Remove old versons, add dep on <perl-5.14 and revbump for perl-5.14 patch by Maks Verver (bug 384057)

(Portage version: 2.1.10.11/cvs/Linux x86_64)

9 files changed, 171 insertions, 219 deletions

diff --git a/app-misc/golly/ChangeLog b/app-misc/golly/ChangeLog
index eb4d1db0d427..6c9621f36000 100644
--- a/app-misc/golly/ChangeLog
+++ b/app-misc/golly/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/golly
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/ChangeLog,v 1.7 2011/03/22 12:29:00 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/ChangeLog,v 1.8 2011/09/27 22:36:43 xmw Exp $
+
+*golly-2.2-r1 (27 Sep 2011)
+
+  27 Sep 2011; Michael Weber <xmw@gentoo.org> -golly-2.1.ebuild,
+  -golly-2.1-r1.ebuild, -files/golly-2.1-as-needed.patch,
+  -files/golly-2.1-perl-ldopts.patch, -files/golly-2.1-python-amd64.patch,
+  golly-2.2.ebuild, +golly-2.2-r1.ebuild, +files/golly-2.2-perl-5.14.patch:
+  Remove old versons, add dep on <perl-5.14 and revbump for perl-5.14 patch by
+  Maks Verver (bug 384057)
 
   22 Mar 2011; Thomas Kahle <tomka@gentoo.org> golly-2.2.ebuild:
   x86 stable per bug 357447
