New version, removing older versions

16 files changed, 19 insertions, 393 deletions

diff --git a/kde-base/kdebindings/Manifest b/kde-base/kdebindings/Manifest
index eda9b5f629ab..2cfcbd0218b8 100644
--- a/kde-base/kdebindings/Manifest
+++ b/kde-base/kdebindings/Manifest
@@ -1,5 +1,6 @@
 MD5 a0e331760e5a548b8ae0da5301f64e9a kdebindings-3.1.4.ebuild 1570
 MD5 aef38763e2fd59f6de5d641c78f4303d kdebindings-3.0.5b.ebuild 1152
+MD5 28736a498911c655c4135788ba49683e kdebindings-3.2.0_rc1.ebuild 1642
 MD5 28736a498911c655c4135788ba49683e kdebindings-3.2.0_beta2.ebuild 1642
 MD5 43959c9b0f8033eba4838ffbc0fa4bc8 kdebindings-3.1.5.ebuild 1414
 MD5 de655afabbf0626441ea5d2cbf03e9ea ChangeLog 6517
@@ -15,4 +16,5 @@ MD5 d4f762ee4e56e0866b0e10f823be10d0 files/digest-kdebindings-3.1.5 71
 MD5 3879564d3e6c08a786055be6147349f8 files/x_Qt.cpp.diff 761
 MD5 50532a20e0b1595a820a3cfe48d75f0d files/digest-kdebindings-3.2.0_beta2 72
 MD5 823592dd45da38fd48dd11d40e5bbb91 files/digest-kdebindings-3.0.5b 220
+MD5 8522b8f3053f1fc8c739c5f34cd0738e files/digest-kdebindings-3.2.0_rc1 73
 MD5 452eac66c774d6c287648f4f68d6aa36 files/kdebindings-3.0.5a-qt31.diff 76610
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 092f59a55c86..0011b9c62cf0 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.113 2004/01/16 19:00:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.114 2004/01/19 03:59:51 caleb Exp $
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.0.4-r1.ebuild,
+  kdelibs-3.1.2-r1.ebuild, kdelibs-3.2.0_beta1.ebuild,
+  kdelibs-3.2.0_beta2.ebuild, files/kdelibs-3.1.2-http.patch,
+  files/kdelibs-3.1.2-khtml.patch,
+  files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch:
+  New version, removing older versions
 
   16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdelibs-3.1.5.ebuild:
   Marked stable on hppa.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index e6ffae890d4e..27191213f191 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,12 +1,8 @@
-MD5 8be197e19e85404d68a4f5270efd4d44 kdelibs-3.1.2-r1.ebuild 2532
 MD5 6bf92d1c01b2fb7165ae97a9917d4e83 kdelibs-3.1.4.ebuild 2386
-MD5 91a9be08b638d2eb478665d154e9908e kdelibs-3.2.0_beta1.ebuild 2550
-MD5 ea339cdf171dc8b017d7df79ad1edc10 kdelibs-3.0.4-r1.ebuild 2296
-MD5 872c910f32b4881bd6622878b0cc4a64 kdelibs-3.2.0_rc1.ebuild 2656
-MD5 922dfd3fab1f4078d891c62afdd90148 kdelibs-3.0.5b-r1.ebuild 1990
+MD5 5cde2e2e856ea2eabd3eb35c535c3f66 kdelibs-3.2.0_rc1.ebuild 2651
+MD5 386541409588ee9fe8f6f3d23a218f42 kdelibs-3.0.5b-r1.ebuild 1989
 MD5 8d6c56b8a4d27bf6a0d74326b7511a40 kdelibs-3.1.5.ebuild 1930
-MD5 e0a6616db88e658275beaf50757433dc kdelibs-3.2.0_beta2.ebuild 2656
-MD5 67b6435911ad6b944daedf21bcc70788 ChangeLog 18864
+MD5 15ca5f3e3e273f357cce8231dafb5ba6 ChangeLog 19185
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
 MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
