games-emulation/vbam: Modernise

* Use GTK3 wxwidgets
* Call cmake-utils_src_prepare
* Remove redundant calls to src_compile
* Add missing app-arch/zip DEPEND
* Use proper ffmpeg/libav construct

Closes: https://bugs.gentoo.org/642742
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/games-emulation/vbam/vbam-2.0.1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
similarity index 86%
rename from games-emulation/vbam/vbam-2.0.1.ebuild
rename to games-emulation/vbam/vbam-2.0.1-r1.ebuild
index c564e02df5d54388773c50134e08d48b6738b2dc..8185bd80ace311e6465a1dd0a708b874fca693bb 100644 (file)
--- a/games-emulation/vbam/vbam-2.0.1.ebuild
+++ b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
+
+WX_GTK_VER="3.0-gtk3"
+inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -22,13 +23,14 @@ SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
-RDEPEND=">=media-libs/libpng-1.4:0=
+RDEPEND="
+       >=media-libs/libpng-1.4:0=
        media-libs/libsdl2[joystick]
        link? ( >=media-libs/libsfml-2.0:= )
-       sys-libs/zlib
+       sys-libs/zlib:=
        virtual/glu
        virtual/opengl
-       ffmpeg? ( virtual/ffmpeg[-libav] )
+       ffmpeg? ( media-video/ffmpeg:= )
        lirc? ( app-misc/lirc )
        nls? ( virtual/libintl )
        wxwidgets? (
@@ -36,18 +38,19 @@ RDEPEND=">=media-libs/libpng-1.4:0=
                x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
        )"
 DEPEND="${RDEPEND}
+       app-arch/zip
        wxwidgets? ( virtual/imagemagick-tools )
        x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
        nls? ( sys-devel/gettext )
        virtual/pkgconfig"
 
 PATCHES=(
-       "${FILESDIR}/${P}-changelog-update.patch"
-       "${FILESDIR}/${P}-read-version-from-changelog.patch"
+       "${FILESDIR}"/${P}-changelog-update.patch
+       "${FILESDIR}"/${P}-read-version-from-changelog.patch
 )
 
 src_prepare() {
-       default
+       cmake-utils_src_prepare
 
        # fix desktop file QA warnings
        edos2unix src/wx/wxvbam.desktop
@@ -70,10 +73,6 @@ src_configure() {
        cmake-utils_src_configure
 }
 
-src_compile() {
-       cmake-utils_src_compile
-}
-
 src_install() {
        cmake-utils_src_install
 

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 357c94893101bdfb778d430b99c801554bbbd097..a030b6e4a4de733d4f514fb653dee9d533c25c87 100644 (file)
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -2,15 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
+
+WX_GTK_VER="3.0-gtk3"
+inherit eutils gnome2-utils wxwidgets xdg-utils cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
        inherit git-r3
 else
-       SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+       SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
+       S="${WORKDIR}/visualboyadvance-m-${PV}"
 fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
@@ -21,13 +23,14 @@ SLOT="0"
 IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
-RDEPEND=">=media-libs/libpng-1.4:0=
+RDEPEND="
+       >=media-libs/libpng-1.4:0=
        media-libs/libsdl2[joystick]
        link? ( >=media-libs/libsfml-2.0:= )
-       sys-libs/zlib
+       sys-libs/zlib:=
        virtual/glu
        virtual/opengl
-       ffmpeg? ( virtual/ffmpeg[-libav] )
+       ffmpeg? ( media-video/ffmpeg:= )
        lirc? ( app-misc/lirc )
        nls? ( virtual/libintl )
        wxwidgets? (
@@ -35,13 +38,14 @@ RDEPEND=">=media-libs/libpng-1.4:0=
                x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
        )"
 DEPEND="${RDEPEND}
+       app-arch/zip
        wxwidgets? ( virtual/imagemagick-tools )
        x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
        nls? ( sys-devel/gettext )
        virtual/pkgconfig"
 
 src_prepare() {
-       default
+       cmake-utils_src_prepare
 
        # fix desktop file QA warnings
        edos2unix src/wx/wxvbam.desktop
@@ -64,10 +68,6 @@ src_configure() {
        cmake-utils_src_configure
 }
 
-src_compile() {
-       cmake-utils_src_compile
-}
-
 src_install() {
        cmake-utils_src_install