Merge updates from master

2026-07-18 11:33:15 -04:00 · 2023-12-15 17:46:52 +00:00
parent 22299f8625 1d844eb6aa
commit 8a30f731ed
13 changed files with 61 additions and 171 deletions
--- a/dev-db/dbeaver-bin/Manifest
+++ b/dev-db/dbeaver-bin/Manifest
@@ -2,3 +2,5 @@ DIST dbeaver-bin-23.0.0-amd64.tar.gz 80880171 BLAKE2B 6aeee7959fb229d612acc49aec
 DIST dbeaver-bin-23.0.0-arm64.tar.gz 80818981 BLAKE2B 16adecc7cdfe9c0a1fc63a37958b46d5475c366e5ff5a7124b49a98abfa619747f3cd3c8ebcaa83b075f38fe096a8eba4537f0801860dfc8098c067b709c04cd SHA512 84d3560929d4fc78430d421493b48e55897fad284b0597acc75ed790107595863653236cca1aca10f99282581e02e76c034bd05c03604721ff8651e969d942ce
 DIST dbeaver-bin-23.2.0-amd64.tar.gz 86591584 BLAKE2B aba54038967b67bf350b99e900bea1af25ae0d78960d55478775c0536ad517635b9a0ff0ee833f6f183431543b23389d70dd2041cf7cb7b70f333aa8926f96cd SHA512 dcf8c85ca420cc5f5e84f499079185b37d4ed2ed8859324cd4077e988aaa3f604a3f582f15f8fba4779945549e41c243b00241ebb4979bdb2f8192f50e5dc0fd
 DIST dbeaver-bin-23.2.0-arm64.tar.gz 86529720 BLAKE2B 31b0fd16cb3637ff8ea4a2486fbc42785858e47f90ae4b43ef80a41c7650cb47b88c18085f8f214daa931205826c4de82b00da1b497fe136e274d4d19f9af4e9 SHA512 cf7a01aa03b01fa75c5a27421352d8d2a27ec82e3b1093de357be211a3724a019230798dcc68498cc0f2a0f5935d57c0f08df81568e2593f8dc0e4858a56095a
+DIST dbeaver-bin-23.3.0-amd64.tar.gz 87702697 BLAKE2B 604001bb9f2bbbf9da338e837bbac2426ee290a8f75a7a106b43e780c6e5ea525523a8d11d8861988abd673cce4d5759357298c50f1103fe4104513a64de48a7 SHA512 8fa3ad96ab64704324ca1cdbd37acaf3841a307b2fb05b743af6adcdfa2410687b7673ba5dc1db17708566524607c0957badf3d3ae26507e584908b720f3d72e
+DIST dbeaver-bin-23.3.0-arm64.tar.gz 87641110 BLAKE2B e93a3d4fe6c72bf9314a01a46ed8c85370bb1cfca75e32cefeb51736ca6cf6365adc302b25b4787c5beee646dc56d6945bfb49abf565c4c738847b7d8f60b2c6 SHA512 f8f36d1b9a668e5fc6a96f9794812d250fec1acf8fe4fb6ca46cdd7940317845e99e3d78fbf153d797bfd84bdc65f7111fd1c25065676ad4d7faa12e35306f00
--- a/dev-db/dbeaver-bin/dbeaver-bin-23.3.0.ebuild
+++ b/dev-db/dbeaver-bin/dbeaver-bin-23.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+DESCRIPTION="Free universal database tool (community edition)."
+HOMEPAGE="https://dbeaver.io/"
+MY_PN="${PN%-bin*}-ce"
+SRC_URI="amd64? ( https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.x86_64-nojdk.tar.gz -> ${P}-amd64.tar.gz )
+	arm64? ( https://dbeaver.io/files/${PV}/${MY_PN}-${PV}-linux.gtk.aarch64-nojdk.tar.gz  -> ${P}-arm64.tar.gz )"
+
+LICENSE="Apache-2.0 EPL-1.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="virtual/jre:17"
+DEPEND="${RDEPEND}"
+
+MY_PN="${PN%-bin*}"
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	sed -e "s/^Icon=.*/Icon=${MY_PN}/" \
+		-e 's:/usr/share/dbeaver:/opt/dbeaver:g' \
+		-e '/^WMCLASS.*/d' \
+		-e "s:^Exec=.*:Exec=${EPREFIX}/usr/bin/${MY_PN}:" \
+		-i "${MY_PN}-ce.desktop"
+	default
+}
+
+src_install() {
+	doicon -s 128 "${MY_PN}.png"
+	newicon icon.xpm "${MY_PN}.xpm"
+	domenu "${MY_PN}-ce.desktop"
+	einstalldocs
+	rm "${MY_PN}-ce.desktop" "${MY_PN}.png" icon.xpm readme.txt
+	insinto "/opt/${MY_PN}-ce"
+	doins -r ./*
+	fperms 0755 "/opt/${MY_PN}-ce/${MY_PN}"
+	make_wrapper "${MY_PN}" "/opt/${MY_PN}-ce/${MY_PN}" "/opt/${MY_PN}-ce"
+}
--- a/dev-python/podman-compose/Manifest
+++ b/dev-python/podman-compose/Manifest
@@ -1 +1 @@
-DIST podman-compose-1.0.6.tar.gz 58426 BLAKE2B 4a200d7abb77535d631704e96f600c360cd03a70274c5ed763a6f21a309f9be1225749e4f34b1df00973e9c1de191ec3d43bf35588d912faac25de52e4dd85be SHA512 eb6972c51fd02c7a7dec364d18417c4f093f12ab90ba7061be189de7130c8eb0becb5a1653ebf7db0611470b52257a4a1eaae52891f434ca73fbc6dd30da5f56
+DIST podman-compose-1.0.6.gh.tar.gz 58426 BLAKE2B 4a200d7abb77535d631704e96f600c360cd03a70274c5ed763a6f21a309f9be1225749e4f34b1df00973e9c1de191ec3d43bf35588d912faac25de52e4dd85be SHA512 eb6972c51fd02c7a7dec364d18417c4f093f12ab90ba7061be189de7130c8eb0becb5a1653ebf7db0611470b52257a4a1eaae52891f434ca73fbc6dd30da5f56
--- a/dev-python/podman-compose/podman-compose-1.0.6.ebuild
+++ b/dev-python/podman-compose/podman-compose-1.0.6.ebuild
@@ -4,23 +4,30 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1

 DESCRIPTION="A script to run docker-compose.yml using Podman"
 HOMEPAGE="https://github.com/containers/podman-compose"
-SRC_URI="https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"

 DEPEND="
+	|| (
+		( app-containers/netavark app-containers/aardvark-dns )
+		app-containers/dnsname-cni-plugin
+	)
 	app-containers/podman
-	app-containers/dnsname-cni-plugin
 	dev-python/pyaml[${PYTHON_USEDEP}]
 	dev-python/python-dotenv[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"

 distutils_enable_tests pytest
+
+python_test() {
+	epytest pytests
+}
--- a/games-action/ddnet/Manifest
+++ b/games-action/ddnet/Manifest
@@ -2,8 +2,7 @@ DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480
 DIST cxx-1.0.71.crate 195479 BLAKE2B 956f735ad6a417337dd6e0f71ba49d21e8ad9724e288b8d05a013c76bdeb0c3565197f8fc02f861a13f68c6823a969b05852c4abc0ef48d3deb4a3ede3ce7d3c SHA512 1b770312e5ea69a9fa3882e2e507d9de4505dbf09fdab4e6cacdeed7a00122b1cc88583d7353959cd0375a380b7e8563a673c4602fc036130f248db97225b305
 DIST cxxbridge-flags-1.0.71.crate 5593 BLAKE2B 4f3c72079b42cf41c66dc779a792c76d860e7b85220508b9284b23645b8fae3911864b76719457952bb3b7e666312022def72204c2d096afa2683716cb9f0c5d SHA512 53f5783c4c15b87eac8f6c7ca911b5b3c92a5821040c4000586a118b441aaab17f798f878433436e881f0edd531d9243234cdb4bacfea16fe1f60df080a2d6b9
 DIST cxxbridge-macro-1.0.71.crate 59620 BLAKE2B ce4b5bfc016a799312cfc2000bcc7b0b701636a558b66d079e3a69ed3a4c83c3c22cbba7bcd3168107d5dd3a0728e2e8887c0089ac7ef022957cc0559ed7a2c5 SHA512 13b0f742ecf4724214b896bcd3c4fedff011751661bd657ca902f123fcb869e835ce850acb1cb9ebe0cb1d13fb9aecc74c7730586ebd465500c2e01cfe686dbc
-DIST ddnet-17.3.tar.gz 45689515 BLAKE2B a8221cd9781e85a75f730c836b01693e4a3f9bec1ec3fda5434f836005c3b1943521bb8c16d5577ebf6293e289d09e833625299fa28aa0d63e1b3eda96fa3fb8 SHA512 f8210772a669768ff940494f2fd80cc13b30d9367c9d5c43f84b6d73728f8676b4a026a709ea9be7263d61a280bea086f9c9ba12f8250596854d8d5e9618a279
-DIST ddnet-17.4.tar.gz 45734312 BLAKE2B 52e3b3692a564abd549fb669a85b6a8b4bbf6c750be79befb528d4599138704433769cfe17bce6b6977e29dca260b3949e0fb4575ce3e6b16f24f2aa0f370c48 SHA512 e0e1bb584d779421105936ef0d032f61994093fc63bcebda37941abe59e8d5fdbafd83f4d3bcee6e16784ed649f607b9314c7dc3a22521a8a254136159923da3
+DIST ddnet-17.4.1.tar.gz 45734138 BLAKE2B 3b9bc8c23b690f2882c9b17b4134e0666b5a32a85e1c21128e3e03408770abeeeda1a32d8323e228cdd28f8efb96a6e2474f440705a2aa0cd0967851c3341f78 SHA512 842e7b38115093de143a979519dd1db9f0434b0bc064f0caf7f835933a2b115c662f4886a6212821a335fb2d8bc2934a35aeb4b769cd052c3bbbf30ea8219c57
 DIST link-cplusplus-1.0.6.crate 8150 BLAKE2B 82b0eb89926a7f3b7e427242ff3f65eba78f467f1ab972f7f280daf09e2be7188d8e851a21018a268871d5dc9cf7dfda4ef24952b5bc38bd722a5537504c1ddb SHA512 9f77f71f7261472de0d97b2c26efb43f3d49dafbaa1eb853340467260a65d85344e94e023540e068051108afd63cc48c6a5c8025f50922a73dc6409134418e74
 DIST proc-macro2-1.0.40.crate 40559 BLAKE2B d83cf7283393a82ca65263afc375d123bd2f48b719c9eab6859c52dc0c2b9b4b5af3090a0ebd0fedf0e1095f0bafbc443016f751a0485dc654bcd80a6f71e326 SHA512 bb179524bd41e36735010a7ec53e096359ffc3688ab97806a45ed9cfb17e8688ce352bbb8cd3bd4e15a4299e8500603c86591b17cfa31bca03f299f6f6347992
 DIST quote-1.0.20.crate 28160 BLAKE2B db257025f64817b1b58eecb8e64e63f1782d8a7fcb42ed6c3364254ec5a26705e49ce0637c880b0355b99a77473ce3083caae2cfabbd1a1a7e4fc826bae2cb7c SHA512 d12f4a425273b99ae655da11fcf5dad2609e20ad3e7d85cde08c7d09f444a5c7a3505470bad2d48b1ba8ea59ebf38ab87aa1052e47ec414acfc05dcb07d438be
--- a/games-action/ddnet/ddnet-17.4.1.ebuild
+++ b/games-action/ddnet/ddnet-17.4.1.ebuild
--- a/games-action/ddnet/ddnet-17.4.ebuild
+++ b/games-action/ddnet/ddnet-17.4.ebuild
@@ -1,92 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-CRATES="
-cc-1.0.73
-cxx-1.0.71
-cxxbridge-flags-1.0.71
-cxxbridge-macro-1.0.71
-link-cplusplus-1.0.6
-proc-macro2-1.0.40
-quote-1.0.20
-syn-1.0.98
-unicode-ident-1.0.1
-"
-
-inherit cargo cmake python-any-r1 xdg
-
-DESCRIPTION="DDraceNetwork, a cooperative racing mod of Teeworlds "
-HOMEPAGE="https://ddnet.org/
-	https://github.com/ddnet/ddnet"
-SRC_URI="https://github.com/ddnet/ddnet/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-$(cargo_crate_uris ${CRATES})"
-
-LICENSE="CC-BY-SA-3.0 OFL-1.1 BSD"
-SLOT="0"
-IUSE="antibot autoupdate +client download-gtest headless-client +inform-update +server +tools upnp +videorecorder vulkan websockets"
-KEYWORDS="~amd64"
-
-DEPEND="
-	client? (
-		media-libs/freetype
-		media-libs/glew
-		media-libs/libogg
-		media-libs/libsdl2
-		media-libs/opus
-		media-libs/opusfile
-		media-libs/libpng
-		media-libs/x264
-		media-sound/wavpack
-		x11-libs/libnotify
-		videorecorder? ( media-video/ffmpeg )
-	)
-	sys-libs/zlib
-	dev-libs/openssl
-	dev-db/sqlite
-	download-gtest? (
-		dev-cpp/gtest
-		dev-vcs/git
-	)
-	net-misc/curl
-	upnp? ( net-libs/miniupnpc )
-	vulkan? (
-		media-libs/vulkan-loader
-		media-libs/libsdl2[vulkan]
-	)
-	websockets? ( net-libs/libwebsockets[client] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-lang/python-3.9
-	dev-util/cmake
-	dev-util/glslang
-	dev-util/spirv-tools
-"
-
-src_unpack() {
-	default_src_unpack
-	cargo_src_unpack
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DANTIBOT=$(usex antibot ON OFF)
-		-DAUTOUPDATE=$(usex autoupdate ON OFF)
-		-DCLIENT=$(usex client ON OFF)
-		-DDOWNLOAD_GTEST=$(usex download-gtest ON OFF)
-		-DHEADLESS_CLIENT=$(usex headless-client ON OFF)
-		-DINFORM_UPDATE=$(usex inform-update ON OFF)
-		-DSERVER=$(usex server ON OFF)
-		-DTOOLS=$(usex tools ON OFF)
-		-DUPNP=$(usex upnp ON OFF)
-		-DVIDEORECORDER=$(usex videorecorder ON OFF)
-		-DVULKAN=$(usex vulkan ON OFF)
-		-DWEBSOCKETS=$(usex websockets ON OFF)
-		-DSECURITY_COMPILER_FLAGS=OFF # Set by gentoo toolchain, see https://bugs.gentoo.org/888875
-	)
-	cmake_src_configure
-}
--- a/gui-apps/organicmaps/organicmaps-9999.ebuild
+++ b/gui-apps/organicmaps/organicmaps-9999.ebuild
@@ -1,4 +1,7 @@
-EAPI=7
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8

 inherit git-r3 xdg cmake
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -10,8 +13,6 @@ LICENSE="Apache-2.0"
 SLOT="0"

 DEPEND="sys-devel/clang
-	>=dev-util/cmake-3.18.1
-	dev-util/ninja
 	media-libs/freetype
 	dev-libs/icu
 	sys-libs/libstdc++-v3
@@ -20,7 +21,6 @@ DEPEND="sys-devel/clang
 	dev-qt/qtsvg
 	dev-db/sqlite
 	sys-libs/zlib[minizip]"
-RDEPEND=""

 PATCHES=(
 	"${FILESDIR}/${P}-zlib-compile.patch"
--- a/mpv-plugin/autoload/Manifest
+++ b/mpv-plugin/autoload/Manifest
@@ -1,2 +0,0 @@
-DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de SHA512 42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a
-DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1 SHA512 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
--- a/mpv-plugin/autoload/autoload-0.35.1.ebuild
+++ b/mpv-plugin/autoload/autoload-0.35.1.ebuild
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_MPV="rdepend"
-MPV_REQ_USE="lua"
-inherit mpv-plugin
-
-DESCRIPTION="Loads playlist entries before and after the the currently played file"
-HOMEPAGE="https://github.com/mpv-player/mpv/tree/master/TOOLS/lua"
-
-# use the already available mpv tarball
-SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> mpv-${PV}.tar.gz"
-
-# since this comes from mpv, use its licenses
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT"
-KEYWORDS="~amd64"
-
-# lock mpv version
-RDEPEND="~media-video/mpv-${PV}"
-
-S="${WORKDIR}/mpv-${PV}/TOOLS/lua"
-
-MPV_PLUGIN_FILES=( ${PN}.lua )
--- a/mpv-plugin/autoload/autoload-0.36.0.ebuild
+++ b/mpv-plugin/autoload/autoload-0.36.0.ebuild
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_MPV="rdepend"
-MPV_REQ_USE="lua"
-inherit mpv-plugin
-
-DESCRIPTION="Loads playlist entries before and after the the currently played file"
-HOMEPAGE="https://github.com/mpv-player/mpv/tree/master/TOOLS/lua"
-
-# use the already available mpv tarball
-SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> mpv-${PV}.tar.gz"
-
-# since this comes from mpv, use its licenses
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT"
-KEYWORDS="~amd64"
-
-# lock mpv version
-RDEPEND="~media-video/mpv-${PV}"
-
-S="${WORKDIR}/mpv-${PV}/TOOLS/lua"
-
-MPV_PLUGIN_FILES=( ${PN}.lua )
--- a/mpv-plugin/autoload/metadata.xml
+++ b/mpv-plugin/autoload/metadata.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
-<pkgmetadata>
-	<maintainer type="person">
-		<email>smaniotto.nicola@gmail.com</email>
-		<name>Nicola Smaniotto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mpv-player/mpv</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -14,12 +14,6 @@

 # New entries go on top.

-# David Roman <davidroman96@gmail.com> (2023-11-16)
-# Redundant package, mpv[lua] also provide this.
-# See https://bugs.gentoo.org/917411
-# Removal in +30 days if no one objects
-mpv-plugin/autoload
-
 # David Roman <davidroman96@gmail.com> (2023-10-19)
 # Known security bugs. Masked until somone updates it.
 # See https://bugs.gentoo.org/915891