Version bump. Use java-pkg-opt-2.eclass for java support.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/net-misc/openconnect/ChangeLog b/net-misc/openconnect/ChangeLog
index 5ab1c50f1a6a621ae1fbacef8c362178e0fc68f7..77bbb706b56b102702fce1dd800984d6a2dd6de6 100644 (file)
--- a/net-misc/openconnect/ChangeLog
+++ b/net-misc/openconnect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openconnect
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/ChangeLog,v 1.37 2015/03/10 16:02:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/ChangeLog,v 1.38 2015/03/11 03:33:48 floppym Exp $
+
+*openconnect-7.04 (11 Mar 2015)
+
+  11 Mar 2015; Mike Gilbert <floppym@gentoo.org> +openconnect-7.04.ebuild:
+  Version bump. Use java-pkg-opt-2.eclass for java support.
 
   10 Mar 2015; Yixun Lan <dlan@gentoo.org> openconnect-7.02.ebuild:
   keyword for arm/arm64, test on cortex-a9 and a53 board

diff --git a/net-misc/openconnect/Manifest b/net-misc/openconnect/Manifest
index 218c29e1668b3320bd0a72ceb7ebba28c146da9b..b5605156d3c40524dba72a8c4adbe61dbe2b1bd2 100644 (file)
--- a/net-misc/openconnect/Manifest
+++ b/net-misc/openconnect/Manifest
@@ -15,6 +15,7 @@ DIST openconnect-5.99.tar.gz 932554 SHA256 a8c8c38054d7e89f22af44461ceb9c6ad8174
 DIST openconnect-6.00.tar.gz 1021981 SHA256 8a0c684dccac2447d204d544f6f466e41b21bce71e033ba58e2cb17b795ab81c SHA512 98c39fdbf6931bc20521de107752ffad1cd99381f4a221cc6ab3f43b6a779f5259ed082e05044c25d61bd32f7f3ade28adfdc3bc2535c2e6acb27375a9591e0c WHIRLPOOL dd3a037def1c192bb9c203b6a97185164f0a5f9ff224f64ab0b36482bd45d57ed4b83a79ac71186d93a29a6d4417c8fe0edd7fd08adf6df1f69f59cc807b6f2f
 DIST openconnect-7.01.tar.gz 1120489 SHA256 b950b93aa8d98b68e0b37d9b851f3c56d1c42b7e40969871a2c3e105e0c37184 SHA512 49346b4f1fc0e7f689a9911f48ae4a200323c325485ac7b0306deac643fa6964ad5245f09a012ecdfd0625e48b2b76c3f4f1fe92a77ef7fc14e1412558979898 WHIRLPOOL 0092a369f7867fe54088f6971739e07d8bd24d5fc49d99b260a7fe3459fc5d21cab238a2835ed8999b129634988a0d166f9fc5f7c8509e6c9d49772ea0034473
 DIST openconnect-7.02.tar.gz 1136137 SHA256 083626e6f2a87393dd13f379a222bf27b0d57fe1ca286d5f3731d4a444ee7169 SHA512 2452308913e5fabf6824dc46baee3ee8493153788b2f6ee0e2e2ab94fa0b00b1604e09140aba3f8a81e121addedd2ca20d3989509ac2d336b69e3c6a7b753757 WHIRLPOOL 0c10c572f0de0583dea746aff45d1ccab5e13623b854bdf665a55f60f74d135dcb2d94b98561985b0bac5fb923872e45f6fd1d3637209875390871cd7783e351
