games-strategy/openra: properly match upstream versioning, switch to git-based, fix sed-call for .desktop files, remove needless doicon rule

4 files changed, 24 insertions, 17 deletions

diff --git a/games-strategy/openra/ChangeLog b/games-strategy/openra/ChangeLog
index e8b406ea4..9c72bd015 100644
--- a/games-strategy/openra/ChangeLog
+++ b/games-strategy/openra/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openra-20120315 (02 Apr 2012)
+
+  02 Apr 2012; hasufell <julian.ospald@googlemail.com>
+  -openra-0_pre20120304.ebuild, -files/openra-0_pre20120304-makefile.patch,
+  +openra-20120315.ebuild, +files/openra-20120315-makefile.patch:
+  properly match upstream versioning, switch to git-based, fix sed-call for
+  .desktop files, remove needless doicon rule
+
   01 Apr 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   openra-0_pre20120304.ebuild:
   hasufell: add a sed-call otherwise the game does not report any version when
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index 7c8ca88e3..514b9351d 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -1,8 +1,7 @@
-AUX openra-0_pre20120304-makefile.patch 1425 RMD160 f427649501d47c70cb9fce5ec618766d714f3ec2 SHA1 6d7315cbcd494e90798d826b9ecdcdb99dd0363e SHA256 118007e882b685aeffa994fba3f5a0e5c41ba447cd526ff8af20de2d69c459ff
+AUX openra-20120315-makefile.patch 1425 RMD160 f427649501d47c70cb9fce5ec618766d714f3ec2 SHA1 6d7315cbcd494e90798d826b9ecdcdb99dd0363e SHA256 118007e882b685aeffa994fba3f5a0e5c41ba447cd526ff8af20de2d69c459ff
 AUX openra-cnc.desktop 179 RMD160 37515323230b95ea3f9ae55b8583a6b485eb84f4 SHA1 a9df52c1967e00da6790bf987c55caf16b09e4b6 SHA256 6d5d77d5206ce24a40eac150f70ef9561553da5390dcd010ccaac064db31a0ef
 AUX openra-editor.desktop 147 RMD160 1b71e5a6d3c67349c874bd62d2884249fbe6573f SHA1 03c302358840fb2e7988dcae5b5d5d2639c3e65d SHA256 be65ea2c5548662ce0ee5d9863f26fac0c0626dc712bb1c1e6ff6a6af064621d
 AUX openra-ra.desktop 169 RMD160 c625dc42ef786f4fab61f510b495459ecf18f8aa SHA1 264747729e1c83bd24ea4b7cd884c3ea1479ddad SHA256 f6ca60a25bc66619d83a0bf93d990f338299ef42e54a4c3eb237239057b08686
-DIST openra-0_pre20120304.tar.gz 10302208 RMD160 6806fc50ec48b91da48b51b349d45976e89e59c0 SHA1 0561e3725af61a10ee0ff0bc1b542e3a24feb9df SHA256 4713db425c817ff9addbbc20c8d37f48f57ad0df6796707b75c27bd1b62d0aea
-EBUILD openra-0_pre20120304.ebuild 1973 RMD160 794120d09da3207c29e78f7ba0a5eaf16ded57aa SHA1 63a29292ce1b663e9e5de284c348938a165661e4 SHA256 4f2547f12052af163cea00e1ad08bb256b5a63e1f8475ca2f7a8a15a606073a2
-MISC ChangeLog 723 RMD160 6f875166003d295393f8bf3d8d272e63c4f21b8f SHA1 beac6b26264547f98470e6fab017d11736162ca8 SHA256 2c37190e603f66a58778077de14f61c6f9a3dbcefa33b2c1b7b756de9c0e0a67
+EBUILD openra-20120315.ebuild 1996 RMD160 6d7332958d7714f95a3dcd983045ae25c3ed4d17 SHA1 a584421dce48ecb17c882675a0fed4b7e1136251 SHA256 e7f5fb73e04a073ede8fc1c671d229bcc7460aff41c53532fd65ab0e224c08de
+MISC ChangeLog 1075 RMD160 c61aa49b742413b7f198a0ca25c589bd29ec4257 SHA1 8504657c1365414d0a721f05ba5312b2efcb95a9 SHA256 e16b66c75f8dbd50b8677ea2fcb1597f27041fb2e000636242b1af4afc298f77
 MISC metadata.xml 277 RMD160 deef251b1089c0d0655fdbf52772c18f013c3786 SHA1 0c0b2d64253140602f55f3a9f253d15bf3feac45 SHA256 3706bb4995873a3063e6224888dee01cde0df6f2522f745b2d38ebcc7db0cd2f
diff --git a/games-strategy/openra/files/openra-0_pre20120304-makefile.patch b/games-strategy/openra/files/openra-20120315-makefile.patch
index 4dacda35d..4dacda35d 100644
--- a/games-strategy/openra/files/openra-0_pre20120304-makefile.patch
+++ b/games-strategy/openra/files/openra-20120315-makefile.patch
diff --git a/games-strategy/openra/openra-0_pre20120304.ebuild b/games-strategy/openra/openra-20120315.ebuild
index 54a668649..9af7443b1 100644
--- a/games-strategy/openra/openra-0_pre20120304.ebuild
+++ b/games-strategy/openra/openra-20120315.ebuild
@@ -4,13 +4,13 @@
 
 EAPI=3
 
-inherit eutils mono gnome2-utils games
+EGIT_REPO_URI="git://github.com/OpenRA/OpenRA.git"
+EGIT_COMMIT="release-${PV}"
 
-MY_PV=${PV#*pre}
+inherit eutils mono gnome2-utils games git-2
 
 DESCRIPTION="A Libre/Free RTS engine supporting early Westwood games like Command & Conquer and Red Alert"
 HOMEPAGE="http://open-ra.org/"
-SRC_URI="http://badading.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -19,6 +19,7 @@ IUSE="cg"
 
 DEPEND="dev-dotnet/libgdiplus
 	dev-lang/mono
+	!games-strategy/openra-bin
 	media-libs/freetype:2[X]
 	media-libs/libsdl[X,audio,video]
 	media-libs/openal
@@ -31,17 +32,9 @@ src_prepare() {
 	# fix a few paths and install-rules
 	epatch "${FILESDIR}"/${P}-makefile.patch
 
-	if use cg ; then
-		# set default renderer to cg
-		sed \
-			-e '/Renderer/s/Gl/Cg/' \
-			-i ${PN}-{cnc,ra}.desktop \
-			|| die "setting default renderer in desktop file failed"
-	fi
-
 	# register game-version
 	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${MY_PV}/" \
+		-e "/Version/s/{DEV_VERSION}/${EGIT_COMMIT}/" \
 		-i mods/{ra,cnc}/mod.yaml || die
 }
 
@@ -58,7 +51,6 @@ src_install() {
 	# icons
 	insinto /usr/share/icons/
 	doins -r packaging/linux/hicolor || die
-	newicon soviet-logo.png ${PN}.png || die
 
 	# .desktop files
 	domenu "${FILESDIR}"/${PN}-{cnc,editor,ra}.desktop || die
@@ -66,6 +58,14 @@ src_install() {
 	#docs
 	dodoc README HACKING CHANGELOG || die
 
+	if use cg ; then
+		# set default renderer to cg
+		sed \
+			-e '/Renderer/s/Gl/Cg/' \
+			-i "${D}"/usr/share/applications/${PN}-{cnc,ra}.desktop \
+			|| die "setting default renderer in desktop file failed"
+	fi
+
 	# file permissions
 	prepgamesdirs
 }