remove gtk2 use flag ; tidy

Package-Manager: portage-2.0.51.22-r2

diff --git a/games-emulation/psemu-cdr/ChangeLog b/games-emulation/psemu-cdr/ChangeLog
index 743faba6500c230820c970ada31bf4c84ebff4a8..61d32d8523f89afb3a74c300b7585b712310f924 100644 (file)
--- a/games-emulation/psemu-cdr/ChangeLog
+++ b/games-emulation/psemu-cdr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/psemu-cdr
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/ChangeLog,v 1.8 2005/04/24 03:30:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/ChangeLog,v 1.9 2005/09/20 15:31:42 mr_bones_ Exp $
+
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> psemu-cdr-1.8.ebuild:
+  remove gtk2 use flag ; tidy
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> psemu-cdr-1.8.ebuild:
   Stable on ppc.

diff --git a/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild b/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
index 77d3b2052849063c6e76d1d017dfa5b1354ef3c1..0acdf83fba02a53b049348c7ba3e11e53a332f66 100644 (file)
--- a/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
+++ b/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
@@ -1,46 +1,40 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild,v 1.6 2005/04/24 03:30:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild,v 1.7 2005/09/20 15:31:42 mr_bones_ Exp $
 
-inherit games eutils
+inherit eutils games
 
-S=${WORKDIR}
 DESCRIPTION="PSEmu plugin to read from CD-ROM"
 HOMEPAGE="http://www.pcsx.net/"
 SRC_URI="http://linuzappz.pcsx.net/downloads/cdr-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="gtk2"
+KEYWORDS="ppc x86"
+IUSE=""
 
-DEPEND="gtk2? ( =x11-libs/gtk+-2* )
-       !gtk2? ( =x11-libs/gtk+-1* )
+RDEPEND="=x11-libs/gtk+-2*"
+DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
+S=${WORKDIR}
+
 src_unpack() {
        unpack ${A}
-       epatch ${FILESDIR}/${PV}-makefile-cflags.patch
+       epatch "${FILESDIR}"/${PV}-makefile-cflags.patch
 }
 
 src_compile() {
-       local gtk
-       if use gtk2 ; then
-               gtk=gtk+2
-       else
-               gtk=gtk
-       fi
-       cd src
-       emake OPTFLAGS="${CFLAGS}" GUI="${gtk}" || die "emake failed"
+       emake -C src OPTFLAGS="${CFLAGS}" GUI="gtk+2" || die "emake failed"
 }
 
 src_install() {
-       exeinto ${GAMES_LIBDIR}/psemu/plugins
-       doexe src/libcdr-*        || die "doexe failed (1)"
-       exeinto ${GAMES_LIBDIR}/psemu/cfg
+       exeinto "${GAMES_LIBDIR}"/psemu/plugins
+       doexe src/libcdr-* || die "doexe failed (1)"
+       exeinto "${GAMES_LIBDIR}"/psemu/cfg
        doexe src/cfg-gtk*/cfgCdr || die "doexe failed(2)"
-       insinto ${GAMES_LIBDIR}/psemu/cfg
-       doins cdr.cfg             || die "doins failed"
-       dodoc ReadMe.txt          || die "dodoc failed"
+       insinto "${GAMES_LIBDIR}"/psemu/cfg
+       doins cdr.cfg || die "doins failed"
+       dodoc ReadMe.txt
        prepgamesdirs
 }