commit:     9dc0747ba3c29a85b7ab3dede90ac9b39f29e438
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat May 22 01:11:37 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 08:13:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc0747b

app-crypt/tpm2-tss: Remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20918
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-crypt/tpm2-tss/Manifest                        |  2 -
 ...0.0-Dont-run-systemd-sysusers-in-Makefile.patch | 16 -----
 ...ss-3.0.1-Fix-underquoting-in-configure-ac.patch | 22 -------
 app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild           | 77 ----------------------
 app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild           | 76 ---------------------
 5 files changed, 193 deletions(-)

diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 24f31fe276b..bcc65f26237 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,5 +1,3 @@
-DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 
21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312
 SHA512 
4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27
 DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 
644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f
 SHA512 
2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
 DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B 
e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0
 SHA512 
f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a
-DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 
5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883
 SHA512 
54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8
 DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B 
cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738
 SHA512 
8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405

diff --git 
a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
 
b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index fd1d462151f..00000000000
--- 
a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index f2fa515a..7d2aca29 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -664,11 +664,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
- 
- install-dirs:
--if HOSTOS_LINUX
--      (systemd-sysusers && systemd-tmpfiles --create) || \
--      ($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call 
set_fapi_permissions)) || true
--      $(call check_fapi_dirs)
--endif
- 
- install-data-hook: install-dirs
-       -if [ ! -z "$(udevrulesprefix)" ]; then \

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
deleted file mode 100644
index a593716c97e..00000000000
--- 
a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.3.ebuild 
b/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
deleted file mode 100644
index 011fcaefd4a..00000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss";
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz";
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( gcrypt openssl )
-               fapi? ( openssl !gcrypt )"
-
-RDEPEND="acct-group/tss
-       acct-user/tss
-       fapi? (
-               dev-libs/json-c
-               net-misc/curl
-       )
-       gcrypt? ( dev-libs/libgcrypt:0= )
-       openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-       test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-       doc? ( app-doc/doxygen )"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
-       local CONFIG_CHECK=" \
-               ~TCG_TPM
-       "
-       linux-info_pkg_setup
-       kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-       default
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               --localstatedir=/var \
-               $(use_enable doc doxygen-doc) \
-               $(use_enable fapi) \
-               $(use_enable static-libs static) \
-               $(use_enable test unit) \
-               --disable-tcti-mssim \
-               --disable-defaultflags \
-               --disable-weakcrypto \
-               --with-crypto="$(usex gcrypt gcrypt ossl)" \
-               --with-runstatedir=/run \
-               --with-udevrulesdir="$(get_udevdir)/rules.d" \
-               --with-udevrulesprefix=60- \
-               --with-sysusersdir="/usr/lib/sysusers.d" \
-               --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
-       default
-       find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-       tmpfiles_process tpm2-tss-fapi.conf
-}

diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild 
b/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild
deleted file mode 100644
index a5458854763..00000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss";
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz";
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc +fapi  +openssl mbedtls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( mbedtls openssl )
-               fapi? ( openssl !mbedtls )"
-
-RDEPEND="acct-group/tss
-       acct-user/tss
-       fapi? ( dev-libs/json-c
-               net-misc/curl )
-       mbedtls? ( net-libs/mbedtls:= )
-       openssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}
-       test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-       doc? ( app-doc/doxygen )"
-
-PATCHES=(
-       "${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() {
-       local CONFIG_CHECK=" \
-               ~TCG_TPM
-       "
-       linux-info_pkg_setup
-       kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-       default
-       eautoreconf
-}
-
-src_configure() {
-       econf \
-               --localstatedir=/var \
-               $(use_enable doc doxygen-doc) \
-               $(use_enable fapi) \
-               $(use_enable static-libs static) \
-               $(use_enable test unit) \
-               --disable-tcti-mssim \
-               --disable-defaultflags \
-               --disable-weakcrypto \
-               --with-crypto="$(usex mbedtls mbed ossl)" \
-               --with-runstatedir=/run \
-               --with-udevrulesdir="$(get_udevdir)/rules.d" \
-               --with-udevrulesprefix=60- \
-               --with-sysusersdir="/usr/lib/sysusers.d" \
-               --with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
-       default
-       find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-       tmpfiles_process tpm2-tss-fapi.conf
-}

Reply via email to