Version bump (thanks Maks Verver, bug 395757)

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

4 files changed, 53 insertions, 68 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/Manifest b/app-misc/golly/Manifest
index 39f9477224bc..3564709f94fb 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX golly-2.2-perl-5.14.patch 3486 RMD160 6002fc3f3e666a4e0fe1c8102e1ae7efd545c766 SHA1 6c979b9996ef2058628a746ba9b7c97df50504d3 SHA256 eb8d02f9eebc10561b08820d63e96ec245445b5454db06f2a2d7b7437cf1ee87
-AUX golly-separate-data-directory.patch 2375 RMD160 02283791a7ff63e6b29e284bfc16a739bb71975b SHA1 3fb21d16e5c38aea5ba6e1ef59e140b371e834d6 SHA256 6bb1f21d516a9b9bc48808708b29215f12582236aec729214bcecb02d78b6f79
 DIST golly-2.2-src.tar.gz 2535583 RMD160 81c00b10c7b53b0e0ada89811a51783e9ab0d82b SHA1 decdfed9929ce144eea54e7ecdabaa8cdf528354 SHA256 cf7fbfd3df3c4cefcd7c4cc881011b2128f7255aacb6c79e93b7f10d3640abc2
+DIST golly-2.3-src.tar.gz 2613073 RMD160 471a98f9158d24820535112c940f99f17b808b32 SHA1 6bd8c7afa817bc79a6c64f28f2ea8af526847a0b SHA256 a1bfa412cd008e7286bc3d50decac65583720676b596bfbf5333306273a6218b
 EBUILD golly-2.2-r1.ebuild 939 RMD160 2d2f4ca0a7ec1c7a8752666e63c7c86d776f05e8 SHA1 0d14cb2a8dce8b73e543920fadb5f9913de011f6 SHA256 0047e8fbd46987c4f71106b072211df14c5c63179a24922e820b9c017bc95300
 EBUILD golly-2.2.ebuild 865 RMD160 80f4bbbb7207d33acc0a4bac19f48a974aa27bfa SHA1 0c5455b0738d5f85b429e622e5f2408c94f969e7 SHA256 27fce77dfa01054f9350ee9486617dd00d0c6c93aea049605bed45067ed2e9bc
-MISC ChangeLog 1800 RMD160 6618a44e27b06e387f921eea4e2b7e960ae8782f SHA1 47dbddca957acb091de68c7c25e3608711b813d8 SHA256 44a1d66e551c43efdb6acd51db72ac5aafea77947c4752c4a77605cbfb627186
+EBUILD golly-2.3.ebuild 861 RMD160 f85a55cabe6e4e109280aae72cc416af434766e2 SHA1 b8c6dae6749f8ef8b124efbb1609a5f76b4ad238 SHA256 ac8119d35a64ed4a92f6eb23a30640c0d53e3550275e097c62665c5b12c5e78a
+MISC ChangeLog 1986 RMD160 085d09008b8acebbbedeee38e8fb8863919b6336 SHA1 6d668b1400e833f8baa9afe55d025739adfc55e1 SHA256 0d79a1f74d3cf6552446831d4498088369cf3acc8418fd1ae35f553d6271caec
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6CUAEACgkQknrdDGLu8JDwPgD/ZjpNULeKI7AgYZRvS/TtoxHw
-qjIBE9xS2OOCD0wfeYIBAIRE9qphPK8C97jChln3yX17QxJfP03xVidGsvAh8Nr0
-=HKnh
+iF4EAREIAAYFAk8Xfx0ACgkQknrdDGLu8JCitQD/dKgvQdXlv4GS9jK6pluK1zxR
+yQdoetFQpDjkvYEFVK0BAJU4+rla8h5PK7oakC3TnATNAHh1F3KH+uEmlSzBPC0Q
+=pdLS
 -----END PGP SIGNATURE-----
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
+}