gentoo resync : 05.04.2018

6 files changed, 104 insertions, 29 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 2d92a874b308..17b2d07ede30 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
index 2559855bbbc4..672a3f0606a7 100644
--- a/games-arcade/oshu/Manifest
+++ b/games-arcade/oshu/Manifest
@@ -1,3 +1,5 @@
-DIST oshu-1.6.0.tar.gz 2459889 BLAKE2B 568b5bf00da50ce215b6156b36d0d1d894259abebeeba725103601f7f5d3a82705d308a7986f5e705b0d24469e6866207836eec9e1b9bdd89df291a4e9c372cd SHA512 e1f76a05d7ba40265dd58f6fe8106ed6293385870c7e77ff6bbd3dd0e9b5f7bc45f8f0b9c3729a6781c04289d54c76f9698bb659ba50fd35e609de23ecb02aa8
-EBUILD oshu-1.6.0.ebuild 535 BLAKE2B 767c93b24ae98d14e6784991c262e43ccaa6a43d4525a3558a1dde4d865e35bd70aeaa35791ed0d410b8744cd3129099101eb93d48c4aedf5cc01eb8bda7a870 SHA512 5e5bd6766b52931e8fdd75611ba05aecacd42fbb71d5d627829add3735ec30575d99f0c063c103ba75059e7d22601bc35a14cbcc458c300901049b6e6517ba11
-MISC metadata.xml 330 BLAKE2B 87fadecd45f680ccf29dbc736eac6c8d5c5da5dc6f15749b42abf6d4d6a5b1d466818b32d996198a0a7534365bf31a5773b8ae358330ee36e365a26e90789ba1 SHA512 c33841e96737f16de6ee6a4f7e2dba04df4dddb26d502d55df8be637ed668a5c8593fef76a2b24a00da335a59cac5f534f89e8cf917d8b1d4ffa9d3d9c0c6d57
+AUX oshu-2.0.0-use_unpacked_osu-skin.patch 1233 BLAKE2B fb8a41b0fc8c8891e3d1dbe1cca6da320049c30a24b146612e2dcbf5490458b8c5db1ed410e9378552f4f048148b2770caf1f87ca60431b92f5d9f9b12885761 SHA512 4e5a0cfb995710c16f6acba7a02e4f0c25de9fc83b28de8c42279fe8e3dea01c33a2e22e9b43e05ab9996534710199315f36e836e24a41ea212e17b08c30e461
+DIST oshu-2.0.0.tar.gz 144088 BLAKE2B c4383746624f4de62e158a2f94d4e5c1a3e2f037fd05d80607932414f20a031103bd73f108644a93faadf61c21f3d2505da3afd2ea7ea43bd59e32966724928b SHA512 ed2b8294b06d239948c563135d997b422191be681ff86714a244ca64079251508a5a62e23cf3ae1e0ac2b3128b6401901233714eab7787989296ca1700192643
+DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
+EBUILD oshu-2.0.0.ebuild 1206 BLAKE2B 03af462af767ca12bed363b6080d692c8b0cc58763346956688f8f6f1a40fc2e673113c24eed5e458645f5d673a5b086465ad8c758c5aba1eaa3548fffb3a631 SHA512 d8300aeac277c59968a265759bc5ca15b6b18ad62e5a36994b1ccaeefd6fd160bcdcaafd42c7501460103126fad7aa321df12d9dbbbf1a650b054d1705ca2ab2
+MISC metadata.xml 423 BLAKE2B 0c302dedd0ac0c3bb3295da6a5ae4e568e848f25d2e03f3276fc37f3053ad46df131a4cff5c7ee2b83061f312c06b090b6a66fad5fd64137d2f9d97ec241143c SHA512 c30495d814265e4a2a18c4ef01e4ea7436d0cdcc14838932aa6d52d87354db8e6bff45519f7a8e333c92bd699b4e903cc1b7aad614455314788007a227857bf6
diff --git a/games-arcade/oshu/files/oshu-2.0.0-use_unpacked_osu-skin.patch b/games-arcade/oshu/files/oshu-2.0.0-use_unpacked_osu-skin.patch
new file mode 100644
index 000000000000..3786c2ed8adf
--- /dev/null
+++ b/games-arcade/oshu/files/oshu-2.0.0-use_unpacked_osu-skin.patch
@@ -0,0 +1,34 @@
+commit 1dffc1a763f33af12715f4abcf8fd2043055a9a2
+Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
+Date:   Sun Apr 1 23:21:55 2018 +0200
+
+    share/skins/CMakeLists.txt: Use already unpacked osu-skin
+
+diff --git a/share/skins/CMakeLists.txt b/share/skins/CMakeLists.txt
+index 54e20e5..2501757 100644
+--- a/share/skins/CMakeLists.txt
++++ b/share/skins/CMakeLists.txt
+@@ -24,22 +24,10 @@ if ("minimal" IN_LIST OSHU_ENABLED_SKINS)
+ endif ("minimal" IN_LIST OSHU_ENABLED_SKINS)
+ 
+ if ("osu" IN_LIST OSHU_ENABLED_SKINS)
+-	file(
+-		DOWNLOAD "https://www.mg0.fr/oshu/skins/osu-v1.tar.gz" "${CMAKE_CURRENT_BINARY_DIR}/osu.tar.gz"
+-		EXPECTED_HASH SHA256=bc645534371bf5ccba66d4a6729dc1deffb6f148b6ce115efd305f9ffab1d183
+-	)
+-	add_custom_command(
+-		OUTPUT osu/README.md
+-		COMMAND "${CMAKE_COMMAND}" -E tar xf osu.tar.gz
+-		COMMAND "${CMAKE_COMMAND}" -E touch osu/README.md
+-		DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/osu.tar.gz"
+-		COMMENT "Unpacking the osu skin"
+-		VERBATIM
+-	)
+ 	add_custom_target(osu-skin DEPENDS osu/README.md)
+ 	add_dependencies(skins osu-skin)
+ 	install(
+-		DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/osu"
++		DIRECTORY osu
+ 		DESTINATION "${OSHU_SKINS_INSTALL_DIRECTORY}"
+ 	)
+ endif ("osu" IN_LIST OSHU_ENABLED_SKINS)
diff --git a/games-arcade/oshu/metadata.xml b/games-arcade/oshu/metadata.xml
index 764e78624bc3..3e59d136eb7a 100644
--- a/games-arcade/oshu/metadata.xml
+++ b/games-arcade/oshu/metadata.xml
@@ -8,4 +8,7 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
+<use>
+	<flag name="osu-skin">Include more complete osu-skin (other is minimal)</flag>
+</use>
 </pkgmetadata>
