Install service menus and block kdesdk-kioslaves[subversion] (as it installs service...
authorMaciej Mrozowski <reavertm@gentoo.org>
Thu, 25 Feb 2010 14:20:31 +0000 (14:20 +0000)
committerMaciej Mrozowski <reavertm@gentoo.org>
Thu, 25 Feb 2010 14:20:31 +0000 (14:20 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

dev-util/kdesvn/ChangeLog
dev-util/kdesvn/Manifest
dev-util/kdesvn/kdesvn-1.5.2-r1.ebuild [moved from dev-util/kdesvn/kdesvn-1.5.2.ebuild with 50% similarity]

index 71155da136c1324816434dcb8307a1bff9470bbb..2074f07379aac1c5df5105c968976055e0f2a00d 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/kdesvn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.76 2010/02/25 13:17:39 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.77 2010/02/25 14:20:31 reavertm Exp $
+
+  25 Feb 2010; Maciej Mrozowski <reavertm@gentoo.org> -kdesvn-1.5.2.ebuild,
+  +kdesvn-1.5.2-r1.ebuild:
+  Install service menus and block kdesdk-kioslaves[subversion] (as it
+  installs service menus as well, just they're worse), remove previous
+  revision.
 
   25 Feb 2010; Maciej Mrozowski <reavertm@gentoo.org> -kdesvn-1.5.1.ebuild:
   Removed old
@@ -70,7 +76,7 @@
   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) 
+  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
index 42be207d261303039c6114532771451e2d164cf5..18db4e12f3784d8e3d0d15401554e02649337744 100644 (file)
@@ -1,6 +1,6 @@
 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
 EBUILD kdesvn-1.4.1.ebuild 1208 RMD160 e90617de2678a0af6ae1359e0fcc9e6c79e80e2e SHA1 13709fdc8adacbb1c3540501bec50dba5dfe964c SHA256 0f8f830d679df6a325f454ef22eb0524be989a0e8a0876f5a00ea4228a171bc4
-EBUILD kdesvn-1.5.2.ebuild 1065 RMD160 e22ee44f66f78d00eda2b42909f9747b885b7f3d SHA1 a0c42b0e96545e473d8a1fd368707446c5870edb SHA256 196984b901fc2dc9eb1680bb0e5d13fd0eb880306e2cf77a23ec7871ff138b08
-MISC ChangeLog 11855 RMD160 3f4d510ecf6b232c24fb9d679bbf1b2e6b79cdd8 SHA1 ede47bcb1ac4103e7063a9ca4ef5395bf4701c5e SHA256 2f3ce46f222f2c40914066f530911381f83e4ed8e02fcc8d7669240ac076a649
+EBUILD kdesvn-1.5.2-r1.ebuild 838 RMD160 fe90580a62f2d2cc2283298b2724f872a57f009e SHA1 e0ba95175396cef6de74e4cb11c8e80d21593a0b SHA256 76076b1cb5e3d81de39d8a2a86ebbda3e6b32eca6695b95e68fd2c7b61165e62
+MISC ChangeLog 12111 RMD160 863027089f2996c6440cabefe1403e22332b52c5 SHA1 6806208546fa5a1b434f7d4d4a12df99a867dd20 SHA256 44be489e322c6b1978668a8cb6275c7c6a5389f11d0cb0dfd0a248f4d2cbf6c1
 MISC metadata.xml 360 RMD160 d38a018d8fecc52012b00ec006f7dccbf5814549 SHA1 7d8af38925a9bb5be33d8fa809672ee952735db3 SHA256 24601a182353cb9edccf90d64b652527e64d51ad8e82e07967ef9409ace33d6a
similarity index 50%
rename from dev-util/kdesvn/kdesvn-1.5.2.ebuild
rename to dev-util/kdesvn/kdesvn-1.5.2-r1.ebuild
index 332370fba7edc88b5110f1ff66c0988dcf518c94..bc34eb7d7a6c8a2a69792ea360324dd9a3605937 100644 (file)
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-1.5.2.ebuild,v 1.1 2010/02/11 11:21:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-1.5.2-r1.ebuild,v 1.1 2010/02/25 14:20:31 reavertm Exp $
+
+EAPI="2"
 
-EAPI=3
 KDE_LINGUAS="de es fr ja lt nl pt_BR ro ru"
 inherit kde4-base
 
@@ -11,30 +12,23 @@ HOMEPAGE="http://kdesvn.alwins-world.de/"
 SRC_URI="http://kdesvn.alwins-world.de/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="4"
 KEYWORDS="~amd64 ~x86"
+SLOT="4"
 IUSE="debug +handbook"
 
-DEPEND=">=dev-db/sqlite-3
+DEPEND="
+       >=dev-db/sqlite-3
        >=dev-util/subversion-1.4
-       !dev-util/qsvn"
+"
 RDEPEND="${DEPEND}
-       >=kde-base/kdesdk-kioslaves-${KDE_MINIMAL}"
-
-DOCS="AUTHORS ChangeLog TODO"
+       !dev-util/kdesvn:1.2
+       !dev-util/qsvn
+       !<kde-base/kdesdk-kioslaves-4.3.5[-kdeprefix]
+       !>=kde-base/kdesdk-kioslaves-4.3.5[-kdeprefix,subversion]
+"
 
 src_configure() {
        append-cppflags -DQT_THREAD_SUPPORT
 
-       mycmakeargs+=( "-DLIB_INSTALL_DIR=${EPREFIX}/usr/$(get_libdir)" )
-
        kde4-base_src_configure
 }
-
-src_install() {
-       kde4-base_src_install
-
-       # Remove kio svn service types - provided by kdesdk-kioslaves.
-       # Last version checked: 1.5.1
-       rm -f "${D}/${PREFIX}"/share/kde4/services/svn{,+ssh,+https,+file,+http}.protocol
-}