Fixes konqueror dos via javascript read of ftp iframe.
authorIoannis Aslanidis <deathwing00@gentoo.org>
Mon, 5 Mar 2007 22:13:45 +0000 (22:13 +0000)
committerIoannis Aslanidis <deathwing00@gentoo.org>
Mon, 5 Mar 2007 22:13:45 +0000 (22:13 +0000)
Package-Manager: portage-2.1.2.1

kde-base/kdelibs/ChangeLog
kde-base/kdelibs/Manifest
kde-base/kdelibs/files/digest-kdelibs-3.5.5-r9 [new file with mode: 0644]
kde-base/kdelibs/files/digest-kdelibs-3.5.6-r3 [new file with mode: 0644]
kde-base/kdelibs/files/kdelibs-3.5.5-vulnerability-20070305.diff [new file with mode: 0644]
kde-base/kdelibs/kdelibs-3.5.5-r9.ebuild [new file with mode: 0644]
kde-base/kdelibs/kdelibs-3.5.6-r3.ebuild [new file with mode: 0644]

index f5461bfc66ea4ad3434a9f3b3a89fa01862102bf..25692bf073f3b5a8e81986a7ebdff5266acd67be 100644 (file)
@@ -1,6 +1,14 @@
 # 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.429 2007/02/14 17:39:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.430 2007/03/05 22:13:45 deathwing00 Exp $
+
+*kdelibs-3.5.6-r3 (05 Mar 2007)
+*kdelibs-3.5.5-r9 (05 Mar 2007)
+
+  05 Mar 2007; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kdelibs-3.5.5-vulnerability-20070305.diff,
+  +kdelibs-3.5.5-r9.ebuild, +kdelibs-3.5.6-r3.ebuild:
+  Fixes konqueror dos via javascript read of ftp iframe.
 
   14 Feb 2007; Bryan Ã˜stergaard <kloeri@gentoo.org>
   kdelibs-3.5.5-r8.ebuild:
index 12bd14ddefd80cecd9045fc2b37f7e0273847f11..53fef43d104463e14b95944813d4e3ae383dbdbe 100644 (file)
@@ -25,6 +25,10 @@ AUX kdelibs-3.5.5-noarts.patch 5474 RMD160 cab567315dbe7b18ccbf9718c98ab2d93786f
 MD5 30d5ee2beb41b46cb3f46c3211d36c96 files/kdelibs-3.5.5-noarts.patch 5474
 RMD160 cab567315dbe7b18ccbf9718c98ab2d93786f1d7 files/kdelibs-3.5.5-noarts.patch 5474
 SHA256 baf1ea16eed48f8a64e0ee25408161b130981e93f0fee718bb7cf71513a64420 files/kdelibs-3.5.5-noarts.patch 5474
+AUX kdelibs-3.5.5-vulnerability-20070305.diff 1590 RMD160 32066ef9f9538171bc30c85f0241e88ca2b6f1f7 SHA1 61b14a6df19957f474a074350e9ed53defd4e66f SHA256 40121f52202a5882ab9e9ba64d6eae945cf81c8452d30c5aa663408c2ce5e8a0
+MD5 dd48cbee1c8d9f89cd4adee43f0f7741 files/kdelibs-3.5.5-vulnerability-20070305.diff 1590
+RMD160 32066ef9f9538171bc30c85f0241e88ca2b6f1f7 files/kdelibs-3.5.5-vulnerability-20070305.diff 1590
+SHA256 40121f52202a5882ab9e9ba64d6eae945cf81c8452d30c5aa663408c2ce5e8a0 files/kdelibs-3.5.5-vulnerability-20070305.diff 1590
 AUX kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211 RMD160 5215d567765b871dd06af23cce293860fd8c2446 SHA1 91038c4218ce8af4bcc4f2135123bc531365bbfe SHA256 cf4033eccf1bd85ca6a32e8c894d418e743c02f35f30030e23dd9d4aef85cd22
 MD5 eb13fecb46d703561ff3b7518876042c files/kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211
 RMD160 5215d567765b871dd06af23cce293860fd8c2446 files/kdelibs-3.5.6-khtml-kde-bug-140768.patch 1211
