[gentoo-commits] repo/gentoo:master commit in: profiles/, profiles/updates/, net-vpn/freelan/, net-vpn/freelan/files/, ...

[Michał Górny]

commit:     02b7f4266660e7083f4fd054b3eccdf2ff8011ec
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 07:29:08 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 26 07:38:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b7f426

net-vpn/freelan: Remove last-rited pkg

Closes: https://bugs.gentoo.org/735552
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-vpn/freelan/Manifest                           |  1 -
 .../files/freelan-2.2-boost-1.70-asio.patch        | 25 ---------
 net-vpn/freelan/files/freelan-2.2-boost-1.70.patch | 50 ------------------
 net-vpn/freelan/files/openrc/freelan.initd         | 12 -----
 net-vpn/freelan/freelan-2.2.ebuild                 | 61 ----------------------
 net-vpn/freelan/metadata.xml                       | 11 ----
 profiles/package.mask                              |  1 -
 profiles/updates/1Q-2017                           |  1 -
 8 files changed, 162 deletions(-)

diff --git a/net-vpn/freelan/Manifest b/net-vpn/freelan/Manifest
deleted file mode 100644
index 4fb174f4a19..00000000000
--- a/net-vpn/freelan/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST freelan-2.2.tar.gz 3071919 BLAKE2B d63cc4133e6c4a55a966d605150c30566b23c3ca69d8eb2df2cd7dd23e2b6325a3b809c4d3c1c6db649988643ab5dd294f11ef90b5b849ad3f9c4c6f4789083f SHA512 e44ffcec6d85f8d2e46ed29267e0b198589009b0bc131bc6fcaa35f21e47b5db13d6ebeb83d7fee7f5baa9c91bd709d37039fd4e66f8f1720521a82d9241dfc0

