5 files changed, 12 insertions, 94 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f203c6d6f28d..cdf816009ea0 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index 79bebe80ab07..ef9441088187 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,7 +1,7 @@
-DIST puppet-lint-2.5.2.gem 91136 BLAKE2B cae884b3994c7862f337a214903ecd4d7bb297e9e2bb7495fb94030304f53fa7ae98080b62944d5c96f2af0d208352d00030415a89259e8e188ec53da2a2b643 SHA512 996a5fda970c318a3f58a196c7b9aba7e712aae2b24d936b917f1dd9eb6bf5d706df28f70d88e1e174e175aabb13f1d22c8c90289314d5a1dd4ff9207ebbfe03
 DIST puppet-lint-3.4.0.gem 83456 BLAKE2B fa6b274b3e6e84095fdaff6f024864dc301f0afc605198cc40b4dd8df7a9de66adfb91982195af9a0ad35301409c23e99d8d6ba5d3c43d3ee4dd57235de2b8cc SHA512 47c025ef925618cba3c1f579a3ef62bd5f9fd8ee7f8f9a68ed84daafeb7f9071e558619b24f0a249fcbe85d8c1b27e715938cc352792f9aa91de131820103e9c
 DIST puppet-lint-4.0.0.gem 80896 BLAKE2B 6e674deaec43c3b45e2c162ef3d09648bd3cdd589a3ae6ce92e21617633529705fe9999f4c6c361c3c1f041a3d25d1a03079f2f97705c01199253661bc9355dc SHA512 a23d316f60cb7d34c394bdaee0ad08070098d732210a92294a3d330cff7330aefe2be6bd9a60219d7538173c2f187c1ed427c6671a345f868286986164ea3a33
-EBUILD puppet-lint-2.5.2.ebuild 531 BLAKE2B c1ac4560155432f3a6a0de1f10eb9d150b259cd98f6054b4ff642172c1201435f42c5eafb066129cd8de56498c56bbf78549019c4af0158db74f29e0f58a7740 SHA512 3d0511ef51f16c31de57b3796fbba9eebd475f32701379cb305851b789912519735458a8c19561291488f998ba0888611e06c9acb6db8266860544b5b379d0f5
+DIST puppet-lint-4.0.1.gem 81408 BLAKE2B 2e202cf99e496336d5a8f23bf8581211b74e8ce25532edb82169b2aa484e14763087d5c6b966c1be50665ab723b72c9b21a74867b8e0c2296b06ea5e246531d6 SHA512 1709cbcae4db082dbe89b65ba6f5679684f3ed9d89955be0706228bcf0036a0bbfb58abb5ac12d8c2602ea9108386ba3e9b83627ca9c8fa0a813d19dc08f995d
 EBUILD puppet-lint-3.4.0.ebuild 757 BLAKE2B 6c85abe19f11a0a1ae7431be8852c1fd7bc92bfc311083ce6484dcf31c18de6377e0c732b9635fa7dfc4483e44b6948edbdcc8f6c10d3537db454b44747297f8 SHA512 5fa96119ae9086fcdbc2cac3e94f010a64f11cfffe732cb69f66dd87ff6df3f48ee0f15e9889246691efd65d0d715c20e518392f5c7fc53d8493bb4f1ce3d355
 EBUILD puppet-lint-4.0.0.ebuild 757 BLAKE2B 6c85abe19f11a0a1ae7431be8852c1fd7bc92bfc311083ce6484dcf31c18de6377e0c732b9635fa7dfc4483e44b6948edbdcc8f6c10d3537db454b44747297f8 SHA512 5fa96119ae9086fcdbc2cac3e94f010a64f11cfffe732cb69f66dd87ff6df3f48ee0f15e9889246691efd65d0d715c20e518392f5c7fc53d8493bb4f1ce3d355
+EBUILD puppet-lint-4.0.1.ebuild 758 BLAKE2B 6c022d7ec8416cf6eacb3c130e11193789c134b7627d56e2962568f39cd70a9efafa7127c21b91a602c48ae1f42cc5dcc9dc960def9ebfffc518d78e16edae57 SHA512 2e7996aabed09ebeb85c3fa3a83b7716b1f1cfdf760295171b92b322bf839da17549f83b25b7809994eb48aeb06a3501b59abfcc54e5cfcae852708ab9ee2476
 MISC metadata.xml 444 BLAKE2B 42dc45f92fcd9546eaf6dd1408ce3f2407a6d9ceb6fe343719d47d82f4e7034085ac5df7b5e215624db2558a76c6d95f0c73a4cd946c2dd91e09c6beb682c31b SHA512 91a1ce00d98421c057be1d70e74e06bbe84c78a0aeeaa574d20164772084272a910afdd1a95f65aff6b453c0cd4e1c00ca7ba146ddff09ddd3f6f2bb6ae810c1
