fix underlinking wrt #429280

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

4 files changed, 67 insertions, 4 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 9f1d0ab4442d..d585d73e8db7 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.143 2012/05/14 00:48:15 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.144 2012/08/26 08:41:38 hasufell Exp $
+
+  26 Aug 2012; Julian Ospald <hasufell@gentoo.org> brasero-2.32.1-r1.ebuild,
+  +files/brasero-2.32.1-underlinking.patch:
+  fix underlinking wrt #429280
 
 *brasero-3.4.1 (14 May 2012)
 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 5ddaa4c334b9..a8dccbb5e767 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX brasero-2.32.0-build-plugins-against-local-library.patch 15544 SHA256 895d4ff2c349ddff6a8fcbc9d366808a3fed2c3aa54bd4bb7b717505801c3176 SHA512 046dbe903f6af5b08f0ac9211ce3325d11082c54f7af68476bed10b82f3480775346da99f34b4d0ee5a81589e66c512e69a3f32106040782ba08971fe85987e6 WHIRLPOOL 6d9bdff897ef51d1d13af99b694cc146c15d9ac315d4b83808f983becd214dc5f578a304f3a4f5a5fee8468d7a71000ef48436d82ad92b1f26455f5648a19db3
 AUX brasero-2.32.1-fix-size.patch 2244 SHA256 6cbedaa3e1ceb1140961afe925792b813a0ca5f894256c9330f756268c43d566 SHA512 5024ea4c499f5055ebaf685e518b3eb2aec8f57cff9c3593f1b0810c3ec3c4ca126f6b2dde2161a71955d8f48c45515bc0900d2bd785fc96534649b69d0fff14 WHIRLPOOL 26064f0dd93b460bed53a0e79a762ac8dbd72af489f805e6275f04ec9cdbf875ea9d863b6907e920505cf262ea305439469f89a8c74766f6a02c95628c030b0d
+AUX brasero-2.32.1-underlinking.patch 1144 SHA256 72ed1ac03ebd454e895ec1f12755950fd69a95bbe9f98f92b262215112d96165 SHA512 53796638edd1d888c82fd1b295e919275b7224b140a59a1c5614ee092784d92310e98540d99bd1bd71cfea86db0f05717a4ab1af2f83a7fb160375ec3196da06 WHIRLPOOL 8edf230310a47e8fa74c6694f1400847ddc4fd924e91eedb6a862b44be355ef8044e1798f358c40674c8eb9b95c0f7ce2669c6547fa270708c53dc465142eb95
 AUX brasero-2.32.1-useless-dialog.patch 2498 SHA256 0be1c75fea2e0d9b72130c26687338f33061a96202c99fcf85c06e2749560912 SHA512 83364ed4aced2c7a72ea40dbd32f4e7aaa9ccd7541b232977dde19c8b331c23d1cf088ce8954b5213fc9d5646e1604ec3cd7e5a749aebe7351dcc68a7455d358 WHIRLPOOL 7b7b41e4732e951e47ce1d1bd785c7b5af14b29d1d74e35a5eb117181b355505e32ea009a84c4d8426989fb4854e0b047db597d75bfd9af91905527c68c41182
 AUX brasero-2.32.1-warning-silenced.patch 690 SHA256 899ca8171a751332957ec21c3028ebc4a4d303bda30699d57cf0f6607bd2ae58 SHA512 b5eaa2983d429f5a3859380630671e939e663a272e2ba4c53e1a564125a1d4e0deeae4bf87a4ac3c9499d5c2dd6fbe2e9ee55f468f39720e3dbbf467046d184f WHIRLPOOL 25350037165df534a3ee34fbd2852deb736c3e55fead219eff0dc1280bf397d864a8e6c6b0ab0392c9d45a4dea5f03f65ead6d7947164085232d794ed8ac682f
 AUX brasero-2.32.1-warning-silenced2.patch 616 SHA256 cb435ec18ba02e445ebbf55c5cee16ce078d0e6e762e5821222e911a13ce5f5d SHA512 4369db4c27e5756be36a2be036428a25c6d73c7427aaebd8bc830f1308ca778fb46f4cfeaeb0e2efcfc62488542fa458a9a39f07e349e86594a4d41494ce2189 WHIRLPOOL aaae12f221af00cdc47072706ad98fc761452d833e53505e8f1a1ec6b8f797d18f2e1deaa3821847bdd71c6334c44ffe405659341923b88aa63ad5cc70e371f2
