diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-06-05 12:45:25 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-06-05 12:45:25 +0200 |
| commit | 5ccd107aa1e962bc3fb93471aa80088e06d591ad (patch) | |
| tree | 11f6c7ec3f13250b6d72155070f1a81c7d8e7464 | |
| parent | dev-perl/Linux-DesktopFiles: Bump to version 0.130.0 (diff) | |
| parent | profiles: Mask x11-misc/lightdm-kde, kde-apps/plasma-runtime for removal (diff) | |
| download | gentoo-5ccd107a.tar.gz gentoo-5ccd107a.tar.bz2 gentoo-5ccd107a.zip | |
Merge branch 'cleanup'
| -rw-r--r-- | profiles/package.mask | 6 | ||||
| -rw-r--r-- | x11-misc/lightdm/lightdm-1.18.3.ebuild | 6 | ||||
| -rw-r--r-- | x11-misc/lightdm/lightdm-1.21.5.ebuild | 5 | ||||
| -rw-r--r-- | x11-misc/lightdm/lightdm-1.22.0.ebuild | 5 | ||||
| -rw-r--r-- | x11-misc/lightdm/metadata.xml | 1 |
5 files changed, 12 insertions, 11 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 4ca56cba1faf..e127e6e979e7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,6 +29,12 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner <asturm@gentoo.org> (05 Jun 2017) +# Relies on obsolete and vulnerable qtwebkit version. Dead upstream. +# Masked for removal in 30 days. Bugs #620792, #620796 +x11-misc/lightdm-kde +kde-apps/plasma-runtime + # Hans de Graaff <graaff@gentoo.org> (05 Jun 2017) # Bundles obsolete and vulnerable webkit version. # Upstream has stopped development and recommends using diff --git a/x11-misc/lightdm/lightdm-1.18.3.ebuild b/x11-misc/lightdm/lightdm-1.18.3.ebuild index f0ddd8d30953..549dc488a540 100644 --- a/x11-misc/lightdm/lightdm-1.18.3.ebuild +++ b/x11-misc/lightdm/lightdm-1.18.3.ebuild @@ -13,8 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.x LICENSE="GPL-3 LGPL-3" SLOT="0" KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86" -IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" -REQUIRED_USE="|| ( gtk kde )" +IUSE="audit +introspection qt4 qt5 +gnome" COMMON_DEPEND="audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 @@ -42,8 +41,7 @@ DEPEND="${COMMON_DEPEND} gnome? ( gnome-base/gnome-common ) sys-devel/gettext virtual/pkgconfig" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) - kde? ( x11-misc/lightdm-kde )" +PDEPEND="x11-misc/lightdm-gtk-greeter" DOCS=( NEWS ) RESTRICT="test" diff --git a/x11-misc/lightdm/lightdm-1.21.5.ebuild b/x11-misc/lightdm/lightdm-1.21.5.ebuild index 84326c449cb6..117a032bbbde 100644 --- a/x11-misc/lightdm/lightdm-1.21.5.ebuild +++ b/x11-misc/lightdm/lightdm-1.21.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.x LICENSE="GPL-3 LGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" +IUSE="audit +gtk +introspection qt4 qt5 +gnome" COMMON_DEPEND="audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 @@ -41,8 +41,7 @@ DEPEND="${COMMON_DEPEND} gnome? ( gnome-base/gnome-common ) sys-devel/gettext virtual/pkgconfig" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) - kde? ( x11-misc/lightdm-kde )" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" DOCS=( NEWS ) RESTRICT="test" diff --git a/x11-misc/lightdm/lightdm-1.22.0.ebuild b/x11-misc/lightdm/lightdm-1.22.0.ebuild index 84326c449cb6..117a032bbbde 100644 --- a/x11-misc/lightdm/lightdm-1.22.0.ebuild +++ b/x11-misc/lightdm/lightdm-1.22.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.x LICENSE="GPL-3 LGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="audit +gtk +introspection kde qt4 qt5 +gnome" +IUSE="audit +gtk +introspection qt4 qt5 +gnome" COMMON_DEPEND="audit? ( sys-process/audit ) >=dev-libs/glib-2.32.3:2 @@ -41,8 +41,7 @@ DEPEND="${COMMON_DEPEND} gnome? ( gnome-base/gnome-common ) sys-devel/gettext virtual/pkgconfig" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter ) - kde? ( x11-misc/lightdm-kde )" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" DOCS=( NEWS ) RESTRICT="test" diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml index 89f62bd578a8..cb677871a1a5 100644 --- a/x11-misc/lightdm/metadata.xml +++ b/x11-misc/lightdm/metadata.xml @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="gtk">Pull in the gtk+ greeter</flag> - <flag name="kde">Pull in the kde greeter</flag> </use> <longdescription lang="en"> </longdescription> |