From: Joe Peterson <lavajoe@gentoo.org>
Date: Tue, 1 Jun 2010 12:58:33 +0000 (+0000)
Subject: Fix bug #322225; remove unused USE svga
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a97b876b6c8184f2bed0ce4a9f4bc968194e455;p=gentoo.git

Fix bug #322225; remove unused USE svga
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

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/Manifest b/media-gfx/povray/Manifest
index 0574784c495d..9a11634ad0ab 100644
--- a/media-gfx/povray/Manifest
+++ b/media-gfx/povray/Manifest
@@ -8,6 +8,6 @@ AUX povray-3.7.0_beta35-print-extend-expiration-info.patch 1160 RMD160 a1c662813
 DIST povray-3.6.1.tar.bz2 8200160 RMD160 84ba679da66089f192cc1bfcf8bdd498e736a9a3 SHA1 1fab3ccbdedafbf77e3a66087709bbdf60bc643d SHA256 4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
 DIST povray-3.7.0.beta.35a.tar.bz2 6327923 RMD160 8dc45ebece731b081ddb7e5280862b40db9f63a3 SHA1 79d2c17d50efea00a509a3020f93668c727aa232 SHA256 4ec857bebf75895dcbc01ad455cd2192c1ccece786691ce9e4f8265c479cfb30
 EBUILD povray-3.6.1-r4.ebuild 2827 RMD160 ac7b2d79211e7c8e5a61619f0d55d5e44955518a SHA1 557564b63c14ee10167d4cad95bab873a70c8e0e SHA256 b1d5733a7c77974680da14b3c905c326e4ea444764d2f6c1d70f4139dc9c0ddd
-EBUILD povray-3.7.0_beta35.ebuild 4435 RMD160 f8ae7c3ea1b663cad9a3708854cea278ace5b224 SHA1 82f954fbc33cc2013dd18f94c7d10fecc165f251 SHA256 b168b50bd9152aed922ebe5a1a8ac73c5047546d5c2319af53e89bcf3adac7ae
-MISC ChangeLog 15413 RMD160 278ec22287522b13b62a4389ebd97ec62c017292 SHA1 989694b8d03d775da7b496d8c5bf439ea8985044 SHA256 dde7398c61615a27ed5547b3a5721ecbd6035b7c6375fe8dff1a946690041057
+EBUILD povray-3.7.0_beta35.ebuild 4530 RMD160 d930855f7ea5e02e7c2b9ae0f8376cc2a4e092d4 SHA1 f22ba0a954e25c6c10a00281dcc51ed9242cb288 SHA256 5768b473ff895c47334c410e1fc8dd63ce62c45ad4a9cdabad4905e252ce758f
+MISC ChangeLog 15533 RMD160 ea8fb52ab2f6848b9cbed5319ce72182ac7a8708 SHA1 c71c094b45edb749aaffe841a5d4060f4b24d0e7 SHA256 313fd605c6a33a07ff6719e97d3bf7df90b4c6ee8857fc5db6bd26aae586cb82
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
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 \