Merge updates from master

2026-07-18 11:33:15 -04:00 · 2024-11-18 13:03:54 +00:00
parent 0e4d12a7f9 7fcf0c2916
commit f22654456d
20 changed files with 306 additions and 54 deletions
--- a/app-admin/vaultwarden/Manifest
+++ b/app-admin/vaultwarden/Manifest
@@ -5,3 +5,6 @@ DIST vaultwarden-1.30.4-deps.tar.xz 46442248 BLAKE2B 2d6f81583fe16855073f7bf6bcd
 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
+DIST vaultwarden-1.32.4-docs.tar.xz 703140 BLAKE2B 6bca8f3e03b73d2bc921cc7f91df7bf5199a6267f7cd34e5f183d04d29d29aeb6d6973c61611ee4a18bbe2e8d3627682c018a3af2411497c140f772c977bae5b SHA512 2e865e3cc68a58227b2d5d99fd2292a4f6ddecce3dccbda99c896a1a83afd2020d0252f2104988099a8f564e20b67e2b09ce82923594bf6bafa2c91736ee057b
+DIST vaultwarden-1.32.4-vendor.tar.xz 57601460 BLAKE2B d7e4a9f03848b93dc7c2619e1140c09112805e7cb61657310a4a3759eedd4e6b2c4cd948b7c64836c9455a79aa63e12a31e64237bfab7cdce07eaa7a0bdcd920 SHA512 0ccedfa75d2d45aab0bff81c27282f22c8b41f91d9de9e76d657e8722efff374ad2130a56ae9c197aad12fbdb7747904cace0246b3ec0ca3126c5ae4513b5584
+DIST vaultwarden-1.32.4.tar.gz 619528 BLAKE2B 7c559b984f889c86c9902e9bd07e6b63748f36e0532f90bca3715229de1c98fe2c4aa846a40c7dc946167fc9ad4da5294271d0cdefe9ff7a206d600554e356ed SHA512 2377ac9acdef157011c03a916ad07d8905550f41efd950f5afdb97bbf4a69ff1b372b5ebe18ca92edb0f02904330f95025b1ec376c5c3cad1388c61493eccb93
--- a/app-admin/vaultwarden/metadata.xml
+++ b/app-admin/vaultwarden/metadata.xml
@@ -5,6 +5,10 @@
    <email>me@rahil.rocks</email>
    <name>Rahil Bhimjiani</name>
  </maintainer>
+  <maintainer type="person">
+    <email>julien@jroy.ca</email>
+    <name>Julien Roy</name>
+  </maintainer>
  <use>
    <flag name="cli">
      Install client with the Command-Line Interface
--- a/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild
+++ b/app-admin/vaultwarden/vaultwarden-1.32.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# https://github.com/dani-garcia/vaultwarden/issues/4649
+RUST_MAX_VER="1.82.0"
+
+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://jroy.ca/dist/${P}-vendor.tar.xz
+	https://jroy.ca/dist/${P}-wiki.tar.xz -> ${P}-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
+"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	rust_pkg_setup
+}
+
+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/app-misc/far2l/Manifest
+++ b/app-misc/far2l/Manifest
@@ -1,2 +1,2 @@
-DIST v_2.5.3.tar.gz 6529657 BLAKE2B fe0a1fad689594c1f472301b1f39e813fc7a5d949a99db38120f4beb4d703854ce0e6fc844e881623cf3a255357ec3680a9efbc78090a800c4c6d3455d6eafea SHA512 a4569511428f7d1465554e9c8075b9481be73f5383831b46e1c5e6ab25e5672585dbbe96bbf22c6dd5115c38e62916f0eef8206718374110b78389fde54086bd
 DIST v_2.6.3.tar.gz 6730071 BLAKE2B 09e629c4bc77a93acdbe92a455355cb09ef54eb025c824fbf829db093f6d5b5a9491023aec80b050667aeeca910dbe82183d542268b0f722c83aa81e3278ade8 SHA512 9d35cae6bbc55058b4926026f73d8f368d8c78669493a67ab0901a3b044b27db87297715d763116fd3460f3a76dc890dbede09e24c3eae8354ac005d8f1c8bd7
