gentoo resync : 14.05.2020

5 files changed, 3 insertions, 146 deletions

diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 818cc0630b96..c381c4bed1f0 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,9 +1,4 @@
-AUX squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch 978 BLAKE2B e9eaa2008367240cdd6e4e910fa28095ba137717c5d6fa372460fdc602c341443ae71bdf71b174e5e9e2ec1400a3a60b83e74908557f75830d58cfb4a484ed23 SHA512 520b14e8e3f97a64c7e99877e1778157f2c9da9ec8f958d7956be7ee6a786c16e5b16fb8c100df03271b86fae25f2762980feada710fcbe9f6ee8a3a2c6f308e
-DIST squashfs-tools-ng-0.7.tar.xz 372956 BLAKE2B 5fd0849c8cb0255ea56edc5b5cdc771363f5ca038f4306bb7d816ff26ce23cbd4f4652ef8ae497b8c9fe1ec09f9ebcfcf13aeb6b99b97db80a95018c25d4a3a6 SHA512 e53d7b64e68a40b49667b65d9fa8f12e977e8ca923c2fe9ce1e1def2745573f8607f7dee7ae6c06496489ef721c4c500ec40513ea5f6bd3ad4bb3a7796972b8e
-DIST squashfs-tools-ng-0.8.tar.xz 1004616 BLAKE2B 5d347eef252886e7750da306f038494a15660350aca7b93aaf85a8411882489d8855c771e719a68b025f5c15fdc8b0d30727dde0884c5982460ff85d106fcd37 SHA512 7a533c7f9f21f717718a9ce5d775cf297c2e8edb6f121741b14692b52cbb6e3d7fe5cd59525222f7f9617440ea2adb2acec4dda3252abf3bebc689905b9fdc20
-DIST squashfs-tools-ng-0.9.tar.xz 1020728 BLAKE2B 4f6672aecfa1f664198465154ad1d1ba92f741bcad576f90b58cdc982cc8a20d21dc7cfcb825604e2801ce187d5f984d55131c04859de0d7e67f515cddd781ac SHA512 6394cb851828f110ed6a3ab17923b214b79b8bb5550069407839da62e5316459d7f564cb31211c849508b9664f4f1f9030ce5f64d5c8649b8a73c3a869ab22d0
-EBUILD squashfs-tools-ng-0.7.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
-EBUILD squashfs-tools-ng-0.8.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
-EBUILD squashfs-tools-ng-0.9.ebuild 1192 BLAKE2B 4e17c0dd8a198760c2b7324460bed3a312e59a05b825ea3d0562b3c64bf619f7115705d2ac0e18ea184c27d2aa2142f8f88849c65c1e09101174e24eb89540f8 SHA512 48beedcb256f93eccfe7229d40eab692e137941bc41803f5ee9832f043d39d5ce0f30cdf41482ae594264383c2782a35d2c24d65cb36d66cf49f8c2f72bda3bb
+DIST squashfs-tools-ng-0.9.1.tar.xz 1026036 BLAKE2B 3e0a0acf5b11ea42bad2149a9b97442739f1eceacfc0f5b009403d4616fcd02d69082e2e0721be3a1d6d9ba67ce6287b12ea13fba6409cb751e844f5d48ce7ea SHA512 eb550430917f267ec1ef1d11795167a6893031fc184f914170679cd24c16930a8f73a2b04a349ce1602e80a327957db7935369965a892fbe4904b6e01bb48b5c
+EBUILD squashfs-tools-ng-0.9.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-0.9-Fix-missing-header-without-LZO.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch
deleted file mode 100644
index cd32661e0092..000000000000
--- a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-0.9-Fix-missing-header-without-LZO.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b3f2636f44eea1a8b6fbf892d2daa611cff9d4af Mon Sep 17 00:00:00 2001
-From: Alyssa Ross <hi@alyssa.is>
-Date: Wed, 1 Apr 2020 14:30:51 +0000
-Subject: [PATCH] Fix missing header without LZO
-
-lib/common/compress.c: In function 'compressor_get_default':
-lib/common/compress.c:39:2: warning: implicit declaration of function 'assert' [-Wimplicit-function-declaration]
-   39 |  assert(0);
-      |  ^~~~~~
-lib/common/compress.c:8:1: note: 'assert' is defined in header '<assert.h>'; did you forget to '#include <assert.h>'?
-    7 | #include "common.h"
-  +++ |+#include <assert.h>
-    8 |
----
- lib/common/compress.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/common/compress.c b/lib/common/compress.c
-index ea7b71f..f16f080 100644
---- a/lib/common/compress.c
-+++ b/lib/common/compress.c
-@@ -5,6 +5,7 @@
-  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
-  */
- #include "common.h"
-+#include <assert.h>
- 
- static int cmp_ids[] = {
- 	SQFS_COMP_XZ,
--- 
-2.24.1
-
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.8.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.8.ebuild
deleted file mode 100644
index 22a2dbc93b62..000000000000
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 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}"
-
-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.7.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild
index 22a2dbc93b62..79c567828ddc 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.7.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.ebuild
deleted file mode 100644
index 366d46b0bdb0..000000000000
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.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}-Fix-missing-header-without-LZO.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
-}