gentoo resync : 18.08.2019

4 files changed, 7 insertions, 6 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 15c075fa2f3d..5e2fdafda0ca 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,7 +1,7 @@
 AUX genkernel-3.4.52.4-crc32c.patch 4981 BLAKE2B e376f504c73ce6fc8b858c05dc36bd45cf82b404d063ea970c64520026a6108d6ac1f806fc81e9943f3a8df3f552236538415622580c914ef06dc9f4c5109d62 SHA512 9ce34b979c855ff69e70891ea568b9d0b9eb26bc209e6ee96fb58687f62bf1c3a8398489d1dde98988790f7e0976fb5ce8dad64a77323ab2e1906d0173bc2861
 AUX genkernel-3.4.52.4-grub-mkconfig.patch 689 BLAKE2B ea390e063b88b6a63fd647e245dc5da7300794c978ed1242193168b95c83338764ec331b1264cb0b0d328904b5145be1f8536ddfad2f6b2b2934175e7b865395 SHA512 f69191e003ee950d8031dd41dffa7724c22535f2b8f7344452150cc171452c9cba171a989aa00d3183993e56c21aeee62ac1b47517c2f2f04d739a109ffefbb3
 AUX genkernel-3.4.52.4-system-map.patch 1498 BLAKE2B 283a0f821e33cadf792428457b22a51c48e07ec5388ce7c3e0fb35e7d4d34b27ab57f2a9ceba85e40d9f74795c19c0721e1d82eb354230c5c310237ee21972a5 SHA512 a2c7fb83e34f75f2ceab182d355616f3ee7e9b524596ea10f69ce1f87f1e21e693f42838650b3a919670182e5f36a6b94475f4d4ebc65e7494cdaa87933f29b9
-AUX genkernel-4.bash 2467 BLAKE2B 8cc52bff26ca5ee25f6e4f4f3d47f6905865ae9fa72dfad6c8ae059cb1beadcaf724a2d5accbd40b38ce1a7745335beae1264a6bd1b0b97a79ac68d3c857e5c9 SHA512 cbcffcb91273d41f6fba82d0b08c9b7cb29f84720beee1253747c09e14f677bc703ff55536b9aba00045c9b4935efd020c7b1b06866205f2b9e6862631975252
+AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281
 AUX genkernel.bash 2438 BLAKE2B 31f1eaa826ab12bba07a2dc45b3394e14ceba9bc98b3f0ce609ca48a9306f2aec507787d457abdee18f4a83ea868de787cc6f9bd085298c396ecab6da14df9c3 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d
 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
@@ -13,6 +13,7 @@ DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d63
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
 DIST busybox-1.31.0.tar.bz2 2427873 BLAKE2B 7fff2ac2c39232f9dbd8ea4af55539e9eb7ab2ddabf2f53534f57cabe00a6096643415275dcfa2730f970994282776f9ce661e99e681989449473182ffe820e1 SHA512 cd58f0b2b6e3bb1b771fcf3d15f420518fb9b10086a45cfb1d7f136ac035be89eec28f9350e42b3fc38454d8bef9190eae0376497487c73785e8fde44c793730
 DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
+DIST cryptsetup-2.2.0.tar.xz 10763072 BLAKE2B 0ffc228bde15e3427f38402b7411207d1402dcd648903d9c1565689462103c07ab23c4d5c1439674693cf7ed6d14cf62c8a2d19e266da60658c91a37549ba74e SHA512 903ef5811999ce3836bc348334192a432a971f94aa9c850491c8ba856a2c87385f75abc9296b0913ee6785149b8a7bd40457ad07e01f4ac7a1e62e97c7b18e6e
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
 DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52
@@ -30,7 +31,7 @@ DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 101bd8011b73699a3d8410fcb93adca2417
 DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41 SHA512 096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
 DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec SHA512 1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
-DIST genkernel-4.0.0_beta10.tar.xz 395268 BLAKE2B 02fdcf9a8f1a7b5c383eca8f3a6d0d1df1d29becfa1d6a27ed8b29b41ac122ef06457ea9925d3d39c1e669b6e16f876198f0a40343fb052cb1d957010aa7ecc7 SHA512 510e15230f940848de4cf3ea3c5e15224666d30427765a7faf153fd08c607a4e03486b15d3b01bd68a7297b70d80a8b38d14db9e572351a18abaae3975d22e00
+DIST genkernel-4.0.0_beta12.tar.xz 400648 BLAKE2B 18d9efd683855b22caefc8b7ec25f3aae396ceb74c7e31f53bf91c3de41dbcef7ad4c437f3058e2cb2b47a79dfecab1ba0d0a9dd0e703796bedb125e1300f614 SHA512 ddf6650ffab732b5387aa664c7852c68c58ff493d7c3a77b0a562b5c850dea35e3d1849a70b9bbe5c4348a390532f292932b336fb75e5600a773d9c2feaa294d
 DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
