gentoo resync : 18.11.2019

4 files changed, 71 insertions, 13 deletions

diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 057bbf2a43b0..bfb9e13a21b9 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,6 +1,8 @@
-DIST libinput-gestures-2.40.tar.gz 18082 BLAKE2B ef01449a6fa381361876909487460f2a11e86887b1a3885b1459c218206e80d76ccf53dbebe39d39c360bee5da7a32028673d2165c244df584ae6e8078957d33 SHA512 70c22f7225f4a1f7e0a4d0a83f84370f2649ef01d9a72756b2d4bb4be92ac2265c9aff9302642609065da0e1769b719f616e2d8ee843aca01ce66f1891732890
 DIST libinput-gestures-2.41.tar.gz 18098 BLAKE2B 792ebab29cb5ea24cbb696eac6ed651632db4079d8470784f45a1055d99c9672f8bfa7e8ddc08b80417c91a47f540fdf13f7a071c73bb7a654ce66508f181a38 SHA512 7f718275d5b4b722df52adb597f0344427500ca730c154cf6fd3de2f06d7081e6214cc954addc34594f17f10c70d081fecbfc1a22d16726b6ea820019dae6d83
-EBUILD libinput-gestures-2.40.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
+DIST libinput-gestures-2.45.tar.gz 18645 BLAKE2B 555556e683eac1944407e169d7ad9cac23fe3b91b781dbba9367b86bd73556d3e0aa550008563c4c7f6726a12dc6ac4a458f9dae5782db0d8a23dc2f12a897f8 SHA512 27eac34826c3f02a16bb5c6c892e2bcc12ed27a8a1cb64bde945e869161f30701240deebbd278318f418319f1c98be13dc90eb95f9354f624939af4b7471762f
+DIST libinput-gestures-2.48.tar.gz 22858 BLAKE2B 67fada253a0d02791e14c6c2175f37f75c2e4ff04b04360070d1c045cf064a9d7b362c28a1e8130e6cc435bd487370c69ded3af41d53b935f7024d722aca9593 SHA512 6ad510f2067ab6cef9c9a94f1c300fe91aa811904a0e85209dc06b3afdd4a2be8ae7bda8ccb40210cc59c3758e3b14b53285f7c3c29c6982a3894952b678a840
 EBUILD libinput-gestures-2.41.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
-EBUILD libinput-gestures-9999.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
+EBUILD libinput-gestures-2.45.ebuild 1293 BLAKE2B 61bdc8a6c7dbc604b3359f576bac1964bd260d54da3e7d255aba5d48ab191f4e753445fc58fb2230e77b2d9fdf3d7ffacac78b9cb8561f673f9f9e32435049ea SHA512 fc74cecde6abffe6929d140e6d307533e389b8841c02323785492fc6b22d976be786df3acbd7dd69ac8d6f1f7964debc562077f8ad6e1e7a8cb9da4d6c9eeaa2
+EBUILD libinput-gestures-2.48.ebuild 1293 BLAKE2B 0e10f5dcb9384c9365a1b37cd3d0bf3edd5f95f5468b40f965ac01fdfaa74d526f81752347563633b4c4a4d9d5c7be391b2c8cb0271594f6581dfdc6dfb1473f SHA512 0490fe3da3b88e2ea14462633fc1071759d174315cb276bc89f6468f07d6585a6089b8346f70e9b24fcc5067c1babcfa77c806da85bfd69668d059bad6a1cbd0
+EBUILD libinput-gestures-9999.ebuild 1293 BLAKE2B 0e10f5dcb9384c9365a1b37cd3d0bf3edd5f95f5468b40f965ac01fdfaa74d526f81752347563633b4c4a4d9d5c7be391b2c8cb0271594f6581dfdc6dfb1473f SHA512 0490fe3da3b88e2ea14462633fc1071759d174315cb276bc89f6468f07d6585a6089b8346f70e9b24fcc5067c1babcfa77c806da85bfd69668d059bad6a1cbd0
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.45.ebuild
index 73b3a4132933..213fbc54cfab 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.45.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5..7} )
 
-inherit gnome2-utils python-single-r1
+inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
 HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
@@ -39,7 +39,7 @@ src_prepare() {
 src_test() { :; }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	elog "You must be in the input group to read the touchpad device."
 
@@ -52,5 +52,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
new file mode 100644
index 000000000000..2f4a08da79af
--- /dev/null
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5..7} )
+
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Actions gestures on your touchpad using libinput"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
+else
+	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libinput-1.8.0
+	x11-misc/wmctrl
+	x11-misc/xdotool"
+DEPEND=">=dev-libs/libinput-1.8.0
+	dev-util/desktop-file-utils"
+
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
+src_test() { :; }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	elog "You must be in the input group to read the touchpad device."
+
+	if ! has_version x11-libs/gtk+:3 ; then
+		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
+	fi
+	if ! has_version kde-plasma/kde-cli-tools:5 ; then
+		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 73b3a4132933..2f4a08da79af 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5..7} )
 
-inherit gnome2-utils python-single-r1
+inherit python-single-r1 xdg-utils
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
 HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
@@ -24,8 +24,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
+	x11-misc/wmctrl
+	x11-misc/xdotool"
 DEPEND=">=dev-libs/libinput-1.8.0
 	dev-util/desktop-file-utils"
 
@@ -39,7 +39,7 @@ src_prepare() {
 src_test() { :; }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	elog "You must be in the input group to read the touchpad device."
 
@@ -52,5 +52,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }