revbump, rm obsolete cg useflag, fix sdl2 support

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

4 files changed, 60 insertions, 28 deletions

diff --git a/games-strategy/openra/ChangeLog b/games-strategy/openra/ChangeLog
index 603522e35785..33031f869a0b 100644
--- a/games-strategy/openra/ChangeLog
+++ b/games-strategy/openra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/openra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.24 2013/12/22 22:37:14 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/ChangeLog,v 1.25 2013/12/24 21:46:19 hasufell Exp $
+
+*openra-20131223-r1 (24 Dec 2013)
+
+  24 Dec 2013; Julian Ospald <hasufell@gentoo.org> -openra-20131223.ebuild,
+  +openra-20131223-r1.ebuild, +files/openra-20131223-sdl2.patch:
+  revbump, rm obsolete cg useflag, fix sdl2 support
 
 *openra-20131223 (22 Dec 2013)
 
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index e04ef6697778..299d3b09e84e 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -5,6 +5,7 @@ AUX README.gentoo 4754 SHA256 fe5d3a65472701fdfa44fe3e27aad694a13881932f75dbbba5
 AUX openra-20120630-sound.patch 616 SHA256 6270dee1ead19c3abefdd1f3742cffbc0af9675f50d8fbcef5a0fb1a856ce16a SHA512 a6d04128fa53cdb70bb6d5de0b529ed283349c3748b3d3d455462f9ec6e3e5defeb49dede887072f52ffe4025b5f43ade42c66708a2deeacd82f06e1b1d68f1c WHIRLPOOL ff14e623e1e0daba621ab9eb701c3665bef32ef2bd838ddf22e181885ab1245f02b5c6f4fca3de95c12bc250ff1588eb1b0becd3897df8a2261d1ab66be9de65
 AUX openra-20130514-makefile.patch 12143 SHA256 7426f60ebac6cd0130d1fb0e05785c2d71dd8ac6a66d7f7f06c6e9e00a69839f SHA512 2c071d2dcb7c8af9983d3c66cf2a0d522e313256250b36b4928abb734db52b18b0636746b466cc5b09b0527560979d05aac905f5ef5e213150a0cc5dc60e0447 WHIRLPOOL 921c4fda40ccbfb5e107b236abd9241ba438b4b6095377525795b636dcb315545e639fa2dfe20e45d6152cc582f74a26a01d19c2095e73ead5bbbffd47a4e0c2
 AUX openra-20130915-make.patch 830 SHA256 95ec85eab0c80ef038507eabaa1a22069289d3b1c012ed357e915dad63836dd1 SHA512 ce6277a6f9c03cca8111a6f605b66a48b35350481a21ca9a104efa2a5a02352ca78f38de018f712862af3b8fab4afad53c546ba97914fd10aca9ac583d89b736 WHIRLPOOL 7e91801eeb3f993d5fbb4f3645d28065a33120ee922d29f4e6e06984bb6362f41a079168014ca3dff89ea13c396f78c2b49f36b80851f4a850a6b8a93ab24f5c
