gentoo resync : 15.01.2020

4 files changed, 89 insertions, 1 deletions

diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
index 8677107a3e9d..34c21bba9015 100644
--- a/x11-libs/tslib/Manifest
+++ b/x11-libs/tslib/Manifest
@@ -1,4 +1,7 @@
+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 1103 BLAKE2B 48107042388b9b05dfa1977a62cea786856e267b762dc64c80c2a48b0469cdcc6c072dd06b8bc2c66bae768431f4af1939ebafe9c54a468496180fe60768d4b7 SHA512 a41e3bee36018b625230f165585afb9493ce86aadeaf1d651773a5b26fd8e0bf35673b1387098321d9aa3a8e0afe90e3cef4d6d52665a29fb0e039b14291b29c
-MISC metadata.xml 329 BLAKE2B 0bc3d02cbc1aa33d242977276c8edc2aa27a58b2b32144be6b6c03bf91cbb77f79c7f6278eb7b505a1be9631d200a198630ec3491bb84ddc486a2d9a305039f9 SHA512 cf3b3310e40c72fa30927c8877d2bcdbf66f38adb2e43a82f7bbea771f4e7f1c292948c03a292b550db0dc8d2e3ef2e12ddb9d676e3bc5663d40714325d0c044
+EBUILD tslib-1.21.ebuild 1571 BLAKE2B 20d3ca2a8c62a85e7f5bafaeb30cf7be34a30fb8519ff9fdde7747cfee76bba19af66e465e74c72745498eef06165d763a5d2fd91a70d5cc91ce8159a3a14f1d SHA512 470ff9c800bea111deafeab004724bc7980360d5375dbe1ff835d70bde49ef3351dbadacaa0d92150f5bed91bab5ce3da2c58014f7c9fd7bc540be7fa7a57b8d
+MISC metadata.xml 476 BLAKE2B 60986e648e86b87a797224b40bcb510af598d2aeafdc497850c714872d844b86c27d7f3c24cbbdad92ec91c8803fd1a8aeb9e06ffea5700ce3c42a2b3d3d8587 SHA512 f5b0def5c198a78dd8bebfb3e9b022ab37dc6466e1a3af7a7b0497f4133be7d155a205da190d63f98c4e10bc7fca6ee84e6aaa6e46e74e1ed0d8c2ac387a15e5
diff --git a/x11-libs/tslib/files/tslib-1.21-optional-utils.patch b/x11-libs/tslib/files/tslib-1.21-optional-utils.patch
new file mode 100644
index 000000000000..5b94599a86fd
--- /dev/null
+++ b/x11-libs/tslib/files/tslib-1.21-optional-utils.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt	2019-10-22 10:27:05.000000000 +0200
++++ b/CMakeLists.txt	2019-12-25 16:18:52.814921538 +0100
+@@ -17,6 +17,7 @@
+ option(BUILD_SHARED_LIBS "ON:  tslib is build as shared; 
+ 			  OFF: tslib is build as static" ON)
+ option(ENABLE_TOOLS "build additional tools" ON)
++option(ENABLE_UTILS "build calibration/test binaries" ON)
+ 
+ set(LIBTS_VERSION_CURRENT 10)
+ set(LIBTS_VERSION_REVISION 3)
+@@ -28,7 +29,9 @@
+ 
+ add_subdirectory(src)
+ add_subdirectory(plugins)
+-add_subdirectory(tests)
++if (ENABLE_UTILS)
++	add_subdirectory(tests)
++endif ()
+ if (ENABLE_TOOLS)
+ 	add_subdirectory(tools)
+ endif ()
diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml
index 7407021b7ce5..640fc4e4a42a 100644
--- a/x11-libs/tslib/metadata.xml
+++ b/x11-libs/tslib/metadata.xml
@@ -8,4 +8,8 @@
 	<upstream>
 		<remote-id type="github">kergoth/tslib</remote-id>
 	</upstream>
+	<use>
+		<flag name="evdev">Build experimental input module</flag>
+		<flag name="uinput">Provide alternative ts_uinput evdev device</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-libs/tslib/tslib-1.21.ebuild b/x11-libs/tslib/tslib-1.21.ebuild
new file mode 100644
index 000000000000..ac72cb85bb3f
--- /dev/null
+++ b/x11-libs/tslib/tslib-1.21.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Touchscreen Access Library"
+HOMEPAGE="https://github.com/kergoth/tslib"
+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"
+IUSE="evdev sdl uinput"
+
+BDEPEND="
+	evdev? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	evdev? ( dev-libs/libevdev[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README{,.md} )
+
+PATCHES=( "${FILESDIR}/${P}-optional-utils.patch" )
+
+src_configure() {
+	my_configure() {
+		local mycmakeargs=(
+			-Denable-input-evdev=$(usex evdev)
+			-DENABLE_TOOLS=$(usex uinput $(multilib_is_native_abi && echo ON || echo OFF) OFF)
+			-DENABLE_UTILS=$(multilib_is_native_abi && echo ON || echo OFF)
+			-Denable-arctic2=ON
+			-Denable-collie=ON
+			-Denable-corgi=ON
+			-Denable-cy8mrln-palmpre=ON
+			-Denable-dejitter=ON
+			-Denable-dmc=ON
+			-Denable-dmc_dus3000=ON
+			-Denable-galax=ON
+			-Denable-h3600=ON
+			-Denable-input=ON
+			-Denable-linear-h2200=ON
+			-Denable-linear=ON
+			-Denable-mk712=ON
+			-Denable-one-wire-ts-input=ON
+			-Denable-pthres=ON
+			-Denable-tatung=ON
+			-Denable-ucb1x00=ON
+			-Denable-variance=ON
+		)
+		multilib_is_native_abi && mycmakeargs+=( -Dwith-sdl=$(usex sdl) )
+
+		cmake-utils_src_configure
+	}
+	multilib_parallel_foreach_abi my_configure
+}