Fix linking with -lX11. Bug #143626

Package-Manager: portage-2.1.1

diff --git a/games-engines/exult/ChangeLog b/games-engines/exult/ChangeLog
index 2496254b996d4d823c81fb4c01f2ad831c4cfccc..4544072d6ccc594221a8bccbb591c543b12bee37 100644 (file)
--- a/games-engines/exult/ChangeLog
+++ b/games-engines/exult/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/exult
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.14 2006/05/05 06:21:55 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/ChangeLog,v 1.15 2006/10/08 11:19:30 tupone Exp $
+
+  08 Oct 2006; <tupone@gentoo.org> +files/exult-1.2-x11link.patch,
+  exult-1.2.ebuild:
+  Fix linking with -lX11. Bug #143626 by koenigrollo@gmx.net
 
   05 May 2006; <Tupone@gentoo.org> +files/exult-1.2-gcc41.patch,
   exult-1.2.ebuild:

diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index 05f318c7c45b142c9843e1979e8c19978682ee9e..ef282e172f413b0f2d00ef69801ce31176d85a33 100644 (file)
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04 size 1357
+AUX exult-1.2-gcc41.patch 1357 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 SHA1 7ad3d82641f1e3f355c7085cc3c7349e5687b008 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04
 MD5 a7f6894ec9b22dce8d5420cfbea5c32c files/exult-1.2-gcc41.patch 1357
 RMD160 c18a2bf589d106e265a543821502be55a9cdbe60 files/exult-1.2-gcc41.patch 1357
 SHA256 cee50e50c21e00d832552d659d08e4b985b84cbeb6ed07e32e0af8b71eee5c04 files/exult-1.2-gcc41.patch 1357
-DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503 size 12614413
-DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa size 11382878
-DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a size 1722259
-EBUILD exult-1.2.ebuild 2613 RMD160 de178139a8161de1288379c02cd23eddf4703f25 SHA1 6657386ee99cdb241250d14ab999fadfffd11f8b SHA256 caf2642d0c7609295c8e7854f0451783212d0fc0d44aa8c3c3e76b89a972bf67 size 2613
-MD5 c577eee26345aab7ab39da4d2e35d5c8 exult-1.2.ebuild 2613
-RMD160 de178139a8161de1288379c02cd23eddf4703f25 exult-1.2.ebuild 2613
-SHA256 caf2642d0c7609295c8e7854f0451783212d0fc0d44aa8c3c3e76b89a972bf67 exult-1.2.ebuild 2613
-MISC ChangeLog 1853 RMD160 2d4d44066fff36a817b63249a9aef2acf81ae130 SHA1 c83e09b219fccfad76cea61041684f142e309d5d SHA256 73a88fdd9bfb07433a5e0129f42db5b3cd749b371a1d67f230b3e899c1b383c3 size 1853
-MD5 0a85247eae33778a4237d2ed699b6ceb ChangeLog 1853
-RMD160 2d4d44066fff36a817b63249a9aef2acf81ae130 ChangeLog 1853
-SHA256 73a88fdd9bfb07433a5e0129f42db5b3cd749b371a1d67f230b3e899c1b383c3 ChangeLog 1853
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+AUX exult-1.2-x11link.patch 286 RMD160 426eb039f9becfbcad6d87cacef4b489e423d45b SHA1 bc76419d4a86d88fa3f3f26da29ae0c03ef4757b SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308
+MD5 4de3e69c8d39573fc2d30894612c3181 files/exult-1.2-x11link.patch 286
+RMD160 426eb039f9becfbcad6d87cacef4b489e423d45b files/exult-1.2-x11link.patch 286
+SHA256 c0b971e64fb04e8ec91fea77b530755aa9c448d1421bca176f56b5561c2ab308 files/exult-1.2-x11link.patch 286
+DIST U7MusicOGG_1of2.zip 12614413 RMD160 2818c026664f6c8ef79201ea34a507091340fbb8 SHA1 50684766f3ca3eb33a777b752e904939a1470bd8 SHA256 ccf748b346345986b08355ae3bf21c72e3bfffe30ecf9f70fe10fdc8c573a503
+DIST U7MusicOGG_2of2.zip 11382878 RMD160 830a718674e1a2acf79ef131d30929c55fb91b44 SHA1 91250accd89bf931ce5fee6433ae988d55266a2f SHA256 58627a090f3f75cc4f5731053d5a2b02c6ba0edff1db0551bcd565d04089baaa
+DIST exult-1.2.tar.gz 1722259 RMD160 339231edf84507f05115ab3189875cb15be9c04f SHA1 81f9d3d428c80990b8e970a4dee5c85a7236dace SHA256 a6dd9d4e399281ed2db691ede21dbb79818ee11b08ef717e3eac255e290cf21a
+EBUILD exult-1.2.ebuild 2673 RMD160 933f7397923fc22e396cf75609d9b03f2637a038 SHA1 0179299d6b4521943c161b6a930e9e94e2ae6e68 SHA256 939db7041214e4e80e8f35296b2167a2a0bb614e38e81f51b47d4b901ed082ef
+MD5 46b5f35569d605ce899a6ec2f7ed9167 exult-1.2.ebuild 2673
+RMD160 933f7397923fc22e396cf75609d9b03f2637a038 exult-1.2.ebuild 2673
+SHA256 939db7041214e4e80e8f35296b2167a2a0bb614e38e81f51b47d4b901ed082ef exult-1.2.ebuild 2673
+MISC ChangeLog 2002 RMD160 867483c63f07f378ea42326796ca1506d5c4cbc8 SHA1 9d70d79d2f1a86e6e44ec4d7b39ef9893464e99f SHA256 b281241fcb1107780de2ca2caf00793cd4b3b35baba73e6a88fe249f7fb0b578
+MD5 2ad9bd54427483c308b7817461ef4b9e ChangeLog 2002
+RMD160 867483c63f07f378ea42326796ca1506d5c4cbc8 ChangeLog 2002
+SHA256 b281241fcb1107780de2ca2caf00793cd4b3b35baba73e6a88fe249f7fb0b578 ChangeLog 2002
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
@@ -24,9 +28,9 @@ MD5 a1e63bc6fa75e2cc687adf8fed610dd1 files/digest-exult-1.2 720
 RMD160 3d319c0f344c19b27036ac76175c7bde5895ab14 files/digest-exult-1.2 720
 SHA256 dbcafca8691e0a531c3216a814b0843a539a071032e7c5533ec7049e5bfab400 files/digest-exult-1.2 720
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEWu8S2CTtIKiFlQIRAhZgAJ9hByfaYQcoYdPvpJp0LEZjtzrJqQCbBCRT
-pSsMerQQNAHQxiCGH7P4hzU=
-=mI+R
+iD8DBQFFKN7QbfN2jvlVAhwRApDqAKCk8HmJvydIwmmlFdLlhq0Hoz18uACcCv4c
+E4BQ74icmTi6z8MNWGv4MqQ=
+=r5Wf
 -----END PGP SIGNATURE-----

diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 4b8b2574197022a9aec49f1ecb3e2236d6c2b74e..03028e4ed6d2859de3eef9037a5392b29216747f 100644 (file)
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.6 2006/05/05 06:21:55 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.7 2006/10/08 11:19:30 tupone Exp $
 
-inherit eutils games
+inherit eutils autotools games
 
 DESCRIPTION="an Ultima 7 game engine that runs on modern operating systems"
 HOMEPAGE="http://exult.sourceforge.net/"
@@ -35,7 +35,8 @@ src_unpack() {
        cd music/
        unpack U7MusicOGG_{1,2}of2.zip
        cd "${S}"
-       epatch "${FILESDIR}/${P}"-gcc41.patch
+       epatch "${FILESDIR}/${P}"-gcc41.patch \
+               "${FILESDIR}/${P}"-x11link.patch
        sed -i \
                -e "s/u7siinstrics.data/u7siintrinsics.data/" \
                usecode/ucxt/data/Makefile.in \
@@ -45,6 +46,7 @@ src_unpack() {
                #-e 's/$(DESTDIR)$(GIMP_PLUGINS) /$(GIMP_PLUGINS) $(DESTDIR)/' \
                #mapedit/Makefile.in \
                #|| die "sed mapedit/Makefile.in failed"
+       eautoreconf
 }
 
 src_compile() {

diff --git a/games-engines/exult/files/exult-1.2-x11link.patch b/games-engines/exult/files/exult-1.2-x11link.patch
new file mode 100644 (file)
index 0000000..5fbd3a6
--- /dev/null
+++ b/games-engines/exult/files/exult-1.2-x11link.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old   2006-10-08 12:38:54.000000000 +0200
++++ configure.ac       2006-10-08 12:39:19.000000000 +0200
+@@ -49,6 +49,8 @@
+ EXULT_DATADIR="$datadir/exult"
+ ARCH=""
+ 
++AC_PATH_XTRA
++
+ # determine windowing system from 'host'
+ AC_MSG_CHECKING("windowing system")
+ case "$host_os" in