diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-12-15 14:04:09 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-12-15 14:04:09 +0000 |
| commit | 076516158d4a645868385bd38c258a1e76030fed (patch) | |
| tree | d87fe95d8b6629fd41f035bfa1eff948c4cbba34 /kde-base | |
| parent | Remove from package.mask dev-libs/pwlib net-libs/openh323 <=net-libs/opal-2.2... (diff) | |
| download | gentoo-2-076516158d4a645868385bd38c258a1e76030fed.tar.gz gentoo-2-076516158d4a645868385bd38c258a1e76030fed.tar.bz2 gentoo-2-076516158d4a645868385bd38c258a1e76030fed.zip | |
this oldpim variant does not work with kde-4.12, file collision
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdepim-runtime/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog index 1df8de014c18..564f4500abf7 100644 --- a/kde-base/kdepim-runtime/ChangeLog +++ b/kde-base/kdepim-runtime/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdepim-runtime # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.174 2013/12/14 21:59:45 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.175 2013/12/15 14:04:09 dilfridge Exp $ + + 15 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> + kdepim-runtime-4.4.11.1-r1.ebuild: + this oldpim variant does not work with kde-4.12, file collision 14 Dec 2013; Johannes Huber <johu@gentoo.org> -files/kdepim-runtime-4.10.5-fix-autoconfig.patch: diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild index 74f5fa5a3bf4..8e9e405224bc 100644 --- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild +++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild,v 1.13 2013/10/10 05:26:49 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild,v 1.14 2013/12/15 14:04:09 dilfridge Exp $ EAPI=4 @@ -25,7 +25,7 @@ COMMON_DEPEND=" dev-libs/libxml2:2 dev-libs/libxslt $(add_kdebase_dep kdelibs 'semantic-desktop(+)' 4.6) - $(add_kdebase_dep kdepimlibs 'semantic-desktop(+)' 4.6) + <kde-base/kdepimlibs-4.11.50:4[aqua=,semantic-desktop(+)] $(add_kdebase_dep libkdepim) x11-misc/shared-mime-info " |