Don't depend on kdelibs, use helpers to install, don't install unneeded empty directories, add ~amd64-linux/~x86-linux keywords

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 45 insertions, 24 deletions

diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 2213868bc301..83c07cc1115b 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.60 2010/01/13 23:49:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.61 2010/01/19 04:55:20 abcd Exp $
+
+  19 Jan 2010; Jonathan Callen <abcd@gentoo.org> kde-env-4.3.4.ebuild:
+  Don't depend on kdelibs, use helpers to install, don't install unneeded
+  empty directories, add ~amd64-linux/~x86-linux keywords
 
   13 Jan 2010; Jeroen Roovers <jer@gentoo.org> kde-env-4.3.3.ebuild:
   Stable for HPPA too.
diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 33867ea17a42..90ccf34b935e 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 EBUILD kde-env-4.3.3.ebuild 1872 RMD160 bc8a6cbfe573a1de8cdc297daa24b4b3c251e83e SHA1 e1de56e6dc678ee3ccca308cbdbbc6509168e84b SHA256 af67a4f163a628015d4f5e3a183254aa74f2869c7f133b45005468e8b56cc716
-EBUILD kde-env-4.3.4.ebuild 1924 RMD160 0704d1e45b5fbc3d1602cdb584a611e3390f64a1 SHA1 906851e1c047617b6cd3456bad67fd6bfafd5c56 SHA256 5a38475dc64bbe7d3575d7cf089637fd449f710a94d4789e546df0c2a6ec9a3e
-MISC ChangeLog 3287 RMD160 817cbf86350c80af6b15a7d3afb4361269530985 SHA1 971038d0b9e3d397be035f8608b092308f772d02 SHA256 6e144af84e198b45edad17643a5a121998f9b3efb954ff10b7c8ce812b26c15a
+EBUILD kde-env-4.3.4.ebuild 1956 RMD160 469bfa4134196a7791cff465a158907d69c27282 SHA1 b3a21b1fc16080dbd6f03b4ea07d74e361864864 SHA256 b3a6c768bad096f6a99f9cc5c8f954194955b88d9811ea8843450859ba482ba0
+MISC ChangeLog 3492 RMD160 d115da6734ec544c26d417491442bdbefd70db4d SHA1 5ade5a2d19a4242f30bd2a638d9205de388b84db SHA256 899607b558d86fd6a1910b497d87b3de0c11657704d30b624c49ac13b5265b5c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktVO0EACgkQOypDUo0oQOqMUgCgisgNk7ctKawzu6JOAV+K1Idq
+0LEAoNytkzcpzjPd94ok6CqnAwPaMxmw
+=6Fk9
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kde-env/kde-env-4.3.4.ebuild b/kde-base/kde-env/kde-env-4.3.4.ebuild
index a7aed9f6ac6d..193dbfe54ebc 100644
--- a/kde-base/kde-env/kde-env-4.3.4.ebuild
+++ b/kde-base/kde-env/kde-env-4.3.4.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.3.4.ebuild,v 1.3 2009/12/23 11:48:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.3.4.ebuild,v 1.4 2010/01/19 04:55:20 abcd Exp $
 
 EAPI="2"
 
+KDE_REQUIRED="never"
 inherit kde4-base
 
 DESCRIPTION="Environment setting required for all KDE4 apps to run."
 HOMEPAGE="http://kde.org"
 [[ ${PV} = *9999* ]] && ESVN_REPO_URI="" || SRC_URI=""
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="as-is"
 IUSE=""
 
