Add kdelibs-3.5.8-r2.ebuild, adding upstream patch to support newer flash version.

Package-Manager: portage-2.1.4_rc11

6 files changed, 254 insertions, 33 deletions

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 237f2ae98a23..4c5198b8c858 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -76,6 +76,7 @@ DIST kdebase-3.5-patchset-05.tar.bz2 16068 RMD160 dc1572fbb3cf3ce9a8e424edd3408b
 DIST kdebase-3.5-patchset-06.tar.bz2 19825 RMD160 ab7358b635e912ed9912cb95e48e3187064abae7 SHA1 3b170da112dd32b347ce9f18b13a4e7c034f600b SHA256 c9ab23f648f84ebc66054f4db48685cbed3d99e9c87fa3df2c0d8a282b9a2394
 DIST kdebase-3.5-patchset-07.tar.bz2 22868 RMD160 37e81cd0bc3943cbbdc100634d79a8eeed73503b SHA1 df1a89279ed08839e8a9e9f64e01223139d52675 SHA256 fca283e0719231b0716f333034e29727b4d1e1f30cead4e1ae1bca330f00c81b
 DIST kdebase-3.5-patchset-08.tar.bz2 23090 RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 SHA1 22715c39a1769a7cbdf3e0ff73425459eadab01d SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a
+DIST kdebase-3.5-patchset-09.tar.bz2 37173 RMD160 c7fe1669e49ff991d4d1649bed6942c27d7728db SHA1 03404410fd361fe1bc2f8b68fdbac3e1193da0e4 SHA256 1e020831eae6c6eb21e4596854406fedac7dfc2b0567f10ff26e47fe0f5ade7e
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
 DIST kdebase-3.5.7.tar.bz2 24395088 RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 SHA1 833a35e4bbec2852f0f5267e680590be0c986594 SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d
@@ -152,14 +153,18 @@ EBUILD kdebase-3.5.8-r4.ebuild 7917 RMD160 a04620fcb97eb5949670ca135517da76e16cf
 MD5 d74100b3bf5c61802c21e8163e131631 kdebase-3.5.8-r4.ebuild 7917
 RMD160 a04620fcb97eb5949670ca135517da76e16cf7bd kdebase-3.5.8-r4.ebuild 7917
 SHA256 28fd38f276781dcd7ed72b879e94fbb96a122b86768ee9373a29ada2d2315c2b kdebase-3.5.8-r4.ebuild 7917
+EBUILD kdebase-3.5.8-r5.ebuild 7917 RMD160 0ee65a4d339a4218ce2ba4f237f562db538c7de2 SHA1 d9ebf081e5822a6c9a7574a97ca362bf17b79e73 SHA256 39574d57b0df8df4969dd02432c7a6c7d7f08a0030b9e0200aba03cf45e9d84b
+MD5 09f46e2822544fdde52c91836b9a8cff kdebase-3.5.8-r5.ebuild 7917
+RMD160 0ee65a4d339a4218ce2ba4f237f562db538c7de2 kdebase-3.5.8-r5.ebuild 7917
+SHA256 39574d57b0df8df4969dd02432c7a6c7d7f08a0030b9e0200aba03cf45e9d84b kdebase-3.5.8-r5.ebuild 7917
 EBUILD kdebase-3.5.8.ebuild 7057 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5 SHA1 e0b98c663b68a5efae0216e6ce773e31dd6eefbf SHA256 fb3f20fdce989e0b09a994858c5265fb6880407be24a8ff78582b78207b933c6
 MD5 37eea3820dbd3438733985f9316abf58 kdebase-3.5.8.ebuild 7057
 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5 kdebase-3.5.8.ebuild 7057
 SHA256 fb3f20fdce989e0b09a994858c5265fb6880407be24a8ff78582b78207b933c6 kdebase-3.5.8.ebuild 7057
