old

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

9 files changed, 10 insertions, 425 deletions

diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 17f32c8e5139..c8e836a107bc 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,15 +1,16 @@
-AUX 0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch 1749 RMD160 834b85feb012396aa6839c2005b078a24735d0dd SHA1 ef74c7fff85e2946eee5ada4250639a16e424482 SHA256 5b12843fa224eba5abe5665ea38b13a772e3404bdd7a4a730cef27aa226a9200
-AUX 0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch 1487 RMD160 f46fe06bd11ca9001cf0c8bb48734a07b3a615fe SHA1 0bf38292ce1dd5c53dd6b58935c94f3d861fe257 SHA256 a3b53763dc0a55c21935adb5b81eed7aaaa626fe659b821d201b9cc29c67b732
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX acl-2.2.49-quote-strchr.patch 657 RMD160 42a17e7a1bec893f8655270b85c3821c8f4c4665 SHA1 39b6bbb34d844fe1365df1b84b8fb41d574acbbc SHA256 d172b07ae4ccb4c8da95f90cc836075e6e582b3b57e029987e4197e58f5daf15
 DIST acl-2.2.42-CITI_NFS4_ALL-2.dif 97276 RMD160 d1cbac2f52d4889a96b3225f301a60cf5e91286e SHA1 543bf9fa9c91dad8c5bfbe58b7122963b712a08c SHA256 10c930e4c6d147d03ad6dc67e38663522fd277525c149d932a8279e2cbe1b95e
 DIST acl-2.2.49.src.tar.gz 362743 RMD160 62a3ccd162b1fa28159467ec46eedf8255adb00c SHA1 6f223daa5aafc8a6d29dbf579c82e86312aeb75d SHA256 b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5
-DIST acl_2.2.47-1.tar.gz 154823 RMD160 22e62f828c68adde101222bb9f55cf3e93b9d95b SHA1 989a54cc2c600182cac9efafeaa73a4623852d1d SHA256 240906fbea566f5d2dc354d67c3c9e776ad7f8a35a189da2f411c4e9847969c8
-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
 EBUILD acl-2.2.49.ebuild 1838 RMD160 611e44456638eefca95e50d740765f297f2aea1f SHA1 f057084b22ddb61befc6045a1b62841a7809ff12 SHA256 6795b9767a3144983c2c03e787c40cb925bc9f901634e995e977ee9642acdae2
 MISC ChangeLog 13683 RMD160 987af9a32fe835b60c359e4c21b78665c2d68d0a SHA1 78299be6a41ac503c349aa283a98861a7c3cd1a1 SHA256 bccf32c6014443e5b19e0ffd03668de76b6776d2e66a8eb73dce031f0bb8df88
 MISC metadata.xml 232 RMD160 90ec4a1cc6ada64a7fd4876979cf14349fc88ea5 SHA1 3a5ced6e3af6b759ef8adc8e4f6a51dbf91fb8ce SHA256 441f653b762deb6e3674d915c6762f28b9e60f3887628e953df603634acd87ad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkz+i7kACgkQTwhj9JtAlp5jowD/UDHYnhtjaYP6XEtEz60r7Tta
