From 03b3a054d3b67ca78dd9720a169437e9b54bb61e Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sat, 24 Mar 2018 07:06:54 +0100
Subject: [PATCH] Libtorrent-Rasterbar: bump, cleanup, debuginfo (#2340)

* Libtorrent-Rasterbar: bump, cleanup, debuginfo

* Cleanup

* Cleanup
---
 ...cipe => libtorrent_rasterbar-1.1.6.recipe} | 44 +++++++++++++------
 ...et => libtorrent_rasterbar-1.1.6.patchset} |  0
 2 files changed, 31 insertions(+), 13 deletions(-)
 rename net-libs/libtorrent-rasterbar/{libtorrent_rasterbar-1.1.5.recipe => libtorrent_rasterbar-1.1.6.recipe} (72%)
 rename net-libs/libtorrent-rasterbar/patches/{libtorrent_rasterbar-1.1.5.patchset => libtorrent_rasterbar-1.1.6.patchset} (100%)

diff --git a/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.5.recipe b/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.6.recipe
similarity index 72%
rename from net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.5.recipe
rename to net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.6.recipe
index 784982c7d..1a41a2faa 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.5.recipe
+++ b/net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.1.6.recipe
@@ -11,20 +11,38 @@ The main goals of libtorrent are:
  * to be memory efficient
  * to be very easy to use"
 HOMEPAGE="http://www.libtorrent.org/"
-COPYRIGHT="2003-2017 Arvid Norberg"
+COPYRIGHT="2003-2017 Arvid Norberg
+	Andrei Kurushin
+	Steven Siloti
+	Thomas Fischer
+	Massaroddel
+	Tianhao Qiu.
+	Shyam
+	Magnus Jonsson
+	Daniel Wallin
+	Cory Nelson
+	Stas Khirman
+	Ryan Norton
+	Andrew Resch
+	Michael Wojciechowski
+	Peter Koeleman
+	Reimond Retz"
 LICENSE="BSD (2-clause)"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${portVersion//./_}/libtorrent-rasterbar-$portVersion.tar.gz"
-CHECKSUM_SHA256="103134068389155a0f2bccaca72a57765460eb8188495089dcad280dcf426930"
+CHECKSUM_SHA256="b7c74d004bd121bd6e9f8975ee1fec3c95c74044c6a6250f6b07f259f55121ef"
 SOURCE_DIR="libtorrent-rasterbar-$portVersion"
 PATCHES="libtorrent_rasterbar-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
+libVersion="9.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
-	libtorrent_rasterbar${secondaryArchSuffix} = $portVersion
-	lib:libtorrent_rasterbar$secondaryArchSuffix = 9 compat >= 9
+	libtorrent_rasterbar$secondaryArchSuffix = $portVersion
+	lib:libtorrent_rasterbar$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -38,7 +56,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libtorrent_rasterbar${secondaryArchSuffix}_devel = $portVersion
-	devel:libtorrent_rasterbar$secondaryArchSuffix = 9 compat >= 9
+	devel:libtorrent_rasterbar$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libtorrent_rasterbar$secondaryArchSuffix == $portVersion base
@@ -53,9 +71,6 @@ BUILD_REQUIRES="
 	devel:libssl$secondaryArchSuffix >= 1.0.0
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
@@ -63,12 +78,15 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libtorrent_rasterbar$secondaryArchSuffix \
+	$libDir/libtorrent-rasterbar.so.$libVersion
+
 BUILD()
 {
-	sed -i 's/-msse4.2//' configure.ac
-	autoreconf -fi
 	export CXXFLAGS="$CXXFLAGS -std=c++11  -DBOOST_NO_CXX11_CONSTEXPR"
-	runConfigure ./configure --disable-static --with-libiconv \
+	runConfigure ./configure \
+		--disable-static \
+		--with-libiconv \
 		--with-boost-system=boost_system \
 		--with-boost-chrono=boost_chrono \
 		--with-boost-random=boost_random
@@ -77,7 +95,7 @@ BUILD()
 
 INSTALL()
 {
-	make install-strip
+	make install
 
 	rm $libDir/libtorrent-rasterbar.la
 
diff --git a/net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.5.patchset b/net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.6.patchset
similarity index 100%
rename from net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.5.patchset
rename to net-libs/libtorrent-rasterbar/patches/libtorrent_rasterbar-1.1.6.patchset