Fix underlink. Bug #367691

Package-Manager: portage-2.1.10/cvs/Linux x86_64

4 files changed, 36 insertions, 7 deletions

diff --git a/games-strategy/glest/ChangeLog b/games-strategy/glest/ChangeLog
index 26d1c97af46e..ba7389e4d7ca 100644
--- a/games-strategy/glest/ChangeLog
+++ b/games-strategy/glest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/glest
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.29 2010/08/15 21:03:02 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/ChangeLog,v 1.30 2011/06/09 12:19:44 tupone Exp $
+
+  09 Jun 2011; Tupone Alfredo <tupone@gentoo.org> glest-3.2.2.ebuild,
+  +files/glest-3.2.2-underlink.patch:
+  Fix underlink. Bug #367691 by Diego Elio Pettenò
 
   15 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> glest-3.2.2.ebuild,
   +files/glest-3.2.2-glibc212.patch:
diff --git a/games-strategy/glest/Manifest b/games-strategy/glest/Manifest
index cdf42b7388bf..e5232d397471 100644
--- a/games-strategy/glest/Manifest
+++ b/games-strategy/glest/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX glest-3.2.2-gentoo.patch 5799 RMD160 bd57040ecd43a6cfdb367823c196a69b59d64d72 SHA1 1171e26afe5f3222c30337e3374ec23491022320 SHA256 716716edeb2fc9e337321ef04b4f36c04f76d73f0969dfb2788a6105eaa77e3c
 AUX glest-3.2.2-glibc210.patch 250 RMD160 399422c100f00d8d063ca0612f2c265705715ef4 SHA1 203aceb9eb847a4cec90585cb0c23072dcc3c0d6 SHA256 9bad234d5b96a61d3d33b586077bdc78b9e02ab4b45b2a23f958081536155435
 AUX glest-3.2.2-glibc212.patch 185 RMD160 8bf8c4777158a5bd2c119b305f0c8c1bbeb2fab7 SHA1 f38dfc5785d9c84445f5c92d3c81d7a4313d7d03 SHA256 2874e4235c6915486921cd2afa01c972a5301d9cf2546f1731d0a2f4ef5181c1
+AUX glest-3.2.2-underlink.patch 312 RMD160 dc20775737eec812753ac34c278cc3407e1c791e SHA1 1ebd22adf7fd599400524c099b9cb6f7c772cf9e SHA256 a3338974c2f162e5493077a5cbfd316aee67b5442f7faf8b066a6f561da46021
 AUX glest-3.2.2-xerces-c.patch 2315 RMD160 a49e2af20274463e0bed6bc28af32c7e336cde0a SHA1 7395927343d88f4a41079b238d01c41a56f13ddd SHA256 aa79bf11f8d41a88f74404426efc9659f32c663d0457a458d3303a941c8884db
 DIST glest-3.2.2-tutorial.tar.bz2 7637 RMD160 cfad894702fe228df7bbbed7cc0ba26e830ea4df SHA1 48561d7ab2898fe6d2568b13d21342afc2f5b656 SHA256 d145f491443c0ab37eeba4827c9ad580f55422a47d68c88b01813d92eef7b526
 DIST glest-source-3.2.2.tar.bz2 364660 RMD160 ae517989f836474251599b9e6633b7be0890ebf9 SHA1 19660b3aac5e220ab2a0cfb48509ba43046eeef2 SHA256 c8d83117f5cf1108cd981a3b70a8d9e70ef0fd3dc1045d25fb9dad5c70928d31
 DIST glest_data_3.2.1.zip 69967380 RMD160 da701fc468a0b7d07a161c13bd981994f9bbadc2 SHA1 44db6f004080dadda6d167ee12300740af95e920 SHA256 5a0660ed103a93d641397980c1e4860d5a0cfcd166256d3f8f6a28c13b457bf1