@@ -15,13 +11,6 @@ MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.4-kjs-alphaev6-gcc3-worka
 MD5 7e993c34c9e6a4d6d50dfc3c920eab11 files/digest-kdelibs-3.2.0_rc1 69
 MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
 MD5 1e53bd5071cc4fe6ba67fda7252a1cf2 files/digest-kdelibs-3.1.5 68
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 488126241373edef5f0cd3db16aecc63 files/kdelibs-3.1.2-http.patch 1450
-MD5 c087405ca3581f6493850d59c98dcefa files/kdelibs-3.1.2-khtml.patch 1486
-MD5 03137d6470b9ab6532a11303c6d6a2ce files/digest-kdelibs-3.2.0_beta1 69
-MD5 b5157791bb30f64dcb7a318f92c40c8e files/digest-kdelibs-3.2.0_beta2 69
 MD5 256de857a4ee4797da48a5c843ab107c files/kdelibs-3.1.4-alsafix.diff 502
-MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
-MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
 MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.0.4-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.0.4-r1
deleted file mode 100644
index 75b6d44bc785..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.0.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0b81f457a78c07978d2c973e0d7d7d49 kdelibs-3.0.4.tar.bz2 7643484
-MD5 5625501819f09510d542142aea7b85ab post-3.0.4-kdelibs-kio-misc.diff 2384
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.2-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.1.2-r1
deleted file mode 100644
index 8a9950b60c75..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b896ce9a6942e4cc4fe1758236bafa3 kdelibs-3.1.2.tar.bz2 10524265
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta1 b/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta1
deleted file mode 100644
index 156e8032c2a2..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d1fbdf9d2740d779b564274e7344b79 kdelibs-3.1.93.tar.bz2 11798521
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta2 b/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta2
deleted file mode 100644
index 58f0290d03f0..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d77351bca1ea44ae0369dbda45a734e5 kdelibs-3.1.94.tar.bz2 12251697
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.2.0_rc1 b/kde-base/kdelibs/files/digest-kdelibs-3.2.0_rc1
new file mode 100644
index 000000000000..336bc5ff9729
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.2.0_rc1
@@ -0,0 +1 @@
+MD5 472b9e0862ae408caff2e20d417ef2df kdelibs-3.1.95.tar.bz2 12565631
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch b/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch
deleted file mode 100644
index 2cae6948ddf9..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kioslave/http/http.cc	7 May 2003 16:43:40 -0000	1.551.2.15
-+++ kioslave/http/http.cc	4 Jul 2003 11:37:27 -0000	1.551.2.21
-@@ -230,19 +229,30 @@
-   kdDebug(7113) << "(" << m_pid << ") ssl_was_in_use = "
-                 << metaData ("ssl_was_in_use") << endl;
- 
-+  m_request.referrer = QString::null;
-   if ( config()->readBoolEntry("SendReferrer", true) &&
-        (m_protocol == "https" || m_protocol == "webdavs" ||
-         metaData ("ssl_was_in_use") != "TRUE" ) )
--     m_request.referrer = metaData("referrer");
--  else
--     m_request.referrer = QString::null;
--
--  if (!m_request.referrer.startsWith("http"))
-   {
--     if (m_request.referrer.startsWith("webdav"))
--        m_request.referrer.replace(0, 6, "http");
--     else
--        m_request.referrer = QString::null;
-+     KURL referrerURL = metaData("referrer");
-+     if (referrerURL.isValid())
-+     {
-+        // Sanitize
-+        QString protocol = referrerURL.protocol();
-+        if (protocol.startsWith("webdav"))
-+        {
-+           protocol.replace(0, 6, "http");
-+           referrerURL.setProtocol(protocol);
-+        }
-+        
-+        if (protocol.startsWith("http"))
-+        {
-+           referrerURL.setRef(QString::null);
-+           referrerURL.setUser(QString::null);
-+           referrerURL.setPass(QString::null);
-+           m_request.referrer = referrerURL.url();
-+        }
-+     }
-   }
- 
-   if ( config()->readBoolEntry("SendLanguageSettings", true) )
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch b/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch
deleted file mode 100644
index 276624135f4b..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- khtml/khtml_part.cpp	3 Jul 2003 17:13:02 -0000	1.770.2.27
-+++ khtml/khtml_part.cpp	10 Jul 2003 11:45:10 -0000
-@@ -4171,7 +4171,27 @@
- 
- QString KHTMLPart::referrer() const
- {
--   return d->m_pageReferrer;
-+   return d->m_referrer;
-+}
-+
-+QString KHTMLPart::pageReferrer() const
-+{
-+   KURL referrerURL = d->m_pageReferrer;
-+   if (referrerURL.isValid())
-+   {
-+      QString protocol = referrerURL.protocol();
-+
-+      if ((protocol == "http") ||
-+         ((protocol == "https") && (m_url.protocol() == "https")))
-+      {
-+          referrerURL.setRef(QString::null);
-+          referrerURL.setUser(QString::null);
-+          referrerURL.setPass(QString::null);
-+          return referrerURL.url();
-+      }
-+   }
-+   
-+   return QString::null;
- }
-
- 
---- khtml/khtml_part.h	18 May 2003 12:34:36 -0000	1.197.2.5
-+++ khtml/khtml_part.h	10 Jul 2003 11:45:11 -0000
-@@ -702,6 +702,11 @@
-   QString referrer() const;
- 
-   /**
-+   * Referrer used to obtain this page.
-+   */
-+  QString pageReferrer() const;
-+
-+  /**
-    * Last-modified date (in raw string format), if received in the [HTTP] headers.
-    */
-   QString lastModified() const;
-
---- khtml/html/html_documentimpl.cpp	27 Jun 2003 09:55:33 -0000	1.143.2.6
-+++ khtml/html/html_documentimpl.cpp	10 Jul 2003 11:45:11 -0000
-@@ -85,7 +85,7 @@
- DOMString HTMLDocumentImpl::referrer() const
- {
-     if ( view() )
--        return view()->part()->referrer();
-+        return view()->part()->pageReferrer();
-     return DOMString();
- }
- 
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch
deleted file mode 100644
index 930776d23a51..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kjs/ustring.cpp.orig	2003-01-23 15:49:49.000000000 -0500
-+++ kjs/ustring.cpp	2003-01-27 19:49:00.000000000 -0500
-@@ -421,8 +421,15 @@
- {
-   double d = toDouble();
-   bool b = true;
-+  /* useless temporary variable to work around gcc optimization bug */
-+  bool nan = false;
- 
--  if (isNaN(d) || d != static_cast<unsigned long>(d)) {
-+  if (isNaN(d)) {
-+    d = 0;
-+    nan = true;
-+  }
-+
-+  if (nan || d != static_cast<unsigned long>(d)) {
-     b = false;
-     d = 0;
-   }
diff --git a/kde-base/kdelibs/kdelibs-3.0.4-r1.ebuild b/kde-base/kdelibs/kdelibs-3.0.4-r1.ebuild
deleted file mode 100644
index ad4bd0998de2..000000000000
--- a/kde-base/kdelibs/kdelibs-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.4-r1.ebuild,v 1.15 2003/12/09 17:46:38 lanius Exp $
-inherit kde eutils
-#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
-
-IUSE="ipv6 ssl alsa cups"
-SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2
-	mirror://kde/security_patches/post-${PV}-${PN}-kio-misc.diff"
-
-DESCRIPTION="KDE $PV - base libraries needed by all kde programs"
-KEYWORDS="x86 ppc alpha"
-HOMEPAGE="http//www.kde.org/"
-
-SLOT="3.0"
-LICENSE="GPL-2 LGPL-2"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire
-# DEPEND from scratch.
-DEPEND=""
-RDEPEND=""
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam
-	~kde-base/arts-1.0.4
-	virtual/ghostscript
-	sys-devel/gettext"
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python
-	>=sys-apps/portage-2.0.36" # for bug #7359
-
-myconf="$myconf --with-distribution=Gentoo"
-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"
-
-[ "$ARCH" == "x86" ] && myconf="$myconf --enable-fast-malloc=full"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-
-set-kdedir $PV
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/post-${PV}-${PN}-kio-misc.diff
-	kde_sandbox_patch ${S}/kio/misc/kpac
-}
-
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	dodir /etc/env.d
-	echo "PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/bin
-LDPATH=${PREFIX}/lib
-KDEDIRS=$PREFIX
-CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/65kdelibs-${PV} # number goes down with version upgrade
-
-	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/50kdedir-${PV} # number goes up with version upgrade
-}
diff --git a/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild b/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild
index 6819bd08473c..d9be97296f08 100644
--- a/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild,v 1.4 2003/12/09 17:46:38 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.5b-r1.ebuild,v 1.5 2004/01/19 03:59:51 caleb Exp $
 inherit kde eutils
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
diff --git a/kde-base/kdelibs/kdelibs-3.1.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.1.2-r1.ebuild
deleted file mode 100644
index 9d8e690ff37b..000000000000
--- a/kde-base/kdelibs/kdelibs-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.2-r1.ebuild,v 1.5 2003/12/09 17:46:38 lanius Exp $
-inherit kde
-#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
-
-IUSE="alsa cups ipv6 ssl"
-DESCRIPTION="KDE libraries needed by all kde programs"
-KEYWORDS="x86 ppc sparc alpha hppa"
-HOMEPAGE="http//www.kde.org/"
-SLOT="3.1"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=""
-RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=app-arch/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam
-	virtual/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.1.2"
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python
-	>=sys-apps/portage-2.0.36" # for #7359
-
-myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-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"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-
-set-kdedir $PV
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/kio/misc/kpac
-	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
-	cd ${S} && epatch ${FILESDIR}/${P}-http.patch
-	cd ${S} && epatch ${FILESDIR}/${P}-khtml.patch
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	# kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild
-	# shouldn't install anything into kdelibs-apidocs (bug #15102)
-	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-}
-
-pkg_postinst() {
-	einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1.
-	If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS=
-	line and env-update."
-}
diff --git a/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild b/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild
deleted file mode 100644
index 3170f2f182af..000000000000
--- a/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta1.ebuild,v 1.7 2003/12/09 17:46:38 lanius Exp $
-inherit kde
-
-MY_PV=3.1.93
-S=${WORKDIR}/${PN}-${MY_PV}
-
-IUSE="alsa cups ipv6 ssl"
-DESCRIPTION="KDE libraries needed by all kde programs"
-KEYWORDS="~x86"
-HOMEPAGE="http//www.kde.org/"
-SLOT="3.2"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/unstable/${MY_PV}/src/${PN}-${MY_PV}.tar.bz2"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND="dev-lang/perl
-	media-libs/audiofile
-	app-arch/bzip2
-	dev-libs/libxslt
-	dev-libs/libpcre
-	dev-libs/libxml2
-	ssl? ( dev-libs/openssl )
-	alsa? ( media-libs/alsa-lib virtual/alsa )
-	cups? ( net-print/cups )
-	media-libs/tiff
-	app-admin/fam
-	virtual/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.2.0_beta1"
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	doc? ( app-doc/doxygen )
-	dev-lang/python"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-need-autoconf 2.5
-
-set-kdedir ${PV}
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S} && make -f admin/Makefile.common && aclocal
-	cd ${S}/kio/misc/kpac
-	cp Makefile.am Makefile.am.orig
-	sed -e 's: $(bindir): $(DESTDIR)/$(bindir):g' Makefile.am.orig > Makefile.am
-	rm Makefile.am.orig
-	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
-}
-
-src_compile() {
-
-	kde_src_compile myconf
-
-	myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-	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
-}
-
-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.2.0_beta2.ebuild b/kde-base/kdelibs/kdelibs-3.2.0_rc1.ebuild
index d4948e916189..9130972da5de 100644
--- a/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.2.0_rc1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_beta2.ebuild,v 1.14 2004/01/18 16:07:48 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.2.0_rc1.ebuild,v 1.1 2004/01/19 03:59:51 caleb Exp $
 inherit kde
 
 need-autoconf 2.5
 set-kdedir ${PV}
 
-MY_PV=3.1.94
+MY_PV=3.1.95
 S=${WORKDIR}/${PN}-${MY_PV}
 
 IUSE="alsa cups ipv6 ssl doc ldap"
@@ -33,7 +33,7 @@ DEPEND=">=sys-devel/autoconf-2.58
 	virtual/ghostscript
 	media-libs/libart_lgpl
 	sys-devel/gettext
-	~kde-base/arts-1.2.0_beta2
+	~kde-base/arts-1.2.0_rc1
 	>=x11-libs/qt-3.2.0"
 
 RDEPEND="$DEPEND