Fix src_test usage (no need for separate configure phase for src_test since it won't work anyway)

14 files changed, 33 insertions, 98 deletions

diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest
index cb978c2a352..18fa223d6e3 100644
--- a/app-admin/packagekit/Manifest
+++ b/app-admin/packagekit/Manifest
@@ -1,4 +1,4 @@
 AUX packagekit-0.6.6-portage.patch 15486 RMD160 85a94d81eda41829d37fefe728820a5b9309628d SHA1 62e34e43c4ae58835637b8c0e84670d66806c700 SHA256 5c350301b3338262cc6fe947e12f7f3d6f11e0f66dba77865535796a999ab443
 DIST PackageKit-0.6.6.tar.gz 9401600 RMD160 cf785c21835292abc97ec8a4dfdceaff877f19fb SHA1 4c88dc3efad0b5aac67676fdb6fbc21084e5a75d SHA256 29b5aad5006c287088d14f311a946ed77fce16861f519fbb65a2cd99dff700b1
-EBUILD packagekit-0.6.6-r1.ebuild 4133 RMD160 829ea034de8e4752132e4ba211c1166e94da6069 SHA1 35d151f515992e42103357abde609423361fcd08 SHA256 d528b2bdf4ccc8cb70a4eb8fe34329b853ee4e40a656bfbf6974ce0c04b028e9
+EBUILD packagekit-0.6.6-r1.ebuild 4021 RMD160 2ca9b2dc74a07636ffd91caa988108682ddf0e39 SHA1 1c376518da9091f3ace6814d203d8af3565a7ac3 SHA256 7295cf2ea1c82684c38aa7c6bc9e1477c1108be0541bce42356dcc7b6a90f508
 MISC metadata.xml 518 RMD160 16fe8423974308cb5aada028f4e5539c7303b497 SHA1 bf062ca3e3e364170d7553c281183cfc4cc2b197 SHA256 45d905f5f8d4fec32e74175e373a0e0b7ebcbd0f5f93e6cd1a266c12daa0e548
diff --git a/app-admin/packagekit/packagekit-0.6.6-r1.ebuild b/app-admin/packagekit/packagekit-0.6.6-r1.ebuild
index fa8f96f1bb6..ede69c0ff6e 100644
--- a/app-admin/packagekit/packagekit-0.6.6-r1.ebuild
+++ b/app-admin/packagekit/packagekit-0.6.6-r1.ebuild
@@ -127,6 +127,7 @@ src_configure() {
 		$(use_enable nsplugin browser-plugin)
 		$(use_enable pm-utils)
 		$(use_enable qt4 qt)
+		$(use_enable test tests)
 		$(use_enable udev device-rebind)
 	)
 
@@ -150,16 +151,6 @@ src_install() {
 	python_clean_installation_image -q
 }
 
-src_test() {
-	myeconfargs+=(
-		--enable-tests
-	)
-
-	autotools-utils_src_configure
-	autotools-utils_src_compile
-	autotools-utils_src_test
-}
-
 pkg_postinst() {
 	python_mod_optimize -q "$(python_get_sitedir)/${PN}"
 
diff --git a/app-misc/strigi/Manifest b/app-misc/strigi/Manifest
index f9b669fd94d..7bcb722f4a4 100644
--- a/app-misc/strigi/Manifest
+++ b/app-misc/strigi/Manifest
@@ -1,2 +1,2 @@
-EBUILD strigi-9999.ebuild 2347 RMD160 e355b5ef0a03a4ed11235c549de11e595e59ff5d SHA1 353df218dd6c0aaeb03ed46a18780745f3621c10 SHA256 f3ae874d9b61811f14fde2d16f8e44efabf1f468921daa37c1ffdb2c71ce6733
+EBUILD strigi-9999.ebuild 2262 RMD160 c3251143e908c25fa0587b0c0fe8425f17f7af5c SHA1 7304018a89804a456875d2309e2dcf81fc272a34 SHA256 0747b7f7f2a2bcf0e5ba89ad4be48e0d09c4971745d863e00693e05ea048b32f
 MISC metadata.xml 486 RMD160 6eb5e37e0646dc21260e2938d9aa6286489e10cd SHA1 d600420837886e1d487266009b803ca76643c571 SHA256 2a4f8b7f0572075a608b0a3fb2e62321b4dbdd61b231cf72218246f0351cda12
diff --git a/app-misc/strigi/strigi-9999.ebuild b/app-misc/strigi/strigi-9999.ebuild
index ebb5a6e4668..48da8f92447 100644
--- a/app-misc/strigi/strigi-9999.ebuild
+++ b/app-misc/strigi/strigi-9999.ebuild
@@ -65,6 +65,7 @@ src_configure() {
 		$(cmake-utils_use_enable inotify)
 		$(cmake-utils_use_enable log LOG4CXX)
 		$(cmake-utils_use_enable qt4)
+		$(cmake-utils_use_enable test CPPUNIT)
 		$(cmake-utils_use_enable xine)
 	)
 
@@ -75,13 +76,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_test() {
-	mycmakeargs+=(-DENABLE_CPPUNIT=ON)
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
-
 pkg_postinst() {
 	if ! use clucene && ! use hyperestraier; then
 		echo
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index b8329b1868f..5a710d66e44 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1,2 @@
-EBUILD skrooge-9999.ebuild 703 RMD160 5a03456a96754422c79ac6ae891efd489addff56 SHA1 358afaae279ddcec97f9d6c25d78b9ee4551426a SHA256 38742a404e213a54bb6747e4607806ea7dabc875a146600c0159f3ad365592ae
+EBUILD skrooge-9999.ebuild 735 RMD160 89aa9d120847847129ac10857be0521e04acf160 SHA1 f3a3bc3eacee82a764ccf05a939d9cc54685be3e SHA256 ed4c3fa808c852642d229c7cd074e6a9a33dd4e937f39664063af6949b85ff72
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/app-office/skrooge/skrooge-9999.ebuild b/app-office/skrooge/skrooge-9999.ebuild
index f4479330ad0..9583dd8a3a2 100644
--- a/app-office/skrooge/skrooge-9999.ebuild
+++ b/app-office/skrooge/skrooge-9999.ebuild
@@ -18,13 +18,16 @@ KEYWORDS=""
 SLOT="4"
 IUSE="debug test"
 
-DEPEND="dev-libs/libofx
+DEPEND="
 	app-crypt/qca:2
-	x11-libs/qt-sql[sqlite]"
+	dev-libs/libofx
+	x11-libs/qt-sql[sqlite]
+"
+RDEPEND="${DEPEND}"
 
-src_test() {
-	mycmakeargs+="
+src_configure() {
+	mycmakeargs=(
 		$(cmake-utils_use test SKG_BUILD_TEST)
-	"
-	kde4-base_src_test
+	)
+	kde4-base_src_configure
 }
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 63164dfefc2..b1a9574a8b7 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,2 +1,2 @@
-EBUILD eigen-9999.ebuild 1504 RMD160 3b4d34f92e5d903816da51c150880f3b8427e9ad SHA1 106adb6031d3e7464b821e860e7019934169d2ae SHA256 2222816f2ec1276d974b30c137393dd2bf0b1e1e18cdc4f70decc5ba03311ec7
+EBUILD eigen-9999.ebuild 1341 RMD160 75b6c1227ba8bd89f8f015e65ef3bc5ecb11fe15 SHA1 455a26f53871059b59651999c53095338008ab50 SHA256 dbd15f7a5e5347ed7500f6dc6f032a3f5d1e6ecc94fb643d1738f60c67186e7b
 MISC metadata.xml 620 RMD160 5e24e438e3a9501381b1cab57dcaf29f8cff8374 SHA1 419bbd39ba071fb7ed3588903419ceadf9833a36 SHA256 35dc30130eccec1771de4dd1392b86fc2d6451bcac10babb0ccf5a5e71aad593
diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild
index 89212799b5f..a77118c5c58 100644
--- a/dev-cpp/eigen/eigen-9999.ebuild
+++ b/dev-cpp/eigen/eigen-9999.ebuild
@@ -14,7 +14,7 @@ EHG_REPO_URI="https://bitbucket.org/eigen/eigen"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="3"
-IUSE="debug doc examples"
+IUSE="debug doc examples test"
 
 RDEPEND="
 	examples? (
@@ -36,34 +36,21 @@ src_configure() {
 		-DEIGEN_BUILD_LIB=OFF
 		-DEIGEN_BUILD_BTL=OFF
 		$(cmake-utils_use examples EIGEN_BUILD_DEMOS)
+		$(cmake-utils_use test EIGEN_BUILD_TESTS)
+		$(cmake-utils_use test EIGEN_TEST_NO_FORTRAN)
 	)
 	cmake-utils_src_configure
 }
 
 src_compile() {
 	cmake-utils_src_compile
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		emake doc || die "building documentation failed"
-	fi
-}
-
-src_test() {
-	mycmakeargs+=(
-		-DEIGEN_BUILD_TESTS=ON
-		-DEIGEN_TEST_NO_FORTRAN=ON
-	)
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
+	use doc && cmake-utils_src_compile doc
 }
 
 src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/doc/html/")
 	cmake-utils_src_install
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"/doc
-		dohtml -r html/* || die "dohtml failed"
-	fi
+
 	if use examples; then
 		cd "${CMAKE_BUILD_DIR}"/demos
 		dobin mandelbrot/mandelbrot opengl/quaternion_demo || die "dobin failed"
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 943cf41c712..7c8e62b6a6c 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,4 +1,4 @@
 DIST grantlee-0.1.4.tar.gz 615750 RMD160 eeacb95a925c73d7035ab6e15408a3150c37b9c2 SHA1 dd01a00547ba17b7a32e78264d71389ae5c26b61 SHA256 84880177c9626c404cbaad9f13fdf5cd3bfb6f5b02963d02245a3da25aa4d2eb
-EBUILD grantlee-0.1.4.ebuild 1043 RMD160 057ed33fabd14bcf00fe43ca0fcb468ea4b56cd4 SHA1 28f7987f439dd96eee6296762690c1918fe58ccd SHA256 5063973eabeb63ceb0f4fd85100e853d1f6fd15aac139d3381fb4d7755c05210
-EBUILD grantlee-9999.ebuild 1042 RMD160 5e70eb8ad9eec03768a56ad3888f3274af602328 SHA1 88f3f9fefcacd50ed44286c6c89a5415082a219d SHA256 a20033ffa0840b2a80ecd1dba4e2d6cb773142db3b94a3b57198404763641193
+EBUILD grantlee-0.1.4.ebuild 937 RMD160 ae1a7310631458123829a79d3820018fa964e24a SHA1 3d11bfd518fd7c889cb630e51dc2d2fb09b07a9b SHA256 a0d77814c6fcbe280d86d7eae509c2dcd6127f17213d856f12404e152da805fc
+EBUILD grantlee-9999.ebuild 936 RMD160 dbea2b6bc3be1d2b5eac58ac6aedef7d886f9f3f SHA1 5fb67ef72da501edb97e9e7e98a597d20e094385 SHA256 668c7169653e77c35abe4d7f824576c85dc38cac73f5eeb045508ddc0e5142b7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-libs/grantlee/grantlee-0.1.4.ebuild b/dev-libs/grantlee/grantlee-0.1.4.ebuild
index 8ed02d04ba7..a2c8ada1c0d 100644
--- a/dev-libs/grantlee/grantlee-0.1.4.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="debug doc"
+IUSE="debug doc test"
 
 COMMON_DEPEND="
 	>=x11-libs/qt-core-4.5.0:4
@@ -29,7 +29,7 @@ DOCS=(AUTHORS CHANGELOG GOALS README)
 
 src_configure() {
 	mycmakeargs=(
-		-DBUILD_TESTS=OFF
+		$(cmake-utils_use_build test TESTS)
 	)
 
 	cmake-utils_src_configure
@@ -46,13 +46,3 @@ src_install() {
 
 	cmake-utils_src_install
 }
-
-src_test() {
-	mycmakeargs+=(
-		-DBUILD_TESTS=ON
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index 54a6fd5423b..d28ac27fb35 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://gitorious.org/grantlee/grantlee.git"
 LICENSE="LGPL-2.1"
 KEYWORDS=""
 SLOT="0"
-IUSE="debug doc"
+IUSE="debug doc test"
 
 COMMON_DEPEND="
 	>=x11-libs/qt-core-4.5.0:4
@@ -29,7 +29,7 @@ DOCS=(AUTHORS CHANGELOG GOALS README)
 
 src_configure() {
 	mycmakeargs=(
-		-DBUILD_TESTS=OFF
+		$(cmake-utils_use_build test TESTS)
 	)
 
 	cmake-utils_src_configure
@@ -46,13 +46,3 @@ src_install() {
 
 	cmake-utils_src_install
 }
-
-src_test() {
-	mycmakeargs+=(
-		-DBUILD_TESTS=ON
-	)
-
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
diff --git a/dev-libs/soprano/Manifest b/dev-libs/soprano/Manifest
index 31d3209cb1e..6630e006df0 100644
--- a/dev-libs/soprano/Manifest
+++ b/dev-libs/soprano/Manifest
@@ -1,5 +1,5 @@
 AUX soprano-2.4.4-make-broken-redland-fatal.cmake 664 RMD160 cc2ad8117dd3202f38c7c3273506671a31c7a55b SHA1 64550959420cb2ec429c77a7f7ba6a1813343c6d SHA256 cabff4156ec94222573bdd7be5c387298ab89838b682cfb7ce0a59f4949a31ae
 DIST soprano-2.5.0.tar.bz2 1944118 RMD160 4399c53dc625869d90b6757843e3adab46340ca6 SHA1 a52aa29d3f652aa43c116d35cdae7469d8fa72c0 SHA256 b65b2485b921a1823cad557b13782e395af3f9ba41def0c4ab26ebd939d4e005
-EBUILD soprano-2.5.0.ebuild 3075 RMD160 d3af7562ac4cb764ed00f8b3b1e505ed4de34c8e SHA1 89548179faf19d9b669ac5a2c5e40197f8f4f89a SHA256 513b4f8e6ee2621d3189df31c57bed111bebe00aac27919be2cdd7d7245db2e7
-EBUILD soprano-9999.ebuild 2917 RMD160 7b915fc0606563f9a4d84e0c7a736069218783e7 SHA1 d22a51db3b5369e7c78c6dd3b9a75127df5a9c8e SHA256 39b46cbec75a8633c08a5932de5bda17ecb44a06d28b6f3a1fa9899226228981
+EBUILD soprano-2.5.0.ebuild 2946 RMD160 e202b2e6b9d4e4c7eb75d4849eca8b3aa15b2a0a SHA1 8f662855cc867796a451c52a15d491f59ce7d54d SHA256 41ad713a93e55fc7dee09cc8ab7e9bae06711e1ce1860ff4109346ccdfd59e89
+EBUILD soprano-9999.ebuild 2788 RMD160 94d8422fcd3a9754412621c67fb6bcb6816ade04 SHA1 691dfeb631569d46184118906f830b9f4707c8db SHA256 d5157774153ba852bbe22039039eaf5c90832c1c1d0bfb1fc488314c1dd7f3e8
 MISC metadata.xml 661 RMD160 4cc052a1f0507d9ea45b3dc36c0d1319cd5d6801 SHA1 ccb365c5b898290244b5ea3c66fa938fb327cce6 SHA256 e06e233e003c202ac8257cdc080eb6380dc6b78166554c54fe72cee5ba39619b
diff --git a/dev-libs/soprano/soprano-2.5.0.ebuild b/dev-libs/soprano/soprano-2.5.0.ebuild
index 9c78fdccd19..a4c6e0fb3ab 100644
--- a/dev-libs/soprano/soprano-2.5.0.ebuild
+++ b/dev-libs/soprano/soprano-2.5.0.ebuild
@@ -5,7 +5,7 @@
 EAPI="2"
 
 JAVA_PKG_OPT_USE="java"
-inherit base cmake-utils flag-o-matic java-pkg-opt-2
+inherit base java-pkg-opt-2 cmake-utils flag-o-matic
 
 DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
 HOMEPAGE="http://sourceforge.net/projects/soprano"
@@ -90,18 +90,8 @@ src_configure() {
 		$(cmake-utils_use !java SOPRANO_DISABLE_SESAME2_BACKEND)
 		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
+		$(cmake-utils_use test SOPRANO_BUILD_TESTS)
 	)
 
 	cmake-utils_src_configure
 }
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	mycmakeargs+=(-DSOPRANO_BUILD_TESTS=ON)
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}
diff --git a/dev-libs/soprano/soprano-9999.ebuild b/dev-libs/soprano/soprano-9999.ebuild
index 434b633c6e3..5c760d4d023 100644
--- a/dev-libs/soprano/soprano-9999.ebuild
+++ b/dev-libs/soprano/soprano-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="2"
 
 JAVA_PKG_OPT_USE="java"
-inherit base cmake-utils flag-o-matic subversion java-pkg-opt-2
+inherit base java-pkg-opt-2 cmake-utils flag-o-matic subversion
 
 DESCRIPTION="Library that provides a nice Qt interface to RDF storage solutions"
 HOMEPAGE="http://sourceforge.net/projects/soprano"
@@ -90,18 +90,8 @@ src_configure() {
 		$(cmake-utils_use !java SOPRANO_DISABLE_SESAME2_BACKEND)
 		$(cmake-utils_use !virtuoso SOPRANO_DISABLE_VIRTUOSO_BACKEND)
 		$(cmake-utils_use doc SOPRANO_BUILD_API_DOCS)
+		$(cmake-utils_use test SOPRANO_BUILD_TESTS)
 	)
 
 	cmake-utils_src_configure
 }
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	mycmakeargs+=(-DSOPRANO_BUILD_TESTS=ON)
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
-}