+AUX openra-20131223-sdl2.patch 793 SHA256 e98f378097f5e354fba802e0c3003ca6156e2756ebab6b7dee5896b51fd84b21 SHA512 ac934bbc88bd80aeb2e04fa55c2e3e267b15e78a2ff8f479e088c9a2655eb85f65a43d859c2e680aaf2e602ed7eaa9c31181970478ecbd5be029ed80f605a0d7 WHIRLPOOL 504b768b282089a065ca50344cd21e825a89b8c198db7ab415d1ee21b6c98d738694fc80c7474c02421d9a53f344a4cc4c36b91eaae1d3ca40663231c65f8263
 DIST openra-20120630.tar.gz 10330304 SHA256 f95b9d41ea4b4094ea61519f6fb0185fa242af156e2ec26dc1f2d55197470a3c SHA512 ab5996a3f48d8be227edc029d3fa7948a80756a64bca65d1936c3f4480ef5258cb62365d079cc28ba2be59796db91326c4f8c8d500ea4d2bbf3a8439d783fceb WHIRLPOOL 390b5fa57ef322e6204a23006fc3a7755178d28e115fd52fa4ca5b46ecf58f8df61b44a90ba2fe143a7fadd0be42aaf3488c3b938eaea11171636b562dfe344d
 DIST openra-20121019.tar.gz 11338976 SHA256 016dd79f759c539889c290e7bd90b3faa92e88c35c6cd20789803b30135978e9 SHA512 199a88b2a34c05787e1d5ebced15975c76b2fb45d70c613db679e7faaa158942a7ddc842ff8e0f912e4e70beb3dab4f281e62dee76899fc67582ec8c067b3556 WHIRLPOOL bf694d4e94d35dd31343b127e7c4855b3bcf56cd6559d5f6a3c3f4ee9e40f627880e79ba599d5929d8c5b49643b93c09ee9d55f35c426d08526736190a9029a2
 DIST openra-20130514.tar.gz 12592295 SHA256 0912303c7a02cf3907f618405c3605c56bcf30f053dcbbd110aba7dbad012210 SHA512 a9efddffb74b215cc9f5319f6b4613aa23116d328226c0cb428e8d2be97b03dfe45024c532c34e91d959434700a6170faa91a56b324aa2bfe1f1ce7ce96d46c4 WHIRLPOOL d91b911b76a7e3f6286f50d4d33beb6a7cb3e0035ef8b3331e6033e2487a13be8e8aac70fde30b7cbc139b71bd8bf5259a97ce0a642fcb386a3e5136223322ea
@@ -14,17 +15,17 @@ EBUILD openra-20120630.ebuild 2040 SHA256 b3c3891ad26a81d27d4c8a68eed507026d4ce5
 EBUILD openra-20121019.ebuild 2107 SHA256 13e09c553eefe18ab63a4adfc1bf8b5e7bf8d761d6a7b1c3f911a630e62ab887 SHA512 594822765e56ee6507f2bec899638736ea664bfd8bc7428608a7fc5fec0ec5cf88f912c9e5ea653a56d52eda753a9e537d589ef8b7aeaf308cc22641068d5c5b WHIRLPOOL 02a73b867ea0f10069fd9626d5a9a10e529302710e0b7749bb12db3b9c56428751ddf9e20aa1ef695395be124601ce2c125211f6ab169ec7000336057bc8aac0
 EBUILD openra-20130514-r1.ebuild 2262 SHA256 65bf2d2f008397df715bc0a94de699c981b6c26305f1ac473a5d0a97c176640c SHA512 8248264cd229d14a5a2525fde21fcad997d0ea9190f27dc4b1ebca98fee2558bc07f9ee22a5f4e9314300c6a5467cd9bb2284c186b038bf8ccc540d853abf781 WHIRLPOOL 461e7b838beb2051d8b4f6b4c197bff1f9ed9b8400f0042e87da354be69e83e8804d554b895801ebdda204cbee4c0d356a5705427998cb4e2c1191e20c0744cb
 EBUILD openra-20130915.ebuild 2262 SHA256 fde755dabb70dcf02f2298f14665d3fbd98643f6694f414ca37bed10d7deea45 SHA512 7db0e1a6e511b7fb9235f3654fb6c6ab0ba94b17e207e6a509ed690169ae346172c3b58303459240dc6512778a225b7e2eb582ab16fc023fa72f8fc9d25f7f3e WHIRLPOOL 64da89a431c826b765aded3247ffed405be6c619c34c1ba873a26c77e1996fdda4faceec368d37b4184112d60f78e00d731936bd516a4ac94f3ba35c1f70dedd
