Bug #136373 - parallel compile fixes.

Package-Manager: portage-2.1

5 files changed, 106 insertions, 15 deletions

diff --git a/sys-fs/xfsdump/ChangeLog b/sys-fs/xfsdump/ChangeLog
index cbfe78a25598..847392080db0 100644
--- a/sys-fs/xfsdump/ChangeLog
+++ b/sys-fs/xfsdump/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/xfsdump
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.31 2006/06/07 17:31:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/ChangeLog,v 1.32 2006/06/11 12:19:57 robbat2 Exp $
+
+*xfsdump-2.2.33-r1 (11 Jun 2006)
+
+  11 Jun 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/xfsdump-2.2.33-Makefile-deps.patch, +xfsdump-2.2.33-r1.ebuild:
+  Bug #136373 - parallel compile fixes.
 
   07 Jun 2006; Mike Frysinger <vapier@gentoo.org>
   +files/xfsdump-2.2.33-no-compress-docs.patch, xfsdump-2.2.33.ebuild:
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 4c32e03d549b..815cefcd1761 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xfsdump-2.2.30-docs.patch 456 RMD160 a25f0aefc53da10aeb51411be1433d44316d4b11 SHA1 f6218843faf5532e900dcb4382162cae1a3e576c SHA256 63b668ce7a01d5b7902dc39a379cfc5a67cefe5f35a2005d5e1d503c6d0d5f9f
 MD5 e6c3a4b8814bbbc2914e1a7c105d9de0 files/xfsdump-2.2.30-docs.patch 456
 RMD160 a25f0aefc53da10aeb51411be1433d44316d4b11 files/xfsdump-2.2.30-docs.patch 456
@@ -9,6 +6,10 @@ AUX xfsdump-2.2.33-LDFLAGS.patch 611 RMD160 92927ece6c525908542c4a97a4cbb75c3daf
 MD5 fd221ded991b5761c2d69503d90a0d3f files/xfsdump-2.2.33-LDFLAGS.patch 611
 RMD160 92927ece6c525908542c4a97a4cbb75c3daf54fe files/xfsdump-2.2.33-LDFLAGS.patch 611
 SHA256 82989176be09cec7fb1af9843f3d5936a78512910bc1d2d1fdbcdda3a910ad1b files/xfsdump-2.2.33-LDFLAGS.patch 611
+AUX xfsdump-2.2.33-Makefile-deps.patch 1051 RMD160 92b970a32ef6f17397968db33bef4f09c6ad8fe5 SHA1 9faa313352e5bedfa9b9416ed2fa0edc49095dda SHA256 eb1a2e156fa5385a4429bdbe5caa9e50d40a19af545767ea2b92c95570481882
+MD5 62ead6c6fcabf8057d7c848d03df1c56 files/xfsdump-2.2.33-Makefile-deps.patch 1051
+RMD160 92b970a32ef6f17397968db33bef4f09c6ad8fe5 files/xfsdump-2.2.33-Makefile-deps.patch 1051
+SHA256 eb1a2e156fa5385a4429bdbe5caa9e50d40a19af545767ea2b92c95570481882 files/xfsdump-2.2.33-Makefile-deps.patch 1051
 AUX xfsdump-2.2.33-no-compress-docs.patch 487 RMD160 b77c339a3e376a7d3885dd80e131cd31ec63eb14 SHA1 74f94c41cb0976f331a495417df5490153184a96 SHA256 862485ec275e656a75761d9da9806d4b91db5f94f212724cfd9476d2504bafa7
 MD5 3cf7f941e0b89b8e41ff47ca16cd18f8 files/xfsdump-2.2.33-no-compress-docs.patch 487
 RMD160 b77c339a3e376a7d3885dd80e131cd31ec63eb14 files/xfsdump-2.2.33-no-compress-docs.patch 487
@@ -19,14 +20,18 @@ EBUILD xfsdump-2.2.30.ebuild 1128 RMD160 3c89f50e8280d0c58f4663387f474563314124e
 MD5 ef7e14f3371496dea815fed451dfe304 xfsdump-2.2.30.ebuild 1128
 RMD160 3c89f50e8280d0c58f4663387f474563314124ef xfsdump-2.2.30.ebuild 1128
 SHA256 b34188d3d11afc2b4538bfefaca230f9c31ef1b591708acd5f26322adc1ff7af xfsdump-2.2.30.ebuild 1128
