Only install sed to /bin for GNU userland.

Package-Manager: portage-2.1.3_rc7

3 files changed, 18 insertions, 24 deletions

diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index e28d37ce56ae..44f27977b042 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/sed
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.83 2006/12/14 18:44:45 eroyf Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.84 2007/07/10 23:00:46 uberlord Exp $
+
+  10 Jul 2007; Roy Marples <uberlord@gentoo.org> sed-4.1.5.ebuild:
+  Only install sed to /bin for GNU userland.
 
   14 Dec 2006; Alexander H. Færøy <eroyf@gentoo.org> sed-4.1.5.ebuild:
   Stable on MIPS; bug #149056
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index ee4c237871ca..73d802461446 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dos2unix 59 RMD160 0368c209fca1c4d15d755843d7a65088b6b4a374 SHA1 68f658288d08c0768d675e5e1601d5024778d043 SHA256 77f34331117af2a0756d9db39f956b74897e2e427f331dfe3bd40a64c5a06b33
 MD5 1f789b81b2d7992345e1490c68ad5477 files/dos2unix 59
 RMD160 0368c209fca1c4d15d755843d7a65088b6b4a374 files/dos2unix 59
@@ -18,14 +15,14 @@ MD5 2502535e2cc93fa49d1c2fdc31eff1b2 files/unix2dos 56
 RMD160 b5c28ec740e353ec1dc1722eff3ca54b48d7b6bc files/unix2dos 56
 SHA256 13513234158e35ecd98ed24e765f69e5aecce6045889775dee12545c14a4dc7b files/unix2dos 56
 DIST sed-4.1.5.tar.gz 799584 RMD160 49b12e99a55c6d2e78ad236f0205e63e46444173 SHA1 8e575e8a44568392d5b6e089eab5da5cdbd45885 SHA256 be955bef7a81d69222e929689e0de0ecf64c13dc5b15b2ee5696d5ef66fdeec0
-EBUILD sed-4.1.5.ebuild 1762 RMD160 3f1ceb8aed54458952830f88339c8567562f73b8 SHA1 015483ae31f7196c0e36cb3d1f7ac372bb9ecbb1 SHA256 e58c5ac80f04905cf5c1cad2d7c42cbbb4313e0f2e48632bcd61c553e86f2f43
-MD5 7f9289afd5699488097b8c88f561ea87 sed-4.1.5.ebuild 1762
-RMD160 3f1ceb8aed54458952830f88339c8567562f73b8 sed-4.1.5.ebuild 1762
-SHA256 e58c5ac80f04905cf5c1cad2d7c42cbbb4313e0f2e48632bcd61c553e86f2f43 sed-4.1.5.ebuild 1762
-MISC ChangeLog 11000 RMD160 f71c8cb5628c7b26ed20440f801e67316d0909da SHA1 0723dafb96e93f5d1c63fb4f81ce27b68608f537 SHA256 f34d64de8cd3f43185554a676691a5b3cf3ddf55634722d518616e33280b3d90
-MD5 4b2806a61e29bfe2c0a1d54068436d84 ChangeLog 11000
-RMD160 f71c8cb5628c7b26ed20440f801e67316d0909da ChangeLog 11000
-SHA256 f34d64de8cd3f43185554a676691a5b3cf3ddf55634722d518616e33280b3d90 ChangeLog 11000
+EBUILD sed-4.1.5.ebuild 1796 RMD160 eaf1366296d986cfa26170369d4bfa0953665720 SHA1 122862a9c46782d33f3e9336986472c0b314b5d9 SHA256 c4a523484aa32ab5c40f32352746a6e0f20f59d2c248f9f34722d32d196791ed
+MD5 6c8972b3a6706d39102d6a8d17c1fd96 sed-4.1.5.ebuild 1796
+RMD160 eaf1366296d986cfa26170369d4bfa0953665720 sed-4.1.5.ebuild 1796
+SHA256 c4a523484aa32ab5c40f32352746a6e0f20f59d2c248f9f34722d32d196791ed sed-4.1.5.ebuild 1796
+MISC ChangeLog 11116 RMD160 3b3dbbbbea224d726242c53945afb69ab6c445bc SHA1 2cbac6e74febccfbdbad2b838d56f607419fdb84 SHA256 a7f98a6401d64424035d018eea0c2a06d5467a2e02607c32d59a8b199d0a1bb4
+MD5 4a23999654e4e489065312f8cd2b70d1 ChangeLog 11116
+RMD160 3b3dbbbbea224d726242c53945afb69ab6c445bc ChangeLog 11116
+SHA256 a7f98a6401d64424035d018eea0c2a06d5467a2e02607c32d59a8b199d0a1bb4 ChangeLog 11116
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -33,10 +30,3 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 d830c9b91707f87d92c8c97fe4deee55 files/digest-sed-4.1.5 229
 RMD160 e62a89e0fb3237843b43bb5b265639f4d903ad02 files/digest-sed-4.1.5 229
 SHA256 fc27a6c7e4ea15ccadc1700d6e950a14125370ea6eb28e3c8d188ac9c91bf98c files/digest-sed-4.1.5 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGjxv4p/wUKkr7RBoRAqyKAJ924YDvSJSo/eZBUmfQem1R9EUWnQCginOz
-ugRMum+Rrsc6fmW21gnYReU=
-=C4+c
------END PGP SIGNATURE-----
diff --git a/sys-apps/sed/sed-4.1.5.ebuild b/sys-apps/sed/sed-4.1.5.ebuild
index 91d7cbc53802..ef76ba57c3cf 100644
--- a/sys-apps/sed/sed-4.1.5.ebuild
+++ b/sys-apps/sed/sed-4.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.5.ebuild,v 1.17 2007/02/28 22:22:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.5.ebuild,v 1.18 2007/07/10 23:00:46 uberlord Exp $
 
 inherit flag-o-matic
 
@@ -44,13 +44,14 @@ src_compile() {
 		-e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \
 		doc/Makefile.in || die "sed html doc"
 
-	local myconf=""
+	local myconf= bindir=/bin
 	if ! use userland_GNU ; then
 		myconf="--program-prefix=g"
+		bindir=/usr/bin
 	fi
 	use static && append-ldflags -static
 	econf \
-		--bindir=/bin \
+		--bindir=${bindir} \
 		$(use_enable nls) \
 		${myconf} \
 		|| die "Configure failed"