Drop --without-included-regex as it breaks systems more than it saves size.

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

4 files changed, 114 insertions, 5 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 1a1122827227..5a8142c2fe81 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.195 2011/05/11 15:00:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.196 2011/07/05 21:08:17 vapier Exp $
+
+*findutils-4.5.10-r1 (05 Jul 2011)
+*findutils-4.4.2-r1 (05 Jul 2011)
+
+  05 Jul 2011; Mike Frysinger <vapier@gentoo.org> +findutils-4.4.2-r1.ebuild,
+  +findutils-4.5.10-r1.ebuild:
+  Drop --without-included-regex as it breaks systems more than it saves size.
 
 *findutils-4.5.10 (11 May 2011)
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 348741e93598..5fa874f26548 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -7,16 +7,18 @@ DIST findutils-4.4.2.tar.gz 2149838 RMD160 d2954a31d59ca238e18b50be82f1eccf7ad69
 DIST findutils-4.5.10.tar.gz 2745375 RMD160 2799998c4e3c308d2680fc13aa74bceac66fd9c9 SHA1 e984c8795cb495623ff50ee319c8c0d8843d9bc2 SHA256 fe24bbce55ac8f136080e01c03e7ae8b5ab395550625c25860efcbbe0641af76
 DIST findutils-4.5.8.tar.gz 2676792 RMD160 aceb9d5b4a2c1eae02ff3f872e846a744d6819ef SHA1 4e892a40a4a397ee9eec42f0a9fa9d160bb8bc1c SHA256 8f4b4179a94695375549d33e72b9bc992cd286230b387f39acce847338272b1d
 DIST findutils-4.5.9.tar.gz 2707711 RMD160 830e450342b4fccf1eb97e8d226cc086978e50e9 SHA1 7bfaadeb7a93c1bd959a360ecb0971a63ff43677 SHA256 ee7fad47a8ee62f335f8415e48d3836052b2d00c4df568cac808e25cd42653cc
+EBUILD findutils-4.4.2-r1.ebuild 1401 RMD160 a11f051f277ef26e7e1a56c4e4fb208134f560aa SHA1 7c281a35b85213b12e1160cb88ebe309450ec746 SHA256 e1db14ca7061fbfb1ff5b5f6df6ab0db811cdc8211ae9d38c152386e2362038e
 EBUILD findutils-4.4.2.ebuild 1501 RMD160 d71f7d53c47b8a530bc59d24fc9247f27bfee360 SHA1 59f7c8fe469a05e929f337b10d7015c1925d3f6d SHA256 2f61ce116bd767ae728aaf40c7baeb289bd901f53a5970eb3b152c7f86d50a8d
+EBUILD findutils-4.5.10-r1.ebuild 1303 RMD160 8e6625fe284b5bc74fdb8b2a7ff57f562d1ab3f6 SHA1 f0509e36fc6e2d5863616a15b0912cef94b9c9c0 SHA256 791c520b4d64c6cf6c1006c671b61c1ffc17767dbf9c947a0cec0c4304536319
 EBUILD findutils-4.5.10.ebuild 1415 RMD160 a5d81b14c3fd511cb7468f50daf16592008959cd SHA1 bacf4cedaca88f6e9e9a16ee06ce51a042673fcb SHA256 4839513359909c2f15ec9544f7e68f740fc028925dcc1800b8a5ab35599ae3dc
 EBUILD findutils-4.5.8.ebuild 1416 RMD160 faa1cad7ec829e82a514e78d7ce08b5778f3522b SHA1 ebb39cbe9ce7408d65464c9ce61bac8b56593f4f SHA256 c07a8f2c8d7264050764aafb12c03ecaf48833f63ca2615af50db2e507bce470
 EBUILD findutils-4.5.9.ebuild 1414 RMD160 772da295cdadaf75e08dc4dece601644a1624bc6 SHA1 4ed49ffcd82b37cb327be93e9265d6cc9fdd51d8 SHA256 6177aab2bfcf1a493ded322c4fe44315913b54a02209f993f5504adc0f850496
-MISC ChangeLog 26867 RMD160 8920fa233c059940262587f09e0759dd3dff5078 SHA1 cda013c8c769b9d44ef9a80476da722d5d872900 SHA256 bfa8fab9c7fe38882b315f8e23b29544098fe2ef59a5cd4fbd8304caeca97616
+MISC ChangeLog 27125 RMD160 482a64345f57bb3502694c01fac22169250e28e8 SHA1 c46eb775de48ab7f061052cc839b76baca42069b SHA256 26e2d7922e26846a2aa946d39c60c5d99cc88ebd2b9c7c28caeb7b04ba25f516
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3KpK4ACgkQaC/OocHi7Jb61gEAl3tBuCANePCnrK++B/vGh2R5
-t1nzTjNyPHFZxncOzkoA/2hiSnFEgYi4375PvlVUTBKy6Jy702d1ArWuXWDVh6TS
-=BbVI
+iF4EAREIAAYFAk4TfUoACgkQaC/OocHi7JbKMgD+Kso/HSiT89OlQOa6btyZmBOr
+vby7FFNXwGr5FxBAPhUA/31GzF/to2ZSCCgeKZD+reSvzBx8dDxeDbzIKE3ZZuQz
+=x22P
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/findutils-4.4.2-r1.ebuild b/sys-apps/findutils/findutils-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..d84b9ebc0bdd
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.4.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.4.2-r1.ebuild,v 1.1 2011/07/05 21:08:17 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+SELINUX_PATCH="findutils-4.4.2-selinux.diff"
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="http://www.gnu.org/software/findutils/"
+SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls selinux static"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+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
+
+	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	local myconf
+	use userland_GNU || myconf=" --program-prefix=g"
+
+	econf \
+		$(use_enable nls) \
+		--libexecdir=/usr/$(get_libdir)/find \
+		${myconf} \
+		|| die "configure failed"
+	emake AR="$(tc-getAR)" || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc NEWS README TODO ChangeLog
+}
diff --git a/sys-apps/findutils/findutils-4.5.10-r1.ebuild b/sys-apps/findutils/findutils-4.5.10-r1.ebuild
new file mode 100644
index 000000000000..b8706f9d2200
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.5.10-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.10-r1.ebuild,v 1.1 2011/07/05 21:08:17 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="http://www.gnu.org/software/findutils/"
+SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
+#	mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls selinux static"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+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
+}
+
+src_compile() {
+	use static && append-ldflags -static
+
+	local myconf
+	use userland_GNU || myconf=" --program-prefix=g"
+
+	econf \
+		$(use_enable nls) \
+		--libexecdir=/usr/$(get_libdir)/find \
+		${myconf} \
+		|| die "configure failed"
+	emake AR="$(tc-getAR)" || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc NEWS README TODO ChangeLog
+}