Fix bug #321361

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

4 files changed, 27 insertions, 4 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 187fd96c7180..e72544813aac 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/povray
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.101 2010/05/24 14:29:56 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.102 2010/05/24 21:37:39 lavajoe Exp $
+
+  24 May 2010; Joe Peterson <lavajoe@gentoo.org> povray-3.7.0_beta35.ebuild,
+  +files/povray-3.7.0_beta35-configure-allow-libpng14.patch:
+  Fix bug #321361
 
 *povray-3.7.0_beta35 (24 May 2010)
 
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 69031096bb7e..0574784c495d 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -2,11 +2,12 @@ AUX povray-3.6.1-configure.patch 1081 RMD160 92dd3995691d567f6ae24b38bea1f31b980
 AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4af2dbe2 SHA1 19537ff628130a4d2b048529e5a4f9bbfe79840c SHA256 1f56d1223954c1d0ed160b034badcf0878813b0bf984221c8eadce5d7666a46e
 AUX povray-3.6.1-libpng14.patch 776 RMD160 df044db215116ab40a3d957068eaf5a9aecce420 SHA1 619bed7be90e347fa3113299795a2b4efd4ee869 SHA256 30d508b14a68b3eff1b2dbaf180c5b9494629fb0720ae6e1ccb17b04efab93fb
 AUX povray-3.6.1-use-system-libpng.patch 1922 RMD160 dd5481f9ff81f06c596dc0a19386e5ca01f4ad57 SHA1 98333f7701ffd1803adc9b04d5d09beff2f34c27 SHA256 efb0d8345d8409d6c92d024b0b1621bea88f460d73ad9d00b4b670e1ae6b127f
+AUX povray-3.7.0_beta35-configure-allow-libpng14.patch 715 RMD160 2e22ed7e6272e188cd89354c2b3b96c29aff6a3f SHA1 5b2b6b0a047520cf238ef03f3950c1068d4910e0 SHA256 10b9e2c7921c4535c47bfc0e51ad6b11ce80c3410141ede28c17203265097ec8
 AUX povray-3.7.0_beta35-libpng14.patch 688 RMD160 585ab7e81a865fa7eab202018677cbde507dd385 SHA1 5a8aed165da70db515a825bd818fda4ba28aeff1 SHA256 e4665235b97475ab3087c1adce002da32cba2585bf5ccb51cc2d65e1f8fa7be1
 AUX povray-3.7.0_beta35-print-extend-expiration-info.patch 1160 RMD160 a1c662813a18681ccd8143f3fe5a7dde4a7a2582 SHA1 eb459a8c01e48ab3cf88f05827286a82cd3b5feb SHA256 ec323fcbd116b01f08cd7d65d5aea496b9c551b2463b89d1cdface2dd694580d
 DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
 DIST povray-3.7.0.beta.35a.tar.bz2 6327923 RMD160 8dc45ebece731b081ddb7e5280862b40db9f63a3 SHA1 79d2c17d50efea00a509a3020f93668c727aa232 SHA256 4ec857bebf75895dcbc01ad455cd2192c1ccece786691ce9e4f8265c479cfb30
 EBUILD povray-3.6.1-r4.ebuild 2827 RMD160 ac7b2d79211e7c8e5a61619f0d55d5e44955518a SHA1 557564b63c14ee10167d4cad95bab873a70c8e0e SHA256 b1d5733a7c77974680da14b3c905c326e4ea444764d2f6c1d70f4139dc9c0ddd
-EBUILD povray-3.7.0_beta35.ebuild 4336 RMD160 4d318d3d94d82b37b61ac2d9665ea366dd053b76 SHA1 46ed355700ef7a156cd8d225b44393e7bd8b7b4c SHA256 b36074ddf41a04716cf80d5bd19230d855bc08a0bcd1ba5f55cef3bd0e564356
-MISC ChangeLog 15256 RMD160 ff6590c27276a69232b0f52f625f26c321c9dc81 SHA1 a68dadb19ad12fbc5c7aa366e67696ced821821f SHA256 6d617fc45c736e215d5ad6e510fe4e25c0bfc197e795af8fb66313ebc5c441bd
+EBUILD povray-3.7.0_beta35.ebuild 4435 RMD160 f8ae7c3ea1b663cad9a3708854cea278ace5b224 SHA1 82f954fbc33cc2013dd18f94c7d10fecc165f251 SHA256 b168b50bd9152aed922ebe5a1a8ac73c5047546d5c2319af53e89bcf3adac7ae
+MISC ChangeLog 15413 RMD160 278ec22287522b13b62a4389ebd97ec62c017292 SHA1 989694b8d03d775da7b496d8c5bf439ea8985044 SHA256 dde7398c61615a27ed5547b3a5721ecbd6035b7c6375fe8dff1a946690041057
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch b/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch
new file mode 100644
index 000000000000..363ff8d50d57
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch
@@ -0,0 +1,14 @@
+--- povray-3.7.0.beta.35a/configure.ac.old	2010-05-24 14:57:58.000000000 -0600
++++ povray-3.7.0.beta.35a/configure.ac	2010-05-24 15:12:20.000000000 -0600
+@@ -361,11 +361,6 @@ else
+   fi
+   AC_MSG_RESULT([yes])
+   AX_CHECK_LIB([png], [$required_libpng_version], [png12 png], [png_get_libpng_ver], [png.h], [png_get_libpng_ver(NULL)], [$with_libpng])
+-  ### FIXME: do not allow for 1.4.x
+-  AC_MSG_CHECKING([for libpng version < 1.4 (not supported at the moment!)])
+-  AX_COMPARE_VERSION([$ax_check_lib_version], [ge], [1.4], [ax_check_lib="bad"], [ax_check_lib="ok"])
+-  AC_MSG_RESULT([$ax_check_lib])
+-  ###
+   if test x"$ax_check_lib" != x"ok"; then
+     AC_MSG_ERROR([cannot find a suitable PNG library])
+   else
diff --git a/media-gfx/povray/povray-3.7.0_beta35.ebuild b/media-gfx/povray/povray-3.7.0_beta35.ebuild
index 1841e0c5cb91..cbeac763e298 100644
--- a/media-gfx/povray/povray-3.7.0_beta35.ebuild
+++ b/media-gfx/povray/povray-3.7.0_beta35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta35.ebuild,v 1.1 2010/05/24 14:29:56 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta35.ebuild,v 1.2 2010/05/24 21:37:39 lavajoe Exp $
 
 inherit eutils autotools flag-o-matic versionator
 
@@ -35,6 +35,10 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	# Remove logic disallowing libpng 1.4
+	epatch "${FILESDIR}"/${P}-configure-allow-libpng14.patch
+
 	# r_info_ptr->trans_alpha might be no-go with libpn12
 	has_version ">=media-libs/libpng-1.4" && epatch "${FILESDIR}"/${P}-libpng14.patch