Clean up ebuild.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 50 insertions, 28 deletions

diff --git a/games-arcade/performous/ChangeLog b/games-arcade/performous/ChangeLog
index 7f7d18939592..9b3f2e1e1b65 100644
--- a/games-arcade/performous/ChangeLog
+++ b/games-arcade/performous/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/performous
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.3 2012/03/05 08:07:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.4 2012/03/05 21:47:20 vapier Exp $
+
+  05 Mar 2012; Mike Frysinger <vapier@gentoo.org> performous-0.6.1.ebuild,
+  +files/performous-0.6.1-linguas.patch:
+  Clean up ebuild.
 
   05 Mar 2012; Tupone Alfredo <tupone@gentoo.org> performous-0.6.1.ebuild:
   Respect LINGUAS settings. Bug #406551 by Piotr Szymaniak
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index cfb0bf293de5..78b524fe9533 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -4,18 +4,29 @@ Hash: SHA1
 AUX performous-0.6.1-ffmpeg.patch 795 RMD160 3ee572e484d960632c954e461e8131c0b69a703a SHA1 b78c3cbcd16b83581f75e86740e2d3cef8dd9599 SHA256 5d3eb46478096b15f982af3ed12bb6d00cb46011a5eb6435a333da4d2bb29399
 AUX performous-0.6.1-gentoo.patch 1445 RMD160 02b13db8ea0581d8d499e2f6e1a6b65fee6a914f SHA1 5bbc0fd310a7d0c42ae52ccb73ae4495b30e0ddd SHA256 82d8bfcf56a0c495e51130817dbe3d327a2fc86ca3d1a5887ee890dcf543897f
 AUX performous-0.6.1-libpng.patch 678 RMD160 190b21b91c1875f140c02aa6be47b13909578d7e SHA1 bfecb26b58a600d8e8ad3abc0547456cc8b6abce SHA256 0c60e3d3ce1b05d5a64642f697dc81489f9f22eb7f55c15fe509d61d0d155d22
+AUX performous-0.6.1-linguas.patch 833 RMD160 f1ad8751081ab6874c6c40f53789ac4d8358bfab SHA1 9d9da6d0d1e5dcb8fa9e4ab5dc84916e9f3c919a SHA256 52efe542b46c6b6f436d97d7ae567c8f6012586dc20d9ea5840e37561fa3811d
 DIST Performous-0.6.1-Source.tar.bz2 3745265 RMD160 5d3a95ae2ed4cbe8e874a328d086522823df4b55 SHA1 6dafb83568d34c66435fa626e73f07ebf82bffc8 SHA256 d210988f8d86797dc9ba5fbde2ffa237c5596eaa1daf9ddcd62bde7d1ab30c85
 DIST ultrastar-songs-jc-1.zip 242698201 RMD160 b541ad7df65a9280d1f5eb8b9891083ffff797d9 SHA1 baf4287e50b8fc4d43d9719b113d04d006a0460e SHA256 b3a6f980926c4f1ce40bc763a406040855600ad005f4daa54e0ac324ce99a9ba
 DIST ultrastar-songs-libre-3.zip 5289866 RMD160 98e9c4ab2364c1c26cb0f51e61c4026f43199868 SHA1 10add8daf1767671eb8b7d10927e93ea5ab73d5f SHA256 739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489
 DIST ultrastar-songs-restricted-3.zip 10242651 RMD160 7eb59b4db7968097db8f850f475e32a9ecbab889 SHA1 fd4e373104df543e44e273d294c39bd7baf6923b SHA256 e05d81333f85e2c6c271a67f90beac453d64eac78cd95eec7214721182257a82
 DIST ultrastar-songs-shearer-1.zip 50411551 RMD160 20ea920aa05c489903988bf31edff467012d4921 SHA1 49d64f914cfd77cc39dcaa14b00a5b4c5df3f112 SHA256 967c3dfae2da2915a66fd9dfee14da7191e13bb95e8b0820049d109c21f25628
