Add new 3.7.0 beta 32

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 165 insertions, 3 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 1f57f88eb8cb..b7add6a0c14c 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/povray
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.97 2009/01/16 21:09:50 lavajoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.98 2009/06/14 17:56:40 lavajoe Exp $
+
+*povray-3.7.0_beta32 (14 Jun 2009)
+
+  14 Jun 2009; Joe Peterson <lavajoe@gentoo.org>
+  +povray-3.7.0_beta32.ebuild,
+  +files/povray-3.7.0_beta32-print-extend-expiration-info.patch:
+  Add new 3.7.0 beta 32
 
 *povray-3.7.0_beta29-r2 (16 Jan 2009)
 
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index ccdbfa4784f4..54f1448b35c1 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -3,9 +3,12 @@ AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4a
 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-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
-MISC ChangeLog 14295 RMD160 559aae31d1d67ab2095004f9f4e80da660ee03e8 SHA1 2e7ce2fd6001a7e791ac4d987ee12a6a3f79e678 SHA256 1cdb1132041f8106484b126a93ab8d4e91cad9a62341db32ecd1f429530c100b
+EBUILD povray-3.7.0_beta32.ebuild 4173 RMD160 ce76525c4c9e506c47e530b33f5bbce7b4692991 SHA1 8331e3bcb58bf445fa102950d24b1096a382931f SHA256 a5e4efe2cad4abdcd93b90d026c1157960304807cb5eefb102e6f4390d616d66
+MISC ChangeLog 14501 RMD160 c518446c3b69e7da421450bf7f36dc8b302d44cb SHA1 7e97485a055b38a84e9644b6bf1e9ecc184e4758 SHA256 9df390bab260cc3d8dae82b9ec212c4d6178dad14db2c96ae0433466b70e3324
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/media-gfx/povray/files/povray-3.7.0_beta32-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0_beta32-print-extend-expiration-info.patch
new file mode 100644
index 000000000000..beb6d9385c34
--- /dev/null
+++ b/media-gfx/povray/files/povray-3.7.0_beta32-print-extend-expiration-info.patch
@@ -0,0 +1,28 @@
+--- 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, you can do something like the following\n(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.7.0_beta32.ebuild b/media-gfx/povray/povray-3.7.0_beta32.ebuild
new file mode 100644
index 000000000000..b31d4380a7ac
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_beta32.ebuild
@@ -0,0 +1,124 @@
+# 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_beta32.ebuild,v 1.1 2009/06/14 17:56:40 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}-${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.36"
+
+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 libtiff) \
+		$(use_with X 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."
+}