Fix failiture with FEATURES=test. Per bug #269011.

5 files changed, 15 insertions, 119 deletions

diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 22df6a78312..8f89b884eb2 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,6 +1,5 @@
-EBUILD kde-env-4.2.2.ebuild 2980 RMD160 48303ea81b9b487d520354776d402ade7892f5ca SHA1 9b01b94635ed70134346c95b94a11a44b3a716de SHA256 9174c80f8c53f121494f833306920545b95a5776ee0a5c7cc6fbf3ad9485de99
-EBUILD kde-env-4.2.85.ebuild 2980 RMD160 48303ea81b9b487d520354776d402ade7892f5ca SHA1 9b01b94635ed70134346c95b94a11a44b3a716de SHA256 9174c80f8c53f121494f833306920545b95a5776ee0a5c7cc6fbf3ad9485de99
-EBUILD kde-env-4.2.9999.ebuild 2975 RMD160 7df57a5ea3fab4c9fc3c30cd1da6f27f44bc7f72 SHA1 014daff4523d28f0f93f2c9b5e7c2672cc7fbbf3 SHA256 3e93d9b79e8890140af09cd86dde7103b91eb7c32c8a58d021274412f9e106a3
-EBUILD kde-env-9999.ebuild 2975 RMD160 7df57a5ea3fab4c9fc3c30cd1da6f27f44bc7f72 SHA1 014daff4523d28f0f93f2c9b5e7c2672cc7fbbf3 SHA256 3e93d9b79e8890140af09cd86dde7103b91eb7c32c8a58d021274412f9e106a3
+EBUILD kde-env-4.2.85.ebuild 2999 RMD160 79fd15dcf1526dadf8dbbb531c4286ee37d07884 SHA1 789286fd712a9579213895827c2f3c676523ab1b SHA256 d837b39a2c23c05dff738314fc8eaa5272601458abe7c61a7b1b6ea3847c6bfe
+EBUILD kde-env-4.2.9999.ebuild 2994 RMD160 9713c32c1a0b0dac389dd72585b8bc8bbe89247d SHA1 c1919ee973772a42a48419c05a7de1fad8cd5d73 SHA256 8c489f1631e9f2f1af7b978e332eb26fd217e80cef734c621574b6e03fbc7591
+EBUILD kde-env-9999.ebuild 2994 RMD160 9713c32c1a0b0dac389dd72585b8bc8bbe89247d SHA1 c1919ee973772a42a48419c05a7de1fad8cd5d73 SHA256 8c489f1631e9f2f1af7b978e332eb26fd217e80cef734c621574b6e03fbc7591
 MISC ChangeLog 1979 RMD160 e165dd5c3996b6ee9110c4c2396965f43f7e91e8 SHA1 4291a5aa4a738e57ee3da9f2dbfa663aec88faa1 SHA256 a23b014fd63d37b1f0da654470e7807f5ea7e4a50c719b1b48217c798f85c84a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kde-env/kde-env-4.2.2.ebuild b/kde-base/kde-env/kde-env-4.2.2.ebuild