-EBUILD openra-20131223.ebuild 2182 SHA256 773fa18d90087d64d5df261fee796c4ca73793d5f673e6fc03bd86a4dbcedfb4 SHA512 864df802061d0eb5f6299a33b0a277571dbe135153344624f9571c47bcb9daeb3f857eac99c2705a864a47d985a9b2e9ef8ad9adc643727ff943bf078ff54424 WHIRLPOOL dc8962dad61758d55640b4cf66c343da86fa99c70335a57715e51f05f97e95555e3361d5235478f1858b08175aead8c786f409672fb0b06f0db6a865336c5741
-MISC ChangeLog 3215 SHA256 128f6b578955dcfa9245929d846ef4f7661d0223b4eeaa4d17a1b2303ab15ea5 SHA512 57d0a5d9d70576200ae73a0138e9361bc6fae478b2c5afb1415b01aa3355b8377e700dd0a594b1d1cf7d90e4b5fb947163b5dd41f1104e2a04c3928035cd0de6 WHIRLPOOL 19f5051a9145d6e668bc17036b80a452c28af145bfb0c7b08ba812ce5338b5939ef5b9ba8cadba4b28bd4d4206560d721521b5a318a61c58050eb3601b03ce27
+EBUILD openra-20131223-r1.ebuild 2158 SHA256 a0770abb5bdf4cbd53334bee6a220c4c89e4588b2e881451ddc98fd065c5b8e8 SHA512 24c0d74be6072e929d30469db8a3283985b51bb41050c1ca44403425a7ac58a9be9157323a186a997c36f66687df4f2a822af58897f802dc783d515ba85fac5d WHIRLPOOL 218a5b611e6403a07cfbe66b924c5b52f59a3e40d4b7ae0b3341abced0ae42418724f74ee834cced76464c79bdec332e1b5f98b901491b095f37e6acb016539d
+MISC ChangeLog 3444 SHA256 cc4e472347fddbefe361a50561c38df8e12acd1fb78d0fd4659f6b72641f13d3 SHA512 4dba850a8dd5cd245ab225c7b8d05ef43affb5d88f0aeb398fe46c428c1c03032bb42f8881c6390379fd941c6e2a1c8762b2d8fd5e1c46b1a1ef7c1e5fb77f8a WHIRLPOOL 8bd1b58e1580f49c08c4b52bc782dbc07cbbf6cc9285c5cfa3d27a096260f6430aa6613490dfbfffd6445420347504e389788accbc54b29cc0ea3be842fe8c56
 MISC metadata.xml 814 SHA256 d2ef2dd5e230dd87190de36198e86a1cd368837e1c71de2212b63d0c18831d81 SHA512 1712ccc1d0f096de8da71119e21060586c2b7e232b21b85a4a34df3d5682116abf784be03cd753a64b6f34277e1e347b0295ead2cee8d8ac0aa5468421156379 WHIRLPOOL f5aa621739cd3506a768e405d9c57ef3095237c10bbe0d5fcba05ad8616307f012101928b7985c507af1f8bbffaf88b2431615cc2db5d0af2c74ab97c2c1c433
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSt2mgAAoJEFpvPKfnPDWzpvYH/ip9KTTdIyNtyLpTbH0drslh
-VliyV5AGPYTFFqcwdwrq70XNChrwtq+q7Z0KOE9uU0OCAHuUsLFRg6rtfUUhVl+T
-NVShdjuQyouQ706jqAyAcSBzcfy0luy8M3KUMQA0vvAJmjzgGwb72WKN7hd9sph5
-tOEIAuVmOSF/S+O1KQ+ffYoHaTj9ddnLmuUui44DLfwNeVjPhHi0c8kIHtWTY8Wu
-fi4lHUH65Lv/TyZCOa4E0Ml+sTD/43sgMLZGfAQPpenrunz6Y/pGwSHZyXqJNmwQ
-ZvFxlNqbewnAGhm98YESWvCWGquxeJaLYX7fLCQFXxL4DqsWMwU2otR3kz7aomE=
-=dRq1
+iQEcBAEBCAAGBQJSugCuAAoJEFpvPKfnPDWznqkH/A99YZJNIu+a2zI2hp6nqH+M
+LjLEBgG/8qM1rPIDdPhIXkIrcCwr+orXmc3spECRkF0I8YqV/wwAcad3VU+oADEn
+a8fuxvHBjxqhun3r8MStasTnp1tqJrZgwcHD9axDRlaV8dpyYAyH2QL/f/nQqsGB
+oJbaftv77mkr0/IatQ5Kt4oTyPSw4lR8+mxc5OcrGQaLTOn6KVH8PkwVRV/Akaq8
+NXrM3NMzrHULSEz4ZOqz4DDUB3bURkp1Ho/a0CLJpGJhkNCcQzESJNpQSPxd65Rp
+XiVK1kFIOGfarompAS4dURKfbIksYlovu500kiXCDAF3nexu1y8PP/UMMeNk6xg=
+=ppgC
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/openra/files/openra-20131223-sdl2.patch b/games-strategy/openra/files/openra-20131223-sdl2.patch
new file mode 100644
index 000000000000..c474498294de
--- /dev/null
+++ b/games-strategy/openra/files/openra-20131223-sdl2.patch
@@ -0,0 +1,26 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Dec 24 21:10:12 UTC 2013
+Subject: fix engine detection
+
+--- a/OpenRA.Game/GameRules/Settings.cs
++++ b/OpenRA.Game/GameRules/Settings.cs
+@@ -83,7 +83,7 @@
+ 
+ 	public class GraphicSettings
+ 	{
+-		public string Renderer = "Gl";
++		public string Renderer;
+ 		public WindowMode Mode = WindowMode.PseudoFullscreen;
+ 		public int2 FullscreenSize = new int2(0,0);
+ 		public int2 WindowedSize = new int2(1024, 768);
+--- a/OpenRA.Game/Game.cs
++++ b/OpenRA.Game/Game.cs
+@@ -283,7 +283,7 @@
+ 			}
+ 
+ 			FileSystem.Mount("."); // Needed to access shaders
+-			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", "Gl", "Cg", null };
++			var renderers = new[] { "Sdl2", "Gl", "Cg", null };
+ 			foreach (var r in renderers)
+ 			{
+ 				if (r == null)
diff --git a/games-strategy/openra/openra-20131223.ebuild b/games-strategy/openra/openra-20131223-r1.ebuild
index 5807fd70dfd8..d590579ae53a 100644
--- a/games-strategy/openra/openra-20131223.ebuild
+++ b/games-strategy/openra/openra-20131223-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20131223.ebuild,v 1.1 2013/12/22 22:37:14 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/openra/openra-20131223-r1.ebuild,v 1.1 2013/12/24 21:46:19 hasufell Exp $
 
 EAPI=5
 
@@ -13,16 +13,18 @@ SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cg tools"
+IUSE="tools"
 
 DEPEND="dev-dotnet/libgdiplus
 	dev-lang/mono
 	media-libs/freetype:2[X]
-	media-libs/libsdl[X,opengl,video]
+	|| (
+		media-libs/libsdl[X,opengl,video]
+		media-libs/libsdl2[X,opengl,video]
+	)
 	media-libs/openal
 	virtual/jpeg
-	virtual/opengl
-	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
+	virtual/opengl"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -35,6 +37,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-sdl2.patch
 	# register game-version
 	sed \
 		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
@@ -57,13 +60,9 @@ src_install() {
 	doins -r packaging/linux/hicolor
 
 	# desktop entries
-	local myrenderer=$(usex cg Cg Gl)
-	make_desktop_entry "${PN} Game.Mods=cnc Graphics.Renderer=${myrenderer}" \
-		"OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra Graphics.Renderer=${myrenderer}" \
-		"OpenRA RA" ${PN}
-	make_desktop_entry "${PN} Game.Mods=d2k Graphics.Renderer=${myrenderer}" \
-		"OpenRA Dune2k" ${PN}
+	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
+	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
+	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
 	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
 
 	dodoc "${FILESDIR}"/README.gentoo README.md CHANGELOG
@@ -81,12 +80,12 @@ pkg_postinst() {
 	games_pkg_postinst
 	gnome2_icon_cache_update
 
-	if ! use cg ; then
-		elog "If you have problems starting the game consider switching"
-		elog "to Graphics.Renderer=Cg in openra*.desktop or manually"
-		elog "run:"
-		elog "${PN} Game.Mods=\$mod Graphics.Renderer=Cg"
-	fi
+	elog "optional dependencies:"
+	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
+	elog
+	elog "you might also want to emerge media-libs/libsdl2 specifically,"
+	elog "because ${PN} supports both sdl1.2 and sdl2, but the ebuild only"
+	elog "pulls in one of them, prefering sdl1.2."
 }
 
 pkg_postrm() {