gentoo resync : 10.11.2017

4 files changed, 26 insertions, 82 deletions

diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 8e943f839e10..9e7309b78344 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,15 +1,13 @@
 DIST libinput-1.6.2.tar.xz 929180 SHA256 96fc0e0b24a96042b16e561201979dfa4a3f00a642538195c62f72b79f4084fa SHA512 f1e1436ec4259ebddf93a50fe4d39a52713efd246a39a072b44bf296a413bdadbb789d6a4f0107ed3eb37afe34a37a43c9e75dcf814462385011eff2d3f42db7 WHIRLPOOL e9ed43ab8efb5b984a8c431e82880a691f7c94577a7a3789cf1e52c82f8aeee70d56474895a349f286f4d7fc845be8302ca7432b8e4801a6233fbe96b0078db3
-DIST libinput-1.7.2.tar.xz 923720 SHA256 0b1e5a6c106ccc609ccececd9e33e6b27c8b01fc7457ddb4c1dd266e780d6bc2 SHA512 cdbd2994e954aac9538fe907c275e6e23e2bed0e9c4c65f19591bdcdbf5074131c72b92e87de87c03f75a991fcdb7f568b491a12f00031c4eba11082ca44d69f WHIRLPOOL 869623f2ef8da44627f28552f86583a6e6927f4966489f1c59d4b7c5061983d58744be5ea162a97e07e4a79495f56a728faaa273f8d45a8a2ee242819769aae8
 DIST libinput-1.7.3.tar.xz 922464 SHA256 096d612d2711f0caa2de544976ff3729e6233511ab373808644cc2dd5affcb1d SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b WHIRLPOOL 06ea9038f7b3127b3238fc863b1ec862647a08b1ab4956fcfd433093dc3c68585ba3b166515370681ed158a48ce6a5670c6b8dcb6d536af25f8bda2c84c74286
-DIST libinput-1.8.2.tar.xz 939664 SHA256 013518ee0adb2287e6e1f08412efba2137320738cadb5399b783738f04cbab38 SHA512 555a7680cc8aaf62c5370a865f3aff0a933d42d94a3d8861c072666b02c9e1be45ea39de9a749a9575cdfb613b6150e412e18559d94d4919f21ca4680a3c76a7 WHIRLPOOL c897c788fe29085f2f8f79f0441f4543d4cfa2f5c4af2357539c9ef49662d7eed2e46fa904bc3291a559a5effd091584da71a6e05ab5c11cb03970a27afd7366
 DIST libinput-1.8.3.tar.xz 941832 SHA256 2fe2e2f52f0971a9c43541b8f26582ca8df6ed4bb9050e85eb40d4ff6b13142d SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6 WHIRLPOOL ebe128f8e9bce71dc7e878cd7dd7815cb0a358f91945ea47945568a1994f1a80c2d6f8db7d5f8f9c5e554c22fcc13733ca4bdcb68b47a72e16e55098904a93e2
 DIST libinput-1.9.0.tar.xz 455248 SHA256 fd717b1f9cf867b2ca1763a5a4638423af178f3a70aa34d278e8bf42777d108e SHA512 4111dd02ef7778c246da28ead284a77014f6eaa4b7f90f36ee124af809e31c70ac065216ef5648d1d2dc525355176e2aa22788bfbb19f5f6d25276fbba42e150 WHIRLPOOL 7a6da661226ef8721bbad446a75be75a3d556d9e886cf44d2296a0fe17207ac181ebd4a4f25dca7ae4072d97cb9759d626d26a1572f007c6b1e9499a0d71beaf
