summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/keepassxc/Manifest1
-rw-r--r--app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild96
-rw-r--r--app-admin/keepassxc/keepassxc-9999.ebuild99
-rw-r--r--app-admin/keepassxc/metadata.xml24
-rw-r--r--app-arch/7-zip/7-zip-21.07-r2.ebuild (renamed from app-arch/7-zip/7-zip-21.07.ebuild)16
-rw-r--r--app-arch/7-zip/files/7-zip-less-asm.patch41
-rw-r--r--app-emulation/dxvk/Manifest2
-rw-r--r--app-emulation/dxvk/dxvk-1.10.1.ebuild (renamed from app-emulation/dxvk/dxvk-1.9.3.ebuild)2
-rw-r--r--app-misc/ca-certificates/Manifest3
-rw-r--r--app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild197
-rw-r--r--app-misc/ca-certificates/files/ca-certificates-20150426-root.patch49
-rw-r--r--app-misc/ca-certificates/files/ca-certificates-no-cryptography.patch24
-rw-r--r--app-misc/ca-certificates/metadata.xml13
-rw-r--r--app-text/zathura/zathura-0.4.9-r1.ebuild (renamed from app-text/zathura/zathura-0.4.8.ebuild)4
-rw-r--r--app-text/zathura/zathura-9999.ebuild61
-rw-r--r--dev-cpp/highway/Manifest1
-rw-r--r--dev-cpp/highway/highway-0.15.0.ebuild27
-rw-r--r--dev-cpp/pangomm/Manifest1
-rw-r--r--dev-cpp/pangomm/files/pangomm-pango-1.50.patch10
-rw-r--r--dev-cpp/pangomm/pangomm-2.42.2-r2.ebuild43
-rw-r--r--dev-dotnet/dotnet-runtime-bin/Manifest6
-rw-r--r--dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.22.ebuild60
-rw-r--r--dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.4.ebuild60
-rw-r--r--dev-java/openj9-openjdk-bin/Manifest32
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.15.10.0.32.0.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.13.8.0.29.0.ebuild)0
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.3.7.0.32.0.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.1.12.0.29.1.ebuild)0
-rw-r--r--dev-java/openj9-openjdk-jre-bin/Manifest16
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.13.8.0.29.0.ebuild)0
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.1.12.0.29.1.ebuild)0
-rw-r--r--dev-java/openj9-openjdk/Manifest10
-rw-r--r--dev-java/openj9-openjdk/metadata.xml1
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.32.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild)17
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-17.0.32.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-17.0.29.1.ebuild)17
-rw-r--r--dev-lang/zig/Manifest1
-rw-r--r--dev-lang/zig/metadata.xml (renamed from dev-cpp/pangomm/metadata.xml)4
-rw-r--r--dev-lang/zig/zig-0.9.0.ebuild101
-rw-r--r--dev-libs/libdwarf/Manifest2
-rw-r--r--dev-libs/libdwarf/libdwarf-0.4.0.ebuild (renamed from dev-libs/libdwarf/libdwarf-0.3.2.ebuild)2
-rw-r--r--dev-libs/openssl/openssl-3.0.2-r1.ebuild (renamed from dev-libs/openssl/openssl-3.0.1-r1.ebuild)12
-rw-r--r--dev-qt/qtgui/qtgui-5.15.2-r15.ebuild184
-rw-r--r--dev-qt/qtgui/qtgui-5.15.3.ebuild (renamed from dev-qt/qtgui/qtgui-5.15.2-r16.ebuild)4
-rw-r--r--games-rpg/runescape-launcher-launcher/Manifest1
-rw-r--r--games-rpg/runescape-launcher-launcher/metadata.xml (renamed from dev-cpp/highway/metadata.xml)0
-rw-r--r--games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3.ebuild35
-rw-r--r--games-rpg/runescape-launcher/Manifest4
-rw-r--r--games-rpg/runescape-launcher/metadata.xml8
-rw-r--r--games-rpg/runescape-launcher/runescape-launcher-2.2.9-r3.ebuild101
-rw-r--r--media-fonts/noto-emoji/Manifest3
-rw-r--r--media-fonts/noto-emoji/noto-emoji-20211101.ebuild26
-rw-r--r--media-fonts/noto-emoji/noto-emoji-99999999.ebuild21
-rw-r--r--media-fonts/source-pro/Manifest3
-rw-r--r--media-fonts/source-pro/files/63-source-pro.conf40
-rw-r--r--media-fonts/source-pro/metadata.xml12
-rw-r--r--media-fonts/source-pro/source-pro-20210115.ebuild39
-rw-r--r--media-gfx/gimp/Manifest1
-rw-r--r--media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch14
-rw-r--r--media-gfx/gimp/gimp-2.99.8.ebuild265
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild266
-rw-r--r--media-gfx/gimp/metadata.xml17
-rw-r--r--media-gfx/gthumb/Manifest1
-rw-r--r--media-gfx/gthumb/gthumb-3.12.0.ebuild99
-rw-r--r--media-gfx/gthumb/metadata.xml14
-rw-r--r--media-gfx/imagemagick/Manifest3
-rw-r--r--media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch14
-rw-r--r--media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild (renamed from media-gfx/imagemagick/imagemagick-7.1.0.19.ebuild)12
-rw-r--r--media-gfx/imagemagick/imagemagick-9999.ebuild270
-rw-r--r--media-libs/libjxl/Manifest3
-rw-r--r--media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch71
-rw-r--r--media-libs/libjxl/libjxl-0.6.1-r1.ebuild130
-rw-r--r--media-libs/libjxl/libjxl-9999.ebuild114
-rw-r--r--media-libs/libjxl/metadata.xml16
-rw-r--r--media-libs/svt-av1/Manifest1
-rw-r--r--media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch18
-rw-r--r--media-libs/svt-av1/metadata.xml7
-rw-r--r--media-libs/svt-av1/svt-av1-0.8.7.ebuild53
-rw-r--r--media-libs/svt-av1/svt-av1-9999.ebuild53
-rw-r--r--media-sound/pamixer/Manifest1
-rw-r--r--media-sound/pamixer/pamixer-1.4.ebuild29
-rw-r--r--media-video/ffmpeg/Manifest6
-rw-r--r--media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild563
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild63
-rw-r--r--metadata/layout.conf2
-rw-r--r--net-mail/notmuch/notmuch-0.34.2-r1.ebuild5
-rw-r--r--profiles/package.mask4
-rw-r--r--profiles/package.use.mask3
-rw-r--r--sci-calculators/units/files/units_cur-urllib.patch1
-rw-r--r--sci-calculators/units/units-2.21-r1.ebuild2
-rwxr-xr-xtools/adoptopenjdk-manifest6
-rw-r--r--virtual/jdk/jdk-16.ebuild12
-rw-r--r--virtual/jre/jre-16.ebuild13
90 files changed, 590 insertions, 3098 deletions
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
deleted file mode 100644
index bdde1c3..0000000
--- a/app-admin/keepassxc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7
diff --git a/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild b/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild
deleted file mode 100644
index 4f2605d..0000000
--- a/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
- if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P/_/-}"
- else
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
- fi
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-crypt/argon2:=
- dev-libs/libgcrypt:=
- >=dev-libs/libsodium-1.0.12:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/qrencode:=
- sys-libs/readline:0=
- sys-libs/zlib:=
- autotype? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst
- )
- keeshare? ( dev-libs/quazip:0= )
- yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
-"
-BDEPEND="
- ccache? ( dev-util/ccache )
- doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
- printf '%s' "${PV}" > .version || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
- -DWITH_GUI_TESTS=OFF
- -DWITH_TESTS="$(usex test)"
- -DWITH_XC_AUTOTYPE="$(usex autotype)"
- -DWITH_XC_DOCS="$(usex doc)"
- -DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_FDOSECRETS=ON
- -DWITH_XC_KEESHARE="$(usex keeshare)"
- -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
- -DWITH_XC_NETWORKING="$(usex network)"
- -DWITH_XC_SSHAGENT=ON
- -DWITH_XC_UPDATECHECK=OFF
- -DWITH_XC_YUBIKEY="$(usex yubikey)"
- )
- if [[ "${PV}" == *_beta* ]] ; then
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
- fi
- cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
deleted file mode 100644
index 3b0d6d6..0000000
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
- if [[ "${PV}" == *_beta* ]] ; then
- SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${P/_/-}"
- else
- #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
- fi
-else
- inherit git-r3
- EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache doc keeshare +network test yubikey"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-crypt/argon2:=
- dev-libs/libgcrypt:=
- >=dev-libs/libsodium-1.0.12:=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- media-gfx/qrencode:=
- sys-libs/readline:0=
- sys-libs/zlib:=
- autotype? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXtst
- )
- keeshare? ( dev-libs/quazip:0= )
- yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
-"
-BDEPEND="
- ccache? ( dev-util/ccache )
- doc? ( dev-ruby/asciidoctor )
-"
-
-src_prepare() {
- use test || \
- sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
- if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then
- printf '%s' "${PV}" > .version || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- # https://github.com/keepassxreboot/keepassxc/issues/5801
- append-cxxflags -fPIC
-
- local mycmakeargs=(
- -DWITH_CCACHE="$(usex ccache)"
- -DWITH_GUI_TESTS=OFF
- -DWITH_TESTS="$(usex test)"
- -DWITH_XC_AUTOTYPE="$(usex autotype)"
- -DWITH_XC_DOCS="$(usex doc)"
- -DWITH_XC_BROWSER="$(usex browser)"
- -DWITH_XC_FDOSECRETS=ON
- -DWITH_XC_KEESHARE="$(usex keeshare)"
- -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)"
- -DWITH_XC_NETWORKING="$(usex network)"
- -DWITH_XC_SSHAGENT=ON
- -DWITH_XC_UPDATECHECK=OFF
- -DWITH_XC_YUBIKEY="$(usex yubikey)"
- )
- if [[ "${PV}" == *_beta* ]] ; then
- mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
- fi
- cmake_src_configure
-}
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
deleted file mode 100644
index 0445305..0000000
--- a/app-admin/keepassxc/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
- </maintainer>
- <use>
- <flag name="autotype">Add support to autotype the passwords into other applications</flag>
- <flag name="browser">Enables browser plugin support</flag>
- <flag name="ccache">Use <pkg>dev-util/ccache</pkg> to build keepassxc</flag>
- <flag name="keeshare">Enable KeeShare sharing integration</flag>
- <flag name="network">Enable network support</flag>
- <flag name="yubikey">Enable database unlocking via YubiKey.</flag>
- </use>
- <longdescription>
- KeePassXC provides a safe location for your passwords and similar
- data. It encrypts its databasee with AES either by passphrase or a key
- file, compatible with a PDA and Windows version.
- </longdescription>
- <upstream>
- <remote-id type="github">keepassxreboot/keepassxc</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-arch/7-zip/7-zip-21.07.ebuild b/app-arch/7-zip/7-zip-21.07-r2.ebuild
index 86d7287..81229fc 100644
--- a/app-arch/7-zip/7-zip-21.07.ebuild
+++ b/app-arch/7-zip/7-zip-21.07-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic
+inherit toolchain-funcs
MY_PV=${PV%%_*}
MY_PV=${MY_PV//./}
@@ -12,10 +12,10 @@ DESCRIPTION="File archiver with a high compression ratio"
HOMEPAGE="https://7-zip.org/"
SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.tar.xz"
-LICENSE="LGPL-2.1+"
+LICENSE="LGPL-2.1+ BSD rar? ( unRAR )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+asm"
+IUSE="+asm rar"
BDEPEND="
asm? ( dev-lang/jwasm )
@@ -24,13 +24,16 @@ RDEPEND="!app-arch/p7zip"
S=${WORKDIR}
-PATCHES=( ${FILESDIR}/7-zip-flags.patch )
+PATCHES=(
+ "${FILESDIR}/7-zip-flags.patch"
+ "${FILESDIR}/7-zip-less-asm.patch"
+)
src_compile() {
cd CPP/7zip/Bundles/Alone2 || die
local myemakeargs=(
- CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}"
- CXX="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}"
+ CC="$(tc-getCC) ${CFLAGS} -fno-strict-aliasing ${LDFLAGS}"
+ CXX="$(tc-getCXX) ${CXXFLAGS} -fno-strict-aliasing ${LDFLAGS}"
)
if use asm; then
myemakeargs+=(USE_ASM=1 USE_JWASM=1)
@@ -44,6 +47,7 @@ src_compile() {
einfo "asm is not supported on this arch, ignoring"
fi
fi
+ use rar || myemakeargs+=(DISABLE_RAR=1)
mkdir -p b/g || die
emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}"
}
diff --git a/app-arch/7-zip/files/7-zip-less-asm.patch b/app-arch/7-zip/files/7-zip-less-asm.patch
new file mode 100644
index 0000000..040b445
--- /dev/null
+++ b/app-arch/7-zip/files/7-zip-less-asm.patch
@@ -0,0 +1,41 @@
+--- a/CPP/7zip/7zip_gcc.mak 2021-12-25 09:00:00.000000000 -0500
++++ b/CPP/7zip/7zip_gcc.mak 2022-05-13 12:20:17.539629635 -0400
+@@ -1127,21 +1127,6 @@
+ endif
+ endif
+
+-ifdef USE_X86_ASM
+-$O/7zCrcOpt.o: ../../../../Asm/x86/7zCrcOpt.asm
+- $(MY_ASM) $(AFLAGS) $<
+-$O/XzCrc64Opt.o: ../../../../Asm/x86/XzCrc64Opt.asm
+- $(MY_ASM) $(AFLAGS) $<
+-$O/Sha1Opt.o: ../../../../Asm/x86/Sha1Opt.asm
+- $(MY_ASM) $(AFLAGS) $<
+-$O/Sha256Opt.o: ../../../../Asm/x86/Sha256Opt.asm
+- $(MY_ASM) $(AFLAGS) $<
+-
+-ifndef USE_JWASM
+-USE_X86_ASM_AES=1
+-endif
+-
+-else
+ $O/7zCrcOpt.o: ../../../../C/7zCrcOpt.c
+ $(CC) $(CFLAGS) $<
+ $O/XzCrc64Opt.o: ../../../../C/XzCrc64Opt.c
+@@ -1150,16 +1135,10 @@
+ $(CC) $(CFLAGS) $<
+ $O/Sha256Opt.o: ../../../../C/Sha256Opt.c
+ $(CC) $(CFLAGS) $<
+-endif
+
+
+-ifdef USE_X86_ASM_AES
+-$O/AesOpt.o: ../../../../Asm/x86/AesOpt.asm
+- $(MY_ASM) $(AFLAGS) $<
+-else
+ $O/AesOpt.o: ../../../../C/AesOpt.c
+ $(CC) $(CFLAGS) $<
+-endif
+
+
+ ifdef USE_X64_ASM
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index d49e771..c26971c 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1 +1 @@
-DIST dxvk-1.9.3.tar.gz 1166878 BLAKE2B 1cef00e9b50632d51340ce0fd9d2842db8370853066e51a7a960d3c18b70c44ab5f2a7949c6c20cee47f7cb0d70fbd276136cc8d4cec137f2c1c87e06396fa1e SHA512 8e9d9fe0c123675add5a998de149c06b6e03e6a06d370090dddc68657dabfc1e98a4dd559b0a6a169466fef01149c9d6a6e9b3d57550e3803bda2bfc1f451cd2
+DIST dxvk-1.10.1.tar.gz 1188138 BLAKE2B e4c5c5052de3f0976581317b9e6de148735198d2545e961ed4540be8660fbba0bcd30f81a1b55f032a1e00e226993d1ab3e4017b104f2829bf37d2ee4fc4420a SHA512 8fd34d9f14a7013cdc1957f63bf60feb19748fddc1cd6ec40cf271005f636de62965efb42ddf2598dad3e37a4f59a870bf769387b2534db93451d1ea6aa65410
diff --git a/app-emulation/dxvk/dxvk-1.9.3.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild
index acb6291..8f498ae 100644
--- a/app-emulation/dxvk/dxvk-1.9.3.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.1.ebuild
@@ -25,8 +25,6 @@ fi
IUSE="+d3d9 +d3d10 +d3d11 debug +dxgi test"
DEPEND="
- abi_x86_32? ( cross-i686-w64-mingw32/gcc )
- abi_x86_64? ( cross-x86_64-w64-mingw32/gcc )
dev-util/vulkan-headers
dev-util/glslang
"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
deleted file mode 100644
index 6c10a91..0000000
--- a/app-misc/ca-certificates/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf912d9a61d10d2c289d1e443b54cca469fa87f9e02b8f67e7e087aceceffc7dd2b4043cdb5380e2652bc619d51f3a224c64f717 SHA512 bedf072c8aa1b05b249ea272f5cecfe16bdcd762c02c712323f12ac7a278e8814453f5f3caad86a2581e451788b292ed3a76a6a81620926459bb890133cffde1
-DIST nss-3.72.tar.gz 83928300 BLAKE2B d92889e27e99095a18090eff0c08b8653ef1f53f4954f5bd018df2f2903647bc71f217159bb4b11f0d6b4fb289fda20bffa2d1d207d1836dcfc33dbd4bedf511 SHA512 1d818d2ef85735837275059fecf68d57e48152f0348ea54887c29171cf029b6944e94d99a8cd96e580a81edb678b79c55515ac0516e27daf6b290c34baed9ebb
-DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild
deleted file mode 100644
index 3a0ffc1..0000000
--- a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result. The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging user reports, refer to our wiki for tips:
-# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
-
- DEB_VER=$(ver_cut 1)
- NSS_VER=$(ver_cut 2-)
- RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
- # Debian precompiled version.
- PRECOMPILED=true
- inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
- https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
- cacert? (
- https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
- )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-CDEPEND="app-misc/c_rehash
- sys-apps/debianutils"
-
-BDEPEND="${CDEPEND}"
-if ! ${PRECOMPILED} ; then
- BDEPEND+=" ${PYTHON_DEPS}"
-fi
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-
-RDEPEND="${CDEPEND}
- ${DEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
- # For the conversion to having it in CONFIG_PROTECT_MASK,
- # we need to tell users about it once manually first.
- [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
- || ewarn "You should run update-ca-certificates manually after etc-update"
-
- if ! ${PRECOMPILED} ; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_unpack() {
- if ! ${PRECOMPILED} ; then
- default
- # Initial 20200601 deb release had bad naming inside the debian source tarball.
- DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
- DEB_BAD_S="${WORKDIR}/work"
- if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
- mv "${DEB_BAD_S}" "${DEB_S}"
- fi
- fi
-
- # Do all the work in the image subdir to avoid conflicting with source
- # dirs in ${WORKDIR}. Need to perform everything in the offset #381937
- mkdir -p "image/${EPREFIX}" || die
- cd "image/${EPREFIX}" || die
-
- ${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- mkdir -p usr/sbin || die
- cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
- usr/sbin/ || die
-
- pushd "${S}"/${PN}-${DEB_VER} >/dev/null || die
- eapply "${FILESDIR}"/${PN}-no-cryptography.patch
- popd >/dev/null || die
-
- if use cacert ; then
- pushd "${S}"/nss-${NSS_VER} >/dev/null || die
- eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
- popd >/dev/null || die
- fi
- fi
-
- default
- eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- -e 's/openssl rehash/c_rehash/' \
- usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-
- # Grab the database from the nss sources.
- cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
- emake -C "${d}"
-
- # Now move the files to the same places that the precompiled would.
- mkdir -p etc/ssl/certs \
- etc/ca-certificates/update.d \
- "${c}"/mozilla \
- || die
- if use cacert ; then
- mkdir -p "${c}"/cacert.org || die
- mv "${d}"/CA_Cert_Signing_Authority.crt \
- "${c}"/cacert.org/cacert.org_class1.crt || die
- mv "${d}"/CAcert_Class_3_Root.crt \
- "${c}"/cacert.org/cacert.org_class3.crt || die
- fi
- mv "${d}"/*.crt "${c}"/mozilla/ || die
- else
- mv usr/share/doc/{ca-certificates,${PF}} || die
- fi
-
- (
- echo "# Automatically generated by ${CATEGORY}/${PF}"
- echo "# $(date -u)"
- echo "# Do not edit."
- cd "${c}" || die
- find * -name '*.crt' | LC_ALL=C sort
- ) > etc/ca-certificates.conf
-
- sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
- cp -pPR image/* "${D}"/ || die
- if ! ${PRECOMPILED} ; then
- cd ${PN}-${DEB_VER} || die
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- doenvd 98ca-certificates
-}
-
-pkg_postinst() {
- if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
- # if the user has local certs, we need to rebuild again
- # to include their stuff in the db.
- # However it's too overzealous when the user has custom certs in place.
- # --fresh is to clean up dangling symlinks
- "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
- fi
-
- if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
- ewarn "Removing the following broken symlinks:"
- ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
- fi
-}
diff --git a/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch b/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch
deleted file mode 100644
index 6e41ac3..0000000
--- a/app-misc/ca-certificates/files/ca-certificates-20150426-root.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-add a --root option so we can generate with DESTDIR installs
-
---- a/image/usr/sbin/update-ca-certificates
-+++ b/image/usr/sbin/update-ca-certificates
-@@ -30,6 +30,8 @@ LOCALCERTSDIR=/usr/local/share/ca-certificates
- CERTBUNDLE=ca-certificates.crt
- ETCCERTSDIR=/etc/ssl/certs
- HOOKSDIR=/etc/ca-certificates/update.d
-+ROOT=""
-+RELPATH=""
-
- while [ $# -gt 0 ];
- do
-@@ -59,13 +61,25 @@ do
- --hooksdir)
- shift
- HOOKSDIR="$1";;
-+ --root|-r)
-+ shift
-+ # Needed as c_rehash wants to read the files directly.
-+ # This gets us from $CERTSCONF to $CERTSDIR.
-+ RELPATH="../../.."
-+ ROOT=$(readlink -f "$1");;
- --help|-h|*)
-- echo "$0: [--verbose] [--fresh]"
-+ echo "$0: [--verbose] [--fresh] [--root <dir>]"
- exit;;
- esac
- shift
- done
-
-+CERTSCONF="$ROOT$CERTSCONF"
-+CERTSDIR="$ROOT$CERTSDIR"
-+LOCALCERTSDIR="$ROOT$LOCALCERTSDIR"
-+ETCCERTSDIR="$ROOT$ETCCERTSDIR"
-+HOOKSDIR="$ROOT$HOOKSDIR"
-+
- if [ ! -s "$CERTSCONF" ]
- then
- fresh=1
-@@ -94,7 +107,7 @@ add() {
- -e 's/,/_/g').pem"
- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
- then
-- ln -sf "$CERT" "$PEM"
-+ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM"
- echo "+$PEM" >> "$ADDED"
- fi
- # Add trailing newline to certificate, if it is missing (#635570)
diff --git a/app-misc/ca-certificates/files/ca-certificates-no-cryptography.patch b/app-misc/ca-certificates/files/ca-certificates-no-cryptography.patch
deleted file mode 100644
index 83cfb92..0000000
--- a/app-misc/ca-certificates/files/ca-certificates-no-cryptography.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/mozilla/certdata2pem.py
-+++ b/mozilla/certdata2pem.py
-@@ -28,8 +28,6 @@
- import textwrap
- import io
-
--from cryptography import x509
--
-
- objects = []
-
-@@ -122,12 +120,6 @@
- if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]:
- continue
-
-- cert = x509.load_der_x509_certificate(obj['CKA_VALUE'])
-- if cert.not_valid_after < datetime.datetime.now():
-- print('!'*74)
-- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL'])
-- print('!'*74)
--
- bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\
- .replace(' ', '_')\
- .replace('(', '=')\
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
deleted file mode 100644
index 250e307..0000000
--- a/app-misc/ca-certificates/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <use>
- <flag name="cacert">
- Include root/class3 certs from CAcert (https://www.cacert.org/)
- </flag>
- </use>
-</pkgmetadata>
diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.9-r1.ebuild
index c1bd16f..fdb219d 100644
--- a/app-text/zathura/zathura-0.4.8.ebuild
+++ b/app-text/zathura/zathura-0.4.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,7 +23,7 @@ IUSE="doc +magic seccomp sqlite synctex test"
RESTRICT="!test? ( test )"
-DEPEND=">=dev-libs/girara-0.3.3
+DEPEND=">=dev-libs/girara-0.3.7
>=dev-libs/glib-2.50:2
>=sys-devel/gettext-0.19.8
x11-libs/cairo
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
deleted file mode 100644
index 00aa622..0000000
--- a/app-text/zathura/zathura-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
- EGIT_BRANCH="develop"
-else
- SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-libs/girara-0.3.3
- >=dev-libs/glib-2.50:2
- >=sys-devel/gettext-0.19.8
- x11-libs/cairo
- >=x11-libs/gtk+-3.22:3
- magic? ( sys-apps/file )
- seccomp? ( sys-libs/libseccomp )
- sqlite? ( >=dev-db/sqlite-3.5.9:3 )
- synctex? ( app-text/texlive-core )"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="doc? ( dev-python/docutils )
- test? ( dev-libs/appstream-glib
- dev-libs/check )
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/zathura-docutils.patch"
-)
-
-src_configure() {
- local emesonargs=(
- -Dconvert-icon=disabled
- -Dmagic=$(usex magic enabled disabled)
- -Dmanpages=$(usex doc enabled disabled)
- -Dseccomp=$(usex seccomp enabled disabled)
- -Dsqlite=$(usex sqlite enabled disabled)
- -Dsynctex=$(usex synctex enabled disabled)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest
deleted file mode 100644
index 0015a5f..0000000
--- a/dev-cpp/highway/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST highway-0.15.0.tar.gz 1598512 BLAKE2B f0ee61b5f19591d88d6fd3950072c9302b13e589ac9e8759444c0bcde2c804438313b1b37c2e3d9c40296898c8fc938a2ae57eba3e17d73a9388c21f20b97b59 SHA512 ed07e855721f87ea67d762b30e001643a76bd16d70372415023c8e6f1a43c58759a14a638e8eb20566863d8358d994153bf7a660fcf604e808adfea5f938a013
diff --git a/dev-cpp/highway/highway-0.15.0.ebuild b/dev-cpp/highway/highway-0.15.0.ebuild
deleted file mode 100644
index 6111907..0000000
--- a/dev-cpp/highway/highway-0.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch"
-HOMEPAGE="https://github.com/google/highway"
-SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
-RDEPEND=""
-BDEPEND=""
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
- -DHWY_SYSTEM_GTEST=ON
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
deleted file mode 100644
index 1a4cc83..0000000
--- a/dev-cpp/pangomm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
diff --git a/dev-cpp/pangomm/files/pangomm-pango-1.50.patch b/dev-cpp/pangomm/files/pangomm-pango-1.50.patch
deleted file mode 100644
index 9f2d14e..0000000
--- a/dev-cpp/pangomm/files/pangomm-pango-1.50.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pango/pangomm/attributes.h
-+++ b/pango/pangomm/attributes.h
-@@ -30,6 +30,9 @@
- #include <pangomm/color.h>
- #include <pangomm/fontdescription.h>
- #include <pango/pango-attributes.h>
-+#if __has_include(<pango/pango-markup.h>)
-+#include <pango/pango-markup.h>
-+#endif
- #include <glibmm/slisthandle.h>
diff --git a/dev-cpp/pangomm/pangomm-2.42.2-r2.ebuild b/dev-cpp/pangomm/pangomm-2.42.2-r2.ebuild
deleted file mode 100644
index 45d4050..0000000
--- a/dev-cpp/pangomm/pangomm-2.42.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome.org meson-multilib python-any-r1
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND="
- >=dev-cpp/cairomm-1.2.2:0[doc?,${MULTILIB_USEDEP}]
- >=dev-cpp/glibmm-2.48.0:2[doc?,${MULTILIB_USEDEP}]
- dev-libs/libsigc++:2[doc?,${MULTILIB_USEDEP}]
- x11-libs/pango[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? (
- app-doc/doxygen[dot]
- dev-lang/perl
- dev-libs/libxslt
- )
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- "${FILESDIR}/pangomm-pango-1.50.patch"
-)
-
-multilib_src_configure() {
- local emesonargs=(
- $(meson_native_use_bool doc build-documentation)
- )
- meson_src_configure
-}
diff --git a/dev-dotnet/dotnet-runtime-bin/Manifest b/dev-dotnet/dotnet-runtime-bin/Manifest
new file mode 100644
index 0000000..ff131a9
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-bin/Manifest
@@ -0,0 +1,6 @@
+DIST dotnet-runtime-3.1.22-linux-arm.tar.gz 31839966 BLAKE2B 9c795546a050045514db22a65c620f44d2c072da423f52ba79afa8071b735a830658c3cc0c5c7e45f315fd8bc54feb3ff5424cdade4294f2b3e8efd08036c1e2 SHA512 2b189ab7fa7c2a42c155a270c59ec149b78194aa4c84c2e35b236e757ae73b7d0055bcade6d45e208f00e391fecb04fa5f71ef51a6a0851f29949517d33086fa
+DIST dotnet-runtime-3.1.22-linux-arm64.tar.gz 30278059 BLAKE2B e2a0bf1d87c2c279a6990a54be68e21491680ca6c3319fcc5620a526401ac31cbfd0ae5b000730631663f8ad4a43cb90447746dd00f9a039dbe901c0c63f74cf SHA512 ac7abb9273d1446ecacf536d2c59b01f23de81a21db035c98e53f63f64f8c3d252b613c24b7f9ea9e559f9c75385d93528ae0207aa7b734dba421c8871f312ed
+DIST dotnet-runtime-3.1.22-linux-x64.tar.gz 30440387 BLAKE2B 4f2adb7ab9af43c26d61f72fd36a91e03b3bbc66e4010a7cde8b3c84bb741ba53b7c18959582e694b0f94c83791cd6217dfb1b324693ee2d8dd427a28e287660 SHA512 4e32b45086fbd630622d20b0b2316d0c9bd66647b38ef1475c9bf8ef755bd60ec7eb8055a8de2bf89ed96e0460abc9e68f500189dd5437e21f2dfbd4fc71693e
+DIST dotnet-runtime-6.0.4-linux-arm.tar.gz 28633539 BLAKE2B 188dfdbf0e7fdcb087b22f3d73b65ab04585da6d3c88f3a9bb59822f1a47825363e84ce16e755ad9eb0dda0e9380d2cc07ccc0fdd014751d6f414a08734d437a SHA512 688b6c6a35786fd36fb8468953d69e5713f8b62e7aace6b836b70051f827a78565c841cf7913412b6319980aab2dab7e52755993cae36fad676d70ffdce968e4
+DIST dotnet-runtime-6.0.4-linux-arm64.tar.gz 28381527 BLAKE2B 02130eba87cddd0d29a737e3cf853e113c308c94517120be07769ed5d46e2e3097645b5362bb5f9a32c43b713f084811443b16c9218bf3010a8f96e97d94e2e7 SHA512 acbb50f2a1cde2bb8f59ec2059cd90f669748ce0da519ddbb831d8f279c4b896cc7a8f4275fb2c4726c5caf3d6430ee6d9823baa6f65238c7017ecbc2b8a6444
+DIST dotnet-runtime-6.0.4-linux-x64.tar.gz 30685905 BLAKE2B e72950a21f567dc0ed69cfab5a4c5bb95ecb084b98d38569ad2d447bf4bced1cf809354004941af6ab4ae44c54d3e60c17a3e96389270fa68f932079eb0d15cd SHA512 001487bfb337d0f737c4e3dedc4bc41b3185922c07c07e8f1d47e4578914fdeeed7421d7af2c4bb5e17ebddd05fde4cb9aea1e8145018dcffeaca70c1fa49bbb
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.22.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.22.ebuild
new file mode 100644
index 0000000..12d4b2a
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.22.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/"
+LICENSE="MIT"
+
+SRC_URI="
+amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
+arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
+arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
+"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="dotnet-symlink kerberos lttng"
+REQUIRED_USE="elibc_glibc"
+QA_PREBUILT="*"
+RESTRICT="splitdebug"
+RDEPEND="
+ kerberos? ( app-crypt/mit-krb5:0/0 )
+ lttng? ( dev-util/lttng-ust:0 )
+ sys-libs/zlib:0/1
+ dotnet-symlink? (
+ !dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
+ !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
+ !dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
+ )
+"
+
+S=${WORKDIR}
+
+delete() {
+ local x
+ x=$(find . -name "$1" -print -delete) && [ -n "$x" ]
+}
+
+src_compile() {
+ use kerberos || delete System.Net.Security.Native.so || die
+ use lttng || delete libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+ local dest="opt/${PN}-${SLOT}"
+ dodir "${dest%/*}"
+
+ { mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
+ dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
+
+ if use dotnet-symlink; then
+ dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
+ dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
+
+ # set an env-variable for 3rd party tools
+ echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
+ doenvd "${T}/90${PN}-${SLOT}"
+ fi
+}
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.4.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.4.ebuild
new file mode 100644
index 0000000..fb09294
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
+HOMEPAGE="https://dotnet.microsoft.com/"
+LICENSE="MIT"
+
+SRC_URI="
+amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz )
+arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz )
+arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz )
+"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+dotnet-symlink kerberos lttng"
+REQUIRED_USE="elibc_glibc"
+QA_PREBUILT="*"
+RESTRICT="splitdebug"
+RDEPEND="
+ kerberos? ( app-crypt/mit-krb5:0/0 )
+ lttng? ( dev-util/lttng-ust:0 )
+ sys-libs/zlib:0/1
+ dotnet-symlink? (
+ !dev-dotnet/dotnet-sdk[dotnet-symlink(+)]
+ !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)]
+ !dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
+ )
+"
+
+S=${WORKDIR}
+
+delete() {
+ local x
+ x=$(find . -name "$1" -print -delete) && [ -n "$x" ]
+}
+
+src_compile() {
+ use kerberos || delete libSystem.Net.Security.Native.so || die
+ use lttng || delete libcoreclrtraceptprovider.so || die
+}
+
+src_install() {
+ local dest="opt/${PN}-${SLOT}"
+ dodir "${dest%/*}"
+
+ { mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die
+
+ if use dotnet-symlink; then
+ dosym "../../${dest}/dotnet" "/usr/bin/dotnet"
+ dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}"
+ dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}"
+
+ # set an env-variable for 3rd party tools
+ echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die
+ doenvd "${T}/90${PN}-${SLOT}"
+ fi
+}
diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest
index 8fe2377..3a89c75 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,16 +1,16 @@
-DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 258280215 SHA256 0138156b0388f7f06bbe67a6ed982ea7d14a372c5e5d14c6e7d53dc17c58f932
-DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.1_12_openj9-0.29.1.tar.gz 261666497 SHA256 6d4fc24664d85b6c8f9c3b4c279ef8237dbec8397e277b775f7459ed5d423df8
-DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 312477496 SHA256 f898c2a081a4e3cc56146ab731edf1ede9e72644ad9a5d8a4c5125766260403f
-DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.1_12_openj9-0.29.1.tar.gz 315841869 SHA256 3d463cfc6829350293d7fbbc95a8614282287ffb5b8ce2da8c600b4ca2d64d1b
-DIST ibm-semeru-open-debugimage_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 276384710 SHA256 7632165750d00ed0ce5c14fcd5e261daf4e7873d53969183189779575e10d8c6
-DIST ibm-semeru-open-debugimage_s390x_linux_17.0.1_12_openj9-0.29.1.tar.gz 279619663 SHA256 14056d435f56a3f1bac1d6b8b41610345bc6942d2d7a4728de62236493581024
-DIST ibm-semeru-open-debugimage_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 322796284 SHA256 b049b1dfe36079caa937262d5b1c83a7e0e5d88704315e819aac1d1480e0da60
-DIST ibm-semeru-open-debugimage_x64_linux_17.0.1_12_openj9-0.29.1.tar.gz 326242836 SHA256 fd541c2dae76a630776418b99f55c4825ab5083025470a38b45df310b8269234
-DIST ibm-semeru-open-jdk_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 197781632 SHA256 151dca23e1fdb43eaa60631c96895be9aa7bb751e7fdf88ddffa1c32157fb417
-DIST ibm-semeru-open-jdk_aarch64_linux_17.0.1_12_openj9-0.29.1.tar.gz 202169246 SHA256 5e0f80052ac4613d2d689904b20ff8b6e2bbd1edd87271db0659a646a24dfeb6
-DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 203079177 SHA256 7b304c52974f51611b45a2ab7949503e33a204b8a4ae705eb3c74789350174d3
-DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.1_12_openj9-0.29.1.tar.gz 207687300 SHA256 80b6389dbed9b7de9c63b1cb423e719aa5e6fbab42387fdb1f68d9d199bf5196
-DIST ibm-semeru-open-jdk_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 199870826 SHA256 6c3ebb4af0f4066e721e1f0078438458775f4b93bfd2d0be1066c54ccf015654
-DIST ibm-semeru-open-jdk_s390x_linux_17.0.1_12_openj9-0.29.1.tar.gz 203493613 SHA256 56e01c97f98bfb2cf9959b09b5d0cfae9993f82f1f54f77ef1199425c0b64bc2
-DIST ibm-semeru-open-jdk_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 202193589 SHA256 3975e2732cf632ca8f41c237ba7e033fd96bda262b79861f83b4e2ac62c90c3d
-DIST ibm-semeru-open-jdk_x64_linux_17.0.1_12_openj9-0.29.1.tar.gz 207287538 SHA256 154f6411742ee1f8cbf004d72e7e71053b9ad4e89090cb930b6f16951e56503e
+DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.15_10_openj9-0.32.0.tar.gz 259077332 SHA256 8738ecff450a3c9eda09e325206d46b438c7581e8f52af56bfe6022dc81be683
+DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.3_7_openj9-0.32.0.tar.gz 262309737 SHA256 e32dcad9007071340d980db98fc9027c7e41b87f979b1320ab887aa781c12d29
+DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.15_10_openj9-0.32.0.tar.gz 326391349 SHA256 d22a8619a006a5d2b5a983e594fbb9d12c38b9880fb266c99b3e447d1766ff11
+DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.3_7_openj9-0.32.0.tar.gz 329696292 SHA256 e0412cf2697231c5901d45824a2aaf6ff86de570bc464ad400990b48b8e4c978
+DIST ibm-semeru-open-debugimage_s390x_linux_11.0.15_10_openj9-0.32.0.tar.gz 277127978 SHA256 5c2376dc5c186970ea903876a21949b868ffcf7e96ce0d201f6e19c3b984379d
+DIST ibm-semeru-open-debugimage_s390x_linux_17.0.3_7_openj9-0.32.0.tar.gz 280254531 SHA256 6df2a6c8767ae86afc83a3ee8128d6b7ae4cd796c8909bb007ceac09316e10f4
+DIST ibm-semeru-open-debugimage_x64_linux_11.0.15_10_openj9-0.32.0.tar.gz 334913689 SHA256 dc790d4ef3211235896e4be2838bf3b7854cbf2e30fb17d458c71acafb3849d1
+DIST ibm-semeru-open-debugimage_x64_linux_17.0.3_7_openj9-0.32.0.tar.gz 340909244 SHA256 ed93953a69b888fa980e7cc4d53f6f30b77de73ebd51dfb9d32035ebbeab0851
+DIST ibm-semeru-open-jdk_aarch64_linux_11.0.15_10_openj9-0.32.0.tar.gz 198145052 SHA256 4703a9a73796497014f76d0b863e7c22e28c18628edbd9f167a0d5790adda73e
+DIST ibm-semeru-open-jdk_aarch64_linux_17.0.3_7_openj9-0.32.0.tar.gz 202491758 SHA256 07ee14c56e9f371a18887b907e03ee3f297ef2a535521e9d0624ac0b033dd35f
+DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.15_10_openj9-0.32.0.tar.gz 203442081 SHA256 aaa15818ed2dcf61dbf642cadc589747f329464fc44503bae6776c79b6985877
+DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.3_7_openj9-0.32.0.tar.gz 208057544 SHA256 c0b667f735c19f7d4ce0ef594354b46866660b7648727bf7f4b9bea5f9464790
+DIST ibm-semeru-open-jdk_s390x_linux_11.0.15_10_openj9-0.32.0.tar.gz 200292301 SHA256 a2eee1e0db7bdc21a055e4c6ee8cdb9477b45dd64f8e8317bafdf5fdc4878ce5
+DIST ibm-semeru-open-jdk_s390x_linux_17.0.3_7_openj9-0.32.0.tar.gz 203843485 SHA256 68ad59228c05674c39ebbd3dc4d8997a21e4c413b5522d0c0e27098dca920895
+DIST ibm-semeru-open-jdk_x64_linux_11.0.15_10_openj9-0.32.0.tar.gz 202667780 SHA256 7063d7dc3e078b70040d156d520b30f8bb6b1985d0417fec908533cbe0beaf8c
+DIST ibm-semeru-open-jdk_x64_linux_17.0.3_7_openj9-0.32.0.tar.gz 207430454 SHA256 7dca04533d539675cc22d60d567b660bbf9a5a8c6ce832a189caea753590bbdd
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.13.8.0.29.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.15.10.0.32.0.ebuild
index 32b852c..32b852c 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.13.8.0.29.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.15.10.0.32.0.ebuild
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.1.12.0.29.1.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.3.7.0.32.0.ebuild
index 32b852c..32b852c 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.1.12.0.29.1.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.3.7.0.32.0.ebuild
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index f69c8d5..458082f 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,8 +1,8 @@
-DIST ibm-semeru-open-jre_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 42122642 SHA256 b56f464c2f46aa779897f076edb4c3c37d0280784bcc3b7a46228a32a9e62470
-DIST ibm-semeru-open-jre_aarch64_linux_17.0.1_12_openj9-0.29.1.tar.gz 41883291 SHA256 9763bdceaaa712b3d432b0b5961cef2140cd986669f887d55463da07748537b2
-DIST ibm-semeru-open-jre_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 44652787 SHA256 3615940d4b26e8d11ff927dbf620a5247caecd84ba24c9d67f0e8b30ff463998
-DIST ibm-semeru-open-jre_ppc64le_linux_17.0.1_12_openj9-0.29.1.tar.gz 44451029 SHA256 1b29af021509e9aa6066953609ea1df661764695a934c0dc0c1abefeee88ff8b
-DIST ibm-semeru-open-jre_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 43141369 SHA256 e942c0806163bbabe0b7ec8e630319489da400d58cd390011fc28428f468558e
-DIST ibm-semeru-open-jre_s390x_linux_17.0.1_12_openj9-0.29.1.tar.gz 42719983 SHA256 e19f4981cef24b8a2b008e14ddbf1481239ef189d22557ea4768b30605e07639
-DIST ibm-semeru-open-jre_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 43966499 SHA256 78eb54af15fac39eb2d254f51f0302aa213d3ad838f17766a9d081ca783edff4
-DIST ibm-semeru-open-jre_x64_linux_17.0.1_12_openj9-0.29.1.tar.gz 44078476 SHA256 69f1f7a6b3d4a701f3c25ac338768d8a414594fa2c50ddfbd8c014e8a5e790db
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.15_10_openj9-0.32.0.tar.gz 45000822 SHA256 69e4a0b383c7b4187478ddb196de3cdc91560e2be40b8ef66354591e87c36e85
+DIST ibm-semeru-open-jre_aarch64_linux_17.0.3_7_openj9-0.32.0.tar.gz 44737346 SHA256 f899948ea0c5dc80a66f801db585939a25a4ae7e1f21a9a8f3bf3749c3baa87f
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.15_10_openj9-0.32.0.tar.gz 47560053 SHA256 5e82f7df54786c557d2d9e9ac22df655fd94b9702c73261390903ac87532d545
+DIST ibm-semeru-open-jre_ppc64le_linux_17.0.3_7_openj9-0.32.0.tar.gz 47330809 SHA256 9c54166490ac55a6bd26249b57eae5df4531635f4871e6642e7979affc894875
+DIST ibm-semeru-open-jre_s390x_linux_11.0.15_10_openj9-0.32.0.tar.gz 46024137 SHA256 def85f1b00e9c65a8c3b5dcf4da0f1b04c17675b4ff9cd6f5dad61d8dcbd03d0
+DIST ibm-semeru-open-jre_s390x_linux_17.0.3_7_openj9-0.32.0.tar.gz 45585241 SHA256 4e2f631ad18c288e419db5c35295829dd7e83f4cd1be95252db06eb622b23090
+DIST ibm-semeru-open-jre_x64_linux_11.0.15_10_openj9-0.32.0.tar.gz 46879082 SHA256 25d4d5e2bbe3eb19bcb9a76aec4b43d4eef5ad66200df3122118f69da5325cf6
+DIST ibm-semeru-open-jre_x64_linux_17.0.3_7_openj9-0.32.0.tar.gz 46954980 SHA256 dad35fec82047e3a82c6e2dda8b53ee763b55aaedaed13b7b130856f4a3ffd35
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.13.8.0.29.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild
index 52c9fd3..52c9fd3 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.13.8.0.29.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.1.12.0.29.1.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild
index 52c9fd3..52c9fd3 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.1.12.0.29.1.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index bfa52d1..1c1b7c0 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,6 +1,4 @@
-DIST openj9-0.29.0.tar.gz 16776743 BLAKE2B 524fc53506be1521c07ce6a65ec17419e7d228baa7543342b4011a223c6f2d1e50d80e2d4eee51cc8cfe89bf387ae17a9eb7d28ce61a5d8ff8bc790307061882 SHA512 accfb336b52c94f6988ef47c79c8be3fe841e37611596e61edaad57c801856c53ea248daab41f05a5487873d002f75b3a684588cb81b0fb0270f2638d6d06ed7
-DIST openj9-0.29.1.tar.gz 16789002 BLAKE2B 8cb49c7ebf89e50c6f7802912d3666d0be3a5614558daa17b90dcdc73b5b11e82265445df6064f4c03db220473320b1a164c4f3274a0316644d2c63d5b1aa71e SHA512 e61aaba78e836f209d35f0aaa344f727e0a9c77ec8efee68fa3a9d73dba44040bba12953ed2dff3475b3dfa94f9f4db6d7978a1b5dd05ae5a6db9eaa60fa83fa
-DIST openj9-omr-0.29.0.tar.gz 7852434 BLAKE2B 6f77abbf2597ee4f71aec7eb44e5a9f54c76fde7e3d432415d34c94c84dc00d49c3cd716c6cda4e0fea807b8ba87345b2c94a0014019154a0c60dde4a00db7b1 SHA512 de58cc6b3c2f3d657b8f588151b96acfffc63af274ef6d9c06e5e832c45c246476475c2d40b657c852d2d6f1915ea52095dae89defdaa644cd14f35500e0939f
-DIST openj9-omr-0.29.1.tar.gz 7852824 BLAKE2B 947e0ec74dcc327b646af7274f0a270a1f4b90f542b8a275e8bb839f8937191d171259da9727cd76bca9b1a83bf20713c538bcc6344d35949e617c293bb63e3d SHA512 8374fc5295cc082496d8e12e00450f57c08bbe4f320bd18a3dd4e5b190091022250b2077867abd81aa2da1bcacd04741d4b07d7e08275237c6997c446bcbead2
-DIST openj9-openjdk-jdk11-openj9-0.29.0.tar.gz 108964710 BLAKE2B 40526d85b988cbcd04ea254c120fd6cffecd2a1d3ce16e8dde54a3bffad81aea9d78b56804671a79684dfb327f6a8176d15b08e06f1e0b9f64f360c113a2b1b2 SHA512 a033b50bbe49c80c97ecf5f49757913815fcb15c1b8b6574f4039899b254febcbc8deaa49b2e5fd255d5dbcb9fccef9d7778971efa41ea3b0a09a40a0b65c87e
-DIST openj9-openjdk-jdk17-openj9-0.29.1.tar.gz 93765672 BLAKE2B b1825236b7a7e6ee70beefde588cde79d35b03f29b7f7ca83b3db178c9d0df318bd07dac81a09266466d094a567990448cad6746953643f7bf51870dc90cf169 SHA512 1fba0cce3840a70b7e43022991034dedc073f1989937fe9cbee1a2260fda71adf729e2bb67ef25e6300f830b69089edb792b35784c09e59e9fc996c38797dec6
+DIST openj9-0.32.0.tar.gz 17217439 BLAKE2B ced6f66129b88d4c3def9f438cd95b98610be7edd66da0fedb9f8cc9c7a5357db49eeee0556ad3ccbdd2e6d5e999c1e75be24db28e963b48fc283bd94bb79466 SHA512 885e86e4a74b095aa333a9ad8456f28d5d0dce19e253af49e5a7fc8de9219e2352f7a52b4b6c043ff2d7882346277c7d3f11f6a1921202ffeb11f7a2c6898c6f
+DIST openj9-omr-0.32.0.tar.gz 7873035 BLAKE2B 0344b4a07c1ad06aeb5e32bdd5485e49a495469906ae36a373d5809e7514b5177177cba61b21e38d4512c65c46e68ba678178ca732bcf92610011a879f04b015 SHA512 398c39d9db8ca3713d5fb4efb34f72820436a8839784a606504659a24a543ed4b8f28ddbd5fef38e7c1a6a55dd4ed6f59b45f6321361387d829f76fbdba6034b
+DIST openj9-openjdk-jdk11-openj9-0.32.0.tar.gz 109076014 BLAKE2B 297fc7902fd3f194b948426cf5c3e6f130b81d7eb4dc2e752754ee4e7c72aa7ca36f5b4df985aea148002d557112763fad97c902fc029a41c441dc3a095fef9a SHA512 4f11715a33bec02bcf20657e69bf4b8bd0820aae5c7bf457aacf115cad654730ee151e9d57bfa6db6d33110178e0820c8a44fc850d2a5eb5064aaf51849bc176
+DIST openj9-openjdk-jdk17-openj9-0.32.0.tar.gz 93908310 BLAKE2B 56551dd892354e55d02f25db00df1f3142b41f29a5f45b2f015e45e0b7811b755f2d10f522f2382efef39bc6aa99db54c41f0b0c28dbda1d2439a0b74f687e5e SHA512 32c6f6f14f597ee5aaac66a3da37aaf989bd0f1ba542e3823e6fd788ebd341d04b440f165ceee033529fbb58c1b5227ed9de28bad2d9610706717bf313d7f18d
diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml
index 1616443..5847839 100644
--- a/dev-java/openj9-openjdk/metadata.xml
+++ b/dev-java/openj9-openjdk/metadata.xml
@@ -7,7 +7,6 @@
</maintainer>
<use>
<flag name="ddr">Enable Direct Dump Reader</flag>
- <flag name="custom-optimization">Override OpenJDK and OpenJ9 per-module optimization flags</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
<flag name="javafx">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.32.0.ebuild
index 07ab41d..18a4b68 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.32.0.ebuild
@@ -27,7 +27,7 @@ fi
LICENSE="GPL-2"
KEYWORDS="~amd64"
-IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+IUSE="alsa cups custom-optimization ddr debug doc gentoo-vm headless-awt javafx +jbootstrap selinux source systemtap"
COMMON_DEPEND="
media-libs/freetype:2=
@@ -85,8 +85,6 @@ DEPEND="
)
"
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
# The space required to build varies wildly depending on USE flags,
@@ -205,6 +203,7 @@ src_configure() {
local myconf=(
--disable-ccache
+ --disable-precompiled-headers
--disable-warnings-as-errors{,-omr,-openj9}
--enable-full-docs=no
--with-boot-jdk="${JDK_HOME}"
@@ -225,7 +224,6 @@ src_configure() {
--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
--with-vendor-version-string="${PVR}"
--with-version-pre=""
- --with-version-opt=""
--with-zlib=system
--enable-dtrace=$(usex systemtap yes no)
--enable-headless-only=$(usex headless-awt yes no)
@@ -244,13 +242,6 @@ src_configure() {
fi
fi
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
(
unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
@@ -296,10 +287,6 @@ src_install() {
rm -v lib/libjsound.* || die
fi
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
if ! use source ; then
rm -v lib/src.zip || die
fi
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.32.0.ebuild
index 93bdcf3..2c42e9a 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.32.0.ebuild
@@ -27,7 +27,7 @@ fi
LICENSE="GPL-2"
KEYWORDS="~amd64"
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap numa +pch selinux source systemtap"
+IUSE="alsa cups ddr debug doc gentoo-vm headless-awt javafx +jbootstrap numa selinux source systemtap"
COMMON_DEPEND="
media-libs/freetype:2=
@@ -86,8 +86,6 @@ DEPEND="
)
"
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
# The space required to build varies wildly depending on USE flags,
@@ -205,6 +203,7 @@ src_configure() {
local myconf=(
--disable-ccache
+ --disable-precompiled-headers
--disable-warnings-as-errors{,-omr,-openj9}
--enable-full-docs=no
--with-boot-jdk="${JDK_HOME}"
@@ -225,7 +224,6 @@ src_configure() {
--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
--with-vendor-version-string="${PVR}"
--with-version-pre=""
- --with-version-opt=""
--with-zlib=system
--enable-dtrace=$(usex systemtap yes no)
--enable-headless-only=$(usex headless-awt yes no)
@@ -244,13 +242,6 @@ src_configure() {
fi
fi
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
(
unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
CFLAGS= CXXFLAGS= LDFLAGS= \
@@ -297,10 +288,6 @@ src_install() {
rm -v lib/libjsound.* || die
fi
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
if ! use source ; then
rm -v lib/src.zip || die
fi
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
new file mode 100644
index 0000000..b55846f
--- /dev/null
+++ b/dev-lang/zig/Manifest
@@ -0,0 +1 @@
+DIST zig-0.9.0.tar.gz 21994175 BLAKE2B aadef89d5fddc3e802965125625e62140ac37bdac40b29ab8b7652056589c037cbed5d4e46889f335b3c296fb4ae2a7cafd5d064a02d728a8325ad515cdc8c7a SHA512 fef36221e818364b45cf65de210b0a9d535c411a510371a3ab4dfd6f4621c0a16dba786169f115a006966875102acc742abee19a74d83e2bc999ea5b8304b879
diff --git a/dev-cpp/pangomm/metadata.xml b/dev-lang/zig/metadata.xml
index 7c900b1..9a74b67 100644
--- a/dev-cpp/pangomm/metadata.xml
+++ b/dev-lang/zig/metadata.xml
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">ziglang/zig</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-lang/zig/zig-0.9.0.ebuild b/dev-lang/zig/zig-0.9.0.ebuild
new file mode 100644
index 0000000..76f45f3
--- /dev/null
+++ b/dev-lang/zig/zig-0.9.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+inherit cmake llvm
+
+DESCRIPTION="A robust, optimal, and maintainable programming language"
+HOMEPAGE="https://ziglang.org/"
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/ziglang/zig.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!test? ( test )"
+
+BUILD_DIR="${S}/build"
+
+# According to zig's author, zig builds that do not support all targets are not
+# supported by the upstream project.
+ALL_LLVM_TARGETS=(
+ AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX
+ PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+)
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]/%/(-)?}"
+
+IUSE="test ${ALL_LLVM_TARGETS[*]}"
+
+RDEPEND="
+ sys-devel/clang:${LLVM_MAX_SLOT}
+ >=sys-devel/lld-${LLVM_MAX_SLOT}
+ <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1))
+ sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}]
+"
+DEPEND="${RDEPEND}"
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+ local mysedargs=() llvm_target arch
+ for target in "${ALL_LLVM_TARGETS[@]}"; do
+ if ! use $target; then
+ llvm_target=${target#llvm_targets_}
+ case $llvm_target in
+ AArch64) arch=(aarch64 aarch64_be aarch64_32);;
+ AMDGPU) arch=(amdgcn);;
+ ARM) arch=(thumb thumbeb arm armeb);;
+ AVR) arch=(avr);;
+ BPF) arch=(bpfel bpfeb);;
+ Hexagon) arch=(hexagon);;
+ Lanai) arch=(lanai);;
+ Mips) arch=(mips mipsel mips64 mips64el);;
+ MSP430) arch=(msp430);;
+ NVPTX) arch=(nvptx nvptx64);;
+ PowerPC) arch=(powerpc powerpcle powerpc64 powerpc64le);;
+ RISCV) arch=(riscv32 riscv64);;
+ Sparc) arch=(sparc sparcv9 sparcel);;
+ SystemZ) arch=(s390x);;
+ WebAssembly) arch=(wasm32 wasm64);;
+ X86) arch=(i386 x86_64);;
+ XCore) arch=(xcore);;
+ *) die "unhandled target"
+ esac
+ for a in ${arch[@]}; do
+ mysedargs+=(
+ -e "/^pub fn targetTriple(/,/^}/s/\.$a => .*/.$a => return error.@\"Zig compiled without LLVM $llvm_target\",/"
+ )
+ done
+ mysedargs+=(
+ -e "/^fn initializeLLVMTarget(/,/^}/ {
+ /\.$a => {/,/},$/ {
+ s/=>.*/=> unreachable,/
+ /=>/!d
+ }
+ }"
+ )
+ fi
+ done
+ sed -i "${mysedargs[@]}" src/codegen/llvm.zig || die
+
+ local mycmakeargs=(
+ -DZIG_USE_CCACHE=OFF
+ -DZIG_PREFER_CLANG_CPP_DYLIB=ON
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./zig build test || die
+}
diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest
index 7f9aeef..6639f9a 100644
--- a/dev-libs/libdwarf/Manifest
+++ b/dev-libs/libdwarf/Manifest
@@ -1 +1 @@
-DIST libdwarf-0.3.2.tar.xz 1983884 BLAKE2B 92892e64436e88374e97976ef4dccb5571c8c172dd2649790383781b6dd0ee4e2715c53357467069430abe668a3544fe8de4bad3370506ac6513d723b3429f56 SHA512 4898f3b4dc40a9e5bfd91160506dd4a75b5a6e6d3c8eb0c8bc64f90c69eacf7ac9ffc8cdad5ef73df7db9eeef408aafe599f43087e98e06281c2419741930f69
+DIST libdwarf-0.4.0.tar.xz 2380100 BLAKE2B a20c035cdcc15765200a10f4f2afc2f0acdfe6eb7bcf89d331f1b1c6c5dc5c8e87d092c5ff3bacddcc366da4da2db5078ed07148d6f451c9be6c50062335b3f2 SHA512 b26eac7b82f7f7f11584442321b6c06d2fef9678c7007cf280523f5e9130f921ffbcee80a13fcffd7f60fb5783a4aca2a2835b50f695c9a3471bffd3d386f82c
diff --git a/dev-libs/libdwarf/libdwarf-0.3.2.ebuild b/dev-libs/libdwarf/libdwarf-0.4.0.ebuild
index 906a9aa..ee99812 100644
--- a/dev-libs/libdwarf/libdwarf-0.3.2.ebuild
+++ b/dev-libs/libdwarf/libdwarf-0.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="The DWARF Debugging Information Format"
HOMEPAGE="https://github.com/davea42/libdwarf-code"
-SRC_URI="https://github.com/davea42/libdwarf-code/releases/download/${P}/${P}.tar.xz"
+SRC_URI="https://github.com/davea42/libdwarf-code/releases/download/v${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-libs/openssl/openssl-3.0.1-r1.ebuild b/dev-libs/openssl/openssl-3.0.2-r1.ebuild
index 4a42988..98282c5 100644
--- a/dev-libs/openssl/openssl-3.0.1-r1.ebuild
+++ b/dev-libs/openssl/openssl-3.0.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
+inherit flag-o-matic linux-info toolchain-funcs multilib-minimal verify-sig
MY_P=${P/_/-}
@@ -15,14 +15,16 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
- SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+ verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )"
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssl.org.asc
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
fi
LICENSE="Apache-2.0"
SLOT="0/3" # .so version of libssl/libcrypto
-IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla"
+IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
@@ -37,7 +39,8 @@ BDEPEND="
sys-apps/diffutils
sys-devel/bc
sys-process/procps
- )"
+ )
+ verify-sig? ( sec-keys/openpgp-keys-openssl )"
DEPEND="${COMMON_DEPEND}"
@@ -177,6 +180,7 @@ multilib_src_configure() {
$(use_ssl rfc3779)
$(use_ssl sctp)
$(use_ssl tls-compression zlib)
+ $(use_ssl weak-ssl-ciphers)
--prefix="${EPREFIX}"/usr
--openssldir="${EPREFIX}"${SSL_CNF_DIR}
--libdir=$(get_libdir)
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
deleted file mode 100644
index c970f17..0000000
--- a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=c9fde86b0a2440133bc08f4811b6ca793be47f0a
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
- +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
- || ( eglfs linuxfb vnc wayland X )
- accessibility? ( dbus X )
- eglfs? ( egl )
- ibus? ( dbus )
- libinput? ( udev )
- X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
- dev-libs/glib:2
- =dev-qt/qtcore-${QT5_PV}*:5=
- dev-util/gtk-update-icon-cache
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/harfbuzz:=
- sys-libs/zlib:=
- dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
- eglfs? (
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- evdev? ( sys-libs/mtdev )
- jpeg? ( virtual/jpeg )
- gles2-only? ( media-libs/libglvnd )
- !gles2-only? ( media-libs/libglvnd[X] )
- libinput? (
- dev-libs/libinput:=
- x11-libs/libxkbcommon
- )
- png? ( media-libs/libpng:= )
- tslib? ( >=x11-libs/tslib-1.21 )
- tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
- udev? ( virtual/libudev:= )
- vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
- vulkan? ( dev-util/vulkan-headers )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb:=[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
-"
-DEPEND="${RDEPEND}
- evdev? ( sys-kernel/linux-headers )
- linuxfb? ( sys-kernel/linux-headers )
- udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
- ibus? ( app-i18n/ibus )
- wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/tools/qvkgen
- src/gui
- src/openglextensions
- src/platformheaders
- src/platformsupport
- src/plugins/generic
- src/plugins/imageformats
- src/plugins/platforms
- src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
- accessibility:accessibility-atspi-bridge
- egl:egl:
- eglfs:eglfs:
- eglfs:eglfs_egldevice:
- eglfs:eglfs_gbm:
- evdev:evdev:
- evdev:mtdev:
- :fontconfig:
- :system-freetype:FREETYPE
- !:no-freetype:
- !gif:no-gif:
- gles2-only::OPENGL_ES
- gles2-only:opengles2:OPENGL_ES_2
- !:no-gui:
- :system-harfbuzz:
- !:no-harfbuzz:
- jpeg:system-jpeg:IMAGEFORMAT_JPEG
- !jpeg:no-jpeg:
- libinput
- libinput:xkbcommon:
- :opengl
- png:png:
- png:system-png:IMAGEFORMAT_PNG
- !png:no-png:
- tslib:tslib:
- udev:libudev:
- vulkan:vulkan:
- X:xcb:
- X:xcb-glx:
- X:xcb-plugin:
- X:xcb-render:
- X:xcb-sm:
- X:xcb-xlib:
- X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :gui
-)
-
-PATCHES=(
- "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
- "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-)
-
-src_prepare() {
- # don't add -O3 to CXXFLAGS, bug 549140
- sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
- # egl_x11 is activated when both egl and X are enabled
- use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
- qt_use_disable_config dbus dbus \
- src/platformsupport/themes/genericunix/genericunix.pri
-
- qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
- qt_use_disable_mod ibus dbus \
- src/plugins/platforminputcontexts/platforminputcontexts.pro
-
- use vnc || sed -i -e '/SUBDIRS += vnc/d' \
- src/plugins/platforms/platforms.pro || die
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- local myconf=(
- $(usev dbus -dbus-linked)
- $(qt_use egl)
- $(qt_use eglfs)
- $(usev eglfs '-gbm -kms')
- $(qt_use evdev)
- $(qt_use evdev mtdev)
- -fontconfig
- -system-freetype
- $(usev !gif -no-gif)
- -gui
- -system-harfbuzz
- $(qt_use jpeg libjpeg system)
- $(qt_use libinput)
- $(qt_use linuxfb)
- -opengl $(usex gles2-only es2 desktop)
- $(qt_use png libpng system)
- $(qt_use tslib)
- $(qt_use udev libudev)
- $(qt_use vulkan)
- $(qt_use X xcb)
- $(usev X '-xcb-xlib')
- )
- if use libinput || use X; then
- myconf+=( -xkbcommon )
- fi
- qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild b/dev-qt/qtgui/qtgui-5.15.3.ebuild
index b5a67c2..441add6 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+QT5_KDEPATCHSET_REV=1
QT5_MODULE="qtbase"
inherit qt5-build
@@ -17,7 +17,6 @@ fi
IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
REQUIRED_USE="
- || ( eglfs linuxfb vnc wayland X )
accessibility? ( dbus X )
eglfs? ( egl )
ibus? ( dbus )
@@ -129,7 +128,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
PATCHES=(
"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
- "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
)
src_prepare() {
diff --git a/games-rpg/runescape-launcher-launcher/Manifest b/games-rpg/runescape-launcher-launcher/Manifest
new file mode 100644
index 0000000..cc1b93f
--- /dev/null
+++ b/games-rpg/runescape-launcher-launcher/Manifest
@@ -0,0 +1 @@
+DIST runescape-launcher-launcher-1.3.tar.xz 56784 BLAKE2B 18551af39f62b5310503332617e6aaba938557201c80eb111247c6cd116aae6c4fec97b151212c0eb86d3bd58c2ae2fa935b01ac32ce9e788b724bcc079b681f SHA512 3a69af5b67acebd6c637c39297ec2b82b9845a79268c40c5f19a0c8d0ef7c144944930b5649ef2712e5f80fb98b5d28ac557094bef3c232a6308f6f373e7558f
diff --git a/dev-cpp/highway/metadata.xml b/games-rpg/runescape-launcher-launcher/metadata.xml
index 004555a..004555a 100644
--- a/dev-cpp/highway/metadata.xml
+++ b/games-rpg/runescape-launcher-launcher/metadata.xml
diff --git a/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3.ebuild b/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3.ebuild
new file mode 100644
index 0000000..a30aa84
--- /dev/null
+++ b/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Launcher for official RuneScape NXT client launcher"
+HOMEPAGE="https://cgit.alxu.ca/runescape-launcher-launcher.git/"
+SRC_URI="https://www.alxu.ca/${P}.tar.xz"
+
+LICENSE="0BSD RuneScape-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ sys-libs/libcap
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXxf86vm
+ dev-libs/openssl-compat:1.1
+ x11-libs/pango
+ media-libs/libsdl2
+"
+
+src_compile() {
+ emake prefix=${EPREFIX}/usr
+}
+
+src_install() {
+ emake prefix=${EPREFIX}/usr DESTDIR=${D} install
+}
diff --git a/games-rpg/runescape-launcher/Manifest b/games-rpg/runescape-launcher/Manifest
deleted file mode 100644
index e5d3bbf..0000000
--- a/games-rpg/runescape-launcher/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST runescape-launcher_2.2.9_Packages 906 BLAKE2B 21618120775dc4dc95fd9ca5cc2fbb2bf7d7333ba5d3b917b12191a5b88012424e2947a7b7623300d67959629bc85b8e58eb2ccf8106a9702a3ea32108c8e74b SHA512 6676ee36bd5206503c8b385e3b62029416bd0cdf057153a7b57d376d096c9eef917428fd435d52704c308710f24ba9ccc9b28e4b94eb6b82a2150f39f7f2e085
-DIST runescape-launcher_2.2.9_Release 961 BLAKE2B 6dc2d40a47a198feb438581b0e571043dccf49e2a265ac87fbbcaab58e3c090c7a49938941bb110b3a04add932316c5afbd32cf75c0678896163837e45ecef78 SHA512 c6b5e363d0a307f463e7b837b58121d8d3e6fa3dff0021a3998a947042cfd82a0d1f71da186eb09f247293b6c4b1bdc4a111a1ed1a702ed6ff27236e84cd0696
-DIST runescape-launcher_2.2.9_Release.gpg 488 BLAKE2B 8d2e18383d45803e8aa128a3a7f78bf087a8be4adccda94d9045eaab7269ea2a88414f598d43d307a701db9a82324f8ff023a41e0a3adbdeb7747484b271dea9 SHA512 01424a2e624d1bf4a3f0f2b57706170d2d44f5373cbca42e10a2d78d587246157f7665a9b12a2e9befc9322c417c3ab7ca877a7d831bbd6904797c12682d02aa
-DIST runescape-launcher_2.2.9_amd64.deb 3877472 BLAKE2B 86733c5ee0c34a64cd2845ed4c6378ad66f6732253742c8d77d64bdb5bd4ea23351b6c918b31a2ff9c80f3ed4fb01c9046514e0ccdefd5a9228a3652b6e2b9f5 SHA512 7a3b596355811fbf35ce684de06de4ad7e219a20e36b51d9efc934e874874b287c03471e01b5bb59aa89e9038d40484eee6dc5cc7e63147117b7f6c864698ef3
diff --git a/games-rpg/runescape-launcher/metadata.xml b/games-rpg/runescape-launcher/metadata.xml
deleted file mode 100644
index 004555a..0000000
--- a/games-rpg/runescape-launcher/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>alex_y_xu@yahoo.ca</email>
- <name>Alex Xu (Hello71)</name>
- </maintainer>
-</pkgmetadata>
diff --git a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r3.ebuild b/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r3.ebuild
deleted file mode 100644
index 9362aea..0000000
--- a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker verify-sig xdg
-
-DESCRIPTION="Official RuneScape NXT client launcher"
-HOMEPAGE="http://www.runescape.com"
-SRC_URI="https://content.runescape.com/downloads/ubuntu/pool/non-free/${PN:0:1}/${PN}/${PN}_${PV}_amd64.deb
- verify-sig? (
- https://content.runescape.com/downloads/ubuntu/dists/trusty/Release -> ${PN}_${PV}_Release
- https://content.runescape.com/downloads/ubuntu/dists/trusty/Release.gpg -> ${PN}_${PV}_Release.gpg
- https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages -> ${PN}_${PV}_Packages
- )
-"
-
-LICENSE="RuneScape-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="kde"
-
-DEPEND=""
-RDEPEND="
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- sys-libs/libcap
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXxf86vm
- dev-libs/openssl
- x11-libs/pango
- media-libs/libsdl2"
-BDEPEND="
- verify-sig? ( app-crypt/openpgp-keys-runescape )
-"
-
-RESTRICT="bindist mirror strip"
-QA_PREBUILT="/usr/share/games/runescape-launcher/runescape"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/runescape.gpg.key
-
-S="${WORKDIR}"
-
-src_unpack() {
- if use verify-sig; then
- local Release=${DISTDIR}/${PN}_${PV}_Release
- local Packages=${DISTDIR}/${PN}_${PV}_Packages
- local debfile=${DISTDIR}/${PN}_${PV}_amd64.deb
- local _out
-
- einfo "Verifying 'Release' file (PGP)..."
-
- verify-sig_verify_detached "$Release"{,.gpg}
-
- einfo "Parsing 'Release' file..."
-
- _out=$(awk 'ok && $3 == "non-free/binary-amd64/Packages" {print $1; exit}
- /^[^[:space:]]/ {ok=0}
- /^SHA256:$/ {ok=1}' < "$Release")
- if ! [[ $_out =~ ^[0-9a-f]{64}$ ]]; then
- die "Could not find hash of 'non-free/binary-amd64/Packages' in the 'Release' file"
- fi
-
- einfo "Verifying 'Packages' file (SHA256)..."
-
- if ! sha256sum --quiet --check <<< "$_out *$Packages"; then
- die "Hash sum of 'Packages' did not match expected"
- fi
-
- einfo "Parsing 'Packages' file..."
-
- _out=$(awk 'ok && /^SHA256:/ {print $2; exit}
- /^Package:/ {ok=0}
- /^Package: runescape-launcher$/ {ok=1}' < "$Packages")
- if ! [[ $_out =~ ^[0-9a-f]{64}$ ]]; then
- die "Could not find hash of '$debfile' in the 'Packages' file"
- fi
-
- einfo "Verifying '$debfile' (SHA256)..."
-
- if ! sha256sum --quiet --check <<< "$_out *$debfile"; then
- die "Hash sum of '$debfile' did not match expected"
- fi
- fi
- unpacker ${PN}_${PV}_amd64.deb
-}
-
-src_compile() {
- mv usr/share/doc . || die
- gunzip doc/runescape-launcher/changelog.gz || die
- if ! use kde; then
- rm -r usr/share/kde4 || die
- fi
-}
-
-src_install() {
- doins -r usr
- dodoc doc/runescape-launcher/*
-}
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 73505b1..6e22e6a 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,2 +1 @@
-DIST NotoColorEmoji-9a5261d871451f9b5183c93483cbd68ed916b1e9.ttf 9867108 BLAKE2B ea4445c37158f80f3d66bd61c471aeff4f5b2fb6f37ada84b3a7d0e33769c2642826df6fe90bcd23404feff3a7f23ca4f138c7df170581603efb86f9aada1209 SHA512 803fb02c31b1d74804b50b363ee694beda10b4803f7aa315c76ee0d698d7d493ef2f877dc04f5aa629e458358a0bb008f6154db3311aba88ee533f9f09686011
-DIST NotoEmoji-Regular-9a5261d871451f9b5183c93483cbd68ed916b1e9.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2ef19565d3bcaa75b82676fbf0efeaa6efa1d25edf352b577acce17a45c6f0e7be1550c46a8c2ab6cef208cd6f11 SHA512 51b01ab0794be9f92c59679f6d56d4ce09ed959daeb9ec945bb837eb15a82ab302e83b29aab1972ac9cb648f7196a5f5ff4488a4622b36bedbc9cd0cab6dc3de
+DIST Noto_Emoji.zip 4053149 BLAKE2B a2d0259807070742e807f17b283d409ce6b28496d373aea56904b6a111c36c53fafd1374127ab3b6034bb61fa35d034849807bb18076116549bcdef000dc2522 SHA512 ed2092f6e68e7f69b0986d92d4e1ff80fba4de9d1990ee8e2aec42115e2c0dd4d69befe4c74597d3d3b7c64a25b957282a93223ce5128cbb42d8dca96d15b996
diff --git a/media-fonts/noto-emoji/noto-emoji-20211101.ebuild b/media-fonts/noto-emoji/noto-emoji-20211101.ebuild
deleted file mode 100644
index df69160..0000000
--- a/media-fonts/noto-emoji/noto-emoji-20211101.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
-
-COMMIT="9a5261d871451f9b5183c93483cbd68ed916b1e9"
-SRC_URI="
- https://github.com/googlefonts/noto-emoji/raw/${COMMIT}/fonts/NotoColorEmoji.ttf -> NotoColorEmoji-${COMMIT}.ttf
- https://github.com/googlefonts/noto-emoji/raw/${COMMIT}/fonts/NotoEmoji-Regular.ttf -> NotoEmoji-Regular-${COMMIT}.ttf
-"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~*"
-IUSE=""
-
-S="${DISTDIR}"
-
-src_install() {
- insinto /usr/share/fonts/${PN}
- newins NotoColorEmoji-${COMMIT}.ttf NotoColorEmoji.ttf
- newins NotoEmoji-Regular-${COMMIT}.ttf NotoEmoji-Regular.ttf
-}
diff --git a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
new file mode 100644
index 0000000..f79faf0
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji"
+
+SRC_URI="https://fonts.google.com/download?family=Noto%20Emoji -> Noto_Emoji.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~*"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/fonts/${PN}
+ doins NotoEmoji-VariableFont_wght.ttf
+}
diff --git a/media-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest
new file mode 100644
index 0000000..99d65ef
--- /dev/null
+++ b/media-fonts/source-pro/Manifest
@@ -0,0 +1,3 @@
+DIST source-code-pro-20210115.tar.gz 6818951 BLAKE2B b133aa317bf5057e8b346d81491bf08c0c257066ed05b2001a9e327308a63a3ef943da3b12b5933c217c31839750fbb3947b4f566f48aac6e88c7096cbbf82cd SHA512 96981af2a470027a372ab8a02265d34a6b2a810c4cca0b498b01e613019a04c9760d95e21fb740af2c7fff076098bb36f5c282bf9b8f1875eed72ed70e4b3ac9
+DIST source-sans-pro-20210115.tar.gz 12105836 BLAKE2B 3e2fed594f74614afd49ef731497b9abd6c75a78850cc1c5abbae0c246f454a0d06b82d4b7eaeefe8fb6b0d8246adb3f2751b4de6e2637f05f6cc20ead66faba SHA512 4b53ca10053bf10b23f3a2488d562b79a8dfd39f1402d068098856bbd1bd5bd9ddbb8f269acea45f003289dc95378229ed14e21fdcd39d49e3d6864693c0fbb4
+DIST source-serif-pro-20210115.tar.gz 40747188 BLAKE2B 9c91fbb5d9b29c28e1e64f36e410afce8ae6f0e6d030a6ee4e6069a20d270bf7852967641eb54b33bfe9a23eae024448f6c22de25d766a9f8a830cce04d29db1 SHA512 fff923121f1d536886468fd4887e036d9d85603e57c4ecabe64f73af4506b15265481ca69cbe7d83751f93ff72f7f9dce3aae56dacdd2c4da1bc1e7285f76d6b
diff --git a/media-fonts/source-pro/files/63-source-pro.conf b/media-fonts/source-pro/files/63-source-pro.conf
new file mode 100644
index 0000000..4265e65
--- /dev/null
+++ b/media-fonts/source-pro/files/63-source-pro.conf
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>Source Code Pro</family>
+ <default>
+ <family>monospace</family>
+ </default>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+ <family>Source Code Pro</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>Source Sans Pro</family>
+ <default>
+ <family>sans-serif</family>
+ </default>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Source Sans Pro</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>Source Serif Pro</family>
+ <default>
+ <family>serif</family>
+ </default>
+ </alias>
+ <alias>
+ <family>serif</family>
+ <prefer>
+ <family>Source Serif Pro</family>
+ </prefer>
+ </alias>
+</fontconfig>
diff --git a/media-fonts/source-pro/metadata.xml b/media-fonts/source-pro/metadata.xml
new file mode 100644
index 0000000..bcdcbf1
--- /dev/null
+++ b/media-fonts/source-pro/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">adobe-fonts/source-code-pro</remote-id>
+ <remote-id type="sourceforge">sourcesans.adobe</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-fonts/source-pro/source-pro-20210115.ebuild b/media-fonts/source-pro/source-pro-20210115.ebuild
new file mode 100644
index 0000000..f20042b
--- /dev/null
+++ b/media-fonts/source-pro/source-pro-20210115.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+SANSV="3.046R"
+SERIFV="4.004R"
+CODEV="2.038R-ro/1.058R-it/1.018R-VAR"
+
+DESCRIPTION="Adobe's open source typeface family designed for UI environments"
+HOMEPAGE="https://adobe-fonts.github.io/source-sans/
+ https://adobe-fonts.github.io/source-serif/
+ https://adobe-fonts.github.io/source-code-pro/"
+SRC_URI="https://github.com/adobe-fonts/source-sans/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz
+ https://github.com/adobe-fonts/source-serif/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz
+ https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+IUSE="cjk"
+
+RESTRICT="binchecks strip"
+
+RDEPEND="
+ media-libs/fontconfig
+ cjk? ( media-fonts/source-han-sans )
+"
+
+FONT_CONF=( "${FILESDIR}"/63-${PN}.conf )
+FONT_SUFFIX="otf"
+
+src_prepare() {
+ default
+ mv source-*/OTF/*.otf . || die
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
deleted file mode 100644
index 4d0a354..0000000
--- a/media-gfx/gimp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gimp-2.99.8.tar.bz2 30799403 BLAKE2B a67863f5e7d40beca80f931973759dc4523718ac2740cac4924dae8e1611491e59c43436ca670643be1878e1d9ff1575174a59c919b33103128a812e7eba6042 SHA512 c603d9a315c21c9da716cc1d8c0c784061e7d0eac4b3d28467aabc3c63c950da0a52649e498049e0b8475933ef93d721a2b8423811b47b00c9490485d316345e
diff --git a/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch b/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch
deleted file mode 100644
index 77b7b2f..0000000
--- a/media-gfx/gimp/files/gimp-2.10_fix_test-appdata.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur a/desktop/test-appdata.sh.in b/desktop/test-appdata.sh.in
---- a/desktop/test-appdata.sh.in 2019-04-07 14:38:14.000000000 +0300
-+++ b/desktop/test-appdata.sh.in 2019-11-06 23:19:32.000000000 +0300
-@@ -2,8 +2,8 @@
-
- # TODO: use validate-strict when the last errors for a strict validation
- # are fixed.
--appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \
--appstream-util validate-relax ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \
-+appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml && \
-+appstream-util validate-relax --nonet ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/gimp-data-extras.metainfo.xml && \
- if [ $(expr @GIMP_MICRO_VERSION@ % 2) = 0 ]; then
- grep TODO ${GIMP_TESTING_ABS_TOP_BUILDDIR}/desktop/org.gimp.GIMP.appdata.xml
- if [ $? = 0 ]; then
diff --git a/media-gfx/gimp/gimp-2.99.8.ebuild b/media-gfx/gimp/gimp-2.99.8.ebuild
deleted file mode 100644
index 93caacb..0000000
--- a/media-gfx/gimp/gimp-2.99.8.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.44"
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/3"
-
-IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
- >=app-text/poppler-0.90.1[cairo]
- >=app-text/poppler-data-0.4.9
- >=dev-libs/atk-2.34.1
- >=dev-libs/glib-2.68.0:2
- >=dev-libs/json-glib-1.4.4
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.21:2
- >=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.86[introspection,lcms,vala?]
- >=media-libs/fontconfig-2.12.6
- >=media-libs/freetype-2.10.2
- >=media-libs/gegl-0.4.32:0.4[cairo,introspection,lcms,vala?]
- >=media-libs/gexiv2-0.10.10
- >=media-libs/harfbuzz-2.6.5:=
- >=media-libs/lcms-2.9:2
- >=media-libs/libmypaint-1.6.1:=
- >=media-libs/libpng-1.6.37:0=
- >=media-libs/tiff-4.1.0:0
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- virtual/jpeg
- >=x11-libs/cairo-1.16.0
- >=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
- >=x11-libs/gtk+-3.24.16:3[introspection]
- x11-libs/libXcursor
- >=x11-libs/pango-1.44.7
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
- heif? ( >=media-libs/libheif-1.9.1:= )
- javascript? ( dev-libs/gjs )
- jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
- jpegxl? ( media-libs/libjxl:= )
- lua? (
- ${LUA_DEPS}
- $(lua_gen_cond_dep '
- dev-lua/lgi[${LUA_USEDEP}]
- ')
- )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-2.3.0:= )
- postscript? ( app-text/ghostscript-gpl )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
- ')
- )
- udev? ( >=dev-libs/libgudev-167:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- >=dev-lang/perl-5.30.3
- >=dev-libs/appstream-glib-0.7.16
- dev-util/gdbus-codegen
- dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.51.0
- sys-apps/findutils
- >=sys-devel/autoconf-2.54
- >=sys-devel/automake-1.11
- >=sys-devel/gettext-0.21
- >=sys-devel/libtool-2.4.6
- doc? (
- app-text/yelp-tools
- dev-libs/gobject-introspection[doctool]
- >=dev-util/gtk-doc-1.32
- dev-util/gtk-doc-am
- )
- vala? ( $(vala_depend) )
-"
-
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
- "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
- gnome2_src_prepare # calls eautoreconf
-
- use vala && vala_src_prepare
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
- fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
- # Bugs #569738 and #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
-
- addwrite /dev/dri/ # bugs #574038 and #684886
- addwrite /dev/ati/ # bug #589198
- addwrite /proc/mtrr # bug #589198
-}
-
-src_configure() {
- _adjust_sandbox
-
- local myconf=(
- GEGL="${EPREFIX}"/usr/bin/gegl-0.4
- GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
-
- --enable-default-binary
-
- --disable-check-update
- --enable-mp
- --with-appdata-test
- --with-bug-report-url=https://bugs.gentoo.org/
- --with-xmc
- --without-libbacktrace
- --without-webkit
- --without-xvfb-run
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable doc gtk_doc)
- $(use_enable doc g-ir-doc)
- $(use_enable vector-icons)
- $(use_with aalib aa)
- $(use_with alsa)
- $(use_with !aqua x)
- $(use_with heif libheif)
- $(use_with javascript)
- $(use_with jpeg2k jpeg2000)
- $(use_with jpegxl)
- $(use_with lua)
- $(use_with mng libmng)
- $(use_with openexr)
- $(use_with postscript gs)
- $(use_with python)
- $(use_with udev gudev)
- $(use_with unwind libunwind)
- $(use_with vala)
- $(use_with webp)
- $(use_with wmf)
- $(use_with xpm libxpm)
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
- gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
- einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
- local prepend=gimp-org-
- (
- cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
- for plugin_slash in $(ls -d1 */); do
- plugin=${plugin_slash%/}
- if [[ -f ${plugin}/${plugin} ]]; then
- # NOTE: Folder and file name need to match for Gimp to load that plug-in
- # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
- mv ${plugin}/{,${prepend}}${plugin} || exit 1
- mv {,${prepend}}${plugin} || exit 1
- fi
- done
- )
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- if use python; then
- python_optimize
- fi
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
- _rename_plugins || die
-
- if use doc; then
- mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die
- cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die
- fi
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
deleted file mode 100644
index b791c3f..0000000
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.44"
-VALA_USE_DEPEND=vapigen
-
-inherit git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gimp.git"
-SRC_URI=""
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/3"
-
-IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="
- lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
- >=app-text/poppler-0.90.1[cairo]
- >=app-text/poppler-data-0.4.9
- >=dev-libs/atk-2.34.1
- >=dev-libs/glib-2.68.0:2
- >=dev-libs/json-glib-1.4.4
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.21:2
- >=media-gfx/mypaint-brushes-2.0.2:=
- >=media-libs/babl-0.1.86[introspection,lcms,vala?]
- >=media-libs/fontconfig-2.12.6
- >=media-libs/freetype-2.10.2
- >=media-libs/gegl-0.4.32:0.4[cairo,introspection,lcms,vala?]
- >=media-libs/gexiv2-0.10.10
- >=media-libs/harfbuzz-2.6.5:=
- >=media-libs/lcms-2.9:2
- >=media-libs/libmypaint-1.6.1:=
- >=media-libs/libpng-1.6.37:0=
- >=media-libs/tiff-4.1.0:0
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- virtual/jpeg
- >=x11-libs/cairo-1.16.0
- >=x11-libs/gdk-pixbuf-2.40.0:2
- >=x11-libs/gtk+-3.24.16:3
- x11-libs/libXcursor
- >=x11-libs/pango-1.44.7
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
- heif? ( >=media-libs/libheif-1.9.1:= )
- javascript? ( dev-libs/gjs )
- jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
- jpegxl? ( media-libs/libjxl:= )
- lua? (
- ${LUA_DEPS}
- $(lua_gen_cond_dep '
- dev-lua/lgi[${LUA_USEDEP}]
- ')
- )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-2.3.0:= )
- postscript? ( app-text/ghostscript-gpl )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
- ')
- )
- udev? ( >=dev-libs/libgudev-167:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- >=dev-lang/perl-5.30.3
- >=dev-libs/appstream-glib-0.7.16
- dev-util/gdbus-codegen
- dev-util/gtk-update-icon-cache
- >=dev-util/intltool-0.51.0
- sys-apps/findutils
- >=sys-devel/autoconf-2.54
- >=sys-devel/automake-1.11
- >=sys-devel/gettext-0.21
- >=sys-devel/libtool-2.4.6
- doc? (
- >=dev-util/gtk-doc-1.32
- dev-util/gtk-doc-am
- )
- vala? ( $(vala_depend) )
-"
-
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
- "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
- # Fix checking of gtk-doc.make if USE="-doc" like autogen.sh
- # USE="doc" is currently broken for gimp-9999 due to absence of appropriate *.m4 file
- if ! use doc ; then
- echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
- sed -i -e "/CLEANFILES/s/^/#/g" \
- "${S}"/devel-docs/{libgimp,libgimpbase,libgimpcolor,libgimpconfig,libgimpmath,libgimpmodule,libgimpthumb,libgimpwidgets}/Makefile.am || die
- fi
-
- gnome2_src_prepare # calls eautoreconf
-
- use vala && vala_src_prepare
-
- sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
- fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
- export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
- # Bugs #569738 and #591214
- local nv
- for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
- # We do not check for existence as they may show up later
- # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
- addwrite "${nv}"
- done
-
- addwrite /dev/dri/ # bugs #574038 and #684886
- addwrite /dev/ati/ # bug #589198
- addwrite /proc/mtrr # bug #589198
-}
-
-src_configure() {
- _adjust_sandbox
-
- local myconf=(
- GEGL="${EPREFIX}"/usr/bin/gegl-0.4
- GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
-
- --enable-default-binary
-
- --disable-check-update
- --enable-mp
- --with-appdata-test
- --with-bug-report-url=https://bugs.gentoo.org/
- --with-xmc
- --without-libbacktrace
- --without-webkit
- --without-xvfb-run
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable cpu_flags_x86_mmx mmx)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable doc gtk_doc)
- $(use_enable vector-icons)
- $(use_with aalib aa)
- $(use_with alsa)
- $(use_with !aqua x)
- $(use_with heif libheif)
- $(use_with javascript)
- $(use_with jpeg2k jpeg2000)
- $(use_with jpegxl)
- $(use_with lua)
- $(use_with mng libmng)
- $(use_with openexr)
- $(use_with postscript gs)
- $(use_with python)
- $(use_with udev gudev)
- $(use_with unwind libunwind)
- $(use_with vala)
- $(use_with webp)
- $(use_with wmf)
- $(use_with xpm libxpm)
- )
-
- gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004
- gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
- einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
- local prepend=gimp-org-
- (
- cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
- for plugin_slash in $(ls -d1 */); do
- plugin=${plugin_slash%/}
- if [[ -f ${plugin}/${plugin} ]]; then
- # NOTE: Folder and file name need to match for Gimp to load that plug-in
- # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
- mv ${plugin}/{,${prepend}}${plugin} || exit 1
- mv {,${prepend}}${plugin} || exit 1
- fi
- done
- )
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- if use python; then
- python_optimize
- fi
-
- # Workaround for bug #321111 to give GIMP the least
- # precedence on PDF documents by default
- mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
- find "${D}" -name '*.la' -type f -delete || die
-
- # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
- mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
- _rename_plugins || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
deleted file mode 100644
index 24214c6..0000000
--- a/media-gfx/gimp/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>torokhov-s-a@yandex.ru</email>
- <name>Sergey Torokhov</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <use>
- <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
- <flag name="jpegxl">Enable support for JPEG XL files</flag>
- <flag name="vector-icons">Enable support for vector icons (experimental)</flag>
- </use>
-</pkgmetadata>
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
deleted file mode 100644
index eade216..0000000
--- a/media-gfx/gthumb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gthumb-3.12.0.tar.xz 7578168 BLAKE2B 76976a7b56ad9f6428a7525dc1968f51cc37f8e6fca9b60077d621dd8133d07f1b7d98b8d97144cf51764f1a5121201f3591092ba7231d667aaff75a0e2b7a31 SHA512 065cbf2c209c23da7f44d4fb5e3684770404adabe8b0bcf80e63a674a030bffe425ba68e98adc63d191af4ab58611565d93e7771ea0b4477753856d889da0600
diff --git a/media-gfx/gthumb/gthumb-3.12.0.ebuild b/media-gfx/gthumb/gthumb-3.12.0.ebuild
deleted file mode 100644
index 80f9f5d..0000000
--- a/media-gfx/gthumb/gthumb-3.12.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr colord exif gnome-keyring gstreamer heif http jpegxl lcms raw slideshow svg tiff test webp"
-
-RDEPEND="
- >=dev-libs/glib-2.54.0:2
- >=x11-libs/gtk+-3.16.0:3
- exif? ( >=media-gfx/exiv2-0.21:= )
- slideshow? (
- >=media-libs/clutter-1.12.0:1.0
- >=media-libs/clutter-gtk-1:1.0
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- media-plugins/gst-plugins-gtk:1.0
- )
- raw? ( >=media-libs/libraw-0.14:= )
- http? (
- >=net-libs/libsoup-2.42.0:2.4
- >=dev-libs/json-glib-0.15.0
- >=net-libs/webkit-gtk-1.10.0:4
- )
- gnome-keyring? ( >=app-crypt/libsecret-0.11 )
- cdr? ( >=app-cdr/brasero-3.2.0 )
- jpegxl? ( media-libs/libjxl:= )
- heif? ( media-libs/libheif:= )
- svg? ( >=gnome-base/librsvg-2.34:2 )
- webp? ( >=media-libs/libwebp-0.2.0:= )
- lcms? ( >=media-libs/lcms-2.6:2 )
- colord? (
- >=x11-misc/colord-1.3
- >=media-libs/lcms-2.6:2
- )
-
- sys-libs/zlib
- virtual/jpeg:0=
- tiff? ( media-libs/tiff:= )
- media-libs/libpng:0=
- >=gnome-base/gsettings-desktop-schemas-0.1.4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/glib-utils
- dev-util/itstool
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-src_configure() {
- local emesonargs=(
- -Drun-in-place=false
- $(meson_use exif exiv2)
- $(meson_use slideshow clutter)
- $(meson_use gstreamer)
- -Dlibchamplain=false # Upstream still doesn't seem to consider this ready
- $(meson_use colord)
- $(meson_use tiff libtiff)
- $(meson_use webp libwebp)
- $(meson_use jpegxl libjxl)
- $(meson_use heif libheif)
- $(meson_use raw libraw)
- $(meson_use svg librsvg)
- $(meson_use gnome-keyring libsecret)
- $(meson_use http webservices)
- $(meson_use cdr libbrasero)
- )
-
- # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
- if use lcms || use colord; then
- emesonargs+=( -Dlcms2=true )
- else
- emesonargs+=( -Dlcms2=false )
- fi
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
deleted file mode 100644
index 258b716..0000000
--- a/media-gfx/gthumb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag>
- <flag name="heif">Enable HEIF support through <pkg>media-libs/libheif</pkg></flag>
- <flag name="jpegxl">Enable JPEG XL support through <pkg>media-libs/libjxl</pkg></flag>
- <flag name="slideshow">Enable slideshow plugin</flag>
- </use>
-</pkgmetadata>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index a70637e..31d8ebd 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,2 +1 @@
-DIST ImageMagick-7.1.0-13.tar.xz 10311564 BLAKE2B 7cb3e58f548cbe0b9e1239df47ff4f42af2cd0b6ff4c417a62515ff9bd434ecabed2cc7f7cb7cf8880f20af3f6d7de33d7368f146b9ac7668149959966a463d8 SHA512 dac1fc229599a63703fc3aa1378de313dc94dfbfa71913dc408ef65c88ef33820b5ddab4c9a064a86cc35c0abb0136f0adb626bff9e227b52ed0d90993688044
-DIST ImageMagick-7.1.0-19.tar.xz 10317628 BLAKE2B 512d2066b0a7aa177c223659e06736361f91b8bfb979d9de8c6cb8c486014f17974abee012394196a2432c0ab49e4e83bbc0aef2e575b59649cd1833470d2907 SHA512 d401e9b820c14016b66a3d3a6ba5c3c025dbcae270eab0e042e3f4fb4962558902a870c0364e7f06ea824576f6cb348f5b2f2e056ca4df81de94b6ca80528be3
+DIST ImageMagick-7.1.0-20.tar.xz 10339572 BLAKE2B 7e99a8b36089b1258f537dbdf8c674be17677da5450854e0dfe0ed3bd3722ec826099f7c22d615daece6d647e6c22f4d9aa7293fed9b4bebb77c163e3ac54bc3 SHA512 e07d8f8ede8f713f1c0bd571b6042062b154b95ab06b0479ec4162d242beba982bfa88438ac67985d4da6d18074bda4b0ac25a7c2ced44f19b54c21120441991
diff --git a/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch b/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch
new file mode 100644
index 0000000..4a946da
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch
@@ -0,0 +1,14 @@
+See https://bugs.gentoo.org/678454
+
+diff --git a/configure.ac b/configure.ac
+index 5e7fb5875..b288327c8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -285,7 +285,6 @@ AC_PROG_AWK
+ AC_PROG_MKDIR_P
+ AM_WITH_DMALLOC
+ AX_C___ATTRIBUTE__
+-AX_GCC_ARCHFLAG([yes])
+ PKG_PROG_PKG_CONFIG([0.20])
+ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.19.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
index f119fbc..8d0425b 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-inherit flag-o-matic libtool perl-functions toolchain-funcs
+inherit autotools flag-o-matic libtool perl-functions toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
@@ -80,10 +80,15 @@ DEPEND="${RDEPEND}
!media-gfx/graphicsmagick[imagemagick]
X? ( x11-base/xorg-proto )"
+PATCHES=(
+ "${FILESDIR}/${PN}-9999-nocputuning.patch"
+)
+
S="${WORKDIR}/${MY_P}"
src_prepare() {
default
+ eautoreconf
# Apply hardening #664236
cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
@@ -176,7 +181,6 @@ src_configure() {
$(use_with wmf)
$(use_with xml)
--${openmp}-openmp
- --with-gcc-arch=no-automagic
)
CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
deleted file mode 100644
index 703982c..0000000
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
- inherit git-r3
- MY_P="imagemagick-9999"
-else
- MY_PV="$(ver_rs 3 '-')"
- MY_P="ImageMagick-${MY_PV}"
- SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.1.0-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
- svg? ( xml )
- test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
- dev-libs/libltdl:0
- bzip2? ( app-arch/bzip2 )
- corefonts? ( media-fonts/corefonts )
- djvu? ( app-text/djvu )
- fftw? ( sci-libs/fftw:3.0 )
- fontconfig? ( media-libs/fontconfig )
- fpx? ( >=media-libs/libfpx-1.3.0-r1 )
- graphviz? ( media-gfx/graphviz )
- heif? ( media-libs/libheif:=[x265] )
- jbig? ( >=media-libs/jbigkit-2:= )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
- jpegxl? ( media-libs/libjxl )
- lcms? ( media-libs/lcms:2= )
- lqr? ( media-libs/liblqr )
- opencl? ( virtual/opencl )
- openexr? ( media-libs/openexr:0= )
- pango? ( x11-libs/pango )
- perl? ( >=dev-lang/perl-5.8.8:0= )
- png? ( media-libs/libpng:0= )
- postscript? ( app-text/ghostscript-gpl )
- raw? ( media-libs/libraw:= )
- svg? (
- gnome-base/librsvg
- media-gfx/potrace
- )
- tiff? ( media-libs/tiff:0= )
- truetype? (
- media-fonts/urw-fonts
- >=media-libs/freetype-2
- )
- webp? ( media-libs/libwebp:0= )
- wmf? ( media-libs/libwmf )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXext
- x11-libs/libXt
- )
- xml? ( dev-libs/libxml2:= )
- lzma? ( app-arch/xz-utils )
- zip? ( dev-libs/libzip:= )
- zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
- !media-gfx/graphicsmagick[imagemagick]
- X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- # Apply hardening #664236
- cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
- sed -i -e '/^<policymap>$/ {
- r policy-hardening.snippet
- d
- }' \
- config/policy.xml || \
- die "Failed to apply hardening of policy.xml"
- einfo "policy.xml hardened"
-
- elibtoolize # for Darwin modules
-
- # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
- local ati_cards mesa_cards nvidia_cards render_cards
- shopt -s nullglob
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if test -n "${ati_cards}"; then
- addpredict "${ati_cards}"
- fi
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -n "${mesa_cards}"; then
- addpredict "${mesa_cards}"
- fi
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if test -n "${nvidia_cards}"; then
- addpredict "${nvidia_cards}"
- fi
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if test -n "${render_cards}"; then
- addpredict "${render_cards}"
- fi
- shopt -u nullglob
- addpredict /dev/nvidiactl
-}
-
-src_configure() {
- local depth=16
- use q8 && depth=8
- use q32 && depth=32
-
- local openmp=disable
- use openmp && { tc-has-openmp && openmp=enable; }
-
- use perl && perl_check_env
-
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable hdri)
- $(use_enable opencl)
- --with-threads
- --with-modules
- --with-quantum-depth=${depth}
- $(use_with cxx magick-plus-plus)
- $(use_with perl)
- --with-perl-options='INSTALLDIRS=vendor'
- --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
- $(use_with bzip2 bzlib)
- $(use_with X x)
- $(use_with zip)
- $(use_with zlib)
- --without-autotrace
- $(use_with postscript dps)
- $(use_with djvu)
- --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
- $(use_with fftw)
- $(use_with fpx)
- $(use_with fontconfig)
- $(use_with truetype freetype)
- $(use_with postscript gslib)
- $(use_with graphviz gvc)
- $(use_with heif heic)
- $(use_with jbig)
- $(use_with jpeg)
- $(use_with jpeg2k openjp2)
- $(use_with jxl libjxl)
- $(use_with lcms)
- $(use_with lqr)
- $(use_with lzma)
- $(use_with openexr)
- $(use_with pango)
- $(use_with png)
- $(use_with raw)
- $(use_with svg rsvg)
- $(use_with tiff)
- $(use_with webp)
- $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
- $(use_with wmf)
- $(use_with xml)
- --${openmp}-openmp
- --with-gcc-arch=no-automagic
- )
- CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # Install default (unrestricted) policy in $HOME for test suite #664238
- local _im_local_config_home="${HOME}/.config/ImageMagick"
- mkdir -p "${_im_local_config_home}" || \
- die "Failed to create IM config dir in '${_im_local_config_home}'"
- cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
- die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
- local im_command= IM_COMMANDS=()
- if [[ ${PV} == "9999" ]] ; then
- IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
- else
- IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
- fi
- IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
- IM_COMMANDS+=( "emake check" ) # Run tests
-
- for im_command in "${IM_COMMANDS[@]}"; do
- eval "${S}"/magick.sh \
- ${im_command} || \
- die "Failed to run \"${im_command}\""
- done
-}
-
-src_install() {
- # Ensure documentation installation files and paths with each release!
- emake \
- DESTDIR="${D}" \
- DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
- install
-
- rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
- dodoc {AUTHORS,README}.txt ChangeLog
-
- if use perl; then
- find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
- find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
- fi
-
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
- # .la files in parent are not needed, keep plugin .la files
- find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
- if use opencl; then
- cat <<-EOF > "${T}"/99${PN}
- SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
- EOF
-
- insinto /etc/sandbox.d
- doins "${T}"/99${PN} #472766
- fi
-
- insinto /usr/share/${PN}
- doins config/*icm
-}
-
-pkg_postinst() {
- local _show_policy_xml_notice=
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- _show_policy_xml_notice=yes
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
- # This is an upgrade
- _show_policy_xml_notice=yes
-
- # Show this elog only once
- break
- fi
- done
- fi
-
- if [[ -n "${_show_policy_xml_notice}" ]]; then
- elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
- elog "which will prevent the usage of the following coders by default:"
- elog ""
- elog " - PS"
- elog " - PS2"
- elog " - PS3"
- elog " - EPS"
- elog " - PDF"
- elog " - XPS"
- fi
-}
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
deleted file mode 100644
index 68460a8..0000000
--- a/media-libs/libjxl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
-DIST lodepng-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz 240079 BLAKE2B 08240bd72d22f789bc0e06ed1d641fbca21ca674697880d4f004e4e76bb1b6cf595e931d2447544d896c79576e942db3cbdcca91d717f4ad8ddcfbd6c5bdc97e SHA512 50a515f1f15122fa017637be30df0db05980d07f8891f16b0b68697ef0df797176bbe005df623e9f2dbb68b750b0a87e69c3cef215c7bf15187d00491c4023c7
-DIST skcms-64374756e03700d649f897dbd98c95e78c30c7da.tar.gz 9181180 BLAKE2B e57083e6add95f60944f098c60ea61be26a159f96dfa70256277495bfa1dfee0210d8f4aee7e7156b8808b4681f74a7a7c8dec7193b969234728d4200697e901 SHA512 524e8796400d0b230149ef93db09ef04847f45d34f67717deb0291ecfeb9ee6ad55549c3473835da87e62e1982b5e0e1071fa4792a6e121d9908216fa5b7422c
diff --git a/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch b/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch
deleted file mode 100644
index c8baf7d..0000000
--- a/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 134f1876473d9463332711a834e2ddc70fa7e38c Mon Sep 17 00:00:00 2001
-From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
-Date: Thu, 7 Oct 2021 14:07:35 -0400
-Subject: [PATCH] Run RoundtripAnimationPatches only if gif enabled
-
----
- lib/jxl/jxl_test.cc | 42 +++++++++++++++++++++---------------------
- 1 file changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/lib/jxl/jxl_test.cc b/lib/jxl/jxl_test.cc
-index aaf1f4e..815ec7c 100644
---- a/lib/jxl/jxl_test.cc
-+++ b/lib/jxl/jxl_test.cc
-@@ -1336,6 +1336,27 @@ TEST(JxlTest, RoundtripLosslessAnimation) {
- 5e-4);
- }
-
-+TEST(JxlTest, RoundtripAnimationPatches) {
-+ ThreadPool* pool = nullptr;
-+ const PaddedBytes orig = ReadTestData("jxl/animation_patches.gif");
-+ CodecInOut io;
-+ ASSERT_TRUE(SetFromBytes(Span<const uint8_t>(orig), &io, pool));
-+ ASSERT_EQ(2u, io.frames.size());
-+
-+ CompressParams cparams;
-+ cparams.patches = Override::kOn;
-+ DecompressParams dparams;
-+ CodecInOut io2;
-+ // 40k with no patches, 27k with patch frames encoded multiple times.
-+ EXPECT_LE(Roundtrip(&io, cparams, dparams, pool, &io2), 24000u);
-+
-+ EXPECT_EQ(io2.frames.size(), io.frames.size());
-+ // >10 with broken patches
-+ EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params,
-+ /*distmap=*/nullptr, pool),
-+ 2.0);
-+}
-+
- #endif // JPEGXL_ENABLE_GIF
-
- #if JPEGXL_ENABLE_JPEG
-@@ -1629,26 +1650,5 @@ TEST(JxlTest, RoundtripProgressive) {
- 4.0f);
- }
-
--TEST(JxlTest, RoundtripAnimationPatches) {
-- ThreadPool* pool = nullptr;
-- const PaddedBytes orig = ReadTestData("jxl/animation_patches.gif");
-- CodecInOut io;
-- ASSERT_TRUE(SetFromBytes(Span<const uint8_t>(orig), &io, pool));
-- ASSERT_EQ(2u, io.frames.size());
--
-- CompressParams cparams;
-- cparams.patches = Override::kOn;
-- DecompressParams dparams;
-- CodecInOut io2;
-- // 40k with no patches, 27k with patch frames encoded multiple times.
-- EXPECT_LE(Roundtrip(&io, cparams, dparams, pool, &io2), 24000u);
--
-- EXPECT_EQ(io2.frames.size(), io.frames.size());
-- // >10 with broken patches
-- EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params,
-- /*distmap=*/nullptr, pool),
-- 2.0);
--}
--
- } // namespace
- } // namespace jxl
---
-2.33.0
-
diff --git a/media-libs/libjxl/libjxl-0.6.1-r1.ebuild b/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
deleted file mode 100644
index a348b83..0000000
--- a/media-libs/libjxl/libjxl-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2 xdg-utils
-
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
- EGIT_SUBMODULES=(third_party/lodepng third_party/skcms)
-else
- LODEPNG_COMMIT="48e5364ef48ec2408f44c727657ac1b6703185f8"
- SKCMS_COMMIT="64374756e03700d649f897dbd98c95e78c30c7da"
- SRC_URI="
- https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz
- https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${SKCMS_COMMIT}.tar.gz
- "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/7"
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="apng doc gdk-pixbuf gif gimp java +jpeg +man openexr static-libs test +tools viewers"
-
-RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
- dev-cpp/highway[${MULTILIB_USEDEP}]
- apng? (
- media-libs/libpng[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
- gdk-pixbuf? ( x11-libs/gdk-pixbuf )
- gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
- gimp? ( media-gfx/gimp:0/2 )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr:= )
- viewers? (
- dev-qt/qtwidgets
- dev-qt/qtx11extras
- )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
- man? ( app-text/asciidoc )
- viewers? ( kde-frameworks/extra-cmake-modules )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jdk-1.8:* )
-"
-
-PATCHES=(
- "${FILESDIR}/roundtripanimationpatches-ifdef-gif.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- tar -xf ${DISTDIR}/${P}.tar.gz || die
- tar -xf ${DISTDIR}/lodepng-${LODEPNG_COMMIT}.tar.gz || die
- rmdir ${P}/third_party/lodepng || die
- mv lodepng-${LODEPNG_COMMIT} ${P}/third_party/lodepng || die
- tar -C ${P}/third_party/skcms -xf ${DISTDIR}/skcms-${SKCMS_COMMIT}.tar.gz || die
- fi
-}
-
-src_prepare() {
- use gdk-pixbuf || sed -i -e '/(gdk-pixbuf)/s/^/#/' plugins/CMakeLists.txt || die
- use gimp || sed -i -e '/(gimp)/s/^/#/' plugins/CMakeLists.txt || die
- cmake_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
- -DJPEGXL_ENABLE_BENCHMARK=OFF
- -DJPEGXL_ENABLE_COVERAGE=OFF
- -DJPEGXL_ENABLE_EXAMPLES=OFF
- -DJPEGXL_ENABLE_FUZZERS=OFF
- -DJPEGXL_ENABLE_TOOLS=$(multilib_native_usex tools)
- -DJPEGXL_ENABLE_JNI=$(multilib_native_usex java)
- -DJPEGXL_ENABLE_MANPAGES=$(multilib_native_usex man)
- -DJPEGXL_ENABLE_OPENEXR=$(multilib_native_usex openexr)
- -DJPEGXL_ENABLE_PLUGINS=$(multilib_is_native_abi && echo ON || echo OFF) # USE=gdk-pixbuf, USE=gimp handled in src_prepare
- -DJPEGXL_ENABLE_SJPEG=OFF
- -DJPEGXL_ENABLE_SKCMS=ON
- -DJPEGXL_ENABLE_TCMALLOC=OFF
- -DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers)
-
- -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(multilib_native_usex apng OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(multilib_native_usex gif OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(multilib_native_usex jpeg OFF ON)
- )
-
- cmake_src_configure
-}
-
-multilib_src_test() {
- # DecodeTest.PixelTestWithICCProfileLossy: https://github.com/libjxl/libjxl/issues/500
- # RobustStatisticsTest: https://github.com/libjxl/libjxl/issues/698
- local myctestargs=(
- -E '^DecodeTest\.PixelTestWithICCProfileLossy$|^RobustStatisticsTest\.'
- )
- cmake_src_test
-}
-
-multilib_src_install() {
- cmake_src_install
- if ! use static-libs; then
- rm "${ED}"/usr/lib*/*.a || die
- fi
- if use java && multilib_is_native_abi; then
- java-pkg_doso tools/libjxl_jni.so
- fi
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild
deleted file mode 100644
index 3a74aac..0000000
--- a/media-libs/libjxl/libjxl-9999.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2 xdg-utils
-
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
- EGIT_SUBMODULES=(third_party/skcms)
-else
- SKCMS_COMMIT="64374756e03700d649f897dbd98c95e78c30c7da"
- SRC_URI="
- https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- https://skia.googlesource.com/skcms/+archive/${SKCMS_COMMIT}.tar.gz -> skcms-${SKCMS_COMMIT}.tar.gz
- "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/0.7"
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="doc gdk-pixbuf gif gimp java +jpeg +png +man openexr static-libs test +tools viewers"
-
-# gflags: https://github.com/libjxl/libjxl/issues/1062
-RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
- dev-cpp/gflags[${MULTILIB_USEDEP}]
- dev-cpp/highway[${MULTILIB_USEDEP}]
- gdk-pixbuf? ( x11-libs/gdk-pixbuf )
- gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
- gimp? ( media-gfx/gimp:0/2 )
- java? ( >=virtual/jre-1.8:* )
- jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr:= )
- png? (
- media-libs/libpng[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
- viewers? (
- dev-qt/qtwidgets
- dev-qt/qtx11extras
- )
-"
-BDEPEND="
- doc? ( app-doc/doxygen )
- man? ( app-text/asciidoc )
- viewers? ( kde-frameworks/extra-cmake-modules )
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jdk-1.8:* )
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- else
- tar -xf ${DISTDIR}/${P}.tar.gz || die
- tar -C ${P}/third_party/skcms -xf ${DISTDIR}/skcms-${SKCMS_COMMIT}.tar.gz || die
- fi
-}
-
-src_prepare() {
- use gdk-pixbuf || sed -i -e '/(gdk-pixbuf)/s/^/#/' plugins/CMakeLists.txt || die
- use gimp || sed -i -e '/(gimp)/s/^/#/' plugins/CMakeLists.txt || die
- cmake_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
- -DJPEGXL_ENABLE_BENCHMARK=OFF
- -DJPEGXL_ENABLE_COVERAGE=OFF
- -DJPEGXL_ENABLE_EXAMPLES=OFF
- -DJPEGXL_ENABLE_FUZZERS=OFF
- -DJPEGXL_ENABLE_TOOLS=$(multilib_native_usex tools)
- -DJPEGXL_ENABLE_JNI=$(multilib_native_usex java)
- -DJPEGXL_ENABLE_MANPAGES=$(multilib_native_usex man)
- -DJPEGXL_ENABLE_OPENEXR=$(multilib_native_usex openexr)
- -DJPEGXL_ENABLE_PLUGINS=$(multilib_is_native_abi && echo ON || echo OFF) # USE=gdk-pixbuf, USE=gimp handled in src_prepare
- -DJPEGXL_ENABLE_SJPEG=OFF
- -DJPEGXL_ENABLE_SKCMS=ON
- -DJPEGXL_ENABLE_TCMALLOC=OFF
- -DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers)
-
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_GIF=$(multilib_native_usex gif OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(multilib_native_usex jpeg OFF ON)
- -DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(multilib_native_usex png OFF ON)
- )
-
- cmake_src_configure
-}
-
-multilib_src_install() {
- cmake_src_install
- if ! use static-libs; then
- rm "${ED}"/usr/lib*/*.a || die
- fi
- if use java && multilib_is_native_abi; then
- java-pkg_doso tools/libjxl_jni.so
- fi
-}
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
deleted file mode 100644
index 11f6fe3..0000000
--- a/media-libs/libjxl/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>alex_y_xu@yahoo.ca</email>
- <name>Alex Xu (Hello71)</name>
- </maintainer>
- <use>
- <flag name="apng">APNG support</flag>
- <flag name="doc">Doxygen API documentation</flag>
- <flag name="gdk-pixbuf">gdk-pixbuf plugin</flag>
- <flag name="jpeg">JPEG v1 support in tools. Note that reconstructed JPEG files are supported regardless of this option.</flag>
- <flag name="tools">Tool programs (cjxl, djxl)</flag>
- <flag name="viewers">Viewer programs</flag>
- </use>
-</pkgmetadata>
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
deleted file mode 100644
index 6208e0d..0000000
--- a/media-libs/svt-av1/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST svt-av1-0.8.7.tar.gz 6396358 BLAKE2B 21a0d319078887809d08276b1a11b6dcca1be90a79c6bda19b86749fabb623918b9112de8ae3c7740b14f23d52e4e1c12ec0190f49880b09993525a857f8e334 SHA512 812b794eda930f53dcba6bb02bc5a3f417346705d64f590d7acf2d45df8d10985bd40c313eaaed514601ab699e23c87852059b9eb0b0ff8a717ef9fd80a132f7
diff --git a/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch
deleted file mode 100644
index 62f3b9b..0000000
--- a/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/785556
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -170,14 +170,6 @@
- endif()
- endforeach()
-
--if(CMAKE_C_FLAGS MATCHES ".*-march=native.*")
-- string(APPEND CMAKE_C_FLAGS " -mno-avx")
--endif()
--
--if(CMAKE_CXX_FLAGS MATCHES ".*-march=native.*")
-- string(APPEND CMAKE_CXX_FLAGS " -mno-avx")
--endif()
--
- if(CMAKE_ASM_NASM_OBJECT_FORMAT MATCHES "win")
- set(CMAKE_ASM_NASM_FLAGS_DEBUG "${CMAKE_ASM_NASM_FLAGS_DEBUG} -gcv8")
- elseif(CMAKE_ASM_NASM_COMPILER MATCHES "nasm")
diff --git a/media-libs/svt-av1/metadata.xml b/media-libs/svt-av1/metadata.xml
deleted file mode 100644
index 8b50750..0000000
--- a/media-libs/svt-av1/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <upstream>
- <remote-id type="gitlab">AOMediaCodec/SVT-AV1</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/svt-av1/svt-av1-0.8.7.ebuild b/media-libs/svt-av1/svt-av1-0.8.7.ebuild
deleted file mode 100644
index 7984c55..0000000
--- a/media-libs/svt-av1/svt-av1-0.8.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
-HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"
-
-if [[ ${PV} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-else
- SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
- S="${WORKDIR}/SVT-AV1-v${PV}"
-fi
-
-# Also see "Alliance for Open Media Patent License 1.0"
-LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
-SLOT="0"
-
-BDEPEND="amd64? ( dev-lang/yasm )"
-
-src_prepare() {
- if ! use amd64 ; then
- # This _should_ be possible on amd64 too, but breaks with -O3
- # without AVX.
- # bug #785556
- eapply "${FILESDIR}"/${PN}-0.8.6-no-force-avx.patch
- fi
-
- cmake_src_prepare
-}
-
-multilib_src_configure() {
- append-ldflags -Wl,-z,noexecstack
-
- local mycmakeargs=(
- # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ?
- # undefined reference to `ifd_inspect'
- # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
- -DBUILD_TESTING=OFF
- -DCMAKE_OUTPUT_DIRECTORY=$BUILD_DIR
- )
-
- if [[ ${ABI} != amd64 ]]; then
- mycmakeargs+=( -DCOMPILE_C_ONLY=ON )
- fi
-
- cmake_src_configure
-}
diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild
deleted file mode 100644
index 7984c55..0000000
--- a/media-libs/svt-av1/svt-av1-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
-HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"
-
-if [[ ${PV} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-else
- SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
- S="${WORKDIR}/SVT-AV1-v${PV}"
-fi
-
-# Also see "Alliance for Open Media Patent License 1.0"
-LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
-SLOT="0"
-
-BDEPEND="amd64? ( dev-lang/yasm )"
-
-src_prepare() {
- if ! use amd64 ; then
- # This _should_ be possible on amd64 too, but breaks with -O3
- # without AVX.
- # bug #785556
- eapply "${FILESDIR}"/${PN}-0.8.6-no-force-avx.patch
- fi
-
- cmake_src_prepare
-}
-
-multilib_src_configure() {
- append-ldflags -Wl,-z,noexecstack
-
- local mycmakeargs=(
- # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ?
- # undefined reference to `ifd_inspect'
- # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
- -DBUILD_TESTING=OFF
- -DCMAKE_OUTPUT_DIRECTORY=$BUILD_DIR
- )
-
- if [[ ${ABI} != amd64 ]]; then
- mycmakeargs+=( -DCOMPILE_C_ONLY=ON )
- fi
-
- cmake_src_configure
-}
diff --git a/media-sound/pamixer/Manifest b/media-sound/pamixer/Manifest
new file mode 100644
index 0000000..996e474
--- /dev/null
+++ b/media-sound/pamixer/Manifest
@@ -0,0 +1 @@
+DIST pamixer-1.4.tar.gz 17614 BLAKE2B afd8b26d987d85c043e88870805b5504ff1f7fb96583b8002dfe106ba4d9a25cf429d7ff81d4ab8a2c75501d5926136089b68fe919c997dd3bb6d4662957c66b SHA512 e3916ed8dc020bb43e57994a9f35a506147a0fde42b88c30c661cbeffa40e0f74cae66cd015394e524684c32f9674de3e3763a1396a3e1b9aecbfdc3ed117fe4
diff --git a/media-sound/pamixer/pamixer-1.4.ebuild b/media-sound/pamixer/pamixer-1.4.ebuild
new file mode 100644
index 0000000..a9205dd
--- /dev/null
+++ b/media-sound/pamixer/pamixer-1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Pulseaudio command line mixer."
+HOMEPAGE="https://github.com/cdemoulins/pamixer"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cdemoulins/pamixer"
+else
+ SRC_URI="https://github.com/cdemoulins/pamixer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/boost
+ media-sound/pulseaudio"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+ dobin ${PN}
+ dodoc README.rst
+}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index af7927e..b5a7c05 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,2 +1,4 @@
-DIST ffmpeg-4.4.1.tar.bz2 11494996 BLAKE2B 050b0501cb21f44451d59bf3b20b18d55234636b5a69a4962103d63f80ce9af172cc2cecb1e33b92334fcf635b283afddbdfa20cbd6deb526008cdb34ae01c16 SHA512 c41e63ffa9f5465ea3a7f4a8b255b299a2f49d5868ada4310a2344b8fea02476365c44871defd5609da55c805cbb58f34063dbdd4b203ade932cba8b3cfefc72
-DIST ffmpeg-libjxl.patch.xz 8852 BLAKE2B ce64d3ad307a89889ce1115a450f8e6b33113781317d767c1bf229ffb1b4f675b98599613326f17afa8c32f938aa31592e9e29014b9f62f4ca96da123923a33e SHA512 dffe3cf72479a34ad4587d2da4d2f539ec8d2d45d1a1d48046a70a55a5de5e4f736dca3f2591f48602343603f5b8d4ddfcb6dc61513920bc8ccc1e30adc6cdac
+DIST 4f4dc78d2870ddd4d5e321e65b5de289a31258cf.patch 16861 BLAKE2B fef83d99407faf3b0ead101fc053dcd8d713749a374bf4542627bcaf8fc25cefa674f0a048b00a6647121ffd4d17eec2eeeab583c44174c4181dccb346752809 SHA512 dbd6cdf8e1766f83c1db26ae6218e8caae2801816a3c07b64965060ed2047c837717ea13c8baa37e9193983bb5a829a9852bc41e155ce542712797da2ed164f0
+DIST 667b1a36939a69619b58d413ebf9d12d987d1d0d.patch 2431 BLAKE2B b92e55b8eced4faad83468e2c1067c9733d47d41fba8549631f0e2ff57d26db25d203f5e7c3b0921df4a97e900c189a7761ae2506132cde77618e252374ebbcf SHA512 d389d2c19cbe741668bcbb18996d2c513fe4b05ad77f810848d4fd9541d95ac8cb4d579a9650fe6df4ff47b97eeb5955c3a5edee700ae7f4020898946fa02744
+DIST 79658a2e9d821783a951a5d08ae6abac7bf24a40.patch 20933 BLAKE2B d098c801f4177904679470ed47208bd815e96d5d69499f58945316d237264d6ea17d1d7ec44786027431e0b2de66eed4bd5b1a70275393b31507e93c271e0d7b SHA512 287fd653cd6ef669de12c13a9e0fe4f04b7b5271e56783d30b7143c0d8ed89033e7bad71aa908a077aa01283f3d5f25543e91b99be6d3f56694cf5c4d04dcab6
+DIST eadde927756bda5d0bcd5b198d020d5f78ddb132.patch 18901 BLAKE2B ef8a4fba40eb79e299ffdac5633b37fbdf2d0bccbe369f8c12a5987f58b525c16e11760f245b3a5da96fa780aedfb1ecd01c77403c31bf582dcdcef714ae6049 SHA512 cdbbd9ef7be54fbadb05fb893c9f5c04bb424045f704dedee7450c679f5f5776ac3587740c60b404da6982a56713f56cc03d472ea0f6d1b09af518d7eec435a4
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild
deleted file mode 100644
index 9727d9b..0000000
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild
+++ /dev/null
@@ -1,563 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=56.58.58
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_MIN_CLONE_TYPE="single"
- EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
-HOMEPAGE="https://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
- SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-SRC_URI+=" https://www.alxu.ca/ffmpeg-libjxl.patch.xz"
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
- !gpl? ( LGPL-2.1 )
- gpl? ( GPL-2 )
- amr? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- gmp? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- libaribb24? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- encode? (
- amrenc? (
- gpl? ( GPL-3 )
- !gpl? ( LGPL-3 )
- )
- )
- samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
- +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp
- +gpl hardcoded-tables +iconv libxml2 lzma +network opencl
- openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan
- X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib
- # libavdevice options
- cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
- opengl
- # indevs
- libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
- # decoders
- amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
- jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm
- libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
- vorbis:libvorbis vpx:libvpx zvbi:libzvbi
- # libavfilter options
- appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
- fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
- rubberband:librubberband zeromq:libzmq zimg:libzimg
- # libswresample options
- libsoxr
- # Threads; we only support pthread for now but ffmpeg supports more
- +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy
- svt-av1:libsvtav1 theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
- alsa chromium doc +encode oss pic sndio static-libs test v4l
- ${FFMPEG_FLAG_MAP[@]%:*}
- ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
- cpu_flags_arm_thumb:armv5te
- cpu_flags_arm_v6:armv6
- cpu_flags_arm_thumb2:armv6t2
- cpu_flags_arm_neon:neon
- cpu_flags_arm_vfp:vfp
- cpu_flags_arm_vfpv3:vfpv3
- cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
- arm64? ( cpu_flags_arm_v8 )
- cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
- cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
- cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
- cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
- cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 )
-PPC_CPU_REQUIRED_USE="
- cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec )
- cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx )
-"
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
- cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
- cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
- cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
- cpu_flags_x86_xop? ( cpu_flags_x86_avx )
- cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 )
- cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
- cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 )
- cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
- cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
- cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
- cpu_flags_x86_sse2? ( cpu_flags_x86_sse )
- cpu_flags_x86_sse? ( cpu_flags_x86_mmxext )
- cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx )
- cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow )
- cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
- ${ARM_CPU_FEATURES[@]}
- ${MIPS_CPU_FEATURES[@]}
- ${PPC_CPU_FEATURES[@]}
- ${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
- ${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
- ${ARM_CPU_REQUIRED_USE}
- ${PPC_CPU_REQUIRED_USE}
- ${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
- bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
- bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
- chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
- codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] )
- dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] )
- encode? (
- amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
- kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
- openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] )
- rav1e? ( >=media-video/rav1e-0.4:=[capi] )
- snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
- theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
- webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
- x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
- x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
- xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
- )
- fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
- flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
- fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] )
- fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
- gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
- gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
- gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
- gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
- iec61883? (
- >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- >=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
- jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
- libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
- libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
- libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
- libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
- libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
- libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
- librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
- libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
- libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
- libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
- libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
- lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
- mmal? ( media-libs/raspberrypi-userland )
- modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
- samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
- sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
- speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
- srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
- svg? (
- gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
- x11-libs/cairo[${MULTILIB_USEDEP}]
- )
- svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
- vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
- vorbis? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
- vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
- )
- zeromq? ( >=net-libs/zeromq-4.1.6 )
- zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- postproc? ( !media-libs/libpostproc )
-"
-
-RDEPEND="${RDEPEND}
- openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) )
-"
-
-DEPEND="${RDEPEND}
- ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
- v4l? ( sys-kernel/linux-headers )
-"
-BDEPEND="
- >=sys-devel/make-3.81
- virtual/pkgconfig
- cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
- cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
- doc? ( sys-apps/texinfo )
- test? ( net-misc/wget sys-devel/bc )
-"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
- postproc? ( gpl )
- frei0r? ( gpl )
- cdio? ( gpl )
- rubberband? ( gpl )
- vidstab? ( gpl )
- samba? ( gpl )
- encode? (
- x264? ( gpl )
- x265? ( gpl )
- xvid? ( gpl )
- )
-"
-REQUIRED_USE="
- cuda? ( video_cards_nvidia )
- libv4l? ( v4l )
- fftools_cws2fws? ( zlib )
- test? ( encode )
- ${GPL_REQUIRED_USE}
- ${CPU_REQUIRED_USE}"
-RESTRICT="
- !test? ( test )
- gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
- "${FILESDIR}"/chromium-r1.patch
- "${WORKDIR}"/ffmpeg-libjxl.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/libavutil/avconfig.h
-)
-
-build_separate_libffmpeg() {
- use opencl
-}
-
-src_prepare() {
- if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
- export revision=git-N-${FFMPEG_REVISION}
- fi
- default
- echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
- local myconf=( )
-
- local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
- use openssl && myconf+=( --enable-nonfree )
- use samba && myconf+=( --enable-version3 )
-
- # Encoders
- if use encode ; then
- ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
- # Licensing.
- if use amrenc ; then
- myconf+=( --enable-version3 )
- fi
- else
- myconf+=( --disable-encoders )
- fi
-
- # Indevs
- use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
- for i in alsa oss jack sndio ; do
- use ${i} || myconf+=( --disable-indev=${i} )
- done
-
- # Outdevs
- for i in alsa oss sndio ; do
- use ${i} || myconf+=( --disable-outdev=${i} )
- done
-
- # Decoders
- use amr && myconf+=( --enable-version3 )
- use gmp && myconf+=( --enable-version3 )
- use libaribb24 && myconf+=( --enable-version3 )
- use fdk && use gpl && myconf+=( --enable-nonfree )
-
- for i in "${ffuse[@]#+}" ; do
- myconf+=( $(use_enable ${i%:*} ${i#*:}) )
- done
-
- if use openssl ; then
- myconf+=( --disable-gnutls )
- fi
-
- # (temporarily) disable non-multilib deps
- if ! multilib_is_native_abi; then
- for i in librav1e libzmq ; do
- myconf+=( --disable-${i} )
- done
- fi
-
- # CPU features
- for i in "${CPU_FEATURES_MAP[@]}" ; do
- use ${i%:*} || myconf+=( --disable-${i#*:} )
- done
-
- if use pic ; then
- myconf+=( --enable-pic )
- # disable asm code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
- fi
- [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag mcpu) $(get-flag march) ; do
- [[ ${i} = native ]] && i="host" # bug #273421
- myconf+=( --cpu=${i} )
- break
- done
-
- # LTO support, bug #566282, bug #754654
- is-flagq "-flto*" && myconf+=( "--enable-lto" )
- filter-flags "-flto*"
-
- # Mandatory configuration
- myconf=(
- --enable-avfilter
- --enable-avresample
- --disable-stripping
- # This is only for hardcoded cflags; those are used in configure checks that may
- # interfere with proper detections, bug #671746 and bug #645778
- # We use optflags, so that overrides them anyway.
- --disable-optimizations
- --disable-libcelt # bug #664158
- "${myconf[@]}"
- )
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
- case ${CHOST} in
- *freebsd*)
- myconf+=( --target-os=freebsd )
- ;;
- *mingw32*)
- myconf+=( --target-os=mingw32 )
- ;;
- *linux*)
- myconf+=( --target-os=linux )
- ;;
- esac
- fi
-
- # doc
- myconf+=(
- $(multilib_native_use_enable doc)
- $(multilib_native_use_enable doc htmlpages)
- $(multilib_native_enable manpages)
- )
-
- local extra_libs
- if use arm || use ppc ; then
- # bug #782811
- # bug #790590
- extra_libs+="$(test-flags-CCLD -latomic) "
- fi
-
- set -- "${S}/configure" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --mandir="${EPREFIX}/usr/share/man" \
- --enable-shared \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --nm="$(tc-getNM)" \
- --ranlib="$(tc-getRANLIB)" \
- --pkg-config="$(tc-getPKG_CONFIG)" \
- --optflags="${CFLAGS}" \
- --extra-libs="${extra_libs}" \
- $(use_enable static-libs static) \
- "${myconf[@]}" \
- ${EXTRA_FFMPEG_CONF}
- echo "${@}"
- "${@}" || die
-
- if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then
- einfo "Configuring for Chromium"
- mkdir -p ../chromium || die
- pushd ../chromium >/dev/null || die
- set -- "${@}" \
- --disable-shared \
- --enable-static \
- --enable-pic \
- --disable-opencl
- echo "${@}"
- "${@}" || die
- popd >/dev/null || die
- fi
-}
-
-multilib_src_compile() {
- emake V=1
-
- if multilib_is_native_abi; then
- for i in "${FFTOOLS[@]}" ; do
- if use fftools_${i} ; then
- emake V=1 tools/${i}$(get_exeext)
- fi
- done
-
- if use chromium; then
- if build_separate_libffmpeg; then
- einfo "Compiling for Chromium"
- pushd ../chromium >/dev/null || die
- emake V=1 libffmpeg
- popd >/dev/null || die
- else
- emake V=1 libffmpeg
- fi
- fi
- fi
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
- emake V=1 fate
-}
-
-multilib_src_install() {
- emake V=1 DESTDIR="${D}" install install-doc
-
- if multilib_is_native_abi; then
- for i in "${FFTOOLS[@]}" ; do
- if use fftools_${i} ; then
- dobin tools/${i}$(get_exeext)
- fi
- done
-
- if use chromium; then
- if build_separate_libffmpeg; then
- einfo "Installing for Chromium"
- pushd ../chromium >/dev/null || die
- emake V=1 DESTDIR="${D}" install-libffmpeg
- popd >/dev/null || die
- else
- emake V=1 DESTDIR="${D}" install-libffmpeg
-
- # When not built separately, libffmpeg has no code of
- # its own so this QA check raises a false positive.
- QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*"
- fi
- fi
- fi
-}
-
-multilib_src_install_all() {
- dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
- [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index b01a905..f942072 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,9 +28,14 @@ HOMEPAGE="https://ffmpeg.org/"
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ SRC_URI="mirror://gentoo/${P}.tar.xz"
else # Release
- SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/ffmpeg.asc
+ inherit verify-sig
+ SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz"
+ SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
+
+ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
fi
FFMPEG_REVISION="${PV#*_p}"
@@ -78,13 +83,13 @@ FFMPEG_FLAG_MAP=(
libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac
- jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm
+ jpeg2k:libopenjpeg jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm
libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
- speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec
+ speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -95,11 +100,10 @@ FFMPEG_FLAG_MAP=(
# Same as above but for encoders, i.e. they do something only with USE=encode.
FFMPEG_ENCODER_FLAG_MAP=(
- amrenc:libvo-amrwbenc mp3:libmp3lame
- kvazaar:libkvazaar libaom
- openh264:libopenh264 rav1e:librav1e snappy:libsnappy
- svt-av1:libsvtav1 theora:libtheora twolame:libtwolame
- webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+ amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame
+ openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1
+ theora:libtheora twolame:libtwolame webp:libwebp x264:libx264
+ x265:libx265 xvid:libxvid
)
IUSE="
@@ -173,6 +177,7 @@ IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ amf? ( media-video/amdgpu-pro-amf )
amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
@@ -189,8 +194,8 @@ RDEPEND="
rav1e? ( >=media-video/rav1e-0.4:=[capi] )
snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+ >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
)
twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
@@ -219,9 +224,10 @@ RDEPEND="
)
jack? ( virtual/jack[${MULTILIB_USEDEP}] )
jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
+ jpegxl? ( media-libs/libjxl:=[${MULTILIB_USEDEP}] )
libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] )
libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] )
- libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
+ libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
@@ -245,34 +251,35 @@ RDEPEND="
sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+ ssh? ( >=net-libs/libssh-0.5.5:=[sftp,${MULTILIB_USEDEP}] )
svg? (
gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
x11-libs/cairo[${MULTILIB_USEDEP}]
)
- svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] )
+ nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+ svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] )
- video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
)
vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
- vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] )
+ vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}]
)
+ postproc? ( !media-libs/libpostproc )
zeromq? ( >=net-libs/zeromq-4.1.6 )
zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- postproc? ( !media-libs/libpostproc )
"
RDEPEND="${RDEPEND}
@@ -284,9 +291,12 @@ DEPEND="${RDEPEND}
ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
v4l? ( sys-kernel/linux-headers )
"
-BDEPEND="
+
+# += for verify-sig above
+BDEPEND+="
>=sys-devel/make-3.81
virtual/pkgconfig
+ amf? ( media-libs/amf-headers )
cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] )
doc? ( sys-apps/texinfo )
@@ -308,7 +318,7 @@ GPL_REQUIRED_USE="
)
"
REQUIRED_USE="
- cuda? ( video_cards_nvidia )
+ cuda? ( nvenc )
libv4l? ( v4l )
fftools_cws2fws? ( zlib )
test? ( encode )
@@ -337,7 +347,13 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
default
+
+ # -fdiagnostics-color=auto gets appended after user flags which
+ # will ignore user's preference.
+ sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
@@ -383,6 +399,7 @@ multilib_src_configure() {
if use openssl ; then
myconf+=( --disable-gnutls )
+ has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 )
fi
# (temporarily) disable non-multilib deps
@@ -455,8 +472,9 @@ multilib_src_configure() {
$(multilib_native_enable manpages)
)
+ # Fixed in 5.0.1? Waiting for verification from someone who hit the issue.
local extra_libs
- if use arm || use ppc ; then
+ if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
# bug #782811
# bug #790590
extra_libs+="$(test-flags-CCLD -latomic) "
@@ -473,6 +491,7 @@ multilib_src_configure() {
--cxx="$(tc-getCXX)" \
--ar="$(tc-getAR)" \
--nm="$(tc-getNM)" \
+ --strip="$(tc-getSTRIP)" \
--ranlib="$(tc-getRANLIB)" \
--pkg-config="$(tc-getPKG_CONFIG)" \
--optflags="${CFLAGS}" \
@@ -556,4 +575,6 @@ multilib_src_install() {
multilib_src_install_all() {
dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+
+ use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override
}
diff --git a/metadata/layout.conf b/metadata/layout.conf
index 0e3ae1b..390ba9f 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,5 +1,5 @@
repo-name = alxu
-masters = gentoo crossdev
+masters = gentoo
thin-manifests = true
use-manifests = true
manifest-hashes = BLAKE2B SHA512
diff --git a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild b/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
index ec0bf11..8ab0efb 100644
--- a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
NEED_EMACS="24.1"
PYTHON_COMPAT=( python3_{7..10} pypy3 )
@@ -19,7 +18,7 @@ LICENSE="GPL-3"
# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
# meant to be binary backward compatible.
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
REQUIRED_USE="
apidoc? ( doc )
nmbug? ( python )
diff --git a/profiles/package.mask b/profiles/package.mask
index 30ed540..704635a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
# https://github.com/pts/pdfsizeopt/issues/139
app-text/pdfsizeopt
-# jagex keeps changing checksum without version bump, not sure how to handle
-games-rpg/runescape-launcher
+# package works fine but program is buggy
+sys-fs/ncdu
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 47718c8..12ac400 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -11,6 +11,3 @@ dev-java/openj9-openjdk jbootstrap
# not implemented yet
dev-java/openj9-openjdk javafx
-
-# dep errors on alpha/ia64/sparc, can't do profiles/arch mask in overlay
-media-libs/libjxl viewers
diff --git a/sci-calculators/units/files/units_cur-urllib.patch b/sci-calculators/units/files/units_cur-urllib.patch
index e77ff96..b0c61f9 100644
--- a/sci-calculators/units/files/units_cur-urllib.patch
+++ b/sci-calculators/units/files/units_cur-urllib.patch
@@ -1,4 +1,3 @@
-Only in a: currency.units
diff -ru a/units_cur b/units_cur
--- a/units_cur 2018-09-15 16:30:09.000000000 -0400
+++ b/units_cur 2021-07-11 18:01:29.030260473 -0400
diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r1.ebuild
index 7668c5f..69616d4 100644
--- a/sci-calculators/units/units-2.21-r1.ebuild
+++ b/sci-calculators/units/units-2.21-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
inherit python-r1
DESCRIPTION="Unit conversion program"
diff --git a/tools/adoptopenjdk-manifest b/tools/adoptopenjdk-manifest
index 1789fdf..c286527 100755
--- a/tools/adoptopenjdk-manifest
+++ b/tools/adoptopenjdk-manifest
@@ -10,14 +10,16 @@ import httpx
import portage
async def do_manifest(client, filename, size, url):
- resp = await client.get(f'{url}.sha256.txt')
+ resp = await client.get(f'{url}.sha256.txt', follow_redirects=True)
+ resp.raise_for_status()
sha256 = resp.text.split(' ')[0]
return (filename, size, sha256)
async def do_api(client, ghauth, tagl):
owner, repo, tag = tagl
apiurl = f'https://api.github.com/repos/{owner}/{repo}/releases/tags/{tag}'
- resp = await client.get(apiurl, auth=ghauth)
+ resp = await client.get(apiurl, auth=ghauth, follow_redirects=True)
+ resp.raise_for_status()
return {asset['browser_download_url']: asset['size']
for asset in resp.json()['assets']}
diff --git a/virtual/jdk/jdk-16.ebuild b/virtual/jdk/jdk-16.ebuild
deleted file mode 100644
index 5a08766..0000000
--- a/virtual/jdk/jdk-16.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-RDEPEND="|| (
- dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)]
-)"
diff --git a/virtual/jre/jre-16.ebuild b/virtual/jre/jre-16.ebuild
deleted file mode 100644
index ede6623..0000000
--- a/virtual/jre/jre-16.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-RDEPEND="|| (
- dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
- virtual/jdk:${SLOT}
- )"