Remove freeimage USE flag, bug #178110

Package-Manager: portage-2.1.3.3

12 files changed, 22 insertions, 243 deletions

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index 5bebff4bfc8f..acbb950e99a4 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/cegui
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.14 2007/05/22 17:36:41 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.15 2007/08/11 13:24:28 nyhm Exp $
+
+*cegui-0.5.0b-r3 (11 Aug 2007)
+
+  11 Aug 2007; Tristan Heaven <nyhm@gentoo.org> -cegui-0.5.0b-r2.ebuild,
+  +cegui-0.5.0b-r3.ebuild:
+  Remove freeimage USE flag, bug #178110
 
 *cegui-0.5.0b-r2 (22 May 2007)
 
diff --git a/dev-games/cegui/cegui-0.5.0b-r2.ebuild b/dev-games/cegui/cegui-0.5.0b-r3.ebuild
index a45bf0df8196..56b91ed54f7a 100644
--- a/dev-games/cegui/cegui-0.5.0b-r2.ebuild
+++ b/dev-games/cegui/cegui-0.5.0b-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.5.0b-r2.ebuild,v 1.1 2007/05/22 17:36:41 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.5.0b-r3.ebuild,v 1.1 2007/08/11 13:24:28 nyhm Exp $
 
 inherit autotools eutils
 
@@ -12,13 +12,12 @@ SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="devil doc examples expat freeimage lua opengl xerces-c xml"
+IUSE="devil doc examples expat lua opengl xerces-c xml"
 
 RDEPEND="dev-libs/libpcre
 	=media-libs/freetype-2*
 	devil? ( media-libs/devil )
 	expat? ( dev-libs/expat )
