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

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

5 files changed, 180 insertions, 3 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/Manifest b/media-gfx/povray/Manifest
index 9a11634ad0ab..47522f708b7c 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -5,9 +8,19 @@ AUX povray-3.6.1-use-system-libpng.patch 1922 RMD160 dd5481f9ff81f06c596dc0a1938
 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
+AUX povray-3.7.0_beta38-print-extend-expiration-info.patch 680 RMD160 6fcdbfbd0e183e22661cfcd7d5989f93fa6f5120 SHA1 9a144c9db4785298a1f05712ef46e8379ca934d5 SHA256 8cb6125164b886e567fab1b0672ae406edf74a5193667d0642967d00e0b1b2bd
 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
+DIST povray-3.7.0.beta.38.tar.bz2 6349534 RMD160 07f810d5a3e6a84caa14b7a0b56700c99d368d86 SHA1 0fe85371b17ca2c6242c2ad8bdc4ef8baaa42fd5 SHA256 3ffa272cd9e99efe9c12f5da0df00a8728b5d85a604b767f52d312903cfd0899
 EBUILD povray-3.6.1-r4.ebuild 2827 RMD160 ac7b2d79211e7c8e5a61619f0d55d5e44955518a SHA1 557564b63c14ee10167d4cad95bab873a70c8e0e SHA256 b1d5733a7c77974680da14b3c905c326e4ea444764d2f6c1d70f4139dc9c0ddd
 EBUILD povray-3.7.0_beta35.ebuild 4530 RMD160 d930855f7ea5e02e7c2b9ae0f8376cc2a4e092d4 SHA1 f22ba0a954e25c6c10a00281dcc51ed9242cb288 SHA256 5768b473ff895c47334c410e1fc8dd63ce62c45ad4a9cdabad4905e252ce758f
-MISC ChangeLog 15533 RMD160 ea8fb52ab2f6848b9cbed5319ce72182ac7a8708 SHA1 c71c094b45edb749aaffe841a5d4060f4b24d0e7 SHA256 313fd605c6a33a07ff6719e97d3bf7df90b4c6ee8857fc5db6bd26aae586cb82
-MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
+EBUILD povray-3.7.0_beta38.ebuild 4454 RMD160 80439062e5abfa2fbc500f708329b8ba77442b86 SHA1 27c8e9504f4112082b26cf0d2fcd1fdd26073f22 SHA256 cae029aa4f78fbfc6edcff1f8f8f730a6eff351153e0f78e2fbe711139c75915
+MISC ChangeLog 15873 RMD160 39bf11cd456fcf77bad9fe1059704a188fea205e SHA1 e2facc27be6b1a372555d6ac35ac298d806d37e9 SHA256 15b4b4730d894a88bce60165b0fc795274686bb9ea5fd243aaa7073fe3854c87
+MISC metadata.xml 329 RMD160 9a8409749fb299cc185ff9a2ca652cfffe77ca2f SHA1 53bbc21317be841681161e836ea09f6340b75109 SHA256 8eafb1373ab7a91c0057026a1e12aa07acdb9830c2b1141140d381a5af4f62df
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxlHWwACgkQgAnW8HDreRY5qQCgs5l7Q1ws3X5EuoUTDHfiJf0p
+LW8An1adFwJGilZdIMReLrmt5DGCP1Ks
+=8Zi2
+-----END PGP SIGNATURE-----
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."
+}