gentoo resync : 02.03.2018

11 files changed, 216 insertions, 40 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 8e6aeb64cf30..f3dcd360cc19 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index ba2643886ef0..311858b72d53 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,5 +1,7 @@
 DIST keystone-12.0.0.tar.gz 1491044 BLAKE2B ebe5fd423509e94d636e303825ac499cf9017a616971654ee52dead111b0fdc76379cf24554c7dd115b1d1a65b081e6931bd890613736f6bffe75e8628f94f7a SHA512 7b7e6cb56b9d22e92834ccfb31dcd6d28d7318e2d8160da93cbc48cdb72aa626021db5b38068ca76caae88e68204c3650f7ce728bc8e1791df8fc8d36072483c
+DIST keystone-13.0.0.tar.gz 1462543 BLAKE2B f34da8cd1af58e8de589c0eb5f3f1f6519f4fcadc6152289c9d1196e6fc9fc3ac607af9686884d3a8072514ed8e6c275a2147c5a4d38c3a93660c1b499544539 SHA512 97e6eba83e47480e3f756f8a726012835c5fcb33534d8cc7eb31343a29e4c23ddf20be10adafb257850c8d846fbf2f674dc5f44a09fd901f95ef5b342c066097
 EBUILD keystone-12.0.0.ebuild 6199 BLAKE2B 59f0e4674e3239cd3f5b83f883504f3c16044807cf049452fbdf8eb95ba0f89ee26c574c8dc924b58b9cc2a8490f215a55693f8b54735d1302cb49e7e5bef114 SHA512 9cd8d4a2255a94d4c3278077eecd3efdc747d3477d3f77b6a645746810aeede13600358dace03692a33704df766fa550daea654950b59865669b44e67c489ed3
+EBUILD keystone-13.0.0.ebuild 6104 BLAKE2B 728f53cde68c7ccf0160fdbb7f87e556f94c4174f3e0b2d00a5f84e004b0fe641ec659253b7a72ebc11cb632adcd96755dfaa2dc6ff020acb73da28579b54c9d SHA512 a9697fb20ba0d2f7fe7e255df865f0caee649aac4eba70bb9e1cb63b2f22140271aacef02024d662bf67b4138a583a93b345dd3ae81a3143c3ac15e15a7b7059
 EBUILD keystone-2017.2.9999.ebuild 6215 BLAKE2B 2d83dc144c4efcda8a7e0fa8f97e92e46749f04c54fa43acca2ae7eb36bee1a5d90729625f593c977be7d428a65723dbcbe6432d88e3df7359df863c47393dd2 SHA512 9d7b9a175f1f4ba214ecea842f8e0694584023f151596de5b771f59a673cbde3835dee5dd71e947a2a64deeb44cc90e0c348ad7a8927c920767891f7271b1357
-EBUILD keystone-2018.1.9999.ebuild 5977 BLAKE2B 4389b7dd63b323e0b3ca3721a4cb4f41d00f96118b4b57e30c8b131ceb83b6101476559292043a8c160735f5105826f7ddacc76473f7e9de3b52a8525b7c279e SHA512 d14001ff5f1bbb52f6f38bf1f6ff745e7205b9ab90ba4eb8dca05fbf381e4e5c8be6e1dfa0d6fd90820ba8aceed069bfd1a1303b4cd8087afe6861c1ce943607
+EBUILD keystone-2018.1.9999.ebuild 6104 BLAKE2B 728f53cde68c7ccf0160fdbb7f87e556f94c4174f3e0b2d00a5f84e004b0fe641ec659253b7a72ebc11cb632adcd96755dfaa2dc6ff020acb73da28579b54c9d SHA512 a9697fb20ba0d2f7fe7e255df865f0caee649aac4eba70bb9e1cb63b2f22140271aacef02024d662bf67b4138a583a93b345dd3ae81a3143c3ac15e15a7b7059
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-13.0.0.ebuild b/sys-auth/keystone/keystone-13.0.0.ebuild
new file mode 100644
index 000000000000..8640cea7f1be
--- /dev/null
+++ b/sys-auth/keystone/keystone-13.0.0.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 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"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-4.0.2[${PYTHON_USEDEP}]
+	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.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}]
+	>=dev-python/pytz-2013.6[${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
+	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-2018.1.9999.ebuild b/sys-auth/keystone/keystone-2018.1.9999.ebuild
index 05c7509a3f5f..8640cea7f1be 100644
--- a/sys-auth/keystone/keystone-2018.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2018.1.9999.ebuild
@@ -5,16 +5,21 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
-inherit distutils-r1 git-r3 user
+inherit distutils-r1 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/queens"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+	EGIT_BRANCH="stable/queens"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="+sqlite ldap memcached mongo mysql postgres test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/sys-auth/libnss-mysql/Manifest b/sys-auth/libnss-mysql/Manifest
index 571ca1ab8a78..8db5a8573f8a 100644
--- a/sys-auth/libnss-mysql/Manifest
+++ b/sys-auth/libnss-mysql/Manifest
@@ -1,5 +1,5 @@
 AUX libnss-mysql-1.5_p20060915-no-automagic-debug.diff 610 BLAKE2B 2c1473fca6eddd1cf66db23268ca24dc824b90a2b155202110329c39083daa696142c85cfe50613a7da356275743a797f066d60d2c80c9b330aaac5c24a65d30 SHA512 f8e33bd221dd1662933510ccf9648a152e78c38e6b0d155ae82c3eff49f0f621b3661aa07bf8d8d84b53e14a048ea6765561c16c38e07286cb93bee6a51a91e7
 DIST libnss-mysql-20060915.tgz 689970 BLAKE2B 147b5bb6c2fb53ca18f6db87054fa6665829671e9abdd7aa439287e301fc2d5ed4c9e2e5968ce6dacb4f74d86debb0c26d5cda56c6fe8f64e92ff3c9eba26a85 SHA512 fc92438b413b175b9bcead222013eab3bf63088a33ece0c4b6cc69edbefb9cc9145138ce786059acf502c2378a2af45588a5a506e45928b9ac600fe05e62e0c7
 EBUILD libnss-mysql-1.5_p20060915-r2.ebuild 1220 BLAKE2B 9510d822fcbdc152dfd5d4b1670697f282dab665bda24ee361a03fb1e22aa708083aa60fca3dc8f27daa13db96174fede7e0ba6ddf0c2b5eadbf5cf3122d7f87 SHA512 6001953dfc5233d31fdbc84f60f63ce6103814157335f7d70c84ef22a47f6ef63c147718d1961414cc00f1252451e3e3848797a396672e39dd757c4340f52e38
-EBUILD libnss-mysql-1.5_p20060915-r3.ebuild 1195 BLAKE2B 3b5596e1068596266c7b814a9bc5af82147b174bd7f43e32e1c2dcdb0076fc842f04f775c6a6a073c162e207631cd81b9a7e2b80fc15de2abdd95f3e183ab506 SHA512 f88a76eb69ab1c94b5bc32ed07e486e81ffda2935aa0071a374ea4408a13d2114aad9fc75caddb05d96f096ff42c2031b43bc8e3f8212bc74b1f2091a5ce5efe
-MISC metadata.xml 402 BLAKE2B c387cabcded825c7734b8c42ddbc8436090c63ed0545c5c0814aa2754c56bd2299a184c28c943361b9b219b3d24038199d7720e8cacdf449fc5520c6da636cd4 SHA512 aa5fef79114433f7b68a3b4d67d60edc5012a874f5dc59166634abb1d10298f7d5b2c27ead34d7df2d8dd9b603aee2d8a5e75697dcd861e2da94183b4b17723e
+EBUILD libnss-mysql-1.5_p20060915-r3.ebuild 1194 BLAKE2B b20b9a1ffbe69edb338a0d08d83f1003bc3fef1e3be22dea282b3ba7b20e5552092c2045ffb8f41bd009d71cd6a0e5b9438236d30c6eb2cf406f5ab3d1d9a12c SHA512 5247070f6a03aea770cb0bea7b263f484de5a70997164b6af50bfc1143188b81dc0cf0e7851853e1addc73858094a2e370169ae4dcab4ead4ea0b16bf7be9f0e
+MISC metadata.xml 325 BLAKE2B 894a3b266d3cba95496ca172f31fdd30d900bf174fef1f475c97b9ebd0b6c6e728c33b30741b17b8cd6e8d521a965392aa3ad484d2d3a6e1d8970aca40d61495 SHA512 b4755442527c73f4bd3fc338ad753c6067b94c9462f92bf36b6bef75ebe1befc397cc177ea3e4fe0477b1de767d977108ab6a89e01e18e2386cb23548682ec8b
diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild
index 5be867817484..cdf220de864f 100644
--- a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild
+++ b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit eutils multilib autotools
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 
 DESCRIPTION="NSS MySQL Library"
 HOMEPAGE="http://libnss-mysql.sourceforge.net/"
diff --git a/sys-auth/libnss-mysql/metadata.xml b/sys-auth/libnss-mysql/metadata.xml
index 7061f94bfe60..b8a8d04247a4 100644
--- a/sys-auth/libnss-mysql/metadata.xml
+++ b/sys-auth/libnss-mysql/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>mysql-bugs@gentoo.org</email>
 		<name>MySQL</name>
diff --git a/sys-auth/openpam/Manifest b/sys-auth/openpam/Manifest
index d456ac97cbe2..9228bcdf3292 100644
--- a/sys-auth/openpam/Manifest
+++ b/sys-auth/openpam/Manifest
@@ -1,7 +1,7 @@
 AUX openpam-20130907-gentoo.patch 5832 BLAKE2B 994af413f1c2811ec09069f67ad2450a8bce721c1676905e83c15652c7e859022250404f2ae81b278df2fa08bc0610d3bc00cff3fb9dade94c37fd0edcf931cb SHA512 f4e8baefaa2113f6e864eebf6e9c596b229a06ea4038c4cf6f9ba96fd8347df7a7cbff691d54da0710b35440a766f0f2d411ccf19f66201508c227f6a4238cef
-AUX openpam-20130907-module-dir.patch 507 BLAKE2B af0b160ddbd380078f98c5deb443cd21ef39dacc8d61588512df11a2d26d04b788b3b0fcda7c3f4d36ccd87884863155140de5e68d8722f08f4c1fe319dcd2e3 SHA512 724af899dddc1932e841aba2f0fe94c18a1d944e5da35d0ff01438ebecb59888db0dbe66f3882aaca2b56661fd7a07afa5438c009baa704fc9e4534854e5c7bb
+AUX openpam-20130907-module-dir.patch 473 BLAKE2B 16537688c32fb31973195090505a897b4399edf3b43a39c92a62325df7ed1e0954cda4a3fcb12003590e0fb97f7060f143b3d68615ca23feea5eb882f7b41899 SHA512 03ba9ec79191bf248b65a50db75eaba52a5eb3a9c99fa2b64c02d5531910f90d1cbbbc274fd2bf3e6deabbcfc0239fad0d2cbadbec336794c0aba4078cee86a1
 AUX openpam-20130907-nbsd.patch 463 BLAKE2B ae2d50ba4569abbed0fdb127508b0571659a0fd545edafaef396abb74516e4176e42e2893770030424c584cd340d13338828997f0430bd9f7646c169166ff6d5 SHA512 8b9f8729830d47b47972ed3c7cbfca0c9bd5b87a245e0fb3e37594a247c89780f481ec3480285a829c1f86a90d591dc9778f6b2e2a57f718a5ec85d74a21af08
 DIST openpam-20140912.tar.gz 457600 BLAKE2B 8c963d9447c55a4f181e2524f9846d92038b3a5172e14ff0bad15ad7e595455896946f0dcf1d8f6dfcbc571ad01b8565447938a0fe9c001da39611d1d265f58a SHA512 c6cfbd669fe1b67af43a33c33bf2587e1512c27f1b96b9b38df37b81ecc4999d85e04b361b19a7265dbf271ebd3de3bd55342ee4fdbee9c68836b69714706423
-EBUILD openpam-20140912-r1.ebuild 1017 BLAKE2B b67e38340a4edef4b4ecf7aeb630fab475b29d51229297cf3e76a1a01b10251568f54abbeda44263c8c0401d9bd2582e1cd37dfa99b0cb8a021bdb235af89ca1 SHA512 3051b2ebf950039cd4b504d5d6fcb91847b7a945c395bdfc3e17b9c3e6c68ebb5d0b3a80bbd75037af141ce9dc0817f94c538d19a42b55c5167abd8310372d41
-EBUILD openpam-20140912.ebuild 1013 BLAKE2B 78fd65e4faf3d6b9c77aa7b53684cb160e0e11d36f09e727bd383caf5497e134e8bf741991b885241d092e0ee8da5e735cbaa1bfc5a1e3a85934296ebb98feb5 SHA512 0b6fa63fa8560fe8c7c7c52b4ca1fe66c6cb260d3936d7fa5ea5eed73df485b742f0a569a443964bdad8834dc11243ac057beaa8088423385cdc9a2c34749f42
+EBUILD openpam-20140912-r1.ebuild 970 BLAKE2B 5ae94a9dc3ef286cac9c3fa53138b1e6c94e38372387876fb396952eb3a5fabb368b7d366674e4f68032a064d238c4e7d5e334cde9a89d8107d797634dcd3468 SHA512 6e09d0eba5641053063c5c61950965fbced4b95cb7b511930f8a55f4d27a9654b24696bebe85f3ff5a58a6c6a5f51cfd31530f1969bc0e2f8035d51bbe65a4b2
+EBUILD openpam-20140912-r2.ebuild 914 BLAKE2B 094c8fa95d82b01e0b06b752ffd1938b2976ac524c1015447fbe1baba9a0bf6b81f40541f614fb8cfc73af0fda50f5dfe00ce02516be4d2f2259411588e72757 SHA512 92b9e073cc810382c302c201a37f89ccf154c7cf1fa9cd0bbd025f48b4293a1d3cdd6e334f4f93711d07c617e10a05a9ebee32793ee3cc5ac8d827aacbe70571
 MISC metadata.xml 319 BLAKE2B cd7e77def6913851b7c1ef25c47fe3e3548c076e5cb8f86a72886936b4f4601a70fe756f107433cddc1c2a26a0d826bd7e167d875b07003af54623bb4e0eadaf SHA512 e15befc8be39bc70ef094473b9e5fb9d2a504abf27b4217431c0ec707665b62e6a582876abaf280aa074e9f71637e792e9ce7e31d09d9d540502900e6a518975
diff --git a/sys-auth/openpam/files/openpam-20130907-module-dir.patch b/sys-auth/openpam/files/openpam-20130907-module-dir.patch
index 01afadbbfb8d..28c4414f9120 100644
--- a/sys-auth/openpam/files/openpam-20130907-module-dir.patch
+++ b/sys-auth/openpam/files/openpam-20130907-module-dir.patch
@@ -1,7 +1,7 @@
 diff --git a/openpam-20130907/lib/libpam/openpam_constants.c b/openpam-20130907/lib/libpam/openpam_constants.c
 index 1cdd810..f66e469 100644
---- a/openpam-20130907/lib/libpam/openpam_constants.c
-+++ b/openpam-20130907/lib/libpam/openpam_constants.c
+--- a/lib/libpam/openpam_constants.c
++++ b/lib/libpam/openpam_constants.c
 @@ -135,8 +135,8 @@ const char *openpam_policy_path[] = {
  };
  
diff --git a/sys-auth/openpam/openpam-20140912-r1.ebuild b/sys-auth/openpam/openpam-20140912-r1.ebuild
index 287db3f24eb6..35d3e7c9ef80 100644
--- a/sys-auth/openpam/openpam-20140912-r1.ebuild
+++ b/sys-auth/openpam/openpam-20140912-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="debug vim-syntax"
+IUSE="debug"
 
 RDEPEND="!sys-libs/pam"
 DEPEND="
@@ -23,8 +23,7 @@ DEPEND="
 	dev-lang/perl"
 
 PDEPEND="
-	sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
+	sys-auth/pambase"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20130907-gentoo.patch"
diff --git a/sys-auth/openpam/openpam-20140912.ebuild b/sys-auth/openpam/openpam-20140912-r2.ebuild
index f32258087444..50de35c46fe7 100644
--- a/sys-auth/openpam/openpam-20140912.ebuild
+++ b/sys-auth/openpam/openpam-20140912-r2.ebuild
@@ -1,12 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit multilib autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="Open source PAM library"
 HOMEPAGE="http://www.openpam.org/"
@@ -15,35 +12,37 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="debug vim-syntax"
+IUSE=""
 
 RDEPEND="!sys-libs/pam"
-DEPEND="sys-devel/make
+DEPEND="
+	sys-devel/make
 	dev-lang/perl"
-PDEPEND="sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
+
+PDEPEND="
+	sys-auth/pambase"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20130907-gentoo.patch"
 	"${FILESDIR}/${PN}-20130907-nbsd.patch"
 	"${FILESDIR}/${PN}-20130907-module-dir.patch"
-	)
-
-DOCS=( CREDITS HISTORY RELNOTES README )
+)
 
 src_prepare() {
 	sed -i -e 's:-Werror::' "${S}/configure.ac"
-
-	autotools-multilib_src_prepare
+	default
+	eautoreconf
 }
 
-my_configure() {
-	local myeconfargs=(
+multilib_src_configure() {
+	local myconf=(
 		--with-modules-dir=/$(get_libdir)/security
-		)
-	autotools-utils_src_configure
+	)
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
 }
 
-src_configure() {
-	multilib_parallel_foreach_abi my_configure
+multilib_src_install_all() {
+	dodoc CREDITS HISTORY RELNOTES README
+	find "${D}" -name '*.la' -delete || die
 }