version bump

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

7 files changed, 189 insertions, 3 deletions

diff --git a/games-arcade/performous/ChangeLog b/games-arcade/performous/ChangeLog
index 181febdfe9e3..b148c182af5d 100644
--- a/games-arcade/performous/ChangeLog
+++ b/games-arcade/performous/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-arcade/performous
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.17 2014/07/14 12:54:24 tupone Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.18 2015/03/31 18:34:46 mr_bones_ Exp $
+
+*performous-1.0 (31 Mar 2015)
+
+  31 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/performous-1.0-gentoo.patch, +files/performous-1.0-include.patch,
+  +files/performous-1.0-libav.patch, +files/performous-1.0-linguas.patch,
+  +performous-1.0.ebuild:
+  version bump
 
   14 Jul 2014; Alfredo Tupone <tupone@gentoo.org> performous-0.7.0-r1.ebuild,
   +files/performous-0.7.0-freetype.patch:
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index 6d8a28fd00dd..09f1a5940503 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -4,12 +4,18 @@ AUX performous-0.7.0-freetype.patch 1608 SHA256 a3f5f2c6de96b8c257a71a4e8cfaa351
 AUX performous-0.7.0-gentoo.patch 1445 SHA256 82d8bfcf56a0c495e51130817dbe3d327a2fc86ca3d1a5887ee890dcf543897f SHA512 576759fe71143480fbeee0abef4a147d5bc627d3a04d8207bdefcf41dd3276bbae26a614b3b865d7a1a3c5ae6b332f8b136afacfdec7f9d68fdae8e24b97939c WHIRLPOOL b6328a66155248360de74b5770c344cdde43239e310b5c865724138a53eb0c60c37955d7a8ca51fb86595a613fc90e4320e2f1d32bdde75689ca69ab5fdce49a
 AUX performous-0.7.0-libav.patch 2038 SHA256 f0aa4df47ddd2e7f0725f06cc345a84787b6b1b0ee9c607bd3e80c71f04bdad1 SHA512 8460b2f8e054183e82130c01761499949a39cc67a33a42745b58d0e16e4a29293489a8fb2b3b63873daebb17a87a655e019e02474ae66981e3af632d3889a237 WHIRLPOOL 0506ded66223cb35026c14a874f50c2db7398bf455e33398a8aeded12a3aebc47c19e36f6a9d74975a52b1beebaa29b345c8aaaf21057e1ef5bb2b0fe3feb259
 AUX performous-0.7.0-linguas.patch 833 SHA256 52efe542b46c6b6f436d97d7ae567c8f6012586dc20d9ea5840e37561fa3811d SHA512 36f20e0dcc21d150cb8f81af83dde594965b1a5ff2bb033be13348061a1cdd67a7fcdeb1e7a9331c6d10102520faf9111d9ecfb89864c75f46f2d1ccdccd8682 WHIRLPOOL 31cedc7a727913f8614ca448617eb47ddbeaee2462841eb08f26ab353728fd21102dfc68c91d7e71a6194174f2af0bad7edb52754f6dd46b9b7798b86d22c784
+AUX performous-1.0-gentoo.patch 474 SHA256 efa2ca7f4b1202cc841ccc9f409bf357b2626d1b3c22e7afbe7ed8635900fe92 SHA512 b00f13c16dd87645ae3baea80a7430bc0ce46d827ef72ecad21ddac8318f4356bffffd24bd03710a529ca215f20b924f27bc69dd2b3e4870ae19388c8b857338 WHIRLPOOL d592574cb2da52b961ad3bdfb28584d34583313f94bcf6ee67c9b4bb911b66ae5056bc02e7339325f8b29146a67a7298d579a59f2b383da1b2d73866588927b9
+AUX performous-1.0-include.patch 322 SHA256 d5822d645a16b6eb3e187faa2e7b0aa6bd1cd55ca9b01e58b5d5b7a34e0da1dd SHA512 c4a5d861e82de18dc97a984a8f941231d6c7cd032d10a13e898e8d39795431df3c86b998b6f46841d8f3e4dbe25cdf09ec70fa68b09a8416d2261876334d3d14 WHIRLPOOL 79b2385292c850f7d5216db80dcfbe1b4bf55812bb1d442e879c51de91d5bc9ac0c7fc351aa26672a94984cf6be80e5261284ff4aaeadfe05eb827940ee14227
+AUX performous-1.0-libav.patch 1119 SHA256 74ef120cef48c372ce7595b6c6722b93d18cca678da8159b95b92b46f33f5ac2 SHA512 60498f14b28daa8ccd8284c8b97d40fc4db3f6fe5f57b48ce9b1e8009e3b76ef901c3ad44792c5e4341455a7cb729252bb90b4e87373e2c1aa983695655da306 WHIRLPOOL 7bc0dff942b4a1dfbcf539c791ae422100e7bd8b515d94708258fa050be1768ef854141bde7424dd00dd38dd4f733f696c4e0686181f3a64b9503f9bc9c8ffd5
+AUX performous-1.0-linguas.patch 1033 SHA256 322dedebe4df3449ae62d53bc0a3947dd23e2b9d165ea1974675d4cc63feafe7 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597 WHIRLPOOL 32dc689bcaa731baacbb2d78a28f591872ff56e9ae9bb5d1613ee48f73ec16c6b64de81fd4bf2aac4c27a3cee2401fe49be707f403d81fee526bdbaf3cf1f12c
 DIST performous-0.7.0.tar.bz2 5015164 SHA256 af4cb8268e608e7a8da178ef80537d6da09e643321878dcdf3f1a71002cb63ec SHA512 bded51d7f2883ea8f15c9ac8ab03f692d0dcdb45b85ae1c7d11d2600ca761962f6fb991f5a5d0a4dd5fbdf60e7ad711ca1e0480dfa14a04c5603897335762db8 WHIRLPOOL 56e464bd27be923022354a289239645c09505dc105a3f36b2a44564e3991f6c0fb45d1485db1a1e80f98f600a9808b97bc7cd6690cf70a455daf9682083427d8
