fix underlinking wrt bug #423233

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

4 files changed, 72 insertions, 8 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 5aa66ecb1c88..8fb308396ff0 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.319 2012/07/07 12:15:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.320 2012/07/07 14:12:18 hasufell Exp $
+
+  07 Jul 2012; Julian Ospald <hasufell@gentoo.org> gnome-games-2.28.2.ebuild,
+  +files/gnome-games-2.28.2-underlinking.patch:
+  fix underlinking wrt bug #423233
 
   07 Jul 2012; Pacho Ramos <pacho@gentoo.org> -gnome-games-2.30.2-r1.ebuild,
   -gnome-games-2.30.2-r2.ebuild, -gnome-games-3.2.1.ebuild,
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index 42f4126e5e03..0e0832bd2db7 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -4,22 +4,27 @@ Hash: SHA1
 AUX gnome-games-2.26.3-gtali-invalid-pointer.patch 1145 SHA256 b75190460f701c1830a8eae85c46de23a3735329f840d21383a60ca4445adac0 SHA512 1f29bd41691a01f5822d3bee6eb1058eb0319e36b36f262daf02e997a1f3b58c87d6de79150f7639b3a0a4926a258b60a37c9f8aef7a3084895892c2f3776b44 WHIRLPOOL 631d301fa48bf3784d981533e9cc22f7c87f955bab2bfffe1a34b28943c281ccb808a44cc4f39d627c31a2522d7136080a9cdde1d540ffadc19bdc08ce5d6099
 AUX gnome-games-2.26.3-implicit-declaration.patch 319 SHA256 7a113e54b4fe50a0d49c5b7b842a03b7f8c494e9f4ee42e9f0ae883dd1bfddcb SHA512 a26e75b67056d36bff391f421e9bafe2034a251ac8a8270eea82ec42c0426894479e4e650ea1a68efd5992ebe60a1e48dc2ddce1325b88343fd422c564a0feb6 WHIRLPOOL 8e1118f7daae63cbc5846de9200e5c194f810cd2499b620ae9934e2020293cc4ec5e0f39975b3a164894e413dd81392583579745fe1bb8666055afa23e74888f
 AUX gnome-games-2.28.1-conflicting-types-libgames-support.patch 1038 SHA256 074718266310ccdc0ed29affee2dcd28c6e51e557b4db84a320c2e6223f55b8e SHA512 f50d26ed581024c4059acb14c2e546d2da6b40f4928ec63b1b8258ca28a70e89d87bca60d1b5af936cbc5b7273a25e0998428c3483be23bff97a331580c6b10d WHIRLPOOL e96d0bc9a74dd9c756843f89879d7cf23be1461304fc95025c0263102c56802ccd55693249e6922515c21cd1f044074e552ef1441252c91fa0622fff82b827f0
+AUX gnome-games-2.28.2-underlinking.patch 1048 SHA256 2e1726f0170e9fe15a9c7827209a500ad49002da3c400e189d50c6fa027c31de SHA512 d054a63efecb7d9606093d06bcfe1a425648000fc8b15c10c6e19b2068c474f39c13b8d5e31e893d478f835190a01d544a9aa8fa75539e76a3139dc40338e637 WHIRLPOOL 2f37d4e854a8dd409d5d0496342f19a0c02bbdd447fc2d30e9f1e8d085909cc39b12a3bbfd87570eac5261942deff0e08dcbb10c466b24defb6114ab70a43191
 AUX gnome-games-2.91.90-fix-conditional-ac-prog-cxx.patch 633 SHA256 902c85ff3f0898b89b75cb077d5b132ad55045fbd18e8c618fae3daee6352e6b SHA512 81c356bf700afcee3fbf3ad8d699b9ad5ae0e8738b72736934e070c117a59efe8bf6597f13630b5310ba3006beb31a5c39fb220206618f1a7f6679a5876727dc WHIRLPOOL 23ed9e56d9b6e3ef463cbf0a2a20bdf442a904551115f31c3bd88838652ed1a30ea2b89d694d10154c3aca81a738fddc986e0d5b423f79462dbccdaba0e819be
 AUX gnome-games-3.2.1-pygobject-3.0.3.patch 1293 SHA256 0d1a7dd240b9e59ebd3d5bf98dcfb628b2a70a0ae10d007eb4fe908a524e4bbe SHA512 2f430f517d4a684db66b9ab680560e0781a660f670099e0c2dfa37dcb8de61ad9e6a5e109ef1ad70e835014270142e454f4c5a814382b1cffd58025d2c63eff3 WHIRLPOOL 93442da1b9ba82d682375f4eacdab93aab618a26a773668bcbbcd71fc94002e0f4b52147f1be52b019ba8f56161365aae88c7099700252861c4e2ff941ce87a3
 AUX gnome-games-3.2.1-sudoku-borders.patch 1059 SHA256 afa6a36eb002ca5ebff9c752a23e865a60df23f0d64c25b883ed77879ae85073 SHA512 6ff84ae8db0f4c5d41e314ed5e0b78e2b2eecbc9cb553cbc3a2c8e5578c512bbdea3560620e2eb96dc57e6d2dc6050726ac20f98ce82ac06ad85f8becaee4c18 WHIRLPOOL 37f5dd4bf91b60e88c3b2d88ed10574146ef7d9d37dde783b79441b050e76fc7ce96fe73939039366744def9e25932b00bc7a15fa376cace626f74d3c12860ea
 AUX gnome-games-fix-staging-games.patch 1245 SHA256 525b90b1bdd69ca9a474daab4a7a79e7494f7dc0e148fd50e9195e64483e0817 SHA512 c764da423486d61821a6bcb66a74039b96f1b3f2f191af6be7c7609a0dc19b26697cc56f52226ba1142f760172f757f38732ce7646c5e6b0ba2e8051d03433cf WHIRLPOOL 6771aac1ab5b27019e40d22d20f3bfe3a4fc3610c9b52f0ef8b02603603344cf1de39b152be7cc7458dece1f2f5486fa2234a17718f8604935a42a335891bd8a
 DIST gnome-games-2.28.2.tar.bz2 25498433 SHA256 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899 SHA512 41d25c54d5d44d4a37ff87ca78fc236a7e33ef58c0eaadc0878eae3ff3bcabacfa986e8fc75230655b3a2bde70fdd81889213b97cbbc29c6b6768b47fb84d4bb WHIRLPOOL e4e958ae49d4b48278531b869bbaf3c085267b5fb6927a34681e7be6a350ce0f899f80c960e137d63aaee8ead1b70c1eb0d6814efacfaea5ff81332d44cb5cdc
