Fix parallel build/install.

Package-Manager: portage-2.1.3_rc6

4 files changed, 76 insertions, 13 deletions

diff --git a/sys-apps/renameutils/ChangeLog b/sys-apps/renameutils/ChangeLog
index 16c98ef68082..3c5093e190ef 100644
--- a/sys-apps/renameutils/ChangeLog
+++ b/sys-apps/renameutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/renameutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/ChangeLog,v 1.5 2007/05/15 14:19:07 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/ChangeLog,v 1.6 2007/07/08 04:46:31 vapier Exp $
+
+  08 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/renameutils-0.8.1-build.patch, renameutils-0.8.1.ebuild:
+  Fix parallel build/install.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/sys-apps/renameutils/Manifest b/sys-apps/renameutils/Manifest
index 39ad036d266e..128d6e853283 100644
--- a/sys-apps/renameutils/Manifest
+++ b/sys-apps/renameutils/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX renameutils-0.8.1-build.patch 1832 RMD160 3878d358202f48d964f6b9517fb77aa3d306e417 SHA1 f2ff35b5719cd21426b5eaa7224a2daae91b73fc SHA256 b02e50e74c6c839e39bf689e815c7cd63783ca1ccc2a0c53f6a0647643f77a7a
+MD5 92d163625df959cac78ef3c9c73372dd files/renameutils-0.8.1-build.patch 1832
+RMD160 3878d358202f48d964f6b9517fb77aa3d306e417 files/renameutils-0.8.1-build.patch 1832
+SHA256 b02e50e74c6c839e39bf689e815c7cd63783ca1ccc2a0c53f6a0647643f77a7a files/renameutils-0.8.1-build.patch 1832
 DIST renameutils-0.8.1.tar.gz 445694 RMD160 8c600fe3c876f4fd000f22f294b5fcbbef495bc9 SHA1 951d14d46a9aa51475870837f916de285a8b8c1b SHA256 da28793e3f0c34e730ee1b09aba048250d7c6f54bdbf86e53655ec5250964562