@@ -49,6 +53,10 @@ EBUILD kdelibs-3.5.5-r8.ebuild 6451 RMD160 ea8acef52c81078b7db108da0554c099597cf
 MD5 66a75e0b0695f2802406f0578b755960 kdelibs-3.5.5-r8.ebuild 6451
 RMD160 ea8acef52c81078b7db108da0554c099597cf006 kdelibs-3.5.5-r8.ebuild 6451
 SHA256 f3486a424f0dd258dddee2084ac3ecceb7fc0f3af990d6fba026afcc28951061 kdelibs-3.5.5-r8.ebuild 6451
+EBUILD kdelibs-3.5.5-r9.ebuild 6520 RMD160 0123e835877e14661529cc82760c8e62f7572812 SHA1 fa27415a6cb61ffcc851e4a1d8c758f6fa4de5d6 SHA256 a2fe78ade50ae9f098331380cee961216f994ce3d17b496386b56286a208197d
+MD5 a403fea654eaf38f43e54e5e259314d1 kdelibs-3.5.5-r9.ebuild 6520
+RMD160 0123e835877e14661529cc82760c8e62f7572812 kdelibs-3.5.5-r9.ebuild 6520
+SHA256 a2fe78ade50ae9f098331380cee961216f994ce3d17b496386b56286a208197d kdelibs-3.5.5-r9.ebuild 6520
 EBUILD kdelibs-3.5.6-r1.ebuild 5934 RMD160 f31b574d0a880af47ba22e837c2aa36e6e6ee355 SHA1 11553ea4e06cc73ac2ce53ce8287aa9a8ae1a609 SHA256 bad86ce3370005b03227056d6362a5727900137978f54c0c1773baf5b8e209da
 MD5 aaff5f188200cafa661c226c0e04eb2b kdelibs-3.5.6-r1.ebuild 5934
 RMD160 f31b574d0a880af47ba22e837c2aa36e6e6ee355 kdelibs-3.5.6-r1.ebuild 5934
@@ -57,10 +65,14 @@ EBUILD kdelibs-3.5.6-r2.ebuild 5989 RMD160 4b84cc101bc182753e67e3e653be0792042c0
 MD5 397458a76d4c0386f7887db44d63349e kdelibs-3.5.6-r2.ebuild 5989
 RMD160 4b84cc101bc182753e67e3e653be0792042c0234 kdelibs-3.5.6-r2.ebuild 5989
 SHA256 be58c908de93a0f9b783abbc3c94411dbf1465beeea7201c52abd62fd84d4015 kdelibs-3.5.6-r2.ebuild 5989
-MISC ChangeLog 70142 RMD160 c752d44edd33936ad7abb0e52d54bbf50b387129 SHA1 60e8e6e291763ec0340cc50d7b207f7ad0974f72 SHA256 6ff48e64b1d4469fb3113ddd3829153a20085670a1ff0ca6ee6346ac99b51830
-MD5 f2132c49d040a5b7bdffb13f678090b7 ChangeLog 70142
-RMD160 c752d44edd33936ad7abb0e52d54bbf50b387129 ChangeLog 70142
-SHA256 6ff48e64b1d4469fb3113ddd3829153a20085670a1ff0ca6ee6346ac99b51830 ChangeLog 70142
+EBUILD kdelibs-3.5.6-r3.ebuild 6060 RMD160 e75a8c015941887df34fdb78c73ddf030e05e081 SHA1 96a45e21389c13ee29a72fd16a6ff39240ad5dcc SHA256 557a7b119b51d535398105c383b6c92f42963331ea361ab5387dbbbda5d61919
+MD5 1fb53b53e3b1a562ca6e95d874c53d31 kdelibs-3.5.6-r3.ebuild 6060
+RMD160 e75a8c015941887df34fdb78c73ddf030e05e081 kdelibs-3.5.6-r3.ebuild 6060
+SHA256 557a7b119b51d535398105c383b6c92f42963331ea361ab5387dbbbda5d61919 kdelibs-3.5.6-r3.ebuild 6060
+MISC ChangeLog 70434 RMD160 4f34fe4f12792a9fa2837ad63f3cc20ab783784c SHA1 1ce8c032be15fe484e65a58252d1ed4831add32f SHA256 adf6006b9e051d403d048b3b1a95ce39f714a5518d13fc21baaac13b0985f595
+MD5 9b9119d51c731666fdf185094861b008 ChangeLog 70434
+RMD160 4f34fe4f12792a9fa2837ad63f3cc20ab783784c ChangeLog 70434
+SHA256 adf6006b9e051d403d048b3b1a95ce39f714a5518d13fc21baaac13b0985f595 ChangeLog 70434
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -77,16 +89,22 @@ SHA256 9180e5499945c7011b584d592a892bc3ecc4a2cfcc703ede9619ab6238639387 files/di
 MD5 b3407b1b16a060400ebc8b3bcd89eef4 files/digest-kdelibs-3.5.5-r8 807
 RMD160 65dd009a5c3e9f9b44e7d277d761a586184f1c20 files/digest-kdelibs-3.5.5-r8 807
 SHA256 9180e5499945c7011b584d592a892bc3ecc4a2cfcc703ede9619ab6238639387 files/digest-kdelibs-3.5.5-r8 807