-DIST gnome-games-3.2.1.tar.xz 22816376 SHA256 b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b
+DIST gnome-games-3.2.1.tar.xz 22816376 SHA256 b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b SHA512 65cf96eee0f9c69279e0663ce6f72db3fe45d61bbba1a50b61f74bd9fd10c7c8053a55f0665930bfd219454bbbbe24c3388d62eee1e1beed783fe67558cc0ce0 WHIRLPOOL acabd4d12ff3ee3f052e949e67fd7be2e7878726fd230b690c1afb7126f0eaf78aae913b479beb364c00668cf0905295a07d8156b138df7d4c40df2fb2557b99
 DIST gnome-games-3.4.2.tar.xz 18578676 SHA256 25676285fad33a39da7fc26b5b1dc751c7981ae778b8fe82e8b7c0a367e5117c
-EBUILD gnome-games-2.28.2.ebuild 4867 SHA256 1d5ef22da78a4ef321747a7a7032f52dfec2fea1009138986cb5ef05be51bf65 SHA512 7f206fb13400eef30f1b5a603e8a9e9cfd5497027b14bb6c01a41f62a329072ba9cccbb9f77b061a54901ea6aaa9316c570f20568ea67c04adf69b01bb0a3a35 WHIRLPOOL ad0e1ed038e60a479427ad92d9c8fb4d944a25d1efae0db1e3cb184508df379e528c9559205d85107577781cb2ee6c62013427139f8d860757cbce367808ab69
+EBUILD gnome-games-2.28.2.ebuild 4937 SHA256 013d4fe7c7ae546dfe93a960735ff5872b0e609f4e66069a13c79dc0e5246451 SHA512 1f5867c5308e5cec74abac0adcd90a2495e989d8dfc291fdd9b0baa895021e4f8fefcc2d65751cecb38c839c92a0703d7f6a7d715111e907abb3573baa3dfe84 WHIRLPOOL 2355311b988ed3cb42d6faf5abaad8edd0352bf46c6c35430999cd0c19dfbd0c8b6eed5bf2d0eedf02bdb4c079cc9615ee0251b9084a381a564931d15baa8a4a
 EBUILD gnome-games-3.2.1-r1.ebuild 5224 SHA256 2ae766afeeacdb949f451b559b33c8b15f26ee2fd7c048c4698ef2d870171bc4 SHA512 f805910cae553812da7fc8430b41b02376a2d7dfce6715e139ed98371add33854fd3c50fb52194f4a62e5325a28d77771be2ea7e0b10e8148f166fd7d0e6a1d9 WHIRLPOOL 93a39677672b8bdd09436e7ad4a7afdb7973fe5d82890a9c50d244b64223226b8b9082b85c9f59a505c5f4a50079f422d8725ef427b60988d052b09c1a542e05
 EBUILD gnome-games-3.4.2.ebuild 3914 SHA256 fecc784f447531457535814f2c8cc6ec0efc19de3d52584136de68a88dcb809f SHA512 b96f6f8ccca109ff838702518a48263efb71427b4196c861ba281fa6d69755015262115de677eb4a9033c0c89abcdcaa568c0ebf24e7965d8dc87512c5484464 WHIRLPOOL 396089220a5ba15b756723282b530d2651628d7a1a5aa4a39503611b4f70a7dbd28dc6090f6b8879ad9d76f4580f16f75f340c07df4e276cf4793ff6585a9ec5
