Re: [gentoo-proxy-maint] [PATCH 1/2] games-arcade/oshu: Version bump, 2.0.1

[Joonas Niilola]

On 3/30/20 5:30 AM, Haelwenn (lanodan) Monnier wrote:
> Signed-off-by: Haelwenn (lanodan) Monnier <contact@×××××××××.me>
> ---
>  games-arcade/oshu/Manifest          |  1 +
>  games-arcade/oshu/oshu-2.0.1.ebuild | 65 +++++++++++++++++++++++++++++
>  2 files changed, 66 insertions(+)
>  create mode 100644 games-arcade/oshu/oshu-2.0.1.ebuild
>
> diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
> index ef952619335..58793eeb050 100644
> --- a/games-arcade/oshu/Manifest
> +++ b/games-arcade/oshu/Manifest
> @@ -1,2 +1,3 @@
>  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
> 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 00000000000..b46284d4604
> --- /dev/null
> +++ b/games-arcade/oshu/oshu-2.0.1.ebuild
> @@ -0,0 +1,65 @@
> +# Copyright 1999-2020 Gentoo Authors
> +# Distributed under the terms of the GNU General Public License v2
> +
> +EAPI=7
> +
> +CMAKE_MIN_VERSION="3.9.0"
> +
> +inherit cmake-utils

Try to use cmake.eclass, cmake-utils is being deprecated for this kind
of use.

Remember to update functions below.


> +
> +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-2.0.5:=
> +	media-libs/sdl2-image:=
> +	x11-libs/cairo:=
> +	x11-libs/pango:=
> +	media-video/ffmpeg:=
> +"

Only ffmpeg from has subslots, so := on the other ones are redundant.


> +
> +DEPEND="${RDEPEND}"
> +
> +RESTRICT="test"

Why? Add a comment and preferably a bug number / upstream issue on top
to explain the restriction.


> +
> +src_prepare() {
> +	if use osu-skin; then
> +		eapply "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
> +		mv "${WORKDIR}/osu" share/skins/

|| die


> +	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
> +}

No xdg* eclass is inherited. I'm aware cmake.utils inherits it, but you
should imply the eclasses whose functions you use, so if the situation
with cmake.eclass changes in future this won't break. You can also use
xdg.eclass and you don't have to define pkg_{postinst,postrm} in this
ebuild at all.