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

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

6 files changed, 45 insertions, 93 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/Manifest b/games-action/cs2d/Manifest
index 64fea947b344..efa11a0a1c05 100644
--- a/games-action/cs2d/Manifest
+++ b/games-action/cs2d/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX cs2d.png 1275 RMD160 a3a0c33434f367b9918de441558e9ec2e3574ee8 SHA1 0733be2481292b08bbf1f9fd52f2ddc72fc249bc SHA256 771d8b9e57e2e4574550f2a92a831b11f816602540c0196788f1d078c09079fc
-DIST cs2d_0119_linux.zip 836968 RMD160 ba5d92063ce2c773447da9348357878a2c096e9f SHA1 2e169c5d6354e33e3515cc045dac8761ff4ff26d SHA256 23d8d10826d2d2e850c4bf42b3d54388ce25f5b6fc0f39f82579b0423eccc458
-DIST cs2d_0119_win.zip 6714492 RMD160 d22d52c9af3b3bd6e4cb041df8807bd819fc13ea SHA1 1d1671b2cbbd10ccaeee67461af5bbab51826ff8 SHA256 a73d71c825e8d496b979794c64103aff9ab5398e1f00ffcbf0bb843082cad449
+DIST cs2d.png 479 RMD160 0a7140505072050dfb257cc6445ea838e490f993 SHA1 681234c93a131b7bef9ffff9d6a8f0e16f755159 SHA256 4114a718e4e1c9b6686571d41f2e66598940e112f129b2c858b2d75ba4f0e607
 DIST cs2d_0120_linux.zip 857948 RMD160 9b3e00606baf555216a35c95dabf297bf788f7ee SHA1 bdeacde0b965ab02f47059a2f584012b21fa338c SHA256 68208d5bf7189e712f96ed9b6d3c40712438e81680d1aa3a543eefd2822bc321
 DIST cs2d_0120_win.zip 7939368 RMD160 611df98e1c757eca6f0efdb5aa222ae9d40f4ee8 SHA1 3023537a2c72832080c1b30b8cc009aa683c787e SHA256 e92eebb9612fbb1aff8ad33b976a7c7d749468c9186cd149875ee1c660915f48
-EBUILD cs2d-0119.ebuild 1621 RMD160 17e9b57ba35f67c70bee110eab998e423d0acc0f SHA1 b33983a24ae21e1bca02d2d0356b335895e48525 SHA256 1f574834e24681151dc083978c8d7b2a2d41bb55f407fcd14e55f2bf3385e9ef
-EBUILD cs2d-0120.ebuild 1627 RMD160 c67f6019af215e0653541eb989104c0134aa7b1d SHA1 fc05f56fd8d62530814d065cd1b807369fa87924 SHA256 97608fc80f5228b878aebc45a63acd1c637480b69b11ee2bbf8b36e4db5997aa
-MISC ChangeLog 676 RMD160 92a1a528462f120ff6b3a8c8590b53e877cd40d4 SHA1 6be9003285e90a7f1ae38809be46971ac31b9fa4 SHA256 2178219a1cade0e76488c48bf489a666e335056e7f447b9d1572926de2eebaf8
-MISC metadata.xml 321 RMD160 ec3db1fd5caef7179ddfec9c1b6e0bb049e34f2e SHA1 f3448ca39fea895648e30f91a048367f46728b72 SHA256 061f16964e9057e3d477024b3c27d351bd9a315bcc4ac5f667bf45a248fa2900
+EBUILD cs2d-0120-r1.ebuild 1787 RMD160 0ca30361973b48b98a4caf4ebca51820bc96e39c SHA1 18d46e649d7a5b110debc82dc79c6fa4829d237b SHA256 caa211be4d533496ec43aa77d1225bd5e69985a1ef4795e62fef8fd6d787e5d3
+MISC ChangeLog 926 RMD160 cb49e4f1deb8ce3073c6cca296bf2d37657c9885 SHA1 914716398e65d23ab77580c4937f968276c223be SHA256 510fa0bab5b17bf2bb79460a33edd4e1bddded16556a12eb81c86d48af9a3bc3
+MISC metadata.xml 340 RMD160 7e455f490d93f10f4dc1445119d3e37afe08df82 SHA1 49f29287a22030f401d6589a2f8fb54f3468877e SHA256 624bccec7a39f34c64246258f8f29c26032bfef542f25779e3e34b15df048850
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPV9MKAAoJEAmJmMX429regXMIAIZuw6CB51SHy2GdiqqdLfhI
-IBJOch/irYdf24s2P8op/yO0y45OaVyONwzE4qq4fr7kBpaIGFCambpZfc1ywIqI
-EX1Xt4jq+SzjGlw05evZLHfWgXhNWRUMcJjsEuRMZMn4fLWrFKbhV1czKI2ylGdp
-m0E6njxGVtTL8Io12Ytb62m6o7FiNL4Vx4CT8bUso74XJ50n33QD1G2APMiWkhPt
-sYvasU3zdyWXlzPVKBwqLf2m2cEK9SbSkzlhOCsPZyV1B2WrDm6o1z3cPjukqfKI
-YonR/clYqXkrY8fCv4eih6EY7jZ/ErY4CBiwMQ3Pgfl+7+Nkr515boyQC8Udwbc=
-=T9Au
+iQEcBAEBAgAGBQJPxeK7AAoJEAmJmMX429reXmIH/iDpIlEJQ1ciA7RxB7TnQ6FN
+196xOImr/jBfluPBxjQO/sCqVU1PZE7E+IYS75swRfe1PjhMquvdzHvUP864ruB7
+JZPZunLySYBkX+aWhPot77T4phfA8v02ZfAdhe83Z1AP6YapkV8Pm58ksB2OgR/w
+8qPQMh/tOOcP8ELeF3F2/MVPeW82HPkEbsBSFh+oUd86MvVF1MS6/WnORbSQK4gi
+pldN+F1EO6lbtYedIIeo8+24NN02ctvMBmll9V7TLyiExyP8K49GKOufd4lBjlRU
+NLIXZ31wINRz6x5CcSFd58HrDGPcpErW1PUhhSDOUrBPoYzi6aUw3ZOqSWqThKg=
+=m/Yw
 -----END PGP SIGNATURE-----
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>