4 files changed, 25 insertions, 53 deletions
diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest
index 00935df1403b..a9cd6fd654ee 100644
--- a/app-editors/vile/Manifest
+++ b/app-editors/vile/Manifest
@@ -1,3 +1,4 @@
-DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
-DIST vile-9.8v.tgz 2405398 BLAKE2B cd8753c57ff95c9b420026128fd19b7c689c99500da7cae91d3160dded46aa101b0cae32daeaf0377d4d72a5e526e8e4f25422bbbff2cc5ecdef10b7f04c8b39 SHA512 b752f26148bd4411ab6b31697459a16d8168f79ffad6b3509d6cf5d40611176b833e56f4bac21fe18ecdd256be467ba96ea98149daceab671002df49508eb8d2
-DIST vile-9.8w.tgz 2407322 BLAKE2B 824142c2d081db7c74ab4ce36db63e2d26e82954b32d274477f920b3519c75a249745365f7fb4f117f613c04fddd468394b4636d5f84d9f024eee3cb9c8332ba SHA512 54a96b400f479c633b917691fdab5ec5098ff1d6a6f5390c085635b4449ee7f02988e52c6b442918917455d02d5d74781ed57e4f944422576cf6532caaa446af
+DIST vile-9.8y.tgz 2477410 BLAKE2B 993f43a8e033e40d95c6d762daafebf328cae291380d448ec14b2a335569d5de7f628308433cb5abec15958bf1fc47c29f3f0ed49282f22cf7affd839c6ac2c6 SHA512 ce3c7178f6aecfd152e487d0053399739cf8880aa9c38283c9e4e7b95606fa2484f3cf9f7e797f538a47555be5257fbd34b112210e68a39d74f6b8ae7d968c32
+DIST vile-9.8y.tgz.asc 729 BLAKE2B 224cc75c025eb81b898990cb9f44a24e340664c658cead90f16d9103ed3bd3f15ce2c5dcf278c25f4a82069be2d39905f241c5d263b3170a731fb7e865cc45f7 SHA512 5475819801b6dcf3259811b5d3e29584a89baf574ca5685e61c6f98ba15c088ac6843bef66d2a9008b18fb4013fb40aa963ee48b15a786d6724f9ad7a599bd13
+DIST vile-9.8z.tgz 2491799 BLAKE2B a581d269931b2f14307a37e9ec9166cd66d6b48aea15405b6805d6ef2ff448342ff4027d10ef67ed9eace1083484ff282edd8f13341ed515a2f11efed9f8e74d SHA512 f5ff6f3d239f993d7b060e89650567e1c622cec1a024901e29d15cd9a588e8603097e12087d54e88beca91a3a7cd7328a541bac62889368da6636f143d6380ff
+DIST vile-9.8z.tgz.asc 729 BLAKE2B 62c9a5b34f3c1018df7e702dfc8e2bc24012aefb305abc1f21a58181a4ec89df6358d601ced10b41942c2bd63dc4e97f56987f90293deb4c8783dc0b98c38065 SHA512 0c7f5b64425f3f28833e54e072709687730e10fab7e231c1850335aa736ddeb5a6c800b66bab2ad6c79460d13987ee6803f9abb0606cd79682e2e1026b3ece25
diff --git a/app-editors/vile/vile-9.8t-r2.ebuild b/app-editors/vile/vile-9.8t-r2.ebuild
deleted file mode 100644
index add73176aa2f..000000000000
--- a/app-editors/vile/vile-9.8t-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-HOMEPAGE="https://invisible-island.net/vile/"
-SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="perl"
-
-RDEPEND=">=sys-libs/ncurses-5.2:0=
-	virtual/libcrypt:=
-	perl? ( dev-lang/perl:= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	app-eselect/eselect-vi"
-
-src_configure() {
-	econf \
-		--with-ncurses \
-		$(use_with perl )
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_OPT_S="" install
-	dodoc CHANGES* README doc/*.doc
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
-
-pkg_postrm() {
-	einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
-	eselect vi update --if-unset
-}
diff --git a/app-editors/vile/vile-9.8w.ebuild b/app-editors/vile/vile-9.8y.ebuild
index 3243b094a959..f4b5095f953e 100644
--- a/app-editors/vile/vile-9.8w.ebuild
+++ b/app-editors/vile/vile-9.8y.ebuild
@@ -1,13 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Bump with app-editors/xvile
 
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
 DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
 HOMEPAGE="https://invisible-island.net/vile/"
 SRC_URI="https://invisible-island.net/archives/vile/current/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${P}.tgz.asc )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,8 +23,11 @@ RDEPEND=">=sys-libs/ncurses-5.2:=
 	iconv? ( virtual/libiconv )
 	perl? ( dev-lang/perl:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/flex
-	virtual/pkgconfig"
+BDEPEND="
+	app-alternatives/lex
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
+"
 IDEPEND="app-eselect/eselect-vi"
 
 src_configure() {
diff --git a/app-editors/vile/vile-9.8v.ebuild b/app-editors/vile/vile-9.8z.ebuild
index 60b94f7129b1..6c0c78fa7e56 100644
--- a/app-editors/vile/vile-9.8v.ebuild
+++ b/app-editors/vile/vile-9.8z.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 # Bump with app-editors/xvile
 
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
+inherit verify-sig
+
 DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
 HOMEPAGE="https://invisible-island.net/vile/"
 SRC_URI="https://invisible-island.net/archives/vile/current/${P}.tgz"
+SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${P}.tgz.asc )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl iconv"
 
 RDEPEND=">=sys-libs/ncurses-5.2:=
@@ -19,8 +23,11 @@ RDEPEND=">=sys-libs/ncurses-5.2:=
 	iconv? ( virtual/libiconv )
 	perl? ( dev-lang/perl:= )"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/flex
-	virtual/pkgconfig"
+BDEPEND="
+	app-alternatives/lex
+	virtual/pkgconfig
+	verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 )
+"
 IDEPEND="app-eselect/eselect-vi"
 
 src_configure() {