diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-05-12 14:10:51 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-05-12 14:10:51 +0000 |
| commit | c3c9c4543a477fcdbe766ab32e38b91fd66a8db2 (patch) | |
| tree | 41b71ea3ce552a9fc798ba2583ca804a1fc6edce /kde-frameworks | |
| parent | Typo. (diff) | |
| download | gentoo-2-c3c9c4543a477fcdbe766ab32e38b91fd66a8db2.tar.gz gentoo-2-c3c9c4543a477fcdbe766ab32e38b91fd66a8db2.tar.bz2 gentoo-2-c3c9c4543a477fcdbe766ab32e38b91fd66a8db2.zip | |
Introduce blocker on net-libs/libkpeople to avoid file collisions wrt bug #548976.
(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/kpeople/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-frameworks/kpeople/kpeople-5.10.0.ebuild | 3 | ||||
| -rw-r--r-- | kde-frameworks/kpeople/kpeople-5.8.0.ebuild | 3 | ||||
| -rw-r--r-- | kde-frameworks/kpeople/kpeople-5.9.0.ebuild | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/kde-frameworks/kpeople/ChangeLog b/kde-frameworks/kpeople/ChangeLog index fc8f7c9f2109..5b019702047f 100644 --- a/kde-frameworks/kpeople/ChangeLog +++ b/kde-frameworks/kpeople/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-frameworks/kpeople # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/ChangeLog,v 1.3 2015/05/09 10:36:05 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/ChangeLog,v 1.4 2015/05/12 14:10:51 kensington Exp $ + + 12 May 2015; Michael Palimaka <kensington@gentoo.org> kpeople-5.10.0.ebuild, + kpeople-5.8.0.ebuild, kpeople-5.9.0.ebuild: + Introduce blocker on net-libs/libkpeople to avoid file collisions wrt bug + #548976. *kpeople-5.10.0 (09 May 2015) diff --git a/kde-frameworks/kpeople/kpeople-5.10.0.ebuild b/kde-frameworks/kpeople/kpeople-5.10.0.ebuild index 1ec825f13ecc..f2898087a63e 100644 --- a/kde-frameworks/kpeople/kpeople-5.10.0.ebuild +++ b/kde-frameworks/kpeople/kpeople-5.10.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/kpeople/kpeople-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.10.0.ebuild,v 1.2 2015/05/12 14:10:51 kensington Exp $ EAPI=5 @@ -28,4 +28,5 @@ DEPEND=" " RDEPEND="${DEPEND} !net-libs/kpeople:5 + !net-libs/libkpeople[-minimal(-)] " diff --git a/kde-frameworks/kpeople/kpeople-5.8.0.ebuild b/kde-frameworks/kpeople/kpeople-5.8.0.ebuild index 0c381014fab4..125823a05de6 100644 --- a/kde-frameworks/kpeople/kpeople-5.8.0.ebuild +++ b/kde-frameworks/kpeople/kpeople-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/kpeople/kpeople-5.8.0.ebuild,v 1.1 2015/03/21 17:29:08 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.8.0.ebuild,v 1.2 2015/05/12 14:10:51 kensington Exp $ EAPI=5 @@ -28,4 +28,5 @@ DEPEND=" " RDEPEND="${DEPEND} !net-libs/kpeople:5 + !net-libs/libkpeople[-minimal(-)] " diff --git a/kde-frameworks/kpeople/kpeople-5.9.0.ebuild b/kde-frameworks/kpeople/kpeople-5.9.0.ebuild index e231a0435f1b..9dbcba1850a3 100644 --- a/kde-frameworks/kpeople/kpeople-5.9.0.ebuild +++ b/kde-frameworks/kpeople/kpeople-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/kpeople/kpeople-5.9.0.ebuild,v 1.1 2015/04/11 17:09:48 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.9.0.ebuild,v 1.2 2015/05/12 14:10:51 kensington Exp $ EAPI=5 @@ -28,4 +28,5 @@ DEPEND=" " RDEPEND="${DEPEND} !net-libs/kpeople:5 + !net-libs/libkpeople[-minimal(-)] " |