From fc31134b7cf69e9a000fe232b45e5b86c0c74b8a Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Fri, 17 Nov 2006 10:01:29 +0000 Subject: [PATCH] Don't require gtk+-1, bug #155432 Package-Manager: portage-2.1.2_rc1-r7 --- games-emulation/goosnes/ChangeLog | 6 +++- games-emulation/goosnes/Manifest | 26 +++++++++-------- .../goosnes/files/goosnes-0.5.2-gtk2.patch | 28 +++++++++++++++++++ games-emulation/goosnes/goosnes-0.5.2.ebuild | 16 ++++------- 4 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 games-emulation/goosnes/files/goosnes-0.5.2-gtk2.patch diff --git a/games-emulation/goosnes/ChangeLog b/games-emulation/goosnes/ChangeLog index f44b472dc536..b32ec5131cfb 100644 --- a/games-emulation/goosnes/ChangeLog +++ b/games-emulation/goosnes/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-emulation/goosnes # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/goosnes/ChangeLog,v 1.8 2006/10/18 18:53:31 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/goosnes/ChangeLog,v 1.9 2006/11/17 10:01:29 nyhm Exp $ + + 17 Nov 2006; Tristan Heaven + +files/goosnes-0.5.2-gtk2.patch, goosnes-0.5.2.ebuild: + Don't require gtk+-1, bug #155432 18 Oct 2006; Tristan Heaven goosnes-0.5.2.ebuild: Use autotools eclass diff --git a/games-emulation/goosnes/Manifest b/games-emulation/goosnes/Manifest index 1bb455fb86d0..30e2b219cc1e 100644 --- a/games-emulation/goosnes/Manifest +++ b/games-emulation/goosnes/Manifest @@ -1,15 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX goosnes-0.5.2-gtk2.patch 822 RMD160 047ce050d4f7f824ff5b6adcf538e13aaf8fdf5e SHA1 0ec1c57323a05fce0161df7072539c1394bc875f SHA256 a35095ba1f0a71daf9f8e043d88e860658c5de678a6bd7307c417aefdf085b52 +MD5 396e58d89e99e87ee9cacd53fc4fad0c files/goosnes-0.5.2-gtk2.patch 822 +RMD160 047ce050d4f7f824ff5b6adcf538e13aaf8fdf5e files/goosnes-0.5.2-gtk2.patch 822 +SHA256 a35095ba1f0a71daf9f8e043d88e860658c5de678a6bd7307c417aefdf085b52 files/goosnes-0.5.2-gtk2.patch 822 DIST goosnes_0.5.2-1.tar.gz 100685 RMD160 8e0e5d63b03314ed27584103ce7f6afaad6c99ef SHA1 daac2e1f9b481c879ec217a696662a93039eb84a SHA256 e95295e4f0ba073faa47f193961731e9fef8f369b75b7df591f70dc6eb20b3b7 -EBUILD goosnes-0.5.2.ebuild 945 RMD160 beb3c7ec5f1b1fbb8a50ac2a03943826fc96be3d SHA1 0d77dc395a577ee8c44cbb0b3b33975bc9508727 SHA256 20b5c0aa3b29882fea066385e255d3c41725a43721c937f17c61adf4d457ad41 -MD5 98cb1ea6dc227b74e4875ddce1d602e4 goosnes-0.5.2.ebuild 945 -RMD160 beb3c7ec5f1b1fbb8a50ac2a03943826fc96be3d goosnes-0.5.2.ebuild 945 -SHA256 20b5c0aa3b29882fea066385e255d3c41725a43721c937f17c61adf4d457ad41 goosnes-0.5.2.ebuild 945 -MISC ChangeLog 858 RMD160 7020d206d620f2fe4a7fa96ad9e39bc8eadd776a SHA1 a48d98d7dd3421c8d818dbd61261277a1b31b2dd SHA256 de730e1cdbb3181996ddff529a58c8e573206580f825c253249722402c606914 -MD5 a926e2e17250a004356e634fb415ef02 ChangeLog 858 -RMD160 7020d206d620f2fe4a7fa96ad9e39bc8eadd776a ChangeLog 858 -SHA256 de730e1cdbb3181996ddff529a58c8e573206580f825c253249722402c606914 ChangeLog 858 +EBUILD goosnes-0.5.2.ebuild 858 RMD160 fd921dc108d85533a22a14d4d42fc958e7db6a4c SHA1 4df5794258be0ed00fd5ece4169262b9e771858b SHA256 fc081c5d597b0ed6af89cca6bec9a66f7f367f1a99eaee28d55091e308d64c04 +MD5 046daeebca52929eb7bdd57469c97bc6 goosnes-0.5.2.ebuild 858 +RMD160 fd921dc108d85533a22a14d4d42fc958e7db6a4c goosnes-0.5.2.ebuild 858 +SHA256 fc081c5d597b0ed6af89cca6bec9a66f7f367f1a99eaee28d55091e308d64c04 goosnes-0.5.2.ebuild 858 +MISC ChangeLog 1000 RMD160 14dd2bab567fea2b93cb365929b1a34f9fc86dca SHA1 213f5abbcb8eec4a0169330ce51640d99bd4092a SHA256 8d6e6b49643a4298066a4a55dc4967cfc02cfcfbf558cc42aa4b8ad7892b20f3 +MD5 20dd82eef1ffc3be674a404d49d2e1e9 ChangeLog 1000 +RMD160 14dd2bab567fea2b93cb365929b1a34f9fc86dca ChangeLog 1000 +SHA256 8d6e6b49643a4298066a4a55dc4967cfc02cfcfbf558cc42aa4b8ad7892b20f3 ChangeLog 1000 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -20,7 +24,7 @@ SHA256 f615dc263812168a0706e640e139b791711d3304ea16cea58c2a4ddf7bba5fd8 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFNngxdz7hIScOURERAsJoAKCAfZc163AzEmlZZS2UedXHfLGe8QCaApvN -UU37NVys1NDd2viS7wEFUT4= -=DfzT +iD8DBQFFXYkqdz7hIScOURERAtWtAJ4zbf9e/2IsYxkuObZqr11NWHN9jgCg0JAp +ClnDvfLc2vyOZk3gLo8RzVs= +=8G0q -----END PGP SIGNATURE----- diff --git a/games-emulation/goosnes/files/goosnes-0.5.2-gtk2.patch b/games-emulation/goosnes/files/goosnes-0.5.2-gtk2.patch new file mode 100644 index 000000000000..df9f41261c7e --- /dev/null +++ b/games-emulation/goosnes/files/goosnes-0.5.2-gtk2.patch @@ -0,0 +1,28 @@ +--- configure.in ++++ configure.in +@@ -19,21 +19,10 @@ + AC_CHECK_PROG(XML2_LIBS,xml2-config,`xml2-config --libs`) + AC_CHECK_PROG(PKGCONFIG,pkg-config,`pkg-config --version`) + +-AC_ARG_WITH(gtk-version, --with-gtk-version=VER Version of GTK+ to link,GTK_VERSION=${withval}) +- +-if test "x${PKGCONFIG}" = 'x'; then +- AM_PATH_GTK(1.2.0, , +- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)) +-else +- #insert gtk-config replacement +- if test "x${GTK_VERSION}" = 'x'; then +- GTK_STRING="gtk+" +- else +- GTK_STRING="gtk+-${GTK_VERSION}" +- fi +- GTK_CFLAGS=`pkg-config --cflags ${GTK_STRING}` +- GTK_LIBS=`pkg-config --libs ${GTK_STRING}` +-fi ++GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags` ++GTK_LIBS=`pkg-config gtk+-2.0 --libs` ++AC_SUBST(GTK_CFLAGS) ++AC_SUBST(GTK_LIBS) + + AC_SUBST(XML2_CFLAGS) + AC_SUBST(XML2_LIBS) diff --git a/games-emulation/goosnes/goosnes-0.5.2.ebuild b/games-emulation/goosnes/goosnes-0.5.2.ebuild index 172c222a2816..09695b114234 100644 --- a/games-emulation/goosnes/goosnes-0.5.2.ebuild +++ b/games-emulation/goosnes/goosnes-0.5.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/goosnes/goosnes-0.5.2.ebuild,v 1.10 2006/10/18 18:53:31 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/goosnes/goosnes-0.5.2.ebuild,v 1.11 2006/11/17 10:01:29 nyhm Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest -inherit autotools games +inherit autotools eutils games DESCRIPTION="A GTK+ frontend for Snes9X" HOMEPAGE="http://bard.sytes.net/goosnes/" @@ -15,9 +15,8 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="" -DEPEND="dev-libs/libxml2 - =x11-libs/gtk+-2*" -RDEPEND="${DEPEND} +RDEPEND="dev-libs/libxml2 + >=x11-libs/gtk+-2 games-emulation/snes9x" DEPEND="${DEPEND} dev-util/pkgconfig" @@ -25,15 +24,10 @@ DEPEND="${DEPEND} src_unpack() { unpack ${A} cd "${S}" - # packaging is broken + epatch "${FILESDIR}"/${P}-gtk2.patch eautoreconf } -src_compile() { - egamesconf --with-gtk-version=2.0 || die - emake || die "emake failed" -} - src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog README -- 2.26.2