Version bump

Package-Manager: portage-2.1.2.9

8 files changed, 38 insertions, 150 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/Manifest b/dev-games/ogre/Manifest
index 4cc26853c283..5e95fc0e1ebb 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -5,38 +5,33 @@ AUX 0.15.1-nocg.patch 1535 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e SHA1
 MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.15.1-nocg.patch 1535
 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e files/0.15.1-nocg.patch 1535
 SHA256 7b931bde184602cf09704685f7967827f24e32926ec8dc0a5411f8f24960279e files/0.15.1-nocg.patch 1535
-AUX ogre-1.4.0-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
-MD5 fdfb5745056c923cf983f726414044e9 files/ogre-1.4.0-cegui.patch 542
-RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 files/ogre-1.4.0-cegui.patch 542
-SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96 files/ogre-1.4.0-cegui.patch 542
 AUX ogre-1.4.1-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
 MD5 fdfb5745056c923cf983f726414044e9 files/ogre-1.4.1-cegui.patch 542
 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 files/ogre-1.4.1-cegui.patch 542
 SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96 files/ogre-1.4.1-cegui.patch 542
+AUX ogre-1.4.2-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
+MD5 fdfb5745056c923cf983f726414044e9 files/ogre-1.4.2-cegui.patch 542
+RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 files/ogre-1.4.2-cegui.patch 542
+SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96 files/ogre-1.4.2-cegui.patch 542
+DIST ogre-linux-osx-v1-4-2.tar.bz2 28683948 RMD160 232e0acfdbbf928ea5582d49b583209c6c50e5f1 SHA1 784ca710b6a410dbf2533530d05995c96d87f627 SHA256 4f13cd1bb07cbdb435a9125c2b2c1dc598255640d202e1b79833914c2ca9c1b7
 DIST ogre-linux_osx-v0-15-1.tar.bz2 24570136 RMD160 19709f610e581c8cbfcfbbe8e4feed1e4bbb2e27 SHA1 c075e585dadd29a5c0271ccb97eb56e473c3271a SHA256 a55f724059feddc6fd51a588be8e2a839341a7c8b97bb2ee5774f4200b383915
-DIST ogre-linux_osx-v1-2-5.tar.bz2 22994042 RMD160 793d4a876a398e4b150fe50d2c4bde24997e3dce SHA1 0d4e1a0fa39ee6a5442b23b49d6e24c9408a876c SHA256 9c7a31d41b626ff276b975f52395d17ee561e2d1dbcf1f6698fcb25c154d2d33
-DIST ogre-linux_osx-v1-4-0.tar.bz2 28719937 RMD160 ab8b64e66d56b286a181bfa206adf0c26574872d SHA1 48898ab48d965b54e62bf45b348b79aabf93a937 SHA256 8e54ccc9fca82186933d9788559eb877c3ba7e487c198ae62ae1119ad1df9844
 DIST ogre-linux_osx-v1-4-1.tar.bz2 28699864 RMD160 6a5cd1bb75f31e548bb238d193b5054eed1942a4 SHA1 fdd867c686de25822e11ac1b43cbacc0937d1c5b SHA256 8cad85e2ee4fd2750f4fb17bd92b28be2b0b24dc2246e6a636649bd1115de326
 EBUILD ogre-0.15.1.ebuild 1436 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 SHA1 9b4bfa5a7d8f389e6cf4b4f01d25e4a946de3dc3 SHA256 f5705dcac9ff289e48f02ce9b402f33eeb93964cf9702d93fd8ff656ab1030b4
 MD5 0b1ac52dc3bcf567017d7f496464eb81 ogre-0.15.1.ebuild 1436
 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 ogre-0.15.1.ebuild 1436
 SHA256 f5705dcac9ff289e48f02ce9b402f33eeb93964cf9702d93fd8ff656ab1030b4 ogre-0.15.1.ebuild 1436
-EBUILD ogre-1.2.5.ebuild 2967 RMD160 be9414cccc3a3343970b71259a95d4ccd2df66c4 SHA1 0f787fc8355ed1c6b2f2bffad009ef2429e74dd3 SHA256 72a2853f63d1ec91613e51c89f33842b5a53c9b154ec96dc92129942ce3b917d
-MD5 a25db2dce6d564ffe79c14540a032e7d ogre-1.2.5.ebuild 2967
-RMD160 be9414cccc3a3343970b71259a95d4ccd2df66c4 ogre-1.2.5.ebuild 2967
-SHA256 72a2853f63d1ec91613e51c89f33842b5a53c9b154ec96dc92129942ce3b917d ogre-1.2.5.ebuild 2967
-EBUILD ogre-1.4.0.ebuild 2692 RMD160 971e30d1172073be8e8de17f30d817b16cf99ab5 SHA1 362148c85f976d0379544eff04e21b702e3aa548 SHA256 c8c83dac7186aee2d7a2dc36dd33505cbd38ccd91c40f2529a7f9b3351375952
-MD5 e099f5a52503db8a88f870ab5e901c72 ogre-1.4.0.ebuild 2692
-RMD160 971e30d1172073be8e8de17f30d817b16cf99ab5 ogre-1.4.0.ebuild 2692
-SHA256 c8c83dac7186aee2d7a2dc36dd33505cbd38ccd91c40f2529a7f9b3351375952 ogre-1.4.0.ebuild 2692
 EBUILD ogre-1.4.1.ebuild 2417 RMD160 e0936159be317dc6a8a6db706df7ffc71fea34c6 SHA1 aaf8b639f4d0a03163e4b9c313b2ab37edaa8632 SHA256 53efabac11ec280850b38f134f50222e8ba101407d222e62ce66b879463fd84b
 MD5 427313caceee4e8f88befff24c5ef892 ogre-1.4.1.ebuild 2417
 RMD160 e0936159be317dc6a8a6db706df7ffc71fea34c6 ogre-1.4.1.ebuild 2417
 SHA256 53efabac11ec280850b38f134f50222e8ba101407d222e62ce66b879463fd84b ogre-1.4.1.ebuild 2417
