fix underlinking and other stuff wrt #489312

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

4 files changed, 106 insertions, 7 deletions

diff --git a/games-strategy/glob2/ChangeLog b/games-strategy/glob2/ChangeLog
index af8ec9e6f8b0..1c0eef82a38d 100644
--- a/games-strategy/glob2/ChangeLog
+++ b/games-strategy/glob2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/glob2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.55 2012/11/07 10:29:13 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/ChangeLog,v 1.56 2013/10/27 16:49:34 hasufell Exp $
+
+*glob2-0.9.4.4-r1 (27 Oct 2013)
+
+  27 Oct 2013; Julian Ospald <hasufell@gentoo.org>
+  +files/glob2-0.9.4.4-underlinking.patch, +glob2-0.9.4.4-r1.ebuild:
+  fix underlinking and other stuff wrt #489312
 
   07 Nov 2012; Tupone Alfredo <tupone@gentoo.org> glob2-0.9.4.4.ebuild:
   Migration to EAPI 4
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
index 9f0072b99c40..bcdfdcb2623e 100644
--- a/games-strategy/glob2/Manifest
+++ b/games-strategy/glob2/Manifest
@@ -3,14 +3,20 @@ Hash: SHA256
 
 AUX glob2-0.9.4.4-gcc44.patch 256 SHA256 053cf0dc887340c9ded2e012e7e9dd87763fe5a6e4134e61baa791d6e8e6494c SHA512 3030cc72d80aabb0ef199b4ce86df80be9f4be4165d72cfb65bb9ea663314976f3783b911f3cb3150bdf733e54b4badbb35ba520f0e33357fe72d9d73ad9a905 WHIRLPOOL 1548598d85c326f6cf6e37ece8d801590fbeeda275a71c1e0710d332b2b29aedf85f1124afb17f0e71e7ddf0a84d0acb1206eac26cfba6ecaec40b7ec3254a66
 AUX glob2-0.9.4.4-scons-blows.patch 975 SHA256 9e9146dd8e7ee3f23c9ebbd2c3cf3d16cf4b271c75cb6cd16a9161759e6fd45b SHA512 8cc48405b8baaf753f6c290c00bd3c4e790e86386fa9c594477d2c0a28594d3080d51d2220b87a56f8e44861f3141e0c3d1f351841ea0c6e705830ecb0ed7822 WHIRLPOOL 441cdaf9f3c31d04c5098aad5b8fc24dc17914f9570de968512765e5c4f75d5c9e3f0eb56a682e43a96687955efd19ad9330ae2628385a6d7b044d9bc7225ebe
+AUX glob2-0.9.4.4-underlinking.patch 810 SHA256 d048f19acac6d00a8999156b81ce4b22a5e7120fb19aafdb3b859b9cd70947e5 SHA512 fca313ba8fcd741867bcac1224a94f5f9996a0f2f3378010909241d4ae8638f4b555a99dc6236b1f9519a3fd362686efa08a1e8e3613f1f696b98fc4321b074e WHIRLPOOL e174cf08b3e906e44e1b2d8d5c54c9cfa58d864d150b629d0a19b546b8a287a7d3dfe653c95d287d1816e7a1d0bcbbd0eab15f6adcf46340212f7efd07469e51
 DIST glob2-0.9.4.4.tar.gz 11338986 SHA256 0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8 SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca WHIRLPOOL d151bc9601eb283a366d98ae23bd5eb6b793024c5f9b9cf49ddc55910142885e5b2f89bfdce4f879190368466f2cc01e836a9178fd899d27d4342bee4c1f9a3a
+EBUILD glob2-0.9.4.4-r1.ebuild 1464 SHA256 800b5b2b43315a7b1aa2b54b18fe7a12cc12e209731a21ec19421827aebae413 SHA512 0d695fe7d7decb028efe52f4394939179146254b8eaaf50451c7463d3b6ad12c5e31ea7e1022aab11c7527805928bc12d7544baf78b4e65b3cab2fc9906a95b8 WHIRLPOOL 1bfd727274e8a84ede62aab89d177a1d763448a0de7f58354c49f49b458e8ef46431f1ac70513d199d9d3e17816dd1cd4dc1652503f409f4126ecbdc7264fbac
 EBUILD glob2-0.9.4.4.ebuild 1257 SHA256 f867e1ac10ee8855ad61ab2e5819767b9704289ef22f8ab0814d272065bbb8aa SHA512 becb408e30a3827238fa0f92a2189c2997a9c42dd4172ce563b8e2f0451c94da3ef13ba49af7c29d07f00e862911df57b8e019dda653edb7cc1b9a8a0061060a WHIRLPOOL 919a491ff541cf461d05c71850fed300019b8b8b2fff622fbc79bca7142aab2d6667ccd1b832bb9170a434b6a00985c8497df57052268b879d8f03aa7a6eaf70