+DIST libinput-1.9.1.tar.xz 456772 SHA256 f0780de4211b3d09f86c17f619f936261a213ca532f8c9ec8f8e7e43422a65f8 SHA512 e60c401cdec6b862c6c7186e636bba285e229b82998d9f86940659806bb64c295ec1060b5e8065345668e4b3ff95457bd01327351520d9f6cf8cbc98b9b95da0 WHIRLPOOL 3a2b679d5d0f1671281fd689a842ccca1f1750f5af6d004d767364daaf17edc7dd8ec17413f1c05c28d162d03036a2719ac2db02bd253f051a9f82c6a667698d
 EBUILD libinput-1.6.2.ebuild 1535 SHA256 9339885a8bce38fed69defce769b1f337a36be302f37d88881ff0b0ab512b13c SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c WHIRLPOOL 4af465c12c12727dba2168f9f2544fe38d9787ad2b343c86eb5734d7e96913dbb8cb485cfbbbaa8f30e02108a32ee813475f45180b74b60fd610b38b8b4d77f6
-EBUILD libinput-1.7.2.ebuild 1536 SHA256 337794ed1591e62bfdc55114724cfb80eea11c7c95086ae290241b1f58a7bf7f SHA512 c5bebcd1026c988bd5b517b76351c0a1326f5e60754a53d25aa73f3c2b7c034623336b0861d8e62254808649fae94bede58a2afd8df415b11327c31bac5e0621 WHIRLPOOL 6259933edd90fb2d2d33d1e1d236958fa85f24588ec29469462db2f4567022bfc8ccce8515660ce3b1cde35e4664e9a17e3778e9a33b27fbd727352d73cdad56
-EBUILD libinput-1.7.3.ebuild 1537 SHA256 a1b13468a7fe62182185628b17e79a4fdb107452d199f356b43f911dc40bb3d0 SHA512 43292245e9e49c706b2565949c696dff71674646fb34d2afa877dc60c29c656d4b749c07cb4a67345a11aa500b27a650574aa6d918466f5f2dacee017fb49a5e WHIRLPOOL 8f7dd2ad95013b5d881d143d3587efe7c95d887c97e9993dd1ebc871d6555a9633006948b4e7467861a6cfe1ac8009bebd6783c9119e42751f99f16745f31f58
-EBUILD libinput-1.8.2.ebuild 1544 SHA256 8b0355468b5985e8b13f94ac0bf2e7812d70e2ec5f4fa696a6424ee37649bc2b SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a WHIRLPOOL f8cec31887f88d7e5c0fdb67a872eb05a2885a6f284aa5143408c77347aac9d49574d622a7cfa6c93bb2020caf0d52c170cd393044d525be62c1a0937924ec42
+EBUILD libinput-1.7.3.ebuild 1536 SHA256 337794ed1591e62bfdc55114724cfb80eea11c7c95086ae290241b1f58a7bf7f SHA512 c5bebcd1026c988bd5b517b76351c0a1326f5e60754a53d25aa73f3c2b7c034623336b0861d8e62254808649fae94bede58a2afd8df415b11327c31bac5e0621 WHIRLPOOL 6259933edd90fb2d2d33d1e1d236958fa85f24588ec29469462db2f4567022bfc8ccce8515660ce3b1cde35e4664e9a17e3778e9a33b27fbd727352d73cdad56
 EBUILD libinput-1.8.3.ebuild 1544 SHA256 8b0355468b5985e8b13f94ac0bf2e7812d70e2ec5f4fa696a6424ee37649bc2b SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a WHIRLPOOL f8cec31887f88d7e5c0fdb67a872eb05a2885a6f284aa5143408c77347aac9d49574d622a7cfa6c93bb2020caf0d52c170cd393044d525be62c1a0937924ec42
 EBUILD libinput-1.9.0.ebuild 1444 SHA256 76962de08b8ffb60dcb7db8191721b4a56ff43bb48c7539692997982b3fb58e0 SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d WHIRLPOOL e88296dcdb2e2bce743815258e91c9bddb0b0e9199515c2cf287af94454bf175d6fd290346c2952c8eeee68885bf4e4cb3ad7bf404e7ac423e24679be04c3531
