11 files changed, 254 insertions, 6 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ca6bd9bb216a..b3debbba2376 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index aba1fbe3b3ef..38a8e484d500 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -5,5 +5,5 @@ EBUILD opentmpfiles-0.1.1.ebuild 1021 BLAKE2B 7268fe79b3bb68b30f642e2e438caffc94
 EBUILD opentmpfiles-0.1.2.ebuild 1120 BLAKE2B f9e9dfd90ce72f1a0b7eb603b430b66a08467786562539810cf091d0b320a763742f1d9fcd70d622d03e529640b9a9b1df0e51ffa7a55f8c4059e803272269a5 SHA512 7231a5327564f6471dff75348d85c7d38bb3f8eff50ef55ef38136de21d8139791e6c32e2ef712b37d1faf82f7f08fec47ba41978a6c051cb7fbf3aa4fdfc0de
 EBUILD opentmpfiles-0.1.3-r1.ebuild 1251 BLAKE2B 0f8f5e948ca15eed6dea84f8097107bc5959de8bd07c15f17750b1823b54620a4f331b4dbc0fe9cb0def5e132ad6c4c5cbfbb548fe258654d8cd5d2c51c10892 SHA512 d80ba564c4899105d409671120727817ec69ccd6c73d64d1b6875036a5b9a4f4c6705c49bbeedbe88067cf76b92c5ef9f70028bddb60c167e7d357cf030245e1
 EBUILD opentmpfiles-0.1.3.ebuild 1139 BLAKE2B c74faed4e847c8fb39276bd184bbfd413d544596ffd4ef74205deca3cd5aa66a3341bf72c5bfe30558b343b7092d42be5ae69a3f90e012af448d10f740d15beb SHA512 be34016b152901f48cc91dca89fcd37aa90c0b22b9496d5dee23a0c9ed1c3c6d2354290a753adf871151f2fabc3f9c0a8f8f3f5f86901cf34123353604afaf04
-EBUILD opentmpfiles-9999.ebuild 1152 BLAKE2B 46347d4d5d16237872d933080b2f3880132d1001cbbe01c3e4ab6575910d5255655863a87484f05b98861318eb61ddd9badac9b3c1c05150905f09ab8b67d880 SHA512 b97d2ecbdc52713f232a518cd7b3f687e3ec0eebd751b3c6ef24ce6a9329e51f3de6f089b8967d177923741a406babdf238b93c15f85d43bb8e5ae1036ac2fd2
+EBUILD opentmpfiles-9999.ebuild 1251 BLAKE2B 0f8f5e948ca15eed6dea84f8097107bc5959de8bd07c15f17750b1823b54620a4f331b4dbc0fe9cb0def5e132ad6c4c5cbfbb548fe258654d8cd5d2c51c10892 SHA512 d80ba564c4899105d409671120727817ec69ccd6c73d64d1b6875036a5b9a4f4c6705c49bbeedbe88067cf76b92c5ef9f70028bddb60c167e7d357cf030245e1
 MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
diff --git a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
index 1577a7364fc9..cd2b8eff44b1 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+inherit prefix
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
@@ -22,8 +23,13 @@ IUSE="selinux"
 RDEPEND="!<sys-apps/openrc-0.23
 	selinux? ( sec-policy/selinux-base-policy )"
 
