gentoo resync : 20.03.2022

3 files changed, 5 insertions, 89 deletions

diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index 9e2ddd8d66c9..3498166f1d1a 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,4 +1,3 @@
-AUX metee-3.1.0-make-docs-optional.patch 2583 BLAKE2B f95c85a91178e2986dfdc8e98630616c3d1364c533cd10f2b69fa5e04184e719d149a2df46d9aa9296df222b56fdef56cf2b265de5eafcbfbf3d019d8e8ea857 SHA512 d2e84ab41ebdfa1fc4d1905cd9cfeed0826512409832e6c99cd946cb71f6829ef52130146a326868d42538c55b26ac1f866809688bce73415f0ebb19338ca0ff
-DIST metee-3.1.0.tar.gz 70185 BLAKE2B 7f0c595b52b608e1136c77df13244681b73f099e384fae6f5ccd350ccf679f539c8b0bc8ac062f386fa41cec9c9edf3064a6c6a981af4ccdc978629a9ebc0d90 SHA512 a967df238f2a51ecbee6fe3fe8a0d63aa321c35a520f0297688a6dab1d760358bca53a6d3cf3446f1fc9cf7f0a6c13746f5d3aa1e2064e753b1bbdb2bd356e60
-EBUILD metee-3.1.0.ebuild 691 BLAKE2B b5953cae207fbd1adaf3e653eb5834e0feffe789f3b639c74d0d25669218621f3c7913b446531d97c312525bf09ef7482d1751aabd6db06cac258b5d6b610af5 SHA512 541eaeb08d582eba338fbb68588478be073eed46f1815be75cbaf625cc32073dfca96c8ff3449d31f96c94e94225ed8e17f260608a4275c9f387102c2d3941c4
+DIST metee-3.1.2.tar.gz 70404 BLAKE2B 811b33dafd6d0f15c6860a97ba9ffb20969548e7fceb3bcc25f96e9eefd27576d076629c21ea7b9c83f934815a6c27229465818c64e2c0fb8996ab9fd6c36a18 SHA512 e1a741a4ebb0971356c00ad51c8b17d273fc3d6453ebe374766259bab855b721cd5223b214447df52f0991474f720010549d88000d47846619252e1c19f84347
+EBUILD metee-3.1.2.ebuild 617 BLAKE2B 94d8f50230611a53c17fca2a037773c3d53d4e86f8c720d58e195fee891ba252f249c1a96c01c723691f2bdbb97e513f2943be06211a9c792d931a4ea5a6deb8 SHA512 b059a3d8f2bbc90174e5704e7ae0cd6e0809156e4f3148765fb1237e53f94082f36395a3aaa27ae8b07ffd91e8c5ea0efda16f610b9118e314acc24d8a4adb40
 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1
diff --git a/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch b/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
deleted file mode 100644
index 9e4eda27e2d8..000000000000
--- a/dev-libs/metee/files/metee-3.1.0-make-docs-optional.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 95c36b4f09eb3697877610a8a995befe32536b78 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sun, 22 Aug 2021 14:16:56 +0200
-Subject: [PATCH] CMakeLists.txt: make docs optional
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- CMakeLists.txt | 51 ++++++++++++++++++++++++++------------------------
- 1 file changed, 27 insertions(+), 24 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b2696d..cd56dc3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,7 @@
- cmake_minimum_required(VERSION 3.5)
- project(metee)
- 
-+option(BUILD_DOCS "Build docs" YES)
- option(BUILD_TEST "Build self-test" NO)
- option(BUILD_SAMPLES "Build samples" NO)
- option(BUILD_MSVC_RUNTIME_STATIC "Build with static runtime libraries on MSVC"
-@@ -43,32 +44,34 @@ install(
- )
- 
- # Documentation
--find_package(Doxygen)
--if(DOXYGEN_FOUND)
--  set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
--  set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
--  configure_file(
--    ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
--    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
--  )
--
--  add_custom_target(
--    doc ALL
--    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
--    COMMENT "Generating documentation with Doxygen"
--    VERBATIM
--  )
--
--  if(UNIX)
--    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
--            DESTINATION ${CMAKE_INSTALL_MANDIR}
-+if(BUILD_DOCS)
-+  find_package(Doxygen)
-+  if(DOXYGEN_FOUND)
-+    set(DOXYGEN_INPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-+    set(DOXYGEN_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-+    configure_file(
-+      ${CMAKE_CURRENT_SOURCE_DIR}/include/Doxyfile.in
-+      ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY
-     )
--    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
--            DESTINATION ${CMAKE_INSTALL_DOCDIR}
-+
-+    add_custom_target(
-+      doc ALL
-+      ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-+      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+      COMMENT "Generating documentation with Doxygen"
-+      VERBATIM
-     )
--  else()
--    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
-+
-+    if(UNIX)
-+      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/man3
-+            DESTINATION ${CMAKE_INSTALL_MANDIR}
-+      )
-+      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-+              DESTINATION ${CMAKE_INSTALL_DOCDIR}
-+      )
-+    else()
-+      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION doc)
-+    endif()
-   endif()
- endif()
- 
diff --git a/dev-libs/metee/metee-3.1.0.ebuild b/dev-libs/metee/metee-3.1.2.ebuild
index 25509cef0437..56bfb574467d 100644
--- a/dev-libs/metee/metee-3.1.0.ebuild
+++ b/dev-libs/metee/metee-3.1.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
 DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
-HOMEPAGE="https://github.com/intel/compute-runtime"
+HOMEPAGE="https://github.com/intel/metee"
 SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -16,8 +16,6 @@ IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/${PN}-3.1.0-make-docs-optional.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS="$(usex doc)"