fix underlinking wrt #451286

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 123 insertions, 2 deletions

diff --git a/games-roguelike/crossfire-client/ChangeLog b/games-roguelike/crossfire-client/ChangeLog
index b5d448c527b0..1c29651fa48d 100644
--- a/games-roguelike/crossfire-client/ChangeLog
+++ b/games-roguelike/crossfire-client/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-roguelike/crossfire-client
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.35 2013/01/13 11:38:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/ChangeLog,v 1.36 2013/01/28 08:24:58 hasufell Exp $
+
+*crossfire-client-1.70.0-r1 (28 Jan 2013)
+
+  28 Jan 2013; Julian Ospald <hasufell@gentoo.org>
+  +crossfire-client-1.70.0-r1.ebuild,
+  +files/crossfire-client-1.70.0-gold.patch:
+  fix underlinking wrt #451286
 
   13 Jan 2013; Agostino Sarubbo <ago@gentoo.org> crossfire-client-1.70.0.ebuild:
   Stable for x86, wrt bug #450790
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
index 9c1adf882632..2968c57dab4f 100644
--- a/games-roguelike/crossfire-client/Manifest
+++ b/games-roguelike/crossfire-client/Manifest
@@ -1,10 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX crossfire-client-1.12.0-curl-headers.patch 312 SHA256 f8756577998ffd2dae37420c6c6841e998ae7eaaa9e2c537ef648db3e7e9db68 SHA512 66ed0cdf1e903453d1d73fd83149664d6b628be178ca6b8464218f33c57f2db478b7f762931cdf6f95b01c357d9c901c395b238507191551ee287cb0dedf6e5a WHIRLPOOL 875702bb33102dcb2face796ef4184c73e31095c854e8ecdff9809d37da3ffec69496e15039c570bffbe4afcd49a968a79dbf4955ce91b1aab89441729997744
 AUX crossfire-client-1.12.0-libpng15.patch 864 SHA256 4420de57673ce891712a03d243a12dc9fb27061b9aac6143b67741f04771b9a6 SHA512 d72c1ad55f5047a09c05a51b20d6e5e77e56c4908f98c980f84d3f083208279a1d814c87b501234e8cf4b2db8568fd001630e60ed64160202094f162c65fb621 WHIRLPOOL 80344d4f7872298af92372c232f9606d618be5528495e92c5d49daf37cb9e552ba115006ee74c4076262d859b89b4392c4d81408bc794ec583a986f029cf76e9
 AUX crossfire-client-1.12.0-lua.patch 568 SHA256 b1d02cb6e6b179696aa7b49b41761d2a309aba18c001739d56e06dac95978904 SHA512 ed653c8e2bf1187995b8a969c075c422f3f78773f5681eeb2e388117d1fe5b036d95ef51958aa5a3ecd5be9afdd7475e6624b6835bad4a2c6824f6ea5e45d994 WHIRLPOOL a1fba6fb7bd5dbfd5de758a7e5817c5144d884ca6620d2bc0772738658331ca3dd1e664a2532a7e6f817c1c91f267da90a9f871867492d38f1d68a57fa891067
 AUX crossfire-client-1.12.0-underlink.patch 474 SHA256 fcf7c9db26027f25ef2b532cd9555deed5d512776c429b669ceb6e95f968e3d0 SHA512 143da927ff0201475209384ec14dd72ef625493d0208a41001d1363c7c03641894af062a09b95a766423971615f0234c3430203d9368bc141a65d85eda1372af WHIRLPOOL 81bed2fe978599c21a167cb19f5b2449b709f05cc9fdb8fe8ddf2aa0a217a2fecce809735d0c529bc11db4f496125836b8a33ba2189c403c341d411800f5815e
+AUX crossfire-client-1.70.0-gold.patch 327 SHA256 5d63d6655e5a7e4001a1748daa551b77512a3b8301c1729911c7f3a9ede07a49 SHA512 375dbc5d19f4c69aa778fd7fb821dd805b353dfe4ef7078951cb0eef706a6a85fd795acafe7b01ec2971c8d0b95968d94fc90c6b37529c256dc322d9f1aabc64 WHIRLPOOL d417cfabf89afa9cab348b2015feb1fc4065aba6602f06be24a75377eabf8e00cd28695eded76f98efb164cfc3df299b9a930989cf86e3d500d7eb422a15f593
 DIST crossfire-client-1.12.0.tar.bz2 823766 SHA256 cfdbc11d06f00d53bde9620ed0a13b5fd54fc7fec4d11b4beaf2146c3cedf227 SHA512 95bfe04102c4245b048ff743db8720a683e4774821a5bdb3388704c14d20daa57a36ffb2b66c1ece1e836d8d3c41319454b280b7010e2d5f4133b5ad990d8e71 WHIRLPOOL 72f4cf84a093cf745552dd2311970b727a2c1c6994e409393cd02cc940c378d35974cebbcd283fd40600e73469c1c164faefe5b37e15481cfa532247b8a3575a
 DIST crossfire-client-1.70.0.tar.gz 801043 SHA256 afa3981785689baa22813ebc3893250c2f73374dda64bfc1dc41e64f4adc60b2 SHA512 ce5b07cd6de03bd2dd28bbb85798ff26ad6764ee5490ba3920b160f6aa109bf5ae409d98855081b4498c3e8fee2e04f2f64a03553366d5f283bca516880e3bd7 WHIRLPOOL b407206deefc5aad6dadabfd37895938587209d3af395cd2a630062fa4102056dd66c01d3e2924d4ae633851b85807735b1d6225eba35194c1c4654181df206e
 EBUILD crossfire-client-1.12.0.ebuild 1737 SHA256 4240617047a53aa633ed8d6fdc1225995ff416602a853d6e927848f50efc443b SHA512 63e2772473c920f643466092f0d8ba8215d788086726be7b01d2965488457916f9e9dff76c3e12b2812893311ecc5190e9cb3cec7e6d307b7166a6ab2361a172 WHIRLPOOL 0022bfcc920e4f8a2b7e2ee6f88f4ae580c7e478c8ac0d3fc0b146672fe5ed52b1302fa1a07c35bbf7e9f6791892493b6fb407931f4c1c7856cb1aeb2b225d6e
+EBUILD crossfire-client-1.70.0-r1.ebuild 1815 SHA256 da4df77a9c866ea67c0207cf3f00a118f8bd43787a7702029215df6a9d81a6f9 SHA512 ff2b58a39c8a0910df64c8d5a06d75f323c29c7d61426e4e585b0829e2bd050cb05a7ac5a4a2183d19279955cff24f51eea051c057308a97b228729219b650fb WHIRLPOOL 3a2e4d35d299dc0655e814efc10f443c94612ca5377fdf703ea971a709318ace19338c1ee834394f293de5b01626730df5d9545925fd4072773184fd374ab68e
 EBUILD crossfire-client-1.70.0.ebuild 1736 SHA256 affd303beb74376773c9193179146e24ad1d4dc50d33da9b5dedfbdf6f9e1fe9 SHA512 8361055603d30c6f2d8a08036ba6e390d1a95757384146e4aea0d740f474f4c3b97665d3ba925c5fb4ae37da897c10517f3d7776f0400f947d084e488535590b WHIRLPOOL 95bc0b979c3e52426f54ba8d23c92f03bdf7855208f6d14cab652582ebd6efbcbbdab56ca3bb5beb1981f8eab8804f6adb3fba4748b43f74f9b364423a4895bf
