gentoo resync : 08.01.2021

3 files changed, 3 insertions, 89 deletions

diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index d02a137e5376..3f242ec1b004 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -3,6 +3,5 @@ AUX pmount-0.9.99_alpha-exfat-support.patch 499 BLAKE2B 11045f138c9b20c03f39760d
 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 2013 BLAKE2B 0140eee43a88f8f892ed31746acf4471610d4b39b6aece38900da524b2254e2ca4704bd3927e2554a478e07562f6b07a060cbc65b0f68c6fffb945d70c9105cb SHA512 dbf9b575961207bb62ef09e8e18667e1df831d228ed49dce8cb983e6016851887c4c45ff56ff61d390967cacd3e44d04984a72a548ad9a3d0960e79fe482cb72
-EBUILD pmount-0.9.99_alpha-r6.ebuild 2055 BLAKE2B 523e73403e5876368ea18f0de453e5a4c1747f0af11ef2f3f4454f0adc9f670680bee0f80eb86e047c4e8924762e5443b752e6ca200c7def8d7391fb7425fddb SHA512 d14261587434fa30b9c2933c1b3ecd9ac48b1856be039fedb37b03d145d2bdac4104bbb88602be7d5d876093ef3570f8eebaa7e1fb6307ca2b70ea23194e675b
+EBUILD pmount-0.9.99_alpha-r6.ebuild 2054 BLAKE2B 6fd8f5a1d5a3f68636fa85c0ac07e2ad666694173e7d6712fe85c0b0caa8908c12133159c5d19b56972060eeb19b1e7f7966eb29690d734ba357e49d521190ee SHA512 dd24bfdbe6f7cd5e2d1ca844976d440ef0c76476c4c0808a689ba2fc607613b916dab12b091e7a29492e898bdb7bf2fc7d3a1aee719699a0285a79ff0136553b
 MISC metadata.xml 434 BLAKE2B 4e7b5746a0ec1a037eb91e0fe55a2fdd14e70320bf2b30ac8640e77f4c005cc533cee3a50ef2907a4e863987bcbf9aedca9e8be51210cffd2ddcf570a05a7714 SHA512 a11a466c6b52b576d55120fd5a142918ed4fc942656f13c923c210ee19dda00867cf66e9e4a6074caac4e1f7683ecdbbae5a72ebe4035300af8bcd41dc4e4f93
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
deleted file mode 100644
index da81d534c5dc..000000000000
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="crypt"
-
-RDEPEND="
-	acct-group/plugdev
-	>=sys-apps/util-linux-2.17.2
-	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext"
-
-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 || die
-	src/conffile.c
-	src/configuration.c
-	src/loop.c
-	EOF
-
-	default
-}
-
-src_configure() {
-	econf --disable-hal
-}
-
-src_test() {
-	local testdir=${S}/tests/check_fstab
-
-	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() {
-	# Must be run SETUID+SETGID, bug #250106
-	exeinto /usr/bin
-	exeopts -m 6710 -g plugdev
-	doexe src/{p,pu}mount
-
-	dodoc AUTHORS ChangeLog TODO
-	doman man/{{p,pu}mount.1,pmount.conf.5}
-
-	insinto /etc
-	doins etc/pmount.{allow,conf}
-
-	keepdir /media #501772
-
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
-	bashcomp_alias pmount pumount
-}
-
-pkg_postinst() {
-	elog
-	elog "This package has been installed setuid and setgid."
-
-	elog "The permissions are as such that only users that belong to the plugdev"
-	elog "group are allowed to run this. But if a script run by root mounts a"
-	elog "device, members of the plugdev group will have access to it."
-	elog
-	elog "Please add your user to the plugdev group to be able to mount USB drives"
-}
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
index d5b7d279d3ee..e6a575c9f139 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="crypt"
 
 RDEPEND="