Add prefix keywords (~amd64-linux, ~ia64-linux, ~x86-linux) and a patch to find make, et al. in PATH instead of hardcoded directories

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 129 insertions, 15 deletions

diff --git a/sys-apps/acl/ChangeLog b/sys-apps/acl/ChangeLog
index 560bc3ce139f..422fd2591fb5 100644
--- a/sys-apps/acl/ChangeLog
+++ b/sys-apps/acl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/acl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.100 2009/07/02 01:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/ChangeLog,v 1.101 2009/12/29 01:39:03 abcd Exp $
+
+  29 Dec 2009; Jonathan Callen <abcd@gentoo.org> acl-2.2.47-r1.ebuild,
+  +files/acl-2.2.47-search-PATH.patch:
+  Add prefix keywords (~amd64-linux, ~ia64-linux, ~x86-linux) and a patch to
+  find make, et al. in PATH instead of hardcoded directories
 
 *acl-2.2.47-r1 (02 Jul 2009)
 
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 786bea93f376..14e6c24f4f9e 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -6,16 +6,17 @@ AUX 0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch 1487 RMD160
 AUX acl-2.2.32-only-symlink-when-needed.patch 836 RMD160 5b36f392f12d2382dd051c9766ae128a71b659ec SHA1 79fefd16a84e51797165fc8438382382156a149b SHA256 fede0dc42499b8903e42ea976d2ebfe8965750a8b2b116433364e657fbc8189d
 AUX acl-2.2.45-libtool.patch 1144 RMD160 bdb8f729772c296429265586c0b5253f2b1e96ad SHA1 ee9d3dccaf93af4a6f8355e4c36dea5ca2f818b6 SHA256 5d6df5fe58c9dee90a2abe4d7ce6bd3cc61f2431de27d0c8d9cc34ba440bf69b
 AUX acl-2.2.45-linguas.patch 314 RMD160 b2a3965b0918963a9d94bed169a6bbe1cd495954 SHA1 80632125303a9c8ce4cb95685031a8257f5870fe SHA256 a250aa592dd4160a758433db718f5826259eb8db8f1e9afbf24e4c24e1e5ba31
+AUX acl-2.2.47-search-PATH.patch 3100 RMD160 dc4facc1db1914fd26db96d6b6131dbf2067ee91 SHA1 2b684d45ecf0d90c9e89419254ca78a05046523e SHA256 4f8640547f5d81c5f3512f073c715f55cdc15bd8e227994c7b91cb3a79cfc685
 DIST acl-2.2.42-CITI_NFS4_ALL-2.dif 97276 RMD160 d1cbac2f52d4889a96b3225f301a60cf5e91286e SHA1 543bf9fa9c91dad8c5bfbe58b7122963b712a08c SHA256 10c930e4c6d147d03ad6dc67e38663522fd277525c149d932a8279e2cbe1b95e
 DIST acl_2.2.47-1.tar.gz 154823 RMD160 22e62f828c68adde101222bb9f55cf3e93b9d95b SHA1 989a54cc2c600182cac9efafeaa73a4623852d1d SHA256 240906fbea566f5d2dc354d67c3c9e776ad7f8a35a189da2f411c4e9847969c8
-EBUILD acl-2.2.47-r1.ebuild 2307 RMD160 9fb927cd8f2f0a4db1a65c07e63f005a4940a2a8 SHA1 49d906e2121e21860cd1a6b478860e4368bd9161 SHA256 90354e1474895daa9a0e47108b52313c0d777203ee2a8e941baa6ece572a3ca2
+EBUILD acl-2.2.47-r1.ebuild 2330 RMD160 d2b38bd6ba4f487c08f8035d05fdd2754e3d97b0 SHA1 7dcf18bb90e0ea8bc33b9b7b1e9e19b2dc2b0915 SHA256 744b0f2a8f19f5fdcd01f974ecddfbaa69614d0e918ad7c0a2dd412c02cca071
 EBUILD acl-2.2.47.ebuild 2112 RMD160 10769e0f68f639b596f44ee999bb485bf6101da6 SHA1 64a7d781636b5be474a01974cb295c0560c4ed47 SHA256 e66585ae2fd30b8a97188634ee7db8e8eaa7582f6b89c24fbfdb1ae3a3e3f65b
-MISC ChangeLog 12610 RMD160 55004a3b58e569767f9f6f466105ed438c047dc6 SHA1 adcfffbe14b28f90f9dbbad0896efc61c63d3832 SHA256 e967e23645ff9c092b0322ac7adc1693fda40ee1e7849c3a4f4e0a3cdb54e53d
+MISC ChangeLog 12857 RMD160 0c42acf427eaa63f232a04b0dd076126d1f7f6fc SHA1 3c6ee8b7a8e95feff54844553e9abf32faf6bd4f SHA256 827e7377ad1c6a8db6cc125612156b1b733afddeee02ec72c4391acb0f2979b5
 MISC metadata.xml 232 RMD160 90ec4a1cc6ada64a7fd4876979cf14349fc88ea5 SHA1 3a5ced6e3af6b759ef8adc8e4f6a51dbf91fb8ce SHA256 441f653b762deb6e3674d915c6762f28b9e60f3887628e953df603634acd87ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkpMDWIACgkQlPl3HsVfCDq/TQCghU8xwBtgiWXl40bHefeEvKCD
-Rv4An0FZlBFAldK9d1sfTLYY4lMjDdiU
-=Y7OM
+iEYEARECAAYFAks5XcAACgkQOypDUo0oQOoiVwCgsrsbBhra7/7bWUp1tJmwdX5R
+vDwAoLzRPQI4r79D540SoQhYZqaKvHL7
+=VK7n
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/acl/acl-2.2.47-r1.ebuild b/sys-apps/acl/acl-2.2.47-r1.ebuild
index 66e779b5b059..869c34486866 100644
--- a/sys-apps/acl/acl-2.2.47-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.47-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.47-r1.ebuild,v 1.1 2009/07/02 01:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/acl/acl-2.2.47-r1.ebuild,v 1.2 2009/12/29 01:39:03 abcd Exp $
 
 inherit eutils autotools toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="nfs nls"
 
 RDEPEND=">=sys-apps/attr-2.4
@@ -35,6 +35,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.2.45-libtool.patch #158068
 	epatch "${FILESDIR}"/${PN}-2.2.45-linguas.patch #205948
 	epatch "${FILESDIR}"/${PN}-2.2.32-only-symlink-when-needed.patch
+	epatch "${FILESDIR}"/${P}-search-PATH.patch
 	sed -i \
 		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
 		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
@@ -48,15 +49,16 @@ src_unpack() {
 }
 
 src_compile() {
+	use prefix || EPREFIX=
 	unset PLATFORM #184564
 	export OPTIMIZER=${CFLAGS}
 	export DEBUG=-DNDEBUG
 
 	econf \
 		$(use_enable nls gettext) \
-		--libexecdir=/usr/$(get_libdir) \
-		--bindir=/bin \
-		|| die
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
+		--bindir="${EPREFIX}"/bin
+
 	emake || die
 }
 
@@ -65,7 +67,5 @@ src_install() {
 	prepalldocs
 
 	# move shared libs to /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/libacl.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libacl.so
+	gen_usr_ldscript -a acl
 }
diff --git a/sys-apps/acl/files/acl-2.2.47-search-PATH.patch b/sys-apps/acl/files/acl-2.2.47-search-PATH.patch
new file mode 100644
index 000000000000..eb67ebf1b32c
--- /dev/null
+++ b/sys-apps/acl/files/acl-2.2.47-search-PATH.patch
@@ -0,0 +1,108 @@
+On prefix, we want the versions from within EPREFIX, so just search the PATH -- don't
+try to be clever about where the tools may be found
+
+--- acl-2.2.47.orig/m4/package_utilies.m4
++++ acl-2.2.47/m4/package_utilies.m4
+@@ -22,57 +22,39 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
+     AC_SUBST(cc)
+     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
+ 
+-    if test -z "$MAKE"; then
+-        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+-    fi
+-    if test -z "$MAKE"; then
+-        AC_PATH_PROG(MAKE, make,, /usr/bin)
+-    fi
++    AC_PATH_PROG(MAKE, gmake)
++    AC_PATH_PROG(MAKE, make)
+     make=$MAKE
+     AC_SUBST(make)
+     AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
+ 
+     AC_PROG_LIBTOOL
+ 
+-    if test -z "$TAR"; then
+-        AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
+-    fi
++    AC_PATH_PROG(TAR, tar)
+     tar=$TAR
+     AC_SUBST(tar)
+-    if test -z "$ZIP"; then
+-        AC_PATH_PROG(ZIP, gzip,, /bin:/usr/bin:/usr/local/bin:/usr/freeware/bin)
+-    fi
++    AC_PATH_PROG(ZIP, gzip)
+ 
+     zip=$ZIP
+     AC_SUBST(zip)
+ 
+-    if test -z "$MAKEDEPEND"; then
+-        AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+-    fi
++    AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+     makedepend=$MAKEDEPEND
+     AC_SUBST(makedepend)
+ 
+-    if test -z "$AWK"; then
+-        AC_PATH_PROG(AWK, awk,, /bin:/usr/bin)
+-    fi
++    AC_PROG_AWK
+     awk=$AWK
+     AC_SUBST(awk)
+ 
+-    if test -z "$SED"; then
+-        AC_PATH_PROG(SED, sed,, /bin:/usr/bin)
+-    fi
++    AC_PROG_SED
+     sed=$SED
+     AC_SUBST(sed)
+ 
+-    if test -z "$ECHO"; then
+-        AC_PATH_PROG(ECHO, echo,, /bin:/usr/bin)
+-    fi
++    AC_PATH_PROG(ECHO, echo)
+     echo=$ECHO
+     AC_SUBST(echo)
+ 
+-    if test -z "$SORT"; then
+-        AC_PATH_PROG(SORT, sort,, /bin:/usr/bin)
+-    fi
++    AC_PATH_PROG(SORT, sort)
+     sort=$SORT
+     AC_SUBST(sort)
+ 
+@@ -80,31 +62,23 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
+     AC_PROG_LN_S
+ 
+     if test "$enable_gettext" = yes; then
+-        if test -z "$MSGFMT"; then
+-                AC_PATH_PROG(MSGFMT, msgfmt,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+-        fi
++        AC_PATH_PROG(MSGFMT, msgfmt)
+         msgfmt=$MSGFMT
+         AC_SUBST(msgfmt)
+         AC_PACKAGE_NEED_UTILITY($1, "$msgfmt", msgfmt, gettext)
+ 
+-        if test -z "$MSGMERGE"; then
+-                AC_PATH_PROG(MSGMERGE, msgmerge,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+-        fi
++        AC_PATH_PROG(MSGMERGE, msgmerge)
+         msgmerge=$MSGMERGE
+         AC_SUBST(msgmerge)
+         AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
+ 
+-        if test -z "$XGETTEXT"; then
+-                AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+-        fi
++        AC_PATH_PROG(XGETTEXT, xgettext)
+         xgettext=$XGETTEXT
+         AC_SUBST(xgettext)
+         AC_PACKAGE_NEED_UTILITY($1, "$xgettext", xgettext, gettext)
+     fi
+ 
+-    if test -z "$RPM"; then
+-        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
+-    fi
++    AC_PATH_PROG(RPM, rpm)
+     rpm=$RPM
+     AC_SUBST(rpm)
+