9 files changed, 49 insertions, 171 deletions
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index bd5f96c366bf..2afd8d83f78b 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 34563728e87f..5d2359e6746f 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -10,7 +10,6 @@ DIST nss-pam-ldapd-0.8.14.tar.gz 508949 BLAKE2B ad8532bf86ef93c62394b91b7c3c035d
 DIST nss-pam-ldapd-0.9.8.tar.gz 771247 BLAKE2B bef3e5ede2b4747277ee400dfa8be620281e4e2a596acff236008e1f0bf6b79d6e309a4ca4bad852f6b0a8f79888cffcfffe09ddea8fde8e53b8450a894598eb SHA512 f0d24afd4cb5cea8155aa719b598448d3d81a896f7bc431f7d73e0617a7b2aa7e0ceb6de0b50163848c5554d96a3c415226e32a92e64ed91772fec4c64ad135b
 DIST nss-pam-ldapd-0.9.9.tar.gz 772059 BLAKE2B 0c1da79d58f19f0c310c0589ca9f286a73ada025028d1a00df938d40dd1211f4dd5ba694de94a37a3596b64b5f8a511127c359a86a60271eb091082dec69e6bb SHA512 8148467523003da397d03b70bb01e52dbc63b0528540aea1d85f6af2ee8af69300e107617b69608397b210e825a2351cfd61b88c4fa146d2e8e9fb9c5cd358e3
 EBUILD nss-pam-ldapd-0.8.14-r2.ebuild 1997 BLAKE2B e46a35f959259a7d1236599c184a6f29f77f46dfb9fe5faa88dd6921c4ea9c005578fa0df10024e5fa5ba786f03d09498f60897212cda3b1ccefd60d24d0a225 SHA512 c9991819449891bc75b941388345871bc047f3f2202569265d9075ba6bd6bc095aca494f22f3411c59197f9401d0d0b109929ad2d0e287d2094c736aa2bcd8d4
-EBUILD nss-pam-ldapd-0.9.8-r2.ebuild 4177 BLAKE2B b27cbfaf81b7eb4b4e4fbbf0437e5e94455521ee8260b93996e25591eed2be721e9e35e71a7e37c3f0b78b4f09fc55087d38cdafcfda7fecb6eadcfae76b86eb SHA512 49c3933587dfa82f93502985dca355f3d311df3b887aac26fee83060d7b68cb317874b378aff13ea7b22782d34a45bab3d98915fa03c43af258bbbcf879ac7c4
 EBUILD nss-pam-ldapd-0.9.8.ebuild 3335 BLAKE2B c159de78ac105c9a24862da7b726c615a17a46dd6d2e3b770d1bd8a6052027c3652b35521b35901a09f0ffbe8e1528ba019c3178e29a39d52ea817a068fe111c SHA512 e7d4c7a05f10d4fb3d3f7ec5a570a63eec8b7adeda6e3474f5a54112d3112495a837c19f78f03db410c79978002e91cb76bd254abd99edcf8d17c5af9f1d5833