diff --git a/net-vpn/freelan/files/freelan-2.2-boost-1.70-asio.patch b/net-vpn/freelan/files/freelan-2.2-boost-1.70-asio.patch
deleted file mode 100644
index 2410ad06f6c..00000000000
--- a/net-vpn/freelan/files/freelan-2.2-boost-1.70-asio.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a3e4150d6df690ea083a74f2e66894dc2af0cd9e Mon Sep 17 00:00:00 2001
-From: QuantumEntangledAndy <sheepchaan@×××××.com>
-Date: Sat, 8 Jun 2019 10:10:10 +0700
-Subject: [PATCH] Fix for boost versions less than 1.66
-
----
- libs/fscp/include/fscp/server.hpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libs/fscp/include/fscp/server.hpp b/libs/fscp/include/fscp/server.hpp
-index 2b18a595..1f4b30ee 100644
---- a/libs/fscp/include/fscp/server.hpp
-+++ b/libs/fscp/include/fscp/server.hpp
-@@ -288,7 +288,11 @@ namespace fscp
- 			 */
- 			boost::asio::io_service& get_io_service()
- 			{
-+#if BOOST_ASIO_VERSION >= 101200 // Boost 1.66+
- 				return reinterpret_cast<boost::asio::io_context&>(get_socket().get_executor().context());
-+#else
-+				return get_socket().get_io_service();
-+#endif
- 			}
- 
- 			/**

diff --git a/net-vpn/freelan/files/freelan-2.2-boost-1.70.patch b/net-vpn/freelan/files/freelan-2.2-boost-1.70.patch
deleted file mode 100644
index 1fa2bb48d65..00000000000
--- a/net-vpn/freelan/files/freelan-2.2-boost-1.70.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d16490d00a47c8dcf008fa1b3219f54669716da3 Mon Sep 17 00:00:00 2001
-From: Sebastien Vincent <sebastien.vincent@×××××××××.com>
-Date: Sun, 19 May 2019 17:57:07 +0200
-Subject: [PATCH] [build] Adds support for Boost >= 1.70.
-
----
- libs/freelan/src/core.cpp         | 2 +-
- libs/fscp/include/fscp/server.hpp | 2 +-
- libs/fscp/src/server.cpp          | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libs/freelan/src/core.cpp b/libs/freelan/src/core.cpp
-index 840a522a..969ae305 100644
---- a/libs/freelan/src/core.cpp
-+++ b/libs/freelan/src/core.cpp
-@@ -777,7 +777,7 @@ namespace freelan
- 
- 		boost::apply_visitor(
- 			asiotap::endpoint_async_resolve_visitor(
--				boost::make_shared<resolver_type>(boost::ref(m_io_service)),
-+				boost::make_shared<resolver_type>(m_io_service),
- 				to_protocol(m_configuration.fscp.hostname_resolution_protocol),
- 				resolver_query::address_configured,
- 				DEFAULT_SERVICE,
-diff --git a/libs/fscp/include/fscp/server.hpp b/libs/fscp/include/fscp/server.hpp
-index 3766b4a3..2b18a595 100644
---- a/libs/fscp/include/fscp/server.hpp
-+++ b/libs/fscp/include/fscp/server.hpp
-@@ -288,7 +288,7 @@ namespace fscp
- 			 */
- 			boost::asio::io_service& get_io_service()
- 			{
--				return get_socket().get_io_service();
-+				return reinterpret_cast<boost::asio::io_context&>(get_socket().get_executor().context());
- 			}
- 
- 			/**
-diff --git a/libs/fscp/src/server.cpp b/libs/fscp/src/server.cpp
-index cb717ec4..62b92dca 100644
---- a/libs/fscp/src/server.cpp
-+++ b/libs/fscp/src/server.cpp
-@@ -1106,7 +1106,7 @@ namespace fscp
- 	template <typename WaitHandler>
- 	void server::ep_hello_context_type::async_wait_reply(boost::asio::io_service& io_service, uint32_t hello_unique_number, const boost::posix_time::time_duration& timeout, WaitHandler handler)
- 	{
--		const boost::shared_ptr<boost::asio::deadline_timer> timer = boost::make_shared<boost::asio::deadline_timer>(boost::ref(io_service), timeout);
-+		const boost::shared_ptr<boost::asio::deadline_timer> timer = boost::make_shared<boost::asio::deadline_timer>(io_service, timeout);
- 
- 		m_pending_requests[hello_unique_number] = pending_request_status(timer);
- 

diff --git a/net-vpn/freelan/files/openrc/freelan.initd b/net-vpn/freelan/files/openrc/freelan.initd
deleted file mode 100644
index e1e4232f438..00000000000
--- a/net-vpn/freelan/files/openrc/freelan.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/freelan"
-command_args="-s -p /var/run/freelan.pid"
-pidfile="/var/run/freelan.pid"
-
-depend() {
-	need net
-	use logger
-}

diff --git a/net-vpn/freelan/freelan-2.2.ebuild b/net-vpn/freelan/freelan-2.2.ebuild
deleted file mode 100644
index 5230dbc4e9a..00000000000
--- a/net-vpn/freelan/freelan-2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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:=[threads]
-	dev-libs/openssl:0=
-	net-misc/curl:=
-	virtual/libiconv
-	net-libs/miniupnpc:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2-boost-1.70.patch
-	"${FILESDIR}"/${PN}-2.2-boost-1.70-asio.patch
-)
-
-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
-}

diff --git a/net-vpn/freelan/metadata.xml b/net-vpn/freelan/metadata.xml
deleted file mode 100644
index a3e769a4485..00000000000
--- a/net-vpn/freelan/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>aballier@g.o</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">freelan-developers/freelan</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 34df9b0b31e..fad43785166 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -265,7 +265,6 @@ games-emulation/gambatte
 games-sports/vdrift
 games-strategy/endless-sky
 games-strategy/glob2
-net-vpn/freelan
 
 # Michał Górny <mgorny@g.o> (2020-09-25)
 # PyPy3.7 alpha.  Known to break a few packages.  Masked until it

diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index dce848ac34c..cde2ff095b4 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -4,7 +4,6 @@ move net-libs/libkgapi kde-apps/libkgapi
 slotmove =dev-ruby/typhoeus-1.1.2 0 1
 move app-cdr/k3b kde-apps/k3b
 move net-misc/badvpn net-vpn/badvpn
-move net-misc/freelan net-vpn/freelan
 move net-firewall/ipsec-tools net-vpn/ipsec-tools
 move net-misc/libreswan net-vpn/libreswan
 move net-misc/logmein-hamachi net-vpn/logmein-hamachi