gentoo resync : 12.03.2021

3 files changed, 22 insertions, 5 deletions

diff --git a/dev-libs/libtsm/Manifest b/dev-libs/libtsm/Manifest
index e6837bea32f7..a108be94dd75 100644
--- a/dev-libs/libtsm/Manifest
+++ b/dev-libs/libtsm/Manifest
@@ -1,5 +1,6 @@
+AUX libtsm-4.0.1-cmake.patch 500 BLAKE2B b666c52e7c271df3499134cf6f90a9ade31158fdf862851945434df6b40305c785f011ee447a1460b8a783089d69627e075762d55012a8075982dbeeb093d91c SHA512 53673ed55b66bc196cda7cb9aaf151304cfb3e6127be1c349a7b14dd250b346e4b544e7a1f2b03f7da090b33a459cf2e801daa8de74a3e5d04daa1fcdf09ab29
 DIST libtsm-3.tar.xz 293264 BLAKE2B 51044f5e7be2269e1b3f40b04aa486f30a3a496d57d3aa64f25b148edb04d8e039dafbe0df32d0557f4c3a21da52bb53be146fe57d84d4e8201289c3bd347d95 SHA512 119834fd6a84489cc7904bf01905c29004901ddf73d6dc4a1f47f6b402ad76f65cb4226eaa718a73dc06694b1524647eff6046894fd9526a8588eed97f6f68b6
 DIST libtsm-4.0.1.tar.gz 157161 BLAKE2B cba597870d58907e647b9929cf9b97db76b6b38655d56dc3fe0ad0f534db8446cbc82d69a0ec10e58506e001aaf610dee4ab3ecb785b79b2f0571805c04d726e SHA512 28a5ac3d9cf12c4655b3e69ce90b814829ab517f69b88e6339e26dfab6957321a292e96fff687308a39cd16b499e8b29aa133216eb531750e4502a691a907752
 EBUILD libtsm-3.ebuild 356 BLAKE2B 1c9e1a0808e2dbc01543b0258d1331be845381860775515add11a7b9def7da590ec0e96e2b1e44abdd49c1f722b4a1a239fae6366ba688ed766344fbaa615226 SHA512 b1f5eec9d9b0fcf1eb9e090b700e41d462db9f28ec7d005b22aed699ce1f494b09664b9223d715f4a571f401002337f700d041a529bd8c0b27ca04b48c790f38
-EBUILD libtsm-4.0.1.ebuild 390 BLAKE2B 75ab14ad474fd98720ac271556c0b993eed4852fb98d075798267597ad02ab4fa45f400a0748fa171af2b0805775917ef77736cbd6e39a481d87873fa8d73835 SHA512 f23fb108308c8656229b4391be99da98ece807679d743e8815f6e00806deb9646e610b2a3bd131c0bcdbcb6d112d64b631261ea66ce36136d5c6888bc5cb2b4d
+EBUILD libtsm-4.0.1.ebuild 403 BLAKE2B 1ff0cda94f29dfaab48a2bffc79a0188375676747d49d3a8871ab84ba19b9cb059ad87130f3f83b96033d4b79b551235caab02c29a7700ec8f87e03b3a0493ab SHA512 41201a25eb3c90000c04fa18a981efbfe983eb5eaaf90544533f04642acbfa67d93264f71df563ff07612a0bec9841aa69f9fcd116df2c9a07e6089731a6f19f
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch b/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch
new file mode 100644
index 000000000000..eae34cf1aca8
--- /dev/null
+++ b/dev-libs/libtsm/files/libtsm-4.0.1-cmake.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2018-10-09 19:40:23.000000000 +0200
++++ b/CMakeLists.txt	2021-03-06 17:37:02.596380373 +0100
+@@ -24,12 +24,6 @@
+ # For feature_summary
+ include(FeatureSummary)
+ 
+-# Extra build types
+-if(NOT CMAKE_BUILD_TYPE)
+-    set(CMAKE_BUILD_TYPE "Debug")
+-endif()
+-include(cmake/BuildTypes.cmake)
+-
+ #---------------------------------------------------------------------------------------
+ # Options
+ #---------------------------------------------------------------------------------------
diff --git a/dev-libs/libtsm/libtsm-4.0.1.ebuild b/dev-libs/libtsm/libtsm-4.0.1.ebuild
index f8bc7744f35c..29e150fe9c61 100644
--- a/dev-libs/libtsm/libtsm-4.0.1.ebuild
+++ b/dev-libs/libtsm/libtsm-4.0.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_BUILD_TYPE=Release
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Terminal Emulator State Machine"
 HOMEPAGE="https://github.com/Aetf/libtsm"
@@ -14,3 +13,5 @@ LICENSE="LGPL-2.1 MIT"
 SLOT="0/4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )