summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-17 13:51:33 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-17 13:51:33 +0000
commitf600f986d14437cce77e6bfe5249046899c5bf7b (patch)
treedfd8bc6274f02105f247f1eed839928d1ea91222 /media-gfx/povray
parentalpha/ia64/s390/sh/sparc stable wrt #412985 (diff)
downloadgentoo-2-f600f986d14437cce77e6bfe5249046899c5bf7b.tar.gz
gentoo-2-f600f986d14437cce77e6bfe5249046899c5bf7b.tar.bz2
gentoo-2-f600f986d14437cce77e6bfe5249046899c5bf7b.zip
media-gfx/povray: Fix to make it build with gcc-4.7
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/povray')
-rw-r--r--media-gfx/povray/ChangeLog5
-rw-r--r--media-gfx/povray/povray-3.7.0_rc5.ebuild11
2 files changed, 8 insertions, 8 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index 9f50f879663e..7e40e06e4d04 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/povray
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.126 2012/03/13 19:13:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.127 2012/06/17 13:51:33 jlec Exp $
+
+ 17 Jun 2012; Justin Lecher <jlec@gentoo.org> povray-3.7.0_rc5.ebuild:
+ Fix to make it build with gcc-4.7
*povray-3.7.0_rc5 (13 Mar 2012)
diff --git a/media-gfx/povray/povray-3.7.0_rc5.ebuild b/media-gfx/povray/povray-3.7.0_rc5.ebuild
index 021e33c85137..d647ad0b5635 100644
--- a/media-gfx/povray/povray-3.7.0_rc5.ebuild
+++ b/media-gfx/povray/povray-3.7.0_rc5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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_rc5.ebuild,v 1.1 2012/03/13 19:13:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc5.ebuild,v 1.2 2012/06/17 13:51:33 jlec Exp $
EAPI=4
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${PN}-${MY_PV}
src_prepare() {
+ epatch "${FILESDIR}"/3.7.0_rc3-user-conf.patch
+
# Change some destination directories that cannot be adjusted via configure
cp configure.ac configure.ac.orig
sed \
@@ -53,14 +55,13 @@ src_prepare() {
-e "s:^povlibdir = .*:povlibdir = @datadir@/${PN}:" \
-e "s:^povdocdir = .*:povdocdir = @datadir@/doc/${PF}:" \
-e "s:^povconfdir = .*:povconfdir = @sysconfdir@/${PN}:" \
+ -e 's:mkdir_p:MKDIR_P:g' \
-i Makefile.am || die
# The "+p" option on the test command line causes a pause and
# prompts the user to interact, so remove it.
sed -i -e "s:biscuit.pov -f +d +p:biscuit.pov -f +d:" Makefile.am || die
- epatch "${FILESDIR}"/3.7.0_rc3-user-conf.patch
-
eautoreconf
}
@@ -106,10 +107,6 @@ src_test() {
POVRAY_BETA=`./unix/povray --betacode 2>&1` emake check
}
-src_install() {
- emake DESTDIR="${D}" install
-}
-
pkg_preinst() {
# Copy the old config files if they are in the old location
# but do not yet exist in the new location.