version bump wrt #454124

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

5 files changed, 139 insertions, 18 deletions

diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index 4c14597b8e0e..a0e7f1a22150 100644
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/warzone2100
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.76 2013/02/07 22:19:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.77 2013/02/10 01:27:10 hasufell Exp $
+
+*warzone2100-3.1.0 (10 Feb 2013)
+
+  10 Feb 2013; Julian Ospald <hasufell@gentoo.org> +warzone2100-3.1.0.ebuild,
+  +files/warzone2100-3.1.0-pkgconf.patch, metadata.xml:
+  version bump wrt #454124
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> warzone2100-2.3.9.ebuild:
   Move Creative Commons licenses to shorter names.
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index cd9e5c7cc855..1429a7a1812a 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -2,25 +2,22 @@
 Hash: SHA256
 
 AUX warzone2100-2.3.9-pkgconf.patch 267 SHA256 7a4ccf217f5ce9e72853aebc1e8ba2ba312ed3f1932f6d1212bc87c63b514e0b SHA512 59374869920263c249e3e5f7a3088e4e233e51d263b44323bde5ffc539f458c4354a12c5fb1d6ceb4caf44f0ca5fef0a540797488d5a361225316ce974f05c80 WHIRLPOOL 26d000ba2e732ee8ef4a0c0e0902d87ee33c7b25a61b3cb1db3baa042c7dbc4482ce46791fe1e2e79ef138fb4f9866ab51a405f2e4ff2d879f31acb0ed1f5a9b
+AUX warzone2100-3.1.0-pkgconf.patch 335 SHA256 4d35227323efc7278d2a835b55d4e4dee42cdd9d4375c5dfb93fdf074c0bad54 SHA512 9a6b3da78f37dc2d86945d81b43ab0c548ab3e474429e99ccf5b482cf6d0832c301b1d9d8b547899ec6f8092af6681c7d4e487d8d21e5c3b6745f0a34f3a07d8 WHIRLPOOL 2b8a4d652c140a1fdcf91bb9b71eabc09cf11a0d49938d27acc22a01972ccbe1864d631d4231aa089648d44b65288c9ee8dec8327a0fee8a4b265b44ff89eca8
 DIST warzone2100-2.3.9.tar.gz 62509972 SHA256 9e843bb752c9c4798b8e6ea0edfb625f9aa2f2ba8cbfe42e31ab1c6aa9267adb SHA512 3af34969e701e089886a228f7e2c33b61d763adcfebe6f8f0ac3cdb24ed133173dbf051c544e12e74f278b7193f4cbc79bb1df2d1a974f8d03575557695a8662 WHIRLPOOL 0953c323c86f0771a69c652326cb72356eb9efe45ad787eee0341d8d10a0c92bd6721691d73bdcd07f24e708b6b14ffb046f643393399ac425fe6a040ad4ee4b
-DIST warzone2100-videos-2.2.wz 571937134 SHA256 142ae905be288cca33357a49f42b884c190e828fc0b1b1773ded5dff774f41a3
+DIST warzone2100-3.1.0.tar.xz 67316000 SHA256 c3e24b0a2703ffe5b171401e0eb9decbe9b130d6478e64300ccfb73a60f61c03 SHA512 bcd24d74bf5d9749897367fac1690a5d1abba162b3ecf87906b3674ef092f2a30c83961f5c3952545b7faa1c8970d43815db1e4effc7d87ca830e475e1654ff0 WHIRLPOOL 3955b1f35a422712b1c82cb378353554f49104f673ca18fcd7abe0b712ece213343c575fc8ae0d6e4b8303c0d4f7c6cec36d8d1eca5dd21d1caeb43b4afe1879
+DIST warzone2100-videos-2.2.wz 571937134 SHA256 142ae905be288cca33357a49f42b884c190e828fc0b1b1773ded5dff774f41a3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6 WHIRLPOOL 167e39a896081d75415810cdaa9c00ce3fa4062db1ef2b4f6f164beb9c1a1d3fd34cd474880521b75e4580f4496b246586d9270219e1cfe8e7740d1f7af35ebe
 EBUILD warzone2100-2.3.9.ebuild 1938 SHA256 ce4611fa0309b79236122fd5ec5cef427ff066027b87190ad6e25b400eddbab1 SHA512 393a7ffe09761b418bfdfb11b06658946ef773cb292fac35093b2225df44fdb23430223f1211dd9192478870e777e6b7dda951158d528f72a73c465bafc5027a WHIRLPOOL 87daee988d259d1bc9e45a7bcf300a00aa5e90e72ce428045f6c7974c9795ac26cd075e41db549bdb6a75b57d145cced0f211eba9240095dc68d7be033015fb9
