gentoo resync : 29.12.2022

3 files changed, 10 insertions, 33 deletions

diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index e49507501ada..7ef7e56be1c7 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,5 +1,3 @@
-DIST metee-3.1.2.tar.gz 70404 BLAKE2B 811b33dafd6d0f15c6860a97ba9ffb20969548e7fceb3bcc25f96e9eefd27576d076629c21ea7b9c83f934815a6c27229465818c64e2c0fb8996ab9fd6c36a18 SHA512 e1a741a4ebb0971356c00ad51c8b17d273fc3d6453ebe374766259bab855b721cd5223b214447df52f0991474f720010549d88000d47846619252e1c19f84347
 DIST metee-3.1.3.tar.gz 71887 BLAKE2B 9fa4f126abccea44b0a074d8bdb1e7e8d7f7bb4d3334cc77d6c00ef6d315577860fde3d11e81499824e79e01e373030cf4f8aa299864197dbde7b14c7c80fe08 SHA512 65f12ff244e66dbc84925be5871e507af9284f47c100fcf4a458882f2e65a0128ac33783c0144f9dfea96a5d87641a1059885855d565ca0e5623ec27718c9d5b
-EBUILD metee-3.1.2.ebuild 617 BLAKE2B 94d8f50230611a53c17fca2a037773c3d53d4e86f8c720d58e195fee891ba252f249c1a96c01c723691f2bdbb97e513f2943be06211a9c792d931a4ea5a6deb8 SHA512 b059a3d8f2bbc90174e5704e7ae0cd6e0809156e4f3148765fb1237e53f94082f36395a3aaa27ae8b07ffd91e8c5ea0efda16f610b9118e314acc24d8a4adb40
-EBUILD metee-3.1.3.ebuild 624 BLAKE2B 9445caa4e39a921712f9fd20c96ed85722dc9c6ee6ee26d32cf6322e94b4104227af9668c5a0adf3a7f8c799d79c70a6c3bf9571898436b9f9c8d4f7944c49a0 SHA512 a5b01448ede15cbbb78f1292d363f24ec8987787d79c43246defb465b6521ef34a944f6093f476cfb89150098eb21939e145abf7b2c5597d22e8f123f2033d76
+EBUILD metee-3.1.3.ebuild 772 BLAKE2B 35d47ae5bfe82857b269235db049a6bcf8f96fc22567cc9eadbf0dbddc68c990f9a412f9b986034a7c5158c155c01aa3c3768821e11a563d8b65e6dc1fe72e18 SHA512 04d26018484e7c2b8a8978e1a393bc902bbd00167c7b608e6d1e5621315940ecc9eb2338097e151a47f04f9b61c60d58e37767affdcb3dba3d4da7cac1930f94
 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1
diff --git a/dev-libs/metee/metee-3.1.2.ebuild b/dev-libs/metee/metee-3.1.2.ebuild
deleted file mode 100644
index 56bfb574467d..000000000000
--- a/dev-libs/metee/metee-3.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Cross-platform access library for Intel CSME HECI interface"
-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"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS="$(usex doc)"
-		-DBUILD_SAMPLES="NO"
-		-DBUILD_SHARED_LIBS="YES"
-		-DBUILD_TEST="NO"
-		-DCONSOLE_OUTPUT="NO"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/metee/metee-3.1.3.ebuild b/dev-libs/metee/metee-3.1.3.ebuild
index 1c3e7da0adaf..21d55479196f 100644
--- a/dev-libs/metee/metee-3.1.3.ebuild
+++ b/dev-libs/metee/metee-3.1.3.ebuild
@@ -11,11 +11,19 @@ SRC_URI="https://github.com/intel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0/3.1.3"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	default
+	cmake_src_prepare
+
+	# Respect users CFLAGS
+	sed -e 's/-D_FORTIFY_SOURCE=2 -O2//' -e 's/-Werror//' -i linux.cmake || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS="$(usex doc)"