gentoo resync : 20.03.2022

4 files changed, 4 insertions, 146 deletions

diff --git a/sys-fs/fscrypt/Manifest b/sys-fs/fscrypt/Manifest
index 6324ec7eb861..0caf48abcf74 100644
--- a/sys-fs/fscrypt/Manifest
+++ b/sys-fs/fscrypt/Manifest
@@ -1,8 +1,6 @@
-AUX 0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch 1448 BLAKE2B ee8879bb777b6d63525489ab3ed051d4107b0f812ac7c65c5312dd81652e8d005300f2cdc036a2a85f4e9e0cd66a3a360b2cbe68bea0f2f2dc91f37243749a44 SHA512 e3f2805a038a82352903ee5449dd75ab3570b880fd6e34e3e2659e898f8c822641ed2519de0080a22f2b08d459a70aeda919cf19a2d3fad4da531a6b59385886
 AUX 0001-Remove-TestLoadSourceDevice.patch 1425 BLAKE2B d42b5923ea629fce22ef1954df2bb6314bc188e3852b0d1ac1574065e9372d223b70ccad562d9dbe34f420164472b686e87a2b465aff7d50c08ea4f17915b860 SHA512 a319fb63913c6e74436c8cfa20ef468983937478c73f5a2e6c31cd6cb39d2418fcd254a70a52201e0ab27566f68405ade4725b1572bded042b91a8032e7ae283
 AUX fscrypt.pam-config 182 BLAKE2B 891d42be956e64bb0e052af0acc8cb9e4f16664c58e79012529f3c0b19779f7f668b9f2d513f76ca1db1d3ca571d15d74e1fb38fde8d0b1b28395957a99515a4 SHA512 41746f7be43cd238abdeb171534e8c9ed3e21b71e2eeeb126abbb56454da1eb693d1b50a80ccc7fbf25ff2cc108792d294ed3c8977748fdfb6c3285b0498c410
-DIST fscrypt-0.3.0.tar.gz 148000 BLAKE2B c62446bfec0f73cb89be092cadb04d9842ec10d79fff4bd5a3b358b29012c03bba766738f6a0ad61502f3d14781bd36ba1bb0a1fa610570014e5c60bda017c59 SHA512 e0b16359a8883d99b2de4aabc0c810d152ce2d70975a785f7a711ac5d7c1abc1e796ad0f58cb8964e9197415062d216ffb7e19d011859d8f98154150349a2cca
-DIST fscrypt-0.3.1.tar.gz 152055 BLAKE2B 4f3d4c8341fcff055bfe91eaa5d8c1edd02f50e9bb9dacdc42bf707a5367bfe658637135b6e2ff828292ad3fa0054578480313d8ec5ddadf15058fea899520c4 SHA512 3b58638d840f32b998a1bd71b1fc815c966769bd054c55c5a63157b13fd5ebd5b2d36fd8cca709ba14507c2b3c60976be01185d405d52a26e3bb3eb665be5158
+DIST fscrypt-0.3.3.tar.gz 167020 BLAKE2B d271c397782bcb40cbb9d1d87463927080487898b590a83b301d98ba584fe9cb7c651c9b0c6eb905e55de42877f09367ca77593efcaca7c2441909d10190bf86 SHA512 d217212a15111bf036725f02b9530ae3716f3242e451ea5f9c8bd93cba113d9d21d1d970d9d0efaa75eb5f30a135cc6cdf18fceb8eb7d04a57363dabf4ed9fe9
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
@@ -34,9 +32,6 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.zip 1697094 BLAKE2B 72e52dab100cd79a22a5f8adaa1af24cf245d193dcdfbfa10c25b440d23eda9a1e0f3c1f2b9684b5fbc9159055f482ff8eae12732c40d9d4dbcdfbf5ae93ca88 SHA512 a981d025dbb8bc8d3b48cbe7327076531e614f9bb9662f24b5f89997d8f9612d750ac53b9191e7df42dc326a36913b29350acaf7fe2f4bf2f08b986a510e95da
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191127021746-63cb32ae39b2.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191127021746-63cb32ae39b2.zip 1905313 BLAKE2B 9bfae83246cb9f9a61848a556991c3bee3daae05ada33358219a76e1e732e72cbfe9b12153cfce5129645c95c7307904332a035e5a77bdf235ebaa7947a6d171 SHA512 0530022733dd878036652b0ee1de614b31b3c804347c9cb6be3dcdf0e8411dce878c23d9242885750057e4f0bec698222e7afdb8a495b229daf456bca6872b66
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip 1529034 BLAKE2B a30815639bc723fe9c7078c1fc5214e43aa946520c8d2d1efdc2cfb88b53c1faf50054f693d4f3b92461a64c07c8dbb845901c87a8deb86650cfcfc0482aae08 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210422114643-f5beecf764ed.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -51,6 +46,5 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb
-EBUILD fscrypt-0.3.0-r1.ebuild 3448 BLAKE2B 34309372795fb8cbdab6eeece5126f8aa2ee90e7e07f9ed1a12dc957f684972d7e4c9f48626ce464af1f607ec3ef4ef47ca817b3dc1f88c33a8cc656baaea825 SHA512 407195243c6dc96016f8d507a180f923d70dd22db91849e904acc6a4f4e3f8cb81d364765d61ae6abaf70c2dbaa87d641a1cbf48ba983cb0aef9ab786d9a5929
-EBUILD fscrypt-0.3.1.ebuild 3488 BLAKE2B c5a0817fccd321446500974a9f2d3dcc02ecc2a790d7c6747ca5214f19947621566222ea41e3dd4c37ac154abee20d1f8dca449bb489b946c33e29ea7c119b2d SHA512 4a27be0dbe0fe4882cec11bf655fdc9dba77003ad81c25664a8594137bd2e19b42ec1f15af74bb375c22baca66b251ba9db372f205a3906f4b8570a3ab6dc0c3
+EBUILD fscrypt-0.3.3.ebuild 3433 BLAKE2B a7c768c40692af6387b04cf83656b55f09ca930cf8bd827af82bf41feb8bd2aada8ccbe2ab761a579cbec6825df2096951583c556b427a564c4d47723bc87887 SHA512 69c5817e31812a431bf323a51a9688d1dc9cf2a63acfa763e08376391a0302de8b15d055cf5cc376d518b4597667b531ca03b88806e4f01ad1ef31ea4da9d8c5
 MISC metadata.xml 438 BLAKE2B 24bde9b0773e0504dd06bab9abe25283a2cab7679be2eb6fd1c875c13078ff91b472a1ee989c4469fcd0d6ff21761cace021c5997877a3c41d876dcbb26104cc SHA512 1301f1fbfa2115779879b830274c67496269d12163dd36efa592e52500f21996b3f3adfa3c69a215274b5dd132ed7583fc31fdd898b02386973713fb6e60be8e
