diff options
| -rw-r--r-- | games-sports/trophy/ChangeLog | 9 | ||||
| -rw-r--r-- | games-sports/trophy/Manifest | 5 | ||||
| -rw-r--r-- | games-sports/trophy/files/trophy-1.1.5-asneeded.patch | 25 | ||||
| -rw-r--r-- | games-sports/trophy/trophy-1.1.5.ebuild | 13 |
4 files changed, 45 insertions, 7 deletions
diff --git a/games-sports/trophy/ChangeLog b/games-sports/trophy/ChangeLog index 10cea9372972..4213fdef3830 100644 --- a/games-sports/trophy/ChangeLog +++ b/games-sports/trophy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-sports/trophy -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/ChangeLog,v 1.8 2009/01/05 01:26:13 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/ChangeLog,v 1.9 2010/05/04 23:19:01 mr_bones_ Exp $ + + 04 May 2010; Michael Sterrett <mr_bones_@gentoo.org> trophy-1.1.5.ebuild, + +files/trophy-1.1.5-asneeded.patch: + add patch for --as-needed support submitted by Kacper Kowalik (Xarthisius) + via bug #318139 05 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> trophy-1.1.5.ebuild: add use-based dep for dev-games/clanlib (bug #247476) diff --git a/games-sports/trophy/Manifest b/games-sports/trophy/Manifest index e1009a14a9d0..cf01cdcb31f5 100644 --- a/games-sports/trophy/Manifest +++ b/games-sports/trophy/Manifest @@ -1,5 +1,6 @@ +AUX trophy-1.1.5-asneeded.patch 1002 RMD160 3fb0723f3da819da44a8d2e63dc938ca2c5d89bb SHA1 c4639c457b7b8941edb9c4b20ac32874d69ec97a SHA256 a8adf2fb15b2eba80e96b8349793a853b76de8117667f8599096d971ba32f7a0 AUX trophy-1.1.5-display-segv.patch 415 RMD160 46b6ac2c096f3ac60831adc749d3fa030ff863ab SHA1 81fadc5c6be9adbdbe4e2a573db14f92eaa9abb8 SHA256 a4a18ddc14ddeba8cee07dc2e60b13bf99e345f03778336c8bbf71ceee9fabdc DIST trophy-1.1.5.tar.gz 14402714 RMD160 9e47bc69a316a982e50858f1c7fb3fce413ba7f9 SHA1 11fbf36691e4db909d7a641daa8e5983431ce6f0 SHA256 bf654a28027c62b36b39c3a23d2d7396b4afa7edbc1377595a99a18a30c26bfe -EBUILD trophy-1.1.5.ebuild 686 RMD160 b6bc1c77a254fb29e6bf26d6b29437d9ecde206c SHA1 2f779c905f9c91100b82f16e6089003ec5d5a82c SHA256 5ded2152cda70ea2ab5fdd8dab4c27ff818848a80b1f970b67a6d736e967d206 -MISC ChangeLog 1078 RMD160 4df5145da071ed0729175149c5cc9f28140df840 SHA1 a303a2f40f23070702a3d052f6b6f58cf065ec0b SHA256 bca5410e5ac731340ec41479814a766996a864d030a12ee38772f1fea7e2fad5 +EBUILD trophy-1.1.5.ebuild 823 RMD160 d4b4dc326c6182debd2c1acf307bc5f8d4139f52 SHA1 773f891b8562c1ed8e050a8d6ea05d58c2bfeafa SHA256 c54a17d0dd3210cbb3ca32e2bec28f3d886255efbe2102dd172536b4e4b12f69 +MISC ChangeLog 1288 RMD160 b8bfb453df680b2d5bc2eb94a6838457ea13c30a SHA1 5f2801ef07b9df3c14fdf699726dc4f53d05fccd SHA256 c5e1753b91a34259cafb6a6ccc1abc1416164c9a00f296d9cec0e97a5d074a6d MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-sports/trophy/files/trophy-1.1.5-asneeded.patch b/games-sports/trophy/files/trophy-1.1.5-asneeded.patch new file mode 100644 index 000000000000..2bd7e5f669f6 --- /dev/null +++ b/games-sports/trophy/files/trophy-1.1.5-asneeded.patch @@ -0,0 +1,25 @@ +Fixing as-needed issues + +http://bugs.gentoo.org/show_bug.cgi?id=318139 + +--- configure.ac ++++ configure.ac +@@ -15,5 +15,6 @@ + # We try to link to clanSignals because this is the only library file that + # doesn't need another one to be linked with. + AC_CHECK_LIB(clanSignals, main, , echo "Trophy requires ClanLib to run."; exit 1) ++PKG_CHECK_MODULES([CLAN], [clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8]) + + AC_OUTPUT(Makefile src/Makefile resources/Makefile) +--- src/Makefile.am ++++ src/Makefile.am +@@ -12,7 +12,6 @@ + caslotselectiondialog.cpp cafogbomb.h caimageview.h camenu.cpp canetclient.h capositiontable.cpp \ + caslotselectiondialog.h + +-CLANLIB_MODULES = clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8 +-AM_LDFLAGS = `pkg-config --libs $(CLANLIB_MODULES)` +-INCLUDES = `pkg-config --cflags $(CLANLIB_MODULES)` + AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" ++trophy_CXXFLAGS = @CLAN_CFLAGS@ ++trophy_LDADD = @CLAN_LIBS@ diff --git a/games-sports/trophy/trophy-1.1.5.ebuild b/games-sports/trophy/trophy-1.1.5.ebuild index b6c82cbc99a6..2357a109efa5 100644 --- a/games-sports/trophy/trophy-1.1.5.ebuild +++ b/games-sports/trophy/trophy-1.1.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/trophy-1.1.5.ebuild,v 1.3 2009/01/05 01:26:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/trophy/trophy-1.1.5.ebuild,v 1.4 2010/05/04 23:19:01 mr_bones_ Exp $ EAPI=2 -inherit games +inherit autotools eutils games DESCRIPTION="2D Racing Game" HOMEPAGE="http://trophy.sourceforge.net/" @@ -20,6 +20,13 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-display-segv.patch ) +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-display-segv.patch \ + "${FILESDIR}"/${P}-asneeded.patch + eautoreconf +} + src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog README TODO |