diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2015-09-02 10:40:50 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2015-09-02 10:42:56 -0400 |
| commit | 10af1d23d759ef64f97126f5a588b2ca49bdef00 (patch) | |
| tree | 81013505d5c69ea08eccd5dd8f08bc1d81bc02d8 /net-misc | |
| parent | dev-vcs/mercurial: Removed old. (diff) | |
| download | gentoo-10af1d23d759ef64f97126f5a588b2ca49bdef00.tar.gz gentoo-10af1d23d759ef64f97126f5a588b2ca49bdef00.tar.bz2 gentoo-10af1d23d759ef64f97126f5a588b2ca49bdef00.zip | |
net-misc/openconnect: Make CONFIG_TUN check non-fatal
Also move the check to pkg_pretend, and remove the custom error messaging.
Package-Manager: portage-2.2.20
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openconnect/metadata.xml | 2 | ||||
| -rw-r--r-- | net-misc/openconnect/openconnect-7.06-r1.ebuild | 30 |
2 files changed, 5 insertions, 27 deletions
diff --git a/net-misc/openconnect/metadata.xml b/net-misc/openconnect/metadata.xml index 4b425f03961b..7030dec29348 100644 --- a/net-misc/openconnect/metadata.xml +++ b/net-misc/openconnect/metadata.xml @@ -8,7 +8,7 @@ <maintainer> <email>mattsch@gmail.com</email> <name>Matthew Schultz</name> - <description>Proxied maintainer. Assign bugs to him.</description> + <description>Proxied maintainer. Copy on bugs.</description> </maintainer> <use> <flag name='gssapi'>Build GSSAPI support.</flag> diff --git a/net-misc/openconnect/openconnect-7.06-r1.ebuild b/net-misc/openconnect/openconnect-7.06-r1.ebuild index ab33ab3a05cb..76711e28543a 100644 --- a/net-misc/openconnect/openconnect-7.06-r1.ebuild +++ b/net-misc/openconnect/openconnect-7.06-r1.ebuild @@ -45,19 +45,10 @@ DEPEND="${DEPEND} 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 $? +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config } pkg_setup() { @@ -66,19 +57,6 @@ 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() { |