gentoo resync : 04.08.2018

3 files changed, 59 insertions, 3 deletions

diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index ad8b044df71e..25d10ed4cc56 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -1,6 +1,6 @@
 AUX mtpfs-1.1-fix-mutex-crash.patch 2115 BLAKE2B 13e74f735cf415d3b8a1139244d4c8f90a4d7d4482cda4de732ba6141e5988b5bd04faf29c8855897469f7e221414dd042be7042ff6c0a1349eec63c76df417c SHA512 800e1dd3d2b76503ee7ba03bbdce8cd43c6a64b4444d3f2f9b49e155b86b005c98ff2019043cbc440762ed8c4dc675a4666fe0fa4bfbc3c89971a2aeb16538e1
 AUX mtpfs-1.1-g_printf.patch 166 BLAKE2B 73c28b822a2ec2cc016bcf4adb037ec4b7b24dc49ecd7c5ad118edc09e970524c7976a95c04de4c5adeae575930912fb7eaf65c175226cff4f5665d2801606b1 SHA512 97ba9291dbcad22c149f5edb89fd67a92b678843caa7b1fa397c9d2c6205bfc591c31696f108732eef9b20bfe767df8e33d5a356d8e975c02eb0a28f773f2006
-AUX mtpfs-1.1-unitialized-variable.patch 346 BLAKE2B 268dd92455df8f41385c145b26046eed8bcaa0cd935d8733da4df1e5219f6d3029cc5e3e6d3b92f5e14b49dec5a181b987f265698b32257fdfb5b0a8117f4927 SHA512 17bec46c584435ff4e636a0b66c612605cdf2ecb029c92058be4e97981758edef31fef7ec31f2e79816fa0c6c3590fe8730abadbe0cbcef825abecdd05aeae8c
+AUX mtpfs-1.1-unitialized-variable.patch 346 BLAKE2B a0d2c486ecb01a11af0f4ef486a28d8dd7d09fd5516372fb37e8adf5010a00e4fe6972bfc5f0ee4baa5e801276df5a54d55c1c9942f0790477384ecd015b1d1a SHA512 a61beb4a5c5cfb2d6682e3962a63697c7c9bfd2692780c2a9cb0d0c5cf3f8e2ef545a1c3cb4c91329e9991ee27db37322b030c8fdcfb0eb40a81b1293d48f884
 AUX mtpfs-1.1-wking-patches/0001-Use-GMutex-instead-of-GStaticMutex.patch 1793 BLAKE2B 84e05f0d2c1b6b93595e6705c0ae415214f90009abbbadc79e3ac8e925734b3a91bbcbfc7b11bc6ca0c268efabe1801fcebf4d7370bc6d8c81b574c8aa376a01 SHA512 a6277bc8a80f65dc685560510ee510367269243826d80f8ef69af5baff1ca6cefc5fec203bd96f997ab1aa111f85404a7fa4c3bffc8f3d0338f090e576773587
 AUX mtpfs-1.1-wking-patches/0002-Free-rawdevices-after-opening-the-connected-device.patch 872 BLAKE2B 10c959ca9061679c103f1a2e96efe0836f137b10ed0011e064665441191e77e739202c498cafcd4c4932fd2b5571af17c90ec14ebe96201668c9e2054953f303 SHA512 281093f81abba85ab2c2cde33ffb19db330332b57366bb3a9574a2f1c0c3378ac55915b421f9ed853212849f629b0bace0ddec5890d5fe521821acdfe6a50277
 AUX mtpfs-1.1-wking-patches/0003-Allocate-additional-byte-for-trailing-null.patch 2016 BLAKE2B 2a8475e6ff89fa5f2409869518d08ead93161227e9484bde32adacfcb4f8ea0c0ab80451e4a226f7d78a75667de363b0b7bc5b21b10f661a062fcb0456867891 SHA512 23d1cf5b70795c5b09d935bd3ca0f362a24f79047072068f48a61a390f3db3010602a79047034a6cb9496ba36012e238ec306bd7849086df6f8166b8f3ed0fbd
@@ -12,4 +12,5 @@ DIST mtpfs-1.0.tar.gz 104242 BLAKE2B b29e0cd88a726affbe0810ceac38378c60b97de99ea
 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 1247 BLAKE2B 116b2f9f385bdd45b16afdc6754c9bed2c331117896de9b377fa4c29b6e3e69d44279ab4aeefa57628406bcd4676aee1b6669eab30af0b5d62956f74f48716f3 SHA512 5f3a21822f025eabffea89fcd46092dffcd6095103f6ba7fcd0660454a10e49e4e2d97a603573d4ec25c1fef7acb3a502ed1ce68a69e1ee4819264bcd4a926c5
 MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
index fb49624515b8..f322d4770ab2 100644
--- a/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
+++ b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch
@@ -1,6 +1,6 @@
 https://bugs.gentoo.org/556690
---- mtpfs.c.old	2015-08-04 21:56:13.080712801 +0200
-+++ mtpfs.c	2015-08-04 21:20:54.822965092 +0200
+--- a/mtpfs.c	2015-08-04 21:56:13.080712801 +0200
++++ b/mtpfs.c	2015-08-04 21:20:54.822965092 +0200
 @@ -1324,7 +1324,7 @@ main (int argc, char *argv[])
      LIBMTP_raw_device_t * rawdevices;
      int numrawdevices;
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
new file mode 100644
index 000000000000..e97428f4e0d5
--- /dev/null
+++ b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A FUSE filesystem providing access to MTP devices"
+HOMEPAGE="https://www.adebenham.com/mtpfs/"
+SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug mad"
+
+RDEPEND="dev-libs/glib:2
+	>=media-libs/libmtp-1.1.2
+	sys-fs/fuse
+	mad? (
+		media-libs/libid3tag
+		media-libs/libmad
+	)"
+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
+}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable mad)
+}
+
+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
+}