Backport libpng14 patch to stable 3.6.1 release.

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

7 files changed, 33 insertions, 176 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index ea8b955cd40a..d43a67dcc10e 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.99 2010/03/12 08:54:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.100 2010/05/15 16:22:12 ssuominen Exp $
+
+  15 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  povray-3.6.1-r4.ebuild, +files/povray-3.6.1-libpng14.patch:
+  Backport libpng14 patch to stable 3.6.1 release.
 
   12 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   povray-3.7.0_beta32.ebuild, +files/povray-3.7.0_beta32-libpng14.patch:
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 79a2dd5ab075..7da3154bf4c5 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,15 +1,12 @@
 AUX povray-3.6.1-configure.patch 1081 RMD160 92dd3995691d567f6ae24b38bea1f31b9803b5b3 SHA1 c4c9fe03b8e24b8c03ed93abd484cfff3abd8dfc SHA256 a3278c6e43c30daa5a2edb7de3726e57f732f9c387b2d838cb41f3c7f14f773b
 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_beta29-fix-expiration-bug.patch 633 RMD160 e3eba65af69299584659c1a4e3c69b64ebc65f54 SHA1 924d572c6ab51474edf3a0e213b1863a3b927ebf SHA256 1b52f9d992744fcc257567ef4ef0ec9d612997bcf786574ed46ba66f8c69afc1
-AUX povray-3.7.0_beta29-print-extend-expiration-info.patch 1179 RMD160 8dad1af951d062c06a14ffe3b68fc17f1fda4fa7 SHA1 c2d8ca630a3f0b479c7f85728549455059e05ff3 SHA256 3f787d0d96b1d193c70d6a6684f84b31618e25b768dccb0fb114b832da023df9
 AUX povray-3.7.0_beta32-libpng14.patch 688 RMD160 585ab7e81a865fa7eab202018677cbde507dd385 SHA1 5a8aed165da70db515a825bd818fda4ba28aeff1 SHA256 e4665235b97475ab3087c1adce002da32cba2585bf5ccb51cc2d65e1f8fa7be1
 AUX povray-3.7.0_beta32-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.32.tar.bz2 6229739 RMD160 a3e758d628352036fed5bb4ffb31bc773d7b69f1 SHA1 73d8b18bfdaf74b1a60d4faec33b1fcd201388da SHA256 005a8c7d6e4787b18e94c9838f4d181c284fc764723424d18960d0165a3a9278
-DIST povray-src-3.7.0.beta.29.tar.bz2 6202387 RMD160 5073463b1068fc95a31f77da6458286888eccff8 SHA1 4c7a4c22472d3b9a2d88e660a6df6c3b3d497efb SHA256 88655167a4ae0ba97a7e1e19c261d592692bbbdc7f77d287c0b3d084334b45b3
-EBUILD povray-3.6.1-r4.ebuild 2740 RMD160 49947c21b48379364d98711f032a9c949c9e603b SHA1 2e90864be295876c14646c08b79f158956e52e49 SHA256 96176df1d8fcd2fbebe5dc6c9cf22cb4c7e1a848f8142dae20fdd0a8f6352d00
-EBUILD povray-3.7.0_beta29-r2.ebuild 4169 RMD160 0284ef9eea9908d6e6855d2ee02c5148219e5c06 SHA1 67e181824a60a1e16d659daaddb2e2072b931b98 SHA256 2ee618c0ae7dd420df1fcc7254f8332d68bbf99b0c416c71d7454d356c856331
+EBUILD povray-3.6.1-r4.ebuild 2827 RMD160 ac7b2d79211e7c8e5a61619f0d55d5e44955518a SHA1 557564b63c14ee10167d4cad95bab873a70c8e0e SHA256 b1d5733a7c77974680da14b3c905c326e4ea444764d2f6c1d70f4139dc9c0ddd
 EBUILD povray-3.7.0_beta32.ebuild 4313 RMD160 e78056fa8cce2527875344ebc739c5ba67464d1c SHA1 17c0d70dcd2a661b158065137e97ef852487fad7 SHA256 b5404a02ce22a478a7388f412fd78036003d9d5bfb749460fe307bc298035ec2
