From c2f624e0279e49e908cc7136a063b550f97ec429 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 17 Oct 2011 16:11:35 +0000 Subject: [PATCH] Fix underlinking with gold Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64 --- media-libs/clutter-gtk/ChangeLog | 6 +++++- media-libs/clutter-gtk/Manifest | 17 +++++++++-------- .../clutter-gtk/clutter-gtk-0.10.8.ebuild | 5 ++++- .../files/clutter-gtk-0.10.8-gold.patch | 16 ++++++++++++++++ media-libs/clutter-gtk/metadata.xml | 8 ++++---- media-libs/libchamplain/Manifest | 18 ++++++++---------- 6 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 media-libs/clutter-gtk/files/clutter-gtk-0.10.8-gold.patch diff --git a/media-libs/clutter-gtk/ChangeLog b/media-libs/clutter-gtk/ChangeLog index dc7ea330e423..4ed526607d0c 100644 --- a/media-libs/clutter-gtk/ChangeLog +++ b/media-libs/clutter-gtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/clutter-gtk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.24 2011/10/15 22:00:56 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/ChangeLog,v 1.25 2011/10/17 16:11:35 jlec Exp $ + + 17 Oct 2011; Justin Lecher + +files/clutter-gtk-0.10.8-gold.patch, metadata.xml, clutter-gtk-0.10.8.ebuild: + Fix underlinking with gold 15 Oct 2011; Pacho Ramos clutter-gtk-0.10.8.ebuild, -clutter-gtk-1.0.2.ebuild: diff --git a/media-libs/clutter-gtk/Manifest b/media-libs/clutter-gtk/Manifest index 51aa9b0dbda5..26b124439fb4 100644 --- a/media-libs/clutter-gtk/Manifest +++ b/media-libs/clutter-gtk/Manifest @@ -1,17 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX clutter-gtk-0.10.8-fix-introspection-build.patch 1723 RMD160 a50392ebf6a5069c44debaef0f9e96fb74c36cf9 SHA1 24eef1764e690c00c2532f4c0f8233cbd9955799 SHA256 a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66 +AUX clutter-gtk-0.10.8-gold.patch 501 RMD160 e4dd1367b2816c2eff05086ba9060b35ad5b17f1 SHA1 d4e64471fe9284b55a0299d2b6eeb64e5b54c17d SHA256 f8c74bf4e664116eaa927863ee919b04fc211b30a93069e74f3c21e35e490bbd DIST clutter-gtk-0.10.8.tar.bz2 321316 RMD160 50050df319824b4966b145a368f5af2657460350 SHA1 783b7fa0e826a18ed22d4c2723ba83c740c3a8fa SHA256 7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814 DIST clutter-gtk-1.0.4.tar.xz 305420 RMD160 46c481e11b256e4e5153b9c812bcbfbf1d3ff674 SHA1 dad930984afd5941e24afbb5d8078dd3dd2e98e0 SHA256 0741fd2feb7d065dd5949a0b47f9cd740272c1428ca93431dea677acb6de464e -EBUILD clutter-gtk-0.10.8.ebuild 1234 RMD160 c8bb0555c43cdd1c4f10de5a7a08daef0db1a6a7 SHA1 898abe060de41632b1abd7999e0117fbaa5446f5 SHA256 04a31a98a8f3113748e26c79da35e8c2d3cb3a171167d5f2a22ff0b0f52e3f56 +EBUILD clutter-gtk-0.10.8.ebuild 1313 RMD160 9333120d25abfc57a3b0478da8a009ffbd2e8798 SHA1 e915ac152a6454e2b6c9d5080a6d9c7c16f74bce SHA256 61f894b657a9515786d16d1d65acdef1810d0f787c2d17b1434ead10c051a218 EBUILD clutter-gtk-1.0.4.ebuild 1003 RMD160 d8e197af208f8fa2e68c0f5de9b8693ad3c73fee SHA1 e62a489ee3dff1b0f78002435c7e7c5b8a2d0a74 SHA256 6237375aacf15dc04b641a10c02f8105294619c0562a4660abea1b4d14d16a9b -MISC ChangeLog 4128 RMD160 30390a4552bbe3ac041cc536d7fe4d4a7939803f SHA1 1b839efc20d5673bc10e34494e009e8c866c517d SHA256 de06a67527a49342502658b514d991593d7261c4ea1b59a7726aeb1333e9bc74 -MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314 +MISC ChangeLog 4285 RMD160 9b3c93df72ca35fcb676b4ad3ba8619dc3b94555 SHA1 e80b727e7561c4fae7ad5d4c4edf3c6397da749d SHA256 f8213a4f9b1e067a03a631d33e17f0b817238ff52aa098c1331a6b21c58473dd +MISC metadata.xml 276 RMD160 c875a0ae3381b53e2eb50ec7d2c2d47aea573881 SHA1 b505ba3ca54ccac992d152389acf123115d10814 SHA256 91f70f4ca35b0ca97241188cf9037f63695399fcecdd3af5e71d188ed70d97e8 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6aAp4ACgkQCaWpQKGI+9RLHACeIn/p1Owt6+1ztmi9Gy+pVoyq -vuYAn0nIePhnVhExYDBHf0Z8ZGTr//jd -=KDR4 +iEYEAREKAAYFAk6cU70ACgkQgAnW8HDreRZYBQCgyd8u9kO98e8C75Tu0iK3d/6K +1KMAn30agtVaPY/1zei/pnkl/8FQBIIv +=zeRq -----END PGP SIGNATURE----- diff --git a/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild b/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild index dba48f10edd3..d11b33e7002d 100644 --- a/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild +++ b/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild,v 1.10 2011/10/15 22:00:56 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gtk/clutter-gtk-0.10.8.ebuild,v 1.11 2011/10/17 16:11:35 jlec Exp $ EAPI="2" @@ -40,5 +40,8 @@ src_prepare() { sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ clutter-gtk/Makefile.am || die + # Fix underlinking problem with gold.ld + epatch "${FILESDIR}"/${P}-gold.patch + eautoreconf } diff --git a/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-gold.patch b/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-gold.patch new file mode 100644 index 000000000000..068c9aa8fa0e --- /dev/null +++ b/media-libs/clutter-gtk/files/clutter-gtk-0.10.8-gold.patch @@ -0,0 +1,16 @@ + examples/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index 1e5d047..6fa1212 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -18,7 +18,7 @@ common_deps = \ + common_ldadd = \ + $(top_builddir)/clutter-gtk/libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la \ + $(CLUTTER_LIBS) \ +- $(GTK_LIBS) ++ $(GTK_LIBS) -lm + + gtk_clutter_test_SOURCES = gtk-clutter-test.c + gtk_clutter_test_DEPENDENCIES = $(common_deps) diff --git a/media-libs/clutter-gtk/metadata.xml b/media-libs/clutter-gtk/metadata.xml index 3147d749554f..99fdd2d75a23 100644 --- a/media-libs/clutter-gtk/metadata.xml +++ b/media-libs/clutter-gtk/metadata.xml @@ -1,9 +1,9 @@ -gnome - - Use dev-libs/gobject-introspection for + gnome + + Use dev-libs/gobject-introspection for introspection - + diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest index 945d461429dc..83dc8d218bce 100644 --- a/media-libs/libchamplain/Manifest +++ b/media-libs/libchamplain/Manifest @@ -1,20 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST libchamplain-0.10.0.tar.bz2 684141 RMD160 8fec982305536f14fc7b8245e225d143cee3c70e SHA1 e97f307ee1a3a36b421e8cb311496cfb06a8cb1b SHA256 98700bb3f3ada5f9bd6b938486e55f90ea76ce4108a8b62928cf185ded49dbb1 DIST libchamplain-0.10.1.tar.bz2 670134 RMD160 8d0a571ed762dc8ecd02d438e0e99ee45b711910 SHA1 5998275a6434d900950e31242f3b5041e56055cc SHA256 d7f5c11c4297e7a03444f30e4bb1b78c4da91046796f0c56c4ad5db0f823bc63 DIST libchamplain-0.6.0.tar.bz2 699922 RMD160 49c8e48c9b52d4fdf90773f6106e51c98420ef15 SHA1 f2a3b96118416268fa90fb6e5b6422442eed2286 SHA256 e6578cc38cee77b7d03a68e7fda347c64ea1f84a4655b3e1d7a55da900699c24 DIST libchamplain-0.8.3.tar.bz2 667873 RMD160 e5670e2698e0951f60a4168bbc9b2e788461e2a7 SHA1 da7b335db417574c3d407873c3e86f1263002d3d SHA256 70d533be213a1586d6725d82afb128d1e57ccc262681dfda193af60507ad42e3 -EBUILD libchamplain-0.10.0.ebuild 1864 RMD160 ff9f4fce66fba4d9e7701edef896a38bf0463f30 SHA1 d0208790be41792ed779857e0fc68db7d0832e2d SHA256 d8c3d52ee8adae4c67969c0a415aa449051afeea0a4ce858e22338a11741d3f9 -EBUILD libchamplain-0.10.1.ebuild 1862 RMD160 63c58171b1227f966b14a4dccbfaa980fa6e46f5 SHA1 37288e6d0b3cb77634054a41c990c76085372dff SHA256 8527d424184e1b422bbe10817532e623c1a6e8ab3ec97d6f1816905f1a8d4be7 -EBUILD libchamplain-0.6.0.ebuild 1995 RMD160 f203188863984d950ee41487625f79e87044c37e SHA1 0193e2b0fd398f481546e55bbaede304f04d399f SHA256 41314914e13e6b64ffcd8825b93d8f2560c05f957abbdd0f77e00dc89d4776b8 -EBUILD libchamplain-0.8.3.ebuild 1083 RMD160 4428327b35ae815363c8f8dde25b7e766a3f4d27 SHA1 6eb36b1e6526ba76d2cfc3e0d5c56026da6cfb02 SHA256 90594573996d9179fca184e961f592574c32a617da59cb2112c44db2d26dfcba -MISC ChangeLog 3621 RMD160 9ea6784513796f28dd78440f2e47a04eedc62a85 SHA1 0a5931702b2df264a4ac503b3741ac062deba642 SHA256 c747efa1a8cc0abd5ab282eeb66579c51a696df14489c838e8ef7c4c048274e4 +EBUILD libchamplain-0.10.1.ebuild 1864 RMD160 32bb9c35bcaa1ab5db9e200c4c529629a216ff3e SHA1 c601460a9dbcd2bbc00bfda9e7eb70a173708495 SHA256 e878f568c51ceff465283f20923d327a83aa81ec3491a91946dae97f531e5b03 +EBUILD libchamplain-0.6.0.ebuild 2133 RMD160 1ec701653d2d93afe28c75fcd61466c309a3038d SHA1 7cab5eb63c5beb9352d6a1f0f904097ce1a67c72 SHA256 75d0db4311b685f9ece9259785dbab9803f02c308ae8f6c77cc40f1c502a7baf +EBUILD libchamplain-0.8.3.ebuild 1259 RMD160 9bc21684a4ee110e0c5f05a0c86ac3b66c8a8af2 SHA1 55a2e447320e8174604e5b51f7074ff8407fed59 SHA256 6015eb9a3716e09d5940fd74da9f77d1edc5f6b24a9171915def1e03cf6f9e86 +MISC ChangeLog 3914 RMD160 f2e3202a5ac48b2cd3fe59c65ce4e1c5264caec1 SHA1 89bcb40934f8bf5c164e2c2b49a367ce5c07c87d SHA256 377369f5f7ee1cb8a8863b8ee5eb1e93aac123234ebf1e585018be947a2e0528 MISC metadata.xml 406 RMD160 c00c800600241193f8cd1c1a3a395aaf5df82c0d SHA1 5094d7dfadb49335e47bb8ef49246f10989559c2 SHA256 5a7e5e53034775fbe975a8611a680c0bf5bcd13588dac58f02b506b1c3f1db9c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk53rHIACgkQ1fmVwcYIWAaDAgCdGiNRWRuT5dhqesVTB71FYn3q -UVsAn3hVO57TRSJS3QuoqxIUOIHyh0zm -=EZPt +iEYEARECAAYFAk6cVKwACgkQCaWpQKGI+9T8cgCfR5XS8irliNZ8lBIpNxhKhbid +H3IAnAkxhrbUbpHCbYkO8NMgZqtEu+hR +=gPAY -----END PGP SIGNATURE----- -- 2.26.2