old

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

5 files changed, 6 insertions, 176 deletions

diff --git a/games-arcade/bub-n-bros/ChangeLog b/games-arcade/bub-n-bros/ChangeLog
index c5d660bdc73c..10e98b1d2877 100644
--- a/games-arcade/bub-n-bros/ChangeLog
+++ b/games-arcade/bub-n-bros/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/bub-n-bros
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.24 2015/02/10 10:03:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/ChangeLog,v 1.25 2015/02/19 06:18:18 mr_bones_ Exp $
+
+  19 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org> -bub-n-bros-1.6.ebuild,
+  -files/bub-n-bros-1.6-home.patch, -files/bub-n-bros-1.6-python25.patch:
+  old
 
   10 Feb 2015; Agostino Sarubbo <ago@gentoo.org> bub-n-bros-1.6.2.ebuild:
   Stable for x86, wrt bug #538878
diff --git a/games-arcade/bub-n-bros/Manifest b/games-arcade/bub-n-bros/Manifest
index 785fc7efad33..06180e361f8f 100644
--- a/games-arcade/bub-n-bros/Manifest
+++ b/games-arcade/bub-n-bros/Manifest
@@ -1,29 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX bub-n-bros-1.6-home.patch 2035 SHA256 13bfced9b7b4bbb543ba32fa209bcf7d313a2f6c0dda979d71dba83dd717ff95 SHA512 77362d4b1daa02f59daa34bc31f6a68506a14eaa4633d04ee3f21f9c8244089e35568bff001a997659de07a4640af84d2ed14807242561e876634d7192f8ab34 WHIRLPOOL 4386739ee5bb2ae406daec9981da4ef3e56ecd9ee04ea30807b37cb796874827826031b50c2e38fbb37d3ddf3585575c8f9da104ccd099f8091ca023e090dc8d
-AUX bub-n-bros-1.6-python25.patch 1066 SHA256 57534f2e7b94fe48d4c6da20dd16257136832171adae6f959492d3c3363821d4 SHA512 d2c19560cf5bcbebcbcadc151c206b1eecc4e2dbe2754e92f014feeedb1301a58a6fff466e9c738babc3d0fbc5d535925bd8edae3e105c1de68041f9a43d73e8 WHIRLPOOL 191b6aef50b99a3af692527edad04cadc754902e00b8f5514b4552bae6fd6440b182d7163914f421f1dd9410ae285adca61c9e2951d2f3743898baf2e5e14558
 AUX bub-n-bros-1.6.2-home.patch 2035 SHA256 13bfced9b7b4bbb543ba32fa209bcf7d313a2f6c0dda979d71dba83dd717ff95 SHA512 77362d4b1daa02f59daa34bc31f6a68506a14eaa4633d04ee3f21f9c8244089e35568bff001a997659de07a4640af84d2ed14807242561e876634d7192f8ab34 WHIRLPOOL 4386739ee5bb2ae406daec9981da4ef3e56ecd9ee04ea30807b37cb796874827826031b50c2e38fbb37d3ddf3585575c8f9da104ccd099f8091ca023e090dc8d
 DIST bubbros-1.6.2.tar.gz 11568771 SHA256 0ad8a359c4632071a9c85c2684bae32aa0fa278632c49f092dc4078cfb9858c4 SHA512 a05fca8e31655e4bade60cd085f29796d789b349f005c715bf0e37e51f0bacb9d8b9650f3b10470917ee25421d32443e01132816a2f508e359302aa2c6d18ddb WHIRLPOOL 6ed0f68cab694399aef4c75ab0633c9c355cbc5328c72fffacd20612c6cf0cc67b06db65dc808307bd036caba19f1d7e35fedd6c756104e9c1c5ce1054b8a43f
-DIST bubbros-1.6.tar.bz2 9052959 SHA256 dd197e60a23e09800010f3a5906feb77847e6eeaa7cfd47d803a85daa0bcf255 SHA512 6f798363d0b4e6cb8f15b2d3e09f30ed34e9a5066a7dc1b96dfc4f413f07f2d042cdc8c6bd8a721df1bc1f677c11790461047fbf8ddd63d889c8c71f61b0711e WHIRLPOOL a0ca4fdddbbdbab80ac63bf8d92e2396350e59b507a2dd78a797c2c732e6bddc9a911e96a307a6698c45ce01254f136be77ddfc92cb165662dd5fb7d5b02f47c
 EBUILD bub-n-bros-1.6.2.ebuild 1581 SHA256 b9802c6a2f419b70429db2f5fa416a15ed24b81f06038922f2c9c0990b2d3002 SHA512 fc7f8816434acdcb0ef1adb0c033311e5c1a5e431a6f56c86521c8455bb85288c030f794d32ba2ff1690abce2e6414b851f0122fe4adcb87ba7bbb316cc30848 WHIRLPOOL f6cf17113d2a3068c3d983a6fa93aca5dee340c5f7e74d62e90ee129ba1e6837c193b524ee5d5c8eb8b42b66cb2d0dad2c6151935e4ce69cf3fe72af41cce26d
