gentoo resync : 15.01.2020

4 files changed, 23 insertions, 20 deletions

diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 3d44f2201b30..28a20b693e4a 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -1,6 +1,6 @@
-AUX pmount-0.9.19-testsuite-missing-dir.patch 1354 BLAKE2B cebe20a80f929f1104fc8a9e54845c31cb21f5aa9d4f404b4469fd006884239504b0c9fb5cd1db579c9669632cafd40f0186d1d8f125c39d46c68af1f7084713 SHA512 a606b937a39c558fa5c48544fa3451504d3c8f540de97d87630e0d3edd6a984b74d8c52fda189aef818e007820ee146daf6b3ce75aad03b3e8e4309723f5113c
-AUX pmount-0.9.99_alpha-locale-regex.patch 749 BLAKE2B d1e777c57ba8b261f6fdf461200a980149b417022dd0fb78cd1f366be2001850956fede8677859a952c9b961668488f8bb2ef0302816f72e41f71b0191d3b336 SHA512 9009544a6d424dc6449d8f1ba53521802741b904129e1f4cd729a1051735fda3d6fcfe85d5aa49f6fbc5df62abbcb21fd7ab578cee667efaf3e4c00dc1b8131c
+AUX pmount-0.9.19-testsuite-missing-dir.patch 1360 BLAKE2B 3a44bfe3de89169f5666886b9c192e0f530b3a3785c8a64fbfbdbbbc93331a9c74cbc19cab25ebcc0f5e3fb64d23348f1dd8deaf028545d444000a64d6a5b45a SHA512 3bc940550f59d62106c610d7846ddea09cab674b176cd7361848d283b0f19a0fda5573c6bafb99abe99c806651493ed07ac21f92d32f7dc30d0ccb77a4c1928e
+AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2025 BLAKE2B ef52d2965725324a5b98db6c6b8a2c061396f35b53f30dc5224d5d56fe8325811357c1de2be0518b5944a4dc3971e791c6fdc60f4d3ddc82876ad94dd2bff6f4 SHA512 65d58a6044be597ac0fe9fe893b411d8f8d82f0ead2eebb710c07e5ce582c673b321283ff01e330f679233fbb2e693576e1a64c79e34d2867873f034bfb089d7
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2014 BLAKE2B 6f03f1ff6df2592923efa868008c734225e2bfb07ce01fa2173fc9fd56886be96760e13b30d1647dc5e0ced80a46ad160facfee7a3ae0eeee5f8bc2b04f78310 SHA512 40168c4e6c9c75f9004cdd97b0dc9227be44bd426e6cc08dfc2ce4bff8decc5f4c952a8e787bd948d392731a8ec09b2fef6563a8d151ecd97fe9338e613ee09d
 MISC metadata.xml 321 BLAKE2B 014d83434739678d62884604e7e4e56cc52123ddd326250068ed4fd2f5db2b439a75e29c5dc3699599db3c640df414f9407cc772e302796a34eec58e21ebf1a2 SHA512 be1e96e34fcb9d2c433c6d67280840adb13b8771860e6314fff1b716814b120c4d31574333052e54fb788f76c8990d0bd1bdb4c725fde28b174bbd5a918bdc6e
diff --git a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
index 93d0555f0f3d..319a1d6f04a3 100644
--- a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
+++ b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
@@ -16,21 +16,21 @@ diff --git a/tests/check_fstab/a b/tests/check_fstab/a
 new file mode 100644
 index 0000000..d16d1c5
 --- /dev/null
-+++ tests/check_fstab/a
++++ b/tests/check_fstab/a
 @@ -0,0 +1 @@
 +This file is a 'dummy device file' for the fstab check
 diff --git a/tests/check_fstab/d b/tests/check_fstab/d
 new file mode 100644
 index 0000000..d16d1c5
 --- /dev/null
-+++ tests/check_fstab/d
++++ b/tests/check_fstab/d
 @@ -0,0 +1 @@
 +This file is a 'dummy device file' for the fstab check
 diff --git a/tests/check_fstab/fstab b/tests/check_fstab/fstab
 new file mode 100644
 index 0000000..8ba6f6c
 --- /dev/null
-+++ tests/check_fstab/fstab
++++ b/tests/check_fstab/fstab
 @@ -0,0 +1,6 @@
 +# A dummy fstab file for 
 +
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch
index c96fc0554522..3dabd03c9659 100644
--- a/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-locale-regex.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/416985
 
---- src/conffile.c
-+++ src/conffile.c
+--- a/src/conffile.c
++++ b/src/conffile.c
 @@ -372,7 +372,7 @@ static int cf_prepare_regexps()
    /* A regexp matching a boolean value*/
  
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index 52df8b15b9ff..7df482af2a2e 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils bash-completion-r1
+EAPI=7
+inherit bash-completion-r1
 
 DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
 HOMEPAGE="https://launchpad.net/pmount"
 SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
+S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,21 +22,22 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext"
 
-S=${WORKDIR}/${P/_/-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
+	"${FILESDIR}"/${P}-locale-regex.patch
+)
 
 src_prepare() {
 	# Restore default value from pmount <= 0.9.23 wrt #393633
 	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
 
-	cat <<-EOF > po/POTFILES.skip
+	cat <<-EOF > po/POTFILES.skip || die
 	src/conffile.c
 	src/configuration.c
 	src/loop.c
 	EOF
 
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch \
-		"${FILESDIR}"/${P}-locale-regex.patch
+	default
 }
 
 src_configure() {
@@ -45,14 +47,15 @@ src_configure() {
 src_test() {
 	local testdir=${S}/tests/check_fstab
 
-	ln -s $testdir/a $testdir/b && ln -s $testdir/d $testdir/c && \
-		ln -s $testdir/c $testdir/e \
-		|| die "Unable to create fake symlinks required for testsuite"
+	ln -s a "${testdir}/b" &&
+		ln -s d "${testdir}/c" &&
+		ln -s c "${testdir}/e" ||
+		die "Unable to create fake symlinks required for testsuite"
 
 	emake check
 }
 
-src_install () {
+src_install() {
 	# Must be run SETUID+SETGID, bug #250106
 	exeinto /usr/bin
 	exeopts -m 6710 -g plugdev