johu 15/01/28 23:25:42
Modified: kdeplasma-addons-4.12.5.ebuild
kdeplasma-addons-4.14.3.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.6 kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild?r1=1.5&r2=1.6
Index: kdeplasma-addons-4.12.5.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.12.5.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdeplasma-addons-4.12.5.ebuild 8 May 2014 07:33:02 -0000 1.5
+++ kdeplasma-addons-4.12.5.ebuild 28 Jan 2015 23:25:42 -0000 1.6
@@ -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 @@
# 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 @@
dev-cpp/eigen:2
"
RDEPEND="${COMMON_DEPEND}
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
"
src_configure() {
1.3 kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild?r1=1.2&r2=1.3
Index: kdeplasma-addons-4.14.3.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdeplasma-addons-4.14.3.ebuild 11 Dec 2014 13:05:46 -0000 1.2
+++ kdeplasma-addons-4.14.3.ebuild 28 Jan 2015 23:25:42 -0000 1.3
@@ -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 @@
# 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 @@
dev-cpp/eigen:2
"
RDEPEND="${COMMON_DEPEND}
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
"
src_configure() {
1.270 kde-base/kdeplasma-addons/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog?rev=1.270&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog?rev=1.270&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog?r1=1.269&r2=1.270
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- ChangeLog 11 Dec 2014 15:45:02 -0000 1.269
+++ ChangeLog 28 Jan 2015 23:25:42 -0000 1.270
@@ -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 <[email protected]> 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 <[email protected]> -kdeplasma-addons-4.14.2.ebuild:
Remove KDE SC 4.14.2
