[gentoo-commits] gentoo-x86 commit in media-gfx/povray: ChangeLog povray-3.7.0_beta25-r1.ebuild povray-3.6.1-r3.ebuild

[Joe Peterson (lavajoe)]

lavajoe     08/05/28 21:52:46

  Modified:             ChangeLog povray-3.7.0_beta25-r1.ebuild
  Added:                povray-3.6.1-r3.ebuild
  Log:
  Backport location changes to 3.6.1; fix up some autoconf stuff
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.74                 media-gfx/povray/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/ChangeLog?r1=1.73&r2=1.74

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog	10 May 2008 17:22:29 -0000	1.73
+++ ChangeLog	28 May 2008 21:52:46 -0000	1.74
@@ -1,6 +1,12 @@
 # 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.73 2008/05/10 17:22:29 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.74 2008/05/28 21:52:46 lavajoe Exp $
+
+*povray-3.6.1-r3 (28 May 2008)
+
+  28 May 2008; Joe Peterson <lavajoe@g.o> +povray-3.6.1-r3.ebuild,
+  povray-3.7.0_beta25-r1.ebuild:
+  Backport location changes to 3.6.1; fix up some autoconf stuff
 
   10 May 2008; Joe Peterson <lavajoe@g.o> -povray-3.6.1-r1.ebuild:
   Remove old



1.2                  media-gfx/povray/povray-3.7.0_beta25-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild?r1=1.1&r2=1.2

Index: povray-3.7.0_beta25-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- povray-3.7.0_beta25-r1.ebuild	9 May 2008 13:06:07 -0000	1.1
+++ povray-3.7.0_beta25-r1.ebuild	28 May 2008 21:52:46 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.1 2008/05/09 13:06:07 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild,v 1.2 2008/05/28 21:52:46 lavajoe Exp $
 
 inherit eutils autotools flag-o-matic versionator
 
@@ -30,19 +30,9 @@
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-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:
-	MY_MAIN_VER=$(get_version_component_range 1-2)
-	append-flags -DPOVLIBDIR=\\\"${ROOT}usr/share/${PN}\\\"
-	append-flags -DPOVCONFDIR=\\\"${ROOT}etc/${PN}\\\"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
 	# Change some destination directories that cannot be adjusted via configure
 	cp configure.ac configure.ac.orig
@@ -55,10 +45,24 @@
 	sed -i -e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" Makefile.am
 	sed -i -e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" Makefile.am
 
-	autoreconf
+	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="${USER} <${USER}@`uname -n`>" \
+		COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
 		$(use_with svga) \
 		$(use_with tiff) \
 		$(use_with X) \



1.1                  media-gfx/povray/povray-3.6.1-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.6.1-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/povray/povray-3.6.1-r3.ebuild?rev=1.1&content-type=text/plain

Index: povray-3.6.1-r3.ebuild
===================================================================
# 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.6.1-r3.ebuild,v 1.1 2008/05/28 21:52:46 lavajoe Exp $

inherit flag-o-matic eutils autotools

DESCRIPTION="The Persistence Of Vision Ray Tracer"
SRC_URI="ftp://ftp.povray.org/pub/povray/Official/Unix/${P}.tar.bz2"
HOMEPAGE="http://www.povray.org/"

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 )"

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}"/${P}-configure.patch
	epatch "${FILESDIR}"/${P}-find-egrep.patch

	# Change some destination directories that cannot be adjusted via configure
	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

	cd unix
	cp Makefile.am Makefile.am.orig
	sed -i -e 's:^  -DPOVLIBDIR=.*:  -DPOVLIBDIR=\\"@datadir@/'"${PN}"'\\" \\:' Makefile.am
	sed -i -e 's:^  -DPOVCONFDIR=.*:  -DPOVCONFDIR=\\"@sysconfdir@/'"${PN}"'\\" \\:' Makefile.am
	cd ..

	# Use of "automake" below will cause a QA warning,
	# but eautoreconf does not work for this source.
	eaclocal
	eautoconf
	automake
}

src_compile() {
	# Fixes bug 71255
	if [[ $(get-flag march) == k6-2 ]]; then
		filter-flags -fomit-frame-pointer
	fi

	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
}



-- 
gentoo-commits@l.g.o mailing list