Merge updates from master

2026-07-17 11:04:10 -04:00 · 2024-03-03 10:20:06 +00:00
parent 59872db929 575efd1e5f
commit 4b3c4028f3
9 changed files with 130 additions and 6 deletions
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -4,3 +4,4 @@ DIST vaultwarden-1.30.3.tar.gz 608049 BLAKE2B f8d8a80c8dc7b6c710b0fbea19a14c7a73
 DIST vaultwarden-1.30.4-deps.tar.xz 46442248 BLAKE2B 2d6f81583fe16855073f7bf6bcd3e6ca62bdb794617592f0a0a58acd64fd47563fd99ad0c1c0d5ad0bebb5130954a21a79899faa5d536cf0e5df5d7af6b0cda5 SHA512 ea9cb986521646433a129627f5e9ce69de682a229dd553d5a555be1df766757b67f6779ab39f21b47f9aa224221e3d8b48ea0eefa959052b85f87711a6c13047
 DIST vaultwarden-1.30.4-docs.tar.xz 73864 BLAKE2B 5a7d71d639b19dedf997a3ab418be228795a03761b3d08cf4e2368ce72548d09dea3fb06b6f485d8b35240161982f1e74d3b4fb7a178714b0de3733ef7db17a4 SHA512 17917c8a365c5d32f1d83aaacdd0a9faac95241cc187d0237e584c34bbadeb1b11948fbcc5def104a091968b3845edcde57900f8f4d1536728664ef9d99467ae
 DIST vaultwarden-1.30.4.tar.gz 597933 BLAKE2B 24f9517173a4832cbd6b002831d4b09fe5b52531772e8f2aa1cca2517c50d39dc830ebb4f13d14851a52638891be2f9144d7ce38ca79813adcd3d62687812f6b SHA512 a84899ebe30129a62971d4391f4801d3a6eb63b22075a11e676a07f73d8ff0f431a4b8868bac37dc344678ff7de70959ed062c2c7fea4c254fe4f5286d56647e