-MISC ChangeLog 14661 RMD160 229ccd669101782ecf85d0b84a3235eee436e3e0 SHA1 1474061ace2c34684fa1cd3dd1ef33adf3c40272 SHA256 e409006d03868ca0f5bbef64ae064c2fd1561acbc2336518d81d5dadb014e1f5
+MISC ChangeLog 14830 RMD160 522ba1e3901f05be01c4c277d64c52d22a69cf9f SHA1 cc8bf2ae0ae8122e3768117d18d970f167e82088 SHA256 ba89ad5144b0a108d689fdab69c2265f69ab4095a75f43e294a744811178e080
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/media-gfx/povray/files/povray-3.6.1-libpng14.patch b/media-gfx/povray/files/povray-3.6.1-libpng14.patch
new file mode 100644
index 000000000000..250927f183eb
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.6.1-libpng14.patch
@@ -0,0 +1,20 @@
+--- source/png_pov.cpp
++++ source/png_pov.cpp
+@@ -1428,7 +1428,7 @@
+ 		if(r_info_ptr->valid & PNG_INFO_tRNS)
+ 		{
+ 			for (index = 0; index < r_info_ptr->num_trans; index++)
+-				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+ 		}
+ 
+ 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
+@@ -1461,7 +1461,7 @@
+ 		if(r_info_ptr->valid & PNG_INFO_tRNS)
+ 		{
+ 			for (index = 0; index < r_info_ptr->num_trans; index++)
+-				cmap[index].Transmit = 255 - r_info_ptr->trans[index];
++				cmap[index].Transmit = 255 - r_info_ptr->trans_alpha[index];
+ 		}
+ 
+ 		Image->data.map_lines = (unsigned char **)POV_MALLOC(height * sizeof(unsigned char *), "PNG image");
diff --git a/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch b/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch
deleted file mode 100644
index 2da0056750b5..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta29-fix-expiration-bug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vfe/vfe.cpp	2008-09-06 00:14:57.000000000 +0200
-+++ vfe/vfe.cpp	2009-01-16 12:48:13.646808534 +0100
-@@ -747,9 +747,9 @@
- 
-   // this code may not be removed or modified unless the compilation is for personal
-   // use and the binary is not distributed to anyone else.
--  xtime_get(&t, TIME_UTC);
--  if (t.sec > 1230760800)
--    throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application.");
-+  // xtime_get(&t, TIME_UTC);
-+  // if (t.sec > 1230760800)
-+  //   throw POV_EXCEPTION(kCannotHandleRequestErr, "Please obtain an updated version of this application.");
- 
-   state = kStarting;
- 
diff --git a/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch
deleted file mode 100644
index 80a382ad672c..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta29-print-extend-expiration-info.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- vfe/unix/unixconsole.cpp~	2008-10-07 17:06:27.000000000 -0600
-+++ vfe/unix/unixconsole.cpp	2008-11-08 14:11:58.000000000 -0700
-@@ -281,10 +281,21 @@
- 
- 		if (user_code != current_code)
- 		{
--			fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
--				PACKAGE,
--				current_week < 52 ? "has expired" : "is over twelve months old and is no longer usable"
--			);
-+                        if (current_week < 52)
-+                        {
-+				fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
-+					PACKAGE,
-+					"has expired"
-+				);
-+                                fprintf(stderr, "\nTo extend the license period (a week at a time), you can do\nsomething like the following (adjust syntax for your shell):\n\n    export POVRAY_BETA=`povray --betacode 2>&1`\n\n");
-+                        }
-+                        else
-+                        {
-+				fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix %s\n",
-+					PACKAGE,
-+					"is over twelve months old and is no longer usable"
-+				);
-+                        }
- 			exit(RETURN_ERROR);
- 		}
- 		current_time = EXPIRE_AT + (current_week+1)*spw - current_time;
diff --git a/media-gfx/povray/povray-3.6.1-r4.ebuild b/media-gfx/povray/povray-3.6.1-r4.ebuild
index 82e212b8158f..d918cd0db499 100644
--- a/media-gfx/povray/povray-3.6.1-r4.ebuild
+++ b/media-gfx/povray/povray-3.6.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/povray/povray-3.6.1-r4.ebuild,v 1.8 2008/11/15 19:05:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r4.ebuild,v 1.9 2010/05/15 16:22:12 ssuominen Exp $
 
 inherit flag-o-matic eutils autotools
 
@@ -24,6 +24,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	has_version ">=media-libs/libpng-1.4" && epatch \
+		"${FILESDIR}"/${P}-libpng14.patch
+
 	epatch "${FILESDIR}"/${P}-configure.patch
 	epatch "${FILESDIR}"/${P}-find-egrep.patch
 