-	freeimage? ( media-libs/freeimage )
 	lua? ( dev-lang/lua )
 	opengl? ( virtual/opengl
 		virtual/glu
@@ -48,7 +47,6 @@ src_compile() {
 		$(use_enable devil) \
 		$(use_enable examples samples) \
 		$(use_enable expat) \
-		$(use_enable freeimage) \
 		$(use_enable lua lua-module) \
 		$(use_enable lua toluacegui) \
 		$(use_enable opengl opengl-renderer) \
@@ -59,6 +57,7 @@ src_compile() {
 		--enable-tinyxml \
 		--disable-corona \
 		--disable-dependency-tracking \
+		--disable-freeimage \
 		--disable-irrlicht-renderer \
 		--disable-samples \
 		--disable-silly \
diff --git a/dev-games/cegui/files/digest-cegui-0.5.0b-r2 b/dev-games/cegui/files/digest-cegui-0.5.0b-r3
index 12103a3d99b2..12103a3d99b2 100644
--- a/dev-games/cegui/files/digest-cegui-0.5.0b-r2
+++ b/dev-games/cegui/files/digest-cegui-0.5.0b-r3
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 98d1011125fb..ed8fb708baf6 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.40 2007/07/19 18:25:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.41 2007/08/11 13:23:41 nyhm Exp $
+
+*ogre-1.4.3-r1 (11 Aug 2007)
+
+  11 Aug 2007; Tristan Heaven <nyhm@gentoo.org>
+  -files/ogre-1.4.1-cegui.patch, -files/ogre-1.4.2-cegui.patch,
+  -ogre-1.4.1.ebuild, -ogre-1.4.2.ebuild, -ogre-1.4.3.ebuild,
+  +ogre-1.4.3-r1.ebuild:
+  Remove freeimage USE flag, bug #178110
 
 *ogre-1.4.3 (19 Jul 2007)
 
diff --git a/dev-games/ogre/files/digest-ogre-1.4.1 b/dev-games/ogre/files/digest-ogre-1.4.1
deleted file mode 100644
index 5d5c196c160a..000000000000
--- a/dev-games/ogre/files/digest-ogre-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cbabbfddc5f1a2c76480eb5fc9d87b37 ogre-linux_osx-v1-4-1.tar.bz2 28699864
-RMD160 6a5cd1bb75f31e548bb238d193b5054eed1942a4 ogre-linux_osx-v1-4-1.tar.bz2 28699864
-SHA256 8cad85e2ee4fd2750f4fb17bd92b28be2b0b24dc2246e6a636649bd1115de326 ogre-linux_osx-v1-4-1.tar.bz2 28699864
diff --git a/dev-games/ogre/files/digest-ogre-1.4.2 b/dev-games/ogre/files/digest-ogre-1.4.2
deleted file mode 100644
index 32295d747f7a..000000000000
--- a/dev-games/ogre/files/digest-ogre-1.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52eea0cf5fc659d9ca63491348e0e0ec ogre-linux-osx-v1-4-2.tar.bz2 28683948
-RMD160 232e0acfdbbf928ea5582d49b583209c6c50e5f1 ogre-linux-osx-v1-4-2.tar.bz2 28683948
-SHA256 4f13cd1bb07cbdb435a9125c2b2c1dc598255640d202e1b79833914c2ca9c1b7 ogre-linux-osx-v1-4-2.tar.bz2 28683948
diff --git a/dev-games/ogre/files/digest-ogre-1.4.3 b/dev-games/ogre/files/digest-ogre-1.4.3-r1
index ec3bf0da2427..85cfcccdfa46 100644
--- a/dev-games/ogre/files/digest-ogre-1.4.3
+++ b/dev-games/ogre/files/digest-ogre-1.4.3-r1
@@ -1,3 +1,2 @@
-MD5 d184bfbc1dd7cbc56aef419171699da6 ogre-linux_osx-v1-4-3.tar.bz2 28642728
 RMD160 ad279ef2e4b4f6f4ef7f139fe6b9a0e65f9a568a ogre-linux_osx-v1-4-3.tar.bz2 28642728
 SHA256 a609f4da17b38578e0b45f95d390782195b287d141db5ee599f683e2c0349138 ogre-linux_osx-v1-4-3.tar.bz2 28642728
diff --git a/dev-games/ogre/files/ogre-1.4.1-cegui.patch b/dev-games/ogre/files/ogre-1.4.1-cegui.patch
deleted file mode 100644
index c089164af219..000000000000
--- a/dev-games/ogre/files/ogre-1.4.1-cegui.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- acinclude.m4
-+++ acinclude.m4
-@@ -411,6 +411,8 @@
- ])
- 
- AC_DEFUN([OGRE_CHECK_CEGUI], [
-+    AC_ARG_ENABLE(cegui)
-+    if test x$enable_cegui != xno; then
-     PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.5.0, 
-             [build_cegui_sample=true], [build_cegui_sample=false])
-     if test x$build_cegui_sample = xtrue; then
-@@ -426,6 +428,7 @@
-     else
-         AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built])
-     fi
-+    fi
-     AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
- ])
- 
diff --git a/dev-games/ogre/files/ogre-1.4.2-cegui.patch b/dev-games/ogre/files/ogre-1.4.2-cegui.patch
deleted file mode 100644
index c089164af219..000000000000
--- a/dev-games/ogre/files/ogre-1.4.2-cegui.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- acinclude.m4
-+++ acinclude.m4
-@@ -411,6 +411,8 @@
- ])
- 
- AC_DEFUN([OGRE_CHECK_CEGUI], [
-+    AC_ARG_ENABLE(cegui)
-+    if test x$enable_cegui != xno; then
-     PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.5.0, 
-             [build_cegui_sample=true], [build_cegui_sample=false])
-     if test x$build_cegui_sample = xtrue; then
-@@ -426,6 +428,7 @@
-     else
-         AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built])
-     fi
-+    fi
-     AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
- ])
- 
diff --git a/dev-games/ogre/ogre-1.4.2.ebuild b/dev-games/ogre/ogre-1.4.2.ebuild
deleted file mode 100644
index 8a036e2497d9..000000000000
--- a/dev-games/ogre/ogre-1.4.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.2.ebuild,v 1.1 2007/06/13 11:55:15 nyhm Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
-SRC_URI="mirror://sourceforge/ogre/ogre-linux-osx-v${PV//./-}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc cegui cg devil double-precision examples freeimage gtk openexr threads"
-RESTRICT="test" #139905
-
-RDEPEND="dev-libs/zziplib
-	>=media-libs/freetype-2.1.10
-	virtual/opengl
-	virtual/glu
-	x11-libs/libXt
-	x11-libs/libXaw
-	x11-libs/libXrandr
-	x11-libs/libX11
-	cegui? ( >=dev-games/cegui-0.5 )
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	devil? ( media-libs/devil )
-	freeimage? ( media-libs/freeimage )
-	gtk? (
-		>=dev-cpp/gtkmm-2.4
-		>=dev-cpp/libglademm-2.4
-	)
-	openexr? ( >=media-libs/openexr-1.2 )
-	threads? ( dev-libs/boost )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/ogrenew
-
-pkg_setup() {
-	if use threads && has_version "<dev-libs/boost-1.34" && \
-		! built_with_use dev-libs/boost threads
-	then
-		die "Please emerge dev-libs/boost with USE=threads"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find -name CVS -print0 | xargs -0 rm -rf
-	if use examples ; then
-		cp -r Samples install-examples || die
-		find install-examples \
-			'(' -name 'Makefile*' -o -name obj -o \
-			    -name bin -o -name '*.cbp' -o -name '*.vcproj*' ')' \
-			-print0 | xargs -0 rm -rf
-	fi
-	sed -i '/CPPUNIT/d' configure.in || die "sed failed"
-	epatch "${FILESDIR}"/${P}-cegui.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-ogre-demos \
-		--enable-static \
-		--with-platform=GLX \
-		--with-gui=$(usev gtk || echo Xt) \
-		$(use_enable cegui) \
-		$(use_enable cg) \
-		$(use_enable devil) \
-		$(use_enable double-precision double) \
-		$(use_enable freeimage) \
-		$(use_enable openexr) \
-		$(use_enable threads threading) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r Docs/* || die "doins Docs failed"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/Samples
-		doins -r install-examples/* || die "doins Samples failed"
-	fi
-	dodoc AUTHORS BUGS LINUX.DEV README
-}
diff --git a/dev-games/ogre/ogre-1.4.1.ebuild b/dev-games/ogre/ogre-1.4.3-r1.ebuild
index 896397e306eb..7d7c5f76656c 100644
--- a/dev-games/ogre/ogre-1.4.1.ebuild
+++ b/dev-games/ogre/ogre-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.1.ebuild,v 1.2 2007/06/12 00:09:31 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.3-r1.ebuild,v 1.1 2007/08/11 13:23:41 nyhm Exp $
 
 inherit eutils autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ogre/ogre-linux_osx-v${PV//./-}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="doc cegui cg devil double-precision examples freeimage gtk openexr threads"
+IUSE="doc cegui cg devil double-precision examples gtk openexr threads"
 RESTRICT="test" #139905
 
 RDEPEND="dev-libs/zziplib
@@ -25,7 +25,6 @@ RDEPEND="dev-libs/zziplib
 	cegui? ( >=dev-games/cegui-0.5 )
 	cg? ( media-gfx/nvidia-cg-toolkit )
 	devil? ( media-libs/devil )
-	freeimage? ( media-libs/freeimage )
 	gtk? (
 		>=dev-cpp/gtkmm-2.4
 		>=dev-cpp/libglademm-2.4
@@ -65,6 +64,7 @@ src_unpack() {
 src_compile() {
 	econf \
 		--disable-dependency-tracking \
+		--disable-freeimage \
 		--disable-ogre-demos \
 		--enable-static \
 		--with-platform=GLX \
@@ -73,7 +73,6 @@ src_compile() {
 		$(use_enable cg) \
 		$(use_enable devil) \
 		$(use_enable double-precision double) \
-		$(use_enable freeimage) \
 		$(use_enable openexr) \
 		$(use_enable threads threading) \
 		|| die
diff --git a/dev-games/ogre/ogre-1.4.3.ebuild b/dev-games/ogre/ogre-1.4.3.ebuild
deleted file mode 100644
index d8e045d4cf20..000000000000
--- a/dev-games/ogre/ogre-1.4.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.3.ebuild,v 1.1 2007/07/19 18:25:43 mr_bones_ Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
-SRC_URI="mirror://sourceforge/ogre/ogre-linux_osx-v${PV//./-}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc cegui cg devil double-precision examples freeimage gtk openexr threads"
-RESTRICT="test" #139905
-
-RDEPEND="dev-libs/zziplib
-	>=media-libs/freetype-2.1.10
-	virtual/opengl
-	virtual/glu
-	x11-libs/libXt
-	x11-libs/libXaw
-	x11-libs/libXrandr
-	x11-libs/libX11
-	cegui? ( >=dev-games/cegui-0.5 )
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	devil? ( media-libs/devil )
-	freeimage? ( media-libs/freeimage )
-	gtk? (
-		>=dev-cpp/gtkmm-2.4
-		>=dev-cpp/libglademm-2.4
-	)
-	openexr? ( >=media-libs/openexr-1.2 )
-	threads? ( dev-libs/boost )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/ogrenew
-
-pkg_setup() {
-	if use threads && has_version "<dev-libs/boost-1.34" && \
-		! built_with_use dev-libs/boost threads
-	then
-		die "Please emerge dev-libs/boost with USE=threads"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find -name CVS -print0 | xargs -0 rm -rf
-	if use examples ; then
-		cp -r Samples install-examples || die
-		find install-examples \
-			'(' -name 'Makefile*' -o -name obj -o \
-			    -name bin -o -name '*.cbp' -o -name '*.vcproj*' ')' \
-			-print0 | xargs -0 rm -rf
-	fi
-	sed -i '/CPPUNIT/d' configure.in || die "sed failed"
-	epatch "${FILESDIR}"/${P}-cegui.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-ogre-demos \
-		--enable-static \
-		--with-platform=GLX \
-		--with-gui=$(usev gtk || echo Xt) \
-		$(use_enable cegui) \
-		$(use_enable cg) \
-		$(use_enable devil) \
-		$(use_enable double-precision double) \
-		$(use_enable freeimage) \
-		$(use_enable openexr) \
-		$(use_enable threads threading) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r Docs/* || die "doins Docs failed"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/Samples
-		doins -r install-examples/* || die "doins Samples failed"
-	fi
-	dodoc AUTHORS BUGS LINUX.DEV README
-}