librsync: bump version.

* 6 tests failed out of 8.

net-libs/librsync/librsync-2.0.0.recipe

@@ -5,7 +5,7 @@ updates of a file, without requiring the old and new versions to \
 both be presentat the sending end.  The library uses a \"streaming\" \
 design similar to that of zlib with the aim of allowing it to be embedded \
 into many different applications."
-HOMEPAGE="http://librsync.sourcefrog.net"
+HOMEPAGE="https://github.com/librsync/librsync"
 COPYRIGHT="1995 Patrick Powell
 	1996-1999 Andrew Tridgell
 	1996 Paul Mackerras
@@ -13,18 +13,8 @@ COPYRIGHT="1995 Patrick Powell
 	2002-2003 Donovan Baarda"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-# Unfortunately the maintainer of librsync did not publish a tag or released
-# tarball for the 1.0.0 release (yet?). Use a static tarball with Git hash
-# for now (which comparing to directly cloning allows for double-checking
-# correctness of the source).
-GIT_HASH='02f1cc19182845d37cfb6a893f54af220a294ce7'
-# Attach the $GIT_HASH to the file name just in case upstream publishes an
-# official release tarball.
-SOURCE_FILENAME="librsync-${portVersion}-${GIT_HASH}.tar.gz"
-SOURCE_URI="https://github.com/librsync/librsync/archive/${GIT_HASH}.tar.gz"
-CHECKSUM_SHA256='25d046a8cbc6e075cc68925b5070c1f0e731e3a018446f6bda20ec9723a5631a'
-SOURCE_DIR="librsync-${GIT_HASH}"
-PATCHES="librsync-${portVersion}.patchset"
+SOURCE_URI="https://github.com/librsync/librsync/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256='b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169'
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -42,50 +32,56 @@ REQUIRES="
 # Although the librsync soname is bumped to 2.0.0, it is purely an ABI change,
 # so the compat level for the devel package remains at 1.
 PROVIDES_devel="
-	${portName}_devel           = $portVersion compat >= 1
+	${portName}_devel = $portVersion compat >= 1
 	devel:librsync$secondaryArchSuffix = 2.0.0 compat >= 1
 	"
 REQUIRES_devel="
 	librsync$secondaryArchSuffix == $portVersion base
+	lib:libbz2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
 	devel:libpopt$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:gawk
-	cmd:grep
-	cmd:libtoolize
+	cmd:cmake
 	cmd:make
 	cmd:perl
-	cmd:sed
-	cmd:which
 	"
 
 BUILD()
 {
-	autoreconf -fi
-	runConfigure ./configure \
-		--enable-shared
+	mkdir -p build
+	cd build
+	cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=release ..
 	make $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
+
+	mkdir -p $includeDir	
+	mv $prefix/include/* $includeDir
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		mv $prefix/lib $prefix/lib2
+		mkdir -p $libDir
+		mv $prefix/lib2/* $libDir/
+		rmdir $prefix/lib2
+	fi
 	prepareInstalledDevelLibs librsync
 	packageEntries devel \
-		$developDir \
-		$manDir/man3
+		$developDir
 }
 
 TEST()
 {
-	make check
+	cd build
+	make -k test
 }

net-libs/librsync/patches/librsync-1.0.0.patchset

@@ -1,28 +0,0 @@
-From 6fdcdff86e215e06817462c0fe4d63a0ca64cf21 Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Tue, 23 Dec 2014 06:15:47 +0000
-Subject: blake2b: Separate declaration and code
-
-Fixes old compilers like gcc 2.95.3.
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-
-diff --git a/blake2b-ref.c b/blake2b-ref.c
-index bcf81da..43cf4c1 100644
---- a/blake2b-ref.c
-+++ b/blake2b-ref.c
-@@ -149,10 +149,10 @@ static inline int blake2b_init0( blake2b_state *S )
- /* init xors IV with input parameter block */
- int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
- {
--  blake2b_init0( S );
-   uint8_t *p = ( uint8_t * )( P );
-   size_t i;
- 
-+  blake2b_init0( S );
-   /* IV XOR ParamBlock */
-   for( i = 0; i < 8; ++i )
-     S->h[i] ^= load64( p + sizeof( S->h[i] ) * i );
--- 
-1.8.3.4
-