Fix building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

6 files changed, 70 insertions, 96 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/Manifest b/media-gfx/gnofract4d/Manifest
index 8d8e358c8417..46c419fad210 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,8 +1,5 @@
-DIST gnofract4d-3.11.tar.gz 891245 RMD160 b4bd08184bed9f3d74077989efbcb9877ac13e11 SHA1 5e2e90628883f1f6a2b6baff5f26d37b711eab16 SHA256 bfa0116a2a0ca3c1072d349561a85204fe135ce8fca1fa3cc5edecb41bc34a16
+AUX gnofract4d-3.12-libpng14.patch 1314 RMD160 822497ea1a01f954b4244a4ee87f97f32c387227 SHA1 3946dfa193f6fc2b6fd7fa1ccd7adfbbc5cb937b SHA256 762bf37c46f941ccc7201e1910e2fcc366c22acd68717fadc095d07361ec373b
 DIST gnofract4d-3.12.tar.gz 892316 RMD160 5ccd2653af741a7e2cd9ce5f2c04c0d8b9d47ef3 SHA1 381c5fc83d6e1590adb77870cdfa0a6cea191e7a SHA256 f59ec0002bc2345bc04e53fc0b6eb3f47f0d2463dbb17f3172dea256d5a2ca3b
-DIST gnofract4d-3.9.tar.gz 750878 RMD160 2744f649898df2f3b59ff77525e9741af736736a SHA1 400592fed3854edcd7d6e7b6b4ffa35307035586 SHA256 ec38cb330c6cc2665c04fa5e7715cbeae3ee92e19e8c5924575fa3ff830ebd5e
-EBUILD gnofract4d-3.11.ebuild 1030 RMD160 d2e56da287e63f27a124e21f6fc5e2b328c5ec49 SHA1 7de150cf7362c85950df78d2dcea3a55d3148ee7 SHA256 2aac3f1f3a1708a1ec9d460db4ae7fa158f35aa83296356f9cb10a464c9005b9
-EBUILD gnofract4d-3.12.ebuild 1028 RMD160 852cb24de9f3e2c5e00a112b8ccadedd205d77a8 SHA1 692e904b63953e605a5d20e33146a58eecb59a55 SHA256 b26438625dabe469cb8216c2503682b3838aecd61c5d33ce43c43c6540fcb9d2
-EBUILD gnofract4d-3.9.ebuild 1009 RMD160 e81309f674d17433078a35626c951dbec05ddc52 SHA1 6085ed85c1cf3628389be356af148f4c9f6b988d SHA256 0fbac966e68090bc5ebbbf033696ab7589d4cf9a10ee61cbc491468280679040
-MISC ChangeLog 1279 RMD160 e781c119654242ed6ba74bd915a17cd1b67b314b SHA1 74de188419ff61cb11f44e7b20225713062bedcf SHA256 6ac569dc107a6cd0cee689e9009f3b82bae0955f8b1dd7d2b091537e62cb1d93
+EBUILD gnofract4d-3.12.ebuild 1116 RMD160 28fd73aaaa01c7f5bffc219cf7e1066268a913a2 SHA1 0f49836355af6e4e45ef0d1e239812bd39d89d35 SHA256 e925eb11969ac5c26c9a646c23386460b0793e883366b8d2bad26165673fd9d3
+MISC ChangeLog 1431 RMD160 7b289c60f22518048bbf0b313616e6a493a844c7 SHA1 755f70722ad5d7f835f11e7999f92740122737c7 SHA256 f0281a538890038180e337f0d5fcf88b845dc460a622a7511412e92a100d5a8b
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
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
-}