| 1 |
commit: 74e69c90edb6e8a5989417b85d0fe647fa842a96 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 29 20:22:35 2015 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 29 20:23:54 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e69c90 |
| 7 |
|
| 8 |
games-emulation/vbam: version bump to new snapshot |
| 9 |
|
| 10 |
Also merge the live and snapshot ebuilds. |
| 11 |
|
| 12 |
games-emulation/vbam/Manifest | 1 + |
| 13 |
.../{vbam-9999.ebuild => vbam-2.0.0_pre1507.ebuild} | 21 ++++++++++++--------- |
| 14 |
games-emulation/vbam/vbam-9999.ebuild | 21 ++++++++++++--------- |
| 15 |
3 files changed, 25 insertions(+), 18 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest |
| 18 |
index d5dd232..1978f16 100644 |
| 19 |
--- a/games-emulation/vbam/Manifest |
| 20 |
+++ b/games-emulation/vbam/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST vbam-1.8.0.1228.tar.xz 866904 SHA256 ff771240b5ec89e452e6c00f45afd2c8f869570b634044cce997f4af797299e6 SHA512 22c7e14e5634c45c5a37be4387be579fceebd200f528514c0ab9059846d60f215e9bb40d73ae9a781a3018e4891d81d56dd50258d21f82b1262735aabab97155 WHIRLPOOL 19bf64ab118f80035f8c97b45c75ebd8cb956854bfc482016e22e0f7a700178115b02f7272ca5ea20cc515f1eac5e2dd22773796a03ff0f9a608ebb0d49c986a |
| 23 |
+DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200 |
| 24 |
|
| 25 |
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild |
| 26 |
similarity index 87% |
| 27 |
copy from games-emulation/vbam/vbam-9999.ebuild |
| 28 |
copy to games-emulation/vbam/vbam-2.0.0_pre1507.ebuild |
| 29 |
index 12b7eb2..5ddac33 100644 |
| 30 |
--- a/games-emulation/vbam/vbam-9999.ebuild |
| 31 |
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild |
| 32 |
@@ -4,16 +4,21 @@ |
| 33 |
|
| 34 |
EAPI=5 |
| 35 |
WX_GTK_VER="3.0" |
| 36 |
-inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games |
| 37 |
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime games |
| 38 |
|
| 39 |
-ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk" |
| 40 |
+if [[ ${PV} == 9999 ]]; then |
| 41 |
+ ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk" |
| 42 |
+ inherit subversion |
| 43 |
+else |
| 44 |
+ SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz" |
| 45 |
+ KEYWORDS="~amd64 ~x86" |
| 46 |
+fi |
| 47 |
|
| 48 |
DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance" |
| 49 |
HOMEPAGE="http://sourceforge.net/projects/vbam/" |
| 50 |
|
| 51 |
LICENSE="GPL-2" |
| 52 |
SLOT="0" |
| 53 |
-KEYWORDS="" |
| 54 |
IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" |
| 55 |
REQUIRED_USE="|| ( sdl gtk wxwidgets )" |
| 56 |
|
| 57 |
@@ -40,12 +45,9 @@ DEPEND="${RDEPEND} |
| 58 |
nls? ( sys-devel/gettext ) |
| 59 |
virtual/pkgconfig" |
| 60 |
|
| 61 |
-src_unpack() { |
| 62 |
- subversion_src_unpack |
| 63 |
-} |
| 64 |
- |
| 65 |
src_prepare() { |
| 66 |
- subversion_src_prepare |
| 67 |
+ [[ ${PV} == 9999 ]] && subversion_src_prepare |
| 68 |
+ |
| 69 |
# fix issue with zlib-1.2.5.1 macros (bug #383179) |
| 70 |
sed -i '1i#define OF(x) x' src/common/memgzio.c || die |
| 71 |
|
| 72 |
@@ -93,7 +95,8 @@ src_install() { |
| 73 |
} |
| 74 |
|
| 75 |
pkg_preinst() { |
| 76 |
- subversion_pkg_preinst |
| 77 |
+ [[ ${PV} == 9999 ]] && subversion_pkg_preinst |
| 78 |
+ |
| 79 |
games_pkg_preinst |
| 80 |
if use gtk || use wxwidgets ; then |
| 81 |
gnome2_icon_savelist |
| 82 |
|
| 83 |
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild |
| 84 |
index 12b7eb2..5ddac33 100644 |
| 85 |
--- a/games-emulation/vbam/vbam-9999.ebuild |
| 86 |
+++ b/games-emulation/vbam/vbam-9999.ebuild |
| 87 |
@@ -4,16 +4,21 @@ |
| 88 |
|
| 89 |
EAPI=5 |
| 90 |
WX_GTK_VER="3.0" |
| 91 |
-inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games |
| 92 |
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime games |
| 93 |
|
| 94 |
-ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk" |
| 95 |
+if [[ ${PV} == 9999 ]]; then |
| 96 |
+ ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk" |
| 97 |
+ inherit subversion |
| 98 |
+else |
| 99 |
+ SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz" |
| 100 |
+ KEYWORDS="~amd64 ~x86" |
| 101 |
+fi |
| 102 |
|
| 103 |
DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance" |
| 104 |
HOMEPAGE="http://sourceforge.net/projects/vbam/" |
| 105 |
|
| 106 |
LICENSE="GPL-2" |
| 107 |
SLOT="0" |
| 108 |
-KEYWORDS="" |
| 109 |
IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets" |
| 110 |
REQUIRED_USE="|| ( sdl gtk wxwidgets )" |
| 111 |
|
| 112 |
@@ -40,12 +45,9 @@ DEPEND="${RDEPEND} |
| 113 |
nls? ( sys-devel/gettext ) |
| 114 |
virtual/pkgconfig" |
| 115 |
|
| 116 |
-src_unpack() { |
| 117 |
- subversion_src_unpack |
| 118 |
-} |
| 119 |
- |
| 120 |
src_prepare() { |
| 121 |
- subversion_src_prepare |
| 122 |
+ [[ ${PV} == 9999 ]] && subversion_src_prepare |
| 123 |
+ |
| 124 |
# fix issue with zlib-1.2.5.1 macros (bug #383179) |
| 125 |
sed -i '1i#define OF(x) x' src/common/memgzio.c || die |
| 126 |
|
| 127 |
@@ -93,7 +95,8 @@ src_install() { |
| 128 |
} |
| 129 |
|
| 130 |
pkg_preinst() { |
| 131 |
- subversion_pkg_preinst |
| 132 |
+ [[ ${PV} == 9999 ]] && subversion_pkg_preinst |
| 133 |
+ |
| 134 |
games_pkg_preinst |
| 135 |
if use gtk || use wxwidgets ; then |
| 136 |
gnome2_icon_savelist |
Archives