From cd0b93ea9adcc7148bdc12202a1d25455fb4f825 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Wed, 18 May 2022 05:20:32 +0200 Subject: games-emulation/mupen64plus-qt: rework quazip includes Signed-off-by: Samuel Bauer --- games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild | 7 ++++--- games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild b/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild index bb5dbf0c0e..baea82b251 100644 --- a/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild +++ b/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop qmake-utils @@ -25,7 +25,7 @@ DEPEND=">=games-emulation/mupen64plus-core-2.5 ${RDEPEND}" src_prepare() { - sed -i -e '/include.*quazip5/s/quazip5/QuaZip-Qt5-1.1\/quazip/' \ + 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 @@ -33,6 +33,7 @@ src_prepare() { src_configure() { eqmake5 + sed -i -e "/INCPATH/s:\$: $(pkg-config --cflags-only-I quazip1-qt5):" Makefile || die } src_install() { diff --git a/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild b/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild index 778646412d..f4de6352da 100644 --- a/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild +++ b/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2018-2021 Gentoo Authors +# Copyright 2018-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop git-r3 qmake-utils @@ -25,7 +25,7 @@ DEPEND=">=games-emulation/mupen64plus-core-2.5 ${RDEPEND}" src_prepare() { - sed -i -e '/include.*quazip5/s/quazip5/QuaZip-Qt5-1.1\/quazip/' \ + 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 @@ -33,6 +33,7 @@ src_prepare() { src_configure() { eqmake5 + sed -i -e "/INCPATH/s:\$: $(pkg-config --cflags-only-I quazip1-qt5):" Makefile || die } src_install() { -- cgit v1.2.3-65-gdbad