commit: 1b83c341b5b7efea19ed0abe168b9104352998a0 Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> AuthorDate: Thu Feb 13 23:34:06 2025 +0000 Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> CommitDate: Thu Feb 13 23:34:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1b83c341
games-emulation/mupen64plus-qt: version bump, upstream now uses cmake Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> games-emulation/mupen64plus-qt/Manifest | 2 +- .../mupen64plus-qt/mupen64plus-qt-1.15-r1.ebuild | 46 ---------------------- .../mupen64plus-qt/mupen64plus-qt-1.17.ebuild | 25 ++++++++++++ .../mupen64plus-qt/mupen64plus-qt-9999.ebuild | 32 ++++----------- 4 files changed, 33 insertions(+), 72 deletions(-) diff --git a/games-emulation/mupen64plus-qt/Manifest b/games-emulation/mupen64plus-qt/Manifest index c0bca664a..4c02f146d 100644 --- a/games-emulation/mupen64plus-qt/Manifest +++ b/games-emulation/mupen64plus-qt/Manifest @@ -1 +1 @@ -DIST mupen64plus-qt-1.15.tar.gz 573009 BLAKE2B 9db7c5c7fefa99466933e4526338487b138eb970595d0ac92aedb1649e9786785b2472b7716cd24080e99cddda9d434207d2387515a62f6b2c111076bdcb10ed SHA512 f7abb23b401febbf60cfb04bcfe37047ce2e323241665aaae06874903da33c0dedf405809a8af193f82f1dc4537adcbcd480f86b5dad5d3af635d1eb00fb6aae +DIST mupen64plus-qt-1.17.tar.gz 733502 BLAKE2B b8542d3541cdbdcc1b5e7dbebe3aa9c145976c96232222715961d86603bcff36195fe3d8df5be484fe56f3f3cbd0dd115360e5bef3927b5377267a344543c390 SHA512 c75c018fcb387aa4957c396a8ec86c42ee378555fce0764a23b4701ccf2c923f0c67a2da21397bc58716f0bb21b88e94b808e10eb8c067b508612399d6d47396 diff --git a/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15-r1.ebuild b/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15-r1.ebuild deleted file mode 100644 index 35fa2ac00..000000000 --- a/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2018-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop qmake-utils - -DESCRIPTION="A basic launcher for Mupen64Plus" -HOMEPAGE="https://github.com/dh4/mupen64plus-qt"; -SRC_URI="https://github.com/dh4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-libs/quazip:=[qt5(+)] -" -DEPEND=">=games-emulation/mupen64plus-core-2.5 - ${RDEPEND}" - -src_prepare() { - sed -i -e '/include.*quazip5/s:quazip5/::' \ - src/emulation/emulatorhandler.cpp src/common.cpp || die - sed -i -e 's/lquazip5/lquazip1-qt5/' mupen64plus-qt.pro || die - default -} - -src_configure() { - eqmake5 - sed -i -e "/INCPATH/s:\$: $(pkg-config --cflags-only-I quazip1-qt5):" Makefile || die -} - -src_install() { - dobin ${PN} - dodoc README.md - doman resources/${PN}.6 - domenu resources/${PN}.desktop - newicon resources/images/mupen64plus.png ${PN}.png -} diff --git a/games-emulation/mupen64plus-qt/mupen64plus-qt-1.17.ebuild b/games-emulation/mupen64plus-qt/mupen64plus-qt-1.17.ebuild new file mode 100644 index 000000000..5802e57bd --- /dev/null +++ b/games-emulation/mupen64plus-qt/mupen64plus-qt-1.17.ebuild @@ -0,0 +1,25 @@ +# Copyright 2018-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A basic launcher for Mupen64Plus" +HOMEPAGE="https://github.com/dh4/mupen64plus-qt"; +SRC_URI="https://github.com/dh4/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" + +RDEPEND=" + dev-libs/quazip[qt6] + dev-qt/qtbase:6[gui,network,sql,widgets,xml] +" +DEPEND=">=games-emulation/mupen64plus-core-2.5 + ${RDEPEND}" + +src_install() { + cmake_src_install + rm -rf "${D}"/usr/$(get_libdir)/ +} diff --git a/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild b/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild index a1e13afb3..17c188307 100644 --- a/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild +++ b/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit desktop git-r3 qmake-utils +inherit cmake git-r3 DESCRIPTION="A basic launcher for Mupen64Plus" HOMEPAGE="https://github.com/dh4/mupen64plus-qt"; @@ -13,33 +13,15 @@ LICENSE="BSD" SLOT="0" RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-libs/quazip:=[qt5(+)] + dev-libs/quazip[qt6] + dev-qt/qtbase:6[gui,network,sql,widgets,xml] " DEPEND=">=games-emulation/mupen64plus-core-2.5 ${RDEPEND}" -src_prepare() { - sed -i -e '/include.*quazip5/s:quazip5/::' \ - src/emulation/emulatorhandler.cpp src/common.cpp || die - sed -i -e 's/lquazip5/lquazip1-qt5/' mupen64plus-qt.pro || die - default -} - -src_configure() { - eqmake5 - sed -i -e "/INCPATH/s:\$: $(pkg-config --cflags-only-I quazip1-qt5):" Makefile || die -} - src_install() { - dobin ${PN} - dodoc README.md - doman resources/${PN}.6 - domenu resources/${PN}.desktop - newicon resources/images/mupen64plus.png ${PN}.png + cmake_src_install + rm -rf "${D}"/usr/$(get_libdir)/ \ + "${D}"/usr/plugins/ \ + "${D}"/usr/bin/qt.conf }