-MISC ChangeLog 68903 RMD160 c6cd14b2fd5b759ce8e8354a3b4f5898e6dc425d SHA1 3113b82de1cab4a111869c866572c86090cd584b SHA256 f08128f5dc7226a8dda45f6737e90a031758272131dee0e67143f8fefb4ee0a2
-MD5 bb2f193fc991e702ba43aef159e48cdc ChangeLog 68903
-RMD160 c6cd14b2fd5b759ce8e8354a3b4f5898e6dc425d ChangeLog 68903
-SHA256 f08128f5dc7226a8dda45f6737e90a031758272131dee0e67143f8fefb4ee0a2 ChangeLog 68903
+MISC ChangeLog 69094 RMD160 5361b982e0042b1067b18e3847b6ab113c5729d3 SHA1 38c63193bcaf0338ef5f3f968ce6bc341fcde391 SHA256 f33feef5939e91cd9654f596b8a3b10714683969a7fb8d2e8142d6280e7ab904
+MD5 db1ea191b0654317e3e4dc7d6387ab3e ChangeLog 69094
+RMD160 5361b982e0042b1067b18e3847b6ab113c5729d3 ChangeLog 69094
+SHA256 f33feef5939e91cd9654f596b8a3b10714683969a7fb8d2e8142d6280e7ab904 ChangeLog 69094
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -221,3 +226,6 @@ SHA256 7818ae28b4d508e14ddc0c228871bd8aecc3418dd6b07a86fba272ea0e489c65 files/di
 MD5 b420ce10e320b3d5451fb61954698685 files/digest-kdebase-3.5.8-r4 521
 RMD160 62dd57f98dc8270a39b119dade2cbfe695812128 files/digest-kdebase-3.5.8-r4 521
 SHA256 7818ae28b4d508e14ddc0c228871bd8aecc3418dd6b07a86fba272ea0e489c65 files/digest-kdebase-3.5.8-r4 521
+MD5 91147b95fd07b5dd80063d7f2286d147 files/digest-kdebase-3.5.8-r5 521
+RMD160 14ff7f61c8baea7015d98ab6893c5df4e3972570 files/digest-kdebase-3.5.8-r5 521
+SHA256 9e24dddeab40ed9a094a9da489f8e40bb76413345ca32a4bfd30e0a62b33c7db files/digest-kdebase-3.5.8-r5 521
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 855376c51c69..665361ce88e1 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.493 2007/11/11 17:52:52 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.494 2007/12/29 17:29:14 tgurr Exp $
+
+*kdelibs-3.5.8-r2 (29 Dec 2007)
+
+  29 Dec 2007; Timo Gurr <tgurr@gentoo.org> +kdelibs-3.5.8-r2.ebuild:
+  Add kdelibs-3.5.8-r2.ebuild, adding upstream patch to support newer flash
+  version.
 
   11 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
   kdelibs-3.5.7-r3.ebuild, kdelibs-3.5.8-r1.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index fe8885272539..0c3f0205d9df 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CVE-2007-1564-kdelibs-3.5.6.diff 2835 RMD160 894a9c5f51da21022b9448da957893a57384c065 SHA1 a296f0dff11007f835bdbca23b259ad8483aa4c9 SHA256 2def5a86817220df9c701d9ad22059c9ef884273a44fee3e12d7b269d8b8e52c
 MD5 62872147c2d369feb3d9077e9b32b03d files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
 RMD160 894a9c5f51da21022b9448da957893a57384c065 files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
@@ -63,6 +60,7 @@ DIST kdelibs-3.5-patchset-09.tar.bz2 19635 RMD160 c4b60c466ba1625c61259b075fd2b7
 DIST kdelibs-3.5-patchset-10.tar.bz2 19407 RMD160 ae0617dbff497751b51859d55ae45a756e69b0c0 SHA1 0289be2b16631b3dec61d738d208a189e175a592 SHA256 6fca1c1718bb628c5980da797858eeef003e57ae0f1ba89ffbd1afe20d9df975
 DIST kdelibs-3.5-patchset-11.tar.bz2 20053 RMD160 bb22719ee4aaf26a23057d2f459f738ad652c918 SHA1 759cfc225a29ef03ff6fec6e6ca1adba51f76e7d SHA256 c80843023f010b4971de0308105f47d08491794ff640d3c08b34d8bbdb6434a8
 DIST kdelibs-3.5-patchset-12.tar.bz2 21970 RMD160 9559e44e5d2205c2d5e0de8459eac898c3193933 SHA1 92452f667ed54d6a15f94d601f1544c8ad30de81 SHA256 0f936758437896ea6ee4332c64bd78ce0d03fd4924d53e29fad6a0de3cf63946