+q1qRGpitgMPRUsy8KvEA/1g9DMicc2bBHbSj6dfbodEIqiZwrlKwhjfjn3bdq5G9
+=7Uub
+-----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
deleted file mode 100644
index 869c34486866..000000000000
--- a/sys-apps/acl/acl-2.2.47-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.2 2009/12/29 01:39:03 abcd Exp $
-
-inherit eutils autotools toolchain-funcs
-
-MY_P="${PN}_${PV}-1"
-DESCRIPTION="Access control list utilities, libraries and headers"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz
-	ftp://xfs.org/mirror/SGI/cmd_tars/${MY_P}.tar.gz
-	nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-2/acl-2.2.42-CITI_NFS4_ALL-2.dif )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-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
-	nfs? ( net-libs/libnfsidmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
-	if use nfs ; then
-		cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die
-		sed -i '/^diff --git a.debian.changelog b.debian.changelog/,/^diff --git/d' acl-2.2.42-CITI_NFS4_ALL-2.dif || die
-		epatch acl-2.2.42-CITI_NFS4_ALL-2.dif
-	fi
-	epatch \
-		"${FILESDIR}"/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch \
-		"${FILESDIR}"/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch #265425
-	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:' \
-		include/builddefs.in \
-		|| die "failed to update builddefs"
-	# libtool will clobber install-sh which is really a custom file
-	mv install-sh acl.install-sh || die
-	AT_M4DIR="m4" eautoreconf
-	mv acl.install-sh install-sh || die
-	strip-linguas po
-}
-
-src_compile() {
-	use prefix || EPREFIX=
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib || die
-	prepalldocs
-
-	# move shared libs to /
-	gen_usr_ldscript -a acl
-}
diff --git a/sys-apps/acl/acl-2.2.47.ebuild b/sys-apps/acl/acl-2.2.47.ebuild
deleted file mode 100644
index 95b92b1e2ba8..000000000000
--- a/sys-apps/acl/acl-2.2.47.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.9 2008/12/16 17:58:55 jer Exp $
-
-inherit eutils autotools toolchain-funcs
-
-MY_P="${PN}_${PV}-1"
-DESCRIPTION="Access control list utilities, libraries and headers"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${MY_P}.tar.gz
-	ftp://xfs.org/mirror/SGI/cmd_tars/${MY_P}.tar.gz
-	nfs? ( http://www.citi.umich.edu/projects/nfsv4/linux/acl-patches/2.2.42-2/acl-2.2.42-CITI_NFS4_ALL-2.dif )"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nfs nls"
-
-RDEPEND=">=sys-apps/attr-2.4
-	nfs? ( net-libs/libnfsidmap )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd "${S}"
-	if use nfs ; then
-		cp "${DISTDIR}"/acl-2.2.42-CITI_NFS4_ALL-2.dif . || die
-		sed -i '/^diff --git a.debian.changelog b.debian.changelog/,/^diff --git/d' acl-2.2.42-CITI_NFS4_ALL-2.dif || die
-		epatch acl-2.2.42-CITI_NFS4_ALL-2.dif
-	fi
-	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
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die "failed to update builddefs"
-	# libtool will clobber install-sh which is really a custom file
-	mv install-sh acl.install-sh || die
-	AT_M4DIR="m4" eautoreconf
-	mv acl.install-sh install-sh || die
-	strip-linguas po
-}
-
-src_compile() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--libexecdir=/usr/$(get_libdir) \
-		--bindir=/bin \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib || die
-	prepalldocs
-
-	# move shared libs to /
-	dodir /$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/libacl.so* "${D}"/$(get_libdir)/ || die
-	gen_usr_ldscript libacl.so
-}
diff --git a/sys-apps/acl/files/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch b/sys-apps/acl/files/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch
deleted file mode 100644
index 7f070a899d78..000000000000
--- a/sys-apps/acl/files/0001-Introduce-new-WALK_TREE_DEREFERENCE_TOPLEVEL-flag.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-http://bugs.gentoo.org/265425
-
-From 1a80c89ee88357137b598fa3357b576933c5746c Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@suse.de>
-Date: Tue, 23 Jun 2009 00:17:49 +0200
-Subject: [PATCH] Introduce new WALK_TREE_DEREFERENCE_TOPLEVEL flag
-
-This flag indicates to dereference top-level symlinks. (If non
-top-level symlinks should be stat()ed as well, the
-WALK_TREE_DEREFERENCE flag must be specified.)
----
- include/walk_tree.h |    9 +++++----
- libmisc/walk_tree.c |    4 +++-
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/include/walk_tree.h b/include/walk_tree.h
-index 53a8fc5..9f1ec34 100644
---- a/include/walk_tree.h
-+++ b/include/walk_tree.h
-@@ -20,10 +20,11 @@
- #ifndef __WALK_TREE_H
- #define __WALK_TREE_H
- 
--#define WALK_TREE_RECURSIVE	0x1
--#define WALK_TREE_PHYSICAL	0x2
--#define WALK_TREE_LOGICAL	0x4
--#define WALK_TREE_DEREFERENCE	0x8
-+#define WALK_TREE_RECURSIVE		0x01
-+#define WALK_TREE_PHYSICAL		0x02
-+#define WALK_TREE_LOGICAL		0x04
-+#define WALK_TREE_DEREFERENCE		0x08
-+#define WALK_TREE_DEREFERENCE_TOPLEVEL	0x10
- 
- #define WALK_TREE_TOPLEVEL	0x100
- #define WALK_TREE_SYMLINK	0x200
-diff --git a/libmisc/walk_tree.c b/libmisc/walk_tree.c
-index 2777145..30ff92a 100644
---- a/libmisc/walk_tree.c
-+++ b/libmisc/walk_tree.c
-@@ -78,7 +78,9 @@ static int walk_tree_rec(const char *path, int walk_flags,
- 		return func(path, NULL, flags | WALK_TREE_FAILED, arg);
- 	if (S_ISLNK(st.st_mode)) {
- 		flags |= WALK_TREE_SYMLINK;
--		if (flags & WALK_TREE_DEREFERENCE) {
-+		if ((flags & WALK_TREE_DEREFERENCE) ||
-+		    ((flags & WALK_TREE_TOPLEVEL) &&
-+		     (flags & WALK_TREE_DEREFERENCE_TOPLEVEL))) {
- 			if (stat(path, &st) != 0)
- 				return func(path, NULL,
- 					    flags | WALK_TREE_FAILED, arg);
--- 
-1.6.3.3
-
diff --git a/sys-apps/acl/files/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch b/sys-apps/acl/files/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch
deleted file mode 100644
index f3925c76003b..000000000000
--- a/sys-apps/acl/files/0001-Make-sure-that-getfacl-R-only-calls-stat-2-on-symlin.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://bugs.gentoo.org/265425
-
-From 63451a06b7484d220750ed8574d3ee84e156daf5 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@suse.de>
-Date: Tue, 23 Jun 2009 00:29:45 +0200
-Subject: [PATCH] Make sure that getfacl -R only calls stat(2) on symlinks when it needs to
-
-This fixes http://oss.sgi.com/bugzilla/show_bug.cgi?id=790
-"getfacl follows symlinks, even without -L".
----
- getfacl/getfacl.c |    7 ++++---
-
-diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c
-index fc650e3..b3e6200 100644
---- a/getfacl/getfacl.c
-+++ b/getfacl/getfacl.c
-@@ -70,7 +70,7 @@ struct option long_options[] = {
- const char *progname;
- const char *cmd_line_options;
- 
--int walk_flags = WALK_TREE_DEREFERENCE;
-+int walk_flags = WALK_TREE_DEREFERENCE_TOPLEVEL;
- int opt_print_acl;
- int opt_print_default_acl;
- int opt_strip_leading_slash = 1;
-@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
- 			case 'L':  /* follow all symlinks */
- 				if (posixly_correct)
- 					goto synopsis;
--				walk_flags |= WALK_TREE_LOGICAL;
-+				walk_flags |= WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE;
- 				walk_flags &= ~WALK_TREE_PHYSICAL;
- 				break;
- 
-@@ -650,7 +650,8 @@ int main(int argc, char *argv[])
- 				if (posixly_correct)
- 					goto synopsis;
- 				walk_flags |= WALK_TREE_PHYSICAL;
--				walk_flags &= ~WALK_TREE_LOGICAL;
-+				walk_flags &= ~(WALK_TREE_LOGICAL | WALK_TREE_DEREFERENCE |
-+						WALK_TREE_DEREFERENCE_TOPLEVEL);
- 				break;
- 
- 			case 's':  /* skip files with only base entries */
--- 
-1.6.3.3
-
diff --git a/sys-apps/acl/files/acl-2.2.32-only-symlink-when-needed.patch b/sys-apps/acl/files/acl-2.2.32-only-symlink-when-needed.patch
deleted file mode 100644
index 387a08352e16..000000000000
--- a/sys-apps/acl/files/acl-2.2.32-only-symlink-when-needed.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-We dont want to generate symlinks when the libdir is the same as the
-devlibdir, otherwise we clobber the real files with broken symlinks
-
---- include/buildmacros
-+++ include/buildmacros
-@@ -102,9 +102,11 @@
- 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
- 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
- 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
-+	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
- 	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
- 	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
--	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so
-+	../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
-+	fi
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
diff --git a/sys-apps/acl/files/acl-2.2.45-libtool.patch b/sys-apps/acl/files/acl-2.2.45-libtool.patch
deleted file mode 100644
index 39a1e2743f40..000000000000
--- a/sys-apps/acl/files/acl-2.2.45-libtool.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- m4/package_utilies.m4
-+++ m4/package_utilies.m4
-@@ -32,15 +32,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
-     AC_SUBST(make)
-     AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
- 
--    if test -z "$LIBTOOL"; then
--	AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
--    fi
--    if test -z "$LIBTOOL"; then
--	AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
--    fi
--    libtool=$LIBTOOL
--    AC_SUBST(libtool)
--    AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
-+    AC_PROG_LIBTOOL
- 
-     if test -z "$TAR"; then
-         AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
---- include/builddefs.in
-+++ include/builddefs.in
-@@ -17,6 +17,7 @@ LIBMISC = $(TOPDIR)/libmisc/libmisc.la
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-+top_builddir = @top_builddir@
- datarootdir = @datarootdir@
- 
- PKG_NAME	= @pkg_name@
---- m4/package_globals.m4
-+++ m4/package_globals.m4
-@@ -8,6 +8,8 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
-   [ pkg_name="$1"
-     AC_SUBST(pkg_name)
- 
-+    AC_PROG_CC
-+
-     . ./VERSION
-     pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
-     AC_SUBST(pkg_version)
diff --git a/sys-apps/acl/files/acl-2.2.45-linguas.patch b/sys-apps/acl/files/acl-2.2.45-linguas.patch
deleted file mode 100644
index b26d9459195a..000000000000
--- a/sys-apps/acl/files/acl-2.2.45-linguas.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.orig	2008-02-22 21:56:25.000000000 -0500
-+++ po/Makefile	2008-02-22 21:56:31.000000000 -0500
-@@ -6,7 +6,7 @@
- include $(TOPDIR)/include/builddefs
- 
- POTHEAD = $(PKG_NAME).pot
--LINGUAS = de es fr gl pl sv
-+LINGUAS ?= de es fr gl pl sv
- LSRCFILES = $(LINGUAS:%=%.po) $(POTHEAD)
- LDIRT = $(POTHEAD)
- 
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
deleted file mode 100644
index eb67ebf1b32c..000000000000
--- a/sys-apps/acl/files/acl-2.2.47-search-PATH.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-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)
-