media-gfx/povray: Version Bump

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 137 insertions, 5 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 540717fb133b..3ae9ad82f2c4 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/povray
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.137 2012/11/30 09:42:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.138 2012/11/30 10:00:13 jlec Exp $
+
+*povray-3.7.0_rc6 (30 Nov 2012)
+
+  30 Nov 2012; Justin Lecher <jlec@gentoo.org> +povray-3.7.0_rc6.ebuild:
+  Version Bump
 
   30 Nov 2012; Justin Lecher <jlec@gentoo.org> -povray-3.7.0_rc3-r1.ebuild,
   -povray-3.7.0_rc5.ebuild:
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 80bdd5e13432..61ffcd27b35b 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -6,14 +6,16 @@ AUX povray-3.7.0_rc5+boost-1.50.patch 7106 SHA256 d2d661b8e30c0567a19a4f3e6aa12d
 AUX povray-3.7.0_rc5-automagic.patch 580 SHA256 a068411f6203cf2a70971fe45bb9c48b66dd06af2d61c5f2dcf694c3e9a36baa SHA512 0d3ef2865d43d815b26b74cce0c4f36f000b4f0280e170e3614c05c8b503dc784e7a2fc0923d034cb213a58201dd406227fa7bc8cfb7fdc463f3ce6316575437 WHIRLPOOL 36db35c949e85c0189d9265449d0ed76330e448d8017ad8429c47d2ac41e9731c9ff5a4bbdda6c8bc4157d75cbae1d88110a731cd2d147d57aaad2d284033838
 DIST povray-3.7.0.RC3.tar.bz2 11226551 SHA256 246affb3be8ebbd3b0a192da7ee9684295d707143d192d4831e78210c6dbbdcb SHA512 a485881c03c1b91607d7ab69203ccf89e68e6382d460e8ac864dd60ee9a173e19fc727f091a95724dde2b4bfbd0871033380e3da99460ef4025114e873d3f943 WHIRLPOOL 81e28342eee0e14b9a8c0b38d62c7469726f3d7f17d19a662e11b7e54ee09368100f8e91b2fbecd69c6a7c26990371d533614b00d3b895dfbcd1893185951611
 DIST povray-3.7.0.RC5.tar.gz 13175516 SHA256 5ba524ab637666b7220e834399780205889589a7d78d6c54b11a7d71c99b20a9 SHA512 ca00ab877a64fdf88e300d5d4a4682fe3572a16b95236bd113ea6ecd7a4ba5483745485a44db113237ca0fcf3a7b50986e1bdc7174777914e147ae40538321d4 WHIRLPOOL 12cd2732627e05addc4d53d703c4fbf840cc9f8f049e909d103be111038525519406761883234f464c231504d1c597626c18b58ad3c3403444217c317213490a
+DIST povray-3.7.0.RC6.tar.gz 13298421 SHA256 374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3 SHA512 93ff4a648ccd5685f1f8baec7e61a9daf43f536cd3fadf6903e284a9bd4e9e8feae5ca31aa6c67a44a6f5d60fd992154a3b7d843a1041f0bb628d763f532422d WHIRLPOOL 1517c8889d8180afa98a663b793ca4b5e35d532b12f571a2d13f435623e1f43f9b7c767a7845c10ba234da142f9f6e56c63c5ebc0390818537791609e14abaf3
 EBUILD povray-3.7.0_rc3.ebuild 3849 SHA256 7cbd0e3df021418ab6f4118a89c4cb77a547b79e53eddb0a3411d5a13ed90278 SHA512 87070682ec752ae98ae61517d0d8e4666d780296936afc2fa266b195c24f6cd97fd4dace61b7a9047984132e22357176ca9c394a2505de2b0f4b5b97b7ff2d05 WHIRLPOOL 5af88df0a810c605549ca204f1e5dd2e9d916c84a73680cfca6d1a66442e207d51f7bc402dede50ab63ba91c7fe0137cf10578244ae49de49a786d75e037954a
 EBUILD povray-3.7.0_rc5-r1.ebuild 3979 SHA256 e68aedfbf80aa1974eddc5c83cf07a00a4145c869e1070a9391c0f02938f9759 SHA512 c7e72a8a04d178d44c06898f3241db290d3f6f72f48b4ef1dfa31634b0ef634c53ba804b5fb0781c7cc0b078033dc470564c999a5ef860664a9baebdacf1f2b7 WHIRLPOOL 0227364b78218a937dba7e0f09d277feaafe4dd9cb107ccc1750788d5103fa567908f5f9f054ebc977ef921bce35e37b15d8f11aacf146fc80235e0688579c75