@@ -33,18 +34,13 @@ src_compile() {
 }
 
 src_install() {
-	dodir /etc/env.d
-	dodir /etc/revdep-rebuild
-	dodir ${KDEDIR}/share/config
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs+=":${EKDEDIR}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
 	if use kdeprefix; then
+		# List all the multilib libdirs
+		local _libdir _libdirs
+		for _libdir in $(get_all_libdirs); do
+			_libdirs+=":${EKDEDIR}/${_libdir}"
+		done
+		_libdirs=${_libdirs#:}
 
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths-${SLOT}"
@@ -58,18 +54,20 @@ PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig"
 XDG_DATA_DIRS="${EKDEDIR}/share"
 EOF
 		doenvd "${T}/43kdepaths-${SLOT}"
-		cat <<-EOF > "${D%/}${EPREFIX}/etc/revdep-rebuild/50-kde-${SLOT}"
+		cat <<-EOF > "${T}/50-kde-${SLOT}"
 SEARCH_DIRS="${EKDEDIR}/bin ${EKDEDIR}/lib*"
 EOF
+		insinto /etc/revdep-rebuild
+		doins "${T}/50-kde-${SLOT}"
 
 		# kdeglobals needed to make third party apps installed in /usr work
-		cat <<-EOF > "${D}/${EKDEDIR}/share/config/kdeglobals"
+		cat <<-EOF > "${T}/kdeglobals"
 [Directories][\$i]
 prefixes=${EPREFIX}/usr
 EOF
-
+		insinto ${KDEDIR}/share/config
+		doins "${T}/kdeglobals"
 	else
-
 		# Much simpler for the FHS compliant -kdeprefix install
 		# number goes down with version
 		cat <<-EOF > "${T}/43kdepaths"
@@ -77,7 +75,6 @@ CONFIG_PROTECT="${EPREFIX}/usr/share/config"
 #KDE_IS_PRELINKED=1
 EOF
 		doenvd "${T}/43kdepaths"
-
 	fi
 }
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 750358694456..91f216616517 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
@@ -16,6 +19,13 @@ AUX kdelibs-4.3.3-plasma-pixmap-cache.patch 656 RMD160 9b8173f035ab3cb1867c21f3d
 DIST kdelibs-4.3.3.tar.bz2 10516364 RMD160 3d6a2c971cef12fb2cb9ba64a10200b2cf098043 SHA1 89b55982e007c44835a9da0f540dd57fa096df45 SHA256 bec0b11b9db010fb14e1bc438ef77dd417a429168eb7d14dc5dee50ea23b5fb3
 DIST kdelibs-4.3.4.tar.bz2 10518171 RMD160 0719043ddcf251a3fce4c2d4bfb1583e80c4b54d SHA1 1af2d185c88898b71f36b57f033e3a6d9839ab3d SHA256 c13799b16a7dc5fa65dd2576d7837cf65336f49b3674e64a28d7f11286910c7f
 EBUILD kdelibs-4.3.3-r1.ebuild 6380 RMD160 116f5a937b4d755a16576610f281b4c55253509e SHA1 81307d86bfafca534a1df20d9da71095e4d2c16e SHA256 f406df22b7fdc76202a52fdad8fc4f286031f3ea1cb3cc89bc66234b4d9ce962
-EBUILD kdelibs-4.3.4.ebuild 9001 RMD160 de6b1f706f25c6e951140a69d5dcb2e977a12d46 SHA1 9d76a53b14fba93b0f1b5c38e196d161c1d676d2 SHA256 26d7cb3704e379f5157dac4ae32cd2cf6a8c246436734b0b22b2060926dd9ae6
-MISC ChangeLog 111163 RMD160 10396e0b90ec3659035246e311f53a1ffd2e0848 SHA1 3df3870590ea2747af74c6c09a167ee4ff715f58 SHA256 aff8c8c913520b077f52f3d9f8b1357d27d59d0c0ebbc215a77e0907b6cbb454
+EBUILD kdelibs-4.3.4.ebuild 9021 RMD160 6947a5769bc4294b0864f4b638af962043b805af SHA1 189bd5c256cd4867cf35b61d4b7a48ae582c8b18 SHA256 f5813ada4020531b158f810e1df2a7cf6c11181c700aaff9e4f179a87ff088b6
+MISC ChangeLog 111341 RMD160 b6bb0ec6a67b99a18fd0d1eabe428113b018b1ca SHA1 4baddaa78891df243be8bff62726ad4750617d7c SHA256 9536791c18456c4565d216116da72704aa1c3400683f204461d8e21bf6b48973
 MISC metadata.xml 221 RMD160 9c453339759a1d29d8fc8d06cbe36fb91807b91a SHA1 255fe1e780bbd626ace5afa94c56787c757de039 SHA256 095684abb4b2740b796e90c3347211dc46b4f59f2b430185060637a6b05f19f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktVO94ACgkQOypDUo0oQOo9GACgwZ1OiHUdtJRZfKDCpdeVKftx
+zAcAn0EgsVACRKOTx99X6UYGgWorZqXM
+=Jg3h
+-----END PGP SIGNATURE-----