Fixup virtualx.eclass usage in both ebuilds and eclass.

16 files changed, 25 insertions, 60 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 829061e27b5..a1ee468d0de 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -15,15 +15,9 @@
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
-#  Do we need an X server? Valid values are "always", "optional", and "manual".
-#  "tests" is a synonym for "optional". While virtualx.eclass supports in principle
-#  also the use of an X server during other ebuild phases, we only use it in
-#  src_test here. Most likely you'll want to set "optional", which introduces the
-#  use-flag "test" (if not already present), adds dependencies conditional on that
-#  use-flag, and automatically runs (only) the ebuild test phase with a virtual X server
-#  present. This makes things a lot more comfortable than the bare virtualx eclass.
-
-# In case the variable is not set in the ebuild, let virtualx eclass not do anything
+# For proper description see virtualx.eclass manpage.
+# Here we redefine default value to be manual, if your package needs virtualx
+# for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
 inherit kde4-functions base virtualx eutils
@@ -891,17 +885,8 @@ kde4-base_src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 
 	if [[ ${VIRTUALX_REQUIRED} == always ]] ||
-		( [[ ${VIRTUALX_REQUIRED} != manual ]] && use test ); then
-
-		if [[ ${maketype} ]]; then
-			# surprise- we are already INSIDE virtualmake!!!
-			ewarn "QA Notice: This version of kde4-base.eclass includes the virtualx functionality."
-			ewarn "           You may NOT set maketype or call virtualmake from the ebuild. Applying workaround."
-			cmake-utils_src_test
-		else
-			export maketype="cmake-utils_src_test"
-			virtualmake
-		fi
+			( [[ ${VIRTUALX_REQUIRED} != manual ]] && use test ); then
+		VIRTUALX_COMMAND="cmake-utils_src_test" virtualmake
 	else
 		cmake-utils_src_test
 	fi
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 1a551d89b55..f7800b8be06 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.5.94.1.tar.bz2 54327134 RMD160 b93fe8b53f70782ad14b5b9515395e7c5f69d97d SHA1 0243aa59c3acd9c38403b3acddb33c22c9c39c65 SHA256 83c5a37e332379d44fbae215ebf1fdff09cd45104f49c188a4c74b465df6d4ae
-EBUILD kmail-4.5.94.1.ebuild 1509 RMD160 3db405ea75d34b820050b82b486243d44e2c3f46 SHA1 76358f121f09059bcea0d08dd2f69061f019c48a SHA256 00befe41d8b0c563e2b25f19d1ad217ffa07270fcb899c2bc6984cdc16b904b4
-EBUILD kmail-4.6.9999.ebuild 1512 RMD160 7527f1222e557cc2e232659e57e0bb7b927f1ade SHA1 9de6e22313d4d2c7217d98657782329f870fa3d2 SHA256 ba47ed4c602987587ca28bb095bfcfcf82d1bb413cde33377cce956dec3243d4
-EBUILD kmail-9999.ebuild 1512 RMD160 7527f1222e557cc2e232659e57e0bb7b927f1ade SHA1 9de6e22313d4d2c7217d98657782329f870fa3d2 SHA256 ba47ed4c602987587ca28bb095bfcfcf82d1bb413cde33377cce956dec3243d4
+EBUILD kmail-4.5.94.1.ebuild 1508 RMD160 dd7576b3ca076ee15a38e649d3d848219e6b4bc9 SHA1 e9b7498779a04f1672a8f7971d0103100174d4cf SHA256 9f1e73fce7f31357f123efa96980bef6428991d032dedb340cb515546feafc75
+EBUILD kmail-4.6.9999.ebuild 1511 RMD160 e0665c4871f23ca59ac2ef30082546f2cdffe081 SHA1 38be7e4ccaee91742d4b316a641e0a90ae408746 SHA256 2ad2c3b61937164850c3d028baabdd8721ecdd668edec2a0d6263f29c7fd82a9
+EBUILD kmail-9999.ebuild 1511 RMD160 e0665c4871f23ca59ac2ef30082546f2cdffe081 SHA1 38be7e4ccaee91742d4b316a641e0a90ae408746 SHA256 2ad2c3b61937164850c3d028baabdd8721ecdd668edec2a0d6263f29c7fd82a9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kmail/kmail-4.5.94.1.ebuild b/kde-base/kmail/kmail-4.5.94.1.ebuild
index 339a8ec5b70..e998677eafe 100644
--- a/kde-base/kmail/kmail-4.5.94.1.ebuild
+++ b/kde-base/kmail/kmail-4.5.94.1.ebuild
@@ -6,7 +6,7 @@ EAPI=3
 
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
-VIRTUALX_REQUIRED=tests
+VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
diff --git a/kde-base/kmail/kmail-4.6.9999.ebuild b/kde-base/kmail/kmail-4.6.9999.ebuild
index 333f55392b1..1a4ad992fde 100644
--- a/kde-base/kmail/kmail-4.6.9999.ebuild
+++ b/kde-base/kmail/kmail-4.6.9999.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 KDE_SCM="git"
-VIRTUALX_REQUIRED=tests
+VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
diff --git a/kde-base/kmail/kmail-9999.ebuild b/kde-base/kmail/kmail-9999.ebuild
index 333f55392b1..1a4ad992fde 100644
--- a/kde-base/kmail/kmail-9999.ebuild
+++ b/kde-base/kmail/kmail-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 KDE_HANDBOOK="optional"
 KMNAME="kdepim"
 KDE_SCM="git"
