New version, tidy up older versions

Package-Manager: portage-2.0.53_rc3

9 files changed, 29 insertions, 171 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index f287267ba536..01f2d7490ce3 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.50 2005/10/01 22:04:55 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.51 2005/10/07 21:09:30 ciaranm Exp $
+
+*findutils-4.2.25 (07 Oct 2005)
+
+  07 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  -findutils-4.2.18.ebuild, -findutils-4.2.20.ebuild,
+  -findutils-4.2.23.ebuild, +findutils-4.2.25.ebuild:
+  New version, tidy up older versions
 
   01 Oct 2005; Ciaran McCreesh <ciaranm@gentoo.org> findutils-4.2.24.ebuild:
   Add --without-included-regex, bug #107638
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 78ff23495d40..2429437839b3 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 054571cd32e981304231461745b82e07 findutils-4.1.20-r1.ebuild 2070
-MD5 7adff12b202c11921f01e3a5cac2ab92 findutils-4.2.23.ebuild 1627
-MD5 e63b61d5721b385b5ebde50fa9a285d3 findutils-4.2.18.ebuild 2087
-MD5 77afdd0a4bd1f36df4bfe6a006595d7f findutils-4.2.20.ebuild 1891
-MD5 1f7197b778d47c773d19430261c84f49 metadata.xml 261
-MD5 ab508db148816c57912242a986d9c5b0 ChangeLog 7690
-MD5 b6a7d70d17ac0b2f629de8655eea5224 findutils-4.2.24.ebuild 1710
+MD5 e196745fd1050cc5282cda155b86d4e4 ChangeLog 7922
+MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20-r1 68
+MD5 2b5e0b42a11ea009340805d461a6ecc5 files/digest-findutils-4.2.24 69
+MD5 20f929ed7c70bcf734d389a7dd03b6d5 files/digest-findutils-4.2.25 69
+MD5 43e3e3c15b66b30de4be62db3b7674ea files/findutils-4.1.20-selinux.diff 10392
+MD5 df65fc9a616feac9570c654f02b2edcc files/findutils-4.2.18-gcc295.patch 457
 MD5 62f86a597482354916befe2e1f084b8d files/findutils-4.2.18-selinux.diff 15327
 MD5 6d52de5b305608054e88b17c5b282048 files/findutils-4.2.20-man.patch 331
-MD5 2b5e0b42a11ea009340805d461a6ecc5 files/digest-findutils-4.2.24 69
 MD5 ed25af7dabe43ac10d2383db9bf30ba5 files/findutils-4.2.20-selinux.diff 14398
-MD5 f983b276be2d73937687b61be2bc917d files/digest-findutils-4.2.18 68
-MD5 df65fc9a616feac9570c654f02b2edcc files/findutils-4.2.18-gcc295.patch 457
-MD5 43e3e3c15b66b30de4be62db3b7674ea files/findutils-4.1.20-selinux.diff 10392
-MD5 64a3abde0e9e5c1c5d464d0d5c9776ad files/digest-findutils-4.2.20 69
 MD5 278b03652ed2957f8f57b04880474e10 files/findutils-4.2.23-selinux.patch 14406
 MD5 0315b5033cf65d15f24b1c252070db45 files/findutils-env-size.patch 672
