version bump

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 130 insertions, 7 deletions

diff --git a/games-puzzle/xblockout/ChangeLog b/games-puzzle/xblockout/ChangeLog
index 5b48a535b47f..2a5f790b621b 100644
--- a/games-puzzle/xblockout/ChangeLog
+++ b/games-puzzle/xblockout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/xblockout
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.25 2010/10/15 12:23:02 tupone Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.26 2013/02/17 04:00:40 hasufell Exp $
+
+*xblockout-1.1.6 (17 Feb 2013)
+
+  17 Feb 2013; Julian Ospald <hasufell@gentoo.org> +xblockout-1.1.6.ebuild,
+  +files/xblockout-1.1.6-font.patch:
+  version bump
 
   15 Oct 2010; Tupone Alfredo <tupone@gentoo.org> xblockout-1.1.5-r1.ebuild:
   Respect LDFLAGS. Bug #335051 by flameeyes@gentoo.org
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index 823c4a3c0135..1f3759695a65 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,5 +1,22 @@
-AUX xblockout-1.1.5-font.patch 1531 RMD160 a7b20c32c3ed040a54ac519a187b9678bf7244e9 SHA1 44f588250fbc5246089c94939ccfcf4360f41181 SHA256 fd1707ce1775804469fec94d71ec97263686324164f50be7aeb3f88e1402e9be
-DIST xbl-1.1.5.tar.gz 136508 RMD160 30cf9f6b1c251b267f0ebe0b85f349e9dce3dd44 SHA1 14503060ccf82d23430fe08e78ba4998723ec174 SHA256 5628e4a70709e3d996f4adf635a1760d96fad3ded0dd32d32205bdccde1e2cad
-EBUILD xblockout-1.1.5-r1.ebuild 1269 RMD160 cdd9e2d8bc27fbe178acddc60e9d3351a3ba4e43 SHA1 88d6e7458d026c9698ece6f692b72d46aaf5916d SHA256 eedbdeea3726a3b66663b73c438bb982b459aa01863f0e81dcc5a8d175fba5db
-MISC ChangeLog 3253 RMD160 80fad65e3c5012fb137c8ccedca2f770e870772a SHA1 a2226325805019f30401e7924ef01a7b933f4af4 SHA256 6c93ffd58eeae7c919c2975a9f126f99c6064c8ec3eebe3139a4ec0e678de7bc
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xblockout-1.1.5-font.patch 1531 SHA256 fd1707ce1775804469fec94d71ec97263686324164f50be7aeb3f88e1402e9be SHA512 adfc6ad87048c4c021e8989886011c8dfa8736778ac12fefacbbffc114272f4a5ee60a997f35d817d22bbd9eb348c7e40701bd25bc1cf0d5924add71fc77e450 WHIRLPOOL 8add3633f33d6d38c59a7449984509e5bed151d65d3ce6ebe7199c7ffabadc157ca2f77e6bbad0628621f47b8768cdc7900f399b1fa38d60973acaf5f395c758
+AUX xblockout-1.1.6-font.patch 1531 SHA256 fd1707ce1775804469fec94d71ec97263686324164f50be7aeb3f88e1402e9be SHA512 adfc6ad87048c4c021e8989886011c8dfa8736778ac12fefacbbffc114272f4a5ee60a997f35d817d22bbd9eb348c7e40701bd25bc1cf0d5924add71fc77e450 WHIRLPOOL 8add3633f33d6d38c59a7449984509e5bed151d65d3ce6ebe7199c7ffabadc157ca2f77e6bbad0628621f47b8768cdc7900f399b1fa38d60973acaf5f395c758
+DIST xbl-1.1.5.tar.gz 136508 SHA256 5628e4a70709e3d996f4adf635a1760d96fad3ded0dd32d32205bdccde1e2cad SHA512 8e1b68b4c8447120180bfe73b3c6fe87b531314c2a6b8a1602ee8fb746254e7fca6aed7f50407db24d3a0a25a6cb059f0a9e7fc8720e16b66bd91de31f7d192d WHIRLPOOL 8ed4dd5eff2b9c58d4114c52862319930f989d024c0463485b73a1152ff5c42b55aa57cb442d00ed31560861617203a0ac638037686455d4338c1d5e8683d0c7
+DIST xbl-1.1.6.tar.gz 136504 SHA256 85f456b6aca15f1642bbd233872250918432f0b5252d4b0d681bc2394fda5f84 SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0 WHIRLPOOL 94f3bd29f13d2e0774e491f0624b7b5d912e37c071fb9490d2b5a5320990731193cd78235aa49e860c2e7b976ced5223c5875a82baaaa846492154ebc5fe2a20
+EBUILD xblockout-1.1.5-r1.ebuild 1269 SHA256 eedbdeea3726a3b66663b73c438bb982b459aa01863f0e81dcc5a8d175fba5db SHA512 1427f58134501921119661d4fa2e1c347b89a8e49b1c37ec25e254395eeba99d40fa76f75cb17b72513366f6ef93b89dfb4a37608ec5362895ce9b6d53906349 WHIRLPOOL 1580268ba10e934f06752f643e8ff679ba3e8d0941bcfe9c9eda5722e80e9f82e78ce935410ab233c1c09b25afc5038c5b7892e3e7531fe090cfbb2c590e4098
+EBUILD xblockout-1.1.6.ebuild 1230 SHA256 1a1684299af903a86a237ced75d38fe49172c4c3aa6d2612472a38345598fad3 SHA512 87da443f1ff92b29374209bfbfff90fbcbe9a766342403e76704a7ff580a1e9333de5978be85c84ddb8bd944f749f4f6737e9456c08f882319511ab6c549d49a WHIRLPOOL aaf9f8389a2ff051a39e5162ee7151868a4c56083a7a0852b4fcc417d86a1164d4ab5b815352ada34f8aef2b887a7b56756e160e888ff8c903b2e95acc9caf29
+MISC ChangeLog 3416 SHA256 ffbac81c2ee6e877307cf428237b2fe157c533fac92227ee202d6f7dc8876cf3 SHA512 93691394cdfb0dcc60c009c798019431307c2580ac69d7f66363bf32837252b3474b3af4ac0eff1f14afca6a331753ab01f64039134bfe945c600d78f6980e35 WHIRLPOOL cbacc2477c8ed5a553ae6d1d2bb907d09398504b41b13d867c4f3d08e544ee8d762dcfc087e351c10c3ec3a81ffdfca62dc9b21cee9bda737bfca2a28c16a17d
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRIFXpAAoJEFpvPKfnPDWzVpoH/1WIlZPVaS7LwQcTT+qjh5g/
+2sVqJ07vULqBjphu7fUxfrwy/H1sSztdTDhy7RNtCUaVIJQ8eBZETZnijfFXTvhG
+OWwyfDVGmb/IfupshO+9nECXkYSL6rDCjr0GIgdOpfnowfi8qzLsFk+UZQYkbyOz
+pmDJ4B5JVWAdEVNjXIRmKOLUS9GuWe8C1hJCgKIkFKa8dYjvfoNLDMkiz29mBfXw
+cRV8OQGj5N0po7ZRs3EaF5SLn7wh5+9f2nZFDJ1lXztHDy5ExF+VAGcb4sSYc271
+IaAPlJH7750j8wLD8Sl7DtpmFIQmNa/NPLw6L/NVdPs4dAb+qmEYI0/qGUIl//0=
+=kL6A
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
new file mode 100644
index 000000000000..bb0302963bdc
--- /dev/null
+++ b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
@@ -0,0 +1,46 @@
+--- initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
++++ initmenu.c	2008-10-27 23:22:52.000000000 +0100
+@@ -408,19 +408,17 @@
+   XCharStruct overall_return ;
+ 
+   m->xfont = XLoadQueryFont( x->display , opt->thefont ) ;
+-  m->font = XLoadFont( x->display , opt->thefont ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font=%s\n", opt->thefont) ;
+     }
+-  if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++  if ( m->xfont==0 )
+     {
+       fprintf(stderr,"Some problems when loading a font... trying others\n") ;
+       m->xfont = XLoadQueryFont( x->display , 
+ 				 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      m->font = XLoadFont( x->display , 
+-			   "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++      m->font = m->xfont->fid;
++      if ( m->xfont==0 )
+ 	{
+ 	  fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
+ 	  fprintf(stderr,"Have you A font?\n");
+@@ -428,17 +426,17 @@
+ 	  exit(1) ;
+ 	}
+     }
++  m->font = m->xfont->fid;
+   m->xfont2 = XLoadQueryFont( x->display , opt->thefont2 ) ;
+-  m->font2 = XLoadFont( x->display , opt->thefont2 ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font2=%s\n", opt->thefont2) ;
+     }
+-  if ( m->font2==BadAlloc || m->font2==BadName || m->xfont2==0 )
++  if ( m->xfont2==0 )
+     {
+-      m->font2 = m->font ;
+       m->xfont2 = m->xfont ;
+     }
++  m->font2 = m->xfont2->fid;
+ 
+   xgc.background = x->back_pixel ;
+   xgc.foreground = opt->backcolor!=7 ? x->white_pixel : x->black_pixel;
diff --git a/games-puzzle/xblockout/xblockout-1.1.6.ebuild b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
new file mode 100644
index 000000000000..1df69c34f27d
--- /dev/null
+++ b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/xblockout-1.1.6.ebuild,v 1.1 2013/02/17 04:00:40 hasufell Exp $
+
+EAPI=5
+inherit flag-o-matic eutils games
+
+DESCRIPTION="X Window block dropping game in 3 Dimension"
+HOMEPAGE="http://www710.univ-lyon1.fr/ftp/xbl/xbl.html"
+SRC_URI="http://www710.univ-lyon1.fr/~exco/XBL/xbl-${PV}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/xbl-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-font.patch
+	sed -i \
+		-e '/^CC/d' \
+		-e 's:-lm:-lm -lX11:' \
+		-e '/DGROUP_GID/d' \
+		-e "s:-g$:${CFLAGS}:" \
+		Makefile.in || die "sed failed"
+	# Don't know about other archs. --slarti
+	use amd64 && filter-flags "-fweb"
+}
+
+src_compile() {
+	emake \
+		USE_SETGID= \
+		SCOREDIR="${GAMES_DATADIR}/${PN}" \
+		RESOURCEDIR="${GAMES_DATADIR}/${PN}" \
+		LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	newgamesbin bl xbl
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	newins Xbl.ad Xbl
+
+	newman xbl.man xbl.6
+	dodoc README xbl-README
+	dohtml *.html *.gif
+	make_desktop_entry xbl XBlockOut
+	prepgamesdirs
+}