diff options
| -rw-r--r-- | games-board/eboard/ChangeLog | 9 | ||||
| -rw-r--r-- | games-board/eboard/Manifest | 8 | ||||
| -rw-r--r-- | games-board/eboard/eboard-1.0.3.ebuild | 14 | ||||
| -rw-r--r-- | games-board/eboard/eboard-1.1.1.ebuild | 14 | ||||
| -rw-r--r-- | games-board/eboard/files/eboard-1.0.3-as-needed.patch | 22 | ||||
| -rw-r--r-- | games-board/eboard/files/eboard-1.1.1-as-needed.patch | 22 |
6 files changed, 68 insertions, 21 deletions
diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog index 2fa7eeeda933..99129e075134 100644 --- a/games-board/eboard/ChangeLog +++ b/games-board/eboard/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-board/eboard -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.20 2008/02/29 19:01:07 carlo Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.21 2009/02/03 14:22:15 tupone Exp $ + + 03 Feb 2009; Alfredo Tupone <tupone@gentoo.org> + +files/eboard-1.0.3-as-needed.patch, +files/eboard-1.1.1-as-needed.patch, + eboard-1.0.3.ebuild, eboard-1.1.1.ebuild: + Fix --as-needed bug #247338 by flameeyes@gentoo.org 29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> eboard-1.0.3.ebuild, eboard-1.0.4.ebuild: diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest index 5d7a5e0cdc92..339b2d85bf4b 100644 --- a/games-board/eboard/Manifest +++ b/games-board/eboard/Manifest @@ -1,8 +1,10 @@ +AUX eboard-1.0.3-as-needed.patch 726 RMD160 9c7451fdc76d8d1599c6fae35aa2b6335493de0a SHA1 59307c52cc7be479dcffaf070c2334912e908900 SHA256 2a4831e85706579059886baa73e87561dae2af87a280e7cb8d0e905227347008 +AUX eboard-1.1.1-as-needed.patch 726 RMD160 9c7451fdc76d8d1599c6fae35aa2b6335493de0a SHA1 59307c52cc7be479dcffaf070c2334912e908900 SHA256 2a4831e85706579059886baa73e87561dae2af87a280e7cb8d0e905227347008 DIST eboard-1.0.3.tar.bz2 428502 RMD160 fca419c4aa5075d9916fdd77d6424d28620d69c9 SHA1 fbb306bc0af5d8c676c9cbc05c6561a56012a811 SHA256 96556e9b94496bb315349f8dc3c79f264621db8f2e4a8c5d640a8bc37a49012f DIST eboard-1.1.1.tar.bz2 462386 RMD160 13bdfe6d33a143d619c6c5be8d849ced9b95e2c4 SHA1 029cf1e7503fc2a862b9880da9ea6ab91e5614cd SHA256 ad971086697c0d5a1c8a64401f6675339e832acb386dc96fa4e17da1832ca26e DIST eboard-extras-1pl2.tar.gz 361237 RMD160 342b1b48091958f5b0e4613e1c9de8b6c23d5b67 SHA1 aac0f4ec4cc83f2e76726fcbe54c707bd0ebe44a SHA256 6849cc104e454167db8b8e9ae0573accade5c941a140b47e58b601164e99fcc3 DIST eboard-extras-2.tar.gz 598909 RMD160 d6b7b9f39167752301018048010fee312acb97c0 SHA1 6b2a88ada8a5b009e7fb97950c0596e23030d161 SHA256 0b98bd4c90b2e275f8535186c3e7cbeeef9c9bb611a7febfcd866486a9f41a9c -EBUILD eboard-1.0.3.ebuild 1848 RMD160 44915457d609f3227f7c866d386614072243df99 SHA1 780d558a37ad060913f1a6822eb6d48777428fed SHA256 134b4d99d836fa59493e536079a9daf9655faa56a94744699093e9607ca50c2d -EBUILD eboard-1.1.1.ebuild 1769 RMD160 388cbb9bd29b79cab93aecc2800ceceb7e25dcbe SHA1 d777e3d32c3e8b4699d0e0e8d15df89089da4b39 SHA256 4f71e03a982372e327ecc7d128de310c13b18f7ee9d41e8651d2d0f6a2c07c43 -MISC ChangeLog 3936 RMD160 b087a11177e8ac19471d994034ebfac0f1ea31a2 SHA1 b6c1a0002f2336cfb80a0798a47f53cf8b5c28e3 SHA256 8c4fbf105a490700c2268312b9018e9591925768384136fb5500e3f5f314ceb3 +EBUILD eboard-1.0.3.ebuild 1848 RMD160 1efb981b6571c49726e52d0750e2c7de04d68a54 SHA1 4860c0cd64fca23341dff0eff0317b9e30904bd6 SHA256 34c93460816179ccaa424b2b80b5cdbf668558df3f8543a8cba81ba79c71658d +EBUILD eboard-1.1.1.ebuild 1765 RMD160 d0d26a0c278c4f593868d853c080b3986ff93f27 SHA1 be43b21d980ae66f16e2abf96b2e1af17cbc1448 SHA256 a0415e6f2a03ce68190f4e84fe131d840db1ab97167f22201e0e9aa6a3e5b37f +MISC ChangeLog 4162 RMD160 c211fd2a4e806b575678d3fd269a027790004892 SHA1 6cb11c7f8458efabc95d74133fd9c6371e084112 SHA256 bd8330d1ff41225a940c8d73984a8d4b59262fcd989a4bd12d2c96724e014cea MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-board/eboard/eboard-1.0.3.ebuild b/games-board/eboard/eboard-1.0.3.ebuild index 40d3ceb2321c..e52d205231a8 100644 --- a/games-board/eboard/eboard-1.0.3.ebuild +++ b/games-board/eboard/eboard-1.0.3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.0.3.ebuild,v 1.4 2008/02/29 19:01:07 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.0.3.ebuild,v 1.5 2009/02/03 14:22:15 tupone Exp $ +EAPI=2 inherit eutils games EXTRAS1="eboard-extras-1pl2" @@ -25,24 +26,21 @@ DEPEND="${RDEPEND} dev-util/pkgconfig nls? ( sys-devel/gettext )" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { sed -i \ -e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \ configure \ || die "sed configure failed" + epatch "${FILESDIR}"/${P}-as-needed.patch } -src_compile() { +src_configure() { # not an autoconf script ./configure \ --prefix="${GAMES_PREFIX}" \ --data-prefix="${GAMES_DATADIR}" \ --man-prefix="/usr/share/man" \ $(use_enable nls) || die - emake || die "emake failed" } src_install() { diff --git a/games-board/eboard/eboard-1.1.1.ebuild b/games-board/eboard/eboard-1.1.1.ebuild index a3dd749f12de..ed57ea20242b 100644 --- a/games-board/eboard/eboard-1.1.1.ebuild +++ b/games-board/eboard/eboard-1.1.1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.2 2008/03/21 16:32:46 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.3 2009/02/03 14:22:15 tupone Exp $ +EAPI=2 inherit eutils games EXTRAS1="eboard-extras-1pl2" @@ -25,24 +26,21 @@ DEPEND="${RDEPEND} dev-util/pkgconfig nls? ( sys-devel/gettext )" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { sed -i \ -e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \ configure \ || die "sed configure failed" + epatch "${FILESDIR}"/${P}-as-needed.patch } -src_compile() { +src_configure() { # not an autoconf script ./configure \ --prefix="${GAMES_PREFIX}" \ --data-prefix="${GAMES_DATADIR}" \ --man-prefix="/usr/share/man" \ $(use_enable nls) || die - emake || die "emake failed" } src_install() { diff --git a/games-board/eboard/files/eboard-1.0.3-as-needed.patch b/games-board/eboard/files/eboard-1.0.3-as-needed.patch new file mode 100644 index 000000000000..b4ec397ba967 --- /dev/null +++ b/games-board/eboard/files/eboard-1.0.3-as-needed.patch @@ -0,0 +1,22 @@ +--- configure.old 2009-02-03 14:46:21.000000000 +0100 ++++ configure 2009-02-03 14:48:13.000000000 +0100 +@@ -638,7 +638,7 @@ + + print CONFIGMAKE "CXX = $cxx\n"; + print CONFIGMAKE "CXXFLAGS = @cxxflags\n"; +-print CONFIGMAKE "LDFLAGS = @ldflags\n"; ++print CONFIGMAKE "LDLIBS = @ldflags\n"; + + print CONFIGMAKE "prefix = \${DESTDIR}$prefix\n"; + print CONFIGMAKE "bindir = \${DESTDIR}$prefix/bin\n"; +--- elifekam.old 2009-02-03 14:48:43.000000000 +0100 ++++ elifekam 2009-02-03 14:48:58.000000000 +0100 +@@ -24,7 +24,7 @@ + all: eboard nls-dicts + + eboard: $(OBJS) +- $(CXX) $(LDFLAGS) -o eboard $(OBJS) ++ $(CXX) $(LDFLAGS) -o eboard $(OBJS) $(LDLIBS) + + .cc.o: $< $(HEADERS) $(XPMS) + $(CXX) $(CXXFLAGS) -c $< -o $@ diff --git a/games-board/eboard/files/eboard-1.1.1-as-needed.patch b/games-board/eboard/files/eboard-1.1.1-as-needed.patch new file mode 100644 index 000000000000..b4ec397ba967 --- /dev/null +++ b/games-board/eboard/files/eboard-1.1.1-as-needed.patch @@ -0,0 +1,22 @@ +--- configure.old 2009-02-03 14:46:21.000000000 +0100 ++++ configure 2009-02-03 14:48:13.000000000 +0100 +@@ -638,7 +638,7 @@ + + print CONFIGMAKE "CXX = $cxx\n"; + print CONFIGMAKE "CXXFLAGS = @cxxflags\n"; +-print CONFIGMAKE "LDFLAGS = @ldflags\n"; ++print CONFIGMAKE "LDLIBS = @ldflags\n"; + + print CONFIGMAKE "prefix = \${DESTDIR}$prefix\n"; + print CONFIGMAKE "bindir = \${DESTDIR}$prefix/bin\n"; +--- elifekam.old 2009-02-03 14:48:43.000000000 +0100 ++++ elifekam 2009-02-03 14:48:58.000000000 +0100 +@@ -24,7 +24,7 @@ + all: eboard nls-dicts + + eboard: $(OBJS) +- $(CXX) $(LDFLAGS) -o eboard $(OBJS) ++ $(CXX) $(LDFLAGS) -o eboard $(OBJS) $(LDLIBS) + + .cc.o: $< $(HEADERS) $(XPMS) + $(CXX) $(CXXFLAGS) -c $< -o $@ |