gentoo resync : 12.01.2019

3 files changed, 12 insertions, 60 deletions

diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index 6ce9dd588d37..10e507e5715e 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -8,9 +8,7 @@ AUX mtpfs-1.1-wking-patches/0004-Use-storageid-to-access-storageArea.patch 1889
 AUX mtpfs-1.1-wking-patches/0005-Use-O_ACCMODE-to-pull-out-the-access-portion-of-the-.patch 1264 BLAKE2B c2974cb2c369c26ed5e46f0dbaa917c92d2e843ee202819c80530ba040718a548b28194b44eb7490608a874fa22184984c716ccf2bfe8ff971302d9fdf9d08d9 SHA512 547c4d1d48832cf9f4735ec194350cf45786dd259788f498edd02d6801718376ca47b96a83ed72b5f660b70638a37edae1778aa99d763d6d969659c519f9c2b3
 AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAKE2B c6cff901a12db5254517776abef8ec58b756bcb2a10b26bcf6fefe7340bb7003a6e2d043f1c87fa586025ab71d0c692e910b3e545858c560b7e9d21193892b70 SHA512 c43ab62c8d63d6e9c2b42de74a4a25fbb6edf87d0f46128796c7e4e61704a5ee7753fafffbcfbbbc116e180cc1a8d8a3aa8a9b4cb9d3a031ffd8d3d67e201da3
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
-DIST mtpfs-1.0.tar.gz 104242 BLAKE2B b29e0cd88a726affbe0810ceac38378c60b97de99eaf0ca4f5b249f87ca982cc7c83faa0bbfc87b4ffb351c10573ce4778de1f9911842707279c4fb08b157d33 SHA512 af3bd067410f51bf76619a5d98a23c2a5755d2f5e2764221af145a463ab1b819332b00e358887488f2e26e29c91dcabceedf5f8637d97a9b2ba06b91281a6a4d
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
-EBUILD mtpfs-1.0.ebuild 986 BLAKE2B 4fc769add8ee8c1c12cc8cec6c69ae9c00fc543fdbf63095296ded1a4a0127fe204f711522ca58c2c95a480f71cba184a27571b0006df085f485cc18fa575f1a SHA512 9069b27f5d76131502438c1bbc9d329efa5c295a4a36403e14119c887eeb5d0e5523cbfa15ed3d63b4f2af8651d15aa7cd5e435c42d765f3c80b62f2109f6c4d
-EBUILD mtpfs-1.1-r3.ebuild 1269 BLAKE2B c3da55f5770aa13f8cfec7f5e00c61c4a057fdc6de780ff066e4972579d7fe3368e64f8231c8c677444cdb863a1560c04fa7e7ebd685788969c04433eefafd48 SHA512 c12f11172555e927eb4335bebfe05105c6346db378a8e838fc4186947f9bf8dec66e07126401219cfdefc68d9683a108f0ca450cd4d0bb31c35d20099c159f79
 EBUILD mtpfs-1.1-r4.ebuild 1242 BLAKE2B ba8f15fb0b62c6ab0b4a5063d7263782ae00b3bce04baac5c091fa642eb774fd0e78203737b381fd5523b0d7bdbcd8cba0e41c5904bcb8a35d041cbd237dba90 SHA512 94c5de07d7d90de0ebac9ebb5f2f0a72b442fe8d47215c27a9bb4b815c6236e2f2f1103717e17e2021b725645cdbaca869f1847ed63f0118c8fd960be590a804
+EBUILD mtpfs-1.1-r5.ebuild 1250 BLAKE2B d927c05104108a374f687669e9e61b8b0945652ba3d3b4ae0c46bcdfdcaf2906ebef70d0bc93ad7e64d7b6ec8036b89b2146e5f948034a26c0743d06b6ab7636 SHA512 1c036b9c225b403bb0c4abda72e68e20fbbba03d0880f7738b14b17e57cad73d50323a5856e184c5f6aedb3ab7d20a652fdbb9c45a37bc3e9b9c4610ce8f2bdd
 MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
diff --git a/sys-fs/mtpfs/mtpfs-1.0.ebuild b/sys-fs/mtpfs/mtpfs-1.0.ebuild
deleted file mode 100644
index 0968c88c8653..000000000000
--- a/sys-fs/mtpfs/mtpfs-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/"
-SRC_URI="https://www.adebenham.com/debian/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="dev-libs/glib:2
-	media-libs/libid3tag
-	media-libs/libmad
-	media-libs/libmtp
-	sys-fs/fuse"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS README)
-
-src_prepare() {
-	sed -e "/#include <string.h>/ a\
-		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-pkg_postinst() {
-	einfo "To mount your MTP device, issue:"
-	einfo "    /usr/bin/mtpfs <mountpoint>"
-	echo
-	einfo "To unmount your MTP device, issue:"
-	einfo "    /usr/bin/fusermount -u <mountpoint>"
-
-	if use debug; then
-		echo
-		einfo "You have enabled debugging output."
-		einfo "Please make sure you run mtpfs with the -d flag."
-	fi
-}
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
index 5fb9a655bf96..8cc52ebc9b74 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r3.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A FUSE filesystem providing access to MTP devices"
 HOMEPAGE="https://www.adebenham.com/mtpfs/"
@@ -16,24 +14,25 @@ IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2
 	>=media-libs/libmtp-1.1.2
-	sys-fs/fuse
+	<sys-fs/fuse-3:0=
 	mad? (
 		media-libs/libid3tag
 		media-libs/libmad
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=(AUTHORS NEWS README)
 
+PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
+	"${FILESDIR}"/${P}-unitialized-variable.patch
+	"${FILESDIR}"/${P}-wking-patches/
+	"${FILESDIR}"/${P}-g_printf.patch )
+
 src_prepare() {
+	default
 	sed -e "/#include <string.h>/ a\
 		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
-
-	epatch "${FILESDIR}"/${P}-fix-mutex-crash.patch
-	epatch "${FILESDIR}"/${P}-unitialized-variable.patch
-	epatch "${FILESDIR}"/${P}-wking-patches/*.patch
-	epatch "${FILESDIR}"/${P}-g_printf.patch
 }
 
 src_configure() {