* [gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/, kde-apps/korganizer/, kde-apps/kleopatra/, kde-apps/minuet/, ...
@ 2019-01-09 2:15 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2019-01-09 2:15 UTC (permalink / raw
To: gentoo-commits
commit: 58aaed8538c56bafb25d1b4b1d132cafd3c043f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 01:41:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 01:52:28 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=58aaed85
kde-apps: Move remaining slot 4 blockers where they belong
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/akonadi/akonadi-18.12.1.ebuild | 1 +
kde-apps/akonadi/akonadi-18.12.49.9999.ebuild | 1 +
kde-apps/akregator/akregator-18.12.1.ebuild | 1 +
kde-apps/akregator/akregator-18.12.49.9999.ebuild | 1 +
kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild | 4 +++-
kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild | 4 +++-
kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild | 1 +
kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild | 1 +
kde-apps/kalarm/kalarm-18.12.1.ebuild | 1 +
kde-apps/kalarm/kalarm-18.12.49.9999.ebuild | 1 +
kde-apps/kjots/kjots-9999.ebuild | 6 +++---
kde-apps/kleopatra/kleopatra-18.12.1.ebuild | 1 +
kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild | 1 +
kde-apps/kmail/kmail-18.12.1.ebuild | 1 +
kde-apps/kmail/kmail-18.12.49.9999.ebuild | 1 +
kde-apps/knotes/knotes-18.12.1.ebuild | 1 +
kde-apps/knotes/knotes-18.12.49.9999.ebuild | 1 +
kde-apps/konqueror/konqueror-18.12.1.ebuild | 1 +
kde-apps/konqueror/konqueror-18.12.49.9999.ebuild | 1 +
kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild | 1 +
kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild | 1 +
kde-apps/kontact/kontact-18.12.1.ebuild | 1 +
kde-apps/kontact/kontact-18.12.49.9999.ebuild | 1 +
kde-apps/kopete/kopete-18.12.1.ebuild | 1 +
kde-apps/kopete/kopete-18.12.49.9999.ebuild | 1 +
kde-apps/korganizer/korganizer-18.12.1.ebuild | 1 +
kde-apps/korganizer/korganizer-18.12.49.9999.ebuild | 1 +
kde-apps/minuet/minuet-18.12.1.ebuild | 7 +++++--
kde-apps/minuet/minuet-18.12.49.9999.ebuild | 7 +++++--
29 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/kde-apps/akonadi/akonadi-18.12.1.ebuild b/kde-apps/akonadi/akonadi-18.12.1.ebuild
index 1a0a2c2243..e80a4b6a95 100644
--- a/kde-apps/akonadi/akonadi-18.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.1.ebuild
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/akonadi:4
!<kde-apps/kapptemplate-17.11.80
!kde-apps/kdepim-l10n
!kde-apps/kdepimlibs
diff --git a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
index 89eddb63f3..7ddc4ea8c4 100644
--- a/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.49.9999.ebuild
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/akonadi:4
!<kde-apps/kapptemplate-17.11.80
!kde-apps/kdepim-l10n
!kde-apps/kdepimlibs
diff --git a/kde-apps/akregator/akregator-18.12.1.ebuild b/kde-apps/akregator/akregator-18.12.1.ebuild
index 0bb31dcaf0..2eaee653ee 100644
--- a/kde-apps/akregator/akregator-18.12.1.ebuild
+++ b/kde-apps/akregator/akregator-18.12.1.ebuild
@@ -51,5 +51,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/grantlee:5
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/akregator:4
!kde-apps/kdepim-l10n
"
diff --git a/kde-apps/akregator/akregator-18.12.49.9999.ebuild b/kde-apps/akregator/akregator-18.12.49.9999.ebuild
index 89b106bdb7..3787c616d2 100644
--- a/kde-apps/akregator/akregator-18.12.49.9999.ebuild
+++ b/kde-apps/akregator/akregator-18.12.49.9999.ebuild
@@ -51,5 +51,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/grantlee:5
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/akregator:4
!kde-apps/kdepim-l10n
"
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild
index 3a35111321..3ab410379f 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild
@@ -29,7 +29,9 @@ DEPEND="
media-libs/libvorbis
)
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !kde-apps/audiocd-kio:4
+"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild
index 11ec6e3bcd..99a384ff78 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.12.49.9999.ebuild
@@ -29,7 +29,9 @@ DEPEND="
media-libs/libvorbis
)
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !kde-apps/audiocd-kio:4
+"
src_configure() {
local mycmakeargs=(
diff --git a/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild
index 5389e3b6c7..765ce86305 100644
--- a/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kaddressbook:4
!kde-apps/kdepim-l10n
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild
index 2b47f5f96b..8de675c691 100644
--- a/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-18.12.49.9999.ebuild
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kaddressbook:4
!kde-apps/kdepim-l10n
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/kalarm/kalarm-18.12.1.ebuild b/kde-apps/kalarm/kalarm-18.12.1.ebuild
index 0eb0134d15..441a00da05 100644
--- a/kde-apps/kalarm/kalarm-18.12.1.ebuild
+++ b/kde-apps/kalarm/kalarm-18.12.1.ebuild
@@ -64,6 +64,7 @@ COMMON_DEPEND="
)
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kalarm:4
!kde-apps/kdepim-l10n
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild b/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild
index 61a03a814f..b0914fc9c5 100644
--- a/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild
+++ b/kde-apps/kalarm/kalarm-18.12.49.9999.ebuild
@@ -64,6 +64,7 @@ COMMON_DEPEND="
)
"
RDEPEND="${COMMON_DEPEND}
+ !kde-apps/kalarm:4
!kde-apps/kdepim-l10n
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/kjots/kjots-9999.ebuild b/kde-apps/kjots/kjots-9999.ebuild
index 48c438a7e1..7b7e5eff14 100644
--- a/kde-apps/kjots/kjots-9999.ebuild
+++ b/kde-apps/kjots/kjots-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
KEYWORDS=""
IUSE=""
-RDEPEND="
+DEPEND="
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kconfig)
@@ -36,6 +36,6 @@ RDEPEND="
dev-libs/grantlee:5
dev-libs/libxslt
"
-DEPEND="${RDEPEND}
- sys-devel/gettext
+RDEPEND="${DEPEND}
+ !kde-apps/kjots:4
"
diff --git a/kde-apps/kleopatra/kleopatra-18.12.1.ebuild b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
index 9d50875fbf..f846276c10 100644
--- a/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
@@ -44,6 +44,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/kleopatra:4
>=app-crypt/gnupg-2.1
app-crypt/paperkey
"
diff --git a/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild b/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild
index a0bbc2a40a..7e48839bcd 100644
--- a/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.12.49.9999.ebuild
@@ -44,6 +44,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/kleopatra:4
>=app-crypt/gnupg-2.1
app-crypt/paperkey
"
diff --git a/kde-apps/kmail/kmail-18.12.1.ebuild b/kde-apps/kmail/kmail-18.12.1.ebuild
index 14e6f0ac94..4827eb3089 100644
--- a/kde-apps/kmail/kmail-18.12.1.ebuild
+++ b/kde-apps/kmail/kmail-18.12.1.ebuild
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4
!kde-apps/kdepim-l10n
+ !kde-apps/kmail:4
!kde-apps/ktnef
$(add_kdeapps_dep kdepim-runtime)
$(add_kdeapps_dep kmail-account-wizard)
diff --git a/kde-apps/kmail/kmail-18.12.49.9999.ebuild b/kde-apps/kmail/kmail-18.12.49.9999.ebuild
index 45fb30d520..ff8a7efea7 100644
--- a/kde-apps/kmail/kmail-18.12.49.9999.ebuild
+++ b/kde-apps/kmail/kmail-18.12.49.9999.ebuild
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4
!kde-apps/kdepim-l10n
+ !kde-apps/kmail:4
!kde-apps/ktnef
$(add_kdeapps_dep kdepim-runtime)
$(add_kdeapps_dep kmail-account-wizard)
diff --git a/kde-apps/knotes/knotes-18.12.1.ebuild b/kde-apps/knotes/knotes-18.12.1.ebuild
index 2c843e3002..733b2b997f 100644
--- a/kde-apps/knotes/knotes-18.12.1.ebuild
+++ b/kde-apps/knotes/knotes-18.12.1.ebuild
@@ -58,6 +58,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/knotes:4
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/knotes/knotes-18.12.49.9999.ebuild b/kde-apps/knotes/knotes-18.12.49.9999.ebuild
index 8ae6b59c3d..6e8382a51d 100644
--- a/kde-apps/knotes/knotes-18.12.49.9999.ebuild
+++ b/kde-apps/knotes/knotes-18.12.49.9999.ebuild
@@ -58,6 +58,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/knotes:4
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/konqueror/konqueror-18.12.1.ebuild b/kde-apps/konqueror/konqueror-18.12.1.ebuild
index baabe39de7..407768a1f1 100644
--- a/kde-apps/konqueror/konqueror-18.12.1.ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.1.ebuild
@@ -60,6 +60,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kfmclient:4
!kde-apps/konq-plugins
+ !kde-apps/konqueror:4
!kde-apps/libkonq:5
$(add_kdeapps_dep kfind)
$(add_plasma_dep kde-cli-tools)
diff --git a/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild b/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild
index 9e76874a1a..08966366c4 100644
--- a/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.49.9999.ebuild
@@ -60,6 +60,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kfmclient:4
!kde-apps/konq-plugins
+ !kde-apps/konqueror:4
!kde-apps/libkonq:5
$(add_kdeapps_dep kfind)
$(add_plasma_dep kde-cli-tools)
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild
index 536e8f06fe..6b040a998b 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild
@@ -27,6 +27,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/konsolekalendar:4
"
src_prepare() {
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild
index c451ebf790..56d16ac77e 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.12.49.9999.ebuild
@@ -27,6 +27,7 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/konsolekalendar:4
"
src_prepare() {
diff --git a/kde-apps/kontact/kontact-18.12.1.ebuild b/kde-apps/kontact/kontact-18.12.1.ebuild
index 20b93280af..31acd1a9fa 100644
--- a/kde-apps/kontact/kontact-18.12.1.ebuild
+++ b/kde-apps/kontact/kontact-18.12.1.ebuild
@@ -41,4 +41,5 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/kontact:4
"
diff --git a/kde-apps/kontact/kontact-18.12.49.9999.ebuild b/kde-apps/kontact/kontact-18.12.49.9999.ebuild
index 2f238309d7..f83f171eec 100644
--- a/kde-apps/kontact/kontact-18.12.49.9999.ebuild
+++ b/kde-apps/kontact/kontact-18.12.49.9999.ebuild
@@ -41,4 +41,5 @@ DEPEND="
"
RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+ !kde-apps/kontact:4
"
diff --git a/kde-apps/kopete/kopete-18.12.1.ebuild b/kde-apps/kopete/kopete-18.12.1.ebuild
index e48a51d593..2738349796 100644
--- a/kde-apps/kopete/kopete-18.12.1.ebuild
+++ b/kde-apps/kopete/kopete-18.12.1.ebuild
@@ -117,6 +117,7 @@ COMMONDEPEND="
"
RDEPEND="${COMMONDEPEND}
!kde-apps/kde4-l10n
+ !kde-apps/kopete:4
latex? (
|| (
media-gfx/imagemagick
diff --git a/kde-apps/kopete/kopete-18.12.49.9999.ebuild b/kde-apps/kopete/kopete-18.12.49.9999.ebuild
index 767193885c..833652e6d5 100644
--- a/kde-apps/kopete/kopete-18.12.49.9999.ebuild
+++ b/kde-apps/kopete/kopete-18.12.49.9999.ebuild
@@ -117,6 +117,7 @@ COMMONDEPEND="
"
RDEPEND="${COMMONDEPEND}
!kde-apps/kde4-l10n
+ !kde-apps/kopete:4
latex? (
|| (
media-gfx/imagemagick
diff --git a/kde-apps/korganizer/korganizer-18.12.1.ebuild b/kde-apps/korganizer/korganizer-18.12.1.ebuild
index a631ad0154..baee0100f6 100644
--- a/kde-apps/korganizer/korganizer-18.12.1.ebuild
+++ b/kde-apps/korganizer/korganizer-18.12.1.ebuild
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4
!kde-apps/kdepim-l10n
+ !kde-apps/korganizer:4
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild b/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild
index a388d91f68..e5c27357b6 100644
--- a/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild
+++ b/kde-apps/korganizer/korganizer-18.12.49.9999.ebuild
@@ -74,6 +74,7 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4
!kde-apps/kdepim-l10n
+ !kde-apps/korganizer:4
$(add_kdeapps_dep kdepim-runtime)
"
diff --git a/kde-apps/minuet/minuet-18.12.1.ebuild b/kde-apps/minuet/minuet-18.12.1.ebuild
index 790d4e71ff..d9136c0bf4 100644
--- a/kde-apps/minuet/minuet-18.12.1.ebuild
+++ b/kde-apps/minuet/minuet-18.12.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://minuet.kde.org/"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep ki18n)
@@ -21,6 +21,9 @@ RDEPEND="
$(add_qt_dep qtquickcontrols2)
media-sound/fluidsynth
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/minuet:4
+"
diff --git a/kde-apps/minuet/minuet-18.12.49.9999.ebuild b/kde-apps/minuet/minuet-18.12.49.9999.ebuild
index b1f25f1391..310d404ed7 100644
--- a/kde-apps/minuet/minuet-18.12.49.9999.ebuild
+++ b/kde-apps/minuet/minuet-18.12.49.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://minuet.kde.org/"
KEYWORDS=""
IUSE=""
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep ki18n)
@@ -21,6 +21,9 @@ RDEPEND="
$(add_qt_dep qtquickcontrols2)
media-sound/fluidsynth
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
+RDEPEND="${COMMON_DEPEND}
+ !kde-apps/minuet:4
+"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-01-09 2:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-09 2:15 [gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/, kde-apps/korganizer/, kde-apps/kleopatra/, kde-apps/minuet/, Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox