diff --git a/app-accessibility/mimic1/mimic1-1.3.0.1.ebuild b/app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild
similarity index 95%
rename from app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
rename to app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild
index b6c8eb1591..408a0e183b 100644
--- a/app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
+++ b/app-accessibility/mimic1/mimic1-1.3.0.1-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
dev-libs/hts_engine
alsa? ( media-libs/alsa-lib )
portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-accessibility/mimic1/mimic1-9999.ebuild b/app-accessibility/mimic1/mimic1-9999.ebuild
index 562221b111..4182a7d6f2 100644
--- a/app-accessibility/mimic1/mimic1-9999.ebuild
+++ b/app-accessibility/mimic1/mimic1-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="
dev-libs/hts_engine
alsa? ( media-libs/alsa-lib )
portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-admin/hardinfo2/Manifest b/app-admin/hardinfo2/Manifest
new file mode 100644
index 0000000000..a2abd8c9df
--- /dev/null
+++ b/app-admin/hardinfo2/Manifest
@@ -0,0 +1 @@
+DIST hardinfo2-2.1.11.tar.gz 5806488 BLAKE2B 866b5e179e07c781de67b7169d03763059c1a8a5c974e8ffd3332c2d639f28dac0837138bcc1dacec88f8d94dcc1654d6383128ea21961cfb9a3b16d57205913 SHA512 639d2d02cd6320d56c5f078f69ff43c0bd74844ecc73df05ee205070732e4a6aeb5e169b78a883c83734be69b547f0736522b2fb6377a0e4a59c07be0a1c8c43
diff --git a/app-admin/hardinfo2/hardinfo2-2.1.11.ebuild b/app-admin/hardinfo2/hardinfo2-2.1.11.ebuild
new file mode 100644
index 0000000000..feb9118007
--- /dev/null
+++ b/app-admin/hardinfo2/hardinfo2-2.1.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="System Information and Benchmark for Linux Systems"
+HOMEPAGE="https://www.hardinfo2.org"
+SRC_URI="https://github.com/hardinfo2/hardinfo2/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="GPL-2+ GPL-3+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="benchmark dmi fwupd +gtk3 mesa network scsi sensors udisks +xdg"
+
+DEPEND="
+ gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 )
+ >=dev-libs/glib-2.24
+ sys-libs/zlib
+ dev-libs/json-glib
+ net-libs/libsoup:3.0
+"
+RDEPEND="
+ ${DEPEND}
+ benchmark? ( app-benchmarks/sysbench )
+ dmi? ( sys-apps/dmidecode )
+ sensors? ( sys-apps/lm-sensors )
+ scsi? ( sys-fs/lsscsi )
+ mesa? ( x11-apps/mesa-progs )
+ udisks? ( sys-fs/udisks:2 )
+ xdg? ( x11-misc/xdg-utils )
+ network? ( net-misc/iperf:3 )
+ fwupd? ( sys-apps/fwupd )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ local mycmakeargs=(
+ -DHARDINFO2_GTK3=$(usex gtk3)
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-admin/hardinfo2/metadata.xml b/app-admin/hardinfo2/metadata.xml
new file mode 100644
index 0000000000..da974a7739
--- /dev/null
+++ b/app-admin/hardinfo2/metadata.xml
@@ -0,0 +1,33 @@
+
+
+
+
+ quincyf467@protonmail.com
+ Quincy Fleming
+
+
+
+ hardinfo2/hardinfo2
+ https://github.com/hardinfo2/hardinfo2/blob/master/README.md
+ https://github.com/hardinfo2/hardinfo2/issues
+
+
+ Hardinfo2 is based on hardinfo, which has not been released for more than 10 years.
+ Hardinfo2 is the reboot that was needed.
+
+ Hardinfo2 offers System Information and Benchmark for Linux Systems.
+ It is able to obtain information from both hardware and basic software.
+ It can benchmark your system and compare to other machines online.
+
+
diff --git a/app-admin/pulumi-bin/Manifest b/app-admin/pulumi-bin/Manifest
index ddb8482c94..de52c7dd15 100644
--- a/app-admin/pulumi-bin/Manifest
+++ b/app-admin/pulumi-bin/Manifest
@@ -1,3 +1,4 @@
DIST pulumi-v3.113.0-linux-x64.tar.gz 159635620 BLAKE2B 724beb887fc90396ac00a13671d73ff0b531ee4a4a34d4277e8b3a982bd0b5246f71e048ff10eac5d9c816a5661b929ba32fb8b2fea675b7aeab8e575695b99d SHA512 0db068d8012f0daba59e092a4d9904cf4c15effb308f34489efa1bc2c9a448668432d4c2cf8f1e9482c7449cd39c38cc293788886890ea8dab420f9d2a9b9bda
DIST pulumi-v3.114.0-linux-x64.tar.gz 159768914 BLAKE2B be3ea69e1ff653a3cc95f4f12b0dbf8dc4f2b631270aec30d4082addb5afed48053deef4a9c26b568512a8eb454879c9244e6f7ede0eb2aee357b2a4cc71e347 SHA512 af9aa95b987507145299b86a8501a6e3b81b09a789c07839e71c10a8d7e5032408b831b1946b316bf94753018d0d1265546c1bf9dfd2fd17445233f736044e74
DIST pulumi-v3.115.2-linux-x64.tar.gz 159802131 BLAKE2B 3a150c18e4c866d15931bf914cd927837ddf46a93e83876c71dfefd61e035f0c969db3153748246c78529eb0dead6370c0aa26eb42a9db048166e1ed286689be SHA512 406548771d7f041dca2718ece20f4efff7019a16f9913a92a61bd7eb2371fdaaff57cf18a6e03b22c1f7e86fa9b4edac2560895e1ee074357e53eb1aff59eb9b
+DIST pulumi-v3.117.0-linux-x64.tar.gz 159101842 BLAKE2B 467270a29faaf9d705513a234b7e7f4c3bf6f7c7e2958007a368751b45592fa761fee31c7eb9a7d4b559769c5b28dc45bb428511555447846443183d9e5936b4 SHA512 7b553e4858dd51f99909902d4107f2e87a6a2f2e053db8b762361cafbcb631d9ff6f3ea6f872fb0c21023c0486dfbe0c328ac47bfc07c0213983518360749785
diff --git a/app-admin/pulumi-bin/pulumi-bin-3.117.0.ebuild b/app-admin/pulumi-bin/pulumi-bin-3.117.0.ebuild
new file mode 100644
index 0000000000..9b4f2f5dbb
--- /dev/null
+++ b/app-admin/pulumi-bin/pulumi-bin-3.117.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Infrastructure as code in any programming language"
+HOMEPAGE="
+ https://www.pulumi.com/
+ https://github.com/pulumi/pulumi
+"
+SRC_URI="
+ amd64? ( https://github.com/pulumi/pulumi/releases/download/v${PV}/pulumi-v${PV}-linux-x64.tar.gz )
+"
+
+S="${WORKDIR}/pulumi"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_PREBUILT="*"
+
+src_install() {
+ dobin pulumi*
+
+ ./pulumi gen-completion bash > pulumi.bash-completion || die "Cannot generate bash completions"
+ newbashcomp pulumi.bash-completion pulumi
+
+ ./pulumi gen-completion zsh > pulumi.zsh-completion || die "Cannot generate zsh completions"
+ insinto /usr/share/zsh/site-functions
+ newins pulumi.zsh-completion _pulumi
+}
diff --git a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild
index b9f05da82c..d87767c367 100644
--- a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild
+++ b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.10.0.ebuild
@@ -26,11 +26,13 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
-RDEPEND="
+RDEPEND="${CDEPEND}
>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]
dev-python/dns-lexicon[${PYTHON_USEDEP}]
+ !>=dev-python/cloudflare-2.21[${PYTHON_USEDEP}]
dev-python/cloudflare[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0.ebuild b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0-r1.ebuild
similarity index 91%
rename from app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0.ebuild
rename to app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0-r1.ebuild
index b9f05da82c..d87767c367 100644
--- a/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0.ebuild
+++ b/app-crypt/certbot-dns-cloudflare/certbot-dns-cloudflare-2.9.0-r1.ebuild
@@ -26,11 +26,13 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
-RDEPEND="
+RDEPEND="${CDEPEND}
>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]
dev-python/dns-lexicon[${PYTHON_USEDEP}]
+ !>=dev-python/cloudflare-2.21[${PYTHON_USEDEP}]
dev-python/cloudflare[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
distutils_enable_tests pytest
distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/app-crypt/totp-cli-bin/Manifest b/app-crypt/totp-cli-bin/Manifest
new file mode 100644
index 0000000000..cf4906d686
--- /dev/null
+++ b/app-crypt/totp-cli-bin/Manifest
@@ -0,0 +1 @@
+DIST totp-cli_Linux_x86_64.tar.gz 1856626 BLAKE2B 9541625e575cd272a0a59cb652d4754a3254fc44a6faf2886d04adb56e5f43f6920e0a4d45d148c70dd4e31a0847881b1e868fae5efbc31719740cf0751ff74c SHA512 8d99e8c619b67ab5a82091f4edf270be5c8e354de2c87168ad9e9590ab529c96ff499132371af20fa4cb2badf5de9a0c28dd0a1dcab9a57992757da59faf4dc7
diff --git a/app-crypt/totp-cli-bin/metadata.xml b/app-crypt/totp-cli-bin/metadata.xml
new file mode 100644
index 0000000000..1d89ce3aca
--- /dev/null
+++ b/app-crypt/totp-cli-bin/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ zdanevich.vitaly@ya.ru
+ Vitaly Zdanevich
+
+ This is a simple TOTP (Time-based One-time Password) CLI tool. TOTP is the most common mechanism for 2FA (Two-Factor-Authentication). You can manage and organize your accounts with namespaces and protect your data with a password.
+
+ yitsushi/totp-cli
+
+
diff --git a/app-crypt/totp-cli-bin/totp-cli-bin-1.8.7.ebuild b/app-crypt/totp-cli-bin/totp-cli-bin-1.8.7.ebuild
new file mode 100644
index 0000000000..a74cf6c8dd
--- /dev/null
+++ b/app-crypt/totp-cli-bin/totp-cli-bin-1.8.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Authy/Google Authenticator like TOTP CLI tool written in Go"
+HOMEPAGE="https://github.com/yitsushi/totp-cli"
+SRC_URI="https://github.com/yitsushi/totp-cli/releases/download/v$PV/totp-cli_Linux_x86_64.tar.gz"
+
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+QA_PREBUILT="usr/bin/$PN"
+
+src_install() {
+ newbin totp-cli ${PN}
+}
+
+pkg_postinst() {
+ einfo "For a more mature TOTP you can try app-admin/keepassxc, cli included"
+}
diff --git a/app-misc/uwufetch/Manifest b/app-misc/uwufetch/Manifest
deleted file mode 100644
index 476441d16e..0000000000
--- a/app-misc/uwufetch/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST uwufetch-2.0.tar.gz 2595233 BLAKE2B ba830b2229c72e76c5ceb3ec6096cba43ddd15f7d25a81562fa6ac37a7074def883ba2f1418adca2487802fcf7044ff92378bb3552ac58170b3c1e7bec4ceeb3 SHA512 97475d7e6648909b1989979292872baf1d13e24c30f3c3403fe1b7fab91ac06e2dcccf17d34ff6af9a48d2b2088df1ea91c7c159737843b3a712601d121bb67e
-DIST uwufetch-2.1.tar.gz 2610835 BLAKE2B 2a983b72637ac21d749d846125ad03277a11eb38ff5a3b49f28ff3fe039715ec115e7b8bda638b4fd25438975e8c36cd1dc0c547270fa61996955a14ad884577 SHA512 7e64d8a52f12e87be16994ffc45f1ffc85ddec230eacbaf25d29e3ddb8901fa4b2fbf3efa02d35b7d81b6a02fec42ec521a5cd80eeb0e1475fc6c59d17a0b381
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-ar.patch b/app-misc/uwufetch/files/uwufetch-2.0-ar.patch
deleted file mode 100644
index 4e9c504661..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile 2022-12-11 12:32:27.488636479 -0500
-+++ b/Makefile 2022-12-11 12:32:53.205856210 -0500
-@@ -5,7 +5,7 @@
- CFLAGS := $(CFLAGS) -O3 -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
- CFLAGS_DEBUG = -Wall -Wextra -g -pthread -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
- CC ?= cc
--AR = ar
-+AR ?= ar
- DESTDIR = /usr
- RELEASE_SCRIPTS = release_scripts/*.sh
- PLATFORM = $(shell uname)
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-cc.patch b/app-misc/uwufetch/files/uwufetch-2.0-cc.patch
deleted file mode 100644
index 1e013a3297..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-cc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile 2022-12-01 16:12:15.695821291 -0500
-+++ Makefile 2022-12-05 08:00:42.879825137 -0500
-@@ -4,7 +4,7 @@
- UWUFETCH_VERSION = $(shell git describe --tags)
- CFLAGS = -O3 -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
- CFLAGS_DEBUG = -Wall -Wextra -g -pthread -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
--CC = cc
-+CC ?= cc
- AR = ar
- DESTDIR = /usr
- RELEASE_SCRIPTS = release_scripts/*.sh
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-cflags-ldflags.patch b/app-misc/uwufetch/files/uwufetch-2.0-cflags-ldflags.patch
deleted file mode 100644
index 32d6824ad7..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-cflags-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile 2022-12-05 08:07:54.867207190 -0500
-+++ Makefile-tmp 2022-12-05 08:14:19.101530405 -0500
-@@ -2,7 +2,7 @@
- BIN_FILES = uwufetch.c
- LIB_FILES = fetch.c
- UWUFETCH_VERSION = $(shell git describe --tags)
--CFLAGS = -O3 -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
-+CFLAGS := $(CFLAGS) -O3 -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
- CFLAGS_DEBUG = -Wall -Wextra -g -pthread -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
- CC ?= cc
- AR = ar
-@@ -64,7 +64,7 @@
- endif
-
- build: $(BIN_FILES) lib
-- $(CC) $(CFLAGS) -o $(NAME) $(BIN_FILES) lib$(LIB_FILES:.c=.a)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(NAME) $(BIN_FILES) lib$(LIB_FILES:.c=.a)
-
- lib: $(LIB_FILES)
- $(CC) $(CFLAGS) -fPIC -c -o $(LIB_FILES:.c=.o) $(LIB_FILES)
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-destdir.patch b/app-misc/uwufetch/files/uwufetch-2.0-destdir.patch
deleted file mode 100644
index 1fb61d3600..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-destdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile 2022-09-30 13:04:19.913850961 -0400
-+++ Makefile 2022-09-30 13:05:14.877102396 -0400
-@@ -91,12 +91,12 @@
- ./$(NAME) $(ARGS)
-
- install: build
-- mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) $(ETC_DIR)/$(NAME)
-+ mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME)
- cp $(NAME) $(DESTDIR)/$(PREFIX)
- cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
- cp $(LIB_FILES:.c=.h) $(DESTDIR)/include
- cp -r res/* $(DESTDIR)/$(LIBDIR)/$(NAME)
-- cp default.config $(ETC_DIR)/$(NAME)/config
-+ cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
- cp ./$(NAME).1.gz $(DESTDIR)/$(MANDIR)
-
- uninstall:
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-includedir.patch b/app-misc/uwufetch/files/uwufetch-2.0-includedir.patch
deleted file mode 100644
index f7efb8cf63..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile 2022-10-04 12:15:17.893515471 -0400
-+++ Makefile-tmp 2022-10-04 12:17:03.220062320 -0400
-@@ -91,10 +91,10 @@
- ./$(NAME) $(ARGS)
-
- install: build
-- mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME)
-+ mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME) ${DESTDIR}/include
- cp $(NAME) $(DESTDIR)/$(PREFIX)
- cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
-- cp $(LIB_FILES:.c=.h) $(DESTDIR)/include
-+ cp $(LIB_FILES:.c=.h) $(DESTDIR)/include/
- cp -r res/* $(DESTDIR)/$(LIBDIR)/$(NAME)
- cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
- cp ./$(NAME).1.gz $(DESTDIR)/$(MANDIR)
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-lib64.patch b/app-misc/uwufetch/files/uwufetch-2.0-lib64.patch
deleted file mode 100644
index c00702f47c..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-lib64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile 2022-10-03 16:17:42.115920608 -0400
-+++ Makefile 2022-10-03 16:24:17.248455117 -0400
-@@ -13,7 +13,7 @@
-
- ifeq ($(PLATFORM), Linux)
- PREFIX = bin
-- LIBDIR = lib
-+ LIBDIR = lib64
- ETC_DIR = /etc
- MANDIR = share/man/man1
- PLATFORM_ABBR = linux
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-no-install-soname.patch b/app-misc/uwufetch/files/uwufetch-2.0-no-install-soname.patch
deleted file mode 100644
index 1a39f94dcd..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-no-install-soname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile 2022-12-05 08:42:56.586585774 -0500
-+++ Makefile-tmp 2022-12-05 08:43:24.063183118 -0500
-@@ -92,8 +92,7 @@
-
- install: build
- mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME) ${DESTDIR}/include ${DESTDIR}/lib/uwufetch
-- cp $(NAME) $(DESTDIR)/$(PREFIX)
-- cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
-+ cp $(NAME) $(DESTDIR)/$(PREFIX)
- cp $(LIB_FILES:.c=.h) $(DESTDIR)/include/
- cp -r res/* $(DESTDIR)/lib/$(NAME)
- cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-nocompressman.patch b/app-misc/uwufetch/files/uwufetch-2.0-nocompressman.patch
deleted file mode 100644
index 8a23f147c0..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-nocompressman.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile 2022-12-01 16:22:56.221596853 -0500
-+++ Makefile-tmp 2022-12-01 16:23:39.471542956 -0500
-@@ -97,7 +97,6 @@
- cp $(LIB_FILES:.c=.h) $(DESTDIR)/include/
- cp -r res/* $(DESTDIR)/lib/$(NAME)
- cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
-- cp ./$(NAME).1.gz $(DESTDIR)/$(MANDIR)
-
- uninstall:
- rm -f $(DESTDIR)/$(PREFIX)/$(NAME)
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-reslib.patch b/app-misc/uwufetch/files/uwufetch-2.0-reslib.patch
deleted file mode 100644
index 3a207f21d2..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-reslib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile 2022-10-04 12:18:03.076649484 -0400
-+++ Makefile-tmp 2022-10-04 12:23:48.782933214 -0400
-@@ -91,11 +91,11 @@
- ./$(NAME) $(ARGS)
-
- install: build
-- mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME) ${DESTDIR}/include
-+ mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME) ${DESTDIR}/include ${DESTDIR}/lib/uwufetch
- cp $(NAME) $(DESTDIR)/$(PREFIX)
- cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
- cp $(LIB_FILES:.c=.h) $(DESTDIR)/include/
-- cp -r res/* $(DESTDIR)/$(LIBDIR)/$(NAME)
-+ cp -r res/* $(DESTDIR)/lib/$(NAME)
- cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
- cp ./$(NAME).1.gz $(DESTDIR)/$(MANDIR)
-
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-soname.patch b/app-misc/uwufetch/files/uwufetch-2.0-soname.patch
deleted file mode 100644
index 133fd250c0..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.0-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile 2022-12-05 08:30:04.452071661 -0500
-+++ Makefile 2022-12-05 08:35:10.611197290 -0500
-@@ -69,7 +69,7 @@
- lib: $(LIB_FILES)
- $(CC) $(CFLAGS) -fPIC -c -o $(LIB_FILES:.c=.o) $(LIB_FILES)
- $(AR) rcs lib$(LIB_FILES:.c=.a) $(LIB_FILES:.c=.o)
-- $(CC) $(CFLAGS) -shared -o lib$(LIB_FILES:.c=.so) $(LIB_FILES:.c=.o)
-+ $(CC) $(CFLAGS) -shared -Wl,-soname,lib$(LIB_FILES:.c=.so).$(UWUFETCH_VERSION) -o lib$(LIB_FILES:.c=.so) $(LIB_FILES:.c=.o)
-
- release: build
- mkdir -pv $(NAME)_$(UWUFETCH_VERSION)-$(PLATFORM_ABBR)
diff --git a/app-misc/uwufetch/files/uwufetch-2.1-destdir.patch b/app-misc/uwufetch/files/uwufetch-2.1-destdir.patch
deleted file mode 100644
index 608487343f..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.1-destdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile 2023-02-13 07:38:44.000000000 -0500
-+++ Makefile-tmp 2023-09-14 13:06:28.012654441 -0400
-@@ -103,12 +103,12 @@
- ./$(NAME) $(ARGS)
-
- install: build man
-- mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) $(ETC_DIR)/$(NAME)
-+ mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME)
- cp $(NAME) $(DESTDIR)/$(PREFIX)
- cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
- cp $(LIB_FILES:.c=.h) $(DESTDIR)/$(INCDIR)
- cp -r res/* $(DESTDIR)/$(LIBDIR)/$(NAME)
-- cp default.config $(ETC_DIR)/$(NAME)/config
-+ cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
- cp ./$(NAME).1.gz $(DESTDIR)/$(MANDIR)
-
- uninstall:
-
diff --git a/app-misc/uwufetch/files/uwufetch-2.1-includedir.patch b/app-misc/uwufetch/files/uwufetch-2.1-includedir.patch
deleted file mode 100644
index 23ea4f2a72..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.1-includedir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile 2023-09-14 13:22:17.487810992 -0400
-+++ Makefile-tmp 2023-09-14 13:33:18.990358700 -0400
-@@ -106,7 +106,7 @@
- mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME)
- cp $(NAME) $(DESTDIR)/$(PREFIX)
- cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
-- cp $(LIB_FILES:.c=.h) $(DESTDIR)/$(INCDIR)
-+ cp $(LIB_FILES:.c=.h) $(DESTDIR)/$(INCDIR)/
- cp -r res/* $(DESTDIR)/$(LIBDIR)/$(NAME)
- cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
- cp ./$(NAME).1.gz $(DESTDIR)/$(MANDIR)
-
diff --git a/app-misc/uwufetch/files/uwufetch-2.1-lib64.patch b/app-misc/uwufetch/files/uwufetch-2.1-lib64.patch
deleted file mode 100644
index c17b35af0b..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.1-lib64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile 2023-09-14 13:19:55.388011895 -0400
-+++ Makefile-tmp 2023-09-14 13:21:18.607891001 -0400
-@@ -17,7 +17,7 @@
-
- ifeq ($(PLATFORM), Linux)
- PREFIX = bin
-- LIBDIR = lib
-+ LIBDIR = lib64
- INCDIR = include
- ETC_DIR = /etc
- MANDIR = share/man/man1
-
diff --git a/app-misc/uwufetch/files/uwufetch-2.1-mkinclude.patch b/app-misc/uwufetch/files/uwufetch-2.1-mkinclude.patch
deleted file mode 100644
index a4b1d395e0..0000000000
--- a/app-misc/uwufetch/files/uwufetch-2.1-mkinclude.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile 2023-09-14 13:33:57.490315315 -0400
-+++ Makefile-tmp 2023-09-14 13:34:37.140272322 -0400
-@@ -103,7 +103,7 @@
- ./$(NAME) $(ARGS)
-
- install: build man
-- mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME)
-+ mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME) ${DESTDIR}/${INCDIR}
- cp $(NAME) $(DESTDIR)/$(PREFIX)
- cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
- cp $(LIB_FILES:.c=.h) $(DESTDIR)/$(INCDIR)/
-
diff --git a/app-misc/uwufetch/metadata.xml b/app-misc/uwufetch/metadata.xml
deleted file mode 100644
index 41b3de18ae..0000000000
--- a/app-misc/uwufetch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- ad-oliviero/uwufetch
-
-
diff --git a/app-misc/uwufetch/uwufetch-2.0.ebuild b/app-misc/uwufetch/uwufetch-2.0.ebuild
deleted file mode 100644
index 80a83c59b7..0000000000
--- a/app-misc/uwufetch/uwufetch-2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A meme system info tool for Linux"
-HOMEPAGE="https://github.com/ad-oliviero/uwufetch"
-SRC_URI="https://github.com/ad-oliviero/uwufetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-PATCHES=(
- "${FILESDIR}/${P}-destdir.patch"
- "${FILESDIR}/${P}-soname.patch"
- "${FILESDIR}/${P}-lib64.patch"
-)
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="x11-apps/xwininfo"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- eapply -p0 "${FILESDIR}/${P}-destdir.patch"
- eapply -p0 "${FILESDIR}/${P}-lib64.patch"
- eapply -p0 "${FILESDIR}/${P}-includedir.patch"
- eapply -p0 "${FILESDIR}/${P}-reslib.patch"
- eapply -p0 "${FILESDIR}/${P}-nocompressman.patch"
- eapply -p0 "${FILESDIR}/${P}-cc.patch"
- eapply -p0 "${FILESDIR}/${P}-cflags-ldflags.patch"
- eapply -p0 "${FILESDIR}/${P}-soname.patch"
- eapply -p0 "${FILESDIR}/${P}-no-install-soname.patch"
- eapply "${FILESDIR}/${P}-ar.patch"
-
- eapply_user
-}
-
-src_compile() {
- emake build
- cp libfetch.so "libfetch.so.1"
-}
-
-src_install() {
- emake DESTDIR="${D}/usr" install
-
- mv "${D}/usr/etc" "${D}/etc"
-
- doman uwufetch.1
- dolib.so libfetch.so.1
- dosym "libfetch.so.1" "/usr/$(get_libdir)/libfetch.so.1"
-}
diff --git a/app-misc/uwufetch/uwufetch-2.1.ebuild b/app-misc/uwufetch/uwufetch-2.1.ebuild
deleted file mode 100644
index daf4750cd6..0000000000
--- a/app-misc/uwufetch/uwufetch-2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A meme system info tool for Linux"
-HOMEPAGE="https://github.com/ad-oliviero/uwufetch"
-SRC_URI="https://github.com/ad-oliviero/uwufetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-PATCHES=(
- "${FILESDIR}/${P}-destdir.patch"
-)
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="x11-apps/xwininfo"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- eapply -p0 "${FILESDIR}/${P}-destdir.patch"
- eapply -p0 "${FILESDIR}/${P}-lib64.patch"
- eapply -p0 "${FILESDIR}/${P}-includedir.patch"
- eapply -p0 "${FILESDIR}/${P}-mkinclude.patch"
-
- eapply_user
-}
-
-src_compile() {
- emake build
- cp libfetch.so "libfetch.so.1"
-}
-
-src_install() {
- emake DESTDIR="${D}/usr" install
-
- mv "${D}/usr/etc" "${D}/etc"
-
- doman uwufetch.1
- dolib.so libfetch.so.1
- dosym "libfetch.so.1" "/usr/$(get_libdir)/libfetch.so.1"
-}
diff --git a/dev-python/pycpio/pycpio-1.1.2.ebuild b/dev-python/pycpio/pycpio-1.1.2-r1.ebuild
similarity index 94%
rename from dev-python/pycpio/pycpio-1.1.2.ebuild
rename to dev-python/pycpio/pycpio-1.1.2-r1.ebuild
index ebff641e6c..0d85c55670 100644
--- a/dev-python/pycpio/pycpio-1.1.2.ebuild
+++ b/dev-python/pycpio/pycpio-1.1.2-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
DEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/zenlib/zenlib-2.1.2.ebuild b/dev-python/zenlib/zenlib-2.1.2.ebuild
index a517df4b63..901021ca3b 100644
--- a/dev-python/zenlib/zenlib-2.1.2.ebuild
+++ b/dev-python/zenlib/zenlib-2.1.2.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/desultory/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
diff --git a/dev-util/dockerfile-language-server/Manifest b/dev-util/dockerfile-language-server/Manifest
index edf86c817a..a76004d2bd 100644
--- a/dev-util/dockerfile-language-server/Manifest
+++ b/dev-util/dockerfile-language-server/Manifest
@@ -1,4 +1,4 @@
DIST dockerfile-language-server-0.10.2-deps.tar.xz 995476 BLAKE2B 8673bf2a780528a431b141f5633b75b3a9e7ba7ffe7267df9a8cf93fae82f82818bc65741f403bf0780e6fb3f1854d52e8715fd2d738b531cc8e8fff98a8069e SHA512 020f2f8a358e9ac6003f6224fa4484d9579dca0e03dfe30c0946dee763016d915a27c686353f9a004a002b02edf43f621462d6771e27dcd32931dd29852dd6cc
-DIST dockerfile-language-server-0.11.0-deps.tar.xz 1021840 BLAKE2B 9462dde5fc5cd6b262124af36a6d14873104bd0ca335a5e722ea5c827a85e02b865a461818c3789752846ced4ca426e0584132107bb55be8408487e3b8dd1ddc SHA512 5cf80ff8a2a9a585ac8dc2a2d03a8fc1743b5028f525ae920271eb45f6a593dd5a5b296b66aea74021749f284f5265d1790bdf8bf571cfd2d4c24d5bb3dcad63
+DIST dockerfile-language-server-0.11.0-deps.tar.xz 833760 BLAKE2B 58c676b7acc2d8ab25b33185e9a1dba288e756954026a4a5fb40ad6b8582f090afdf531c6872d5adf954db6a947be16fbeed76b9b6357e6ac14270389a15c9c3 SHA512 e98cb717aba190a95d8c424beb755b70b9cdb0adedac2db448e31c8369317be5be0e4ef90ded30e0aa175b92c64d67fb90b002d6f6c7e79c6676aaeaf55f972b
DIST dockerfile-language-server-nodejs-0.10.2.tgz 19882 BLAKE2B 90f1b5387df2c9db9a302e36f8df59d53c8235b69abd9b74d273e5bfd2f77f8045d7ed4a4f0b4328ec4c8d3b5234d8ef9790d26eb7ca8f0b3a078ed4d266f0c0 SHA512 bcb6da798bf88775c4ceb67d24e84fe9b0f578bcdbcc6cc5145d3717739f77a921f4f536686052fcb56377fc35a260b2355d8b1ef8855f46461c83665ac658cb
DIST dockerfile-language-server-nodejs-0.11.0.tgz 20176 BLAKE2B aeb4e5ca4a51a6c26f4ef32f5f9e53ef4dc3ad563aae4a6ffa44be1aa574f959c94ab83afea4024fb26530db681ca633d5071b602f6852a6a19f41fdeab33604 SHA512 92ff7b11561c2978784a2b5e6955fc2c34b0a5c74038824cff75a6eab5b14c7e202dba33a1c0de9285396295f55f690a388e0be60bf3148873831a8f8459d1ce
diff --git a/dev-util/lemminx-bin/Manifest b/dev-util/lemminx-bin/Manifest
index 0df6ff8453..248cc0bee7 100644
--- a/dev-util/lemminx-bin/Manifest
+++ b/dev-util/lemminx-bin/Manifest
@@ -1,2 +1,2 @@
-DIST lemminx-bin-0.24.0.zip 15263058 BLAKE2B d655810c407b7c49fc45813e33aac02eab2b6dd1d15bfc68ffaa73f701a1dacd76e497e2030da125eb5b48f969d3e9b8afd8c46a92b434d63a612bcb72827b47 SHA512 123eb3a406a4975034f9d4257f0ffd6417296b65a84d759a65ef15ac4c6ac0ed124000d5101bc5c8799f396d42d5dfb9d9779d5231202ac70109b8c1367191f9
DIST lemminx-bin-0.25.0.zip 15608360 BLAKE2B 3f1a0e127073745091b9d252fd717cd7f520e6f49af5f6ad19c916b1f087e851987ce6dc672f67420f46bcb5add93ee6f81df09eca5029319ebdd9aed498aa70 SHA512 ff9a270699cecf480ae4a8382333ac1afcc7d497ee45afc7486db0504bdad6589283c4a7eb167ae109c260563c076c8e8f02dd2d63658ea63e925f9676df4019
+DIST lemminx-bin-0.27.0.zip 23761557 BLAKE2B dc0ab6143b141e765bf881a95273d2b4742f75288aff893dc2299a210993af4340f1922b04a8c453377e85fe4c3b164111ed935405ad25122bb9765d6b5a5b82 SHA512 b227ba27af5782762d9a9e9db435268fa5b8ab848e271bbca65af82d9b911e2b4bef643fd0c1f4ae1da08ce099df78e0f2a6f00e1d88ddcf4aa1f82f0bfa1533
diff --git a/dev-util/lemminx-bin/lemminx-bin-0.24.0.ebuild b/dev-util/lemminx-bin/lemminx-bin-0.27.0.ebuild
similarity index 100%
rename from dev-util/lemminx-bin/lemminx-bin-0.24.0.ebuild
rename to dev-util/lemminx-bin/lemminx-bin-0.27.0.ebuild
diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 9044b8e6e8..7c1f242623 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1,2 @@
DIST lua-language-server-3.7.3.zip 31522954 BLAKE2B 979f6de423d56b8781bfd3315d2d64cfe3082e3eecdf1203d7159d93f7bffa01f7330fe41c73949ece01fede8b987726cba54b884a07088d6ce6111802bede0a SHA512 db59d2987b09bb90fcdc362294d7b28b1652613414970856b54343c2a6ec791744dd524e505cb1495c0014c37288a8f5f5a849c64391a3e1a716bbe6788adcf2
+DIST lua-language-server-3.9.1.zip 32595453 BLAKE2B 53e13639a6b60805c074b617c53503360388da3c6ee1c887845bff472dfea7048b5b8793968df068c747c925648feb3f851a2eca42c6a21e33b0f6242b1b80e7 SHA512 305b036d804d3864a0baecabf4cc9bf46f0bd9ffcf3cb5ced9f57b0b29b8d9231b7283970ef38bd1669be05da795f08627a56a5eb83a70d71e2768254cf497bc
diff --git a/dev-util/lua-language-server/files/build.ninja_v2.patch b/dev-util/lua-language-server/files/build.ninja_v2.patch
new file mode 100644
index 0000000000..5485c31863
--- /dev/null
+++ b/dev-util/lua-language-server/files/build.ninja_v2.patch
@@ -0,0 +1,102 @@
+--- b/build/build.ninja
++++ b/build/build.ninja
+@@ -14,7 +14,7 @@
+ make/code_format.lua
+ rule c_source_bee
+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+- -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -I$builddir/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS
+ description = Compile C $out
+ deps = gcc
+ depfile = $out.d
+@@ -22,14 +22,14 @@
+ 3rd/bee.lua/3rd/lua-seri/lua-seri.c
+ rule cxx_source_bee
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+ build $obj/source_bee/format.obj: cxx_source_bee 3rd/bee.lua/3rd/fmt/format.cc
+ rule cxx_source_bee_1
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+- -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -65,7 +65,7 @@
+ rule cxx_source_bee_2
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+ -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 -DBEE_STATIC $
+- -DNDEBUG -fPIC -o $out -c $in
++ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -94,7 +94,7 @@
+ 3rd/bee.lua/binding/luaref.cpp
+ rule c_source_lua
+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
+- -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
++ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in CFLAGS
+ description = Compile C $out
+ deps = gcc
+ depfile = $out.d
+@@ -104,7 +104,7 @@
+ rule cxx_source_bootstrap
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+ -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua -DLUA_USE_LINUX $
+- -DNDEBUG -fPIC -o $out -c $in
++ -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -112,7 +112,7 @@
+ 3rd/bee.lua/bootstrap/main.cpp
+ rule link_bootstrap
+ command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $
+- -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++ -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
+ description = Link Exe $out
+ build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
+ $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $
+@@ -155,8 +155,8 @@
+ -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
+ -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
+ -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $
+- -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -Werror -o $
+- $out -c $in
++ -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -o $
++ $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -259,7 +259,7 @@
+ rule c_lpeglabel
+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+ -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
+- -o $out -c $in
++ -o $out -c $in CFLAGS
+ description = Compile C $out
+ deps = gcc
+ depfile = $out.d
+@@ -271,7 +271,7 @@
+ rule cxx_lua_language_server
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
+ -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
+- -DNDEBUG -o $out -c $in
++ -DNDEBUG -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -279,7 +279,7 @@
+ make/modules.cpp
+ rule link_lua_language_server
+ command = $cc $in -o $out -lm -ldl -lstdc++fs -pthread -Wl,-Bstatic $
+- -lstdc++ -Wl,-Bdynamic -s
++ -lstdc++ -Wl,-Bdynamic LDFLAGS
+ description = Link Exe $out
+ build $bin/lua-language-server: link_lua_language_server $
+ $obj/lua-language-server/modules.obj $obj/lpeglabel/lplcap.obj $
diff --git a/dev-util/lua-language-server/files/linux.ninja_v2.patch b/dev-util/lua-language-server/files/linux.ninja_v2.patch
new file mode 100644
index 0000000000..b4eba4b75e
--- /dev/null
+++ b/dev-util/lua-language-server/files/linux.ninja_v2.patch
@@ -0,0 +1,71 @@
+--- a/3rd/luamake/compile/ninja/linux.ninja
++++ b/3rd/luamake/compile/ninja/linux.ninja
+@@ -2,12 +2,12 @@ ninja_required_version = 1.7
+ builddir = build/linux
+ bin = $builddir/bin
+ obj = $builddir/obj
+-cc = gcc
+-ar = ar
++cc = REPLACE_ME
++ar = REPLACE_AR
+ luamake = luamake
+ rule c_source_bee
+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
+- -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -Itools/lua54 -DNDEBUG -fPIC -o $out -c $in CFLAGS
+ description = Compile C $out
+ deps = gcc
+ depfile = $out.d
+@@ -15,14 +15,14 @@ build $obj/source_bee/lua-seri.obj: c_source_bee $
+ bee.lua/3rd/lua-seri/lua-seri.c
+ rule cxx_source_bee
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+- -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+ build $obj/source_bee/format.obj: cxx_source_bee bee.lua/3rd/fmt/format.cc
+ rule cxx_source_bee_1
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+- -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in
++ -fvisibility=hidden -Ibee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -58,7 +58,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_1 bee.lua/bee/version.cpp
+ rule cxx_source_bee_2
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+ -fvisibility=hidden -Ibee.lua -Itools/lua54 -DBEE_STATIC -DNDEBUG -fPIC $
+- -o $out -c $in
++ -o $out -c $in CXXFLAGS
+ description = Compile C++ $out
+ deps = gcc
+ depfile = $out.d
+@@ -88,7 +88,7 @@ build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp
+ rule c_source_lua
+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
+ -DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
+- description = Compile C $out
++ description = Compile C $out CFLAGS
+ deps = gcc
+ depfile = $out.d
+ build $obj/source_lua/linit.obj: c_source_lua bee.lua/3rd/lua/linit.c
+@@ -97,14 +97,14 @@ rule cxx_source_bootstrap
+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
+ -fvisibility=hidden -Ibee.lua/3rd/lua -Ibee.lua -DLUA_USE_LINUX $
+ -DNDEBUG -fPIC -o $out -c $in
+- description = Compile C++ $out
++ description = Compile C++ $out CXXFLAGS
+ deps = gcc
+ depfile = $out.d
+ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
+ bee.lua/bootstrap/main.cpp
+ rule link_bootstrap
+- command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $
+- -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
++ command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl $
++ -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS
+ description = Link Exe $out
+ rule copy
+ command = cp -fv $in$input $out 1>/dev/null
diff --git a/dev-util/lua-language-server/lua-language-server-3.9.1.ebuild b/dev-util/lua-language-server/lua-language-server-3.9.1.ebuild
new file mode 100644
index 0000000000..a70ce930c7
--- /dev/null
+++ b/dev-util/lua-language-server/lua-language-server-3.9.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua{5-{1,3,4},jit} )
+
+inherit ninja-utils toolchain-funcs lua-single prefix
+
+DESCRIPTION="Lua language server"
+HOMEPAGE="https://github.com/LuaLS/lua-language-server"
+SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRE_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="${LUA_DEPS}"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ app-alternatives/ninja
+ app-arch/unzip
+"
+RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}/linux.ninja.patch"
+ "${FILESDIR}/build.ninja.patch"
+)
+
+src_prepare() {
+ # Remove hardcoded gcc references
+ sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
+ make.lua || die
+ sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
+ 3rd/lpeglabel/makefile || die
+ # Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
+ eapply "${FILESDIR}/linux.ninja_v2.patch"
+ eapply_user
+ sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
+ -e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
+ -e "s/CFLAGS/${CFLAGS}/" \
+ -e "s/CXXFLAGS/${CXXFLAGS}/" \
+ -e "s/LDFLAGS/${LDFLAGS}/" \
+ 3rd/luamake/compile/ninja/linux.ninja || die
+
+ prefixify_ro "${FILESDIR}/wrapper.sh"
+}
+
+src_compile() {
+ eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
+ use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
+ ./3rd/luamake/luamake init || die
+
+ # Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
+ sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
+ -e "s/^ar =.*./ar = REPLACE_AR/" \
+ build/build.ninja || die
+
+ eapply "${FILESDIR}/build.ninja_v2.patch"
+ sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
+ -e "s/REPLACE_AR/$(tc-getAR)/" \
+ -e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
+ -e "s/CFLAGS/${CFLAGS}/" \
+ -e "s/CXXFLAGS/${CXXFLAGS}/" \
+ -e "s/LDFLAGS/${LDFLAGS}/" \
+ build/build.ninja || die
+
+ use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
+ rm -rf meta/198256b1
+}
+
+src_install() {
+ newbin "${T}/wrapper.sh" ${PN}
+
+ into /opt/${PN}
+ dobin bin/${PN}
+
+ insinto /opt/${PN}/bin
+ doins bin/main.lua
+
+ insinto /opt/${PN}
+ doins -r debugger.lua main.lua locale meta script
+
+ einstalldocs
+}
diff --git a/dev-util/yaml-language-server/Manifest b/dev-util/yaml-language-server/Manifest
index 7cbb0cbbfa..1f0cbc21c0 100644
--- a/dev-util/yaml-language-server/Manifest
+++ b/dev-util/yaml-language-server/Manifest
@@ -1,4 +1,2 @@
-DIST yaml-language-server-1.13.0-deps.tar.xz 5460772 BLAKE2B 110680d5ce1459a90483f58ef28dbf82af5fa4cd5984044a294b9d1f8e40b74fa552011e29fa1a780bfc93243039eb57c2766682d84160bb77fe87e04c12b975 SHA512 17b167b372140845e52cfd41c49dec2610f2dfde76e60a74c5c03240aa4ce9aab4dc4d741d4942999614cebcca567f6a9bd52f8088b4b94f615ae6576a3a0337
-DIST yaml-language-server-1.13.0.tgz 557876 BLAKE2B 2b51ba4a0ac4372efae5d788c06f3e4e2a545f8ea02e508e68c7457b8fb7d25f5f4446b56c39f93308b4aa56236204b75c525c549ed6eb98354ac76170070344 SHA512 0b37a456314e52489723ab60dc13ee4a4c44eb491e0d3e3ff8b8cf2d7c27b7880247369a58c0a34fdd8dc4e1efd5d7ab6c12c75a879c6b2e3cb6c7bf0ded7cd5
-DIST yaml-language-server-1.14.0-deps.tar.xz 5470756 BLAKE2B 32dfbd6e959bd8054b6d5cb9daf0fadd0c4a218fa6b1724cde566b8eec5c134b50be7884cb9663ffc20a271af6005495e9dbc76e826f61f935af339e52769e57 SHA512 329342806793524d9e7af450ac4efd3d43aa3d125eabf61d6967e8430db5c0d5cf9524d21cb567dab34022ebb7ca164686857e1a0a94a159fec287d7a632af15
+DIST yaml-language-server-1.14.0-deps.tar.xz 5420516 BLAKE2B cb0814b0058539c69e4f4d9b994b54315a9535e3c43d5dd6cdb0f7bc827d58b01a0b239f68d4086b422c6b90c16f46d5a35fcb1c3b5ca934e6401d1add9b7e4a SHA512 e67042b0fc415bbb338cec2e520d0df549dab4a9e89df011022315d78f1b16184060f4dac62870234b1dd97ab71b876544663963c9ca1fc5eec1c84571e2182b
DIST yaml-language-server-1.14.0.tgz 567903 BLAKE2B 72109e7e9e469b7411388282159027ca2bbf9fb24ea976c70893c201a3448fc084460cf73f9aaead31a6491ab084c1377e746836fb373d9876194874cd36fc82 SHA512 1e73621cce403935ee33c669b9bcea813cbeed5e6416231755e74e4f6ca386f9f10b0ea96cc5dc0ffca61da693e6fdae7b41fc1861f834592f084cdc21c4c90e
diff --git a/dev-util/yaml-language-server/yaml-language-server-1.13.0.ebuild b/dev-util/yaml-language-server/yaml-language-server-1.13.0.ebuild
deleted file mode 100644
index 2ac4c93d2f..0000000000
--- a/dev-util/yaml-language-server/yaml-language-server-1.13.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Language Server for YAML Files"
-HOMEPAGE="https://github.com/redhat-developer/yaml-language-server"
-SRC_URI="
- mirror://npm/${PN}/-/${P}.tgz
- https://tastytea.de/files/gentoo/${P}-deps.tar.xz
-"
-S="${WORKDIR}"
-
-# NOTE: to generate the dependency tarball:
-# npm --cache ./npm-cache install $(portageq envvar DISTDIR)/${P}.tgz
-# tar -caf ${P}-deps.tar.xz npm-cache
-
-LICENSE="Apache-2.0 BSD-2 ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="net-libs/nodejs"
-BDEPEND="net-libs/nodejs[npm]"
-
-src_unpack() {
- cd "${T}" || die "Could not cd to temporary directory"
- unpack ${P}-deps.tar.xz
-}
-
-src_install() {
- npm \
- --offline \
- --verbose \
- --progress false \
- --foreground-scripts \
- --global \
- --prefix "${ED}"/usr \
- --cache "${T}"/npm-cache \
- install "${DISTDIR}"/${P}.tgz || die "npm install failed"
-
- cd "${ED}"/usr/$(get_libdir)/node_modules/${PN} || die "cd failed"
- einstalldocs
-}
diff --git a/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild b/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12-r1.ebuild
similarity index 93%
rename from games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild
rename to games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12-r1.ebuild
index b4eee6a12f..4faa5cf97e 100644
--- a/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12.ebuild
+++ b/games-fps/the-dark-mod-bin/the-dark-mod-bin-2.12-r1.ebuild
@@ -22,6 +22,9 @@ KEYWORDS="~amd64"
QA_PREBUILT="*"
RESTRICT="strip"
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
src_install() {
dodir /opt
dodir /usr/bin/
diff --git a/games-rpg/snoot-game/Manifest b/games-rpg/snoot-game/Manifest
index 2338f45a76..d0e0691cf6 100644
--- a/games-rpg/snoot-game/Manifest
+++ b/games-rpg/snoot-game/Manifest
@@ -1 +1 @@
-DIST SnootGame-Patch8_NewYears-linux.tar.bz2 213046487 BLAKE2B c7a7b1f85eb46d7f5a67b7cd0f0a889cab33e44ade78a7e26b99d96243caa9b9cf3ea5ad1a8a7192ac7d3af65135bc49238391f40e82f8150ea8fac5a96617c9 SHA512 fa3dd74e3bf938a5ce59676f9d8332946d275d59115edd21f2c3df6d00f218542c4c9969ffa91f6a1200bdc715dc9d688ee4cfe7278bdbc9a236a2ac64d52a5f
+DIST SnootGame-Patch10-KurwaBobr-linux.tar.bz2 447762588 BLAKE2B e09caf75894573fb71d78a1e559c948ac3f185761c85e04493bf34db0c3373563480fc1829f35b9612757b680c6bfcf3b0a631e822a1b30523b912af9d1336f8 SHA512 5a9e9f871b2296be3e3f3066e79447ace96881ba4e0bbb8adca1bf4dd676049f3e946f4839d5e5249074a34203e0ffdd5f383829d8d78f97f355a9b86cc0f13e
diff --git a/games-rpg/snoot-game/snoot-game-1.9.1.ebuild b/games-rpg/snoot-game/snoot-game-1.10.0.ebuild
similarity index 84%
rename from games-rpg/snoot-game/snoot-game-1.9.1.ebuild
rename to games-rpg/snoot-game/snoot-game-1.10.0.ebuild
index 8585897b58..99c2c5fab6 100644
--- a/games-rpg/snoot-game/snoot-game-1.9.1.ebuild
+++ b/games-rpg/snoot-game/snoot-game-1.10.0.ebuild
@@ -6,11 +6,11 @@ EAPI=8
PYTHON_COMPAT=( python3_{10,11,12} )
inherit python-single-r1 desktop wrapper
-MY_PV="Patch8_NewYears"
+MY_PV="Patch10-KurwaBobr"
DESCRIPTION="Visual novel parody of Goodbye Volcano High"
-HOMEPAGE="https://snootgame.xyz/"
-SRC_URI="https://snootgame.xyz/bin/SnootGame-${MY_PV}-linux.tar.bz2"
+HOMEPAGE="https://snootgame.xyz/en"
+SRC_URI="https://snootgame.xyz/en/bin/SnootGame-${MY_PV}-linux.tar.bz2"
S="${WORKDIR}/SnootGame-${MY_PV}-linux/"
diff --git a/gui-apps/hypridle/hypridle-0.1.2-r1.ebuild b/gui-apps/hypridle/hypridle-0.1.2-r2.ebuild
similarity index 62%
rename from gui-apps/hypridle/hypridle-0.1.2-r1.ebuild
rename to gui-apps/hypridle/hypridle-0.1.2-r2.ebuild
index 11e24b3e4e..ff76295a15 100644
--- a/gui-apps/hypridle/hypridle-0.1.2-r1.ebuild
+++ b/gui-apps/hypridle/hypridle-0.1.2-r2.ebuild
@@ -5,7 +5,6 @@ EAPI=8
inherit cmake
-COMMIT="158c52c4a76cff7a1635be8ec1a4a369bc8674ed"
DESCRIPTION="Hyprland's idle daemon"
HOMEPAGE="https://github.com/hyprwm/hypridle"
@@ -14,8 +13,6 @@ if [[ "${PV}" = *9999 ]]; then
EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
else
SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
- S="${WORKDIR}/${PN}-${PV}"
-
KEYWORDS="~amd64"
fi
@@ -23,15 +20,9 @@ LICENSE="BSD"
SLOT="0"
RDEPEND="
- dev-libs/wayland
- gui-libs/egl-wayland
- || (
- >=media-libs/mesa-24.1.0_rc1[opengl]
- =gui-wm/hyprland-0.35.0
- dev-cpp/sdbus-c++
+ dev-cpp/sdbus-c++:=
>=dev-libs/hyprlang-0.4.0
+ dev-libs/wayland
"
DEPEND="
${RDEPEND}
@@ -39,22 +30,10 @@ DEPEND="
"
BDEPEND="
+ dev-util/wayland-scanner
virtual/pkgconfig
- dev-build/cmake
"
PATCHES=(
"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch"
)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE:STRING=Release
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-}
diff --git a/gui-apps/hypridle/hypridle-9999.ebuild b/gui-apps/hypridle/hypridle-9999.ebuild
index 11e24b3e4e..ff76295a15 100644
--- a/gui-apps/hypridle/hypridle-9999.ebuild
+++ b/gui-apps/hypridle/hypridle-9999.ebuild
@@ -5,7 +5,6 @@ EAPI=8
inherit cmake
-COMMIT="158c52c4a76cff7a1635be8ec1a4a369bc8674ed"
DESCRIPTION="Hyprland's idle daemon"
HOMEPAGE="https://github.com/hyprwm/hypridle"
@@ -14,8 +13,6 @@ if [[ "${PV}" = *9999 ]]; then
EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
else
SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
- S="${WORKDIR}/${PN}-${PV}"
-
KEYWORDS="~amd64"
fi
@@ -23,15 +20,9 @@ LICENSE="BSD"
SLOT="0"
RDEPEND="
- dev-libs/wayland
- gui-libs/egl-wayland
- || (
- >=media-libs/mesa-24.1.0_rc1[opengl]
- =gui-wm/hyprland-0.35.0
- dev-cpp/sdbus-c++
+ dev-cpp/sdbus-c++:=
>=dev-libs/hyprlang-0.4.0
+ dev-libs/wayland
"
DEPEND="
${RDEPEND}
@@ -39,22 +30,10 @@ DEPEND="
"
BDEPEND="
+ dev-util/wayland-scanner
virtual/pkgconfig
- dev-build/cmake
"
PATCHES=(
"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hypridle.patch"
)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE:STRING=Release
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-}
diff --git a/gui-apps/hyprlock/hyprlock-0.3.0-r2.ebuild b/gui-apps/hyprlock/hyprlock-0.3.0-r3.ebuild
similarity index 78%
rename from gui-apps/hyprlock/hyprlock-0.3.0-r2.ebuild
rename to gui-apps/hyprlock/hyprlock-0.3.0-r3.ebuild
index 07fbc35d00..a855737c5e 100644
--- a/gui-apps/hyprlock/hyprlock-0.3.0-r2.ebuild
+++ b/gui-apps/hyprlock/hyprlock-0.3.0-r3.ebuild
@@ -13,8 +13,6 @@ if [[ "${PV}" = *9999 ]]; then
EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
else
SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${PV}"
-
KEYWORDS="~amd64"
fi
@@ -22,19 +20,17 @@ LICENSE="BSD"
SLOT="0"
RDEPEND="
+ dev-libs/date
dev-libs/wayland
- gui-libs/egl-wayland
media-libs/mesa[opengl]
sys-libs/pam
- >=gui-wm/hyprland-0.35.0
- dev-libs/glib
+ dev-libs/glib:2
>=dev-libs/hyprlang-0.4.0
media-libs/libglvnd
x11-libs/cairo
x11-libs/libxkbcommon
x11-libs/libdrm
x11-libs/pango
-
"
DEPEND="
${RDEPEND}
@@ -42,8 +38,7 @@ DEPEND="
"
BDEPEND="
- dev-build/cmake
- dev-libs/date
+ dev-util/wayland-scanner
virtual/pkgconfig
"
@@ -51,15 +46,3 @@ PATCHES=(
"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch"
"${FILESDIR}/0002-cmake-install-pam-file-fix.patch"
)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE:STRING=Release
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-}
diff --git a/gui-apps/hyprlock/hyprlock-9999.ebuild b/gui-apps/hyprlock/hyprlock-9999.ebuild
index 07fbc35d00..a855737c5e 100644
--- a/gui-apps/hyprlock/hyprlock-9999.ebuild
+++ b/gui-apps/hyprlock/hyprlock-9999.ebuild
@@ -13,8 +13,6 @@ if [[ "${PV}" = *9999 ]]; then
EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
else
SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${PV}"
-
KEYWORDS="~amd64"
fi
@@ -22,19 +20,17 @@ LICENSE="BSD"
SLOT="0"
RDEPEND="
+ dev-libs/date
dev-libs/wayland
- gui-libs/egl-wayland
media-libs/mesa[opengl]
sys-libs/pam
- >=gui-wm/hyprland-0.35.0
- dev-libs/glib
+ dev-libs/glib:2
>=dev-libs/hyprlang-0.4.0
media-libs/libglvnd
x11-libs/cairo
x11-libs/libxkbcommon
x11-libs/libdrm
x11-libs/pango
-
"
DEPEND="
${RDEPEND}
@@ -42,8 +38,7 @@ DEPEND="
"
BDEPEND="
- dev-build/cmake
- dev-libs/date
+ dev-util/wayland-scanner
virtual/pkgconfig
"
@@ -51,15 +46,3 @@ PATCHES=(
"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch"
"${FILESDIR}/0002-cmake-install-pam-file-fix.patch"
)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE:STRING=Release
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-}
diff --git a/gui-apps/hyprlock/metadata.xml b/gui-apps/hyprlock/metadata.xml
index 5e8a60de0f..de8df41f8d 100644
--- a/gui-apps/hyprlock/metadata.xml
+++ b/gui-apps/hyprlock/metadata.xml
@@ -6,9 +6,9 @@
Gonçalo Negrier Duarte
- https://github.com/hyprwm/hyrlock/releases
+ https://github.com/hyprwm/hyprlock/releases
https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/
- https://github.com/hyprwm/hyrlock/issues
+ https://github.com/hyprwm/hyprlock/issues
hyprwm/hyprlock
diff --git a/gui-wm/miracle-wm/files/miracle-wm-0.2.1-unset-compiler.patch b/gui-wm/miracle-wm/files/miracle-wm-0.2.1-unset-compiler.patch
new file mode 100644
index 0000000000..5748ad93b5
--- /dev/null
+++ b/gui-wm/miracle-wm/files/miracle-wm-0.2.1-unset-compiler.patch
@@ -0,0 +1,22 @@
+https://github.com/mattkae/miracle-wm/pull/138
+https://bugs.gentoo.org/932784
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,6 @@
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+-set(CMAKE_CXX_COMPILER g++)
+
+ set(ENV{PKG_CONFIG_PATH} "/usr/local/lib/pkgconfig/")
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -3,7 +3,6 @@
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+-set(CMAKE_CXX_COMPILER g++)
+
+ include_directories(
+ ${PROJECT_SOURCE_DIR}/src
diff --git a/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild b/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild
index e42a6b1019..153f400d7c 100644
--- a/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild
+++ b/gui-wm/miracle-wm/miracle-wm-0.2.1.ebuild
@@ -29,6 +29,11 @@ BDEPEND="
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ # bug #932784
+ "${FILESDIR}/${P}-unset-compiler.patch"
+)
+
src_prepare() {
cmake_src_prepare
use test || cmake_comment_add_subdirectory tests/
diff --git a/gui-wm/swayfx/swayfx-0.4-r1.ebuild b/gui-wm/swayfx/swayfx-0.4-r1.ebuild
new file mode 100644
index 0000000000..0516529dad
--- /dev/null
+++ b/gui-wm/swayfx/swayfx-0.4-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU Public License v2
+
+EAPI=8
+
+inherit fcaps meson optfeature
+
+DESCRIPTION="SwayFX: Sway, but with eye candy!"
+HOMEPAGE="https://github.com/WillPower3309/swayfx"
+SRC_URI="https://github.com/WillPower3309/swayfx/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+man +swaybar +swaynag tray wallpapers X"
+REQUIRED_USE="tray? ( swaybar )"
+
+DEPEND="
+ >=dev-libs/json-c-0.13:0=
+ >=dev-libs/libinput-1.21.0:0=
+ virtual/libudev
+ sys-auth/seatd:=
+ dev-libs/libpcre2
+ >=dev-libs/wayland-1.21.0
+ x11-libs/cairo
+ >=x11-libs/libxkbcommon-1.5.0
+ x11-libs/pango
+ x11-libs/pixman
+ gui-libs/scenefx
+ media-libs/libglvnd
+ swaybar? ( x11-libs/gdk-pixbuf:2 )
+ tray? ( || (
+ sys-apps/systemd
+ sys-auth/elogind
+ sys-libs/basu
+ ) )
+ wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
+ X? ( x11-libs/libxcb:0=
+ x11-libs/xcb-util-wm
+ )
+"
+DEPEND+="
+ >=gui-libs/wlroots-0.17:=[X?]
+ =dev-libs/wayland-protocols-1.24
+ >=dev-build/meson-0.60.0
+ virtual/pkgconfig
+"
+BDEPEND+="man? ( >=app-text/scdoc-1.9.2 )"
+
+FILECAPS=(
+ cap_sys_nice usr/bin/sway # reflect ">=gui-wm/sway-1.9"
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature man man-pages)
+ $(meson_feature tray)
+ $(meson_feature X xwayland)
+ $(meson_feature swaybar gdk-pixbuf)
+ $(meson_use swaynag)
+ $(meson_use swaybar)
+ $(meson_use wallpapers default-wallpaper)
+ -Dfish-completions=true
+ -Dzsh-completions=true
+ -Dbash-completions=true
+ )
+
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ insinto /usr/share/xdg-desktop-portal
+ doins "${FILESDIR}/sway-portals.conf"
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ optfeature_header "There are several packages that may be useful with swayfx:"
+ optfeature "wallpaper utility" gui-apps/swaybg
+ optfeature "idle management utility" gui-apps/swayidle
+ optfeature "simple screen locker" gui-apps/swaylock
+ optfeature "lightweight notification daemon" gui-apps/mako
+ echo
+ einfo "For a list of additional addons and tools usable with sway please"
+ einfo "visit the offical wiki at:"
+ einfo "https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway"
+ einfo "Please note that some of them might not (yet) available on gentoo"
+}
diff --git a/media-gfx/qview/Manifest b/media-gfx/qview/Manifest
index ddc546a295..49e05c5009 100644
--- a/media-gfx/qview/Manifest
+++ b/media-gfx/qview/Manifest
@@ -1,2 +1,3 @@
DIST qview-4.0.tar.gz 1662149 BLAKE2B 5a09b070234b6480bd076625a543271dd1de324c10123db183c540ad9da5a3be88e1d40efc30d5ec479c84b5c81c005f149df79e7d6c9b37f491e2b3c96738ca SHA512 442b7815e8449a80ec41424d7c999ea9972e19309559abb8f0985b0523255a3fe191d5cd7183a36f322be9c84d1af099cbef92a76b634da31af0852735a4620c
DIST qview-5.0.tar.gz 1968047 BLAKE2B a47d48ff51f049501493e32a082c396edc6729de5f40421edf27a847c5a333564647a92443417af9e0ec61927ddfd4e027edf31283f67df01646cce15720e620 SHA512 91671ed125bc4388d9043f3c24cbbe2ea2592ecec181a3f968cc2f951eb367a1576f9e19da6fd00128239efadd6f82d9f0b6437a081ee43ad4567141d6e62b65
+DIST qview-6.1.tar.gz 2058320 BLAKE2B a5fc9677649b1d01ff3f68343ed1530b4ee69096c23e308ad328f2b6dd5a0f3ee70d99bad66edd4dafba34909167368fcc9b22849f89433953d8911ba4c83aab SHA512 ca6c577ae77c3f5ec39e7f9a7a1328e97a10fe5b2c974031bc3a9e651b15c793e5479b4c414f3caf1205e5f5027b084bb76ab5b0a9b432621df77be698e18e5b
diff --git a/media-gfx/qview/metadata.xml b/media-gfx/qview/metadata.xml
index b9d10e2be5..734470f998 100644
--- a/media-gfx/qview/metadata.xml
+++ b/media-gfx/qview/metadata.xml
@@ -10,7 +10,7 @@
jurplel
jurplel@interversehq.com
- https://interversehq.com/qview/changelog
+ https://interversehq.com/qview/changelog/
https://github.com/jurplel/qView/wiki
https://github.com/jurplel/qView/issues
jurplel/qView
diff --git a/media-gfx/qview/qview-4.0.ebuild b/media-gfx/qview/qview-4.0.ebuild
index b3826a9172..7ae9f1e9f5 100644
--- a/media-gfx/qview/qview-4.0.ebuild
+++ b/media-gfx/qview/qview-4.0.ebuild
@@ -19,6 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
diff --git a/media-gfx/qview/qview-5.0.ebuild b/media-gfx/qview/qview-5.0.ebuild
index 6d0e3b2f66..d23dbb5f66 100644
--- a/media-gfx/qview/qview-5.0.ebuild
+++ b/media-gfx/qview/qview-5.0.ebuild
@@ -19,6 +19,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
diff --git a/media-gfx/qview/qview-6.1.ebuild b/media-gfx/qview/qview-6.1.ebuild
new file mode 100644
index 0000000000..64445115dc
--- /dev/null
+++ b/media-gfx/qview/qview-6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Practical and minimal image viewer"
+HOMEPAGE="https://github.com/jurplel/qView https://interversehq.com/qview/"
+SRC_URI="https://github.com/jurplel/qView/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/qView-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-qt/qtbase[concurrent,gui,network,widgets]
+"
+
+DEPEND="${RDEPEND}
+"
+
+BDEPEND="
+ dev-qt/qttools[linguist]
+"
+
+src_configure() {
+ eqmake6 PREFIX=/usr qView.pro
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
diff --git a/media-sound/jriver/jriver-31.0.83.ebuild b/media-sound/jriver/jriver-31.0.83.ebuild
index 58f5f7812e..c6f23c3c05 100644
--- a/media-sound/jriver/jriver-31.0.83.ebuild
+++ b/media-sound/jriver/jriver-31.0.83.ebuild
@@ -23,9 +23,11 @@ RDEPEND="
app-arch/brotli
media-libs/alsa-lib
media-libs/libglvnd
+ sys-libs/zlib
x11-libs/gtk+
x11-libs/pango
x11-libs/libXrandr
+ x11-libs/libX11
"
QA_PREBUILT="*"
diff --git a/media-video/ciano/ciano-0.2.4-r1.ebuild b/media-video/ciano/ciano-0.2.4-r2.ebuild
similarity index 92%
rename from media-video/ciano/ciano-0.2.4-r1.ebuild
rename to media-video/ciano/ciano-0.2.4-r2.ebuild
index aaf01aa207..98a08b557c 100644
--- a/media-video/ciano/ciano-0.2.4-r1.ebuild
+++ b/media-video/ciano/ciano-0.2.4-r2.ebuild
@@ -19,8 +19,12 @@ DEPEND="dev-libs/granite"
BDEPEND="${PYTHON_DEPS}"
RDEPEND="
${DEPEND}
+ dev-libs/glib
+ dev-libs/libgee
media-video/ffmpeg
virtual/imagemagick-tools
+ x11-libs/gtk+:3
+ x11-libs/pango
"
src_prepare() {
diff --git a/net-analyzer/gping/files/gping-1.16.1-remove-libgit2-dep.patch b/net-analyzer/gping/files/gping-1.16.1-remove-libgit2-dep.patch
new file mode 100644
index 0000000000..df554bc428
--- /dev/null
+++ b/net-analyzer/gping/files/gping-1.16.1-remove-libgit2-dep.patch
@@ -0,0 +1,17 @@
+https://github.com/orf/gping/commit/a3709e7dbad4a88072466e3370d28cce5e115fc4
+https://bugs.gentoo.org/932853
+Removes build dependency on libgit2
+--- a/gping/Cargo.toml
++++ b/gping/Cargo.toml
+@@ -17,9 +17,9 @@ anyhow = "1.0.81"
+ dns-lookup = "2.0.0"
+ chrono = "0.4.34"
+ itertools = "0.12.1"
+-shadow-rs = "0.26.1"
++shadow-rs = { version = "0.26.1", default_features = false }
+ const_format = "0.2.32"
+ clap = { version = "4.5.0", features = ["derive"] }
+
+ [build-dependencies]
+-shadow-rs = "0.26.1"
++shadow-rs = { version = "0.26.1", default_features = false }
diff --git a/net-analyzer/gping/gping-1.16.1.ebuild b/net-analyzer/gping/gping-1.16.1-r1.ebuild
similarity index 98%
rename from net-analyzer/gping/gping-1.16.1.ebuild
rename to net-analyzer/gping/gping-1.16.1-r1.ebuild
index a003d0dcc3..1fa79a56a0 100644
--- a/net-analyzer/gping/gping-1.16.1.ebuild
+++ b/net-analyzer/gping/gping-1.16.1-r1.ebuild
@@ -172,6 +172,11 @@ LICENSE+=" Apache-2.0 MIT MIT-0 Unicode-DFS-2016 ZLIB"
SLOT="0"
KEYWORDS="~amd64"
+PATCHES=(
+ # bug #932853
+ "${FILESDIR}/${P}-remove-libgit2-dep.patch"
+)
+
QA_FLAGS_IGNORED="usr/bin/gping"
src_install() {
diff --git a/net-dialup/syncterm/Manifest b/net-dialup/syncterm/Manifest
new file mode 100644
index 0000000000..02af807d11
--- /dev/null
+++ b/net-dialup/syncterm/Manifest
@@ -0,0 +1 @@
+DIST syncterm-1.1-src.tgz 18270212 BLAKE2B 91043a31374d73d29a447ab425007aad95ee7d22ded3ea4a518c1fa05958b5f20a4a83df9f575e9cb3962301cc31b55ab876e96addd617e045627d34e56fd922 SHA512 b5280e8f64ce12101f810dbee38a113e03450356a1fbc46a7c63a57eb8ca382e99ec1586b0a3527e336c9725efedae2ce80c5d4b372456eba1f090ec0f8c80eb
diff --git a/net-dialup/syncterm/files/syncterm-1.1_disable-parallel-build.patch b/net-dialup/syncterm/files/syncterm-1.1_disable-parallel-build.patch
new file mode 100644
index 0000000000..2c77ba1c1d
--- /dev/null
+++ b/net-dialup/syncterm/files/syncterm-1.1_disable-parallel-build.patch
@@ -0,0 +1,16 @@
+Disable parallel make jobs so that `st_crypt.h` can find ``.
+As of writing, I have no idea how to fix this otherwise.
+
+From: Seth M. Price
+
+--- a/src/syncterm/GNUmakefile
++++ b/src/syncterm/GNUmakefile
+@@ -96,6 +96,8 @@ ifndef bcc
+ endif
+ endif
+
++.NOTPARALLEL:
++
+ $(MTOBJODIR)$(DIRSEP)ciolib_res$(OFILE):
+ cd ${MTOBJODIR} && $(AR) -x ../${CIOLIB-MT} ciolib_res$(OFILE)
+
diff --git a/net-dialup/syncterm/files/syncterm-1.1_use-sched-yield-instead-of-pthread-yield.patch b/net-dialup/syncterm/files/syncterm-1.1_use-sched-yield-instead-of-pthread-yield.patch
new file mode 100644
index 0000000000..630ba0ca5c
--- /dev/null
+++ b/net-dialup/syncterm/files/syncterm-1.1_use-sched-yield-instead-of-pthread-yield.patch
@@ -0,0 +1,41 @@
+Use `sched_yield()` instead of nonstandard `pthread_yield()`.
+Fixes compiler error.
+
+From: Rob Swindell
+From: Seth M. Price
+Bug: https://gitlab.synchro.net/main/sbbs/-/issues/299
+
+--- a/3rdp/build/GNUmakefile
++++ b/3rdp/build/GNUmakefile
+@@ -67,7 +67,7 @@ $(CRYPT_SRC): | $(3RDPSRCDIR)
+ $(CRYPT_IDIR): | $(3RDPODIR)
+ $(QUIET)$(IFNOTEXIST) mkdir $(CRYPT_IDIR)
+
+-$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
++$(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)build/terminal-params.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw32-static.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ranlib.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-noasm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zz-country.patch $(3RDP_ROOT)$(DIRSEP)build/cl-algorithms.patch $(3RDP_ROOT)$(DIRSEP)build/cl-allow-duplicate-ext.patch $(3RDP_ROOT)$(DIRSEP)build/cl-macosx-minver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-endian.patch $(3RDP_ROOT)$(DIRSEP)build/cl-cryptodev.patch $(3RDP_ROOT)$(DIRSEP)build/cl-posix-me-gently.patch $(3RDP_ROOT)$(DIRSEP)build/cl-tpm-linux.patch $(3RDP_ROOT)$(DIRSEP)build/cl-PAM-noprompts.patch $(3RDP_ROOT)$(DIRSEP)build/cl-zlib.patch $(3RDP_ROOT)$(DIRSEP)build/Dynamic-linked-static-lib.patch $(3RDP_ROOT)$(DIRSEP)build/SSL-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bigger-maxattribute.patch $(3RDP_ROOT)$(DIRSEP)build/cl-vcxproj.patch $(3RDP_ROOT)$(DIRSEP)build/cl-mingw-vcver.patch $(3RDP_ROOT)$(DIRSEP)build/cl-win32-build-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-gcc-non-const-time-val.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-odbc.patch $(3RDP_ROOT)$(DIRSEP)build/cl-noasm-defines.patch $(3RDP_ROOT)$(DIRSEP)build/cl-bn-noasm64-fix.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-RSA-suites.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ECC-RSA.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC.patch $(3RDP_ROOT)$(DIRSEP)build/cl-prefer-ECC-harder.patch $(3RDP_ROOT)$(DIRSEP)build/cl-more-RSA-ECC-fixes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-DH-key-init.patch $(3RDP_ROOT)$(DIRSEP)build/cl-clear-GCM-flag.patch $(3RDP_ROOT)$(DIRSEP)build/cl-use-ssh-ctr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-list-ctr-modes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssh-incCtr.patch $(3RDP_ROOT)$(DIRSEP)build/cl-ssl-suite-blocksizes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-tpm.patch $(3RDP_ROOT)$(DIRSEP)build/cl-no-via-aes.patch $(3RDP_ROOT)$(DIRSEP)build/cl-fix-ssh-ecc-ephemeral.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-just-use-cc.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-learn-numbers.patch $(3RDP_ROOT)$(DIRSEP)/build/cl-linux-yield.patch | $(CRYPT_SRC) $(CRYPT_IDIR)
+ @echo Creating $@ ...
+ $(QUIET)-rm -rf $(CRYPT_SRC)/*
+ $(QUIET)unzip -oa $(3RDPDISTDIR)$(DIRSEP)cryptlib.zip -d $(CRYPT_SRC)
+@@ -112,6 +112,7 @@ $(CRYPTLIB_BUILD): $(3RDP_ROOT)$(DIRSEP)dist/cryptlib.zip $(3RDP_ROOT)$(DIRSEP)b
+ $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-fix-ssh-ecc-ephemeral.patch
+ $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-just-use-cc.patch
+ $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-learn-numbers.patch
++ $(QUIET)patch -p0 -d $(CRYPT_SRC) < cl-linux-yield.patch
+ ifeq ($(CC),mingw32-gcc)
+ $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make directories
+ $(QUIET)cd $(CRYPT_SRC) && env - PATH="$(PATH)" CC="$(CC)" AR="$(AR)" RANLIB="$(RANLIB)" make toolscripts
+
+--- /dev/null
++++ b/3rdp/build/cl-linux-yield.patch
+@@ -0,0 +1,11 @@
++--- old/thread.h 2021-10-19 12:34:08.766649958 -0700
+++++ kernel/thread.h 2021-10-19 12:34:43.794072316 -0700
++@@ -3005,7 +3005,7 @@
++ #endif /* Slowaris 5.7 / 7.x or newer */
++ #elif defined( _AIX ) || defined( __Android__ ) || defined( __CYGWIN__ ) || \
++ ( defined( __hpux ) && ( OSVERSION >= 11 ) ) || \
++- defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ )
+++ defined( __NetBSD__ ) || defined( __QNX__ ) || defined( __UCLIBC__ ) || defined(__linux__)
++ #define THREAD_YIELD() sched_yield()
++ #elif defined( __XMK__ )
++ /* The XMK underlying scheduling object is the process context, for which
diff --git a/net-dialup/syncterm/metadata.xml b/net-dialup/syncterm/metadata.xml
new file mode 100644
index 0000000000..00b56688b0
--- /dev/null
+++ b/net-dialup/syncterm/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ Seth M. Price
+ sprice623@aol.com
+
+
+ A cross-platform ANSI-BBS terminal designed to connect to
+ remote BBSs via telnet, rlogin, or SSH. Supports ANSI music
+ and the IBM charset when possible. Will run from a console,
+ under X11 using XLib, or using SDL.
+
+
+ https://sourceforge.net/p/syncterm/tickets/
+ syncterm
+
+
diff --git a/net-dialup/syncterm/syncterm-1.1.ebuild b/net-dialup/syncterm/syncterm-1.1.ebuild
new file mode 100644
index 0000000000..d5bf9221f3
--- /dev/null
+++ b/net-dialup/syncterm/syncterm-1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="BBS (bulletin board system) terminal"
+HOMEPAGE="https://syncterm.bbsdev.net/"
+SRC_URI="https://sourceforge.net/projects/syncterm/files/syncterm/syncterm-${PV}/syncterm-${PV}-src.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ncurses sdl X"
+
+DEPEND="ncurses? ( sys-libs/ncurses )
+ sdl? ( media-libs/libsdl2 )
+ X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eapply "${FILESDIR}/${P}_use-sched-yield-instead-of-pthread-yield.patch"
+ eapply "${FILESDIR}/${P}_disable-parallel-build.patch"
+ eapply_user
+}
+
+src_compile() {
+ # FIXME: probably bad form
+ cd "${S}/src/syncterm"
+
+ # NOTE: build system automatically detects whether
+ # optional dependencies are there, strangely
+
+ emake
+ emake syncterm.man
+
+ # doman complains about wrong filename otherwise
+ cp syncterm.man syncterm.1
+}
+
+src_install() {
+ # Regular ‘emake install’ violates policy in multiple ways
+ dobin src/syncterm/gcc.linux.x64.exe.debug/syncterm
+ doicon src/syncterm/syncterm.png
+ domenu src/syncterm/syncterm.desktop
+ doman src/syncterm/syncterm.1
+
+ # Things not installed by ‘emake install’
+ dodoc src/syncterm/CHANGES
+}
diff --git a/net-dialup/syncterm/syncterm-9999.ebuild b/net-dialup/syncterm/syncterm-9999.ebuild
new file mode 100644
index 0000000000..af31be2acd
--- /dev/null
+++ b/net-dialup/syncterm/syncterm-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit git-r3 desktop
+
+DESCRIPTION="BBS (bulletin board system) terminal"
+HOMEPAGE="https://syncterm.bbsdev.net/"
+EGIT_REPO_URI="https://gitlab.synchro.net/main/sbbs"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ncurses sdl X"
+
+DEPEND="ncurses? ( sys-libs/ncurses )
+ sdl? ( media-libs/libsdl2 )
+ X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ # FIXME: probably bad form
+ cd "${S}/src/syncterm"
+
+ # NOTE: build system automatically detects whether
+ # optional dependencies are there, strangely
+
+ emake
+ emake syncterm.man
+
+ # doman complains about wrong filename otherwise
+ cp syncterm.man syncterm.1
+}
+
+src_install() {
+ # Regular ‘emake install’ violates policy in multiple ways
+ dobin src/syncterm/gcc.linux.x64.exe.debug/syncterm
+ doicon src/syncterm/syncterm.png
+ domenu src/syncterm/syncterm.desktop
+ doman src/syncterm/syncterm.1
+
+ # Things not installed by ‘emake install’
+ dodoc src/syncterm/CHANGES
+}
diff --git a/net-irc/srain/Manifest b/net-irc/srain/Manifest
index bbccdeeec4..8b059ad354 100644
--- a/net-irc/srain/Manifest
+++ b/net-irc/srain/Manifest
@@ -1 +1 @@
-DIST srain-1.6.0.tar.gz 2760635 BLAKE2B 18676142c875b9715cd3e94b9877e6ae7235e035299284dc410b7ae6be26eb01450557da0c9cb050d71d79145583132601f12a395c28968b23361f84c1f08fce SHA512 59d962ddbf71724d5f68decc1e3b873cea6c6bd2ca23b21a1a6fe937d53f2871398fdcda906840755efc6b454d2d5116ca620c047f1634fb68b45ab2c0443a57
+DIST srain-1.7.0.tar.gz 2760861 BLAKE2B 2cbf4bc1a1777b851ea604e63350947851fa0a4c937fbd60c6192e2d197c137870bd2859d922de9ff6bd4b2da7e8fcdcd07493f68fd021ab775125de0dbda359 SHA512 0549a08379946cc4ea0c331f212f03b08a0c7248964984d01a64744058d116ec1af05b2aefd0d689438dafa9df4e70179bb8957d9992f02414a462577c5d99dc
diff --git a/net-irc/srain/srain-1.6.0.ebuild b/net-irc/srain/srain-1.7.0.ebuild
similarity index 98%
rename from net-irc/srain/srain-1.6.0.ebuild
rename to net-irc/srain/srain-1.7.0.ebuild
index 8dcf030db3..dcef04ffdc 100644
--- a/net-irc/srain/srain-1.6.0.ebuild
+++ b/net-irc/srain/srain-1.7.0.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libconfig:=
dev-libs/openssl:=
- net-libs/libsoup:2.4
+ net-libs/libsoup:3.0
x11-libs/gtk+:3
appindicator? ( dev-libs/libayatana-appindicator )
"
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.9.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.9.ebuild
index 5287bc2d25..18a7328b4e 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.9.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.5.9.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
dev-libs/icu:=
>=dev-libs/xapian-1.4:=
net-mail/dovecot:=
+ dev-db/sqlite:*
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
index c3dcbbef8e..241c01def8 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.10.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
dev-libs/icu:=
>=dev-libs/xapian-1.4:=
net-mail/dovecot:=
+ dev-db/sqlite:*
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.11.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.11.ebuild
index 5287bc2d25..18a7328b4e 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.11.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.11.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
dev-libs/icu:=
>=dev-libs/xapian-1.4:=
net-mail/dovecot:=
+ dev-db/sqlite:*
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.12.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.12.ebuild
index 5287bc2d25..18a7328b4e 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.12.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.12.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
dev-libs/icu:=
>=dev-libs/xapian-1.4:=
net-mail/dovecot:=
+ dev-db/sqlite:*
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.6.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.6.ebuild
index 5287bc2d25..18a7328b4e 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.6.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.6.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
dev-libs/icu:=
>=dev-libs/xapian-1.4:=
net-mail/dovecot:=
+ dev-db/sqlite:*
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.9.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.9.ebuild
index c3dcbbef8e..241c01def8 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.9.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-1.7.9.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
dev-libs/icu:=
>=dev-libs/xapian-1.4:=
net-mail/dovecot:=
+ dev-db/sqlite:*
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
index e12ebd7f57..f7e93b516d 100644
--- a/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
+++ b/net-mail/dovecot-fts-xapian/dovecot-fts-xapian-9999.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
dev-libs/icu:=
>=dev-libs/xapian-1.4:=
net-mail/dovecot:=
+ dev-db/sqlite:*
"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild
new file mode 100644
index 0000000000..c4ee310edc
--- /dev/null
+++ b/net-misc/FORT-validator/FORT-validator-1.6.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools fcaps systemd
+
+MY_PN="fort"
+
+DESCRIPTION="FORT validator is an open source RPKI validator"
+HOMEPAGE="https://fortproject.net/validator?2"
+SRC_URI="https://github.com/NICMx/${PN}/releases/download/${PV}/fort-${PV}.tar.gz"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps"
+
+DEPEND="
+ acct-group/fort
+ acct-user/fort
+ caps? ( sys-libs/libcap )
+ dev-libs/jansson
+ dev-libs/libxml2
+ dev-libs/openssl
+ net-misc/curl
+"
+RDEPEND="
+ ${DEPEND}
+ net-misc/rsync
+"
+
+src_prepare() {
+ default
+ # Don't strip CFLAGS
+ sed -i 's/fort_CFLAGS =/fort_CFLAGS = ${CFLAGS} /' src/Makefile.am || die
+ # Don't test network
+ sed -i '/http/d' test/Makefile.am || die
+ eautoreconf
+}
+
+src_install() {
+ newinitd "${FILESDIR}/${MY_PN}-1.5-initd" ${MY_PN}
+ newconfd "${FILESDIR}/${MY_PN}-1.5-confd" ${MY_PN}
+
+ emake DESTDIR="${ED}" install
+ insinto /usr/share/${MY_PN}/
+ insopts -m0644 -o "${MY_PN}"
+ diropts -m0755 -o "${MY_PN}"
+ doins -r examples/tal/
+
+ dodoc -r examples/
+
+ insinto /etc/fort
+ newins "${FILESDIR}/fort-config.json" config.json
+
+ systemd_dounit "${FILESDIR}/${MY_PN}-1.5.service"
+}
+
+pkg_postinst() {
+ fcaps cap_net_bind_service usr/bin/fort
+
+ einfo ""
+ einfo "You have to init the TALs before the first run. To do so, run "
+ einfo ""
+ einfo " su -s /bin/sh -c '${EROOT}/usr/bin/${MY_PN} --init-tals --tal /usr/share/${MY_PN}/tal/' fort"
+ einfo ""
+ einfo "as root."
+}
diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest
index a81ee821f1..c2e9fffd44 100644
--- a/net-misc/FORT-validator/Manifest
+++ b/net-misc/FORT-validator/Manifest
@@ -1,2 +1,3 @@
DIST fort-1.5.3.tar.gz 564257 BLAKE2B f0a6c9899c968f6697c79c0f541275874bc7aa23d6e42113d4be23b6338eb3007557a0260e601575719b90b8e87c4483bb13a40a6ac0724e17cf8157ce40d6ba SHA512 1b97bec1b031cd717d4012b0faec36785ba5c8e06ca46b4a017a08c3f2a038d2224c740a6b84f1c853c996c203af9ac975506d5c0e379a7cab82554318136a99
DIST fort-1.5.4.tar.gz 563138 BLAKE2B bd2a680a41b678bbf49d762fdd1f0f20e2c8bbf3fa80cb57c996d39ad39118ead3ebed7737bdef7478effbb6fa6e7fb39cd3c945a495f613a010dd79bea4f5d6 SHA512 44ec8dd28ab087f1d78f999c53b5dee8f13a6fc9bdf590d3261d640488b118e14970d88c5c5851e602a8119704378088230b8137978ef3caf6bab909af36408e
+DIST fort-1.6.1.tar.gz 547724 BLAKE2B 362299bf0a190b9d8cf6f658f2830435ceb78c4bc181e6735e2291f2d766018e9402cc596c20ef4b98aca43ac1c8edfee8369f237f0b9c1e657cf31ae2d023b0 SHA512 84ad18e730fca7ac67c028dc5b05a5b5d175eaa4eb2edade238ae16064c2f83865e263e767d37938c975578236edd8cba0b8604099a9e3ccef13250d2feb46dd
diff --git a/net-misc/gsocket/Manifest b/net-misc/gsocket/Manifest
deleted file mode 100644
index d1752355cd..0000000000
--- a/net-misc/gsocket/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gsocket-1.4.41.tar.gz 219668 BLAKE2B 794b74890edf3c80f26b258255a9a2a53fe634efcf203a5af5582177ce9445d79e048d631849cc00fbbda4de067a7dc7eba780c71b3f0e98f468e3ed90cd0f9f SHA512 a579b27f10d346568f203e26d57967b8c9cd3756485b1782d33278ec386fc735ce812ca1f151261f42957fce24ebdce62b67d09ab418d7187b56442765820956
diff --git a/net-misc/gsocket/gsocket-1.4.41.ebuild b/net-misc/gsocket/gsocket-1.4.41.ebuild
deleted file mode 100644
index 62ab97c1a2..0000000000
--- a/net-misc/gsocket/gsocket-1.4.41.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Connect like there is no firewall. Securely."
-HOMEPAGE="https://www.gsocket.io/"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hackerschoice/gsocket.git"
-else
- SRC_URI="https://github.com/hackerschoice/gsocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/net-misc/gsocket/gsocket-9999.ebuild b/net-misc/gsocket/gsocket-9999.ebuild
deleted file mode 100644
index 62ab97c1a2..0000000000
--- a/net-misc/gsocket/gsocket-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Connect like there is no firewall. Securely."
-HOMEPAGE="https://www.gsocket.io/"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hackerschoice/gsocket.git"
-else
- SRC_URI="https://github.com/hackerschoice/gsocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/net-misc/gsocket/metadata.xml b/net-misc/gsocket/metadata.xml
deleted file mode 100644
index 366b044685..0000000000
--- a/net-misc/gsocket/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- dev@dyama.net
- Daichi Yamamoto
-
-
- hackerschoice/gsocket
-
-
diff --git a/net-p2p/dogecoin-qt/Manifest b/net-p2p/dogecoin-qt/Manifest
index f3d64fdf43..eee60d2090 100644
--- a/net-p2p/dogecoin-qt/Manifest
+++ b/net-p2p/dogecoin-qt/Manifest
@@ -1,2 +1,2 @@
DIST dogecoin-qt-v1.14.6.tar.gz 8162072 BLAKE2B e2d1abe7b60cc2f15998834ec1f23570ad3d471d80e9d05b8e5aa64d6e46b7196d7a13d134e6721fe57b6afd34811bd486de02c00b54ee8516313b81ae6821c2 SHA512 05f1142a22f36a04e65ef91c834b3e724280e29b930617bb66fac98777bb541ddca15771db4205f0cdc14389f3eb4e94fda550f7806b3e9863d909c063f38610
-DIST dogecoin-qt-v1.14.7.tar.gz 11546516 BLAKE2B 48276a203c02719f63d05a6205e7216972615dedcbd8014e17e2ff2ceafe53810bb56581ce8599f1afb4e5894a4a49986fc0269e2cab32ff253b8ad2648a8a39 SHA512 d071cd91bc96c3144c024d4245a508e20b191779bb75a91cf312adda65e10656843be693e2a8a651d4374fa6f656589d667453c3ae5c61e6291e4f360c8bab05
+DIST dogecoin-qt-v1.14.7.tar.gz 11546516 BLAKE2B e292983d6fb0ecb35c1d8e45705b38563e3076400aa90b36d5edd0e9adac42d697179362718ed81aead4cb86633d98234b36a46e6e960296abf3029525861c70 SHA512 4febf88cc80565c25a4ec9a809b4ef6a7054d93a57cc0dafbb6f2c2bd8166111507431356227a4c372590450c1c6c80dd365ed666c6a48a04288efdbda74f9f2
diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild
index 6b3ad9f774..b1bd4f31b1 100644
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild
@@ -32,7 +32,7 @@ DEPEND="
dev-qt/qtnetwork
dev-qt/qtprintsupport
dev-qt/linguist-tools:=
- >=dev-libs/boost-1.84.0-r3
+ \
+${PF}.tar.gz
+ https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
+${PF}-singleapplication.tar.gz
+ https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
+${PF}-monero.tar.gz
+ https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${PF}-monero-miniupnp.tar.gz
+ https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${PF}-monero-randomx.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${PF}-monero-rapidjson.tar.gz
+ https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${PF}-monero-supercop.tar.gz
+ https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${PF}-monero-trezorcommon.tar.gz
+"
+
+# Feather is released under the terms of the BSD license, but it vendors
+# code from Monero and Tor too.
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qrcode home tickers crowdfunding bounties reddit revuo calc exchange xmrig localmonero"
+DEPEND="
+ dev-libs/libsodium:=
+ media-gfx/qrencode:=
+ media-gfx/zbar:=[v4l]
+ ~dev-libs/polyseed-1.0.0
+ dev-libs/libzip:=
+ dev-libs/boost:=[nls]
+ >=dev-qt/qtbase-6.5.2:6
+ >=dev-qt/qtsvg-6.5.2:6
+ >=dev-qt/qtmultimedia-6.5.2:6
+ >=dev-qt/qtwebsockets-6.5.2:6
+ dev-libs/libgcrypt:=
+ sys-libs/zlib
+ dev-libs/openssl:=
+ net-dns/unbound:=[threads]
+ net-libs/czmq:=
+ qrcode? ( media-libs/zxing-cpp )
+"
+RDEPEND="
+ ${DEPEND}
+ net-vpn/tor
+ xmrig? ( net-misc/xmrig )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+src_unpack() {
+ unpack ${PF}.tar.gz \
+ ${PF}-singleapplication.tar.gz \
+ ${PF}-monero.tar.gz \
+ ${PF}-monero-miniupnp.tar.gz \
+ ${PF}-monero-randomx.tar.gz \
+ ${PF}-monero-rapidjson.tar.gz \
+ ${PF}-monero-supercop.tar.gz \
+ ${PF}-monero-trezorcommon.tar.gz
+ mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
+ "${WORKDIR}"/${P}/src/third-party/singleapplication || die
+ mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero || die
+ mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/miniupnp || die
+ mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/randomx || die
+ mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/rapidjson || die
+ mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/supercop || die
+ mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/trezor-common || die
+}
+
+src_prepare() {
+ default
+ echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die
+ echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${P}/src/config-feather.h || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_BUILD_TYPE=Release
+ -DBUILD_SHARED_LIBS=OFF
+ -DARCH=x86-64
+ -DBUILD_TAG="linux-x64"
+ -DBUILD_64=ON
+ -DSELF_CONTAINED=OFF
+ -DWITH_PLUGIN_HOME=$(usex home)
+ -DWITH_PLUGIN_TICKERS=$(usex tickers)
+ -DWITH_PLUGIN_CROWDFUNDING=$(usex crowdfunding)
+ -DWITH_PLUGIN_BOUNTIES=$(usex bounties)
+ -DWITH_PLUGIN_REDDIT=$(usex reddit)
+ -DWITH_PLUGIN_REVUO=$(usex revuo)
+ -DWITH_PLUGIN_CALC=$(usex calc)
+ -DWITH_PLUGIN_EXCHANGE=$(usex exchange)
+ -DWITH_PLUGIN_LOCALMONERO=$(usex localmonero)
+ -DWITH_PLUGIN_XMRIG=$(usex xmrig)
+ -DCHECK_UPDATES=OFF
+ -DPLATFORM_INSTALLER=OFF
+ -DUSE_DEVICE_TREZOR=OFF
+ -DDONATE_BEG=OFF
+ -DWITH_SCANNER=$(usex qrcode)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_build feather
+}
+
+src_install() {
+ dobin "${BUILD_DIR}/bin/feather"
+
+ newicon -s 256 "${WORKDIR}"/${P}/src/assets/images/appicons/256x256.png feather.png
+ newicon -s 128 "${WORKDIR}"/${P}/src/assets/images/appicons/128x128.png feather.png
+ newicon -s 96 "${WORKDIR}"/${P}/src/assets/images/appicons/96x96.png feather.png
+ newicon -s 64 "${WORKDIR}"/${P}/src/assets/images/appicons/64x64.png feather.png
+ newicon -s 48 "${WORKDIR}"/${P}/src/assets/images/appicons/48x48.png feather.png
+ newicon -s 32 "${WORKDIR}"/${P}/src/assets/images/appicons/32x32.png feather.png
+ domenu "${WORKDIR}"/${P}/src/assets/feather.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ einfo "Ensure that Tor is running with 'rc-service tor start' before"
+ einfo "using Feather."
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index e21e6e5e0d..ccf726f4e5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -93,13 +93,6 @@ dev-python/hypothesmith
# Masked for removal on 2024-05-28
x11-terms/rio-terminfo
-# Lucio Sauer (2024-04-27)
-# Archived upstream, no revdeps, known security bugs, open downstream bugs
-# https://github.com/ad-oliviero/uwufetch/issues/257
-# https://github.com/ad-oliviero/uwufetch/issues/249
-# Removal on 2024-05-27
-app-misc/uwufetch
-
# Julien Roy (2024-03-21)
# sys-libs/libucontext is masked in ::gentoo
sys-libs/gcompat
diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index 049fe24ca3..c3fa722004 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -5,3 +5,5 @@ DIST ugrd-1.4.2.tar.gz 50984 BLAKE2B 5b69cbaaefdcfe5b427f781806a58b39e6539b7f790
DIST ugrd-1.5.1.tar.gz 51574 BLAKE2B 5058e515e3d9aa543eb9ddd51335a5aa197ddf79395a193a4a4440706c2d940e77a0a26d470fc1ae86965d605e9889004d404e6ab5a4e1b4c12aaac92b872d2d SHA512 0a83180ed2947ce71cfb91c0fe65ddf20a3cbcb7f98f04efb4a95f904489153cb2e32e7efdb85c8ded8c4f29d95361bb7dc93e7eba72e74f1531c91aa03c1912
DIST ugrd-1.6.0.tar.gz 52219 BLAKE2B 34168eb5c553efe804ac9d5034ada96634f2323f26ecaad89eb5e0c0cc4eeb1ce6182d850186c3d439fa5470679ed08a73531966e9e742c1a018f84bf4dd851c SHA512 ea4843d5c21aa09e992478236395cdb3262110ffa3b5caec8db6712ea132851e9daa471a959437a37d2ca29cd62b9275dfe5515cdeb5c557c1268d797468dfb9
DIST ugrd-1.7.1.tar.gz 52946 BLAKE2B a41be0e5177b1883060a1693a8ec68179cf69d74713a95c51d2b2d2b8f3faca74f8f80d32e7767719e8de4b7190162f3b41bc779d487fdcbfe3e40a416f86c89 SHA512 f042106ec8843f738968e16d51d9deda010179678cf82daf2d162d3a3125eb9106dfdc5453c8555d8ba097caa2af22b74b2e1c5c38dc5083b97ac49cb7cea225
+DIST ugrd-1.8.4.tar.gz 53231 BLAKE2B 0c4c8bb2e9ae86e9b5d5e4b5b68e46fa7e985dc8e1299351ea3610b0d0f2961e96db92561dc8ad2cf6583bf28921df92463444c0e166544c029d823dd8c37da8 SHA512 5f1b618a231ff327ee02f8ee184660eb15073e8f3d493e168ea44069f6da72b72f68237e6d5ea17be23da578362993bdbe0132b6e23cbe811bb98ce3d94ae1c3
+DIST ugrd-1.9.1.tar.gz 53936 BLAKE2B 5c24b81aa43436ff43ed1338848bff044d83c2c71de556a363bb9cee22a41c288e1f26e541e46ba7df3676524dc515e6de00e0bd2b7dd493c0d7580baa2fbffb SHA512 13d9b579575a34a497ea3b4ff3c37b3e2ed03ae9861dbc4c432458debe3ada608159dc16fc1752cb9544dd7c01647e85f0e12330b98eec288b0599bff1aa7f0f
diff --git a/sys-kernel/ugrd/ugrd-1.8.4.ebuild b/sys-kernel/ugrd/ugrd-1.8.4.ebuild
new file mode 100644
index 0000000000..2c55118efd
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-1.8.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+inherit distutils-r1 optfeature shell-completion
+
+DESCRIPTION="Python based initramfs generator with TOML defintions"
+HOMEPAGE="https://github.com/desultory/ugrd"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ app-misc/pax-utils
+ >=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]
+ >=dev-python/pycpio-1.1.2[${PYTHON_USEDEP}]
+ sys-apps/pciutils
+"
+
+src_install() {
+ # Call the distutils-r1_src_install function to install the package
+ distutils-r1_src_install
+ # Create the ugrd config directory
+ keepdir /etc/ugrd
+ # Install the example config into /etc/ugrd/config.toml
+ # Do not overwrite an existing config
+ insinto /etc/ugrd
+ newins examples/example.toml config.toml
+ # Create the kernel preinst.d directory if it doesn't exist
+ # Install the kernel preinst.d hook
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/installkernel/51-ugrd.install
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/kernel-install/51-ugrd.install
+ # Install bash autocomplete script
+ dobashcomp completion/ugrd
+ dozshcomp completion/_ugrd
+}
+
+pkg_postinst() {
+ optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
+ optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
+ optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
+ ewarn "UGRD will not be used with installkernel unless 'ugrd' is set as the"
+ ewarn "'initrd_generator' in /usr/lib/kernel/install.conf."
+}
diff --git a/sys-kernel/ugrd/ugrd-1.9.1.ebuild b/sys-kernel/ugrd/ugrd-1.9.1.ebuild
new file mode 100644
index 0000000000..2c55118efd
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-1.9.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+inherit distutils-r1 optfeature shell-completion
+
+DESCRIPTION="Python based initramfs generator with TOML defintions"
+HOMEPAGE="https://github.com/desultory/ugrd"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ app-misc/pax-utils
+ >=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]
+ >=dev-python/pycpio-1.1.2[${PYTHON_USEDEP}]
+ sys-apps/pciutils
+"
+
+src_install() {
+ # Call the distutils-r1_src_install function to install the package
+ distutils-r1_src_install
+ # Create the ugrd config directory
+ keepdir /etc/ugrd
+ # Install the example config into /etc/ugrd/config.toml
+ # Do not overwrite an existing config
+ insinto /etc/ugrd
+ newins examples/example.toml config.toml
+ # Create the kernel preinst.d directory if it doesn't exist
+ # Install the kernel preinst.d hook
+ exeinto /usr/lib/kernel/preinst.d
+ doexe hooks/installkernel/51-ugrd.install
+ exeinto /usr/lib/kernel/install.d
+ doexe hooks/kernel-install/51-ugrd.install
+ # Install bash autocomplete script
+ dobashcomp completion/ugrd
+ dozshcomp completion/_ugrd
+}
+
+pkg_postinst() {
+ optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup
+ optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs
+ optfeature "ugrd.crypto.gpg support" app-crypt/gnupg
+ ewarn "UGRD will not be used with installkernel unless 'ugrd' is set as the"
+ ewarn "'initrd_generator' in /usr/lib/kernel/install.conf."
+}
diff --git a/sys-kernel/ugrd/ugrd-9999.ebuild b/sys-kernel/ugrd/ugrd-9999.ebuild
index 49dd8900c2..2c7ad0ee5b 100644
--- a/sys-kernel/ugrd/ugrd-9999.ebuild
+++ b/sys-kernel/ugrd/ugrd-9999.ebuild
@@ -32,10 +32,9 @@ src_install() {
newins examples/example.toml config.toml
# Create the kernel preinst.d directory if it doesn't exist
# Install the kernel preinst.d hook
- keepdir /etc/kernel/preinst.d
- exeinto /etc/kernel/preinst.d
+ exeinto /usr/lib/kernel/preinst.d
doexe hooks/installkernel/51-ugrd.install
- exeinto /lib/kernel/install.d
+ exeinto /usr/lib/kernel/install.d
doexe hooks/kernel-install/51-ugrd.install
# Install bash autocomplete script
dobashcomp completion/ugrd
diff --git a/x11-misc/autotiling/Manifest b/x11-misc/autotiling/Manifest
index c609b48122..1410418546 100644
--- a/x11-misc/autotiling/Manifest
+++ b/x11-misc/autotiling/Manifest
@@ -1,2 +1,2 @@
-DIST autotiling-1.9.1.tar.gz 18084 BLAKE2B 42d3ed0400d997dea2a1ab3c1f1e581678c8ff9171c492adbacb10f3269f1859f15dbfd0ec7ffe23aeb915f2922f1d278b4219fcfda7bba6b1122363fbb9d6ec SHA512 39ffc97b27c9ade5b988462393f42cd45b5283cc3c4d03efe8ba46729ca8aaf5602e036abde2158d6ffa674ed0daed48b917d86ed97b33865e0c38ef2a475143
DIST autotiling-1.9.2.gh.tar.gz 18989 BLAKE2B 0c4aba21b214473fc58ee3286c62f17bc48b81db6b83d3afc402576514c8a4837563c3695440a7159365fb4503800c86dca493f8aa44ba5bfde826ccbde4961e SHA512 84a9a1328b1c4cc599219f2a1d9e08ede56d5cf926d7f0f3539f0de4ffdfd397354f7b25385f663bcb7526acd5da762a8624f6e0b661ebd82737c3c574d8bd9d
+DIST autotiling-1.9.3.tar.gz 18128 BLAKE2B c236c1700daa238f86c7a01de52ec25a15029776974e7b778c01cfbabbd6ad4eb9916b602172fe9c2238d06dd5142fd3c78c2b39a097cda4a196c98cc498abe9 SHA512 235400882a5626db4db118c2c802060f695691fa4d19debc6deab7eb42a9b679ff111102798dc180bcbb548de97cb38b71eee76084d7ff76bf81d1818e00cf5b
diff --git a/x11-misc/autotiling/autotiling-1.9.1.ebuild b/x11-misc/autotiling/autotiling-1.9.3.ebuild
similarity index 94%
rename from x11-misc/autotiling/autotiling-1.9.1.ebuild
rename to x11-misc/autotiling/autotiling-1.9.3.ebuild
index f7d2fb5294..18a54cbb17 100644
--- a/x11-misc/autotiling/autotiling-1.9.1.ebuild
+++ b/x11-misc/autotiling/autotiling-1.9.3.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1 pypi
diff --git a/x11-misc/ksnip/Manifest b/x11-misc/ksnip/Manifest
index 0a10baa1d4..77349feb6c 100644
--- a/x11-misc/ksnip/Manifest
+++ b/x11-misc/ksnip/Manifest
@@ -1,3 +1 @@
-DIST ksnip-1.10.0.tar.gz 647515 BLAKE2B 2a053aa9abc129f15f3b88015c14e2ca4fbf4847091a26b905fcc9bf8f464bcb417e96f0d987b86d9013049749f8d5f4826762941e05b4a2589f69d74c665cab SHA512 2633c36ee410b26df7633361f91ddb6fd212e2ca4c6727cdf0081450d77056c3038cdb4eac02ef4c08c2226cc742b82eced123bf32db2b49a93d415632d0dc3f
DIST ksnip-1.10.1.tar.gz 690500 BLAKE2B 8606ce6c72fda55c52f3a319151b68bf9da3c8c696839c7a597ce2707467076b18afd5ea500eeec1fe8d3b431bd9dee4b76bd8fc9d08be5b42292cefdeaad7d8 SHA512 f989b5967facf721964d54141ae0a66e03f0e35be336873975facc0882373be6377e152e59a558be13a4aca0415f11c040e8af05dc7d920f5c548389213e263c
-DIST ksnip-1.9.2.tar.gz 569082 BLAKE2B a40c4b67db5272f00108041226822bb70ac2f86803e6b6e41c496a7baba61a2c77e6101fd79cc936e9b2ad530b59d6f0af6eaa071172cccbdeb88b5c85497942 SHA512 7b00538a129b15f30e4a6439e5c4dab57cbcaa1d6c67559413107500698fa0572b2b94ac8ff1522eb61dc2d8ced1b7efe4589d22c7438a7a03f9452b13939afd
diff --git a/x11-misc/ksnip/ksnip-1.10.0-r1.ebuild b/x11-misc/ksnip/ksnip-1.10.0-r1.ebuild
deleted file mode 100644
index a5cb5bcdba..0000000000
--- a/x11-misc/ksnip/ksnip-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="Ksnip is a Qt based cross-platform screenshot tool"
-HOMEPAGE="https://github.com/ksnip/ksnip"
-SRC_URI="https://github.com/ksnip/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5[png]
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- >=media-libs/kcolorpicker-0.2.0
- >=media-libs/kimageannotator-0.6.0
- x11-libs/libX11
- x11-libs/libxcb"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- kde-frameworks/extra-cmake-modules
-"
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-
-src_install() {
- cmake_src_install
-
- doicon -s scalable desktop/${PN}.svg
- domenu desktop/org.${PN}.${PN}.desktop
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/x11-misc/ksnip/ksnip-1.10.1.ebuild b/x11-misc/ksnip/ksnip-1.10.1.ebuild
index a379d12434..a33b23e13d 100644
--- a/x11-misc/ksnip/ksnip-1.10.1.ebuild
+++ b/x11-misc/ksnip/ksnip-1.10.1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
dev-qt/qtxml:5
>=media-libs/kcolorpicker-0.2.0
>=media-libs/kimageannotator-0.6.1
+ ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5[png]
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- >=media-libs/kcolorpicker-0.1.6
- >=media-libs/kimageannotator-0.5.3
- x11-libs/libX11
- x11-libs/libxcb"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5
- kde-frameworks/extra-cmake-modules
-"
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-
-src_install() {
- cmake_src_install
-
- doicon -s scalable desktop/${PN}.svg
- domenu desktop/org.${PN}.${PN}.desktop
-}