gentoo resync : 16.01.2018

9 files changed, 11 insertions, 283 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d50ec18862be..3e94664edc54 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/freelan/Manifest b/net-vpn/freelan/Manifest
index 34e4e7d384ba..e009e7a07ab7 100644
--- a/net-vpn/freelan/Manifest
+++ b/net-vpn/freelan/Manifest
@@ -1,10 +1,4 @@
-AUX boost158.patch 1433 BLAKE2B 1fcb0d99a10e1660d1e2c985cb38b02ce55d2fbf8bb87e33dda2a037120f157b1e786aacbe3c58026949c78de94034d752bf58304f541462788b055b2f05dc94 SHA512 862765ea32542275777a50ca0c6cc135525dc4cab8c6db184f85aaa24daf7e34ca809e6c9b7b52c49c68d5d3aade5d5e5c0eb60816f4f84d8fccf754e5841640
-AUX boost163.patch 1448 BLAKE2B ce29c06d9ab05b7048ce6b4e1521ca787c25323085a4a698084180af4fddb364391d1214180de657f3c553fd58685e05fe667f871e3e83026960f4ff9788cba4 SHA512 ce67970a5d24314318c6c418178b154a7577e4568571129995961b318b087595bb7133d734c05e6d741836f99b2c978293fd786fc538b9a057fe9c85b164b318
-AUX gcc7.patch 1821 BLAKE2B 4dd7e687481098b2e69bf381f1715e200bf084c47645da8b043603a1874a6d6dbbfecdd50399ced7d14ed02ed8bd1d990a65d81a1666edc6141300829edfd42a SHA512 8448139692db3fe01ae45fa36f378e036ff947f8e500bb97c74326bf27a28479bc1981ff16c1a15288905e0f3fd76b05d16588437038fc47abee23a77388f9ea
-AUX glibc225.patch 710 BLAKE2B 27fd063dccca4d251702f0b2618df93e2f6a5f9d60e42ca6055be15efc3339a0781d44d73f6e644652b74c3a1e4300bdbcee0ecb78826d14a32b1382269fcf38 SHA512 150d3d259aa54575bf77b7ba97fb9e8bfad0d9eec14a82098a8ab6e1151696b93f90f9ba60b1570f22468806f3da26514cdfb12351071a7fbced4ba15dbac549
-AUX mf.patch 1004 BLAKE2B bb2f9a2148b72184b8a58d94036514339046175b29ab9a0db62ab2ccec1b1bf9d64c1809b3334f1a017f2ac68c095848052ff10eb26fa48413247733453051c9 SHA512 1753cd420ec43d3aab05b28326ebb41c43ce8d3437bfa3703bc90b3b86d0a65cfbba17aff3b99057900dc84bb54c815c0178441171ba51029aefec0a131f6313
 AUX openrc/freelan.initd 263 BLAKE2B d0a111fc41f2b5774e5073fca1e68df333c180f95b0335d4f18cf681b9cf238a55203b13bf3aee757497234c4e2feb1732bebe03095ec729e79526ef5f55147a SHA512 bf8ac87cbfdf83ab38e0a90f85d598abf25028682cd94b6b44de69d02daecf35d35403e2a3e63c10cb6a99f783f7a72bb58fd0e0cb00013c32fe2aba4b179f23