diff --git a/app-admin/puppet-lint/puppet-lint-2.5.2.ebuild b/app-admin/puppet-lint/puppet-lint-4.0.1.ebuild
index ecb09ba34024..3925aec549db 100644
--- a/app-admin/puppet-lint/puppet-lint-2.5.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-4.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -13,14 +13,21 @@ RUBY_FAKEGEM_BINWRAP="puppet-lint"
 inherit ruby-fakegem
 
 DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
+HOMEPAGE="https://github.com/puppetlabs/puppet-lint"
 
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
 	dev-ruby/rspec-collection_matchers:1
 	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	# Skip acceptance tests due to unpackages puppet_litmus which in turn
+	# has a number of unpackaged dependencies.
+	rm -rf spec/acceptance || die
+	rm -f spec/spec_helper_acceptance.rb || die
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 4ad88ff86abb..22020ed2586e 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +3,7 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.12.5-vendor.tar.gz 53968923 BLAKE2B ea00b99e5cecbd0157222057269a570ea10194aa60821efeee8fa85c6a7497f3dd46d2d6fe04ad2c881e8176fff6bc033986099657e9333c9dfe6dd1c796aea1 SHA512 554b2e23120045d8ae22365d509756aa47754d4ba8c02886619fdf383a95fcbad172b2fe4b738df1c09ff0368aab6fc68aa70305b075254f103358e99fbc508e
-DIST vault-1.12.5-webui.tar.xz 1415000 BLAKE2B b3fc8fd9074456b4b9518c4eb8ce2657fb3d3ef16338afc548a2a397d1d2e9e8f1520549cfd2833554249f6eb8f64fe798e1743c1745d81c58710299dbeb50b3 SHA512 e77616d03042dd101fa854004a36ab74641196dd3dfb40daef58896dc330b3b17da3fad56a29ca7d93a034901a30cac1928e44ed6e48e77dc5aa16f6369e7d3e
 DIST vault-1.12.7-vendor.tar.gz 54194408 BLAKE2B e67a011490b94f10ee54e30054b9efc5229f14aed9409d057972123a180631e6226b4e1240b5179737ba373db16db87ea06124aa5b1865471df968d02b76eca8 SHA512 7562b07a03e864851f511a9cbfdf650cc2cdcef29280073a8d20497accdea868f33a194b504c90221084affe684aa6bd71d0a77490ac149576a84482adcbfc14
 DIST vault-1.12.7-webui.tar.xz 1418060 BLAKE2B 1d120967842b514112d4dcc70e090acd2ae8a8c0c166150e1c310941514ddf9468efab4d11c6d060020b55e1e0a6b34a642f8f52ef145e6050c2224be3b9995e SHA512 15f3c358a6650b9185feb4c68c89230e049cd497848a6d5bf4d004052e56f3ac20309206ca9aab63513fd2bea368e3a557857683f3476ce6c57b6a38128a103b
-EBUILD vault-1.12.5.ebuild 2095 BLAKE2B 9381f523b1b70fff142571c5e61627cf211c60b3b5f061b1a7a3dbaa26b0531fc86f430370f5eb48a2a65881a19a1f3142b5dbe21311bc51d9d51bb5163c7227 SHA512 dd949037626cec46c7cc35e3811befb80b78d2a7cba1d91d36d8878f3dea50188a7fb26268e0f26162cfa6206fcd35db8016a6dc1ebf266ed3c65847218ae0dd
 EBUILD vault-1.12.7.ebuild 2095 BLAKE2B 9381f523b1b70fff142571c5e61627cf211c60b3b5f061b1a7a3dbaa26b0531fc86f430370f5eb48a2a65881a19a1f3142b5dbe21311bc51d9d51bb5163c7227 SHA512 dd949037626cec46c7cc35e3811befb80b78d2a7cba1d91d36d8878f3dea50188a7fb26268e0f26162cfa6206fcd35db8016a6dc1ebf266ed3c65847218ae0dd
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.12.5.ebuild b/app-admin/vault/vault-1.12.5.ebuild
deleted file mode 100644
index 8158ce887ad1..000000000000
--- a/app-admin/vault/vault-1.12.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/zmedico/vault/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="+webui"
-
-BDEPEND="
-	app-arch/zip
-	dev-go/gox
-	>=dev-lang/go-1.15.3"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT="test"
-S=${WORKDIR}/${P}-vendor
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-e "s|^BUILD_DATE=.*|BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%SZ)|" \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-e "s/gofumpt/gofmt/g" \
-		-i Makefile || die
-	if [[ -d "${WORKDIR}/http/web_ui" ]]; then
-		rm -rf "${S}/http/web_ui" || die
-		mv "${WORKDIR}/http/web_ui" "${S}/http/web_ui" ||
-			die "mv failed"
-	else
-		mkdir -p "${S}/http/web_ui" || die
-		touch "${S}/http/web_ui/no_web_ui" || die
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake bin
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}