Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

7 files changed, 4 insertions, 128 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index cf9937102124..6046072b7e8c 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index df85e94ba0e1..ec0c337a77f1 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -5,9 +5,7 @@ AUX elogind-236.1-docs.patch 791 BLAKE2B fd3c73c92c1a8d84216e68a19890af4acb269e6
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
-DIST elogind-235.4.tar.gz 1019339 BLAKE2B 728e6707f57f43acf9a40e127fe2e53389cbcba1c96b79f96b23dc7d2ffdc3c84efdd55905a22cbeae0442d9278fd1e9371904c2da8aa29c00f79b879522b2c6 SHA512 43a4a25219c234214b1541f17c4aec65847e62ebbeeb223c7890f6648a2ffadc8388e4c526ab49df9ff1f216160810c601c7609098b9b2955bc63142f684b16e
 DIST elogind-236.1.tar.gz 1050387 BLAKE2B d0d295210eb07374cae738f55b472d9410f68c9e7f318dd736b5fcb5c0409c3da144988d8042b1e3b103d34d7a02471b4e316a924c9b1640c605fc73972de3da SHA512 ab4989f4467ef001bb8b837035bee870beaf5ec5fa2389649bdcad2fe7bbf82691bfd3176cf9a3bf3b5c232c77210f431f2d38ebdbfd09f5a7868cd50e476c59
 EBUILD elogind-235.2-r2.ebuild 3274 BLAKE2B 01b8ed8c003382dc7eaf676a2b95493c442c673306405a832f174dabf025c0787daee1b98bfc584480f78b608fe4281a81b3ed554e14156d3c045ddee6c95da8 SHA512 f866e80c5631e3fae2269f5f12350e76a15ccea6186325319bc7c05ddade5cf0055761b6e01e068391fcda7dcff107437dbba31745a91ed04fefdd81f90c3402
-EBUILD elogind-235.4.ebuild 3248 BLAKE2B ea8412e276879ad063cba63f3385d152464120344d041bc900370344d7a4233a3b3496f428cea8b91703e3b02383e0d0bc2cf00c5683188baadbb9a6acf0fc1f SHA512 12fd4d2a03049406ed12d5c436b6386938e15b5a92b03114a4e1f76c7dd2671c5cbb5a613ac0fb5455cf2d472f287b7bb0344135ef4fb66739381d3da779b6ea
 EBUILD elogind-236.1.ebuild 3116 BLAKE2B bf36f5cc6d55be2443f08bc70fe6a94ab6af175b66491e39676ff7fe868bd95a45efbac4d17facac75a2fa8ea096cbcc12bffc251ce80206ff05f9513a11c7cb SHA512 7f3f17016a3528ea5e7e0550e006cbce0ca5dc438438b6c8c8afd330e788fe18398fd959e65f248b10e894a4898c4d2c2b3dac4fb9f505b107298ac8ec17c004
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-235.4.ebuild b/sys-auth/elogind/elogind-235.4.ebuild
deleted file mode 100644
index c2dbf0ad0277..000000000000
--- a/sys-auth/elogind/elogind-235.4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info meson 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 doc +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}-235.2-docs.patch"
-	"${FILESDIR}/${PN}-235.2-drop-logintest.patch" # bug 645156
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
-	local cgroupmode="legacy"
-
-	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="hybrid"
-	elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="unified"
-	fi
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/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}/"
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
-		-Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		-Dman=auto
-		-Dsmack=true
-		-Dcgroup-controller=openrc
-		-Ddefault-hierarchy=${cgroupmode}
-		-Ddefault-kill-user-processes=false
-		-Dacl=$(usex acl true false)
-		-Ddebug=$(usex debug elogind false)
-		--buildtype $(usex debug debug release)
-		-Dhtml=$(usex doc auto false)
-		-Dpam=$(usex pam true false)
-		-Dselinux=$(usex selinux true false)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-
-	meson_src_install
-
-	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
-		elog "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
-}
diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index a48a34d3dbaa..5a3a4af98c7c 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -6,6 +6,6 @@ DIST nss-mdns-0.11.tar.gz 382059 BLAKE2B 5523c76d6f7364efde54b9bf303dfdf34c11b96
 DIST nss-mdns-0.13.tar.gz 380261 BLAKE2B 555b7b9df8ff15da423712fac04ccbc303395d38a07121906cf31871a8684c71e43809b80674a489d87397902a33f4d19b0ae49a4c384290bad227a24880476f SHA512 f1b379111fb758323179ea3e447d754e934308940b11a8402dfb6033264940d831266d15ae1ee0badfecd5cdc7f589b42e4363dfc058f5e62026017d97eb0a3b
 EBUILD nss-mdns-0.10-r3.ebuild 1689 BLAKE2B 4050f59ac44f5a510f9a7beb3be44e609d8a40bb0e54fe43c2c48ec2f128fe5d1467a23343d7029953eff93a230175c20339005e879160b1147f8044bd41d413 SHA512 f10e8583fd7624dcddcd17c17bdd5c375f22903a21e4c595bb5f7a447a5e92abbafda9f549b3f3acb8c387451b10765f4f826340484003000f04762e3732eb5b
 EBUILD nss-mdns-0.11.ebuild 1667 BLAKE2B 35aea7515b9117cacc47f8680886d5d60e63752515712ba654655e127f40e4fdf40fc8ac6967e85d01e8b32e6894b84358d344faf95b5eb199c9fb7dcd9b6fa7 SHA512 4b4f9c48ea0bb498061b98f3add9b06b148e524140b798f3ac0b3a60e830a084506231118cbf3cfd3f7d3795b7c43e9e3dfe036713a03f45b4d8dd694549eace
-EBUILD nss-mdns-0.13.ebuild 1646 BLAKE2B 375d1bc9377294c02600c430682237cdae1bd57167270339d30c799acd99122a8fcf79fe9a9869202c08c719c343d81727d59b2f5525be00a0713554eed79ae6 SHA512 5950f6e4bb995b5bf9cd62fdcad1bea4cd6b2ba210f9ec6ad2e560894d97e8d07dd0f4809a4ef74dc7ad8290386ffb471ec5307f31dd5fd93c8cfdf3876637fb
+EBUILD nss-mdns-0.13.ebuild 1647 BLAKE2B fd7b8f690b7f27dd7ab3593573963f0fa71b178035ef1edf66e75a6d9f886eb6e2e5c354bc453f0b78a6a5c369c7fd1e2a3cc19b64440b7d4107f17db615ba17 SHA512 b49b53ab68690a2b3062ae180bdd0d45a60f41fe2b5721330df4b6a5e40a43e952ae54e754d05980874b8038daf302bd9810dd74821dbe17a25e19017df25827
 EBUILD nss-mdns-9999.ebuild 1681 BLAKE2B 1ae2e683def7ecd909d010611439201c6eb3827fcc7ead3c7b6229165413f725611061deec56e31cf19682a572afe2510c58591f4a6120043a4893ca4d50abd8 SHA512 edcc52347c4d4c1abd751be2b2f8965d7153ee087ca280acc2baa875e6f50f58460dd2c419e04f35d47bfca33cd8bfdc57be741193c5b2ce2125389a4246356a
 MISC metadata.xml 795 BLAKE2B 9237e6e6cc772633d1e45db608880c8bf112a361a2914ccc8f413020d31905d10e5822c922659bd500072f47580c63c94a68f54171a259ae3dc28b0b17499387 SHA512 912e8a154a0672a58bd89ee1f52efd8d43cfbeff1f1c40def47d6bd7600fb9b74e1b11dd633ea1ad6f75ef9ae9979ac5b741cfd5df97ea6b0055b060df33c977
diff --git a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
index 71be0028179c..290b9b38b6db 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index a03549af16e8..327631ea7312 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -3,5 +3,5 @@ AUX pam_mysql-0.7_rc1-memleak.diff 274 BLAKE2B 9efb6d3c3be48c470f91f8cb479ee683b
 DIST pam_mysql-0.7RC1.tar.gz 335240 BLAKE2B 5351da14d7e9bd2693c9ca0595a472fffb86818fc7e74313f3235675be8fd5daef99c2d14f2bd19c370a19592cc0a46181fd3a3411ef5a8d3b26059a16673d75 SHA512 c057999c62d29dfa7a07db9a8d33d0cf0377dae4770c73019bd85f67c9c92fc9dac36fa606739162a5f7b0f9fbd849e5833fee827febfe4af883b8c2ddbd8b4f
 DIST pam_mysql-0.8.1.tar.gz 49613 BLAKE2B 1e3f6b0c8a11c8d328300fc820ddbbcd1601735de611e9317aab8f26ab2fbcf0f704e7a2c26de347fe9c4088c8171f0c278cd92e1668671871e5cd79db981241 SHA512 68aecc83c026c7616211a46b80f96fe822c8bd069a5ab6e9b170607bddac0dabe20410f78a1ac61ca1c1b2724ed0f0d99694d34bf28763270da3771c9ef05faf
 EBUILD pam_mysql-0.7_rc1-r5.ebuild 1155 BLAKE2B e3c0fc39955f888bac0ecb71acf82a22b787781961bd95be4422d52ac4bfc94f76db9861f7a95af61df1188d777a738b0d0fb9d32ce68622fca10f032193776b SHA512 2345868d1d5e30926a38e3a6e6a07f9cbfbc040f059fb16509704b53352a07c598a5d6ca24b6d08f0a77f8fe24fee785cda9e31327acbcd7b600d4e483330921
-EBUILD pam_mysql-0.8.1.ebuild 885 BLAKE2B cbfffc6a4684f8385981b85a0f25e6576adfcd8855f7146d71882450c12f7e6ff76d511cfeaf44d521963b928e5671a75688ea2671c93f6ebd60d3ad6ecdc243 SHA512 23db18f390fa6d7cf0e3cc83413ee3822ad8268c0d185a23d9fe868bee2b4dac4c220e2b3c64f03b6608784d80d6b9f2ba476fd6f7dc74a48c3372815f75981e
+EBUILD pam_mysql-0.8.1.ebuild 886 BLAKE2B 1945f76501bd0e8b94857b656521eaf458083ac8fcd540e1993581161ec9fbd6bccda3cc510363921170d575f51784b20373bc4ce5a80b378ec3b41f1c68c70d SHA512 1c892a1eeb0211fdca1e7634338bec2e267fe2f51033da0cd12743b9b32e940159d58b51af1e1afacebae7152d27ce9284a0c7a1ea5e81cf8198a9f3828a7980
 MISC metadata.xml 404 BLAKE2B aa7d8e4f9b1d52a6b238bca975f697debb58355314621957db0afaea72490a1e7b386ef05f95d9707d68bee9178b6848affeeadcad6800b0746912916cf2d682 SHA512 d78e3f912015ea18a9385b21c0f7f4d29a2af8773c0a154fd41a1a16abc71af8a7d43b71fa66f835be1b44d3afc22f0333e741313dfccb6446d628962d25915b
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild
index 2df38e72d0d1..06b48b8ead62 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild
@@ -17,7 +17,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="openssl"
 S="${WORKDIR}/pam-MySQL-${PV}"