Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/ssh-ldap-pubkey/
Date: Fri, 15 Mar 2019 09:35:38
Message-Id: 1552642528.96af924862032f6a2da72dcc5f3bf6b0ce3d3373.mgorny@gentoo
1 commit: 96af924862032f6a2da72dcc5f3bf6b0ce3d3373
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 15 09:33:17 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 15 09:35:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96af9248
7
8 sys-auth/ssh-ldap-pubkey: Remove old revisions
9
10 Remove old revisions as part of dev-python/pyldap cleanup.
11
12 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
13
14 .../ssh-ldap-pubkey-1.3.0-r1.ebuild | 71 ----------------------
15 .../ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild | 66 --------------------
16 2 files changed, 137 deletions(-)
17
18 diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
19 deleted file mode 100644
20 index fb9c5709b98..00000000000
21 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r1.ebuild
22 +++ /dev/null
23 @@ -1,71 +0,0 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 -# Distributed under the terms of the GNU General Public License v2
26 -
27 -EAPI="6"
28 -
29 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
30 -inherit distutils-r1
31 -
32 -DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
33 -HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
34 -
35 -if [[ ${PV} == "9999" ]]; then
36 - EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
37 -
38 - inherit git-r3
39 -else
40 - SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
41 - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
42 -fi
43 -
44 -LICENSE="MIT"
45 -SLOT="0"
46 -IUSE="schema test"
47 -RESTRICT="!test? ( test )"
48 -
49 -MY_CDEPEND="
50 - dev-python/docopt[${PYTHON_USEDEP}]
51 - >=dev-python/python-ldap-3.0[${PYTHON_USEDEP}]
52 - virtual/logger"
53 -
54 -DEPEND="
55 - ${MY_CDEPEND}
56 - dev-python/setuptools[${PYTHON_USEDEP}]
57 - test? (
58 - dev-python/pytest[${PYTHON_USEDEP}]
59 - dev-python/pytest-describe[${PYTHON_USEDEP}]
60 - dev-python/pytest-mock[${PYTHON_USEDEP}]
61 - )"
62 -
63 -# We need to block previous net-misc/openssh packages
64 -# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
65 -RDEPEND="${MY_CDEPEND}
66 - schema? ( !net-misc/openssh[ldap] )"
67 -
68 -DOCS=( README.md CHANGELOG.adoc )
69 -
70 -src_prepare() {
71 - sed -i -e 's/pyldap/python-ldap >= 3.0/' setup.py || die
72 - distutils-r1_src_prepare
73 -}
74 -
75 -python_test() {
76 - pytest -vv || die "Tests failed under ${EPYTHON}"
77 -}
78 -
79 -python_install_all() {
80 - distutils-r1_python_install_all
81 -
82 - if use schema; then
83 - insinto /etc/openldap/schema
84 - doins etc/openssh-lpk.schema
85 - fi
86 -
87 - local MY_DOCDIR="/usr/share/doc/${PF}/examples"
88 - insinto "${MY_DOCDIR}"
89 - doins etc/ldap.conf
90 -
91 - # We don't want to compress this small file to allow user
92 - # to diff configuration against upstream's default
93 - docompress -x "${MY_DOCDIR}"
94 -}
95
96 diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
97 deleted file mode 100644
98 index 7d04c5fd300..00000000000
99 --- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0.ebuild
100 +++ /dev/null
101 @@ -1,66 +0,0 @@
102 -# Copyright 1999-2018 Gentoo Authors
103 -# Distributed under the terms of the GNU General Public License v2
104 -
105 -EAPI="6"
106 -
107 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
108 -inherit distutils-r1
109 -
110 -DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
111 -HOMEPAGE="https://github.com/jirutka/ssh-ldap-pubkey"
112 -
113 -if [[ ${PV} == "9999" ]]; then
114 - EGIT_REPO_URI="https://github.com/jirutka/${PN}/${PN}.git"
115 -
116 - inherit git-r3
117 -else
118 - SRC_URI="https://github.com/jirutka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
119 - KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
120 -fi
121 -
122 -LICENSE="MIT"
123 -SLOT="0"
124 -IUSE="schema test"
125 -RESTRICT="!test? ( test )"
126 -
127 -MY_CDEPEND="
128 - dev-python/docopt[${PYTHON_USEDEP}]
129 - dev-python/pyldap[${PYTHON_USEDEP}]
130 - virtual/logger"
131 -
132 -DEPEND="
133 - ${MY_CDEPEND}
134 - dev-python/setuptools[${PYTHON_USEDEP}]
135 - test? (
136 - dev-python/pytest[${PYTHON_USEDEP}]
137 - dev-python/pytest-describe[${PYTHON_USEDEP}]
138 - dev-python/pytest-mock[${PYTHON_USEDEP}]
139 - )"
140 -
141 -# We need to block previous net-misc/openssh packages
142 -# to avoid file collision on "/etc/openldap/schema/openssh-lpk.schema"
143 -RDEPEND="${MY_CDEPEND}
144 - schema? ( !net-misc/openssh[ldap] )"
145 -
146 -DOCS=( README.md CHANGELOG.adoc )
147 -
148 -python_test() {
149 - pytest -vv || die "Tests failed under ${EPYTHON}"
150 -}
151 -
152 -python_install_all() {
153 - distutils-r1_python_install_all
154 -
155 - if use schema; then
156 - insinto /etc/openldap/schema
157 - doins etc/openssh-lpk.schema
158 - fi
159 -
160 - local MY_DOCDIR="/usr/share/doc/${PF}/examples"
161 - insinto "${MY_DOCDIR}"
162 - doins etc/ldap.conf
163 -
164 - # We don't want to compress this small file to allow user
165 - # to diff configuration against upstream's default
166 - docompress -x "${MY_DOCDIR}"
167 -}