1 |
commit: 8f752261cf351aea4ded195296aec54efc1578dd |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 5 00:20:54 2016 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 5 00:20:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f752261 |
7 |
|
8 |
net-misc/openconnect: ebuild improvements |
9 |
|
10 |
EAPI=6. |
11 |
Drop linguas from IUSE. |
12 |
Move python_setup from pkg_setup to src_configure. |
13 |
|
14 |
Package-Manager: portage-2.3.0_p11 |
15 |
|
16 |
net-misc/openconnect/openconnect-9999.ebuild | 27 ++++++++++++--------------- |
17 |
1 file changed, 12 insertions(+), 15 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/openconnect/openconnect-9999.ebuild b/net-misc/openconnect/openconnect-9999.ebuild |
20 |
index c457dfe..20c579a 100644 |
21 |
--- a/net-misc/openconnect/openconnect-9999.ebuild |
22 |
+++ b/net-misc/openconnect/openconnect-9999.ebuild |
23 |
@@ -2,12 +2,12 @@ |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
# $Id$ |
26 |
|
27 |
-EAPI=5 |
28 |
+EAPI=6 |
29 |
|
30 |
PYTHON_COMPAT=( python2_7 ) |
31 |
PYTHON_REQ_USE="xml" |
32 |
|
33 |
-inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo |
34 |
+inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo-r1 |
35 |
|
36 |
if [[ ${PV} == 9999 ]]; then |
37 |
EGIT_REPO_URI="git://git.infradead.org/users/dwmw2/${PN}.git" |
38 |
@@ -26,10 +26,6 @@ HOMEPAGE="http://www.infradead.org/openconnect.html" |
39 |
LICENSE="LGPL-2.1 GPL-2" |
40 |
SLOT="0/5" |
41 |
IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs stoken" |
42 |
-ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW" |
43 |
-for lang in $ILINGUAS; do |
44 |
- IUSE="${IUSE} linguas_${lang}" |
45 |
-done |
46 |
|
47 |
DEPEND="dev-libs/libxml2 |
48 |
sys-libs/zlib |
49 |
@@ -63,30 +59,31 @@ pkg_pretend() { |
50 |
|
51 |
pkg_setup() { |
52 |
java-pkg-opt-2_pkg_setup |
53 |
- |
54 |
- if use doc; then |
55 |
- python-any-r1_pkg_setup |
56 |
- fi |
57 |
} |
58 |
|
59 |
src_unpack() { |
60 |
if [[ ${PV} == 9999 ]]; then |
61 |
git-r3_src_unpack |
62 |
fi |
63 |
- unpack ${A} |
64 |
+ default |
65 |
} |
66 |
|
67 |
src_prepare() { |
68 |
- epatch_user |
69 |
+ default |
70 |
if [[ ${PV} == 9999 ]]; then |
71 |
eautoreconf |
72 |
fi |
73 |
} |
74 |
|
75 |
src_configure() { |
76 |
- strip-linguas $ILINGUAS |
77 |
- echo ${LINGUAS} > po/LINGUAS |
78 |
- if ! use doc; then |
79 |
+ if [[ ${LINGUAS+set} == set ]]; then |
80 |
+ strip-linguas -u po |
81 |
+ echo "${LINGUAS}" > po/LINGUAS || die |
82 |
+ fi |
83 |
+ |
84 |
+ if use doc; then |
85 |
+ python_setup |
86 |
+ else |
87 |
# If the python cannot be found, the docs will not build |
88 |
sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die |
89 |
fi |