commit: f446ca0db4542d6fbf4a6f5236352a42f730408b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Mar 10 01:05:57 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 10 01:05:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f446ca0d
dev-libs/softhsm: fix invalid EROOT usage Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/softhsm/softhsm-2.5.0.ebuild | 31 +++++++++++++++++-------------- dev-libs/softhsm/softhsm-2.6.1.ebuild | 31 +++++++++++++++++-------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild index c9d44cfbb66..d9c6a91a08d 100644 --- a/dev-libs/softhsm/softhsm-2.5.0.ebuild +++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,25 +7,27 @@ DESCRIPTION="A software PKCS#11 implementation" HOMEPAGE="https://www.opendnssec.org/"; SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"; +LICENSE="BSD" +SLOT="2" KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="bindist gost libressl migration-tool test" + RESTRICT="!test? ( test )" -SLOT="2" -LICENSE="BSD" -RDEPEND="migration-tool? ( dev-db/sqlite:3= ) +RDEPEND=" + migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) - !~dev-libs/softhsm-2.0.0:0" + !~dev-libs/softhsm-2.0.0:0 +" DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig +BDEPEND=" sys-devel/gcc:=[cxx] - test? ( dev-util/cppunit )" + virtual/pkgconfig + test? ( dev-util/cppunit ) +" -DOCS=( - NEWS - README.md -) +DOCS=( NEWS README.md ) PATCHES=( "${FILESDIR}/${P}-libressl.patch" @@ -36,7 +38,7 @@ src_configure() { --disable-static \ --with-crypto-backend=openssl \ --disable-p11-kit \ - --localstatedir="${EROOT}/var" \ + --localstatedir="${EPREFIX}/var" \ $(use_enable !bindist ecc) \ $(use_enable gost) \ $(use_with migration-tool migrate) @@ -44,7 +46,8 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete || die - keepdir "${EROOT}/var/lib/softhsm/tokens" + find "${ED}" -name '*.la' -delete || die + + keepdir /var/lib/softhsm/tokens } diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1.ebuild index 0d7093bbaa8..4fef59f66d5 100644 --- a/dev-libs/softhsm/softhsm-2.6.1.ebuild +++ b/dev-libs/softhsm/softhsm-2.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,32 +7,34 @@ DESCRIPTION="A software PKCS#11 implementation" HOMEPAGE="https://www.opendnssec.org/"; SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"; +LICENSE="BSD" +SLOT="2" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" IUSE="bindist gost libressl migration-tool test" + RESTRICT="!test? ( test )" -SLOT="2" -LICENSE="BSD" -RDEPEND="migration-tool? ( dev-db/sqlite:3= ) +RDEPEND=" + migration-tool? ( dev-db/sqlite:3= ) !libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:= ) - !~dev-libs/softhsm-2.0.0:0" + !~dev-libs/softhsm-2.0.0:0 +" DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig +BDEPEND=" sys-devel/gcc:=[cxx] - test? ( dev-util/cppunit )" + virtual/pkgconfig + test? ( dev-util/cppunit ) +" -DOCS=( - NEWS - README.md -) +DOCS=( NEWS README.md ) src_configure() { econf \ --disable-static \ --with-crypto-backend=openssl \ --disable-p11-kit \ - --localstatedir="${EROOT}/var" \ + --localstatedir="${EPREFIX}/var" \ $(use_enable !bindist ecc) \ $(use_enable gost) \ $(use_with migration-tool migrate) @@ -40,7 +42,8 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete || die - keepdir "${EROOT}/var/lib/softhsm/tokens" + find "${ED}" -name '*.la' -delete || die + + keepdir /var/lib/softhsm/tokens }