-MISC ChangeLog 5407 RMD160 cff8a1f8c59a6fff260a7704405fe79e75334727 SHA1 d6cef021f61c0c6cd3f044e66812e5c5f29d7bea SHA256 2f6bcc340fb2ca3c57b3f146465adcadd8116f3060de210b941339613e4495bc
-MD5 b94f3de4e7d4f9551caeabd767bb526a ChangeLog 5407
-RMD160 cff8a1f8c59a6fff260a7704405fe79e75334727 ChangeLog 5407
-SHA256 2f6bcc340fb2ca3c57b3f146465adcadd8116f3060de210b941339613e4495bc ChangeLog 5407
+EBUILD ogre-1.4.2.ebuild 2417 RMD160 affc513274d27070e25ebf73b592c79ff2ab94a3 SHA1 d035a5956d544b31fdba6187b632551e3c5bcf04 SHA256 807e5a7167cb5b8b7f901a2bae764c6ae09c66e42166b5a24d3c1f5d5e47689a
+MD5 e1018977ca42c9b762f8a46c527e8bb9 ogre-1.4.2.ebuild 2417
+RMD160 affc513274d27070e25ebf73b592c79ff2ab94a3 ogre-1.4.2.ebuild 2417
+SHA256 807e5a7167cb5b8b7f901a2bae764c6ae09c66e42166b5a24d3c1f5d5e47689a ogre-1.4.2.ebuild 2417
+MISC ChangeLog 5551 RMD160 61fadaf6a9ffc60010b42230edba4421dca056fc SHA1 cababafc078e351f13247c1382ff781eaece2d3f SHA256 6e521a6b0524e6e9240883d6bae9565eb07cadd3f7e74a9367de2a72c7b0da60
+MD5 99743bb14d495096b842b971212fdc89 ChangeLog 5551
+RMD160 61fadaf6a9ffc60010b42230edba4421dca056fc ChangeLog 5551
+SHA256 6e521a6b0524e6e9240883d6bae9565eb07cadd3f7e74a9367de2a72c7b0da60 ChangeLog 5551
 MISC metadata.xml 4236 RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf SHA1 de49ea9fb17aa117ce25f685ae76062bea60b91f SHA256 3d5b0d15c24a55959278cf092bb62bfd109da2db4fcc8a07a7c6ccf449624981
 MD5 e7475f1eeda170514de47a940cb77420 metadata.xml 4236
 RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf metadata.xml 4236
@@ -44,19 +39,16 @@ SHA256 3d5b0d15c24a55959278cf092bb62bfd109da2db4fcc8a07a7c6ccf449624981 metadata
 MD5 2c0f946cc8e1dc11a54224c23e3c93be files/digest-ogre-0.15.1 277
 RMD160 43d8e012016709be3266789470b0163e6c951bfc files/digest-ogre-0.15.1 277
 SHA256 1576201669beb416fcceef86a919d6e5e75c27e0793d9b858ddd4ea6b23a6f7c files/digest-ogre-0.15.1 277
-MD5 7cb88b6724444e3830efdc0f0cc25f27 files/digest-ogre-1.2.5 274
-RMD160 e45d2a00a11b91f6bb8646a59e4c363d82fe6fe6 files/digest-ogre-1.2.5 274
-SHA256 15c9c0c781f81d30da14d3be2cece909862c66d5e14967af3782f4beed1c2898 files/digest-ogre-1.2.5 274
-MD5 e119b227ebb41435daf124813e9e26c5 files/digest-ogre-1.4.0 274
-RMD160 a7e00165eeadf94c0bccf2deabcccd0da841b221 files/digest-ogre-1.4.0 274
-SHA256 a7070d72e89d84b7793e73961c2ea4af968c9b53d607b7ce10a200cd377fb3ef files/digest-ogre-1.4.0 274
 MD5 5683bc9147a1f38970bf5bdf2a1c5211 files/digest-ogre-1.4.1 274
 RMD160 462318bd990fc1852f900b3a22384e705df3fce1 files/digest-ogre-1.4.1 274
 SHA256 1a2fe65c452205a11a1f66d906d06d8494affe57a2c628e96fca4b62956a2862 files/digest-ogre-1.4.1 274
+MD5 f6c60e74a0ab425419667ed17ec5aa9e files/digest-ogre-1.4.2 274
+RMD160 7ba8e7bdd04f6615287f478b1bf179ae3adc11d9 files/digest-ogre-1.4.2 274
+SHA256 38b3e0e90749968aa4095cc3347bee6b3267447eacb677584391a0de1b2898f6 files/digest-ogre-1.4.2 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbeRJdz7hIScOURERAvwlAKCC0tz2mtMo1imVZSGQ11Jnx6xYiwCguHk1
-PTpyXOH81HlaBsAMPzqKdE4=
-=0vqX
+iD8DBQFGb9ssdz7hIScOURERAhB1AJwJggJd6iqEq56CCtmCFvKY+a7whQCfaN3I
+Rmm9Rb2lomGWmk+PSzGqXf4=
+=+0r8
 -----END PGP SIGNATURE-----
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) \