+DIST openconnect-7.04.tar.gz 1205264 SHA256 baac1fdf8f5f9debe1f91a2f3ca6895cf24ef0f8b2d8c2c67f5ce6789f28663b SHA512 72b00e66690d3a21f79145f12a970ad14c84e7aabb91d64d72484849a6de949b29d96cffa830e22c967fe74c76847e7982d1ce0cda16538c5b50097c16f7b69e WHIRLPOOL 09993ff2e5d67220f13f6cfa9b19512539bc14e611b5d5fe4bde192a0657760485152aefd624e7f95af1084a94753fd9bdd4866ad4e913989b7e67b5021774ce
 DIST openconnect-script-20121108205904.tar.gz 6380 SHA256 99fb6c72c13b5724766a952e392b75774771f220f59793e5d2576d7e3412555b SHA512 089650538f035875c205bed0190e44ed8176a138bbe2f635ac5335050c3b831fc85fbd61448ddaf7cb540c0a5d9b32f8f909e1fd5be188bfef07e721d4656545 WHIRLPOOL 3dc2b820afe49cc59c96d514f166d94fdbc3db9f3edbace69e41ae7e604263a834fff0a1fa7be806ff88c328a75de4306ec159e4022d43cd245addf34615efb2
 DIST openconnect-script-20130310115608.tar.xz 6172 SHA256 35743e02dce5e04eb5921237267eea922c68fb3a48c820c7d45c88b37fa6e456 SHA512 10ddfcd322a1a5748f5a7a490e631571f4e9451f831bb1bf80edac6cd0bf2c8523e21fff10ead2162a78cc60551f2a62fd8d65501c5daf9df8c863d30fad8b3f WHIRLPOOL 263076480254e922c91a8f1c7abed1256c800257889f74e25f26c44a918ca4d34109c0fa3aa8046ca3751b5755034776c28a815482d03d40a76bae8524c62408
 DIST openconnect-script-20140311.tar.xz 6240 SHA256 908c667507132ef0269b6d1511ee8b89ae22dfa272c9ffa7ea24c1fa1b31fceb SHA512 043443c615b076d61ea8c464a6b7b68ca526e636313488501459f6eca6974c276d3a60e165fb23f017858a18b255f9c9e1ad80736cb852756d7fe8f3bc5aa917 WHIRLPOOL ae5632be17d72bf7992814e0262cb862ee0bec48dbd119d33bc94b3647755087c2427418ea0064c7560be6e06dc83a2702587fab3403afccfc90d3df8acd0a9f
@@ -29,22 +30,13 @@ EBUILD openconnect-5.99.ebuild 4752 SHA256 8b7fb39897ec1f11f6af8ea1619260f9b88de
 EBUILD openconnect-6.00.ebuild 4673 SHA256 748f79a5876d5528beacabfc1193d205dd1bfd285cad56dde2ce38cced070afa SHA512 143c0a7ad8a768fd497e664583e1224aa4352c6024a98035942a33c413a5ea1a03e2edda12ba3cef4ea6ffa644021442a3e8d835a66b8a1e9864ef7c025d3cb3 WHIRLPOOL 050fa060dd88fac063f1b088a1cc9dd8c65a57fd2d79abc8be2724c9c42c857eebf1a51d62d92f46be9f4b9fc0e797ed21cca35e52e52e2985876f1f4b4749f6
 EBUILD openconnect-7.01.ebuild 4441 SHA256 ea5898151ebd944797e12c8af17834435eceb95cf8589d95a86d3ae1c9a91f92 SHA512 10fb1b2ee297a20771bd4bfd77a3621e953ef485d917a9200a55285eb8f80511db9fd85f6c20ce2e964b7da7339ae5b13cc9359321b36c8d3d64bef44a35d082 WHIRLPOOL f0168416c53044c5116cce71860d52db0c10f1d806aefc722b18ce6adb3c1c3849b1bc6feb4aafa0d91c73d09607ad787e0cb191c156f4cc8d7adbfbd34f1a59
 EBUILD openconnect-7.02.ebuild 4375 SHA256 f81a50e41a8f8acaae06148bfe58629ec218234ac5dd838d8e5fcb5c667189ee SHA512 b2074ee48b7825613c1b31a0e9a0e170ab268e18b6b50fbf1bc28c1f1abcde68886f9d91aa8839db6fa4630d71d43c1d211fb97234bf5c0b88ceabd8236bf3d7 WHIRLPOOL 47343ffed34a1638bfed97695f7a1be4b04d08c40abb50785369022a953b63e33994e9746c7dc6820758ba5d6bec5d2935104cf1318936c355294e384c26bfe8
-MISC ChangeLog 5952 SHA256 41334afde28dbd04d538b883e51cd294942b9603cc1dcd0430fb83189f3b60f6 SHA512 60c998e0141540fe1425f7ec0fe737eefc31c669e3f5ec0eea32a130bd6587bef70deba653a79b3380ff86dbf69a9120da8fe86a752eb56f1f8d2c6bbd9e10ca WHIRLPOOL 3ee63e75d7af2423a2132c1581fde8f2e4f38cbe36ec5b2d667d3b4b9f5705edeaf7e0ae42503e44f5d7025b1eb75c45c074da55709e7ba3f0c19ef1c08f91c8
+EBUILD openconnect-7.04.ebuild 4403 SHA256 afe059feb87e6fa84ca372bb7e153971b9591a827d2417b13a453e29157d8dc1 SHA512 7e02ebe1757bd12e50ef89dd3f9b6f4d86df19f1835ccd053f5df5183baaf94d326974402b722b6066150fb4f686e3df8844422471ac4b6cb0bf370ad5b0ab06 WHIRLPOOL 00ff811b38311d0fd98a9923a4c87f78ef35aafa710c6c2a98bf5bf59e07e6a6cb99bb915d788638a85be1366f9e599b212e5376bb14027109687e847919ff9a
+MISC ChangeLog 6124 SHA256 258e5290fcfd3fdac1a51f0c81ae4bd70a44124f6865f9d3908e9a372d1d9b0f SHA512 894d62128506b2d157ff58aa42494f48f256a23985ac79c8ee2b8c72f8471987df21a4c6a52a7d0aca2eb4814190728a0dfa9367a4de70e8fdeda717ab285b9e WHIRLPOOL d073f5108e277ecfff3d7e168c8226ed664df30c562da8cdecbc88cadb0fa0a89d98a508a6e2fbd8dffdae2dbfdf8b497e03a15e905d9f4706561264aa2bcabb
 MISC metadata.xml 606 SHA256 c62dfd9f1996b2318f603d0d66b31cbe034773873d844dd344c86fecbf1f22f4 SHA512 2ebe6f9936c7dd7762874f9f8a5c5b9c206bb9af806990af5c9a85fdc1911a6078a7d6be73afbe6e018f777c61caeace9c0aa6710f1ab90446ae8609cdb6285a WHIRLPOOL fe571cb438ebe0e881b791e66acffccac15aba941d90694c751df6550b53bb986a17adfafbf6129123cf5ecde7a50ad4ea8f9f87622b12cd40c8462b79a32cdc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU/xWuAAoJEJIMDbyqvv1V0dEQAM4pkf+ZwpIOuBEqc2ov++Y8
-sQ3EXiURJ9oobQowvY/Mn5p7RrFTGWGxrc3RXICNu8QvFWxhNy56sqy2SGiXyvEt
-cXfghAx+Apdm0gMZKTuBbnCmazO0muEjkLLu3r6BsalPSjqQlMjG0sX3REu7yzYL
-64usN++bqqVpXrxmaZeaxO0ZbUsTR29Tn0NiWbcFi1YYOVpYmEHx02yYfj6X2RP4
-JeKkDEvLkr55dxRShJ8aGZKt5d0tTfBIJDHKuzWBFwo5gwCYMEFTQkyI3KEbf50j
-JjOFceDOXNFPd6mh8+tR8lhfPzTlVJEBKzkWxD/x5FV/W7taIvYheRj78pX4JRRD
-fkaCP2bS4IphiALGwXrYQMaVbNrE+1zSb5oDS2YlVgDna2AyuCNbwvXaY5Sbabaw
-TeGxfkLGCZiAC0/5OjTA07L2T9MPIMFZgKJJ2tAzcrRfn556ftbINI3ZiW70nGWQ
-wrGEzD109Zk5W66pcPMHMADhaZmWHGaKwvoK3OG1iAWJBRuJRMHj+Z42dMHTWCoG
-JMvwiO7zGwbgMHIKTHj1njLi0NaF0TcuXUJKdZljjSMsXybACKn9XBey610XNLFK
-F8vsmJ6MMwkILgrKzNs94cQV3uK/rcavmwFDF4EFiR0D+bIHcP0lygNcuYEdnh0f
-TEP1YIm9h26AFdZ1THlG
-=PPQa
+iF4EAREIAAYFAlT/t6EACgkQC77qH+pIQ6SiewEAxQdRzgzwI+5uOcx5/NUb/UX2
+iywDoFM2m+pFwzF1aToBAILAb+bkvLskOJ2yCq0nSCBnK/RZsQytmawsJcjoIRvk
+=l1kW
 -----END PGP SIGNATURE-----

