fix up IUSE and deps; desktop entry; patch for --as-needed - submitted by Denis Dupeyron via bug #130522

(Portage version: 2.1_pre10-r2)

3 files changed, 29 insertions, 8 deletions

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index d6fbcc13a2c9..4c2e4ae60471 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/gnubg
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.21 2006/04/02 15:15:47 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.22 2006/05/02 05:07:34 mr_bones_ Exp $
+
+  02 May 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gnubg-0.14.3-as-needed.patch, gnubg-0.14.3.ebuild:
+  fix up IUSE and deps; desktop entry; patch for --as-needed - submitted by
+  Denis Dupeyron via bug #130522
 
   02 Apr 2006; <Tupone@gentoo.org> +files/gnubg-0.14.3-gcc4.patch,
   gnubg-0.14.3.ebuild:
diff --git a/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch b/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
new file mode 100644
index 000000000000..dac4af9209a0
--- /dev/null
+++ b/games-board/gnubg/files/gnubg-0.14.3-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Nadurp gnubg-0.14.3/Makefile.am gnubg-0.14.3-as-needed/Makefile.am
+--- gnubg-0.14.3/Makefile.am	2004-05-07 08:20:04.000000000 +0200
++++ gnubg-0.14.3-as-needed/Makefile.am	2006-04-19 20:36:23.000000000 +0200
+@@ -120,7 +120,7 @@ gnubg_SOURCES = $(COMMON_SOURCES) gtkboa
+ 	gtkpath.c gtkpath.h gtktoolbar.h gtktoolbar.c \
+ 	$(BR1_SOURCES) $(SOUND_SOURCES) $(FONT_SOURCES) $(PYTHON_SOURCES) $(TIME_SOURCES)
+ gnubg_LDADD = @GTK_LIBS@ $(COMMON_LIBS) $(SOUND_LIBS) $(PNG_LIBS) \
+-        @LIBART_LIBS@ $(BOARD3D_LIBS) @THREAD_LIBS@
++        @LIBART_LIBS@ $(BOARD3D_LIBS) @THREAD_LIBS@ -lutil
+ gnubg_DEPENDENCIES = $(COMMON_DEPS) $(BOARD3D_DEPS)
+ else
+ ## --- Plain
diff --git a/games-board/gnubg/gnubg-0.14.3.ebuild b/games-board/gnubg/gnubg-0.14.3.ebuild
index 843ca8f142aa..581d37dc8cb7 100644
--- a/games-board/gnubg/gnubg-0.14.3.ebuild
+++ b/games-board/gnubg/gnubg-0.14.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.4 2006/04/02 15:15:47 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3.ebuild,v 1.5 2006/05/02 05:07:34 mr_bones_ Exp $
 
-inherit gnuconfig flag-o-matic games
+inherit gnuconfig flag-o-matic eutils games
 
 WPV="0.14"
 DESCRIPTION="GNU BackGammon"
@@ -15,11 +15,10 @@ 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 gtk guile nas nls opengl png python readline X"
+IUSE="arts esd gdbm gtk guile nas nls opengl python readline X"
 
 # FIXME does this need to DEPEND on netpbm?
-DEPEND="virtual/libc
-	dev-libs/glib
+DEPEND="dev-libs/glib
 	>=media-libs/freetype-2
 	media-libs/libpng
 	dev-libs/libxml2
@@ -30,6 +29,7 @@ DEPEND="virtual/libc
 	gtk? (
 		=x11-libs/gtk+-2*
 		=dev-libs/glib-2*
+		media-libs/libart_lgpl
 		opengl? ( x11-libs/gtkglext
 			media-libs/ftgl )
 	)
@@ -44,7 +44,9 @@ src_unpack() {
 	cd "${S}"
 	mv ../${PN}.weights-${WPV} "${S}/${PN}.weights"
 	mv ../*bd .
-	epatch "${FILESDIR}/${P}"-gcc4.patch
+	epatch \
+		"${FILESDIR}/${P}"-gcc4.patch \
+		"${FILESDIR}/${P}"-as-needed.patch
 	gnuconfig_update
 }
 
@@ -79,7 +81,7 @@ src_compile() {
 
 	filter-flags -ffast-math #bug #67929
 
-	egamesconf \
+	LIBART_CONFIG="/usr/bin/libart2-config" egamesconf \
 		$(use_enable arts artsc) \
 		$(use_enable esd) \
 		$(use_with gdbm) \
@@ -98,5 +100,7 @@ src_install() {
 	insinto "${GAMES_DATADIR}/${PN}"
 	doins ${PN}.weights *bd || die "doins failed"
 	dodoc AUTHORS README NEWS
+	newicon xpm/gnubg-big.xpm gnubg.xpm
+	make_desktop_entry "gnubg -w" "GNU Backgammon" gnubg.xpm
 	prepgamesdirs
 }