From 3dc00e7313bdf4fb5b4c588bb35cd5600d929d25 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 3 May 2016 07:14:12 +0200
Subject: [PATCH] libarchive: update to 3.2.0; merged bsdcpio into bsdtar.

---
 srcpkgs/bsdcpio                               |  1 -
 srcpkgs/libarchive/patches/xz_filter_mt.patch | 39 ----------------
 srcpkgs/libarchive/template                   | 45 ++++++++-----------
 3 files changed, 19 insertions(+), 66 deletions(-)
 delete mode 120000 srcpkgs/bsdcpio
 delete mode 100644 srcpkgs/libarchive/patches/xz_filter_mt.patch

diff --git a/srcpkgs/bsdcpio b/srcpkgs/bsdcpio
deleted file mode 120000
index 6e93d9cc1c0..00000000000
--- a/srcpkgs/bsdcpio
+++ /dev/null
@@ -1 +0,0 @@
-libarchive
\ No newline at end of file
diff --git a/srcpkgs/libarchive/patches/xz_filter_mt.patch b/srcpkgs/libarchive/patches/xz_filter_mt.patch
deleted file mode 100644
index 3ea40534e73..00000000000
--- a/srcpkgs/libarchive/patches/xz_filter_mt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Use lzma_stream_encoder_mt() to enable xz parallel compression in the
-xz write filter.
-
-	--xtraeme
-
---- libarchive/archive_write_add_filter_xz.c.orig	2015-01-07 13:19:20.106417631 +0100
-+++ libarchive/archive_write_add_filter_xz.c	2015-01-07 13:24:20.097461789 +0100
-@@ -103,6 +103,7 @@ struct private_data {
- 	lzma_stream	 stream;
- 	lzma_filter	 lzmafilters[2];
- 	lzma_options_lzma lzma_opt;
-+	lzma_mt		 lzma_mt;
- 	int64_t		 total_in;
- 	unsigned char	*compressed;
- 	size_t		 compressed_buffer_size;
-@@ -151,6 +152,13 @@ common_setup(struct archive_write_filter
- 	}
- 	f->data = data;
- 	data->compression_level = LZMA_PRESET_DEFAULT;
-+	data->lzma_mt.check = LZMA_CHECK_CRC64;
-+	data->lzma_mt.filters = data->lzmafilters;
-+	data->lzma_mt.preset = data->compression_level;
-+	data->lzma_mt.threads = lzma_cputhreads();
-+	if (data->lzma_mt.threads == 0)
-+		data->lzma_mt.threads = 1;
-+
- 	f->open = &archive_compressor_xz_open;
- 	f->close = archive_compressor_xz_close;
- 	f->free = archive_compressor_xz_free;
-@@ -226,8 +234,7 @@ archive_compressor_xz_init_stream(struct
- 	data->stream.next_out = data->compressed;
- 	data->stream.avail_out = data->compressed_buffer_size;
- 	if (f->code == ARCHIVE_FILTER_XZ)
--		ret = lzma_stream_encoder(&(data->stream),
--		    data->lzmafilters, LZMA_CHECK_CRC64);
-+		ret = lzma_stream_encoder_mt(&(data->stream), &data->lzma_mt);
- 	else if (f->code == ARCHIVE_FILTER_LZMA)
- 		ret = lzma_alone_encoder(&(data->stream), &data->lzma_opt);
- 	else {	/* ARCHIVE_FILTER_LZIP */
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index ac56f603963..d60d6596845 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
-version=3.1.2
-revision=20
+version=3.2.0
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.libarchive.org/"
 license="BSD"
 distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz"
-checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e
+checksum=7bce45fd71ff01dc20d19edd78322d4965583d81b8bed8e26cacb65d6f5baa87
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake libtool"
@@ -30,31 +30,24 @@ build_options="acl expat lzo ssl"
 build_options_default="acl ssl"
 
 bsdtar_package() {
-	short_desc="BSD tar(1) using libarchive"
+	replaces="bsdcpio>=0"
+	short_desc="BSD utilities using libarchive"
 	pkg_install() {
-		vmove usr/bin/bsdtar
-		vmove usr/share/man/man1/bsdtar.1
-		vmove usr/share/man/man5/tar.5
-	}
-}
-bsdcpio_package() {
-	short_desc="BSD cpio(1) using libarchive"
-	pkg_install() {
-		vmove usr/bin/bsdcpio
-		vmove usr/share/man/man1/bsdcpio.1
-		vmove usr/share/man/man5/cpio.5
-	}
-}
-libarchive-devel_package() {
-	depends="${makedepends} libarchive>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-		vmove usr/share
+		vmove usr/bin
+		vmove usr/share/man/man1
+		vmove usr/share/man/man5
 		# Conflicts with mtree.
 		mv ${PKGDESTDIR}/usr/share/man/man5/{mtree.5,libarchive-mtree.5}
 	}
 }
+libarchive-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+		vmove usr/lib/pkgconfig
+		vmove usr/share
+	}
+}