gentoo resync : 28.04.2018

7 files changed, 49 insertions, 116 deletions

diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 847c16f3d461..15272b7ba810 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,12 +1,6 @@
-DIST libinput-gestures-2.15.tar.gz 11468 BLAKE2B cdcdea40a00eafc84f0a42a7f050c5f484c742c07ad008507881aca19296c93d9e486944d381e94240fd97e1f4740d2a2ba956e8152c1cbe2ab69c0685cf258e SHA512 b0449ce3355e700655cf450b62e239566f2a49127bb4afeda659e04026657d86f13dbfd101399428771b92323e6c55cf40f75bad79025ff80eb9003d85345c23
-DIST libinput-gestures-2.19.tar.gz 13031 BLAKE2B 0f34b0c66ea30cba789cad0f3e82cc9756d48ba6769c63a04d1983f49695e7953b8f60fed3c640e505458ed54e3fbca93be0b9c65fca746c52a13b17f63ed4a2 SHA512 d67e5180e89dd1032fc16be6c6bb8b17f413bc41ebf2d92735fa444b23b5001ae37e243d1089f96308ea22a015b38c066ad8ca2a8f33feea247a51d6bf049d10
-DIST libinput-gestures-2.26.tar.gz 15016 BLAKE2B a61404a6e09f24b6919e1af627eb18c8572195fa1b6a5316dc1e02cb8dcd9738e2663833ac5aa9a372100c1cd3a492205aad8d5e51e592f90db3debd8d79d957 SHA512 375c457c04f74d140693f6db0594b38f09c1a60eec89fa6e4b6da9b1d8d62abe42cf9e1a74214534f2b2f2a36d323521860bea722045b467d6bf2720a9c8c772
-DIST libinput-gestures-2.30.tar.gz 15462 BLAKE2B 35b0dac4c729beb3e10830f8344012f7ab181ad0af68eba65ab5d4c8543dc6c6b636be004ee7faf3138f651fae726d50d0052854b2fbda41cc7cb035deac7e4d SHA512 846e069835eda2c5a36aeafaed3f94d792a0227838622875014f2021531d9e08151900f3cf2188f8edf013d310e2444738d8deea525486349bea6589d09ccce2
 DIST libinput-gestures-2.31.tar.gz 15872 BLAKE2B 0fe671f50ee6e7b06362591d68d259587347794c80df27c73d833e459eb9499ae919bf3e4f12e1dfc2852fd9b70c3962963f3a291107bab8ea0a8f1576dddde4 SHA512 fc3c90025486c8da5b2419f99666737dca40dfc962a549bd1955ea792137a1377a9697c8cab908991503fa9dd6d72520a04ac2dbc9463bc228566569be43ca67