-MISC ChangeLog 44816 SHA256 ceb32af9093804516e603aa87843a9a05d42fce2beed79fda01f610bb7e92385 SHA512 20b110877c55ad0714e7a007f0ff7fd2512776c813d1df0e41bfcb090f43f9793c78de51066d25bb190545d7828489cb93a4a76a2e703a6eb96d0f739164e035 WHIRLPOOL ad66a1ee632b54eb7b13ccce24e3c7fd2880401ac43a988717f8a5d3edf7d618fab1f55e356184ecd442eff91a6154c161e11056dd5ae481ac807e000f159175
+MISC ChangeLog 44981 SHA256 7e27ed5749addb4f0c9ad0a2ffb02bbc7d19f0c95a1b9902c25db84bb1447f21 SHA512 09dbe1ceba0ed75949a7f6d87f84a2c3954483ddd0ab8a433101a20c45421688bc57a0e6bef6862e5d7d2e6676b6f1180f7c6bf3b1c77c0ce6ec12281ccced99 WHIRLPOOL e3417fe7a8e4a2ca666caca2933bbbc5be8ef9186e4329131df9a45871b57234094d8c82ee25ed2ca2896a40ea878dd2d61bf9e1041d407168195592fccb26dc
 MISC metadata.xml 836 SHA256 b233cfdcd3311a14130163329fa9047c65a852526db63dd6c5002b0bcc6d490d SHA512 adb94f78b231d373cd109175a7d2c4ae3c598c5f8b9631ad07ae099eb52023e983a2a6b4dcdb49907720dc3c1e1906d8d900f5e77889cf773af717131fe610a1 WHIRLPOOL 5ef8b3a86e024ed1197be8f1490f22e5adabb3d45486830b581a6c5d78e9c6d32379a7ec9eed9a3fe74f6311fc293b7f4c1981e7b27fce49851b9f1a22402e84
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/4KHoACgkQCaWpQKGI+9TytQCgiHhUtaINbBVoSuZr2eytueiI
-LbwAnj1xfdHsHGHzS6By8WSUsWTxu/V7
-=YAIN
+iQEcBAEBAgAGBQJP+ELrAAoJEFpvPKfnPDWz8EYH/12QEviYuyFGD4D0FAon8Avo
+QXPtprtYEVOY0SDaE4m8AXqmptkMycoAtmK1YeblePS6gWsuUS9Tcmn4nAIyxzk7
+rro0MqAgEnvhjw8GeA2DwZ+uSsPbJAu4yETy66PndrfOYcQr7qjdiJrZA74htjB4
+3LDgNnbuB31QgWDLpeZ8auJKoK1VtlSH/t6ETnQBI++jR1ItccV7vurXKWzjX2xm
+Ds/7/d8MwhR1NAAaFELOXxurnNg3pAO0IzS7iMIy3RUSu1eOSxLs+Atuq4HiQXEv
+FAv7MJXLNcIHo7jmAvuLDS8UnjE0VuzlsaiECyA2Sw9T/Le70C1h4HlPjwj8sc8=
+=Y8RQ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.28.2-underlinking.patch b/gnome-extra/gnome-games/files/gnome-games-2.28.2-underlinking.patch
new file mode 100644
index 000000000000..f622d1e5a8f6
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.28.2-underlinking.patch
@@ -0,0 +1,52 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Jul  7 13:14:09 UTC 2012
+Subject: build system
+
+fix underlinking
+
+--- configure.in
++++ configure.in
+@@ -566,6 +566,9 @@
+ 
+ # Check for common modules
+ 
++PKG_CHECK_MODULES([X11],[x11])
++AC_SUBST([X11_LIBS])
++
+ need_gthread=no
+ PKG_CHECK_MODULES([GTHREAD],[gthread-2.0])
+ AC_SUBST([GTHREAD_CFLAGS])
+--- gnect/src/Makefile.am
++++ gnect/src/Makefile.am
+@@ -64,6 +64,7 @@
+ 
+ gnect_LDADD = \
+ 	$(top_builddir)/libgames-support/libgames-support.la \
++	$(X11_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(INTLLIBS) \
+ 	$(LIB_GGZMOD) \
+--- iagno/Makefile.am
++++ iagno/Makefile.am
+@@ -56,6 +56,7 @@
+ 
+ iagno_LDADD = \
+ 	$(top_builddir)/libgames-support/libgames-support.la \
++	$(X11_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(INTLLIBS) \
+ 	$(LIB_GGZMOD) \
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Jul  7 13:43:03 UTC 2012
+Subject: 
+
+--- gnibbles/Makefile.am
++++ gnibbles/Makefile.am
+@@ -42,6 +42,7 @@
+ 
+ gnibbles_LDADD = \
+ 	$(top_builddir)/libgames-support/libgames-support.la \
++	$(X11_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(INTLLIBS)
+ 
diff --git a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
index 61f2d8786974..240babf791ce 100644
--- a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.28.2.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/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild,v 1.14 2012/07/07 12:15:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild,v 1.15 2012/07/07 14:12:18 hasufell Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -133,6 +133,9 @@ src_prepare() {
 	# in libgames-support/games_sound.c.
 	epatch "${FILESDIR}/${PN}-2.28.1-conflicting-types-libgames-support.patch"
 
+	# fix underlinking
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+
 	# If calling eautoreconf, this ebuild uses libtool-2
 	eautoreconf