From 03ef819b8d6f7008b35e0c3271daafc156eea9e2 2013-02-01 00:57:41
From: Richard H <chain@rpgfiction.net>
Date: 2013-02-01 00:57:41
Subject: [PATCH] updated ebuilds for qmc2

---

diff --git a/games-emulation/qmc2/Manifest b/games-emulation/qmc2/Manifest
index c61c789f7cda9e16f572cfa05d31b99d09902bde..c5af0b4c07ff6c92e9a20fa83d9a18828716662d 100644
--- a/games-emulation/qmc2/Manifest
+++ b/games-emulation/qmc2/Manifest
@@ -1,4 +1,4 @@
-AUX qmc2-fullscreen-native-res.patch 2016 RMD160 31317e3b48062de99642e9d99798bc26ee15898d SHA1 a56c83d35e6cf585a49827c3ed3422fd00b8bde4 SHA256 6774411666b68d93d1f26d3d4dd223ca64c6106e0b6729e73996e614cf520f57
-AUX qmc2-new-makefile.patch 1352 RMD160 5d711f12b19cea39cc5b1acf627fdd0d6168155f SHA1 ccff4f94fb2b09d01318bf56cdb6e39143bc1276 SHA256 7ac029d82774d80d45ec7bfbdf903f0abf1672426601aae3fd34cb30e88b9220
-DIST qmc2-0.2.b16.tar.bz2 2782301 RMD160 03cf4847b6462a5ee7c5a2cf2deb26fabca7b7a0 SHA1 fdac3fa89995cc7ffc03adf371ed21ecf07b6093 SHA256 b923e4693379337bb0c809317b818e7015e8ed9a16a1e029bf34a811c56834c1
-EBUILD qmc2-0.2_beta16.ebuild 1576 RMD160 218dfa87294486bb57c8ff4e12f1ddad5af5a86c SHA1 984141624ff1dc2123bd1b9b0096134d4a5c3036 SHA256 733d9edc14423691b0a9694c41f2c0676497caa03527a9ccc0cd0343fa2aeea3
+AUX qmc2-fullscreen-native-res.patch 2016 SHA256 6774411666b68d93d1f26d3d4dd223ca64c6106e0b6729e73996e614cf520f57 SHA512 a750f50975cee33f8d32110233080291511cf62ffb6a7d96679c5bb1aa7f973500df62e10074bd4977a0891b03b001d922faf018f39457e7218eb4754d1b174f WHIRLPOOL b910eb1e8e7637699842f884f2051e07b5477fd14fa13f1c21a68a105468719eb7e63d80a72c59c85cae59478df3f860bb64f7c27de0858dd0d01e82a5654523
+AUX qmc2-new-makefile.patch 1352 SHA256 7ac029d82774d80d45ec7bfbdf903f0abf1672426601aae3fd34cb30e88b9220 SHA512 80087b889835a2f06237085acbb42978e437d5a672455a6531a1d2b9f123b0e5d76407a31e5be5986461b9ae71022bd52256eb831b61d36df997bd76f8579574 WHIRLPOOL 046ae54b5f28dda8d4b6f3d79c29c6bf4be8bbd2c29d8e54126c47689aea5ca6e4b85c6ec08e50a8eeb3169fc034d209ebae2aaee5e5b31ff7459d5f1cbafc9f
+DIST qmc2-0.38.tar.gz 12454429 SHA256 dd314bf426256dd488c0aebbcaef17f85a3023cddc94b658588501502ec6d649 SHA512 f0f5f7cb70bf2d9ada0e78fb3d2bd48891c9966b69d5d2f2e5aea07dc11842a5fb7b4f3751ad771b8c2885b0434d33923eb717bf7f1a51bc8c87daf46bdaff39 WHIRLPOOL f045e1f7820d932aaf2f2e393c62be464e56933851a6f437281ecaf2f11eced428d67cf41626b95e7d0067c876300f656420efaecaee15c06c2718d4f0cd8469
+EBUILD qmc2-0.38.ebuild 2363 SHA256 5f02b0b0a159b476f347382bc58ac4326838845480d77100418d26f30fe8d420 SHA512 0cff2c0e4bdaeb261825e275715657eeecc9adb68ddaf38447686649148882a328f2aa5d1e0efff76c60b338bbeee62cfc882d6e0ccff8418d9deb6882b329e2 WHIRLPOOL b2d9a9126ae7632bb74ca79b10a8bd1f5b5278c72cc94d377edddd61df506f5f0d0f1f25a5b520f5534377f50ce3a696cbe3a59bc940012070d3e81ac29bda10
diff --git a/games-emulation/qmc2/qmc2-0.2_beta16.ebuild b/games-emulation/qmc2/qmc2-0.2_beta16.ebuild
deleted file mode 100644
index f321ae9930c3508b450974a35cb854390d2d9e6c..0000000000000000000000000000000000000000
--- a/games-emulation/qmc2/qmc2-0.2_beta16.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils qt4 games
-
-MY_PV=${PV/_beta/.b}
-
-DESCRIPTION="An MAME frontend for SDLMAME"
-HOMEPAGE="http://www.mameworld.net/mamecat/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.bz2"
-
-EAPI="1"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug joystick opengl phonon"
-
-DEPEND="x11-libs/qt-gui:4
-	phonon? ( x11-libs/qt-phonon:4 )
-	joystick? ( media-libs/libsdl )
-	opengl? ( virtual/opengl )"
-
-RDEPEND="${DEPEND}
-	games-emulation/sdlmame"
-
-S="${WORKDIR}/${PN}"
-
-QT4_BUILT_WITH_USE_CHECK="accessibility"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${PN}-fullscreen-native-res.patch"
-}
-
-src_compile() {
-	## This is not as it appears, ARCH means something different to qmc2's Makefile
-	## then it means to the portage/portage-compatible package manager
-	sed -ie 's%ifndef ARCH%ifdef ARCH%' Makefile
-
-	# Should really use GAMES_DATADIR, but then it bombs out
-	FLAGS="QTDIR=/usr DESTDIR=${D} PREFIX=${GAMES_PREFIX} DATADIR=${GAMES_DATADIR} CTIME=0"
-
-	use debug || FLAGS="${FLAGS} DEBUG=0"
-	use joystick && FLAGS="${FLAGS} JOYSTICK=1"
-	use opengl && FLAGS="${FLAGS} OPENGL=1"
-	use phonon || FLAGS="${FLAGS} PHONON=0"
-	emake ${FLAGS} || die "make failed"
-}
-
-src_install() {
-	emake ${FLAGS} install || die "make install failed"
-
-	## Not a big fan of doing this, but it's necessary due to build system
-	sed -ie "s%${D}%/%g" "${D}etc/${PN}/${PN}.ini" 
-	rm "${D}etc/${PN}/${PN}.inie"
-	make_desktop_entry ${PN}
-	
-	prepgamesdirs
-}
diff --git a/games-emulation/qmc2/qmc2-0.38.ebuild b/games-emulation/qmc2/qmc2-0.38.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..d66d387476af4e806c72405cd5d4546dc2edd749
--- /dev/null
+++ b/games-emulation/qmc2/qmc2-0.38.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils games
+
+MY_PV=${PV/_beta/.b}
+
+DESCRIPTION="An MAME frontend for SDLMAME/SDLMESS"
+HOMEPAGE="http://qmc2.arcadehits.net/wordpress/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug joystick opengl phonon +sdlmame sdlmess sqlite"
+
+DEPEND=">=x11-libs/qt-gui-4.7:4[accessibility]
+	>=x11-libs/qt-webkit-4.7:4
+	>=x11-libs/qt-test-4.7:4
+	phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.7 ) )
+	joystick? ( media-libs/libsdl[joystick] )
+	opengl? ( >=x11-libs/qt-opengl-4.7:4 )
+	sqlite? ( >=x11-libs/qt-sql-4.7:4[sqlite] )"
+
+RDEPEND="${DEPEND}
+	sdlmame? ( games-emulation/sdlmame )
+	sdlmess? ( games-emulation/sdlmess )
+	x11-apps/xwininfo"
+
+S="${WORKDIR}/${PN}"
+
+REQUIRED_USE="|| ( sdlmame sdlmess )"
+
+pkg_setup() {
+	# Set proper parameters for make
+	FLAGS="DESTDIR=${D} PREFIX=\"${GAMES_PREFIX}\" DATADIR=\"${GAMES_DATADIR}\" CTIME=0"
+
+	use debug || FLAGS="${FLAGS} DEBUG=0"
+	use joystick || FLAGS="${FLAGS} JOYSTICK=0"
+	use opengl && FLAGS="${FLAGS} OPENGL=1"
+	use phonon || FLAGS="${FLAGS} PHONON=0"
+	use sqlite && FLAGS="${FLAGS} DATABASE=1"
+
+	games_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.2_beta20-makefile.patch"
+	sed -i '1i#define OF(x) x' minizip/ioapi.h
+
+	## This is not as it appears, ARCH means something different to qmc2's Makefile
+	## then it means to the portage/portage-compatible package manager
+	sed -ie 's%ifndef ARCH%ifdef ARCH%' Makefile
+
+	use sdlmess && cp -r "${S}" "${WORKDIR}/${PN}-sdlmess"
+}
+
+src_compile() {
+	if use sdlmame
+	then
+	    emake ${FLAGS} EMULATOR=SDLMAME || die "make failed"
+	fi
+
+	if use sdlmess
+	then
+	    cd "${WORKDIR}/${PN}-sdlmess"
+	    emake ${FLAGS} EMULATOR=SDLMESS || die "make failed"
+	fi
+}
+
+src_install() {
+	if use sdlmame
+	then
+	    emake ${FLAGS} EMULATOR=SDLMAME install || die "make install failed"
+	fi
+
+	if use sdlmess
+	then
+	    cd "${WORKDIR}/${PN}-sdlmess"
+	    emake ${FLAGS} EMULATOR=SDLMESS install || die "make install failed"
+	fi
+
+	## Not a big fan of doing this, but it's necessary due to build system
+	sed -ie "s%${D}%/%g" "${D}etc/${PN}/${PN}.ini"
+	rm "${D}etc/${PN}/${PN}.inie"
+
+	# Remove symlink to avoid confusion
+	rm "${D}/${GAMES_BINDIR}/qmc2"
+
+	prepgamesdirs
+}