Remove masked freeimage USE flag

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

6 files changed, 15 insertions, 12 deletions

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index 1217175be9b9..a6979751ccc7 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-games/cegui
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.26 2009/07/01 21:18:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.27 2009/11/05 01:40:28 nyhm Exp $
+
+  05 Nov 2009; Tristan Heaven <nyhm@gentoo.org> cegui-0.6.2b.ebuild:
+  Remove masked freeimage USE flag
 
   01 Jul 2009; Markus Meier <maekke@gentoo.org> cegui-0.6.2b.ebuild:
   amd64 stable, bug #255080
diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild
index c7e9d87c241e..27acbbdbd9aa 100644
--- a/dev-games/cegui/cegui-0.6.2b.ebuild
+++ b/dev-games/cegui/cegui-0.6.2b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.5 2009/07/01 21:18:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.6 2009/11/05 01:40:28 nyhm Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -14,14 +14,13 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}b.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="debug devil directfb doc examples expat freeimage irrlicht lua opengl xerces-c xml"
+IUSE="debug devil directfb doc examples expat irrlicht lua opengl xerces-c xml"
 
 RDEPEND="dev-libs/libpcre
 	media-libs/freetype:2
 	devil? ( media-libs/devil )
 	directfb? ( dev-libs/DirectFB )
 	expat? ( dev-libs/expat )
-	freeimage? ( media-libs/freeimage )
 	irrlicht? ( dev-games/irrlicht )
 	lua? (
 		dev-lang/lua
@@ -61,7 +60,6 @@ src_configure() {
 		$(use_enable directfb directfb-renderer) \
 		$(use_enable examples samples) \
 		$(use_enable expat) \
-		$(use_enable freeimage) \
 		$(use_enable irrlicht irrlicht-renderer) \
 		$(use_enable lua external-toluapp) \
 		$(use_enable lua lua-module) \
@@ -76,6 +74,7 @@ src_configure() {
 		--disable-corona \
 		--disable-dependency-tracking \
 		--disable-external-tinyxml \
+		--disable-freeimage \
 		--disable-samples \
 		--disable-silly \
 		--without-gtk2 \
diff --git a/dev-games/cegui/metadata.xml b/dev-games/cegui/metadata.xml
index 2387f349cbeb..dfc9dab1d818 100644
--- a/dev-games/cegui/metadata.xml
+++ b/dev-games/cegui/metadata.xml
@@ -4,7 +4,6 @@
   <herd>games</herd>
   <use>
     <flag name="devil">Enable image loading via DevIL</flag>
-    <flag name="freeimage">Enable image loading via FreeImage</flag>
     <flag name="irrlicht">Enable the Irrlicht renderer</flag>
     <flag name="xerces-c">Enable the Xerces-C++ XML parser module</flag>
   </use>
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 3efb9c91d7ed..9e0f51be68c0 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.57 2009/09/10 23:12:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.58 2009/11/05 01:42:23 nyhm Exp $
+
+  05 Nov 2009; Tristan Heaven <nyhm@gentoo.org> ogre-1.6.3.ebuild,
+  metadata.xml:
+  Remove masked freeimage USE flag
 
 *ogre-1.6.3 (10 Sep 2009)
 
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index e7927d4967f4..4cc80de17f6d 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -78,6 +78,5 @@ Exporters
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="devil">image loading support with DevIL</flag>
     <flag name="double-precision">more precise calculations at the expense of speed</flag>
-    <flag name="freeimage">image loading support with FreeImage</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-games/ogre/ogre-1.6.3.ebuild b/dev-games/ogre/ogre-1.6.3.ebuild
index 2789c09998f0..d89cae4ac471 100644
--- a/dev-games/ogre/ogre-1.6.3.ebuild
+++ b/dev-games/ogre/ogre-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.3.ebuild,v 1.1 2009/09/10 23:12:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.3.ebuild,v 1.2 2009/11/05 01:42:23 nyhm Exp $
 
 EAPI=2
 inherit multilib eutils autotools flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogre/ogre-v${PV//./-}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc cg devil double-precision examples freeimage gtk threads"
+IUSE="doc cg devil double-precision examples gtk threads"
 RESTRICT="test" #139905
 
 RDEPEND="dev-libs/zziplib
@@ -25,7 +25,6 @@ RDEPEND="dev-libs/zziplib
 	x11-libs/libX11
 	cg? ( media-gfx/nvidia-cg-toolkit )
 	devil? ( media-libs/devil )
-	freeimage? ( media-libs/freeimage )
 	gtk? ( x11-libs/gtk+:2 )
 	threads? ( || ( >=dev-libs/boost-1.34.1 dev-libs/boost[threads] ) )"
 DEPEND="${RDEPEND}
@@ -55,6 +54,7 @@ src_configure() {
 	strip-flags
 		econf \
 		--disable-dependency-tracking \
+		--disable-freeimage \
 		--disable-openexr \
 		--disable-ogre-demos \
 		--enable-static \
@@ -63,7 +63,6 @@ src_configure() {
 		$(use_enable cg) \
 		$(use_enable devil) \
 		$(use_enable double-precision double) \
-		$(use_enable freeimage) \
 		$(use_enable threads threading)
 }