8 files changed, 144 insertions, 109 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 20b0941a4b32..76cf61e4e806 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dockmanager/Manifest b/x11-misc/dockmanager/Manifest
deleted file mode 100644
index cc2d95df747a..000000000000
--- a/x11-misc/dockmanager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dockmanager-0.1.0.tar.gz 532346 BLAKE2B 9258a101b337d05a93b45e0ea429a7e57a26cc99f5a0d006b3c780738c8320499a5bcb34014b3b9d7f862169c1dbae3e7cfe6a5acc3783454f01c7d4bc44cb0b SHA512 4379e21b5bb42d8a0e58edf02991a4a3f9c8eefc08321cbeb91db45718fdbfe155894e57b46356b07c43e4ce70266357ef84bc4c79280175cc724c9ddb550f4f
-EBUILD dockmanager-0.1.0-r1.ebuild 885 BLAKE2B a73fef9823fa10a532590820b97bab66b471c6968adf9e8da518d5c0109eb0a7f96e9e3815ff669b779f35b81493d99efa5bc582d4078a5c88a090244266b564 SHA512 2de62c625149c983b7b6fbffaa347e76c703264e34058f8b731075365aff8dbc5ae7d882778ee97dfab018caf3bf020456380eb338b7ae65e86e4a614c169fcb
-MISC metadata.xml 222 BLAKE2B f6a7e11c2e876d86874c84e2ca00d8aef3cb62b7ea50f7bf624835c90ac88d4eeef39f2244552df11cbab530309824b72fbf002497175894001d9993f73b798b SHA512 4a386e582b7ec42c42ed453d3ade64bdf10f09c6d6d3132934233131340342fe626a3411e5b0c9564445f46d322e643f1e7d3f26c77f21bfe9af53d16878f9e3
diff --git a/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild b/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
deleted file mode 100644
index c8a900c7df03..000000000000
--- a/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-GCONF_DEBUG="no"
-
-inherit gnome2 python-single-r1 vala
-
-DESCRIPTION="dock-independent helper scripts"
-HOMEPAGE="https://launchpad.net/dockmanager"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libdesktop-agnostic
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	rm -f {scripts,metadata}/pidgin_control.* || die
-	sed -i -e "/pidgin_control/d" {scripts,metadata}/Makefile.* || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable !debug release)
-}
diff --git a/x11-misc/dockmanager/metadata.xml b/x11-misc/dockmanager/metadata.xml
deleted file mode 100644
index 4fab8457cfd1..000000000000
--- a/x11-misc/dockmanager/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="launchpad">dockmanager</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 8c2716bb3bf4..7eea8b52e0ca 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -9,5 +9,6 @@ DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
 EBUILD lightdm-1.18.3-r1.ebuild 3897 BLAKE2B 05e97d3e9c2c8513d43e7f06c30737d066d9360f3177144bff79eee134d7b8a4b77af929c087c027cbd38b5cf68d34d8a149b6bbfe1c8804472730e4738ce812 SHA512 531f3724cb706a17b7dfc309f7413e1df5ed0e7e9f7da37d3427a5c189a8007cfd598eb370b1a57673033077b1a060cbd083f5088160eb78f788cfb9aebe2897
 EBUILD lightdm-1.24.0-r1.ebuild 3862 BLAKE2B ce4df61efd5edfd3f55507993d5d8d5330ec68466478e7603f881a7ac92168a7cdca1ac4c355000f093adac96baa14167f79da6cb4c1cfd951aaa4c25bb3ef4d SHA512 bb54b9ef6f2405c7fd5fe450ef9f0fde38f1fb0b5183cf37fddb8013019b0c5d30d2f13be64b41cd3a652a4a7c65ef100b327c2abc8ff5fc8884a72bd77ec946
+EBUILD lightdm-1.26.0-r1.ebuild 3939 BLAKE2B 1030ede780282b1d2a0a64069f1ea658a122b8814ab54108ff24705e5111517b7a39bae47480a57ab4bb2dc9b691e0fefa24fb9927815ac146a9d22e83fdf9f0 SHA512 1eba927aac1ea1b4765aaa662045a872522e0d09d49f22b66a27267b4468ad4771b57046e2104454ef27dec2eded14fb0b78c52741e07fb40efe1b4eebe7e214
 EBUILD lightdm-1.26.0.ebuild 3849 BLAKE2B 883cefc8f097c294bcc33f695de248e1549a1a2d4383f48878ae30a33eb6d8fed88d7b60cf0a1c85695f2f223f30ae54d66d5d20d92616875ed277750c0fcdf8 SHA512 a624e845c4e9080658c3e4911158f75b4dbf8fd2f87a5f5d6246352e438c880a9923b35c3521705e93046f7b5812c2c435c5a4c9a37b4c6b1e9af031b5e1090b
 MISC metadata.xml 391 BLAKE2B c6a14fded4791158cfe9c26a70c9c4de8638ab6e9ad1f683cbf94a522f456f36f0aaf2db26d88ac9dab5bf7818d18d4dbf793ef7a6970e91f16e9642d8cbc91b SHA512 c3856bf443309731ef7ea0d849f76219f69552475a88e5c5fb54ca73f30f223da44d2f4eb6d37cfc5f305757c6654573f3d639fa87818318f7afa4dc57dce466
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
new file mode 100644
index 000000000000..bf3d47193355
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audit +gnome +gtk +introspection qt5 vala"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	dev-libs/libxml2
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	audit? ( sys-process/audit )
+	gnome? ( sys-apps/accountsservice )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	gnome? ( gnome-base/gnome-common )
+	vala? ( $(vala_depend) )
+"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+	xdg_environment_reset
+
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	# use correct version of qmake. bug #566950
+	sed \
+		-e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" \
+		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+		-i configure.ac || die
+
+	default
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user=${LIGHTDM_USER:=root}
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	use qt5 && append-cxxflags -std=c++11
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-static
+		--disable-tests
+		$(use_enable audit libaudit)
+		$(use_enable introspection)
+		--disable-liblightdm-qt
+		$(use_enable qt5 liblightdm-qt5)
+		$(use_enable vala)
+		--with-user-session=${_session}
+		--with-greeter-session=${_greeter}
+		--with-greeter-user=${_user}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${ED%/}/etc/apparmor.d ]]; then
+		rm -r "${ED%/}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	dodir /var/lib/lightdm-data
+
+	find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
+	rm -rf "${ED%/}"/etc/init
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+}
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest
index 6e31491ff54d..ea3e8a6bf121 100644
--- a/x11-misc/slop/Manifest
+++ b/x11-misc/slop/Manifest
@@ -1,4 +1,3 @@
-AUX slop-6.3.46-fix-build-system.patch 2274 BLAKE2B cec202a664d3329d7354f63d20e5a197363296d1506e46900ae51d542bc44279ac62fb9668dcaa2cbade49688d210f9fbac7cbbb706feb5382921536b8471c2b SHA512 344396f7cc8c60f09647c434b78183264dede5548e243df3408f46486f489eb14353fa770ba1f604f604a15417a92f84cd51c561b7026b74b854d8ba7d02cc67
 DIST slop-7.4.tar.gz 50079 BLAKE2B 20815270bf1bffe0ef26630fd31d0d4cc7261633cef389e64c232a89033b6e8b5e1651fb5c882e2870808107734c4c088123b85675fa2aae932570d770344dc8 SHA512 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
 EBUILD slop-7.4.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
 EBUILD slop-9999.ebuild 841 BLAKE2B e9d7a1c367746cf7755c53e6e67b49350636a9e492fb4925227301e3bbd75b7fff0305cdcb5d44c0d68545677770b5cc286e9762c68da9175379bb4b0856cb04 SHA512 2d488df26b6f1c39539d9eba88baa621a6166b53b30ec30d68bda1eb617dbd9da5b17d74a2fffc5193012141e1e3a68c180ed6d62d3703dd26d35eab4410e078
diff --git a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch b/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
deleted file mode 100644
index 2ca92f9d2ac8..000000000000
--- a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,16 +1,13 @@
- cmake_minimum_required(VERSION 3.1.3)
- 
-+include(GNUInstallDirs)
-+
- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)")
--if ( NOT CMAKE_INSTALL_PREFIX )
--    set(CMAKE_INSTALL_PREFIX "/usr")
--endif()
- 
--project(slop)
-+project(slop VERSION 6.3.46 LANGUAGES CXX)
- 
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
- 
--set( CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where man pages reside. (/usr/share/man, /usr/local/share/man, etc.)" )
--
- set( CMAKE_COMPRESS_MAN TRUE CACHE BOOL "Whether or not to compress the man pages for install." )
- 
- if ( CMAKE_COMPRESS_MAN )
-@@ -21,7 +18,7 @@
- 
- include_directories("${PROJECT_BINARY_DIR}")
- 
--add_definitions(-DSLOP_VERSION="v6.3.46")
-+add_definitions(-DSLOP_VERSION="v${PROJECT_VERSION}")
- 
- # The names have to be unique unfortunately.
- set(EXECUTABLE_NAME "slop")
-@@ -43,11 +40,13 @@
- 
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 11)
-+set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_EXTENSIONS OFF)
- 
- add_executable(${EXECUTABLE_NAME} src/main.cpp)
- 
- set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
- set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 11)
-+set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_EXTENSIONS OFF)
- 
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" )
- 
-@@ -83,7 +82,7 @@
-     target_link_libraries(${EXECUTABLE_NAME} ${ICU_UC_LIBRARIES} )
- endif()
- 
--install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
--install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
--install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" COMPONENT development )
-+install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" )
-+install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}" )
-+install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT development )
- install( FILES "${CMAKE_SOURCE_DIR}/${MANTARGET}" DESTINATION  "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc )