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

Package-Manager: portage-2.1_pre10-r2

4 files changed, 50 insertions, 27 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/Manifest b/games-board/gnubg/Manifest
index 4181ecaacfd1..499c7ac558f8 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,25 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a77f9c39ec0f1c940a6d2ed01b6f1645 ChangeLog 2805
-RMD160 6aaa3532b2d663cb99342bd2347a99a934f8eabc ChangeLog 2805
-SHA256 3cbb28c1f8ee2e3c28b2ccf313815426407697dcb5f59fdc1c34413c8707c12f ChangeLog 2805
-MD5 73279a730dd0234f743d5326bdf41b6b files/digest-gnubg-0.14.3 940
-RMD160 51f4904714d31dea82db728be317de6e1b90bcbe files/digest-gnubg-0.14.3 940
-SHA256 887bd90f455fffd6d5bfdb8ba3befc1667c22bb0ff9ed6ee91e1f54eff84963c files/digest-gnubg-0.14.3 940
+AUX gnubg-0.14.3-as-needed.patch 663 RMD160 5fee6fd59dbaf749331ce1a1bdb41a8c2abc984e SHA1 5ea968a2ea20a7b144267a22c3432f1fe3edcaf5 SHA256 beca15462bb051736f1e56875dc64ddb9a5613698747fe831d2e420004a23335 size 663
+MD5 4e0bc2653e88cbde01cc8e478c34dafc files/gnubg-0.14.3-as-needed.patch 663
+RMD160 5fee6fd59dbaf749331ce1a1bdb41a8c2abc984e files/gnubg-0.14.3-as-needed.patch 663
+SHA256 beca15462bb051736f1e56875dc64ddb9a5613698747fe831d2e420004a23335 files/gnubg-0.14.3-as-needed.patch 663
+AUX gnubg-0.14.3-gcc4.patch 3589 RMD160 28d8b654f837936db37f66e9df8e85e8369a82a3 SHA1 eed82ec0b1a4cb5f51468dbcb5c4f2ac80036e3d SHA256 0f3f7e08207f3d0ccbf4931127dde6c9ca95ec1cb4d12914d3dbc7932407c096 size 3589
 MD5 138e70fe96c2f36dc2f3187f2b1e5a29 files/gnubg-0.14.3-gcc4.patch 3589
 RMD160 28d8b654f837936db37f66e9df8e85e8369a82a3 files/gnubg-0.14.3-gcc4.patch 3589
 SHA256 0f3f7e08207f3d0ccbf4931127dde6c9ca95ec1cb4d12914d3dbc7932407c096 files/gnubg-0.14.3-gcc4.patch 3589
-MD5 bbacc30e56be1372976394a699a89aef gnubg-0.14.3.ebuild 2596
-RMD160 1cfc90cb322e790afd42666a1583dd19b1430bf8 gnubg-0.14.3.ebuild 2596
-SHA256 6cd150eb5ad4b6dbbaff70e9485eebafa487d40fcb5ba90c9ce74026ffcfe19d gnubg-0.14.3.ebuild 2596
+DIST gnubg-0.14.3.tar.gz 4241526 RMD160 da7b2a3b52194ca11d505a70fba805e99f15c3ed SHA256 76d18f1a7952a4ba2372e439b3c4ecf2fcd244d334c609bb22d3f501067d1d72 size 4241526
+DIST gnubg.weights-0.14.gz 460747 RMD160 5d588b1145f0d0489b5d70fa6cfccd9ce6738f04 SHA256 6c134ded36d0875cb673a4f9fd84e2d30424935951baeffcd94852ccdb2daf70 size 460747
+DIST gnubg_os0.bd.gz 906720 RMD160 83fefa3c39544ca9a51f1ba7ae5e8bd5215e631c SHA256 e84a36f133ee7ea9fa3686af6c111088b8b43906db1b6c6b3db0035c84cda809 size 906720
+DIST gnubg_ts0.bd.gz 5899380 RMD160 9e0bea798a53374061014226aca9f5d2063133e8 SHA256 0934e4f2d84f5cd50c2ff4592c93c49d43f7cb89da342600736849c7362626d5 size 5899380
+EBUILD gnubg-0.14.3.ebuild 2791 RMD160 86167c014db55a41e6929bc7f60ed85a53916b51 SHA1 4307b21c71e5dcd178d3a48be98bb671c2d1700c SHA256 4af2cd0a0d2957c26d07adaea0e5f4d42d690d3202eaf43bb328bfe21e70ae23 size 2791
+MD5 ba5d879cfd7857ab8373726f5cb411e2 gnubg-0.14.3.ebuild 2791
+RMD160 86167c014db55a41e6929bc7f60ed85a53916b51 gnubg-0.14.3.ebuild 2791
+SHA256 4af2cd0a0d2957c26d07adaea0e5f4d42d690d3202eaf43bb328bfe21e70ae23 gnubg-0.14.3.ebuild 2791
+MISC ChangeLog 3033 RMD160 c9ce62730327979a6fc5197024e55c0259d55c68 SHA1 bc5961593b1fd66e6715157c06c4893f01cf0413 SHA256 26c6170c691b33fd557b4f979e1775515dd7f76668e7fd47548cc413252b05aa size 3033
+MD5 0d72eb12cb35897a0b7a64a6397fd45d ChangeLog 3033
+RMD160 c9ce62730327979a6fc5197024e55c0259d55c68 ChangeLog 3033
+SHA256 26c6170c691b33fd557b4f979e1775515dd7f76668e7fd47548cc413252b05aa ChangeLog 3033
+MISC metadata.xml 251 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb SHA1 8134d1f2611a2e4387a89e84580a2cb5c25f5649 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe size 251
 MD5 3f11aaf297b2fe67404a96cda13e9bfe metadata.xml 251
 RMD160 f77a8fea97ab2a02ef2d9bf1cc7b390c5c19e6cb metadata.xml 251
 SHA256 34f41062e84f1e12c08550faffc97632a2432df3579520cec76dbe8b08fb9cfe metadata.xml 251
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEL+q22CTtIKiFlQIRAqcIAKDIa1IxmPuV2ZDiMwg+HpwVNFx56ACgrlR0
-BxpUHAZSrOy/923sUagehjg=
-=qhdr
------END PGP SIGNATURE-----
+MD5 73279a730dd0234f743d5326bdf41b6b files/digest-gnubg-0.14.3 940
+RMD160 51f4904714d31dea82db728be317de6e1b90bcbe files/digest-gnubg-0.14.3 940
+SHA256 887bd90f455fffd6d5bfdb8ba3befc1667c22bb0ff9ed6ee91e1f54eff84963c files/digest-gnubg-0.14.3 940
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
 }