-EBUILD libinput-gestures-2.15.ebuild 759 BLAKE2B b501b62c0e471b403ab713bc8c48599152347669f62df632192f41da6d8d307c6c95f60f25e8c561bd7e243964b35dbe64131d767dab1976c84f5ba32f020547 SHA512 120065e75ee119865923e4f1bd05d960c457971802100fdbb7e34ba755574ec5ebc1677649e8ef15a7989c46cef67956b860789fb5073372f41ba0f1d44ed451
-EBUILD libinput-gestures-2.19.ebuild 759 BLAKE2B bc1e7bcf80e47b317d80517008f18bc6ace0d0c1bd1badd5a6c7af4ed10fc28a181c22a8eab049293a6d003cb1c0383d2d064f91d42f07cf68f812061f566839 SHA512 351167d64286f3024fdd49eb4b96d587c588113ae7edbbc99c738d634ad87e49a9f6400db198dc3382f041711e02662edef81f12b3e0a3e57f9383fff1e92f93
-EBUILD libinput-gestures-2.26.ebuild 779 BLAKE2B c375406ce910a6f6a80ed73782cca048e9d1fde71dfe9e18eb1706573c6e2ca99d36dbb3084ae1d95718f48da666d9f5deba6c2b676db43fc7b00c1ce08bc807 SHA512 6213d21385271e59ca451702f9320503dfaafb090a7a3404131c4d4853856f0a551db966e48d7ccd520d9da64580c05d6d4a10a70dc5c35c79dd87dee47336fb
-EBUILD libinput-gestures-2.30.ebuild 1005 BLAKE2B dedabe01ea832b21b2130222249d9821b418293d6381bdfb47cd8ce624254ed97d0734c455784bb4fc1918f120a39b116eaec5647c56dc33f8a6fb27110c0614 SHA512 1bea80d8d4f9b6612bbd5829e8ee433cab015f709e863f08b97ae3e91aa330d7de29b77ed9f1d300241e05745146252ec6b725467a28dad9ddac711033f4b6d0
-EBUILD libinput-gestures-2.31.ebuild 1005 BLAKE2B dedabe01ea832b21b2130222249d9821b418293d6381bdfb47cd8ce624254ed97d0734c455784bb4fc1918f120a39b116eaec5647c56dc33f8a6fb27110c0614 SHA512 1bea80d8d4f9b6612bbd5829e8ee433cab015f709e863f08b97ae3e91aa330d7de29b77ed9f1d300241e05745146252ec6b725467a28dad9ddac711033f4b6d0
-EBUILD libinput-gestures-9999.ebuild 986 BLAKE2B 97abbaf3ff5bcb6ecc3fde720ea2fe75de7ae56c711c5d279728f33390a6adf6913fea8bdb2c086a5104f46eb63b23d1753aa43ff727c4df7544e0ce2e8c6e77 SHA512 38102dea2f745286b6d13e2d4a5dfad88a725f4363b56c150c43cb3078b4a39d8ad4ed7294603d047cd1fe14cf2774b80b32ab5d271cfb6ccc9d4b7c7c3b4dc9
+DIST libinput-gestures-2.34.tar.gz 16321 BLAKE2B ae1fc850a075fd0b8e4aec6b94f0257f10f309a28a4893aad608eff59afede28b4126734a14f510ca569f64d79492461000dfca8c34e614a5e99839f3c5d952d SHA512 47ffa36b9abb01e62a046d1135cf3ec2773285f94ba68d66c03f877b6acf057491fb4a7645198d8c3bde39e38e12e039f3b10c6987d5765798d969d23359269f
+EBUILD libinput-gestures-2.31.ebuild 1017 BLAKE2B 611b39ec192cc040fd79ef4d262fc15ee31515ebafa478d1a406f64b4da6d32679945d5e0554df832a73cc7ed19c1cc41e830205f3fbced34f40c54f44542a7e SHA512 26486d673e801c4af689661765eca932cc46bf1abc68f67038455ccdeef036bed0ec579bebf3bb6abe74f8daaf12df9772d9e938bc70de314fc3a23fd68ec9a7
+EBUILD libinput-gestures-2.34.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
+EBUILD libinput-gestures-9999.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild
deleted file mode 100644
index 98e1c98335ad..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde gtk"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libinput
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND="dev-libs/libinput
-	dev-util/desktop-file-utils
-	gtk? ( x11-libs/gtk+:3 )
-	kde? ( kde-plasma/kde-cli-tools:5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.19.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.19.ebuild
deleted file mode 100644
index 766fd4ddfc59..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.19.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk kde"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libinput
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND="dev-libs/libinput
-	dev-util/desktop-file-utils
-	gtk? ( x11-libs/gtk+:3 )
-	kde? ( kde-plasma/kde-cli-tools:5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.26.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.26.ebuild
deleted file mode 100644
index 5f7ead386f54..000000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.26.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit python-single-r1
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk kde"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/libinput-1.8.0
-	x11-misc/xdotool
-	x11-misc/wmctrl"
-DEPEND=">=dev-libs/libinput-1.8.0
-	dev-util/desktop-file-utils
-	gtk? ( x11-libs/gtk+:3 )
-	kde? ( kde-plasma/kde-cli-tools:5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_postinst() {
-	elog "You must be in the input group to read the touchpad device."
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
index a9187de1a09c..abfc20a74249 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.31.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit python-single-r1
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
 SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.30.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild
index a9187de1a09c..39fb049c736d 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.30.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.34.ebuild
@@ -5,15 +5,20 @@ EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit python-single-r1
+inherit gnome2-utils python-single-r1
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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"
-KEYWORDS="~amd64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -25,7 +30,16 @@ DEPEND=">=dev-libs/libinput-1.8.0
 	dev-util/desktop-file-utils
 	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
 
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
+
 	elog "You must be in the input group to read the touchpad device."
 
 	if ! has_version x11-libs/gtk+:3 ; then
@@ -35,3 +49,7 @@ pkg_postinst() {
 		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
 	fi
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 17387ae8a397..39fb049c736d 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -5,16 +5,20 @@ EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit git-r3 python-single-r1
+inherit gnome2-utils python-single-r1
 
 DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/${PN}"
-EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-SRC_URI=""
+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"
-KEYWORDS=""
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -26,7 +30,16 @@ DEPEND=">=dev-libs/libinput-1.8.0
 	dev-util/desktop-file-utils
 	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
 
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
+
 	elog "You must be in the input group to read the touchpad device."
 
 	if ! has_version x11-libs/gtk+:3 ; then
@@ -36,3 +49,7 @@ pkg_postinst() {
 		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
 	fi
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}