Merge updates from master

7 files changed, 2 insertions, 55 deletions

diff --git a/media-fonts/noto-cjk/metadata.xml b/media-fonts/noto-cjk/metadata.xml
index 4915e3a96577..f2387332549d 100644
--- a/media-fonts/noto-cjk/metadata.xml
+++ b/media-fonts/noto-cjk/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Fonts</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml
index f6949c4dba8c..b6e0bb3244a6 100644
--- a/media-fonts/noto/metadata.xml
+++ b/media-fonts/noto/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Fonts</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 2537583b5988..324f86130dd2 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,2 +1 @@
-DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d7ad7a3eb36238847f9cb735011fe69fb367e013126419b780ad1fa61c6ad1fdb163e8c5727c4dcff50db85959b7b2 SHA512 98acebf74fe5f5181098cdd880303d6c78d5aa88aa7a87d5371c887e4614536b19a24d48526b235de034fad26b68ddaf4f286b68b5963e95cc1cf7cee1c7b58c
 DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
deleted file mode 100644
index 3952f64c133b..000000000000
--- a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="exFAT filesystem utilities"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	default
-	dosym exfatfsck.8 /usr/share/man/man8/fsck.exfat.8
-	dosym mkexfatfs.8 /usr/share/man/man8/mkfs.exfat.8
-}
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 84e249045158..e5b775c98d04 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,2 +1 @@
-DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e263451bc3cd388b67dc6e793383c8eede1ea754a55c7ce7f14b38b7ec40f503acd28b0709d1ef58b10cb977a1d58 SHA512 ce81f15121b9f21bdaaacb09bdeeccdc8d556585967b85f1ab57534a8da07ea45434541fc571069b5795bae0f2ba5f090bbe7a0d5881dd35de06b706abe6d395
 DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
deleted file mode 100644
index 729d41d9a216..000000000000
--- a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="exFAT filesystem FUSE module"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
-
-RDEPEND="sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	default
-	dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8
-}
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
index ae1eb6cb731f..e9825ca85a4e 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
@@ -11,6 +11,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+IUSE="suid"
 
 RDEPEND="sys-fs/fuse:0"
 DEPEND="${RDEPEND}"
@@ -18,5 +19,6 @@ BDEPEND="virtual/pkgconfig"
 
 src_install() {
 	default
+	use suid && fperms u+s /usr/sbin/mount.exfat-fuse
 	dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8
 }