Version bump, remove old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 51 insertions, 56 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/Manifest b/dev-vcs/kdesvn/Manifest
index 2c30a38a1af9..d6d53fbf62ac 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,8 +1,8 @@
-DIST kdesvn-1.4.1.tar.bz2 1672916 RMD160 4a49d7b7808794c6476b2866205f917bf97a1292 SHA1 4822919fb699c6558608c1a6b0c48412aa188f4b SHA256 3f955420c951b37bf8409798d47bd1e95a8ed3f2aa25f743ed3cd03fe4b44af5
 DIST kdesvn-1.5.2.tar.bz2 1725506 RMD160 5361e0983c6a18afabcb88cc06270fc3fbb595aa SHA1 e8728c1f6fbf46b7ac2879bfdba152c9be9b9b43 SHA256 701892616a88ff53fa86a4cb7e1e126689d30f628cf020bf09484f7062a76beb
 DIST kdesvn-1.5.3.tar.bz2 1755777 RMD160 ff3eb77eb3aab3a546a0f5fe155fcf957bb442b1 SHA1 03e125818f4d44be2287e0557d5b1eaf7ec60457 SHA256 0893faef1e970c527705dee0a559545849c1dfbb252e265b95a424f2f34016b2
-EBUILD kdesvn-1.4.1.ebuild 1209 RMD160 971eca5ba80919a81a96d4610c40c296a98d3e26 SHA1 efcc0c5c4b4803eac42517d07e202b67c8a7704d SHA256 747d029c1312bb5af2b7d970d1ebb815d0694d585af5f09bf0095fd2ca73d1e6
+DIST kdesvn-1.5.4.tar.bz2 1745201 RMD160 71e65b6868a7593a5a2640238f76890888e28411 SHA1 15617ccb9086214ac66b4f694401b9aad22abc92 SHA256 29917758ce4d957d8e9400c1581cd31cec79e54ed123e331abd55a3fa360aeee
 EBUILD kdesvn-1.5.2-r1.ebuild 831 RMD160 50996273083aa3b6961cb67ff8a8e104b940471f SHA1 f0708cd8cdc4ee31c60ea72f78579fd6586330f7 SHA256 0fc794605a8ec507ccf63dfcfbcfb27f92a245a88148a83849a97bc0f1d304d5
 EBUILD kdesvn-1.5.3.ebuild 912 RMD160 0ccf485a5d1d17c8cadb619a0441e12f749a6ba7 SHA1 e63dd6ec4baca3ab25ada48c65aa63b17c012891 SHA256 e79b2d6dacd402b1e533ca2f06e26a7c6695a2c33345874ffaf03bb6930d619a
-MISC ChangeLog 13324 RMD160 a2df22050ec0f645a99211eeac9a9f645f69d3c8 SHA1 a4243f33e6b09171d0d2860dfe44a0f9e37ccdc3 SHA256 fe0391991936945b3cf86090c38e7c13f9e545af61e603c56864e47a26633c0b
+EBUILD kdesvn-1.5.4.ebuild 912 RMD160 0ccf485a5d1d17c8cadb619a0441e12f749a6ba7 SHA1 e63dd6ec4baca3ab25ada48c65aa63b17c012891 SHA256 e79b2d6dacd402b1e533ca2f06e26a7c6695a2c33345874ffaf03bb6930d619a
+MISC ChangeLog 13484 RMD160 519e0d8d81185d24619086fdd1eb5fa210c8c1ae SHA1 094047356cd557c40fe752602640bb62964e3bb1 SHA256 38bce947fe267a90732378157a876efecbb4bb375704fcda81f50a849224fbc8
 MISC metadata.xml 278 RMD160 d5cbffad72f423ea293d1087de275b64401ff3b0 SHA1 524a08b06317bc7693d29b839dd10c757f41ccdf SHA256 40fc319a0a33f1bb62b01b9b7b170f779aac27d9ec4e8909cc5c14ae4aa7e63b
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
+}