From: Tristan Heaven Date: Fri, 2 Feb 2007 17:37:04 +0000 (+0000) Subject: Fix for --as-needed, bug #164777 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f19d67cb3a875bf045c18bf418250f82cf46117d;p=gentoo.git Fix for --as-needed, bug #164777 Package-Manager: portage-2.1.2-r6 --- diff --git a/games-mud/gmudix/ChangeLog b/games-mud/gmudix/ChangeLog index ab4ca1b64fbf..c91e77eaca16 100644 --- a/games-mud/gmudix/ChangeLog +++ b/games-mud/gmudix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-mud/gmudix -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/gmudix/ChangeLog,v 1.10 2005/10/24 15:50:34 dertobi123 Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-mud/gmudix/ChangeLog,v 1.11 2007/02/02 17:37:04 nyhm Exp $ + + 02 Feb 2007; Tristan Heaven + +files/gmudix-1.0-as-needed.patch, gmudix-1.0.ebuild: + Fix for --as-needed, bug #164777 24 Oct 2005; Tobias Scherbaum gmudix-1.0.ebuild: Marked ppc stable, Thanks to Owen in bug #109868 diff --git a/games-mud/gmudix/Manifest b/games-mud/gmudix/Manifest index b877b4fbd46a..c3b029b03f6a 100644 --- a/games-mud/gmudix/Manifest +++ b/games-mud/gmudix/Manifest @@ -1,16 +1,30 @@ -DIST gmudix-1.0.tar.gz 137548 -EBUILD gmudix-1.0.ebuild 787 RMD160 ae26a4feda98e5e0134d05cf9adbeb98a46f0057 SHA1 af355809397e17bf1564b50c530557a775689d07 SHA256 0cf4c2fe4efefdbd71f594990c7cb1495ee997bbde700c9de2605ebd936a5ef4 -MD5 f2935705da28b1f32fef7f697f58a5a6 gmudix-1.0.ebuild 787 -RMD160 ae26a4feda98e5e0134d05cf9adbeb98a46f0057 gmudix-1.0.ebuild 787 -SHA256 0cf4c2fe4efefdbd71f594990c7cb1495ee997bbde700c9de2605ebd936a5ef4 gmudix-1.0.ebuild 787 -MISC ChangeLog 1791 RMD160 074124b9803b6e9ab26c20dc45efde8f8e1ccb86 SHA1 b5b572bb2016d70517a71aa5d6862a9d38ff74aa SHA256 85e17bf56228a429a01f256f939945ed132ab2f18bd660d3c00e9aae95e6f2af -MD5 1521d41e2ed425c0c8e890bbf43bbc98 ChangeLog 1791 -RMD160 074124b9803b6e9ab26c20dc45efde8f8e1ccb86 ChangeLog 1791 -SHA256 85e17bf56228a429a01f256f939945ed132ab2f18bd660d3c00e9aae95e6f2af ChangeLog 1791 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gmudix-1.0-as-needed.patch 1078 RMD160 01f96a4ff51993911a201b438041a75294848ec9 SHA1 660290a19561b6428b796a93899179732553146a SHA256 e06771cd47ac9af5dc511ed53150f31365489bdf0c4ff4a7bee75db5ed0765db +MD5 f1ccc5aecedd4680cc1963ddbdf8c864 files/gmudix-1.0-as-needed.patch 1078 +RMD160 01f96a4ff51993911a201b438041a75294848ec9 files/gmudix-1.0-as-needed.patch 1078 +SHA256 e06771cd47ac9af5dc511ed53150f31365489bdf0c4ff4a7bee75db5ed0765db files/gmudix-1.0-as-needed.patch 1078 +DIST gmudix-1.0.tar.gz 137548 RMD160 117318e5cba1d599144717d81b15bcbc1374fa88 SHA1 39d96aead3ea3b9130741f5ee5d858be88d9fbe4 SHA256 92588f498f5188ade961b7fd53951300236af105a72d0ffbd586d03a13008b03 +EBUILD gmudix-1.0.ebuild 885 RMD160 40c08aaa45e95103c4a3daea4aaf13d7a68c33d7 SHA1 5ec623bbc15f5a36aeaec9d5bc62cd0b9ff0658d SHA256 3c658ae12fd3f18626bbbf5cd9aeb494149edeb8459c8b56947ce95cad0d1015 +MD5 5652758d25e7c1685927c6d843a5d9e2 gmudix-1.0.ebuild 885 +RMD160 40c08aaa45e95103c4a3daea4aaf13d7a68c33d7 gmudix-1.0.ebuild 885 +SHA256 3c658ae12fd3f18626bbbf5cd9aeb494149edeb8459c8b56947ce95cad0d1015 gmudix-1.0.ebuild 885 +MISC ChangeLog 1925 RMD160 11958d05bb700c18863295a009508e33814f2871 SHA1 4611ee78e922a25f178123171e85e1c0d89d5f0b SHA256 f636c58c53a94e1d5580fae118642465281c7a4f5bc37082a7dbe91af7db417a +MD5 22342d7a75cbb320f9a7364fc1940dbd ChangeLog 1925 +RMD160 11958d05bb700c18863295a009508e33814f2871 ChangeLog 1925 +SHA256 f636c58c53a94e1d5580fae118642465281c7a4f5bc37082a7dbe91af7db417a ChangeLog 1925 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 ea8fe09ee40d54e6ced04447b7702d17 files/digest-gmudix-1.0 62 -RMD160 f5d30e798b736b6aba51d560ff29fbff43f0f455 files/digest-gmudix-1.0 62 -SHA256 e03d1279c0b7ae27fed70d36055fabd5b05870d12531faef71d62aedcfae07df files/digest-gmudix-1.0 62 +MD5 55489cfd5838e77960b64e3822652bb1 files/digest-gmudix-1.0 232 +RMD160 0d54d3d0ce96ee54fe0b6597e72d65265bf5d9e7 files/digest-gmudix-1.0 232 +SHA256 739d6fbf7a5deca68d7fedbd4234dad093a636ad15f89143dc785498c957a630 files/digest-gmudix-1.0 232 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFFw3bGdz7hIScOURERAu1/AJ4vmilSmZCb1COHw55pp6v7HHiYSQCfUCSr +khf0oos1GcQ/2NlbABRuViI= +=OGvG +-----END PGP SIGNATURE----- diff --git a/games-mud/gmudix/files/digest-gmudix-1.0 b/games-mud/gmudix/files/digest-gmudix-1.0 index 4b40a3bb9584..b69423922e27 100644 --- a/games-mud/gmudix/files/digest-gmudix-1.0 +++ b/games-mud/gmudix/files/digest-gmudix-1.0 @@ -1 +1,3 @@ MD5 bcdd48048fb3b483516872d1d0d593d9 gmudix-1.0.tar.gz 137548 +RMD160 117318e5cba1d599144717d81b15bcbc1374fa88 gmudix-1.0.tar.gz 137548 +SHA256 92588f498f5188ade961b7fd53951300236af105a72d0ffbd586d03a13008b03 gmudix-1.0.tar.gz 137548 diff --git a/games-mud/gmudix/files/gmudix-1.0-as-needed.patch b/games-mud/gmudix/files/gmudix-1.0-as-needed.patch new file mode 100644 index 000000000000..838376ef256f --- /dev/null +++ b/games-mud/gmudix/files/gmudix-1.0-as-needed.patch @@ -0,0 +1,28 @@ +--- configure.in ++++ configure.in +@@ -8,7 +8,8 @@ + AC_PROG_MAKE_SET + + dnl Checks for libraries. +-PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= 2.0.0) ++PKG_CHECK_MODULES(GTK, gtk+-2.0) ++PKG_CHECK_MODULES(GTHREAD, gthread-2.0) + + dnl Checks for header files. + AC_HEADER_STDC +--- src/Makefile.am ++++ src/Makefile.am +@@ -1,10 +1,5 @@ + bin_PROGRAMS = gmudix + gmudix_SOURCES = alias.c commands.c file.c gui_alias.c gui_capture.c gui_character.c gui_color.c gui_font.c gui_general.c gui_macro.c gui_main.c gui_path.c gui_preferences.c gui_tab.c gui_timer.c gui_trigger.c gui_user.c gui_variable.c history.c log.c macro.c mccp.c mudix.c net.c path.c process.c string.c tabs.c telnet.c timer.c trigger.c user.c variable.c +-INCLUDES = -Wall -I.. -I../include `pkg-config --cflags gtk+-2.0` +-gmudix_LDFLAGS = -lz `pkg-config --libs gtk+-2.0` `pkg-config --libs gthread-2.0` +- +-if DEBUG_SYMBOLS +-CFLAGS := $(CFLAGS) -O2 -g +-else +-CFLAGS := $(CFLAGS) -O2 +-endif ++AM_CFLAGS = -Wall ++INCLUDES = -I.. -I../include $(GTK_CFLAGS) $(GTHREAD_CFLAGS) ++LDADD = -lz $(GTK_LIBS) $(GTHREAD_LIBS) diff --git a/games-mud/gmudix/gmudix-1.0.ebuild b/games-mud/gmudix/gmudix-1.0.ebuild index 961eef3c6af6..c88b65517125 100644 --- a/games-mud/gmudix/gmudix-1.0.ebuild +++ b/games-mud/gmudix/gmudix-1.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-mud/gmudix/gmudix-1.0.ebuild,v 1.8 2006/06/06 06:08:26 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-mud/gmudix/gmudix-1.0.ebuild,v 1.9 2007/02/02 17:37:04 nyhm Exp $ -inherit games +inherit autotools eutils games DESCRIPTION="A GTK+ 2.0 MUD client with ANSI color mapping, aliasing, macros, paths, tab completions, timers, triggers, variables, and an easy-to-use script language and more" HOMEPAGE="http://dw.nl.eu.org/mudix.html" @@ -13,15 +13,20 @@ SLOT="0" KEYWORDS="~amd64 ppc x86" IUSE="" -DEPEND="virtual/libc - sys-libs/zlib - >=dev-libs/atk-1.0 - >=dev-libs/glib-2.0 - >=x11-libs/pango-1.0 - >=x11-libs/gtk+-2.0" +RDEPEND=">=x11-libs/gtk+-2" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-as-needed.patch + rm -f missing + eautoreconf +} src_install() { - dogamesbin src/gmudix + dogamesbin src/${PN} || die "dogamesbin failed" dodoc AUTHORS ChangeLog README TODO doc/*txt prepgamesdirs }