summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-01-28 23:25:42 +0000
committerJohannes Huber <johu@gentoo.org>2015-01-28 23:25:42 +0000
commit7eef3b8deabaa6e99ff05ff0f8fa7a6fce1c038b (patch)
treef27d0d9dd31d2bcc47ac2a7fd8dde530910d1b99 /kde-base
parentAdjust use dependencies to handle >=app-crypt/qca-2.1. (diff)
downloadgentoo-2-7eef3b8deabaa6e99ff05ff0f8fa7a6fce1c038b.tar.gz
gentoo-2-7eef3b8deabaa6e99ff05ff0f8fa7a6fce1c038b.tar.bz2
gentoo-2-7eef3b8deabaa6e99ff05ff0f8fa7a6fce1c038b.zip
Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdeplasma-addons/ChangeLog8
-rw-r--r--kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild8
-rw-r--r--kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild8
3 files changed, 14 insertions, 10 deletions
diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 82bb16be9c86..7017d622e333 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdeplasma-addons
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.269 2014/12/11 15:45:02 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.270 2015/01/28 23:25:42 johu Exp $
+
+ 28 Jan 2015; Johannes Huber <johu@gentoo.org> kdeplasma-addons-4.12.5.ebuild,
+ kdeplasma-addons-4.14.3.ebuild:
+ Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
11 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -kdeplasma-addons-4.14.2.ebuild:
Remove KDE SC 4.14.2
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild
index 21113ba2ebd7..8fdea7dcc70c 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild,v 1.5 2014/05/08 07:33:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild,v 1.6 2015/01/28 23:25:42 johu Exp $
EAPI=5
@@ -17,8 +17,7 @@ RESTRICT=test
# krunner is only needed to generate dbus interface for lancelot
COMMON_DEPEND="
- app-crypt/qca:2
- app-crypt/qca-ossl:2
+ app-crypt/qca:2[qt4(+)]
$(add_kdebase_dep kdelibs 'semantic-desktop?')
$(add_kdebase_dep krunner '' 4.11)
$(add_kdebase_dep plasma-workspace 'semantic-desktop?' 4.11)
@@ -41,6 +40,7 @@ DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:2
"
RDEPEND="${COMMON_DEPEND}
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
"
src_configure() {
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
index 598ede07d9a5..ba66ec8e1e0c 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.2 2014/12/11 13:05:46 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v 1.3 2015/01/28 23:25:42 johu Exp $
EAPI=5
@@ -17,8 +17,7 @@ RESTRICT=test
# krunner is only needed to generate dbus interface for lancelot
COMMON_DEPEND="
- app-crypt/qca:2
- app-crypt/qca-ossl:2
+ app-crypt/qca:2[qt4(+)]
$(add_kdebase_dep kdelibs 'nepomuk?')
$(add_kdebase_dep krunner '' 4.11)
$(add_kdebase_dep plasma-workspace 'nepomuk?' 4.11)
@@ -39,6 +38,7 @@ DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:2
"
RDEPEND="${COMMON_DEPEND}
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
"
src_configure() {