-EBUILD bub-n-bros-1.6.ebuild 1549 SHA256 3e65f8af5909346ce5b085b69c435a51effc6d5418f31b61202be9cc049021b2 SHA512 7826be3052e760d361133061319f01df9c4a30d7c876dc818611f05fdb08098854025cc3606dfb65dffb373a8662d5099383a67761177076191b07ba3c7275e4 WHIRLPOOL 8dcfcfaeaf7e3262e518cddaae1b6c299e6c42753c84c645cd79a5f1aa450f323901fc3c9d14fa1cce85971d7ff45a135e76184dacb916df8612df2a320f17a3
-MISC ChangeLog 2902 SHA256 6fddeb39df996e442f6eb09b7673e2b81afb4fd6808eebeffaaee8e04aafc945 SHA512 8c929f52a963a0ffafdae7bab13cfdadaba946955318a31b01ddee8d75ca9fa0762710e90ebcb15481c28f9a11c0d68498b2b9c2e8d6effcc65fe0a97155bf02 WHIRLPOOL 71d929fbe6803dbddc5f019f1269557476ed4ecb985c7e6b83da26072038ef6a2ffa4944798e2ba30651772a06df79bf1516e6d5044dfe5a3d0bdfadbca48941
+MISC ChangeLog 3068 SHA256 272f5efd7142b25ca1e761bb287cbec2ab6f32ceb2751de3e5d3a58520e1a5cb SHA512 1336f13e8fd9e87cd2ae20820ab889f407199cb4f61a0d466ddde64d1c57c73924280b648cbe627051ca148f1c1182da9acd16515cbe2f8b0ed301d594a91065 WHIRLPOOL 2c498425a512938242f2bff28cbdaef083e5c25b118888ea64819b4b8fe1d0ae8039b9c8a947aa44dd87a111bc9d5671d3bf8bc571a9bafe496586fbf6663522
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJU2ddzAAoJELp701BxlEWfKNIQAKXTIkoPzb8NSdpVIV1sgneJ
-BwQ0bgOI/HUMr7AxQ2LtvLLxbxAaLx1ag2IDk52jk0GKsEicCq0VN+RFeDyfPc+S
-cvvFthLA8EIU7ZK7h2WgSIiz/tku/5Q3mIZmKUe02siEyzrx+HtNEaIkZD11Syth
-L8iunSgm2lNN/gtLC8i22KYW9hbZ0BnisaVW6bpWoAaLfxDI+uFpwRF3uqKCdEUe
-n0Y+OcnsJSTOy8golZde4XXSL3QpN4uTTL98WpJzlVw8iZrQCsAF4DorfgHNB/Jb
-OUUtqDuGO6ZbWzfgbzl05O6cuDTDaBxKhCitRKwJtqtR6uVVz2+CasIRR4vB9HIJ
-aPjJbs4jQ9KAbq39QRcmsOMHO4krF99pcaD0v+ine3zZWhPm7AzRWw/A3zsOrp8E
-xxD4GSq8GCI/daX9wfmXEgMurLark71yOC8joi1Ip+52b7BjzaOjukcg1oiQmbhd
-fqZJQAwbxoqSfaVN+XLijS8nPx5NGUieTNLLrTgA3xiqYt7CTOVJPClR16qPpx0A
-VVIWuYKniLrXqMzwBS1c6n6v6bScofgVTGFPvas/vBAn3Ap8kPDCrPqbgyaoMIYL
-l9EChB55Uhem2noVnEmk5AGU0WKM7UNNNZLRrq38Ca9JNEfAhhGSvqqpunrWeEZw
-p5sRKWT6g5/YSacrutL2
-=qjJC
------END PGP SIGNATURE-----
diff --git a/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild b/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild
deleted file mode 100644
index ee82cd1ed147..000000000000
--- a/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/bub-n-bros/bub-n-bros-1.6.ebuild,v 1.7 2010/09/09 17:35:20 mr_bones_ Exp $
-
-EAPI=2
-PYTHON_DEPEND="2"
-inherit eutils python games
-
-MY_P=${P/-n-}
-DESCRIPTION="A multiplayer clone of the famous Bubble Bobble game"
-HOMEPAGE="http://bub-n-bros.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-python/pygame"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-	games_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-	epatch \
-		"${FILESDIR}"/${P}-home.patch \
-		"${FILESDIR}"/${P}-python25.patch
-	python_convert_shebangs -r 2 .
-}
-
-src_compile() {
-	# Compile the "statesaver" extension module to enable the Clock bonus
-	cd "${S}"/bubbob
-	$(PYTHON) setup.py build_ext -i || die
-
-	# Compile the extension module required for the X Window client
-	cd "${S}"/display
-	$(PYTHON) setup.py build_ext -i || die
-
-	# Build images
-	cd "${S}"/bubbob/images
-	$(PYTHON) buildcolors.py || die
-}
-
-src_install() {
-	local dir=$(games_get_libdir)/${PN}
-
-	exeinto "${dir}"
-	doexe *.py || die "doexe failed"
-
-	insinto "${dir}"
-	doins -r bubbob common display java http2 metaserver || die "doins failed"
-
-	dodir "${GAMES_BINDIR}"
-	dosym "${dir}"/BubBob.py "${GAMES_BINDIR}"/bubnbros || die "dosym failed"
-
-	newicon http2/data/bob.png ${PN}.png
-	make_desktop_entry bubnbros Bub-n-Bros
-
-	prepgamesdirs
-}
diff --git a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch b/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch
deleted file mode 100644
index 4d2cc317aba3..000000000000
--- a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-home.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- bubbob/images.py	2007-09-08 17:03:41.000000000 +0200
-+++ bubbob/images.py	2007-09-08 17:57:45.000000000 +0200
-@@ -454,7 +454,6 @@
-     # check and maybe regenerate the colored image files
-     file = os.path.join('images', 'buildcolors.py')
-     g = {'__name__': '__auto__', '__file__': file}
--    execfile(file, g)
-     # replace the entries 'filename_%d.ppm' by a family of entries,
-     # one for each color
-     sprmap = {}
---- display/pclient.py	2007-09-08 17:03:41.000000000 +0200
-+++ display/pclient.py	2007-09-08 17:57:45.000000000 +0200
-@@ -162,8 +162,8 @@
-         if mode[-1].has_key('cfgfile'):
-             self.trackcfgfile = mode[-1]['cfgfile']
-         else:
--            self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
--                                             'http2', 'config.txt')
-+            self.trackcfgfile = os.path.join(os.environ.get('HOME'),
-+                                             '.bubnbros')
-         self.udpsock = None
-         self.udpsock_low = None
-         self.udpsock2 = None
---- http2/httppages.py	2007-09-08 17:03:41.000000000 +0200
-+++ http2/httppages.py	2007-09-08 17:57:45.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- 
- class PageServer:
--    CONFIGFILE = 'config.txt'
-+    CONFIGFILE = '.bubnbros'
-     localservers = None
- 
-     def __init__(self, Game):
-@@ -46,7 +46,7 @@
-         self.seed = hex(random.randrange(0x1000, 0x10000))
-         #self.unique_actions = {}
-         self.localhost = gamesrv.HOSTNAME
--        self.filename = os.path.join(LOCALDIR, self.CONFIGFILE)
-+        self.filename = os.path.join(os.environ.get('HOME'), self.CONFIGFILE)
-         data = self.loadoptionfile()
-         self.globaloptions = Options(data.get('*', {}))
-         self.localoptions  = Options(data.get(self.localhost, {}))
-@@ -333,7 +333,6 @@
-                             'buildcolors.py')
-         if os.path.exists(file):
-             g = {'__name__': '__auto__', '__file__': file}
--            execfile(file, g)
- 
-         if port:
-             address = '%s:%s' % (host, port)
diff --git a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch b/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch
deleted file mode 100644
index d681f31ae850..000000000000
--- a/games-arcade/bub-n-bros/files/bub-n-bros-1.6-python25.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur bubbros-1.5.orig/bubbob/statesaver.c bubbros-1.5/bubbob/statesaver.c
---- bubbros-1.5.orig/bubbob/statesaver.c	2007-09-08 17:43:14.000000000 +0200
-+++ bubbros-1.5/bubbob/statesaver.c	2007-09-08 17:43:14.000000000 +0200
-@@ -75,7 +75,7 @@
-     Py_INCREF(g);  /* exhausted -- can return 'g' itself */
-     return g;
-   }
--  if (f->f_nfreevars || f->f_ncells) {
-+  if (PySequence_Length(co->co_freevars) || PySequence_Length(co->co_cellvars)) {
-     PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
-     goto error;
-   }
-@@ -112,6 +112,8 @@
-   PyFrameObject* f = NULL;
-   PyFrameObject* f2 = NULL;
-   PyCodeObject* co;
-+  PyCodeObject* code;
-+  PyCodeObject* code2;
-   int i, res;
- 
-   if (g != g2)
-@@ -141,9 +143,9 @@
-         Py_DECREF(x);
-         goto error;
-       }
--      f2 = (PyFrameObject*) x;
- 
--      if (f2->f_stacksize != f->f_stacksize) {
-+      code2 = (PyFrameObject*) x;
-+      if (code2->co_stacksize != code->co_stacksize) {
-         PyErr_SetString(PyExc_TypeError, "stack size mismatch");
-         goto error;
-       }