Adjust locations of /usr/share files, docs, and config files

Package-Manager: portage-2.1.4.4

3 files changed, 98 insertions, 2 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index f997b4bb5164..c58045d8c1f0 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.71 2008/04/04 05:03:16 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.72 2008/05/09 13:06:07 lavajoe Exp $
+
+*povray-3.7.0_beta25-r1 (09 May 2008)
+
+  09 May 2008; Joe Peterson <lavajoe@gentoo.org>
+  +povray-3.7.0_beta25-r1.ebuild:
+  Adjust locations of /usr/share files, docs, and config files
 
 *povray-3.7.0_beta25 (04 Apr 2008)
 
diff --git a/media-gfx/povray/Manifest b/media-gfx/povray/Manifest
index 4a80af82bc34..0fd21cd0bf7d 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -4,6 +4,7 @@ DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a
 DIST povray-src-3.7.0.beta.25b.tar.bz2 6890656 RMD160 37e8f6fb33bbc82d2ce6154a8b0c75ae7f5cda8e SHA1 0f55e441c97e88a4a8b148b7e7a328d1189a5ff9 SHA256 ef54965dec05c8063c40eab768f3fb722eb0ed72ae7918afe45d7a6bd553abc8
 EBUILD povray-3.6.1-r1.ebuild 1394 RMD160 3b840001acc9988e9344453c29e050d68b01fb1d SHA1 d4e1d3093d8f7aac8c70603d59090f13d7706b31 SHA256 b5679f1b6723c521e535f237825bb743c9ce0f4938878dc8727864aad8ea1370
 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.7.0_beta25.ebuild 1685 RMD160 48e1c55dcdf88c49a39b9a09edf68ffb5805be7a SHA1 8f92b1b55f7c0e14933f919ea5b691ada0d558af SHA256 2c8e9d9b23169d741effaafaa77c9c440277a7446993affcd835ccb0aad5f11e
-MISC ChangeLog 10443 RMD160 ece97e593f94015767728897f7d7907f11696567 SHA1 6c0abc4ace4fcebf292ee01672d2a2cbbbc8ff8c SHA256 ee94aa0c933a9f82f166c810d44e65390587850704553121dc418539e959e128
+MISC ChangeLog 10629 RMD160 3f476ec35d288d28dd721a0b6ca9daef326b4340 SHA1 6b53a9a69b618fb1a5b58f61f045b22a35bd673f SHA256 28625f7648381536747e741cd5e4b25e81d1cc333a3233395042b7e85ee96ca2
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
diff --git a/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild b/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
new file mode 100644
index 000000000000..9a8496d7d3fc
--- /dev/null
+++ b/media-gfx/povray/povray-3.7.0_beta25-r1.ebuild
@@ -0,0 +1,89 @@
+# 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 $
+
+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_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}\\\"
+
+	# 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
+
+	autoreconf
+
+	econf \
+		COMPILED_BY="${USER} <${USER}@`uname -n`>" \
+		$(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
+}