gentoo (leap year) resync : 29.02.2020

4 files changed, 66 insertions, 6 deletions

diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 72802e9afda6..729e8a8c56db 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -2,5 +2,7 @@ AUX tpm2-abrmd-2.1.1-build.patch 4350 BLAKE2B 9d8dd854954bb79239a2b443d7d6a8eb4a
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
-EBUILD tpm2-abrmd-2.1.1-r1.ebuild 1211 BLAKE2B 1d21d99ed796ba182a8d1188cdeab2f8ed68d107b80223f69d9dd4f76d346dfe593e1912c44b629a408485b1c102d0ce8d643f6721c7f5d5ba0dd0e1e8a34526 SHA512 6d537e4bd4f81d68a954a710c211ea0bf759ff0c1dd7bd4c4462dd57c8f6a8fa72caf274ea5996d29a3049d4ca1677a159d10360c8f0e4e18fb46ba8d700c1e1
-MISC metadata.xml 256 BLAKE2B ef1b528e6888edab8fb403562cc532d082bef9cd585a69c35e1e180662c319351d05e708ed47d0daf911f68eb2842deca3f0bbfea58310e6fcd75e0fa406a1c4 SHA512 d7f2c7e7308b4fae73309ff23cd8210df042d969cc5d2419ccb5b8017b1ea5d1842a9943f4b4e6e0d9d5cd56a12327e7bb8d9da578799f67516110611005c152
+DIST tpm2-abrmd-2.3.1.tar.gz 566988 BLAKE2B 281c1288baaa07b93939219143f4ecc2420b353d04d751746b6e43c93e092d0facb3d0ddbc20129328666d69954dd16ea7e709fea99690af80b2c83e1ac855e4 SHA512 144ab2b147cd18f892f3c05181efdbed2ac422fe8507eb42871ffe571340b6395431743a4f1995a7ce7a914fd5e7afd2b17328062c893a0403708c2c4d92e0cb
+EBUILD tpm2-abrmd-2.1.1-r2.ebuild 1211 BLAKE2B ae3015831a8031e1bce98392f65b7c699c6bdbb4ae0abce74e9860939b6fc64c2d28af158d7d891fba18fedc633b2f10d5aaa948ff7cc6751917958157bf0d9f SHA512 3d2e9786b3e41ffbe30ab123c509d535f89b460ec91dcc3ee031b7fe00e5e2355cf567f91ea8f2182a84b0c4934d3cac94a43a083f29b28eaf8d130c87cff1cb
+EBUILD tpm2-abrmd-2.3.1.ebuild 1170 BLAKE2B 18af00b2e1596539fbc3f4d8e760129544a8912188df9319c6f8d53ea64f9a7f68dc3da265ca8c203cf61acdc0fa5115a99fd9aeb234497d78ba3137a26edda0 SHA512 20d7a6601a5e89f0921761d8b8341e7be729dd991a624ada4ff1ed2eddb36584fddf2560b6e8405872b6a9bdb2edb4e71f2cea794a2d939bd8f9486a1847a85e
+MISC metadata.xml 458 BLAKE2B 049bd6e5ef39abed2d063afe42162fbd7afa04776d9cae8d35c2704ed9ebcdd7ab575dd87350744d443211d6ed4a7a8f3a8d1a12abc4f0673d0c642d3b9412ff SHA512 c44d5ffb197cca46a7c06e1d7d74351590624a0ac62d2fd41e07c8f2dd51877a3770b7c047c4880f3bbea9ac4488a8045bf5aa364c8faf5e0c9bc030620702f7
diff --git a/app-crypt/tpm2-abrmd/metadata.xml b/app-crypt/tpm2-abrmd/metadata.xml
index 3693cb8ff2e3..ddc35e0cf88d 100644
--- a/app-crypt/tpm2-abrmd/metadata.xml
+++ b/app-crypt/tpm2-abrmd/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>salah.coronya@gmail.com</email>
+		<name>Salah Coronya</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-abrmd</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild
index 535dcd41a597..dddc82c0e866 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r1.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,11 +17,11 @@ IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="sys-apps/dbus:=
+	acct-group/tss
+	acct-user/tss
 	dev-libs/glib:=
 	app-crypt/tpm2-tss:="
 DEPEND="${RDEPEND}
-	acct-group/tss
-	acct-user/tss
 	test? ( dev-util/cmocka )"
 BDEPEND="virtual/pkgconfig
 	dev-util/gdbus-codegen"
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild
new file mode 100644
index 000000000000..53562b771fdc
--- /dev/null
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="TPM2 Access Broker & Resource Manager"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/tss
+	 acct-user/tss
+	 sys-apps/dbus:=
+	 dev-libs/glib:=
+	 app-crypt/tpm2-tss:="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig
+	dev-util/gdbus-codegen"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable test unit) \
+		--disable-defaultflags \
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
+		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
+		--with-systemdpresetdisable \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}