From 11e1e6bd52270b4b17185b27f604447b67ab9ea6 Mon Sep 17 00:00:00 2001
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Wed, 14 Apr 2021 11:09:43 -0700
Subject: [PATCH] net-p2p/py-libtorrent-rasterbar: Update 1.2.10 -> 1.2.13

Reported by:	portscout
---
 net-p2p/py-libtorrent-rasterbar/Makefile      |  9 ++--
 net-p2p/py-libtorrent-rasterbar/distinfo      |  6 +--
 net-p2p/py-libtorrent-rasterbar/files/b2      |  3 ++
 ...h-ca9a7f3b89095949e30f533e53080293f33f2f60 | 50 -------------------
 4 files changed, 12 insertions(+), 56 deletions(-)
 create mode 100755 net-p2p/py-libtorrent-rasterbar/files/b2
 delete mode 100644 net-p2p/py-libtorrent-rasterbar/files/patch-ca9a7f3b89095949e30f533e53080293f33f2f60

diff --git a/net-p2p/py-libtorrent-rasterbar/Makefile b/net-p2p/py-libtorrent-rasterbar/Makefile
index ee603e64b8062..77832364f5cc1 100644
--- a/net-p2p/py-libtorrent-rasterbar/Makefile
+++ b/net-p2p/py-libtorrent-rasterbar/Makefile
@@ -1,8 +1,8 @@
 # Created by: Doug Barton <dougb@FreeBSD.org>
 
 PORTNAME=	libtorrent-rasterbar
-DISTVERSIONPREFIX=	libtorrent-
-DISTVERSION=	1.2.10
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.2.13
 PORTEPOCH=	1
 CATEGORIES=	net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,15 +13,18 @@ COMMENT=	Python bindings for libtorrent-rasterbar
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../COPYING
 
+BUILD_DEPENDS=	b2:devel/boost_build
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		${PY_BOOST}
 
-USES=		compiler:c11 iconv localbase python:3.6+
+USES=		compiler:c11 iconv localbase:ldflags python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	arvidn
 GH_PROJECT=	libtorrent
 USE_PYTHON=	distutils autoplist
 
+BINARY_ALIAS=	b2=${FILESDIR}/b2
+
 CFLAGS+=	-DTORRENT_DISABLE_LOGGING # undefined symbol: https://github.com/arvidn/libtorrent/issues/3331
 LDFLAGS+=	${LOCALBASE}/lib/libboost_python${PYTHON_SUFFIX}.so ${LOCALBASE}/lib/libiconv.so # fails to link libs: https://github.com/arvidn/libtorrent/issues/3330
 
diff --git a/net-p2p/py-libtorrent-rasterbar/distinfo b/net-p2p/py-libtorrent-rasterbar/distinfo
index 146fcd43aa5b7..6521bf8bf6cf3 100644
--- a/net-p2p/py-libtorrent-rasterbar/distinfo
+++ b/net-p2p/py-libtorrent-rasterbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599281590
-SHA256 (arvidn-libtorrent-libtorrent-1.2.10_GH0.tar.gz) = e0fedb583f1e7bdcc0eb80a9df064a1e6fb0b825d8423e64bdb0f7a35879a09e
-SIZE (arvidn-libtorrent-libtorrent-1.2.10_GH0.tar.gz) = 3586008
+TIMESTAMP = 1618420303
+SHA256 (arvidn-libtorrent-v1.2.13_GH0.tar.gz) = c34be78042920459bbbb2bcb20f993896b958f7c524fe4b8bff34f4179637558
+SIZE (arvidn-libtorrent-v1.2.13_GH0.tar.gz) = 3608107
diff --git a/net-p2p/py-libtorrent-rasterbar/files/b2 b/net-p2p/py-libtorrent-rasterbar/files/b2
new file mode 100755
index 0000000000000..3381c22472b5e
--- /dev/null
+++ b/net-p2p/py-libtorrent-rasterbar/files/b2
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+$PREFIX/bin/b2 toolset=clang "$@"
diff --git a/net-p2p/py-libtorrent-rasterbar/files/patch-ca9a7f3b89095949e30f533e53080293f33f2f60 b/net-p2p/py-libtorrent-rasterbar/files/patch-ca9a7f3b89095949e30f533e53080293f33f2f60
deleted file mode 100644
index 8908de08462db..0000000000000
--- a/net-p2p/py-libtorrent-rasterbar/files/patch-ca9a7f3b89095949e30f533e53080293f33f2f60
+++ /dev/null
@@ -1,50 +0,0 @@
-- patch from the upstream to fix build
-
-From ca9a7f3b89095949e30f533e53080293f33f2f60 Mon Sep 17 00:00:00 2001
-From: arvidn <arvid@libtorrent.org>
-Date: Mon, 11 Jan 2021 21:14:29 +0100
-Subject: [PATCH] Fix cxxflags and linkflags injection via environment
- variables
-
----
- ChangeLog | 2 ++
- Jamfile   | 5 ++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git ../../ChangeLog ../..//ChangeLog
-index 01301258c8..aaefc2bc76 100644
---- ../..//ChangeLog
-+++ ../..//ChangeLog
-@@ -1,3 +1,5 @@
-+	* Fix cxxflags and linkflags injection via environment variables
-+
- 1.2.12 released
- 
- 	* fix loading of DHT node ID from previous session on startup
-diff --git ../..//Jamfile ../../Jamfile
-index 21d1fc423e..44a1199484 100644
---- ../../Jamfile
-+++ ../../Jamfile
-@@ -745,8 +745,7 @@ local usage-requirements =
- 	<toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
- 	<toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
- 
--	<cxxflags>$(CXXFLAGS)
--	<linkflags>$(LDFLAGS)
-+	<cxxflags>"$(CXXFLAGS:J= )"
- 	;
- 
- project torrent ;
-@@ -770,11 +769,11 @@ lib torrent
- 
- 	<conditional>@building
- 	<conditional>@warnings
--	<cxxflags>$(CXXFLAGS)
- 
- 	<tag>@tag
- 
- 	$(usage-requirements)
-+	<linkflags>"$(LDFLAGS:J= )"
- 
- 	: # default build
- 	<threading>multi