diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-03 08:11:17 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-09-03 08:11:17 +0000 |
| commit | 63c4e70406a909631f877d9c4d9aa8aff4ed8755 (patch) | |
| tree | fbf8ca35dfb3169e98ccb6ef28d48d89fb33d6af /kde-base/kdemultimedia-kioslaves | |
| parent | Version bump. (diff) | |
| download | gentoo-2-63c4e70406a909631f877d9c4d9aa8aff4ed8755.tar.gz gentoo-2-63c4e70406a909631f877d9c4d9aa8aff4ed8755.tar.bz2 gentoo-2-63c4e70406a909631f877d9c4d9aa8aff4ed8755.zip | |
Add blocker on kscd to avoid collision on +handbook install.
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdemultimedia-kioslaves')
| -rw-r--r-- | kde-base/kdemultimedia-kioslaves/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog index 1638e96bd744..afe32112f98c 100644 --- a/kde-base/kdemultimedia-kioslaves/ChangeLog +++ b/kde-base/kdemultimedia-kioslaves/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdemultimedia-kioslaves # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.224 2012/09/02 21:54:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.225 2012/09/03 08:11:17 scarabeus Exp $ + + 03 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> + kdemultimedia-kioslaves-4.8.5.ebuild: + Add blocker on kscd to avoid collision on +handbook install. 02 Sep 2012; Agostino Sarubbo <ago@gentoo.org> kdemultimedia-kioslaves-4.8.5.ebuild: @@ -1060,4 +1064,3 @@ +kdemultimedia-kioslaves-3.4.0_beta1.ebuild: Adding the split ebuilds to portage. For KDE 3.4, we've created separate ebuilds for all the KDE apps. - diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild index 9593c6393e08..f3412f17f775 100644 --- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild +++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild,v 1.3 2012/09/02 21:54:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild,v 1.4 2012/09/03 08:11:17 scarabeus Exp $ EAPI=4 @@ -27,6 +27,9 @@ DEPEND=" " RDEPEND="${DEPEND}" +# handbook collision, it was delivered by kscd prior this release +add_blocker kscd 4.8.4 + KMEXTRACTONLY=" libkcompactdisc/ " |