gentoo Easter resync : 12.04.2020

4 files changed, 113 insertions, 64 deletions

diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
index 672a3f0606a7..82125b7d8028 100644
--- a/games-arcade/oshu/Manifest
+++ b/games-arcade/oshu/Manifest
@@ -1,5 +1,6 @@
 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-2.0.1.tar.gz 144900 BLAKE2B 47f1d0a11255459ae357142499aeffcf07fbcad961cb34ba98e9efa7cb4229cf8d61ec836a4c899f2ea0883f1252395bc0c6ff34c5d670d67091cf6483d135ff SHA512 65768b3d8e7733464f05a19bbee594c0be728267bbd0667bc0f34e0d01a39e52d4ecce89a9223f7c454d73b21bc735401e9d83eea8b0a2eaf1c7825a3bd6b1cf
 DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
-EBUILD oshu-2.0.0.ebuild 1206 BLAKE2B 03af462af767ca12bed363b6080d692c8b0cc58763346956688f8f6f1a40fc2e673113c24eed5e458645f5d673a5b086465ad8c758c5aba1eaa3548fffb3a631 SHA512 d8300aeac277c59968a265759bc5ca15b6b18ad62e5a36994b1ccaeefd6fd160bcdcaafd42c7501460103126fad7aa321df12d9dbbbf1a650b054d1705ca2ab2
+EBUILD oshu-2.0.1.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
+EBUILD oshu-9999.ebuild 1188 BLAKE2B 59a26375ab0c598abec94e55016d8d0c59f8db61da06ac9ab9b9895d35311136a69b4816ada8be1542617988f311bf63099b3d0ad4ab556bd398a348e849c6ea SHA512 4ee01d125d2b1298037c78ddd499dbaa7531b726d706cefc71d019ed4084f443bd7745b33e00dee85b76c2abc9c6e0115eca885e7fafd9d29f641e456b1c194f
 MISC metadata.xml 423 BLAKE2B 0c302dedd0ac0c3bb3295da6a5ae4e568e848f25d2e03f3276fc37f3053ad46df131a4cff5c7ee2b83061f312c06b090b6a66fad5fd64137d2f9d97ec241143c SHA512 c30495d814265e4a2a18c4ef01e4ea7436d0cdcc14838932aa6d52d87354db8e6bff45519f7a8e333c92bd699b4e903cc1b7aad614455314788007a227857bf6
diff --git a/games-arcade/oshu/oshu-2.0.0.ebuild b/games-arcade/oshu/oshu-2.0.0.ebuild
deleted file mode 100644
index 24f021264b5a..000000000000
--- a/games-arcade/oshu/oshu-2.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-}
diff --git a/games-arcade/oshu/oshu-2.0.1.ebuild b/games-arcade/oshu/oshu-2.0.1.ebuild
new file mode 100644
index 000000000000..f394d8081789
--- /dev/null
+++ b/games-arcade/oshu/oshu-2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Lightweight osu! port"
+HOMEPAGE="https://github.com/fmang/oshu"
+
+if [[ $PV = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
+	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+else
+	SRC_URI="https://github.com/fmang/oshu/archive/${PV}.tar.gz -> oshu-${PV}.tar.gz
+		osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3 CC-BY-NC-4.0"
+SLOT="0"
+IUSE="osu-skin"
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+	x11-libs/cairo
+	x11-libs/pango
+	media-video/ffmpeg:=
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if use osu-skin; then
+		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
+		mv "${WORKDIR}/osu" share/skins/ || die "Failed to move osu-skin"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
+		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}
diff --git a/games-arcade/oshu/oshu-9999.ebuild b/games-arcade/oshu/oshu-9999.ebuild
new file mode 100644
index 000000000000..f394d8081789
--- /dev/null
+++ b/games-arcade/oshu/oshu-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+
+DESCRIPTION="Lightweight osu! port"
+HOMEPAGE="https://github.com/fmang/oshu"
+
+if [[ $PV = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fmang/oshu.git"
+	SRC_URI="osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+else
+	SRC_URI="https://github.com/fmang/oshu/archive/${PV}.tar.gz -> oshu-${PV}.tar.gz
+		osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3 CC-BY-NC-4.0"
+SLOT="0"
+IUSE="osu-skin"
+
+RDEPEND="
+	media-libs/libsdl2
+	media-libs/sdl2-image
+	x11-libs/cairo
+	x11-libs/pango
+	media-video/ffmpeg:=
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if use osu-skin; then
+		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
+		mv "${WORKDIR}/osu" share/skins/ || die "Failed to move osu-skin"
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
+		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build check
+}