+DIST v_2.6.4.tar.gz 6854330 BLAKE2B 577de3d07a40822c88358d267fa4be8b9ff68e4928218002a9cd45c9d3edd2e1faecbd8dec11d54aeeb6c49f087b8aff8d0fb0e22ffcc5fb0152b0d27774dc03 SHA512 87dfdbcecc0617d200288f113a7a59ae3192c9ab3f0e39fa1dac4992cedc9fdce2bf2bdc317446d37a078581c2c7dd5d7cf4fcb65e1577fafeec91974eb08a59
--- a/app-misc/far2l/far2l-2.6.3_beta.ebuild
+++ b/app-misc/far2l/far2l-2.6.3_beta.ebuild
@@ -54,9 +54,12 @@ pkg_setup() {
 }

 src_prepare() {
-	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt || die
-	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die
-	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::" -i "${S}"/CMakeLists.txt || die
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::"
+		-i "${S}"/CMakeLists.txt || die
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::"
+		-i "${S}"/CMakeLists.txt || die
+	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::"
+		-i "${S}"/CMakeLists.txt || die
 	cmake_src_prepare
 }

--- a/app-misc/far2l/far2l-2.6.4_beta.ebuild
+++ b/app-misc/far2l/far2l-2.6.4_beta.ebuild
@@ -3,7 +3,9 @@

 EAPI=8

-WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{10..13} )
+
+WX_GTK_VER="3.2-gtk3"

 inherit cmake xdg wxwidgets

@@ -24,24 +26,26 @@ fi

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets"
+IUSE="+archive +chardet +colorer nfs samba sftp +ssl webdav wxwidgets X"
 RESTRICT="mirror"

-BDEPEND="sys-devel/m4"
-
-RDEPEND="dev-libs/xerces-c
-	dev-libs/spdlog
-	app-i18n/uchardet
+RDEPEND="
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	ssl? ( dev-libs/openssl )
-	sftp? ( net-libs/libssh[sftp] )
-	samba? ( net-fs/samba )
-	nfs? ( net-fs/libnfs )
-	webdav? ( net-libs/neon )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXi
+	)
 	archive? (
 		dev-libs/libpcre2
 		app-arch/libarchive
-	)"
+	)
+	chardet? ( app-i18n/uchardet )
+	colorer? ( dev-libs/libxml2 )
+	nfs? ( net-fs/libnfs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh[sftp] )
+	ssl? ( dev-libs/openssl )
+	webdav? ( net-libs/neon )"

 DEPEND="${RDEPEND}"

@@ -54,11 +58,9 @@ pkg_setup() {
 }

 src_prepare() {
-	p=/lib/far2l/far2l
-
-	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}\${p}_askpass)::" \
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" \
 		-i "${S}"/CMakeLists.txt || die
-	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}\${p}_sudoapp)::" \
+	sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" \
 		-i "${S}"/CMakeLists.txt || die
 	sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::" \
 		-i "${S}"/CMakeLists.txt || die
@@ -68,8 +70,8 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DUSEWX="$(usex wxwidgets)"
-#		FIXME: add python plugins support
-#		We need pcpp for this
+		-DUSEUCD=$"$(usex chardet)"
+		-DCOLORER="$(usex colorer)"
 #		-DPYTHON="$(usex python)"
 		-DBUILD_SHARED_LIBS=OFF
 	)
--- a/app-misc/far2l/far2l-9999.ebuild
+++ b/app-misc/far2l/far2l-9999.ebuild
@@ -3,6 +3,8 @@

 EAPI=8

+PYTHON_COMPAT=( python3_{10..13} )
+
 WX_GTK_VER="3.2-gtk3"

 inherit cmake xdg wxwidgets
@@ -70,8 +72,6 @@ src_configure() {
 		-DUSEWX="$(usex wxwidgets)"
 		-DUSEUCD=$"$(usex chardet)"
 		-DCOLORER="$(usex colorer)"
-#		FIXME: add python plugins support
-#		We need pcpp for this
 #		-DPYTHON="$(usex python)"
 		-DBUILD_SHARED_LIBS=OFF
 	)
