old

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 6 insertions, 124 deletions

diff --git a/games-puzzle/xblockout/ChangeLog b/games-puzzle/xblockout/ChangeLog
index 0751a9c228f5..0d71c8484ea3 100644
--- a/games-puzzle/xblockout/ChangeLog
+++ b/games-puzzle/xblockout/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/xblockout
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.30 2015/02/21 12:27:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/ChangeLog,v 1.31 2015/03/12 18:32:26 mr_bones_ Exp $
+
+  12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/xblockout-1.1.5-font.patch, -xblockout-1.1.5-r1.ebuild:
+  old
 
   21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> xblockout-1.1.6.ebuild:
   Stable for ppc, wrt bug #539520
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index 0f7cfb97365c..be02913b0c62 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,28 +1,5 @@
------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 1248 SHA256 1673a7da21684dcca0d3ac0e7da50ea316ecdea2564e38699aba4ac1fa073720 SHA512 1cba10cb4c9976c54a4e8d165dd95ed3635a0c46f059935c385e729dad49f14cea9e90491bcde2c5bcb63ce57e039e7cd440196a9f105556c40814beb189005f WHIRLPOOL 8726496216a09da3d533b4cdd918c9af997f04afba87d83aee54de1c54bdb4825c4d8e7d974b2532c598aa863ed025c788a04ab4e787597e5c43c4f4f60fbc63
-MISC ChangeLog 3835 SHA256 8eeeb8687a395cd51e79d26eb5a70b7fb4fed73e0015f4dba69e772e0206d3a2 SHA512 32094d904418759a0aed4097a93e98143c4d46df94b7d172dae092af3a557ca4606d5bc0d495ede375324f85e3601c64fe1a5b89387ff2f1c84ef78b2186ae72 WHIRLPOOL 7906947768a8f96dbceb82ce31e8e31959103456dc8d9dcaf368effe824145fa1db5caf3f705ce7b81846b3d9758deb4b0fa4b8eaf4ee10e52823e307fbc10f2
+MISC ChangeLog 3968 SHA256 7937ed3af3207bff5dadb8ede1d2f4b2f2db2eff19446e6040112afc4db824ea SHA512 43d1a3dd58347b04b1451311d4336ee675251a1ddbcca2d7040ba2e551b92b90f3fb02eaf395465166dac1ac2ad010946f2c108ad24acff9be207e7e5305b5e7 WHIRLPOOL 05156cc50bbb0dd26b9d9824f817817626022380b795b7ffe9470a40bc7b939582dbc140aa6e31c47e8c28e4db85ed98348b789f6b32b74165cc5dc4c3a467fa
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJU6HmXAAoJELp701BxlEWftKQP+wRVmjkjykfnOQzjAOpRGX1h
-6z/pyCZjvBUaa2V6b7WWIhS0bSa9hzGH1pubYZeNkBWPjklkct8eMkJ2g4IlxKWa
-nVmYl8DM0xx/7xlA4klyUVO3EEds5tCnLOBgXkYZOC2cr4ivzW3xVURNLdbL5pBW
-S8reQWVTEYXTQz9YTHEqO2pXY0rYEkHFzLaQpULhLJTJDIuoq6UgTwbyw+yskmyN
-zBwhMKF3m4d70LJtSfyZMrnSq0298GPNB4mFj0HLFwLIW6M+f91Y/fDI2k58n6jS
-934RVvQ18KFhFTA3cGgxj5eA+rapI6ZC5o3/AX3hX+46O8OUMbDgcD1Tf7jzQiBd
-EQwbFgaQ5xD7GkvBCHXVx1l/+6maI3H+pePvbaLyyZVTDOfktCxb877HN9pjQj+f
-NZK7kLluZgLb6T+eFa+Zr0lEyqfsmpXK3n7YcHS8LOmyTz8iOJ0WxdFJYq/m3uCf
-DhRQWsZCfe92iSw/dU8vMeB46L4TtFgFfETKB2HjMrhhffekOTodS+vyB9JZJU1t
-1+jPQ02zA38HNdgswzDoW6Dt4mq/gJNyUQt34BMXpRLbAN/IymjMqcKVC9k+fsPJ
-vULhR1uZGEdlVEMFCfxsqOzshKfYTZXDlcq7NW63oEymNnbQH71/m2UX2HZPgwoj
-ncGTseWSAKRgPiA1XCVr
-=LPFt
------END PGP SIGNATURE-----
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch
deleted file mode 100644
index bb0302963bdc..000000000000
--- a/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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.5-r1.ebuild b/games-puzzle/xblockout/xblockout-1.1.5-r1.ebuild
deleted file mode 100644
index fbe77f16c538..000000000000
--- a/games-puzzle/xblockout/xblockout-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xblockout/xblockout-1.1.5-r1.ebuild,v 1.8 2010/10/18 18:06:19 mr_bones_ Exp $
-
-EAPI=2
-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=""
-
-DEPEND="x11-libs/libXext"
-
-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}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	newgamesbin bl xbl || die "newgamesbin failed"
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	newins Xbl.ad Xbl || die "doins failed"
-
-	newman xbl.man xbl.6
-	dodoc README xbl-README
-	dohtml *.html *.gif
-	make_desktop_entry xbl XBlockOut
-	prepgamesdirs
-}