Fix for Prefix, marked ~sparc-solaris

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

3 files changed, 28 insertions, 24 deletions

diff --git a/app-admin/sudo/ChangeLog b/app-admin/sudo/ChangeLog
index 773060ca7f0c..66237561fb84 100644
--- a/app-admin/sudo/ChangeLog
+++ b/app-admin/sudo/ChangeLog
@@ -1,6 +1,9 @@
 # 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.307 2012/04/23 23:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/ChangeLog,v 1.308 2012/04/27 15:21:09 grobian Exp $
+
+  27 Apr 2012; Fabian Groffen <grobian@gentoo.org> sudo-1.8.4_p4.ebuild:
+  Fix for Prefix, marked ~sparc-solaris
 
   23 Apr 2012; Mike Frysinger <vapier@gentoo.org>
   +files/sudo-1.8.3_p1-no-utmpx.patch, sudo-1.8.3_p2.ebuild,
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index ceeb3c8f894c..7e987ac3f0a9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -8,23 +8,13 @@ DIST sudo-1.8.4p2.tar.gz 1608580 RMD160 62c52bf05ac4a236e7cdf56c15cc271928635d85
 DIST sudo-1.8.4p4.tar.gz 1608969 RMD160 02875946f3bb9a40637efde20c1a9a3f0b0cfca8 SHA1 49373706709bd4c30d9b3c513eff7be04aecd812 SHA256 bf965b09bde9b0cf7fd2355c53a81884d02d522af2d539cf40218436e9a5051e
 EBUILD sudo-1.8.3_p2.ebuild 4954 RMD160 5935ba8549246709c716b3c4cba4fe7fca1e82a5 SHA1 ade45f010bda743134fd004e55ae0f8e97881952 SHA256 992271224d012eef8c90c148ca2a77635acebceaf80f627d32e5a65fa2a6e058
 EBUILD sudo-1.8.4_p2.ebuild 4914 RMD160 6fe99461b9d7cf2ace0b78b437c9d153cef55278 SHA1 2cd2cc22e03783d0eaa739b686fa0296471ef12f SHA256 a2495c41b3927d8a034983c59bca2d8bf41820af84f8334be7860314ddd71512
-EBUILD sudo-1.8.4_p4.ebuild 4914 RMD160 34cc9e28efbab73369cf0352a20ea60cea2ae68e SHA1 5021732a995607277a3729d512ea5927dcc1bc2e SHA256 067f5ba1bbeb3abb67883678f4f0e0b9fcb03a29bde39cab30b79373e56b371b
-MISC ChangeLog 44948 RMD160 fd18e545948a837387240f7e10082e6627ca038d SHA1 c60b6ebafcc678dd9ca655ea2038fb5620e889b4 SHA256 33b73e72477e6695d5878f1c71cdbabcb81e171ce09a51bbfaa4d78b5406d2b5
+EBUILD sudo-1.8.4_p4.ebuild 5378 RMD160 265d98f21e72b93cb7adc9566de18e586aee17bf SHA1 23632d2f81134e7b08c1fd3fd68f6b209e0fbd95 SHA256 b088f116c8b7d67bd69d314bd1917e0333bea628c1c6c0cd7a2aad166831bc07
+MISC ChangeLog 45063 RMD160 1299e9bcf31b13afbb328fd3227ac69cd7fd0ac8 SHA1 58d631bb1c8e71df447ddc01daf266b398a6748e SHA256 0e43b6bf28b67d5068fb6458490459a56a934971bc3809f34fa0e94636e7b80f
 MISC metadata.xml 560 RMD160 4e8bb9df73a4095b15b23d4ca31dea29b3f376d2 SHA1 a29e70672a1c039c4a97ee65e3e077ba0a01f26b SHA256 465d0ea14b7db3ecd0bad7c175f9e17003794145f5f59c4941f848960c91048a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.19 (Darwin)
 
-iQIcBAEBAgAGBQJPleZkAAoJELEHsLL7fEFWWRMP/RkMLoC4fpceqm6qPoKc3OZa
-v6wAfqw9OKBWw4oANTDsXAF+pziywl7xoea8QRGPs122QROYnconxCVE9R8Jvw/X
-bNjAc9sECFk/2LUQ8zVUwnqnTLtelVOLei23PnpNaQslPY4B/6iJm+gigZr05HaO
-xI9z3UuiWv8VRHHUq4fHMbpSn2sXP0tp6wbfKttAJ3oKIsYjhS+/UTun4ZbcZZpV
-js6P4MCQ1EwhJwShDHjquKR60ja1W9xhzNd5NtgfqJL5Wqy/hl6dJCKy1xAI7Ez9
-e9SHHfHa+8nRWifeliwI0NExAWn7YC/RLSS1zDEVnZlDioSScb3SBpksoYyC+qAu
-vDy9NGDnoySopRPYO9b0PKvomIIfIpYtC83U4AitfjnXop7GwVVNqadIEl078Hcd
-ilpbtZhik7IZ6MkEvMxjd1zZ7TCwZsevwMsaD5r0FlkikAGyushQcLN2IAFLtPwu
-9vY+64NDiFlf8eqQsPcfZsGscf742jBTu/n9m9XHjdxnZWyYd0HZE4DZM/74iZTQ
-taKu3Pk54+nWcCyAWxt49YzbIEewQn08rvb7UqE2JwgORvxKRE66s4v9rnuYIRbL
-f9ndgbmrEKwuJITeVAfXWFrC7CuYc+aweerGGtR8UHtgpuOMu3duF/UHesycIhcq
-dwPPQYMFk7AcJowdVJeW
-=GLrE
+iEYEARECAAYFAk+auZEACgkQX3X2B8XHTomWlwCfXO9LhPUrJetq28mEEXloqgdA
+b44An1COu+NvL8ORr0717RqwEZB0eFi2
+=3SNW
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sudo/sudo-1.8.4_p4.ebuild b/app-admin/sudo/sudo-1.8.4_p4.ebuild
index 0353a00a1bf9..e1ee43467567 100644
--- a/app-admin/sudo/sudo-1.8.4_p4.ebuild
+++ b/app-admin/sudo/sudo-1.8.4_p4.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_p4.ebuild,v 1.2 2012/04/23 23:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.8.4_p4.ebuild,v 1.3 2012/04/27 15:21:09 grobian 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 )
@@ -61,7 +61,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 +106,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 +118,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 +164,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"