diff --git a/app-misc/golly/files/golly-2.1-as-needed.patch b/app-misc/golly/files/golly-2.1-as-needed.patch
deleted file mode 100644
index f65df4a5925c..000000000000
--- a/app-misc/golly/files/golly-2.1-as-needed.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/makefile-gtk b/makefile-gtk
-index 56b31d0..a09aad4 100644
---- a/makefile-gtk
-+++ b/makefile-gtk
-@@ -21,7 +21,7 @@ BINFILES = golly bgolly RuleTableToTree
- CXXC = g++
- CXXFLAGS = `wx-config --cxxflags` -O5 -DZLIB -DVERSION=$(VERSION) \
-    -Wall -Wno-non-virtual-dtor -fno-strict-aliasing
--LDFLAGS = `wx-config --libs` -lz
-+LIBS = `wx-config --libs` -lz
- 
- # for Perl script support
- PERL_INCLUDE = `perl -MExtUtils::Embed -e ccopts`
-@@ -72,13 +72,13 @@ clean:
- 	rm -f golly bgolly RuleTableToTree
- 
- golly: $(BASEOBJ) $(WXOBJ)
--	$(CXXC) $(CXXFLAGS) -o golly $(BASEOBJ) $(WXOBJ) $(LDFLAGS) $(PYTHON_LINK) $(PERL_LINK)
-+	$(CXXC) $(CXXFLAGS) $(LDFLAGS) -o golly $(BASEOBJ) $(WXOBJ) $(LIBS) $(PYTHON_LINK) $(PERL_LINK)
- 
- bgolly: $(BASEOBJ) $(OBJDIR)/bgolly.o
--	$(CXXC) $(CXXFLAGS) -o bgolly $(BASEOBJ) $(OBJDIR)/bgolly.o $(LDFLAGS)
-+	$(CXXC) $(CXXFLAGS) $(LDFLAGS) -o bgolly $(BASEOBJ) $(OBJDIR)/bgolly.o $(LIBS)
- 
- RuleTableToTree: $(BASEOBJ) $(OBJDIR)/RuleTableToTree.o
--	$(CXXC) $(CXXFLAGS) -o RuleTableToTree $(BASEOBJ) $(OBJDIR)/RuleTableToTree.o $(LDFLAGS)
-+	$(CXXC) $(CXXFLAGS) $(LDFLAGS) -o RuleTableToTree $(BASEOBJ) $(OBJDIR)/RuleTableToTree.o $(LIBS)
- 
- $(OBJDIR)/bgolly.o: bgolly.cpp
- 	$(CXXC) $(CXXFLAGS) -c -o $@ bgolly.cpp
diff --git a/app-misc/golly/files/golly-2.1-perl-ldopts.patch b/app-misc/golly/files/golly-2.1-perl-ldopts.patch
deleted file mode 100644
index a98178f8f2d1..000000000000
--- a/app-misc/golly/files/golly-2.1-perl-ldopts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- golly-2.1-src.old/makefile-gtk	2009-09-07 02:33:06.000000000 +0200
-+++ golly-2.1-src.new/makefile-gtk	2010-06-08 17:32:21.000000000 +0200
-@@ -29,7 +29,7 @@
- # than 5.10 (this is necessary because boot_DynaLoader is in DynaLoader.a);
- # if using 5.10 or later we can dynamically load the Perl library because
- # it contains the boot_DynaLoader code
--PERL_LINK = `perl -MExtUtils::Embed -e '$$]<5.010 && ldopts'`
-+PERL_LINK = `perl -MExtUtils::Embed -e 'ldopts'`
- 
- # for Python script support
- PYTHON_INCLUDE = -I`python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"`
diff --git a/app-misc/golly/files/golly-2.1-python-amd64.patch b/app-misc/golly/files/golly-2.1-python-amd64.patch
deleted file mode 100644
index 9c43d53d8372..000000000000
--- a/app-misc/golly/files/golly-2.1-python-amd64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- wxpython.cpp	2009/09/04 00:36:39	1.70
-+++ wxpython.cpp	2009/10/04 23:03:13	1.71
-@@ -106,7 +106,11 @@
- {
-    // startup/shutdown
-    void(*G_Py_Initialize)(void) = NULL;
-+#ifdef __LP64__
-+   PyObject*(*G_Py_InitModule4_64)(char*, struct PyMethodDef*, char*, PyObject*, int) = NULL;
-+#else
-    PyObject*(*G_Py_InitModule4)(char*, struct PyMethodDef*, char*, PyObject*, int) = NULL;
-+#endif
-    void(*G_Py_Finalize)(void) = NULL;
- 
-    // errors
-@@ -145,7 +149,11 @@
- 
- // redefine the Py* functions to their equivalent G_* wrappers
- #define Py_Initialize         G_Py_Initialize
--#define Py_InitModule4        G_Py_InitModule4
-+#ifdef __LP64__
-+   #define Py_InitModule4_64  G_Py_InitModule4_64
-+#else
-+   #define Py_InitModule4     G_Py_InitModule4
-+#endif
- #define Py_Finalize           G_Py_Finalize
- #define PyErr_Occurred        G_PyErr_Occurred
- #define PyErr_SetString       G_PyErr_SetString
-@@ -185,7 +193,11 @@
- } pythonFuncs[] =
- {
-    PYTHON_FUNC(Py_Initialize)
-+#ifdef __LP64__
-+   PYTHON_FUNC(Py_InitModule4_64)
-+#else
-    PYTHON_FUNC(Py_InitModule4)
-+#endif
-    PYTHON_FUNC(Py_Finalize)
-    PYTHON_FUNC(PyErr_Occurred)
-    PYTHON_FUNC(PyErr_SetString)
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
new file mode 100644
index 000000000000..10c983025c9d
--- /dev/null
+++ b/app-misc/golly/files/golly-2.2-perl-5.14.patch
@@ -0,0 +1,114 @@
+--- 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.1-r1.ebuild b/app-misc/golly/golly-2.1-r1.ebuild
deleted file mode 100644
index f84bf96c1bbd..000000000000
--- a/app-misc/golly/golly-2.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.1-r1.ebuild,v 1.3 2010/11/01 15:33:12 fauli Exp $
-
-EAPI=2
-PYTHON_DEPEND=2
-WX_GTK_VER=2.8
-
-inherit eutils python wxwidgets toolchain-funcs
-
-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[ithreads]
-	|| ( <=x11-libs/wxGTK-2.8.10.1-r5:2.8[X] >=x11-libs/wxGTK-2.8.11.0:2.8[X,tiff] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Fix linker flags to work with Perl 5.10.1 (fixed in CVS)
-	epatch "${FILESDIR}"/${P}-perl-ldopts.patch
-
-	# Fix Python symbol names on AMD64 (fixed in CVS)
-	epatch "${FILESDIR}"/${P}-python-amd64.patch
-
-	# Fix installing data files into a different directory than binaries:
-	epatch "${FILESDIR}"/${PN}-separate-data-directory.patch
-
-	# We need this for correct linking
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	# Get rid of .DS_Store and other stuff that should not be installed:
-	find -type f -name '.*' -exec rm -f {} + || die
-	find Scripts/Python -name '*.pyc' -exec rm -f {} + || die
-
-	# Fix Python library path:
-	sed -i -e "s|libpython2.5.so|$(python_get_library)|" wxprefs.cpp || die
-
-	# Insert user-specified compiler flags into Makefile:
-	sed -i -e "/^CXXFLAGS = /s/-O5/${CXXFLAGS}/" makefile-gtk || die
-}
-
-src_compile() {
-	emake \
-		CXXC="$(tc-getCXX)" \
-		-f makefile-gtk || die
-}
-
-src_install() {
-	dobin golly bgolly RuleTableToTree || die
-
-	insinto /usr/share/${PN}
-	doins -r Help Patterns Scripts Rules || die
-
-	dodoc README || die
-}
diff --git a/app-misc/golly/golly-2.1.ebuild b/app-misc/golly/golly-2.1.ebuild
deleted file mode 100644
index 2f170be0b21d..000000000000
--- a/app-misc/golly/golly-2.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.1.ebuild,v 1.1 2010/09/16 15:53:09 xmw Exp $
-
-EAPI=2
-PYTHON_DEPEND=2
-WX_GTK_VER=2.8
-
-inherit eutils python wxwidgets toolchain-funcs
-
-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-2.8.10.1-r5:2.8[X] >=x11-libs/wxGTK-2.8.11.0:2.8[X,tiff] )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Fix linker flags to work with Perl 5.10.1 (fixed in CVS)
-	epatch "${FILESDIR}"/${P}-perl-ldopts.patch
-
-	# Fix Python symbol names on AMD64 (fixed in CVS)
-	epatch "${FILESDIR}"/${P}-python-amd64.patch
-
-	# Fix installing data files into a different directory than binaries:
-	epatch "${FILESDIR}"/${PN}-separate-data-directory.patch
-
-	# We need this for correct linking
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	# Get rid of .DS_Store and other stuff that should not be installed:
-	find -type f -name '.*' -exec rm -f {} + || die
-	find Scripts/Python -name '*.pyc' -exec rm -f {} + || die
-
-	# Fix Python library path:
-	sed -i -e "s|libpython2.5.so|$(python_get_library)|" wxprefs.cpp || die
-
-	# Insert user-specified compiler flags into Makefile:
-	sed -i -e "/^CXXFLAGS = /s/-O5/${CXXFLAGS}/" makefile-gtk || die
-}
-
-src_compile() {
-	emake \
-		CXXC="$(tc-getCXX)" \
-		-f makefile-gtk || die
-}
-
-src_install() {
-	dobin golly bgolly RuleTableToTree || die
-
-	insinto /usr/share/${PN}
-	doins -r Help Patterns Scripts Rules || die
-
-	dodoc README || die
-}
diff --git a/app-misc/golly/golly-2.2-r1.ebuild b/app-misc/golly/golly-2.2-r1.ebuild
new file mode 100644
index 000000000000..ab9da586c627
--- /dev/null
+++ b/app-misc/golly/golly-2.2-r1.ebuild
@@ -0,0 +1,45 @@
+# 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
index 434f26c4c41a..84b79faf339b 100644
--- a/app-misc/golly/golly-2.2.ebuild
+++ b/app-misc/golly/golly-2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2011/03/22 12:29:00 tomka Exp $
+# $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
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-lang/perl
+DEPEND="<dev-lang/perl-5.14
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 RDEPEND="${DEPEND}"