Fix usage of bindnow-flags to actually be used, fix install phase (needs to be serialized, not parallel), and fix glitch in destdir patch for install-info.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 32 insertions, 21 deletions

diff --git a/app-misc/fdutils/ChangeLog b/app-misc/fdutils/ChangeLog
index f6558a8a8edc..19021dd1ce75 100644
--- a/app-misc/fdutils/ChangeLog
+++ b/app-misc/fdutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/fdutils
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/ChangeLog,v 1.17 2005/12/25 14:47:43 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/ChangeLog,v 1.18 2006/04/02 23:06:42 robbat2 Exp $
+
+  02 Apr 2006; Robin H. Johnson <robbat2@gentoo.org>
+  files/fdutils-5.5-destdirfix.patch, fdutils-5.5.ebuild:
+  Fix usage of bindnow-flags to actually be used, fix install phase (needs to
+  be serialized, not parallel), and fix glitch in destdir patch for
+  install-info.
 
   25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> fdutils-5.5.ebuild:
   Use bindnow-flags function instead of -Wl,-z,now.
diff --git a/app-misc/fdutils/Manifest b/app-misc/fdutils/Manifest
index 81895330e69f..74607fa56edf 100644
--- a/app-misc/fdutils/Manifest
+++ b/app-misc/fdutils/Manifest
@@ -1,17 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f1dc2e162d70f5b00f207cce69bf2440 ChangeLog 2238
+MD5 6154dc8204b2c0828e4c9f6b50a155fc ChangeLog 2510
+RMD160 e5f059d8582a0776278f96ead57ecf6bf3e59a5c ChangeLog 2510
+SHA256 16fd6991d88a7eb5df83acdde7196f14521615d25541f03b3df1d12f8409a00a ChangeLog 2510
 MD5 fb33c6e876bc1cb641bb18e97263194b fdutils-5.4.20020222-r1.ebuild 1061
-MD5 a6d8fa01aaa0b53d917e3f289a5d4cc8 fdutils-5.5.ebuild 969
+RMD160 2d0a13a20ef4a747c83810435e2146e18648218d fdutils-5.4.20020222-r1.ebuild 1061
+SHA256 65f5d37cccb993d01fb10e46365d6e64d9470574e57771cd0426ccea7cd97154 fdutils-5.4.20020222-r1.ebuild 1061
+MD5 0e656872d97dc252ffdb968ee1f071f3 fdutils-5.5.ebuild 1007
+RMD160 6587b704fc1243fc1d96b312ba967df1f03fd9db fdutils-5.5.ebuild 1007
+SHA256 244349304a1ef4b2e4e50f67a4945d76b081298c692d85a7cac83cf59d7c7d34 fdutils-5.5.ebuild 1007
 MD5 c2ef222aaad9496533b756688db40543 files/digest-fdutils-5.4.20020222-r1 135
+RMD160 2adc58a9f18cdb05b12b76c4de4e974ee4c14720 files/digest-fdutils-5.4.20020222-r1 135
+SHA256 6980d8ae25f6ee6f445a6b067ba8ce1882618e122b5049bbcdedb70817ef5681 files/digest-fdutils-5.4.20020222-r1 135
 MD5 5c3161c351b422855e48edafa8b3848b files/digest-fdutils-5.5 63
-MD5 21695579553826eb26a0bb04c353aafb files/fdutils-5.5-destdirfix.patch 5679
+RMD160 12c60f42880b5ed8ffcff7a677a8290b27d66e4c files/digest-fdutils-5.5 63
+SHA256 2ecaa2463e8c0f368932dfa0e0f5c6475d7d3f2b37491341876f17616ef83410 files/digest-fdutils-5.5 63
+MD5 d9026ade4ac300a430ec8810078220c0 files/fdutils-5.5-destdirfix.patch 5699
+RMD160 dc6552f60672abfa645367b772d78581a89e151b files/fdutils-5.5-destdirfix.patch 5699
+SHA256 a2d2961738840aba6ec1b298da177bd4f474faa0b8ce01da6bf884d133ca68ee files/fdutils-5.5-destdirfix.patch 5699
 MD5 9ff6a26897281b34d5e67b3f80ab60f2 files/fdutils-no-fd.4-manpage.diff 434
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDrrEcAiZjviIA2XgRAgsEAKDf5SJ51yzRSDYTdyy/YrN/vG2WLQCg8pWf
-6Y++uL7ZAYvD6BxTZTeJgmk=
-=gPJ0
------END PGP SIGNATURE-----
+RMD160 e2b69c348e1c134324d06cc0eb234d3ef4afb669 files/fdutils-no-fd.4-manpage.diff 434
+SHA256 3436f0c8b8b52b3f418696cb19cd95027f016260a85ed8cb95691b33d802c075 files/fdutils-no-fd.4-manpage.diff 434
diff --git a/app-misc/fdutils/fdutils-5.5.ebuild b/app-misc/fdutils/fdutils-5.5.ebuild
index 3bc176b3d9b1..566b31c00328 100644
--- a/app-misc/fdutils/fdutils-5.5.ebuild
+++ b/app-misc/fdutils/fdutils-5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.5.ebuild,v 1.4 2005/12/25 14:47:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdutils/fdutils-5.5.ebuild,v 1.5 2006/04/02 23:06:42 robbat2 Exp $
 
 inherit eutils flag-o-matic
 
@@ -25,8 +25,8 @@ src_unpack() {
 }
 
 src_compile() {
+	append-ldflags $(bindnow-flags)
 	econf --enable-fdmount-floppy-only || die
-	append-cflags $(bindnow-flags)
 
 	if use doc;
 	then
@@ -38,5 +38,6 @@ src_compile() {
 
 src_install() {
 	dodoc Changelog
-	emake DESTDIR=${D} install || die
+	use doc && dodir /usr/share/info/
+	emake -j1 DESTDIR=${D} install || die
 }
diff --git a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
index 1e65c890aff9..47d1918b1f42 100644
--- a/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
+++ b/app-misc/fdutils/files/fdutils-5.5-destdirfix.patch
@@ -20,11 +20,11 @@
  	if [ -n "$(INSTALL_INFO)" ] ; then \
  		if [ -f $(infodir)/dir.info ] ; then \
 -			$(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir.info; \
-+			$(INSTALL_INFO) $(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \
++			$(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \
  		fi; \
  		if [ -f $(infodir)/dir ] ; then \
 -			$(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir; \
-+			$(INSTALL_INFO) $(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \
++			$(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \
  		fi; \
  	fi