fix up deps; turn off gtk1 support since it's broken (bug #83283)

(Portage version: 2.0.51-r15)

2 files changed, 30 insertions, 32 deletions

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index 01cfed14c9c3..e17b8b9457c9 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/gnubg
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.17 2005/02/25 03:14:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.18 2005/02/25 22:07:39 mr_bones_ Exp $
+
+  25 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.14.3.ebuild:
+  fix up deps; turn off gtk1 support since it's broken (bug #83283)
 
 *gnubg-0.14.3 (24 Feb 2005)
 
diff --git a/games-board/gnubg/gnubg-0.14.3.ebuild b/games-board/gnubg/gnubg-0.14.3.ebuild
index 0c4a2309cfa2..04e78b87bb64 100644
--- a/games-board/gnubg/gnubg-0.14.3.ebuild
+++ b/games-board/gnubg/gnubg-0.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3.ebuild,v 1.1 2005/02/25 03:14:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3.ebuild,v 1.2 2005/02/25 22:07:39 mr_bones_ Exp $
 
 inherit gnuconfig flag-o-matic games
 
@@ -15,31 +15,30 @@ SRC_URI="ftp://alpha.gnu.org/gnu/gnubg/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-amd64 ~ppc ~sparc x86"
-IUSE="arts esd gdbm guile gtk gtk2 nas nls opengl png python readline truetype X"
+IUSE="arts esd gdbm gtk guile nas nls opengl png python readline X"
 
 # FIXME does this need to DEPEND on netpbm?
-DEPEND="guile? ( dev-util/guile )
-	python? ( dev-lang/python )
-	truetype? ( =media-libs/freetype-1* )
-	gtk? (
-		gtk2? (
-			=x11-libs/gtk+-2*
-			=dev-libs/glib-2*
-		)
-		!gtk2? (
-			=x11-libs/gtk+-1.2*
-			=dev-libs/glib-1*
-		)
-		opengl? ( x11-libs/gtkglext media-libs/ftgl )
-	)
-	readline? ( sys-libs/readline )
-	X? ( virtual/x11 )
+DEPEND="virtual/libc
 	dev-libs/glib
-	gdbm? ( sys-libs/gdbm )
-	esd? ( media-sound/esound )
+	>=media-libs/freetype-2
+	media-libs/libpng
+	dev-libs/libxml2
+	sys-libs/zlib
 	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	gdbm? ( sys-libs/gdbm )
+	gtk? (
+		=x11-libs/gtk+-2*
+		=dev-libs/glib-2*
+		opengl? ( x11-libs/gtkglext
+			media-libs/ftgl )
+		virtual/x11
+	)
+	guile? ( dev-util/guile )
 	nas? ( media-libs/nas )
-	png? ( media-libs/libpng )"
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
@@ -58,15 +57,13 @@ src_compile() {
 		else
 			myconf="--without-gtkextra"
 		fi
-		# --with-gtk doesn't mean what you think it means for configuring gnubg.
-		if use gtk2 ; then
-			myconf="${myconf} --with-gtk --with-gtk2"
-		else
-			myconf="${myconf} --with-gtk --without-gtk2"
-		fi
+		myconf="${myconf} --with-gtk --with-gtk2"
 		if use opengl ; then
 			myconf="${myconf} --with-board3d"
 			append-flags $(pkg-config ftgl --cflags)
+			append-ldflags $(pkg-config ftgl --libs)
+		else
+			myconf="${myconf} --without-board3d"
 		fi
 	else
 		myconf="${myconf} --without-gtk --disable-gtktest --without-board3d"
@@ -76,14 +73,12 @@ src_compile() {
 	else
 		myconf="${myconf} --without-sound --disable-esdtest --disable-artsc-test"
 	fi
-	if ! use truetype ; then
-		myconf="${myconf} --with-ft=no --with-ft-exec-prefix=no --disable-freetypetest"
+	if ! use guile ; then
+		myconf="${myconf} --without-guile"
 	fi
 
 	filter-flags -ffast-math #bug #67929
 
-	# configure script doesn't handle this option correctly.
-	#       `use_with guile` \
 	egamesconf \
 		$(use_enable arts artsc) \
 		$(use_enable esd) \