summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-02-11 08:39:43 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-02-11 08:39:43 +0000
commit4f367b16832a17b5ab9d8e9756983ac2988b5b7e (patch)
treeef108b22657276154f824c82915aaeb5893c0013
parentEAPI=2; make it work with newer devil (diff)
downloadhistorical-4f367b16832a17b5ab9d8e9756983ac2988b5b7e.tar.gz
historical-4f367b16832a17b5ab9d8e9756983ac2988b5b7e.tar.bz2
historical-4f367b16832a17b5ab9d8e9756983ac2988b5b7e.zip
Fix --as-needed bug #247452
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64
-rw-r--r--games-puzzle/xpuyopuyo/ChangeLog8
-rw-r--r--games-puzzle/xpuyopuyo/Manifest15
-rw-r--r--games-puzzle/xpuyopuyo/files/xpuyopuyo-0.9.8-as-needed.patch11
-rw-r--r--games-puzzle/xpuyopuyo/xpuyopuyo-0.9.8.ebuild12
4 files changed, 28 insertions, 18 deletions
diff --git a/games-puzzle/xpuyopuyo/ChangeLog b/games-puzzle/xpuyopuyo/ChangeLog
index 039d8827c525..2691571e63c5 100644
--- a/games-puzzle/xpuyopuyo/ChangeLog
+++ b/games-puzzle/xpuyopuyo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/xpuyopuyo
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpuyopuyo/ChangeLog,v 1.3 2008/06/26 08:43:21 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpuyopuyo/ChangeLog,v 1.4 2009/02/11 08:39:43 tupone Exp $
+
+ 11 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+ +files/xpuyopuyo-0.9.8-as-needed.patch, xpuyopuyo-0.9.8.ebuild:
+ Fix --as-needed bug #247452 by flameeyes@gentoo.org
26 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
xpuyopuyo-0.9.8.ebuild:
diff --git a/games-puzzle/xpuyopuyo/Manifest b/games-puzzle/xpuyopuyo/Manifest
index 1ec24135b166..2afef2c8493c 100644
--- a/games-puzzle/xpuyopuyo/Manifest
+++ b/games-puzzle/xpuyopuyo/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xpuyopuyo-0.9.8-as-needed.patch 567 RMD160 25a8919b0caddf2e27a532f3d48d6e39676c5e87 SHA1 6fe5d81c89eccb30f041eb113df5b430e6761fc2 SHA256 27b7e5ff1a6006130e409e529571c2ac090743bc8878b5c76c6edcd3e3439076
DIST xpuyopuyo-0.9.8.tar.gz 1235619 RMD160 a5512e897d807764c0432de515b75d76b54a21a0 SHA1 07c4a6b87b4a42778af69c2b223cd27b79fe2d41 SHA256 29bcc028e027c3c3d8706a85cb3611ceadfc3119016cde14419eb0364cbe04d4
-EBUILD xpuyopuyo-0.9.8.ebuild 816 RMD160 fd271aa168a8471349fc7c0769080b9e02c01b2c SHA1 2890c4aa35006e4095745a9e417b55d33152d6b8 SHA256 520e75a68d2743d6d086e592577b7d218d7fd1af58690b3498076f10b278da31
-MISC ChangeLog 638 RMD160 16ad4d366c2163f4f18490d15bc3f3387fd13893 SHA1 5de7bc94977c19c137a47ef40475f5d60f5bfe35 SHA256 7097a2b5aec54be90cb94b36f930b3d790bea5e24dc8996ad5f6430787fd744c
+EBUILD xpuyopuyo-0.9.8.ebuild 860 RMD160 c6a02dd421e6df4a26543cc1fa4a47585d08cc12 SHA1 033effbbdc121c79112cdce8a9fb9275d4108098 SHA256 2fbe66f148e9a7f3e478cb6f9f3466ce130ec3d57740b56c2a85e2866dba142e
+MISC ChangeLog 810 RMD160 e7765ed4cb440610c69f46aaeac2418570e43c58 SHA1 cf28278387463decb78ef432b0db098f7009ec03 SHA256 0d485ac04758229bd777c1d7dfd59919965fc5f854c636509d2406e335c35602
MISC metadata.xml 693 RMD160 3e24feecbe9e0a4c947fe35f4687236e120375c8 SHA1 ee92bfa4dfd23271269ea60a15fcd48622f852d7 SHA256 afcfc65d599cf147ecddca667f1abeb8a4856c43c7fdcab01ef5e4e7b93c0a40
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhjVq4ACgkQNQqtfCuFnePW7ACdGaTNUutq1GldH5xRSYrTUIoq
-xrcAoJ8jK9Re49c2zA8pJ00qFUrxqp92
-=/+vb
------END PGP SIGNATURE-----
diff --git a/games-puzzle/xpuyopuyo/files/xpuyopuyo-0.9.8-as-needed.patch b/games-puzzle/xpuyopuyo/files/xpuyopuyo-0.9.8-as-needed.patch
new file mode 100644
index 000000000000..3df49a433dbf
--- /dev/null
+++ b/games-puzzle/xpuyopuyo/files/xpuyopuyo-0.9.8-as-needed.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.old 2009-02-11 09:30:12.000000000 +0100
++++ Makefile.in 2009-02-11 09:30:28.000000000 +0100
+@@ -120,7 +120,7 @@
+
+ XPP_LIBS = $(NET_LIBS) pgame/libxpp_game.a pai/libxpp_ai.a
+ XPP_NET_LIBS = pnet/libxpp_net.a # This must be after interface
+-XPP_SOUND_LIBS = $(LIBMIKMOD_LIBS) psound/libxpp_sound.a
++XPP_SOUND_LIBS = psound/libxpp_sound.a $(LIBMIKMOD_LIBS)
+
+ @GTK_TRUE@xpuyopuyo_LDADD = $(XPP_LIBS) pgtk/libxpp_interface.a $(XPP_NET_LIBS) $(XPP_SOUND_LIBS) $(GTK_LIBS) pgame/libxpp_game.a putil/libxpp_util.a
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/games-puzzle/xpuyopuyo/xpuyopuyo-0.9.8.ebuild b/games-puzzle/xpuyopuyo/xpuyopuyo-0.9.8.ebuild
index f12f56b4c40f..e9f4026a0618 100644
--- a/games-puzzle/xpuyopuyo/xpuyopuyo-0.9.8.ebuild
+++ b/games-puzzle/xpuyopuyo/xpuyopuyo-0.9.8.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-puzzle/xpuyopuyo/xpuyopuyo-0.9.8.ebuild,v 1.4 2008/06/26 08:43:21 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpuyopuyo/xpuyopuyo-0.9.8.ebuild,v 1.5 2009/02/11 08:39:43 tupone Exp $
+EAPI=2
inherit eutils games
DESCRIPTION="A Tetris-like game with opponent"
@@ -17,13 +18,16 @@ DEPEND="=x11-libs/gtk+-1.2*
x11-libs/libXpm
media-libs/libmikmod"
-src_compile() {
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
+src_configure() {
egamesconf \
--with-gnome \
--enable-aibreed \
--enable-network \
|| die
- emake || die "make failed"
}
src_install() {