--- a/dev-cpp/cpptrace/Manifest
+++ b/dev-cpp/cpptrace/Manifest
@@ -1,3 +1,3 @@
 DIST cpptrace-0.6.3.tar.gz 321472 BLAKE2B 8f6fd949e8e30ae9860516d4ab20583606ace12d5c37b512e1940a472143e90befd7179591a2eba80f25545c2036775224b3a1644cb26c342618f6f85617dc5f SHA512 fbea457268fcf535c8295098c8e21a915cae408a253050d9c69d2d34758b2e3cc14d3cfc39ee2dbe9399f4363a4a1462447206067f794cbf88282b54a9a587e7
-DIST cpptrace-0.7.0.tar.gz 373947 BLAKE2B ac8337baaa53ce52210f64efb1e6203df830e03316479d8780bf927c5ef4f300e8987cc8371fd219b5bd9929b14b7fd36087374e9c910147ca640cb6ed2a46de SHA512 e205ab54e51dc5fe0cc448e181181d3a2ef3e0d2435d5040cca7f36fc9f9998a0cea2a11051898ebfcc84954a1dd2aff9f48ac9ab718e5d8f974aff419f9ff23
 DIST cpptrace-0.7.2.tar.gz 376987 BLAKE2B 9a76c077dc30a8aaf68a37e587d1d6fea940fc30b62a1fe4e93b5816353594283b95bc4e2c91d36f4ef250b90adfe0fab0732fa8e5af176b5e54bae33c99b9b5 SHA512 476db9964d4b8b353015e998e6e74ff811957f05319d8066bafd3f0858c945e7bdfd922f286ca6152a3094c5ad93ccac0790d70e248223c129020eddd7eee72d
+DIST cpptrace-0.7.3.tar.gz 377957 BLAKE2B c671e37bd168260882ca6f4b8a8a335eb4f470c5ca53115b607cfb8467b98871ea83252b097a16ae257164815518c00a747f38c3f660158030b928aaefc1e31c SHA512 8e1c4ec3f7bbc717a677f00ee8c56bb082732d779b2682e9cc629ba96e68def786c12e815f10606067e361f0c1d46f9833e454c786aa26688ef1a940a5e6d98b
--- a/dev-cpp/cpptrace/cpptrace-0.7.3.ebuild
+++ b/dev-cpp/cpptrace/cpptrace-0.7.3.ebuild
--- a/games-util/pegasus/pegasus-9999.ebuild
+++ b/games-util/pegasus/pegasus-9999.ebuild
@@ -14,35 +14,29 @@ LICENSE="GPL-3"
 SLOT="0"

 RDEPEND="
->dev-qt/qtmultimedia-5.15:5[qml]
->dev-qt/qtquickcontrols2-5.15:5
->dev-qt/qtsvg-5.15:5
->dev-qt/qtsql-5.15:5[sqlite]
->dev-qt/linguist-tools-5.15:5
+dev-qt/qtconcurrent:5
+dev-qt/qtmultimedia:5[qml]
+dev-qt/qtquickcontrols2:5
+dev-qt/qtsvg:5
+dev-qt/qtsql:5[sqlite]
 media-libs/libpng
 media-libs/libsdl2
 "

 DEPEND="$RDEPEND"

-src_prepare()  {
-	# Patch desktop file to final path
-	sed -i 's:$${INSTALL_BINDIR}:/usr/bin:g' "${S}"/src/app/platform/linux/org.pegasus_frontend.Pegasus.desktop.qmake.in
-	eapply_user
-}
+BDEPEND="dev-qt/linguist-tools:5"

 src_configure() {
 	eqmake5 USE_SDL_GAMEPAD=1 USE_SDL_POWER=1 \
-		INSTALL_BINDIR="${D}/usr/bin" \
-		INSTALL_DOCDIR="${D}/usr/share/doc/${PF}" \
-		INSTALL_DESKTOPDIR="${D}/usr/share/applications" \
-		INSTALL_ICONDIR="${D}/usr/share/icons"
+	        INSTALL_BINDIR="${EPREFIX}/usr/bin" \
+			INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+			INSTALL_DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+			INSTALL_ICONDIR="${EPREFIX}/usr/share/icons"
 }

-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dosym ../icons/64x64/apps/org.pegasus_frontend.Pegasus.png \
+	/usr/share/pixmaps/org.pegasus_frontend.Pegasus.png
 }