@@ -11,9 +15,20 @@ DIST brasero-2.32.1.tar.bz2 4530933 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75c
 DIST brasero-3.2.0.tar.xz 2923972 SHA256 2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c SHA512 6809374acedf105915448750df361e2fd47bceecb348baf3a571aea4ff8c5bffc5f3550004e92acaa1235cbf7ce58e0343837ea1024a962603c872df1b3d22b8 WHIRLPOOL 8c791acaa908032f930b94799785136e614a3188bdff497d1fcb5025e49624a8900a23e6467a9101bcad86aa6190ff5cb25d2d537f961f679fb05fbaf57a6b43
 DIST brasero-3.4.0.tar.xz 3229628 SHA256 e35b739a7db54d21564232303bb9d12609a02976c36cdd8848ff4376a0809198 SHA512 b162f9785a5ad549ffc3bb6790d6a9dbcf982f5cdfd214655156aabae401dc6b25b389ed2d8f5f6d3ab3c71768acc1a19e941d4b62de83e779289ab77f9ceca5 WHIRLPOOL 308e2941d9083cfc63b5b0acfa867307d08f93983aafb1b448929241aca55d40314fced35971e42f4a38c5258b714eaff99f55c5c37f15dad6795038c764161f
 DIST brasero-3.4.1.tar.xz 3233512 SHA256 e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6 SHA512 238baf251982adefc3a206adf6e244d2d6326dc7a5e4768d60acab7d116392e5bd24ca8b15a804e309aeeda0ff5b18f22c2230d8f219c3ea432a1611dfe4b330 WHIRLPOOL 0a858c4c6db489e738d5b8624eb039264ef6fb9bd7ae57be1ecd2e597353c1d6ce53109405bdb4f91e85509da6e55cf96a035597c0b3ddf4ee8afd334db7167a
-EBUILD brasero-2.32.1-r1.ebuild 3542 SHA256 8035805115b3551d190ec63ac525068a84dd132b93493e95222186d9321fec8f SHA512 de2d052856207f788a39c651f609596eedbe7f1890faea3b5760c540393355c1806157189c812f8e5bfce077e24dfc2f281f88e79ac26c77c32bf71261809408 WHIRLPOOL 060736b0373cda273da6f9371e0d367ba974fb77fd7bd5478f6e4628646a866d4a0bc4c9069a9c881ed605c9e1c1c55258c41b66a73d91b353e3905de97bd113
+EBUILD brasero-2.32.1-r1.ebuild 3634 SHA256 2ba792bca74104848b1c2e43a6856cb1b4fd72e9ed725e878580a0d1866f33ba SHA512 5dd1226512da8c70ceb3eb88537994269bd24bf690535303ae7135b03f74ac88c1757c1b297c1abc55318810a25dc548bf12895d8a3a44d01219d4d47b596cce WHIRLPOOL b4d19e65d81ba435d695c9f1a33963f7f5fe8a52513d3bffc50cd91bb1f06e153bdcde562f57dff0abba589c44d024505ef72d4d4622caff075294bbfa7d9c71
 EBUILD brasero-3.2.0-r1.ebuild 2996 SHA256 f28946e561c3a903264aa5a4617d6a4c7f9676c932faa14b547019ba0fec7a30 SHA512 d704aaa1af1cf3c4907a1aaa73d77c29628ea64bb8cb3b17259a2e86fb8b4827a308d808101ec9d1fa11f8465d681050824763d32b980a16e7e7db63c18256e1 WHIRLPOOL 590e568d9d1a36525c0370a0a2bce096c9541c583fc937a66f7f48614985507e919cd1f2c9859b7cd08bfa2b93e3e6174caf502df6fbe736bf9f5b3d4d1e70b2
 EBUILD brasero-3.4.0.ebuild 2462 SHA256 f7577858a3e996cf044a8e8daf8964cd80bd1db02d501b763ac8b7cc374f19ea SHA512 94f66f113a1a0f0fe25a22d7913e53910389862cb7878e3876bedfe125ac57c8cf6657f6aa2b3ae7da03bde506ea147cf1e3ba95474c15407964a36af238ee04 WHIRLPOOL ca2494181dcb69f5234720ebcb00488796b766384b85c3e57d81bbf8e4e229893d2e981dc5769a22408e5551471f168b7dcf051623ad21de92e448f978a67c41
 EBUILD brasero-3.4.1.ebuild 2465 SHA256 004ec15924e03e244954938fafbac69bc8c547179028d80db5019e20cb190a0d SHA512 eb8239485e3b960f9710a8c999233a9397f37de981235240c0c2230c732717309604e60df56de5c276def236dbce8e4ece8473cabe50f7e724e5d4c8fd7d95b1 WHIRLPOOL 295c0a4f0a9e040ca8610aa3c93c5d5e8eba67fda77e002207ab9960a409af9d0ba2004cdb31d8b1d3fe509edb62d64a08c6db352d1c355c3e20adb89c8709fa
