gentoo resync : 24.12.2018

4 files changed, 9 insertions, 9 deletions

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 996f80daab70..5101b63cf44f 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,10 +5,10 @@ AUX 2.0.5-dmcrypt.rc 8827 BLAKE2B d4604b8f78d6ab6b4b64b6be64f8706b01aec320ef0c61
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
-DIST cryptsetup-2.0.4.tar.xz 10444544 BLAKE2B 95c18eefe99c27d05e347440d77e4ff53dcc110822dc706e2284e3203da9069acbd8afedb8d596a0f832bdadea0597b75af58a22af712818a3e0aae2824e51b7 SHA512 74d442c7c7837da719a14aefa8bf0b5dffbb050acd6fbd140c50d43470c828f79fdcf7cd6acf1c149a4e1129a100059df6216b7d8ca04eb0b070cb8d4ca33e61
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
+DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 EBUILD cryptsetup-1.7.5-r1.ebuild 4041 BLAKE2B 3f8868734f9ed2d1a635762348632b00520b243738c9f907866225e981bd7534d38f746c2eda2292cfaa395f77e431cd4b479ba97294d187c9d7de3b3f6047c5 SHA512 d41b3eb764e68fe72d1e4d2ee725a66030f03cfe7ea7d9046cc0dfaf673062229e9ade2a356b81112e8955cc8536916caae949716aebf3b0d4bfb8ce8f2190c7
-EBUILD cryptsetup-2.0.4-r1.ebuild 4136 BLAKE2B 1eaddb9cda051ec1047e8746aaabfa0446fa6a426eaabae091e2bb99d9748f869b4092611fb436655ce20fa85ae5150be672387db684a273cf9697d91453ed0c SHA512 977769e4fa394fd70c5f67cfdb270f76c8aa483f841f87948ee1c72097f105a5ed0f177cb2c73ba5b33a24026e3183b2dacf84c08edcd8a2f4d7981898f2d8fb
-EBUILD cryptsetup-2.0.5-r1.ebuild 4140 BLAKE2B 411e5b149c8946261c57a25005fa15a572ae187461fdb8dad847abb9e24605036aed42f499aec94bc31008f346cad9633d9af6ef85231c57bab1b4ebb0793dc7 SHA512 20184bdfbc797d3a86dc655b2e096f85f52c461fb3b6bee061a2b96013f13731137b4d6aeea8cd027fd838b22c84329b0b3ad198c448d5bab1ccca4037bb0d3d
-EBUILD cryptsetup-2.0.5.ebuild 4140 BLAKE2B 7cb64bd81f835aea5ae764a3f4008cd29c51d9075da702af038c5d1df96c46a4808930bf30a3832627e3892d595ee04429c3e11d35acfe1d830c128333cfcc9f SHA512 64e4ce816fc022eb32e0cf56b392d46076fee297a0061084c7c358899500b3eaac88754ebed852e7b1db3d14a7db6cf18c31ea986a14262386bd0521fa13c20a
+EBUILD cryptsetup-2.0.5-r1.ebuild 4147 BLAKE2B 945b8e95155e0eb30c010d72857884d57f1d6cdbbd9b71b7ffa800e85a731ef7f3d1d9ac752d45e187a0db18ebedecf3275f6b5361bd831477ddf5bbf5bedbd8 SHA512 01e57a21c5e8114ffca4a4ca620568662479784a4f5d29e34e6d730a41e047612f4e0b96bf8b7950a06f48360a22dbfef78cf81f1c8c96170291bc9551048a8b
+EBUILD cryptsetup-2.0.5.ebuild 4147 BLAKE2B 650cea2aedb6469ef9b41603c52c85ee69b2dd6fb997c8aaff9c898f7e1d590a0d88ad53afe047025fec71772f0da78af3cb9809359ccf4de5ee8af591013d71 SHA512 157f9e71044219b3efe2396299fbfc4d6741ab36fd7490ffff8b034272b6d8c0a8e976e9d51400e27abe42a58a54baa478e3cc370894f02e7d1fe9a76d506766
+EBUILD cryptsetup-2.0.6.ebuild 4147 BLAKE2B 650cea2aedb6469ef9b41603c52c85ee69b2dd6fb997c8aaff9c898f7e1d590a0d88ad53afe047025fec71772f0da78af3cb9809359ccf4de5ee8af591013d71 SHA512 157f9e71044219b3efe2396299fbfc4d6741ab36fd7490ffff8b034272b6d8c0a8e976e9d51400e27abe42a58a54baa478e3cc370894f02e7d1fe9a76d506766
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
index 5f5526582fe8..da5c949c138f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
@@ -14,7 +14,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="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
index 1441e14c0072..29d5fcff6450 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
@@ -14,7 +14,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="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.4-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
index 40bb64ed350c..29d5fcff6450 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,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="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P/_/-}"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-static-pwquality-build.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
 
 pkg_setup() {
 	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"