gentoo resync : 09.12.2017

3 files changed, 23 insertions, 97 deletions

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 1b90af44c3ed..91a2aa6a94f4 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -4,11 +4,10 @@ AUX sddm-0.14.0-avatars.patch 1470 BLAKE2B 4f5b5de2792f37c823bf30591f7964a6a100d
 AUX sddm-0.14.0-consolekit.patch 322 BLAKE2B ace6c045ab0282eca8bf8a11aa8aa2690fac3ce7f712cd71e48bc9ec8f04dc18b9afd997d04550ade8a37a24a66e430f6b5ae8e752345c7c132cb95ae61b2e73 SHA512 aa53338c3e154982388b2e98101cd49e607f1744acee28f46892e3a6848f06de4ba8a8bf204128da1a7b22df9efe5d95bb6ac1cd5dedb8a301f8587af381253a
 AUX sddm-0.16.0-Xsession.patch 606 BLAKE2B 8d437038be2b5fd3934174320aa14484ddd5de5b3d8529100af2679b4cb8ac2ef846ca2812ac8136b7482cf8010d724e37555636304fbe1e72b3a53c0d6b5b1e SHA512 ce01832d8af011c4e244c9357f540182cdf3b7af8d00616132f94c95a95b32df41beb1760ac8cad7a0a5a34165b8b289df0308656268d67f9bc420b5d3fb40f1
 AUX sddm-0.16.0-ck2-revert.patch 918 BLAKE2B 803f3370260ce40a4b46d3d7a9f2f7529db90baba039c080606f9333e4933c6e3a219331d57dbc577e6a32567fedade3a4aec8bd1706bfb5887a0c281d37c2fb SHA512 f9b49390f656d3ba9528c9fecaff044bab7f4933293bd439fc3ccec873aae9899b4f8b93fa769d506948de2be1d3275dafc96795b1c20caf547cbf474ee12b60
-DIST sddm-0.14.0.tar.xz 3298360 SHA256 7e348258618b20f777767a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366 WHIRLPOOL d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 WHIRLPOOL 48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
-DIST sddm-0.16.0.tar.gz 3523735 SHA256 f7f73c6dd6d544ec2c5e4657e181f60467ec31d84bf1b775c544dfe8748badbe SHA512 1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c WHIRLPOOL 1a51b2d53fa5427a6785070107152bf9c907a8ebf77dd0532820d9fbcca33d68d7dbc5bcacd863d1881c54d26617bf6986c276ae6d99806e1a2bce6920240733
-EBUILD sddm-0.14.0-r2.ebuild 2332 BLAKE2B 53646b41c0b205380e42ec984efdac588a7f21c5e623c662a09dadefe64539c32951236aa8601c36f91a30cd667071ef8d5058d39bb8d8a3d5e5b4b973c1402b SHA512 b67ed7c8582b205972ebe2847d87a08cd24c3c9c2d6f77bd81bc89503e49cc380c6fa7af6722639cf92df1414d96a21bafd4978b0b08127c37e2419651e6bd71
+DIST sddm-0.16.0.tar.gz 3523735 BLAKE2B d460cc6d6b9273310cc339f62f2463defea8933441b0332b58da9af394593a6fcb57f2789d2090710d6cb423843380d6693d8e9ead4bdfbab0556a09cbe36fa9 SHA512 1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c
+DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.16.0-r2.ebuild 1563 BLAKE2B 584ac1bcb4006765d16171e6e5ff675f4818dc05f07d76c995a92e38789b6f041e697f05a11bfbff5f84aab1292803dca746dffed432c4e435225f0152d5d0cd SHA512 bd5cab0a672662b03dfa63cb01a22520fbe921332d6b045f8a8729c70e0069598769a76b86cee28c58c321964b3f537f2067ccd6392d85a64628e652d786c187
 EBUILD sddm-0.16.0-r3.ebuild 2035 BLAKE2B fbe965522bb5dbfa4c6c29b7b195f6f352860ffb837468ff62ab9bb33e9bbbca090791468c27fb91f68c12a8ddeb5aab2d138a763de43ec4ed1113ded22f28fb SHA512 5c866739c6a685e604d3f35776f401c4976ac9713cf35aa938df09cac464dfd6aa66c5ccadad500ac318e67bf1da0a01ba158abf2b1f9c5e7367cbc78f0c4a80
+EBUILD sddm-0.17.0.ebuild 2051 BLAKE2B 19cacf2db7043d6e3c0520f7b5e283e42673a3cfc455dde1ca5a6f7b58242e87e44268fc99cd2f2782c0dced6aa2ed184edc5fed7d0aca81ada6ac9961ecbe53 SHA512 33cd121876df882fc1a8234d62ff830af124ead6445d63cd162e06af9c8749db29d385ad9dd2f921faeb864ad25257ebc4c73e70c1130f9cd2be1a64b1e4a9aa
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.14.0-r2.ebuild b/x11-misc/sddm/sddm-0.14.0-r2.ebuild
deleted file mode 100644
index f3ac6dba4c95..000000000000
--- a/x11-misc/sddm/sddm-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,86 +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.xz"
-KEYWORDS="amd64 ~arm x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit +pam 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 )
-	pam? ( sys-libs/pam )
-	systemd? ( sys-apps/systemd:= )
-	!systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-
-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"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch"
-	# fix for flags handling and bug 563108
-	"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-	"${FILESDIR}/${P}-avatars.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-		fi
-	fi
-}
-
-src_prepare() {
-	use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PAM=$(usex pam)
-		-DNO_SYSTEMD=$(usex '!systemd')
-		-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
-
-	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
-		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
-		if [[ -z ${line} ]]; then
-			ewarn
-			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
-			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
-			ewarn
-			ewarn "session      optional      pam_ck_connector.so nox11"
-			ewarn
-			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
-			ewarn
-		fi
-	fi
-}
diff --git a/x11-misc/sddm/sddm-0.16.0-r2.ebuild b/x11-misc/sddm/sddm-0.17.0.ebuild
index 26770167920d..9e7594ad238d 100644
--- a/x11-misc/sddm/sddm-0.16.0-r2.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0.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,16 +34,28 @@ 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}-Xsession.patch" # bug 611210
-	"${FILESDIR}/${P}-ck2-revert.patch" # bug 633920
+	"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+	"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
 )
 
+src_prepare() {
+	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() {
 	local mycmakeargs=(
 		-DENABLE_PAM=$(usex pam)