Version Bump, QA e.g. do respect users choice of FLAGS and skip upstreams, add USE instead of using automagics, #292769, imported prefix support

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

4 files changed, 165 insertions, 1 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index ffe7c750e388..754b24085731 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,14 @@
 # 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.103 2010/06/01 12:58:33 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.104 2010/08/13 10:24:38 jlec Exp $
+
+*povray-3.7.0_beta38 (13 Aug 2010)
+
+  13 Aug 2010; Justin Lecher <jlec@gentoo.org> +povray-3.7.0_beta38.ebuild,
+  +files/povray-3.7.0_beta38-print-extend-expiration-info.patch,
+  metadata.xml:
+  Version Bump, QA e.g. do respect users choice of FLAGS and skip upstreams,
+  add USE instead of using automagics, #292769, imported prefix support
 
   01 Jun 2010; Joe Peterson <lavajoe@gentoo.org> povray-3.7.0_beta35.ebuild:
   Fix bug #322225; remove unused USE svga
diff --git a/media-gfx/povray/files/povray-3.7.0_beta38-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0_beta38-print-extend-expiration-info.patch
new file mode 100644
index 000000000000..022e7a50602c
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0_beta38-print-extend-expiration-info.patch
@@ -0,0 +1,12 @@
+diff --git a/vfe/unix/unixconsole.cpp b/vfe/unix/unixconsole.cpp
+index e2dffb0..94da68f 100644
+--- a/vfe/unix/unixconsole.cpp
++++ b/vfe/unix/unixconsole.cpp
+@@ -259,6 +259,7 @@ void PrintBeta(int argc, char **argv)
+ 	if (current_time > HARD_EXPIRY)
+ 	{
+ 		fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix expired on 1 January 2011\n", PACKAGE);
++		fprintf(stderr, "\nTo extend the license period, you can do something like the following\n(adjust syntax for your shell):\n\n    export POVRAY_BETA=`povray --betacode 2>&1`\n\n");
+ 		exit(RETURN_ERROR);
+ 	}
+ 	fprintf(stderr, "%s: this pre-release version of POV-Ray for Unix expires on 1 January 2011\n", PACKAGE);
diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml
index fa0705095167..f5930037ad52 100644
--- a/media-gfx/povray/metadata.xml
+++ b/media-gfx/povray/metadata.xml
@@ -5,4 +5,7 @@
 <maintainer>
   <email>lavajoe@gentoo.org</email>
 </maintainer>
+<use>
+  <flag name='mkl'>Enable support for Intel Vector Math Library, part of sci-libs/mkl</flag>
+</use>
 </pkgmetadata>
diff --git a/media-gfx/povray/povray-3.7.0_beta38.ebuild b/media-gfx/povray/povray-3.7.0_beta38.ebuild
new file mode 100644
index 000000000000..8b4b035f86fd
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_beta38.ebuild
@@ -0,0 +1,141 @@
+# 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_beta38.ebuild,v 1.1 2010/08/13 10:24:38 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils 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/redirect/www.povray.org/beta/source/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="povlegal-3.6"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug mkl openexr tiff X"
+
+DEPEND="
+	>=dev-libs/boost-1.36
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr )
+	mkl? ( sci-libs/mkl )
+	tiff? ( >=media-libs/tiff-3.6.1 )
+	X? ( media-libs/libsdl )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# Print info on how to extend the expiration date of the beta
+	# if it has expired.
+	epatch "${FILESDIR}"/${P}-print-extend-expiration-info.patch
+
+	# Change some destination directories that cannot be adjusted via configure
+	cp configure.ac configure.ac.orig
+	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
+
+	cp Makefile.am Makefile.am.orig
+	sed \
+		-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
+		-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
+		-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
+		-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-flags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\"
+	append-flags -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) \
+		$(use_with mkl libmkl) \
+		$(use_with tiff libtiff) \
+		$(use_with X libsdl) \
+		$(use_with X x) \
+		--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 || 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 "${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
+}
+
+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."
+}