Revert "gentoo resync : 13.09.2019"

This reverts commit a1392efe64137262023d92492396ca9156d22396.

4 files changed, 159 insertions, 6 deletions

diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 0ad31c28b155..a35f52f0376b 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -2,5 +2,7 @@ AUX udevil-0.4.3-flags.patch 1051 BLAKE2B d9c6ad984ac5ef75f20226f7d2e2a3ce73126a
 AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc481481156a4fa2b005046e7718ca186a2c3a1b980456d0025ffe3e25db476c91b3011fa5a3a209f270847508e78aaf2081c1b2a SHA512 ce9070dcce7fb0117e50cda0f8b27f493a24f881a9e11fef2024ff3e3b70a1804bb7beef35c9935247baa1f74a499a0ad928a9ff7dbcc586b8c7ee26c5a57776
 AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
-EBUILD udevil-0.4.4-r3.ebuild 1960 BLAKE2B a1aec5c2fd909c3b0361651bb39771bb88dcb939654af6a6e149b2407453e15693d19a15293a63400e9e7279c8dc056edf62f87c7494a8cd2554896de904c2ff SHA512 e1a6f76c8e7e1423288fb3c486bffbaf37b28ec3975e30c8d857f8f369cea6060c9f373358b9f4cf0b2c731efaf3a2254b8d71978715c3652d07c3cdbaa48489
+EBUILD udevil-0.4.4-r1.ebuild 1929 BLAKE2B 2aa9974037fc6a8e839a103c1a9f155236305de2521752b4570df6d251f1c1ae1f562e43ff4f056cf2a4f12436757a09e99fe11d9f31d8843ccc6922ac4c1af9 SHA512 d485071b991959dc45476bf9d0f54264c39386e8698e93beb3a0ac4eb8741937558e418a8c6353328bf9ab40d69fceee8f98afe48ab64eef777b3efcb5bceee3
+EBUILD udevil-0.4.4-r2.ebuild 1983 BLAKE2B f55a86aecb963c18879a78715dc1d91dea20474443ce1b221049cb6cc1a89771d7f1f1a336a5e2c82fec6b8cee3865a4f40ed1841ec6618d77cd97d711625971 SHA512 c744b083e8c0becbb09804c6e0c41704469f3a226588d4e36cd9aedbcca35bd51ee1ac2838a893879fa7b712e350154d680e8a291d5feccb5e637429506f4ff6
+EBUILD udevil-0.4.4-r3.ebuild 1981 BLAKE2B 41c282b74f6add017ea962267a8430115f0fc4776b9d39fde351351fa405bf054843a4c74384ee70e824c4ecc6fd18548ecd39e821ed90b51876566892fa43d0 SHA512 287d08a8535aa11394a26a4d6f995ad344cb1bbc2ed2c53781d6e2df5ede3a875d0ae301105e122bccedf1481cfd3872e3d99697d97571d2ac0c099545e0affe
 MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/udevil-0.4.4-r1.ebuild b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..73596bdd436e
--- /dev/null
+++ b/sys-apps/udevil/udevil-0.4.4-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools epatch user
+
+DESCRIPTION="mount and unmount removable devices without a password"
+HOMEPAGE="https://ignorantguru.github.com/udevil/"
+SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-4.0:*
+	dev-libs/glib:2
+	sys-apps/util-linux
+	virtual/acl
+	>=virtual/udev-143"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup(){
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# This works for 0.4.4 too, no sense copying the patch
+	epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
+	epatch "${FILESDIR}"/${PN}-0.4.4-stat.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-setfacl-prog="$(type -P setfacl)" \
+		--enable-systemd
+}
+
+src_install() {
+	default
+	fowners root:plugdev /usr/bin/udevil
+	fperms 4754 /usr/bin/udevil
+}
+
+pkg_postinst() {
+	einfo
+	elog "Please add your user to the plugdev group"
+	elog "to be able to use ${PN} as a user"
+	elog
+	elog "Optional dependencies:"
+	elog "  gnome-extra/zenity (devmon popups)"
+	elog "  net-fs/davfs2      (mount WebDAV resources)"
+	elog "  net-fs/cifs-utils  (mounting samba shares)"
+	elog "  net-fs/curlftpfs   (mounting ftp shares)"
+	elog "  net-fs/nfs-utils   (mounting nfs shares)"
+	elog "  net-fs/sshfs       (mounting sftp shares)"
+	elog "  virtual/eject      (eject via devmon)"
+	if ! has_version 'sys-fs/udisks' ; then
+		elog
+		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See https://ignorantguru.github.com/${PN}/#polling"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
diff --git a/sys-apps/udevil/udevil-0.4.4-r2.ebuild b/sys-apps/udevil/udevil-0.4.4-r2.ebuild
new file mode 100644
index 000000000000..a75cf290506c
--- /dev/null
+++ b/sys-apps/udevil/udevil-0.4.4-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools user
+
+DESCRIPTION="mount and unmount removable devices without a password"
+HOMEPAGE="https://ignorantguru.github.com/udevil/"
+SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-4.0:*
+	dev-libs/glib:2
+	sys-apps/util-linux
+	virtual/acl
+	>=virtual/udev-143"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup(){
+	enewgroup plugdev
+}
+
+PATCHES=(
+	# This works for 0.4.4 too, no sense copying the patch
+	"${FILESDIR}"/${PN}-0.4.3-flags.patch
+	"${FILESDIR}"/${PN}-0.4.4-stat.patch
+	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-setfacl-prog="$(type -P setfacl)" \
+		--enable-systemd
+}
+
+src_install() {
+	default
+	fowners root:plugdev /usr/bin/udevil
+	fperms 4754 /usr/bin/udevil
+}
+
+pkg_postinst() {
+	einfo
+	elog "Please add your user to the plugdev group"
+	elog "to be able to use ${PN} as a user"
+	elog
+	elog "Optional dependencies:"
+	elog "  gnome-extra/zenity (devmon popups)"
+	elog "  net-fs/davfs2      (mount WebDAV resources)"
+	elog "  net-fs/cifs-utils  (mounting samba shares)"
+	elog "  net-fs/curlftpfs   (mounting ftp shares)"
+	elog "  net-fs/nfs-utils   (mounting nfs shares)"
+	elog "  net-fs/sshfs       (mounting sftp shares)"
+	elog "  virtual/eject      (eject via devmon)"
+	if ! has_version 'sys-fs/udisks' ; then
+		elog
+		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See https://ignorantguru.github.com/${PN}/#polling"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
index fdae0cfa0d3d..0dede83db0ee 100644
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools
+inherit autotools user
 
 DESCRIPTION="mount and unmount removable devices without a password"
 HOMEPAGE="https://ignorantguru.github.com/udevil/"
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="
-	acct-group/plugdev
-	>=app-shells/bash-4.0:*
+RDEPEND=">=app-shells/bash-4.0:*
 	dev-libs/glib:2
 	sys-apps/util-linux
 	virtual/acl
@@ -26,6 +24,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+pkg_setup(){
+	enewgroup plugdev
+}
+
 PATCHES=(
 	# This works for 0.4.4 too, no sense copying the patch
 	"${FILESDIR}"/${PN}-0.4.3-flags.patch