Adding sys-libs/zlib dependency and revbump to fix CXXFLAGS, thanks Agostino Sarubbo (bug 403573)

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

4 files changed, 63 insertions, 12 deletions

diff --git a/app-misc/golly/ChangeLog b/app-misc/golly/ChangeLog
index 8187ab250c4c..4b896bf22ba3 100644
--- a/app-misc/golly/ChangeLog
+++ b/app-misc/golly/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2012/02/14 14:22:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/ChangeLog,v 1.11 2012/02/14 23:42:49 xmw Exp $
+
+*golly-2.3-r1 (14 Feb 2012)
+
+  14 Feb 2012; Michael Weber <xmw@gentoo.org> golly-2.3.ebuild,
+  +golly-2.3-r1.ebuild:
+  Adding sys-libs/zlib dependency and revbump to fix CXXFLAGS, thanks Agostino
+  Sarubbo (bug 403573)
 
   14 Feb 2012; Agostino Sarubbo <ago@gentoo.org> golly-2.3.ebuild:
   Stable for amd64, wrt bug #403411
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 4d0bbe9b9aeb..bf0981d3211d 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX golly-2.2-perl-5.14.patch 3486 RMD160 6002fc3f3e666a4e0fe1c8102e1ae7efd545c766 SHA1 6c979b9996ef2058628a746ba9b7c97df50504d3 SHA256 eb8d02f9eebc10561b08820d63e96ec245445b5454db06f2a2d7b7437cf1ee87
 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
-EBUILD golly-2.3.ebuild 860 RMD160 9f3f1c6b7753f8649e92f661332b05175d44e3b2 SHA1 f6536d02b1bb1743a584dbf2672bb2ef996c4abb SHA256 b93994a368e09b72e9337380c32253ade297c7c21314cb363f2bcac9c7ac7754
-MISC ChangeLog 2091 RMD160 d232cca49e05ec6de7f75a73168a60434cc82762 SHA1 b2d499b837d824aa23e76f91530eda4df956b9dd SHA256 85877dfbf9e2770ec98b6916680b3bca4d0a3c7f0689ea02c03e2dc4359046d7
+EBUILD golly-2.3-r1.ebuild 978 RMD160 63be2ae46479e645bd486c7d026a9d865f74803a SHA1 e1d02f8477652a18b60489abc9e38989b061ca3e SHA256 7eddd6f90a2888909a629ffd1e621b7c712444b80ac839d137fda5076a8cf8c2
+EBUILD golly-2.3.ebuild 875 RMD160 5665e2bb25239057b40d4ba6292ebf30f3826413 SHA1 ff3249339aaa18e49ff99e3247d283c5a62ff7b3 SHA256 3cde5ec98d1f051818817ecc969ce7176d5a8250b4390bde74abb832d5160eb1
+MISC ChangeLog 2311 RMD160 ff834f8dfec28037c492576a0dcfd31499aa1f4d SHA1 a294b7b4ecb26eb06b5a713f865c97be3ccfd91e SHA256 ef931e6299dfe973844be2e737779fcad9260926730186a6e31e5e7f37484780
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPOm4mAAoJEOTDgjZ80txdAcUIAJ2sgVpdSEFFCHhLJfSXr3v0
-+jWmGlqYseFcUjHeo6yKMXctY6oUxf85Qvhd3wgAoQA6N03l/C84gmQqX6XHAsYF
-XPWfvhnRzWsXd/nUeF3pP34LwMJAOAklWVhs/dF9WXQovVh8LuuOGm2ycQXM6m92
-4wP1P8hcVSm34CUt5nVfai7G7UpJzJwDIixnGFvk74H1BttvN84t4LIMaeGbENBv
-A+4rUrRz7A9vTr5YkNPPFgosLto4SBWfosIu90Tyaulpo+PkIJUUUky7OA1bY9gw
-FbbJYnGhdMVRCC6xcql44o0dYZUTqkQ/XqNNIqIEfhuyvHrviuMZtjtHpMMUhMo=
-=iJMb
+iF4EAREIAAYFAk868YAACgkQknrdDGLu8JA0ZQD9H1zLhoMrpOcdYKkIrK/en00k
+Fi1IyO+Zxq0ue/6gn3MA/0En3+iO2PoIoUJbhhLnLUGLDzpz/WE997SKHTyjOCe9
+=jbfR
 -----END PGP SIGNATURE-----
diff --git a/app-misc/golly/golly-2.3-r1.ebuild b/app-misc/golly/golly-2.3-r1.ebuild
new file mode 100644
index 000000000000..fb9aaf6a6d6a
--- /dev/null
+++ b/app-misc/golly/golly-2.3-r1.ebuild
@@ -0,0 +1,46 @@
+# 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.1 2012/02/14 23:42:49 xmw Exp $
+
+EAPI=4
+PYTHON_DEPEND=2
+WX_GTK_VER=2.8
+
+inherit eutils python toolchain-funcs wxwidgets
+
+MY_P=${P}-src
+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"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND="${DEPEND}"
+
+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() {
+	econf \
+		--with-perl-shlib="libperl.so" \
+		--with-python-shlib="$(python_get_library)"
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc README
+}
diff --git a/app-misc/golly/golly-2.3.ebuild b/app-misc/golly/golly-2.3.ebuild
index a8ae11dcf213..645da1c2f822 100644
--- a/app-misc/golly/golly-2.3.ebuild
+++ b/app-misc/golly/golly-2.3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/02/14 14:22:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/golly/golly-2.3.ebuild,v 1.3 2012/02/14 23:42:49 xmw Exp $
 
 EAPI=2
 PYTHON_DEPEND=2
@@ -19,6 +19,7 @@ KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
+	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 RDEPEND="${DEPEND}"