Fix building with libpng14.

(Portage version: 2.2_rc66/cvs/Linux x86_64)

5 files changed, 67 insertions, 90 deletions

diff --git a/media-gfx/gnofract4d/ChangeLog b/media-gfx/gnofract4d/ChangeLog
index c991a955ef86..d7d91556f843 100644
--- a/media-gfx/gnofract4d/ChangeLog
+++ b/media-gfx/gnofract4d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gnofract4d
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnofract4d/ChangeLog,v 1.7 2009/09/03 14:10:50 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnofract4d/ChangeLog,v 1.8 2010/03/10 14:38:31 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gnofract4d-3.12.ebuild, +files/gnofract4d-3.12-libpng14.patch:
+  Fix building with libpng14.
 
 *gnofract4d-3.12 (03 Sep 2009)
 
diff --git a/media-gfx/gnofract4d/files/gnofract4d-3.12-libpng14.patch b/media-gfx/gnofract4d/files/gnofract4d-3.12-libpng14.patch
new file mode 100644
index 000000000000..f509fad57869
--- /dev/null
+++ b/media-gfx/gnofract4d/files/gnofract4d-3.12-libpng14.patch
@@ -0,0 +1,47 @@
+--- fract4d/c/imageIO.cpp
++++ fract4d/c/imageIO.cpp
+@@ -119,7 +119,7 @@
+ 	info_ptr = png_create_info_struct(png_ptr);
+ 	if(NULL == info_ptr)
+ 	{
+-	    png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++	    png_destroy_write_struct(&png_ptr, NULL);
+ 	    return;
+ 	}
+ 
+@@ -312,7 +312,7 @@
+ 	info_ptr = png_create_info_struct(png_ptr);
+ 	if (info_ptr == NULL)
+ 	{
+-	    png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++	    png_destroy_read_struct(&png_ptr, NULL, NULL);
+ 	    return;
+ 	}
+ 
+@@ -325,7 +325,7 @@
+ 	//printf("shutdown\n");
+ 	if(ok)
+ 	{
+-	    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	}
+     }
+ 
+@@ -351,7 +351,7 @@
+     
+     //printf("get IHDR\n");
+     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+-		 &interlace_type, int_p_NULL, int_p_NULL);
++		 &interlace_type, (int *) NULL, (int *) NULL);
+ 
+     //printf("set res(%d,%d)\n",width,height);
+     if(!im->set_resolution(width, height, -1, -1))
+@@ -372,7 +372,7 @@
+ 	for (int y = 0; y < im->Yres(); y++)
+ 	{
+ 	    png_bytep row = (png_bytep)(im->getBuffer() + im->row_length() * y); 
+-	    png_read_rows(png_ptr, &row, png_bytepp_NULL, 1);
++	    png_read_rows(png_ptr, &row, NULL, 1);
+ 	}
+     }
+     return true;
diff --git a/media-gfx/gnofract4d/gnofract4d-3.11.ebuild b/media-gfx/gnofract4d/gnofract4d-3.11.ebuild
deleted file mode 100644
index a5bbcabb1d0c..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnofract4d/gnofract4d-3.11.ebuild,v 1.1 2009/05/10 17:51:55 ssuominen Exp $
-
-EAPI=1
-inherit distutils fdo-mime multilib python
-
-DESCRIPTION="a program for drawing beautiful mathematically-based images known as fractals."
-HOMEPAGE="http://gnofract4d.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	media-libs/libpng
-	media-libs/jpeg
-	>=dev-python/pygtk-2
-	>=gnome-base/gconf-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	distutils_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/fract*
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-3.12.ebuild b/media-gfx/gnofract4d/gnofract4d-3.12.ebuild
index b5c9cb7068da..27f2c547c3a8 100644
--- a/media-gfx/gnofract4d/gnofract4d-3.12.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-3.12.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnofract4d/gnofract4d-3.12.ebuild,v 1.1 2009/09/03 14:10:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnofract4d/gnofract4d-3.12.ebuild,v 1.2 2010/03/10 14:38:31 ssuominen Exp $
 
-EAPI=1
-inherit distutils fdo-mime multilib python
+EAPI=2
+
+PYTHON_DEPEND="2:2.6"
+
+inherit distutils eutils fdo-mime
 
 DESCRIPTION="a program for drawing beautiful mathematically-based images known as fractals."
 HOMEPAGE="http://gnofract4d.sourceforge.net"
@@ -22,20 +25,24 @@ RDEPEND=">=x11-libs/gtk+-2:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+	distutils_src_prepare
+}
+
 src_install() {
 	distutils_src_install
 	rm -rf "${D}"/usr/share/doc/${PN}
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/fract*
+	python_mod_optimize $(python_get_sitedir)/fract*
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/fract*
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
diff --git a/media-gfx/gnofract4d/gnofract4d-3.9.ebuild b/media-gfx/gnofract4d/gnofract4d-3.9.ebuild
deleted file mode 100644
index 8db5c1bfba04..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnofract4d/gnofract4d-3.9.ebuild,v 1.1 2008/08/25 16:50:57 maekke Exp $
-
-inherit distutils fdo-mime multilib python
-
-DESCRIPTION="a program for drawing beautiful mathematically-based images known as fractals."
-HOMEPAGE="http://gnofract4d.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	media-libs/libpng
-	media-libs/jpeg
-	dev-python/pygtk
-	gnome-base/gconf"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	distutils_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/fract*
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}