+DIST kdelibs-3.5-patchset-13.tar.bz2 23234 RMD160 d0c3eb1438cfe03111b41039f1fd53745c8d46a6 SHA1 a0d242a210da0fe35242d95fbcf61e859a202208 SHA256 6f277b6fa01490e1efdb9849e43d373d05c600384162eb9d42ba14f2df43bdc5
 DIST kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 SHA1 1f1e7a02e0dfc35fd2d27d8983a16e53e42397c0 SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c
 DIST kdelibs-3.5.5.tar.bz2 15486690 RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 SHA1 7961818e41e22cce7c58219c4eb63ed5fbb94307 SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3
 DIST kdelibs-3.5.6.tar.bz2 15509460 RMD160 ce8c088e13f0e59238719600da9c768eac58b57d SHA1 2cc15499bd2191bd9333cfd1892b5ecf1199fbfd SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c
@@ -110,14 +108,18 @@ EBUILD kdelibs-3.5.8-r1.ebuild 6064 RMD160 6f772b2a8bcb2c578bb5200f2d0f27fc65b94
 MD5 53457a5e64352589e626bf7d3c191ed6 kdelibs-3.5.8-r1.ebuild 6064
 RMD160 6f772b2a8bcb2c578bb5200f2d0f27fc65b94a78 kdelibs-3.5.8-r1.ebuild 6064
 SHA256 bb7dd3ecd48e5a6bf6d5da3b7dd0e47acd8663386345847e09ef6de4b497886f kdelibs-3.5.8-r1.ebuild 6064
+EBUILD kdelibs-3.5.8-r2.ebuild 6059 RMD160 3285052f107b87d189f7aa9e43e816806c422c8a SHA1 b29d9601a73e3c11d6c749c73e51c2d4ed7098bb SHA256 6c68727df4d217956ad0df1308d3db098a32c31bd010827c8c1564bef1da9948
+MD5 84a447433fae3daa82fff952209be063 kdelibs-3.5.8-r2.ebuild 6059
+RMD160 3285052f107b87d189f7aa9e43e816806c422c8a kdelibs-3.5.8-r2.ebuild 6059
+SHA256 6c68727df4d217956ad0df1308d3db098a32c31bd010827c8c1564bef1da9948 kdelibs-3.5.8-r2.ebuild 6059
 EBUILD kdelibs-3.5.8.ebuild 5971 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc SHA1 ce4c0049ab32e4bfc17ea9939c067f3c060aa3f2 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7
 MD5 832f29cc7666ce4dd82b229e40a9a4bb kdelibs-3.5.8.ebuild 5971
 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc kdelibs-3.5.8.ebuild 5971
 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7 kdelibs-3.5.8.ebuild 5971
-MISC ChangeLog 79849 RMD160 3e278fcd24bd445e79a2d2f289a9b3fb87105abb SHA1 639aed189ec9290e6cdcd174ae206d4ba5fc4019 SHA256 af629e55176a9045ede5b0c76233ed83e43e456d0a78de6b5cb3617ce000a1b6
-MD5 f84a6e23e60dfdb924b6a51d56af8c69 ChangeLog 79849
-RMD160 3e278fcd24bd445e79a2d2f289a9b3fb87105abb ChangeLog 79849
-SHA256 af629e55176a9045ede5b0c76233ed83e43e456d0a78de6b5cb3617ce000a1b6 ChangeLog 79849
+MISC ChangeLog 80035 RMD160 82bd553b64932023752e6224444f7bf4d24bad22 SHA1 e8553b1e1139d8b8cdc35e7f0beb7bdfcd0bdc1a SHA256 8eb84ff2e70dda6486e4f2c848001d6285ad2173146484e1bcb4acddd51b3ec5
+MD5 6383618a6c02f5b20a35dc8a04ca49ce ChangeLog 80035
+RMD160 82bd553b64932023752e6224444f7bf4d24bad22 ChangeLog 80035
+SHA256 8eb84ff2e70dda6486e4f2c848001d6285ad2173146484e1bcb4acddd51b3ec5 ChangeLog 80035
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -155,10 +157,6 @@ SHA256 dcb4b10aed20b014dcf94dda5f9c9f038725a3c2c76e025863abf7e327e297c0 files/di
 MD5 045d21239aae2d8475ecc135f0556897 files/digest-kdelibs-3.5.8-r1 807
 RMD160 a62a27af50bec9cd7997c5323ce601b983e9a7c2 files/digest-kdelibs-3.5.8-r1 807
 SHA256 72a97de753479bd8eef7faa3e43fe4c0881b386a78f16b009cb986c3524ccabf files/digest-kdelibs-3.5.8-r1 807
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHN0F+CkvF58q80IkRAnh4AJ0cC0o0JREVn2y9ND8GnbY11CsPzQCghaXj
-/UPdyKDX8OtBabh96ZUDRg8=
-=q4t8
------END PGP SIGNATURE-----
+MD5 7b2fae771c916c494e79bb3132635a06 files/digest-kdelibs-3.5.8-r2 807
+RMD160 cbaf41e92a3328398a7ef7268878db39b4b3e98a files/digest-kdelibs-3.5.8-r2 807
+SHA256 e59eb0035bc668b9e28152ca47b7837a88e5eb77840bdfbce970e87b40bc8d99 files/digest-kdelibs-3.5.8-r2 807
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.8-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.5.8-r2
new file mode 100644
index 000000000000..8b27f2127964
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.8-r2
@@ -0,0 +1,9 @@
+MD5 de715cce67ac3712757a36c40a341558 kdelibs-3.5-patchset-13.tar.bz2 23234
+RMD160 d0c3eb1438cfe03111b41039f1fd53745c8d46a6 kdelibs-3.5-patchset-13.tar.bz2 23234
+SHA256 6f277b6fa01490e1efdb9849e43d373d05c600384162eb9d42ba14f2df43bdc5 kdelibs-3.5-patchset-13.tar.bz2 23234
+MD5 f347ebd7259bdc2c0de9e1db2a09d2fd kdelibs-3.5.8-seli-xinerama.patch.bz2 5230
+RMD160 26efc6620d176414b3b771145a7c00db11c3df6b kdelibs-3.5.8-seli-xinerama.patch.bz2 5230
+SHA256 389a31d7e3f44eca5984842d66fa19a8a9f6f11fd6dac134cfd1e4d24e7fb174 kdelibs-3.5.8-seli-xinerama.patch.bz2 5230
+MD5 acaa37e79e840d10dca326277a20863c kdelibs-3.5.8.tar.bz2 15557343
+RMD160 e3524ca8613fca338a0530213e921fbfae56e866 kdelibs-3.5.8.tar.bz2 15557343
+SHA256 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6 kdelibs-3.5.8.tar.bz2 15557343
diff --git a/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild
new file mode 100644
index 000000000000..8e779962ab85
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.8-r2.ebuild,v 1.1 2007/12/29 17:29:14 tgurr Exp $
+
+inherit kde flag-o-matic eutils multilib
+set-kdedir 3.5
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+	mirror://gentoo/kdelibs-3.5-patchset-13.tar.bz2
+	mirror://gentoo/${P}-seli-xinerama.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+	avahi kernel_linux fam lua kdehiddenvisibility"
+
+# Added aspell-en as dependency to work around bug 131512.
+# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
+RDEPEND="$(qt_min_version 3.3.3)
+	arts? ( >=kde-base/arts-3.5.5 )
+	app-arch/bzip2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-6.6
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=dev-libs/openssl-0.9.7d
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( >=net-print/cups-1.1.19 )
+	tiff? ( media-libs/tiff )
+	kerberos? ( virtual/krb5 )
+	jpeg2k? ( media-libs/jasper )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
+	fam? ( virtual/fam )
+	virtual/ghostscript
+	utempter? ( sys-libs/libutempter )
+	!kde-base/kde-env
+	lua? ( dev-lang/lua )
+	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
+	>=sys-apps/portage-2.1.2.11
+	!kde-base/ksync"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
+		bindist? ( kde-misc/kdnssd-avahi )"
+
+# Testing code is rather broken and merely for developer purposes, so disable it.
+RESTRICT="test"
+
+pkg_setup() {
+	if use legacyssl ; then
+		echo ""
+		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
+		elog "sites, but breaks others instead. It is strongly discouraged to use it."
+		elog "For more information, see bug #128922."
+		echo ""
+	fi
+
+	if ! use utempter ; then
+		echo ""
+		elog "On some setups, which rely on the correct update of utmp records, not using"
+		elog "utempter might not update them correctly. If you experience unexpected"
+		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
+		echo ""
+	fi
+
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror "The alsa USE flag in this package enables ALSA support"
+		eerror "for libkmid, KDE midi library."
+		eerror "For this reason, you have to merge media-libs/alsa-lib"
+		eerror "with the midi USE flag enabled, or disable alsa USE flag"
+		eerror "for this package."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use legacyssl ; then
+		# This patch won't be included upstream, see bug #128922.
+		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
+	fi
+
+	if use utempter ; then
+		# Bug #135818 is the eternal reference.
+		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
+	fi
+
+	if use branding ; then
+		# Add "(Gentoo)" to khtml user agent.
+		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
+	fi
+
+	# Xinerama patch from Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${WORKDIR}/${P}-seli-xinerama.patch"
+}
+
+src_compile() {
+	rm -f "${S}/configure"
+
+	myconf="--with-distribution=Gentoo --disable-fast-malloc
+			--with-libart --with-libidn --with-ssl
+			--without-hspell
+			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+			$(use_with acl) $(use_with alsa)
+			$(use_with arts) $(use_enable cups)
+			$(use_with kerberos gssapi) $(use_with tiff)
+			$(use_with jpeg2k jasper) $(use_with openexr)
+			$(use_with utempter) $(use_with lua)
+			$(use_enable kernel_linux sendfile) --enable-mitshm
+			$(use_with spell aspell)"
+
+	if use avahi || use bindist ; then
+		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-dnssd"
+	fi
+
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
+	# fix bug 58179, bug 85593
+	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
+	# closer look... - corsair
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# work around bug #120858, gcc 3.4.x -Os miscompilation
+	use x86 && replace-flags "-Os" "-O2" # see bug #120858
+
+	replace-flags "-O3" "-O2" # see bug #148180
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	kde_src_compile
+
+	if use doc; then
+		make apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		make DESTDIR="${D}" install-apidox || die
+	fi
+
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
+
+	# Get rid of the disabled version of the kdnsd libraries
+	if use avahi || use bindist ; then
+		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+	fi
+
+	dodir /etc/env.d
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	# Please note that the KDE install path has to be the last value in KDEDIRS.
+	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+MANPATH=${PREFIX}/share/man
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="/usr:/usr/local:${PREFIX}"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+
+	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
+	dodir /etc/revdep-rebuild
+
+cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+}
diff --git a/kde-base/nsplugins/Manifest b/kde-base/nsplugins/Manifest
index 91a9d7df3f5b..801d2e497617 100644
--- a/kde-base/nsplugins/Manifest
+++ b/kde-base/nsplugins/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nsplugins-3.5.5-npapi-64bit.patch 718 RMD160 c4420f4625bfde9eb5e647371297192f8831a28f SHA1 dd5c2a8f60810eaeee06fdb94537d33b698cae7f SHA256 932895b1724ad7bc21d0732130169b967f8704696a86cfa2a154f0129b6472f2
 MD5 da09cd773016524764a40b2106a098dc files/nsplugins-3.5.5-npapi-64bit.patch 718
 RMD160 c4420f4625bfde9eb5e647371297192f8831a28f files/nsplugins-3.5.5-npapi-64bit.patch 718
@@ -12,6 +9,7 @@ SHA256 bc162a970d1e5511bb757de7881af2b8604224cf83f2115da28b68c7a7c37c1d files/ns
 DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5-patchset-05.tar.bz2 16068 RMD160 dc1572fbb3cf3ce9a8e424edd3408b8912c6bfd5 SHA1 ba4e667fe64e3095d8de0b4fa5813029557a2cac SHA256 d1d3c8b51c68610c76c61ba4923618a16609bb76af547d8d26bb9a3f6990bd4d
+DIST kdebase-3.5-patchset-09.tar.bz2 37173 RMD160 c7fe1669e49ff991d4d1649bed6942c27d7728db SHA1 03404410fd361fe1bc2f8b68fdbac3e1193da0e4 SHA256 1e020831eae6c6eb21e4596854406fedac7dfc2b0567f10ff26e47fe0f5ade7e
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
 DIST kdebase-3.5.7.tar.bz2 24395088 RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 SHA1 833a35e4bbec2852f0f5267e680590be0c986594 SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d
@@ -44,14 +42,18 @@ EBUILD nsplugins-3.5.7.ebuild 659 RMD160 c047ac8ac4334120009b3d685e3f9fe55ff653a
 MD5 3f93443f5531f1d62aaf640674b4aedf nsplugins-3.5.7.ebuild 659
 RMD160 c047ac8ac4334120009b3d685e3f9fe55ff653aa nsplugins-3.5.7.ebuild 659
 SHA256 7079ff2aa7f767e16662466655e018a9df572fc85799a85ab8cfb4160cf08336 nsplugins-3.5.7.ebuild 659
