gentoo resync : 15.11.2017

7 files changed, 72 insertions, 80 deletions

diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index ec02035a4707..b9e5ec6ec42d 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,6 +1,8 @@
 AUX kdocker-4.8-unbundle-qtsingleapplication.patch 425 SHA256 ccacb2b0e8df33808017a5ac28e054e95ded6d45c31a4be8af85c4212447c098 SHA512 b30cf6fd65df88eee8395f7f6d3d73fbaff2575fb36977c5a16ce1c3983804f1045e6beea787796eb9ef1878cc1c18ef7e033fbc7f1d113630850457a0d00262 WHIRLPOOL 881fd1bcf8bbb280ec1607bcfa1f45380f7d52c26fff557396510e5dedc9c051265d94b8759037e4eb3bfc3dc5a58b103b4ecb5c02335e17c15274156fd01f76
 DIST kdocker-4.8.tar.gz 379186 SHA256 16e5d6dab6957139343b29d2bab7d1f7154d74bb4a60dace897b23cf6f8921a9 SHA512 4e7d716dba1ec7d45cb1134e4d28b4d4461a837d2f88f1460d54297594f617c414ba231515e1ca5c284e75099ac5db9762712085aba6c374991c8c642d903a91 WHIRLPOOL 059c018059e29f5259adfeb23f3bf1d6b1967aa06a1cf991bcfa050324c3459ea08c304c869a77c4f6ac16e508546051d6484cc6806217fb39afd8fdd01f9970
-EBUILD kdocker-4.8-r2.ebuild 1003 SHA256 cefcd3b1c2ea0fee51981d0cdadb2bc03a90cfb6f266c5159b7b3945e470955b SHA512 0fade0c1bfe0a95528661db365f19ad1e79771282a69f49ba4b960a13941a237da0f454fd6b4a033ef5c69ffe159815e1e542d4cdf498fdea395a1bbc0825168 WHIRLPOOL 5c9f154e2c9c1569f7b361fb6d1397a6186fe7c9aece215d4bafcfc33c20f69d33bd2e2799e73f56b5bab26f77de5a06ef7cb8f91d0a700ffeb200d0f17b4490
+DIST kdocker-5.0.tar.gz 152222 SHA256 711c3a07d36d278eca47fa56db34fcb0f20f30210d9a1e86a9d0243b834e357a SHA512 7c7702000621204d7e4acab295d43d05f71982af91524bc237878bdc9aa8851dc01a718bbe32412f46c718a1e358de8e710489a4beba9ef5b39359fe43662ba3 WHIRLPOOL 735e90b7e77dce434c3a4a6f0bc249b05845eae8dbcffd91f816882e5aa5e64bb359d675ccea62b3f1f45c70538ac7a49e23e5d60b070fd9877ee77f399be668
+EBUILD kdocker-4.8-r2.ebuild 1008 SHA256 300a69d611438d8753f7cdba53fa053902c0a6194db07394ff79c564ed17fa68 SHA512 9b1082d7d8671684342b4876334c286939e6d02d45df704a182c0b5584242b71d3273b0311c68badacaf032551e883f9255ea0daaf6abf1576bb5ced56852c19 WHIRLPOOL e5b6fa49bc5f3883a1b85c3e44ae44bb9497e6750390e4960fa46bf08a12888d4a783d3c8e6945e5605a5d98825e67d7cddf30b051281e62f7ee29a6245772bc
+EBUILD kdocker-5.0.ebuild 963 SHA256 7761de76e5656a0d00f5a5f2d7dd69005fe15ab17f3de7cf6d8f154fcc9d857e SHA512 a4b14f2dd2129a4d4689af2ba7eecfde3270497bd913dfc70f53a2d3e995daa92e9aa76626a27e31bc80d6c296e93af443ac922af54061355fa2a46b918066eb WHIRLPOOL c9e286d9f32e445d3b20113ce79358d1f9f0994afa6449b62949e430835572ee9dc263dce8ac8488db0fafe2436dab88cc5224dfba3d55e2cb77b200205283a7
 MISC ChangeLog 2795 SHA256 22edc6b50b1872324307750da902efd87c86fe442b10f3bc31cd060b03d5d14e SHA512 d113a9de1f3c8ae4c84772dd0345fcfe58dae6e0afab809e2e57927e0c533dde09a78e65b26e03fa942d46ded06ce6821037fcc70e669f0825b3fe6a5c8a6f87 WHIRLPOOL b3041babb64c7a3b825b3c478f3e5a5656dff679e393fcf8aebf1ec7c2de33b968f3a3ee45ddafb2ad1a7de191c7e3bb70d80a1bf07d60007e6f41e4cb079753
 MISC ChangeLog-2015 4358 SHA256 dcfd7e6b85087b214f381e31902110366f8229e92323ec489f572ff21b4ca26b SHA512 aadd1fde82976837ad5fcce3b5d50f8450a9f97b9e96e3824094e1e4664195daa84e6d99e1a97a1d1e36afaf2e0f6f6f0f3ea0a2888b963e0194dc1e2f78555e WHIRLPOOL 9eeacc575c8e7b097a12d2c217a03ccda6bc5aa7562b2d9f0263897d7d395282d49ccdcd2dec840779c9a5f3f9d23ff8686cb9dff273fa452a29a00299336248