+MD5 b3407b1b16a060400ebc8b3bcd89eef4 files/digest-kdelibs-3.5.5-r9 807
+RMD160 65dd009a5c3e9f9b44e7d277d761a586184f1c20 files/digest-kdelibs-3.5.5-r9 807
+SHA256 9180e5499945c7011b584d592a892bc3ecc4a2cfcc703ede9619ab6238639387 files/digest-kdelibs-3.5.5-r9 807
 MD5 b82df77d8d947cfd51e3fad1ce093674 files/digest-kdelibs-3.5.6-r1 807
 RMD160 e5e25e17340fbe888f9c28829d332c34148d1f06 files/digest-kdelibs-3.5.6-r1 807
 SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/digest-kdelibs-3.5.6-r1 807
 MD5 b82df77d8d947cfd51e3fad1ce093674 files/digest-kdelibs-3.5.6-r2 807
 RMD160 e5e25e17340fbe888f9c28829d332c34148d1f06 files/digest-kdelibs-3.5.6-r2 807
 SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/digest-kdelibs-3.5.6-r2 807
+MD5 b82df77d8d947cfd51e3fad1ce093674 files/digest-kdelibs-3.5.6-r3 807
+RMD160 e5e25e17340fbe888f9c28829d332c34148d1f06 files/digest-kdelibs-3.5.6-r3 807
+SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/digest-kdelibs-3.5.6-r3 807
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF00kvugEuf3OQ0akRAoWxAJ9kZ94vg03Ec5R4KddUihfaj8CAQACfT2XX
-TFyf5IbjTdfRIGLjOoIKCrM=
-=EWRs
+iD8DBQFF7JYlQVeVlgLp4x8RAjCTAJ4lfy/kLXQqrpCMGyMCKW15nlhpRQCePDPC
+wC4uQ2+CmA7SqbGrnJFH914=
+=2x+8
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r9 b/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r9
new file mode 100644 (file)
index 0000000..cec88e0
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423
+RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423
+SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423
+MD5 d8ce997461cb1aa2255032f02fd14326 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+MD5 2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 15486690
+RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 kdelibs-3.5.5.tar.bz2 15486690
+SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 kdelibs-3.5.5.tar.bz2 15486690
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r3 b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r3
new file mode 100644 (file)
index 0000000..1585f02
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423
+RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423
+SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423
+MD5 d8ce997461cb1aa2255032f02fd14326 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+MD5 e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2 15509460
+RMD160 ce8c088e13f0e59238719600da9c768eac58b57d kdelibs-3.5.6.tar.bz2 15509460
+SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c kdelibs-3.5.6.tar.bz2 15509460
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-vulnerability-20070305.diff b/kde-base/kdelibs/files/kdelibs-3.5.5-vulnerability-20070305.diff
new file mode 100644 (file)
index 0000000..657bd9b
--- /dev/null
@@ -0,0 +1,37 @@
+diff -Naur kdelibs-3.5.5.old/khtml/ecma/kjs_html.cpp kdelibs-3.5.5/khtml/ecma/kjs_html.cpp
+--- kdelibs-3.5.5.old/khtml/ecma/kjs_html.cpp  2007-03-05 21:59:24.000000000 +0100
++++ kdelibs-3.5.5/khtml/ecma/kjs_html.cpp      2007-03-05 22:03:35.000000000 +0100
+@@ -1840,10 +1840,12 @@
+                                     getDOMNode(exec, frameElement.contentDocument()) : Undefined();
+     case FrameContentWindow:   {
+         KHTMLPart* part = static_cast<DOM::HTMLFrameElementImpl*>(frameElement.handle())->contentPart();
+-        if (part)
+-            return Value(Window::retrieveWindow(part));
+-        else
+-            return Undefined();
++        if (part) {
++          Window *w = Window::retrieveWindow(part);
++          if (w)
++            return Value(w);
++        }
++        return Undefined();
+     }
+     case FrameFrameBorder:     return String(frameElement.frameBorder());
+     case FrameLongDesc:        return String(frameElement.longDesc());
+@@ -1873,10 +1875,12 @@
+                                      getDOMNode(exec, iFrame.contentDocument()) : Undefined();
+     case IFrameContentWindow:       {
+         KHTMLPart* part = static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle())->contentPart();
+-        if (part)
+-            return Value(Window::retrieveWindow(part));
+-        else
+-            return Undefined();
++        if (part) {
++          Window *w = Window::retrieveWindow(part);
++          if (w)
++            return Value(w);
++        }
++        return Undefined();
+     }
+     case IFrameFrameBorder:     return String(iFrame.frameBorder());
+     case IFrameHeight:          return String(iFrame.height());
diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r9.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r9.ebuild
new file mode 100644 (file)
index 0000000..09815eb
--- /dev/null
@@ -0,0 +1,211 @@
+# 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.5-r9.ebuild,v 1.1 2007/03/05 22:13:45 deathwing00 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-05.tar.bz2
+       mirror://gentoo/${P}-seli-xinerama.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
+zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+
+# Added aspell-en as dependency to work around bug 131512.
+RDEPEND="$(qt_min_version 3.3.3)
+       arts? ( ~kde-base/arts-${PV} )
+       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-4.2
+       media-libs/libart_lgpl
+       net-dns/libidn
+       acl? ( kernel_linux? ( sys-apps/acl ) )
+       ssl? ( >=dev-libs/openssl-0.9.7d )
+       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 )
+       zeroconf? (     !avahi? ( 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 app-dicts/aspell-en
+               linguas_he? ( >=app-text/hspell-1.0 ) )"
+
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )
+       sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+       || ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 ) "
+
+PDEPEND="zeroconf? ( avahi? ( 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 that relies 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" || die "Patch did not apply."
+       fi
+
+       # Apply the following patch on the next revision of kdelibs-3.5.5 (fixes kde
+       # bug #135409), which corrects a nasty regression in the cstyle indenter.
+       epatch "${FILESDIR}/${P}-kate-cstyle-indenter-fix.diff"
+
+       # Fix kdeprint timeout when trying to connect to cupsd. Bug #151261.
+       epatch "${FILESDIR}/${P}-kdeprint-cupsd-timeout-fix.patch"
+
+       # Fix rendering (see upstream bug #135639).
+       epatch "${FILESDIR}/${P}-khtml.patch"
+
+       # Allow notification with arts disabled
+       epatch "${FILESDIR}/${P}-noarts.patch"
+       epatch "${FILESDIR}/${P}-noarts-2.patch"
+
+       # xinerama patch from Lubos Lunak
+       # http://ktown.kde.org/~seli/xinerama/
+       epatch "${DISTDIR}/${P}-seli-xinerama.patch.bz2"
+
+       epatch "${FILESDIR}/${P}-CVE-2007-0537.patch"
+
+       epatch "${FILESDIR}/${P}-vulnerability-20070305.diff"
+}
+
+src_compile() {
+       rm -f "${S}/configure"
+
+       myconf="--with-distribution=Gentoo --disable-fast-malloc
+                       $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+                       --with-libart --with-libidn
+                       $(use_with acl) $(use_with ssl)
+                       $(use_with alsa) $(use_with arts)
+                       $(use_with kerberos gssapi) $(use_with tiff)
+                       $(use_with jpeg2k jasper) $(use_with openexr)
+                       $(use_enable cups)
+                       $(use_with utempter) $(use_with lua)
+                       $(use_enable kernel_linux sendfile) --enable-mitshm
+                       $(use_with spell aspell)"
+
+       if use zeroconf && ! use avahi; then
+               myconf="${myconf} --enable-dnssd"
+       else
+               myconf="${myconf} --disable-dnssd"
+       fi
+
+       if use spell; then
+               myconf="${myconf} $(use_with linguas_he hspell)"
+       else
+               myconf="${myconf} --without-hspell"
+       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
+
+       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 zeroconf && use avahi; 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
+
+       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}
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="${PREFIX}:/usr:/usr/local"
+#KDE_IS_PRELINKED=1
+EOF
+}
+
+pkg_postinst() {
+       if use zeroconf; then
+               echo
+               elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+               elog "is running. Make sure also that multicast dns lookups are enabled by editing"
+               elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+               elog "  hosts: files mdns dns"
+               echo
+       fi
+}
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r3.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r3.ebuild
new file mode 100644 (file)
index 0000000..2f907b8
--- /dev/null
@@ -0,0 +1,199 @@
+# 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.6-r3.ebuild,v 1.1 2007/03/05 22:13:45 deathwing00 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-05.tar.bz2
+       mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
+zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+
+# Added aspell-en as dependency to work around bug 131512.
+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-4.2
+       media-libs/libart_lgpl
+       net-dns/libidn
+       acl? ( kernel_linux? ( sys-apps/acl ) )
+       ssl? ( >=dev-libs/openssl-0.9.7d )
+       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 )
+       zeroconf? (     !avahi? ( 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 app-dicts/aspell-en
+               linguas_he? ( >=app-text/hspell-1.0 ) )"
+
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )
+       sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+       || ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 ) "
+
+PDEPEND="zeroconf? ( avahi? ( 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 that relies 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
+
+       epatch "${FILESDIR}/${P}-khtml-kde-bug-140768.patch"
+
+       # xinerama patch from Lubos Lunak
+       # http://ktown.kde.org/~seli/xinerama/
+       epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
+
+       epatch "${FILESDIR}/${PN}-3.5.5-vulnerability-20070305.diff"
+}
+
+src_compile() {
+       rm -f "${S}/configure"
+
+       myconf="--with-distribution=Gentoo --disable-fast-malloc
+                       $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+                       --with-libart --with-libidn
+                       $(use_with acl) $(use_with ssl)
+                       $(use_with alsa) $(use_with arts)
+                       $(use_with kerberos gssapi) $(use_with tiff)
+                       $(use_with jpeg2k jasper) $(use_with openexr)
+                       $(use_enable cups)
+                       $(use_with utempter) $(use_with lua)
+                       $(use_enable kernel_linux sendfile) --enable-mitshm
+                       $(use_with spell aspell)"
+
+       if use zeroconf && ! use avahi; then
+               myconf="${myconf} --enable-dnssd"
+       else
+               myconf="${myconf} --disable-dnssd"
+       fi
+
+       if use spell; then
+               myconf="${myconf} $(use_with linguas_he hspell)"
+       else
+               myconf="${myconf} --without-hspell"
+       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
+
+       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 zeroconf && use avahi; 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
+
+       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}
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="${PREFIX}:/usr:/usr/local"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+}
+
+pkg_postinst() {
+       if use zeroconf; then
+               echo
+               elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+               elog "is running. Make sure also that multicast dns lookups are enabled by editing"
+               elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+               elog "  hosts: files mdns dns"
+               echo
+       fi
+}