sys-fs/squashfuse fix fuse:3 dependency. sys-fs/squashmount version bump

Signed-off-by: Martin Väth <martin@mvath.de>

5 files changed, 4 insertions, 61 deletions

diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index 7e179ed1..9d196117 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -1,2 +1 @@
 DIST squashfuse-0.1.104.tar.gz 63596 SHA512 34e5092fb422b98ec7eaaa5ea1fe71c401cf9cfb0fdad8d89f8ed1662912b3733fceafb2959af988467363e5d7fc9ccdd37cc2bcfc090379c4f9e38a415f7a2b
-DIST squashfuse-0.1.104_alpha20180721.tar.gz 58749 SHA512 8d8e84e87ec09e9f6313d8654252f967d434859a12bb64cffb25283e740ece6d13f2669a5cb4a19a37a127da9aa7c3b24a13c803a70d78425589751e9fc17b20
diff --git a/sys-fs/squashfuse/squashfuse-0.1.104.ebuild b/sys-fs/squashfuse/squashfuse-0.1.104.ebuild
index feec43b5..e42cfb89 100644
--- a/sys-fs/squashfuse/squashfuse-0.1.104.ebuild
+++ b/sys-fs/squashfuse/squashfuse-0.1.104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ IUSE="lz4 lzma lzo static-libs +zlib zstd"
 REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
 
 COMMON_DEPEND="
-	>=sys-fs/fuse-2.8.6:0=
+	sys-fs/fuse:3=
 	lzma? ( >=app-arch/xz-utils-5.0.4:= )
 	zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
 	lzo? ( >=dev-libs/lzo-2.06:= )
diff --git a/sys-fs/squashfuse/squashfuse-0.1.104_alpha20180721.ebuild b/sys-fs/squashfuse/squashfuse-0.1.104_alpha20180721.ebuild
deleted file mode 100644
index feec43b5..00000000
--- a/sys-fs/squashfuse/squashfuse-0.1.104_alpha20180721.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors and Martin V\"ath
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-RESTRICT="mirror"
-inherit autotools flag-o-matic
-
-DESCRIPTION="FUSE filesystem to mount squashfs archives"
-HOMEPAGE="https://github.com/vasi/squashfuse"
-
-case ${PV} in
-*alpha*)
-	EGIT_COMMIT="0b48352ed7a89d920bb6792ac59f9f6775088f02"
-	SRC_URI="https://github.com/vasi/squashfuse/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-	alpha=:;;
-*)
-	SRC_URI="https://github.com/vasi/squashfuse/archive/${PV}/${P}.tar.gz"
-	alpha=false;;
-esac
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="lz4 lzma lzo static-libs +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzma lzo zlib zstd )"
-
-COMMON_DEPEND="
-	>=sys-fs/fuse-2.8.6:0=
-	lzma? ( >=app-arch/xz-utils-5.0.4:= )
-	zlib? ( >=sys-libs/zlib-1.2.5-r2:= )
-	lzo? ( >=dev-libs/lzo-2.06:= )
-	lz4? ( >=app-arch/lz4-0_p106:= )
-	zstd? ( >=app-arch/zstd-1.0:= )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	default
-	! $alpha || sed -i -e '1s:\[0\.1\.100\]:['"${PV}"']:' configure.ac || die
-	AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_configure() {
-	filter-flags '-flto*' -fwhole-program -fno-common
-	local myconf=(
-		$(use lz4 || echo --without-lz4)
-		$(use lzma || echo  --without-xz)
-		$(use lzo || echo --without-lzo)
-		$(use zlib || echo --without-zlib)
-		$(use zstd || echo --without-zstd)
-		$(use static-libs || echo --disable-static)
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-fs/squashmount/Manifest b/sys-fs/squashmount/Manifest
index b15181fe..988bff3a 100644
--- a/sys-fs/squashmount/Manifest
+++ b/sys-fs/squashmount/Manifest
@@ -1 +1 @@
-DIST squashmount-22.0.1.tar.gz 75666 SHA512 8e3e68921d2f1d3d4686672d1f2a39146c122e39d3383564e6aba22c0b61aeb38756cfac8fb088427c57e5b4561f1ed0bec95b944e54be6a482f99026bd9e971
+DIST squashmount-22.1.tar.gz 76068 SHA512 ac2079b6a58615c7232f60e1f1dc498dee16ef30a83a3057c7768f75b810aeca01b567b506977919eb68abe44b28b7b8c126ac82941a6a38c676cb4ba2c950e1
diff --git a/sys-fs/squashmount/squashmount-22.0.1.ebuild b/sys-fs/squashmount/squashmount-22.1.ebuild
index bce669d2..082c0e4d 100644
--- a/sys-fs/squashmount/squashmount-22.0.1.ebuild
+++ b/sys-fs/squashmount/squashmount-22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Martin V\"ath
+# Copyright 2013-2021 Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7