New version.
authorGregorio Guidi <greg_g@gentoo.org>
Wed, 16 Nov 2005 10:47:10 +0000 (10:47 +0000)
committerGregorio Guidi <greg_g@gentoo.org>
Wed, 16 Nov 2005 10:47:10 +0000 (10:47 +0000)
Package-Manager: portage-2.0.51.22-r3

26 files changed:
kde-base/kde/ChangeLog
kde-base/kde/files/digest-kde-3.5.0_rc1 [new file with mode: 0644]
kde-base/kde/kde-3.5.0_rc1.ebuild [new file with mode: 0644]
kde-base/kdeaccessibility/ChangeLog
kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.0_rc1 [new file with mode: 0644]
kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild [new file with mode: 0644]
kde-base/kdenetwork/ChangeLog
kde-base/kdenetwork/files/digest-kdenetwork-3.5.0_rc1 [new file with mode: 0644]
kde-base/kdenetwork/files/kopete-3.5.0_rc1-fix.patch [new file with mode: 0644]
kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild [new file with mode: 0644]
kde-base/kdepim/ChangeLog
kde-base/kdepim/files/digest-kdepim-3.5.0_rc1 [new file with mode: 0644]
kde-base/kdepim/kdepim-3.5.0_rc1.ebuild [new file with mode: 0644]
kde-base/kdesdk/ChangeLog
kde-base/kdesdk/files/digest-kdesdk-3.5.0_rc1 [new file with mode: 0644]
kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild [new file with mode: 0644]
kde-base/kdetoys/ChangeLog
kde-base/kdetoys/files/digest-kdetoys-3.5.0_rc1 [new file with mode: 0644]
kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild [new file with mode: 0644]
kde-base/kdeutils/ChangeLog
kde-base/kdeutils/files/digest-kdeutils-3.5.0_rc1 [new file with mode: 0644]
kde-base/kdeutils/files/kdeutils-3.5_rc1-unicode.patch [new file with mode: 0644]
kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild [new file with mode: 0644]
kde-base/kdewebdev/ChangeLog
kde-base/kdewebdev/files/digest-kdewebdev-3.5.0_rc1 [new file with mode: 0644]
kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild [new file with mode: 0644]

index 157ae071cba111cf2eaf7674c36848ef4c46cd11..8fbc20164ae44accb358116424b04ae663ad5cf8 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kde
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.123 2005/10/20 15:20:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.124 2005/11/16 10:47:10 greg_g Exp $
+
+*kde-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.5.0_rc1.ebuild:
+  New version.
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> kde-3.4.1.ebuild:
   Mark 3.4.1 stable on alpha
diff --git a/kde-base/kde/files/digest-kde-3.5.0_rc1 b/kde-base/kde/files/digest-kde-3.5.0_rc1
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/kde-base/kde/kde-3.5.0_rc1.ebuild b/kde-base/kde/kde-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..351f0cb
--- /dev/null
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:47:10 greg_g Exp $
+
+DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+SLOT="3.5"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="accessibility"
+
+# excluded: kdebindings, kdesdk, since these are developer-only packages
+RDEPEND="~kde-base/kdelibs-${PV}
+       ~kde-base/kdebase-${PV}
+       ~kde-base/kdeaddons-${PV}
+       ~kde-base/kdeadmin-${PV}
+       ~kde-base/kdeartwork-${PV}
+       ~kde-base/kdeedu-${PV}
+       ~kde-base/kdegames-${PV}
+       ~kde-base/kdegraphics-${PV}
+       ~kde-base/kdemultimedia-${PV}
+       ~kde-base/kdenetwork-${PV}
+       ~kde-base/kdepim-${PV}
+       ~kde-base/kdetoys-${PV}
+       ~kde-base/kdeutils-${PV}
+       ~kde-base/kdewebdev-${PV}
+       accessibility? ( ~kde-base/kdeaccessibility-${PV} )"
index 2ad17e1711fc79c3333d45a858d1b79443de3716..62ba4564cb119a05d20de1329190bd1e1e5e5521 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeaccessibility
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.77 2005/10/15 11:08:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.78 2005/11/16 10:42:36 greg_g Exp $
+
+*kdeaccessibility-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.5.0_rc1.ebuild:
+  New version.
 
 *kdeaccessibility-3.5.0_beta2 (15 Oct 2005)
 
diff --git a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.0_rc1 b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.0_rc1
new file mode 100644 (file)
index 0000000..d8a4fa2
--- /dev/null
@@ -0,0 +1 @@
+MD5 cc27f1b3799ad4213796ba7c4c97fdff kdeaccessibility-3.5.0_rc1.tar.bz2 8435792
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..d46192d
--- /dev/null
@@ -0,0 +1,30 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:42:36 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE accessibility module"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="alsa gstreamer"
+
+DEPEND="media-libs/akode
+       alsa? ( media-libs/alsa-lib )
+       gstreamer? ( >=media-libs/gstreamer-0.8.7
+                    >=media-libs/gst-plugins-0.8.7 )"
+
+RDEPEND="${DEPEND}
+       || ( app-accessibility/festival
+            app-accessibility/epos
+            app-accessibility/flite
+            app-accessibility/freetts )"
+
+DEPEND="${DEPEND}
+       dev-util/pkgconfig"
+
+src_compile() {
+       local myconf="--with-akode
+                    $(use_with alsa) $(use_with gstreamer)"
+
+       kde_src_compile
+}
index 1c7e8439039ca0200b2628004b318c155ac01855..e10b4ef298e3a28bbb289c69420a984f2246d5eb 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.171 2005/10/17 19:49:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.172 2005/11/16 10:35:50 greg_g Exp $
+
+*kdenetwork-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kopete-3.5.0_rc1-fix.patch, +kdenetwork-3.5.0_rc1.ebuild:
+  New version.
 
   17 Oct 2005; Aron Griffis <agriffis@gentoo.org>
   kdenetwork-3.4.1-r1.ebuild:
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.0_rc1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.0_rc1
new file mode 100644 (file)
index 0000000..8b5e955
--- /dev/null
@@ -0,0 +1 @@
+MD5 721a495ec77098bca021b163b892d060 kdenetwork-3.5.0_rc1.tar.bz2 7452842
diff --git a/kde-base/kdenetwork/files/kopete-3.5.0_rc1-fix.patch b/kde-base/kdenetwork/files/kopete-3.5.0_rc1-fix.patch
new file mode 100644 (file)
index 0000000..1f2afd8
--- /dev/null
@@ -0,0 +1,20 @@
+Index: kircmessage.cpp
+===================================================================
+--- kopete/protocols/irc/libkirc/kircmessage.cpp       (revision 479956)
++++ kopete/protocols/irc/libkirc/kircmessage.cpp       (working copy)
+@@ -168,11 +168,11 @@
+                       //
+                       // Some servers send '\n' instead of '\r\n' that the RFCs say they should be sending.
+ 
+-                      if (length > 1 && raw[length-2] == '\n') {
+-                              raw[length-2] = '\0';
++                      if (length > 1 && raw.at(length-2) == '\n') {
++                              raw.at(length-2) = '\0';
+                       }
+-                      if (length > 2 && raw[length-3] == '\r') {
+-                              raw[length-3] = '\0';
++                      if (length > 2 && raw.at(length-3) == '\r') {
++                              raw.at(length-3) = '\0';
+                       }
+ 
+                       kdDebug(14121) << "<< " << raw << endl;
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..c9e3beb
--- /dev/null
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:35:50 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE network apps: kopete, kppp, kget..."
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="rdesktop sametime slp ssl wifi xmms"
+
+DEPEND="~kde-base/kdebase-${PV}
+       dev-libs/libxslt
+       dev-libs/libxml2
+       net-dns/libidn
+       >=dev-libs/glib-2
+       sametime? ( >=net-libs/meanwhile-0.4.2 )
+       slp? ( net-libs/openslp )
+       wifi? ( net-wireless/wireless-tools )
+       xmms? ( media-sound/xmms )"
+# glib: for webcam support in Kopete.
+
+RDEPEND="${DEPEND}
+       rdesktop? ( >=net-misc/rdesktop-1.4.1 )
+       dev-lang/perl
+       ssl? ( app-crypt/qca-tls
+              dev-perl/IO-Socket-SSL )"
+# perl: for KSirc.
+# qca-tls: for Kopete jabber plugin.
+# IO-Socket-SSL: for SSL support in KSirc.
+
+DEPEND="${DEPEND}
+       dev-util/pkgconfig"
+
+src_unpack() {
+       kde_src_unpack
+
+       # Remove for rc2.
+       epatch "${FILESDIR}/kopete-3.5.0_rc1-fix.patch"
+}
+
+
+src_compile() {
+       local myconf="--with-libidn
+                     $(use_enable sametime sametime-plugin)
+                     $(use_enable slp) $(use_with wifi)
+                     $(use_with xmms) --without-external-libgadu"
+
+       kde_src_compile
+}
+
+src_install() {
+       kde_src_install
+
+       chmod u+s ${D}/${KDEDIR}/bin/reslisa
+
+       # empty config file needed for lisa to work with default settings
+       dodir /etc
+       touch ${D}/etc/lisarc
+
+       # lisa, reslisa initscripts
+       sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${T}/lisa
+       sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${T}/reslisa
+       exeinto /etc/init.d
+       doexe ${T}/lisa ${T}/reslisa
+
+       insinto /etc/conf.d
+       newins ${FILESDIR}/lisa.conf lisa
+       newins ${FILESDIR}/reslisa.conf reslisa
+}
index 03decfdadc0359b4deafb8ad67f272dc30ac3d63..6f8f20afda5c9069d220c90c32465aee97843672 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.176 2005/10/17 22:35:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.177 2005/11/16 10:38:51 greg_g Exp $
+
+*kdepim-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.5.0_rc1.ebuild:
+  New version.
 
   17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdepim-3.4.1-r2.ebuild:
   Mark 3.4.1-r2 stable on alpha
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.0_rc1 b/kde-base/kdepim/files/digest-kdepim-3.5.0_rc1
new file mode 100644 (file)
index 0000000..2a2a943
--- /dev/null
@@ -0,0 +1 @@
+MD5 6d5df9a18022f020e97d279ac42b7885 kdepim-3.5.0_rc1.tar.bz2 12865936
diff --git a/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild b/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..d3b1c57
--- /dev/null
@@ -0,0 +1,22 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:38:51 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="crypt gnokii pda"
+
+DEPEND="~kde-base/kdebase-${PV}
+       >=dev-libs/cyrus-sasl-2
+       pda? ( app-pda/pilot-link dev-libs/libmal )
+       gnokii? ( app-mobilephone/gnokii )
+       crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
+
+src_compile() {
+       local myconf="--with-sasl $(use_with gnokii)"
+
+       kde_src_compile
+}
index 80aeb18f32e93230fdc760116f05b9e356427909..e5ad800fc2b856898c867b9fd2e66d3bdaff609d 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.100 2005/10/15 11:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.101 2005/11/16 10:45:33 greg_g Exp $
+
+*kdesdk-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.5.0_rc1.ebuild:
+  New version.
 
 *kdesdk-3.5.0_beta2 (15 Oct 2005)
 
diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.5.0_rc1 b/kde-base/kdesdk/files/digest-kdesdk-3.5.0_rc1
new file mode 100644 (file)
index 0000000..373f89b
--- /dev/null
@@ -0,0 +1 @@
+MD5 0c6de88df6ddd2c1bb00bb1987640df9 kdesdk-3.5.0_rc1.tar.bz2 4831451
diff --git a/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild b/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..98e2ad6
--- /dev/null
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:45:33 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa"
+IUSE="berkdb subversion"
+
+DEPEND="x86? ( dev-util/callgrind )
+       sys-devel/flex
+       subversion? ( dev-util/subversion )
+       berkdb? ( || ( =sys-libs/db-4.3*
+                      =sys-libs/db-4.2* ) )"
+
+RDEPEND="${DEPEND}
+       dev-util/cvs
+       media-gfx/graphviz"
+
+src_compile() {
+       local myconf="$(use_with subversion)"
+
+       if use berkdb; then
+               if has_version "=sys-libs/db-4.3*"; then
+                       myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3
+                               --with-db-include-dir=/usr/include/db4.3"
+               elif has_version "=sys-libs/db-4.2*"; then
+                       myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2
+                               --with-db-include-dir=/usr/include/db4.2"
+               fi
+       else
+               myconf="${myconf} --without-berkeley-db"
+       fi
+
+       kde_src_compile
+}
index 4d15146ebb37667624c82d05a004c925c8fcad9c..101c92aaf6fb311fa87db25e6fb23a43c2bcab18 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdetoys
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.124 2005/10/17 22:46:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.125 2005/11/16 10:39:55 greg_g Exp $
+
+*kdetoys-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.5.0_rc1.ebuild:
+  New version.
 
   17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdetoys-3.4.1.ebuild:
   Mark 3.4.1 stable on alpha
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.5.0_rc1 b/kde-base/kdetoys/files/digest-kdetoys-3.5.0_rc1
new file mode 100644 (file)
index 0000000..f1deed5
--- /dev/null
@@ -0,0 +1 @@
+MD5 1a6d3df94de6ed0f9893514a32c94194 kdetoys-3.5.0_rc1.tar.bz2 3171886
diff --git a/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild b/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..5d60c89
--- /dev/null
@@ -0,0 +1,10 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:39:55 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE toys"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
index af6269fd233e3e361fec5dcdaf38fb7b6d8606bc..fcf1ae8541e94eae769eb4ea4024a0afe581aa8f 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.134 2005/10/19 14:34:28 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.135 2005/11/16 10:41:26 greg_g Exp $
+
+*kdeutils-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeutils-3.5_rc1-unicode.patch, +kdeutils-3.5.0_rc1.ebuild:
+  New version.
 
 *kdeutils-3.4.3-r1 (19 Oct 2005)
 
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.5.0_rc1 b/kde-base/kdeutils/files/digest-kdeutils-3.5.0_rc1
new file mode 100644 (file)
index 0000000..0a6bb31
--- /dev/null
@@ -0,0 +1 @@
+MD5 801c776b207fea6983854925b9663f9f kdeutils-3.5.0_rc1.tar.bz2 2957042
diff --git a/kde-base/kdeutils/files/kdeutils-3.5_rc1-unicode.patch b/kde-base/kdeutils/files/kdeutils-3.5_rc1-unicode.patch
new file mode 100644 (file)
index 0000000..c859831
--- /dev/null
@@ -0,0 +1,53 @@
+diff -Nur kdeutils-3.5.0.orig/superkaramba/src/meter_python.cpp kdeutils-3.5.0/superkaramba/src/meter_python.cpp
+--- kdeutils-3.5.0.orig/superkaramba/src/meter_python.cpp      2005-11-08 23:29:27.000000000 +0100
++++ kdeutils-3.5.0/superkaramba/src/meter_python.cpp   2005-11-16 10:20:33.000000000 +0100
+@@ -119,22 +119,41 @@
+   PyObject *pyString;
+ 
+   const unsigned short* tmp = string.ucs2();
+-  Py_UNICODE *buf = new Py_UNICODE[string.length()];
+-  for(unsigned int i = 0; i < string.length(); i++)
++  bool dofree = false;
++
++  if(tmp)
+   {
+-    buf[i] = tmp[i];
++    #if Py_UNICODE_SIZE == 4
++
++      Py_UNICODE* buf = new Py_UNICODE[string.length()];
++      
++      for(unsigned int i = 0; i < string.length(); i++)
++      {
++        buf[i] = tmp[i];
++      }
++      dofree = true;
++
++    #else
++
++      Py_UNICODE* buf = (Py_UNICODE*) tmp;
++
++    #endif
++
++    pyString = PyUnicode_FromUnicode(buf, string.length());
++
++    if(dofree)
++    {
++      delete [] buf;
++    }
+   }
+-  
+-  if(tmp)
+-    pyString = PyUnicode_FromWideChar(buf, string.length());
++
+   else
+     pyString = PyString_FromString("");
+-  
+-  delete [] buf;
+ 
+   return pyString;
+ }
+ 
++
+ long getMeter(long widget, char* name)
+ {
+   karamba* theme = (karamba*)widget;
diff --git a/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild b/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..4623434
--- /dev/null
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:41:26 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE utilities"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="crypt snmp pbbuttonsd xmms"
+
+DEPEND="~kde-base/kdebase-${PV}
+       snmp? ( net-analyzer/net-snmp )
+       pbbuttonsd? ( app-laptop/pbbuttonsd )
+       dev-lang/python
+       xmms? ( media-sound/xmms )
+       dev-libs/gmp"
+
+RDEPEND="${DEPEND}
+       crypt? ( app-crypt/gnupg )
+       !x11-misc/superkaramba"
+
+src_unpack() {
+       kde_src_unpack
+
+       # Fix output of klaptopdaemon (kde bug 103437).
+       epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
+
+       # Remove for rc2.
+       epatch "${FILESDIR}/kdeutils-3.5_rc1-unicode.patch"
+}
+
+src_compile() {
+       local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
+                     $(use_with xmms)"
+
+       use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
+
+       kde_src_compile
+}
index c08933641f98d0918ed48d9badff66b41230020c..ff751172ae820f3516582dcb1e161f8b37e07072 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdewebdev
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.73 2005/10/18 00:19:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.74 2005/11/16 10:46:38 greg_g Exp $
+
+*kdewebdev-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdewebdev-3.5.0_rc1.ebuild:
+  New version.
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdewebdev-3.4.1.ebuild:
   Mark 3.4.1 stable on alpha
diff --git a/kde-base/kdewebdev/files/digest-kdewebdev-3.5.0_rc1 b/kde-base/kdewebdev/files/digest-kdewebdev-3.5.0_rc1
new file mode 100644 (file)
index 0000000..6d2b2f4
--- /dev/null
@@ -0,0 +1 @@
+MD5 75d6be1a7edcee2ae9290b002a9c720f kdewebdev-3.5.0_rc1.tar.bz2 6019892
diff --git a/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild b/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild
new file mode 100644 (file)
index 0000000..abbcaa4
--- /dev/null
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:46:38 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE web development - Quanta"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc tidy"
+
+DEPEND="dev-libs/libxslt
+       dev-libs/libxml2"
+
+RDEPEND="${DEPEND}
+       tidy? ( app-text/htmltidy )
+       doc? ( app-doc/quanta-docs )"