-MISC ChangeLog 10690 SHA256 3c63a366455144def89a9fc4bc03863b449a470d923f6f6b2d33751c6d6f2a3a SHA512 7e960ae3a744f5830815c8dcabaf01e0e85ce7d75257b9174e31439971d8b88f32f9f25cb7251f5e7335da8ef945187712499c66b956624c5dffefb1031c0282 WHIRLPOOL 079aa4793df2afddfa29f339781d3336fb3c49b649a6d4189f5df821356656edf1299a70876a708dcdcca78a7eec868319d51ada32ebd31b6f1f00d082aaf7ca
-MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+EBUILD warzone2100-3.1.0.ebuild 2359 SHA256 a88f56dfd4c97ba9273b968a998a4533430017bcbd820e22abca928a08bd8574 SHA512 074cbd396258768ffcaaec9349e16f4cb1f46fb13a37771b9449f885ab0275d7e79b8fa3e56875152581803d0ffcad801ed30622fc00dbf4bace476a9f0551d6 WHIRLPOOL ab64aedbd5b249bb375c92290a60e28d337170b42ca0a79d5c0335f83e0b5df523311d8c69d405f2745f9edb8c2f0feba92db28e4632216fe6e8429f1cd45f5a
+MISC ChangeLog 10891 SHA256 44973dfde4561e17397f748d3b5377847195e66a7228e7e32128b9bb9544d366 SHA512 5a947fc4118380d7bc8123e6e948dad5394b4326045bad80e6e66abaa9149895c5e9fcca4d9cc31f39b2b541a0b4feb65af4740e5c14c479b4ec08047dd407b5 WHIRLPOOL 08fbb9b7a8301d549de0ce5f8fca2957cacae5bfa71aa286700825348df8292f15cea50e109ed9b85f1dee26a2a26b5114f7fb672a8135482958f96c67b28e27
+MISC metadata.xml 258 SHA256 3d72dcf93bf68cafa88e3ab7abeaa250ff6415c59969a1b10c24f81c6570b089 SHA512 dff6b0ebd26889bf14e8db9e91742beb639304ea0650858deac3c8f49ba06dfdc6dbdc2b6f50ce73ef39019d6d01ffa11969f8f317fd6748bdbef10ac08dd323 WHIRLPOOL ca698218a29bbc050aea21a6cf4adf5377cdc2adeb137a945ca1f6625562e2d53537f648d0196f94d9e61ab0a9a465a666b34e918694fd48fd147d7fa8eee921
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFCljAAoJEDxpGckxwJCBJ/UQAIceQ5+EuMLTi1EyK8Hah6tg
-iDTzKYd+7ORY1BJ5WK/4F1kDbR1OWqR4p+rwO/e6gumlPV4GAM46KzV1BodMwVfO
-nl9X9Q1L/CpWjuBXZMK4SDDn/S4Gk27qS5usga/gG3+z9L5Zv29JXuMKydsYAhhK
-dR8SNn7YvdcN+zCFThERxLu0ICsbRDUrPy03AbtMtqQ5+ynexafTtoH10IACmYvF
-y4STiFriLvEfF/CmgmLDy2QrWILzh2dFFj5BqzpzMvJ6MP+wTK4+JlDgeg+txTDv
-dESXV9t9LwZNzAmh0fPFLXMyA3n75qZYcquh9OqBHXlbcvzvQgMyQvsVPSSexgxg
-gQtniFcYz9WIVfB8N6SWxbZ4UPvYc+VFXjq/uR0cFLRXiHDHlaDaYkVDw7vBMZhu
-YNowoHQ0zLpZA5VRJ8H6AOxWf07ri4zpFUy/LLVkbSfvYNAI6a/RsuoyRoiaoMVf
-WD75GlupwCQTSvAp8ricztbv1arOlYEnGWe0m80u3O079DvnSZzN5fVZZN+266OE
-ulrZp9SX55/je3gJhin3V+6AlD3FXYY6xfPipv8cm/nqaYN6AgM/52ZC9OvNIurj
-J9YrSPDvNahtgBRN3XV098rTitpauNfZzs7d5iSY+idcuc88Ev2bKM/PxK0R8yl8
-BjXinZdEFd1UTMa+fRxZ
-=3E+X
+iQEcBAEBCAAGBQJRFvdyAAoJEFpvPKfnPDWzD48H/2a/FH6itup8n8pmKWyxM8wd
+5kWOrN3G7NQkqqzNK3CNsHLXeRk/WfWdk/2HAOYjmVDiPOSJU+zi+sS84SYB9XoK
+D3c7+C81gdedlgITWCJIZssbFrUReC56u6TceQqgWOrsnVjORBE8B9XTmasKoxsv
+tKwvXQBr+HjGsQuInHZa72HyfbxYraN4JfQCgVcphlGXMB3EiHAGkoVkeK/kgv96
+0pgFbHDFr/zcSFazcqWXNvqFRNCMXWX9p0n1eRdDvbQg/AoAX+4rYMIvdi9R/OAG
+5ZaZOKitXYiYnj0pH6b1jqXBKwFXj8LhGkh+KVM1lvuZHfKO8y7FWWCkAqIK0oU=
+=/BQe
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/warzone2100/files/warzone2100-3.1.0-pkgconf.patch b/games-strategy/warzone2100/files/warzone2100-3.1.0-pkgconf.patch
new file mode 100644
index 000000000000..0149ea776528
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-3.1.0-pkgconf.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=428494
+
+should be obsolete with >=dev-util/pkgconf-0.8.4
+
+--- warzone2100-3.1.0/configure.ac
++++ warzone2100-3.1.0/configure.ac
+@@ -89,7 +89,6 @@
+ 
+ # Check for pkg-config
+ PKG_PROG_PKG_CONFIG
+-AC_PROG_VERSION_CHECK([pkg-config], [0.9])
+ 
+ AC_MSG_CHECKING([for backend])
+ AC_ARG_WITH([backend],
diff --git a/games-strategy/warzone2100/metadata.xml b/games-strategy/warzone2100/metadata.xml
index d3c2cc926f0b..53a01ac6a09e 100644
--- a/games-strategy/warzone2100/metadata.xml
+++ b/games-strategy/warzone2100/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>games</herd>
+	<use>
+		<flag name="qt4">Use qt-gui/qt-opengl for backend rendering instead of sdl</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-strategy/warzone2100/warzone2100-3.1.0.ebuild b/games-strategy/warzone2100/warzone2100-3.1.0.ebuild
new file mode 100644
index 000000000000..c23b55bcd225
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-3.1.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-3.1.0.ebuild,v 1.1 2013/02/10 01:27:10 hasufell Exp $
+
+EAPI=5
+inherit autotools eutils versionator gnome2-utils games
+
+MY_PV=$(get_version_component_range -2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
+	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+# upstream requested debug support
+IUSE="debug nls qt4 videos"
+
+# TODO: unbundle miniupnpc and quesoglc
+RDEPEND=">=dev-games/physfs-2[zip]
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/glew
+	media-libs/libogg
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/qt-core:4
+	x11-libs/qt-script:4
+	nls? ( virtual/libintl )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-opengl:4
+	)
+	!qt4? ( media-libs/libsdl[opengl,video] )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	app-arch/zip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	media-fonts/dejavu"
+
+src_prepare() {
+	sed -i \
+		-e 's/#top_builddir/top_builddir/' \
+		po/Makevars || die
+
+	epatch "${FILESDIR}"/${P}-pkgconf.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--docdir=/usr/share/doc/${PF} \
+		--localedir=/usr/share/locale \
+		--with-distributor="Gentoo ${PF}" \
+		--with-icondir=/usr/share/icons/hicolor/128x128/apps \
+		--with-applicationdir=/usr/share/applications \
+		$(use_enable debug debug relaxed) \
+		$(use_enable nls) \
+		--with-backend=$(usex qt4 "qt" "sdl")
+}
+
+src_install() {
+	default
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
+	if use videos ; then
+		insinto "${GAMES_DATADIR}"/${PN}
+		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+	fi
+	doman doc/warzone2100.6
+	dodoc doc/quickstartguide.pdf
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}