net-vpn/openconnect: adopt 9999 ebuild to recent upstream changes

Change the way we disable docs, see previous 8.03 ebuild, and bump
vpnc-script version even beyond that, to 20190611.

Closes: https://github.com/gentoo/gentoo/pull/12307
Signed-off-by: Henning Schild <henning@hennsch.de>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 90bbaafe563435f70b672b8678b15b885a751a5f..6cb9e20fc5f1aba100867f1313e9f31c6e9ec405 100644 (file)
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -4,3 +4,4 @@ DIST openconnect-8.03.tar.gz 1885587 BLAKE2B 272d1b5afda46d05dcfbaee224ad42303ea
 DIST vpnc-scripts-20180227.tar.gz 21241 BLAKE2B 2ba4c76121ba9c5d307233d6f8c91db03c8da4882b8f6dfeed335f7fcc30438df8fe0657a1177e7e551566b597e195cf41bb6e27e13b757a0c931e8574de9a5e SHA512 9a508426e9307213078ce57b59d25168647fa5d2e823b1085e93401259b0a52269e948c8292e4055babf3e8b3c087a23475b5caa2a43c11feb2df8b0d8843972
 DIST vpnc-scripts-20190117.tar.gz 21412 BLAKE2B 47adc50fe8940e6f5253321d2ef91abeb03e131dc0c1ba02f33f90c9a1ef75c0e838c0215c7ac419134c620b83a449e225d6ba5d77bb98d8f461406cb39eed9f SHA512 d01bb52532bd96f1bbf9735b8d5530c762c80205e53057f619db6090556887da1c91fe111da9937b452910f493e73dad26fcd20d3bd97248099d90ffa3060cde
 DIST vpnc-scripts-20190425.tar.gz 21388 BLAKE2B 774b9f64429e61396c3d291b3822355c4f206bd06af00d8f7599b197e6e3b5f5beb44ad41f9fc6328dda9a0283dce736f278fc66a6c40f2fc210f324112edcea SHA512 9be7f8e89fc4aeaa55b54db69e0ea7636b4fad79cd0ede99811aab10460ae06e1e9f051f9412ce36f3ab357b72a31140a03a496eba171dd21555efdf46fcb7c1
+DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a

diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 58a0374678c33b3b9ac6dcdc870d47290c8586fd..59c24454d732136ad01465aa3761d5058840d39f 100644 (file)
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit linux-info python-any-r1 readme.gentoo-r1
@@ -15,7 +15,7 @@ else
        ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
        KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
-VPNC_VER=20190117
+VPNC_VER=20190611
 SRC_URI="${ARCHIVE_URI}
        ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
 
@@ -81,7 +81,7 @@ src_configure() {
        if use doc; then
                python_setup
        else
-               export PYTHON=/bin/false
+               sed -i -e 's/^build_www=yes/build_www=no/' "${S}"/configure || die
        fi
 
        # Used by tests if userpriv is disabled