fix sed calls with gnu sed when bsd sed is not available

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 46cec29329ff5f1b0c781a7afd968e1847f6ede1..e3cbef553461b8ed7457521f0e7b14c2f3206e35 100644 (file)
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.101 2011/11/07 16:06:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.102 2011/11/07 16:46:26 aballier Exp $
+
+  07 Nov 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0_rc1.ebuild:
+  fix sed calls with gnu sed when bsd sed is not available
 
   07 Nov 2011; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0_rc1.ebuild:
   remove useless patch

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index b5a83d529fd1b8ca04f2da51ce02a95fb6078e3c..5ea8f503694d44a9cbcb3178adb5ba350755b56b 100644 (file)
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -59,13 +59,13 @@ DIST freebsd-usbin-9.0_rc1.tar.bz2 2605735 RMD160 672adbdfff912e6027bad8acd9db66
 EBUILD freebsd-lib-7.2-r1.ebuild 12021 RMD160 83fc0d2ee7e5ff037ae27358d0b345fc28938158 SHA1 d91c9328cfbe8e614bda3b93d782a8452dff0c8e SHA256 4cfd26e8299670f33e6fa20094b66e464ed3bd113c899b3374b55678ac4a4dd0
 EBUILD freebsd-lib-8.0.ebuild 14623 RMD160 3194aa0ab5fda28db1db05b4449d5889251cedc1 SHA1 bbddaa53f36296b2a635c459868cd56fd965de81 SHA256 ba8328339f7c487617d8e1c8754d91ccae38a15073a92b847299aa5e8dfe68da
 EBUILD freebsd-lib-8.2-r1.ebuild 15691 RMD160 24faa71ebac5ed9935f52e8e2036cf2e08632ccd SHA1 a17c950b703f3ec5c4bc094d99c1ea12839855f5 SHA256 e5f57f8252c839e5e16dcb1aa29aacaba09c89d2d443a6b159fcad9210834053
-EBUILD freebsd-lib-9.0_rc1.ebuild 15777 RMD160 e3cb986999b907abd099d9886e1160be8cfd377b SHA1 07dfb5be3930c098078df039fffe7dfe32147975 SHA256 59ae496c58eea0a5e4e49aef9e78707241b7a9ed83c1b90a51b59c8248c7fe8f
-MISC ChangeLog 23242 RMD160 a2deab9a83a967d420663bb04fc233b63400bddb SHA1 9d08fce2997ebf10615815f1db8013530d669af6 SHA256 f54beefd0c54ee47f5dc472ec4db173120997e3dc8f6ea21b0a01a9163b79e4b
+EBUILD freebsd-lib-9.0_rc1.ebuild 16059 RMD160 914556e076a5a6833d255d0c0c4772fb13a57a1e SHA1 fb4c566a2ccab04b3f95fc1d6390ce2122eb9f0b SHA256 a1f16c4d0abc26717906a771b19e24b47da70561bc425b14745539ddcb706aff
+MISC ChangeLog 23382 RMD160 b41f37d82248f0975c24e37c6cdcb72c74b96096 SHA1 531417706594b08a323bdb1c431478f9afc97a9c SHA256 b343eb5e50440c0f09778a82bccac8bf8e3b7bf710eb2f890f764bae55f79427
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk64Af0ACgkQvFcC4BYPU0oBhQCfS0eAzn8+BKTQXi5zlXMCi/ni
-N7sAnjDQdojFw5JW8j9NIIgxNRud+EuN
-=uV9V
+iEYEARECAAYFAk64C2gACgkQvFcC4BYPU0r84ACeNP+tHiWa7tyClgiNM0rpw6Tv
+N0cAoJfyULHlsf3dgrjl6Uqa1HM1a1Nf
+=CQTw
 -----END PGP SIGNATURE-----

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild
index 5ec6526c52caf4256cc6bda4eb00daa7c1ccc25c..0b0bb5ace43681bd9e1d8b6eeed964fd09ab0cb8 100644 (file)
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild,v 1.2 2011/11/07 16:06:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0_rc1.ebuild,v 1.3 2011/11/07 16:46:26 aballier Exp $
 
 EAPI=2
 
@@ -53,7 +53,8 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
 fi
 
 IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-       build bootstrap crosscompile_opts_headers-only zfs"
+       build bootstrap crosscompile_opts_headers-only zfs
+       userland_GNU userland_BSD"
 
 pkg_setup() {
        [ -c /dev/zero ] || \
@@ -187,12 +188,20 @@ src_prepare() {
        sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
                -i "${S}/csu/i386-elf/Makefile" \
                -i "${S}/csu/ia64/Makefile" || die
+       # Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+       # BSD's sed on BSD.
+       if use userland_GNU; then
+               find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+       fi
 }
 
 src_compile() {
        # Does not work with GNU sed
-       export ESED=/usr/bin/sed
-       unalias sed
+       # Force BSD's sed on BSD.
+       if use userland_BSD ; then
+               export ESED=/usr/bin/sed
+               unalias sed
+       fi
 
        cd "${WORKDIR}/include"
        $(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"