-MISC ChangeLog 6688 SHA256 f3c643352a60646022f0140db5359cc632701b9eaaf5c2d0fc454accd7080d09 SHA512 432d0bb0b5f941b1178e3dc527e2f6cc7e8e12aed5b1cd66db0bf4104398eca4c14e497c4f53dccdfc06c3e0e45479c7afd44e0ca628f43fb6ae943e21715ef2 WHIRLPOOL 9fbb54f193efaff9045c858706f62889514a87a63042dc3c0e3e960e41ba80c7903adf492137a3e329c1fef33450745b2ea8fda87ae20a76d607c7364cf2ff82
+MISC ChangeLog 6891 SHA256 1f9074fd0fea7621eb75b721d9ced6f2372d0e5e56cef6ca1bc31689a7f97f93 SHA512 27a35ae79d95c1900447caf299fb8c7ebf44e2d7e45d29287b2553118bf56153cd7ee7da98154573964fa3f8f3fff10982e5778bf0fff6131b4fe9f0bf52c4fe WHIRLPOOL a7e88fa756b9766c812838fec53d7f52c7e33f397f9d25a00c60cf14edbe296b99354ce94a8ffb614ab5024d9dd289ebefacc88dda558f882197ca17665e661f
 MISC metadata.xml 546 SHA256 f55b8dd9eba3e7bbaf5765b86e7c434d6f53285c3aa43923c3ec247c569cf8fd SHA512 34b1d913d42b52156cf3b14f0993e11b081a33f3f56f24befcfbee8f4ee59a432cb9f7f84e54f1a385030ac2c18d79ee0367e5121baac8e5087291db7b31840f WHIRLPOOL 306897493790d0b357913d34aa803295db81e929e3eef122c145a2556f7c1901d78a44a806994650323ba3678bc3b36bd2359fe625625e51ac08037fc6afcca0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlCaN/8ACgkQIY77eQFFFC1mowCfa8GWIQ+QmbqlPwNhF426fWwZ
-LNAAninbUT3Xl+Ol/2JxGh70PaC3UE+o
-=i2qb
+iQEcBAEBCAAGBQJSbUQiAAoJEFpvPKfnPDWzMKEIAInUteRIKx/PDwRaSa4iweb6
+fdlc3q2E5t2OMsMzAp68/Bil5QAHefkaDOfIQc3jDUz8Y3+wDggNf+oa6fb85dym
+CR9XUlsE+Mjcg+hbnXV9f8K2WQCqwkkdp6TdS8/fpupRcxG7U0IoTYTMtPqzOaz3
+MkL27z5rq4b1F3SVirjwS+PDmvhMdC+P1J/Esy7XTruSgKcXsmOh2pIx2+GJrFRK
+tAgOeJLhcJtP6CnbO4rPlKid5R4blmbdRIxf/S3POlntecFMW0/Nuaf8wnbQWYig
+OJUle1PGeGsJboPbU0iXTry8rMAKOG8uye+7Sc2tKuAk8yiDganpgY7xeSuGXlk=
+=zyLA
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
new file mode 100644
index 000000000000..2b6342276f46
--- /dev/null
+++ b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
@@ -0,0 +1,20 @@
+diff -burN glob2-0.9.4.4.orig/SConstruct glob2-0.9.4.4/SConstruct
+--- glob2-0.9.4.4.orig/SConstruct	2009-08-30 21:23:30.000000000 +0200
++++ glob2-0.9.4.4/SConstruct	2013-10-24 21:03:46.755492770 +0200
+@@ -110,6 +110,16 @@
+             print "Could not find libz or zlib1.dll"
+             missing.append("zlib")
+ 
++    boost_system = ''
++    if conf.CheckLib("boost_system"):
++        boost_system="boost_system"
++    elif conf.CheckLib("boost_system-mt"):
++        boost_system="boost_system-mt"
++    else:
++        print "Could not find libboost_system or libboost_system-mt"
++        missing.append("libboost_system")
++    env.Append(LIBS=[boost_system])
++
+     boost_thread = ''
+     if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"):
+         boost_thread="boost_thread"
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
new file mode 100644
index 000000000000..3db298d4b8c8
--- /dev/null
+++ b/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/glob2/glob2-0.9.4.4-r1.ebuild,v 1.1 2013/10/27 16:49:34 hasufell Exp $
+
+EAPI=5
+inherit eutils gnome2-utils scons-utils games
+
+DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
+HOMEPAGE="http://globulation2.org/"
+SRC_URI="mirror://nongnu/glob2/${PV:0:5}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/boost-1.34[threads]
+	dev-libs/fribidi
+	media-libs/libsdl[opengl]
+	media-libs/libvorbis
+	media-libs/sdl-image[png]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	media-libs/speex
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-{gcc44,scons-blows,underlinking}.patch )
+
+src_configure() {
+	myesconsargs=(
+		INSTALLDIR="${GAMES_DATADIR}"/${PN}
+		DATADIR="${GAMES_DATADIR}"/${PN}
+	)
+	escons data
+}
+
+src_compile() {
+	escons
+}
+
+src_install() {
+	dogamesbin src/${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r campaigns data maps scripts
+	find "${D}/${GAMES_DATADIR}"/${PN} -name SConscript -exec rm -f '{}' +
+	newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png
+	make_desktop_entry glob2 "Globulation 2"
+	dodoc README*
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}