diff --git a/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild b/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild
deleted file mode 100644
index cfe5f1162917..000000000000
--- a/media-gfx/povray/povray-3.7.0_beta29-r2.ebuild
+++ /dev/null
@@ -1,124 +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/povray/povray-3.7.0_beta29-r2.ebuild,v 1.1 2009/01/16 21:09:50 lavajoe Exp $
-
-inherit eutils autotools flag-o-matic versionator
-
-POVRAY_MAJOR_VER=$(get_version_component_range 1-3)
-POVRAY_MINOR_VER=$(get_version_component_range 4)
-if [ -n "$POVRAY_MINOR_VER" ]; then
-	POVRAY_MINOR_VER=${POVRAY_MINOR_VER/beta/beta.}
-	MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
-else
-	MY_PV=${POVRAY_MAJOR_VER}
-fi
-
-DESCRIPTION="The Persistence of Vision Raytracer"
-HOMEPAGE="http://www.povray.org/"
-SRC_URI="http://www.povray.org/beta/source/${PN}-src-${MY_PV}.tar.bz2"
-
-LICENSE="povlegal-3.6"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="svga tiff X"
-
-DEPEND="media-libs/libpng
-	tiff? ( >=media-libs/tiff-3.6.1 )
-	media-libs/jpeg
-	sys-libs/zlib
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	>=dev-libs/boost-1.33"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Print info on how to extend the expiration date of the beta
-	# if it has expired.
-	epatch "${FILESDIR}"/${P}-print-extend-expiration-info.patch
-	epatch "${FILESDIR}"/${P}-fix-expiration-bug.patch
-
-	# Change some destination directories that cannot be adjusted via configure
-	cp configure.ac configure.ac.orig
-	sed -i -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' configure.ac
-	sed -i -e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' configure.ac
-	sed -i -e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' configure.ac
-
-	cp Makefile.am Makefile.am.orig
-	sed -i -e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" Makefile.am
-	sed -i -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" Makefile.am
-	sed -i -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" Makefile.am
-
-	# The "+p" option on the test command line causes a pause and
-	# prompts the user to interact, so remove it.
-	sed -i -e"s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am
-
-	eautoreconf
-}
-
-src_compile() {
-	# Fixes bug 71255
-	if [[ $(get-flag march) == k6-2 ]]; then
-		filter-flags -fomit-frame-pointer
-	fi
-
-	# The config files are installed correctly (e.g. povray.conf),
-	# but the code compiles using incorrect [default] paths
-	# (based on /usr/local...), so povray will not find the system
-	# config files without the following fix:
-	append-flags -DPOVLIBDIR=\\\"${ROOT}usr/share/${PN}\\\"
-	append-flags -DPOVCONFDIR=\\\"${ROOT}etc/${PN}\\\"
-
-	econf \
-		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
-		$(use_with svga) \
-		$(use_with tiff) \
-		$(use_with X) \
-		--disable-strip \
-		|| die
-
-	emake || die
-}
-
-src_test() {
-	# For the beta releases, we generate a license extension in case needed
-	POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check || die "Test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_preinst() {
-	# Copy the old config files if they are in the old location
-	# but do not yet exist in the new location.
-	# This way, they can be treated by CONFIG_PROTECT as normal.
-	for conf_file in $(ls "${D}/etc/${PN}"); do
-		if [ ! -e "${ROOT}etc/${PN}/${conf_file}" ]; then
-			for version_dir in $(ls "${ROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
-				if [ -e "${ROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
-					mv "${ROOT}etc/${PN}/${version_dir}/${conf_file}" "${ROOT}etc/${PN}"
-					elog "Note: ${conf_file} moved from ${ROOT}etc/povray/${version_dir}/ to ${ROOT}etc/povray/"
-					break
-				fi
-			done
-		fi
-	done
-}
-
-pkg_postinst() {
-	ewarn "POV-Ray betas have expiration dates, but these can be extended for up to"
-	ewarn "a year.  If expired, you will get the following error when running povray:"
-	ewarn
-	ewarn "    povray: this pre-release version of POV-Ray for Unix has expired"
-	ewarn
-	ewarn "To extend the license period (a week at a time), you can do"
-	ewarn "something like the following (adjust syntax for your shell):"
-	ewarn
-	ewarn "    export POVRAY_BETA=\`povray --betacode 2>&1\`"
-	ewarn
-	ewarn "You will need to repeat this each time it expires."
-}