gentoo resync : 25.11.2020

5 files changed, 37 insertions, 13 deletions

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index be3e35ae7877..80aa0f97c88c 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -2,10 +2,11 @@ AUX tpm2-tss-2.4.1-Dont-run-systemd-sysusers-in-Makefile.patch 531 BLAKE2B 45a14
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
 AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945
-DIST tpm2-tss-2.4.1.tar.gz 1445103 BLAKE2B c7be91b93d19b5afeddb6ec455db9ba06795f8dc76ee2a0c6cbabbd8f623930d7c9fdf6319497c70790445531d1e36fe3f904f4c1f4bc9254d833b6d19280f1f SHA512 51551d63fa404e23664aaad1b247bd4b1f93812ced1aed144c37f28cdb3adb4e696aa9e93a502c8fa0eb7e9b4376ac9377f0537eb4c717b68c0b014fee7a0643
-DIST tpm2-tss-2.4.2.tar.gz 1461987 BLAKE2B 7d37818ba91c4128862206d5179dcde2c5149b5b00807b242a0b4311531ad2da9e8ad435a6b46872aab5eb91777012010a352ba0f478737740175e0353275643 SHA512 db31d216abcefdad76f5d9ff2995c99c552400392a4dec800b962fa1fa3ac83effacca831602a9b7f814045c996a1bb066802c5373b54233aa24ddafd636c27e
-DIST tpm2-tss-3.0.0.tar.gz 1509288 BLAKE2B 23c46ba6c9ea2b61703556d3aab5b4e75b1a0242a688c44e8c254a4defd8258e100a933598755373ffec9db3ca0ab9d35e6a290a73851c2a456449e04bd8313a SHA512 ba54904f2cd8cbcca85ce4d4ac5c8650da6ab076e8d8d142e1b7ee75c5e9a645520f1a5ac8ffe5269deceba84762c9074b131296e8b2d4c684ddc335a828d7a8
-EBUILD tpm2-tss-2.4.1.ebuild 1773 BLAKE2B 0b8ad6d1eb92cae0c57fa37a28b3415427cf0a6310aa120e4224dce23c433e8f9dfd8b1005717d4c8e1672c3e59a8c1ce6119e67327cc23bdb999069eb464373 SHA512 a609ca5ff1c17ce961335d0eaabd53a11a7c9d9090f83004bfe336dfa2e85b04d09937e26336f26be044c258668adc8fbab568f2d3dd45670abaebd7b77b8ca7
-EBUILD tpm2-tss-2.4.2.ebuild 1703 BLAKE2B 853fb221ab9c00a9f13ec06e57047595ebe611625d2ff405a29fb79b53a11d9546e3ae910e46f5a5ac1afdd8f3a314eb64bd7453f9e1e8ae629e1f0971e14ac8 SHA512 075ff834e07e11c8df2fadce856441bb45f1e30c47c46f839e5e6b5487edb4bb87ad1b27be239b0261ab4e6a583a611bdf69493e5e890388b0d813ed14d2bd2f
-EBUILD tpm2-tss-3.0.0.ebuild 1700 BLAKE2B 757cfe421b8efdadddc692c87d022a4cc9b2cb81b8f164853a0452007b41e6507275e2d6843e9893accdb12cdbf013f8a4c378454535fc5bb2d22a3c7b372615 SHA512 4c8002a932997356daf5cf3ac4aefc26baf5bb3624a8369ba4ff09a81092c6516ca40037e002016f65e5f9361a1a5fe6c8e32db95266c4ab0d5915aaf9fbea0c
+AUX tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch 990 BLAKE2B 275ce64a386e1d3a5e458b7914c9885e196d40f44d1af57bf2925f0c794946884ea9ebbf60e82ccd747986f9f8feaefa07f43742353a4da99f1fd13d17196975 SHA512 02c3c6f0cbb9f5a70988e7ba7c27d2b19b2ba74c024ca34f71f9803bdac4935b19bd0650bd9069b0c628e2a72449ed69710f59f576261aa68884777bf8f0d7f7
+DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27
+DIST tpm2-tss-2.4.4.tar.gz 1440127 BLAKE2B f5db64281af92bc74d92ecffedbaa051aef21277d8c1c56fb0eb2c47fdebc12772eb18a7c2a2cb671730a1089227f756314ee02acfaa5307fedbfddb86565a81 SHA512 df35bace1744a93e5072a26490e7724604fcc8b04f2b1be71be0069750b8cff7ca4c5c6134e54fbe76f0797d5e83dcfbc8ce248a800d064fbf3be9e3e4745f73
+DIST tpm2-tss-3.0.2.tar.gz 1489725 BLAKE2B e68a6ce24070c9f4966367ecd55cef324b0bef2786dbcdedb894a19dcd71fbb2eda473f612885db4c816c6c2c15711ee192d441be6eb6fd665dd13180e70b556 SHA512 0b295bb1a135c904344e8a11ae9a293f71d60ea045bacd59a9b778ba19e88e1b91022f24a4775615c215db450584574901838146bc4d4d286ee8b686b72b0bab
+EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393
+EBUILD tpm2-tss-2.4.4.ebuild 1789 BLAKE2B e87e5282b9fffc2a2cc69ec2fe2911abea2ae8b2f339c8f15a1224c3dc747a2762d92ffd708ddc97b20c296ed9d61a7bdf94c60982a7eca8594abaac896b760d SHA512 b998791025a6a3ceff0a874b69bb3fa846462d19f99864a8abdef1915e7f8663ae183ea09c79e8c36f00e37f9d5513a6bb4cfbadb1ee0e4889534484ceafbdb6
+EBUILD tpm2-tss-3.0.2.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b
 MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
new file mode 100644
index 000000000000..a593716c97ea
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index ff59dd7c..3049032b 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration],
+         [build and execute integration tests])],,
+     [enable_integration=no])
+ AS_IF([test "x$enable_integration" = "xyes"],
+-     AS_IF([test "$HOSTOS" = "Linux"],
++     [AS_IF([test "$HOSTOS" = "Linux"],
+            [ERROR_IF_NO_PROG([ss])],
+            [ERROR_IF_NO_PROG([sockstat])])
+        ERROR_IF_NO_PROG([echo])
+@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"],
+              [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])])
+        AC_SUBST([INTEGRATION_TCTI], [$integration_tcti])
+        AC_SUBST([INTEGRATION_ARGS], [$integration_args])
+-       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration]))
++       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])])
+ AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
+ #
+ # sanitizer compiler flags
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
index 6f62e2098b94..011fcaefd4a0 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.2.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -33,7 +33,7 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
 )
 
 pkg_setup() {
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.4.ebuild
index 7133a5cfcb7c..67d6b4fa14c7 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -33,8 +33,8 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
-	"${FILESDIR}/${P}-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
+	"${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
+	"${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
 )
 
 pkg_setup() {
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.0.2.ebuild
index b746508251c2..a5458854763f 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc +fapi  +openssl mbedtls static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -31,7 +31,8 @@ BDEPEND="virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+	"${FILESDIR}/${PN}-3.0.1-Fix-underquoting-in-configure-ac.patch"
 )
 
 pkg_setup() {