From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E0D3138359 for ; Wed, 2 Sep 2020 16:20:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DF51E093E; Wed, 2 Sep 2020 16:20:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CA2DE0936 for ; Wed, 2 Sep 2020 16:20:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88800340E9D for ; Wed, 2 Sep 2020 16:20:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C49A339 for ; Wed, 2 Sep 2020 16:20:00 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1599063351.8961b3856c9e6cc09f2c26c5303ae771cd67c319.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/ssh-ldap-pubkey/Manifest sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild X-VCS-Directories: sys-auth/ssh-ldap-pubkey/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 8961b3856c9e6cc09f2c26c5303ae771cd67c319 X-VCS-Branch: master Date: Wed, 2 Sep 2020 16:20:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 04d58cf7-0916-453c-99f3-0126ca4b0831 X-Archives-Hash: 07b70ac7c1ae2abb3c659a408dc2155b commit: 8961b3856c9e6cc09f2c26c5303ae771cd67c319 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 2 16:15:51 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Sep 2 16:15:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8961b385 sys-auth/ssh-ldap-pubkey: drop old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> sys-auth/ssh-ldap-pubkey/Manifest | 4 - .../ssh-ldap-pubkey-1.3.0-r2.ebuild | 85 ---------------------- .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild | 71 ------------------ 3 files changed, 160 deletions(-) diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest index efaac702b49..d9319450c0c 100644 --- a/sys-auth/ssh-ldap-pubkey/Manifest +++ b/sys-auth/ssh-ldap-pubkey/Manifest @@ -1,5 +1 @@ -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 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 d4129f617cb..00000000000 --- 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 f9b87b29b31..00000000000 --- 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}" -}