Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/
Date: Fri, 26 Aug 2016 05:17:34
Message-Id: 1472188638.0ca8f58344643b381c0ec900b73960c75226c5c4.radhermit@gentoo
1 commit: 0ca8f58344643b381c0ec900b73960c75226c5c4
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 26 05:10:17 2016 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 26 05:17:18 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca8f583
7
8 games-emulation/vbam: update to EAPI 6 and drop games eclass usage
9
10 games-emulation/vbam/vbam-9999.ebuild | 51 +++++++++++++----------------------
11 1 file changed, 19 insertions(+), 32 deletions(-)
12
13 diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
14 index acb9bda..e198f37 100644
15 --- a/games-emulation/vbam/vbam-9999.ebuild
16 +++ b/games-emulation/vbam/vbam-9999.ebuild
17 @@ -1,21 +1,21 @@
18 -# Copyright 1999-2015 Gentoo Foundation
19 +# Copyright 1999-2016 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21 # $Id$
22
23 -EAPI=5
24 +EAPI=6
25 WX_GTK_VER="3.0"
26 -inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
27 +inherit cmake-utils wxwidgets gnome2-utils fdo-mime eutils
28
29 if [[ ${PV} == 9999 ]]; then
30 - ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
31 - inherit subversion
32 + EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
33 + inherit git-r3
34 else
35 SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
36 KEYWORDS="~amd64 ~x86"
37 fi
38
39 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
40 -HOMEPAGE="https://sourceforge.net/projects/vbam/"
41 +HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
42
43 LICENSE="GPL-2"
44 SLOT="0"
45 @@ -24,7 +24,7 @@ REQUIRED_USE="|| ( sdl gtk wxwidgets )"
46
47 RDEPEND=">=media-libs/libpng-1.4:0=
48 media-libs/libsdl[joystick]
49 - link? ( >=media-libs/libsfml-2.0 )
50 + link? ( >=media-libs/libsfml-2.0:= )
51 sys-libs/zlib
52 virtual/glu
53 virtual/opengl
54 @@ -46,13 +46,7 @@ DEPEND="${RDEPEND}
55 virtual/pkgconfig"
56
57 src_prepare() {
58 - [[ ${PV} == 9999 ]] && subversion_src_prepare
59 -
60 - # fix issue with zlib-1.2.5.1 macros (bug #383179)
61 - sed -i '1i#define OF(x) x' src/common/memgzio.c || die
62 -
63 - sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
64 - CMakeLists.txt src/wx/CMakeLists.txt || die
65 + default
66
67 # fix desktop file QA warnings
68 edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop
69 @@ -60,19 +54,18 @@ src_prepare() {
70
71 src_configure() {
72 local mycmakeargs=(
73 - $(cmake-utils_use_enable cairo CAIRO)
74 - $(cmake-utils_use_enable ffmpeg FFMPEG)
75 - $(cmake-utils_use_enable gtk GTK)
76 - $(cmake-utils_use_enable link LINK)
77 - $(cmake-utils_use_enable lirc LIRC)
78 - $(cmake-utils_use_enable nls NLS)
79 - $(cmake-utils_use_enable openal OPENAL)
80 - $(cmake-utils_use_enable sdl SDL)
81 - $(cmake-utils_use_enable wxwidgets WX)
82 - $(cmake-utils_use_enable x86 ASM_CORE)
83 - $(cmake-utils_use_enable x86 ASM_SCALERS)
84 + -DENABLE_CAIRO=$(usex cairo)
85 + -DENABLE_FFMPEG=$(usex ffmpeg)
86 + -DENABLE_GTK=$(usex gtk)
87 + -DENABLE_LINK=$(usex link)
88 + -DENABLE_LIRC=$(usex lirc)
89 + -DENABLE_NLS=$(usex nls)
90 + -DENABLE_OPENAL=$(usex openal)
91 + -DENABLE_SDL=$(usex sdl)
92 + -DENABLE_WX=$(usex wxwidgets)
93 + -DENABLE_ASM_CORE=$(usex x86)
94 + -DENABLE_ASM_SCALERS=$(usex x86)
95 -DCMAKE_SKIP_RPATH=ON
96 - -DDATA_INSTALL_DIR=share/games/${PN}
97 )
98 cmake-utils_src_configure
99 }
100 @@ -90,21 +83,15 @@ src_install() {
101 fi
102 use wxwidgets && doman src/debian/wxvbam.1
103 use gtk && doman src/debian/gvbam.1
104 -
105 - prepgamesdirs
106 }
107
108 pkg_preinst() {
109 - [[ ${PV} == 9999 ]] && subversion_pkg_preinst
110 -
111 - games_pkg_preinst
112 if use gtk || use wxwidgets ; then
113 gnome2_icon_savelist
114 fi
115 }
116
117 pkg_postinst() {
118 - games_pkg_postinst
119 if use gtk || use wxwidgets ; then
120 gnome2_icon_cache_update
121 fi