diff --git a/.github/workflows/emails.yml b/.github/workflows/emails.yml
index 6bdef241e2..d7465dc7b4 100644
--- a/.github/workflows/emails.yml
+++ b/.github/workflows/emails.yml
@@ -20,7 +20,6 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4
with:
- ref: dev
fetch-depth: 0
- name: Get compare commit
diff --git a/app-misc/doublecmd-bin/Manifest b/app-misc/doublecmd-bin/Manifest
index 39e3f09881..0d85b35849 100644
--- a/app-misc/doublecmd-bin/Manifest
+++ b/app-misc/doublecmd-bin/Manifest
@@ -6,3 +6,7 @@ DIST doublecmd-1.1.11.gtk2.i386.tar.xz 7991484 BLAKE2B 6d7246ab70fee0dd16fdb7c57
DIST doublecmd-1.1.11.gtk2.x86_64.tar.xz 8766008 BLAKE2B c1c75ba570ef198971ecb6ca757dc252bae3f3fb9e87393e5971e7208ba50e65594254d8ee6f1c53811d5bdff899d44de3eb26635849e75833b36b8ed8cdea62 SHA512 7fbe5208fdf44a6b926dd6a9158218516f23c2b46b300fc55ec0c50b27de69e27070054de16c99dd289aca64e5329bd9f0a7c22c55f6df7e728b19cace08053b
DIST doublecmd-1.1.11.qt.i386.tar.xz 8379188 BLAKE2B 82578b1c07412ab28adcf17447e800ec1b61cd72166a80c37f2950511c3ad45fad60e5d8ebe069ca6eea556af633070cde0a53137d567258f9080ea29bd7f9c1 SHA512 0a8eea4446b926a320903e86c5bb30f6f8c8fd594185a23602fad79d39fa3978c03ad0d3209004b38a1e655a1693ef6d9aee0675468f36a6e8509c5d9e612984
DIST doublecmd-1.1.11.qt.x86_64.tar.xz 9098704 BLAKE2B f9419b260a8c0d6e1cd548bca6843b6ae2be18908bf4e00a15ded3d9ca4cb3521b51f35f6ce308f668b8afba611c8cc1d1b072228c8d8a14a1f68da06763da83 SHA512 0520a7ee4678725e057dc2aa1d9132b4d58c70e7eb6f24a035e1c3017cb25bc06bb1535a14d2ca20030499693f510f5be6c5a377d22ac0c937b7aa9661ab5922
+DIST doublecmd-1.1.12.gtk2.i386.tar.xz 7988996 BLAKE2B 7bf214453f1e693c80ed700cfea15b5b334a88d8cbcdb5ca59047802ee3b49ec3950ebd3a3286660f27708612fbde068cc9206c303b8fb33a557dee695e8e9d5 SHA512 06cc90db5f89c035ca2b18217ab67adf94caba5899dabaa997bf9cb7c1d1ebdd2cd52a2fd0f1a1b667ccf1b51e3d7599c8cc9b2fa6c0e98c3d3ff309745f9de4
+DIST doublecmd-1.1.12.gtk2.x86_64.tar.xz 8767760 BLAKE2B 79e13639582e3e33802a3be2acb35a306e182e1506d6ee6c4545077793c5ef00d15cd445a0e36ad3510bec607a7795e6f89a9ce6f8874d1f6aa0e6bbbb667b2e SHA512 2c92dded98d98deed6ccc8a0f8d0a6b75f0d10ed5860951d8cf542660c94ae635c3f246d84a1747e4d235cdf4ff6bcf1599ec12da341267cc5a63d1742cea104
+DIST doublecmd-1.1.12.qt.i386.tar.xz 8381672 BLAKE2B 3f8c623a706fd1dc5acd742edc689f1dfe9a5aeb3ef78cf1e7e2be4ad89dfca13c6d412ac0f4baccb0e5997af3d3afbecf2518e91379c95fe8a2ce3a50c071cd SHA512 0be897a708f11f36d80de451c7d97418589472d8fb7cd4c6e3660a9a3debb52205e5a89acc47522f336ece1a9183cfe777bbf2e59cc5fa191141b6db769f9594
+DIST doublecmd-1.1.12.qt.x86_64.tar.xz 9102456 BLAKE2B 37290235e045ed978e6ec5631ba6f6c869ea9e31fcae4b3125fbf5dd69d28e890ede53386c141e86f7ce720644beb733568292eee6b3b1efea019bf0fc581daa SHA512 6e2c1372cbe90af5eb22e70c1e7eddb36a0c0859c5ad9cfcccf7445e6ca277fdf361b20b8f2a5faa5b18790cfe21a500c16cf3fb6f649dca92635713672f09e7
diff --git a/app-misc/doublecmd-bin/doublecmd-bin-1.1.12_beta.ebuild b/app-misc/doublecmd-bin/doublecmd-bin-1.1.12_beta.ebuild
new file mode 100644
index 0000000000..e883dcaf33
--- /dev/null
+++ b/app-misc/doublecmd-bin/doublecmd-bin-1.1.12_beta.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper xdg
+
+MY_PN="doublecmd"
+DESCRIPTION="Free cross platform open source file manager with two panels side by side."
+HOMEPAGE="https://doublecmd.sourceforge.io/"
+
+SRC_URI="amd64? (
+ gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.gtk2.x86_64.tar.xz )
+ qt5? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.qt.x86_64.tar.xz )
+ )
+ x86? (
+ gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.gtk2.i386.tar.xz )
+ qt5? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV/_beta/}.qt.i386.tar.xz )
+ )"
+
+# Licenses for package and plugins
+LICENSE="GPL-2+ LGPL-2-with-linking-exception LGPL-2.1+ LGPL-3 GPL-1 freedist"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="gtk qt5"
+REQUIRED_USE=" ^^ ( gtk qt5 ) "
+
+S="${WORKDIR}/${MY_PN}"
+
+QA_PREBUILT="
+ */doublecmd
+ */libQt5Pas.so.1
+ */libunrar.so
+ */plugins/.*
+"
+
+## "ldd doublecmd" output show linking to some libraries provided by sys-libs/glibc:2.2
+## (maybe virtual/libc-1) and no libraries of sys-libs/ncurses (that removed here).
+## x11-libs/X11 is optional dependency of dev-qt/qtgui:5 by [xcb] or [X]
+## therefore it is mentioned here explicitly.
+RDEPEND="
+ dev-libs/glib:2
+ sys-apps/dbus
+ x11-libs/libX11
+ virtual/libc
+ gtk? ( x11-libs/gtk+:2 )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ )
+"
+
+src_install(){
+ insinto "/opt/${PN}"
+ doins -r "${S}/."
+
+ # Remove doublecmd.inf to use config from user home directory
+ rm "${ED}/opt/${PN}"/settings/doublecmd.inf || die
+
+ exeinto "/opt/${PN}"
+ doexe "${S}/${MY_PN}"
+ make_wrapper ${MY_PN} "/opt/${PN}/${MY_PN}" "" "/opt/${PN}" "/opt/bin/"
+
+ doicon -s 48 ${MY_PN}.png
+ make_desktop_entry "${MY_PN}" "Double Commander" "${MY_PN}" "Utility;" || die "Failed making desktop entry!"
+}
diff --git a/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild b/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild
index feaea80f6f..81651f0b14 100644
--- a/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild
+++ b/dev-build/FoBiS/FoBiS-3.0.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYPI_PN="${PN}.py"
PYPI_NO_NORMALIZE=1
@@ -16,6 +16,7 @@ HOMEPAGE="https://github.com/szaghi/FoBiS"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
IUSE="graphviz"
diff --git a/dev-java/corretto-bin/Manifest b/dev-java/corretto-bin/Manifest
index 21e2702da1..1c59d9b082 100644
--- a/dev-java/corretto-bin/Manifest
+++ b/dev-java/corretto-bin/Manifest
@@ -1,5 +1,5 @@
-DIST amazon-corretto-11.0.22.7.1-linux-x64.tar.gz 195214324 BLAKE2B 16dd4d260cd163b73786c445db6ddf8249d4a595dabdca5bffe3c168661a586be08004ca9244478a47578680dfc2f62bec3a7be7b6c91073de66ee90d85ad15e SHA512 9cc7ceee131b3aebabed75749e5fc9782d64083516a8fc42636fe4183eb90c883be8b3f711cc607980f4cabb87a4380593a3eb4df30ca88d7fb1a796dadffefe
-DIST amazon-corretto-17.0.10.8.1-linux-x64.tar.gz 193714285 BLAKE2B 35184de6bfc2bbc1339817a09aeb1ae31d8eb93aaf4d2e936b69537cedf2dae761fc20ba6895a9344007f1cb50319c821361e0913831c4e0fcb05c06f6b62874 SHA512 485bbf9d6a45aac018ae5af5bac1608f81c91c0cacd6904854b33a0ed52267f55a751e97b4fef7dff37d5cf4300701ef3558b910299f0a85676b54c22b69dce7
-DIST amazon-corretto-21.0.2.14.1-linux-x64.tar.gz 209399162 BLAKE2B 8778c7ae7a8588b3a4dd58d5e3c18ca8931b5d4e32c4f308c0f765df7140232d7c800708859d86a66a58275a517edd461c16457159de5ca362d51728559bcd46 SHA512 14264809f297d42163c2c55c827b16eba058c39a36d5e92589419cccf66187b59225b08a8623f556d1febdeedbb2a47975b655b8bd816483d2862c7c44ef0470
-DIST amazon-corretto-22.0.0.37.1-linux-x64.tar.gz 207737618 BLAKE2B 4f7cf43d4de10a44fec207fee62050948cefd532409bfc9122a007aa5a1a9deaf36e919d5773c43be15a3b731936134ee94104702780ec887efc0a43bc4cc781 SHA512 8a4ef82a33cee41b0fd782c9252bc944fa2a10c220e873699276857a32d618a5b4ad2053a06c377d211b691b793125d2c858b3773deaf6dc8a5babe50d05b969
-DIST amazon-corretto-8.402.08.1-linux-x64.tar.gz 118079903 BLAKE2B 5b1ffcabe40e1d6046842a27a65014b055e2dc64736ea9359a74166b68a8435803ce745de7d4bd0d84deaa686c10b4a5d41b9cbb21bc2a0d6542e09042216169 SHA512 4584c80690a1c03fef4764be98ecc808ec1283bed687c0bfc9fc0a6d08d30885ec59aea8a19d0a18bde5ffb33527427c3b8cd41c795a75609514de198c76db76
+DIST amazon-corretto-11.0.23.9.1-linux-x64.tar.gz 195487466 BLAKE2B f17bfd1406fb3e8cca617fbf1d3cf212af9299aa65df4b68ea6aa5881cb42f8056a2bc3dda5e1ad5583eededb7b711874ff9507304448f37a66a50950ed0b73f SHA512 37ac145e1c2ff1cf103200262890fc2732c99345a13a9d9d0457ce11aab55efda166f0ee15f3adcea9c11f91b3008522e26a63f36570f97aa4cfb9fa3318b3d9
+DIST amazon-corretto-17.0.11.9.1-linux-x64.tar.gz 193947693 BLAKE2B c384a0343739a98466e0ae4ad19de501f17910570d567ff6eec47ec66e8723ea931c8eb143f57ff3e75ed53051529cf11f1fac8c43d1387dfb637a06b1e679b0 SHA512 a101945fa3fe3ca068a62c9ac3133ff8062a48834f672a1594a5a6e11f29827616c09fd7cb0bbb057a7bdb500b367b5cb97c75ad95d8041ca4e02d6d65df66b6
+DIST amazon-corretto-21.0.3.9.1-linux-x64.tar.gz 209461943 BLAKE2B b21b20e3ae625ab25e59f4d7faa3988277b4e70ae1a98e4b7c5fc09df92e1616ca28aa786f50ccd0554df8b11c7cbc094fb8e0189bd80c6431c13db4cc6dec37 SHA512 f5a9f919f0707be620294ea322e9518758ef661bd88c8c2af1a8f95b06f78068272e67758a70c64dc5c8d4989829362aa7efa0ff13077022e5a32c7dafecabff
+DIST amazon-corretto-22.0.1.8.1-linux-x64.tar.gz 207751648 BLAKE2B 37a65e9bfd006836967b7d29df944a500069163488bd23197fa7790705fd2637f6c223c72de884be1153708b2781b19fb66b88bb28eb68bd27a2db336af7a2f4 SHA512 e7f1d77cd4cd8e13f45b895141da076cd43b6c1cb2204a33742cfdf75185297340217a2745fd1d9f8e5d2cf276bf4926ee102f2f34588acd7a6c4c03bf688d82
+DIST amazon-corretto-8.412.08.1-linux-x64.tar.gz 118088115 BLAKE2B e0a5e6de7985900514a22f14795966e161719db39259f55576a0172e133057837c713f823e59b29b1e81b236b69a3ce76e6ed7e3cd27745d6b4148b2b4e8af8a SHA512 48b0a5420d6f18d6bbb74ee8a14069d102c4e9bdc04b0818aa42e0ce345b39871762b6ba1b13322c829049897a79e9a8105637f317317fca9debf0b79d27c645
diff --git a/dev-java/corretto-bin/corretto-bin-11.0.22.7.1.ebuild b/dev-java/corretto-bin/corretto-bin-11.0.23.9.1.ebuild
similarity index 95%
rename from dev-java/corretto-bin/corretto-bin-11.0.22.7.1.ebuild
rename to dev-java/corretto-bin/corretto-bin-11.0.23.9.1.ebuild
index 8305000c24..3a3a6a4a09 100644
--- a/dev-java/corretto-bin/corretto-bin-11.0.22.7.1.ebuild
+++ b/dev-java/corretto-bin/corretto-bin-11.0.23.9.1.ebuild
@@ -6,15 +6,16 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
-"
-
DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services"
HOMEPAGE="https://aws.amazon.com/corretto"
+
+SRC_URI="
+ https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
+"
+
+S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux source"
@@ -42,8 +43,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -88,4 +87,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-java/corretto-bin/corretto-bin-17.0.10.8.1.ebuild b/dev-java/corretto-bin/corretto-bin-17.0.11.9.1.ebuild
similarity index 95%
rename from dev-java/corretto-bin/corretto-bin-17.0.10.8.1.ebuild
rename to dev-java/corretto-bin/corretto-bin-17.0.11.9.1.ebuild
index 8305000c24..3a3a6a4a09 100644
--- a/dev-java/corretto-bin/corretto-bin-17.0.10.8.1.ebuild
+++ b/dev-java/corretto-bin/corretto-bin-17.0.11.9.1.ebuild
@@ -6,15 +6,16 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
-"
-
DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services"
HOMEPAGE="https://aws.amazon.com/corretto"
+
+SRC_URI="
+ https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
+"
+
+S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux source"
@@ -42,8 +43,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -88,4 +87,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-java/corretto-bin/corretto-bin-21.0.2.14.1.ebuild b/dev-java/corretto-bin/corretto-bin-21.0.3.9.1.ebuild
similarity index 95%
rename from dev-java/corretto-bin/corretto-bin-21.0.2.14.1.ebuild
rename to dev-java/corretto-bin/corretto-bin-21.0.3.9.1.ebuild
index 8305000c24..3a3a6a4a09 100644
--- a/dev-java/corretto-bin/corretto-bin-21.0.2.14.1.ebuild
+++ b/dev-java/corretto-bin/corretto-bin-21.0.3.9.1.ebuild
@@ -6,15 +6,16 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
-"
-
DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services"
HOMEPAGE="https://aws.amazon.com/corretto"
+
+SRC_URI="
+ https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
+"
+
+S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux source"
@@ -42,8 +43,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -88,4 +87,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-java/corretto-bin/corretto-bin-22.0.0.37.1.ebuild b/dev-java/corretto-bin/corretto-bin-22.0.1.8.1.ebuild
similarity index 95%
rename from dev-java/corretto-bin/corretto-bin-22.0.0.37.1.ebuild
rename to dev-java/corretto-bin/corretto-bin-22.0.1.8.1.ebuild
index 8305000c24..3a3a6a4a09 100644
--- a/dev-java/corretto-bin/corretto-bin-22.0.0.37.1.ebuild
+++ b/dev-java/corretto-bin/corretto-bin-22.0.1.8.1.ebuild
@@ -6,15 +6,16 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
-"
-
DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services"
HOMEPAGE="https://aws.amazon.com/corretto"
+
+SRC_URI="
+ https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
+"
+
+S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux source"
@@ -42,8 +43,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -88,4 +87,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-java/corretto-bin/corretto-bin-8.402.08.1-r3.ebuild b/dev-java/corretto-bin/corretto-bin-8.412.08.1.ebuild
similarity index 94%
rename from dev-java/corretto-bin/corretto-bin-8.402.08.1-r3.ebuild
rename to dev-java/corretto-bin/corretto-bin-8.412.08.1.ebuild
index 388a3d9679..d5a1029ad3 100644
--- a/dev-java/corretto-bin/corretto-bin-8.402.08.1-r3.ebuild
+++ b/dev-java/corretto-bin/corretto-bin-8.412.08.1.ebuild
@@ -6,15 +6,17 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
-"
DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services"
HOMEPAGE="https://aws.amazon.com/corretto"
+
+SRC_URI="
+ https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz
+"
+
+S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="cups headless-awt selinux source"
@@ -33,7 +35,7 @@ RDEPEND="
selinux? ( sec-policy/selinux-java )
!headless-awt? (
app-accessibility/at-spi2-core
- x11-libs/gtk+
+ x11-libs/gtk+:2
x11-libs/gdk-pixbuf
x11-libs/libXxf86vm
x11-libs/libX11
@@ -48,8 +50,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -86,4 +86,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-11.0.22.ebuild b/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-11.0.22.ebuild
index cf80650e30..59255f4256 100644
--- a/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-11.0.22.ebuild
+++ b/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-11.0.22.ebuild
@@ -6,16 +6,19 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- amd64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-x64.tar.gz )
- arm64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-aarch64.tar.gz )
-"
DESCRIPTION="Prebuilt Java JDK binaries provided by Microsoft"
HOMEPAGE="https://www.microsoft.com/openjdk"
+
+SRC_URI="
+ amd64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-x64.tar.gz )
+ arm64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-aarch64.tar.gz )
+"
+
+S="${WORKDIR}/jdk-${MY_PV}+7"
+
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux source"
@@ -43,8 +46,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/jdk-${MY_PV}+7"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -94,4 +95,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-17.0.10.ebuild b/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-17.0.10.ebuild
index cf80650e30..f2dbe60a5c 100644
--- a/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-17.0.10.ebuild
+++ b/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-17.0.10.ebuild
@@ -6,16 +6,17 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- amd64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-x64.tar.gz )
- arm64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-aarch64.tar.gz )
-"
-
DESCRIPTION="Prebuilt Java JDK binaries provided by Microsoft"
HOMEPAGE="https://www.microsoft.com/openjdk"
+
+SRC_URI="
+ amd64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-x64.tar.gz )
+ arm64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-aarch64.tar.gz )
+"
+
+S="${WORKDIR}/jdk-${MY_PV}+7"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux source"
@@ -43,8 +44,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/jdk-${MY_PV}+7"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -94,4 +93,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-21.0.2.ebuild b/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-21.0.2.ebuild
index ea61ecf3ee..0c23dbe1c5 100644
--- a/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-21.0.2.ebuild
+++ b/dev-java/microsoft-openjdk-bin/microsoft-openjdk-bin-21.0.2.ebuild
@@ -6,16 +6,17 @@ EAPI=8
inherit java-vm-2 toolchain-funcs
MY_PV=${PV/_p/+}
-SLOT=$(ver_cut 1)
-
-SRC_URI="
- amd64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-x64.tar.gz )
- arm64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-aarch64.tar.gz )
-"
-
DESCRIPTION="Prebuilt Java JDK binaries provided by Microsoft"
HOMEPAGE="https://www.microsoft.com/openjdk"
+
+SRC_URI="
+ amd64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-x64.tar.gz )
+ arm64? ( https://aka.ms/download-jdk/microsoft-jdk-${PV}-linux-aarch64.tar.gz )
+"
+
+S="${WORKDIR}/jdk-${MY_PV}+13"
LICENSE="GPL-2-with-classpath-exception"
+SLOT=$(ver_cut 1)
KEYWORDS="~amd64"
IUSE="alsa cups headless-awt selinux source"
@@ -43,8 +44,6 @@ RDEPEND="
RESTRICT="preserve-libs splitdebug"
QA_PREBUILT="*"
-S="${WORKDIR}/jdk-${MY_PV}+13"
-
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
@@ -94,4 +93,4 @@ src_install() {
pkg_postinst() {
java-vm-2_pkg_postinst
-}
\ No newline at end of file
+}
diff --git a/dev-libs/StringiFor/StringiFor-1.1.4.ebuild b/dev-libs/StringiFor/StringiFor-1.1.4.ebuild
index a6d02c4aac..6373db8090 100644
--- a/dev-libs/StringiFor/StringiFor-1.1.4.ebuild
+++ b/dev-libs/StringiFor/StringiFor-1.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
FORTRAN_STANDARD=2003
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit fortran-2 python-any-r1 toolchain-funcs
@@ -21,7 +21,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs test"
-RESTRICT="!test? ( test )"
+RESTRICT="mirror !test? ( test )"
BDEPEND="
${PYTHON_DEPS}
diff --git a/dev-python/sphinxcontrib-katex/Manifest b/dev-python/sphinxcontrib-katex/Manifest
index 9dbf8dcf44..af6a3a8580 100644
--- a/dev-python/sphinxcontrib-katex/Manifest
+++ b/dev-python/sphinxcontrib-katex/Manifest
@@ -1,4 +1 @@
-DIST sphinxcontrib-katex-0.9.4.tar.gz 98826 BLAKE2B 8d89ba5b5e282d94f57eb976a8779c176e0ae769eb91cc03d5a44461f51f966be8c995dfc2fc7c74d28d52487a76edd8f64879b6045f5c15d4aa97e2c2eb862f SHA512 3fb66ca12a78d1a22dbb029a1c82de57ff0407da1fba8bf49be927b83c618fe7a80ef5560a1639439a6761146bc3073b4a9e52c6869d44d4d1f05cc311780519
-DIST sphinxcontrib-katex-0.9.6.tar.gz 99157 BLAKE2B 72c0be16e2670a7990c8c25b788d2050c516c64c7f288729653ba656a061d8f5152d30c671bd0ed74b3db52c1dd531b341267e3bfca2bb1d9b929238e5ac1679 SHA512 caa1671922a1a677a94687de930d8c7d53b10b2e1e6e8c84e06426ea6a6fee295605b2d99cb3b3d159f016772dae376dd638a507110ebc139387e120f2324e12
-DIST sphinxcontrib-katex-0.9.7.tar.gz 99131 BLAKE2B 79ebc1818bb077894795728af64f9c20a773181d132ff80b60a134160a9e3e46bcf7fd0d989bec32c7e6b9102a9eda72a97b68d293f59258ae5e4f98775b0e56 SHA512 26fffecb967cdf0c658e5c30966cc065b856acd5874f3bed4de021f522f15c021ff94b691cc19b7070c15f7e55f35e2f0fe758356dd1bd8e0620f0f5b3664cdd
DIST sphinxcontrib-katex-0.9.9.tar.gz 99711 BLAKE2B 75d8e4acd26bb8b83693ea42d8bb05997195252ae34f8484484f094b124ea629b48b2c496d3f7b5252171cda125c63aaf3161c457032f91057662a76a1a40f8d SHA512 aaac916193d01b32e3e10636294abb5285b18f922c7e7c190e0e4dc66f477860058981f50f38a9441323e79be32d9b0585c0e99f90f4074b555229cceb0a8b8f
diff --git a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild
deleted file mode 100644
index b45f856996..0000000000
--- a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="KaTeX Sphinx extension for rendering of math in HTML pages"
-HOMEPAGE="https://github.com/hagenw/sphinxcontrib-katex"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/sphinx-4.5.0-r1[${PYTHON_USEDEP}]"
-
-DOCS=()
-
-distutils_enable_sphinx docs
-
-src_prepare() {
- default
- sed -i -e 's/license_file/license_files/' setup.cfg || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.6.ebuild b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.6.ebuild
deleted file mode 100644
index 91f6f0b80e..0000000000
--- a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="KaTeX Sphinx extension for rendering of math in HTML pages"
-HOMEPAGE="https://github.com/hagenw/sphinxcontrib-katex"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- >=dev-python/sphinx-4.5.0-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
- dev-python/insipid-sphinx-theme
-
-src_prepare() {
- sed -i -e 's/license_file/license_files/' setup.cfg || die
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.7.ebuild b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.7.ebuild
deleted file mode 100644
index a108e1a6f7..0000000000
--- a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.9.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="KaTeX Sphinx extension for rendering of math in HTML pages"
-HOMEPAGE="https://github.com/hagenw/sphinxcontrib-katex"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/sphinx-4.5.0-r1[${PYTHON_USEDEP}]"
-
-DOCS=()
-
-distutils_enable_sphinx docs \
- dev-python/insipid-sphinx-theme
-
-src_prepare() {
- default
- sed -i -e 's/license_file/license_files/' setup.cfg || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
index 2a02080965..e64fb3bc65 100644
--- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
+++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit desktop python-single-r1 toolchain-funcs xdg
@@ -20,15 +20,15 @@ SRC_URI="
https://github.com/spirali/${PN}/archive/${PKG_sha}.tar.gz -> ${P}.tar.gz
https://github.com/KDE/kmahjongg/raw/master/icons/48-apps-kmahjongg.png -> kmahjongg_${PN}.png"
+S="${WORKDIR}/${PN}-${PKG_sha}"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}-${PKG_sha}"
+RESTRICT="mirror !test? ( test )"
RDEPEND="
${PYTHON_DEPS}
diff --git a/media-fonts/monaspace/Manifest b/media-fonts/monaspace/Manifest
new file mode 100644
index 0000000000..0f31d46622
--- /dev/null
+++ b/media-fonts/monaspace/Manifest
@@ -0,0 +1 @@
+DIST monaspace-v1.000.zip 122949327 BLAKE2B f22a24580e21edc2488dffd8dfce22551ff5ba88e199349e9d835b9ccb04dc3f6bec3b6a4c0f22e3ce8fba1e541fd3b8ddc6593dc21bb12a082833b199a1c00e SHA512 f06bfcc20c48b6c92b16620ee5f649a284bfc8d8d20c212b28613491a26a3627be02eede167eda331e66509163fd50fb435e89c07c6cff297efd503c273a102c
diff --git a/media-fonts/monaspace/metadata.xml b/media-fonts/monaspace/metadata.xml
new file mode 100644
index 0000000000..afce255112
--- /dev/null
+++ b/media-fonts/monaspace/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ dev@greener.sh
+ Robert Greener
+
+
+ githubnext/monaspace
+
+
+
diff --git a/media-fonts/monaspace/monaspace-1.000.ebuild b/media-fonts/monaspace/monaspace-1.000.ebuild
new file mode 100644
index 0000000000..171c61734e
--- /dev/null
+++ b/media-fonts/monaspace/monaspace-1.000.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit font
+
+DESCRIPTION="A free and open-source typeface for developers"
+HOMEPAGE="https://github.com/githubnext/monaspace"
+SRC_URI="https://github.com/githubnext/monaspace/releases/download/v${PV}/monaspace-v${PV}.zip"
+
+S="${WORKDIR}/monaspace-v${PV}"
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+FONT_S="${S}/fonts/total"
+FONT_SUFFIX=""
+IUSE="variable +otf"
+REQUIRED_USE="|| ( otf variable )"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+ default
+
+ mkdir "${S}/fonts/total" || die
+
+ if use otf ; then
+ mv "${S}/fonts/otf/"* "${S}/fonts/total" || die
+ FONT_SUFFIX="${FONT_SUFFIX} otf"
+ fi
+
+ if use variable ; then
+ mv "${S}/fonts/variable/"* "${S}/fonts/total" || die
+ FONT_SUFFIX="${FONT_SUFFIX} ttf"
+ fi
+}
diff --git a/media-gfx/WebPlotDigitizer-bin/Manifest b/media-gfx/WebPlotDigitizer-bin/Manifest
index 5816d5f71d..cd27886570 100644
--- a/media-gfx/WebPlotDigitizer-bin/Manifest
+++ b/media-gfx/WebPlotDigitizer-bin/Manifest
@@ -1,2 +1 @@
-DIST WebPlotDigitizer-4.6-linux-x64.zip 109834831 BLAKE2B 5ec14e9498796c28d191023ca9688a5b581033e75607588357e9320614dd02a3098e76cbaa45ab16508273799afaab16c334f50e40b189f8d7cbf70a09f941ab SHA512 635e3c040a42d13c1ac4a83d7e76f5e20b3329dbd375c2177446a4b4232a0edfb3de725c912efc072a9ae5c0bae8ffcb4d6998be40ede554fec8a105f9e654d9
DIST WebPlotDigitizer-4.7-linux-x64.zip 121001396 BLAKE2B 5130b27e2afff22cd2df571076cf3d809708261d6338ea9693527d75faf82e16009195aa9e7418e49ed7693a58c9a2638e19b2be581fc73c5a0702509412ce3a SHA512 264eae05f8087b1533480a1b31b9de330287b0be8761413ac13de09b1df1d115f2acc7170a2785fc8102ded78b231962728318972a71b1f076f39e6d4f894881
diff --git a/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.6.ebuild b/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.6.ebuild
deleted file mode 100644
index 2f42fda954..0000000000
--- a/media-gfx/WebPlotDigitizer-bin/WebPlotDigitizer-bin-4.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-MY_PN=${PN%-*}
-
-inherit desktop python-single-r1 xdg
-
-DESCRIPTION="Web based tool to extract data from plots, images, and maps"
-HOMEPAGE="https://automeris.io/WebPlotDigitizer/"
-SRC_URI="https://automeris.io/downloads/${MY_PN}-${PV}-linux-x64.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-#RESTRICT="strip"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-QA_PREBUILT="*"
-
-## RDEPEND is still required to be filled with actual runtime-deps:
-## python is just assumed runtime-dependency.
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/nss
- x11-libs/gtk+:3[X,cups,introspection]
-"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}-${PV}-linux-x64"
-
-QA_FLAGS_IGNORED="*"
-
-## It seems media-libs/alsa-lib is required by chrome-sandbox.
-## Actually this library isn't required to work.
-QA_SONAME="*"
-
-src_install() {
- insinto "/opt/${P}"
- doins -r "${S}/."
-
- exeinto "/opt/${P}"
- doexe "/${S}/${MY_PN}-${PV}"
- dosym ../../opt/"${MY_PN}"-bin-"${PV}/${MY_PN}-${PV}" /usr/bin/"${PN}"
-
- newicon "/${S}/resources/app/images/icon/icon.png" ${PN}-icon.png
-
- make_desktop_entry "/opt/${P}/${MY_PN}-${PV}" "${MY_PN}" "${PN}-icon" "Graphics"
- ## After opening via xdg-open the js scripts could not work (i.e. "File - Load Image" menu)
- make_desktop_entry "/usr/bin/xdg-open /opt/${P}/resources/app/index.html" "${MY_PN} html" "viewhtml" "Graphics"
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index cf1b688241..0e6d5885b7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -14,6 +14,31 @@
# New entries go on top.
+# Robert Greener (2024-04-18)
+# Superceded by media-fonts/nerdfonts[firacode]
+# Removal on 2024-05-18
+media-fonts/firacode-nerdfont
+
+# Robert Greener (2024-04-18)
+# Superceded by media-fonts/nerdfonts[iosevka]
+# Removal on 2024-05-18
+media-fonts/iosevka-nerdfont
+
+# Robert Greener (2024-04-18)
+# Superceded by media-fonts/nerdfonts[jetbrainsmono]
+# Removal on 2024-05-18
+media-fonts/jetbrainsmono-nerdfont
+
+# Robert Greener (2024-04-18)
+# Superceded by media-fonts/nerdfonts[robotomono]
+# Removal on 2024-05-18
+media-fonts/robotomono-nerdfont
+
+# Robert Greener (2024-04-18)
+# Superceded by media-fonts/nerdfonts[ubuntumono]
+# Removal on 2024-05-18
+media-fonts/ubuntumono-nerdfont
+
# Anna Vyalkova (2024-04-14)
# Depends on nonexistent app-misc/pup. Upstream is long time dead. No revdeps.
# Removal on 2024-05-14.