-MISC ChangeLog 20993 SHA256 3150028b64b6dbf3f7353af1d847b4942003c09c898de9f746294c2beea0149c SHA512 36b053571bde71f5e3ef5191a5a071eaf497e94c0bfc95e26ae9f7f4f898d1f494e812882c2987dedcaf42442ae91e581965322be38ddb8d9472fab5245f8d07 WHIRLPOOL 060cec008f69633434d31752a38926119361f6c61fee6264f86e3c0d00526575ecee86211ea67c5851cb81af2059b59f725b05dd8bb40dae3807d5fb841afc9c
+EBUILD povray-3.7.0_rc6.ebuild 3998 SHA256 c1f39c39ff36c25595569399ac98779ba4d66bb547f6b99f84bc6ba2752f2b57 SHA512 06c769ea8c34a936ec348a84b53341dc21325581f66044019a34f45219a77a7a66e6b26c8193462e8e350a767368f50aa3e3cf48fe03511f9b52bc1bbc2fe89f WHIRLPOOL 77d19f35a7d38a093ed3733c9484264e31c960bd3ed6fd3de89197dd4f363d9f67b7f5d95005f3de0e7f855dd6f82de5d064fb364f47ded1702b24699271ece1
+MISC ChangeLog 21115 SHA256 bdb84fc14a0e28d7cc94370476060263d617f10232bf47f7a701a772f5ac212d SHA512 1903d8d2a6d3fad8a93b9d73c2ef2091565464950533dbf1f6ea767aed1eb5697b68736ef24d5a461567298b56c5889717579e207278f282f9c11f08a0a4dec3 WHIRLPOOL 5f5c0ad7797eebb94054f38f143cd3176307e87e0ce71b507a1964476bdf1732dbdcaf6bef93fb0dad1a14848998646b06e3856e9919e6fece5cf74d068455f4
 MISC metadata.xml 308 SHA256 4423f3c3195da71fa4a0afb30ad179510a356dee631ae6c80dc5487ffc680ed9 SHA512 5856b4f91658118a21bb2d4bf6fc63673357cb86f74451ef159304c1ea1fcd6671f0d998936e11bed2adf53d7790bff34f28a2c910cabb89ea7bfa14582c334c WHIRLPOOL 1e51de8e95ae7e1acc1135da083c36de40cc2fdaa3c371d4c7fca061ac9cda9d7ff10fe393ecce201dcd7f64a3a88d92c3cb3f1e02693323898df2881bb4705c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlC4f3sACgkQgAnW8HDreRapZACffNxzHnKuhnn0xw39XOi7IyOC
-ojsAnAwNxnnGsUt7hwrdlz3jmSSAb+kh
-=Yy40
+iEYEAREKAAYFAlC4g64ACgkQgAnW8HDreRamRwCfTNp5uqoHg/hbh+6wOTggg/FT
+g0AAoJfUNOUglT3YhtBOFeNlv9LW2gXi
+=WeCN
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/povray/povray-3.7.0_rc6.ebuild b/media-gfx/povray/povray-3.7.0_rc6.ebuild
new file mode 100644
index 000000000000..86c0c4c9b6da
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_rc6.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2012 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_rc6.ebuild,v 1.1 2012/11/30 10:00:13 jlec Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic versionator multilib
+
+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/rc/RC}
+	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/redirect/www.povray.org/beta/source/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="povlegal-3.6"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug mkl openexr tiff X"
+
+DEPEND="
+	>=dev-libs/boost-1.50.0[threads(+)]
+	media-libs/libpng:0
+	sys-libs/zlib
+	virtual/jpeg
+	mkl? ( sci-libs/mkl )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr )
+	tiff? ( media-libs/tiff:0 )
+	X? ( media-libs/libsdl )"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	sys-devel/boost-m4"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/3.7.0_rc3-user-conf.patch \
+		"${FILESDIR}"/${PN}-3.7.0_rc5+boost-1.50.patch \
+		"${FILESDIR}"/${PN}-3.7.0_rc5-automagic.patch
+
+	# Change some destination directories that cannot be adjusted via configure
+	sed \
+		-e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \
+		-e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \
+		-e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \
+		-i configure.ac || die
+
+	sed \
+		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
+		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
+		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
+		-e 's:mkdir_p:MKDIR_P:g' \
+		-i Makefile.am || die
+
+	# 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 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local non_redist_conf
+
+	# 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-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\"
+
+	if ! use tiff ; then
+		non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
+	else
+		non_redist_conf=""
+	fi
+
+	econf \
+		${non_redist_conf} \
+		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
+		$(use_enable debug) \
+		$(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)") \
+		$(use_with mkl libmkl "${EPREFIX}/usr/$(get_libdir)") \
+		$(use_with tiff libtiff "${EPREFIX}/usr/$(get_libdir)") \
+		$(use_with X libsdl "${EPREFIX}/usr/$(get_libdir)") \
+		$(use_with X x "${EPREFIX}/usr/$(get_libdir)") \
+		--disable-strip \
+		--disable-optimiz \
+		--disable-optimiz-arch
+}
+
+src_test() {
+	# For the beta releases, we generate a license extension in case needed
+	POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check
+}
+
+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 "${ED}/etc/${PN}"); do
+		if [ ! -e "${EROOT}etc/${PN}/${conf_file}" ]; then
+			for version_dir in $(ls "${EROOT}etc/${PN}" | grep "^[0-9]" | sort -rn); do
+				if [ -e "${EROOT}etc/${PN}/${version_dir}/${conf_file}" ]; then
+					mv "${EROOT}etc/${PN}/${version_dir}/${conf_file}" "${EROOT}etc/${PN}"
+					elog "Note: ${conf_file} moved from ${EROOT}etc/povray/${version_dir}/ to ${EROOT}etc/povray/"
+					break
+				fi
+			done
+		fi
+	done
+}