Version bump (thanks Maks Verver, bug 395757)

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 47 insertions, 63 deletions

diff --git a/app-misc/golly/ChangeLog b/app-misc/golly/ChangeLog
index 6c9621f36000..c54e7bb33456 100644
--- a/app-misc/golly/ChangeLog
+++ b/app-misc/golly/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2011/09/27 22:36:43 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/ChangeLog,v 1.9 2012/01/19 02:25:17 xmw Exp $
+
+*golly-2.3 (27 Dec 2011)
+
+  27 Dec 2011; Michael Weber <xmw@gentoo.org> +golly-2.3.ebuild,
+  -files/golly-separate-data-directory.patch:
+  Version bump (thanks Maks Verver, bug 395757)
 
 *golly-2.2-r1 (27 Sep 2011)
 
diff --git a/app-misc/golly/files/golly-separate-data-directory.patch b/app-misc/golly/files/golly-separate-data-directory.patch
deleted file mode 100644
index abbaedf476f7..000000000000
--- a/app-misc/golly/files/golly-separate-data-directory.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- golly-2.1-src.old/wxgolly.cpp	2009-09-07 02:35:55.000000000 +0200
-+++ golly-2.1-src.new/wxgolly.cpp	2010-06-08 17:34:51.000000000 +0200
-@@ -195,42 +195,6 @@
- 
- // -----------------------------------------------------------------------------
- 
--void SetAppDirectory(const char* argv0)
--{
--   #ifdef __WXMSW__
--      // on Windows we need to reset current directory to app directory if user
--      // dropped file from somewhere else onto app to start it up (otherwise we
--      // can't find Help files)
--      wxString appdir = wxStandardPaths::Get().GetDataDir();
--      wxString currdir = wxGetCwd();
--      if ( currdir.CmpNoCase(appdir) != 0 )
--         wxSetWorkingDirectory(appdir);
--      // avoid VC++ warning
--      wxUnusedVar(argv0);
--   #elif defined(__WXMAC__)
--      // wxMac has set current directory to location of .app bundle so no need
--      // to do anything
--   #else // assume Unix
--      // user might have started app from a different directory so find
--      // last "/" in argv0 and change cwd if "/" isn't part of "./" prefix
--      unsigned int pos = strlen(argv0);
--      while (pos > 0) {
--         pos--;
--         if (argv0[pos] == '/') break;
--      }
--      if ( pos > 0 && !(pos == 1 && argv0[0] == '.') ) {
--         char appdir[2048];
--         if (pos < sizeof(appdir)) {
--            strncpy(appdir, argv0, pos);
--            appdir[pos] = 0;
--            wxSetWorkingDirectory(wxString(appdir,wxConvLocal));
--         }
--      }
--   #endif
--}
--
--// -----------------------------------------------------------------------------
--
- void GollyApp::SetFrameIcon(wxFrame* frame)
- {
-    // set frame icon
-@@ -280,13 +244,12 @@
-       wxSystemOptions::SetOption(wxMAC_TEXTCONTROL_USE_MLTE, 1);
-    #endif
- 
--   // get current working directory before calling SetAppDirectory
-+   // get current working directory before changing to data directory
-    wxString initdir = wxFileName::GetCwd();
-    if (initdir.Last() != wxFILE_SEP_PATH) initdir += wxFILE_SEP_PATH;
- 
--   // make sure current working directory contains application otherwise
--   // we can't open Help files
--   SetAppDirectory( wxString(argv[0]).mb_str(wxConvLocal) );
-+   // change to data directory
-+   wxSetWorkingDirectory(wxString("/usr/share/golly", wxConvLocal));
- 
-    // now set global gollydir for use in GetPrefs and elsewhere
-    gollydir = wxFileName::GetCwd();
diff --git a/app-misc/golly/golly-2.3.ebuild b/app-misc/golly/golly-2.3.ebuild
new file mode 100644
index 000000000000..73eca31f36e8
--- /dev/null
+++ b/app-misc/golly/golly-2.3.ebuild
@@ -0,0 +1,40 @@
+# 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.3.ebuild,v 1.1 2012/01/19 02:25:18 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_configure() {
+	econf \
+		--with-perl-shlib="libperl.so" \
+		--with-python-shlib="$(python_get_library)"
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install || die
+	dodoc README
+}