-MISC ChangeLog 6069 SHA256 46e47ea85caf9090c537662bf5a09f53ee0c6dbdc7e5e66a35000706172bcd19 SHA512 5fa027cbb3e0e8917d15b721eacc60dd1d4e05480461b71c39961378d289db7528c425bb0861733d76515d98c670b4506e36b227ca14dfd4edc5cd7bcb5437b4 WHIRLPOOL 1a62cb6520b837417fbb3f057625c7a2f25237b8f8a74d7f0a7314579fa7edc22232586d95301a7ffddbade0fa7d0084495286cc613939515f33fa0738d36166
+MISC ChangeLog 6283 SHA256 3ecabc7f462121480cf4b06ee8ac97e9bd5a708b5c55bb72959bfdd94fb8a697 SHA512 c8360b523241c93262ab97c199d68e2d4ac04bf51cb7e4f4b15e12e4900983700ad430ea7071b3fc1c48431063b5c2f4713dac6dd4851e27d079b42ec3b9eb9a WHIRLPOOL 17bb3dc4ec636a419b1e8948f6a3c21feb1486ac41c097627beace110968238fde7980fae8145333d93fc217bd88c4a193106f44a1e28e990d231fe9894decbf
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBjXdAAoJEFpvPKfnPDWzirYH/1TC+XZxVUDIsNO6raNjJdjc
+VriO3qpIIyRNMsuGweb8F28hBnKbKyiCR2apN7PsU622kF2Abmr814WznA3hG+rx
+Rm/y437Lc+9hhC0QOUYS6GorIwHffjV/vJlQBHlimAKwn97a7gZ7znmAtPQQyrp+
+JBV0xl+ZmUwDta37+aySHNkCQVF/WSD7aY1IKiwXb4kWAWLiTKxhZ+SwkZeE++lz
+RrLR2wuQWND0Hhrm9yhXi1TWNb9h+UDQpUjCLzNsEZOaDzqwqWPBpHelRbVQBaH6
+xCrZjDJVMxCdhs9238DhOpuJIiuXtaV1oLSgxFTxEfLX4C2nhGtmAPhWij9B8u4=
+=YcQ0
+-----END PGP SIGNATURE-----
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.70.0-r1.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.70.0-r1.ebuild
new file mode 100644
index 000000000000..d9d1609d303a
--- /dev/null
+++ b/games-roguelike/crossfire-client/crossfire-client-1.70.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/crossfire-client/crossfire-client-1.70.0-r1.ebuild,v 1.1 2013/01/28 08:24:58 hasufell Exp $
+
+EAPI=5
+inherit autotools eutils toolchain-funcs gnome2-utils games
+
+DESCRIPTION="Client for the nethack-style but more in the line of UO"
+HOMEPAGE="http://crossfire.real-time.com/"
+SRC_URI="mirror://sourceforge/crossfire/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa lua oss sdl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	virtual/opengl
+	x11-libs/gtk+:2
+	gnome-base/libglade
+	sdl? ( media-libs/libsdl[video]
+		media-libs/sdl-image )
+	lua? ( dev-lang/lua )
+	net-misc/curl
+	media-libs/freeglut
+	media-libs/libpng:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -ri -e '/^.TH/s:$: 6:' $(find . -name "*man") || die
+	epatch "${FILESDIR}"/${P}-gold.patch
+	eautoreconf
+}
+
+src_configure() {
+	# bugs in configure script so we cant use $(use_enable ...)
+	local myconf
+
+	use sdl || myconf="${myconf} --disable-sdl"
+	use alsa || myconf="${myconf} --disable-alsa9 --disable-alsa"
+	if ! use alsa && ! use oss ; then
+		myconf="${myconf} --disable-sound"
+	fi
+	egamesconf ${myconf}
+}
+
+src_compile() {
+	# bug 139785
+	if use alsa || use oss ; then
+		emake -j1 -C sound-src AR="$(tc-getAR)"
+	fi
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	local s
+
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO
+	domenu gtk-v2/crossfire-client.desktop
+	for s in 16 32 48
+	do
+		newicon -s ${s} pixmaps/${s}x${s}.png ${PN}.png
+	done
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-roguelike/crossfire-client/files/crossfire-client-1.70.0-gold.patch b/games-roguelike/crossfire-client/files/crossfire-client-1.70.0-gold.patch
new file mode 100644
index 000000000000..74dbe1334b70
--- /dev/null
+++ b/games-roguelike/crossfire-client/files/crossfire-client-1.70.0-gold.patch
@@ -0,0 +1,16 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Jan 28 08:14:23 UTC 2013
+Subject: fix underlinking
+
+--- crossfire-client-1.70.0/configure.ac
++++ crossfire-client-1.70.0/configure.ac
+@@ -242,6 +242,9 @@
+ AC_PROG_CPP
+ AC_PROG_RANLIB
+ 
++# Check for X11
++PKG_CHECK_MODULES([X], [x11])
++
+ AC_SUBST(X_LIBS)
+ AC_SUBST(X_CFLAGS)
+