+DIST performous-1.0.tar.gz 3950246 SHA256 da9f39d281dbfe0849897dc98dc72cfc5a54be53f67c29b6430e57aefcc86b50 SHA512 9cdc6ad71248fede7df6fdc8ea4aca70a9c79be40e1d8c07c425f4a0e0c6e352233aee2ddeb586dcc6a7ea567b3e399aad9c5840475d8ce91c3ec7d4ec1eb30b WHIRLPOOL 2b9dbf8cec9e09bbff6a9490cbeb3fc04e88776c57fe80b9da04b91cdc2ac8ed9e129746e2adb4866ee52edb819229c6f52c45d2e301718a7c4e106ba27f14f1
 DIST ultrastar-songs-jc-1.zip 242698201 SHA256 b3a6f980926c4f1ce40bc763a406040855600ad005f4daa54e0ac324ce99a9ba SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea WHIRLPOOL 13bd3761b80b2a9491c6dbe2e535dbdc1e0f53b51d5070a0caf776da94c45c62a5a6980b4d95f629e0cfe5d6ef985428e5dcf6d4ba2f0931e6ea1d39d7f6674c
 DIST ultrastar-songs-libre-3.zip 5289866 SHA256 739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66 WHIRLPOOL 48d48e82ec8bd02376b3def5a3f215331c49853cf00439686cd577ebd51321e4a4e8b213d40356a46e2a2bd2a1bf6c1cb07b09195209833f4eb004166937bfe5
 DIST ultrastar-songs-restricted-3.zip 10242651 SHA256 e05d81333f85e2c6c271a67f90beac453d64eac78cd95eec7214721182257a82 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8 WHIRLPOOL cb83550395bbbadb45ad982fd4586a4dca49ae96bbe7adfab1b925301fa69eb5581c24f0c5c8d3593851a80b3e86137eea7658753f720ad76bae6e5809c2feba
 DIST ultrastar-songs-shearer-1.zip 50411551 SHA256 967c3dfae2da2915a66fd9dfee14da7191e13bb95e8b0820049d109c21f25628 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b WHIRLPOOL 868974ba4e68482dde0a25b338f0c8afd64435ddb872cd4a2ac7d5e8a984d16ebfdca530501779c24d1b2e4feb8151ee71f5db3052032fd706f42a88d31a46ab
 EBUILD performous-0.7.0-r1.ebuild 2376 SHA256 9c5120aa6d1463e1a55484292fdb1fe2b7a51f2033f6f50a090cae1bd19122e4 SHA512 4cb69a0d1cc77aa2c64133b47e0a0ef251f2f5f9cc92b169790f4aaa1b11238b7f9fdf4a53fc5015880869ca610e31731801fd454ec59c72f9a4dbf75af4f821 WHIRLPOOL cfe17ab180041b291d6d1e7b036bbc33afb821566053e7222b9d474452f9f8e36150fd650df194e4e668838feb7880dc836389e0b748c7e4c1feba0db998dea2
 EBUILD performous-0.7.0.ebuild 2478 SHA256 9be865016be08b8116ab4acd0f1cbd7f8d1b6f8de0fd7e1217b0f6777f46dd13 SHA512 ae212bde9afd139930bd373854b4a632f9d0efbc905fa41fd4f6f491fe2cdec30805785661ac0d72cdb0fc311c6122bd9d094bb1ff0f2612d2efb4436aa81781 WHIRLPOOL e178ecf84858890d399b1c114d8a623ba7e4b1a7be6feb1c7e602463d25fc62497af68b9dac41ba8373e7d68b927221c4ca74e7c2474dea7c3d1bb5d84f844b9
