[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     c6c88025548a7f20f8d5e1cd8ec0d7d4d8ee8204
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 17:12:20 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 18:06:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c88025

sys-fs/cryptsetup: Bump to version 2.2.0. Removed old.

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-fs/cryptsetup/Manifest                         |  2 +-
 ...up-2.2.0_rc1.ebuild => cryptsetup-2.2.0.ebuild} | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 5523b2cfa62..11ac83f31f5 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -2,4 +2,4 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
 DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
-DIST cryptsetup-2.2.0-rc1.tar.xz 10720888 BLAKE2B 6a8ee7d3ffa8d536627ba1be19e013ecfcdab793492ec59db676f0d017450be6cad8686337a7e341dac69ffd5f8f686e1262ff5b6e4b54f18d9c2e1e816b171b SHA512 a9875d3e20a99377ed3065ac9a4079968766b7774b2ea67226591f992932168278752dc762ef9843077e75da004f58e362327deb0981efbb0ce0928216aea2da
+DIST cryptsetup-2.2.0.tar.xz 10763072 BLAKE2B 0ffc228bde15e3427f38402b7411207d1402dcd648903d9c1565689462103c07ab23c4d5c1439674693cf7ed6d14cf62c8a2d19e266da60658c91a37549ba74e SHA512 903ef5811999ce3836bc348334192a432a971f94aa9c850491c8ba856a2c87385f75abc9296b0913ee6785149b8a7bd40457ad07e01f4ac7a1e62e97c7b18e6e

diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
similarity index 90%
rename from sys-fs/cryptsetup/cryptsetup-2.2.0_rc1.ebuild
rename to sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
index e0142bdc521..49cad800b71 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0_rc1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools linux-info libtool eapi7-ver
+inherit autotools linux-info libtool
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 # cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE
 # and change "libressl" to "openssl" in our econf call.
 CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl"
@@ -43,8 +43,10 @@ LIB_DEPEND="
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
 	${LIB_DEPEND//\[static-libs\(+\)\]}"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -92,7 +94,7 @@ src_configure() {
 		--sbindir=/sbin
 		# for later use
 		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
-		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
+		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
 		--with-crypto_backend=${cryptobackend}
 		$(use_enable argon2 libargon2)
 		$(use_enable nls)
@@ -124,11 +126,13 @@ src_install() {
 	default
 
 	if use static ; then
-		mv "${ED%}"/sbin/cryptsetup{.static,} || die
-		mv "${ED%}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
 	fi
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	dodoc docs/v*ReleaseNotes