summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Peterson <lavajoe@gentoo.org>2010-06-01 12:58:33 +0000
committerJoe Peterson <lavajoe@gentoo.org>2010-06-01 12:58:33 +0000
commit54595d9f6f19fe79c933cf0019bc551c56238d97 (patch)
tree29212b2229cb426380c4c28ccfaa83cf48248992 /media-gfx/povray
parentx86 stable wrt bug #321611 (diff)
downloadgentoo-2-54595d9f6f19fe79c933cf0019bc551c56238d97.tar.gz
gentoo-2-54595d9f6f19fe79c933cf0019bc551c56238d97.tar.bz2
gentoo-2-54595d9f6f19fe79c933cf0019bc551c56238d97.zip
Fix bug #322225; remove unused USE svga
(Portage version: 2.1.8.3/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_beta35.ebuild15
2 files changed, 15 insertions, 5 deletions
diff --git a/media-gfx/povray/ChangeLog b/media-gfx/povray/ChangeLog
index e72544813aac..ffe7c750e388 100644
--- a/media-gfx/povray/ChangeLog
+++ b/media-gfx/povray/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/povray
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.102 2010/05/24 21:37:39 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/ChangeLog,v 1.103 2010/06/01 12:58:33 lavajoe Exp $
+
+ 01 Jun 2010; Joe Peterson <lavajoe@gentoo.org> povray-3.7.0_beta35.ebuild:
+ Fix bug #322225; remove unused USE svga
24 May 2010; Joe Peterson <lavajoe@gentoo.org> povray-3.7.0_beta35.ebuild,
+files/povray-3.7.0_beta35-configure-allow-libpng14.patch:
diff --git a/media-gfx/povray/povray-3.7.0_beta35.ebuild b/media-gfx/povray/povray-3.7.0_beta35.ebuild
index cbeac763e298..016ea983f9df 100644
--- a/media-gfx/povray/povray-3.7.0_beta35.ebuild
+++ b/media-gfx/povray/povray-3.7.0_beta35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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_beta35.ebuild,v 1.2 2010/05/24 21:37:39 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_beta35.ebuild,v 1.3 2010/06/01 12:58:33 lavajoe Exp $
inherit eutils autotools flag-o-matic versionator
@@ -20,14 +20,13 @@ SRC_URI="http://www.povray.org/redirect/www.povray.org/beta/source/${PN}-${MY_PV
LICENSE="povlegal-3.6"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="svga tiff X"
+IUSE="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.36"
S="${WORKDIR}/${PN}-${MY_PV}"
@@ -66,6 +65,8 @@ src_unpack() {
}
src_compile() {
+ local non_redist_conf
+
# Fixes bug 71255
if [[ $(get-flag march) == k6-2 ]]; then
filter-flags -fomit-frame-pointer
@@ -78,9 +79,15 @@ src_compile() {
append-flags -DPOVLIBDIR=\\\"${ROOT}usr/share/${PN}\\\"
append-flags -DPOVCONFDIR=\\\"${ROOT}etc/${PN}\\\"
+ if ! use tiff ; then
+ non_redist_conf="NON_REDISTRIBUTABLE_BUILD=yes"
+ else
+ non_redist_conf=""
+ fi
+
econf \
+ ${non_redist_conf} \
COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" \
- $(use_with svga) \
$(use_with tiff libtiff) \
$(use_with X x) \
--disable-strip \