-MISC ChangeLog 3382 SHA256 f8a303757c9049a93f2eb397655377d5f102f96ef17a940afd77c98170fdaef4 SHA512 ded5077382e4136cf4d01980429c362f4bb168349a95a1d154148ea71b1e69de9453902c266fc45ba162118d2c8b26a87b132b6fc5af2f04fc02bd8e8cbf6e6c WHIRLPOOL bbd0dc27a3e7e838c2f0c30c5edcfc6216bf89baad03a66fbbf0e1913401fc36a2a6894b4936fad16fa4e7393cb29bd98a2e2d989167e277de57362572f8f312
+EBUILD performous-1.0.ebuild 2615 SHA256 93a09ed360f41930b06b4aa8a6a3d37fe950bfce32f65825d2080d8e0303d060 SHA512 49affab588516953823cff2dcbc50e40f2704a1c93d3087a59177e8aa3a6c0f7daec8f5478efcbd45550db8ee4abdb22963dd7d11133bdaf2f03758776181a91 WHIRLPOOL 3404be371780896cdd80e0af1efd642f42b5ca690f31cb15432091cec8bb9149e9069273d06d78e7c561e35716c23b142c9b64d550fe29425ae6a4a70168c6ca
+MISC ChangeLog 3662 SHA256 3d6ff5e24720d1f36784761809eb3bc3cd6a1d5b7549e219fa6181805f9e7a6f SHA512 d5b5337ecad94723cc123605fa1ce1e6368913d60d59fda3ade6150274511488083e06492a2c121d449c45320789a8eb34d1ee021cc3c9819ad1535efedc3f87 WHIRLPOOL ebf604aaab20d9b8fb78635a6572e068f9b92ae540a01feea9dff11ee1f07f0990a86408f196df955b94f83654d5f81dd3534dcfb49be3b5186ab1e0fc82c4b2
 MISC metadata.xml 564 SHA256 c3c42c109f862bbd1e4757c2e6ebef0df2661aea10c418b9fa7fb13e79c6c688 SHA512 b9c42a4984a4ea8379c47d775258abd540322a325a18511c485a6869663fb904e1625c2ac64d484d953c82e00486ba0f4e557ee567677b6b99bec3b6d721c56f WHIRLPOOL bfb866e2fc0ec502820b9dc5abb8226d088a52a57db7bf7a0534c43df28cc7bc6c8bd5e10bcbe74ac512ba35e58ab8bb6758b988097795ec316da6e75f9c9b49