+EBUILD nsplugins-3.5.8-r1.ebuild 669 RMD160 193b5024279777171be27876c2c16a3802db4f69 SHA1 2dff93a5992b170b6fb33e60cf5f9ae468a0bf24 SHA256 6ea66f859644e32402cc3fd6e2b4f609b6ac343076418d48b94940c8137d61ce
+MD5 f70473a93542d33915175054714a6ae8 nsplugins-3.5.8-r1.ebuild 669
+RMD160 193b5024279777171be27876c2c16a3802db4f69 nsplugins-3.5.8-r1.ebuild 669
+SHA256 6ea66f859644e32402cc3fd6e2b4f609b6ac343076418d48b94940c8137d61ce nsplugins-3.5.8-r1.ebuild 669
 EBUILD nsplugins-3.5.8.ebuild 671 RMD160 ccc2dfb5f8cdefd9f4eb7cbec79a54ddb60fe2ab SHA1 10e34174faa44cc24310be47210251653fa26aa8 SHA256 6e46d996c9498a42434893ea0c11d311e4e3190b6e59b4b6c3bc58cb146c5884
 MD5 f4f3c3372d258c2ccc62adea03277974 nsplugins-3.5.8.ebuild 671
 RMD160 ccc2dfb5f8cdefd9f4eb7cbec79a54ddb60fe2ab nsplugins-3.5.8.ebuild 671
 SHA256 6e46d996c9498a42434893ea0c11d311e4e3190b6e59b4b6c3bc58cb146c5884 nsplugins-3.5.8.ebuild 671
-MISC ChangeLog 11765 RMD160 d758e3fc4a2e99bbe376aca54e9bb0724672e486 SHA1 0bbaf18ba3adf087737de11c7e12e641938ff313 SHA256 c5e3283fc4c4ac683838ed2bb08ff4dc9e35d16b6432df458be0e81e4689c2ae
-MD5 fcbeef1ed072f7edbb89553b81278adc ChangeLog 11765
-RMD160 d758e3fc4a2e99bbe376aca54e9bb0724672e486 ChangeLog 11765
-SHA256 c5e3283fc4c4ac683838ed2bb08ff4dc9e35d16b6432df458be0e81e4689c2ae ChangeLog 11765
+MISC ChangeLog 11957 RMD160 3516c7c6fd4b94513d00d0e703490bde816f20e7 SHA1 296b4396cbe1fce6f62bfa1a1d3bba3ed4ff15c1 SHA256 b065df3f01c5223d450f210dd5c4db4980438608853ddb2bde7c4b865567aeb6
+MD5 148226159913d921cada92d342b74ab9 ChangeLog 11957
+RMD160 3516c7c6fd4b94513d00d0e703490bde816f20e7 ChangeLog 11957
+SHA256 b065df3f01c5223d450f210dd5c4db4980438608853ddb2bde7c4b865567aeb6 ChangeLog 11957
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -80,10 +82,6 @@ SHA256 6a5a2b865af05be7ff99dde4fa36a42340da5fdce36b8c595f4563bfb9a5f3e4 files/di
 MD5 c6f0691e4ca45cec8d122aa754894aef files/digest-nsplugins-3.5.8 521
 RMD160 fb9914d157b5d875b8457b06a2bc2b6366554d4b files/digest-nsplugins-3.5.8 521
 SHA256 d44230bf759c4658e191373f2cfcfa5b3565b9bce3bed7ccaf0828656be9aeb4 files/digest-nsplugins-3.5.8 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGZ+Ml1Qf6C0PV04RAnd5AKCrWYTnOt6KHlZJDcnijprjhgwjpACfY7ZL
-/K9mn70iq9SUErn/Mvcnb3Y=
-=HXZ5
------END PGP SIGNATURE-----
+MD5 91147b95fd07b5dd80063d7f2286d147 files/digest-nsplugins-3.5.8-r1 521
+RMD160 14ff7f61c8baea7015d98ab6893c5df4e3972570 files/digest-nsplugins-3.5.8-r1 521
+SHA256 9e24dddeab40ed9a094a9da489f8e40bb76413345ca32a4bfd30e0a62b33c7db files/digest-nsplugins-3.5.8-r1 521