-AUX prefix.patch 3282 BLAKE2B 8e681dd73b5bba8668c540f0da8ffe9dad90875c199b968ac867c6a3e60470a9a1b3098722fe6f4ddcc0dacefbf3c6b437cbec2ae153ac305258e9554480737d SHA512 8a4751cd2cc9933e7fd3ae47c03292f2752416002b8ce6fe1ff651aa7c341d6195a640d51f0c88e25113084aeb4e2e88eef91f9b97936b46da6ec600d0efe799
-DIST freelan-2.0.tar.gz 4330112 BLAKE2B 2b900f8b04b4eb19334d4a7bac29b024ff59e37d66df533cbc84d346049994e022ffb71eae8b5c418a727bb01fc4bcdc190ffed7c49023df98aa60a2437cf0af SHA512 72e5381fdad4d413f4f85c4789ad78c38360a300da6f49a3e8119fe2cacb7a7b05ce16ddcbfcdc008e1c2848c535648967e92f082338fdfb2c1b8e43f53291cc
-EBUILD freelan-2.0.ebuild 1370 BLAKE2B 3ccc68f4b3f2cb3da87642499da33de5ea1581688e895050d7fde46eca9183cbd58b75c50fbb5fdaae3d98174b328c29a83b03df56aa2f1734f4b72ca16a9133 SHA512 5dbdb99545cadc5d840d6b0ae0f34e9e8082fbf8cd312f8f3dcad1ba89b480d396b826d8a7071b6f2caa4e713954592327ca830921913522e5536030d113205d
+DIST freelan-2.1.tar.gz 4340411 BLAKE2B 78365f8f4d6334313abd824a68a06470a34e6e62b17fae1f32e3d655c1210892ccbb17ba81b02930e1554d73adbaea171562365dcda091677513d15506f631fe SHA512 f01f0021ab54450be8cf81b3ee58a74ff02e421ccc0e6b7a3733bbd721dedb14a0bf8c6a9e01d20f000e4b232c89fc358834e696211e239c899e4926e6682e1a
+EBUILD freelan-2.1.ebuild 1235 BLAKE2B 81839cfb9c05991476b9796269ae2916c5778dba3c7303f73d804d7bd2a20b991c22f1cf2b95601611b8c5b693702bff560ecc6f1f0d2dffee38621d6cd9c6fb SHA512 225276c0d0f8984049f5d45e9c05271e9921c147fcc86b918a7a30584e739ec77fa5d2072d10bfc20488e840ccd855b1ccc6c7de6845e19f702e38a96ee8842b
 MISC metadata.xml 340 BLAKE2B 0357b1c5d1b93bc0eda1ef8fab979eff07eff843168adcf3c81ca210d129b8ff84167704c49c2d1940e4e9aea0ac50f11ec80da36a88e988cb66c8b7b109684b SHA512 864027adfa1b5b2947c04b737a862aabb9dee4f411d837489cad78bd0e46cd92d31a71ee1167dc938ec0dd23d8005dc1255df6d1b21820f05c3b420f1e280608
