From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-998753-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 0F1381382C5
for <garchives@archives.gentoo.org>; Sat, 20 Jan 2018 19:54:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 360B8E0841;
Sat, 20 Jan 2018 19:54:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 060EEE0841
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Jan 2018 19:54:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 78BCD335C37
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Jan 2018 19:54:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 317341C0
for <gentoo-commits@lists.gentoo.org>; Sat, 20 Jan 2018 19:54:08 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1516478032.b226cc20961b7f3f5c091eaf02b30ecc2b503a93.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-emulation/vbam/vbam-2.0.1-r1.ebuild games-emulation/vbam/vbam-2.0.1.ebuild games-emulation/vbam/vbam-9999.ebuild
X-VCS-Directories: games-emulation/vbam/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: b226cc20961b7f3f5c091eaf02b30ecc2b503a93
X-VCS-Branch: master
Date: Sat, 20 Jan 2018 19:54:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: bdb4c8a8-c42d-40a7-a683-41ded266dc2a
X-Archives-Hash: bf853b8e5b3a59e9f8cc638818f5537e
commit: b226cc20961b7f3f5c091eaf02b30ecc2b503a93
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 19:53:26 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 19:53:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b226cc20
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
.../{vbam-2.0.1.ebuild => vbam-2.0.1-r1.ebuild} | 23 +++++++++++-----------
games-emulation/vbam/vbam-9999.ebuild | 22 ++++++++++-----------
2 files changed, 22 insertions(+), 23 deletions(-)
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 c564e02df5d..8185bd80ace 100644
--- 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 357c9489310..a030b6e4a4d 100644
--- 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