Version Bump

Package-Manager: portage-2.2.0_alpha9/cvs/Linux x86_64

3 files changed, 155 insertions, 5 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index f83df5fbbd21..fbaffcb3df04 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2010/11/14 14:40:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.108 2010/12/20 14:24:17 jlec Exp $
+
+*povray-3.7.0_beta40 (20 Dec 2010)
+
+  20 Dec 2010; Justin Lecher <jlec@gentoo.org> +povray-3.7.0_beta40.ebuild:
+  Version Bump
 
   14 Nov 2010; Justin Lecher <jlec@gentoo.org> povray-3.6.1-r4.ebuild,
   povray-3.7.0_beta35.ebuild, povray-3.7.0_beta38.ebuild:
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index a74e131a826b..b1398944403f 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -12,15 +12,17 @@ AUX povray-3.7.0_beta38-print-extend-expiration-info.patch 680 RMD160 6fcdbfbd0e
 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
+DIST povray-3.7.0.beta.40.tar.bz2 6537405 RMD160 fe7e0a45841da63e50cdc1af80d489c3eae40ccc SHA1 1dd67b290c6a2c2583eab5d1d253e93344bbf9aa SHA256 ddd8af6089312d0dae8b0c51891e1a89e1f8877ce9ddabac374b1b6abf85deb6
 EBUILD povray-3.6.1-r4.ebuild 2886 RMD160 7e4894d4df32972a06d8ead9471389b007892429 SHA1 5a08380ac7977796b51cb312066639ef3bb90178 SHA256 55cc252be1fcef66028a6fc96248052007f7ffafc5d3fff1414b073d55dd7915
 EBUILD povray-3.7.0_beta35.ebuild 4536 RMD160 dc5dfb8fb546ea501af0918c01d20aae60ec89c3 SHA1 890d5254b49afffe2a65e3eb9b78029e692e7d44 SHA256 03ae50be1eddc6141f1b3c1000d8ba3e81d48263e01957084ecc8a95821b7985
 EBUILD povray-3.7.0_beta38.ebuild 4551 RMD160 941289b518e0e570f3e41bb444f6acd1602f9b79 SHA1 59ec22c03ba6893562af1d00f0685def9c0e9402 SHA256 c0b2ee0ffbcae4df5224a2ec13e139a565c5f0f903a1c528735c48453ffaf0fe
-MISC ChangeLog 16278 RMD160 25938b1509c0cd03680755e6d460736857c92505 SHA1 ae922a8a8416adc8b444a7a44120be8f5c4f4ae7 SHA256 45d166f55b31c7348802fa4172baf978032b6ce4f75fd2c861a2d3aff65d9159
+EBUILD povray-3.7.0_beta40.ebuild 4565 RMD160 4688ae565b5745c590d083103b04f6fbda3fd64c SHA1 0fb2a3bd5881545fbcab952f94a44eac97ba745a SHA256 0c3831040a10777a97886579f29d9e154fff3883af8f271233cff275a1857d15
+MISC ChangeLog 16406 RMD160 6eda24b8b791515319b8e15f898ac14858cdbcf4 SHA1 d206e754af81ac1912fc779fdbaec68d601dd12b SHA256 c06971a4e080e3b64895a605e5b89ef51e89faaa9d207e1ae3588175fc1a74d5
 MISC metadata.xml 329 RMD160 9a8409749fb299cc185ff9a2ca652cfffe77ca2f SHA1 53bbc21317be841681161e836ea09f6340b75109 SHA256 8eafb1373ab7a91c0057026a1e12aa07acdb9830c2b1141140d381a5af4f62df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzf9PkACgkQgAnW8HDreRb+TgCgxi6iEXcPdnjOIUx18vnrKF5R
-hJ8An1s0ajjQZqGo4WDMUXs/eu+s76Rl
-=NZsO
+iEYEARECAAYFAk0PZxcACgkQgAnW8HDreRYD9gCeMvM2i7rsp0j0Dz8lEqsM1J0r
+Wn4AoMGm6SvrSeOxd924XaAHf3ZnFLO2
+=36oI
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/povray/povray-3.7.0_beta40.ebuild b/media-gfx/povray/povray-3.7.0_beta40.ebuild
new file mode 100644
index 000000000000..771c900778fa
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_beta40.ebuild
@@ -0,0 +1,143 @@
+# 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_beta40.ebuild,v 1.1 2010/12/20 14:24:17 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 ~ppc-macos ~x86-macos"
+IUSE="debug mkl openexr tiff X"
+
+DEPEND="
+	>=dev-libs/boost-1.41
+	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 )"
+RDEPEND="${DEPEND}"
+
+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}"/${PN}-3.7.0_beta38-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 \
+		--with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+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."
+}