Version bump

(Portage version: 2.1.2.9)

7 files changed, 19 insertions, 123 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index a684daed5c37..fe4ec176f789 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2007/06/12 00:09:31 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.39 2007/06/13 11:55:15 nyhm Exp $
+
+*ogre-1.4.2 (13 Jun 2007)
+
+  13 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/ogre-1.4.2-cegui.patch, +ogre-1.4.2.ebuild:
+  Version bump
 
   12 Jun 2007; Tristan Heaven <nyhm@gentoo.org> ogre-1.4.1.ebuild:
   Fix dev-libs/boost built_with_use test, bug #181226
diff --git a/dev-games/ogre/files/digest-ogre-1.2.5 b/dev-games/ogre/files/digest-ogre-1.2.5
deleted file mode 100644
index 1c731e554a77..000000000000
--- a/dev-games/ogre/files/digest-ogre-1.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b4c9c0e6dda14009c8e7a29de876d9a1 ogre-linux_osx-v1-2-5.tar.bz2 22994042
-RMD160 793d4a876a398e4b150fe50d2c4bde24997e3dce ogre-linux_osx-v1-2-5.tar.bz2 22994042
-SHA256 9c7a31d41b626ff276b975f52395d17ee561e2d1dbcf1f6698fcb25c154d2d33 ogre-linux_osx-v1-2-5.tar.bz2 22994042
diff --git a/dev-games/ogre/files/digest-ogre-1.4.0 b/dev-games/ogre/files/digest-ogre-1.4.0
deleted file mode 100644
index e9954795e21d..000000000000
--- a/dev-games/ogre/files/digest-ogre-1.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 125d85992d95eda9c5ef2d65c4481a92 ogre-linux_osx-v1-4-0.tar.bz2 28719937
-RMD160 ab8b64e66d56b286a181bfa206adf0c26574872d ogre-linux_osx-v1-4-0.tar.bz2 28719937
-SHA256 8e54ccc9fca82186933d9788559eb877c3ba7e487c198ae62ae1119ad1df9844 ogre-linux_osx-v1-4-0.tar.bz2 28719937
diff --git a/dev-games/ogre/files/digest-ogre-1.4.2 b/dev-games/ogre/files/digest-ogre-1.4.2
new file mode 100644
index 000000000000..32295d747f7a
--- /dev/null
+++ b/dev-games/ogre/files/digest-ogre-1.4.2
@@ -0,0 +1,3 @@
+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/ogre-1.4.0-cegui.patch b/dev-games/ogre/files/ogre-1.4.2-cegui.patch
index c089164af219..c089164af219 100644
--- a/dev-games/ogre/files/ogre-1.4.0-cegui.patch
+++ b/dev-games/ogre/files/ogre-1.4.2-cegui.patch
diff --git a/dev-games/ogre/ogre-1.2.5.ebuild b/dev-games/ogre/ogre-1.2.5.ebuild
deleted file mode 100644
index b3521c6801ac..000000000000
--- a/dev-games/ogre/ogre-1.2.5.ebuild
+++ /dev/null
@@ -1,102 +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.2.5.ebuild,v 1.2 2007/02/14 20:13:24 mr_bones_ Exp $
-
-inherit eutils autotools
-
-MY_PV=${PV//./-}
-MY_PV=${MY_PV/_/}
-DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
-SRC_URI="mirror://sourceforge/ogre/${PN}-linux_osx-v${MY_PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="cegui cg devil double-precision examples gtk openexr test threads"
-
-RDEPEND=">=dev-libs/zziplib-0.13.36
-	>=media-libs/freetype-2.1.10
-	threads? ( >=dev-libs/boost-1.33.0 )
-	cegui? ( >=dev-games/cegui-0.4.0 )
-	devil? ( >=media-libs/devil-1.6.7 )
-	openexr? ( >=media-libs/openexr-1.2 )
-	gtk? ( >=dev-cpp/gtkmm-2.4 >=dev-cpp/libglademm-2.4 )
-	virtual/opengl
-	x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt x11-libs/libX11
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	dev-util/pkgconfig
-	sys-devel/flex
-	cg? ( >=media-gfx/nvidia-cg-toolkit-1.2 )
-	test? ( dev-util/cppunit )"
-
-S=${WORKDIR}/ogrenew
-
-pkg_setup() {
-	if use threads ; then
-		if ! built_with_use dev-libs/boost threads ; then
-			die "Please emerge dev-libs/boost with USE=threads"
-		fi
-		if use cegui && has_version '>=dev-games/cegui-0.5'; then
-			ewarn "${P} doesn't work with dev-games/cegui-0.5."
-			ewarn "Downgrade to dev-games/cegui-0.4 if cegui support is required."
-			die "${P} doesn't work with dev-games/cegui-0.5."
-		fi
-
-		ewarn "Threads support is experimental in ${PN} and is not recommended."
-		ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=144819"
-		ewarn "Read the man page for portage by typing \"man portage\""
-		ewarn "and read about /etc/portage/package.use for disabling"
-		ewarn "the threads use flag for ${PN} without affecting other packages."
-		ebeep
-		epause 10
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	./bootstrap || die "bootstrap failed"
-
-	find Samples/Media -name CVS -print0 | xargs -0 rm -rf
-	if use examples ; then
-		cp -r Samples install-examples || die
-		find install-examples \
-			'(' -name 'Makefile*' -o -name CVS -o -name obj -o \
-			    -name bin -o -name '*.cbp' -o -name '*.vcproj*' ')' \
-			-print0 | xargs -0 rm -rf
-	fi
-}
-
-src_compile() {
-	# For the config toolkit:
-	local mycfgtk="cli"
-	use gtk && mycfgtk="gtk"
-
-	econf \
-		--disable-dependency-tracking \
-		--with-cfgtk=${mycfgtk} \
-		--with-platform=GLX \
-		$(use_enable devil) \
-		$(use_enable cg) \
-		$(use_enable openexr) \
-		$(use_enable threads threading) \
-		$(use_enable double-precision double) \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/OGRE/Media
-	doins -r Samples/Media/*
-	if use examples ; then
-		dohtml -r Docs/* Docs/Tutorials/*
-		insinto /usr/share/doc/${PF}/Samples
-		doins -r install-examples/*
-	fi
-	dodoc AUTHORS BUGS LINUX.DEV README Docs/README.linux
-	dohtml Docs/*.html
-}
diff --git a/dev-games/ogre/ogre-1.4.0.ebuild b/dev-games/ogre/ogre-1.4.2.ebuild
index fc569da56597..8a036e2497d9 100644
--- a/dev-games/ogre/ogre-1.4.0.ebuild
+++ b/dev-games/ogre/ogre-1.4.2.ebuild
@@ -1,17 +1,17 @@
 # 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.0.ebuild,v 1.1 2007/04/04 01:44:49 nyhm Exp $
+# $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"
+SRC_URI="mirror://sourceforge/ogre/ogre-linux-osx-v${PV//./-}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="doc cegui cg double-precision examples freeimage gtk openexr threads"
+IUSE="doc cegui cg devil double-precision examples freeimage gtk openexr threads"
 RESTRICT="test" #139905
 
 RDEPEND="dev-libs/zziplib
@@ -24,6 +24,7 @@ RDEPEND="dev-libs/zziplib
 	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
@@ -38,17 +39,10 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/ogrenew
 
 pkg_setup() {
-	if use threads ; then
-		if ! built_with_use dev-libs/boost threads ; then
-			die "Please emerge dev-libs/boost with USE=threads"
-		fi
-		ewarn "Threads support is experimental in ${PN} and is not recommended."
-		ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=144819"
-		ewarn "Read the man page for portage by typing \"man portage\""
-		ewarn "and read about /etc/portage/package.use for disabling"
-		ewarn "the threads use flag for ${PN} without affecting other packages."
-		ebeep
-		epause 10
+	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
 }
 
@@ -77,6 +71,7 @@ src_compile() {
 		--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) \