[gentoo-commits] gentoo-x86 commit in media-gfx/povray: povray-3.6.1-r5.ebuild ChangeLog povray-3.6.1-r4.ebuild

[Joe Peterson (lavajoe)]

lavajoe     11/09/28 17:43:12

  Modified:             ChangeLog
  Added:                povray-3.6.1-r5.ebuild
  Removed:              povray-3.6.1-r4.ebuild
  Log:
  Require older libjpeg-6b for older povray-3.6.1 and use included static lib if not available (bug #382459); revert use of EROOT, etc., in povray-3.6.1 ebuild (not EAPI 3)
  
  (Portage version: 2.1.10.19/cvs/Linux x86_64)

Revision  Changes    Path
1.113                media-gfx/povray/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog	24 Mar 2011 15:57:10 -0000	1.112
+++ ChangeLog	28 Sep 2011 17:43:12 -0000	1.113
@@ -1,6 +1,14 @@
 # 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.112 2011/03/24 15:57:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.113 2011/09/28 17:43:12 lavajoe Exp $
+
+*povray-3.6.1-r5 (28 Sep 2011)
+
+  28 Sep 2011; Joe Peterson <lavajoe@g.o> -povray-3.6.1-r4.ebuild,
+  +povray-3.6.1-r5.ebuild, +files/povray-3.6.1-only-libjpeg-6b.patch:
+  Require older libjpeg-6b for older povray-3.6.1 and use included static lib
+  if not available (bug #382459); revert use of EROOT, etc., in povray-3.6.1
+  ebuild (not EAPI 3)
 
   24 Mar 2011; Justin Lecher <jlec@g.o>
   +files/3.7.0_rc3-user-conf.patch, povray-3.7.0_rc3.ebuild:



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

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

Index: povray-3.6.1-r5.ebuild
===================================================================
# 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-r5.ebuild,v 1.1 2011/09/28 17:43:12 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

	# Check for an exact match to libjpeg-6b,
	# since newer versions do not work (bug #382459).
	epatch "${FILESDIR}"/${P}-only-libjpeg-6b.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
	# (but keep jpeg and tiff, since we need to use these old static versions
	# if libjpeg-6b is not found on system (bug #382459)).
	#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)

	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
}