gentoo resync : 24.09.2020

4 files changed, 6 insertions, 171 deletions

diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 47fc34f9c4ec..234755d69f65 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,3 @@
-DIST libinput-1.15.6.tar.xz 584184 BLAKE2B 9963e9df41cb32c40454a3dc76975315f74a2e8b2549c037868c651c2ada90f77a605048ba603a4c01d0641fc39154b578a766309f1c376c07d3bdd02dfd387c SHA512 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969
-DIST libinput-1.16.0.tar.xz 593304 BLAKE2B 959b9e5720b1aa196eb45cf772e8edc800032ee0cd2db1c06537ed979cbf83eaef8c50d2f6aa194e8cf668fcfd1bcb46767a897f99679867b7d816e2567c16a8 SHA512 0c932a88f2a1d23ebef0d58c0cdbfb558e9e3d990fca15b21f5b9011bdd1bc2da81aad374fcdb8f4590f6ee2fc45e668e0583371ceb354437e585240e687aac6
 DIST libinput-1.16.1.tar.xz 595548 BLAKE2B 497089248c2104ff7784b7d46d8e846047e054f01c6ea192f1c41171b39213fa1f19be8c8253c32f988bfc6f025d2519697256ffaf62884182c511bcd5c5d335 SHA512 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0
-EBUILD libinput-1.15.6.ebuild 2146 BLAKE2B 546077aa2a928f10745d17235c84b840ae817ed8dfc124ec82e2504620b3bd65066c95ca945743f703acfbbf50d6968f2f7be6ad8d1e964087f8e2eab52380e5 SHA512 cc2a9d8013068f919e5e181e407870930ba2531eb7b0dfb7c1c1319ca62a5b919b0e227b0bb085377d32b5c5bfea5d24106aedb580f7cc3b5b1e15a9df23e42b
-EBUILD libinput-1.16.0.ebuild 2157 BLAKE2B a85519433dd08ad44c6dde55780b2d3f3f8a1559533120b7a18ccd3920e3ec969dfef9c37a92b71773d2a46563ef0382755ef3d12b97bb6bf188711782faad69 SHA512 e3c62cc6e5a626116801a017852c5b13342e8b5850171f3698e465a84dd3743cad941790d315f5e87f2cd318c0815972d06860efa301baf60b4c8963d6f83a67
-EBUILD libinput-1.16.1.ebuild 2149 BLAKE2B 5d6f6983f9c815fff392efb0e1b07bd20b81a97aa15a7343279438295c0ae038c4f667612214cf60167139b4a5529ba356f3f065a19ffe59753dba04c5567be5 SHA512 f7a0c14f0028ccd8d54d7b4d97209f5344f3bd23a7194d4dbac557cd092cefddea22084f7e5c59848fd5288914e6610b6db100a63a15c2bef878fbeeb589cb36
+EBUILD libinput-1.16.1.ebuild 2230 BLAKE2B 74ca4324289826313f0d01cc08308062483e5c4d204f87f30abe91d2eda88b1278fad9b62a4901c1fbf6b749abacb0f5f92e3b7c52708023c6435392244a46fa SHA512 6290bda45e9c91dafe2a38e3d08c5c83e46c88f13ba186184998c41b8d91f884768d5d12d70fc1072763ddce9ba7545e892699cbbc190e16d757ce32c1833c03
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.15.6.ebuild b/dev-libs/libinput/libinput-1.15.6.ebuild
deleted file mode 100644
index 931b05cb869e..000000000000
--- a/dev-libs/libinput/libinput-1.15.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.16.0.ebuild b/dev-libs/libinput/libinput-1.16.0.ebuild
deleted file mode 100644
index cfbdf1816876..000000000000
--- a/dev-libs/libinput/libinput-1.16.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		$(meson_use test tests)
-		-Dudev-dir="${EPREFIX}$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	pkgname="dev-python/python-libevdev"
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
-		einfo "${pkgname} must be installed to use the"
-		einfo "libinput measure and libinput replay tools."
-	fi
-
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.16.1.ebuild b/dev-libs/libinput/libinput-1.16.1.ebuild
index 37db73f505fb..9fba9ce31fea 100644
--- a/dev-libs/libinput/libinput-1.16.1.ebuild
+++ b/dev-libs/libinput/libinput-1.16.1.ebuild
@@ -52,6 +52,11 @@ pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
 src_configure() {
 	# gui can be built but will not be installed
 	local emesonargs=(