diff --git a/net-vpn/freelan/files/boost158.patch b/net-vpn/freelan/files/boost158.patch
deleted file mode 100644
index 7d5bb740f7bd..000000000000
--- a/net-vpn/freelan/files/boost158.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 68d18a5a7dd7fad8638409d46d144d33a30b54ce
-Author: Mihai Bişog <mihai.bisog@gmail.com>
-Date:   Sat Aug 1 15:18:35 2015 +0300
-
-    Fixed compilation errors when compiling against boost 1.58
-
-diff --git a/libs/asiotap/include/asiotap/types/endpoint.hpp b/libs/asiotap/include/asiotap/types/endpoint.hpp
-index 125e1b4..318b7e6 100644
---- a/libs/asiotap/include/asiotap/types/endpoint.hpp
-+++ b/libs/asiotap/include/asiotap/types/endpoint.hpp
-@@ -350,6 +350,9 @@ namespace asiotap
- 	 */
- 	std::istream& operator>>(std::istream& is, endpoint& value);
- 
-+// Note: this operator is defined in boost variant as of version 1.58. Keeping it around will
-+// introduce overload resolution ambiguity.
-+#if BOOST_VERSION < 105800
- 	/**
- 	 * \brief Compare two endpoints.
- 	 * \param lhs The left argument.
-@@ -360,6 +363,7 @@ namespace asiotap
- 	{
- 		return !(lhs == rhs);
- 	}
-+#endif
- 
- 	/**
- 	 * \brief Get an endpoint with a default port.
-diff --git a/libs/freelan/src/curl.cpp b/libs/freelan/src/curl.cpp
-index 342bb79..392d734 100644
---- a/libs/freelan/src/curl.cpp
-+++ b/libs/freelan/src/curl.cpp
-@@ -146,7 +146,7 @@ namespace freelan
- 
- 	void curl::set_proxy(const asiotap::endpoint& proxy)
- 	{
--		if (proxy != asiotap::hostname_endpoint::null())
-+		if (proxy != asiotap::endpoint(asiotap::hostname_endpoint::null()))
- 		{
- 			set_option(CURLOPT_PROXY, static_cast<const void*>(boost::lexical_cast<std::string>(proxy).c_str()));
- 		}
diff --git a/net-vpn/freelan/files/boost163.patch b/net-vpn/freelan/files/boost163.patch
deleted file mode 100644
index 33636ef0d0b1..000000000000
--- a/net-vpn/freelan/files/boost163.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: freelan-2.0/libs/freelan/src/core.cpp
-===================================================================
---- freelan-2.0.orig/libs/freelan/src/core.cpp
-+++ freelan-2.0/libs/freelan/src/core.cpp
-@@ -1766,7 +1766,8 @@ namespace freelan
- 			{
- 				m_logger(fscp::log_level::information) << "IPv4 address: " << m_configuration.tap_adapter.ipv4_address_prefix_length;
- 
--				tap_config.ipv4.network_address = { m_configuration.tap_adapter.ipv4_address_prefix_length.address(), m_configuration.tap_adapter.ipv4_address_prefix_length.prefix_length() };
-+				asiotap::base_ip_network_address<boost::asio::ip::address_v4> a(m_configuration.tap_adapter.ipv4_address_prefix_length.address(), m_configuration.tap_adapter.ipv4_address_prefix_length.prefix_length());
-+				tap_config.ipv4.network_address = a;
- 			}
- 			else
- 			{
-@@ -1778,7 +1779,8 @@ namespace freelan
- 			{
- 				m_logger(fscp::log_level::information) << "IPv6 address: " << m_configuration.tap_adapter.ipv6_address_prefix_length;
- 
--				tap_config.ipv6.network_address = { m_configuration.tap_adapter.ipv6_address_prefix_length.address(), m_configuration.tap_adapter.ipv6_address_prefix_length.prefix_length() };
-+				asiotap::base_ip_network_address<boost::asio::ip::address_v6> a(m_configuration.tap_adapter.ipv6_address_prefix_length.address(), m_configuration.tap_adapter.ipv6_address_prefix_length.prefix_length());
-+				tap_config.ipv6.network_address = a;
- 			}
- 			else
- 			{
diff --git a/net-vpn/freelan/files/gcc7.patch b/net-vpn/freelan/files/gcc7.patch
deleted file mode 100644
index 71bcf3d9a841..000000000000
--- a/net-vpn/freelan/files/gcc7.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5014a8023b42762052d6417ebbc0cd2adb1fda90
-Author: Sebastien Vincent <sebastien.vincent@cppextrem.com>
-Date:   Sat Aug 5 20:10:55 2017 +0200
-
-    Fixes compilation with g++-7.
-
-diff --git a/libs/asiotap/src/posix/posix_tap_adapter.cpp b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-index 71377cee..cdd7abf3 100644
---- a/libs/asiotap/src/posix/posix_tap_adapter.cpp
-+++ b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-@@ -206,6 +206,7 @@ namespace asiotap
- 						{
- 							result[name] = name;
- 						}
-+						break;
- 					}
- 					case tap_adapter_layer::ip:
- 					{
-@@ -213,6 +214,7 @@ namespace asiotap
- 						{
- 							result[name] = name;
- 						}
-+						break;
- 					}
- 				}
- 			}
-diff --git a/libs/netlinkplus/include/netlinkplus/endpoint.hpp b/libs/netlinkplus/include/netlinkplus/endpoint.hpp
-index 3503cae3..74fb7e1b 100644
---- a/libs/netlinkplus/include/netlinkplus/endpoint.hpp
-+++ b/libs/netlinkplus/include/netlinkplus/endpoint.hpp
-@@ -44,6 +44,8 @@
- 
- #pragma once
- 
-+#include <cstring>
-+
- #include <boost/asio.hpp>
- 
- #include <linux/netlink.h>
-@@ -125,17 +127,17 @@ namespace netlinkplus
- 
- 			friend bool operator==(const netlink_endpoint& lhs, const netlink_endpoint& rhs)
- 			{
--				return (lhs.m_sockaddr == rhs.m_sockaddr);
-+				return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) == 0);
- 			}
- 
- 			friend bool operator!=(const netlink_endpoint& lhs, const netlink_endpoint& rhs)
- 			{
--				return (lhs.m_sockaddr != rhs.m_sockaddr);
-+				return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) != 0);
- 			}
- 
- 			friend bool operator<(const netlink_endpoint& lhs, const netlink_endpoint& rhs)
- 			{
--				return (lhs.m_sockaddr < rhs.m_sockaddr);
-+				return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) < 0);
- 			}
- 
- 		private:
diff --git a/net-vpn/freelan/files/glibc225.patch b/net-vpn/freelan/files/glibc225.patch
deleted file mode 100644
index e21df29d1aec..000000000000
--- a/net-vpn/freelan/files/glibc225.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 597b6eb65b4ea68f0fe8015db38ce68b71c280d7
-Author: Florian Lamprecht <florian_lamprecht@gmx.de>
-Date:   Sun Mar 19 13:37:27 2017 +0100
-
-    Fix a compiler warning on linux
-    
-    include a systemmacro explictly to avoid warning, which is handled as error.
-
-diff --git a/libs/asiotap/src/posix/posix_tap_adapter.cpp b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-index 74e9eb2a..71377cee 100644
---- a/libs/asiotap/src/posix/posix_tap_adapter.cpp
-+++ b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-@@ -56,7 +56,7 @@
- #ifdef LINUX
- 
- #include <linux/if_tun.h>
--
-+#include <sys/sysmacros.h>
- /**
-  * \struct in6_ifreq
-  * \brief Replacement structure since the include of linux/ipv6.h introduces conflicts.
diff --git a/net-vpn/freelan/files/mf.patch b/net-vpn/freelan/files/mf.patch
deleted file mode 100644
index c7e169f4e8a7..000000000000
--- a/net-vpn/freelan/files/mf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4109bb053906f45b545a6cca4399734b91bca425
-Author: Julien Kauffmann <julien.kauffmann@freelan.org>
-Date:   Sat May 9 16:55:51 2015 -0400
-
-    Fixed Makefile
-
-diff --git a/Makefile b/Makefile
-index d6bcd59..20b5ea1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,14 +1,15 @@
- PRODUCT_NAME:=freelan
--PRODUCT_VERSION:=$(shell git describe)
-+PRODUCT_VERSION:=$(shell cat VERSION | tr -d '\r\n')
-+PRODUCT_PREFIX=/usr
- 
--default: install
--
--install:
--	# Install the files to ${DESTDIR} (defaults to /)
--	scons install prefix=/
-+default: build
- 
- build:
--	scons all samples
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX}
-+
-+install:
-+	# Install the files to $(DESTDIR) (defaults to /)
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX}
- 
- package:
- 	git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ | gzip > ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz
diff --git a/net-vpn/freelan/files/prefix.patch b/net-vpn/freelan/files/prefix.patch
deleted file mode 100644
index ac75e87fb1d1..000000000000
--- a/net-vpn/freelan/files/prefix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit d782a42eaeecdce9b4377a7b41dc60b9fecca31c
-Author: Julien Kauffmann <julien.kauffmann@freelan.org>
-Date:   Sat May 9 19:30:11 2015 -0400
-
-    Added support for a different binary prefix
-
-diff --git a/Makefile b/Makefile
-index 20b5ea1..b009d2c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,15 +1,16 @@
- PRODUCT_NAME:=freelan
- PRODUCT_VERSION:=$(shell cat VERSION | tr -d '\r\n')
--PRODUCT_PREFIX=/usr
-+PRODUCT_BIN_PREFIX=/usr
-+PRODUCT_PREFIX=/
- 
- default: build
- 
- build:
--	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX}
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX}
- 
- install:
- 	# Install the files to $(DESTDIR) (defaults to /)
--	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX}
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX}
- 
- package:
- 	git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ | gzip > ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz
-diff --git a/SConstruct b/SConstruct
-index 32a9915..bc68b71 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -28,7 +28,7 @@ class FreelanEnvironment(Environment):
-     A freelan specific environment class.
-     """
- 
--    def __init__(self, mode, prefix, **kwargs):
-+    def __init__(self, mode, prefix, bin_prefix=None, **kwargs):
-         """
-         Initialize the environment.
- 
-@@ -66,14 +66,19 @@ class FreelanEnvironment(Environment):
- 
-         self.mode = mode
-         self.prefix = prefix
-+        self.bin_prefix = bin_prefix if bin_prefix else prefix
-         self.destdir = self['ENV'].get('DESTDIR', '')
- 
-         if self.destdir:
-             self.install_prefix = os.path.normpath(
-                 os.path.abspath(self.destdir),
-             ) + self.prefix
-+            self.bin_install_prefix = os.path.normpath(
-+                os.path.abspath(self.destdir),
-+            ) + self.bin_prefix
-         else:
-             self.install_prefix = self.prefix
-+            self.bin_install_prefix = self.bin_prefix
- 
-         if os.path.basename(self['CXX']) == 'clang++':
-             self.Append(CXXFLAGS=['-Qunused-arguments'])
-@@ -147,10 +152,15 @@ class FreelanEnvironment(Environment):
- mode = GetOption('mode')
- prefix = os.path.normpath(os.path.abspath(ARGUMENTS.get('prefix', './install')))
- 
-+if 'bin_prefix' in ARGUMENTS:
-+    bin_prefix = os.path.normpath(os.path.abspath(ARGUMENTS['bin_prefix']))
-+else:
-+    bin_prefix = None
-+
- if mode in ('all', 'release'):
--    env = FreelanEnvironment(mode='release', prefix=prefix)
-+    env = FreelanEnvironment(mode='release', prefix=prefix, bin_prefix=bin_prefix)
-     libraries, includes, apps, samples, configurations = SConscript('SConscript', exports='env', variant_dir=os.path.join('build', env.mode))
--    install = env.Install(os.path.join(env.install_prefix, 'bin'), apps)
-+    install = env.Install(os.path.join(env.bin_install_prefix, 'bin'), apps)
-     install.extend(env.Install(os.path.join(env.install_prefix, 'etc', 'freelan'), configurations))
- 
-     Alias('install', install)
diff --git a/net-vpn/freelan/freelan-2.0.ebuild b/net-vpn/freelan/freelan-2.1.ebuild
index eb641501a7e4..aa9b0303c450 100644
--- a/net-vpn/freelan/freelan-2.0.ebuild
+++ b/net-vpn/freelan/freelan-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit scons-utils toolchain-funcs eutils
+inherit scons-utils toolchain-funcs
 
 DESCRIPTION="Peer-to-peer VPN software that abstracts a LAN over the Internet"
 HOMEPAGE="http://www.freelan.org/"
@@ -19,26 +19,19 @@ DEPEND="
 	dev-libs/openssl:0=
 	net-misc/curl:=
 	virtual/libiconv
+	net-libs/miniupnpc:=
 "
 RDEPEND="${DEPEND}"
 
-FREELAN_NO_GIT=1
-FREELAN_NO_GIT_VERSION=${PV}
-
 src_prepare() {
-	epatch \
-		"${FILESDIR}/boost158.patch" \
-		"${FILESDIR}/mf.patch" \
-		"${FILESDIR}/prefix.patch" \
-		"${FILESDIR}/boost163.patch" \
-		"${FILESDIR}/glibc225.patch" \
-		"${FILESDIR}/gcc7.patch"
+	export FREELAN_NO_GIT=1
+	export FREELAN_NO_GIT_VERSION=${PV}
 
 	sed -e "s/CXXFLAGS='-O3'/CXXFLAGS=''/" \
 		-e "s/CXXFLAGS=\['-Werror'\]/CXXFLAGS=[]/" \
 		-e "s/CXXFLAGS=\['-pedantic'\]/CXXFLAGS=[]/" \
 		-i SConstruct || die
-	epatch_user
+	default
 }
 
 src_compile() {
@@ -55,7 +48,8 @@ src_compile() {
 }
 
 src_install() {
-	DESTDIR="${D}" escons --mode=release prefix="${EPREFIX:-/}" bin_prefix="/usr" install
+	DESTDIR="${D}" escons --mode=release install prefix="${EPREFIX:-/}" bin_prefix="/usr"
+	dobin build/release/bin/freelan
 	dodoc CONTRIBUTING.md README.md
 
 	newinitd "${FILESDIR}/openrc/freelan.initd" freelan