summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-games/ogre/ChangeLog5
-rw-r--r--dev-games/ogre/Manifest22
-rw-r--r--dev-games/ogre/ogre-1.4.1.ebuild17
3 files changed, 20 insertions, 24 deletions
diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 58b6c5895fdd..a684daed5c37 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,9 @@
# 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.37 2007/05/29 19:38:19 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.38 2007/06/12 00:09:31 nyhm Exp $
+
+ 12 Jun 2007; Tristan Heaven <nyhm@gentoo.org> ogre-1.4.1.ebuild:
+ Fix dev-libs/boost built_with_use test, bug #181226
*ogre-1.4.1 (29 May 2007)
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index c713e83b3533..4cc26853c283 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -29,14 +29,14 @@ EBUILD ogre-1.4.0.ebuild 2692 RMD160 971e30d1172073be8e8de17f30d817b16cf99ab5 SH
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 2751 RMD160 03704c92d2b8fce1308a00a2ad7d5e26ac36d978 SHA1 305972589626709c43dadc893344569eda928298 SHA256 1c965e419aa498668188d229379b4b747b7a2ce2fe7f110f1201d1f57a878325
-MD5 a9e9a2ea7477377ceee08da834818cb2 ogre-1.4.1.ebuild 2751
-RMD160 03704c92d2b8fce1308a00a2ad7d5e26ac36d978 ogre-1.4.1.ebuild 2751
-SHA256 1c965e419aa498668188d229379b4b747b7a2ce2fe7f110f1201d1f57a878325 ogre-1.4.1.ebuild 2751
-MISC ChangeLog 5285 RMD160 b6f40708099c66c5bce1beb54c3933f918911456 SHA1 2b32dff8c528d9bfa5bc381803505ce71ce5111c SHA256 b554ab1f2535991864dfba04c95ff6f43b58ddbe4a7baad65f76f22aaa112b30
-MD5 78ee5f1e59fd0a30e52b854911d181fb ChangeLog 5285
-RMD160 b6f40708099c66c5bce1beb54c3933f918911456 ChangeLog 5285
-SHA256 b554ab1f2535991864dfba04c95ff6f43b58ddbe4a7baad65f76f22aaa112b30 ChangeLog 5285
+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
MISC metadata.xml 4236 RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf SHA1 de49ea9fb17aa117ce25f685ae76062bea60b91f SHA256 3d5b0d15c24a55959278cf092bb62bfd109da2db4fcc8a07a7c6ccf449624981
MD5 e7475f1eeda170514de47a940cb77420 metadata.xml 4236
RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf metadata.xml 4236
@@ -56,7 +56,7 @@ SHA256 1a2fe65c452205a11a1f66d906d06d8494affe57a2c628e96fca4b62956a2862 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGXIE4dz7hIScOURERAhRpAKCo0//NkGuZkmNFECJGtrdC21+CyACfXUZU
-db73jjN5bMG3HC0Y3NIowsw=
-=xqmk
+iD8DBQFGbeRJdz7hIScOURERAvwlAKCC0tz2mtMo1imVZSGQ11Jnx6xYiwCguHk1
+PTpyXOH81HlaBsAMPzqKdE4=
+=0vqX
-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/ogre-1.4.1.ebuild b/dev-games/ogre/ogre-1.4.1.ebuild
index 18f1e6f5d293..896397e306eb 100644
--- a/dev-games/ogre/ogre-1.4.1.ebuild
+++ b/dev-games/ogre/ogre-1.4.1.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.1 2007/05/29 19:38:19 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.1.ebuild,v 1.2 2007/06/12 00:09:31 nyhm Exp $
inherit eutils autotools
@@ -39,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
}