-VIRTUALX_REQUIRED=tests
+VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index e797585e593..a60a73a6496 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,3 +1,3 @@
-EBUILD ksysguard-4.6.9999.ebuild 963 RMD160 563cb7eb788bc11cc9d38b80c391085308f958c3 SHA1 ff8a39810b32aecf1b31e769f5c6c12f349cace1 SHA256 53dd1b3f8fd15518ed0f887e725a8b9b665d460c091a76b4588b139fe1baeb49
-EBUILD ksysguard-9999.ebuild 963 RMD160 563cb7eb788bc11cc9d38b80c391085308f958c3 SHA1 ff8a39810b32aecf1b31e769f5c6c12f349cace1 SHA256 53dd1b3f8fd15518ed0f887e725a8b9b665d460c091a76b4588b139fe1baeb49
+EBUILD ksysguard-4.6.9999.ebuild 957 RMD160 f679f6be2d9e21499598cc685a7d803418b86f42 SHA1 d4c152b71e560b6c32ad44be659e979fe1f7d499 SHA256 d81df12e7c1e434de361427072e87b5b3aeb43a7bcf99431caf68d6a2c0c5fcb
+EBUILD ksysguard-9999.ebuild 957 RMD160 f679f6be2d9e21499598cc685a7d803418b86f42 SHA1 d4c152b71e560b6c32ad44be659e979fe1f7d499 SHA256 d81df12e7c1e434de361427072e87b5b3aeb43a7bcf99431caf68d6a2c0c5fcb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/ksysguard/ksysguard-4.6.9999.ebuild b/kde-base/ksysguard/ksysguard-4.6.9999.ebuild
index ea55ee94978..f346b268475 100644
--- a/kde-base/ksysguard/ksysguard-4.6.9999.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.6.9999.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 KDE_HANDBOOK="optional"
 KMNAME="kdebase-workspace"
 CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED="optional"
+VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
diff --git a/kde-base/ksysguard/ksysguard-9999.ebuild b/kde-base/ksysguard/ksysguard-9999.ebuild
index ea55ee94978..f346b268475 100644
--- a/kde-base/ksysguard/ksysguard-9999.ebuild
+++ b/kde-base/ksysguard/ksysguard-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 KDE_HANDBOOK="optional"
 KMNAME="kdebase-workspace"
 CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED="optional"
+VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KSysguard is a network enabled task manager and system monitor application."
diff --git a/kde-base/ksystemlog/Manifest b/kde-base/ksystemlog/Manifest
index 8a9624567bd..3bbd5aced99 100644
--- a/kde-base/ksystemlog/Manifest
+++ b/kde-base/ksystemlog/Manifest
@@ -1,3 +1,3 @@
-EBUILD ksystemlog-4.6.9999.ebuild 794 RMD160 6f60447f695fdebcb9da1c81c5f4b48fbd3939d8 SHA1 72057b31fcdf8fcf1d95e40d3b40f91c6d979af8 SHA256 17fd37d00a2e426a284b66a393f783d228ac6988a57e8dffef4d678163c8fbb5
-EBUILD ksystemlog-9999.ebuild 794 RMD160 6f60447f695fdebcb9da1c81c5f4b48fbd3939d8 SHA1 72057b31fcdf8fcf1d95e40d3b40f91c6d979af8 SHA256 17fd37d00a2e426a284b66a393f783d228ac6988a57e8dffef4d678163c8fbb5
+EBUILD ksystemlog-4.6.9999.ebuild 793 RMD160 7ba0a2882a654370471f795cf678db0ee494f9d2 SHA1 9b56062abd9575e7016efab8033fbe27f21190b1 SHA256 039a296c475d418402ed78ff143f1f4c119d8962fc37e309d2e04154f8ff6eac
+EBUILD ksystemlog-9999.ebuild 793 RMD160 7ba0a2882a654370471f795cf678db0ee494f9d2 SHA1 9b56062abd9575e7016efab8033fbe27f21190b1 SHA256 039a296c475d418402ed78ff143f1f4c119d8962fc37e309d2e04154f8ff6eac
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/ksystemlog/ksystemlog-4.6.9999.ebuild b/kde-base/ksystemlog/ksystemlog-4.6.9999.ebuild
index 1d8a2de9e41..b6bb62187e8 100644
--- a/kde-base/ksystemlog/ksystemlog-4.6.9999.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-4.6.9999.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"
 
-VIRTUALX_REQUIRED=tests
+VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KDE system log viewer"
diff --git a/kde-base/ksystemlog/ksystemlog-9999.ebuild b/kde-base/ksystemlog/ksystemlog-9999.ebuild
index 1d8a2de9e41..b6bb62187e8 100644
--- a/kde-base/ksystemlog/ksystemlog-9999.ebuild
+++ b/kde-base/ksystemlog/ksystemlog-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 KDE_HANDBOOK="optional"
 KMNAME="kdeadmin"
 
-VIRTUALX_REQUIRED=tests
+VIRTUALX_REQUIRED=test
 inherit kde4-meta
 
 DESCRIPTION="KDE system log viewer"
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 978f0d5c9aa..d594c22f413 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,2 +1,2 @@
-EBUILD basket-9999.ebuild 617 RMD160 e328d293f76268803d9cf8a760ea2a8878c03426 SHA1 0b463bf7c564e351061747411b2058e65e2da904 SHA256 12dacdc4d4ae6c2a23dfc2043d8c5b5d59689e47716237fa4f1e383b6688d4b8
+EBUILD basket-9999.ebuild 616 RMD160 d6e8c0b584647ed2983040f3f590c867be37f8da SHA1 069161196d284a74b0bb51feba8b727947361bc5 SHA256 0cf8ed666060ee475d9e936ecd52dcf7ef2e8bf98c7417dee10ef980049bd067
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild
index 5ffb1855ac1..e6ab6561779 100644
--- a/kde-misc/basket/basket-9999.ebuild
+++ b/kde-misc/basket/basket-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=3
 
