Patched to use gtk-2. Bug #201214

Package-Manager: portage-2.1.3.19

5 files changed, 88 insertions, 9 deletions

diff --git a/games-arcade/xbill/ChangeLog b/games-arcade/xbill/ChangeLog
index 05ebdfe8ca0c..2dae3a04fc8a 100644
--- a/games-arcade/xbill/ChangeLog
+++ b/games-arcade/xbill/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/xbill
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbill/ChangeLog,v 1.13 2007/08/07 23:45:32 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbill/ChangeLog,v 1.14 2007/12/05 22:52:43 tupone Exp $
+
+*xbill-2.1-r2 (05 Dec 2007)
+
+  05 Dec 2007; Tupone Alfredo <tupone@gentoo.org>
+  +files/xbill-2.1-gtk2.patch, +xbill-2.1-r2.ebuild:
+  Patched to use gtk-2. Bug #201214 by yury fedorchenko
 
   07 Aug 2007; Tristan Heaven <nyhm@gentoo.org> xbill-2.1-r1.ebuild:
   Add gtk USE flag, bug #186807 by Pacho Ramos
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
index 16ed8bf3a108..40b6e7e5ef70 100644
--- a/games-arcade/xbill/Manifest
+++ b/games-arcade/xbill/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xbill-2.1-gtk2.patch 582 RMD160 f9233a3b4da6eee4f83da08b61c05a6d54ed188c SHA1 da52bc0ea619583790e78d8df06bad6c2bb3087f SHA256 6c9806a0f212843b7c48b5dc647180fd297b3b78e1646ffa1f8c8f2259072fac
+MD5 69d070260ece7e84ea042e78bf7f39ad files/xbill-2.1-gtk2.patch 582
+RMD160 f9233a3b4da6eee4f83da08b61c05a6d54ed188c files/xbill-2.1-gtk2.patch 582
+SHA256 6c9806a0f212843b7c48b5dc647180fd297b3b78e1646ffa1f8c8f2259072fac files/xbill-2.1-gtk2.patch 582
 DIST xbill-2.1.tar.gz 77610 RMD160 1d8a680f45775e7c840b4fe12cd21a439d41b2dc SHA1 ca466fb90a7c41055005d2e4dcece2e82b6c55c6 SHA256 0efdfff1ce2df70b7a15601cb488cd7b2eb918d21d78e877bd773f112945608d
 EBUILD xbill-2.1-r1.ebuild 852 RMD160 6ed71ea1fb5dc619d2d85ad3068ad0aa4bb49c57 SHA1 ab33087c82a31a4c73e33d328b3718077ed959b2 SHA256 f6c051ff4b243ffd5bb0f426551f84fc226b1d4ccfd17f72320bc2a9ca85d9df
 MD5 4c7231746ef30b9ed17075ae42be16d1 xbill-2.1-r1.ebuild 852
 RMD160 6ed71ea1fb5dc619d2d85ad3068ad0aa4bb49c57 xbill-2.1-r1.ebuild 852
 SHA256 f6c051ff4b243ffd5bb0f426551f84fc226b1d4ccfd17f72320bc2a9ca85d9df xbill-2.1-r1.ebuild 852
-MISC ChangeLog 1498 RMD160 05addd921ba35f95cafc433e491b02064e4c9988 SHA1 7de169aa7e7d7b8669c826933f239898f24d0ef5 SHA256 85c1baf34a34fd0c60897ad72c2802c8c40978d45a77cc98db8f9294453ead29
-MD5 28b608f275221a4997061f8af6403f0c ChangeLog 1498
-RMD160 05addd921ba35f95cafc433e491b02064e4c9988 ChangeLog 1498
-SHA256 85c1baf34a34fd0c60897ad72c2802c8c40978d45a77cc98db8f9294453ead29 ChangeLog 1498
+EBUILD xbill-2.1-r2.ebuild 961 RMD160 6ab98af4c80b804152232b198f37f2ff8370ab87 SHA1 70f164bab265ab42162998e9786fdce02f7126ff SHA256 6d6796e5a911619954dd28f23422b75aa676ddaf3ef17efb56d391586ec997be
+MD5 fbae7cecee144a3bcdca0979774c5de9 xbill-2.1-r2.ebuild 961
+RMD160 6ab98af4c80b804152232b198f37f2ff8370ab87 xbill-2.1-r2.ebuild 961
+SHA256 6d6796e5a911619954dd28f23422b75aa676ddaf3ef17efb56d391586ec997be xbill-2.1-r2.ebuild 961
+MISC ChangeLog 1689 RMD160 ff53d3edcf656c821731601afeeee32614b2893c SHA1 380615abeb3785ab0e6cb8424fc9e2999110957c SHA256 f1888efdf3528d5822ba4e77d9078ce198ea4cc81fd2765137d0b20339fc6596
+MD5 b5e0b143b4760605ffa9b57cab629693 ChangeLog 1689
+RMD160 ff53d3edcf656c821731601afeeee32614b2893c ChangeLog 1689
+SHA256 f1888efdf3528d5822ba4e77d9078ce198ea4cc81fd2765137d0b20339fc6596 ChangeLog 1689
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -17,10 +25,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 ff4f29b67fcfead042cfa0e140939973 files/digest-xbill-2.1-r1 226
 RMD160 c4cb921adee44eaca5b76ec02366f12454fc0c74 files/digest-xbill-2.1-r1 226
 SHA256 37f02b52a9e6625a6abb82c18d38335e008e0d1f3b17fdd51778cb3ae50c4bd4 files/digest-xbill-2.1-r1 226
