old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 5 insertions, 151 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/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;
-       }