gentoo resync : 31.01.2018

12 files changed, 73 insertions, 531 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index aec8fb0dc227..1629ed7c4070 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index b3dcec7989d6..9e032646b001 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,10 +1,8 @@
-AUX elogind-226.4-docs.patch 355 BLAKE2B 6e2ffcfe0e4b8d8822cb41133302757cc02c09298dd53cb4eb277b3e3200764f6beb90d4a702870e00d0ff5338cb5a0a7d228a563a6f9c51fb340e4c63650a59 SHA512 dc942f190ea2064e194808db7c6ede618d536778f1b574658ddb9c0aa4a106f6129cc18000eaa63aeca1b16ad28fe5f5dbee441bd93436ae62eb4740236f94ae
 AUX elogind-235.1-docs.patch 714 BLAKE2B 93271996cbff4cc8f1cb222c83672f491d3473839fffea4818e7a7341fdb0060de23cca70576d81d0c6783fc796d998b0b70a38237ec7ab14dd8e2521659d49e SHA512 2e530aa318d3ba0de3a1fceb4d8316f8215e1a8d769b077cf4b223ae2f8103c62c2852dd3fd45540646ad6272b0edbb4b23d70a379a2601765c61b4d78b4d81e
+AUX elogind-235.2-drop-logintest.patch 451 BLAKE2B 61c25c176fd85786d899b34831c320e364b91e8f250c323caf1a5badb531cd58281ef5ac43347a4b94f44e7a40232d5cfded4c3ee7a113cbfd440bc24b13fbd9 SHA512 9017ceb04a779dbc5a2dbc5f1fa4c412d8538626696815f9a6ace3acb4c7d3dc1ca7685292b02483a2f80bc6685769efc853dcedd0e71e13bdbd324bb16ceafe
 AUX elogind-235.2-legacy-cgroupmode.patch 2527 BLAKE2B de50970f6c930b2ff35f6ecc4119e06abb23cbc02fcdb649930258b717ab05cb5b4b1ad8de1e89da705c8a1b66093eedba984c0a831fd60cef3d9704e09c6161 SHA512 1c98981db6efc6afb779aef93fd4cd7ba31a1995d74d1edea9b486c4724fe7bc215df95745a3553324750794530466679cbde491bf01ed5bab99a20eda135bb2
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
-DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e
 DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