diff --git a/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch b/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch
deleted file mode 100644
index f1732df62aeb..000000000000
--- a/sys-fs/fscrypt/files/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3e08e9d634ae6fe259ba35139ef0a7bb4b7e60d8 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Sat, 17 Apr 2021 18:19:59 +0200
-Subject: [PATCH] Makefile: Optionally avoid installation of Ubuntu-specific
- PAM config
-
-This allows non Ubuntu distributions to opt out from the installation
-of Ubuntu-specific PAM files.
----
- Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 6e79421356de..307eeedc5153 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,6 +28,7 @@ PAM_NAME := pam_$(NAME)
- # BINDIR: Where to install the fscrypt binary.        Default: $(PREFIX)/bin
- # PAM_MODULE_DIR: Where to install pam_fscrypt.so.    Default: $(PREFIX)/lib/security
- # PAM_CONFIG_DIR: Where to install Ubuntu PAM config. Default: $(PREFIX)/share/pam-configs
-+#   If the empty string, then the Ubuntu PAM config will not be installed.
- #
- # MOUNT: The filesystem where our tests are run.    Default: /mnt/fscrypt_mount
- #   Ex: make test-setup MOUNT=/foo/bar
-@@ -178,9 +179,11 @@ install-pam: $(PAM_MODULE)
- 	install -d $(DESTDIR)$(PAM_MODULE_DIR)
- 	install $(PAM_MODULE) $(DESTDIR)$(PAM_MODULE_DIR)
- 
-+ifdef $(PAM_CONFIG_DIR)
- 	m4 --define=PAM_INSTALL_PATH=$(PAM_INSTALL_PATH) < $(PAM_NAME)/config > $(PAM_CONFIG)
- 	install -d $(DESTDIR)$(PAM_CONFIG_DIR)
- 	install $(PAM_CONFIG) $(DESTDIR)$(PAM_CONFIG_DIR)/$(NAME)
-+endif
- 
- COMPLETION_INSTALL_DIR := $(PREFIX)/share/bash-completion/completions
- 
--- 
-2.30.2
-
diff --git a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild b/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild
deleted file mode 100644
index d2d6c39c8c14..000000000000
--- a/sys-fs/fscrypt/fscrypt-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module pam
-
-DESCRIPTION="Tool for managing Linux filesystem encryption"
-HOMEPAGE="https://github.com/google/fscrypt"
-
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/client9/misspell v0.3.4"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/golang/protobuf v1.2.0"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/pkg/errors v0.8.0"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/urfave/cli v1.20.0"
-	"github.com/urfave/cli v1.20.0/go.mod"
-	"github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad"
-	"github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20191127021746-63cb32ae39b2"
-	"golang.org/x/sys v0.0.0-20191127021746-63cb32ae39b2/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20191025023517-2077df36852e"
-	"golang.org/x/tools v0.0.0-20191025023517-2077df36852e/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-)
-go-module_set_globals
-
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-
-# Apache-2.0: fscrypt, google/renameio
-# BSD: golang/protobuf, rogpeppe/go-internal, golang/x/*
-# BSD-2: pkg/errors
-# MIT: BurntSushi/toml, kisielk/gotool, kr/*, urfave/cli, honnef.co/go/tools
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DEPEND="sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/0001-Remove-TestLoadSourceDevice.patch"
-	"${FILESDIR}/0001-Makefile-Optionally-avoid-installation-of-Ubuntu-spe.patch"
-)
-
-src_compile() {
-	# Set GO_LINK_FLAGS to the empty string, as fscrypt strips the
-	# binary by default. See bug #783780.
-	emake GO_LINK_FLAGS=""
-}
-
-src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		PREFIX="/usr" \
-		PAM_MODULE_DIR="$(getpam_mod_dir)" \
-		PAM_CONFIG_DIR= \
-		install
-	einstalldocs
-
-	newpamd "${FILESDIR}/fscrypt.pam-config" fscrypt
-}
diff --git a/sys-fs/fscrypt/fscrypt-0.3.1.ebuild b/sys-fs/fscrypt/fscrypt-0.3.3.ebuild
index 5fda4eb5eb6e..6a019db69a91 100644
--- a/sys-fs/fscrypt/fscrypt-0.3.1.ebuild
+++ b/sys-fs/fscrypt/fscrypt-0.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit go-module pam
 
@@ -39,7 +39,6 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"