Adopt package, fix buffer overflow (kinda), bug 442290, and impossible game speed. Drop to ~arch as we're returning from package mask.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE

6 files changed, 71 insertions, 15 deletions

diff --git a/games-arcade/xboing/ChangeLog b/games-arcade/xboing/ChangeLog
index dde31cfbd2c4..31285575d1f6 100644
--- a/games-arcade/xboing/ChangeLog
+++ b/games-arcade/xboing/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/xboing
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xboing/ChangeLog,v 1.14 2011/01/08 20:58:52 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xboing/ChangeLog,v 1.15 2013/02/02 19:19:26 dilfridge Exp $
+
+  02 Feb 2013; Andreas K. Huettel <dilfridge@gentoo.org> -xboing-2.4-r1.ebuild,
+  +xboing-2.4-r2.ebuild, +files/xboing-2.4-buffer.patch,
+  +files/xboing-2.4-sleep.patch, metadata.xml:
+  Adopt package, fix buffer overflow (kinda), bug 442290, and impossible game
+  speed. Drop to ~arch as we're returning from package mask.
 
   08 Jan 2011; Tupone Alfredo <tupone@gentoo.org> xboing-2.4-r1.ebuild:
   Again respect LDFLAGS. Bug #351038 by flameeyes@gentoo.org
diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest
index 563b3f24bb30..6e124321fd85 100644
--- a/games-arcade/xboing/Manifest
+++ b/games-arcade/xboing/Manifest
@@ -1,5 +1,27 @@
-DIST xboing-2.4-debian.patch.bz2 7740 RMD160 90ab378da5bf13c2e8c880191d82faec6ec4c66d SHA1 b78e26134685cd093e38d2f08c12ce1d2bab7549 SHA256 14461b3684c8a651fb9cff864931f1e56600c373a16b8ea61a98f689173c893e
-DIST xboing2.4.tar.gz 588811 RMD160 3aa027dd7a7abe9b4119362a1c8b5fb968971567 SHA1 57fad37ab99e6a3ff87ff814d0de1baad3b93b91 SHA256 67019cb8c8a4da0b1177dcc8bed063afe3b8f1853b18345dbc1deaca51d4a29a
-EBUILD xboing-2.4-r1.ebuild 1291 RMD160 0b895ad9529d1dad388b4167d9d811e1f6cbb0ca SHA1 f4bf4e91f86c8a795494106b13bd35282c8ccc17 SHA256 0c682e723f80b190a392ec8c69f470609ce8a2ceb90d869aa7e1001eabcf4175
-MISC ChangeLog 1822 RMD160 5fdb9fb7119c2c48786258d4bcb1ae8023be128d SHA1 ce65d96acfab727fa3b7052537288f8b8105b5b4 SHA256 90c26384b2e5eac56c390fb75c2d49dcc3c4869de796d6722477de52bbcb4c6f
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xboing-2.4-buffer.patch 356 SHA256 549fe462e92313c05574ec11e95091db58df9c047495f142a2418c723130552a SHA512 8cd226cf2058d44bfb9055dec90b75eae32d68be40bf4e6a97d51edb443d425fd6de18efd82a3f254a5cf5e4bf4a815e21f45b7f51620adacd65bbb44309c038 WHIRLPOOL a313c4d626f9cce642ab5ea74a64f076d54ccd4649f00857f195441ec6cc8edf99ad8f17c8f8e40e8eeaec6a342a81e678c0d080ff97199a7dcd9c98b2de97f1
+AUX xboing-2.4-sleep.patch 397 SHA256 9430e8fbcd5d35c3c1220279541ff64d7506904e2b7f9d8624ef09be7e718bb4 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0 WHIRLPOOL 0cc9b5c25173b5f9d3362870b96b4dd0899993995d2cc4185d77b629589ed4cf2052245360d64bd39d7847fb0e759d37b56037a420d586b007d1979fb1d8d28c
+DIST xboing-2.4-debian.patch.bz2 7740 SHA256 14461b3684c8a651fb9cff864931f1e56600c373a16b8ea61a98f689173c893e SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9 WHIRLPOOL cc90b0e81f828b34ebacd15fac7839db47a891d701a1c4cd942a0f1aace903f23f57764d2698b11a04b46cad23e5841816127bbe5248f43d1a3be220d25fac28
+DIST xboing2.4.tar.gz 588811 SHA256 67019cb8c8a4da0b1177dcc8bed063afe3b8f1853b18345dbc1deaca51d4a29a SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454 WHIRLPOOL c2e1f6b6074c4db1afba7f52d4cb78203a980f3bbc1f4564397d864a01b977a25c27097b53957f80057d1445292a18bd5f4ae3913718c0c24a808eda32ba6b83
+EBUILD xboing-2.4-r2.ebuild 1405 SHA256 50cab023477d8352946b323a26a3bb9ccd8c7966362268184b1c6bdf0a763b29 SHA512 29ca205c6cd5e6cd571fe0ecb26e65c0a92380907a525d755caa839b2f5594a97a5a712bea43c8b2232ee49c2a9389ee3ebfa583de1cec7e31c925fa5566ee30 WHIRLPOOL 95e7d035758b8340dcf65918a42cf49b01dc8b4546d97d78f82cb8a3a67eb11a92515305661f1bc3f6700d74aa94d7d8762cf70cffa9fabf75eaced1ceae4c6b
+MISC ChangeLog 2149 SHA256 dd76ff223caa865d3d8c619f766234819db6c7947c39c0eca5d7ad26a8971504 SHA512 270beaa3a8e51f0254edc5734c48ae743afa76477fcf189d869a7398309ee8759ccefce51e26fecf41b951ce7f88d66b6aebeb8d157142ab73cf413a541cd534 WHIRLPOOL 7826e8333116b1cf6e137dfd1d25792f69d4c65fe87d7fa1fc9187e4d6a2a4433272ac2d1d75ceb789e89fcb780f35d485793422b8887a8cb3373be3d4d425d3
+MISC metadata.xml 200 SHA256 cd4726c927f95e95afea0dbe05066003b4bf99a42a42b84193f0361f2e80a719 SHA512 046d2dc173e592b2d26f03cbad4eaa7836ebeccf5e5e1b7058302bfbab3b4165c8ede0951ab3b2f4f479f1213b5dda87eb7e88ce5d619f7c93ab74b958626f95 WHIRLPOOL 480bf3f0c3dd8761f57fe8df9f8435dc0d2ebece678c209471dc18eba32058636a5e93cff73587578b08f3d94c76ad679789406df8b9c7f2d9c3ada1db797e59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRDWbHAAoJENwGBM22xffeLCEQAJNqMeM1kQXybjxz1JhilPDU
+FdEDSQplfCniMmFgdiY7kJX9DGOp7t+fkkXGljC4dWZmuKkXGlbxiZWQarjbOvAh
+/0emguHq+Qs3x0v6mS+jTXPuHJL5fHlZeqVPgH94YKVt30Mo9QwFCTZmCJ4BWz7S
+mZQ2ireGqdMbzyBO0CeLcmYNrWCqwVB9cIBPCbXybc0iHiyO0SrOiQcJFmrFp9mz
+KlXJFktW9BFDrCnRBM7ycGhKhjSh5XrQX8ylH6nDz5A81Mo4yBX6+MkuZtT7ul3M
+SsNrbLft/+8+CuvvTqVn59lp9u4jD6YVWfCxHTyiOD4dAu2FWzQ8RP2uj1bmjuoR
+sOEE5jwVXVBeURMeVnMZsh0QhFQLkOREwV/UV6ZGhLUg/yuc/V32r+mpNEboPt7u
+HrsSQRnBIrzvxuYqTJ6nARPF6MvWAODeSBatxIOtAhdcYyQDZtF9CY0BCOlt+WNO
+LycMEUabUKj9aKfpFAf0X8zI0vBBDjDBPlGiGBY9zafn0Gundsfs52RT7d19Qgye
+btntYDjTwB1n2PMqPWAsyMaQq3dR5JEdSRPTyyIcZqHYQOsnuJD2n5cHpcNjY1Wy
+ZnTnTK0Vp/stSe01lOzyBQ03ZDET6vt5rBSxzr2hOSqAF9xeMGKow7yzhmM1+AFe
+bsakCrDx7m2IABFNyBAU
+=gxRO
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/xboing/files/xboing-2.4-buffer.patch b/games-arcade/xboing/files/xboing-2.4-buffer.patch
new file mode 100644
index 000000000000..381ae69982d9
--- /dev/null
+++ b/games-arcade/xboing/files/xboing-2.4-buffer.patch
@@ -0,0 +1,12 @@
+diff -ruN xboing.orig/init.c xboing/init.c
+--- xboing.orig/init.c	1996-11-22 02:28:46.000000000 +0100
++++ xboing/init.c	2013-02-02 19:57:55.000000000 +0100
+@@ -266,7 +266,7 @@
+ #endif
+ {
+ 	/* Create all required font structures */
+-	char str[80];
++	char str[200];
+ 
+ 	/* Font used for titles */
+     if (!(titleFont = XLoadQueryFont(display, TITLE_FONT)))
diff --git a/games-arcade/xboing/files/xboing-2.4-sleep.patch b/games-arcade/xboing/files/xboing-2.4-sleep.patch
new file mode 100644
index 000000000000..80723465185f
--- /dev/null
+++ b/games-arcade/xboing/files/xboing-2.4-sleep.patch
@@ -0,0 +1,13 @@
+diff -ru xboing.debian/misc.c xboing/misc.c
+--- xboing.debian/misc.c	2013-02-02 20:07:07.000000000 +0100
++++ xboing/misc.c	2013-02-02 20:11:51.000000000 +0100
+@@ -116,9 +116,7 @@
+     long SyncTime;
+     static unsigned long accu;
+ 
+-#ifdef __alpha__
+     ms *= 1000;	/* convert from milliseconds to microseconds for usleep */
+-#endif
+   
+     gettimeofday(&st, NULL);
+     XSync(display, False);
diff --git a/games-arcade/xboing/metadata.xml b/games-arcade/xboing/metadata.xml
index d3c2cc926f0b..57c4c091b3ea 100644
--- a/games-arcade/xboing/metadata.xml
+++ b/games-arcade/xboing/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+<maintainer><email>dilfridge@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/games-arcade/xboing/xboing-2.4-r1.ebuild b/games-arcade/xboing/xboing-2.4-r2.ebuild
index db7afa0ced70..1947e0070381 100644
--- a/games-arcade/xboing/xboing-2.4-r1.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xboing/xboing-2.4-r1.ebuild,v 1.13 2011/01/08 20:58:52 tupone Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xboing/xboing-2.4-r2.ebuild,v 1.3 2013/02/02 19:19:26 dilfridge Exp $
+
+EAPI=5
 
 inherit eutils games
 
@@ -12,7 +13,7 @@ SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz
 
 LICENSE="xboing"
 SLOT="0"
-KEYWORDS="ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXpm"
@@ -25,6 +26,8 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	epatch "${WORKDIR}"/xboing-${PV}-debian.patch
+	epatch "${FILESDIR}"/xboing-${PV}-buffer.patch
+	epatch "${FILESDIR}"/xboing-${PV}-sleep.patch
 	sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c
 }
 
@@ -40,15 +43,15 @@ src_compile() {
 		CXXOPTIONS="${CXXFLAGS}" \
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
-		XBOING_DIR=${GAMES_DATADIR}/${PN} \
+		XBOING_DIR="${GAMES_DATADIR}/${PN}" \
 		|| die
 }
 
 src_install() {
 	make \
-		PREFIX=${D} \
+		PREFIX="${D}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
-		XBOING_DIR=${GAMES_DATADIR}/${PN} \
+		XBOING_DIR="${GAMES_DATADIR}/${PN}" \
 		install \
 		|| die
 	newman xboing.man xboing.6