Update kde-env from kde-testing. KDEDIRS no longer needed.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 117 insertions, 2 deletions

diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 22b8b1a9184f..021e36d1a03e 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.37 2009/05/09 13:41:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.38 2009/05/28 08:31:42 scarabeus Exp $
+
+*kde-env-4.2.3-r1 (28 May 2009)
+
+  28 May 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +kde-env-4.2.3-r1.ebuild:
+  Update kde-env from kde-testing. KDEDIRS no longer needed.
 
   09 May 2009; Tomas Chvatal <scarabeus@gentoo.org> kde-env-4.2.3.ebuild:
   Fix failiture with FEATURES=test. Per bug #269011.
diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 9945b66b626a..ff65ad58552d 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD kde-env-4.2.3-r1.ebuild 1979 RMD160 f3ea42d34b3de992301c8ebfeaebcceb396a2710 SHA1 fe33bb4fe15ce135e786ed543f3cfb2a1021f747 SHA256 df7bae7202922871423652729ed4eb3d7882acf140af03867a110145bf41b46a
 EBUILD kde-env-4.2.3.ebuild 3162 RMD160 fe4dd432e45324cc282ea3b35f5610a4ac4ebe17 SHA1 7ae219508083cdc4981c10f3ac5c5cdff3de1756 SHA256 d8236fb4a4c374f411fe9abbc16a95e5d1e86125df4762847046b9b4e46c3fe2
-MISC ChangeLog 698 RMD160 f584d6da8ce4b3ed797794adf09dcd31a9d7ce9f SHA1 667ec3cd7f6ba6a766199905bc6c7e10dd40d171 SHA256 8dd37b855dddda307b5d1d49baa3a95e077ceb6069ef85e6d8ba500ef588d573
+MISC ChangeLog 876 RMD160 afba024f8a64c219c8f2d77e73fe59c770801679 SHA1 08ab5d76f6f143b567ff28859830931cdad38b14 SHA256 fa3de263fc0e53c410e6893ca41939a9fbe02ef475625519d15e0668cb3eb80f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoeS/gACgkQHB6c3gNBRYcRzACfew1QW31uAOwX0R396HDl5CEY
+0UgAn3Vkw4+lV+6l5b4YypBDaF3anN3d
+=ueUD
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kde-env/kde-env-4.2.3-r1.ebuild b/kde-base/kde-env/kde-env-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..f5f98b334e33
--- /dev/null
+++ b/kde-base/kde-env/kde-env-4.2.3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.2.3-r1.ebuild,v 1.1 2009/05/28 08:31:42 scarabeus Exp $
+
+EAPI="2"
+
+inherit kde4-base
+
+DESCRIPTION="Environment setting required for all KDE4 apps to run."
+HOMEPAGE="http://kde.org"
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+LICENSE="as-is"
+IUSE=""
+
+RDEPEND="
+	!<kde-base/kdelibs-3.5.10-r3
+	!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
+
+		# number goes down with version
+		cat <<-EOF > "${T}/43kdepaths-${SLOT}"
+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"
+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]
+prefixes=/usr
+EOF
+
+	else
+
+		# Much simpler for the FHS compliant -kdeprefix install
+		# number goes down with version
+		cat <<-EOF > "${T}/43kdepaths"
+CONFIG_PROTECT="/usr/share/config"
+#KDE_IS_PRELINKED=1
+EOF
+		doenvd "${T}/43kdepaths"
+
+	fi
+}
+
+pkg_preinst() {
+	:
+}
+
+src_test() {
+	:
+}