Disable optimzations on 3.6.1 to match 3.7.0 and to fix misalignment with libjpeg on 32-bit systems (bug #382459)

(Portage version: 2.1.10.20/cvs/Linux x86_64)

2 files changed, 99 insertions, 1 deletions

diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 84799a8dc8a0..d696658c93cb 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/povray
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.114 2011/09/28 19:33:31 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.115 2011/10/01 00:44:01 lavajoe Exp $
+
+*povray-3.6.1-r6 (01 Oct 2011)
+
+  01 Oct 2011; Joe Peterson <lavajoe@gentoo.org> +povray-3.6.1-r6.ebuild:
+  Disable optimzations on 3.6.1 to match 3.7.0 and to fix misalignment with
+  libjpeg on 32-bit systems (bug #382459)
 
   28 Sep 2011; Joe Peterson <lavajoe@gentoo.org> +povray-3.6.1-r4.ebuild,
   -povray-3.6.1-r5.ebuild, -files/povray-3.6.1-only-libjpeg-6b.patch:
diff --git a/media-gfx/povray/povray-3.6.1-r6.ebuild b/media-gfx/povray/povray-3.6.1-r6.ebuild
new file mode 100644
index 000000000000..26767835d410
--- /dev/null
+++ b/media-gfx/povray/povray-3.6.1-r6.ebuild
@@ -0,0 +1,92 @@
+# 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-r6.ebuild,v 1.1 2011/10/01 00:44:01 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="svga tiff X"
+
+DEPEND=">=media-libs/libpng-1.4
+	tiff? ( >=media-libs/tiff-3.6.1 )
+	virtual/jpeg
+	sys-libs/zlib
+	X? ( x11-libs/libXaw )
+	svga? ( media-libs/svgalib )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+	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 ..
+
+	# Patch code that compares system lib versions to properly detect
+	# newer versions.  Also fix reference to old png call.  (Bug #153538)
+	epatch "${FILESDIR}"/${P}-use-system-libpng.patch
+
+	# Also, to make sure no bundled static libs can be used, remove them
+	rm -r libraries/jpeg
+	rm -r libraries/png
+	rm -r libraries/tiff
+	rm -r libraries/zlib
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+}
+
+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) \
+		--disable-optimiz
+
+	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
+}