gentoo resync : 30.06.2019

3 files changed, 61 insertions, 3 deletions

diff --git a/net-vpn/freelan/Manifest b/net-vpn/freelan/Manifest
index e009e7a07ab7..109481a1c8fb 100644
--- a/net-vpn/freelan/Manifest
+++ b/net-vpn/freelan/Manifest
@@ -1,4 +1,6 @@
 AUX openrc/freelan.initd 263 BLAKE2B d0a111fc41f2b5774e5073fca1e68df333c180f95b0335d4f18cf681b9cf238a55203b13bf3aee757497234c4e2feb1732bebe03095ec729e79526ef5f55147a SHA512 bf8ac87cbfdf83ab38e0a90f85d598abf25028682cd94b6b44de69d02daecf35d35403e2a3e63c10cb6a99f783f7a72bb58fd0e0cb00013c32fe2aba4b179f23
 DIST freelan-2.1.tar.gz 4340411 BLAKE2B 78365f8f4d6334313abd824a68a06470a34e6e62b17fae1f32e3d655c1210892ccbb17ba81b02930e1554d73adbaea171562365dcda091677513d15506f631fe SHA512 f01f0021ab54450be8cf81b3ee58a74ff02e421ccc0e6b7a3733bbd721dedb14a0bf8c6a9e01d20f000e4b232c89fc358834e696211e239c899e4926e6682e1a
-EBUILD freelan-2.1.ebuild 1235 BLAKE2B 81839cfb9c05991476b9796269ae2916c5778dba3c7303f73d804d7bd2a20b991c22f1cf2b95601611b8c5b693702bff560ecc6f1f0d2dffee38621d6cd9c6fb SHA512 225276c0d0f8984049f5d45e9c05271e9921c147fcc86b918a7a30584e739ec77fa5d2072d10bfc20488e840ccd855b1ccc6c7de6845e19f702e38a96ee8842b
+DIST freelan-2.2.tar.gz 3071919 BLAKE2B d63cc4133e6c4a55a966d605150c30566b23c3ca69d8eb2df2cd7dd23e2b6325a3b809c4d3c1c6db649988643ab5dd294f11ef90b5b849ad3f9c4c6f4789083f SHA512 e44ffcec6d85f8d2e46ed29267e0b198589009b0bc131bc6fcaa35f21e47b5db13d6ebeb83d7fee7f5baa9c91bd709d37039fd4e66f8f1720521a82d9241dfc0
+EBUILD freelan-2.1.ebuild 1238 BLAKE2B ea8727853befdb3007d0b470bea019af58c2d5145a4457b5d6b5441320faad6f49321710640a2c183132be9c7cee8a3b84b640c35854fdefa7f77e6b2b4dfef5 SHA512 98ef62c55d750433f8bb1227fed883f8f84072fba1cecf013d9dd9bf60002815d4d78221a6d59b48134cdb872b4be5d3c8a5cbc266995a82380ce439b09b2fd8
+EBUILD freelan-2.2.ebuild 1238 BLAKE2B ea8727853befdb3007d0b470bea019af58c2d5145a4457b5d6b5441320faad6f49321710640a2c183132be9c7cee8a3b84b640c35854fdefa7f77e6b2b4dfef5 SHA512 98ef62c55d750433f8bb1227fed883f8f84072fba1cecf013d9dd9bf60002815d4d78221a6d59b48134cdb872b4be5d3c8a5cbc266995a82380ce439b09b2fd8
 MISC metadata.xml 340 BLAKE2B 0357b1c5d1b93bc0eda1ef8fab979eff07eff843168adcf3c81ca210d129b8ff84167704c49c2d1940e4e9aea0ac50f11ec80da36a88e988cb66c8b7b109684b SHA512 864027adfa1b5b2947c04b737a862aabb9dee4f411d837489cad78bd0e46cd92d31a71ee1167dc938ec0dd23d8005dc1255df6d1b21820f05c3b420f1e280608
diff --git a/net-vpn/freelan/freelan-2.1.ebuild b/net-vpn/freelan/freelan-2.1.ebuild
index aa9b0303c450..d286ce106e25 100644
--- a/net-vpn/freelan/freelan-2.1.ebuild
+++ b/net-vpn/freelan/freelan-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="debug"
 
 DEPEND="
-	dev-libs/boost:=[threads]
+	<dev-libs/boost-1.70:=[threads]
 	dev-libs/openssl:0=
 	net-misc/curl:=
 	virtual/libiconv
diff --git a/net-vpn/freelan/freelan-2.2.ebuild b/net-vpn/freelan/freelan-2.2.ebuild
new file mode 100644
index 000000000000..d286ce106e25
--- /dev/null
+++ b/net-vpn/freelan/freelan-2.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit scons-utils toolchain-funcs
+
+DESCRIPTION="Peer-to-peer VPN software that abstracts a LAN over the Internet"
+HOMEPAGE="http://www.freelan.org/"
+SRC_URI="https://github.com/freelan-developers/freelan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	<dev-libs/boost-1.70:=[threads]
+	dev-libs/openssl:0=
+	net-misc/curl:=
+	virtual/libiconv
+	net-libs/miniupnpc:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	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
+	default
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	export LINK="$(tc-getCXX)"
+
+	local MYSCONS=(
+		"--mode=$(usex debug debug release)"
+		prefix="${EPREFIX:-/}"
+		bin_prefix="/usr"
+		apps
+	)
+	escons "${MYSCONS[@]}"
+}
+
+src_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
+}