gentoo resync : 30.09.2018

3 files changed, 2 insertions, 28 deletions

diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index f29f7d2a2674..9c51047d579c 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,5 +1,4 @@
 DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c
-EBUILD libevdev-1.5.9-r1.ebuild 1063 BLAKE2B bf6c32fe22abc2536268059db2c41d1b81dd6f562e43a84a1783e92e619f4a5119c139bea69003182ac60b357886d3d601cc15ed6739114719a8d3deab244858 SHA512 729f64e90c9b48e9baa065abe1c8c1a2c5ad8ba6ccbe139b10167def3ba4ae8cbbbffe7f3502b351339cd3f3fc1772736890228bf8a233bfa347360fac4b618d
-EBUILD libevdev-1.5.9.ebuild 661 BLAKE2B 7652efcfaec06d2115d750a2ea48b82e3126af8ae9b017b7b90e706f05a44f5a5dc361870a2b4cbe5ea356a009c44078419b234fefaf9fa83175d2de2ec0645f SHA512 2274dca24677c9e60ca05c2430eb1903da437e6c3dcd81843750378d0a9570d206933baab589be3050296e95e8cd6e15c70a96278ed04db0b2210f81ec02fb0b
+EBUILD libevdev-1.5.9-r1.ebuild 1060 BLAKE2B 6a86951c06d37389eba726579aeea3b6ad54c5d33e64ae4bc79900aef9cff38e98740fbf32c13986215f78c8e0bc4acf3254373a02e097e500bc49028c72f0e7 SHA512 395970e87ef33692d3276e5a367505d9162a6012f7feefe2e4be9b5f0ce3144d6dd826432be972af1288c32f6028436b0c0b0e1262ea5849bc03dcda1e8503e3
 EBUILD libevdev-9999.ebuild 1069 BLAKE2B ce9fc469b63870e17fd86864afe1e18d154b6a2d9bd05e4f3fc71937c45aece02391275d960bece94ce998ba4f40fc7e1b0c73f8fbb1de83bd1e1d84fed19879 SHA512 0fe984fb6a8efe9692532041e9adc37e209d93641e4c4b00693242332610b6f6e6139738ed53ea2014ceef19c5615aac9e2948b3b7e3cc58819f2123a0b22bfa
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
index 23337f81f384..7d982501d6ad 100644
--- a/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.9-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevdev/libevdev-1.5.9.ebuild b/dev-libs/libevdev/libevdev-1.5.9.ebuild
deleted file mode 100644
index be72884a0198..000000000000
--- a/dev-libs/libevdev/libevdev-1.5.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 xorg-2
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git"
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/"
-
-if [[ ${PV} == 9999* ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-fi
-
-RESTRICT="test" # Tests need to run as root.
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"