local DCOP DoS, #83814

(Portage version: 2.0.51.19)

8 files changed, 390 insertions, 37 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 43ebfaf67c11..c4c98a4908b7 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.217 2005/03/15 20:40:11 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.218 2005/03/16 12:31:56 carlo Exp $
+
+*kdelibs-3.3.2-r7 (16 Mar 2005)
+
+  16 Mar 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.2.3-kdelibs-dcop.patch, +files/post-3.3.2-kdelibs-dcop.patch,
+  +kdelibs-3.2.3-r8.ebuild, +kdelibs-3.3.2-r7.ebuild:
+  local DCOP DoS, #83814
 
   15 Mar 2005; Guy Martin <gmsoft@gentoo.org> kdelibs-3.3.2-r5.ebuild:
   Stable on hppa
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 574a35832d8d..c5c5b3d2bf9a 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,52 +1,58 @@
-MD5 1f4d34db894fbf7606a7e260ca345530 ChangeLog 34926
-MD5 642ea25c3926d67609ba51eb5730114f kdelibs-3.2.3-r5.ebuild 2940
 MD5 46de211493d01cca0a5916b85f7ed074 kdelibs-3.2.3-r6.ebuild 3005
-MD5 a54271a06765de123e3afaad451fbadc kdelibs-3.2.3-r7.ebuild 3002
-MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986
+MD5 d39a975bb149b6f3d046b26700db2335 kdelibs-3.3.2-r7.ebuild 3477
 MD5 79b789f02dced6acb0daf91de04bd55c kdelibs-3.3.2-r2.ebuild 3153
-MD5 e9880699449565ce112cfb096a2b73bf kdelibs-3.3.2-r3.ebuild 3291
+MD5 ec90fa8275c9d499b28386900ac3fbf0 kdelibs-3.2.3-r8.ebuild 3057
+MD5 3110a84a8fab7b6ed8b7e2d6d8458eae kdelibs-3.4.0_rc1-r1.ebuild 2637
 MD5 a269dba5d66751563def52ffa62c65f5 kdelibs-3.3.2-r4.ebuild 3348
-MD5 eb2891eff874523d2dc5dc47507cbe7d kdelibs-3.3.2-r5.ebuild 3344
-MD5 ea27e399daaad758dcac0697981f3584 kdelibs-3.4.0_beta1.ebuild 2813
 MD5 fcbbc60f31a8a5ec853b401b5a058e9d kdelibs-3.4.0_beta2.ebuild 2701
-MD5 3110a84a8fab7b6ed8b7e2d6d8458eae kdelibs-3.4.0_rc1-r1.ebuild 2637
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986
+MD5 642ea25c3926d67609ba51eb5730114f kdelibs-3.2.3-r5.ebuild 2940
 MD5 833cfdc2a5d2a7e2891dea836c31aa6b kdelibs-3.3.2-r6.ebuild 3407
 MD5 ac2b987ade1a6fc4d3c688f4350bbb82 kdelibs-3.4.0.ebuild 2943
-MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r6 68
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r7 68
-MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r3 68
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r4 68
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r5 68
+MD5 a54271a06765de123e3afaad451fbadc kdelibs-3.2.3-r7.ebuild 3002
+MD5 e9880699449565ce112cfb096a2b73bf kdelibs-3.3.2-r3.ebuild 3291
+MD5 ea27e399daaad758dcac0697981f3584 kdelibs-3.4.0_beta1.ebuild 2813
+MD5 46f429e5be716f72ab1c7f35672a3dcb ChangeLog 35166
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 eb2891eff874523d2dc5dc47507cbe7d kdelibs-3.3.2-r5.ebuild 3344
+MD5 e5285c7be708bc634b61a720515f2091 files/kdelibs-3.4.0_beta2-export-symbols-for-bindings.diff 5733
 MD5 1c47f3fafa13fcf69ce4cb1c474f5643 files/digest-kdelibs-3.4.0_beta1 69
 MD5 c4a839a9c3a59950aa5e8db4e312d219 files/digest-kdelibs-3.4.0_beta2 69
-MD5 29bcfee4f3cecd8529fa92ce4caba53c files/digest-kdelibs-3.4.0_rc1-r1 72
-MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
 MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
-MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
-MD5 3b4b9a9cd4249a8f5aafe27a234db33c files/kdelibs-3.4.0_beta2-export-kio-symbols.diff 819
-MD5 e5285c7be708bc634b61a720515f2091 files/kdelibs-3.4.0_beta2-export-symbols-for-bindings.diff 5733
+MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324
 MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751
-MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
-MD5 1f98b72b586d9a988c47dfce380dd8b6 files/post-3.2.3-kdelibs-htmlframes2.patch 975
-MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
-MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
-MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
 MD5 a639b7b592f005e911c454a0a8c9c542 files/post-3.2.3-kdelibs-kioslave.patch 549
-MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.1-kdelibs-htmlframes2.patch 989
-MD5 fed1da1d587ee8aa43b3affc1fa9a35b files/post-3.3.1-kdelibs-khtml.diff 2447
-MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324
+MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
+MD5 998641088387e630d4ab9e9013caa539 files/kdelibs-3.4.0-imagemap.patch 546
+MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
+MD5 29bcfee4f3cecd8529fa92ce4caba53c files/digest-kdelibs-3.4.0_rc1-r1 72
+MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
+MD5 296419fbb169c4d87ace85d1e1645652 files/kdelibs-3.4.0-form-freeze.patch 660
 MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
+MD5 0948701bffb082c65784dc8a2b648ef0 files/post-3.2.3-kdelibs-dcop.patch 1901
+MD5 3b4b9a9cd4249a8f5aafe27a234db33c files/kdelibs-3.4.0_beta2-export-kio-symbols.diff 819
 MD5 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442
+MD5 fed1da1d587ee8aa43b3affc1fa9a35b files/post-3.3.1-kdelibs-khtml.diff 2447
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.1-kdelibs-htmlframes2.patch 989
+MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
+MD5 1f98b72b586d9a988c47dfce380dd8b6 files/post-3.2.3-kdelibs-htmlframes2.patch 975
+MD5 661f99a406078c89ff9cae9fd67fd28a files/digest-kdelibs-3.4.0 68
+MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417
 MD5 fe67157b26a8cdf5bcfa1898cdf3b154 files/post-3.3.2-kdelibs-kioslave.patch 663
+MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 7309e259ae1f29be08bbb70e580da3fb files/post-3.3.2-kdelibs-dcop.patch 1903
+MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
 MD5 054d042dcbccec0be386a2d26d30a5b1 files/reference-list-rev-1.3.diff 526
+MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r6 68
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r7 68
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r8 68
+MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r3 68
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r4 68
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r5 68
 MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r6 68
