Move cs2d.png to mirrors, bug 417117. Cosmetic clean-ups, add games herd

(Portage version: 2.1.10.63/cvs/Linux x86_64)

5 files changed, 33 insertions, 78 deletions

diff --git a/games-action/cs2d/ChangeLog b/games-action/cs2d/ChangeLog
index f794d54464f0..df39831425b8 100644
--- a/games-action/cs2d/ChangeLog
+++ b/games-action/cs2d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-action/cs2d
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/ChangeLog,v 1.3 2012/03/07 21:28:29 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/ChangeLog,v 1.4 2012/05/30 09:04:20 maksbotan Exp $
+
+*cs2d-0120-r1 (30 May 2012)
+
+  30 May 2012; Maxim Koltsov <maksbotan@gentoo.org> +cs2d-0120-r1.ebuild,
+  -cs2d-0119.ebuild, -cs2d-0120.ebuild, -files/cs2d.png, metadata.xml:
+  Move cs2d.png to mirrors, bug 417117. Cosmetic clean-ups, add games herd
 
 *cs2d-0120 (07 Mar 2012)
 
diff --git a/games-action/cs2d/cs2d-0119.ebuild b/games-action/cs2d/cs2d-0120-r1.ebuild
index d367a4378d6b..b678450e3b6f 100644
--- a/games-action/cs2d/cs2d-0119.ebuild
+++ b/games-action/cs2d/cs2d-0120-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/cs2d-0119.ebuild,v 1.2 2012/03/03 13:39:26 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/cs2d-0120-r1.ebuild,v 1.1 2012/05/30 09:04:20 maksbotan Exp $
 
 EAPI=2
 
@@ -9,7 +9,8 @@ inherit eutils games
 DESCRIPTION="Counter-Strike 2D is freeware clone of Counter-Strike with some added features in gameplay."
 HOMEPAGE="http://www.cs2d.com/"
 SRC_URI="http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_linux.zip
-	http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_win.zip"
+	http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_win.zip
+	http://dev.gentoo.org/~maksbotan/cs2d/cs2d.png"
 LICENSE="freedist"
 
 SLOT="0"
@@ -17,43 +18,49 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
-RDEPEND="x86? (
-		media-libs/openal )
+RDEPEND="
+	x86? (
+		media-libs/openal
+		media-libs/freetype:2
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		virtual/opengl
+	)
 	amd64? (
 		app-emulation/emul-linux-x86-sdl
+		app-emulation/emul-linux-x86-opengl
+		app-emulation/emul-linux-x86-xlibs
 	)"
 
 QA_PRESTRIPPED="opt/cs2d/CounterStrike2D"
 QA_EXECSTACK="opt/cs2d/CounterStrike2D"
 
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
+S=${WORKDIR}
 
+src_prepare() {
 	# removing windows files
 	rm -f *.exe *.bat
+
+	# OpenAL is default sound driver
+	sed -i -e 's:^sounddriver.*$:sounddriver OpenAL Default:' sys/config.cfg || die
 }
 
 src_install() {
-	insinto "${GAMES_PREFIX_OPT}/${PN}"
+	insinto "${GAMES_PREFIX_OPT}"/${PN}
 	doins -r . || die
 
-	doicon "${FILESDIR}/cs2d.png"
-
 	make_desktop_entry CounterStrike2D "Counter Strike 2D"
 	make_desktop_entry "CounterStrike2D -fullscreen -24bit" "Counter Strike 2D - FULLSCREEN"
 	games_make_wrapper CounterStrike2D ./CounterStrike2D \
 		"${GAMES_PREFIX_OPT}"/${PN} "${GAMES_PREFIX_OPT}"/${PN}
 
-	prepgamesdirs
+	doicon "${DISTDIR}"/${PN}.png
 
-	# OpenAL is default sound driver
-	sed -i 's:FreeAudio DirectSound:OpenAL Default:' "${D}/${GAMES_PREFIX_OPT}/${PN}/sys/config.cfg"
+	prepgamesdirs
 
 	# fixing permissions
-	chmod -R g+w "${D}/${GAMES_PREFIX_OPT}/${PN}/maps"
-	chmod -R g+w "${D}/${GAMES_PREFIX_OPT}/${PN}/screens"
-	chmod -R g+w "${D}/${GAMES_PREFIX_OPT}/${PN}/sys"
-	fperms ug+x "${GAMES_PREFIX_OPT}/${PN}/CounterStrike2D"
+	fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/maps
+	fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/screens
+	fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/sys
+	fperms ug+x "${GAMES_PREFIX_OPT}"/${PN}/CounterStrike2D
 }
diff --git a/games-action/cs2d/cs2d-0120.ebuild b/games-action/cs2d/cs2d-0120.ebuild
deleted file mode 100644
index df1c7e182c44..000000000000
--- a/games-action/cs2d/cs2d-0120.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/cs2d-0120.ebuild,v 1.1 2012/03/07 21:28:29 maksbotan Exp $
-
-EAPI=2
-
-inherit eutils games
-
-DESCRIPTION="Counter-Strike 2D is freeware clone of Counter-Strike with some added features in gameplay."
-HOMEPAGE="http://www.cs2d.com/"
-SRC_URI="http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_linux.zip
-	http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_win.zip"
-LICENSE="freedist"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="x86? (
-		media-libs/openal )
-	amd64? (
-		app-emulation/emul-linux-x86-sdl
-	)"
-
-QA_PRESTRIPPED="opt/cs2d/CounterStrike2D"
-QA_EXECSTACK="opt/cs2d/CounterStrike2D"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-
-	# removing windows files
-	rm -f *.exe *.bat
-}
-
-src_install() {
-	insinto "${GAMES_PREFIX_OPT}/${PN}"
-	doins -r . || die
-
-	doicon "${FILESDIR}/cs2d.png"
-
-	make_desktop_entry CounterStrike2D "Counter Strike 2D"
-	make_desktop_entry "CounterStrike2D -fullscreen -24bit" "Counter Strike 2D - FULLSCREEN"
-	games_make_wrapper CounterStrike2D ./CounterStrike2D \
-		"${GAMES_PREFIX_OPT}"/${PN} "${GAMES_PREFIX_OPT}"/${PN}
-
-	prepgamesdirs
-
-	# OpenAL is default sound driver
-	sed -i 's:^sounddriver.*$:sounddriver OpenAL Default:' "${D}/${GAMES_PREFIX_OPT}/${PN}/sys/config.cfg"
-
-	# fixing permissions
-	chmod -R g+w "${D}/${GAMES_PREFIX_OPT}/${PN}/maps"
-	chmod -R g+w "${D}/${GAMES_PREFIX_OPT}/${PN}/screens"
-	chmod -R g+w "${D}/${GAMES_PREFIX_OPT}/${PN}/sys"
-	fperms ug+x "${GAMES_PREFIX_OPT}/${PN}/CounterStrike2D"
-}
diff --git a/games-action/cs2d/files/cs2d.png b/games-action/cs2d/files/cs2d.png
deleted file mode 100644
index ba80a38046e2..000000000000
--- a/games-action/cs2d/files/cs2d.png
+++ /dev/null
diff --git a/games-action/cs2d/metadata.xml b/games-action/cs2d/metadata.xml
index 4dde58c10c46..921b2ff4ce3f 100644
--- a/games-action/cs2d/metadata.xml
+++ b/games-action/cs2d/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
+<herd>games</herd>
 <maintainer>
 	<email>maksbotan@gentoo.org</email>
 	<name>Maxim Koltsov</name>