Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
Date: Fri, 18 Jan 2019 17:11:19
Message-Id: 1547831466.3b5beea6e4f4f524da0dfd6af9599761c3c501c8.floppym@gentoo
1 commit: 3b5beea6e4f4f524da0dfd6af9599761c3c501c8
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 18 16:54:46 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 18 17:11:06 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5beea6
7
8 net-vpn/openconnect: bump to 8.02
9
10 Drop java support due to lagging eclasses.
11
12 Package-Manager: Portage-2.3.56_p3, Repoman-2.3.12_p50
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14
15 net-vpn/openconnect/Manifest | 2 ++
16 ...connect-9999.ebuild => openconnect-8.02.ebuild} | 26 +++++++++-------------
17 net-vpn/openconnect/openconnect-9999.ebuild | 26 +++++++++-------------
18 3 files changed, 22 insertions(+), 32 deletions(-)
19
20 diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
21 index c0fc41c220a..178a317433b 100644
22 --- a/net-vpn/openconnect/Manifest
23 +++ b/net-vpn/openconnect/Manifest
24 @@ -1,2 +1,4 @@
25 DIST openconnect-7.08.tar.gz 1686133 BLAKE2B 265c43982b475ef1e49d7bf16e782c82b9ac48fbfbe61b5b8fe250505391edea8e5050e8cc3dc9b3cadb349f3842e13c05e431172e8c7488d9052ad15c93e87e SHA512 22f9b0bd4bd17e2ab91ff42b2464c89abba035fe705c037ba4d1042ace460c8738e20481783a1edc3b7dd6503fe9fcc7fdd188552811fb1525310e25a4c2f400
26 +DIST openconnect-8.02.tar.gz 1876135 BLAKE2B aef1f17702ddbbd392c3203f4235a6e24ca5ecbfe144652675ac8b98c0cbb85bf8cc5563295150cf385d3c0bc5a9b3ad84228706baa17f56dd62b798cbdd05d1 SHA512 690a51198aeaf4bb1cd0901b0799ac991712a29aa899fe735a7b5201683cd627556eebeefba01d0c752ba44ba0a6c5ee1c3647d692383f3f4b335e79c5337cbc
27 DIST vpnc-scripts-20180227.tar.gz 21241 BLAKE2B 2ba4c76121ba9c5d307233d6f8c91db03c8da4882b8f6dfeed335f7fcc30438df8fe0657a1177e7e551566b597e195cf41bb6e27e13b757a0c931e8574de9a5e SHA512 9a508426e9307213078ce57b59d25168647fa5d2e823b1085e93401259b0a52269e948c8292e4055babf3e8b3c087a23475b5caa2a43c11feb2df8b0d8843972
28 +DIST vpnc-scripts-20190117.tar.gz 21412 BLAKE2B 47adc50fe8940e6f5253321d2ef91abeb03e131dc0c1ba02f33f90c9a1ef75c0e838c0215c7ac419134c620b83a449e225d6ba5d77bb98d8f461406cb39eed9f SHA512 d01bb52532bd96f1bbf9735b8d5530c762c80205e53057f619db6090556887da1c91fe111da9937b452910f493e73dad26fcd20d3bd97248099d90ffa3060cde
29
30 diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-8.02.ebuild
31 similarity index 86%
32 copy from net-vpn/openconnect/openconnect-9999.ebuild
33 copy to net-vpn/openconnect/openconnect-8.02.ebuild
34 index e5bb8a5a9d5..5cd531dc817 100644
35 --- a/net-vpn/openconnect/openconnect-9999.ebuild
36 +++ b/net-vpn/openconnect/openconnect-8.02.ebuild
37 @@ -1,21 +1,21 @@
38 -# Copyright 1999-2018 Gentoo Authors
39 +# Copyright 1999-2019 Gentoo Authors
40 # Distributed under the terms of the GNU General Public License v2
41
42 -EAPI=6
43 +EAPI=7
44
45 PYTHON_COMPAT=( python2_7 )
46 PYTHON_REQ_USE="xml"
47
48 -inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
49 +inherit linux-info python-any-r1 readme.gentoo-r1
50
51 if [[ ${PV} == 9999 ]]; then
52 - EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git"
53 + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
54 inherit git-r3 autotools
55 else
56 ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
57 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
58 fi
59 -VPNC_VER=20180227
60 +VPNC_VER=20190117
61 SRC_URI="${ARCHIVE_URI}
62 ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
63
64 @@ -24,7 +24,7 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
65
66 LICENSE="LGPL-2.1 GPL-2"
67 SLOT="0/5"
68 -IUSE="doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken"
69 +IUSE="doc +gnutls gssapi libproxy libressl lz4 nls smartcard static-libs stoken"
70
71 DEPEND="
72 dev-libs/libxml2
73 @@ -47,10 +47,9 @@ DEPEND="
74 RDEPEND="${DEPEND}
75 sys-apps/iproute2
76 !<sys-apps/openrc-0.13"
77 -DEPEND="${DEPEND}
78 +BDEPEND="
79 virtual/pkgconfig
80 doc? ( ${PYTHON_DEPS} sys-apps/groff )
81 - java? ( >=virtual/jdk-1.6 )
82 nls? ( sys-devel/gettext )"
83
84 CONFIG_CHECK="~TUN"
85 @@ -60,7 +59,7 @@ pkg_pretend() {
86 }
87
88 pkg_setup() {
89 - java-pkg-opt-2_pkg_setup
90 + :
91 }
92
93 src_unpack() {
94 @@ -78,11 +77,6 @@ src_prepare() {
95 }
96
97 src_configure() {
98 - if [[ ${LINGUAS+set} == set ]]; then
99 - strip-linguas -u po
100 - echo "${LINGUAS}" > po/LINGUAS || die
101 - fi
102 -
103 if use doc; then
104 python_setup
105 else
106 @@ -101,7 +95,7 @@ src_configure() {
107 $(use_with gssapi)
108 $(use_with smartcard libpcsclite)
109 $(use_with stoken)
110 - $(use_with java)
111 + --without-java
112 )
113
114 econf "${myconf[@]}"
115 @@ -147,7 +141,7 @@ src_install() {
116 newins "${FILESDIR}"/openconnect.logrotate openconnect
117 keepdir /var/log/openconnect
118
119 - prune_libtool_files
120 + find "${ED}" -name '*.la' -delete || die
121
122 readme.gentoo_create_doc
123 }
124
125 diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
126 index e5bb8a5a9d5..5cd531dc817 100644
127 --- a/net-vpn/openconnect/openconnect-9999.ebuild
128 +++ b/net-vpn/openconnect/openconnect-9999.ebuild
129 @@ -1,21 +1,21 @@
130 -# Copyright 1999-2018 Gentoo Authors
131 +# Copyright 1999-2019 Gentoo Authors
132 # Distributed under the terms of the GNU General Public License v2
133
134 -EAPI=6
135 +EAPI=7
136
137 PYTHON_COMPAT=( python2_7 )
138 PYTHON_REQ_USE="xml"
139
140 -inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1
141 +inherit linux-info python-any-r1 readme.gentoo-r1
142
143 if [[ ${PV} == 9999 ]]; then
144 - EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git"
145 + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
146 inherit git-r3 autotools
147 else
148 ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
149 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
150 fi
151 -VPNC_VER=20180227
152 +VPNC_VER=20190117
153 SRC_URI="${ARCHIVE_URI}
154 ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
155
156 @@ -24,7 +24,7 @@ HOMEPAGE="http://www.infradead.org/openconnect.html"
157
158 LICENSE="LGPL-2.1 GPL-2"
159 SLOT="0/5"
160 -IUSE="doc +gnutls gssapi java libproxy libressl lz4 nls smartcard static-libs stoken"
161 +IUSE="doc +gnutls gssapi libproxy libressl lz4 nls smartcard static-libs stoken"
162
163 DEPEND="
164 dev-libs/libxml2
165 @@ -47,10 +47,9 @@ DEPEND="
166 RDEPEND="${DEPEND}
167 sys-apps/iproute2
168 !<sys-apps/openrc-0.13"
169 -DEPEND="${DEPEND}
170 +BDEPEND="
171 virtual/pkgconfig
172 doc? ( ${PYTHON_DEPS} sys-apps/groff )
173 - java? ( >=virtual/jdk-1.6 )
174 nls? ( sys-devel/gettext )"
175
176 CONFIG_CHECK="~TUN"
177 @@ -60,7 +59,7 @@ pkg_pretend() {
178 }
179
180 pkg_setup() {
181 - java-pkg-opt-2_pkg_setup
182 + :
183 }
184
185 src_unpack() {
186 @@ -78,11 +77,6 @@ src_prepare() {
187 }
188
189 src_configure() {
190 - if [[ ${LINGUAS+set} == set ]]; then
191 - strip-linguas -u po
192 - echo "${LINGUAS}" > po/LINGUAS || die
193 - fi
194 -
195 if use doc; then
196 python_setup
197 else
198 @@ -101,7 +95,7 @@ src_configure() {
199 $(use_with gssapi)
200 $(use_with smartcard libpcsclite)
201 $(use_with stoken)
202 - $(use_with java)
203 + --without-java
204 )
205
206 econf "${myconf[@]}"
207 @@ -147,7 +141,7 @@ src_install() {
208 newins "${FILESDIR}"/openconnect.logrotate openconnect
209 keepdir /var/log/openconnect
210
211 - prune_libtool_files
212 + find "${ED}" -name '*.la' -delete || die
213
214 readme.gentoo_create_doc
215 }
Report Message
Find on MARC Find on Google Groups