New version.

Package-Manager: portage-2.0.51.22-r3

4 files changed, 101 insertions, 1 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index af6269fd233e..fcf1ae8541e9 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -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
index 000000000000..0a6bb31a4539
--- /dev/null
+++ b/kde-base/kdeutils/files/digest-kdeutils-3.5.0_rc1
@@ -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
index 000000000000..c8598310eeeb
--- /dev/null
+++ b/kde-base/kdeutils/files/kdeutils-3.5_rc1-unicode.patch
@@ -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
index 000000000000..4623434d1f47
--- /dev/null
+++ b/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild
@@ -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
+}