gentoo resync : 06.08.2019

3 files changed, 8 insertions, 73 deletions

diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 401bbcaa3159..1c9c7e68cc4a 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,9 +1,7 @@
-DIST avfs-1.0.4.tar.bz2 719761 BLAKE2B 6bbe47136a6aedd399800ea3ee16f82c367e11f723785ebacf4ef7bd12319ad2f8fe528580e20f368934423ee41afc75b9a73ce7389a100f70e42180e2fb2dcc SHA512 3cfda7a471b5e696984acf9101312e898bc68fe16196bfee8e6a255bd182c279a6ad53fee09c0d6554a968f837e97652e95d794fa46f0d384dd41ae426d49516
-DIST avfs-1.0.5.tar.bz2 723937 BLAKE2B 49a7ba0f88e126804c8ae12d1ad9a2924311198baee85f56a17c1e9dd810bdac8d519f0fc8a8cf23b5e4d7319460108e3e27cb28a1dc7320760c42f7257460d0 SHA512 d50d8fc31a56a0dac17a14c19de3f1bae2519feb965768810d19192eba6dbe24ab181c4574ff8982883d9b76f77241a1e27f3ef12d05ab8112f3caf14e59bd3c
 DIST avfs-1.0.6.tar.bz2 729592 BLAKE2B 41c703e92921ba9393d95455f7d3dd18587b2d7f2ff46de02d290515cf6c8182d19ff117a7ce040ccaab491240b4f27a3ebd58026045ae9b0d69f47a8beeabc7 SHA512 6b9c070896c5d5abbb6a8c14a7dfd39d9b58d13a6db122b5bf1756b2da7435dfbc00a1fd04bedf99b94b76d9ec7f8c05fccc21de6b9e713fc60cfe0ec88064b4
 DIST avfs-1.1.0.tar.bz2 605637 BLAKE2B c9c64d1fdcda84ede92e0a8896e0b6508f6f2b2f086acd1edeacc87d01ba431d052d51535abd483a0652cf999df842432d02a8e90049ddeb7c5d9a269e2e5885 SHA512 415a52bfecb58cc67818a7e247e0cc40892c81431cdf13a607b4a233aa312ac900f1d33c060aa7495df50c3dda553115ab0b159950811318ca6850847ddbd4fa
-EBUILD avfs-1.0.4.ebuild 1491 BLAKE2B 44b686e4f157e63704afe64ceee6d000b81665e2e66263eaefb104baa63906dae2471b54e4b18514dbbf90658eb25ad8f8e5cf45e23f19c97143ca6ff0fd98aa SHA512 1428602ce6a1770e82b1a958e35f9fcb51dc244cafc6bd9dbecff1d5f4b8a0748fb23dc517c2703e19096c1a48f2ad8e671d33ed217ed41415ffb9b352da2f5c
-EBUILD avfs-1.0.5.ebuild 1495 BLAKE2B 6e3ba071c4ff9722a71fd3886798565145b62fbbb298a7199153814eac56ae2c13536032e260c8733dccf585d40442e5d50c8d82854ac674e67d22c612378a87 SHA512 59fc962e1989ad8759dbe8c93511c738dd4fdc276a462348249a7dfee8b6a93adc9a3f4978ddc317dc6e424888d2ea95299d052fd1bd4c3d4cf10c506b97bebc
+DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92
 EBUILD avfs-1.0.6.ebuild 1493 BLAKE2B d362bed34a4ad4b28ec669ba4e87b3762adc824e3a6b9014aee0b4d8bc0fb711b7be80221f9a7619fed5f834e108aeeda7566a8be650a56971919539562cda17 SHA512 ca67c66c16f0a4a5e12aef9bd9dce0379b6c5da25626168f6b536658613452bedae198c502bc119a64640210611c47a2b58ac595a95950d4911a4f6aa40a0af7
 EBUILD avfs-1.1.0.ebuild 1485 BLAKE2B 0d6c8890fd19de44803b8c8b271b167e8f1e82349cdfe5b5a303846cb6aa450ab6be18904a1fc37525e68320543b2902bd0dedc5457a64cfd95fd8b1dcb24ee2 SHA512 a654908b37c840774128d6c77b397346d812b0c7d00d937594e4d89f1d8f5abf0a761b66b4d7c24fc2838a6c6889245c7b57feac65a2995f10d772c088102a2b
+EBUILD avfs-1.1.1.ebuild 1494 BLAKE2B a9076c09d451277a427871db0d1d502f76714c2f0f3fb4c1dcc7cb0617bb9335f948917afad05c723a09c6b21a9caa0d80bd1f5218c94d078a3c3520b2072621 SHA512 c49eb991267b1610f7c2d87d51fe19d5efdccf967a1af4b958e58b285b554b10162c6624c8e96067383ae803b1fe23c9297fcbea6c84e5c08ece76ccb2df1999
 MISC metadata.xml 319 BLAKE2B d0597cca90871778d014601140806702319a3a34784c9864d4e70a5b72fd04ec566622d8be8ba1fa3363ca5964ba63822af72ef524767c86b2f9f5535ed846b3 SHA512 805edf3205c69e9bb435c3b86d259e08044da746dfa6205343ccf4e2c2f802c8b51324d140e567a32019f79b5dc63203222221ddc9bc881683d8c9d511a38540
diff --git a/sys-fs/avfs/avfs-1.0.4.ebuild b/sys-fs/avfs/avfs-1.0.4.ebuild
deleted file mode 100644
index a96449ae56b2..000000000000
--- a/sys-fs/avfs/avfs-1.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune
-
-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}
-	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/{avfscoda*,*pass}
-
-	prune_libtool_files
-}
-
-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.0.5.ebuild b/sys-fs/avfs/avfs-1.1.1.ebuild
index 141208a376cf..b89cc6aa4b34 100644
--- a/sys-fs/avfs/avfs-1.0.5.ebuild
+++ b/sys-fs/avfs/avfs-1.1.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit ltprune
+EAPI=7
 
 DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
 HOMEPAGE="https://sourceforge.net/projects/avf"
@@ -17,8 +16,8 @@ RDEPEND=">=sys-fs/fuse-2.4:0
 	sys-libs/zlib
 	app-arch/bzip2
 	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
@@ -42,9 +41,9 @@ src_install() {
 	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
 
 	docinto scripts
-	dodoc scripts/{avfscoda*,*pass}
+	dodoc scripts/*pass
 
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
 
 pkg_postinst() {