Make kdesdk-kioslaves work. Fixes bug 244960.

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 30 insertions, 43 deletions

diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index a0b776317da2..826c98f721e4 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.92 2008/10/21 10:04:16 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.93 2008/10/30 12:24:53 scarabeus Exp $
+
+*kdesdk-kioslaves-4.1.2-r1 (30 Oct 2008)
+
+  30 Oct 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  -kdesdk-kioslaves-4.1.2.ebuild, +kdesdk-kioslaves-4.1.2-r1.ebuild:
+  Rewrite kdesdk-kioslaves so it actualy works correctly. Also add -r1
+  because it changes path where it installs. #244960
 
   21 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   -kdesdk-kioslaves-4.0.4.ebuild, -kdesdk-kioslaves-4.0.5.ebuild:
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2-r1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..911361ea764a
--- /dev/null
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2-r1.ebuild,v 1.1 2008/10/30 12:24:53 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdesdk"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-libs/apr
+	dev-util/subversion"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs} -DAPRCONFIG_EXECUTABLE=/usr/bin/apr-1-config"
+	kde4-meta_src_configure
+}
+# warning when there is kdesvn for kde4 it will collide with this package
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2.ebuild
deleted file mode 100644
index 4fbcdbfbff4e..000000000000
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-4.1.2.ebuild,v 1.1 2008/10/02 08:13:36 jmbsvicetto Exp $
-
-EAPI="2"
-
-KMNAME=kdesdk
-KMMODULE=kioslave
-inherit kde4-meta
-
-DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/apr
-		dev-util/subversion"
-RDEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if ldd /usr/bin/svn | grep -q libapr-0 \
-		&& ! has_version dev-libs/apr:0;
-	then
-		eerror "Subversion has been built against dev-libs/apr:0, but no matching version is installed."
-		die "Please rebuild dev-util/subversion."
-	fi
-	if ldd /usr/bin/svn | grep -q libapr-1 \
-		&& ! has_version dev-libs/apr:1;
-	then
-		eerror "Subversion has been built against dev-libs/apr:1, but no matching version is installed."
-		die "Please rebuild dev-util/subversion."
-	fi
-}
-
-src_configure() {
-	if ldd /usr/bin/svn | grep -q libapr-0; then
-		mycmakeargs="${mycmakeargs} -DAPRCONFIG_EXECUTABLE=/usr/bin/apr-config"
-	else
-		mycmakeargs="${mycmakeargs} -DAPRCONFIG_EXECUTABLE=/usr/bin/apr-1-config"
-	fi
-
-	kde4-meta_src_configure
-}