-VIRTUALX_REQUIRED=tests
+VIRTUALX_REQUIRED=test
 KDE_SCM="git"
 inherit kde4-base
 
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest
index 0ef49a10d4d..3dc3178f72d 100644
--- a/net-libs/libktorrent/Manifest
+++ b/net-libs/libktorrent/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST libktorrent-1.1rc1.tar.bz2 967260 RMD160 7088434a3bc6f84efec9d16748ed4cc622f29169 SHA1 bdee33f803f6fa80efae80d81c9e135ea89bf371 SHA256 6392c77946fd523904cdd29148264fdd0b5bbcbd4abe07cecbf9ee00f2f1d1b4
-EBUILD libktorrent-1.1_rc1.ebuild 1335 RMD160 dd9f435ba267cbc573de07ce894a3f9a7cfb89c1 SHA1 9b622986bb2e5538d39de24d8c7ce9accbeb2b04 SHA256 6551793ab52fe2071540a4bf4879a2dbd7ad5b1ee8d74c29b50e93ea72a6f89e
-EBUILD libktorrent-9999.ebuild 1355 RMD160 8371be9a4444403d933d88a443b125a07466de6f SHA1 e780a6d2a33c74d6fbd5bb9159a1c6868c9c51e6 SHA256 b6a3cd2f4b5992a5f3d01adb34639b40f90fbb6e2a381fd05b09f8d8bb0e3e98
+EBUILD libktorrent-1.1_rc1.ebuild 1331 RMD160 3d93aeb1480dbfc92ad10bba5c3a52a444056691 SHA1 3636ad5bc4f3a62aa02cf96b0773692d491cb602 SHA256 be107ad78c583b25f21c9e0e7507eafc33117d1953f25afae41729fd64e07d3e
+EBUILD libktorrent-9999.ebuild 1351 RMD160 55b8c728788bfced3b68315d7e1b0a5e13b5fe04 SHA1 23cbdd962549ff384ad671817d259cd6f0b4d9a6 SHA256 940e7988099846034067965b0d37568d30cce7a04ae8065c9dba49f1d23de33b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNXtctAAoJENwGBM22xffeiP0P/jI1yN4q3R97GoKZugSl+R5T
-woQ7sNNmse9ofPgcrFTfTXS6Ad4bgSQc6AmnwEzmPvF8Ke/Q2trSwSMo6lak0/kA
-NRK1N7vZoaaTa6ulwmt7Ioqu98cH8hLaDcmv8N2/dyLMgBM6M5CE1vNbXk1oVIIR
-hwwtn7jhW5cvMMmVzlqW5PM2ZdFSI36owFtHPWWrBSHx9Imus2UhtaAdRJJ0iUl/
-LL2W2siwny0XvqUDnlr2j7zXEUkXhyND2bjbZVzQ1NB5p+it+OOZmj2nYgLw+/Bk
-O+zuP+5+moiuv7cxjvD9UDlQJRds9x5/Wq0vMFsXHSBk+AlTaNMbV1eWI1lZ9QVZ
-cCROdARxz9ZfuNAYQoTHnR4x2WMvNUSk6vzNQHvFqldVYUFsgVcH0L2b+AdhotPe
-B8A9jXmGEuCo16yaUbdZdDpz39d+IEkySpBowdSY490PuNbdweFpLVx0atgjC/3b
-0VN6CUiCHfzX9CnKMxenOqiY9FtAZS4TtovorJIgvW11pOqoCtf3uEuRi4QaRS42
-vmAb2oybD3OgeYw2LgRP2RkYS/rQNKCyyVzZ5HHQ/JjzXQBneVWysV2xE4FrsEeK
-YSXm+65vRuz/3NHsFIPtrcqFfivBefqChB+kUGFiKIPpniPkGUKT+/zrL/VeZO6Z
-R5wn8n9bMn17Xp5e9ffo
-=9t98
------END PGP SIGNATURE-----
diff --git a/net-libs/libktorrent/libktorrent-1.1_rc1.ebuild b/net-libs/libktorrent/libktorrent-1.1_rc1.ebuild
index a50e1f97157..7ad17a8059b 100644
--- a/net-libs/libktorrent/libktorrent-1.1_rc1.ebuild
+++ b/net-libs/libktorrent/libktorrent-1.1_rc1.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} != 9999* ]]; then
 	SRC_URI="http://ktorrent.org/downloads/${KTORRENT_VERSION}/${MY_P}.tar.bz2"
 	S="${WORKDIR}"/"${MY_P}"
 fi
-VIRTUALX_REQUIRED=optional
+VIRTUALX_REQUIRED=test
 inherit kde4-base
 
 DESCRIPTION="A BitTorrent library based on KDE Platform"
diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild b/net-libs/libktorrent/libktorrent-9999.ebuild
index 21aebf56e5e..f7253e16087 100644
--- a/net-libs/libktorrent/libktorrent-9999.ebuild
+++ b/net-libs/libktorrent/libktorrent-9999.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} != 9999* ]]; then
 else
 	KEYWORDS=""
 fi
-VIRTUALX_REQUIRED=optional
+VIRTUALX_REQUIRED=test
 inherit kde4-base
 
 DESCRIPTION="A BitTorrent library based on KDE Platform"