+DIST vaultwarden-1.30.5.tar.gz 597882 BLAKE2B 8b7a8135cd4b454a7cd7016ee1b0efed09d4507ec28ff712b3d935ca006c524dc27e9de65c930a82e6cb0911cb9629ae1d5a9ee95531d3e5a171abae8ba99f72 SHA512 acf7c344840f9b19e3aa366dae794ca6daca9dfad10d2bfdfa08d195d00f553643b46f2f7fe9344d0949306f9dc892722af7aeb7a047986edc98b51ec0c143bb
--- a/app-admin/vaultwarden/vaultwarden-1.30.5.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-1.30.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cargo check-reqs readme.gentoo-r1 systemd tmpfiles
+
+DESCRIPTION="Unofficial Bitwarden compatible password manager server written in Rust"
+HOMEPAGE="https://github.com/dani-garcia/vaultwarden"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.git"
+else
+	SRC_URI="
+	https://github.com/dani-garcia/vaultwarden/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-1.30.4/deps.tar.xz -> ${PN}-1.30.4-deps.tar.xz
+	https://github.com/rahilarious/gentoo-distfiles/releases/download/${PN}-1.30.4/wiki.tar.xz -> ${PN}-1.30.4-docs.tar.xz
+"
+	KEYWORDS="~amd64"
+fi
+
+# main
+LICENSE="AGPL-3"
+# deps
+LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+
+SLOT="0"
+IUSE="cli mysql postgres sqlite web"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	acct-user/vaultwarden
+	acct-group/vaultwarden
+	cli? ( || ( app-admin/bitwarden-cli app-admin/bitwarden-cli-bin  ) )
+	mysql? ( dev-db/mysql-connector-c:= )
+	postgres? ( dev-db/postgresql:* )
+	sqlite? ( dev-db/sqlite:3 )
+	web? ( || ( www-apps/vaultwarden-web www-apps/vaultwarden-web-bin  ) )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+QA_PRESTRIPPED="usr/bin/${PN}"
+ECARGO_VENDOR="${WORKDIR}/vendor"
+
+PATCHES=(
+	"${FILESDIR}"/vaultwarden-envfile-1.30.3.patch
+)
+
+CHECKREQS_MEMORY=3G
+CHECKREQS_DISK_BUILD=2G
+
+DOC_CONTENTS="\n
+	Configuration file: /etc/${PN}.env\n
+	Data directory: /var/lib/${PN}\n
+	\n
+	MySQL & PostgreSQL users must set DATABASE_URL in config\n
+	\n
+	Default server: http://0.0.0.0:8000\n
+	Admin interface: http://0.0.0.0:8000/admin
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		# clone vaultwarden
+		git-r3_src_unpack
+
+		# clone vaultwarden.wiki
+		EGIT_REPO_URI="https://github.com/dani-garcia/vaultwarden.wiki.git"
+		EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}.wiki"
+		git-r3_src_unpack
+
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_prepare() {
+	default
+	use web && { sed -i -e 's|^WEB_VAULT_ENABLED=false|WEB_VAULT_ENABLED=true|g;' .env.template || die; }
+}
+
+src_configure() {
+	local myfeatures=(
+		$(usev sqlite)
+		$(usev mysql)
+		$(usev postgres postgresql )
+	)
+	cargo_src_configure
+}
+
+src_compile() {
+	# https://github.com/dani-garcia/vaultwarden/blob/main/build.rs
+	[[ ${PV} != 9999* ]] && export VW_VERSION="${PV}"
+	cargo_src_compile
+}
+
+src_install() {
+	dobin target/*/"${PN}"
+	systemd_newunit "${FILESDIR}"/vaultwarden-1.30.3.service "${PN}".service
+	newinitd "${FILESDIR}"/vaultwarden-1.30.3.initd "${PN}"
+	newtmpfiles "${FILESDIR}"/vaultwarden-tmpfiles-1.30.3.conf "${PN}".conf
+	insinto /etc
+	newins .env.template "${PN}".env
+	dosym -r /etc/"${PN}".env /etc/conf.d/"${PN}"
+	keepdir /var/lib/"${PN}"
+
+	readme.gentoo_create_doc
+	einstalldocs
+	dodoc -r ../"${PN}".wiki/*
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}".conf
+	readme.gentoo_print_elog
+}
--- a/dev-python/types-protobuf/Manifest
+++ b/dev-python/types-protobuf/Manifest
@@ -1 +1 @@
-DIST types-protobuf-4.24.0.20240129.tar.gz 48125 BLAKE2B 5348a59fe912411a06be7453066163b904f8183984da1f821745d0e7d1ff2ea81d087169c3ffdd5f4c22756b2c106a95a606e451eca84b341c1f05b882d87f56 SHA512 f7d381ed59ff72bddbd300d9d969bd323b6fd1f1a0add37065cdece3294a944e078d7701c6a8521c64103ab6e2a4d3c004ad2552523c0da75e45a971c2a96cde
+DIST types-protobuf-4.24.0.20240302.tar.gz 48129 BLAKE2B 97c090cae9d7e967f80743e4e887c1f97a206eb61317c4431a43640966973fce9c4f875090ae241592f5b0e7c882d3fac04acad633a2e3eb0efa39f68d0840cd SHA512 498a2ceb40a7d9769d30576b2f17db88fac4f2b88c8dc89f0eaa3a43b16ac24282d4c5294ffc557330faf64bd9779bfe9acbbed22852ce6364fa12270ae3d9fd
--- a/dev-python/types-protobuf/types-protobuf-4.24.0.20240302.ebuild
+++ b/dev-python/types-protobuf/types-protobuf-4.24.0.20240302.ebuild
--- a/media-libs/amdvlk-bin/Manifest
+++ b/media-libs/amdvlk-bin/Manifest
@@ -2,5 +2,5 @@ DIST amdvlk-bin-2021.2.5-amd64.rpm 16616736 BLAKE2B 091d14036fc164e15ebb138812ba
 DIST amdvlk-bin-2021.2.5-i386.deb 23475164 BLAKE2B b7f7fb91d88c7a37e69f99a2a036b6e1eda1ae00f0f378eb0a245253b12ea6adbd23de70e9bc06c95438a02f2d1905eb8dd55c601ba616106e2b2e2f7db08a93 SHA512 1f6067c97661285f62bcd0cb8a81138943f7280ebfda3d70aa32237cea0b715131c7b8af982b62c63ef813f6c1ff54672eea61244cf3c13f1cb536edbb4a749c
 DIST amdvlk-bin-2023.3.3-amd64.rpm 16954920 BLAKE2B 8b8d2e353a2055a823c5a7932c55a5e113036388a68c2f61a665de0209e82dd219b21e6f4a79f2ad6141381601e408b0007068140fcc2692bf5904ac289ab597 SHA512 827bcf885f207557b452360491187b9909279a601dff9c635561b4aa5f2c8aae9d940e880a98c7fb1482efd7fec068e8f3667729930ecd20dfa7c06be15193c9
 DIST amdvlk-bin-2023.3.3-i386.deb 25352166 BLAKE2B f4e3af91c2f4e7be6c447c2553ac3deed106be86ce3bd3204ac2e6734ca09dba4c59da8ffd49b52f85dfcbe5eaba09cfa2519578ececfb6f7b21ee4a3d67430d SHA512 3668d701292b7283409ec2209f52b0b01cd7821754969efc4c91c74b2b075ee612f41fafd471dd92da1b204644c76bb92fd60c4c916588b7ee8961257523ba50
-DIST amdvlk-bin-2024.1.1-amd64.rpm 18242384 BLAKE2B f26155287dfd7c968581b5eba3a4ad4ac9e1c0d4740a9aa57e120c8a21a1638cf0f02bcf3fd51fb2b6150031b7d81a2c755095807f8afbec5727be4dd661bcaf SHA512 f75b175377a9c252d564db5d99aae47d833d6ddc2c0b7c9292113e96e0635d059deae82ef54e9a88025c28b8b2271113ab468c72a0aa16c4908857b970f3634e
-DIST amdvlk-bin-2024.1.1-i386.deb 25981812 BLAKE2B c8cb424798b6d2f64f0d4c68930c4fbe7ac02039373d33aa6cc0c2912b71df7a7adff64e3f60be52f3bd4bcec0c91ee5f3a0edfaa88dc2f09390c245e94f0170 SHA512 6c3f5aea6e734fa3550c7f4103108dd3efca2ce0ddb1e0410b46ef3d4171deb66cf10b2e38935bf965d729daa221fd6af119582ef7b15e779df80d84122b9587
+DIST amdvlk-bin-2024.1.2-amd64.rpm 18323340 BLAKE2B 0e7bc3e53fae11007b660786451a4268a79de0691a14d862dffdb9ba9c25b1a7c64bd88021aad754e6b87a84474b6727b02af8e0a6c662430a8b31af3b6ac829 SHA512 759b2b85f5570bd15638f8be2f16072b50a667a812ef93de55326984e660470a9af28f484e9d11931ac0285b854fdace4394c38cd869668b3e1c7b04e6d3bc9d
+DIST amdvlk-bin-2024.1.2-i386.deb 26110588 BLAKE2B 5b1fb0a12a003d565a4ff9e7856d9ee3d21773bd954b16d7885e7607acf67337c696ab2909ffa8b36a61d632001ac8b701f2368cceab4ba5ecba21a94fb4fca9 SHA512 0ce33654cdc6dd661e6253a58448eb955c5beb42b300b284ed6dd48d37dbc814b061197b2de81f320a92a99e34b7fcd79543e2b47975c127fd2b045df11986ce
--- a/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild
+++ b/media-libs/amdvlk-bin/amdvlk-bin-2024.1.2.ebuild
--- a/media-libs/dr_wav/Manifest
+++ b/media-libs/dr_wav/Manifest
@@ -1 +1 @@
-DIST dr_wav-0.13.16.gh.tar.gz 518698 BLAKE2B 9598008c392fcb24448f15771bb47e6479c99b529164e28af00600d3eb7066ffb49f328bcaca88cb89ac0348551ff60cbf9c965d1f39e460319a0867b4141821 SHA512 8d6b8324db7a0864b1c264a1aea7f29eb282f726aa2d6ba8be8fb27892dd7c3c047b3b669bcc9744e52b4fb57899437bb42ba17b5cefd3520c98cb17570e68dd
+DIST dr_wav-0.13.16.gh.tar.gz 518708 BLAKE2B 33c55d2e7dcba5e01421dc3003a5f1a520a13c0f32a9720625771f9c4625fd47d6f6567642dba8cfdf8c59561fab5074b02f6ad86e97c9ab6b970a6529332cb6 SHA512 604752b11f0c51eb25a1c51b8e74c7c11473f0267b2d48a2ec2637c3ea881b9a29867a5a0aa016b7a1dced67bd271abc62b20fe771e0c20862dc14afccd39b09
--- a/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
+++ b/media-libs/dr_wav/dr_wav-0.13.16-r1.ebuild
@@ -7,7 +7,7 @@ inherit edo toolchain-funcs

 DESCRIPTION="Single-header WAV audio loader and writer library"
 HOMEPAGE="https://github.com/mackron/dr_libs/"
-COMMIT="e4a7765e598e9e54dc0f520b7e4416359bee80cc"
+COMMIT="4ec70a37c4450b021a6653f0813f1b9ceaae65fb"
 SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"

 LICENSE="|| ( MIT-0 public-domain )"
--- a/sys-apps/corefreq/corefreq-1.96.3.ebuild
+++ b/sys-apps/corefreq/corefreq-1.96.3.ebuild
@@ -39,7 +39,10 @@ pkg_setup() {
 	linux-mod_pkg_setup
 }

-QA_PREBUILT="usr/bin/${PN}d"
+QA_PREBUILT="
+	usr/bin/${PN}d
+	/usr/bin/${PN}-cli
+"

 src_install() {
 	linux-mod_src_install