Fix parallel install issue (bug #347055 by Teun).

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

6 files changed, 40 insertions, 17 deletions

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 9e6d925d52ae..99b41fa83918 100644
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/solfege
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.54 2010/11/28 08:39:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.55 2010/11/29 09:43:50 radhermit Exp $
+
+  29 Nov 2010; Tim Harder <radhermit@gentoo.org> solfege-3.16.4.ebuild,
+  +files/solfege-3.16.4-parallel-install.patch, solfege-3.18.7.ebuild,
+  solfege-3.19.1.ebuild:
+  Fix parallel install issue (bug #347055 by Teun).
 
 *solfege-3.19.1 (28 Nov 2010)
 
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 6e012cf6fe96..6217ab90e21a 100644
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -3,23 +3,24 @@ Hash: SHA1
 
 AUX solfege-3.16.4-ldflags.patch 696 RMD160 907642f0c495d7acabdf8e7c67e0f492e2d52088 SHA1 48356c2a887f560836a74d6f9af06eefb383e39a SHA256 fbc17b0be43883d8c64431633dd5c44a5692c59f44c8e91ae1e739bb07152ef3
 AUX solfege-3.16.4-makefile.patch 432 RMD160 0aed1132e855e40548abe6be5124aad034b7706c SHA1 7b1262d696a67142ea6d47887b60914e520f0a42 SHA256 6855d9fb1caf4544eaa8406197001948bfae4d8bdf707646b6b1fe5413bec898
+AUX solfege-3.16.4-parallel-install.patch 593 RMD160 e8dd96d3e9fd24868af6b0088aa9ed759a95d7d4 SHA1 bdf9e49f6052915175e000b81dc2e80fe1ed2243 SHA256 6bc1eb3335d922018d9cc18401f784d452fb0214c533e83400cee24d833dcdc5
 AUX solfege-3.16.4-swig2.patch 402 RMD160 5469d9c50fbfc62dc2e6c0fb38a09e5bbaf3d4c0 SHA1 e5bf05d26274835b776e9f8290a3892dc9a6d48d SHA256 537650558807b4c6a65e9fcf52f2550e5ee6b71c7b25af0855af38011f73615a
 DIST solfege-3.16.4.tar.gz 4827876 RMD160 2e186104aa0137c26cf5436d53a3af109e36d53c SHA1 34ca593971eb4ef4c79c8ba444ae10bc78f1de57 SHA256 10a0acddd8f41c638eea56478dcdbcb4c0d0a013dba9c2530d759173a7591463
 DIST solfege-3.18.7.tar.gz 5017655 RMD160 55d01aa84176bcca0526e2e1720117992a46b518 SHA1 9224c8f4a9e65a063d3f8dee2b3f3908117c4b01 SHA256 5efae213e4c5418ffc8679c2e284fdc03217f3329a3c68a44328904ce2bd9404
 DIST solfege-3.19.1.tar.gz 5037643 RMD160 405ed6347af31845e3681fdc9abeda84e4918cd4 SHA1 439b58ace9e0a378d9b98b88bf1f2216ae3dd1e5 SHA256 760940096c77504c7dd244ea8ae01cd73f42d509a776f9f4643df2caeba4a057
-EBUILD solfege-3.16.4.ebuild 1457 RMD160 f083d1cd6623b99339f8e4672e56699f97dd60f9 SHA1 8d9bef4fb7a05df974e72161c9801673e2210388 SHA256 8bda2c0dcbb1e49528d4817576593ee7956c4ae80b37aebd82ac92567f8b30c6
-EBUILD solfege-3.18.7.ebuild 1333 RMD160 1c8ca748be0fa048a916fb1b2138da50d529fc24 SHA1 43846c11522836cba83d407f218ee70c27b45496 SHA256 b07a796daad36b587325d5e7aa05668027d7adfd5de32116ed195162b998a933
-EBUILD solfege-3.19.1.ebuild 1309 RMD160 881f982938c50ba89187105b3f25dbc0e976d782 SHA1 d8c44e5e047fd43ca2dfe3085e774f8e5a2b6f6a SHA256 a792ba5b6911e085a992e2b34a650b6cae8795cf3835a871107ac1ce05602268
-MISC ChangeLog 8186 RMD160 eec9d4dd10f5e42368fb1f2e8d1504cd0d731081 SHA1 19b3c061d14347ba40f1f3ba709ca0b6bcf0800d SHA256 7abb6b7e19504b8bb27dbee25fd400392d588c814e35e515a933da6bab766852
+EBUILD solfege-3.16.4.ebuild 1510 RMD160 a99e7ece1fc8bb0dab0f9568c8777de178a124ed SHA1 191fb4ecdd4cb7573f2758ec2d958215a1b853c3 SHA256 da95214317d9891f77b78c481fe4b25f2553ff5964a07f6a02712e8acc8e7e53
+EBUILD solfege-3.18.7.ebuild 1399 RMD160 055e15e12cb2b7a4994509512cd4bee1783152ae SHA1 7ba3ddae1c83d7bd57e0176464a6139279c01c83 SHA256 873b22ca600b3d364f31a28ae249b67a60994ccbd1d261bb65e9f44a546392e1
+EBUILD solfege-3.19.1.ebuild 1375 RMD160 ebeb710de675708a5055bacde38f555e4ed19972 SHA1 43788caca26d46a656dd1d48a6cbf8459b4efa50 SHA256 3ae9529c8195f00ca053f1fcb8ac2c8460485942d9cc8abd861947d4d27f3b9d
+MISC ChangeLog 8407 RMD160 348561a1f301eb90564bd5419e8996f7184ee040 SHA1 df63cf7ef75d92574b1fa3235210211643dd727f SHA256 d828dc909045c902822122e99cb51ce7fa8f762acdade2f332fa93d61c6a48c9
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJM8hUvAAoJEEqz6FtPBkyjq54H/idEi6/4GQhkQUNwvrnEvxwK
-Q6jRIvscOmw4PTHcdNGSNVGIftVnQaWKYvzeEIsCAq3taNV99C0RAyWH4pkYJH5G
-AKL3dKpqRuzTZrw49BpO4qqzahNY3ardbKmneyFOkiWbIY7fn1H0v02gpPOcTLIy
-ZKKPy63y5MCQ6hI8qz6XxEIhxhVrBnEFfxUqyMrL4JpolZ49HY/yazq851t7SQcj
-dGadsu1zzGIWdoBE1TXnV2dFD4E7428ffEignr6K/VGeA83sg/mQnJ9O4h5Vf0Q4
-Xuyv+vAsc1JBMA0pxSuFUwNL3aFewpNLuMaqsmyJunMxGwCE1JLIfJVA97uAHpo=
-=jDxC
+iQEcBAEBAgAGBQJM83XfAAoJEEqz6FtPBkyjOusH/2lsXC6u4gDRm1GehNH3zBzz
+0Q7oFOM9XlLLj14yMyv3u09uv67g1RauhlOUSnn+l19OhfTthRjHuH1C02pqthoK
+Efeb84GREh11XTa5zIdiW/N76DKe2yuQZvn0oYvPy1gL8Cq+6X3OdNpC6YnlqN0g
+kLcef7npVCgstzl4/PZCqaHL+RrhIqNouRptms9CRSzdkdGXiM1MdBXXEZvn8fYk
+F3PRy/9lhuxqONro21np/HZ6qblvXGf2rHbmvvvUt75CoKpPtRwzy3dfj2DdNCqY
+n0VyUxfeMdX6bh4hXFdZj1BL1lfbX1zE/WyZyQlApQTS+/71vlOHLR13r+PnrR0=
+=6vYH
 -----END PGP SIGNATURE-----
diff --git a/media-sound/solfege/files/solfege-3.16.4-parallel-install.patch b/media-sound/solfege/files/solfege-3.16.4-parallel-install.patch
new file mode 100644
index 000000000000..b43c2eb6459b
--- /dev/null
+++ b/media-sound/solfege/files/solfege-3.16.4-parallel-install.patch
@@ -0,0 +1,12 @@
+--- solfege-3.16.4/Makefile.in.orig	2010-11-29 01:22:56.006406814 -0800
++++ solfege-3.16.4/Makefile.in	2010-11-29 01:23:12.252510667 -0800
+@@ -129,8 +129,7 @@
+ 
+ install: all mkinstalldirs install-po install-soundcard install-graphics install-program-files compileall
+ 
+-install-program-files:
+-	$(INSTALL_PROGRAM) run-solfege.py $(DESTDIR)/$(bindir)/solfege
++install-program-files: mkinstalldirs
+ 	$(INSTALL_PROGRAM) run-solfege.py $(DESTDIR)/$(bindir)/solfege
+ 	$(INSTALL_DATA) solfege.gtkrc $(DESTDIR)/$(datadir)/$(PACKAGE)
+ 	$(INSTALL_DATA) default.config $(DESTDIR)/$(datadir)/$(PACKAGE)
diff --git a/media-sound/solfege/solfege-3.16.4.ebuild b/media-sound/solfege/solfege-3.16.4.ebuild
index a33f0419dc5e..6b38f829585d 100644
--- a/media-sound/solfege/solfege-3.16.4.ebuild
+++ b/media-sound/solfege/solfege-3.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.16.4.ebuild,v 1.7 2010/10/24 15:42:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.16.4.ebuild,v 1.8 2010/11/29 09:43:50 radhermit Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
@@ -41,6 +41,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-swig2.patch
 	epatch "${FILESDIR}"/${P}-ldflags.patch
 	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-parallel-install.patch
 }
 
 src_configure() {
diff --git a/media-sound/solfege/solfege-3.18.7.ebuild b/media-sound/solfege/solfege-3.18.7.ebuild
index 079ed89f8d7e..73a5c0e2c31e 100644
--- a/media-sound/solfege/solfege-3.18.7.ebuild
+++ b/media-sound/solfege/solfege-3.18.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.7.ebuild,v 1.1 2010/10/30 02:47:33 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.18.7.ebuild,v 1.2 2010/11/29 09:43:50 radhermit Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
-inherit python
+inherit python eutils
 
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
 HOMEPAGE="http://www.solfege.org"
@@ -37,6 +37,8 @@ src_prepare() {
 	sed -i \
 		-e '/^CFLAGS/s:-I/usr/src/linux/include::' \
 		solfege/soundcard/Makefile || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-3.16.4-parallel-install.patch
 }
 
 src_configure() {
diff --git a/media-sound/solfege/solfege-3.19.1.ebuild b/media-sound/solfege/solfege-3.19.1.ebuild
index 8f982ae111f6..1fc0dfe20efc 100644
--- a/media-sound/solfege/solfege-3.19.1.ebuild
+++ b/media-sound/solfege/solfege-3.19.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.19.1.ebuild,v 1.1 2010/11/28 08:39:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.19.1.ebuild,v 1.2 2010/11/29 09:43:50 radhermit Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
 PYTHON_USE_WITH="sqlite"
-inherit python
+inherit python eutils
 
 DESCRIPTION="GNU Solfege is a program written to help you practice ear training."
 HOMEPAGE="http://www.solfege.org"
@@ -35,6 +35,8 @@ src_prepare() {
 	sed -i \
 		-e '/^CFLAGS/s:-I/usr/src/linux/include::' \
 		solfege/soundcard/Makefile || die "sed failed"
+
+	epatch "${FILESDIR}"/${PN}-3.16.4-parallel-install.patch
 }
 
 src_configure() {