fix gtk2 USE flag usage (bug 34562); fix in-game docs; fix hiscore file; more error checking/messages

3 files changed, 43 insertions, 17 deletions

diff --git a/games-strategy/dopewars/ChangeLog b/games-strategy/dopewars/ChangeLog
index ee51e573498b..8d37ab548fd3 100644
--- a/games-strategy/dopewars/ChangeLog
+++ b/games-strategy/dopewars/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-strategy/dopewars
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/ChangeLog,v 1.5 2003/11/22 01:37:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/ChangeLog,v 1.6 2003/11/28 09:01:34 mr_bones_ Exp $
+
+  28 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.9.ebuild:
+  fix gtk2 USE flag usage (bug 34562); fix in-game docs; fix hiscore file; more
+  error checking/messages
+
+  27 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.9.ebuild:
+  be less specific about glib (bug 34562)
 
   21 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> dopewars-1.5.8.ebuild,
   files/dopewars-1.5.8-gentoo.diff:
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
index 259796dc6039..d307b41df4e6 100644
--- a/games-strategy/dopewars/Manifest
+++ b/games-strategy/dopewars/Manifest
@@ -1,4 +1,4 @@
-MD5 4a7d9d5a036d165e1d471f81476b750a ChangeLog 3358
-MD5 8b5e8d416177ef5d36dddbe9e843dff8 dopewars-1.5.9.ebuild 1388
+MD5 f0a502fd0e7c6ca7dc23dd741b070a91 ChangeLog 3664
+MD5 ddc82f39dd3baa3fd8a87cc1fe02f9cf dopewars-1.5.9.ebuild 1913
 MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
 MD5 ba5b960a65c5fa58ba14cd1fefc64ffe files/digest-dopewars-1.5.9 67
diff --git a/games-strategy/dopewars/dopewars-1.5.9.ebuild b/games-strategy/dopewars/dopewars-1.5.9.ebuild
index 97a620607a9b..eda36dcf45a3 100644
--- a/games-strategy/dopewars/dopewars-1.5.9.ebuild
+++ b/games-strategy/dopewars/dopewars-1.5.9.ebuild
@@ -1,36 +1,53 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/dopewars-1.5.9.ebuild,v 1.3 2003/11/22 01:36:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dopewars/dopewars-1.5.9.ebuild,v 1.4 2003/11/28 09:01:34 mr_bones_ Exp $
 
-inherit games eutils
+inherit games
 
 DESCRIPTION="Re-Write of the game Drug Wars"
-SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
 HOMEPAGE="http://dopewars.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 IUSE="nls ncurses gtk gtk2 gnome esd sdl"
 
-DEPEND="=dev-libs/glib-1.2*
+DEPEND=">=sys-apps/sed-4
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	esd? ( media-sound/esound )
-	gnome? ( gnome-base/gnome )
-	gtk2? ( =x11-libs/gtk+-2* )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
+	gtk? (
+		|| (
+			gtk2? ( =x11-libs/gtk+-2* )
+			=x11-libs/gtk+-1.2*
+		)
+		dev-libs/glib
+	)
 	nls? ( sys-devel/gettext )
 	sdl? ( media-libs/libsdl media-libs/sdl-mixer )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e "/priv_hiscore/ s:DPDATADIR:\"${GAMES_STATEDIR}\":" \
+		-e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \
+		-e 's:index.html:html/index.html:' \
+			src/dopewars.c || \
+				die "sed src/dopewars.c failed"
+}
+
 src_compile() {
 	local myservconf=""
 	if [ `use gtk` ] ; then
 		myservconf="--enable-gui-server `use_enable gtk2 glib2`"
 	else
-		myservconf="--disable-gui-client"
+		myservconf="--disable-gui-client --disable-glibtest --disable-gtktest"
 	fi
 
 	egamesconf \
+		--disable-dependency-tracking \
 		`use_enable ncurses curses-client` \
 		`use_enable nls` \
 		`use_with sdl` \
@@ -39,19 +56,21 @@ src_compile() {
 		--enable-plugins \
 		${myservconf} \
 		|| die
-	emake || die "Compilation failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
 
-	cd ${D}/${GAMES_DATADIR}
+	cd "${D}/${GAMES_DATADIR}"
 	use gnome && mv gnome ../ || rm -rf gnome
 	mv pixmaps ../
-	dohtml -r doc/*/*
+	dohtml -r doc/*/* || die "dohtml failed"
 	rm -rf doc
-	rm dopewars.sco
+	dodir "${GAMES_STATEDIR}" || die "dodir failed"
+	mv dopewars.sco "${D}/${GAMES_STATEDIR}"
+	fperms 664 "${GAMES_STATEDIR}/dopewars.sco" || die "fperms failed"
 
 	prepgamesdirs
 }