-EBUILD performous-0.6.1.ebuild 2239 RMD160 9f8a97582e5e6997fc973162a4e2449db3ac8fa2 SHA1 1ed9ae2bd417cf237e4fe61415a64341aa63382a SHA256 3f8ef483bf864b35d5901310fb462fb3236ff15b54826609099551452d0f0ccf
-MISC ChangeLog 824 RMD160 58b77b0ec120f818a0cbf31bb937d50e39fc16b8 SHA1 4881ff4761d49d15d24374cb80ed72fa4b506148 SHA256 ff3446fd5fd40e56c8126ae057907a4f25950be327fd4821db52e4aa02c3b290
+EBUILD performous-0.6.1.ebuild 2088 RMD160 9cad705ed3cdfbb5d7f53ea2c42969e928f7d3bb SHA1 acb9cbb9f162706972610bd30d771e3c03160a9a SHA256 13b1c94324b9311a48cfa0eb2df86d4c85b5ee5dd7aa11496a053be570da8cee
+MISC ChangeLog 960 RMD160 c51c495bc42f161665a79e3e16b89cf749200844 SHA1 9340a441a3971699a7bc3c188af7771276800709 SHA256 a2baa8018e965dc8a636a6893bee48e24bac98484fc6d1b7905ccbced102fb00
 MISC metadata.xml 536 RMD160 bcab16517c7f86266852d25efc7c79d527d54a48 SHA1 67ea3ae7852fca041a3ac5c9504224eb6a08d74a SHA256 316340057c29f5114bca4fef85389999055165713cd5ee32c957f5804d65e063
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9UdGsACgkQIY77eQFFFC0+CwCeNqhtpQbdujZXuq1Mf+EC5+gp
-QpYAnjl4Dxlzy2/1D7imYRfb//auduSO
-=eCSP
+iQIcBAEBAgAGBQJPVTRvAAoJELEHsLL7fEFWvdYP/1fCBsgUnBdyZo6jKZRMyI9E
+dqFhMgtZ9ls9tDcEfsa5Kg/Ax7dTobEQvwZQjf/XBAjp/mf9ot7Jtx/zRE0nT9UH
+OGSMfqthQARfeBpKz+1rAlI7yUSQnPHjNmVJR0NlBvmDUrixyCon8Xok/6b0YVa3
+rUudBvkcZNlPNNrosdX8M/QK0i1isk9BPLCnwwZnf7ZcNOMMi/CDBFsylrX2fVRx
+q5OD/8mdTKSfl18uC2o1pUcC7k4KExT978uxKLip7rIxmMC6DXtClY9n3fx+28ZB
+YwEUNqgYLKtr2c1Q4to3kWcdv+JXLvQQgOnZ/ZWCdJW0+KSpGTPbqikbBGkSFBH1
+35pVI5dq/kvbQY3fI5KTUR5FCd85T+1WalZyOFry91QNb0egsESjzkQ7klWsXFje
+JDdA2qwysgfK7+qqPjXkDzMTJnl4RPbjduR1pQfP7Cxs79eSinQfCKOGaOXb7YFw
+HCZz8eH5Oh0VGtf+77rcUYtKlsgboB9CcojtiEBMgYMulRWQq1Kw5Obsa/7l9TSM
+qJmGvC8LRVgqXxejD6KiE60otrfWQqcLdRc1YyzDZeodRE/crh7Mc2aGGiF14GWu
+B+7G/EfVJhrnMCwzFY/g2lU/EWqxmFfMKIQfwWXd0Ge847kf6LjuO368KghV6O1C
+QZcvXO9Rpt6vaImUF8d4
+=IaSU
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/performous/files/performous-0.6.1-linguas.patch b/games-arcade/performous/files/performous-0.6.1-linguas.patch
new file mode 100644
index 000000000000..21836766d878
--- /dev/null
+++ b/games-arcade/performous/files/performous-0.6.1-linguas.patch
@@ -0,0 +1,15 @@
+--- lang/CMakeLists.txt
++++ lang/CMakeLists.txt
+@@ -7,5 +7,11 @@
+ 	set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
+ 	add_custom_command(OUTPUT ${mofile} COMMAND ${Msgfmt_BIN} -v "${pofile}" -o ${mofile} MAIN_DEPENDENCY ${pofile} COMMENT "Building ${language} locale" VERBATIM)
+ 	add_custom_target(locale_${language} ALL DEPENDS ${mofile})  # Make sure the mofiles are always built
+-	install(FILES ${mofile} DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
+ endforeach(language)
++foreach(language $ENV{LINGUAS})
++	set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
++	if (EXISTS ${pofile})
++		set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
++		install(FILES ${mofile} DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
++	endif()
++endforeach(language)
diff --git a/games-arcade/performous/performous-0.6.1.ebuild b/games-arcade/performous/performous-0.6.1.ebuild
index da0165fc165c..4b65d9a49f8b 100644
--- a/games-arcade/performous/performous-0.6.1.ebuild
+++ b/games-arcade/performous/performous-0.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.6.1.ebuild,v 1.3 2012/03/05 08:07:59 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.6.1.ebuild,v 1.4 2012/03/05 21:47:20 vapier Exp $
 
-EAPI=3
+EAPI="3"
 
 inherit flag-o-matic base cmake-utils games
 
@@ -26,12 +26,8 @@ LICENSE="GPL-2
 		CCPL-Attribution-NonCommercial-NoDerivs-2.5
 	)"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="songs tools"
-LANGS="da de es fi fr hu it ja nl sv"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
 
 RDEPEND="dev-cpp/glibmm
 	dev-cpp/libxmlpp
@@ -56,33 +52,31 @@ DEPEND="${RDEPEND}
 	media-libs/glew
 	sys-apps/help2man"
 
-S="${WORKDIR}"/${MY_P}-Source
+S=${WORKDIR}/${MY_P}-Source
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ffmpeg.patch
 	"${FILESDIR}"/${P}-libpng.patch
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-linguas.patch
 )
-append-cppflags -DBOOST_FILESYSTEM_VERSION=2
 
 src_prepare() {
 	base_src_prepare
 	sed -i \
 		-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
 		game/CMakeLists.txt \
-		|| die "sed failed"
-	cd lang
-	for X in $LANGS
-	do
-		use linguas_$X || rm $X.po
-	done
+		|| die
+	append-cppflags -DBOOST_FILESYSTEM_VERSION=2
+
+	strip-linguas -u lang
 }
 
 src_configure() {
-	local mycmakeargs="
+	local mycmakeargs=(
 		$(cmake-utils_use_enable tools TOOLS)
 		-DSHARE_INSTALL="${GAMES_DATADIR}"/${PN}
-	"
+	)
 	cmake-utils_src_configure
 }
 
@@ -92,12 +86,10 @@ src_compile() {
 
 src_install() {
 	cmake-utils_src_install
-	if use songs; then
+	if use songs ; then
 		insinto "${GAMES_DATADIR}"/${PN}
-		doins -r "${S}/songs" || die "doins failed"
+		doins -r "${S}/songs" || die
 	fi
-	cd docs
-	dodoc {Authors,DeveloperReadme,instruments,TODO}.txt \
-		|| die "dodoc failed"
+	dodoc docs/{Authors,DeveloperReadme,instruments,TODO}.txt
 	prepgamesdirs
 }