6 files changed, 12 insertions, 52 deletions
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
-}