Add in *bsd things, bug #92588. Change to not use einstall.

Package-Manager: portage-2.0.51.21-r1 goat on a rope edition

3 files changed, 26 insertions, 10 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 393e4723b50f..e477cb649b93 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.42 2005/03/17 23:10:06 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.43 2005/05/14 20:35:15 ciaranm Exp $
+
+  14 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> findutils-4.2.20.ebuild:
+  Add in *bsd things, bug #92588. Change to not use einstall.
 
 *findutils-4.2.20 (17 Mar 2005)
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 3c6c3dfe1e35..7c8c780ce355 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,13 +1,23 @@
-MD5 6a7c2a546e6e616bdf3ddd5eb2b21dc9 ChangeLog 6349
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9e0e4971b96c75afd908eaa3dbfaa0c4 ChangeLog 6489
 MD5 3f4b41cc2feb37166ed7b75ea6d44f10 findutils-4.1.20-r1.ebuild 2066
-MD5 1f7197b778d47c773d19430261c84f49 metadata.xml 261
 MD5 e63b61d5721b385b5ebde50fa9a285d3 findutils-4.2.18.ebuild 2087
-MD5 148ca64c3e413a187abdd968e71eede3 findutils-4.2.20.ebuild 1700
-MD5 43e3e3c15b66b30de4be62db3b7674ea files/findutils-4.1.20-selinux.diff 10392
+MD5 1f7197b778d47c773d19430261c84f49 metadata.xml 261
+MD5 51ce0b2117b3cde26bb04ddb04fad8de findutils-4.2.20.ebuild 1807
 MD5 be3f6e925d8c5774cc1ea631677e7401 files/digest-findutils-4.1.20-r1 68
-MD5 0315b5033cf65d15f24b1c252070db45 files/findutils-env-size.patch 672
 MD5 f983b276be2d73937687b61be2bc917d files/digest-findutils-4.2.18 68
+MD5 64a3abde0e9e5c1c5d464d0d5c9776ad files/digest-findutils-4.2.20 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 64a3abde0e9e5c1c5d464d0d5c9776ad files/digest-findutils-4.2.20 69
 MD5 ed25af7dabe43ac10d2383db9bf30ba5 files/findutils-4.2.20-selinux.diff 14398
+MD5 0315b5033cf65d15f24b1c252070db45 files/findutils-env-size.patch 672
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFChmEXLLFUmVNQ7rkRAnWOAJsGTtePWduaxg/uoGp8BHIvxB0LlwCfSYOd
+Gc8D2TssLXn2HuMrlhUkvUo=
+=5m4m
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/findutils/findutils-4.2.20.ebuild b/sys-apps/findutils/findutils-4.2.20.ebuild
index 2898d19ed79e..b7fe189a738d 100644
--- a/sys-apps/findutils/findutils-4.2.20.ebuild
+++ b/sys-apps/findutils/findutils-4.2.20.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/03/18 01:38:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.20.ebuild,v 1.3 2005/05/14 20:35:15 ciaranm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -42,12 +42,15 @@ src_compile() {
 	export CPPFLAGS="${CXXFLAGS}"
 	use static && append-ldflags -static
 
-	econf $(use_enable nls) || die
+	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() {
-	einstall libexecdir=${D}/usr/lib/find || die
+	make DESTDIR="${D}" libexecdir=${D}/usr/lib/find install || die
 	prepallman
 
 	rm -rf ${D}/usr/var