gentoo resync : 29.12.2022

3 files changed, 3 insertions, 33 deletions

diff --git a/app-vim/gnupg/Manifest b/app-vim/gnupg/Manifest
index c9650559fadf..505a46ddabef 100644
--- a/app-vim/gnupg/Manifest
+++ b/app-vim/gnupg/Manifest
@@ -1,5 +1,3 @@
-DIST gnupg-2.6.tar.bz2 12074 BLAKE2B d06e4637627187e1d276c3b485e22b35f0cba78a491d34f0884da7ad320f12a3443e40a7c0e7e3f27be03984380eb966d593a283d768bb834a1fefed05656dd3 SHA512 1b7307954aad751006286edebb80767951b9bd9a8eff4c4a57fa6030cb442ceca12730a82c76a2181e1da19cc4cc8be21ccd4f8a21817aedf42785d8ff4b61ac
 DIST gnupg-2.7.1.zip 16131 BLAKE2B 82e29fd95adc5d6690409ec136086be2f0f358143de0bd6ad53c095d4cdcebe47f463f30cc5f494c441222380b5fac3291a9a6f7937f487ad28702ed3e175873 SHA512 07599e981e55d7eac7b06169e9ce30d33374b01680ad0317d5e4b51addce22b195dbd7a22a2adc381dfb89bd66aad9c377b43f36e6a5b32b7c577462b149e0a2
-EBUILD gnupg-2.6.ebuild 771 BLAKE2B f3767681669d829f63e517e3919e5921c8903f231dc7138470cab808c2d82ba7a5681ad8210d0cb279af7e33bda6ad227792a9d8c24ceaf1e9172ad6b1f227f5 SHA512 16533f194b0f5f78afaf278f4722317c71cace8db2982d6d759070b079ed72c73ebaaaa38d6654b272328c9b4281a02b1ffa100262e1c6aaff457896a67e06f2
-EBUILD gnupg-2.7.1.ebuild 886 BLAKE2B 12dc71ab4f0a09c9d9d254d539f20a63e4472eb110de492a46402b0d042ebb5ccf791618c6b2a4779ed9c23652d0efc5338e31d62111ae9fe8b9f79296c9deab SHA512 cd9614b5a4c497b4c0933f15e6ffd4ce3e836875a4426814abf1070c21f4455fd5f08feec9d8b0bd23bd0c800891adebe83b1296af3b53360957eb48f4104615
+EBUILD gnupg-2.7.1.ebuild 884 BLAKE2B 67f894aab7b0827ea7e53c81bc70da6aa394100063127baa7f6968772809adfb4036f44b9afcfe8e0820bd517f08952c4e0066eea5ff141d3dd8f7c5f505e52c SHA512 91634a6558c970bb8d345b2af37ddb6c1e145560618b985595d3e156efd31c407149393556b9eee943fa69b4503bf0e181469611eb658172038ba075b242aa44
 MISC metadata.xml 250 BLAKE2B 159edb6cbbe3884fd7b328cba2125da0a51b5c0be964e60b708efe1bd040a41abdf16f8dbcfaecb9e6e1073528ac99195a08d7045d433414ec2ba1c94d582761 SHA512 6c29f24b33b8829463103cee99e2cf65cf550aa1d6c60c5a746ca2947a97a052969c8dfb9d12ae8114db0971626f9246cb9e4808d951eeae78321325da1ac32a
diff --git a/app-vim/gnupg/gnupg-2.6.ebuild b/app-vim/gnupg/gnupg-2.6.ebuild
deleted file mode 100644
index ef344bdcf3f9..000000000000
--- a/app-vim/gnupg/gnupg-2.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="transparent editing of gpg encrypted files"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3645"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="app-crypt/gnupg"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	default
-
-	# There's good documentation included with the script, but it's not
-	# in a helpfile. Since there's rather too much information to include
-	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
-	mkdir doc || die
-	sed -e '/" Section: Plugin header.\+$/,9999d' -e 's/^" \?//' \
-		-e 's/\(Name:\s\+\)\([^.]\+\)\.vim/\1*\2.txt*/' \
-		plugin/${PN}.vim \
-		> doc/${PN}.txt || die
-}
diff --git a/app-vim/gnupg/gnupg-2.7.1.ebuild b/app-vim/gnupg/gnupg-2.7.1.ebuild
index af2368e71d4c..a2dd74a2ee33 100644
--- a/app-vim/gnupg/gnupg-2.7.1.ebuild
+++ b/app-vim/gnupg/gnupg-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="transparent editing of gpg encrypted files"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3645"
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=27359 -> ${P}.zip"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 S="${WORKDIR}/vim-${P}"