add patch to build with glibc29 from Martin Väth via bug #251121

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

6 files changed, 97 insertions, 80 deletions

diff --git a/games-arcade/kobodeluxe/ChangeLog b/games-arcade/kobodeluxe/ChangeLog
index a6d6cd581eee..eff36ca873b1 100644
--- a/games-arcade/kobodeluxe/ChangeLog
+++ b/games-arcade/kobodeluxe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/kobodeluxe
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/kobodeluxe/ChangeLog,v 1.27 2008/06/29 10:53:17 klausman Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/kobodeluxe/ChangeLog,v 1.28 2009/01/13 01:01:10 mr_bones_ Exp $
+
+  13 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/kobodeluxe-0.4_pre10-gcc41.patch,
+  +files/kobodeluxe-0.5.1-glibc29.patch, -kobodeluxe-0.4_pre10.ebuild,
+  kobodeluxe-0.5.1.ebuild:
+  add patch to build with glibc29 from Martin Väth via bug #251121
 
   28 Jun 2008; Tobias Klausmann <klausman@gentoo.org>
   kobodeluxe-0.5.1.ebuild:
diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
index d0f846191b83..1c6890f3adfc 100644
--- a/games-arcade/kobodeluxe/Manifest
+++ b/games-arcade/kobodeluxe/Manifest
@@ -1,7 +1,5 @@
-AUX kobodeluxe-0.4_pre10-gcc41.patch 278 RMD160 f54640058ac50e33a92167c2544eab60c2151289 SHA1 12df569e65a3cab46dc0b31a39adb51e654f0bac SHA256 a349e3801ce34bb52946257e4601eb7cd6c83878f614f7b6453ab05a3a818aad
-DIST KoboDeluxe-0.4pre10.tar.gz 800650 RMD160 0b5cc8062bbde8697eadce6f5cf95e61485f21bc SHA1 7b1f37482d40e9f68291527d8b1b9dd7d88dd25c SHA256 b68d5977e9ef447285002a1d4eac0b3319c9f7f6f261028d6a7dfd0bcebe513a
+AUX kobodeluxe-0.5.1-glibc29.patch 2400 RMD160 9721f811042563dcc5b059604de419fee02b1024 SHA1 274dc8e7909bc6f9fab31306c85d992af8b62674 SHA256 c4fbcc43024b20eae865a4cc5fc8bdfe043514e1c67ddbe41b26c4a79bdf7aab
 DIST KoboDeluxe-0.5.1.tar.bz2 1781752 RMD160 b196054f2220fe1b479a490723b1f5da4e74aa1f SHA1 bc49dbbae562baffd312444b373c7ebbf5e233c6 SHA256 0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