-EBUILD nss-pam-ldapd-0.9.9.ebuild 4177 BLAKE2B e8227007ad01eca6732f962a133febb1845ac31ea0a291485dae38fbce431f0eb672e5535e1f2bdcbd7b0c383aaa0b5e5cb40633f560cf32e239a59d498568c7 SHA512 375edff3a961f927cb6894b70919c86d78576639d749321f9aababe7cb876b23e66cf0495db4920dd061d6271a1fbbf51a38658662256979cc0dce47a9d6f2a4
+EBUILD nss-pam-ldapd-0.9.9.ebuild 4175 BLAKE2B 7cc1d8ccbb135ec1acb241a772fb61437589e5fe2e25a95dcad2e7bcf5d303eed913784864031eb1f1113baa155a843145e34ba1411d491ce0f873cf38708af5 SHA512 3eeb621027bde4da7372536125f8cf6ef84dac2ecc6b2b554b4191f01f228505fc44e2251332501a5d8e1ac2bfa115d0722ea03ca1a63af39800c58524d24099
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8-r2.ebuild
deleted file mode 100644
index d286f5f9a46c..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.8-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos +pam pynslcd sasl test +utils"
-
-COMMON_DEP="
-	net-nds/openldap[${MULTILIB_USEDEP}]
-	sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	virtual/pam[${MULTILIB_USEDEP}]
-	utils? ( ${PYTHON_DEPS} )
-	pynslcd? (
-		dev-python/python-ldap[${PYTHON_USEDEP}]
-		dev-python/python-daemon[${PYTHON_USEDEP}]
-	)
-	!sys-auth/nss_ldap
-	!sys-auth/pam_ldap"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)
-	sys-devel/automake"
-
-REQUIRED_USE="
-	utils? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} pynslcd )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch
-	"${FILESDIR}"/${PN}-0.9.8-pynslcd-module-paths.patch
-)
-
-pkg_setup() {
-	enewgroup nslcd
-	enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_prepare() {
-	cp pynslcd/pynslcd.py "${S}" || die "Copying pynslcd failed"
-
-	default
-	use utils && python_setup
-	touch pynslcd/__init__.py || die "Could not create __init__.py for pynslcd"
-}
-
-multilib_src_configure() {
-	local -a myconf
-
-	myconf=(
-		--disable-utils
-		--enable-warnings
-		--with-ldap-lib=openldap
-		--with-ldap-conf-file=/etc/nslcd.conf
-		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
-		--with-nslcd-socket=/run/nslcd/socket
-		$(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc')
-		$(use_enable pynslcd)
-		$(use_enable debug)
-		$(use_enable kerberos)
-		$(use_enable pam)
-		$(use_enable sasl)
-	)
-
-	# nss libraries always go in /lib on Gentoo
-	if multilib_is_native_abi ; then
-		myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
-		myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
-	else
-		myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
-		myconf+=("--libdir=/$(get_libdir)")
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	local script
-
-	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-	newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
-	s6_install_service nslcd "${FILESDIR}"/nslcd-run-s6
-
-	insinto /usr/share/nss-pam-ldapd
-	doins "${WORKDIR}/${P}/nslcd.conf"
-
-	fperms o-r /etc/nslcd.conf
-
-	if use utils; then
-		python_moduleinto nslcd
-		python_foreach_impl python_domodule utils/*.py
-
-		for script in chsh getent; do
-			python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
-		done
-	fi
-	if use pynslcd; then
-		rm -rf "${D}"/usr/share/pynslcd
-		python_moduleinto pynslcd
-		python_foreach_impl python_domodule pynslcd/*.py
-		python_scriptinto /usr/sbin
-		python_newscript pynslcd.py pynslcd
-		newinitd "${FILESDIR}"/pynslcd.initd pynslcd
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
-	systemd_dounit "${FILESDIR}"/nslcd.service
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use pynslcd; then
-		python_moduleinto pynslcd
-		python_foreach_impl python_domodule pynslcd/*.py
-	fi
-}
-
-python_test() {
-	PYTHONPATH="${S}" emake check
-}
-
-multilib_src_test() {
-	pushd "${BUILD_DIR}"
-	ln -s ../pynslcd/constants.py utils/constants.py
-	python_foreach_impl python_test
-	popd
-}
-
-pkg_postinst() {
-	echo
-	elog "For this to work you must configure /etc/nslcd.conf"
-	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
-	echo
-	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
-	elog "start it like this:"
-	elog "  # /etc/init.d/nslcd start"
-	echo
-	elog "You can add it to the default runlevel like so:"
-	elog " # rc-update add nslcd default"
-	elog
-	elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
-	elog "to supervise this service."
-	elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
-	elog "default runlevel instead of nslcd."
-	elog
-	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
-	elog " is now named /etc/nslcd.conf"
-	echo
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild
index 7b25079038a8..bdec7ea6e243 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug kerberos +pam pynslcd sasl test +utils"
 
 COMMON_DEP="
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index 7490cc2b0928..dbe776b6cf83 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,3 +1,4 @@
 DIST polkit-qt-1-0.112.0_p20160416.tar.xz 64540 BLAKE2B fbc3631585801f42ff92324576a2bd82d61aa5b24317f95e1182c300073a8e746007fa3409127a50d7d3433c5092f56d72e2e579683d08145067d4424c4dfe7e SHA512 90677af780a2bbcb33b6a54702ba96f965eb8561f2636af7aa0146f9b2450f9e89f67e022ffa99742afe50e3d1f570eabfad686e9e08e629a1e662d9f5abf2ea
 EBUILD polkit-qt-0.112.0_p20160416-r1.ebuild 1392 BLAKE2B b9b73020401d1a1bd79479d252a2de367b254d6f9d6d844e20a84ff4a0f13f5d591253dc486f9c6d037b0a52bf7106fa32ab6101dd1c742e520b3b0a5e5da636 SHA512 a1ddb1a1b0294dbc95f804e441691577c4b244325b81228d0c582cfd8576accee79f5b171e7d13ddf62f0f75686d07fddd585cbe0073f1d914f7ad6144624e70
+EBUILD polkit-qt-0.112.0_p20160416-r2.ebuild 829 BLAKE2B 7746da664b6f5b714b1772427220085c2921c183719a79d8c25ebdda53d2dbdb11a9b4e22102f41aebd1f3c9ce8bc1137c86faf17ec329b5bf5eee9ee656efc6 SHA512 aeccdb91684b6f8ba4fd9b9b2b8250e3d223f1a08055d07582825de5976c08e0042f693f8bed92932166cd1bca5c635da0152065b449b44ee88eda3a8474e2d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
new file mode 100644
index 000000000000..e909e08a5bfd
--- /dev/null
+++ b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/qt/qt-1}"
+inherit cmake-utils
+
+DESCRIPTION="PolicyKit Qt API wrapper library"
+HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
+SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug examples"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=sys-auth/polkit-0.103
+	examples? ( dev-qt/qtxml:5 )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README README.porting TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DUSE_QT4=OFF
+		-DUSE_QT5=ON
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sys-auth/rtkit/Manifest b/sys-auth/rtkit/Manifest
index 425c30aef9e3..4d141a0a0e64 100644
--- a/sys-auth/rtkit/Manifest
+++ b/sys-auth/rtkit/Manifest
@@ -2,6 +2,6 @@ AUX rtkit-0.11-controlgroup.patch 528 BLAKE2B 2b8d61a1f6705c76015332ecf87a8d940c
 AUX rtkit-0.11-gettime.patch 744 BLAKE2B a32bf8db977a473a005d0890b7b6064c0ef8769cdaf42a46bab5d43d5f62adec1f3896a5a6a110eaf3d146e2075304fbba692630c4ee3e1b58a07b1168776743 SHA512 b9207e1be512689e3896587105d135ab686d4eb1dd8c2e0feb62ca73eed2a8e1e473826e82b06bf240f26c64975b9793cd407cf6493a8f7eb6946da17198059c
 AUX rtkit-0.11-polkit.patch 2074 BLAKE2B 4530c423c62b1fae601a16271e8de829d9ee5e1b4f147867694de707ae24965ef4aa6864f3981ee0c4084e6652dcd418d651920887509eee2d3c8a4ae3d68d59 SHA512 cc4cb9879235398f828c16951e380e0456c9e5bbd5acc2a0968153c5ce361fd1aceeeeac8ab873c21c0556c5d4677cdad8ed9e23dd3b9b5a8a73cf9264ee5a4b
 DIST rtkit-0.11.tar.xz 126748 BLAKE2B e989f1fb9e33c2e06d7eedbe0aab45982d458b6a80aa8ba9b05ae94ed048ef1351d30f8800859a08d8bb0a53891e7b63f6bda6308b4521da10a61182ca3921f9 SHA512 4641af965dc64c0f498ae469fbee1ceb337204fa7d778fbbb41f2b5c5e88947e633c7e9ad037274fdd778c3c097a4a1dbb0b2add287d74eccbcd2d357cb2da22
-EBUILD rtkit-0.11-r1.ebuild 950 BLAKE2B 4ec6a6156d10441ae10dc866a003d939f8d744cfee00f22b284e51877cdf70d7167ec5dcc12dffa32944fa7022f9899730c97b9ed05b7ec18944e6625b7e4454 SHA512 7ea241a9f99d42c0af9873b1c6549f9ac7f90076944f93734974d1c39dc9c1e96c09e70b8a1c1f3739352fefe4800ca626ac45cf7e8cf7f6d0bfe302ccdcbc0a
-EBUILD rtkit-0.11-r2.ebuild 1343 BLAKE2B c2a45b350532aa1fe0a4313d5452e1848a2cb21e3ff0ea696d35b940edc5b27f9fef38d126ab961028aa9ed80d8e4aa403eb01b25e8f5c4829eeef5cad7fcf8a SHA512 a889e66f6a33a1b11ca6569e32f7e7ea10369f9531371949671845589af6914f30c2de6d30473e7d4d922b6b996911e4d8cd68397c686d9b308414b2961c4acf
+EBUILD rtkit-0.11-r1.ebuild 950 BLAKE2B 095fca5ccf3d98f55a13e17f0cbe9b9d323f76560005fb0c4977e687b638087dbec3c285b6c7c587bcce32504927b621ebb8576c38c7b9e5d1c6874320489c12 SHA512 a5c3f0e14787711bfdd826345cfec2ceb60dd708f95a6fdd81ed77f9ffb51bb10ba53819272ec7406fd2c28fd73ce1659e508c3669b1cb6267896dbdb3f17fb6
+EBUILD rtkit-0.11-r2.ebuild 1342 BLAKE2B 4ac3a9cd082ab0dfdc3196e12182cdb528f11f0ad169add7e94f3944e4646faba00d4e2d6afd61e753808b037ca99aece8e41761ce63319ec887b90089b3832f SHA512 4cd30f5dd4f5736d9a66a634aa4aeb2109b202bfe592a6d1bece3fce98a690fe9ef6836c1ca37f0d0689fb20fd14b16cb8e8accb9a2e5a0b69965fa8a1dec558
 MISC metadata.xml 455 BLAKE2B cc63fbcf541ef442091a8bd3f8b2da07f629b71778b0ece05a18617088de554f6f8ffdc1d4aeed4a73bb957c88b470fcec52781704800575b364a3d2164b3914 SHA512 90bde656e242fe6cd7b408671f419ee54f73a781b67ee9047c8cd06d7fb29fee2882aed7ab95b42f22fdb65570f389e04931f8fa24506307b1bc8387c213850e
diff --git a/sys-auth/rtkit/rtkit-0.11-r1.ebuild b/sys-auth/rtkit/rtkit-0.11-r1.ebuild
index dec2005a9526..4b8743fc02f7 100644
--- a/sys-auth/rtkit/rtkit-0.11-r1.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/sys-auth/rtkit/rtkit-0.11-r2.ebuild b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
index 96647b3425dc..cf79c89b989d 100644
--- a/sys-auth/rtkit/rtkit-0.11-r2.ebuild
+++ b/sys-auth/rtkit/rtkit-0.11-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sh sparc x86"
 IUSE=""
 
 RDEPEND="