-EBUILD renameutils-0.8.1.ebuild 701 RMD160 f29ae9d498abbd8336e23f9d319549ab6835836e SHA1 18bff79fb5462b71b69c6f9c9d8847e1f50a3e0d SHA256 da75067aee7a20c904375ba6c272cb3db2701925801d0c00ef432feed6b2af58
-MD5 046fcf70cc92eaf99e97f55a3c0beff0 renameutils-0.8.1.ebuild 701
-RMD160 f29ae9d498abbd8336e23f9d319549ab6835836e renameutils-0.8.1.ebuild 701
-SHA256 da75067aee7a20c904375ba6c272cb3db2701925801d0c00ef432feed6b2af58 renameutils-0.8.1.ebuild 701
-MISC ChangeLog 790 RMD160 ca182860e29ea5d20056b365faeb8832de2555c4 SHA1 9cd7b93bb597ba7b6c9dff849f096fedb6aa65fe SHA256 4da4283a4a93f5b8c4e1032c2c26ca90e3ca4498d70753049f99720e3f928e81
-MD5 b25b7e98bce647a86bf4d09b3673865c ChangeLog 790
-RMD160 ca182860e29ea5d20056b365faeb8832de2555c4 ChangeLog 790
-SHA256 4da4283a4a93f5b8c4e1032c2c26ca90e3ca4498d70753049f99720e3f928e81 ChangeLog 790
+EBUILD renameutils-0.8.1.ebuild 835 RMD160 f070c67a7da091f1ececa79f8b93eb60d57f86dc SHA1 fa851883f5c0698af131dbe03ee301ef83220c9f SHA256 51b8ff12d87a114186706643d226fcd8f9ff0fffadd0216cfec64a7f446bf86c
+MD5 111444c1b512787234c86ad41cde4f18 renameutils-0.8.1.ebuild 835
+RMD160 f070c67a7da091f1ececa79f8b93eb60d57f86dc renameutils-0.8.1.ebuild 835
+SHA256 51b8ff12d87a114186706643d226fcd8f9ff0fffadd0216cfec64a7f446bf86c renameutils-0.8.1.ebuild 835
+MISC ChangeLog 936 RMD160 7da5672fdb13f48d6aef8a8dd6fac0fc55d6e004 SHA1 c20d3d1ca1d8b3d1384d545fc37e546df05480df SHA256 2555bd243321acb091c7f1ca4fd61bdbf043660efbcb40345f223232dc059410
+MD5 af488f20f4416ea9dfecf1e3f3aedcce ChangeLog 936
+RMD160 7da5672fdb13f48d6aef8a8dd6fac0fc55d6e004 ChangeLog 936
+SHA256 2555bd243321acb091c7f1ca4fd61bdbf043660efbcb40345f223232dc059410 ChangeLog 936
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -20,7 +24,7 @@ SHA256 7b331add33a7e4acc76e5bc5201c1337e1bcbf476c877fb56abcb169e94bf55b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGjxukp/wUKkr7RBoRAqlmAJ9n3Ks97ayESJRQ6gHs83Rk6M/PswCdF+RT
-tKerecIyLtm6DR1SmcI4YHM=
-=zAaD
+iD8DBQFGkGy+p/wUKkr7RBoRAlHnAJ44BY3uGcaeKwM4WLzwIxLHKgrxiQCgv2/G
+a14CpFiU8Hs/HY4pNddppfI=
+=rzm+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/renameutils/files/renameutils-0.8.1-build.patch b/sys-apps/renameutils/files/renameutils-0.8.1-build.patch
new file mode 100644
index 000000000000..03271014030a
--- /dev/null
+++ b/sys-apps/renameutils/files/renameutils-0.8.1-build.patch
@@ -0,0 +1,46 @@
+--- configure.ac
++++ configure.ac
+@@ -7,6 +7,7 @@
+ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADER([config.h])
+ AC_GNU_SOURCE
++AC_SYS_LARGEFILE
+ AC_DEFINE_DIR(LOCALEDIR, datadir/locale, [Directory where gettext translations are kept.])
+ 
+ # Checks for programs.
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -40,21 +40,23 @@
+   ../lib/libgnu.a
+ 
+ all-local:
+-	@[ -f qmv ] || (echo $(LN_S) qcmd qmv ; $(LN_S) qcmd qmv)
+-	@[ -f qcp ] || (echo $(LN_S) qcmd qcp ; $(LN_S) qcmd qcp)
+-	@[ -f imv ] || (echo $(LN_S) icmd imv ; $(LN_S) icmd imv)
+-	@[ -f icp ] || (echo $(LN_S) icmd icp ; $(LN_S) icmd icp)
++	$(LN_S) -f qcmd qmv
++	$(LN_S) -f qcmd qcp
++	$(LN_S) -f icmd imv
++	$(LN_S) -f icmd icp
+ 
+ install-exec-local:
+-	@[ -f $(bindir)/qmv ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qmv)
+-	@[ -f $(bindir)/qcp ] || (echo $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp ; $(LN_S) qcmd $(DESTDIR)$(bindir)/qcp)
+-	@[ -f $(bindir)/imv ] || (echo $(LN_S) icmd $(DESTDIR)$(bindir)/imv ; $(LN_S) icmd $(DESTDIR)$(bindir)/imv)
+-	@[ -f $(bindir)/icp ] || (echo $(LN_S) icmd $(DESTDIR)$(bindir)/icp ; $(LN_S) icmd $(DESTDIR)$(bindir)/icp)
++	$(MKDIR_P) $(DESTDIR)$(bindir)
++	$(LN_S) -f qcmd $(DESTDIR)$(bindir)/qmv
++	$(LN_S) -f qcmd $(DESTDIR)$(bindir)/qcp
++	$(LN_S) -f icmd $(DESTDIR)$(bindir)/imv
++	$(LN_S) -f icmd $(DESTDIR)$(bindir)/icp
+ 
+ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(man1dir)
+-	@[ -f $(man1dir)/qmv.1 ] || (echo $(LN_S) qcmd.1 $(DESTDIR)$(man1dir)/qmv.1 ; $(LN_S) qcmd.1 $(DESTDIR)$(man1dir)/qmv.1)
+-	@[ -f $(man1dir)/qcp.1 ] || (echo $(LN_S) qcmd.1 $(DESTDIR)$(man1dir)/qcp.1 ; $(LN_S) qcmd.1 $(DESTDIR)$(man1dir)/qcp.1)
++	$(MKDIR_P) $(DESTDIR)$(man1dir)
++	$(LN_S) -f qcmd.1 $(DESTDIR)$(man1dir)/qmv.1
++	$(LN_S) -f qcmd.1 $(DESTDIR)$(man1dir)/qcp.1
+ 
+ clean-local:
+ 	rm -f qmv qcp imv icp qmv.1 qcp.1
diff --git a/sys-apps/renameutils/renameutils-0.8.1.ebuild b/sys-apps/renameutils/renameutils-0.8.1.ebuild
index 9a83e4b2fd36..a32a42752c78 100644
--- a/sys-apps/renameutils/renameutils-0.8.1.ebuild
+++ b/sys-apps/renameutils/renameutils-0.8.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/renameutils-0.8.1.ebuild,v 1.2 2007/07/07 04:48:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/renameutils/renameutils-0.8.1.ebuild,v 1.3 2007/07/08 04:46:31 vapier Exp $
+
+inherit eutils autotools
 
 DESCRIPTION="Use your favorite text editor to rename files"
 HOMEPAGE="http://www.nongnu.org/renameutils/"
@@ -13,6 +15,13 @@ IUSE="nls"
 
 DEPEND=">=sys-libs/readline-5.0-r2"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
 src_compile() {
 	econf $(use_enable nls) || die
 	emake || die "emake failed"