+EBUILD xfsdump-2.2.33-r1.ebuild 1282 RMD160 756dbb9dd4e5d1fc0f997e7b3e3b497e89ec2191 SHA1 ddc76767b34aefa31ad92935e3380c68c332d314 SHA256 b7be3d45b27751e79a77972d7ce7943aac6f86d951cb4ae6ef9b8cd5adfa9ace
+MD5 114bdcb703ff506ae0ee36c0d85f2689 xfsdump-2.2.33-r1.ebuild 1282
+RMD160 756dbb9dd4e5d1fc0f997e7b3e3b497e89ec2191 xfsdump-2.2.33-r1.ebuild 1282
+SHA256 b7be3d45b27751e79a77972d7ce7943aac6f86d951cb4ae6ef9b8cd5adfa9ace xfsdump-2.2.33-r1.ebuild 1282
 EBUILD xfsdump-2.2.33.ebuild 1101 RMD160 eee2d531f2d7d2358ddc1edf628f8104abe43372 SHA1 b0a45975140b4d42785cd7f84e6322fcea21140f SHA256 3fa60034e6314d9d5a072f69d202b2c1efb56e01521501d0524035e15f473f18
 MD5 f5d88c4161a4df396cc71555205bc086 xfsdump-2.2.33.ebuild 1101
 RMD160 eee2d531f2d7d2358ddc1edf628f8104abe43372 xfsdump-2.2.33.ebuild 1101
 SHA256 3fa60034e6314d9d5a072f69d202b2c1efb56e01521501d0524035e15f473f18 xfsdump-2.2.33.ebuild 1101
-MISC ChangeLog 5782 RMD160 a21bd642cf97600f40b5c0c8c448a37826861fc8 SHA1 ae6e94e91e375ddfbee083f5f7f50c563e705213 SHA256 cfc5696ee4163b22fcb86077a9458fafc262a3b58b1847da0a9885f166e99731
-MD5 7e2a564f9bb3b7174fc7dd56208d56c3 ChangeLog 5782
-RMD160 a21bd642cf97600f40b5c0c8c448a37826861fc8 ChangeLog 5782
-SHA256 cfc5696ee4163b22fcb86077a9458fafc262a3b58b1847da0a9885f166e99731 ChangeLog 5782
+MISC ChangeLog 5983 RMD160 658a715c0fe95059645274b6931a648a47993006 SHA1 f4054862a29c8d528b18840f3c0e2b5f71dbb492 SHA256 d640d5782c983c5810064d7a0f332d9bacf6da1fcfb3fc49cd10eb293049367d
+MD5 df5e717e2efdf6835440263f493fb498 ChangeLog 5983
+RMD160 658a715c0fe95059645274b6931a648a47993006 ChangeLog 5983
+SHA256 d640d5782c983c5810064d7a0f332d9bacf6da1fcfb3fc49cd10eb293049367d ChangeLog 5983
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -37,10 +42,6 @@ SHA256 bb7f7bf95e54431fdaffa59b0fc1e57a4160e2494aa376c8c4a5b5bedcd0deb7 files/di
 MD5 068d73ba9154523893ed061b660c7aeb files/digest-xfsdump-2.2.33 256
 RMD160 07587d2927d4bc5482db1fcd42555bfaf6df5428 files/digest-xfsdump-2.2.33 256
 SHA256 8153642b7e366aa980fe26b34d0cf393541b07b401a00a78bfb8680e9c7a640e files/digest-xfsdump-2.2.33 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEhw542+ySkm8kpY0RAjj7AKCXuZSFBMNbzvJyxGwBNUs5SYTqQACgvtHM