@@ -67,6 +68,6 @@ EBUILD genkernel-3.5.2.4.ebuild 4919 BLAKE2B 64b2dcbefae58d8fc4ec5901f00e2858c02
 EBUILD genkernel-3.5.2.5.ebuild 4919 BLAKE2B 64b2dcbefae58d8fc4ec5901f00e2858c02641ef77315b46d092f18df4b8f2c32544a3baf53f36a789eec7d11652155831f3c89efba83156fd4cdff3f11a2ac6 SHA512 f4c5f8362b80c1475e4ae7a870afc2681e00e1eba8dbf3b452c23fd85cd2c9c3f9c9291522782ce6bf34234fb663a81871582afb7d2a6efd752db1f108b287ba
 EBUILD genkernel-3.5.3.2.ebuild 4920 BLAKE2B eab47ca81c1ccab3ff07ec9bc6ac4622a258f68d2d4278fbaa27d2d8e5a636f50ce916773a93f2f1b222476aa1f54cd5544735abd54acbac43bb37f5dccb6397 SHA512 3becb2fc4e9a0c400c19e56eb22e8d9cdb6349c1101ce6435a7273dd4b7e28acbc2d472ca633a70f11dbb8dc9136825fd26b1e9867b741b7be835aec78d909c6
 EBUILD genkernel-3.5.3.3.ebuild 4909 BLAKE2B 0ec28cd64a6f719fc41dc6034e3ff8ccf2b69ac35273222a9649e73d08544c2e87e6d3dc6496346902f04d9fecf2a08673af6baa583225f1452a77235a6f18a3 SHA512 6e76e7c21aad6870c9da0f293b4e29dafffcf66e3dcd030f9b2d21c9053aa6f51068d27e9a8771f2fe22363ffdb6dc420b60d2b1cd6bbd927bc9e89f51d3277a
-EBUILD genkernel-4.0.0_beta10.ebuild 9112 BLAKE2B 736ba79f58d41eee6c1e227a8330efacbb970a1fe8562d7e0206fda7af2c95788eaeabdf4e65c10ef51e201a20278ec321be5ea569cfd3fca91787a64dddc9ec SHA512 d3aa94439d7d44fd3d903152b5809d94107e2203948c935d7d1025bd110a2c8247453af960651c1b39847571585b9abaeb485da0afd6247dfac6ba9cfb938560
-EBUILD genkernel-9999.ebuild 9112 BLAKE2B 736ba79f58d41eee6c1e227a8330efacbb970a1fe8562d7e0206fda7af2c95788eaeabdf4e65c10ef51e201a20278ec321be5ea569cfd3fca91787a64dddc9ec SHA512 d3aa94439d7d44fd3d903152b5809d94107e2203948c935d7d1025bd110a2c8247453af960651c1b39847571585b9abaeb485da0afd6247dfac6ba9cfb938560
+EBUILD genkernel-4.0.0_beta12.ebuild 9112 BLAKE2B 736ba79f58d41eee6c1e227a8330efacbb970a1fe8562d7e0206fda7af2c95788eaeabdf4e65c10ef51e201a20278ec321be5ea569cfd3fca91787a64dddc9ec SHA512 d3aa94439d7d44fd3d903152b5809d94107e2203948c935d7d1025bd110a2c8247453af960651c1b39847571585b9abaeb485da0afd6247dfac6ba9cfb938560
+EBUILD genkernel-9999.ebuild 9112 BLAKE2B 567751e05ff76929eb2b4a8255f8536406db4def634d7b79ec3d6cd9a467d27940a105a1deed3aa2189a76b1212118b514fe5297f4221e2f33fe752e9a78eee1 SHA512 745576db70d74f55e8c52eb6687e5e92519284adc78821e488df18409899865183593bdd3f97d35f0d43e4c7714951d5fa011261f37fecee26c6e5b4dc7aa01e
 MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db
diff --git a/sys-kernel/genkernel/files/genkernel-4.bash b/sys-kernel/genkernel/files/genkernel-4.bash
index 631fc8b30e47..f72aa7a22409 100644
--- a/sys-kernel/genkernel/files/genkernel-4.bash
+++ b/sys-kernel/genkernel/files/genkernel-4.bash
@@ -11,7 +11,7 @@ _genkernel()
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
     # extract initial list of params/actions from genkernel --help
-    genkernel_help=$(command genkernel --help)
+    genkernel_help=$(command genkernel --help 2>/dev/null)
     actions=( $(<<<"$genkernel_help" sed -n \
 	'/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') )
     params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') )
diff --git a/sys-kernel/genkernel/genkernel-4.0.0_beta10.ebuild b/sys-kernel/genkernel/genkernel-4.0.0_beta12.ebuild
index b8929b0de29a..b8929b0de29a 100644
--- a/sys-kernel/genkernel/genkernel-4.0.0_beta10.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.0_beta12.ebuild
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index b8929b0de29a..af5de9cab9ef 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -12,7 +12,7 @@ inherit bash-completion-r1 mount-boot
 # or add new patches!
 VERSION_BTRFS_PROGS="5.2.1"
 VERSION_BUSYBOX="1.31.0"
-VERSION_CRYPTSETUP="2.1.0"
+VERSION_CRYPTSETUP="2.2.0"
 VERSION_DMRAID="1.0.0.rc16-3"
 VERSION_DROPBEAR="2019.78"
 VERSION_EUDEV="3.2.8"