-EBUILD elogind-234.4-r1.ebuild 2904 BLAKE2B 01348724ce12ee709bf444794544e1cd15a9b97a976f50c41f0686ad82d935f99a12f081481c22e0dfaf63c99426ec63961b1aa7bee926b377744b7bf09a247d SHA512 dfd1fa283a1110092b32bec7ec6627b3819c44242de6387eac9abbac457f11fe31bb93f76852fbfd1a88e646273eccd884fc90b353cec718f82dbd1ea8759982
-EBUILD elogind-235.2-r1.ebuild 3486 BLAKE2B 53d22fc4d4a6a0d9d44e5f21f74ca1750702c259025fef3a57d6fb821c9bdb47a5dcf61f366c4e7110a579bd673aca91148a22f2c3ff159031a32b79f58718a6 SHA512 8f944e79cd223e81ffd7e10a876417f130056f4b6b4771c5a967013e864d9cdbb7aad4ca9bdcfb3c16f674f377c736333f2c5a6fdd5824ff4650e2cbb46cbab7
+EBUILD elogind-235.2-r1.ebuild 3482 BLAKE2B 074d2cb004f73706a8741aa0a9ed9487b6d46af554323111e72818bed98e30c74a6807b5498a65e1a750038b2148cd2dee10e181a0577ad93c8668eb61adba3a SHA512 8be1cc4c9af68def30591f9971a82a39cdab2e7ed9cede69a3f34bb4876e1ca78d0b95e4264e726b7126440d84aa9716abdda564a6c1d0d777f5e793b6ac63f6
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-234.4-r1.ebuild b/sys-auth/elogind/elogind-234.4-r1.ebuild
deleted file mode 100644
index c56a5360fee2..000000000000
--- a/sys-auth/elogind/elogind-234.4-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info pam udev xdg-utils
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="acl debug pam policykit selinux"
-
-COMMON_DEPEND="
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/libudev:=
-	acl? ( sys-apps/acl )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	dev-util/intltool
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-PDEPEND="
-	sys-apps/dbus
-	policykit? ( sys-auth/polkit )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" )
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf # Makefile.am patched by "${FILESDIR}/${P}-docs.patch"
-	xdg_environment_reset
-}
-
-src_configure() {
-	econf \
-		--with-pamlibdir=$(getpam_mod_dir) \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--with-rootlibdir="${EPREFIX}"/$(get_libdir) \
-		--with-rootprefix="${EPREFIX}/" \
-		--with-rootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \
-		--enable-smack \
-		--with-cgroup-controller=openrc \
-		--disable-lto \
-		--without-kill-user-processes \
-		$(use_enable debug debug elogind) \
-		$(use_enable acl) \
-		$(use_enable pam) \
-		$(use_enable selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	if [ "$(rc-config list boot | grep elogind)" != "" ]; then
-		ewarn "elogind is currently started from boot runlevel."
-	elif [ "$(rc-config list default | grep elogind)" != "" ]; then
-		ewarn "elogind is currently started from default runlevel."
-		ewarn "Please remove elogind from the default runlevel and"
-		ewarn "add it to the boot runlevel by:"
-		ewarn "# rc-update del elogind default"
-		ewarn "# rc-update add elogind boot"
-	else
-		ewarn "elogind is currently not started from any runlevel."
-		ewarn "You may add it to the boot runlevel by:"
-		ewarn "# rc-update add elogind boot"
-	fi
-	ewarn "Alternatively you can leave elogind out of any"
-	ewarn "runlevel. It will then be started automatically"
-	if use pam; then
-		ewarn "when the first service calls it via dbus, or the"
-		ewarn "first user logs into the system."
-	else
-		ewarn "when the first service calls it via dbus."
-	fi
-}
diff --git a/sys-auth/elogind/elogind-235.2-r1.ebuild b/sys-auth/elogind/elogind-235.2-r1.ebuild
index eb33bb294c41..f2e8d0611a39 100644
--- a/sys-auth/elogind/elogind-235.2-r1.ebuild
+++ b/sys-auth/elogind/elogind-235.2-r1.ebuild
@@ -42,6 +42,7 @@ PDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-235.1-docs.patch"
 	"${FILESDIR}/${P}-legacy-cgroupmode.patch"
+	"${FILESDIR}/${P}-drop-logintest.patch" # bug 645156
 )
 
 pkg_setup() {
@@ -58,10 +59,8 @@ src_prepare() {
 }
 
 src_configure() {
-	local emesonargs cgroupmode rccgroupmode
-
-	rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
-	cgroupmode="legacy"
+	local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
+	local cgroupmode="legacy"
 
 	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
 		cgroupmode="hybrid"
@@ -69,28 +68,29 @@ src_configure() {
 		cgroupmode="unified"
 	fi
 
-	emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${P}" \
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" \
-		-Dpamlibdir=$(getpam_mod_dir) \
-		-Dudevrulesdir="$(get_udevdir)"/rules.d \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		-Drootlibdir="${EPREFIX}"/$(get_libdir) \
-		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \
-		-Drootprefix="${EPREFIX}/" \
-		-Dsmack=true \
-		-Dman=auto \
-		-Dhtml=$(usex doc auto false) \
-		-Dcgroup-controller=openrc \
-		-Ddefault-hierarchy=${cgroupmode} \
-		-Ddebug=$(usex debug elogind false) \
-		--buildtype $(usex debug debug release) \
-		-Dacl=$(usex acl true false) \
-		-Dpam=$(usex pam true false) \
-		-Dselinux=$(usex selinux true false) \
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" \
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${P}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
+		-Dpamlibdir=$(getpam_mod_dir)
+		-Dudevrulesdir="$(get_udevdir)"/rules.d
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		-Drootlibdir="${EPREFIX}"/$(get_libdir)
+		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
+		-Drootprefix="${EPREFIX}/"
+		-Dsmack=true
+		-Dman=auto
+		-Dhtml=$(usex doc auto false)
+		-Dcgroup-controller=openrc
+		-Ddefault-hierarchy=${cgroupmode}
+		-Ddebug=$(usex debug elogind false)
+		--buildtype $(usex debug debug release)
+		-Dacl=$(usex acl true false)
+		-Dpam=$(usex pam true false)
+		-Dselinux=$(usex selinux true false)
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
 		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
 	)
+
 	meson_src_configure
 }
 
@@ -104,9 +104,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "$(rc-config list boot | grep elogind)" != "" ]; then
+	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
 		ewarn "elogind is currently started from boot runlevel."