-MISC ChangeLog 22880 SHA256 ba58ac30569ba099cb897ee743ba5ec49a3720cef32ee9359a950171bdbb6e84 SHA512 8f7cd42c30522345af929142010c582dba184126e492f60be7a6bc797d7ea5887f485bd2a997a0309cc65e95289af3c3b4f95305cac5af034b3050cc6012d923 WHIRLPOOL f6c20501c00aeed4304df584ccd2ced09aace695251f32a3f10d92f8030521c58ddc1c7b298c1cb8e0345bb5c62a672105c136fb26b2d7e15bdb2e3c15320af3
+MISC ChangeLog 23032 SHA256 ed18875827b20fb3db53747d826068990dc76932bc8dffbf5e3f46e657ae23f7 SHA512 ea08e29032db47d8d1fb5cd06e3f8eb2958d3a73198b2d5a4997141db6b5990792bf5db92a8c614aa6913459f55cf00145501e0f4dd48dd6d53d9062966c0855 WHIRLPOOL a8a7ee82d933f58576a61cdfbc76643a9caea67a273f3ae32aa131a33e172c38536f40050917f8d933a2ff9887403b702df50b2d0226e4583d3759f17c342dd2
 MISC metadata.xml 804 SHA256 5cf5e6975460ecc9b4611798e81f3d299c3e808792ff1e553140a940cfa739bb SHA512 d05f12fa3a358a293b0e1d04b3463396bdb2aaa285f6096fa3c4a8a9c5c9086c984106ee3f36d23d3244a96714445132e7d3d3f55c456959a7d718e01b93b8bd WHIRLPOOL 6945585208ccf32bc3efda2965ded655e2223d9cbb0e9c5fe54ac8c54aed98e2cbcca40e3c89b9a6b121761a4ad8c39c7ac1d34c7082960b52af59f9ed4a1352
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQOeAQAAoJEFpvPKfnPDWzWgsH/0Ds3/8sl3lNzIRhbW5ANzup
+nzyr7Po9YE1x37VaxcGjbXh2ZjSJNvPNSPpdh1SzDPqriLTEQWz8U9VChHluWhfq
+5Hx1fJRl09JL8Cqt97jnsAuF9Fhlu7p2xV+iCIereOyJ6n/hrkJ7QSEz86pkSlkq
+Y5QhI8GaLsDdeoSiSM9EanWpM52J33ZFJkF0JFgDTPRBla5hYYcbWvG9XY5ySKJU
+RCVdcKZtVv+1LPYKwW6IZufPXr7+auNM99YbQnLmYynFwD5BfM263Cu0n1OuP382
+og+H6epuAUZBfG5C89DsdAxQnwnedv3ztUSbiA+xGT6azt+AEbftUTfvTRYY0dY=
+=+Ssi
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/brasero/brasero-2.32.1-r1.ebuild b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
index c086ba11d95c..d13eb260403a 100644
--- a/app-cdr/brasero/brasero-2.32.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.9 2012/05/03 07:51:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.10 2012/08/26 08:41:38 hasufell Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -26,6 +26,7 @@ COMMON_DEPEND="
 	>=media-libs/gst-plugins-base-0.10:0.10
 	>=dev-libs/libxml2-2.6:2
 	>=dev-libs/libunique-1:1
+	x11-libs/libICE
 	x11-libs/libSM
 	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
 	libburn? (
@@ -59,6 +60,7 @@ PDEPEND="gnome-base/gvfs"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-silent-rules
 		--disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
@@ -79,6 +81,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+
 	# Fix link against installed libraries, bug #340767
 	epatch "${FILESDIR}/${PN}-2.32.0-build-plugins-against-local-library.patch"
 
diff --git a/app-cdr/brasero/files/brasero-2.32.1-underlinking.patch b/app-cdr/brasero/files/brasero-2.32.1-underlinking.patch
new file mode 100644
index 000000000000..c4b20580c862
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.32.1-underlinking.patch
@@ -0,0 +1,40 @@
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sat Aug 4 11:21:07 2012 +0200
+
+    fix underlinking wrt #429280
+
+--- configure.in
++++ configure.in
+@@ -269,6 +269,10 @@ esac
+ AC_SUBST(BRASERO_CANBERRA_CFLAGS)
+ AC_SUBST(BRASERO_CANBERRA_LIBS)
+ 
++PKG_CHECK_MODULES([BRASERO_ICE], [ice])
++AC_SUBST(BRASERO_ICE_CFLAGS)
++AC_SUBST(BRASERO_ICE_LIBS)
++
+ dnl ****************Nautilus**********************************
+ # Note: the extension is built against gtk+-2.0 so we cannot build extension with gtk+-3.0
+ NAUTILUS_REQUIRED=2.22.2
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -24,7 +24,8 @@ INCLUDES = \
+ 	$(BRASERO_LIBUNIQUE_CFLAGS) 					\
+ 	$(BRASERO_SEARCH_CFLAGS)					\
+ 	$(BRASERO_PL_PARSER_CFLAGS)					\
+-	$(BRASERO_SM_CFLAGS)
++	$(BRASERO_SM_CFLAGS)						\
++	$(BRASERO_ICE_CFLAGS)
+ 
+ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+ RECMARSHALFILES = brasero-marshal.h brasero-marshal.c
+@@ -171,7 +172,8 @@ brasero_LDADD =						\
+ 	$(BRASERO_LIBUNIQUE_LIBS) 	\
+ 	$(BRASERO_SEARCH_LIBS)		\
+ 	$(BRASERO_PL_PARSER_LIBS)	\
+-	$(BRASERO_SM_LIBS)
++	$(BRASERO_SM_LIBS)		\
++	$(BRASERO_ICE_LIBS)
+ 
+ EXTRA_DIST =			\
+ 	brasero-marshal.list