diff --git a/games-arcade/oshu/oshu-1.6.0.ebuild b/games-arcade/oshu/oshu-1.6.0.ebuild
deleted file mode 100644
index d8ded4320ec0..000000000000
--- a/games-arcade/oshu/oshu-1.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Lightweight osu! port"
-HOMEPAGE="https://github.com/fmang/oshu"
-SRC_URI="https://www.mg0.fr/oshu/releases/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3 CC-BY-NC-4.0"
-SLOT="0"
-IUSE="libav"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.5:=
-	media-libs/sdl2-image:=
-	x11-libs/cairo:=
-	x11-libs/pango:=
-	!libav? ( media-video/ffmpeg:= )
-	libav? ( media-video/libav:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/games-arcade/oshu/oshu-2.0.0.ebuild b/games-arcade/oshu/oshu-2.0.0.ebuild
new file mode 100644
index 000000000000..24f021264b5a
--- /dev/null
+++ b/games-arcade/oshu/oshu-2.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.9.0"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Lightweight osu! port"
+HOMEPAGE="https://github.com/fmang/oshu"
+SRC_URI="https://www.mg0.fr/oshu/releases/${P}.tar.gz
+	osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3 CC-BY-NC-4.0"
+SLOT="0"
+IUSE="libav osu-skin"
+
+RDEPEND="
+	>=media-libs/libsdl2-2.0.5:=
+	media-libs/sdl2-image:=
+	x11-libs/cairo:=
+	x11-libs/pango:=
+	!libav? ( media-video/ffmpeg:= )
+	libav? ( media-video/libav:= )
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+RESTRICT="test"
+
+src_prepare() {
+	if use osu-skin; then
+		epatch "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
+		mv "${WORKDIR}/osu" share/skins/
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
+		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}