-bERt93Nnq7d9Giiil4peWqc=
-=ir61
------END PGP SIGNATURE-----
+MD5 068d73ba9154523893ed061b660c7aeb files/digest-xfsdump-2.2.33-r1 256
+RMD160 07587d2927d4bc5482db1fcd42555bfaf6df5428 files/digest-xfsdump-2.2.33-r1 256
+SHA256 8153642b7e366aa980fe26b34d0cf393541b07b401a00a78bfb8680e9c7a640e files/digest-xfsdump-2.2.33-r1 256
diff --git a/sys-fs/xfsdump/files/digest-xfsdump-2.2.33-r1 b/sys-fs/xfsdump/files/digest-xfsdump-2.2.33-r1
new file mode 100644
index 000000000000..461b64880e81
--- /dev/null
+++ b/sys-fs/xfsdump/files/digest-xfsdump-2.2.33-r1
@@ -0,0 +1,3 @@
+MD5 d891a6f0215f4ad33840ddf60a295ec7 xfsdump-2.2.33.src.tar.gz 576941
+RMD160 d192bd114a07ea532ebc64d4474be4ce206ae51e xfsdump-2.2.33.src.tar.gz 576941
+SHA256 444ace415cacaf79b0329d53df9ed3949072adc8363b28ce1fa14892c7d5296d xfsdump-2.2.33.src.tar.gz 576941
diff --git a/sys-fs/xfsdump/files/xfsdump-2.2.33-Makefile-deps.patch b/sys-fs/xfsdump/files/xfsdump-2.2.33-Makefile-deps.patch
new file mode 100644
index 000000000000..ce5b2af53d02
--- /dev/null
+++ b/sys-fs/xfsdump/files/xfsdump-2.2.33-Makefile-deps.patch
@@ -0,0 +1,27 @@
+diff -Nuar --exclude '*~' xfsdump-2.2.33.orig/dump/Makefile xfsdump-2.2.33/dump/Makefile
+--- xfsdump-2.2.33.orig/dump/Makefile	2006-01-11 21:06:47.000000000 -0800
++++ xfsdump-2.2.33/dump/Makefile	2006-06-11 05:08:10.187705660 -0700
+@@ -106,3 +106,5 @@
+ 
+ $(INVINCL) $(INVCOMMON):
+ 	@$(RM) $@; $(LN_S) ../inventory/$@ $@
++
++$(LOCALS): $(LINKS)
+diff -Nuar --exclude '*~' xfsdump-2.2.33.orig/invutil/Makefile xfsdump-2.2.33/invutil/Makefile
+--- xfsdump-2.2.33.orig/invutil/Makefile	2006-01-11 21:06:48.000000000 -0800
++++ xfsdump-2.2.33/invutil/Makefile	2006-06-11 05:05:17.077263668 -0700
+@@ -70,3 +70,5 @@
+ 
+ $(INVINCL) $(INVCOMMON):
+ 	@$(RM) $@; $(LN_S) ../inventory/$@ $@
++
++$(LOCALS): $(LINKS)
+diff -Nuar --exclude '*~' xfsdump-2.2.33.orig/restore/Makefile xfsdump-2.2.33/restore/Makefile
+--- xfsdump-2.2.33.orig/restore/Makefile	2006-01-11 21:06:49.000000000 -0800
++++ xfsdump-2.2.33/restore/Makefile	2006-06-11 05:07:04.512296744 -0700
+@@ -116,3 +116,5 @@
+ 
+ $(INVINCL) $(INVCOMMON):
+ 	@$(RM) $@; $(LN_S) ../inventory/$@ $@
++
++$(LOCALS): $(LINKS)
diff --git a/sys-fs/xfsdump/xfsdump-2.2.33-r1.ebuild b/sys-fs/xfsdump/xfsdump-2.2.33-r1.ebuild
new file mode 100644
index 000000000000..282312ff21f4
--- /dev/null
+++ b/sys-fs/xfsdump/xfsdump-2.2.33-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-2.2.33-r1.ebuild,v 1.1 2006/06/11 12:19:57 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="xfs dump/restore utilities"
+HOMEPAGE="http://oss.sgi.com/projects/xfs"
+SRC_URI="ftp://oss.sgi.com/projects/xfs/download/cmd_tars/${P}.src.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc -sparc ~x86"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs
+	sys-fs/xfsprogs
+	sys-apps/dmapi
+	>=sys-apps/attr-2.4.19"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-compress-docs.patch
+	epatch "${FILESDIR}"/${P}-LDFLAGS.patch #126825
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:=.*:= /usr/share/doc/${PF}:" \
+		-e '/^GCFLAGS/s:-O1::' \
+		include/builddefs.in \
+		|| die
+	epatch "${FILESDIR}"/${P}-Makefile-deps.patch
+	for i in restore dump invutil ; do
+		sed -i.orig \
+			-e 's|@$(RM) $@; $(LN_S)|$(RM) $@; $(LN_S)|g' \
+			${S}/${i}/Makefile || die
+	done
+}
+
+src_compile() {
+	export OPTIMIZER="${CFLAGS}"
+	export DEBUG=-DNDEBUG
+
+	econf \
+		--libdir=/$(get_libdir) \
+		--libexecdir=/usr/$(get_libdir) \
+		--sbindir=/sbin \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make DIST_ROOT="${D}" install || die
+	prepalldocs
+}