diff --git a/net-misc/openconnect/openconnect-7.04.ebuild b/net-misc/openconnect/openconnect-7.04.ebuild
new file mode 100644 (file)
index 0000000..afed400
--- /dev/null
+++ b/net-misc/openconnect/openconnect-7.04.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openconnect/openconnect-7.04.ebuild,v 1.1 2015/03/11 03:33:48 floppym Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils java-pkg-opt-2 linux-info python-any-r1
+
+DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
+HOMEPAGE="http://www.infradead.org/openconnect.html"
+VPNC_VER=20140806
+SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
+       ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc +gnutls gssapi java libproxy nls static-libs"
+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"
+for lang in $ILINGUAS; do
+       IUSE="${IUSE} linguas_${lang}"
+done
+
+DEPEND="dev-libs/libxml2
+       sys-libs/zlib
+       !gnutls? (
+               >=dev-libs/openssl-1.0.1h:0[static-libs?]
+       )
+       gnutls? (
+               >=net-libs/gnutls-3[static-libs?] dev-libs/nettle
+               app-misc/ca-certificates
+       )
+       gssapi? ( app-crypt/mit-krb5 )
+       libproxy? ( net-libs/libproxy )
+       nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+       sys-apps/iproute2"
+DEPEND="${DEPEND}
+       virtual/pkgconfig
+       doc? ( ${PYTHON_DEPS} sys-apps/groff )
+       java? ( >=virtual/jdk-1.6 )
+       nls? ( sys-devel/gettext )"
+
+tun_tap_check() {
+       ebegin "Checking for TUN/TAP support"
+       if { ! linux_chkconfig_present TUN; }; then
+               eerror "Please enable TUN/TAP support in your kernel config, found at:"
+               eerror
+               eerror "  Device Drivers  --->"
+               eerror "    [*] Network device support  --->"
+               eerror "      <*>   Universal TUN/TAP device driver support"
+               eerror
+               eerror "and recompile your kernel ..."
+               die "no CONFIG_TUN support detected!"
+       fi
+       eend $?
+}
+
+pkg_setup() {
+       java-pkg-opt-2_pkg_setup
+
+       if use doc; then
+               python-any-r1_pkg_setup
+       fi
+
+       if use kernel_linux; then
+               get_version
+               if linux_config_exists; then
+                       tun_tap_check
+               else
+                       ewarn "Was unable to determine your kernel .config"
+                       ewarn "Please note that OpenConnect requires CONFIG_TUN to be set in your"
+                       ewarn "kernel .config, Without it, it will not work correctly."
+                       # We don't die here, so it's possible to compile this package without
+                       # kernel sources available. Required for cross-compilation.
+               fi
+       fi
+}
+
+src_configure() {
+       strip-linguas $ILINGUAS
+       echo ${LINGUAS} > po/LINGUAS
+       if ! use doc; then
+               # If the python cannot be found, the docs will not build
+               sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
+       fi
+
+       # stoken and liboath not in portage
+       econf \
+               --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
+               $(use_enable static-libs static) \
+               $(use_enable nls ) \
+               $(use_with !gnutls openssl) \
+               $(use_with gnutls ) \
+               $(use_with libproxy) \
+               --without-stoken \
+               --without-liboath \
+               $(use_with gssapi) \
+               $(use_with java)
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+
+       dodoc AUTHORS TODO
+       newinitd "${FILESDIR}"/openconnect.init.in-r3 openconnect
+       dodir /etc/openconnect
+       insinto /etc/openconnect
+       newconfd "${FILESDIR}"/openconnect.conf.in openconnect
+       exeinto /etc/openconnect
+       newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/openconnect.logrotate openconnect
+       keepdir /var/log/openconnect
+
+       # Remove useless .la files
+       prune_libtool_files --all
+}
+
+pkg_postinst() {
+       if [[ -z ${REPLACING_VERSIONS} ]]; then
+               elog "The init script for openconnect has changed and now supports multiple vpn tunnels."
+               elog
+               elog "You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d"
+               elog "instead of calling it directly:"
+               elog
+               elog "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0"
+               elog
+               elog "You can then start the vpn tunnel like this:"
+               elog
+               elog "/etc/init.d/openconnect.vpn0 start"
+               elog
+               elog "If you would like to run preup, postup, predown, and/or postdown scripts,"
+               elog "You need to create a directory in /etc/openconnect with the name of the vpn:"
+               elog
+               elog "mkdir /etc/openconnect/vpn0"
+               elog
+               elog "Then add executable shell files:"
+               elog
+               elog "mkdir /etc/openconnect/vpn0"
+               elog "cd /etc/openconnect/vpn0"
+               elog "echo '#!/bin/sh' > preup.sh"
+               elog "cp preup.sh predown.sh"
+               elog "cp preup.sh postup.sh"
+               elog "cp preup.sh postdown.sh"
+               elog "chmod 755 /etc/openconnect/vpn0/*"
+       fi
+}