Backport location changes to 3.6.1; fix up some autoconf stuff

Package-Manager: portage-2.1.4.4

4 files changed, 114 insertions, 19 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index aac5029dab95..ed9804f61173 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -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@gentoo.org> +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@gentoo.org> -povray-3.6.1-r1.ebuild:
   Remove old
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index f971a2748248..53d4f28deaac 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -3,7 +3,8 @@ AUX povray-3.6.1-find-egrep.patch 2463 RMD160 6af6c01daec1a0eb5ae27f65ede5411c4a
 DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
 DIST povray-src-3.7.0.beta.25b.tar.bz2 6890656 RMD160 37e8f6fb33bbc82d2ce6154a8b0c75ae7f5cda8e SHA1 0f55e441c97e88a4a8b148b7e7a328d1189a5ff9 SHA256 ef54965dec05c8063c40eab768f3fb722eb0ed72ae7918afe45d7a6bd553abc8
 EBUILD povray-3.6.1-r2.ebuild 1507 RMD160 a19e644cee988e4fd08a9899488f724bb914f7fa SHA1 c0047a1dbb33e7ced8ba72db84e4ba0cc98eba62 SHA256 18b7040548f990c7df80da07deb14b58413c643b6e42d58425dc9ec70ce6de83
-EBUILD povray-3.7.0_beta25-r1.ebuild 2974 RMD160 539d28605d6434736fe786bf1fc9e02238289bf2 SHA1 266a4b5ffe405efe4de754aa4bf2c36ac9cee91d SHA256 afc7cc02992fdc41246e052d00b2cfa519302e443d527c92d5b3fefd9a2c10a8
+EBUILD povray-3.6.1-r3.ebuild 2495 RMD160 dd9c51c9b8a7c1c827a3c4911aa9fc2a55b11b7f SHA1 304a6c788179a34da842486396a048dcadbca1e5 SHA256 1d2c9730db81901a034c9cf99473a415047da6e6fa413fee4c9b31f350c1618f
+EBUILD povray-3.7.0_beta25-r1.ebuild 2982 RMD160 97b5e662c436edd2d4f6b94ad54e9c5263478346 SHA1 8929d7a44e7febc645182ff3166dc2324f1a9584 SHA256 916b8e1f04f53e3c559cdc69e02a3a2a1f6b1eee2c1e9365f9ba0cb2e0b5b0c6
 EBUILD povray-3.7.0_beta25.ebuild 1685 RMD160 48e1c55dcdf88c49a39b9a09edf68ffb5805be7a SHA1 8f92b1b55f7c0e14933f919ea5b691ada0d558af SHA256 2c8e9d9b23169d741effaafaa77c9c440277a7446993affcd835ccb0aad5f11e
-MISC ChangeLog 10717 RMD160 2f956d2305005637e6bc0f09d09cf49327a87e1a SHA1 83a5c2627357b36d507a7a24034b17dc3e7fea4c SHA256 b68f6a1a6abc798917709417245176788a30c9dd71da99a11ac01c0d6ce434e2
+MISC ChangeLog 10922 RMD160 b2cb3a161da4c001703c6acca21e49c4459e6666 SHA1 810cd7faa9340fb5a733576fbfc82b89d5e08c51 SHA256 ebe142a1d2366e54dcae2758240c3dc166ba32021153cce520326f107551ba12
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/media-gfx/povray/povray-3.6.1-r3.ebuild b/media-gfx/povray/povray-3.6.1-r3.ebuild
new file mode 100644
index 000000000000..146cdae4148c
--- /dev/null
+++ b/media-gfx/povray/povray-3.6.1-r3.ebuild
@@ -0,0 +1,84 @@
+# 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
+}
diff --git a/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild b/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
index 9a8496d7d3fc..88f642bccbb5 100644
--- a/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
@@ -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 @@ DEPEND="media-libs/libpng
 
 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 @@ src_compile() {
 	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) \