deleted file mode 100644
index 0a953e2f724..00000000000
--- a/kde-base/kde-env/kde-env-4.2.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit kde4-base
-
-DESCRIPTION="Environment setting required for all KDE4 apps to run."
-HOMEPAGE="http://kde.org"
-SRC_URI=""
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="as-is"
-IUSE=""
-
-RDEPEND="
-	!kdeprefix? (
-		!kde-base/kdelibs:4.1
-		!<=kde-base/kdelibs-4.2.2-r1:4.2
-		!<=kde-base/kdelibs-4.2.70:4.3
-	)
-	kdeprefix? ( !<kde-base/kdelibs-${PV}:${SLOT} )
-"
-
-src_unpack() {
-	:
-}
-
-src_prepare() {
-	:
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /etc/env.d
-	dodir /etc/revdep-rebuild
-	dodir "${PREFIX}"/share/config
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	if use kdeprefix; then
-
-		cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
-PATH="${PREFIX}/bin"
-ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
-LDPATH="${_libdirs}"
-MANPATH="${PREFIX}/share/man"
-CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
-#KDE_IS_PRELINKED=1
-PKG_CONFIG_PATH="${PREFIX}/$(get_libdir)/pkgconfig"
-XDG_DATA_DIRS="${PREFIX}/share"
-KDEDIRS="/usr"
-EOF
-		doenvd "${T}"/43kdepaths-${SLOT}
-		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-
-		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > "${D}/${PREFIX}/share/config/kdeglobals"
-[Directories][\$i]
-dir_data=${PREFIX}/share/apps:/usr/share/apps
-dir_html=${PREFIX}/share/doc/HTML:/usr/share/doc/HTML
-dir_icon=${PREFIX}/share/icons:/usr/share/icons
-dir_config=${PREFIX}/share/config:/usr/share/config
-dir_pixmap=${PREFIX}/share/pixmaps:/usr/share/pixmaps
-dir_apps=${PREFIX}/share/applications:/usr/share/applications
-dir_sound=${PREFIX}/share/sounds:/usr/share/sounds
-dir_locale=${PREFIX}/share/locale:/usr/share/locale
-dir_services=${PREFIX}/share/kde4/services:/usr/share/kde4/services
-dir_servicetypes=${PREFIX}/share/kde4/servicetypes:/usr/share/kde4/servicetypes
-dir_mime=${PREFIX}/share/mime:/usr/share/mime
-dir_templates=${PREFIX}/share/templates:/usr/share/templates
-dir_exe=${PREFIX}/$(get_libdir)/kde4/libexec:${PREFIX}/bin:/usr/$(get_libdir)/kde4/libexec:/usr/bin
-dir_module=${PREFIX}/$(get_libdir)/kde4:/usr/$(get_libdir)/kde4
-dir_qtplugins=${PREFIX}/$(get_libdir)/kde4/plugins:/usr/$(get_libdir)/kde4/plugins
-dir_kcfg=${PREFIX}/share/config.kcfg:/usr/share/config.kcfg
-dir_lib=${PREFIX}/$(get_libdir):/usr/$(get_libdir)
-EOF
-
-	else
-
-		# Much simpler for the FHS compliant -kdeprefix install
-		cat <<-EOF > "${T}"/43kdepaths # number goes down with version
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-		EOF
-		doenvd "${T}"/43kdepaths
-
-		# Simpler kdeglobals
-		cat <<-EOF > "${D}/usr/share/config/kdeglobals"
-[Directories][\$i]
-dir_apps=/usr/share/applications
-dir_mime=/usr/share/mime
-EOF
-
-	fi
-}
-
-pkg_preinst() {
-	:
-}
diff --git a/kde-base/kde-env/kde-env-4.2.85.ebuild b/kde-base/kde-env/kde-env-4.2.85.ebuild
index 0a953e2f724..b5bfdbde660 100644
--- a/kde-base/kde-env/kde-env-4.2.85.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.85.ebuild
@@ -113,3 +113,7 @@ EOF
 pkg_preinst() {
 	:
 }
+
+src_test() {
+	:
+}
diff --git a/kde-base/kde-env/kde-env-4.2.9999.ebuild b/kde-base/kde-env/kde-env-4.2.9999.ebuild
index f16b45a1415..f03bd4483b3 100644
--- a/kde-base/kde-env/kde-env-4.2.9999.ebuild
+++ b/kde-base/kde-env/kde-env-4.2.9999.ebuild
@@ -113,3 +113,7 @@ EOF
 pkg_preinst() {
 	:
 }
+
+src_test() {
+	:
+}
diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild
index f16b45a1415..f03bd4483b3 100644
--- a/kde-base/kde-env/kde-env-9999.ebuild
+++ b/kde-base/kde-env/kde-env-9999.ebuild
@@ -113,3 +113,7 @@ EOF
 pkg_preinst() {
 	:
 }
+
+src_test() {
+	:
+}