From 474a67cf07e955b3edf49e7956da5f0c89372610 Mon Sep 17 00:00:00 2001 From: Joe Peterson Date: Fri, 7 Nov 2008 17:15:41 +0000 Subject: Add new 3.7.0 beta 29; remove old (Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 i686) --- media-gfx/povray/ChangeLog | 9 +- .../povray/files/povray-3.7.0_beta25-gcc43.patch | 44 --------- media-gfx/povray/povray-3.7.0_beta25-r1.ebuild | 95 ------------------ media-gfx/povray/povray-3.7.0_beta29.ebuild | 110 +++++++++++++++++++++ 4 files changed, 118 insertions(+), 140 deletions(-) delete mode 100644 media-gfx/povray/files/povray-3.7.0_beta25-gcc43.patch delete mode 100644 media-gfx/povray/povray-3.7.0_beta25-r1.ebuild create mode 100644 media-gfx/povray/povray-3.7.0_beta29.ebuild (limited to 'media-gfx/povray') diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog index ad979c055649..2f65b2db4847 100644 --- a/media-gfx/povray/ChangeLog +++ b/media-gfx/povray/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/povray # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.77 2008/11/07 06:40:30 lavajoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.78 2008/11/07 17:15:41 lavajoe Exp $ + +*povray-3.7.0_beta29 (07 Nov 2008) + + 07 Nov 2008; Joe Peterson + -files/povray-3.7.0_beta25-gcc43.patch, -povray-3.7.0_beta25-r1.ebuild, + +povray-3.7.0_beta29.ebuild: + Add new 3.7.0 beta 29; remove old 07 Nov 2008; Joe Peterson -povray-3.7.0_beta25.ebuild: diff --git a/media-gfx/povray/files/povray-3.7.0_beta25-gcc43.patch b/media-gfx/povray/files/povray-3.7.0_beta25-gcc43.patch deleted file mode 100644 index 59e69cb6f42d..000000000000 --- a/media-gfx/povray/files/povray-3.7.0_beta25-gcc43.patch +++ /dev/null @@ -1,44 +0,0 @@ -Povray-3.7.0-beta25b: Fix a few GCC-4.3 related compilation problems: -add a few missing includes - ---- povray-3.7.0.beta.25b/source/base/fileinputoutput.h~ 2008-04-07 11:35:15.305580552 +0200 -+++ povray-3.7.0.beta.25b/source/base/fileinputoutput.h 2008-04-07 11:35:15.305580552 +0200 -@@ -97,6 +97,7 @@ - #include "base/path.h" - - #include -+#include - - namespace pov_base - { ---- povray-3.7.0.beta.25b/source/base/fileinputoutput.cpp~ 2008-04-07 11:34:54.618082366 +0200 -+++ povray-3.7.0.beta.25b/source/base/fileinputoutput.cpp 2008-04-07 11:34:54.618082366 +0200 -@@ -92,6 +92,7 @@ - - #include - #include -+#include - - #include "base/configbase.h" - ---- povray-3.7.0.beta.25b/source/base/textstreambuffer.cpp~ 2008-04-07 11:35:37.272306361 +0200 -+++ povray-3.7.0.beta.25b/source/base/textstreambuffer.cpp 2008-04-07 11:35:37.272306361 +0200 -@@ -91,6 +91,7 @@ - *********************************************************************************/ - - #include -+#include - - #include "configbase.h" - ---- povray-3.7.0.beta.25b/source/base/animation/moov.cpp~ 2008-04-07 13:56:09.833886560 +0200 -+++ povray-3.7.0.beta.25b/source/base/animation/moov.cpp 2008-04-07 13:56:09.833886560 +0200 -@@ -90,6 +90,8 @@ - * - *********************************************************************************/ - -+#include -+ - #include "base/configbase.h" - #include "base/pov_err.h" - #include "base/types.h" diff --git a/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild b/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild deleted file mode 100644 index 80010c189ef9..000000000000 --- a/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2008 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_beta25-r1.ebuild,v 1.3 2008/09/12 05:17:50 lavajoe Exp $ - -inherit eutils autotools flag-o-matic versionator - -MY_PV=$(get_version_component_range 1-3) -MY_MINOR_VER=$(get_version_component_range 4) -if [ -n "$MY_MINOR_VER" ]; then - MY_MINOR_VER=${MY_MINOR_VER/beta/beta.} - MY_PV="${MY_PV}.${MY_MINOR_VER}b" -fi - -DESCRIPTION="The Persistence of Vision Raytracer" -HOMEPAGE="http://www.povray.org/" -SRC_URI="http://www.povray.org/beta/source/${PN}-src-${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.33" - -S="${WORKDIR}/${PN}-${MY_PV}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gcc43.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 - - 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) \ - $(use_with X) \ - || die - - emake || die -} - -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 -} diff --git a/media-gfx/povray/povray-3.7.0_beta29.ebuild b/media-gfx/povray/povray-3.7.0_beta29.ebuild new file mode 100644 index 000000000000..0adc438be3ba --- /dev/null +++ b/media-gfx/povray/povray-3.7.0_beta29.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2008 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_beta29.ebuild,v 1.1 2008/11/07 17:15:41 lavajoe Exp $ + +inherit eutils autotools flag-o-matic versionator + +MY_PV=$(get_version_component_range 1-3) +MY_MINOR_VER=$(get_version_component_range 4) +if [ -n "$MY_MINOR_VER" ]; then + MY_MINOR_VER=${MY_MINOR_VER/beta/beta.} + MY_PV="${MY_PV}.${MY_MINOR_VER}" +fi + +DESCRIPTION="The Persistence of Vision Raytracer" +HOMEPAGE="http://www.povray.org/" +SRC_URI="http://www.povray.org/beta/source/${PN}-src-${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.33" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + #epatch "${FILESDIR}"/${P}-gcc43.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 + + 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) \ + $(use_with X) \ + --disable-strip \ + || die + + emake || die +} + +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." +} -- cgit v1.2.3-65-gdbad