Version bump for the kde3 version, remove some old kde3 versions (bug 269813)

1.0.5 solves compilation and linking bugs: bug 243222, bug 244714, bug 248875 and as-needed bug 250085
Also, rewritten in EAPI-2 and slotted in :3.5
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 84 insertions, 157 deletions

diff --git a/dev-util/kdesvn/ChangeLog b/dev-util/kdesvn/ChangeLog
index af7e727bb174..4731484f963e 100644
--- a/dev-util/kdesvn/ChangeLog
+++ b/dev-util/kdesvn/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/kdesvn
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.61 2009/04/20 14:58:43 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.62 2009/05/21 09:28:21 tampakrap Exp $
+
+*kdesvn-1.0.5 (21 May 2009)
+
+  21 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kdesvn-1.0.1.ebuild, -kdesvn-1.0.4.ebuild, +kdesvn-1.0.5.ebuild:
+  Version bump for the kde3 version, remove some old kde3 versions (bug
+  269813) 
+  1.0.5 solves compilation and linking bugs: bug 243222, bug 244714, bug
+  248875 and as-needed bug 250085
+  Also, rewritten in EAPI-2 and slotted in :3.5
 
 *kdesvn-1.3.0 (20 Apr 2009)
 
diff --git a/dev-util/kdesvn/Manifest b/dev-util/kdesvn/Manifest
index 450e4319beee..bbd9b63f8b56 100644
--- a/dev-util/kdesvn/Manifest
+++ b/dev-util/kdesvn/Manifest
@@ -1,14 +1,12 @@
 AUX kdesvn-0.14.4-linkage.patch 523 RMD160 c212dc27eb3913c1451b2078c9dea239e6c42813 SHA1 5675ff2b8b506dbe495fed648c1e6388ac11b3f3 SHA256 601737da348c2faedb09ab907e3150b6a2a31c36a630b5cd899424b9863d1253
 AUX kdesvn-1.0.1-linkage.patch 562 RMD160 87640c6f5b8a18ee294e0c0d489aad49e0b6aebc SHA1 0439c04f032bd9e08b4f10e2d301414806fcbff4 SHA256 8c92fd569be69b532a35a72afaec20abd5679398cd49aaf3008e3921909989ea
 DIST kdesvn-0.14.4.tar.bz2 1277228 RMD160 9c0e3403db7d1a9efc531f91460f49ca8d87a1c7 SHA1 9df607eb9bac18083f9d8871aad1549f7ccb8f3b SHA256 e4f5359cd088c960d0522e06a76165aafd002d3cd041b58a2c65c2786442f319
-DIST kdesvn-1.0.1.tar.bz2 1365898 RMD160 646982c8253948f16e78360d4ff54e1f5c72eafe SHA1 54be111da2c495edacc3cc40d7c624b06f7ed03e SHA256 2ecf9b38ea832f01e8ce25fe559d12eefb2b8d9dc48115f7581ffbfa4e7309a2
-DIST kdesvn-1.0.4.tar.bz2 1381073 RMD160 5943f2bb96f008873f0ed86696b1642b50fdfd23 SHA1 03d13c7c7a0f3c21a4e7fbaecbe419ff3b6fda28 SHA256 74b2ae61ffd41f7335e5ae3884549e9a7ed3ae067986fe98eede93c03265b2f4
+DIST kdesvn-1.0.5.tar.bz2 1382607 RMD160 32a4eb6eb4909858f8437ba44e8289b1fe02cbf5 SHA1 3ec90f33c8a9a2fe5188b0823fc451d84bfabf92 SHA256 c84bc8d651dedb17fb1c286cf526f764458647ce6bee0ce63c4169546f172877
 DIST kdesvn-1.2.4.tar.bz2 1628194 RMD160 d8d9ce9df9cafcafda32dc39ea7316b942f0ae6a SHA1 dc902abb1bfd6918703c8e5af88172bf043a86f0 SHA256 aa81addf5f86b4c59026debc555d7aac783002331942847c32d2feb277a81620
 DIST kdesvn-1.3.0.tar.bz2 1612997 RMD160 17d4aade8facc6b3180f34344e6218be29db2843 SHA1 74090fabe0f2a717c72260179997af9784fab9b6 SHA256 d219c430c98d75d07258057e78c29042777e0368eded7494499361031ac63649
 EBUILD kdesvn-0.14.4.ebuild 1502 RMD160 31637169db46f7559404e9aee02f2ab9120ce09c SHA1 6a2f43e0f38229579eac7b619f04888437ff4438 SHA256 49adf9c1c615e7d6d92583ef7057957b200e39f96f6267c9ef6adc52446e9d2e
-EBUILD kdesvn-1.0.1.ebuild 1578 RMD160 e100a6634c3338be3036a7dba93508315c6264dd SHA1 952a3bbd731f45a1f851fd208adda8815da4836f SHA256 92219a72f7efde55e50905efebf19fff8ea581eeb0484e39a3341640defa610d
-EBUILD kdesvn-1.0.4.ebuild 2098 RMD160 9ea57c1361a7eb31231275c76a38f06a20831788 SHA1 03fc294545a5643e961e9e9658f35f6e00fc268a SHA256 0a6cdf1ced178ac68a07562cb0cbb8aa4fa45e74db638efb5c8d775e826cab12
+EBUILD kdesvn-1.0.5.ebuild 1687 RMD160 8b4ecfc2db4408902dd1f98e41d08b02f92bdb5a SHA1 eee12164b3938700fb2df25ee46030e63fda5530 SHA256 65979ee58095a42fcaf1b28279aa18a7fe584e417749cbb953f14d274a672abb
 EBUILD kdesvn-1.2.4.ebuild 1148 RMD160 e68d02b5953717fa727e7dece752b5196fef02f6 SHA1 0122dc5cfd02fadbd412b490276f732a77772057 SHA256 b01dcca3471e739a3b9a7bbc3c469dabd86a50ffda5674bbd1617648e19bdd57
 EBUILD kdesvn-1.3.0.ebuild 1148 RMD160 99743d1cbac996c131ee39d6c35ca7e8de7c0a64 SHA1 e20ce15beb8ed953a4cd059944fcfd888a2c654a SHA256 c26e7e6b466ceeb8915d69fd40fda0048fd3583a19065d4685cc73ead4765d51
-MISC ChangeLog 9447 RMD160 827603efdf643ee60afc4b6076b16d7bc958325f SHA1 144bb9d179961834b8f1d61f794097839063aa32 SHA256 6c4be39327fb57164792ff6caa75f67cc89c7b8c2c1a3dd050177edd5a3c25f1
+MISC ChangeLog 9839 RMD160 93f902fd35daed6360cb6d0c970518ff5a4d8601 SHA1 6b19ed06a4fdd028dc1aa096468c1f7ae4177aac SHA256 b5f7246db2cf9eed26cef64f9e392ae62c2cf30b222931041657562697d08d00
 MISC metadata.xml 360 RMD160 d38a018d8fecc52012b00ec006f7dccbf5814549 SHA1 7d8af38925a9bb5be33d8fa809672ee952735db3 SHA256 24601a182353cb9edccf90d64b652527e64d51ad8e82e07967ef9409ace33d6a
diff --git a/dev-util/kdesvn/kdesvn-1.0.1.ebuild b/dev-util/kdesvn/kdesvn-1.0.1.ebuild
deleted file mode 100644
index 3adb4b5b0430..000000000000
--- a/dev-util/kdesvn/kdesvn-1.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-1.0.1.ebuild,v 1.1 2008/09/11 19:51:02 george Exp $
-
-inherit qt3 base eutils versionator toolchain-funcs kde-functions
-
-My_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="KDESvn is a frontend to the subversion vcs."
-HOMEPAGE="http://www.alwins-world.de/wiki/programs/kdesvn"
-SRC_URI="http://kdesvn.alwins-world.de/trac.fcgi/downloads/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-util/subversion-1.4
-	dev-db/sqlite"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4"
-
-need-kde 3.3
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-linkage.patch || die "LIB_SUFFIX patch failed"
-
-	# this seems to be again necessary
-	sed -i -e "s:\${APR_CPP_FLAGS}:\${APR_CPP_FLAGS} \"-DQT_THREAD_SUPPORT\":" \
-		CMakeLists.txt || die "QT_THREAD_SUPPORT sed failed"
-}
-
-src_compile() {
-	local myconf
-	if use debug ; then
-		myconf="-DCMAKE_BUILD_TYPE=Debug"
-	fi
-
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr					\
-		-DCMAKE_BUILD_TYPE=Release					\
-		-DCMAKE_C_COMPILER=$(type -P $(tc-getCC))		\
-		-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX))	\
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DQT_THREAD_SUPPORT"		\
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir) 		\
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
-	if ! has_version 'kde-base/kompare'; then
-		echo
-		elog "For nice graphical diffs, install kde-base/kompare."
-		echo
-	fi
-}
diff --git a/dev-util/kdesvn/kdesvn-1.0.4.ebuild b/dev-util/kdesvn/kdesvn-1.0.4.ebuild
deleted file mode 100644
index a5cddb11539c..000000000000
--- a/dev-util/kdesvn/kdesvn-1.0.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-1.0.4.ebuild,v 1.3 2008/12/21 10:35:18 george Exp $
-
-inherit qt3 kde-functions versionator
-
-My_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="KDESvn is a frontend to the subversion vcs."
-HOMEPAGE="http://www.alwins-world.de/wiki/programs/kdesvn"
-SRC_URI="http://kdesvn.alwins-world.de/trac.fcgi/downloads/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=dev-util/subversion-1.4
-	=kde-base/kdesdk-kioslaves-3.5*
-	dev-db/sqlite"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4"
-
-need-kde 3.3
-
-LANGS="ca cs de es fr gl it ja lt nl pa ru sv"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}/${P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} || rm -f "${X}."*
-	done
-
-	# this seems to be again necessary
-	sed -i -e "s:\${APR_CPP_FLAGS}:\${APR_CPP_FLAGS} \"-DQT_THREAD_SUPPORT\":" \
-		"${S}"/CMakeLists.txt || die "QT_THREAD_SUPPORT sed failed"
-
-	# Force kdesvn to recognize kio_svn protocol name instead of kio_ksvn
-	# (this way we can reuse .protocol files from kdesdk-kioslaves, avoiding
-	# collision)
-	grep -rle "kio_ksvn" "${S}"/* | xargs \
-		sed -i -e "s:kio_ksvn:kio_svn:"
-}
-
-src_compile() {
-	local myconf
-	if use debug ; then
-		myconf="-DCMAKE_BUILD_TYPE=Debug"
-	fi
-
-	set-kdedir
-
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=${KDEDIR} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-		-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DQT_THREAD_SUPPORT" \
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir) \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	# remove svn*.protocol files, now that they provide the same stuff as the
-	# ones by kdesdk-kioslaves
-	rm "${D}/${KDEDIR}"/share/services/svn*.protocol
-}
-
-pkg_postinst() {
-	if ! has_version 'kde-base/kompare'; then
-		echo
-		elog "For nice graphical diffs, install kde-base/kompare."
-		echo
-	fi
-}
diff --git a/dev-util/kdesvn/kdesvn-1.0.5.ebuild b/dev-util/kdesvn/kdesvn-1.0.5.ebuild
new file mode 100644
index 000000000000..b85fac96888f
--- /dev/null
+++ b/dev-util/kdesvn/kdesvn-1.0.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-1.0.5.ebuild,v 1.1 2009/05/21 09:28:21 tampakrap Exp $
+
+EAPI="2"
+
+inherit cmake-utils qt3 kde-functions versionator
+
+set-kdedir 3.5
+
+My_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="KDESvn is a frontend to the subversion vcs."
+HOMEPAGE="http://www.alwins-world.de/wiki/programs/kdesvn"
+SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2"
+
+SLOT="3.5"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="!<dev-util/kdesvn-1.0.5
+	>=dev-util/subversion-1.4
+	kde-base/kdesdk-kioslaves:3.5
+	dev-db/sqlite"
+
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4"
+
+need-kde 3.5
+
+EXTRA_ECONF+="-DCMAKE_INSTALL_PREFIX=${KDEDIR}"
+
+LANGS="ca cs de es fr gl it ja lt nl pa ru sv"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch
+	epatch "${FILESDIR}"/${PN}-1.0-subversion.patch
+
+	sed -i -e "s:\${APR_CPP_FLAGS}:\${APR_CPP_FLAGS} \"-DQT_THREAD_SUPPORT\":" \
+		"${S}"/CMakeLists.txt || die "QT_THREAD_SUPPORT sed failed"
+
+	#remove kiosvn from CMakeLists.txt as it is already compiled from kdesdk-kioslaves
+	sed -i '/kiosvn/d' "${S}"/src/CMakeLists.txt
+
+	for X in ${LANGS} ; do
+		use linguas_${X} || rm -f po/"${X}."*
+	done
+
+	cmake-utils_src_prepare
+}
+
+src_compile() {
+	# fixing up lib paths
+	sed -i "/^KDE3/ s:/usr/lib:${KDEDIR}/lib:g" "${WORKDIR}"/"${PN}"_build/CMakeCache.txt
+
+	cmake-utils_src_compile
+}
+
+pkg_postinst() {
+	if ! has_version 'kde-base/kompare'; then
+		echo
+		elog "For nice graphical diffs, install kde-base/kompare."
+		echo
+	fi
+}