diff --git a/games-arcade/performous/files/performous-1.0-gentoo.patch b/games-arcade/performous/files/performous-1.0-gentoo.patch
new file mode 100644
index 000000000000..a73663a88c41
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.0-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt
+--- performous-1.0.orig/game/CMakeLists.txt	2014-10-28 19:11:45.000000000 -0400
++++ performous-1.0/game/CMakeLists.txt	2015-03-31 03:01:30.806061643 -0400
+@@ -141,7 +141,7 @@
+ 	set(BIN_INSTALL .)  # Straight to Program Files/Performous with no bin subfolder.
+ 	set(SUBSYSTEM_WIN32 WIN32)
+ else()
+-	set(BIN_INSTALL bin)
++	set(BIN_INSTALL @GENTOO_BINDIR@)
+ endif()
+ 
+ # Build main executable
diff --git a/games-arcade/performous/files/performous-1.0-include.patch b/games-arcade/performous/files/performous-1.0-include.patch
new file mode 100644
index 000000000000..ba67018e5422
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.0-include.patch
@@ -0,0 +1,10 @@
+--- performous-1.0/game/song.hh.orig	2015-03-31 13:56:13.546360617 -0400
++++ performous-1.0/game/song.hh	2015-03-31 13:56:23.609025021 -0400
+@@ -3,6 +3,7 @@
+ #include "i18n.hh"
+ #include "notes.hh"
+ #include "util.hh"
++#include "fs.hh"
+ #include <boost/foreach.hpp>
+ #include <boost/noncopyable.hpp>
+ #include <stdexcept>
diff --git a/games-arcade/performous/files/performous-1.0-libav.patch b/games-arcade/performous/files/performous-1.0-libav.patch
new file mode 100644
index 000000000000..e3f36615281e
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.0-libav.patch
@@ -0,0 +1,19 @@
+diff -urN Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake
+--- Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake	2012-05-16 13:44:26.112930173 +0200
++++ Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake	2012-05-16 13:56:10.229914635 +0200
+@@ -25,9 +25,15 @@
+       if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h")
+         set(AVUtil_INCLUDE "${suffix}avutil.h")
+       endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h")
++      if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h")
++        set(AVUtilMath_INCLUDE "${suffix}mathematics.h")
++      endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h")
+     endif(NOT AVUtil_INCLUDE)
+   endforeach(suffix)
+ 
++  if(NOT AVUtilMath_INCLUDE)
++    message(FATAL_ERROR "Found mathematics.h include dir, but not the header file. Perhaps you need to clear CMake cache?")
++  endif(NOT AVUtilMath_INCLUDE) 
+   if(NOT AVUtil_INCLUDE)
+     message(FATAL_ERROR "Found avutil.h include dir, but not the header file. Perhaps you need to clear CMake cache?")
+   endif(NOT AVUtil_INCLUDE)
diff --git a/games-arcade/performous/files/performous-1.0-linguas.patch b/games-arcade/performous/files/performous-1.0-linguas.patch
new file mode 100644
index 000000000000..f8f1349ea3b9
--- /dev/null
+++ b/games-arcade/performous/files/performous-1.0-linguas.patch
@@ -0,0 +1,18 @@
+diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt
+--- performous-1.0.orig/lang/CMakeLists.txt	2014-10-28 19:11:45.000000000 -0400
++++ performous-1.0/lang/CMakeLists.txt	2015-02-22 04:25:40.502252942 -0500
+@@ -9,5 +9,13 @@
+ 	file(MAKE_DIRECTORY "${mobuild}")
+ 	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")
+ 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-1.0.ebuild b/games-arcade/performous/performous-1.0.ebuild
new file mode 100644
index 000000000000..5727ea96748c
--- /dev/null
+++ b/games-arcade/performous/performous-1.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-1.0.ebuild,v 1.1 2015/03/31 18:34:46 mr_bones_ Exp $
+
+EAPI=5
+CMAKE_REMOVE_MODULES="yes"
+CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ"
+inherit eutils cmake-utils gnome2-utils games
+
+MY_PN=Performous
+MY_P=${MY_PN}-${PV}
+SONGS_PN=ultrastar-songs
+
+DESCRIPTION="SingStar GPL clone"
+HOMEPAGE="http://sourceforge.net/projects/performous/"
+SRC_URI="https://github.com/performous/performous/archive/1.0.tar.gz -> ${P}.tar.gz
+	songs? (
+		mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
+		mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
+		mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip
+		mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip
+	)"
+
+LICENSE="GPL-2
+	songs? (
+		CC-BY-NC-SA-2.5
+		CC-BY-NC-ND-2.5
+	)"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="midi songs tools webcam"
+
+RDEPEND="dev-cpp/glibmm
+	dev-cpp/libxmlpp
+	media-libs/portaudio
+	dev-libs/boost[threads(+)]
+	dev-libs/glib
+	dev-libs/libxml2
+	gnome-base/librsvg
+	media-gfx/imagemagick
+	virtual/jpeg
+	media-libs/libpng:0
+	media-libs/libsdl2[joystick,video]
+	virtual/ffmpeg
+	virtual/opengl
+	virtual/glu
+	sys-libs/zlib
+	virtual/libintl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	media-libs/glew
+	midi? ( media-libs/portmidi )
+	webcam? ( media-libs/opencv )"
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-libav.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-linguas.patch \
+		"${FILESDIR}"/${P}-include.patch
+	sed -i \
+		-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
+		-e '/ Z /s/ Z / ZLIB /' \
+		-e 's/Jpeg/JPEG/' \
+		-e 's/Png/PNG/' \
+		game/CMakeLists.txt || die
+
+	strip-linguas -u lang
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable tools TOOLS)
+		$(cmake-utils_use_enable webcam WEBCAM)
+		$(cmake-utils_use_enable midi MIDI)
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DSHARE_INSTALL="${GAMES_DATADIR}"/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use songs ; then
+		insinto "${GAMES_DATADIR}"/${PN}
+		doins -r "${WORKDIR}/songs"
+	fi
+	dodoc docs/{Authors,instruments}.txt
+	newicon -s scalable data/themes/default/icon.svg ${PN}.svg
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}