diff options
| author |   George Shapovalov <george@gentoo.org> | 2008-12-21 10:35:18 +0000 |
|---|---|---|
| committer | George Shapovalov <george@gentoo.org> | 2008-12-21 10:35:18 +0000 |
| commit | 7821f8590cd605c92372412f762d485934d59df5 (patch) | |
| tree | ab837824caf3565ffeacd0fbc328afe9df0c50d1 /dev-util | |
| parent | Fix bug #251681 (diff) | |
| download | gentoo-2-7821f8590cd605c92372412f762d485934d59df5.tar.gz gentoo-2-7821f8590cd605c92372412f762d485934d59df5.tar.bz2 gentoo-2-7821f8590cd605c92372412f762d485934d59df5.zip | |
fixed collision woth kdesdk-kioslaves (#243434)
(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r4 x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/kdesvn/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/kdesvn/kdesvn-1.0.4.ebuild | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/dev-util/kdesvn/ChangeLog b/dev-util/kdesvn/ChangeLog index ff06289de511..5b39b738c499 100644 --- a/dev-util/kdesvn/ChangeLog +++ b/dev-util/kdesvn/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/kdesvn # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.54 2008/10/22 14:15:56 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.55 2008/12/21 10:35:18 george Exp $ + + 01 Dec 2008; George Shapovalov <george@gentoo.org> kdesvn-1.0.4.ebuild: + fixed collision with kdesdk-kioslaves (#243434) 22 Oct 2008; George Shapovalov <george@gentoo.org> kdesvn-1.0.4.ebuild: added LINGUAS support, thanks to Theo Chatzimichos (#238245) for diff --git a/dev-util/kdesvn/kdesvn-1.0.4.ebuild b/dev-util/kdesvn/kdesvn-1.0.4.ebuild index acc9f5cdc1fe..a5cddb11539c 100644 --- a/dev-util/kdesvn/kdesvn-1.0.4.ebuild +++ b/dev-util/kdesvn/kdesvn-1.0.4.ebuild @@ -1,6 +1,6 @@ # 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.2 2008/10/22 14:15:56 george Exp $ +# $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 @@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="debug" RDEPEND=">=dev-util/subversion-1.4 + =kde-base/kdesdk-kioslaves-3.5* dev-db/sqlite" DEPEND="${RDEPEND} @@ -40,6 +41,12 @@ src_unpack() { # 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() { @@ -64,6 +71,10 @@ src_compile() { 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() { |