Update to KDE 3.4.2.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 93 insertions, 1 deletions

diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index 6a72007b5643..0ba3809e74e5 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.89 2005/07/04 22:51:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.90 2005/07/28 13:04:00 greg_g Exp $
+
+*kdesdk-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdesdk-3.4-configure.patch, +kdesdk-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Add dependency on sys-libs/db.
 
   04 Jul 2005; Jason Wever <weeve@gentoo.org> kdesdk-3.4.1.ebuild:
   Added ~sparc keyword.
diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.4.2 b/kde-base/kdesdk/files/digest-kdesdk-3.4.2
new file mode 100644
index 000000000000..944cb4dff1ec
--- /dev/null
+++ b/kde-base/kdesdk/files/digest-kdesdk-3.4.2
@@ -0,0 +1 @@
+MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
new file mode 100644
index 000000000000..8933c41f59f7
--- /dev/null
+++ b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
@@ -0,0 +1,41 @@
+diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/svn/configure.in.bot
+--- kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot	2005-05-23 14:08:56.000000000 +0200
++++ kdesdk-3.4.2/kioslave/svn/configure.in.bot	2005-07-26 14:17:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-if test -z "$SVN_SUBDIR"; then
++if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then
+   echo ""
+   echo "You're missing Subversion libraries (1.x)"
+   echo "KDE will not be able to browse Subversion repositories without it,"
+@@ -7,4 +7,3 @@
+   echo ""
+   all_tests=bad
+ fi
+-
+diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.in kdesdk-3.4.2/kioslave/svn/configure.in.in
+--- kdesdk-3.4.2.orig/kioslave/svn/configure.in.in	2005-05-23 14:08:56.000000000 +0200
++++ kdesdk-3.4.2/kioslave/svn/configure.in.in	2005-07-26 14:17:59.000000000 +0200
+@@ -1,3 +1,11 @@
++AC_ARG_WITH(subversion,
++  [AC_HELP_STRING(--with-subversion,
++    [enable support for subversion @<:@default=check@:>@])],
++  [], with_subversion=check)
++
++SVN_SUBDIR=""
++if test "x$with_subversion" != xno; then
++
+ APR_CONFIGS="apr-config /usr/local/apr/bin/apr-config"
+ SVN_SUBDIR="svn"
+ AC_ARG_WITH(apr-config,
+@@ -137,6 +145,11 @@
+ SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE"
+ SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS"
+ 
++if test "x$with_subversion" != xcheck && test -z "$SVN_SUBDIR"; then
++  AC_MSG_ERROR([--with-subversion was given, but test for subversion failed])
++fi
++fi
++
+ AC_SUBST(SVN_INCLUDE)
+ AC_SUBST(SVN_LIB)
+ AC_SUBST(SVN_CPPFLAGS)
diff --git a/kde-base/kdesdk/kdesdk-3.4.2.ebuild b/kde-base/kdesdk/kdesdk-3.4.2.ebuild
new file mode 100644
index 000000000000..1cc8ec7b985b
--- /dev/null
+++ b/kde-base/kdesdk/kdesdk-3.4.2.ebuild
@@ -0,0 +1,44 @@
+# 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.4.2.ebuild,v 1.1 2005/07/28 13:04:00 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="subversion"
+
+DEPEND="x86? ( dev-util/callgrind )
+	media-gfx/graphviz
+	sys-devel/flex
+	subversion? ( dev-util/subversion )
+	|| ( =sys-libs/db-4.3*
+	     =sys-libs/db-4.2* )"
+
+RDEPEND="${DEPEND}
+	dev-util/cvs"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Configure patch. Applied for 3.5.
+	epatch "${FILESDIR}/kdesdk-3.4-configure.patch"
+
+	# For the configure patch.
+	make -f admin/Makefile.common
+}
+
+src_compile() {
+	local myconf="$(use_with subversion)"
+
+	if has_version "=sys-libs/db-4.3*"; then
+		myconf="${myconf} --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-db-name=db-4.2
+		        --with-db-include-dir=/usr/include/db4.2"
+	fi
+
+	kde_src_compile
+}