[gentoo-commits] repo/gentoo:master commit in: games-emulation/vbam/

["Tim Harder" <radhermit@gentoo.org>]

commit:     74e69c90edb6e8a5989417b85d0fe647fa842a96
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 20:22:35 2015 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 20:23:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e69c90

games-emulation/vbam: version bump to new snapshot

Also merge the live and snapshot ebuilds.

 games-emulation/vbam/Manifest                       |  1 +
 .../{vbam-9999.ebuild => vbam-2.0.0_pre1507.ebuild} | 21 ++++++++++++---------
 games-emulation/vbam/vbam-9999.ebuild               | 21 ++++++++++++---------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index d5dd232..1978f16 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1 +1,2 @@
 DIST vbam-1.8.0.1228.tar.xz 866904 SHA256 ff771240b5ec89e452e6c00f45afd2c8f869570b634044cce997f4af797299e6 SHA512 22c7e14e5634c45c5a37be4387be579fceebd200f528514c0ab9059846d60f215e9bb40d73ae9a781a3018e4891d81d56dd50258d21f82b1262735aabab97155 WHIRLPOOL 19bf64ab118f80035f8c97b45c75ebd8cb956854bfc482016e22e0f7a700178115b02f7272ca5ea20cc515f1eac5e2dd22773796a03ff0f9a608ebb0d49c986a
+DIST vbam-2.0.0_pre1507.tar.xz 2169848 SHA256 08c512dee029118c65043a3b82caa1e96e49b7c522f3c0c4bed2e091846a0d51 SHA512 9f06fc871c674caf3cc936016b486e98ab1db129edac0ac3615b7b03cfb7b79d9cffa89f436577a9524a128987a6b65bfbbfa0ed602fe17e5dcfbdb56a445c2f WHIRLPOOL b1f926a9b24b0bc3a801c68e723b474f2ee1e60d9ae9851933935fc0bc234f089e1d565b7ceadcc1e2fe24792e7a54f7fc473a0aa545ee5a15bab5844d0df200

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
similarity index 87%
copy from games-emulation/vbam/vbam-9999.ebuild
copy to games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
index 12b7eb2..5ddac33 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-2.0.0_pre1507.ebuild
@@ -4,16 +4,21 @@
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
 
-ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+	inherit subversion
+else
+	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://sourceforge.net/projects/vbam/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
@@ -40,12 +45,9 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_unpack() {
-	subversion_src_unpack
-}
-
 src_prepare() {
-	subversion_src_prepare
+	[[ ${PV} == 9999 ]] && subversion_src_prepare
+
 	# fix issue with zlib-1.2.5.1 macros (bug #383179)
 	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
 
@@ -93,7 +95,8 @@ src_install() {
 }
 
 pkg_preinst() {
-	subversion_pkg_preinst
+	[[ ${PV} == 9999 ]] && subversion_pkg_preinst
+
 	games_pkg_preinst
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_savelist

diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 12b7eb2..5ddac33 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -4,16 +4,21 @@
 
 EAPI=5
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games
+inherit cmake-utils wxwidgets gnome2-utils fdo-mime games
 
-ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+if [[ ${PV} == 9999 ]]; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/vbam/code/trunk"
+	inherit subversion
+else
+	SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
 HOMEPAGE="http://sourceforge.net/projects/vbam/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
 REQUIRED_USE="|| ( sdl gtk wxwidgets )"
 
@@ -40,12 +45,9 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig"
 
-src_unpack() {
-	subversion_src_unpack
-}
-
 src_prepare() {
-	subversion_src_prepare
+	[[ ${PV} == 9999 ]] && subversion_src_prepare
+
 	# fix issue with zlib-1.2.5.1 macros (bug #383179)
 	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
 
@@ -93,7 +95,8 @@ src_install() {
 }
 
 pkg_preinst() {
-	subversion_pkg_preinst
+	[[ ${PV} == 9999 ]] && subversion_pkg_preinst
+
 	games_pkg_preinst
 	if use gtk || use wxwidgets ; then
 		gnome2_icon_savelist