[games-arcade/frogatto] audio -> sound (bug #357661), cleanup.

Package-Manager: portage-2.2.8-r1
Manifest-Sign-Key: A018DE8C

6 files changed, 14 insertions, 157 deletions

diff --git a/games-arcade/frogatto/Manifest b/games-arcade/frogatto/Manifest
index 089cdbd..ee1c6fd 100644
--- a/games-arcade/frogatto/Manifest
+++ b/games-arcade/frogatto/Manifest
@@ -1,4 +1,11 @@
-DIST frogatto-1.0.2.tar.bz2 100857913 SHA256 4985f38fc07ac9e184539c222da9b85741b3ddf7f28b41b54b790c8c186526c2
-DIST frogatto-1.0.tar.bz2 136213969 SHA256 7a3dab049df8d4cd38a4fa0ab98ea001d5bae1d373d134fbd4e773132fb68c59
-DIST frogatto-1.1.1.tar.bz2 151088361 SHA256 d2404d8d83d5d5e2b42b25f632113d5fbfc22d2ef72c4a44ec7833257e550670 SHA512 59c146c00dec8bc90dd674883ca7f2eb5fc54b4336737140bb350225394b363be4ec62a8e9e59a73a3f36397d760c018b18397ec4dafa50419c4a74d510d0c5f WHIRLPOOL a660a6df55739755acf910b49053f78a3b1d886e54f86b84b30cbd783f853db707f7679924dfe5b14b3b086dd7f3ad69f7b860baae1a62378a243c76ec9213b6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST frogatto-1.3.1.tar.gz 500369477 SHA256 23c167d5c2510d059e34cf4ec42bfe6e8c83cb934f1573d7c141c182ca1c9c17 SHA512 bb1c5e765a456abedd7b80cce99b7be62734a6163c2e2beb9776c6a61eba779a916ea99a3c113be0626a4d238f10dcdf360d26f993f1d9ac4e381d711b27be23 WHIRLPOOL d288a95d286a648b141cf11cdae0c16a5c81ab0469894c9e1d55b82e9eaae27b164746c5d99fffbc93de694aa02010b5722517b27670c82f182b2d6115512b92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlN2SVwACgkQz+A7F6AY3oxggAD6A7bInHM8G+d+exbB+RYxMkhf
+lGZH/9BL8pO8UnT9W1ABAMjCR4vn+GIoZfiQKKF8rTynGm8fL+i41llVtoRd8RQj
+=ZC6V
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/frogatto/frogatto-1.0.2.ebuild b/games-arcade/frogatto/frogatto-1.0.2.ebuild
deleted file mode 100644
index 9f51ab8..0000000
--- a/games-arcade/frogatto/frogatto-1.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: games-arcade/frogatto/frogatto-1.0.ebuild frostwork Exp $
-
-EAPI="3"
-
-inherit eutils games flag-o-matic
-
-DESCRIPTION="a frog, and a platform game"
-HOMEPAGE="http://frogatto.com/"
-SRC_URI="http://www.frogatto.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-image
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/glew
-	dev-libs/boost
-	virtual/opengl
-	virtual/glu"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0-gentoo.patch || die
-	# respect ${GAMES_DATADIR}
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:.\/images/:"${GAMES_DATADIR}"/"${PN}"/images/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:data/:"${GAMES_DATADIR}"/"${PN}"/data/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:music/:"${GAMES_DATADIR}"/"${PN}"/music/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:music_aac/:"${GAMES_DATADIR}"/"${PN}"/music_aac/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:sounds/:"${GAMES_DATADIR}"/"${PN}"/sounds/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:sounds_wav/:"${GAMES_DATADIR}"/"${PN}"/sounds_wav/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:FreeMono.ttf:"${GAMES_DATADIR}"/"${PN}"/FreeMono.ttf:g"; done
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" || die
-}
-
-src_install() {
-	newgamesbin game ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data images music sounds FreeMono.ttf || die
-	newicon images/window-icon.png ${PN}.png
-	make_desktop_entry ${PN}
-	prepgamesdirs
-}
diff --git a/games-arcade/frogatto/frogatto-1.0.ebuild b/games-arcade/frogatto/frogatto-1.0.ebuild
deleted file mode 100644
index 663df84..0000000
--- a/games-arcade/frogatto/frogatto-1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: games-arcade/frogatto/frogatto-1.0.ebuild frostwork Exp $
-
-EAPI="3"
-
-inherit eutils games flag-o-matic
-
-DESCRIPTION="a frog, and a platform game"
-HOMEPAGE="http://frogatto.com/"
-SRC_URI="http://www.frogatto.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-image
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/glew
-	dev-libs/boost
-	virtual/opengl
-	virtual/glu"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch || die
-	# respect ${GAMES_DATADIR}
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:.\/images/:"${GAMES_DATADIR}"/"${PN}"/images/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:data/:"${GAMES_DATADIR}"/"${PN}"/data/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:music/:"${GAMES_DATADIR}"/"${PN}"/music/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:music_aac/:"${GAMES_DATADIR}"/"${PN}"/music_aac/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:sounds/:"${GAMES_DATADIR}"/"${PN}"/sounds/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:sounds_wav/:"${GAMES_DATADIR}"/"${PN}"/sounds_wav/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:FreeMono.ttf:"${GAMES_DATADIR}"/"${PN}"/FreeMono.ttf:g"; done
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" || die
-}
-
-src_install() {
-	newgamesbin game ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data images music music_aac sounds sounds_wav FreeMono.ttf || die
-	newicon images/window-icon.png ${PN}.png
-	make_desktop_entry ${PN}
-	prepgamesdirs
-}
diff --git a/games-arcade/frogatto/frogatto-1.1.1.ebuild b/games-arcade/frogatto/frogatto-1.1.1.ebuild
deleted file mode 100644
index ab20bfe..0000000
--- a/games-arcade/frogatto/frogatto-1.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: games-arcade/frogatto/frogatto-1.0.ebuild frostwork Exp $
-
-EAPI="3"
-
-inherit eutils games flag-o-matic
-
-DESCRIPTION="a frog, and a platform game"
-HOMEPAGE="http://frogatto.com/"
-SRC_URI="http://www.frogatto.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-image
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/glew
-	dev-libs/boost
-	virtual/opengl
-	virtual/glu"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{gentoo,libpng}.patch || die
-	# respect ${GAMES_DATADIR}
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:.\/images/:"${GAMES_DATADIR}"/"${PN}"/images/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:data/:"${GAMES_DATADIR}"/"${PN}"/data/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:music/:"${GAMES_DATADIR}"/"${PN}"/music/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:music_aac/:"${GAMES_DATADIR}"/"${PN}"/music_aac/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:sounds/:"${GAMES_DATADIR}"/"${PN}"/sounds/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:sounds_wav/:"${GAMES_DATADIR}"/"${PN}"/sounds_wav/:g"; done
-	for i in `find src -name *.cpp`; do sed -i "$i" -e "s:FreeMono.ttf:"${GAMES_DATADIR}"/"${PN}"/FreeMono.ttf:g"; done
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" OPTX="${CXXFLAGS}" || die
-}
-
-src_install() {
-	newgamesbin game ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data images music sounds FreeMono.ttf || die
-	newicon images/window-icon.png ${PN}.png
-	make_desktop_entry ${PN}
-	prepgamesdirs
-}
diff --git a/games-arcade/frogatto/frogatto-1.3.1.ebuild b/games-arcade/frogatto/frogatto-1.3.1.ebuild
index 6383c14..900524c 100644
--- a/games-arcade/frogatto/frogatto-1.3.1.ebuild
+++ b/games-arcade/frogatto/frogatto-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI=5
 
 inherit eutils games
 
@@ -19,7 +19,7 @@ IUSE="extras"
 DEPEND="dev-libs/boost
 	media-libs/glew
 	media-libs/libpng:0
-	media-libs/libsdl[X,audio,joystick,opengl,video]
+	media-libs/libsdl[X,joystick,opengl,sound,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-ttf
diff --git a/games-arcade/frogatto/metadata.xml b/games-arcade/frogatto/metadata.xml
index 78f925f..4743733 100644
--- a/games-arcade/frogatto/metadata.xml
+++ b/games-arcade/frogatto/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>playboys</herd>
+<herd></herd>
 <use>
 	<flag name="extras">Install additional modules</flag>
 </use>