gentoo resync : 17.05.2018

5 files changed, 64 insertions, 25 deletions

diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index 23d39b727461..2f7d81161a82 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,4 +1,5 @@
 DIST uam-0.3.2.tar.bz2 60508 BLAKE2B 35accde4ae392f33af0d1c0f30069975e30691927dff33ac754d00f1de7b30d1b789e9797637f9701913796b5993add4b2405294fa47b1fbd6f8d6e1946b1ad8 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273
-EBUILD uam-0.3.2.ebuild 1490 BLAKE2B c18f67cc75abdeb64a5434e5dffdc01f7665a31eaa451de61b1783068b50c48dcd84aa2e6e6371a975756960d6207120fe422bab0811b8d5fd362d2ce9ca2d93 SHA512 6c5c47fedab034583c1f471a1768e800b37f7127482e28cf1449be1c4085fb2caf46c0acf57ed8dce9849b7987addc05972f1b6c08a4c8a0f246a1a8e5a38ecf
-EBUILD uam-9999.ebuild 1641 BLAKE2B 43823d6f16dbdfb9fe7a744bd5d2b2a4536f30f8527371d8ef5e2fa2086ba3ad64dbbcfb7772b3b8f67b5a4ecc33042c4e1411f3c439bce407829f405934427e SHA512 73b2b1a6d4139eb4bc6e846aa4cb0baa582215f5baf0b0fadf712213c79a53749ed0ac31a34463da4beaf0932c8425602830582beffb1c7e4beb207c7bc7c293
-MISC metadata.xml 720 BLAKE2B b7972ab02c083ded62cf5552a515c0f75d7ec7a5546e75df29dc2b749c6db713d5cea47eb3478fc92ded9128dd08d5b7f84c6050db2354b2aafedc22a3652ef8 SHA512 8603fba8cd8b329edef637f3030bc6b2d9ab4b40bcb511a501140e71eae5cc89be8c1a488c5e45e0f1daaf83334306e3ba86966ac74bceba6426b68cb1b2fbe3
+EBUILD uam-0.3.2-r1.ebuild 1477 BLAKE2B bbfb23a4c7d65305ea40f6e316552357e06394ff5a51e2e3855262430f86b72890c2fe17106edfb9f90f9046d3f8ef927a2ffa57678d5ebb2f9a33b870f51207 SHA512 d5b1ca27e1c8b156ad86eb957fdaa049589bb68fb617d9a51744b48aefa993994ba24ae7e31748ce0400a41009d5959c2280676dcdbabdd9cb354b11f8ea65fe
+EBUILD uam-0.3.2.ebuild 1491 BLAKE2B 99e490c5cbffe511bc15559193c8cbbf8402e362cec57b9812579b2e001e736830a2ecc854a3bcde53cb2a5e66698ecfd16288e1be91cb11b80e789e1dfdd808 SHA512 190309f169b1f70a1dbd2e3469ccbc09fac2781dbba027294796fec61d67538a46a88e600c934d085373160e10e72f17045dbdf166451e0355c2477a0ca360d4
+EBUILD uam-9999.ebuild 1509 BLAKE2B 8fee1d4104540955b2cd074fd902ed56ee2777f315e88850d096461bfd76c16f93963dcc8b0d60629fd0226e8c2b95bbbc73446c7afa7c9f572e82552022642d SHA512 d410de4ba3041a770b13edb3365b896e6548611748168f4031b89d090718c3e600cfe94c294c6e3842ca00cd1a1a10cc35fb8498c028018474e710253bd7d7a6
+MISC metadata.xml 714 BLAKE2B fe8e8accd2c75c3aa51ce152676480d221a02e009db51874118ad939350c22c01bd171fe5d8628b626b0bf399df31b62f24303496768e214a0392979101ed128 SHA512 a344cc7080f63224d58604c26db1923afbe06b6bae3bd839f72e8f1cd8b6e41fc01e2eb46b135e8b8dfcb1217fc5ad507c0e86315c833a2d2b0541a6c3a53078
diff --git a/sys-apps/uam/metadata.xml b/sys-apps/uam/metadata.xml
index 6a889f577ea0..2cdff751d2ae 100644
--- a/sys-apps/uam/metadata.xml
+++ b/sys-apps/uam/metadata.xml
@@ -15,7 +15,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/uam/issues/</bugs-to>
-		<remote-id type="bitbucket">mgorny/uam</remote-id>
+		<bugs-to>https://github.com/mgorny/uam/issues/</bugs-to>
+		<remote-id type="github">mgorny/uam</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/uam/uam-0.3.2-r1.ebuild b/sys-apps/uam/uam-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..409fc7f68e81
--- /dev/null
+++ b/sys-apps/uam/uam-0.3.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit udev user
+
+DESCRIPTION="Simple udev-based automounter for removable USB media"
+HOMEPAGE="https://github.com/mgorny/uam/"
+SRC_URI="https://github.com/mgorny/uam/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	# The plugdev group is created by pam, pmount and many other ebuilds
+	# in gx86. As we don't want to depend on any of them (even pmount is
+	# optional), we create it ourself too.
+	enewgroup plugdev
+
+	elog "To be able to access uam-mounted filesystems, you have to be"
+	elog "a member of the 'plugdev' group."
+	elog
+	elog "Note that uam doesn't provide any way to allow unprivileged user"
+	elog "to manually umount devices. The upstream suggested solution"
+	elog "is to use [sys-apps/pmount]. If you don't feel like installing"
+	elog "additional tools, remember to sync before removing your USB stick."
+	elog
+	elog "If you'd like uam to mount ejectable media like CDs/DVDs, you need"
+	elog "to enable in-kernel media polling, e.g.:"
+	elog "	echo 5000 > /sys/module/block/parameters/events_dfl_poll_msecs"
+	elog "where 5000 would mean a poll will occur every 5 seconds."
+	elog
+	elog "If you'd like to receive libnotify-based notifications, you need"
+	elog "to install the [x11-misc/sw-notify-send] tool."
+
+	udev_reload
+}
diff --git a/sys-apps/uam/uam-0.3.2.ebuild b/sys-apps/uam/uam-0.3.2.ebuild
index 1700a15a47c8..e0bf0ed9eeff 100644
--- a/sys-apps/uam/uam-0.3.2.ebuild
+++ b/sys-apps/uam/uam-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit autotools-utils udev user
 
 DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://bitbucket.org/mgorny/uam/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/uam/"
+SRC_URI="https://github.com/mgorny/uam/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sys-apps/uam/uam-9999.ebuild b/sys-apps/uam/uam-9999.ebuild
index 512c8e51355b..4aa949336985 100644
--- a/sys-apps/uam/uam-9999.ebuild
+++ b/sys-apps/uam/uam-9999.ebuild
@@ -1,34 +1,28 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-
-inherit git-r3
-#endif
-
-inherit autotools-utils udev user
+inherit autotools git-r3 udev user
 
 DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://bitbucket.org/mgorny/uam/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/uam/"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/uam.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND="virtual/udev"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
+src_prepare() {
+	default
+	eautoreconf
+}
 
 pkg_postinst() {
 	# The plugdev group is created by pam, pmount and many other ebuilds