[gentoo-commits] repo/gentoo:master commit in: net-misc/openconnect/

[Mike Gilbert]

commit:     f29adf534acbc354b1d27b2dd689108bf64f5ff1
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 16:19:06 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 16:21:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f29adf53

net-misc/openconnect: general ebuild cleanup

Package-Manager: portage-2.3.2_p8

 net-misc/openconnect/openconnect-9999.ebuild | 37 ++++++++++++++--------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/net-misc/openconnect/openconnect-9999.ebuild 
b/net-misc/openconnect/openconnect-9999.ebuild
index 7e5fb54..5f4b500 100644
--- a/net-misc/openconnect/openconnect-9999.ebuild
+++ b/net-misc/openconnect/openconnect-9999.ebuild
@@ -87,24 +87,25 @@ src_configure() {
        if use doc; then
                python_setup
        else
-               # If the python cannot be found, the docs will not build
-               sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
+               export PYTHON=/bin/false
        fi
 
-       # liboath not in portage
-       econf \
-               --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
-               --without-openssl-version-check \
-               $(use_enable static-libs static) \
-               $(use_enable nls ) \
-               $(use_with !gnutls openssl) \
-               $(use_with gnutls ) \
-               $(use_with libproxy) \
-               $(use_with lz4) \
-               $(use_with gssapi) \
-               $(use_with smartcard libpcsclite) \
-               $(use_with stoken) \
+       local myconf=(
+               --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
+               --without-openssl-version-check
+               $(use_enable static-libs static)
+               $(use_enable nls)
+               $(use_with !gnutls openssl)
+               $(use_with gnutls)
+               $(use_with libproxy)
+               $(use_with lz4)
+               $(use_with gssapi)
+               $(use_with smartcard libpcsclite)
+               $(use_with stoken)
                $(use_with java)
+       )
+
+       econf "${myconf[@]}"
 }
 
 DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
@@ -135,9 +136,8 @@ chmod 755 /etc/openconnect/vpn0/*
 "
 
 src_install() {
-       emake DESTDIR="${D}" install
+       default
 
-       dodoc AUTHORS TODO
        newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
        dodir /etc/openconnect
        insinto /etc/openconnect
@@ -148,8 +148,7 @@ src_install() {
        newins "${FILESDIR}"/openconnect.logrotate openconnect
        keepdir /var/log/openconnect
 
-       # Remove useless .la files
-       prune_libtool_files --all
+       prune_libtool_files
 
        readme.gentoo_create_doc
 }