gentoo resync : 28.04.2018

3 files changed, 30 insertions, 25 deletions

diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index ee395a809ee0..2cfae6c8b535 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -5,5 +5,5 @@ DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed
 DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
 DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
 DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
-EBUILD performous-1.1.ebuild 2520 BLAKE2B 5da48880220e4fb81ab851b3303250ac267173075c079e544cd8f1e9325baab1b5739fed67aeac4a89701e58c84668c78c113063569d8c622e2841d497a5cadf SHA512 7480ae6c6a59cd269006bc26afe47cb77896cf4d565e19e0280de5edd496e0df748c8c161fa3c90fcf893452760c45af6a511a84094e5afc32c925853256727c
-MISC metadata.xml 796 BLAKE2B f74397fc9ab29519c3076bdd9caa181f2d71080f3ad05a060ceba13c42ea9b0a826e756300e9730940bc9189a4dfae6a253052f79b48413b68a348b5d303b09f SHA512 1161a7a6b8c9827fe54c01f99ce6534475f23e3cba4890b8e5ab3aedd594de43c836df01c428144dd3ce141fe5df0a590206819e607044d28ab36c4a3cec3255
+EBUILD performous-1.1-r1.ebuild 2474 BLAKE2B eaecbe32cbf0d321090972037a54065d559063b57abe80e5570cbfd74deeffb603d0b25f539fc3b43b207913cae9bcb3a7fa4d1dd0cca61457264981740bbf03 SHA512 cc07a9970af2e12bb8eb4bb0f1279c5213c5937398f5108c89d89a4260ad75e1a608892ea45b418a3fdf20ef7ea1f56335615e3c6f677fa9aa7b4bdba34f82ad
+MISC metadata.xml 856 BLAKE2B d467d86270f2f571d310ceac4934aea595a62fa9e234e8897ef0b22871df612cdb335e7e3298a0991db6c98b78ea68b04882de8696150d5acb65944d9ff80c3d SHA512 24da96b0da902a2d54d92e2f74d8c57fdd1e84f35b96d416cb15898485f0387c70f3430e21ba7eebd5bc289f76f02695d246746abe7eb041f9f7e2e0e8e1e4e0
diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml
index c8eefd0a8906..2ee1cd7690b5 100644
--- a/games-arcade/performous/metadata.xml
+++ b/games-arcade/performous/metadata.xml
@@ -11,7 +11,7 @@
 	<use>
 		<flag name="midi">Enable MIDI I/O support</flag>
 		<flag name="songs">Install a few demo songs</flag>
-		<flag name="tools">Install tools</flag>
+		<flag name="tools">Enable building of song extraction utilities for SingStar and Guitar Hero</flag>
 		<flag name="webcam">Enable Webcam support</flag>
 	</use>
 	<upstream>
diff --git a/games-arcade/performous/performous-1.1.ebuild b/games-arcade/performous/performous-1.1-r1.ebuild
index e7eefe5ef0ab..6b8850506d52 100644
--- a/games-arcade/performous/performous-1.1.ebuild
+++ b/games-arcade/performous/performous-1.1-r1.ebuild
@@ -1,44 +1,50 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 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
+inherit desktop cmake-utils epatch gnome2-utils
+
+MY_PN="Performous"
+MY_P="${MY_PN}-${PV}"
+SONGS_PN="ultrastar-songs"
 
 DESCRIPTION="SingStar GPL clone"
 HOMEPAGE="https://performous.org/"
-SRC_URI="https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+	https://github.com/performous/performous/archive/${PV}.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
+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:2
+RDEPEND="
+	dev-cpp/glibmm:2
 	dev-cpp/libxmlpp:2.6
 	media-libs/portaudio
 	dev-libs/boost[threads(+)]
 	dev-libs/glib:2
-	dev-libs/libxml2
-	gnome-base/librsvg
-	media-gfx/imagemagick
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	media-gfx/imagemagick:0=
 	virtual/jpeg:0
-	media-libs/libpng:0
+	media-libs/libpng:0=
 	media-libs/libsdl2[joystick,video]
 	virtual/ffmpeg
 	virtual/opengl
@@ -50,10 +56,12 @@ RDEPEND="dev-cpp/glibmm:2
 	x11-libs/pango
 	media-libs/libepoxy
 	midi? ( media-libs/portmidi )
-	webcam? ( media-libs/opencv )"
+	webcam? ( media-libs/opencv )
+"
 DEPEND="${RDEPEND}
 	sys-apps/help2man
-	sys-devel/gettext"
+	sys-devel/gettext
+"
 
 src_prepare() {
 	cmake-utils_src_prepare
@@ -61,7 +69,7 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/${P}-linguas.patch
 	sed -i \
-		-e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \
+		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
 		-e '/ Z /s/ Z/ ZLIB/g' \
 		-e 's/Z_FOUND/ZLIB_FOUND/g' \
 		-e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
@@ -78,7 +86,7 @@ src_configure() {
 		$(cmake-utils_use_enable webcam WEBCAM)
 		$(cmake-utils_use_enable midi MIDI)
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DSHARE_INSTALL="${GAMES_DATADIR}"/${PN}
+		-DSHARE_INSTALL="/usr/share/${PN}"
 	)
 	cmake-utils_src_configure
 }
@@ -90,21 +98,18 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 	if use songs ; then
-		insinto "${GAMES_DATADIR}"/${PN}
+		insinto "/usr/share/${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
 }