Remove old and version bump.

(Portage version: 2.2.0_alpha105/cvs/Linux x86_64)

2 files changed, 25 insertions, 9 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 66237561fb84..b42137014ed9 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sudo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.308 2012/04/27 15:21:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.309 2012/05/16 15:25:07 flameeyes Exp $
+
+*sudo-1.8.5 (16 May 2012)
+
+  16 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> +sudo-1.8.5.ebuild,
+  -sudo-1.8.4_p2.ebuild:
+  Remove old and version bump.
 
   27 Apr 2012; Fabian Groffen <grobian@gentoo.org> sudo-1.8.4_p4.ebuild:
   Fix for Prefix, marked ~sparc-solaris
diff --git a/app-admin/sudo/sudo-1.8.4_p2.ebuild b/app-admin/sudo/sudo-1.8.5.ebuild
index 362b9fd7a02c..dbeb36def135 100644
--- a/app-admin/sudo/sudo-1.8.4_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.4_p2.ebuild,v 1.2 2012/04/23 23:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.5.ebuild,v 1.1 2012/05/16 15:25:07 flameeyes Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 # 3-clause BSD license
 LICENSE="as-is BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
 IUSE="ldap nls pam offensive selinux skey"
 
 DEPEND="pam? ( virtual/pam )
@@ -50,7 +50,6 @@ REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.3_p1-no-utmpx.patch
 	elibtoolize
 }
 
@@ -61,7 +60,7 @@ set_rootpath() {
 	einfo "Setting secure_path ..."
 
 	# first extract the default ROOTPATH from build env
-	ROOTPATH=$(unset ROOTPATH; . /etc/profile.env; echo "${ROOTPATH}")
+	ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
 	if [[ -z ${ROOTPATH} ]] ; then
 		ewarn "	Failed to find ROOTPATH, please report this"
 	fi
@@ -106,7 +105,7 @@ src_configure() {
 	econf \
 		--enable-zlib=system \
 		--with-secure-path="${ROOTPATH}" \
-		--with-editor=/usr/libexec/editor \
+		--with-editor="${EPREFIX}"/usr/libexec/editor \
 		--with-env-editor \
 		$(use_with offensive insults) \
 		$(use_with offensive all-insults) \
@@ -118,9 +117,9 @@ src_configure() {
 		$(use_with selinux) \
 		--without-opie \
 		--without-linux-audit \
-		--with-timedir=/var/db/sudo \
-		--with-plugindir=/usr/$(get_libdir)/sudo \
-		--docdir=/usr/share/doc/${PF}
+		--with-timedir="${EPREFIX}"/var/db/sudo \
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 }
 
 src_install() {
@@ -164,6 +163,17 @@ pkg_postinst() {
 			ewarn
 		fi
 	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
 
 	elog "To use the -A (askpass) option, you need to install a compatible"
 	elog "password program from the following list. Starred packages will"