-MD5 0b59e4e3c5ff452c7e1c2779eecef491 files/digest-findutils-4.2.23 68
-MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20-r1 68
+MD5 054571cd32e981304231461745b82e07 findutils-4.1.20-r1.ebuild 2070
+MD5 b6a7d70d17ac0b2f629de8655eea5224 findutils-4.2.24.ebuild 1710
+MD5 b5a994338066527e073bb0ffb49cc953 findutils-4.2.25.ebuild 1699
+MD5 1f7197b778d47c773d19430261c84f49 metadata.xml 261
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDPwgyLLFUmVNQ7rkRAp7AAKCwzkx0Kknb7KC/JHRB9UgDhX3OQACffqqu
-z7Cf5OXY+rkT28d9+kVgJdg=
-=LyVd
+iD8DBQFDRuQWLLFUmVNQ7rkRAv6XAKCCQKiDtHYIzG0JHWZ9iJs5y2RwMwCfdKsg
+S3wYk/WzbeP3lMnaVw+K7aw=
+=iDYp
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/files/digest-findutils-4.2.18 b/sys-apps/findutils/files/digest-findutils-4.2.18
deleted file mode 100644
index 7505dfb3cbf5..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.2.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8aac2498435f3f1882678fb9ebda5c34 findutils-4.2.18.tar.gz 942093
diff --git a/sys-apps/findutils/files/digest-findutils-4.2.20 b/sys-apps/findutils/files/digest-findutils-4.2.20
deleted file mode 100644
index eada313a7aa0..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.2.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c8e12165b221dd67a19c00d780437a4 findutils-4.2.20.tar.gz 1044129
diff --git a/sys-apps/findutils/files/digest-findutils-4.2.23 b/sys-apps/findutils/files/digest-findutils-4.2.23
deleted file mode 100644
index f998db41c9f4..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.2.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ecaff8b060e8d69c10eb2391a8032e26 findutils-4.2.23.tar.gz 978446
diff --git a/sys-apps/findutils/files/digest-findutils-4.2.25 b/sys-apps/findutils/files/digest-findutils-4.2.25
new file mode 100644
index 000000000000..1b2dc624b199
--- /dev/null
+++ b/sys-apps/findutils/files/digest-findutils-4.2.25
@@ -0,0 +1 @@
+MD5 e92fef6714ffa9972f28a1a423066921 findutils-4.2.25.tar.gz 1040578
diff --git a/sys-apps/findutils/findutils-4.2.18.ebuild b/sys-apps/findutils/findutils-4.2.18.ebuild
deleted file mode 100644
index bd6f9f92f81d..000000000000
--- a/sys-apps/findutils/findutils-4.2.18.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.18.ebuild,v 1.2 2005/02/20 17:40:02 azarah Exp $
-
-inherit eutils flag-o-matic gnuconfig toolchain-funcs
-
-SELINUX_PATCH="findutils-4.2.18-selinux.diff"
-
-# Note this doesn't point to gnu.org because alpha.gnu.org has quit
-# supplying the development versions.  If it comes back in the future
-# then we might want to redirect the link.  See bug 18729
-DESCRIPTION="GNU utilities to find files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build afs selinux static"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	afs? ( net-fs/openafs )
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Detect new systems properly
-	gnuconfig_update
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	# Fix variable definition to be gcc-2.95.3 compatible
-	epatch ${FILESDIR}/${P}-gcc295.patch
-
-	# Patches for selinux
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-}
-
-src_compile() {
-	if use afs && use x86; then
-		append-flags -I/usr/afsws/include
-		append-ldflags -lpam
-		export LIBS="/usr/afsws/lib/pam_afs.so.1 -lpam"
-	fi
-	export CPPFLAGS="${CXXFLAGS}"
-	use static && append-ldflags -static
-
-	econf $(use_enable nls) || die
-	emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die
-}
-
-src_install() {
-	einstall libexecdir=${D}/usr/lib/find || die
-	prepallman
-
-	rm -rf ${D}/usr/var
-	use build \
-		&& rm -rf ${D}/usr/share \
-		|| dodoc NEWS README TODO ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "Please note that the locate and updatedb binaries"
-	ewarn "are not longer provided by findutils."
-	ewarn "Please emerge slocate"
-}
diff --git a/sys-apps/findutils/findutils-4.2.20.ebuild b/sys-apps/findutils/findutils-4.2.20.ebuild
deleted file mode 100644
index be94ad6b957e..000000000000
--- a/sys-apps/findutils/findutils-4.2.20.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.20.ebuild,v 1.4 2005/05/22 08:58:30 ciaranm Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SELINUX_PATCH="findutils-4.2.20-selinux.diff"
-
-DESCRIPTION="GNU utilities to find files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls build afs selinux static"
-
-RDEPEND="afs? ( net-fs/openafs )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	# Patches for selinux
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-
-	# Make the man page more accurate. Bug #93294.
-	epatch ${FILESDIR}/${P}-man.patch
-}
-
-src_compile() {
-	if use afs && use x86; then
-		append-flags -I/usr/afsws/include
-		append-ldflags -lpam
-		export LIBS="/usr/afsws/lib/pam_afs.so.1 -lpam"
-	fi
-	export CPPFLAGS="${CXXFLAGS}"
-	use static && append-ldflags -static
-
-	local myconf=""
-	[[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
-
-	econf $(use_enable nls) ${myconf} || die
-	emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" libexecdir=${D}/usr/lib/find install || die
-	prepallman
-
-	rm -rf ${D}/usr/var
-	use build \
-		&& rm -rf ${D}/usr/share \
-		|| dodoc NEWS README TODO ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "Please note that the locate and updatedb binaries"
-	ewarn "are not longer provided by findutils."
-	ewarn "Please emerge slocate"
-}
diff --git a/sys-apps/findutils/findutils-4.2.23.ebuild b/sys-apps/findutils/findutils-4.2.25.ebuild
index 7430832b604a..8af1625d2458 100644
--- a/sys-apps/findutils/findutils-4.2.23.ebuild
+++ b/sys-apps/findutils/findutils-4.2.25.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.23.ebuild,v 1.3 2005/09/26 04:56:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.25.ebuild,v 1.1 2005/10/07 21:09:30 ciaranm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-SELINUX_PATCH="findutils-4.2.23-selinux.patch"
+# SELINUX_PATCH="findutils-4.2.23-selinux.patch"
 
 DESCRIPTION="GNU utilities for finding files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
+# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,14 +29,14 @@ src_unpack() {
 	sed -i '/^SUBDIRS/s/locate//' Makefile.in
 
 	# Patches for selinux
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
+	# use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
 }
 
 src_compile() {
 	use static && append-ldflags -static
 
-	local myconf=""
-	[[ "${USERLAND}" != "GNU" ]] && myconf="--program-prefix=g"
+	local myconf="--without-included-regex"
+	[[ "${USERLAND}" != "GNU" ]] && myconf=" --program-prefix=g"
 
 	econf $(use_enable nls) ${myconf} || die "configure failed"
 	emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die "make failed"