-src_install() {
+src_prepare() {
 	default
+	hprefixify tmpfiles
+}
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
 	cd openrc
 	for f in opentmpfiles-dev opentmpfiles-setup; do
 		newconfd ${f}.confd ${f}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 0d4e8bdbfcae..fd54423f4f1b 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-20170813.tar.xz 64424 BLAKE2B b4d46f82197bb5f1b956fe72e87ef365b139c6a1ab90906ac30dd3191fb6c3f5ef3978ceaf56d029a3766e8354558aa00554a767c637eef49b861b6a775fc614 SHA512 0ae4906b5c3eb400ca397f0c3baf5146b8197ee2dc712b1b89dd2f443f9505aee208327f008118628407b54ce52390a8b6138425f3f6f974b94f4a8d79955653
+DIST osinfo-db-20180416.tar.xz 70324 BLAKE2B 44bcc2be467f7e1ce50d1a0fd2bd2f3695f6aa68ab038fd0d548a8c46606032a9fb805152f0de08a0f56d6e096397cc17582a7451e0695dbb58760fa94363630 SHA512 e8d25dc501909803a949987239ea5a2e7a01ac4bb536f1040edff93d8ce3871499fceda882da799ada295dd5d4cc284e99c6b5f493c464dda776f6144803a1f1
 EBUILD osinfo-db-20170813.ebuild 671 BLAKE2B 21131786f459a25aab816a1ea30067b7f3ed84d00063d7e2ed330c060f7e8616171e298379ac0bfad2ac54c2e847072b8a481ef85be280f19b9ded9f8f2494a7 SHA512 feecb9a6298484e19e9d78aefa7e75c376b66c0bd676aff22e5ad3fe7a745ea74fc64ddbfb6dde002f6b58a72720e5ddb571ef616c9e1af04411a910aa1b2694
+EBUILD osinfo-db-20180416.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20180416.ebuild b/sys-apps/osinfo-db/osinfo-db-20180416.ebuild
new file mode 100644
index 000000000000..9e69a433ac60
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20180416.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="http://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index d79454770b42..5e5c4a48ac8a 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,6 +1,6 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r1.ebuild 1557 BLAKE2B 9168ceeb1a34a56dfc16538480d32d828f851699f25776466f31394d9a9806395523f3899286f1fb64b3013bf403b607fbf1cd744e29b0ad71be7b2c46afe65e SHA512 63e239cb2f0bb9b88bb4fbf19d1eba4158751bfcf9ff99a39b99123e6a855889fcd18d004a904ca437119188a8b85dc125f75f5aaf6c36f629d830759b0b3c67
+EBUILD pcmciautils-018_p8-r1.ebuild 1556 BLAKE2B 2bddbb297c995c8a38397db0d5e6927921e89a832ed55dbe5fe42ce48c1c76fa5f7074ebfd8bb49555caf7a2898bbfdd0f4c64c6d1b773459c2f9314fff6080e SHA512 0300814896620067aee868a14fe7442538f320a05139c9f67f3566d843a009ebac345801a4692a3a08ec9210c485c94a0c8e6492b1cb211a58d24d57acbd3323
 EBUILD pcmciautils-018_p8.ebuild 1513 BLAKE2B 04f16b0dc86e74a539aec390a58b5461b72c7993490e102bbeb958b1934668e8f6833150b7cfa86e3728e6722ba17785a2296f5b4318b21f21dde898f94a0318 SHA512 71f6ce9e540765a471c79ae5dd7b0aacf942c5f60bde01c7b99e5697360dd347045282a2daa30b26ef8851caa7be66c255e5594b2709c78d0a45f5c7c13c0fca
 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
index 6c637a19fba3..16f47c72c26a 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sh x86"
+KEYWORDS="amd64 arm ~ppc ~sh x86"
 IUSE="debug staticsocket"
 
 RDEPEND="virtual/modutils"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 3c41719e4157..8f04520d8bad 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,6 +4,8 @@ AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 AUX shadow-4.5-CVE-2018-7169.patch 5778 BLAKE2B 59e06cda2d3b48d77548c22073f9c4ce018c16bdd128089ce6ae6d8eebe1ad9b73438530fb32b628bc5e72201852b7c452264a13707bcbfa826777b778a7b90b SHA512 fef082516e47ee4e3d9627916c47ffb8e1987580586639374d461b7b9d041370abe5b80dbbfacd4fd256a1bc2f9d23e0e71497298dd60ccd96d795811a13cd58
 DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
+DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
 EBUILD shadow-4.5.ebuild 5324 BLAKE2B 7e31b15f14edc3434fa1acca45a5c4955f78e5794d342d09834a0f9dbccb16c1d71e83952fa971a71f03844f6868fa81b16da7b473383156f10cebb2432b0ea8 SHA512 baa289b709d84f9b056d2415ed147d0bf80bed3e3645ab7738617693d7b8ada235410cf95c1d944044125bbab79f9feb101bcb1cd2d74eb33fc709346711107d
+EBUILD shadow-4.6.ebuild 5362 BLAKE2B 9a8b299498327ee7e8431d79fb5bfea1000b3af19432e557b2548dbb8f52bab2188b551e13a0ebb9f5a1859cfc4504f31725620bd5267693721ecdfb83e1355a SHA512 421275eb670c8b6339fea5c24fb3a4fdc11fbb7a4d7a429a01bbbe5174f42128cce4834c990221ba5ac1164ff9f31be96340450b653e7db3986f78dca5380791
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
new file mode 100644
index 000000000000..1d0cf5b9914a
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool pam multilib
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="acl audit +cracklib nls pam selinux skey xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+RDEPEND="acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	pam? ( virtual/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	nls? ( virtual/libintl )
+	xattr? ( sys-apps/attr:0= )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+)
+
+src_prepare() {
+	default
+	#eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--without-group-name-max-length
+		--without-tcb
+		--enable-shared=no
+		--enable-static=yes
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with cracklib libcrack)
+		$(use_with pam libpam)
+		$(use_with skey)
+		$(use_with selinux)
+		$(use_enable nls)
+		$(use_with elibc_glibc nscd)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=$1 val=$2
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED%/}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED%/}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED%/}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED%/}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	# move passwd to / to help recover broke systems #64441
+	mv "${ED%/}"/usr/bin/passwd "${ED%/}"/bin/ || die
+	dosym ../../bin/passwd /usr/bin/passwd
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chpasswd chgpasswd newusers; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chage chsh chfn \
+				 user{add,del,mod} group{add,del,mod} ; do
+			newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
+		done
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED%/}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED%/}"/usr/share/man \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED%/}"/etc/pam.d/{login,passwd,su} || die
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED%/}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 4dabcb5690db..cf66710f3030 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -10,5 +10,5 @@ DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
 EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
 EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
-EBUILD xinetd-2.3.15.3.ebuild 1090 BLAKE2B 347ded2128831353bd59fe8a03448cc0a3781b496e9fdfb1e4ef00faa385c7e1c78ff614ddca8b4236a757aabca88aaa0fb057d16b3d42f7537f2d86790824f5 SHA512 8bc9f44085dccb65af0d2ccc8f83c068ee4a3fca6bf8e778bf4ceaace00451f8d31fa9da5e6dab3db4661581ff84c33aa75bea15ffca87f83c62090faaa253e3
+EBUILD xinetd-2.3.15.3.ebuild 1089 BLAKE2B 8e78d2b1d0e17278291b815073399bbf87bbdb48254f6797517f6d7210d5f7eb13f61eb062a59c1e70a4e10a639ca7e6b6a8fb4c77912a22c7cfef2e3412770f SHA512 9e1bf8970a7bfdeadb620aa954795e0fd450ec62e6bcbde45c7f8a710267e8b385cba204751b8ffa0de8b89d2c61556a21cf6cb52083e6d997467f0e6a6bab66
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index c5bd7dd06f8f..10b4ad13101b 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl selinux tcpd"
 
 DEPEND="