Add fix for --as-needed; bug #168427

Package-Manager: portage-2.1.2.1

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 22e09bd010c1eb6f38b11ba18cbbfee3d9096375..b790b2753335eb330c7ce1bdb6ed21cd1893ac1b 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.90 2007/03/05 20:10:02 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.91 2007/03/05 20:50:23 dang Exp $
+
+  05 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/rhythmbox-0.9.8-as-needed.patch, rhythmbox-0.9.8.ebuild:
+  Add fix for --as-needed; bug #168427
 
   05 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
   +files/rhythmbox-0.9.8-multijob-fix.patch, rhythmbox-0.9.8.ebuild:

diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 8e95488f007f8381b79bf9ab5ee44ca619b30e74..32cce5e4e3dc2c5abdc25aeb66a433a63dea14dc 100644 (file)
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -25,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-as-needed.patch 1080 RMD160 cb6a1b61478976f6266312dcb6fe89dd99cf9b6e SHA1 335ec58a31d8bb7e4540f834baf1e74bad5c772d SHA256 dcb2d038723d82e3f9a7d13ccfa469e92f4f84678a6ef7da84940f5d22c3c104
+MD5 917191f829a31160d277d61e26f1c3bb files/rhythmbox-0.9.8-as-needed.patch 1080
+RMD160 cb6a1b61478976f6266312dcb6fe89dd99cf9b6e files/rhythmbox-0.9.8-as-needed.patch 1080
+SHA256 dcb2d038723d82e3f9a7d13ccfa469e92f4f84678a6ef7da84940f5d22c3c104 files/rhythmbox-0.9.8-as-needed.patch 1080
 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
@@ -40,14 +44,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 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
+EBUILD rhythmbox-0.9.8.ebuild 3595 RMD160 575f5042605dbc97b9b14910b03bf6774c1337f1 SHA1 85798bc00eb23a7baa1a7b46829146dd76aebe48 SHA256 b813804b0af2cce452b578d2d538b48f49107dbd78e4f7884d54663a4b8958d5
+MD5 7eb691e4331cc00e636a6a5254201eb3 rhythmbox-0.9.8.ebuild 3595
+RMD160 575f5042605dbc97b9b14910b03bf6774c1337f1 rhythmbox-0.9.8.ebuild 3595
+SHA256 b813804b0af2cce452b578d2d538b48f49107dbd78e4f7884d54663a4b8958d5 rhythmbox-0.9.8.ebuild 3595
+MISC ChangeLog 12926 RMD160 5746d21fb27d6ef49cfa55ea0664ace229c46d4f SHA1 e7e1e2dd611f952e22525e4f5d8591ba89f3394b SHA256 09a0a7e58b7c12b6bb0d64c813853794401e76d213fa6a1a071c634835e778da
+MD5 47e8a431376bdba805109dfe94daef41 ChangeLog 12926
+RMD160 5746d21fb27d6ef49cfa55ea0664ace229c46d4f ChangeLog 12926
+SHA256 09a0a7e58b7c12b6bb0d64c813853794401e76d213fa6a1a071c634835e778da ChangeLog 12926
 MISC metadata.xml 200 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 SHA1 9d3b582b967a1030b95428758f25fe33cb5a25fd SHA256 2e1eafdbf68047687a24f6a4ad8d519ec193805e347bf17d1d00f7771353e39b
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 RMD160 bca17f66c909b846452eb76b2d2c9a2eec429db0 metadata.xml 200
@@ -64,7 +68,7 @@ SHA256 5d53e69ac6d6ba974b5338b29cbf4fac2b584da32f8555628aa508191a56010d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF7Hj4omPajV0RnrERAoI+AJ4mlFcmsp42fLHzLtY27NnMogIJWgCfSxKe
-9ClaJbkiMLUXtoKBm5TDrm0=
-=0OZ1
+iD8DBQFF7IJsomPajV0RnrERAm1dAJ4rV56zKJEFxnttXXjd2UlTz1ZYLgCeNpfD
+0d6dRTa5C2K71EGukgB6vDw=
+=bYQd
 -----END PGP SIGNATURE-----

diff --git a/media-sound/rhythmbox/files/rhythmbox-0.9.8-as-needed.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.8-as-needed.patch
new file mode 100644 (file)
index 0000000..7622ad7
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.9.8-as-needed.patch
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN rhythmbox-0.9.8.orig/widgets/Makefile.am rhythmbox-0.9.8/widgets/Makefile.am
+--- rhythmbox-0.9.8.orig/widgets/Makefile.am   2007-01-09 01:42:22.000000000 -0500
++++ rhythmbox-0.9.8/widgets/Makefile.am        2007-03-05 15:32:20.000000000 -0500
+@@ -63,5 +63,5 @@ INCLUDES =                                           \
+       $(RHYTHMBOX_CFLAGS)
+ 
+ librbwidgets_la_LDFLAGS = -export-dynamic
+-librbwidgets_la_LIBADD = $(LIBSEXY_LIBS)
++librbwidgets_la_LIBADD = $(NOTIFY_LIBS) $(LIBSEXY_LIBS)
+ 
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN rhythmbox-0.9.8.orig/widgets/Makefile.in rhythmbox-0.9.8/widgets/Makefile.in
+--- rhythmbox-0.9.8.orig/widgets/Makefile.in   2007-02-21 04:52:25.000000000 -0500
++++ rhythmbox-0.9.8/widgets/Makefile.in        2007-03-05 15:32:34.000000000 -0500
+@@ -373,7 +373,7 @@ INCLUDES = \
+ 
+ 
+ librbwidgets_la_LDFLAGS = -export-dynamic
+-librbwidgets_la_LIBADD = $(LIBSEXY_LIBS)
++librbwidgets_la_LIBADD = $(NOTIFY_LIBS) $(LIBSEXY_LIBS)
+ subdir = widgets
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
index d8c24193e2f01d907c19e8d273a1b5dbae61b5bb..845dfddb11b3b3c02e7e445b2aa06466902f7a1d 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.3 2007/03/05 20:10:02 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild,v 1.4 2007/03/05 20:50:23 dang Exp $
 
 inherit gnome2 eutils
 
@@ -102,6 +102,8 @@ src_unpack() {
        gnome2_src_unpack
        # Fix parallel build; bug #169182
        epatch "${FILESDIR}"/${P}-multijob-fix.patch
+       # Fix --as-needed build.  Bug #168427
+       epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_compile() {