-MD5 661f99a406078c89ff9cae9fd67fd28a files/digest-kdelibs-3.4.0 68
-MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
-MD5 296419fbb169c4d87ace85d1e1645652 files/kdelibs-3.4.0-form-freeze.patch 660
-MD5 998641088387e630d4ab9e9013caa539 files/kdelibs-3.4.0-imagemap.patch 546
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r7 68
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r8 b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r8
new file mode 100644
index 000000000000..ab94bd8ba7fd
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.2.3-r8
@@ -0,0 +1 @@
+MD5 d9d1c4bd2016a96f156b491ca908dc16 kdelibs-3.2.3.tar.bz2 12737024
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r7 b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r7
new file mode 100644
index 000000000000..bc59a2da5ef1
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.3.2-r7
@@ -0,0 +1 @@
+MD5 0473fb4c6c2cd2bc0f267cfa201f3fd8 kdelibs-3.3.2.tar.bz2 15623180
diff --git a/kde-base/kdelibs/files/post-3.2.3-kdelibs-dcop.patch b/kde-base/kdelibs/files/post-3.2.3-kdelibs-dcop.patch
new file mode 100644
index 000000000000..3cc549ea6a50
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.2.3-kdelibs-dcop.patch
@@ -0,0 +1,56 @@
+Index: dcop/dcopserver.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v
+retrieving revision 1.160.2.4
+diff -u -p -r1.160.2.4 dcopserver.cpp
+--- dcop/dcopserver.cpp	6 Aug 2004 11:16:30 -0000	1.160.2.4
++++ dcop/dcopserver.cpp	2 Mar 2005 13:17:09 -0000
+@@ -984,7 +984,7 @@ DCOPServer::DCOPServer(bool _suicide)
+ 	}
+ 
+     char errormsg[256];
+-    int orig_umask = umask(0); /*old libICE's don't reset the umask() they set */
++    int orig_umask = umask(077); /*old libICE's don't reset the umask() they set */
+     if (!IceListenForConnections (&numTransports, &listenObjs,
+ 				  256, errormsg))
+ 	{
+Index: dcop/KDE-ICE/Xtranssock.c
+===================================================================
+RCS file: /home/kde/kdelibs/dcop/KDE-ICE/Xtranssock.c,v
+retrieving revision 1.9
+diff -u -p -r1.9 Xtranssock.c
+--- dcop/KDE-ICE/Xtranssock.c	19 Mar 2003 18:35:52 -0000	1.9
++++ dcop/KDE-ICE/Xtranssock.c	2 Mar 2005 13:17:10 -0000
+@@ -937,6 +937,7 @@ TRANS(SocketUNIXCreateListener) (XtransC
+ #endif
+ 
+     unlink (sockname.sun_path);
++    (void) umask (oldUmask);
+ 
+     if ((status = TRANS(SocketCreateListener) (ciptr,
+ 	(struct sockaddr *) &sockname, namelen)) < 0)
+@@ -944,7 +945,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+ 	PRMSG (1,
+     "SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
+ 	    0, 0, 0);
+-	(void) umask (oldUmask);
+ 	return status;
+     }
+ 
+@@ -962,7 +962,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+         PRMSG (1,
+         "SocketUNIXCreateListener: Can't allocate space for the addr\n",
+ 	    0, 0, 0);
+-	(void) umask (oldUmask);
+         return TRANS_CREATE_LISTENER_FAILED;
+     }
+ 
+@@ -970,8 +969,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+     ciptr->addrlen = namelen;
+     memcpy (ciptr->addr, &sockname, ciptr->addrlen);
+ 
+-    (void) umask (oldUmask);
+-
+     return 0;
+ }
+ 
diff --git a/kde-base/kdelibs/files/post-3.3.2-kdelibs-dcop.patch b/kde-base/kdelibs/files/post-3.3.2-kdelibs-dcop.patch
new file mode 100644
index 000000000000..3560839ab6a7
--- /dev/null
+++ b/kde-base/kdelibs/files/post-3.3.2-kdelibs-dcop.patch
@@ -0,0 +1,56 @@
+Index: dcop/dcopserver.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v
+retrieving revision 1.170.2.1
+diff -u -p -r1.170.2.1 dcopserver.cpp
+--- dcop/dcopserver.cpp	6 Aug 2004 11:18:23 -0000	1.170.2.1
++++ dcop/dcopserver.cpp	2 Mar 2005 13:09:38 -0000
+@@ -952,7 +952,7 @@ DCOPServer::DCOPServer(bool _suicide)
+ 	}
+ 
+     char errormsg[256];
+-    int orig_umask = umask(0); /*old libICE's don't reset the umask() they set */
++    int orig_umask = umask(077); /*old libICE's don't reset the umask() they set */
+     if (!IceListenForConnections (&numTransports, &listenObjs,
+ 				  256, errormsg))
+ 	{
+Index: dcop/KDE-ICE/Xtranssock.c
+===================================================================
+RCS file: /home/kde/kdelibs/dcop/KDE-ICE/Xtranssock.c,v
+retrieving revision 1.10
+diff -u -p -r1.10 Xtranssock.c
+--- dcop/KDE-ICE/Xtranssock.c	2 Jun 2004 20:28:25 -0000	1.10
++++ dcop/KDE-ICE/Xtranssock.c	2 Mar 2005 13:09:38 -0000
+@@ -940,6 +940,7 @@ TRANS(SocketUNIXCreateListener) (XtransC
+ #endif
+ 
+     unlink (sockname.sun_path);
++    (void) umask (oldUmask);
+ 
+     if ((status = TRANS(SocketCreateListener) (ciptr,
+ 	(struct sockaddr *) &sockname, namelen)) < 0)
+@@ -947,7 +948,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+ 	PRMSG (1,
+     "SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
+ 	    0, 0, 0);
+-	(void) umask (oldUmask);
+ 	return status;
+     }
+ 
+@@ -965,7 +965,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+         PRMSG (1,
+         "SocketUNIXCreateListener: Can't allocate space for the addr\n",
+ 	    0, 0, 0);
+-	(void) umask (oldUmask);
+         return TRANS_CREATE_LISTENER_FAILED;
+     }
+ 
+@@ -973,8 +972,6 @@ TRANS(SocketUNIXCreateListener) (XtransC
+     ciptr->addrlen = namelen;
+     memcpy (ciptr->addr, &sockname, ciptr->addrlen);
+ 
+-    (void) umask (oldUmask);
+-
+     return 0;
+ }
+ 
diff --git a/kde-base/kdelibs/kdelibs-3.2.3-r8.ebuild b/kde-base/kdelibs/kdelibs-3.2.3-r8.ebuild
new file mode 100644
index 000000000000..f3e152831dd4
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.2.3-r8.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.3-r8.ebuild,v 1.1 2005/03/16 12:31:56 carlo Exp $
+
+inherit kde eutils
+
+need-autoconf 2.5
+set-kdedir ${PV}
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
+IUSE="alsa cups ipv6 ssl doc ldap"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+DEPEND=">=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	>=app-arch/bzip2-1.0.2
+	>=dev-libs/libxslt-1.0.31
+	>=dev-libs/libxml2-2.5.8
+	>=dev-libs/libpcre-3.9
+	ssl? ( >=dev-libs/openssl-0.9.6k )
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	cups? ( >=net-print/cups-1.1.19 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	media-libs/tiff
+	>=app-admin/fam-2.6.10
+	virtual/ghostscript
+	media-libs/libart_lgpl
+	sys-devel/gettext
+	~kde-base/arts-1.2.3
+	>=x11-libs/qt-3.2.3"
+RDEPEND="${DEPEND}
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	doc? ( app-doc/doxygen )
+	dev-lang/python"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-kcookiejar.patch
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-kstandarddirs.patch
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes.patch
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-htmlframes2.patch
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-kio.diff
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-khtml.diff
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-kioslave.patch
+	epatch ${FILESDIR}/kde3-dcopidlng.patch
+	cd ${S}/dcop && patch -p0 < ${FILESDIR}/post-3.2.3-kdelibs-dcopserver.patch
+	cd ${S}
+	epatch ${FILESDIR}/post-3.2.3-kdelibs-dcop.patch
+
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
+	myconf="$myconf `use_with alsa` `use_enable cups`"
+
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
+	use alsa	&& myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
+	use cups	&& myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups"
+
+	use x86 && myconf="$myconf --enable-fast-malloc=full"
+
+	kde_src_compile configure make
+
+	use doc && make apidox
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	if use doc ; then
+		einfo "Copying API documentation..."
+		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
+		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	else
+		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	fi
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+
+}
+
+pkg_postinst() {
+	if use doc ; then
+		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+		ln -sf $KDEDIR/share/doc/HTML/en/common \
+			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+	fi
+}
diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r7.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r7.ebuild
new file mode 100644
index 000000000000..ccf1321c4c81
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r7.ebuild,v 1.1 2005/03/16 12:31:56 carlo Exp $
+
+inherit kde eutils flag-o-matic
+set-kdedir 3.3
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.3"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~alpha"
+IUSE="alsa arts cups doc ipv6 kerberos ldap spell ssl tiff"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+RDEPEND="arts? ( ~kde-base/arts-1.3.2 )
+	>=x11-libs/qt-3.3.3
+	app-arch/bzip2
+	>=dev-libs/libxslt-1.1.4
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	alsa? ( media-libs/alsa-lib virtual/alsa )
+	cups? ( >=net-print/cups-1.1.19 )
+	ldap? ( >=net-nds/openldap-2.1.26 )
+	tiff? ( media-libs/tiff )
+	spell? ( || ( app-text/aspell
+		      app-text/ispell ) )
+	kerberos? ( virtual/krb5 )
+	virtual/fam
+	virtual/ghostscript
+	media-libs/libart_lgpl
+	net-dns/libidn
+	sys-devel/gettext"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	doc? ( app-doc/doxygen )
+	!kde-misc/kgamma"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-kio.diff
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-htmlframes2.patch
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-kioslave.patch
+
+	# see bug #67748. Patch applied in kdelibs 3.4.x.
+	epatch ${FILESDIR}/${P}-aspell-dir.patch
+
+	# see bug #77127. Patch applied in kdelibs 3.3.3.
+	epatch ${FILESDIR}/${P}-anchor-fix.patch
+
+	# see bug #81652.
+	epatch ${FILESDIR}/kde3-dcopidlng.patch
+
+	# see bug #63529.
+	epatch ${FILESDIR}/${P}-ppc64.patch
+
+	# see bug #83814.
+	epatch ${FILESDIR}/post-3.3.2-kdelibs-dcop.patch
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
+	myconf="$myconf $(use_with alsa) $(use_enable cups) $(use_with arts)"
+
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
+
+	use kerberos || myconf="$myconf --with-gssapi=no"
+
+	use x86 && myconf="$myconf --enable-fast-malloc=full"
+	use ppc64 && append-flags -mminimal-toc
+
+	kde_src_compile configure make
+
+	use doc && make apidox
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	if use doc ; then
+		einfo "Copying API documentation..."
+		dodir ${KDEDIR}/share/doc/HTML/en/kdelibs-apidocs
+		cp -r ${S}/apidocs/* ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	else
+		rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
+	fi
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+	# 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
+
+	if ! use arts ; then
+
+		dodir /etc/env.d
+
+		echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${PREFIX}/lib
+CONFIG_PROTECT=\"${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown\"" > ${D}/etc/env.d/47kdepaths-3.3.1 # number goes down with version upgrade
+
+	fi
+
+}
+
+pkg_postinst() {
+	if use doc ; then
+		rm $KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+		ln -sf $KDEDIR/share/doc/HTML/en/common \
+			$KDEDIR/share/doc/HTML/en/kdelibs-apidocs/common
+	fi
+}