gentoo resync : 25.08.2020

4 files changed, 2 insertions, 125 deletions

diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index d41cd8d69851..3d42ef817c09 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,7 +1,4 @@
-AUX squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch 2014 BLAKE2B 2e48b1343a52439e894d2058c4b8bc8d0ca18b709217882e92828479b9886d06e612117c270659b399b35d46b81eb0ddcae4f55e9116be048f647da028b35377 SHA512 3684736818b807f433b0f69c2a4d6439e4f204563b8fc8667cfa0f95d13860eb42c1775adc0d4689f8bf26888e6da9d2ed5308794d2bc2deb0c27c2391cd548e
-DIST squashfs-tools-ng-0.9.1.tar.xz 1026036 BLAKE2B 3e0a0acf5b11ea42bad2149a9b97442739f1eceacfc0f5b009403d4616fcd02d69082e2e0721be3a1d6d9ba67ce6287b12ea13fba6409cb751e844f5d48ce7ea SHA512 eb550430917f267ec1ef1d11795167a6893031fc184f914170679cd24c16930a8f73a2b04a349ce1602e80a327957db7935369965a892fbe4904b6e01bb48b5c
-DIST squashfs-tools-ng-1.0.0.tar.xz 1079912 BLAKE2B b7a9e4cafc31c0058d73b1a8b69125f92d753214f6e9f0372558271bbd8df163d9b3bf3fea45b96da5044c86e75affc2bfd27826d3725a35fbb417e443cf6ccb SHA512 536f12aa53214f88739cea0d26c55e04434c284935ff1d59ee8f5108acd92fc11e800e42e3a112524d09dbd1fa50c4f15c3211ff5d02ae50b7fa137600d2ae15
-EBUILD squashfs-tools-ng-0.9.1.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
-EBUILD squashfs-tools-ng-1.0.0.ebuild 1201 BLAKE2B cc3f5a6908e0681a1a69d7c5966a6c27b63670339c8b02d3aa082bd2b088e79ff544437dcd5f2a179e049e1c7ec63a9493159b5d7198c4409690c491c110da53 SHA512 2420d389f4359a9bf1c5b99ddbb3f81a4182052050544e44bdd28b1e51fcf47c4f605cca8362df568311085a21d8e08c9efd2ff0c5f25011017fbe6e5e0784bc
+DIST squashfs-tools-ng-1.0.1.tar.xz 1079720 BLAKE2B efc4d715c65d42876d5ac51364d195267c6bc6c2219fea5746231bc4efbd9adac3fa23ea58f837da8610179f3d96ec9422efebe4ae231f4ab243cf948e64fa9b SHA512 3b597b7bf654c6897e04dc6c18cec6034a8f0c0fe070c8d6eb3c8f4a06f4ab2ea8c970ac18c12f05ccb3015cf911790e945798a34361fdb7d1a442a1ca646a04
+EBUILD squashfs-tools-ng-1.0.1.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
 EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
diff --git a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch
deleted file mode 100644
index e61d881c74bf..000000000000
--- a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4c10a491a2ddfcdc3226431a71aefd6ca71135d4 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sat, 13 Jun 2020 11:05:49 -0700
-Subject: [PATCH] extras: Pass flags argument to fix build
-
-Missed in commit 259a98985b4f (Add flags to functions that might
-logically be expanded in the future)
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
- extras/browse.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/extras/browse.c b/extras/browse.c
-index ef4e223..86ce788 100644
---- a/extras/browse.c
-+++ b/extras/browse.c
-@@ -63,7 +63,7 @@ static void list_directory(const char *dirname)
- 
- 	/* Get the directory inode we want to dump and open the directory */
- 	if (dirname == NULL) {
--		ret = sqfs_dir_reader_open_dir(dr, working_dir);
-+		ret = sqfs_dir_reader_open_dir(dr, working_dir, 0);
- 		if (ret)
- 			goto fail_open;
- 	} else if (*dirname == '/') {
-@@ -74,7 +74,7 @@ static void list_directory(const char *dirname)
- 		if (ret)
- 			goto fail_resolve;
- 
--		ret = sqfs_dir_reader_open_dir(dr, inode);
-+		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
- 		free(inode);
- 		if (ret)
- 			goto fail_open;
-@@ -84,7 +84,7 @@ static void list_directory(const char *dirname)
- 		if (ret)
- 			goto fail_resolve;
- 
--		ret = sqfs_dir_reader_open_dir(dr, inode);
-+		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
- 		free(inode);
- 		if (ret)
- 			goto fail_open;
-@@ -526,7 +526,7 @@ int main(int argc, char **argv)
- 	}
- 
- 	/* create a directory reader and get the root inode */
--	dr = sqfs_dir_reader_create(&super, cmp, file);
-+	dr = sqfs_dir_reader_create(&super, cmp, file, 0);
- 	if (dr == NULL) {
- 		fprintf(stderr, "%s: error creating directory reader.\n",
- 			argv[1]);
-@@ -539,7 +539,7 @@ int main(int argc, char **argv)
- 	}
- 
- 	/* create a data reader */
--	data = sqfs_data_reader_create(file, super.block_size, cmp);
-+	data = sqfs_data_reader_create(file, super.block_size, cmp, 0);
- 
- 	if (data == NULL) {
- 		fprintf(stderr, "%s: error creating data reader.\n",
--- 
-2.26.2
-
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild
deleted file mode 100644
index e9e3aff7cec4..000000000000
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A new set of tools for working with SquashFS images"
-HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
-if [[ ${PV} = 9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-3+ tools? ( GPL-3+ )"
-SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
-
-DEPEND="
-	sys-libs/zlib:=
-	lz4?     ( app-arch/lz4:= )
-	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
-	selinux? ( sys-libs/libselinux:= )
-	zstd?    ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-extras-Pass-flags-argument-to-fix-build.patch
-)
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_with lz4)
-		$(use_with lzo)
-		$(use_with selinux)
-		$(use_with tools)
-		$(use_with xz)
-		$(use_with zstd)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.1.ebuild
index 79c567828ddc..79c567828ddc 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.1.ebuild