summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2018-05-24 16:48:13 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2018-05-24 16:48:13 +0000
commit89a7c4571177fda443bcc6d6822f419d4f1ff59c (patch)
treed3932d6ebf064f26408deb8416f632f0ea0e86f8
parent2018-05-24 16:37:48 UTC (diff)
parentprofiles: Add <app-office/libreoffice-6.0[kde] to package.use.mask (diff)
downloadgentoo-89a7c4571177fda443bcc6d6822f419d4f1ff59c.tar.gz
gentoo-89a7c4571177fda443bcc6d6822f419d4f1ff59c.tar.bz2
gentoo-89a7c4571177fda443bcc6d6822f419d4f1ff59c.zip
Merge updates from master
-rw-r--r--profiles/base/package.use.mask17
-rw-r--r--profiles/package.mask7
2 files changed, 20 insertions, 4 deletions
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53273ad59cb4..e4a486b3d1dc 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,14 +7,23 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# kdelibs4 is dead and going away. Bug #645558
+<app-office/libreoffice-6.0 kde
+<app-office/libreoffice-bin-6.0 kde
+<app-office/libreoffice-bin-debug-6.0 kde
+
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# Qt4 is dead and going away.
+kde-plasma/plasma-desktop qt4
+kde-plasma/plasma-meta qt4
+kde-plasma/breeze qt4
+kde-plasma/oxygen qt4
+
# Michał Górny <mgorny@gentoo.org> (16 May 2018)
# Depends on last-rited sci-libs/coinhsl.
sci-libs/ipopt hsl
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on obsolete dev-libs/sni-qt and dead Qt4.
-kde-plasma/plasma-desktop qt4
-
# Mike Gilbert <floppym@gentoo.org> (01 May 2018)
# Requires >=media-video/ffmpeg-4 (bug 654208).
>=www-client/chromium-67 system-ffmpeg
diff --git a/profiles/package.mask b/profiles/package.mask
index c4c8951ebdf1..cced0487142e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,13 @@
#--- END OF EXAMPLES ---
+# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
+# Depends on dead Qt4. Masked for removal in 30 days. Bug #629018
+dev-libs/libattica
+kde-frameworks/kde-env
+kde-frameworks/kdelibs
+kde-plasma/qguiplatformplugin_kde
+
# Lars Wendler <polynomial-c@gentoo.org> (22 May 2018)
# Breaks revdeps (most likely because of GooHash removal).
# See tracker bug https://bugs.gentoo.org/656264