-	elif [ "$(rc-config list default | grep elogind)" != "" ]; then
+	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
 		ewarn "elogind is currently started from default runlevel."
 		ewarn "Please remove elogind from the default runlevel and"
 		ewarn "add it to the boot runlevel by:"
diff --git a/sys-auth/elogind/files/elogind-226.4-docs.patch b/sys-auth/elogind/files/elogind-226.4-docs.patch
deleted file mode 100644
index 4161f6331253..000000000000
--- a/sys-auth/elogind/files/elogind-226.4-docs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.am	2017-02-16 13:22:56.764985896 +0100
-+++ b/Makefile.am	2017-02-16 13:23:04.998986057 +0100
-@@ -194,12 +194,6 @@
- bin_PROGRAMS =
- rootlibexec_PROGRAMS =
- 
--dist_doc_DATA = \
--	README \
--	NEWS \
--	LICENSE.LGPL2.1 \
--	LICENSE.GPL2
--
- @INTLTOOL_POLICY_RULE@
- 
- # ------------------------------------------------------------------------------
diff --git a/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch b/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch
new file mode 100644
index 000000000000..45f17f1b843a
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch
@@ -0,0 +1,17 @@
+--- a/src/test/meson.build	2018-01-15 20:34:18.000000000 +0100
++++ b/src/test/meson.build	2018-01-31 15:11:33.342989914 +0100
+@@ -868,10 +868,10 @@
+ #          [],
+ #          [threads]],
+ #endif // 0
+-
+-        [['src/libelogind/sd-login/test-login.c'],
+-         [],
+-         []],
++# Broken in chroot; needs elogind at runtime?
++#        [['src/libelogind/sd-login/test-login.c'],
++#         [],
++#         []],
+ ]
+ 
+ #if 0 /// UNNEEDED in elogind
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 444550e6a579..4c7077bc8411 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,7 +1,4 @@
-DIST keystone-11.0.3.tar.gz 1373880 BLAKE2B e68ff166f726a01135050c97cde71ff58294350d14992512f61c2fe78111e5135fc69540e8031950daa5bd16602854e8dcb1a8734f000ff2b261232d3b5db99b SHA512 0468a834b1a44b27f4747aeb580f17f68b7dce0ee0cbc3693355d66e9c46383b7ad3a769b3ffa0146fac9b45a75c8a2c95aad0df4825d2be33cadb2cf6b1a659
 DIST keystone-12.0.0.tar.gz 1491044 BLAKE2B ebe5fd423509e94d636e303825ac499cf9017a616971654ee52dead111b0fdc76379cf24554c7dd115b1d1a65b081e6931bd890613736f6bffe75e8628f94f7a SHA512 7b7e6cb56b9d22e92834ccfb31dcd6d28d7318e2d8160da93cbc48cdb72aa626021db5b38068ca76caae88e68204c3650f7ce728bc8e1791df8fc8d36072483c
-EBUILD keystone-11.0.3.ebuild 5473 BLAKE2B 1cc364868afc40043a0e80520670cf9cc01292b31372789ad8dd7c31bb5010d0d138d87ddec29fb81aef40416f196107e13b34a466e1814ec322393cee10b76c SHA512 1d306f843004818a452e393fe2af92159fd4ac9e36afe1efdb796167d0a343eddf56f852126c5eb9b985ebff77819babec95f54f3660292db2f7b4534fc81233
 EBUILD keystone-12.0.0.ebuild 6199 BLAKE2B 59f0e4674e3239cd3f5b83f883504f3c16044807cf049452fbdf8eb95ba0f89ee26c574c8dc924b58b9cc2a8490f215a55693f8b54735d1302cb49e7e5bef114 SHA512 9cd8d4a2255a94d4c3278077eecd3efdc747d3477d3f77b6a645746810aeede13600358dace03692a33704df766fa550daea654950b59865669b44e67c489ed3
