fix the gtk2 support per Spider; more error messages/checking

3 files changed, 18 insertions, 21 deletions

diff --git a/games-emulation/psemu-cdr/ChangeLog b/games-emulation/psemu-cdr/ChangeLog
index 43461fd174a3..ae04bdcbc27c 100644
--- a/games-emulation/psemu-cdr/ChangeLog
+++ b/games-emulation/psemu-cdr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/psemu-cdr
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/ChangeLog,v 1.2 2003/09/10 16:04:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/ChangeLog,v 1.3 2003/11/22 01:29:42 mr_bones_ Exp $
+
+  21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> psemu-cdr-1.8.ebuild:
+  fix the gtk2 support per Spider; more error messages/checking
 
 *psemu-cdr-1.8 (14 Aug 2003)
 
diff --git a/games-emulation/psemu-cdr/Manifest b/games-emulation/psemu-cdr/Manifest
index 6c5b7e0a77cb..141f81533abc 100644
--- a/games-emulation/psemu-cdr/Manifest
+++ b/games-emulation/psemu-cdr/Manifest
@@ -1,4 +1,4 @@
-MD5 cebe9fccfb101907d3a8588f1b5870c6 files/digest-psemu-cdr-1.8 58
+MD5 7a743d2a51f3cecdc86a66f72b5cf4c4 ChangeLog 1146
+MD5 fd2c1e1f76f0c4f1bebb62556072c846 psemu-cdr-1.8.ebuild 1143
 MD5 169244f21e87968b8b24a2156c6ea257 files/1.8-makefile-cflags.patch 317
-MD5 387f929b73c698aa15e90ef8aa83f2fa psemu-cdr-1.8.ebuild 1075
-MD5 1732ba6e4141c8638617b3fd38ccdbfb ChangeLog 1001
+MD5 cebe9fccfb101907d3a8588f1b5870c6 files/digest-psemu-cdr-1.8 58
diff --git a/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild b/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
index 4c338bb53c51..919832edeb56 100644
--- a/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
+++ b/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.1 2003/09/09 16:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/psemu-cdr/psemu-cdr-1.8.ebuild,v 1.2 2003/11/22 01:29:42 mr_bones_ Exp $
 
 inherit games eutils
 
+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"
@@ -11,17 +12,12 @@ SRC_URI="http://linuzappz.pcsx.net/downloads/cdr-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="gtk gtk2"
+IUSE="gtk2"
 
-DEPEND="|| (
-		gtk2? ( =x11-libs/gtk+-2* )
-		gtk? ( =x11-libs/gtk+-1* )
-		=x11-libs/gtk+-2*
-	)
+DEPEND="gtk2? ( =x11-libs/gtk+-2* )
+	!gtk2? ( =x11-libs/gtk+-1* )
 	dev-util/pkgconfig"
 
-S=${WORKDIR}
-
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${PV}-makefile-cflags.patch
@@ -31,22 +27,20 @@ src_compile() {
 	local gtk
 	if [ `use gtk2` ] ; then
 		gtk=gtk+2
-	elif [ `use gtk` ] ; then
-		gtk=gtk
 	else
-		gtk=gtk+2
+		gtk=gtk
 	fi
 	cd src
-	emake OPTFLAGS="${CFLAGS}" GUI="${gtk}" || die
+	emake OPTFLAGS="${CFLAGS}" GUI="${gtk}" || die "emake failed"
 }
 
 src_install() {
 	exeinto ${GAMES_LIBDIR}/psemu/plugins
-	doexe src/libcdr-*
+	doexe src/libcdr-*        || die "doexe failed (1)"
 	exeinto ${GAMES_LIBDIR}/psemu/cfg
-	doexe src/cfg-gtk*/cfgCdr
+	doexe src/cfg-gtk*/cfgCdr || die "doexe failed(2)"
 	insinto ${GAMES_LIBDIR}/psemu/cfg
-	doins cdr.cfg
-	dodoc ReadMe.txt
+	doins cdr.cfg             || die "doins failed"
+	dodoc ReadMe.txt          || die "dodoc failed"
 	prepgamesdirs
 }