-MISC metadata.xml 298 SHA256 53601401f85d9e0647a6241140e3db5d76e9b0d05ec3b6677afb766f2b990f6c SHA512 624a0b2498a8e2faca121e56f4c1cd24996a1d5733ca36d9b21ecb42741fe1027a80bf6698624d47a97c9417f602bb49e784fa01c6c64e609009b2c1dd2cd85d WHIRLPOOL 4207ce75b94ae98f8d7cfa029b15acf75c863b89b39c084b278c4d4b07a282813fdbf6979621d885ffb68c2bbbc34d0590d795128328c101d402c682dc6fa0a8
+MISC metadata.xml 314 SHA256 583b5f3206e158d07fc777c0b9422d31cc54cf67f7c98e09cd7042b7d5472792 SHA512 7004b14353f87c3c308055f8291e09f8f3b36ce8859f51a055f691afbfb2537fef9f5632793c9977cab36aa8e453d53876d7e2e57ae0bddaaebe261a7cac0ff4 WHIRLPOOL 5ba630009a11faa0583e1c9ff80c5b8e76831b3a1436179b2369e0b06e9ae3a5dd1a928a194260c3cd920454b69d1885185b7f8a7896e16202cdc01f8f688f1c
diff --git a/x11-misc/kdocker/kdocker-4.8-r2.ebuild b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
index 777c7974c8b7..f3e8ad99e0d2 100644
--- a/x11-misc/kdocker/kdocker-4.8-r2.ebuild
+++ b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ LANGS="it"
 inherit bash-completion-r1 qt4-r2
 
 DESCRIPTION="Helper to dock any application into the system tray"
-HOMEPAGE="https://launchpad.net/kdocker/"
+HOMEPAGE="https://github.com/user-none/KDocker"
 SRC_URI="https://launchpad.net/${PN}/trunk/${PV:0:3}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -26,7 +26,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS ChangeLog CREDITS README TODO )
-
 PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
 
 src_prepare() {
diff --git a/x11-misc/kdocker/kdocker-5.0.ebuild b/x11-misc/kdocker/kdocker-5.0.ebuild
new file mode 100644
index 000000000000..f5fe8f99707d
--- /dev/null
+++ b/x11-misc/kdocker/kdocker-5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 qmake-utils
+
+DESCRIPTION="Helper to dock any application into the system tray"
+HOMEPAGE="https://github.com/user-none/KDocker"
+SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXpm
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO )
+
+S=${WORKDIR}/KDocker-${PV}
+
+src_prepare() {
+	default
+
+	sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
+		kdocker.pro || die "sed failed"
+}
+
+src_configure() {
+	eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/x11-misc/kdocker/metadata.xml b/x11-misc/kdocker/metadata.xml
index 8c76e7855575..5b89c48049a4 100644
--- a/x11-misc/kdocker/metadata.xml
+++ b/x11-misc/kdocker/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="launchpad">kdocker</remote-id>
-		<bugs-to>https://bugs.launchpad.net/kdocker</bugs-to>
+		<remote-id type="github">user-none/KDocker</remote-id>
+		<bugs-to>https://github.com/user-none/KDocker/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 4d68e37c905f..71599d94b228 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,9 +9,8 @@ DIST sddm-0.15.0.tar.gz 3520188 SHA256 a4211e5b66f674415e07bc1cc39c16f60ae602541
 DIST sddm-0.16.0.tar.gz 3523735 SHA256 f7f73c6dd6d544ec2c5e4657e181f60467ec31d84bf1b775c544dfe8748badbe SHA512 1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c WHIRLPOOL 1a51b2d53fa5427a6785070107152bf9c907a8ebf77dd0532820d9fbcca33d68d7dbc5bcacd863d1881c54d26617bf6986c276ae6d99806e1a2bce6920240733
 EBUILD sddm-0.14.0-r2.ebuild 2332 SHA256 1a0083b134f33feb4b1014a2c3a5227a569ac6a2904feeabf3a09e41564c223c SHA512 b67ed7c8582b205972ebe2847d87a08cd24c3c9c2d6f77bd81bc89503e49cc380c6fa7af6722639cf92df1414d96a21bafd4978b0b08127c37e2419651e6bd71 WHIRLPOOL 1dc114783af75071c4e174897eb1deaa0c0e0db45aaae378d4ccce83f61707e1885a0a8e915e1b40f30ebc28d15877ab810b530028a4f9d749eb66aa11e1ba60
 EBUILD sddm-0.15.0.ebuild 1576 SHA256 c29f9d1a75face9de46899dba6684c1f269b5e6aea2e9ebf20ea59f9b7d2a4e5 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45 WHIRLPOOL 47caec5f73b8aa5669e866b0f76d06a6577e9c1fb5ba250507906cc73478af3c19f7ec372de649a938396497fac1e7f51104c38b420fbadf4237a29e8a667f85
-EBUILD sddm-0.16.0-r1.ebuild 1628 SHA256 e976e4e79e0f9448b0fa645b78fd82cee9a469510500d7b75aedb3f16a989f1e SHA512 fa13f0f94e8eec28d8851ef6963acbaf188d96e8f365b940e2efc2110ac0376903f14b7a311ba30ee0598222f93083235cdb299db617ac620bc6a6a7666573db WHIRLPOOL a93d7a20fd1971c30fcb1c29af1149ccd7d41bcc9d02e0a206fad16fcdf492fdaa1cbb2cbc65d07825ba57e7fa4f146744d3f5dfd46ff36320d5cfeadb9b7ca4
 EBUILD sddm-0.16.0-r2.ebuild 1563 SHA256 92c2c4a262da26632c979dd6fb798604112f6e1b3d11f51d4f10fbde9ffcec00 SHA512 bd5cab0a672662b03dfa63cb01a22520fbe921332d6b045f8a8729c70e0069598769a76b86cee28c58c321964b3f537f2067ccd6392d85a64628e652d786c187 WHIRLPOOL 3c9d61d29215fd0ede670de5a548534de619fe8e8df00b27fb7d0cf4abb626ebcbc8d0195a72a5bec60153a94bb964b4e1b531b54b0be1bc29e6e83ccb6f42ea
-EBUILD sddm-0.16.0.ebuild 1578 SHA256 6e738dd5bf6f6439256555fdc1f1deef106852a5b4767ce6a7ba657cf2e41194 SHA512 1635e9649279e4a8899e7478d13fe4e63fdcf43ec0204685220eaaf1716dbdf4c4eaada9079b8b6bae302d0c10c412a47b5fd99b774f498746d0f46dc7a81dfd WHIRLPOOL 4b68be654dc880c1a71eeb1d029d324174d986cad5de4f3f06b29d254238fe2de41f1af320d4ee89bd09c9c17f81143e2a52ec4b6f4b5650df9bc184d4c3cb56
+EBUILD sddm-0.16.0-r3.ebuild 2035 SHA256 e5d9ee20d526416d72788a1499676febaecca20f00bd4259bdaa2e9fddd5d8f4 SHA512 5c866739c6a685e604d3f35776f401c4976ac9713cf35aa938df09cac464dfd6aa66c5ccadad500ac318e67bf1da0a01ba158abf2b1f9c5e7367cbc78f0c4a80 WHIRLPOOL ce9d60d2b6bf77c16d0d4bc5634362638396e6eaf7e718568c7a8eb586f40abc9f7aee461c25b9bd77d67b6741889f538a4ffdd092fc591a1a9fbdfd7d2cd1d8
 MISC ChangeLog 9132 SHA256 b3c4811eab359e67c259d59550832dcb14fb4ab3ddeb71d23edc2207bda83c15 SHA512 32fc4d222b2316a4247cee25798050094983b69873e3358611d908ec030ab7c5b43c64c92a59e88aa37ba2c3ce97556ff1e03d33c6f0b90a0fdcec0a9825c2dc WHIRLPOOL c427eb05f0f819c4d6cff7d007e8d9ab7816e1fe9462af81f688bac0f649028b2137798ef40553b69d2be032a3eff971ac7875065eaf2d73759bd23e29bcb390
 MISC ChangeLog-2015 3391 SHA256 3512268a5a75b764800ce67e516270f4482390a1f9ab958ec0627dc4403889e8 SHA512 3ec070987205570ba6efa11b7feca3fa42a96d2ae4997dab21c713eab043c883d9f6b7073c8572314fc6793374a6061dfa9c0eba812de21de7869c284e5b3a6d WHIRLPOOL 440c4354b7e61f5022f1f728d3a1346b8cea88eeeade570f9b3ba83a67faf26987e532e5566f272df49d3af30c7fc745983273b1cb8733625690e5fa1a6776a1
 MISC metadata.xml 943 SHA256 39b142d1f59af5862546ac9fba88ebfed56f1c68b52c432bf973dcb7f8b790ae SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516 WHIRLPOOL aa42f29410aefcf50c53516904020cbb698b07e023efa1d86e76dd8b9a0e1c30054bd0f453cd6e497fc4a9b6226e7d0576b8770fc63b940a41831a1b22fccdc3
diff --git a/x11-misc/sddm/sddm-0.16.0-r1.ebuild b/x11-misc/sddm/sddm-0.16.0-r3.ebuild
index 3aaacde32ab8..aa78c82fcbd8 100644
--- a/x11-misc/sddm/sddm-0.16.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.16.0-r3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=6
 
-inherit cmake-utils systemd user
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
+inherit cmake-utils l10n systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
@@ -12,15 +13,15 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-IUSE="consolekit elogind +pam systemd"
+IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
 RDEPEND="
 	>=dev-qt/qtcore-5.6:5
 	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtgui-5.6:5
 	>=dev-qt/qtdeclarative-5.6:5
+	>=dev-qt/qtgui-5.6:5
 	>=dev-qt/qtnetwork-5.6:5
 	>=x11-base/xorg-server-1.15.1
 	x11-libs/libxcb[xkb]
@@ -33,18 +34,26 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/docutils
 	>=dev-qt/linguist-tools-5.6:5
-	>=dev-qt/qttest-5.6:5
 	kde-frameworks/extra-cmake-modules
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	test? ( >=dev-qt/qttest-5.6:5 )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
-	"${FILESDIR}/${P}-ck2-revert.patch" #bug 633920
+	"${FILESDIR}/${P}-Xsession.patch" # bug 611210
+	"${FILESDIR}/${P}-ck2-revert.patch" # bug 633920
 )
 
 src_prepare() {
-	use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
 	cmake-utils_src_prepare
+
+	disable_locale() {
+		sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+	}
+	l10n_find_plocales_changes "data/translations" "" ".ts"
+	l10n_for_each_disabled_locale_do disable_locale
+
+	use test || cmake_comment_add_subdirectory test
 }
 
 src_configure() {
diff --git a/x11-misc/sddm/sddm-0.16.0.ebuild b/x11-misc/sddm/sddm-0.16.0.ebuild
deleted file mode 100644
index acd5a8fc7556..000000000000
--- a/x11-misc/sddm/sddm-0.16.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.6:5
-	>=dev-qt/qtdbus-5.6:5
-	>=dev-qt/qtgui-5.6:5
-	>=dev-qt/qtdeclarative-5.6:5
-	>=dev-qt/qtnetwork-5.6:5
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb]
-	consolekit? ( >=sys-auth/consolekit-0.9.4 )
-	elogind? ( sys-auth/elogind )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	>=dev-qt/linguist-tools-5.6:5
-	>=dev-qt/qttest-5.6:5
-	kde-frameworks/extra-cmake-modules
-	virtual/pkgconfig"
-
-# fix for flags handling and bug 563108
-PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
-
-src_prepare() {
-	use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-DUSE_ELOGIND=$(usex 'elogind')
-		-DBUILD_MAN_PAGES=ON
-		-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-	systemd_reenable sddm.service
-}