gentoo resync : 12.05.2022

3 files changed, 3 insertions, 66 deletions

diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 6fd2f3b1927e..725d4ce26cb8 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,7 +1,5 @@
-DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92
 DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005
 DIST avfs-1.1.4.tar.bz2 614657 BLAKE2B a742f2e7fd4f97f2a3207cfe95d9358cfd895e4c047c39bbbf3ac0a35e1702542339f46199ba5f92868ceb48f009736a513431c0467ba49d9aacf73a667956ec SHA512 5caa7050e6b9cdce0b5ccd515af8233dc1e9226a97cdf3a3284ced5edd44fbde426049b4ce500ce1daf020d085f9f0a9f81eff339657e92ff2d09b1dec6e4267
-EBUILD avfs-1.1.1.ebuild 1491 BLAKE2B 4456b482d395814bcc942b915c443593d661284f5d8ac25f6a143b474f00b6bec645af06ffb56f355597195d01213285082bb7288c10f95e238ee9db98100538 SHA512 f983cbc72aaba0a55f88a26d8cb76b34baaa6f0cefd816ab9952eefdb2530dafb2b49ea5790b7281324d27159e37fef63cea9884ce9c6e052f2b5c44e0395e0e
 EBUILD avfs-1.1.3.ebuild 1612 BLAKE2B a907724e13fa959057992d53b78333d2cffcd6b7de0e2bcbaefe20101206a119280de3b6cfbf6d4f6846c1437bd74a6643e885096be2a98f6da3599f94ddab2a SHA512 44bea1e13bf358c18a261d8bf9142b8597ed3cd5a41c83af11bb03daa091ba79eb1575000b8aa140e19c8e9175984b67236563b68ed7998b9c07c4a3cb5d4e32
-EBUILD avfs-1.1.4.ebuild 1668 BLAKE2B b4340b129967e9f274dc5cc6341695606df0722a7ee94afb18ac35e1d18c757ed3c48c25fb47d36806c58b5f95f10faf34906c0c5911d4cebac8b5ee0a6e33cf SHA512 e3d03034650f97ad8a43fc7958e07a968ec7305ce1f017cd4abadf84ef9f6b7523d49e3383366407fd07a807c1a3171705c930e6a80d2f3b578a04f8c13c9fe0
+EBUILD avfs-1.1.4.ebuild 1664 BLAKE2B 90995cd45ee59d801ecc605fc12878faf7ca5242a65bb19faffd1160fbb028cd521346d1804ad192b659abd6dcf819e5787aa1b70e24f42e5b7e32c8e920f0bd SHA512 7318ec810582490e9b9f766c48de93cd06900928a8142e3181f7c412f3f634c30d4cb0b32ad028bcc02a80c15281c551245eb0a1e1bab328226bd230a5b07b0c
 MISC metadata.xml 519 BLAKE2B a21b5a5944a06860545d860886095c450059dbcd3bc502d85128cdef189f292af5de9562399736dcfa936befb4e5e46b8e83d8421d8af51c4bb513d6a911b570 SHA512 5c96b5b0fda1295d9433bc1d38660b207363693c3be03f2d7b8baffb20508990e9d582fa71066f99637030dda4c244e1ee005e428d353f10d4198f048c874761
diff --git a/sys-fs/avfs/avfs-1.1.1.ebuild b/sys-fs/avfs/avfs-1.1.1.ebuild
deleted file mode 100644
index eea80dedaca1..000000000000
--- a/sys-fs/avfs/avfs-1.1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
-HOMEPAGE="https://sourceforge.net/projects/avf/"
-SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="static-libs +lzma"
-
-RDEPEND=">=sys-fs/fuse-2.4:0
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-fuse \
-		--enable-library \
-		--enable-shared \
-		--with-system-zlib \
-		--with-system-bzlib \
-		$(use_enable static-libs static) \
-		$(use_with lzma xz)
-}
-
-src_install() {
-	default
-
-	# remove cruft
-	rm "${D}"/usr/bin/{davpass,ftppass} || die
-
-	# install docs
-	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
-	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
-
-	docinto scripts
-	dodoc scripts/*pass
-
-	find "${ED}" -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "This version of AVFS includes FUSE support. It is user-based."
-		einfo "To execute:"
-		einfo "1) as user, mkdir ~/.avfs"
-		einfo "2) make sure fuse is either compiled into the kernel OR"
-		einfo "   modprobe fuse or add to startup."
-		einfo "3) run mountavfs"
-		einfo "To unload daemon, type umountavfs"
-		einfo
-		einfo "READ the documentation! Enjoy :)"
-	fi
-}
diff --git a/sys-fs/avfs/avfs-1.1.4.ebuild b/sys-fs/avfs/avfs-1.1.4.ebuild
index ce013d95c46b..f8c5a0ef0f50 100644
--- a/sys-fs/avfs/avfs-1.1.4.ebuild
+++ b/sys-fs/avfs/avfs-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="lzip +lzma webdav +zstd"
 
 RDEPEND="