-EBUILD glest-3.2.2.ebuild 2449 RMD160 a59d948c1756b2a32b90c0df4cd8fa9c58ab6fb7 SHA1 14320dd839e8fc8ac33e954bc0c7def301e6c177 SHA256 4543eeedd7171dbc21614e7306c5ad376272214ced3e06558d55d44b4ad9b430
-MISC ChangeLog 4706 RMD160 60ad778cd281ee5786705d613efdc041a03e0eaa SHA1 08fa06189e0dda6dcb21d03d8bee29076daa25e6 SHA256 e92efa3f1ab03b2d70a52f8541235fb8408acd6179456c7e08243e52c69e9d50
+EBUILD glest-3.2.2.ebuild 2533 RMD160 652b1acd39ebe1e8a322b34c0221a3c17d8b2d11 SHA1 e255c4f8014544d3f552bddb3cbe26b85c58f7e1 SHA256 2838612da8da57d1b36cba023f00e2bafe4f9cf43d175d37012c02904bf6d56c
+MISC ChangeLog 4864 RMD160 8287d8c1c1e71e8b1be1467a387d78dd1c8fd560 SHA1 18a78bae663b1ce830e2874dc9675c913f30c84a SHA256 d35bbe75e98816cb9f0dfe7199ab02f93f6e5872b0a48f16a25c1412467a46ca
 MISC metadata.xml 234 RMD160 b09018c0da39b6d254b90c670ef2b3f0840bd268 SHA1 75479a33f4392ebea31076dad0df0996a20fffd6 SHA256 ece9d2567a15234ed14597c3e250fa5598ebb4fc7b8bd55a3b8d37a3421936ec
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3wumwACgkQIY77eQFFFC2agACgj5Bjfn5PB6xrgyggafJvGfsk
+JVUAnR79qBTdvFRNWoNsmE4uW/RN91N0
+=gLxE
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/glest/files/glest-3.2.2-underlink.patch b/games-strategy/glest/files/glest-3.2.2-underlink.patch
new file mode 100644
index 000000000000..5c06d6bf9bd6
--- /dev/null
+++ b/games-strategy/glest/files/glest-3.2.2-underlink.patch
@@ -0,0 +1,11 @@
+--- mk/autoconf/ax_check_gl.m4.old	2011-06-09 13:59:57.263672275 +0200
++++ mk/autoconf/ax_check_gl.m4	2011-06-09 14:00:31.552853456 +0200
+@@ -49,6 +49,8 @@
+     fi
+     if test -n "$x_libraries"; then
+       GL_LIBS="-L${x_libraries} -lX11 ${GL_LIBS}"
++    else
++      GL_LIBS="-lX11 ${GL_LIBS}"
+     fi
+   fi
+ 
diff --git a/games-strategy/glest/glest-3.2.2.ebuild b/games-strategy/glest/glest-3.2.2.ebuild
index 1717f4bc8062..5a206764a428 100644
--- a/games-strategy/glest/glest-3.2.2.ebuild
+++ b/games-strategy/glest/glest-3.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-3.2.2.ebuild,v 1.9 2010/08/15 21:03:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glest/glest-3.2.2.ebuild,v 1.10 2011/06/09 12:19:44 tupone Exp $
 
 EAPI=2
-inherit eutils wxwidgets games
+inherit eutils autotools wxwidgets games
 
 DESCRIPTION="Cross-platform 3D realtime strategy game"
 HOMEPAGE="http://www.glest.org/"
@@ -36,6 +36,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/${P}-xerces-c.patch \
+		"${FILESDIR}"/${P}-underlink.patch \
 		"${FILESDIR}"/${P}-glibc210.patch \
 		"${FILESDIR}"/${P}-glibc212.patch
 
@@ -55,6 +56,8 @@ src_prepare() {
 		|| die "sed failed"
 
 	find "${WORKDIR}"/glest_game -name Thumbs.db -exec rm -f '{}' +
+
+	AT_M4DIR="mk/autoconf" eautoreconf
 }
 
 src_configure() {