Revert pointless revision bump for runtime depend modification.

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

4 files changed, 11 insertions, 52 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 810085024fd1..c087dcf593de 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.65 2010/02/26 23:30:21 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.66 2010/02/26 23:38:15 ssuominen Exp $
+
+  26 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> dolphin-4.4.0.ebuild,
+  -dolphin-4.4.0-r1.ebuild:
+  Revert pointless revision bump for runtime depend modification.
 
 *dolphin-4.4.0-r1 (27 Feb 2010)
 
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index f9bd2640dd0d..19e297e5511b 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -5,7 +5,6 @@ DIST kdebase-4.4.0.tar.bz2 3768376 RMD160 5f3cf71404523f09105a5a5617e3f005aa83cf
 EBUILD dolphin-4.3.3.ebuild 910 RMD160 f26ba505bb719cd406d34430e9dce5b42769dc67 SHA1 38dc80e225b25e1eef295fc5694c93db2ea52767 SHA256 04388b3e12bff5408b7a6b5e05b7177abf6db898b235ce6f2c86f9b520a99a64
 EBUILD dolphin-4.3.4.ebuild 852 RMD160 0a7c493f9c65a05af6637b1cf99cdd6d40a312a9 SHA1 5ebf7fcbad32b1a31e1419c4b380fc3d20f56356 SHA256 00e2843db0720caa2618b7b78d7971fb167733f4bc40665f2c9cb43e527bbd3c
 EBUILD dolphin-4.3.5.ebuild 851 RMD160 919841049d6ad4bb34fe44f79a0824f87eeb2d27 SHA1 b772474163a7ac8fcb044ee52eaf17b33de7f9a4 SHA256 643ea748953b6c6fe71f581b9ac4bd23b1b72f52b0e490ccd904e6d7480e5a89
-EBUILD dolphin-4.4.0-r1.ebuild 1162 RMD160 c0bab5119861e74b0081bffc7cde2191180a2b39 SHA1 63014203296da79e829a885dd4c1dc46027c8704 SHA256 dd56ff45c8c31db3a375c5211e9bd16880f4451f2b650acf502f587541b8aae6
-EBUILD dolphin-4.4.0.ebuild 1129 RMD160 ecc6a374a39d43b0a284af368f549178d78add05 SHA1 c3f9aa7afd53166368869de08045f90915668d51 SHA256 a6438475ed43b2fd28bbf273120457b5d05391ffc326eba250a279cb441f94e1
-MISC ChangeLog 9465 RMD160 f901bd2132074de3851b59b2953b4a97e8291630 SHA1 892283ef43c61565b4ec55f9ea6bc0a6174419b7 SHA256 9e7cfacf12514f55758501b7abe93dda223ac42f06cf0207f5f0715c82a4bad0
+EBUILD dolphin-4.4.0.ebuild 1161 RMD160 0bfaf1d71bae659dbb9eae9d2cb776f060aa0b0c SHA1 b7c3a00721a81148e9f388ee4549ad52986e97d9 SHA256 a36f05be58a539e82fec70e770ff046ba7a4d000c8cd0b105914486590ac1269
+MISC ChangeLog 9638 RMD160 2bb292ab1dbf20c75af0d8fe133060851e1fa723 SHA1 5c440b13756fafa625a86ac4e5f213a50d59994f SHA256 b5d07ce5964056639f9a17acc788392f910f59de17e176506593f8e724542fe3
 MISC metadata.xml 287 RMD160 6079a550c87093424f04a1d307864f6558608f59 SHA1 cd35c8ff7336bf936094660061f6ef58dd16276d SHA256 f8ca0fcb27fae3e13bce985f13164013ba54c573c50a047622953f03c48a6969
diff --git a/kde-base/dolphin/dolphin-4.4.0-r1.ebuild b/kde-base/dolphin/dolphin-4.4.0-r1.ebuild
deleted file mode 100644
index 5c640bedf964..000000000000
--- a/kde-base/dolphin/dolphin-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.4.0-r1.ebuild,v 1.1 2010/02/26 23:30:21 mrpouet Exp $
-
-EAPI="2"
-
-KMNAME="kdebase-apps"
-inherit kde4-meta
-
-DESCRIPTION="A KDE filemanager focusing on usability"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook semantic-desktop subversion thumbnail"
-
-DEPEND="
-	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep libkonq)
-	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
-"
-RDEPEND="${DEPEND}
-	subversion? (
-	dev-util/subversion
-	$(add_kdebase_dep kompare) )
-	$(add_kdebase_dep kfind)
-"
-PDEPEND="
-	thumbnail? ( $(add_kdebase_dep mplayerthumbs) )
-"
-
-KMLOADLIBS="libkonq"
-
-src_prepare() {
-	kde4-meta_src_prepare
-
-	if ! use subversion; then
-		sed -e '/install(.*fileviewsvnplugin.*)/s/^/#DONOTINSTALL /g' \
-			-i dolphin/src/CMakeLists.txt || die 'failed to disable subversion plugin'
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/dolphin/dolphin-4.4.0.ebuild b/kde-base/dolphin/dolphin-4.4.0.ebuild
index c1052877f970..519117e165bd 100644
--- a/kde-base/dolphin/dolphin-4.4.0.ebuild
+++ b/kde-base/dolphin/dolphin-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.4.0.ebuild,v 1.1 2010/02/09 00:16:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.4.0.ebuild,v 1.2 2010/02/26 23:38:15 ssuominen Exp $
 
 EAPI="2"
 
@@ -17,7 +17,9 @@ DEPEND="
 	semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 )
 "
 RDEPEND="${DEPEND}
-	subversion? ( dev-util/subversion )
+	subversion? (
+	dev-util/subversion
+	$(add_kdebase_dep kompare) )
 	$(add_kdebase_dep kfind)
 "
 PDEPEND="