Make kdesdk-kioslaves work. Fixes bug 244960.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 33 insertions, 46 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/Manifest b/kde-base/kdesdk-kioslaves/Manifest
index cd43beb9cf4d..5ed2bc2c02a1 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-base/kdesdk-kioslaves/Manifest
@@ -1,8 +1,8 @@
-DIST kdesdk-3.5.10.tar.bz2 5252055 RMD160 28a296667d66021c3b13c1991e1028d5e8554dfd SHA1 1a6702e8e7741690496327b8a908fabdab5d3c79 SHA256 78626d3af1ed1cba8eb147bbecd13732bc7cd26ba159fa67a211cdebc30dfd47
+DIST kdesdk-3.5.10.tar.bz2 218481 RMD160 2275f062d36f7791f04b2878b36d3eef6ef59d37 SHA1 d9a9600266443096f7baa1830cdda0e7a2ca71c4 SHA256 213954587525c07cc8f1fb8dd10f219da02979363b02d8e7c02598e2d5c654c8
 DIST kdesdk-3.5.9.tar.bz2 5250576 RMD160 afb9f26bae17ec4e43db51855e19f5cd88a70e6c SHA1 8e968591d37f770e8dc8aad43e696d3e44f8e2d0 SHA256 dabb5fe471381b8ac50996ca16869e5ae400826166dadce51044990faa088179
 DIST kdesdk-4.1.2.tar.bz2 4908025 RMD160 7c76480b8be6240ff95905b26839fcd947afe7d8 SHA1 1bab8f79a66f7947fdf596e1ca42801a6baac9a2 SHA256 35631cf71f110315936dead6dc9949b8bc01b5226b98a32762f541d6da2271af
 EBUILD kdesdk-kioslaves-3.5.10.ebuild 1246 RMD160 5f46ec347e529debddcb67471099c9871c325ff4 SHA1 5f1beddf0666f394d9812bc30ca8ecb7289229ad SHA256 073b602cb0e8f0bad49e0f36c75afe3b43b9819c59bfa423b0729c1493147755
 EBUILD kdesdk-kioslaves-3.5.9.ebuild 1239 RMD160 47aedf2f59ec385fc677aa5b5f09e5aed5a3eb11 SHA1 dfdef6d960266691db29eea69e4460e805073e9b SHA256 f05afbae9c971d7af0afe9c4ea1504dbc49c79283e5a20b93f5933cc8433eef6
-EBUILD kdesdk-kioslaves-4.1.2.ebuild 1205 RMD160 da392b9b8be8f55777ccbafd208a743f72c87c25 SHA1 e863bbc73401b65e4876847e55f08658e953cb88 SHA256 228397ea6a476dcbd29b72908bc3c7f7035ff7a713b2bf1eec04c26b4654479f
-MISC ChangeLog 13080 RMD160 0f2e624935fc1acae8212955a2ce4480810978ac SHA1 4dd14a0ee71447135c1c3baa9a630d86a6610d20 SHA256 965b66a900531160b4e967fa9eda3b897f1fca8c5e9ee121d6688e273773b9b8
+EBUILD kdesdk-kioslaves-4.1.2-r1.ebuild 653 RMD160 e79b0136d279c3be74c95491d56c9bc446f14753 SHA1 7d7ffe34e555954b4320c51e86948142bdac17dc SHA256 cfe3ce76e8e5ac8aab4f79f2072dd5fdb41a42395e00c899fd7ef01bc4abcaa6
+MISC ChangeLog 13366 RMD160 0ba43adf00593636b2012ff836512f10fbe55ba7 SHA1 e7100eec3d7d8a166094cf413cee0c8080ba38f7 SHA256 4b64f00dd719f96cf8d0374766f1551284522eed6db9c16a3b986568de54a874
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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
-}