gentoo resync : 16.09.2020

4 files changed, 2 insertions, 164 deletions

diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
index 351c21831f23..5e43f276ff45 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -1,9 +1,3 @@
-DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea SHA512 0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
-DIST ssh-ldap-pubkey-1.3.1.tar.gz 15263 BLAKE2B e073093ff5c2e5ebb560d00b4973a0d26c708d647974a1e2a3298d5be656a2a8f9099c9fa805eda9c0e69b615dccbf43c6eaec5a7284d612e8d7d71784c3d673 SHA512 fe17ad5515e044052350d68222ae1f2ba2b8dde796c3665a1e41094c0311609d37e27f95bf6f048ba881bd722717cb80b127d48c083c2c7ae9c53661ad4039e4
 DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3 SHA512 8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
-DIST ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch 1494 BLAKE2B 3fb89340d8177db79396b13615437aa921ecc2d21b8ca5c918587bb07f9fb53bc8f356c50c57269b1ffe04995033815d7632ff060485d4c29d34dc7805227533 SHA512 dfc137b6fb2bc0aea698b23ea462de2bd00503b9b21f022b77b28d51020758730ea4017b890e298616beb198816489862830d4dda7cae5114572523ad6289472
-DIST ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch 2215 BLAKE2B abeaa5a364cd98050fd8abb1019cc203b72e96baa4c3704c7aac6cadc07d999defa2333f6ca4f6793dd0e758b08ab198135c65d100f5f91eba6273c07dd20250 SHA512 85136608352fb35ede70eff8522e09167e48eed5c99a87756ea8b3f641de0dc169bf066d0c21a28fc35c41337372803d97bd37ca8bad1dbafb92464086fe3a63
-EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2216 BLAKE2B 75c57778e75d2d3b25aa57f58031723ead243fa4286c88e49bcefa10df745694192b685d405c4ff5aad5ab2e94296d25f2c6eec2aeb8a6b76a44a31199fa34bc SHA512 ae104e7a5cb040bdcd0b28e40446b59de7ffbf0a74de203fbceb1f575c194b82d1f845013c554c63d5a3fe4522c849caf5a0d83f61e14977fdb20d9848da2eb4
-EBUILD ssh-ldap-pubkey-1.3.1.ebuild 1713 BLAKE2B bf291394cf41bcd03c15ba913136f93d2c17244fb660b06a076b4492d024c2abc5ad2ed85ab81170b58c605f6b81be316d3ac5747059b9b8782b4c098bdd0c2f SHA512 f16fae43a02ff3d70f3213eae49f9370d1f0e2ea9cac5a6c1ed586a559bd896a00c5129439c626188f20eac84dbc84a41094cdade938f493ce035025e395019c
-EBUILD ssh-ldap-pubkey-1.3.2.ebuild 1717 BLAKE2B cce812913992d61faa786b2064737b88626d6b384874117227464c8bde7db8ee2ef12e93590ad4b5b3c78fb53624a22a16c1e2309ce8a2c30e233ef6f771e7e2 SHA512 bfd363e66de54061c74007e68fd0e153114ef13854bb958dc456b6b215cb637b0886e8da8b808a5ab49dc016146915285f23c79d5a96a22e6e90b36ef63f8072
+EBUILD ssh-ldap-pubkey-1.3.2.ebuild 1719 BLAKE2B e2e909b944c14c84bcd18d9fb18e13c684da966a90a14d496b97c03b47b5217ccd964ce07b8dd0f57931412a2f8610d2df67f72bfc6e30bc68068d435b9574f5 SHA512 c98e68c5fc27305963ee67de8e19994abce67752d7d4f8dbf30d4d571af82156205def563d958ff8c5c5c632a380131853aa4916c5b23370878a5c8a464a403f
 MISC metadata.xml 523 BLAKE2B 0a9308f1acc865d1150c5d1f7275ab7d213965be821936aadc1e92b6a0ca0f3ba90a8e4b28a1683b182fe1d540991ff032407e641ce0ea4b4f8511a880e74d99 SHA512 f9db947dfb435f981350a30cd8d6d9163b9b5067f610eae87f17c85d6a123a2dd620aa06d1a290ed148321d68c37877662885b07b5af15fce3f13d0afbba67dc
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
deleted file mode 100644
index d4129f617cbd..000000000000
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
-HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-fi
-PATCHES=( )
-PATCH_COMMITS=(
-	# https://github.com/jirutka/ssh-ldap-pubkey/pull/33/
-	# config.parse_config: fix parsing of non-word characters
-	130478a7532a8d3dfb0c8e3fbeac494908b8ec55
-	# https://github.com/jirutka/ssh-ldap-pubkey/pull/33/
-	# find_dn_by_login: handle complex filters
-	8d718357dfa5a62f919e61cf620a862cae87e833
-)
-for c in "${PATCH_COMMITS[@]}" ; do
-	d="${PN}-${c}.patch"
-	PATCHES+=( "${DISTDIR}/${d}" )
-	SRC_URI="${SRC_URI} https://github.com/jirutka/${PN}/commit/${c}.patch -> ${d}"
-done
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="schema test"
-RESTRICT="!test? ( test )"
-
-MY_CDEPEND="
-	dev-python/docopt[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]
-	virtual/logger"
-
-DEPEND="
-	${MY_CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-describe[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-# We need to block previous net-misc/openssh packages
-# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
-RDEPEND="${MY_CDEPEND}
-	schema? ( !net-misc/openssh[ldap] )"
-
-DOCS=( README.md CHANGELOG.adoc )
-
-src_prepare() {
-	sed -i -e 's/pyldap/python-ldap >= 3.0/' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use schema; then
-		insinto /etc/openldap/schema
-		doins etc/openssh-lpk.schema
-	fi
-
-	local MY_DOCDIR="/usr/share/doc/${PF}/examples"
-	insinto "${MY_DOCDIR}"
-	doins etc/ldap.conf
-
-	# We don't want to compress this small file to allow user
-	# to diff configuration against upstream's default
-	docompress -x "${MY_DOCDIR}"
-}
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
deleted file mode 100644
index f9b87b29b318..000000000000
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
-HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="schema test"
-RESTRICT="!test? ( test )"
-
-MY_CDEPEND="
-	dev-python/docopt[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]
-	virtual/logger"
-
-DEPEND="
-	${MY_CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-describe[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-# We need to block previous net-misc/openssh packages
-# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
-RDEPEND="${MY_CDEPEND}
-	schema? ( !net-misc/openssh[ldap] )"
-
-DOCS=( README.md CHANGELOG.adoc )
-
-src_prepare() {
-	sed -i -e 's/pyldap/python-ldap >= 3.0/' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use schema; then
-		insinto /etc/openldap/schema
-		doins etc/openssh-lpk.schema
-	fi
-
-	local MY_DOCDIR="/usr/share/doc/${PF}/examples"
-	insinto "${MY_DOCDIR}"
-	doins etc/ldap.conf
-
-	# We don't want to compress this small file to allow user
-	# to diff configuration against upstream's default
-	docompress -x "${MY_DOCDIR}"
-}
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
index 15c6338cb358..e34d60f6eb71 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"