summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Peterson <lavajoe@gentoo.org>2011-01-28 19:01:32 +0000
committerJoe Peterson <lavajoe@gentoo.org>2011-01-28 19:01:32 +0000
commit63b4a328b7eafc1412c7b3c7a217f9100335ae1e (patch)
treec655545a7b4776b68e2d8b9b9cf6f67110f809af /media-gfx/povray
parenteapi=3; cleanup; stable amd64 (diff)
downloadgentoo-2-63b4a328b7eafc1412c7b3c7a217f9100335ae1e.tar.gz
gentoo-2-63b4a328b7eafc1412c7b3c7a217f9100335ae1e.tar.bz2
gentoo-2-63b4a328b7eafc1412c7b3c7a217f9100335ae1e.zip
Add new 3.7.9_rc3; remove old
(Portage version: 2.1.9.34/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/povray')
-rw-r--r--media-gfx/povray/ChangeLog13
-rw-r--r--media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch14
-rw-r--r--media-gfx/povray/files/povray-3.7.0_beta35-libpng14.patch20
-rw-r--r--media-gfx/povray/files/povray-3.7.0_beta35-print-extend-expiration-info.patch28
-rw-r--r--media-gfx/povray/povray-3.6.1-r4.ebuild4
-rw-r--r--media-gfx/povray/povray-3.7.0_beta35.ebuild137
-rw-r--r--media-gfx/povray/povray-3.7.0_rc3.ebuild (renamed from media-gfx/povray/povray-3.7.0_beta38.ebuild)28
7 files changed, 18 insertions, 226 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index fbaffcb3df04..75e299f9fcb0 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,15 @@
# 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.108 2010/12/20 14:24:17 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.109 2011/01/28 19:01:32 lavajoe Exp $
+
+*povray-3.7.0_rc3 (28 Jan 2011)
+
+ 28 Jan 2011; Joe Peterson <lavajoe@gentoo.org> -povray-3.7.0_beta35.ebuild,
+ -povray-3.7.0_beta38.ebuild, +povray-3.7.0_rc3.ebuild,
+ -files/povray-3.7.0_beta35-configure-allow-libpng14.patch,
+ -files/povray-3.7.0_beta35-libpng14.patch,
+ -files/povray-3.7.0_beta35-print-extend-expiration-info.patch:
+ Add new 3.7.9_rc3; remove old
*povray-3.7.0_beta40 (20 Dec 2010)
diff --git a/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch b/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch
deleted file mode 100644
index 363ff8d50d57..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta35-configure-allow-libpng14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- povray-3.7.0.beta.35a/configure.ac.old 2010-05-24 14:57:58.000000000 -0600
-+++ povray-3.7.0.beta.35a/configure.ac 2010-05-24 15:12:20.000000000 -0600
-@@ -361,11 +361,6 @@ else
- fi
- AC_MSG_RESULT([yes])
- AX_CHECK_LIB([png], [$required_libpng_version], [png12 png], [png_get_libpng_ver], [png.h], [png_get_libpng_ver(NULL)], [$with_libpng])
-- ### FIXME: do not allow for 1.4.x
-- AC_MSG_CHECKING([for libpng version < 1.4 (not supported at the moment!)])
-- AX_COMPARE_VERSION([$ax_check_lib_version], [ge], [1.4], [ax_check_lib="bad"], [ax_check_lib="ok"])
-- AC_MSG_RESULT([$ax_check_lib])
-- ###
- if test x"$ax_check_lib" != x"ok"; then
- AC_MSG_ERROR([cannot find a suitable PNG library])
- else
diff --git a/media-gfx/povray/files/povray-3.7.0_beta35-libpng14.patch b/media-gfx/povray/files/povray-3.7.0_beta35-libpng14.patch
deleted file mode 100644
index efc4ca46b10b..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta35-libpng14.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- source/base/image/png.cpp
-+++ source/base/image/png.cpp
-@@ -433,7 +433,7 @@
- entry.alpha = 1.0f ;
- if (has_alpha)
- if (index < r_info_ptr->num_trans)
-- entry.alpha = (float) (r_info_ptr->trans[index]) / 255.0;
-+ entry.alpha = (float) (r_info_ptr->trans_alpha[index]) / 255.0;
- colormap.push_back (entry);
- }
-
-@@ -459,7 +459,7 @@
- entry.alpha = 1.0f ;
- if (r_info_ptr->valid & PNG_INFO_tRNS)
- if (index < r_info_ptr->num_trans)
-- entry.alpha = (float) (r_info_ptr->trans[index]) / 255.0;
-+ entry.alpha = (float) (r_info_ptr->trans_alpha[index]) / 255.0;
- colormap.push_back (entry);
- }
-
diff --git a/media-gfx/povray/files/povray-3.7.0_beta35-print-extend-expiration-info.patch b/media-gfx/povray/files/povray-3.7.0_beta35-print-extend-expiration-info.patch
deleted file mode 100644
index beb6d9385c34..000000000000
--- a/media-gfx/povray/files/povray-3.7.0_beta35-print-extend-expiration-info.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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.6.1-r4.ebuild b/media-gfx/povray/povray-3.6.1-r4.ebuild
index 53e2afc2928a..72768081286b 100644
--- a/media-gfx/povray/povray-3.6.1-r4.ebuild
+++ b/media-gfx/povray/povray-3.6.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r4.ebuild,v 1.11 2010/11/14 14:40:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.6.1-r4.ebuild,v 1.12 2011/01/28 19:01:32 lavajoe Exp $
inherit flag-o-matic eutils autotools
diff --git a/media-gfx/povray/povray-3.7.0_beta35.ebuild b/media-gfx/povray/povray-3.7.0_beta35.ebuild
deleted file mode 100644
index bd88243712b3..000000000000
--- a/media-gfx/povray/povray-3.7.0_beta35.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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_beta35.ebuild,v 1.4 2010/11/14 14:40:52 jlec 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}a"
-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"
-IUSE="tiff X"
-
-DEPEND="media-libs/libpng
- tiff? ( >=media-libs/tiff-3.6.1 )
- media-libs/jpeg
- sys-libs/zlib
- X? ( x11-libs/libXaw )
- >=dev-libs/boost-1.36"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Remove logic disallowing libpng 1.4
- epatch "${FILESDIR}"/${P}-configure-allow-libpng14.patch
-
- # r_info_ptr->trans_alpha might be no-go with libpn12
- has_version ">=media-libs/libpng-1.4" && epatch "${FILESDIR}"/${P}-libpng14.patch
-
- # 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() {
- 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=\\\"${ROOT}usr/share/${PN}\\\"
- append-flags -DPOVCONFDIR=\\\"${ROOT}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_with tiff libtiff) \
- $(use_with X x) \
- --disable-strip
-
- 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."
-}
diff --git a/media-gfx/povray/povray-3.7.0_beta38.ebuild b/media-gfx/povray/povray-3.7.0_rc3.ebuild
index 0db30ac8b70b..42b935c1ab47 100644
--- a/media-gfx/povray/povray-3.7.0_beta38.ebuild
+++ b/media-gfx/povray/povray-3.7.0_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.4 2010/11/14 14:40:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc3.ebuild,v 1.1 2011/01/28 19:01:32 lavajoe Exp $
EAPI="3"
@@ -9,7 +9,7 @@ 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.}
+ POVRAY_MINOR_VER=${POVRAY_MINOR_VER/rc/RC}
MY_PV="${POVRAY_MAJOR_VER}.${POVRAY_MINOR_VER}"
else
MY_PV=${POVRAY_MAJOR_VER}
@@ -25,7 +25,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd
IUSE="debug mkl openexr tiff X"
DEPEND="
- >=dev-libs/boost-1.36
+ >=dev-libs/boost-1.41
media-libs/jpeg
media-libs/libpng
sys-libs/zlib
@@ -40,10 +40,6 @@ 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}"/${P}-print-extend-expiration-info.patch
-
# Change some destination directories that cannot be adjusted via configure
cp configure.ac configure.ac.orig
sed \
@@ -99,7 +95,7 @@ src_configure() {
--disable-strip \
--disable-optimiz \
--disable-optimiz-arch \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+ --with-boost-libdir="${EPREFIX}/usr/$(get_libdir)"
}
src_test() {
@@ -127,17 +123,3 @@ pkg_preinst() {
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."
-}