remove test useflag completely and disable build of tests wrt bug #412675

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 30 insertions, 14 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 93a61b921064..6c46b4b1541b 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.80 2012/06/13 07:03:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.81 2012/06/16 15:40:45 hasufell Exp $
+
+  16 Jun 2012; Julian Ospald <hasufell@gentoo.org> ogre-1.7.4-r1.ebuild,
+  ogre-1.8.0.ebuild:
+  remove test useflag completely and disable build of tests wrt bug #412675
 
   13 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> -ogre-1.7.4.ebuild:
   old
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 1a2413fe5c6d..dc2efab1be4a 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ogre-1.6.5-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a
 AUX ogre-1.6.5-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f
 AUX ogre-1.6.5-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
@@ -11,7 +14,18 @@ DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdb
 DIST ogre_src_v1-7-4.tar.bz2 67391570 RMD160 4259b45dc4b3c4f930053e0de5e4366eaf113840 SHA1 e989b96eacc2c66f8cf8a19dae6cfd962a165207 SHA256 afa475803d9e6980ddf3641dceaa53fcfbd348506ed67893c306766c166a4882
 DIST ogre_src_v1-8-0.tar.bz2 88682669 RMD160 0eaa5e6bd631b34326a0e49b351dbeece92aa9ab SHA1 0fa7afd1bd7915f33df0a7f96a0f55c2b01297ec SHA256 2f59de73b0717c5d2084285f2594a045a9240a8a53e5b38203419c4e715c8ba6
 EBUILD ogre-1.6.5.ebuild 2528 RMD160 d87bfb3747006d0d7efe6ceb7e54d4362159391e SHA1 21959afb4d5fbdd37e55c36927492d82a95aa05e SHA256 ee511ad5a6254238644a2ffa61f9b8889fecdf0ed7b946fb302ba6e3881bb510
-EBUILD ogre-1.7.4-r1.ebuild 2367 RMD160 8d5881353dacfcc8fa840c3d01e135a6f22cd603 SHA1 f54ea9f7e84dfbf99b4c70097d6cec740579110d SHA256 bfe3afc9e1a66936f184dac0e3e680b7654da07620865a296934f2d9fd9c2582
-EBUILD ogre-1.8.0.ebuild 2588 RMD160 cd5e368178fd8d919ba36b2bae43b7b6a2d95d2e SHA1 e3748229babbff688eabb9cb7799e6ededc19b8a SHA256 1911b3f6ec4b5e29ad76cb8d5868f027ebe1ab044f798f0c95c6ce81342a2c0d
-MISC ChangeLog 11633 RMD160 9335bc99d822c7d9bdeb6826baa3e406b2c2d67e SHA1 5ef06f7dffee37182dc9d4d356cf185d443ff212 SHA256 c01830d3e1c579cf17cb421173d0d105b15f5ca9780865f4ee6d239e5ca8d070
+EBUILD ogre-1.7.4-r1.ebuild 2323 RMD160 21d0f88b0465488467207823f5634c273f21c670 SHA1 34d3caeab0fd68f526bea1f88d2eee8f49e4adab SHA256 dff5c3e5ae25e81aa6e1df6c42e91f3b5b2600ac84bcd422d962ee16cbc05d44
+EBUILD ogre-1.8.0.ebuild 2538 RMD160 e5bbb2202890bc79fcb6b81ca0cf3bf5d57029de SHA1 f80e9f0c04c54cdb3e375b6aec84fd9bd27b6d1a SHA256 5433332c22b3c851382083609eb2a3c687afff26885f0a949b55cb6131b7867f
+MISC ChangeLog 11803 RMD160 15eacbdff425df228fabf49dde6657e7b6c34bb4 SHA1 60c1f87c6fbf5d85c247d12072975266bb6b2ead SHA256 863849c51f461845df287e8be2b51cdcf8c25a3095a03f3e78f0c60d1c3482e2
 MISC metadata.xml 5014 RMD160 c9a0b98bb110fbc4100c469fb1bddd82fecafbf9 SHA1 e55b3fed8028fb6dd46497cf759efbe9ed7f2727 SHA256 7ea0c9b0e56cadc41e0e1ac195ee058ac8abb176a3ac5b8ffb8363af12fd54d8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP3KhJAAoJEFpvPKfnPDWzkcEIAKZrtJTTds929xdB/V1pfpNL
+I5wM8fUT9NWiIz403qMYEp3xMqVbk2BhQhnceXqDd9TAhS0uqLmxqj6x5lziZCgO
+KeWjTRaM/xB17KQEYzA1f766l5GyXz3jHtildCtHdxbui0F5BhmK+iRwh4d3qqgz
+Nqkbk62A1VwilFYvKhvwJzWSHvAYBkUdtRi/T4i6FSMhRwpUlTGTfenerAJ9G36c
+l3JqyxDitWCssonOg4tixxejsStpdHXuxo7w3GLE9nmAqCYnPRUr98zTbFu+nKDA
+4aLqIsdGcjeEfuRxZef0gZEInKZ04FW6XcOKoB0lCwHRA2Uazszlso0tVvsirPk=
+=jMJs
+-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/ogre-1.7.4-r1.ebuild b/dev-games/ogre/ogre-1.7.4-r1.ebuild
index 04befd3fc1b4..6c88f8dd3645 100644
--- a/dev-games/ogre/ogre-1.7.4-r1.ebuild
+++ b/dev-games/ogre/ogre-1.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.7.4-r1.ebuild,v 1.2 2012/06/04 17:16:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.7.4-r1.ebuild,v 1.3 2012/06/16 15:40:45 hasufell Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="+boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb test threads tools +zip"
+IUSE="+boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb threads tools +zip"
 REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
 RESTRICT="test" #139905
 
@@ -37,8 +37,7 @@ RDEPEND="media-libs/freetype:2
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
+	doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/${PN}_src_v${MY_PV}
 
@@ -65,7 +64,7 @@ src_configure() {
 		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
 		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
 		$(cmake-utils_use profile OGRE_PROFILING)
-		$(cmake-utils_use test OGRE_BUILD_TESTS)
+		-DOGRE_BUILD_TESTS=FALSE
 		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
 		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
 		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
diff --git a/dev-games/ogre/ogre-1.8.0.ebuild b/dev-games/ogre/ogre-1.8.0.ebuild
index c3c689827110..4ebe1d2dad9e 100644
--- a/dev-games/ogre/ogre-1.8.0.ebuild
+++ b/dev-games/ogre/ogre-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.0.ebuild,v 1.3 2012/06/13 01:52:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.8.0.ebuild,v 1.4 2012/06/16 15:40:45 hasufell Exp $
 
 EAPI=4
 inherit eutils cmake-utils
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb test threads tools +zip"
+IUSE="+boost cg doc double-precision examples +freeimage gles2 ois +opengl poco profile tbb threads tools +zip"
 REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
 RESTRICT="test" #139905
 
@@ -38,8 +38,7 @@ RDEPEND="media-libs/freetype:2
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
+	doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/${PN}_src_v${MY_PV}
 
@@ -69,7 +68,7 @@ src_configure() {
 		-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
 		$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
 		$(cmake-utils_use profile OGRE_PROFILING)
-		$(cmake-utils_use test OGRE_BUILD_TESTS)
+		-DOGRE_BUILD_TESTS=FALSE
 		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
 		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
 		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)