gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 44 deletions

diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 70d7fb2a36cf..88496a45d27f 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,7 +1,4 @@
 AUX tslib-1.21-optional-utils.patch 610 BLAKE2B 0f25c58205f5bbddc62f278827d9689e58c88323d6c2797d3f36d165c5dcfc8fe18574225dab106eb9c01d3a7f54a3f7c3797be0853dd3b144bbb61529ea83eb SHA512 3c061d34e5a2f89c61754331d9a8efa9ffeb492169d3c0082b29107f03442adc75f6a39f289577c3902df2a9efc4166f9ac610867742989f09f10a8bfd69230d
-DIST tslib-1.0-patches-5.tar.bz2 6602 BLAKE2B 3cd67f4eeacd0651354af8ee4637e27084e9ad61246e6cab631ef52c7435e6d37acdaffd4ca72d8435335860f12d2b0fb4205b33092ea603aafc837e2dba6885 SHA512 dcde900942a3c9e9114e2c36d1d9554eeae8e5ca64463d69c52188a30734b19d6ba0439e8bb009b0d535dfae3f8f8e688a6861ec0a0371fdcb0e9986abb963de
-DIST tslib-1.0.tar.bz2 47522 BLAKE2B 99f43b5175fadef240a973d0e88c80a227b5ffe518c97c6d890fa4194148ff099055b98e7b5b3fee542249bb9c9bae88a22d1d050f2f7ca1563d03b453aac34c SHA512 a12e569b1d9cd809776a605775c3000f4e405789d95eeda21451d3911b5aa67003c921d9988f5ea8eba8b32108c8b0816e6609b5f013a2594d27b6e00e75de8c
 DIST tslib-1.21.tar.xz 349216 BLAKE2B e19623c9390688b0aa85e6547a57542d2e10498c8ebbb30f840157d240dc9975c3e6735814a5e6f02fb71c273a52f860695cf4772fef28522e74c5781cdcb02a SHA512 66c5e5dc4e2314277e19af29b5dce1181573579f13b0e79fa43e658838d4c19a77feb978b60d7c6458337e8d6100ee54a42fc4af3a99fd8d6840cccafa6323c4
-EBUILD tslib-1.0-r3.ebuild 1104 BLAKE2B 686322e0b7c3dfc9480c162f61366429a7f7af9e33101c6b55f4a966b2abf2ce0814a0d46c397229761b32226509bab433cd3a8ddfa00d43c0abddcb756760c8 SHA512 480bad9584084fffd1221b74aa241fb5e5ca181a67b3c4ae5dfead8622961dfdef216b0eb2682ef8e464522e149e367522f438b48cc63edbdf910cde9175963b
-EBUILD tslib-1.21.ebuild 1563 BLAKE2B 5298a755e9b729ee8600df6af038ec81888ccbef2f06cbab9158b2c29262db1ed891ce224b2761b8a5c68a676b3b2977d5209e2c6056f54c1a24e3cf45c5fee6 SHA512 adf7cceb50a52d1eb58c733344c28c0b2de98c945dc1b3bc84f7f273c6a64bb4ca36ebbcbd56def8fa21961770cf92d0b64d94a174d5695192da079725eae4e9
+EBUILD tslib-1.21.ebuild 1559 BLAKE2B f0ff88b979032b3c81a40e881e2d3b414ca009fca5f8e1f35bf86ffbab0630ac4996860b2e6753b494ee652f81e3b9e4f30f3cb47a07d708cd2f2cd6d9f07e09 SHA512 a0bb7ba84a2c8715d3f9abe75d92c6c5e2cf29100cd6138cf66f05274f8888aacabc45cdcc10d57b1b1d92f2537d08747e33b06d2a38b4c1c51af6f13fece68e
 MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/tslib-1.0-r3.ebuild b/x11-libs/tslib/tslib-1.0-r3.ebuild
deleted file mode 100644
index 4747625c4ea4..000000000000
--- a/x11-libs/tslib/tslib-1.0-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs autotools multilib-minimal
-
-PATCH_VER="5"
-DESCRIPTION="Touchscreen Access Library"
-HOMEPAGE="https://github.com/kergoth/tslib"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE=""
-#extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	# patches come from buildroot + openembedded + suse
-	EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patch
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# compile everything. INSTALL_MASK= what you don't want.
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-linear --enable-dejitter \
-		--enable-variance --enable-pthres \
-		--enable-input --enable-shared \
-		--enable-arctic2 --enable-collie \
-		--enable-corgi --enable-h3600 \
-		--enable-linear-h2200 --enable-mk712 \
-		--enable-ucb1x00 --disable-debug
-}
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
index 3891d1a0b2e1..bd2fc9d88d55 100644
--- a/x11-libs/tslib/tslib-1.21.ebuild
+++ b/x11-libs/tslib/tslib-1.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libts/tslib/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2 uinput? ( GPL-2+ )"
 SLOT="0"
-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 sparc x86"
 IUSE="evdev sdl uinput"
 
 BDEPEND="