+EBUILD libinput-1.9.1.ebuild 1444 SHA256 76962de08b8ffb60dcb7db8191721b4a56ff43bb48c7539692997982b3fb58e0 SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d WHIRLPOOL e88296dcdb2e2bce743815258e91c9bddb0b0e9199515c2cf287af94454bf175d6fd290346c2952c8eeee68885bf4e4cb3ad7bf404e7ac423e24679be04c3531
 MISC ChangeLog 14704 SHA256 90bfde16dec6889083dc8f8a9b741e2ef9333ba05a1f38fa7ae990c257952d23 SHA512 8e45d452518032caa5c130be088e498409c11599298fef9a718368a77cd0b55d08406b0c1b31f36dbb1ddf3030ebe91bbbd91715602f0acc1bf816514388d689 WHIRLPOOL 7838c6e8eef6544342ea963e7abaa2bc4df3c70fe1f4f6daed06274f5456d4e358a80daac308eb0fefd7d33caf92972dcf14c963ec23ae1b5e6063386bae73c0
 MISC ChangeLog-2015 4085 SHA256 3316c764e3b7915215642529f9cf317e25dac5ddd889c1af4ae063fdce21bc76 SHA512 f368002ee0fc4984ef107e3522b24110a6694fd38baa30e353748f20ef71aae09c7c43b0d5837f9c795e2858b1904e63da2737dffa1084e934315e09f1e0583e WHIRLPOOL bdc6c89707548d4336ab365a1afee2bdca7d5689fe5f8b8db4cf252f0cb158aacdc1c9d29de9952302d32f77fc7e6def57cf7de33410e6889509dde51607c553
 MISC metadata.xml 340 SHA256 aec9631d3779808069d2ea623ad89d68d982b1ce2d5b583dbceea573d38edbcb SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09 WHIRLPOOL d7c62ee9f95afc2180efeebd0bc8e40400685721be71516e2f31748abcc6b826a6104ea0cc8611221646b6cdf1e6e41948669a3c43ad362fed3aa82e444c8d60
diff --git a/dev-libs/libinput/libinput-1.7.2.ebuild b/dev-libs/libinput/libinput-1.7.2.ebuild
deleted file mode 100644
index f100733b6afa..000000000000
--- a/dev-libs/libinput/libinput-1.7.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="input_devices_wacom test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-0.4
-	>=sys-libs/mtdev-1.1
-	virtual/libudev
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-#	test? (
-#		>=dev-libs/check-0.9.10
-#		dev-util/valgrind
-#		sys-libs/libunwind )
-
-src_prepare() {
-	default
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-documentation \
-		--disable-event-gui \
-		$(use_enable input_devices_wacom libwacom) \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libinput/libinput-1.7.3.ebuild b/dev-libs/libinput/libinput-1.7.3.ebuild
index bc945ad3e268..f100733b6afa 100644
--- a/dev-libs/libinput/libinput-1.7.3.ebuild
+++ b/dev-libs/libinput/libinput-1.7.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.8.2.ebuild b/dev-libs/libinput/libinput-1.9.1.ebuild
index 0c88be02d470..89bf24d7c505 100644
--- a/dev-libs/libinput/libinput-1.8.2.ebuild
+++ b/dev-libs/libinput/libinput-1.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit udev
+inherit meson udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -10,8 +10,8 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="input_devices_wacom test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
 RESTRICT="test"
@@ -23,33 +23,34 @@ RDEPEND="
 	virtual/libudev
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
 #	test? (
 #		>=dev-libs/check-0.9.10
 #		dev-util/valgrind
 #		sys-libs/libunwind )
 
-src_prepare() {
-	default
-	# Doc handling in kinda strange but everything
-	# is available in the tarball already.
-	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
-		-i Makefile.am Makefile.in || die
-}
-
 src_configure() {
 	# gui can be built but will not be installed
-	# building documentation silently fails with graphviz syntax errors
-	econf \
-		--disable-debug-gui \
-		--disable-documentation \
-		$(use_enable input_devices_wacom libwacom) \
-		$(use_enable test tests) \
-		--with-udev-dir="$(get_udevdir)"
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
-	dodoc -r doc/html
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }