public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/povray: povray-3.7.0_beta35.ebuild ChangeLog povray-3.7.0_beta32.ebuild
@ 2010-05-24 14:29 Joe Peterson (lavajoe)
  0 siblings, 0 replies; only message in thread
From: Joe Peterson (lavajoe) @ 2010-05-24 14:29 UTC (permalink / raw
  To: gentoo-commits

lavajoe     10/05/24 14:29:56

  Modified:             ChangeLog
  Added:                povray-3.7.0_beta35.ebuild
  Removed:              povray-3.7.0_beta32.ebuild
  Log:
  Add new beta version 35a; remove old beta (fix bug #320865)
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.101                media-gfx/povray/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/ChangeLog?r1=1.100&r2=1.101

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ChangeLog	15 May 2010 16:22:12 -0000	1.100
+++ ChangeLog	24 May 2010 14:29:56 -0000	1.101
@@ -1,6 +1,16 @@
 # 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.100 2010/05/15 16:22:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.101 2010/05/24 14:29:56 lavajoe Exp $
+
+*povray-3.7.0_beta35 (24 May 2010)
+
+  24 May 2010; Joe Peterson <lavajoe@gentoo.org>
+  -povray-3.7.0_beta32.ebuild, +povray-3.7.0_beta35.ebuild,
+  -files/povray-3.7.0_beta32-libpng14.patch,
+  -files/povray-3.7.0_beta32-print-extend-expiration-info.patch,
+  +files/povray-3.7.0_beta35-libpng14.patch,
+  +files/povray-3.7.0_beta35-print-extend-expiration-info.patch:
+  Add new beta version 35a; remove old beta (fix bug #320865)
 
   15 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   povray-3.6.1-r4.ebuild, +files/povray-3.6.1-libpng14.patch:



1.1                  media-gfx/povray/povray-3.7.0_beta35.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/povray-3.7.0_beta35.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/povray/povray-3.7.0_beta35.ebuild?rev=1.1&content-type=text/plain

Index: povray-3.7.0_beta35.ebuild
===================================================================
# 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.1 2010/05/24 14:29:56 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}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="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}"
	# 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() {
	# 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."
}






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-05-24 14:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-24 14:29 [gentoo-commits] gentoo-x86 commit in media-gfx/povray: povray-3.7.0_beta35.ebuild ChangeLog povray-3.7.0_beta32.ebuild Joe Peterson (lavajoe)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox