diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-04-29 16:21:49 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-04-29 16:21:49 +0000 |
| commit | 8631714bafa9530e818fcdb4a12166e660f32ea3 (patch) | |
| tree | 49c41d1b21abe4497515bfe26ef677aa06c4828e /kde-frameworks | |
| parent | remove old (diff) | |
| download | gentoo-2-8631714bafa9530e818fcdb4a12166e660f32ea3.tar.gz gentoo-2-8631714bafa9530e818fcdb4a12166e660f32ea3.tar.bz2 gentoo-2-8631714bafa9530e818fcdb4a12166e660f32ea3.zip | |
Add blocker to avoid file collisions during upgrade wrt bug #548036.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'kde-frameworks')
| -rw-r--r-- | kde-frameworks/kxmlrpcclient/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild | 3 | ||||
| -rw-r--r-- | kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/kde-frameworks/kxmlrpcclient/ChangeLog b/kde-frameworks/kxmlrpcclient/ChangeLog index bf390ba61347..1b607695a6f5 100644 --- a/kde-frameworks/kxmlrpcclient/ChangeLog +++ b/kde-frameworks/kxmlrpcclient/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-frameworks/kxmlrpcclient # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/ChangeLog,v 1.2 2015/04/11 17:09:49 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/ChangeLog,v 1.3 2015/04/29 16:21:49 kensington Exp $ + + 29 Apr 2015; Michael Palimaka <kensington@gentoo.org> + kxmlrpcclient-5.8.0.ebuild, kxmlrpcclient-5.9.0.ebuild: + Add blocker to avoid file collisions during upgrade wrt bug #548036. *kxmlrpcclient-5.9.0 (11 Apr 2015) diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild index 52121604d946..a7e42ba7eff7 100644 --- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild +++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild,v 1.1 2015/03/21 17:31:08 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild,v 1.2 2015/04/29 16:21:49 kensington Exp $ EAPI=5 @@ -18,5 +18,6 @@ RDEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) dev-qt/qtxml:5 + !<kde-plasma/plasma-workspace-5.2.95 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild index 7a8cd5b6c22a..65d95bccd0c6 100644 --- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild +++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild,v 1.1 2015/04/11 17:09:49 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild,v 1.2 2015/04/29 16:21:49 kensington Exp $ EAPI=5 @@ -18,5 +18,6 @@ RDEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) dev-qt/qtxml:5 + !<kde-plasma/plasma-workspace-5.2.95 " DEPEND="${RDEPEND}" |