--- a/media-gfx/grafx2/Manifest
+++ b/media-gfx/grafx2/Manifest
@@ -1 +1,3 @@
 DIST grafx2-2.7.2978-src.tgz 1104727 BLAKE2B 7ae308ea7ce3dd10966e85353111c890931a56c9bc496c4d956d89db9609e4e472280df1202e85494929979ee080a7c5daf07b629ed7002291448c87a7547cf6 SHA512 ed8d92b51cf71ee139b7c21206a088ba056642debcbbc6e650bdab9547b53159251d842eb4c5ea46b18859c0f333bad66ed60e4b91d58bacd7f02022ead7a61e
+DIST grafx2-testdata-20201222.tar.bz2 36853538 BLAKE2B 506db79030f33e5308ac9f4cbed7891c836cde9c8795eb867b7df2c80bd3b3825af93099f3def6f3a0e55b8628a4139e9b1c689d317daec189037d50a9e2da93 SHA512 3be28934b8d7b945fcc21bd9e1d500dd4dfca2bb371b801ef7dbe4670529d054fb19f10fdeeb2fec9096c611c31adfcf238c4b3035b2891db4fc6e9968978c4e
+DIST grafx2-v2.9.3219.tar.gz 2631545 BLAKE2B 76c67986f45f21c11d7df7f628c689f2e08d24ec54e14ed2d2d25729e471b4b045cc4d70e5c4c20ee9e6e4950439d1747b3e67308d2dacd706be762c693391d6 SHA512 db6a6092c899dbc313e4a680654d128e77b0db8af64032f412dc788b0d9fa9070847cfdb6ec8af4a4dbb35568dc992bce2ebf8f3852ecba1a12608f0a454cd74
--- a/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978-r100.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 # Test phase fails: make: *** [Makefile:1146: ../bin/tests-sdl] Error 1
 RESTRICT="test"

-DEPEND="
+RDEPEND="
 	media-libs/libsdl
 	media-libs/sdl-image[tiff]
 	media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
 	ttf? ( media-libs/sdl-ttf )
 	lua? ( ${LUA_DEPS} )
 "
+DEPEND="${RDEPEND}"

 PATCHES=( "${FILESDIR}/${PN}-desktop-file.patch" )

--- a/media-gfx/grafx2/grafx2-2.7.2978.ebuild
+++ b/media-gfx/grafx2/grafx2-2.7.2978.ebuild
@@ -23,7 +23,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-desktop-file.patch"
 )

-DEPEND="
+RDEPEND="
 	media-libs/libsdl
 	media-libs/sdl-image[tiff]
 	media-libs/freetype
@@ -31,6 +31,7 @@ DEPEND="
 	ttf? ( media-libs/sdl-ttf )
 	lua? ( >=dev-lang/lua-5.1.0 )
 "
