remove gtk2 use flag; tidy

Package-Manager: portage-2.0.51.22-r2

3 files changed, 29 insertions, 37 deletions

diff --git a/games-emulation/mupen64-glN64/ChangeLog b/games-emulation/mupen64-glN64/ChangeLog
index baf9d783aa2f..5037e4a3e11f 100644
--- a/games-emulation/mupen64-glN64/ChangeLog
+++ b/games-emulation/mupen64-glN64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/mupen64-glN64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.9 2005/04/24 20:04:08 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/ChangeLog,v 1.10 2005/09/20 15:20:20 mr_bones_ Exp $
+
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  mupen64-glN64-0.4.1_rc2-r1.ebuild:
+  remove gtk2 use flag; tidy
 
   24 Apr 2005; Daniel Goller <morfic@gentoo.org>
   +files/mupen64-glN64-noasmfix.patch, -mupen64-glN64-0.4.1_pre1.ebuild,
diff --git a/games-emulation/mupen64-glN64/Manifest b/games-emulation/mupen64-glN64/Manifest
index 32bc355dd0bb..9dac31755239 100644
--- a/games-emulation/mupen64-glN64/Manifest
+++ b/games-emulation/mupen64-glN64/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5ec05d66117b117c0b92114f0c782335 mupen64-glN64-0.4.1_rc2-r1.ebuild 1309
-MD5 a1ac991af0b82fff00db26baa5e61655 ChangeLog 2370
 MD5 a3e62bf537d9a02609601aa9ba76da7e metadata.xml 247
-MD5 47f0e615c36a823f63220f4aec84d47f files/mupen64-glN64-compile.patch 1290
+MD5 aecaa7e5da64fa33c9117f1e2ab5c737 mupen64-glN64-0.4.1_rc2-r1.ebuild 1109
+MD5 fb2c18bcb09578766fcb05155fe39cd6 ChangeLog 2496
+MD5 e0e2f9111004f21e197569c2bd419c8a files/digest-mupen64-glN64-0.4.1_rc2-r1 68
 MD5 b16845f6a1bc038fe837a44a2bbd4568 files/mupen64-glN64-ucode.patch 3503
-MD5 a1fe9b4a472bafe9d9d82bea44ec08cc files/mupen64-glN64-noasmfix.patch 454
 MD5 9220d158fd6e0f37797eb2f7aae4c3c7 files/mupen64-glN64-noasm.patch 409
-MD5 e0e2f9111004f21e197569c2bd419c8a files/digest-mupen64-glN64-0.4.1_rc2-r1 68
+MD5 a1fe9b4a472bafe9d9d82bea44ec08cc files/mupen64-glN64-noasmfix.patch 454
 MD5 7b7b92e1dd75295fa258e3f0e02d1d3c files/mupen64-glN64-gtk2.patch 808
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCa/pWUpKYMelfdYERAmRPAKCMio20ZDdjxSZX5ZYihfwJuFHCcwCeKwoa
-otjCHT/IOZKracynbaExwHI=
-=WC2m
------END PGP SIGNATURE-----
+MD5 47f0e615c36a823f63220f4aec84d47f files/mupen64-glN64-compile.patch 1290
diff --git a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
index 8848afda9da3..144dd112cffc 100644
--- a/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
+++ b/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild
@@ -1,48 +1,46 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild,v 1.5 2005/04/24 20:04:08 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-glN64/mupen64-glN64-0.4.1_rc2-r1.ebuild,v 1.6 2005/09/20 15:20:20 mr_bones_ Exp $
 
 inherit eutils games
 
 MY_P="glN64-${PV/_/-}"
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="An OpenGL graphics plugin for the mupen64 N64 emulator"
-SRC_URI="mirror://gentoo/glN64-0.4.1-rc2.tar.bz2"
 HOMEPAGE="http://deltaanime.ath.cx/~blight/n64/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 LICENSE="as-is"
 SLOT="0"
-IUSE="asm gtk2"
+IUSE="asm"
 
 RDEPEND="media-libs/libsdl
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	gtk2? ( =x11-libs/gtk+-2* )"
+	=x11-libs/gtk+-2*"
 DEPEND="${RDEPEND}
-	gtk2? ( dev-util/pkgconfig )"
-
-src_compile () {
-	epatch ${FILESDIR}/${PN}-compile.patch || die "compile patch failed"
+	dev-util/pkgconfig"
 
-	if use gtk2; then
-		epatch ${FILESDIR}/${PN}-gtk2.patch || die "gtk2 patch failed"
-	fi
+S=${WORKDIR}/${MY_P}
 
-	epatch ${FILESDIR}/${PN}-ucode.patch || die "ucode patch failed"
-	epatch ${FILESDIR}/${PN}-noasmfix.patch || die "noasmfix patch failed"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-compile.patch \
+		"${FILESDIR}"/${PN}-gtk2.patch \
+		"${FILESDIR}"/${PN}-ucode.patch \
+		"${FILESDIR}"/${PN}-noasmfix.patch
 
 	if ! use asm; then
 		epatch ${FILESDIR}/${PN}-noasm.patch
 	fi
 
-	sed -i -e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 -fPIC ${CXXFLAGS}:" \
-		Makefile || die "couldn't apply cflags"
-
-	make || die
+	sed -i \
+		-e "s:CXXFLAGS.*=\(.*\):CXXFLAGS=\1 -fPIC ${CXXFLAGS}:" \
+		Makefile \
+		|| die "sed failed"
 }
 
 src_install () {
-	exeinto ${GAMES_LIBDIR}/mupen64/plugins
+	exeinto "${GAMES_LIBDIR}"/mupen64/plugins
 	doexe glN64-0.4.1.so || die "doexe failed"
 	prepgamesdirs
 }