Version bump, remove old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 48 insertions, 53 deletions

diff --git a/dev-vcs/kdesvn/ChangeLog b/dev-vcs/kdesvn/ChangeLog
index 052574951167..fb37445ccf07 100644
--- a/dev-vcs/kdesvn/ChangeLog
+++ b/dev-vcs/kdesvn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/kdesvn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/ChangeLog,v 1.7 2010/06/22 18:49:16 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/ChangeLog,v 1.8 2010/08/21 14:01:32 tampakrap Exp $
+
+*kdesvn-1.5.4 (21 Aug 2010)
+
+  21 Aug 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  -kdesvn-1.4.1.ebuild, +kdesvn-1.5.4.ebuild:
+  Version bump, remove old
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   kdesvn-1.4.1.ebuild, kdesvn-1.5.2-r1.ebuild, kdesvn-1.5.3.ebuild:
diff --git a/dev-vcs/kdesvn/kdesvn-1.4.1.ebuild b/dev-vcs/kdesvn/kdesvn-1.4.1.ebuild
deleted file mode 100644
index 2dd216ed43d6..000000000000
--- a/dev-vcs/kdesvn/kdesvn-1.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/kdesvn/kdesvn-1.4.1.ebuild,v 1.4 2010/06/22 18:49:16 arfrever Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="cs de es fr ja lt nl ru"
-inherit kde4-base
-
-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="4"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="debug +handbook"
-
-DEPEND="
-	dev-db/sqlite
-	>=dev-vcs/subversion-1.4
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}
-	!dev-util/kdesvn:1.2
-	>=kde-base/kdesdk-kioslaves-${KDE_MINIMAL}
-"
-
-src_configure() {
-	append-cppflags -DQT_THREAD_SUPPORT
-	mycmakeargs="${mycmakeargs}
-		-DLIB_INSTALL_DIR=${PREFIX}/$(get_libdir)"
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# Remove kio svn service types - provided by kdesdk-kioslaves
-	rm -f "${D}/${PREFIX}"/share/kde4/services/svn{,+ssh,+https,+file,+http}.protocol
-}
-
-pkg_postinst() {
-	if ! has_version 'kde-base/kompare'; then
-		echo
-		elog "For nice graphical diffs, install kde-base/kompare."
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}
diff --git a/dev-vcs/kdesvn/kdesvn-1.5.4.ebuild b/dev-vcs/kdesvn/kdesvn-1.5.4.ebuild
new file mode 100644
index 000000000000..490a90518e1f
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-1.5.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header $
+
+EAPI="2"
+
+KDE_LINGUAS="de es fr ja lt nl pt_BR ro ru"
+inherit kde4-base
+
+DESCRIPTION="KDESvn is a frontend to the subversion vcs."
+HOMEPAGE="http://kdesvn.alwins-world.de/"
+if [[ ${PV} = 9999* ]]; then
+	ESVN_REPO_URI="http://www.alwins-world.de/repos/kdesvn/trunk/"
+	ESVN_PROJECT="kdesvn"
+else
+	SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug +handbook"
+
+DEPEND="
+	>=dev-db/sqlite-3
+	dev-libs/apr:1
+	>=dev-vcs/subversion-1.4
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}
+	!<kde-base/kdesdk-kioslaves-4.3.5[-kdeprefix]
+	!>=kde-base/kdesdk-kioslaves-4.3.5[-kdeprefix,subversion]
+"
+
+src_configure() {
+	append-cppflags -DQT_THREAD_SUPPORT
+
+	[[ ${PV} = 9999* ]] && mycmakeargs=(-DDAILY_BUILD=ON)
+
+	kde4-base_src_configure
+}