+DEPEND="${RDEPEND}"

 src_prepare() {
 	pushd ../
--- a/media-gfx/grafx2/grafx2-2.9.3219.ebuild
+++ b/media-gfx/grafx2/grafx2-2.9.3219.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit lua-single toolchain-funcs xdg
+
+pic_samples_commit=40738b358a5a5cb33d54897b008cbccad98e63d6
+pic_samples_date=20201222
+
+DESCRIPTION="A pixelart-oriented painting program"
+HOMEPAGE="http://www.pulkomandy.tk/projects/GrafX2
+	https://grafx2.eu/
+"
+SRC_URI="http://www.pulkomandy.tk/projects/GrafX2/downloads/${PN}-v${PV}.tar.gz
+	test? (
+		https://gitlab.com/GrafX2/pic-samples/-/archive/${pic_samples_commit}/pic-samples-${pic_samples_commit}.tar.bz2
+		-> ${PN}-testdata-${pic_samples_date}.tar.bz2
+	)
+"
+S="${WORKDIR}/${PN}-v$(ver_cut 1-2)/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc lua +sdl sdl2 ttf test"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	?? ( sdl sdl2 )
+	ttf? ( ^^ ( sdl sdl2 ) )
+"
+RESTRICT="!test? ( test )"
+
+SDL_DEPS="
+	media-libs/libsdl!VER!
+	media-libs/sdl!VER!-image[tiff]
+	ttf? ( media-libs/sdl!VER!-ttf )
+"
+
+RDEPEND="
+	media-libs/libpng
+	lua? ( ${LUA_DEPS} )
+	sdl? ( ${SDL_DEPS//!VER!/} )
+	sdl2? ( ${SDL_DEPS//!VER!/2} )
+	!sdl? ( !sdl2? ( x11-libs/libX11 ) )
+	ttf? ( media-libs/freetype )
+"
+DEPEND="$RDEPEND"
+
+src_prepare() {
+	pushd .. || die
+	default
+
+	if use test; then
+		rmdir tests/pic-samples || die
+		mv "${WORKDIR}/pic-samples-${pic_samples_commit}" tests/pic-samples || die
+	fi
+
+	popd || die
+
+	# Remove optimisation and debug info from CFLAGS
+	sed -r -i '/^\s*COPT\s*\+?=/s!\s*(-g(|gdb|stabs)|-O\$\(OPTIM\))(\s|$)!\3!g' Makefile
+}
+
+src_configure() {
+	my_makeargs=(
+		V=1
+		PREFIX="${EPREFIX}/usr"
+	)
+	use sdl  && my_makeargs+=( API=sdl  )
+	use sdl2 && my_makeargs+=( API=sdl2 )
+	use sdl || use sdl2 || my_makeargs+=( API=x11  )
+
+	use ttf || my_makeargs+=( NOTTF=1 )
+	use lua || my_makeargs+=( NOLUA=1 SCRIPT_FILES="" )
+
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake "${my_makeargs[@]}"
+}
+
+src_test() {
+	emake "${my_makeargs[@]}" check
+}
+
+src_install() {
+	emake "${my_makeargs[@]}" DESTDIR="${D}" install
+
+	# install documentation
+	cd ../doc || die
+	dodoc README.txt COMPILING.txt
+
+	if use doc; then
+		dodoc -r original_docs
+
+		insinto "/usr/share/doc/${P}"
+		doins quickstart.rtf
+	fi
+
+	# grafx2 binary usually has name grafx2-sdl or grafx2-x11 but desktop file
+	# references it as just grafx2, so let's create symlink to mitigate it.
+	local bin="$(basename "$(ls "${ED}"/usr/bin/grafx2*)" )"
+	[[ -z "$bin" ]] && die "failed to find installed binary"
+	if [[ "$bin" != "grafx2" ]]; then
+		echo "$bin"
+		dosym "$bin" "/usr/bin/grafx2" || die;
+	fi
+}
--- a/media-gfx/grafx2/metadata.xml
+++ b/media-gfx/grafx2/metadata.xml
@@ -4,6 +4,8 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="ttf">Install TTF Fonts</flag>
+		<flag name="ttf">Add support for TTF fonts</flag>
+		<flag name="sdl">Use <pkg>media-libs/libsdl</pkg> as a rendering backend</flag>
+		<flag name="sdl2">Use <pkg>media-libs/libsdl2</pkg> as a rendering backend</flag>
 	</use>
 </pkgmetadata>
--- a/net-im/mautrix-meta/Manifest
+++ b/net-im/mautrix-meta/Manifest
@@ -1,4 +1,4 @@
 DIST mautrix-meta-0.3.1-deps.tar.xz 28436296 BLAKE2B 044812d4dfc89fd7d13e38595de1322b14dcbca0ae907c4a6a463047f1ed22e83fa0b825857c3eb134b22f49e7c308749bbf60bbf9725a64ae8b1952b08f7482 SHA512 2f753f1e02a9d6225f7370b3d30c06a91127a2e4d4c4e12032a27e9f0136d7590a52a281369d42b1d7b76f6a5b5c2cffbfbe1ea2a96e1c1eb6f145dcbb483fdb
 DIST mautrix-meta-0.3.1.gh.tar.gz 203444 BLAKE2B 294171599408b3f5f40a244d952b7f06678f52c015bb94ce2d4dad0568642fac399467bd86b81036c200b47a74a389614bd41b74e560d92e4de2b77ca58acd5a SHA512 e0141b9adc9361236d24c94a66fdbbfcd10789f7a8f7d7a582f709c2e716eb72b7d4564c5dc58e2a5c82b37709ad2eb3a45e782aca8d74a430d2a15c0ee6db32
-DIST mautrix-meta-0.4.1-deps.tar.xz 84314124 BLAKE2B c76b56d663e8c0a54bdc08251dbb5d6ff03eefb7e38fa3f299baff8729bfa5c57bfa0e59f9eb7c3b47727e7940d99721ffec6a7689a9eb65f2405e32fb488c30 SHA512 77f36de178421de676d12536c0a00a19628b44333b1d01758731a0c1f2a79373aa6a32879d7bbcb42a38f85bc2bbcdd32956abadfcd561a41b0fe205100cfb15
-DIST mautrix-meta-0.4.1.gh.tar.gz 176127 BLAKE2B ba6a593922608d056be5726c2fcdbfbb08f43f2aeec8f034d4d5dd1c0b8cbda3a86bcba64ca0f01fd8da40febd9db4f70fe6fedeb165a1ef8441ca00125e7a2c SHA512 bb44887072da9f0768e883e1500f98d1726387d295d0cb02f960321ff0c9c1ca1274ead114414b9991d172acf3dd88be93fccdb46be17b89809a529fe1f35b04
+DIST mautrix-meta-0.4.2-deps.tar.xz 84320060 BLAKE2B cdef9d1cadd349b9d3460bd64613eeb41856b4cc4b39385220dc8309e728bed3af874f7a56056f633a0ef7a3bd486da16613fb34fb3c3370ddc82151a60cb796 SHA512 9274e4cf43fe78b8407a7ded8c1ec78f99723264fc49d202018519e17ed64244118a323b9d60dbbdd7042a7b3c5158c7200fba9543c982a3eea6648bf24780d8
+DIST mautrix-meta-0.4.2.gh.tar.gz 176291 BLAKE2B 179b7b7e5fb03b79890b96ad90ec809a80526f043b5ecb40ef1758c44c4aee3401ad5d64d9ec3e975269d5d60496e344067313362fe9740eaa9a5e5facf2a0d8 SHA512 6bc501ac7b5d62e427d1976fba5b3b8a262efdda0fc3859bb0fdb292d2e4ca926989c412b14359391ac9ce2fa1725b90c3a70aa57790eba81038c64386679b16
--- a/net-im/mautrix-meta/mautrix-meta-0.4.2.ebuild
+++ b/net-im/mautrix-meta/mautrix-meta-0.4.2.ebuild
--- a/net-misc/cve-client/Manifest
+++ b/net-misc/cve-client/Manifest
@@ -1 +1 @@
-DIST cve-client-1.1.0.tar.gz 7051 BLAKE2B 76e590f88d9595c790bee2cee744a9be2f1d80e9b21c674aeabc4bc0783487729fa40f288445bfedc364c5adddeed54981e3c73ce179fb43e48f026de0ad1ead SHA512 71e270faaa23e565cc2bbd9446a11745d82d1368f5cb626edac9fdabebab612c0910ab3cd46db67b11f732221320d46e9d9b6656a8bbfba189db5066fdf51411
+DIST cve-client-1.1.1.tar.gz 7096 BLAKE2B dc842fda4c749e1400103f4932b5057418eca23c795047f5dbe81819ee057a14a5e11c42c5cd977d4c078e4433cf7f45104a1174a94d3dcb9091cb961b9a2e9e SHA512 548becdb1dab161e30e9392e0f923bf33b6e39c7b4a4b1eb3bd982b3eafcc1c178c5250f20a88f04dc466d48184653bc1a4bf814f2ef78b4cb6ad0047832fa61
--- a/net-misc/cve-client/cve-client-1.1.1.ebuild
+++ b/net-misc/cve-client/cve-client-1.1.1.ebuild
@@ -10,7 +10,7 @@ then
 	inherit git-r3
 	EGIT_REPO_URI="https://hacktivis.me/git/cve-client.git"
 else
-	SRC_URI="https://hacktivis.me/releases/${P}.tar.gz"
+	SRC_URI="https://hacktivis.me/releases/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi

--- a/net-misc/cve-client/cve-client-9999.ebuild
+++ b/net-misc/cve-client/cve-client-9999.ebuild
@@ -10,7 +10,7 @@ then
 	inherit git-r3
 	EGIT_REPO_URI="https://hacktivis.me/git/cve-client.git"
 else
-	SRC_URI="https://hacktivis.me/releases/${P}.tar.gz"
+	SRC_URI="https://hacktivis.me/releases/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi