Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/
Date: Wed, 02 Sep 2020 16:20:16
Message-Id: 1599063351.8961b3856c9e6cc09f2c26c5303ae771cd67c319.whissi@gentoo
1 commit: 8961b3856c9e6cc09f2c26c5303ae771cd67c319
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 16:15:51 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 16:15:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8961b385
7
8 sys-auth/ssh-ldap-pubkey: drop old
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 sys-auth/ssh-ldap-pubkey/Manifest | 4 -
14 .../ssh-ldap-pubkey-1.3.0-r2.ebuild | 85 ----------------------
15 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild | 71 ------------------
16 3 files changed, 160 deletions(-)
17
18 diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
19 index efaac702b49..d9319450c0c 100644
20 --- a/sys-auth/ssh-ldap-pubkey/Manifest
21 +++ b/sys-auth/ssh-ldap-pubkey/Manifest
22 @@ -1,5 +1 @@
23 -DIST ssh-ldap-pubkey-1.3.0.tar.gz 14530 BLAKE2B 1de6913e4abb25d441731b3c36b64361f5fa8900c289b1f4ef58776ab0018414d20b4b24716833e1e27e5dc18079ec77c283bab88879e3fb719fc9ad054267ea SHA512 0c675b0bf68ccecdabda5f4f559772fd0d34151794c2a3855e063befffe9777ceb79e99b5649f15e5bd0c4ea40c22f734d1748a8053d49bffea58077b72efe16
24 -DIST ssh-ldap-pubkey-1.3.1.tar.gz 15263 BLAKE2B e073093ff5c2e5ebb560d00b4973a0d26c708d647974a1e2a3298d5be656a2a8f9099c9fa805eda9c0e69b615dccbf43c6eaec5a7284d612e8d7d71784c3d673 SHA512 fe17ad5515e044052350d68222ae1f2ba2b8dde796c3665a1e41094c0311609d37e27f95bf6f048ba881bd722717cb80b127d48c083c2c7ae9c53661ad4039e4
25 DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3 SHA512 8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
26 -DIST ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch 1494 BLAKE2B 3fb89340d8177db79396b13615437aa921ecc2d21b8ca5c918587bb07f9fb53bc8f356c50c57269b1ffe04995033815d7632ff060485d4c29d34dc7805227533 SHA512 dfc137b6fb2bc0aea698b23ea462de2bd00503b9b21f022b77b28d51020758730ea4017b890e298616beb198816489862830d4dda7cae5114572523ad6289472
27 -DIST ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch 2215 BLAKE2B abeaa5a364cd98050fd8abb1019cc203b72e96baa4c3704c7aac6cadc07d999defa2333f6ca4f6793dd0e758b08ab198135c65d100f5f91eba6273c07dd20250 SHA512 85136608352fb35ede70eff8522e09167e48eed5c99a87756ea8b3f641de0dc169bf066d0c21a28fc35c41337372803d97bd37ca8bad1dbafb92464086fe3a63
28
29 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
30 deleted file mode 100644
31 index d4129f617cb..00000000000
32 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
33 +++ /dev/null
34 @@ -1,85 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI="6"
39 -
40 -PYTHON_COMPAT=( python3_6 )
41 -inherit distutils-r1
42 -
43 -DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
44 -HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
45 -
46 -if [[ ${PV} == "9999" ]]; then
47 - EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
48 -
49 - inherit git-r3
50 -else
51 - SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
52 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
53 -fi
54 -PATCHES=( )
55 -PATCH_COMMITS=(
56 - # https://github.com/jirutka/ssh-ldap-pubkey/pull/33/
57 - # config.parse_config: fix parsing of non-word characters
58 - 130478a7532a8d3dfb0c8e3fbeac494908b8ec55
59 - # https://github.com/jirutka/ssh-ldap-pubkey/pull/33/
60 - # find_dn_by_login: handle complex filters
61 - 8d718357dfa5a62f919e61cf620a862cae87e833
62 -)
63 -for c in "${PATCH_COMMITS[@]}" ; do
64 - d="${PN}-${c}.patch"
65 - PATCHES+=( "${DISTDIR}/${d}" )
66 - SRC_URI="${SRC_URI} https://github.com/jirutka/${PN}/commit/${c}.patch -> ${d}"
67 -done
68 -
69 -LICENSE="MIT"
70 -SLOT="0"
71 -IUSE="schema test"
72 -RESTRICT="!test? ( test )"
73 -
74 -MY_CDEPEND="
75 - dev-python/docopt[${PYTHON_USEDEP}]
76 - >=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]
77 - virtual/logger"
78 -
79 -DEPEND="
80 - ${MY_CDEPEND}
81 - dev-python/setuptools[${PYTHON_USEDEP}]
82 - test? (
83 - dev-python/pytest[${PYTHON_USEDEP}]
84 - dev-python/pytest-describe[${PYTHON_USEDEP}]
85 - dev-python/pytest-mock[${PYTHON_USEDEP}]
86 - )"
87 -
88 -# We need to block previous net-misc/openssh packages
89 -# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
90 -RDEPEND="${MY_CDEPEND}
91 - schema? ( !net-misc/openssh[ldap] )"
92 -
93 -DOCS=( README.md CHANGELOG.adoc )
94 -
95 -src_prepare() {
96 - sed -i -e 's/pyldap/python-ldap >= 3.0/' setup.py || die
97 - distutils-r1_src_prepare
98 -}
99 -
100 -python_test() {
101 - pytest -vv || die "Tests failed under ${EPYTHON}"
102 -}
103 -
104 -python_install_all() {
105 - distutils-r1_python_install_all
106 -
107 - if use schema; then
108 - insinto /etc/openldap/schema
109 - doins etc/openssh-lpk.schema
110 - fi
111 -
112 - local MY_DOCDIR="/usr/share/doc/${PF}/examples"
113 - insinto "${MY_DOCDIR}"
114 - doins etc/ldap.conf
115 -
116 - # We don't want to compress this small file to allow user
117 - # to diff configuration against upstream's default
118 - docompress -x "${MY_DOCDIR}"
119 -}
120
121 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
122 deleted file mode 100644
123 index f9b87b29b31..00000000000
124 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
125 +++ /dev/null
126 @@ -1,71 +0,0 @@
127 -# Copyright 1999-2020 Gentoo Authors
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI="7"
131 -
132 -PYTHON_COMPAT=( python3_6 )
133 -inherit distutils-r1
134 -
135 -DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
136 -HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
137 -
138 -if [[ ${PV} == "9999" ]]; then
139 - EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
140 -
141 - inherit git-r3
142 -else
143 - SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
144 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
145 -fi
146 -
147 -LICENSE="MIT"
148 -SLOT="0"
149 -IUSE="schema test"
150 -RESTRICT="!test? ( test )"
151 -
152 -MY_CDEPEND="
153 - dev-python/docopt[${PYTHON_USEDEP}]
154 - >=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]
155 - virtual/logger"
156 -
157 -DEPEND="
158 - ${MY_CDEPEND}
159 - dev-python/setuptools[${PYTHON_USEDEP}]
160 - test? (
161 - dev-python/pytest[${PYTHON_USEDEP}]
162 - dev-python/pytest-describe[${PYTHON_USEDEP}]
163 - dev-python/pytest-mock[${PYTHON_USEDEP}]
164 - )"
165 -
166 -# We need to block previous net-misc/openssh packages
167 -# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
168 -RDEPEND="${MY_CDEPEND}
169 - schema? ( !net-misc/openssh[ldap] )"
170 -
171 -DOCS=( README.md CHANGELOG.adoc )
172 -
173 -src_prepare() {
174 - sed -i -e 's/pyldap/python-ldap >= 3.0/' setup.py || die
175 - distutils-r1_src_prepare
176 -}
177 -
178 -python_test() {
179 - pytest -vv || die "Tests failed under ${EPYTHON}"
180 -}
181 -
182 -python_install_all() {
183 - distutils-r1_python_install_all
184 -
185 - if use schema; then
186 - insinto /etc/openldap/schema
187 - doins etc/openssh-lpk.schema
188 - fi
189 -
190 - local MY_DOCDIR="/usr/share/doc/${PF}/examples"
191 - insinto "${MY_DOCDIR}"
192 - doins etc/ldap.conf
193 -
194 - # We don't want to compress this small file to allow user
195 - # to diff configuration against upstream's default
196 - docompress -x "${MY_DOCDIR}"
197 -}