-EBUILD keystone-2017.1.9999.ebuild 5492 BLAKE2B 8136ef4e3329c773c507179e0c281d94b2a6565d738c5c0b43018537c693d7aa3a03b66520ca887a9476bb91ff6866157fdd2877c3108b38caeae4fc36303057 SHA512 b78f56f4efd9234610854835791dc13a9f7a17fc3f317ccbd89b56a1478b32d4218ae42f08de06fdbb55d62b2b240bc3d43e047237be02878e8597cd0e299305
 EBUILD keystone-2017.2.9999.ebuild 6215 BLAKE2B 2d83dc144c4efcda8a7e0fa8f97e92e46749f04c54fa43acca2ae7eb36bee1a5d90729625f593c977be7d428a65723dbcbe6432d88e3df7359df863c47393dd2 SHA512 9d7b9a175f1f4ba214ecea842f8e0694584023f151596de5b771f59a673cbde3835dee5dd71e947a2a64deeb44cc90e0c348ad7a8927c920767891f7271b1357
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-11.0.3.ebuild b/sys-auth/keystone/keystone-11.0.3.ebuild
deleted file mode 100644
index 2b7157997711..000000000000
--- a/sys-auth/keystone/keystone-11.0.3.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	memcached? (
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
-	)
-	|| (
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-		www-apache/mod_wsgi[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
-	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates etc/policy.json
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/*
-
-	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-auth/keystone/keystone-2017.1.9999.ebuild b/sys-auth/keystone/keystone-2017.1.9999.ebuild
deleted file mode 100644
index a84d72776540..000000000000
--- a/sys-auth/keystone/keystone-2017.1.9999.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 git-r3 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-EGIT_REPO_URI="https://github.com/openstack/keystone.git"
-EGIT_BRANCH="stable/ocata"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	memcached? (
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-	)
-	mongo? (
-		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
-		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
-	)
-	ldap? (
-		>=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
-	)
-	|| (
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-		www-apache/mod_wsgi[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
-	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates etc/policy.json
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-	insinto /etc/keystone/httpd
-	doins httpd/*
-
-	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-auth/yubikey-personalization-gui/Manifest b/sys-auth/yubikey-personalization-gui/Manifest
index 92b1037f4d0d..f16c38a3aed4 100644
--- a/sys-auth/yubikey-personalization-gui/Manifest
+++ b/sys-auth/yubikey-personalization-gui/Manifest
@@ -1,5 +1,3 @@
-DIST yubikey-personalization-gui-3.1.23.tar.gz 1450340 BLAKE2B fb183d939334b13faf1464dc65a0a03180a2b402ae628f556dba7211e66e89628718e797a86189f654ca88225c3b834df67b497e7a94d0e210edc433bfff49b8 SHA512 912bcbcac5cad285c43995f646de6aa68cc99a4d047b7632786cd93e38c031e2fb8dcc4f57f45647ba3e276de03aaea6ed9757f72ec2c42a43780c19edcca51b
-DIST yubikey-personalization-gui-3.1.24.tar.gz 947135 BLAKE2B 846fa6792c71b57ffb99c548efe6780571c1d52061393805f0f9a76a7e7722b3fc2851ead913b09028d7798ae7bab4670260cae63a98ef0c0d1b176266fa4338 SHA512 149237a719277a6571916473d31e6099c3f3a2003fcb2893c2becee80788102496dbbc8e424f75fe1f1dd3ac87122bd35b6908cf784458635069d89e7e706cfa
-EBUILD yubikey-personalization-gui-3.1.23.ebuild 962 BLAKE2B 68cfa79fe91cf4bac7496088f3a827539d265d54ecc13d9059cc47cc9e6a894e4ebb5e446001818dda315fd014fa7267bae080873c44298f369da3c2959353de SHA512 4fd6c55a5b145fc94db852da55d43c2f407bf5132f7a4b326831645138c8a6e61b37b5c76b648de540c279213e71b3048ec0464d0292e6e0c7ad487271340b84
-EBUILD yubikey-personalization-gui-3.1.24.ebuild 962 BLAKE2B fb8c2df8960de0fd74527e7cdbdd908f36adcb4901f5bf3b7528c95c51c1de137fd33c9695a0d96e6077cec030423dbe3b82b2fd88b048f9b093b92d625bfac0 SHA512 9b505329e8ff92e42cc9dfe11d9c90ce270442670dc131ef975d04288b438387ec9a1244e6fbc73b57f48c770e7955c1bd3947aa102d4f924c1518e8915c9059
+DIST yubikey-personalization-gui-3.1.25.tar.gz 942121 BLAKE2B edc581824f917b50664dd758a0447fa9a61c85844cd220d82661c9e1f1bbabc1bda77545c1eda2e56a43b8176479c1b161f8e9ad5feb3d61cdc37d301ebde9fc SHA512 6d45c2a9e9c452a44fba5ff3830150ce65e968899215c59fd7b412317143015c466ac706dcfa49def2c4304a01866a3674ba7cc37e47dff4e8c6acb8166fcf45
+EBUILD yubikey-personalization-gui-3.1.25.ebuild 1200 BLAKE2B 0eb335368f59ef82af5e429b75d9bc7b17d54d156c0583b67810a2131458f4a2e16a8239ee20ee3bdb9267e8f0fb9ae3716b2032d45e5c2b3d20ee0e6c26ef4a SHA512 bf8fc0315874c105117e1167ca0d9e2a7cc3156b6ab1a5febf3e8d1df35abaf007edac5ff8486535bcc17a9d8695b793c54b2b802f315644cc2ec2f6a5276d24
 MISC metadata.xml 404 BLAKE2B 2e7d7a0725118ddda15c0f1135febdbe12395a686eda48ce921c4beacd0e5479c75cd6eaa29c252047e827623e6cb81327ef2402e81c78376d1d5f93b0463c1a SHA512 bbd668995dcf6b8e44b498dc152349ccc9c534047fd46e6364cce6ca0f0689e396064466c9f49cc170e832b8681f98f096f43bb5da423e1065cfd019da3c1b12
diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild
deleted file mode 100644
index 3e2afce422b9..000000000000
--- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.24.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="GUI for personalization of Yubico's YubiKey"
-SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz"
-HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui"
-
-KEYWORDS="~amd64"
-SLOT="0"
-LICENSE="BSD-2"
-IUSE="debug"
-
-RDEPEND="
-	>=sys-auth/ykpers-1.14.0
-	>=sys-auth/libyubikey-1.6
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	dev-libs/glib:2
-	virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS README )
-
-src_configure() {
-	eqmake4 YKPersonalization.pro
-}
-
-src_install() {
-	dobin build/release/yubikey-personalization-gui
-	doman resources/lin/yubikey-personalization-gui.1
-	domenu resources/lin/yubikey-personalization-gui.desktop
-	doicon resources/lin/yubikey-personalization-gui.xpm
-	doicon -s 128 resources/lin/yubikey-personalization-gui.png
-}
diff --git a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
index 9f4e92b51485..e3c1da150af0 100644
--- a/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.23.ebuild
+++ b/sys-auth/yubikey-personalization-gui/yubikey-personalization-gui-3.1.25.ebuild
@@ -1,34 +1,46 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils qmake-utils
+inherit desktop flag-o-matic qmake-utils
 
 DESCRIPTION="GUI for personalization of Yubico's YubiKey"
-SRC_URI="http://yubico.github.io/yubikey-personalization-gui/releases/${P}.tar.gz"
+SRC_URI="https://github.com/Yubico/yubikey-personalization-gui/archive/${P}.tar.gz"
 HOMEPAGE="https://github.com/Yubico/yubikey-personalization-gui"
 
 KEYWORDS="~amd64"
 SLOT="0"
 LICENSE="BSD-2"
-IUSE="debug"
+IUSE="debug test"
 
 RDEPEND="
-	>=sys-auth/ykpers-1.14.0
-	>=sys-auth/libyubikey-1.6
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
 	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=sys-auth/libyubikey-1.6
+	>=sys-auth/ykpers-1.14.0
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS README )
+	virtual/pkgconfig
+	test? ( dev-qt/qttest:5 )"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	if ! use test ; then
+		sed -i YKPersonalization.pro \
+			-e 's/src \\/src/' \
+			-e '/tests/d' || die
+	fi
+}
 
 src_configure() {
-	eqmake4 YKPersonalization.pro
+	append-cxxflags -std=c++11
+
+	eqmake5 "CONFIG+=nosilent" YKPersonalization.pro
 }
 
 src_install() {