commit: f0b888963c7cfa48318ecfce7556b20df0ea92b5 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Tue Feb 6 10:16:41 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Tue Feb 6 13:07:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b88896
games-util/cartridges: fix python optimization call Closes: https://bugs.gentoo.org/923898 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../{cartridges-2.3.ebuild => cartridges-2.3-r1.ebuild} | 4 ++-- ...artridges-2.6.1.ebuild => cartridges-2.6.1-r1.ebuild} | 4 ++-- ...artridges-2.6.2.ebuild => cartridges-2.6.2-r1.ebuild} | 4 ++-- ...artridges-2.7.2.ebuild => cartridges-2.7.2-r1.ebuild} | 4 ++-- games-util/cartridges/cartridges-9999.ebuild | 16 ++++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/games-util/cartridges/cartridges-2.3.ebuild b/games-util/cartridges/cartridges-2.3-r1.ebuild similarity index 92% rename from games-util/cartridges/cartridges-2.3.ebuild rename to games-util/cartridges/cartridges-2.3-r1.ebuild index ed5e3c551ea4..d8611e3e92f3 100644 --- a/games-util/cartridges/cartridges-2.3.ebuild +++ b/games-util/cartridges/cartridges-2.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -44,7 +44,7 @@ src_install() { meson_src_install python_fix_shebang "${ED}"/usr/bin - python_optimize "${ED}"/usr/share/cartridges/cartridges + python_optimize "${ED}/usr/share/cartridges" } pkg_postinst() { diff --git a/games-util/cartridges/cartridges-2.6.1.ebuild b/games-util/cartridges/cartridges-2.6.1-r1.ebuild similarity index 92% rename from games-util/cartridges/cartridges-2.6.1.ebuild rename to games-util/cartridges/cartridges-2.6.1-r1.ebuild index a0ac6894055e..2a9a628c1118 100644 --- a/games-util/cartridges/cartridges-2.6.1.ebuild +++ b/games-util/cartridges/cartridges-2.6.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,7 +46,7 @@ src_install() { meson_src_install python_fix_shebang "${ED}/usr/bin" - python_optimize "${ED}/usr/share/cartridges/cartridges" + python_optimize "${ED}/usr" } pkg_postinst() { diff --git a/games-util/cartridges/cartridges-2.6.2.ebuild b/games-util/cartridges/cartridges-2.6.2-r1.ebuild similarity index 92% rename from games-util/cartridges/cartridges-2.6.2.ebuild rename to games-util/cartridges/cartridges-2.6.2-r1.ebuild index a0ac6894055e..2a9a628c1118 100644 --- a/games-util/cartridges/cartridges-2.6.2.ebuild +++ b/games-util/cartridges/cartridges-2.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,7 +46,7 @@ src_install() { meson_src_install python_fix_shebang "${ED}/usr/bin" - python_optimize "${ED}/usr/share/cartridges/cartridges" + python_optimize "${ED}/usr" } pkg_postinst() { diff --git a/games-util/cartridges/cartridges-2.7.2.ebuild b/games-util/cartridges/cartridges-2.7.2-r1.ebuild similarity index 90% rename from games-util/cartridges/cartridges-2.7.2.ebuild rename to games-util/cartridges/cartridges-2.7.2-r1.ebuild index cb3975484a26..737fd3c49f9c 100644 --- a/games-util/cartridges/cartridges-2.7.2.ebuild +++ b/games-util/cartridges/cartridges-2.7.2-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit gnome2-utils meson python-single-r1 xdg +inherit gnome2-utils python-single-r1 meson xdg DESCRIPTION="Simple game launcher written in Python using GTK4 and Libadwaita" HOMEPAGE="https://github.com/kra-mo/cartridges/"; @@ -44,7 +44,7 @@ src_install() { meson_src_install python_fix_shebang "${ED}/usr/bin" - python_optimize "${ED}/usr/share/cartridges/cartridges" + python_optimize "${ED}/usr" } pkg_postinst() { diff --git a/games-util/cartridges/cartridges-9999.ebuild b/games-util/cartridges/cartridges-9999.ebuild index 05c8ac27f772..4e682ff73e26 100644 --- a/games-util/cartridges/cartridges-9999.ebuild +++ b/games-util/cartridges/cartridges-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,12 +10,14 @@ inherit gnome2-utils meson python-single-r1 xdg DESCRIPTION="Simple game launcher written in Python using GTK4 and Libadwaita" HOMEPAGE="https://github.com/kra-mo/cartridges/"; -if [[ ${PV} == *9999* ]] ; then +if [[ "${PV}" == *9999* ]] ; then inherit git-r3 + EGIT_REPO_URI="https://github.com/kra-mo/${PN}.git"; else SRC_URI="https://github.com/kra-mo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" fi @@ -25,26 +27,24 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} + >=gui-libs/libadwaita-1.4.0:1[introspection] gui-libs/gtk:4[introspection] - gui-libs/libadwaita:1[introspection] $(python_gen_cond_dep ' dev-python/pygobject:3[${PYTHON_USEDEP}] ') " -DEPEND="${RDEPEND}" BDEPEND=" + ${RDEPEND} dev-libs/appstream-glib dev-util/blueprint-compiler dev-util/desktop-file-utils " -PATCHES=( "${FILESDIR}"/${PN}-1.5.4-dont-validate-appstream.patch ) - src_install() { meson_src_install - python_fix_shebang "${ED}"/usr/bin - python_optimize "${ED}"/usr/share/cartridges/cartridges + python_fix_shebang "${ED}/usr/bin" + python_optimize "${ED}/usr" } pkg_postinst() {
