Version bump (thanks Maks Verver, bug 421485), drop old, remove eutils eclass.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

6 files changed, 23 insertions, 209 deletions

diff --git a/app-misc/golly/ChangeLog b/app-misc/golly/ChangeLog
index 3a7fa8c9c752..46b9a37aa49f 100644
--- a/app-misc/golly/ChangeLog
+++ b/app-misc/golly/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/golly
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/ChangeLog,v 1.14 2012/06/08 11:55:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/ChangeLog,v 1.15 2012/06/18 22:38:11 xmw Exp $
+
+*golly-2.4 (18 Jun 2012)
+
+  18 Jun 2012; Michael Weber <xmw@gentoo.org> -golly-2.2.ebuild,
+  -golly-2.2-r1.ebuild, -files/golly-2.2-perl-5.14.patch, -golly-2.3.ebuild,
+  golly-2.3-r1.ebuild, +golly-2.4.ebuild:
+  Version bump (thanks Maks Verver, bug 421485), drop old, remove eutils
+  eclass.
 
   08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> golly-2.3-r1.ebuild:
   x86 stable wrt bug #418605
diff --git a/app-misc/golly/files/golly-2.2-perl-5.14.patch b/app-misc/golly/files/golly-2.2-perl-5.14.patch
deleted file mode 100644
index 10c983025c9d..000000000000
--- a/app-misc/golly/files/golly-2.2-perl-5.14.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- wxperl.cpp	2011/06/22 06:32:11	1.97
-+++ wxperl.cpp	2011/09/22 09:19:07	1.99
-@@ -131,6 +131,17 @@
-    #define PERL5101_OR_LATER
- #endif
- 
-+// check if we're building with Perl 5.14 or later
-+#if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
-+   #define PERL514_OR_LATER
-+#endif
-+
-+// Check if PL_thr_key is a real variable or instead a macro which calls
-+// Perl_Gthr_key_ptr(NULL), which was the default before Perl 5.14:
-+#ifdef PL_thr_key
-+   #define PERL_THR_KEY_FUNC 1
-+#endif
-+
- static PerlInterpreter* my_perl = NULL;
- 
- EXTERN_C void boot_DynaLoader(pTHX_ CV* cv);
-@@ -155,7 +166,11 @@
- extern "C"
- {
- #ifdef USE_ITHREADS
--   perl_key*(*G_Perl_Gthr_key_ptr)(register PerlInterpreter*);
-+   #ifdef PERL_THR_KEY_FUNC
-+      perl_key*(*G_Perl_Gthr_key_ptr)(register PerlInterpreter*);
-+   #else
-+      perl_key *G_PL_thr_key;
-+   #endif
- #endif
-    SV**(*G_Perl_av_fetch)(pTHX_ AV*, I32, I32);
-    I32(*G_Perl_av_len)(pTHX_ AV*);
-@@ -215,7 +230,13 @@
- }
- 
- // redefine Perl functions to their equivalent G_* wrappers
--#define Perl_Gthr_key_ptr        G_Perl_Gthr_key_ptr
-+#ifdef USE_ITHREADS
-+   #ifdef PERL_THR_KEY_FUNC
-+      #define Perl_Gthr_key_ptr        G_Perl_Gthr_key_ptr
-+   #else
-+      #define PL_thr_key               (*G_PL_thr_key)
-+   #endif
-+#endif
- #define Perl_av_fetch            G_Perl_av_fetch
- #define Perl_av_len              G_Perl_av_len
- #define Perl_av_push             G_Perl_av_push
-@@ -287,7 +308,11 @@
- } perlFuncs[] =
- {
- #ifdef USE_ITHREADS
--   PERL_FUNC(Perl_Gthr_key_ptr)
-+   #ifdef PERL_THR_KEY_FUNC
-+      PERL_FUNC(Perl_Gthr_key_ptr)
-+   #else
-+      PERL_FUNC(PL_thr_key)
-+   #endif
- #endif
-    PERL_FUNC(Perl_av_fetch)
-    PERL_FUNC(Perl_av_len)
-@@ -318,19 +343,24 @@
-    PERL_FUNC(Perl_sys_term)
- #endif
- #ifdef MULTIPLICITY
--   #ifdef PERL510_OR_LATER
--      PERL_FUNC(Perl_Imarkstack_ptr_ptr)
--      PERL_FUNC(Perl_Istack_base_ptr)
--      PERL_FUNC(Perl_Istack_max_ptr)
--      PERL_FUNC(Perl_Istack_sp_ptr)
--   #else
--      PERL_FUNC(Perl_Tmarkstack_ptr_ptr)
--      PERL_FUNC(Perl_Tstack_base_ptr)
--      PERL_FUNC(Perl_Tstack_max_ptr)
--      PERL_FUNC(Perl_Tstack_sp_ptr)
-+   #ifndef PERL514_OR_LATER
-+      // before Perl 5.14:
-+      PERL_FUNC(Perl_Iexit_flags_ptr)
-+      PERL_FUNC(Perl_Iperl_destruct_level_ptr)
-+      #ifdef PERL510_OR_LATER
-+         // Perl 5.10/5.12 only:
-+         PERL_FUNC(Perl_Imarkstack_ptr_ptr)
-+         PERL_FUNC(Perl_Istack_base_ptr)
-+         PERL_FUNC(Perl_Istack_max_ptr)
-+         PERL_FUNC(Perl_Istack_sp_ptr)
-+      #else
-+         // before Perl 5.10:
-+         PERL_FUNC(Perl_Tmarkstack_ptr_ptr)
-+         PERL_FUNC(Perl_Tstack_base_ptr)
-+         PERL_FUNC(Perl_Tstack_max_ptr)
-+         PERL_FUNC(Perl_Tstack_sp_ptr)
-+      #endif
-    #endif
--   PERL_FUNC(Perl_Iexit_flags_ptr)
--   PERL_FUNC(Perl_Iperl_destruct_level_ptr)
- #else  /* no MULTIPLICITY */
-    /* N.B. these are actually variables, not functions, but the distinction does
-       not matter for symbol resolution: */
-@@ -3079,8 +3109,13 @@
-    STRLEN n_a;
-    char* err = SvPV(ST(0),n_a);
- 
--   // store message in global string (shown after script finishes)
--   scripterr = wxString(err, wxConvLocal);
-+   if (scripterr == wxString(abortmsg,wxConvLocal)) {
-+      // this can happen in Perl 5.14 so don't change scripterr
-+      // otherwise a message box will appear
-+   } else {
-+      // store message in global string (shown after script finishes)
-+      scripterr = wxString(err, wxConvLocal);
-+   }
- 
-    XSRETURN(0);
- }
diff --git a/app-misc/golly/golly-2.2-r1.ebuild b/app-misc/golly/golly-2.2-r1.ebuild
deleted file mode 100644
index ab9da586c627..000000000000
--- a/app-misc/golly/golly-2.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.2-r1.ebuild,v 1.1 2011/09/27 22:36:43 xmw Exp $
-
-EAPI=2
-PYTHON_DEPEND=2
-WX_GTK_VER=2.8
-
-inherit eutils python wxwidgets
-
-MY_P=${P}-src
-DESCRIPTION="A simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	#bug 384057
-	epatch "${FILESDIR}"/${P}-perl-5.14.patch
-}
-
-src_configure() {
-	econf \
-		--with-perl-shlib="libperl.so" \
-		--with-python-shlib="$(python_get_library)"
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-misc/golly/golly-2.2.ebuild b/app-misc/golly/golly-2.2.ebuild
deleted file mode 100644
index 84b79faf339b..000000000000
--- a/app-misc/golly/golly-2.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.2.ebuild,v 1.4 2011/09/27 22:36:43 xmw Exp $
-
-EAPI=2
-PYTHON_DEPEND=2
-WX_GTK_VER=2.8
-
-inherit eutils python wxwidgets
-
-MY_P=${P}-src
-DESCRIPTION="A simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="<dev-lang/perl-5.14
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_configure() {
-	econf \
-		--with-perl-shlib="libperl.so" \
-		--with-python-shlib="$(python_get_library)"
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/app-misc/golly/golly-2.3-r1.ebuild b/app-misc/golly/golly-2.3-r1.ebuild
index 230a6130193c..661d3d32ddb9 100644
--- a/app-misc/golly/golly-2.3-r1.ebuild
+++ b/app-misc/golly/golly-2.3-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.3-r1.ebuild,v 1.3 2012/06/08 11:55:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.3-r1.ebuild,v 1.4 2012/06/18 22:38:11 xmw Exp $
 
 EAPI=4
 PYTHON_DEPEND=2
 WX_GTK_VER=2.8
 
-inherit eutils python toolchain-funcs wxwidgets
+inherit python toolchain-funcs wxwidgets
 
 MY_P=${P}-src
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
diff --git a/app-misc/golly/golly-2.3.ebuild b/app-misc/golly/golly-2.4.ebuild
index 37267f936d4d..e29d93864d52 100644
--- a/app-misc/golly/golly-2.3.ebuild
+++ b/app-misc/golly/golly-2.4.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.3.ebuild,v 1.4 2012/02/24 14:41:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.4.ebuild,v 1.1 2012/06/18 22:38:11 xmw Exp $
 
-EAPI=2
+EAPI=4
 PYTHON_DEPEND=2
 WX_GTK_VER=2.8
 
-inherit eutils python wxwidgets
+inherit python toolchain-funcs wxwidgets
 
 MY_P=${P}-src
-DESCRIPTION="A simulator for Conway's Game of Life and other cellular automata"
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
@@ -27,6 +27,11 @@ S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -e 's:-O2::' -i configure Makefile.{am,in} || die
 }
 
 src_configure() {
@@ -36,6 +41,6 @@ src_configure() {
 }
 
 src_install() {
-	emake docdir= DESTDIR="${D}" install || die
-	dodoc README
+	emake docdir= DESTDIR="${D}" install
+	dodoc README TODO
 }