gentoo auto-resync : 25:11:2023 - 10:31:10

6 files changed, 89 insertions, 282 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 66ab953d1dc9..f138d4f09b49 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index ec65055dec35..79d5e343c3cd 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -6,8 +6,6 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.11-r1.ebuild 3168 BLAKE2B b136622ad1eb71b40f8fd045ffed6b3c4b375477c4d74fe8481e4b650aeabf47646addbe2f59c1ea32a3aaf199c65e92c528614ed0e39b1b54746794253e3c8f SHA512 462609bbe615c6c4d42a6a0cc99ce17a9694aea1a0b18316fa19d9eeeeb6686b7f7c2cdfb7493865683303c72511ab41231ce5bb8ad0bdc8be9b911f8e5d2abd
-EBUILD gkrellm-2.3.11-r2.ebuild 3202 BLAKE2B 8a5bc2648dcd2563227d857ba1f4136d0eb9596b3b49b286f59c7c603bb9ae17ddffad55f8aefabe94cfb530666e57b5ab54f43cdeda5d1f6bc670fa17a46814 SHA512 10dbfca9679482a25daf5b2b8be68d8e439fb1a3c4469b3b3625f1754731986bc18fc7b869d477497d69b5a549715a064b68b36f7beb59cf93cedfe21f5727bb
 EBUILD gkrellm-2.3.11-r4.ebuild 3466 BLAKE2B a990d137e1e775d3e5a29d3ef94a76bd7f8e7f8c22144f68fcf3de2f5d9e73a174908956cf3cd77b89ae897c84979b421b6c31dedfcfa3cf2b50f587d8ae4d69 SHA512 1a2f215450b93e4d1f4702dbe78b777e24a124055875b2d1145472aa524cc4314033a8f14a0dd2f269339ff2331f82715aba28e4f614f491879d05ddf04eca9d
 EBUILD gkrellm-9999.ebuild 3472 BLAKE2B 10ce029cfeadd1168434a2e85dfab1100471065af3f5bb9f984ae3e5482fdd2f34585df75d94d4edb05f8392b4b336fa40aa1cf3b6ad4060f76d738ca48e455c SHA512 d982d055dd85914c8880025ef090f54aa65bc813fe23dd9bf821e2a6067f9ca90ef5081bf0c45e75c32a299b7308926a2112049a3569e51a43b20008069229a2
 MISC metadata.xml 802 BLAKE2B 0d527f21d935bc50eaf60972bb00776b02542178a29034d60be642ba28a3d22d3bc7c8307aba6e803011f0f39a6b04334a14d8e5eade5c9839d232e8dcc03b1f SHA512 d8f5aa5e767d3da83182dbbedc79af11a7381d25009431c89339149ee8205bc9b3dc9a82c690c824b7175df6861c3925b27d44ccf33695159c0a1bcade7a7544
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
deleted file mode 100644
index 136f4e903e33..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop systemd toolchain-funcs
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://gkrellm.srcbox.net/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
-else
-	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-3+"
-SLOT="2"
-IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
-
-RDEPEND="
-	acct-group/gkrellmd
-	acct-user/gkrellmd
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	TARGET=
-
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild
deleted file mode 100644
index b2ba84f7d156..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.11-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop systemd toolchain-funcs
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://gkrellm.srcbox.net/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
-else
-	SRC_URI="http://gkrellm.srcbox.net/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-3+"
-SLOT="2"
-IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
-
-RDEPEND="
-	acct-group/gkrellmd
-	acct-user/gkrellmd
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			dev-libs/openssl:0=
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	nls? ( sys-devel/gettext )
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.5-config.patch"
-	"${FILESDIR}/${PN}-2.3.5-width.patch"
-	"${FILESDIR}/${PN}-2.3.5-sansfont.patch"
-)
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	TARGET=
-
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 22020ed2586e..586e588ed9ed 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -5,5 +5,8 @@ AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea8
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
 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
+DIST vault-1.14.5-vendor.tar.gz 71839384 BLAKE2B 845416db5d69c400d5e9603bd42b2d73112b1cea884a03ac1345afad627b0d8ed0ff983d97b3086ed69462713cc706aa67f46164df4c1e4e3226aafb66cf0e89 SHA512 ac55e4f9b76ac80eb0f82e5d63ed234c65a9b5c737fcb6f7ad8c9cb9dbe303b6d18a11b329f8223d9fbdcea1a7ee982c622184537fce45fe005df89b8392bbe5
+DIST vault-1.14.5-webui.tar.xz 1670796 BLAKE2B 8629de337f2c708553752409a1c8ddc94e421adb34c7b31116f4154e06eed6e7ffb0355cd7ff91d7ec42f1fb1a35737732d530a8587cf515a0636b0a5dbffb38 SHA512 32ff0d720282f0539288f3ee111b91d43b9098bd4ea309d11f638c9f0c4a0a9276fe2f940573d9d664dcea33945f08ac33488ad05d37b372042e859b6d2f7e97
 EBUILD vault-1.12.7.ebuild 2095 BLAKE2B 9381f523b1b70fff142571c5e61627cf211c60b3b5f061b1a7a3dbaa26b0531fc86f430370f5eb48a2a65881a19a1f3142b5dbe21311bc51d9d51bb5163c7227 SHA512 dd949037626cec46c7cc35e3811befb80b78d2a7cba1d91d36d8878f3dea50188a7fb26268e0f26162cfa6206fcd35db8016a6dc1ebf266ed3c65847218ae0dd
+EBUILD vault-1.14.5.ebuild 2096 BLAKE2B fca083286620ca0cf90fa6f428e627851948afd1b77125171cf8b6c1e6bbfe599ca38cbfed8d22f7c83235d1d27e7fd8c011022d4cba68b3c1518319c7ca6ba0 SHA512 b7888e02d2cea6b5418f09f885391d4ef07da44a810caa866c0a52452e43c78138cde10032a72b7d37e3dd19540c7f03dbf24c84ea2cbd63472030d2af3b6a83
 MISC metadata.xml 372 BLAKE2B 8e18e03d14e17a6a5d8c6b7bdb0d87ef6aec8530e203edc579a66b0c6ba0809bbddf4d68943281483ed841daa18a87ee13bed427162e40cd6c2fe3c45b0ec4fb SHA512 07bd140cd5152ccf7e9c39a0ad45a9361b56306b773176155fceaee3dbfa4645d74dba5a21a131f0221419aed5a9aeed4a5aef7c4eec2750c803e11c96621b02
diff --git a/app-admin/vault/vault-1.14.5.ebuild b/app-admin/vault/vault-1.14.5.ebuild
new file mode 100644
index 000000000000..bca60ca1df89
--- /dev/null
+++ b/app-admin/vault/vault-1.14.5.ebuild
@@ -0,0 +1,86 @@
+# 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}
+}