-EBUILD kobodeluxe-0.4_pre10.ebuild 1853 RMD160 a953b945612f6c29ca64d301b38e81cf987ef2d5 SHA1 dd39e8f22c979065b6c486277eb784480a290364 SHA256 836fa68b8a927cf02f1e95c3bc51ffb1ca53af282b11bc5b0e1b23b63d5f1224
-EBUILD kobodeluxe-0.5.1.ebuild 1404 RMD160 fe853f81ac7b549631137a4ce28b8cb1685b9a45 SHA1 11b44b3f5b9ce49ffa6221dce7f3bc95f5e1f787 SHA256 3951c95f564305fc44fb497736b4df5db81141b8ed4644ab10f8975f0a49dedb
-MISC ChangeLog 4552 RMD160 4da426619a8f5f4660f2f5d51478a833a5c3eb89 SHA1 fe9a17a0c8ab0430c9605dfaf1d2d91ee6c848fe SHA256 9c29b01a42c302006f5ad6253c2bdcac61307f6898f747a85f0936a4e9ba13d9
+EBUILD kobodeluxe-0.5.1.ebuild 1446 RMD160 a2ba983018442f072ee452d06c55d73dc5b803c4 SHA1 184a926368e42e72dd1564ccdea0f3c0d6a6097b SHA256 d99755572ac03bb2b0458df0c7238de755fb3297a699a0f530c99b2ba702f120
+MISC ChangeLog 4818 RMD160 f3797f67c3f6b331449fc754166a3ec6ecd791b2 SHA1 fa19ead7c25b875e5d33ee3db1666ff1be1066d6 SHA256 445f8d86291c0e99ebadb05c58863ef04979945d5d09d3ace10a53a0128d60a3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.4_pre10-gcc41.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.4_pre10-gcc41.patch
deleted file mode 100644
index c41e30dfe3b5..000000000000
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.4_pre10-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- KoboDeluxe-0.4pre10/gamestate.h.orig	2006-03-19 16:06:44.000000000 +0100
-+++ KoboDeluxe-0.4pre10/gamestate.h	2006-03-19 16:06:50.000000000 +0100
-@@ -24,6 +24,8 @@
- 
- #include "window.h"
- 
-+class gamestatemanager_t;
-+
- class gamestate_t
- {
- 	friend class gamestatemanager_t;
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
new file mode 100644
index 000000000000..98451bb29975
--- /dev/null
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
@@ -0,0 +1,83 @@
+--- enemies.h
++++ enemies.h
+@@ -70,9 +70,9 @@
+ extern const enemy_kind bomb2;
+ extern const enemy_kind bombdeto;
+ extern const enemy_kind cannon;
+-extern const enemy_kind pipe1;
++extern const enemy_kind pipeone;
+ extern const enemy_kind core;
+-extern const enemy_kind pipe2;
++extern const enemy_kind pipetwo;
+ extern const enemy_kind rock;
+ extern const enemy_kind ring;
+ extern const enemy_kind enemy_m1;
+@@ -430,7 +430,7 @@
+ 
+ inline int _enemy::is_pipe()
+ {
+-	return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
++	return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo)));
+ }
+ 
+ 
+--- enemy.cpp
++++ enemy.cpp
+@@ -713,7 +713,7 @@
+ 
+ void _enemy::kill_cannon()
+ {
+-	enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
++	enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y));
+ 	sound.g_base_node_explo(x, y);
+ 	release();
+ }
+@@ -755,10 +755,10 @@
+ 
+ void _enemy::kill_core()
+ {
+-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
++	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
++	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
++	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
++	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ 	enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
+ 	sound.g_base_core_explo(x, y);
+ 	release();
+@@ -851,7 +851,7 @@
+ 		screen.set_map(x1, y1, m ^ a);
+ 	release();
+ }
+-const enemy_kind pipe1 = {
++const enemy_kind pipeone = {
+ 	0,
+ 	&_enemy::make_pipe1,
+ 	&_enemy::move_pipe1,
+@@ -978,19 +978,19 @@
+ 	}
+ 	p ^= a;
+ 	if(p & U_MASK)
+-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
++		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+ 	if(p & R_MASK)
+-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
++		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+ 	if(p & D_MASK)
+-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
++		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ 	if(p & L_MASK)
+-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
++		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+ 	manage.add_score(10);
+ 	release();
+ }
+ 
+ 
+-const enemy_kind pipe2 = {
++const enemy_kind pipetwo = {
+ 	0,
+ 	&_enemy::make_pipe2,
+ 	&_enemy::move_pipe2,
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.4_pre10.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.4_pre10.ebuild
deleted file mode 100644
index 02a264e815df..000000000000
--- a/games-arcade/kobodeluxe/kobodeluxe-0.4_pre10.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/kobodeluxe/kobodeluxe-0.4_pre10.ebuild,v 1.17 2007/09/23 16:02:14 josejx Exp $
-
-inherit eutils games
-
-MY_P="KoboDeluxe-${PV/_/}"
-DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
-HOMEPAGE="http://www.olofson.net/kobodl/"
-SRC_URI="http://www.olofson.net/kobodl/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	opengl? ( virtual/opengl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	# Fix paths
-	sed -i \
-		-e 's:\$(datadir)/games/kobo-deluxe:$(datadir)/kobodeluxe:' \
-		-e 's:\$(prefix)/games/kobo-deluxe/scores:$(localstatedir)/kobodeluxe:' \
-		configure || die "sed configure failed"
-	sed -i \
-		-e 's:\$(datadir)/games/kobo-deluxe:$(datadir)/kobodeluxe:' \
-		data/Makefile.in || die "sed data/Makefile.in failed"
-}
-
-src_compile() {
-	egamesconf $(use_enable opengl) || die
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newicon data/logo3.png ${PN}.png
-	make_desktop_entry kobodl "Kobo Deluxe"
-	dodoc ChangeLog README* TODO
-	insinto "${GAMES_STATEDIR}"/${PN}
-	doins 501 || die "doins failed"
-	prepgamesdirs
-	fperms 2775 "${GAMES_STATEDIR}"/${PN}
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "The location of the highscore files has changed.  If this isn't the"
-	elog "first time you've installed ${PN} and you'd like to keep the high"
-	elog "scores from a previous version of ${PN}, please move all the files"
-	elog "in /var/lib/games/kobodeluxe/ to ${GAMES_STATEDIR}/${PN}. If you"
-	elog "have a /var/lib/games/kobodeluxe/ directory it may be removed."
-}
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
index 405a8c18593a..3ce476e34c53 100644
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# 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-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild,v 1.5 2008/06/29 10:53:17 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild,v 1.6 2009/01/13 01:01:10 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -23,6 +23,7 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc29.patch
 	# Fix paths
 	sed -i \
 		-e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \