projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b76555c)
Parallel make fix; bug #169182
authorDaniel Gryniewicz <dang@gentoo.org>
Mon, 5 Mar 2007 20:10:02 +0000 (20:10 +0000)
committerDaniel Gryniewicz <dang@gentoo.org>
Mon, 5 Mar 2007 20:10:02 +0000 (20:10 +0000)
Package-Manager: portage-2.1.2-r12

media-sound/rhythmbox/ChangeLog patch | blob | history
media-sound/rhythmbox/Manifest patch | blob | history
media-sound/rhythmbox/files/rhythmbox-0.9.8-multijob-fix.patch [new file with mode: 0644] patch | blob
media-sound/rhythmbox/rhythmbox-0.9.8.ebuild patch | blob | history

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 3b0cfec2e5732e22a812e7d501f95c499f859cc4..22e09bd010c1eb6f38b11ba18cbbfee3d9096375 100644 (file)
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.89 2007/02/24 21:16:41 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.90 2007/03/05 20:10:02 dang Exp $
+
+  05 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/rhythmbox-0.9.8-multijob-fix.patch, rhythmbox-0.9.8.ebuild:
+  Parallel make fix; bug #169182
 
 *rhythmbox-0.9.8 (25 Feb 2007)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index db25cd27f6d0ed79657f9ea712c98a35904a0db3..8e95488f007f8381b79bf9ab5ee44ca619b30e74 100644 (file)
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.8.7-gst_shn_support.patch 665 RMD160 8f8eec7bf19405ea70b7ab5984c5d5a96e834822 SHA1 033ca9aa8109a558162a6ddbbdf4f270da2e239c SHA256 1c4fbabdff94741c88fb92f37c84ae70e05be9054481241efcab49f8c2c19018
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
 RMD160 8f8eec7bf19405ea70b7ab5984c5d5a96e834822 files/rhythmbox-0.8.7-gst_shn_support.patch 665
@@ -22,6 +25,10 @@ AUX rhythmbox-0.9.7-excessive-notification.patch 618 RMD160 b1d5f2550b672b2d64c1
 MD5 32b9b46d3c52cecf7fdb56c21e57cd78 files/rhythmbox-0.9.7-excessive-notification.patch 618
 RMD160 b1d5f2550b672b2d64c131cbc7e4ff65062ace29 files/rhythmbox-0.9.7-excessive-notification.patch 618
 SHA256 32cbaec58b7f82abaf34b7f2b21cab216523d005c16ed96607495159e59917e8 files/rhythmbox-0.9.7-excessive-notification.patch 618
+AUX rhythmbox-0.9.8-multijob-fix.patch 2963 RMD160 87472267fd89889d9385bdca391a83250c356de5 SHA1 55210d88092b825b35a9d96eec54f100394801b6 SHA256 4a34840b623370aac9b1d955ce7aeca25df4dafca6dfc4b9e686bd02a32d45e5
+MD5 14baaa1620b8bbb86789fa3f8d00fd00 files/rhythmbox-0.9.8-multijob-fix.patch 2963
+RMD160 87472267fd89889d9385bdca391a83250c356de5 files/rhythmbox-0.9.8-multijob-fix.patch 2963
+SHA256 4a34840b623370aac9b1d955ce7aeca25df4dafca6dfc4b9e686bd02a32d45e5 files/rhythmbox-0.9.8-multijob-fix.patch 2963
 DIST rhythmbox-0.8.8.tar.bz2 2435338 RMD160 7c436dd556c330ea98d87bad5cb304ab4a236020 SHA1 a48713cc191ce6df44f5466638dda39d56280243 SHA256 7faf1c10aaa198a1acacd3eb12979a2ea0730a0aa98d28f3c673a7f78b8dbda1
 DIST rhythmbox-0.9.7.tar.bz2 3231718 RMD160 547643b40b36e4e0c18b6d817c37426ce585119f SHA1 c5baf5c4ab03b19adb32f643fe21527c7506d061 SHA256 2fac1912a15c19841d4ca3188df7aa8c7aaa37dbbffb279b24259cc1281ff995
 DIST rhythmbox-0.9.8.tar.bz2 3374502 RMD160 df3363fac7009842c4541688dd43671c55311523 SHA1 7510da6d634e3efdfd29e03f018b1a14f56d7553 SHA256 7561b01ca27f901e7b9a14e5b8813510c8e96041496527a4568a3624237b5525
@@ -33,14 +40,14 @@ EBUILD rhythmbox-0.9.7-r3.ebuild 3686 RMD160 649719fa4ea8c9ffca02ea6225e16e834f1
 MD5 c6f3d499ed7f542a6a32e774400e99ec rhythmbox-0.9.7-r3.ebuild 3686
 RMD160 649719fa4ea8c9ffca02ea6225e16e834f1982d1 rhythmbox-0.9.7-r3.ebuild 3686
 SHA256 a86885816a3ae69b1601af79d4acfcdd4a2629c6b4ba57bf2a1d66ea83fcd0cd rhythmbox-0.9.7-r3.ebuild 3686
-EBUILD rhythmbox-0.9.8.ebuild 3423 RMD160 8e1e08406f91fdc3194cee73dec299c07f24edb2 SHA1 ab697bdabb602b03a9560ab9acb70976c15717a8 SHA256 256a0a6fe3b8e10fe4714f0f313ad8fcce7843cc4bb129c6891206b46fa2cfd5
-MD5 40da3231cc6707fc7dec029d5c9bff19 rhythmbox-0.9.8.ebuild 3423
-RMD160 8e1e08406f91fdc3194cee73dec299c07f24edb2 rhythmbox-0.9.8.ebuild 3423
-SHA256 256a0a6fe3b8e10fe4714f0f313ad8fcce7843cc4bb129c6891206b46fa2cfd5 rhythmbox-0.9.8.ebuild 3423
-MISC ChangeLog 12615 RMD160 4ff2572e7f9bd626226c4bb1f295fa1e34036ed9 SHA1 91d24a1e61124ba3b872b63f4c6a4d7c4448219b SHA256 1e8618b4645c3c7c25c6601de0acb1d48f92938cbc37aab0c16afa552f650fd8
-MD5 c695c518acd32616317c754b7cfc0d6a ChangeLog 12615
-RMD160 4ff2572e7f9bd626226c4bb1f295fa1e34036ed9 ChangeLog 12615
-SHA256 1e8618b4645c3c7c25c6601de0acb1d48f92938cbc37aab0c16afa552f650fd8 ChangeLog 12615
+EBUILD rhythmbox-0.9.8.ebuild 3513 RMD160 d14cd505b42dfc0c7ad5975c9489a1086e9758cd SHA1 27511f513a7357142bd14f5e02b52e22b671972c SHA256 2031d3d648c9db590f8e5955e238008f2d4c2df508bb8afc7d425523cc11d19f
+MD5 e5dddc1de6b8d4c9a8cdb15a9e20c332 rhythmbox-0.9.8.ebuild 3513
+RMD160 d14cd505b42dfc0c7ad5975c9489a1086e9758cd rhythmbox-0.9.8.ebuild 3513
+SHA256 2031d3d648c9db590f8e5955e238008f2d4c2df508bb8afc7d425523cc11d19f rhythmbox-0.9.8.ebuild 3513
+MISC ChangeLog 12769 RMD160 f7e382a103b77cbf38bc7dd124fca723e06532d3 SHA1 e1f430fdfc6259f108f593f03e75c4eaf011b083 SHA256 84c35e499f8eb0011f824761b26b6232d9b617b7c3a3267dc71153d091d8bb11
+MD5 aec214ad0859d0001ed2e33a72fe92cc ChangeLog 12769
+RMD160 f7e382a103b77cbf38bc7dd124fca723e06532d3 ChangeLog 12769
+SHA256 84c35e499f8eb0011f824761b26b6232d9b617b7c3a3267dc71153d091d8bb11 ChangeLog 12769
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200
@@ -54,3 +61,10 @@ SHA256 4bfa3d9f98c32f139761486bbe64393a6bd9cd64a65416cbd3141a1a493e7807 files/di
 MD5 90da601e7950a0462d66a20b216407b0 files/digest-rhythmbox-0.9.8 253
 RMD160 018e1e56389639ca2f9310ce3ee17ac4c3fcd856 files/digest-rhythmbox-0.9.8 253
 SHA256 5d53e69ac6d6ba974b5338b29cbf4fac2b584da32f8555628aa508191a56010d files/digest-rhythmbox-0.9.8 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF7Hj4omPajV0RnrERAoI+AJ4mlFcmsp42fLHzLtY27NnMogIJWgCfSxKe
+9ClaJbkiMLUXtoKBm5TDrm0=
+=0OZ1
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.9.8-multijob-fix.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.8-multijob-fix.patch
new file mode 100644 (file)
index 0000000..73623fe
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.9.8-multijob-fix.patch
@@ -0,0 +1,61 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN rhythmbox-0.9.8.orig/metadata/Makefile.am rhythmbox-0.9.8/metadata/Makefile.am
+--- rhythmbox-0.9.8.orig/metadata/Makefile.am  2007-01-25 06:12:16.000000000 -0500
++++ rhythmbox-0.9.8/metadata/Makefile.am       2007-03-05 14:43:09.000000000 -0500
+@@ -46,7 +46,7 @@ rhythmbox_metadata_SOURCES =                                 \
+       rb-metadata-dbus-service.c
+ 
+ rhythmbox_metadata_LDADD =                            \
+-      $(top_builddir)/metadata/librbmetadatasvc.la    \
++      librbmetadatasvc.la                             \
+       $(top_builddir)/lib/librb.la                    \
+       $(RHYTHMBOX_LIBS)                               \
+       $(DBUS_LIBS)
+@@ -57,7 +57,7 @@ test_metadata_SOURCES =                                      \
+       test-metadata.c
+ 
+ test_metadata_LDADD =                                 \
+-      $(top_builddir)/metadata/librbmetadata.la       \
++      librbmetadata.la                                \
+       $(top_builddir)/lib/librb.la                    \
+       $(RHYTHMBOX_LIBS)                               \
+       $(DBUS_LIBS)
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN rhythmbox-0.9.8.orig/metadata/Makefile.in rhythmbox-0.9.8/metadata/Makefile.in
+--- rhythmbox-0.9.8.orig/metadata/Makefile.in  2007-02-21 04:52:21.000000000 -0500
++++ rhythmbox-0.9.8/metadata/Makefile.in       2007-03-05 14:50:23.000000000 -0500
+@@ -367,7 +367,7 @@ $(am__append_1)
+ 
+ 
+ @WITH_METADATA_HELPER_TRUE@rhythmbox_metadata_LDADD = \
+-@WITH_METADATA_HELPER_TRUE@   $(top_builddir)/metadata/librbmetadatasvc.la    \
++@WITH_METADATA_HELPER_TRUE@   librbmetadatasvc.la                             \
+ @WITH_METADATA_HELPER_TRUE@   $(top_builddir)/lib/librb.la                    \
+ @WITH_METADATA_HELPER_TRUE@   $(RHYTHMBOX_LIBS)                               \
+ @WITH_METADATA_HELPER_TRUE@   $(DBUS_LIBS)
+@@ -380,7 +380,7 @@ $(am__append_1)
+ 
+ 
+ @WITH_METADATA_HELPER_TRUE@test_metadata_LDADD = \
+-@WITH_METADATA_HELPER_TRUE@   $(top_builddir)/metadata/librbmetadata.la       \
++@WITH_METADATA_HELPER_TRUE@   librbmetadata.la                                \
+ @WITH_METADATA_HELPER_TRUE@   $(top_builddir)/lib/librb.la                    \
+ @WITH_METADATA_HELPER_TRUE@   $(RHYTHMBOX_LIBS)                               \
+ @WITH_METADATA_HELPER_TRUE@   $(DBUS_LIBS)
+@@ -429,7 +429,7 @@ am__rhythmbox_metadata_SOURCES_DIST = rb
+ @WITH_METADATA_HELPER_TRUE@   rb-metadata-dbus-service.$(OBJEXT)
+ rhythmbox_metadata_OBJECTS = $(am_rhythmbox_metadata_OBJECTS)
+ @WITH_METADATA_HELPER_TRUE@rhythmbox_metadata_DEPENDENCIES = \
+-@WITH_METADATA_HELPER_TRUE@   $(top_builddir)/metadata/librbmetadatasvc.la \
++@WITH_METADATA_HELPER_TRUE@   librbmetadatasvc.la \
+ @WITH_METADATA_HELPER_TRUE@   $(top_builddir)/lib/librb.la
+ @WITH_METADATA_HELPER_FALSE@rhythmbox_metadata_DEPENDENCIES =
+ rhythmbox_metadata_LDFLAGS =
+@@ -437,8 +437,7 @@ am__test_metadata_SOURCES_DIST = test-me
+ @WITH_METADATA_HELPER_TRUE@am_test_metadata_OBJECTS = \
+ @WITH_METADATA_HELPER_TRUE@   test-metadata.$(OBJEXT)
+ test_metadata_OBJECTS = $(am_test_metadata_OBJECTS)
+-@WITH_METADATA_HELPER_TRUE@test_metadata_DEPENDENCIES = \
+-@WITH_METADATA_HELPER_TRUE@   $(top_builddir)/metadata/librbmetadata.la \
++@WITH_METADATA_HELPER_TRUE@test_metadata_DEPENDENCIES = librbmetadata.la \
+ @WITH_METADATA_HELPER_TRUE@   $(top_builddir)/lib/librb.la
+ @WITH_METADATA_HELPER_FALSE@test_metadata_DEPENDENCIES =
+ test_metadata_LDFLAGS =
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
index 02806ec11b480b35886a6018ac3ec7a86312af57..d8c24193e2f01d907c19e8d273a1b5dbae61b5bb 100644 (file)
--- a/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild,v 1.2 2007/02/24 21:19:07 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild,v 1.3 2007/03/05 20:10:02 dang Exp $
 
 inherit gnome2 eutils
 
@@ -52,8 +52,6 @@ DEPEND="${RDEPEND}
        >=dev-util/intltool-0.35
        app-text/scrollkeeper"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 pkg_setup() {
 
        if ! use avahi && ! use howl; then
@@ -100,6 +98,12 @@ export GST_INSPECT=/bin/true
 USE_DESTDIR=1
 }
 
+src_unpack() {
+       gnome2_src_unpack
+       # Fix parallel build; bug #169182
+       epatch "${FILESDIR}"/${P}-multijob-fix.patch
+}
+
 src_compile() {
        addpredict "$(unset HOME; echo ~)/.gconf"
        addpredict "$(unset HOME; echo ~)/.gconfd"
Unnamed repository; edit this file 'description' to name the repository.