+MD5 ff4f29b67fcfead042cfa0e140939973 files/digest-xbill-2.1-r2 226
+RMD160 c4cb921adee44eaca5b76ec02366f12454fc0c74 files/digest-xbill-2.1-r2 226
+SHA256 37f02b52a9e6625a6abb82c18d38335e008e0d1f3b17fdd51778cb3ae50c4bd4 files/digest-xbill-2.1-r2 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGuQQidz7hIScOURERAm3uAKCsxevXh9hl7t9CTvPOerzDXQT6FACfVJ+z
-PbSKBwmNaYBWKrxWicFxv9k=
-=VmV1
+iD8DBQFHVyvB8qKy9+b2Hl0RAis+AKDceaModIZTPjUbHpvAtQlhiNHHoACfVY2K
+ikeOZ8209ULG/k/iwIKBVd8=
+=JiCt
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/xbill/files/digest-xbill-2.1-r2 b/games-arcade/xbill/files/digest-xbill-2.1-r2
new file mode 100644
index 000000000000..4b819313ddc6
--- /dev/null
+++ b/games-arcade/xbill/files/digest-xbill-2.1-r2
@@ -0,0 +1,3 @@
+MD5 585e4866b15255a24203db9959407b2f xbill-2.1.tar.gz 77610
+RMD160 1d8a680f45775e7c840b4fe12cd21a439d41b2dc xbill-2.1.tar.gz 77610
+SHA256 0efdfff1ce2df70b7a15601cb488cd7b2eb918d21d78e877bd773f112945608d xbill-2.1.tar.gz 77610
diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
new file mode 100644
index 000000000000..70817b09c7ab
--- /dev/null
+++ b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
@@ -0,0 +1,18 @@
+--- configure.in.old	2007-12-05 22:37:57.000000000 +0100
++++ configure.in	2007-12-05 22:54:57.000000000 +0100
+@@ -88,12 +88,11 @@
+ 	[  --enable-gtk            build with the GTK widget set])
+ 
+ if test "$enable_gtk" != "no"; then
+-	AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no)
++	PKG_CHECK_MODULES(GTK, gtk+-2.0)
+ 
+-	if test "X$GTKCONFIG" = X"yes"; then
++	if test $pkg_failed = no; then
+ 		AC_DEFINE(USE_GTK)
+-		GTK_CFLAGS="`gtk-config --cflags`"
+-		WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
++		WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS"
+ 		WIDGET_OBJS="$WIDGET_OBJS gtk.o"
+ 	fi
+ fi
diff --git a/games-arcade/xbill/xbill-2.1-r2.ebuild b/games-arcade/xbill/xbill-2.1-r2.ebuild
new file mode 100644
index 000000000000..39ea681e6d4b
--- /dev/null
+++ b/games-arcade/xbill/xbill-2.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xbill/xbill-2.1-r2.ebuild,v 1.1 2007/12/05 22:52:43 tupone Exp $
+
+inherit eutils autotools games
+
+DESCRIPTION="A game about an evil hacker called Bill!"
+HOMEPAGE="http://www.xbill.org/"
+SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+DEPEND="gtk? ( =x11-libs/gtk+-2* )
+	!gtk? ( x11-libs/libXaw )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gtk2.patch
+	eautoreconf
+}
+
+src_compile() {
+	egamesconf \
+		--disable-motif \
+		$(use_enable gtk) \
+		$(use_enable !gtk athena) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newicon pixmaps/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} XBill ${PN}.xpm
+	dodoc ChangeLog README
+	prepgamesdirs
+}