fix parallel build, bug #422683

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

4 files changed, 35 insertions, 13 deletions

diff --git a/dev-ml/odns/ChangeLog b/dev-ml/odns/ChangeLog
index 3484347faa5b..9e96be4ff562 100644
--- a/dev-ml/odns/ChangeLog
+++ b/dev-ml/odns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/odns
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/odns/ChangeLog,v 1.3 2011/07/06 18:34:50 aballier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/odns/ChangeLog,v 1.4 2012/07/04 21:38:25 aballier Exp $
+
+  04 Jul 2012; Alexis Ballier <aballier@gentoo.org> odns-0.3.ebuild,
+  +files/odns-0.3-parmake.patch:
+  fix parallel build, bug #422683
 
   06 Jul 2011; Alexis Ballier <aballier@gentoo.org> -odns-0.2.ebuild:
   remove old
diff --git a/dev-ml/odns/Manifest b/dev-ml/odns/Manifest
index bba4d2c8ac3b..458983bc1875 100644
--- a/dev-ml/odns/Manifest
+++ b/dev-ml/odns/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST odns-0.3.tar.gz 57616 RMD160 37b62f3414ae61b0db950674abff541d0f824a8c SHA1 de0a87a33233817b5a4ad9f69bfa9b7389f9dd64 SHA256 368bfbfe240de99f705e162c4382ff51969ff0f69d2c8315f52b813f919f148f
-EBUILD odns-0.3.ebuild 689 RMD160 6ba3eed253650b2e725d257d6b95e4accb63b7d6 SHA1 56bca93fd2005596d6ddc7d3b02ca84f91c995a0 SHA256 5c22f9faed482137cbf594b8d33d8a042301d874c82d051600ec8e2df49f1dca
-MISC ChangeLog 536 RMD160 e3a6f9533be10c9c5aed6df553e5ef0439ae6411 SHA1 8a309b05d8642aa8c97b64fe897e5bd5f8fe1c0d SHA256 b2341ed1d12972e0961cd100aef35dacd9958c2a82cdb04da6a8d484bcfdc43a
-MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+AUX odns-0.3-parmake.patch 631 SHA256 b6f62f6ebf44d261e2d2523197dbdbb627bb79bf4a2d051ff30bd32802a8a4aa SHA512 e831d5fc0a310680ed75205b5d08fde65f679fa54791798eca528ccfa245b68f7b2afb320ee70716430fae0cd6d36340d480506cd8cf70b7c53bf067e63cb0b8 WHIRLPOOL 60a8a8db4b9401fe853f616888d5b99a0b32809a6cc3f66edea718cd574fa3128b2332c052cefb95a556647adfc2d000a59f7d51f0a83c9fc3e59acc750167e1
+DIST odns-0.3.tar.gz 57616 SHA256 368bfbfe240de99f705e162c4382ff51969ff0f69d2c8315f52b813f919f148f SHA512 6d40d7fc882185500aaa58582112abd57faf72ee0a57fabc211ad4bf39739b39cb956e6cb109808e05d767560a942c3300e9ec0e6b28c13cec2a2b4dd0c3bf5d WHIRLPOOL 911f92169ceeb0e35af37585ce2e48e28f12b371784c156c741a3d66fe7d30bf8620bc76d9dce0948c73ec666ccea934a7a91e7cef88e1e9beacaf39f941a6e5
+EBUILD odns-0.3.ebuild 737 SHA256 4285daddc09fe7db21e3c8af8e7a98baed664aa797bc48e8592dc7307c7db448 SHA512 3d498349fdf53ce03fcd50d05c7dcdb6a2776861fb6e1a198c9fa28ccd106edab554173b50ef39d09502db84f63f7d28097ac83a5b075247c18160a7d6ec8dcf WHIRLPOOL c79e04612c95799aa473815c4a69035ad5af3c108b999bc4f149281a90f138e0d84b6f0f8398d903055fbeb211c6010a836ddd99353c05115715f7bbd6042bef
+MISC ChangeLog 673 SHA256 507f75b55070e65f5f8a527fa1f66320263ab077f85139bb51d49cac6e152905 SHA512 884574bc4116464bea0eb3c42eb8c5a70782204cdd1a825fc25169fecb0c0bd2f676f9146ff9bf3f1bb6cf76efce36486193909476a7cf430d359cdca7638e96 WHIRLPOOL da8cf39d46c46b098b547f82582745638c039a53d8d8d38961e804cafa1a8028d24eb39082f1d2b3b66da49fedd49179c8efd1aa34da4d1091e9094f7ecb9694
+MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk4UqtAACgkQvFcC4BYPU0ot8ACfaM69iKVgRbMK0HWordd4XbZb
-DhkAnjz1zKAnDlM8e8QWbtCDxrJh6pw7
-=GRyB
+iEYEARECAAYFAk/0t9YACgkQvFcC4BYPU0rVpwCeIGXQFrvpapk+j6A9AT7EQ0a3
+khUAoIkS9etwkNzocv7A2EGz7/WNb8Qw
+=EG5n
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/odns/files/odns-0.3-parmake.patch b/dev-ml/odns/files/odns-0.3-parmake.patch
new file mode 100644
index 000000000000..7034abd25cf2
--- /dev/null
+++ b/dev-ml/odns/files/odns-0.3-parmake.patch
@@ -0,0 +1,16 @@
+fix parallel make
+https://bugs.gentoo.org/show_bug.cgi?id=422683
+
+Index: odns-0.3/OCamlMakefile
+===================================================================
+--- odns-0.3.orig/OCamlMakefile
++++ odns-0.3/OCamlMakefile
+@@ -1152,7 +1152,7 @@ $(BCDIDIR)/%.di $(NCDIDIR)/%.di:	%.mli
+ $(DOC_DIR)/$(RESULT)/html:
+ 	mkdir -p $@
+ 
+-$(DOC_DIR)/$(RESULT)/html/index.html: $(DOC_DIR)/$(RESULT)/html $(DOC_FILES)
++$(DOC_DIR)/$(RESULT)/html/index.html: $(DOC_DIR)/$(RESULT)/html $(DOC_FILES) byte-code-library
+ 	rm -rf $</*
+ 	$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $(FIRST_DOC_FILE)`; \
+ 	if [ -z "$$pp" ]; then \
diff --git a/dev-ml/odns/odns-0.3.ebuild b/dev-ml/odns/odns-0.3.ebuild
index d6fdbfb7db43..061b735aa786 100644
--- a/dev-ml/odns/odns-0.3.ebuild
+++ b/dev-ml/odns/odns-0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/odns/odns-0.3.ebuild,v 1.1 2011/03/04 12:33:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/odns/odns-0.3.ebuild,v 1.2 2012/07/04 21:38:25 aballier Exp $
 
 EAPI=3
 
-inherit findlib
+inherit findlib eutils
 
 DESCRIPTION="OCaml library to query DNS servers"
 HOMEPAGE="http://odns.tuxfamily.org/"
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -i -e "s/version=\"0.2\"/version=\"${PV}\"/" META || die
+	epatch "${FILESDIR}/${P}-parmake.patch"
 }
 
 src_install() {