summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--acct-group/adbusers/adbusers-0.ebuild9
-rw-r--r--acct-group/adbusers/metadata.xml8
-rw-r--r--app-arch/7-zip/7-zip-22.01.ebuild (renamed from app-arch/7-zip/7-zip-22.00.ebuild)0
-rw-r--r--app-arch/7-zip/Manifest2
-rw-r--r--app-arch/precomp-cpp/metadata.xml3
-rw-r--r--app-text/zathura/Manifest2
-rw-r--r--app-text/zathura/files/zathura-disable-seccomp-tests.patch22
-rw-r--r--app-text/zathura/zathura-0.5.2-r3.ebuild (renamed from app-text/zathura/zathura-0.4.9-r1.ebuild)12
-rw-r--r--dev-cpp/tbb-compat/Manifest1
-rw-r--r--dev-cpp/tbb-compat/metadata.xml14
-rw-r--r--dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild72
-rw-r--r--dev-dotnet/dotnet-runtime-bin/Manifest21
-rw-r--r--dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild (renamed from dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.25.ebuild)9
-rw-r--r--dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.21.ebuild (renamed from dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.5.ebuild)23
-rw-r--r--dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild65
-rw-r--r--dev-java/openj9-openjdk-bin/Manifest24
-rw-r--r--dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh5
-rw-r--r--dev-java/openj9-openjdk-bin/metadata.xml1
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.15.10.0.32.0.ebuild)8
-rw-r--r--dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild (renamed from dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.3.7.0.32.0.ebuild)8
-rw-r--r--dev-java/openj9-openjdk-jre-bin/Manifest12
-rw-r--r--dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh11
-rw-r--r--dev-java/openj9-openjdk-jre-bin/metadata.xml1
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild)7
-rw-r--r--dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild (renamed from dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild)7
-rw-r--r--dev-java/openj9-openjdk/Manifest8
-rw-r--r--dev-java/openj9-openjdk/files/omr-fam.patch70
-rw-r--r--dev-java/openj9-openjdk/files/openj9-no-o3.patch11
-rw-r--r--dev-java/openj9-openjdk/files/openj9-openjdk-override-version.patch11
-rw-r--r--dev-java/openj9-openjdk/files/openj9-openjdk.env.sh3
-rw-r--r--dev-java/openj9-openjdk/metadata.xml2
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-11.0.32.0.ebuild)39
-rw-r--r--dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild (renamed from dev-java/openj9-openjdk/openj9-openjdk-17.0.32.0.ebuild)67
-rw-r--r--dev-lang/zig/Manifest1
-rw-r--r--dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch13
-rw-r--r--dev-lang/zig/zig-0.9.1.ebuild115
-rw-r--r--dev-libs/libdwarf/Manifest2
-rw-r--r--dev-libs/libdwarf/libdwarf-0.9.0.ebuild (renamed from dev-libs/libdwarf/libdwarf-0.4.1.ebuild)2
-rw-r--r--dev-libs/libdwarf/metadata.xml3
-rw-r--r--dev-libs/openssl/Manifest4
-rw-r--r--dev-libs/openssl/files/gentoo.config-1.0.4 (renamed from dev-libs/openssl/files/gentoo.config-1.0.2)19
-rw-r--r--dev-libs/openssl/openssl-3.1.1.ebuild (renamed from dev-libs/openssl/openssl-3.0.3-r1.ebuild)185
-rw-r--r--dev-qt/qtgui/Manifest2
-rw-r--r--dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch29
-rw-r--r--dev-qt/qtgui/metadata.xml26
-rw-r--r--dev-qt/qtgui/qtgui-5.15.5.ebuild178
-rw-r--r--dev-util/android-udev-rules/Manifest1
-rw-r--r--dev-util/android-udev-rules/android-udev-rules-20220611.ebuild30
-rw-r--r--dev-util/android-udev-rules/metadata.xml8
-rw-r--r--eclass/virtualwl.eclass24
-rw-r--r--games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3-r1.ebuild (renamed from games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3.ebuild)4
-rw-r--r--gui-apps/gammastep/Manifest1
-rw-r--r--gui-apps/gammastep/gammastep-2.0.7-r1.ebuild87
-rw-r--r--gui-apps/gammastep/metadata.xml12
-rw-r--r--gui-apps/wlsunset/Manifest1
-rw-r--r--gui-apps/wlsunset/metadata.xml (renamed from dev-lang/zig/metadata.xml)3
-rw-r--r--gui-apps/wlsunset/wlsunset-0.3.0.ebuild38
-rw-r--r--gui-apps/wob/Manifest1
-rw-r--r--gui-apps/wob/metadata.xml18
-rw-r--r--gui-apps/wob/wob-0.14.2.ebuild34
-rw-r--r--gui-apps/wshowkeys/Manifest1
-rw-r--r--gui-apps/wshowkeys/wshowkeys-1.0.ebuild (renamed from gui-apps/wshowkeys/wshowkeys-9999.ebuild)6
-rw-r--r--gui-wm/tinywl/Manifest1
-rw-r--r--gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch55
-rw-r--r--gui-wm/tinywl/tinywl-0.15.1.ebuild48
-rw-r--r--mail-client/astroid/astroid-9999.ebuild2
-rw-r--r--media-fonts/noto-cjk/Manifest6
-rw-r--r--media-fonts/noto-cjk/metadata.xml3
-rw-r--r--media-fonts/noto-cjk/noto-cjk-20220126.ebuild (renamed from media-fonts/noto-cjk/noto-cjk-20211026.ebuild)4
-rw-r--r--media-fonts/noto-emoji/Manifest1
-rw-r--r--media-fonts/noto-emoji/noto-emoji-99999999.ebuild30
-rw-r--r--media-fonts/noto/Manifest5
-rw-r--r--media-fonts/noto/noto-20211207.ebuild26
-rw-r--r--media-fonts/noto/noto-20230117.ebuild35
-rw-r--r--media-gfx/imagemagick/Manifest1
-rw-r--r--media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch14
-rw-r--r--media-gfx/imagemagick/files/policy-hardening.snippet9
-rw-r--r--media-gfx/imagemagick/files/policy.test.xml17
-rw-r--r--media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild274
-rw-r--r--media-gfx/imagemagick/metadata.xml19
-rw-r--r--media-sound/pamixer/metadata.xml (renamed from gui-wm/tinywl/metadata.xml)3
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild589
-rw-r--r--media-video/ffmpeg/files/chromium-r1.patch42
-rw-r--r--media-video/ffmpeg/metadata.xml71
-rw-r--r--net-mail/notmuch/Manifest2
-rw-r--r--net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch24
-rw-r--r--net-mail/notmuch/files/notmuch-assume-modern-gmime.patch38
-rw-r--r--net-mail/notmuch/notmuch-0.37-r2.ebuild (renamed from net-mail/notmuch/notmuch-0.34.2-r1.ebuild)30
-rw-r--r--profiles/package.mask1
-rw-r--r--sci-calculators/units/units-2.21-r2.ebuild (renamed from sci-calculators/units/units-2.21-r1.ebuild)6
-rw-r--r--sys-fs/ncdu/Manifest1
-rw-r--r--sys-fs/ncdu/metadata.xml4
-rw-r--r--sys-fs/ncdu/ncdu-2.1.2.ebuild29
-rw-r--r--virtual/jre/jre-11-r3.ebuild (renamed from virtual/jre/jre-11-r2.ebuild)2
-rw-r--r--virtual/jre/jre-17-r1.ebuild (renamed from virtual/jre/jre-17.ebuild)2
-rw-r--r--www-client/firefox/Manifest99
-rw-r--r--www-client/firefox/files/disable-auto-update.policy.json5
-rw-r--r--www-client/firefox/files/distribution.ini42
-rw-r--r--www-client/firefox/files/firefox-r1.sh116
-rw-r--r--www-client/firefox/files/gentoo-default-prefs.js12
-rw-r--r--www-client/firefox/files/gentoo-hwaccel-prefs.js-r25
-rw-r--r--www-client/firefox/files/icon/firefox-r3.desktop236
-rw-r--r--www-client/firefox/files/icon/firefox-symbolic.svg64
-rw-r--r--www-client/firefox/firefox-101.0.1-r11.ebuild1297
-rw-r--r--www-client/firefox/metadata.xml42
-rw-r--r--x11-apps/sx/metadata.xml3
-rw-r--r--x11-apps/sx/sx-2.1.7.ebuild1
-rw-r--r--x11-apps/sx/sx-9999.ebuild1
109 files changed, 676 insertions, 4048 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..24887ae
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/metadata/md5-cache
diff --git a/acct-group/adbusers/adbusers-0.ebuild b/acct-group/adbusers/adbusers-0.ebuild
deleted file mode 100644
index f8d84ac..0000000
--- a/acct-group/adbusers/adbusers-0.ebuild
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit acct-group
-
-DESCRIPTION="Android Debug Bridge user group"
-ACCT_GROUP_ID=-1
diff --git a/acct-group/adbusers/metadata.xml b/acct-group/adbusers/metadata.xml
deleted file mode 100644
index f453528..0000000
--- a/acct-group/adbusers/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/app-arch/7-zip/7-zip-22.00.ebuild b/app-arch/7-zip/7-zip-22.01.ebuild
index 81229fc..81229fc 100644
--- a/app-arch/7-zip/7-zip-22.00.ebuild
+++ b/app-arch/7-zip/7-zip-22.01.ebuild
diff --git a/app-arch/7-zip/Manifest b/app-arch/7-zip/Manifest
index 2405209..ac40149 100644
--- a/app-arch/7-zip/Manifest
+++ b/app-arch/7-zip/Manifest
@@ -1 +1 @@
-DIST 7z2200-src.tar.xz 1285632 BLAKE2B c738382a55af91ec62842b68aaef0e7dfb331e92929d410b3f615156bf4157d6cc4e35c0614b0f6323ae98e8406b33d3ef78c9449615912530bf1d1b20d63ec1 SHA512 0c3660bb2ccb945db6f6aaecffff956d1b346eec8f40e68a3a5d6cdeb2301e34a61bd6cbb7365138ff5b7eebbbc2925a873fffe7dc9d76afa616eb184f9f3960
+DIST 7z2201-src.tar.xz 1291560 BLAKE2B 1d88234fdf9d7074e3dc6c243c209f694897ac23f82d7f5d4767186114245c1aa9c4290c8a538dc3cdd1074385ae9142f1efd22771942ec63d8c00ed38b7082b SHA512 3f391b1bd65a0654eb5b31b50f1d400f0ec38ab191d88e15849a6e4d164b7bf2ce4a6d70ec8b6e27bde1b83bb2d45b65c03129499334669e05ee025784be455a
diff --git a/app-arch/precomp-cpp/metadata.xml b/app-arch/precomp-cpp/metadata.xml
index 004555a..50e3faf 100644
--- a/app-arch/precomp-cpp/metadata.xml
+++ b/app-arch/precomp-cpp/metadata.xml
@@ -5,4 +5,7 @@
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu (Hello71)</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">schnaader/precomp-cpp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index fe867e8..10f9a96 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1 +1 @@
-DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10
+DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
diff --git a/app-text/zathura/files/zathura-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-disable-seccomp-tests.patch
new file mode 100644
index 0000000..f3d88a2
--- /dev/null
+++ b/app-text/zathura/files/zathura-disable-seccomp-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index ac7edb8..68216f3 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -25,17 +25,6 @@ if check.found()
+ timeout: 60*60
+ )
+
+- if seccomp.found()
+- sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
+- dependencies: build_dependencies + test_dependencies,
+- include_directories: include_directories,
+- c_args: defines + flags
+- )
+- test('sandbox', sandbox,
+- timeout: 60*60
+- )
+- endif
+-
+ utils = executable('test_utils', ['test_utils.c', 'tests.c'],
+ dependencies: build_dependencies + test_dependencies,
+ include_directories: include_directories,
diff --git a/app-text/zathura/zathura-0.4.9-r1.ebuild b/app-text/zathura/zathura-0.5.2-r3.ebuild
index fdb219d..da82595 100644
--- a/app-text/zathura/zathura-0.4.9-r1.ebuild
+++ b/app-text/zathura/zathura-0.5.2-r3.ebuild
@@ -18,8 +18,8 @@ else
fi
LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc +magic seccomp sqlite synctex test"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="seccomp sqlite synctex test"
RESTRICT="!test? ( test )"
@@ -28,27 +28,27 @@ DEPEND=">=dev-libs/girara-0.3.7
>=sys-devel/gettext-0.19.8
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
- magic? ( sys-apps/file )
+ 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 )
+BDEPEND="dev-python/docutils
test? ( dev-libs/appstream-glib
dev-libs/check )
virtual/pkgconfig"
PATCHES=(
+ "${FILESDIR}"/zathura-disable-seccomp-tests.patch
"${FILESDIR}/zathura-docutils.patch"
)
src_configure() {
local emesonargs=(
-Dconvert-icon=disabled
- -Dmagic=$(usex magic enabled disabled)
- -Dmanpages=$(usex doc enabled disabled)
+ -Dmanpages=enabled
-Dseccomp=$(usex seccomp enabled disabled)
-Dsqlite=$(usex sqlite enabled disabled)
-Dsynctex=$(usex synctex enabled disabled)
diff --git a/dev-cpp/tbb-compat/Manifest b/dev-cpp/tbb-compat/Manifest
new file mode 100644
index 0000000..d2d3f1d
--- /dev/null
+++ b/dev-cpp/tbb-compat/Manifest
@@ -0,0 +1 @@
+DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
diff --git a/dev-cpp/tbb-compat/metadata.xml b/dev-cpp/tbb-compat/metadata.xml
new file mode 100644
index 0000000..fc9202e
--- /dev/null
+++ b/dev-cpp/tbb-compat/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <longdescription lang="en">
+ The Intel Threading Building Blocks is a library that helps you
+ leverage multi-core processor performance without having to be a
+ threading expert. It represents a higher-level, task-based
+ parallelism that abstracts platform details and threading mechanism
+ for performance and scalability.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">intel/tbb</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild
new file mode 100644
index 0000000..55d3c63
--- /dev/null
+++ b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+MY_PV="$(ver_cut 1)_U$(ver_cut 2)"
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://www.threadingbuildingblocks.org"
+SRC_URI="https://github.com/intel/tbb/archive/${MY_PV}.tar.gz -> tbb-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!=dev-cpp/tbb-2020.3*"
+S="${WORKDIR}/oneTBB-${MY_PV}"
+
+src_prepare() {
+ default
+
+ # Give it a soname on FreeBSD
+ echo 'LIB_LINK_FLAGS += -Wl,-soname=$(BUILDING_LIBRARY)' >> build/FreeBSD.gcc.inc
+ # Set proper versionning on FreeBSD
+ sed -i -e '/.DLL =/s/$/.1/' build/FreeBSD.inc || die
+}
+
+local_src_compile() {
+ local comp arch
+
+ case ${MULTILIB_ABI_FLAG} in
+ abi_x86_64) arch=x86_64 ;;
+ abi_x86_32) arch=ia32 ;;
+# abi_ppc_64) arch=ppc64 ;;
+# abi_ppc_32) arch=ppc32 ;;
+ esac
+
+ case "$(tc-getCXX)" in
+ *clang*) comp="clang" ;;
+ *g++*) comp="gcc" ;;
+ *ic*c) comp="icc" ;;
+ *) die "compiler $(tc-getCXX) not supported by build system" ;;
+ esac
+
+ tc-export AS CC CXX
+
+ arch=${arch} \
+ CPLUS_FLAGS="${CXXFLAGS}" \
+ emake -C "${S}" compiler=${comp} work_dir="${BUILD_DIR}" tbb_root="${S}" cfg=release $@
+}
+
+multilib_src_compile() {
+ local_src_compile tbb tbbmalloc
+}
+
+multilib_src_test() {
+ local_src_compile test
+}
+
+multilib_src_install() {
+ cd "${BUILD_DIR}_release" || die
+ local l
+ for l in $(find . -name lib\*$(get_libname \*)); do
+ dolib.so ${l}
+ local bl=$(basename ${l})
+ dosym ${bl} /usr/$(get_libdir)/${bl%%.*}$(get_libname)
+ done
+}
diff --git a/dev-dotnet/dotnet-runtime-bin/Manifest b/dev-dotnet/dotnet-runtime-bin/Manifest
index 1b6e27a..78805a8 100644
--- a/dev-dotnet/dotnet-runtime-bin/Manifest
+++ b/dev-dotnet/dotnet-runtime-bin/Manifest
@@ -1,6 +1,15 @@
-DIST dotnet-runtime-3.1.25-linux-arm.tar.gz 31848614 BLAKE2B 2cdd2667f619dc6b8e9c9c0fcaa7011840e077988fa679aaf937ac1e5a9ca6cd0ef3505239a4850e8d893208eb7af3258df910403df7af3494494f945f73a12e SHA512 a0950ef427e07e4de7111411fb12389fda15193a84f22ca04c8a43e16bfe451ba34338def07dcfd3cf530cda0b14b4e69dac83e38da753e8cc708d6090c62dfe
-DIST dotnet-runtime-3.1.25-linux-arm64.tar.gz 30295532 BLAKE2B 5228e50adac1b2f52d130756d0c69b0294c62dd8f8d3618bb3049dae62fa3c8a528d70d0b1febde6d4a7774f0fd975d47ec1c70c7967122c2797c1a34d083e50 SHA512 894efe2c65702b6b99812fdea82672ec8534fa3cee66185266ff06c7fc7d6e9bb5ab12c1a9aee7a9f8f0873fe1eef402a22f34da1860d1f9ec068574380cba10
-DIST dotnet-runtime-3.1.25-linux-x64.tar.gz 30459553 BLAKE2B 2843ad2690bcc7d584dadaefe3fbe58136769fc4e7aee2ce8230ed487e4df3910da1353645d5db06ea12edf657559972a699f9ac638fd7a75bc83fa500dfb2b2 SHA512 e5155a0d26837b53bfc9275bfcd69eb7400bd8b2004be69e339f62ce36b6333f1f2da8d391bb98e4cb3630a20b68a0a0f4e6f8d1558a4cb0a53da796a71c214c
-DIST dotnet-runtime-6.0.5-linux-arm.tar.gz 28627995 BLAKE2B 95f835311a2cd4969c66dfe5085986369ca73266b5fbd456d2c735bd0a436c5c6e04ac70f861ac5ad87f54c6f4e1a8508c2fa794fb04c9537eeda337b08afd33 SHA512 5180bc076629afa91096ed500ce966d1d62e7b1b6248a6a33d6e758a3bca8fdff382d90793d847f049a330f4a0964dd29b18ac8cbd374492f19d74056a608252
-DIST dotnet-runtime-6.0.5-linux-arm64.tar.gz 28386959 BLAKE2B 03783c433506a098bdd56a8ab4945c6e10d8abb62024e78721799bbdf87cdce5c3ddff9196dcb18ce52b3092639d9fe1e991aee6290fad4be70ac054cdc43fff SHA512 bed49b74ad60d2701ddd638c61c215ad48f5c6eb88df140545d29901df60c6667474ca9d3bed6583dba605282ec64989ff2b431f098f0afc6ed155af59f7126d
-DIST dotnet-runtime-6.0.5-linux-x64.tar.gz 30681960 BLAKE2B aa4f1b34860d23e0c3d8eb92aa688cd9a23047031122aec046915cb663cef5ee3a6d7e9036a54b9225bb6722968e54e4d48b95ab6de4e9ecf98c6b8ea03587df SHA512 c228f0ba0ecc4ccda708e97529b248dd6d70f7f747ead6453623be77e8e1529b54db52f5df1b5e00b5b7f92b73389560832f80607fc07e50879d55ce905afcf7
+DIST dotnet-runtime-3.1.32-linux-arm.tar.gz 31846724 BLAKE2B c3515a186492cebe9fc5d094c5d983fe7cc9eb6747d3ef2600fcf5fa628c1e17fc1a05c32cb5679a819702c92250e53bfe29c8e6932cfd1abdd392231363d042 SHA512 eaa5e439e9a70ca72a1de731e4b2b7b97e59c8d60bc694e0a08c8da6246aaecc3498dc14729c83140039a285a8cda8fcd334bdc81e507d97c2f92b9dffcf0140
+DIST dotnet-runtime-3.1.32-linux-arm64.tar.gz 30300088 BLAKE2B c6ff1d6e3b451712df38ebe8694bc9a3b9b3ebc5125b73c274f823c25bc755083b49134e3d10ff4a3a75516cb2f6c72ce1162bd2135749506e6fa56e906d4f08 SHA512 ff311df0db488f3b5cc03c7f6724f8442de7e60fa0a503ec8f536361ce7a357ad26d09d2499d68c50ebdfa751a5520bba4aaa77a38b191c892d5a018561ce422
+DIST dotnet-runtime-3.1.32-linux-x64.tar.gz 30466403 BLAKE2B 0e79d0bc3319529f6ebf00b6b7bb0010b7f62cee89aabab22758e3f9935926415a00351169dc96fb9286c244ca59b55215c8da8e318e6750c7eddb7defe0d5c6 SHA512 a1de9bbc3d2e3a4f5f52b7742c678b182a58a724d36232997511e390027044d60144a7e010a29d6ee016ec91f2911daef28ac5712a827fff8bdde73314b7e002
+DIST dotnet-runtime-6.0.21-linux-arm.tar.gz 28658107 BLAKE2B 48d44a8116c631c8d9c14d81825cf9800631de8cc63c86451f47a3e18aad180ae5f1c5ba5c13cf47737074e003307bd2707a819603545667fcf098fa03fdb9f8 SHA512 a265c05ff50bee5e6d2b46f6117bab812e5348f56914945d09694627a2ea6f309fbd9f5a2656ff90c566fa0208a6119bb87a3fcf26417d64de5549d650c262b6
+DIST dotnet-runtime-6.0.21-linux-arm64.tar.gz 28407878 BLAKE2B 6be0a9643af7c6257b2acef367a231dd7cefde1f8b3589022983e81e0776d6471be481e32783c35ca8cf30c1b8138cb802bd7b88247daef1b729ad589d0cd021 SHA512 f34e1319ded1e1115ceb63eab16a4ac7096e36e3236f8117f61ec9f0e19dd50adb473e1213a1018abfaedc4da57519b85058e7b14187a33e0b91e79af4dabf63
+DIST dotnet-runtime-6.0.21-linux-musl-arm.tar.gz 28680123 BLAKE2B df3c551354009897cbe84236c35e096ff8840d2e881940563407ddeecdf8a0d65fc9e9bde26e1efb8473cfc4d3add761139e7e07cb2fbc3a50abf78f487b173c SHA512 e021f7a2290358ffa130cfb356831ebb06cf6582dccec85a8b1e6004c100972dfb60854e0a2d7f31d09a579ebfa125d4c44e7a150a89e9040f08c06f963624f5
+DIST dotnet-runtime-6.0.21-linux-musl-arm64.tar.gz 28430445 BLAKE2B 437b297e3eacf9c25c71882164fa9dc2f5cc3b17f800132da8b347be16df36956119796e17884934e6c3732948d147ad5341119a430dc21c73e09abfcb1c657f SHA512 827bd3b6117ed674ae290b2b80598551b91e67766533895fbd375b121e813f9d7927797fc91aafe3bf2cac927173703c7dbb4fd18dcc6a2648bf1f973dc86fec
+DIST dotnet-runtime-6.0.21-linux-musl-x64.tar.gz 30254930 BLAKE2B 120466ea08604c4c1727b8be3c58a4e7e6042f5fa0a5524e34b93b55955ec6f99657fbc100ae120aa53e8dd5f315c09c8918ecabd34f3c69c874530dc9dc8411 SHA512 f5205bd0703a8c6db5dc4157849a734103bf2495ae10b15dce38cc03f12195b1a615367bc1f87a2ec4a05472753cd99858b8be2b74adfb93c3b558ebe1f045a1
+DIST dotnet-runtime-6.0.21-linux-x64.tar.gz 30707364 BLAKE2B f2492c46341ffbce60d69c0f24effd857d1895f9a92aa4b5d065f4f849edb7317905fbbebe7ae2ca29774c8938803986f9072ebbfbe8d403fa018f19015276ca SHA512 9b1573f7a42d6c918447b226fda4173b7db891a7290b51ce36cf1c1583f05643a3dda8a13780b5996caa2af36719a910377e71149f538a6fa30c624b8926e0cd
+DIST dotnet-runtime-7.0.10-linux-arm.tar.gz 29657370 BLAKE2B 7c0550f8bb0e8b61d977f58f8d5d3ac015ef1accfcb1277daea49e5f5b4996f6e90b91ae6f71ac1666e8dc6c796316325d66997118fa6e4577136447312d99bd SHA512 15538acaa6799c37d1caf493bd5d94e567c70e6e17dd0b538f4a7ad795d060960181fa8a82c553466cb0ee58b21f4021246395f2b4a27a6dc6d6fe0dfbf53c74
+DIST dotnet-runtime-7.0.10-linux-arm64.tar.gz 29770350 BLAKE2B 9c6f160d608c5afad2e730975348c578f269017b4804bfd7a4dc57109c5e4dc47a9bd0e863a3f620762fdcce7b83c3ec90e1950d4ffdb2f4272cfdd4a6582337 SHA512 e90b68b272d5db7cf8665bf052fb0300d50a69818d70675442dc891654d140f7f84527b849860589bf152de1d00aa55dc15ee32f5678d46ea0069210fd002b03
+DIST dotnet-runtime-7.0.10-linux-musl-arm.tar.gz 29674697 BLAKE2B 8ecf0dd1cdeb757f764cf25684fc854c2740dace757b537443ac007aea6b50063ee72361615948f5e95e34e538fc374e084e9254536a259829954474ea6838dc SHA512 c2280801d61774ac7243d6507aca9134d6757b49513523bca8f31b0f068793c66b4eed6a352607e63e73d5cc6fff26ac05157ec5d25160ac2269c1ecef6bdad1
+DIST dotnet-runtime-7.0.10-linux-musl-arm64.tar.gz 29768438 BLAKE2B af0fff73973b94b487318019639e56ed261345a2e08a3ec3d25fe9d23179e0b5a6d906afbb8be96382a31c84ba4e5cf2fcf7a91af2e3592d5d73874e15672ddd SHA512 660033371ee3a5ae06d64c366a1e1811c19da22eb8e23d67b5fd1c16dda2e52c9650d8c1c9bab6c289a76f89cc61ae97490c01de2f4e908de9e9b82777e97ef0
+DIST dotnet-runtime-7.0.10-linux-musl-x64.tar.gz 31050507 BLAKE2B d6b884269f84c7219cf4a1b842bc0307df61e96bd6a67109caa5edabe3b072db149cf311ad9a135e7c6920cb3fb49fc0cf4044f79616cc665f58e4b91b3a4de8 SHA512 9d494a4748298c494609112d695439c114a42480f58d5b4cadd78a889ecb1b00ff10898cd7c3455589ac367d5a877bdc03621f74901355f063139778ae044c8b
+DIST dotnet-runtime-7.0.10-linux-x64.tar.gz 31493010 BLAKE2B 871559081bfe172dee03796513904c97fae80ee9144c1899479e2f3429229306a1dd988862d52705f11b67ac46111d0fa5dc000b97c2232e438abdff4331522a SHA512 f15b6bf0ef0ce48901880bd89a5fa4b3ae6f6614ab416b23451567844448f2510cf5beeeef6c2ac33400ea013cda7b6d2a4477e7aa0f36461b94741161424c3e
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.25.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild
index 12d4b2a..fd5ec0d 100644
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.25.ebuild
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.32.ebuild
@@ -18,14 +18,14 @@ KEYWORDS="~amd64 ~arm ~arm64"
IUSE="dotnet-symlink kerberos lttng"
REQUIRED_USE="elibc_glibc"
QA_PREBUILT="*"
-RESTRICT="splitdebug"
+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-sdk-bin
!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
)
"
@@ -33,8 +33,7 @@ RDEPEND="
S=${WORKDIR}
delete() {
- local x
- x=$(find . -name "$1" -print -delete) && [ -n "$x" ]
+ test -n "$(find . -name "$1" -print -delete)"
}
src_compile() {
@@ -47,11 +46,11 @@ src_install() {
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}"
+ 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
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.5.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.21.ebuild
index fb09294..3d47925 100644
--- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.5.ebuild
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.21.ebuild
@@ -7,25 +7,31 @@ DESCRIPTION=".NET is a free, cross-platform, open-source developer platform"
HOMEPAGE="https://dotnet.microsoft.com/"
LICENSE="MIT"
+gen_src_uri() {
+ echo "$1? (
+ elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz )
+ elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz )
+ )"
+}
+
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 )
+ $(gen_src_uri amd64 x64)
+ $(gen_src_uri arm)
+ $(gen_src_uri arm64)
"
SLOT="$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="+dotnet-symlink kerberos lttng"
-REQUIRED_USE="elibc_glibc"
+IUSE="dotnet-symlink kerberos lttng"
QA_PREBUILT="*"
-RESTRICT="splitdebug"
+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-sdk-bin
!dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
)
"
@@ -33,8 +39,7 @@ RDEPEND="
S=${WORKDIR}
delete() {
- local x
- x=$(find . -name "$1" -print -delete) && [ -n "$x" ]
+ test -n "$(find . -name "$1" -print -delete)"
}
src_compile() {
diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild
new file mode 100644
index 0000000..3d47925
--- /dev/null
+++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-7.0.10.ebuild
@@ -0,0 +1,65 @@
+# 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"
+
+gen_src_uri() {
+ echo "$1? (
+ elibc_glibc? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-${2:-$1}.tar.gz )
+ elibc_musl? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-musl-${2:-$1}.tar.gz )
+ )"
+}
+
+SRC_URI="
+ $(gen_src_uri amd64 x64)
+ $(gen_src_uri arm)
+ $(gen_src_uri arm64)
+"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="dotnet-symlink kerberos lttng"
+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
+ !dev-dotnet/dotnet-runtime[dotnet-symlink(+)]
+ )
+"
+
+S=${WORKDIR}
+
+delete() {
+ test -n "$(find . -name "$1" -print -delete)"
+}
+
+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 2ad99a6..b36e1ce 100644
--- a/dev-java/openj9-openjdk-bin/Manifest
+++ b/dev-java/openj9-openjdk-bin/Manifest
@@ -1,12 +1,12 @@
-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_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_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
+DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 344573477 SHA256 cbeb1b48be7ebe090d7998ff903cdfc120597f0c291e063f2173786ebc4d1e7a
+DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 359634686 SHA256 d8e0a70145f7f160a1c26ad5196f521bf68ad0ecd6a784faf81ab59868ffb81b
+DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 357090764 SHA256 39efd2b530b3061c11c490e75ebbb20a4ec72448aec268bdb8449ee00021a138
+DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 372992490 SHA256 093579d76dda1fff44da05f08a9450d4e435e2f6be5d538113b96ccf0d2a559e
+DIST ibm-semeru-open-debugimage_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 369014125 SHA256 d2cda3fb77f3cad6870f2c868ad4bb3fc6c86e2a82522426a732733ce0fdb2d6
+DIST ibm-semeru-open-debugimage_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 386149336 SHA256 cf947725632aa736e9bd0e5b7b3f5af9b427f62fdde2b9c16c4aaf3e1231526d
+DIST ibm-semeru-open-jdk_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 202866166 SHA256 64f9cc164906b65fb1cb88287d64e40e02371ae1366bce28802d90cbd91df1be
+DIST ibm-semeru-open-jdk_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 206857922 SHA256 cfdff21ce44ae6af494cba75c1f323bef83a982f2c11944988bab2125f85b906
+DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 206559764 SHA256 c23d62e5e2c3613357f6904cfc9a8229709bbc12d6aeb814875e0c4c471bb350
+DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 211958174 SHA256 6934275c8045df881db8693caa219ef566d15f4a0d0b0154583f12370b996c5b
+DIST ibm-semeru-open-jdk_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 205707724 SHA256 d11ec92737b9f97bdd9bb553c3e476981f4ac38039963a15c2e1ca9ec163a304
+DIST ibm-semeru-open-jdk_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 209702777 SHA256 9b945e58f024108a20eb907015cca4a452332b7644e8dd8e051149a3ec62e3a3
diff --git a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh
index 2e200d9..f4e3c9a 100644
--- a/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh
+++ b/dev-java/openj9-openjdk-bin/files/openj9-openjdk-bin.env.sh
@@ -1,7 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK ${DL_PV}"
+VERSION="IBM Semeru JDK ${DL_PV}"
JAVA_HOME="${EPREFIX}/opt/${P}"
JDK_HOME="${EPREFIX}/opt/${P}"
JAVAC="\${JAVA_HOME}/bin/javac"
diff --git a/dev-java/openj9-openjdk-bin/metadata.xml b/dev-java/openj9-openjdk-bin/metadata.xml
index 4c0b1aa..532f0f1 100644
--- a/dev-java/openj9-openjdk-bin/metadata.xml
+++ b/dev-java/openj9-openjdk-bin/metadata.xml
@@ -8,7 +8,6 @@
</longdescription>
<use>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
<flag name="source">Install JVM sources</flag>
</use>
</pkgmetadata>
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.15.10.0.32.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild
index 91c0740..f41e70a 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.15.10.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.21_p9.ebuild
@@ -14,8 +14,8 @@ abi_uri() {
)"
}
-JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
-DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.41.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM"
HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups debug +gentoo-vm headless-awt selinux source"
+IUSE="alsa cups debug headless-awt selinux source"
RDEPEND="
>=sys-apps/baselayout-java-0.1.0-r1
@@ -110,7 +110,7 @@ src_install() {
# provide stable symlink
dosym "${P}" "/opt/${PN}-${SLOT}"
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
java-vm_set-pax-markings "${ddest}"
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.3.7.0.32.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild
index 91c0740..f41e70a 100644
--- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.3.7.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.9_p9.ebuild
@@ -14,8 +14,8 @@ abi_uri() {
)"
}
-JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
-DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.41.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM"
HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups debug +gentoo-vm headless-awt selinux source"
+IUSE="alsa cups debug headless-awt selinux source"
RDEPEND="
>=sys-apps/baselayout-java-0.1.0-r1
@@ -110,7 +110,7 @@ src_install() {
# provide stable symlink
dosym "${P}" "/opt/${PN}-${SLOT}"
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
java-vm_set-pax-markings "${ddest}"
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest
index 11eda36..3c2aca6 100644
--- a/dev-java/openj9-openjdk-jre-bin/Manifest
+++ b/dev-java/openj9-openjdk-jre-bin/Manifest
@@ -1,6 +1,6 @@
-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_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
+DIST ibm-semeru-open-jre_aarch64_linux_11.0.21_9_openj9-0.41.0.tar.gz 46724041 SHA256 5eb5d5d6006e1066b5c72d3b000f1c8fda572fa64189af103ef1176235cd3174
+DIST ibm-semeru-open-jre_aarch64_linux_17.0.9_9_openj9-0.41.0.tar.gz 46616927 SHA256 9760aa27a5790a8c20a702ff5f036535f3df51d3fb291bb5254b5ae76e096bad
+DIST ibm-semeru-open-jre_ppc64le_linux_11.0.21_9_openj9-0.41.0.tar.gz 48848011 SHA256 0495d4d122dfb7ae160d9c76549f62fdd77b9c8ceddc9d4aced882c3c5157ba5
+DIST ibm-semeru-open-jre_ppc64le_linux_17.0.9_9_openj9-0.41.0.tar.gz 49098475 SHA256 73b9baab2766191de5da00498f2dcfe9de90fff6c4c457bea4944f103c6dde6e
+DIST ibm-semeru-open-jre_x64_linux_11.0.21_9_openj9-0.41.0.tar.gz 48023048 SHA256 324f7e8d75490cc76d5cf6a46b43f50ec1206a97d49e1549d1c65f1583fc51d5
+DIST ibm-semeru-open-jre_x64_linux_17.0.9_9_openj9-0.41.0.tar.gz 47935029 SHA256 1caf409f33f7738efe37742197525b5ae6244d6383b2017e7b8e925dc0b6a329
diff --git a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh
index 1ad9132..ba4b8a2 100644
--- a/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh
+++ b/dev-java/openj9-openjdk-jre-bin/files/openj9-openjdk-jre-bin.env.sh
@@ -1,10 +1,5 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="AdoptOpenJDK JRE ${DL_PV}"
-JAVA_HOME="${EPREFIX}/opt/${P}"
-JDK_HOME="${EPREFIX}/opt/${P}"
-JAVAC="\${JAVA_HOME}/bin/javac"
+VERSION="IBM Semeru JRE ${DL_PV}"
+JAVA_HOME="${EPREFIX}/opt/${PN}-${SLOT}"
PATH="\${JAVA_HOME}/bin"
ROOTPATH="\${JAVA_HOME}/bin"
LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
@@ -13,4 +8,4 @@ PROVIDES_TYPE="JRE"
PROVIDES_VERSION="${SLOT}"
BOOTCLASSPATH=""
GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
+ENV_VARS="JAVA_HOME PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openj9-openjdk-jre-bin/metadata.xml b/dev-java/openj9-openjdk-jre-bin/metadata.xml
index b21a054..96526d8 100644
--- a/dev-java/openj9-openjdk-jre-bin/metadata.xml
+++ b/dev-java/openj9-openjdk-jre-bin/metadata.xml
@@ -8,6 +8,5 @@
</longdescription>
<use>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
</use>
</pkgmetadata>
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild
index c121b1e..7aa42d8 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.15.10.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.21_p9.ebuild
@@ -11,8 +11,8 @@ abi_uri() {
)"
}
-JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
-DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.41.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -25,12 +25,11 @@ DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM"
HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
+IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
media-libs/freetype:2
- >net-libs/libnet-1.1
>=sys-apps/baselayout-java-0.1.0-r1
>=sys-libs/glibc-2.2.5:*
sys-libs/zlib
diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild
index c121b1e..7aa42d8 100644
--- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.3.7.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.9_p9.ebuild
@@ -11,8 +11,8 @@ abi_uri() {
)"
}
-JDK_PV=$(ver_cut 1-3)+$(ver_cut 4)
-DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7)
+JDK_PV=${PV//_p/+}
+DL_PV=${JDK_PV}_openj9-0.41.0
SLOT=$(ver_cut 1)
SRC_URI="
@@ -25,12 +25,11 @@ DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM"
HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/"
LICENSE="GPL-2-with-classpath-exception"
KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups +gentoo-vm headless-awt selinux"
+IUSE="alsa cups headless-awt selinux"
RDEPEND="
media-libs/fontconfig:1.0
media-libs/freetype:2
- >net-libs/libnet-1.1
>=sys-apps/baselayout-java-0.1.0-r1
>=sys-libs/glibc-2.2.5:*
sys-libs/zlib
diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index 1c1b7c0..59d3825 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,4 +1,4 @@
-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
+DIST openj9-0.41.0.tar.gz 18175551 BLAKE2B 691251444980b715b30d2624f6bf9e3964fb848201491f9ac18076ad8d4e354f34ba38affdf55ddf2631ddbd980a5fa4a39a7ac4dab9da8d8cf912711e03009a SHA512 39b5b3d950954183fcfce40398ab7a990a5030e7f403d2e1eb216a914345ec78bcdac14c5c2b24c7ddafcb75a91e267b03c752f88189b537258967f2d191efea
+DIST openj9-omr-0.41.0.tar.gz 8058703 BLAKE2B ead5711d9ab0400ddee7798c594585b9bfe73eeb20fc59f191ba062e64005f8c41c4ff8049e58d95cdb5f2175929274ae306c0b4f7938e8c5c8df2f9962d59df SHA512 2429994271f8367204b0e6d75450a7d283dc0fc1166055340a050cf80e06e87d95e3df0607d8d2554fb4adfa712f6ff048fb3d0fb24efed1960e5e3802b7f02d
+DIST openj9-openjdk-jdk11-openj9-0.41.0.tar.gz 102514856 BLAKE2B cb1bdc624ae4222ceaac329c5a70ac9f69003bad1dafbd2600fd088538a988b659f368615d5a269c0965caeb14df5b60cf80231d203fbe4a6302ba14a29fccaa SHA512 681a5d636c4672dae489cf71dfd6d9f8879a6ffe795912ecf9fa8f319f2039a16b9db2a75ee69bee9330f2978c411b077d496dc46ff91d9ec4c835f2b32d6142
+DIST openj9-openjdk-jdk17-openj9-0.41.0.tar.gz 95151687 BLAKE2B 4f31f740d3bc568910ec9c0c55b980a51e13272c1fd2d740e019b0fbe1631910e4f961170b26221bcf49d88e47fe0f314ab1182d113581abdecd096f873f71f6 SHA512 5d6e58a317c641b5b73295ee2f3ca63e85d14385640727e949ad06c41dc260fd710eef9f5eac8cb426e1524439359340f2d1ab606c752d77643baeb3201a2d18
diff --git a/dev-java/openj9-openjdk/files/omr-fam.patch b/dev-java/openj9-openjdk/files/omr-fam.patch
deleted file mode 100644
index 9141ec1..0000000
--- a/dev-java/openj9-openjdk/files/omr-fam.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/ddr/tools/blob_reader/blob_reader.cpp b/ddr/tools/blob_reader/blob_reader.cpp
-index 028decd0c..a0212609f 100644
---- a/ddr/tools/blob_reader/blob_reader.cpp
-+++ b/ddr/tools/blob_reader/blob_reader.cpp
-@@ -85,7 +85,7 @@ struct BlobHeaderV1 {
-
- struct BlobString {
- uint16_t length;
-- char data[1]; /* flexible array member */
-+ char data[];
-
- void endian_swap()
- {
-diff --git a/include_core/ute_core.h b/include_core/ute_core.h
-index 8b3b1c65d..330ea52c6 100644
---- a/include_core/ute_core.h
-+++ b/include_core/ute_core.h
-@@ -125,7 +125,7 @@ typedef struct UtTraceRecord {
- uint64_t threadSyn2; /* Thread synonym 2 */
- int32_t firstEntry; /* Offset to first trace entry */
- int32_t nextEntry; /* Offset to next entry */
-- char threadName[1]; /* Thread name */
-+ char threadName[]; /* Thread name */
- } UtTraceRecord;
-
- /*
-diff --git a/include_core/ute_dataformat.h b/include_core/ute_dataformat.h
-index 71d9e36ad..8a9dcb487 100644
---- a/include_core/ute_dataformat.h
-+++ b/include_core/ute_dataformat.h
-@@ -180,7 +180,7 @@ typedef struct UtProcSection {
- #define UT_TRACE_ACTIVE_SECTION_NAME "UTTA"
- typedef struct UtActiveSection {
- UtDataHeader header; /* Eyecatcher, version etc */
-- char active[1]; /* Trace activation commands */
-+ char active[]; /* Trace activation commands */
- } UtActiveSection;
-
- /*
-@@ -191,7 +191,7 @@ typedef struct UtActiveSection {
- #define UT_TRACE_SERVICE_SECTION_NAME "UTSS"
- typedef struct UtServiceSection {
- UtDataHeader header; /* Eyecatcher, version etc */
-- char level[1]; /* Service level info */
-+ char level[]; /* Service level info */
- } UtServiceSection;
-
- /*
-@@ -202,7 +202,7 @@ typedef struct UtServiceSection {
- #define UT_TRACE_STARTUP_SECTION_NAME "UTSO"
- typedef struct UtStartupSection {
- UtDataHeader header; /* Eyecatcher, version etc */
-- char options[1]; /* Startup options */
-+ char options[]; /* Startup options */
- } UtStartupSection;
-
- /*
-diff --git a/omrtrace/omrtrace_internal.h b/omrtrace/omrtrace_internal.h
-index e52347eac..a68a88abd 100644
---- a/omrtrace/omrtrace_internal.h
-+++ b/omrtrace/omrtrace_internal.h
-@@ -157,7 +157,7 @@ typedef struct OMR_TraceGlobal OMR_TraceGlobal;
- typedef struct UtTraceCfg {
- UtDataHeader header;
- struct UtTraceCfg *next; /* Next trace config command */
-- char command[1]; /* Start of variable length section */
-+ char command[]; /* Start of variable length section */
- } UtTraceCfg;
-
- typedef struct UtDeferredConfigInfo {
diff --git a/dev-java/openj9-openjdk/files/openj9-no-o3.patch b/dev-java/openj9-openjdk/files/openj9-no-o3.patch
index 63d1dcf..b332052 100644
--- a/dev-java/openj9-openjdk/files/openj9-no-o3.patch
+++ b/dev-java/openj9-openjdk/files/openj9-no-o3.patch
@@ -1,11 +1,10 @@
-diff -ru a/runtime/cmake/platform/toolcfg/gnu.cmake b/runtime/cmake/platform/toolcfg/gnu.cmake
---- a/runtime/cmake/platform/toolcfg/gnu.cmake 2021-07-20 17:24:52.000000000 -0400
-+++ b/runtime/cmake/platform/toolcfg/gnu.cmake 2021-08-07 09:46:15.685325927 -0400
+--- a/runtime/cmake/platform/toolcfg/gnu.cmake
++++ b/runtime/cmake/platform/toolcfg/gnu.cmake
@@ -20,7 +20,6 @@
# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
################################################################################
-list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3 -g -fstack-protector)
- list(APPEND OMR_PLATFORM_C_COMPILE_OPTIONS -Wimplicit -Wreturn-type)
- list(APPEND OMR_PLATFORM_CXX_COMPILE_OPTIONS -fno-threadsafe-statics)
-
+ if(OMR_DDR AND NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 11))
+ # In gcc 11+ the default is to use DWARF version 5 which is not yet
+ # supported by ddrgen: tell the compiler to use DWARF version 4.
diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk-override-version.patch b/dev-java/openj9-openjdk/files/openj9-openjdk-override-version.patch
new file mode 100644
index 0000000..1652627
--- /dev/null
+++ b/dev-java/openj9-openjdk/files/openj9-openjdk-override-version.patch
@@ -0,0 +1,11 @@
+--- a/closed/OpenJ9.gmk
++++ b/closed/OpenJ9.gmk
+@@ -44,7 +44,7 @@
+ # $4 - 'required' for a required repository, anything else for an optional one
+ GetVersion = $(eval $(call GetVersionHelper,$(strip $1),$(strip $2),$(strip $3),$(strip $4)))
+ define GetVersionHelper
+- $2 := $$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD))
++ $2 := $$(if $$($2),$$($2),$$(if $(wildcard $3),$$(shell $(GIT) -C $3 rev-parse --short HEAD)))
+ ifneq (,$$($2))
+ VersionLabelWidth := $(shell $(ECHO) "$1" | $(AWK) "{ width = length; print (width > $(VersionLabelWidth) ? width : $(VersionLabelWidth)) }")
+ VersionPairs += "$1" "$$($2)"
diff --git a/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh b/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh
index 5aac9c7..8d0d130 100644
--- a/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh
+++ b/dev-java/openj9-openjdk/files/openj9-openjdk.env.sh
@@ -1,6 +1,3 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
VERSION="OpenJDK ${SLOT} with OpenJ9 ${OPENJ9_PV}"
JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml
index 8af5981..dadf469 100644
--- a/dev-java/openj9-openjdk/metadata.xml
+++ b/dev-java/openj9-openjdk/metadata.xml
@@ -8,9 +8,9 @@
<use>
<flag name="ddr">Enable Direct Dump Reader</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>
<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
+ <flag name="jitserver">OpenJ9 JITServer support</flag>
<flag name="numa">Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)</flag>
<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
</use>
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.32.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild
index d11ce4a..35bc082 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.41.0.ebuild
@@ -18,8 +18,8 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
else
SRC_URI="
- https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
- https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
+ https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+ https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
"
fi
@@ -27,7 +27,7 @@ fi
LICENSE="GPL-2"
KEYWORDS="~amd64"
-IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap numa selinux source systemtap"
+IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
@@ -40,7 +40,7 @@ COMMON_DEPEND="
media-libs/libpng:0=
media-libs/lcms:2=
sys-libs/zlib
- virtual/jpeg:0=
+ media-libs/libjpeg-turbo:0=
systemtap? ( dev-util/systemtap )
dev-libs/elfutils
@@ -83,14 +83,14 @@ DEPEND="
x11-libs/libXtst
javafx? ( dev-java/openjfx:${SLOT}= )
|| (
- dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)]
- dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)]
- dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
- dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+ dev-java/openj9-openjdk-bin:${SLOT}
+ dev-java/openj9-openjdk:${SLOT}
+ dev-java/openjdk-bin:${SLOT}
+ dev-java/openjdk:${SLOT}
)
"
-S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
+S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}"
# The space required to build varies wildly depending on USE flags,
# ranging from 3GB to 16GB. This function is certainly not exact but
@@ -109,6 +109,10 @@ pkg_pretend() {
openjdk_check_requirements
if [[ ${MERGE_TYPE} != binary ]]; then
has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+
+ if use jitserver && tc-is-clang; then
+ die "jitserver does not compile with clang"
+ fi
fi
}
@@ -147,17 +151,9 @@ src_prepare() {
default
+ eapply -- "${FILESDIR}/openj9-openjdk-override-version.patch"
eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
- eapply -d omr -- "${FILESDIR}/omr-fam.patch"
-
- if [[ ${OPENJ9_PV} != 9999 ]]; then
- sed -i -e '/^OPENJDK_SHA :=/s/:=.*/:= __OPENJDK_SHA__/' \
- -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- closed/OpenJ9.gmk || die
- fi
find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die
sed -i -e '/^ OPENJ9_CONFIGURE_NUMA$/d' closed/autoconf/custom-hook.m4 || die
@@ -203,6 +199,7 @@ src_configure() {
--with-cmake
$(use_enable ddr)
+ $(use_enable jitserver)
)
if use javafx; then
@@ -239,6 +236,10 @@ src_compile() {
$(usex jbootstrap bootcycle-images product-images)
EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}"
+ OPENJDK_SHA=$(ver_cut 1-3)
+ OPENJ9_SHA=${OPENJ9_P}
+ OPENJ9_TAG=${OPENJ9_P}
+ OPENJ9OMR_SHA=${OPENJ9_P}
)
emake "${myemakeargs[@]}" -j1 #nowarn
}
@@ -269,7 +270,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.32.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild
index e42663c..ca64ddd 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.32.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.41.0.ebuild
@@ -18,8 +18,8 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then
OPENJ9_OMR_EGIT_REPO_URI="https://github.com/eclipse/openj9-omr.git"
else
SRC_URI="
- https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
- https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz
+ https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/${OPENJ9_P}.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz
+ https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz
https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz
"
fi
@@ -27,7 +27,7 @@ fi
LICENSE="GPL-2"
KEYWORDS="~amd64"
-IUSE="alsa cups ddr debug doc +gentoo-vm headless-awt javafx +jbootstrap numa selinux source systemtap"
+IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
@@ -40,7 +40,7 @@ COMMON_DEPEND="
media-libs/libpng:0=
media-libs/lcms:2=
sys-libs/zlib
- virtual/jpeg:0=
+ media-libs/libjpeg-turbo:0=
systemtap? ( dev-util/systemtap )
dev-libs/elfutils
@@ -90,7 +90,7 @@ DEPEND="
)
"
-S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
+S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}"
# The space required to build varies wildly depending on USE flags,
# ranging from 3GB to 16GB. This function is certainly not exact but
@@ -109,6 +109,10 @@ pkg_pretend() {
openjdk_check_requirements
if [[ ${MERGE_TYPE} != binary ]]; then
has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
+
+ if use jitserver && tc-is-clang; then
+ die "jitserver does not compile with clang"
+ fi
fi
}
@@ -132,25 +136,11 @@ pkg_setup() {
local vm
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+ if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
java-pkg-2_pkg_setup
return
fi
done
-
- for variant in openj9- ''; do
- if has_version dev-java/${variant}openjdk:${SLOT}; then
- JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${SLOT}
- break
- elif has_version dev-java/${variant}openjdk-bin:${SLOT}; then
- JDK_HOME=$(best_version dev-java/${variant}openjdk-bin:${SLOT})
- JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
- break
- fi
- done
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
- export JDK_HOME
}
src_unpack() {
@@ -175,17 +165,9 @@ src_prepare() {
default
+ eapply -- "${FILESDIR}/openj9-openjdk-override-version.patch"
eapply -d openj9 -- "${FILESDIR}/openj9-no-o3.patch"
eapply -d omr -- "${FILESDIR}/omr-omrstr-iconv-failure-overflow.patch"
- eapply -d omr -- "${FILESDIR}/omr-fam.patch"
-
- if [[ ${OPENJ9_PV} != 9999 ]]; then
- sed -i -e '/^OPENJDK_SHA :=/s/:=.*/:= __OPENJDK_SHA__/' \
- -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \
- -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \
- closed/OpenJ9.gmk || die
- fi
find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die
sed -i -e '/^ OPENJ9_CONFIGURE_NUMA$/d' closed/autoconf/custom-hook.m4 || die
@@ -194,6 +176,20 @@ src_prepare() {
}
src_configure() {
+ for variant in openj9- ''; do
+ if has_version dev-java/${variant}openjdk:${SLOT}; then
+ JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${SLOT}
+ break
+ elif has_version dev-java/${variant}openjdk-bin:${SLOT}; then
+ JDK_HOME=$(best_version dev-java/${variant}openjdk-bin:${SLOT})
+ JDK_HOME=${JDK_HOME#*/}
+ JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+ break
+ fi
+ done
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+ export JDK_HOME
+
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2
@@ -231,6 +227,7 @@ src_configure() {
--with-cmake
$(use_enable ddr)
+ $(use_enable jitserver)
)
if use javafx; then
@@ -267,6 +264,10 @@ src_compile() {
$(usex jbootstrap bootcycle-images product-images)
EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}"
+ OPENJDK_SHA=$(ver_cut 1-3)
+ OPENJ9_SHA=${OPENJ9_P}
+ OPENJ9_TAG=${OPENJ9_P}
+ OPENJ9OMR_SHA=${OPENJ9_P}
)
emake "${myemakeargs[@]}" -j1 #nowarn
}
@@ -297,12 +298,12 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh
+ java-vm_install-env "${FILESDIR}"/${PN}.env.sh
java-vm_revdep-mask
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
@@ -312,3 +313,7 @@ src_install() {
dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}
+
+pkg_postinst() {
+ java-vm-2_pkg_postinst
+}
diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
deleted file mode 100644
index daf4475..0000000
--- a/dev-lang/zig/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d
diff --git a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch b/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch
deleted file mode 100644
index 70f807f..0000000
--- a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 638f39f7e..791477c41 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -787,7 +787,7 @@ else()
- set(ZIG1_RELEASE_ARG -OReleaseFast --strip)
- endif()
- if(ZIG_SINGLE_THREADED)
-- set(ZIG1_SINGLE_THREADED_ARG "-fsingle-threaded")
-+ set(ZIG1_SINGLE_THREADED_ARG "--single-threaded")
- else()
- set(ZIG1_SINGLE_THREADED_ARG "")
- endif()
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild
deleted file mode 100644
index 2227501..0000000
--- a/dev-lang/zig/zig-0.9.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=13
-inherit cmake llvm check-reqs
-
-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://ziglang.org/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test +threads"
-RESTRICT="!test? ( test )"
-
-PATCHES=("${FILESDIR}/${P}-fix-single-threaded.patch")
-
-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 threads ${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}"
-}
-
-# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements
-CHECKREQS_MEMORY="10G"
-
-pkg_setup() {
- llvm_pkg_setup
- check-reqs_pkg_setup
-}
-
-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
- -DZIG_SINGLE_THREADED="$(usex threads OFF 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 dcc5163..53fb6a2 100644
--- a/dev-libs/libdwarf/Manifest
+++ b/dev-libs/libdwarf/Manifest
@@ -1 +1 @@
-DIST libdwarf-0.4.1.tar.xz 2410800 BLAKE2B 88753ebc2606fbcc7a41ea3db8f5bc1b41357705f7b4e21acb49c13d96f3741a7305b764ab973bc9ac0c6c4246b668f82d93886451d9963f4237a9ff47694429 SHA512 793fe487de80fe6878f022b90f49ec334a0d7db071ff22a11902db5e3457cc7f3f853945a9ac74de2c40f7f388277f21c5b2e62745bca92d2bb55c51e9577693
+DIST libdwarf-0.9.0.tar.xz 2718492 BLAKE2B fd3d2d94532a009dfceb46869481507bf92d8ad7236bc2240049272f5e9f102d1a53bcc57df83fcdfc0ab37fbdab6e3926312d3619d8b0e669198b47bba1b950 SHA512 282d90dfc9da704eb64a4ba1141f2ae660feeb14bbf1a72377386698e3124928b44a6914d8e88e6141ab08835ce723ad090a853ad57dbcb439dbba57255fb589
diff --git a/dev-libs/libdwarf/libdwarf-0.4.1.ebuild b/dev-libs/libdwarf/libdwarf-0.9.0.ebuild
index ee99812..475c379 100644
--- a/dev-libs/libdwarf/libdwarf-0.4.1.ebuild
+++ b/dev-libs/libdwarf/libdwarf-0.9.0.ebuild
@@ -14,7 +14,6 @@ IUSE="dwarfexample dwarfgen static-libs"
DEPEND="
sys-libs/zlib
- dwarfgen? ( virtual/libelf )
"
RDEPEND="${DEPEND}"
@@ -24,7 +23,6 @@ src_configure() {
--enable-shared
$(use_enable dwarfexample)
$(use_enable dwarfgen)
- $(use_enable dwarfgen libelf)
$(use_enable static-libs static)
)
econf "${myeconfargs[@]}"
diff --git a/dev-libs/libdwarf/metadata.xml b/dev-libs/libdwarf/metadata.xml
index c4a208f..32edad3 100644
--- a/dev-libs/libdwarf/metadata.xml
+++ b/dev-libs/libdwarf/metadata.xml
@@ -9,4 +9,7 @@
<flag name="dwarfexample">dwarfexample</flag>
<flag name="dwarfgen">dwarfgen</flag>
</use>
+ <upstream>
+ <remote-id type="github">davea42/libdwarf-code</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 0f681d0..a86d270 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,2 +1,2 @@
-DIST openssl-3.0.3.tar.gz 15058905 BLAKE2B 8141d13dbea2f1febdd4e46aa404e9f3bac51e1fdc0c9b0df8bf3bf6852e18b09201a2a8cbee99f72e8d6de660834093449b7a14a3fbdda8511286ca3b6743e7 SHA512 949472025211fabdaf2564122f0a9a3baef0facb6373e90cf6c4485164a50898050b179722d0b358c4d8cf1787384ea30d5fd03b98757634631d3e8978509b1a
-DIST openssl-3.0.3.tar.gz.asc 488 BLAKE2B 3f31e3a73706b69683220e05b1b4ddc75dc3e7e12652dca711e4aa0eb3c023ef736aee9ade15172d7f28e1e1af03e86d4854ec6c3d167cad42882f483c5e56d4 SHA512 04afe65c6af1ae43a9967462383a6a4f567f5acff19ec1952cd6fce2dc3c3d4dfb3cb54126562724c148f40dcb66668abf727282d35730bbf36f82b5c6bacace
+DIST openssl-3.1.1.tar.gz 15544757 BLAKE2B 094f7e28f16de6528016fcd21df1d7382b0dbdcd80ec469d37add9c37f638c059dda3ffb4415eba890a33d146ddc9016bcc7192df101c73be5e70faf6e3b1097 SHA512 8ba9dd6ab87451e126c19cc106ccd1643ca48667d6c37504d0ab98205fbccf855fd0db54474b4113c4c3a15215a4ef77a039fb897a69f71bcab2054b2effd1d9
+DIST openssl-3.1.1.tar.gz.asc 833 BLAKE2B 5a2a9aeb475b843862e133d53bc5bb3c8e12e8e03b1e2da41d0eaa0eade1ae03c4318ad1f5c490c5e1ed7e6ac6275a6d7c881d99993911722b043b15d1622b25 SHA512 83349020c67e5b956f3ef37604a03a1970ea393f862691f5fd5d85930c01e559e25db17d397d8fd230c3862a8b2fba2d5c7df883d56d7472f4c01dab3a661cb2
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.2 b/dev-libs/openssl/files/gentoo.config-1.0.4
index 68d7d0a..79f6331 100644
--- a/dev-libs/openssl/files/gentoo.config-1.0.2
+++ b/dev-libs/openssl/files/gentoo.config-1.0.4
@@ -77,7 +77,9 @@ fi
# Detect target arch
machine=""
+submachine=""
chost_machine=${CHOST%%-*}
+[[ ${CC} == *clang* ]] && submachine="-clang"
case ${system} in
linux)
case ${chost_machine}:${ABI} in
@@ -95,17 +97,22 @@ linux)
# hppa64*) machine=parisc64;;
hppa*) machine="generic32 -DB_ENDIAN";;
i[0-9]86*|\
- x86_64*:x86) machine=elf;;
+ x86_64*:x86) machine=x86${submachine};;
ia64*) machine=ia64;;
- m68*) machine="generic32 -DB_ENDIAN";;
- mips*el*) machine="generic32 -DL_ENDIAN";;
- mips*) machine="generic32 -DB_ENDIAN";;
+ loongarch64*) machine="loongarch64 -DL_ENDIAN" system=linux64;;
+ m68*) machine="latomic -DB_ENDIAN";;
+ mips*el*:o32) machine="mips32 -DL_ENDIAN";;
+ mips*:o32) machine="mips32 -DB_ENDIAN";;
+ mips*el*:n32) machine="mips64 -DL_ENDIAN";;
+ mips*:n32) machine="mips64 -DB_ENDIAN";;
+ mips*el*:n64) machine="mips64 -DL_ENDIAN" system=linux64;;
+ mips*:n64) machine="mips64 -DB_ENDIAN" system=linux64;;
powerpc64*le*)machine=ppc64le;;
powerpc64*) machine=ppc64;;
powerpc*le*) machine="generic32 -DL_ENDIAN";;
powerpc*) machine=ppc;;
riscv32*) machine="generic32 -DL_ENDIAN";;
- riscv64*) machine="generic64 -DL_ENDIAN";;
+ riscv64*) machine="riscv64 -DL_ENDIAN" system=linux64;;
# sh64*) machine=elf;;
sh*b*) machine="generic32 -DB_ENDIAN";;
sh*) machine="generic32 -DL_ENDIAN";;
@@ -120,7 +127,7 @@ linux)
s390x*) machine=s390x system=linux64;;
s390*) machine="generic32 -DB_ENDIAN";;
x86_64*:x32) machine=x32;;
- x86_64*) machine=x86_64;;
+ x86_64*) machine=x86_64${submachine};;
esac
;;
BSD)
diff --git a/dev-libs/openssl/openssl-3.0.3-r1.ebuild b/dev-libs/openssl/openssl-3.1.1.ebuild
index 86e51bf..d391173 100644
--- a/dev-libs/openssl/openssl-3.0.3-r1.ebuild
+++ b/dev-libs/openssl/openssl-3.1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
@@ -15,21 +16,22 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
- 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"
+ SRC_URI="
+ mirror://openssl/source/${MY_P}.tar.gz
+ verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )
+ "
+ #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
S="${WORKDIR}"/${MY_P}
LICENSE="Apache-2.0"
-SLOT="0/3" # .so version of libssl/libcrypto
+SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto
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="
- >=app-misc/c_rehash-1.7-r1
+ !<net-misc/openssh-9.2_p1-r3
tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
"
BDEPEND="
@@ -40,7 +42,7 @@ BDEPEND="
sys-devel/bc
sys-process/procps
)
- verify-sig? ( sec-keys/openpgp-keys-openssl )"
+ verify-sig? ( >=sec-keys/openpgp-keys-openssl-20230207 )"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
@@ -50,11 +52,6 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/openssl/configuration.h
)
-PATCHES=(
- # General patches which are suitable to always apply
- # If they're Gentoo specific, add to USE=-vanilla logic in src_prepare!
-)
-
pkg_setup() {
if use ktls ; then
if kernel_is -lt 4 18 ; then
@@ -63,6 +60,7 @@ pkg_setup() {
CONFIG_CHECK="~TLS ~TLS_DEVICE"
ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+ use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
linux-info_pkg_setup
fi
@@ -81,14 +79,17 @@ pkg_setup() {
fi
}
-src_prepare() {
- # Allow openssl to be cross-compiled
- cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
- chmod a+rx gentoo.config || die
+src_unpack() {
+ # Can delete this once test fix patch is dropped
+ if use verify-sig ; then
+ # Needed for downloaded patch (which is unsigned, which is fine)
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+ fi
- # Keep this in sync with app-misc/c_rehash
- SSL_CNF_DIR="/etc/ssl"
+ default
+}
+src_prepare() {
# Make sure we only ever touch Makefile.org and avoid patching a file
# that gets blown away anyways by the Configure script in src_configure
rm -f Makefile
@@ -106,18 +107,13 @@ src_prepare() {
rm test/recipes/80-test_ssl_new.t || die
fi
- # - Make sure the man pages are suffixed (bug #302165)
- # - Don't bother building man pages if they're disabled
- # - Make DOCDIR Gentoo compliant
- sed -i \
- -e '/^MANSUFFIX/s:=.*:=ssl:' \
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
- -e $(has noman FEATURES \
- && echo '/^install:/s:install_docs::' \
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
- -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
- Configurations/unix-Makefile.tmpl \
- || die
+ # Test fails depending on kernel configuration, bug #699134
+ rm test/recipes/30-test_afalg.t || die
+}
+
+src_configure() {
+ # Keep this in sync with app-misc/c_rehash
+ SSL_CNF_DIR="/etc/ssl"
# Quiet out unknown driver argument warnings since openssl
# doesn't have well-split CFLAGS and we're making it even worse
@@ -130,32 +126,17 @@ src_prepare() {
# it's still relevant:
# - https://github.com/llvm/llvm-project/issues/55255
# - https://github.com/openssl/openssl/issues/18225
+ # - https://github.com/openssl/openssl/issues/18663#issuecomment-1181478057
# Don't remove the no strict aliasing bits below!
filter-flags -fstrict-aliasing
append-flags -fno-strict-aliasing
+ # The OpenSSL developers don't test with LTO right now, it leads to various
+ # warnings/errors (which may or may not be false positives), it's considered
+ # unsupported, and it's not tested in CI: https://github.com/openssl/openssl/issues/18663.
+ filter-lto
append-flags $(test-flags-CC -Wa,--noexecstack)
- # Prefixify Configure shebang (bug #141906)
- sed \
- -e "1s,/usr/bin/env,${BROOT}&," \
- -i Configure || die
-
- # Remove test target when FEATURES=test isn't set
- if ! use test ; then
- sed \
- -e '/^$config{dirs}/s@ "test",@@' \
- -i Configure || die
- fi
-
- # The config script does stupid stuff to prompt the user. Kill it.
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
- ./config --test-sanity || die "I AM NOT SANE"
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
# bug #197996
unset APPS
# bug #312551
@@ -165,14 +146,16 @@ multilib_src_configure() {
tc-export AR CC CXX RANLIB RC
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
- local sslout=$(./gentoo.config)
+ local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4")
einfo "Using configuration: ${sslout:-(openssl knows best)}"
- local config="Configure"
- [[ -z ${sslout} ]] && config="config"
# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
local myeconfargs=(
@@ -185,7 +168,7 @@ multilib_src_configure() {
enable-sm2
enable-srp
$(use elibc_musl && echo "no-async")
- $(use amd64 && echo "enable-ec_nistp_64_gcc_128")
+ enable-ec_nistp_64_gcc_128
enable-idea
enable-mdc2
$(use fips && echo "enable-fips")
@@ -205,38 +188,15 @@ multilib_src_configure() {
threads
)
- CFLAGS= LDFLAGS= edo \
- ./${config} \
- "${myeconfargs[@]}"
-
- # Clean out hardcoded flags that openssl uses
- local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
- -e 's:^CFLAGS=::' \
- -e 's:\(^\| \)-fomit-frame-pointer::g' \
- -e 's:\(^\| \)-O[^ ]*::g' \
- -e 's:\(^\| \)-march=[^ ]*::g' \
- -e 's:\(^\| \)-mcpu=[^ ]*::g' \
- -e 's:\(^\| \)-m[^ ]*::g' \
- -e 's:^ *::' \
- -e 's: *$::' \
- -e 's: \+: :g' \
- -e 's:\\:\\\\:g'
- )
-
- # Now insert clean default flags with user flags
- sed -i \
- -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
- -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
- Makefile \
- || die
+ edo perl "${S}/Configure" "${myeconfargs[@]}"
}
multilib_src_compile() {
- # depend is needed to use $confopts; it also doesn't matter
- # that it's -j1 as the code itself serializes subdirs
- emake -j1 depend
+ emake build_sw
- emake all
+ if multilib_is_native_abi; then
+ emake build_docs
+ fi
}
multilib_src_test() {
@@ -246,10 +206,17 @@ multilib_src_test() {
}
multilib_src_install() {
- # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130)
- dodir /usr
+ emake DESTDIR="${D}" install_sw
+ if use fips; then
+ emake DESTDIR="${D}" install_fips
+ # Regen this in pkg_preinst, bug 900625
+ rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die
+ fi
- emake DESTDIR="${D}" install
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install_ssldirs
+ emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs
+ fi
# This is crappy in that the static archives are still built even
# when USE=static-libs. But this is due to a failing in the openssl
@@ -271,35 +238,6 @@ multilib_src_install_all() {
# Create the certs directory
keepdir ${SSL_CNF_DIR}/certs
- # Namespace openssl programs to prevent conflicts with other man pages
- cd "${ED}"/usr/share/man || die
- local m d s
- for m in $(find . -type f | xargs grep -L '#include') ; do
- d=${m%/*} ; d=${d#./} ; m=${m##*/}
-
- [[ ${m} == openssl.1* ]] && continue
-
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
- mv ${d}/{,ssl-}${m} || die
-
- # Fix up references to renamed man pages
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
- ln -s ssl-${m} ${d}/openssl-${m} || die
-
- # Locate any symlinks that point to this man page
- # We assume that any broken links are due to the above renaming
- for s in $(find -L ${d} -type l) ; do
- s=${s##*/}
- rm -f ${d}/${s}
-
- # We don't want to "|| die" here
- ln -s ssl-${m} ${d}/ssl-${s}
- ln -s ssl-${s} ${d}/openssl-${s}
- done
- done
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
# bug #254521
dodir /etc/sandbox.d
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
@@ -308,8 +246,19 @@ multilib_src_install_all() {
keepdir ${SSL_CNF_DIR}/private
}
+pkg_preinst() {
+ if use fips; then
+ # Regen fipsmodule.cnf, bug 900625
+ ebegin "Running openssl fipsinstall"
+ "${ED}/usr/bin/openssl" fipsinstall -quiet \
+ -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \
+ -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
+ eend $?
+ fi
+}
+
pkg_postinst() {
- ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)"
- c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+ ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
+ openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
eend $?
}
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
deleted file mode 100644
index 7305269..0000000
--- a/dev-qt/qtgui/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST qtbase-5.15.4-gentoo-kde-4.tar.xz 569140 BLAKE2B e33a39cc409a6378febec4b675f3473bde939c42235d7b9ffd671221745c05d9d8db427f5ceab9b856f84e293f09bea7c327649a4578f44344e56e978b414942 SHA512 cf67a9654c833910cd4f25d4b742f4750a90e10c682b93e9fdd905590b6c6eb5dd53d0d56d0700b022a3dc85d9202e2971391cfd9158713a12971107a56a0e62
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
deleted file mode 100644
index 41814c0..0000000
--- a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 Mar 2019 21:37:52 -0500
-Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2
-
-Resolves a build failure when QMAKE_CXXFLAGS contains -march=native
-and the compiler is running on a CPU which does not support AVX2.
-
-Bug: https://bugs.gentoo.org/672946
----
- mkspecs/common/gcc-base.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index c2669e4833..44aa96af38 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp
- QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
-
- # -march=haswell is supported as of GCC 4.9 and Clang 3.6
--QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2
-+QMAKE_CFLAGS_ARCH_HASWELL = -mavx2
-
- # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code
- QMAKE_AR_LTCG = gcc-ar cqs
---
-2.21.0.rc1
-
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
deleted file mode 100644
index 6edd18d..0000000
--- a/dev-qt/qtgui/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <use>
- <flag name="egl">Enable EGL integration</flag>
- <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag>
- <flag name="evdev">Enable support for input devices via evdev</flag>
- <flag name="ibus">Build the IBus input method plugin</flag>
- <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
- <flag name="linuxfb">Enable Linux framebuffer support for embedded devices</flag>
- <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag>
- <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
- <flag name="vulkan">Enable support for Vulkan</flag>
- <flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag>
- <flag name="X">Build the XCB platform plugin and enable X11 integration</flag>
- </use>
- <upstream>
- <bugs-to>https://bugreports.qt.io/</bugs-to>
- <doc>https://doc.qt.io/</doc>
- </upstream>
- <slots>
- <subslots>
- Must only be used by packages that are known to use private parts of the Qt API.
- </subslots>
- </slots>
-</pkgmetadata>
diff --git a/dev-qt/qtgui/qtgui-5.15.5.ebuild b/dev-qt/qtgui/qtgui-5.15.5.ebuild
deleted file mode 100644
index 8f7dac8..0000000
--- a/dev-qt/qtgui/qtgui-5.15.5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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 ~loong ~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="
- 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? ( media-libs/libjpeg-turbo:= )
- 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
-)
-
-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-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest
deleted file mode 100644
index beeba86..0000000
--- a/dev-util/android-udev-rules/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST android-udev-rules-20220611.tar.gz 21035 BLAKE2B 7018855989dd66900f2870dc9bf2271476d993956030d99826758a065b72db04d70a16d4a3fb190bc98f9d374db0ec3698af2e6aab135732146e562f56ae4c2e SHA512 df72283626b9674d63afec0c285f4159b5269b3a1ed13271065d3080b1ba1045ace7f4c972377212b42f0fd132b15ed49fe413505563c716be8b49741e773b64
diff --git a/dev-util/android-udev-rules/android-udev-rules-20220611.ebuild b/dev-util/android-udev-rules/android-udev-rules-20220611.ebuild
deleted file mode 100644
index 0365d66..0000000
--- a/dev-util/android-udev-rules/android-udev-rules-20220611.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-DESCRIPTION="Comprehensive list of udev rules to connect to android devices"
-HOMEPAGE="https://github.com/M0Rf30/android-udev-rules"
-SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- acct-group/adbusers
- virtual/udev
-"
-
-src_install() {
- udev_dorules 51-android.rules
-}
-
-pkg_postinst() {
- einfo "To be able to use android devices,"
- einfo "add yourself to the 'adbusers' group by calling"
- einfo " usermod -a -G adbusers <user>"
-}
diff --git a/dev-util/android-udev-rules/metadata.xml b/dev-util/android-udev-rules/metadata.xml
deleted file mode 100644
index ba2f69e..0000000
--- a/dev-util/android-udev-rules/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="project">
- <email>nyronium@genthree.io</email>
- <name>nyronium</name>
- </maintainer>
-</pkgmetadata>
diff --git a/eclass/virtualwl.eclass b/eclass/virtualwl.eclass
index 162f615..9146425 100644
--- a/eclass/virtualwl.eclass
+++ b/eclass/virtualwl.eclass
@@ -17,7 +17,7 @@ esac
if [[ ! ${_VIRTUALWL_ECLASS} ]]; then
_VIRTUALWL_ECLASS=1
-# @ECLASS-VARIABLE: VIRTUALWL_REQUIRED
+# @ECLASS_VARIABLE: VIRTUALWL_REQUIRED
# @PRE_INHERIT
# @DESCRIPTION:
# Variable specifying the dependency on wayland.
@@ -28,7 +28,7 @@ _VIRTUALWL_ECLASS=1
# into "kde? ( )" and add kde into IUSE.
: ${VIRTUALWL_REQUIRED:=test}
-# @ECLASS-VARIABLE: VIRTUALWL_DEPEND
+# @ECLASS_VARIABLE: VIRTUALWL_DEPEND
# @OUTPUT_VARIABLE
# @DESCRIPTION:
# Standard dependencies string that is automatically added to BDEPEND
@@ -56,16 +56,6 @@ esac
# @DESCRIPTION:
# Start a new wayland session and run commands in it.
#
-# IMPORTANT: This command is run nonfatal !!!
-#
-# This means we are checking for the return code and raise an exception if it
-# isn't 0. So you need to make sure that all commands return a proper
-# code and not just die. All eclass function used should support nonfatal
-# calls properly.
-#
-# The rationale behind this is the tear down of the started wayland session. A
-# straight die would leave a running session behind.
-#
# Example:
#
# @CODE
@@ -99,17 +89,15 @@ virtwl() {
# TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work
addpredict /dev/dri
- coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY'; }
+ local VIRTWL VIRTWL_PID
+ coproc VIRTWL { WLR_BACKENDS=headless exec tinywl -s 'echo $WAYLAND_DISPLAY; read _; kill $PPID'; }
local -x WAYLAND_DISPLAY
read WAYLAND_DISPLAY <&${VIRTWL[0]}
debug-print "${FUNCNAME}: $@"
- nonfatal "$@"
- retval=$?
+ "$@"
[[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly"
- kill $VIRTWL_PID
-
- [[ $retval = 0 ]] || die "Failed to run '$@'"
+ exec {VIRTWL[0]}<&- {VIRTWL[1]}>&-
}
fi
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-r1.ebuild
index a0f2e7a..48b5a06 100644
--- a/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3.ebuild
+++ b/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
x11-libs/libSM
x11-libs/libX11
x11-libs/libXxf86vm
- dev-libs/openssl-compat:1.1
+ dev-libs/openssl-compat:1.1.1
x11-libs/pango
media-libs/libsdl2
"
@@ -31,5 +31,5 @@ src_compile() {
}
src_install() {
- emake prefix="${EPREFIX}/usr" DESTDIR=${D} install
+ emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install
}
diff --git a/gui-apps/gammastep/Manifest b/gui-apps/gammastep/Manifest
deleted file mode 100644
index ec51105..0000000
--- a/gui-apps/gammastep/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gammastep-2.0.7.tar.bz2 539933 BLAKE2B 24deede72975f9114d691d7349c47bb5af5305f4ad1de7b99e0ecd32796b9d8aac548f7d27763c310b284517d4aa521facdd86f6c3237a7633865bba06b67aa3 SHA512 5071bc15b553f42538072d307965ccd4cacc7d3cce571bd5a2e44389834fee4abb9eeb28d849934eaa144dabc8b245854fc3bebea15a021aa8c8c380913ed5fd
diff --git a/gui-apps/gammastep/gammastep-2.0.7-r1.ebuild b/gui-apps/gammastep/gammastep-2.0.7-r1.ebuild
deleted file mode 100644
index cf33697..0000000
--- a/gui-apps/gammastep/gammastep-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit systemd autotools gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="https://gitlab.com/chinstrap/gammastep/"
-SRC_URI="https://gitlab.com/chinstrap/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X appindicator drm geoclue gtk nls wayland"
-
-BDEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50
- nls? ( sys-devel/gettext )
-"
-DEPEND="
- X? (
- >=x11-libs/libX11-1.4
- x11-libs/libXxf86vm
- x11-libs/libxcb
- )
- appindicator? ( dev-libs/libappindicator:3[introspection] )
- drm? ( x11-libs/libdrm )
- geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
- gtk? ( ${PYTHON_DEPS} )
- wayland? ( >=dev-libs/wayland-1.15.0 )"
-RDEPEND="${DEPEND}
- gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
- x11-libs/gtk+:3[introspection]
- dev-python/pyxdg[${PYTHON_USEDEP}] )"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- use gtk && python_setup
-
- econf \
- $(use_enable nls) \
- $(use_enable drm) \
- $(use_enable X randr) \
- $(use_enable X vidmode) \
- $(use_enable geoclue geoclue2) \
- $(use_enable gtk gui) \
- $(use_enable wayland) \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- --enable-apparmor
-}
-
-_impl_specific_src_install() {
- emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
- -C src/gammastep_indicator install
-}
-
-src_install() {
- emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
- if use gtk; then
- python_foreach_impl _impl_specific_src_install
- python_replicate_script "${D}"/usr/bin/gammastep-indicator
-
- python_foreach_impl python_optimize
- fi
-}
-
-pkg_preinst() {
- use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
diff --git a/gui-apps/gammastep/metadata.xml b/gui-apps/gammastep/metadata.xml
deleted file mode 100644
index 9cbd80b..0000000
--- a/gui-apps/gammastep/metadata.xml
+++ /dev/null
@@ -1,12 +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="drm">Enable drm method.</flag>
- <flag name="geoclue">Enable geolocation support.</flag>
- </use>
-</pkgmetadata>
diff --git a/gui-apps/wlsunset/Manifest b/gui-apps/wlsunset/Manifest
new file mode 100644
index 0000000..dc36999
--- /dev/null
+++ b/gui-apps/wlsunset/Manifest
@@ -0,0 +1 @@
+DIST wlsunset-0.3.0.tar.gz 16533 BLAKE2B 930635e82963d14fae9f95e2219574c962adbf32406bd184d35b79848dce2f2edaa526aaaf21c2dfdde9f4d4f9fe04011d592955867c3b01b5de4778ef9915f1 SHA512 0685989ec99d7066d5d1efacfbb4676d2df235d33d64cfe3d41c762ccc2ff5c292e03430414b43d719c35ddc0ad8267b765764c15afd1b3177ed1e0bb6f449c1
diff --git a/dev-lang/zig/metadata.xml b/gui-apps/wlsunset/metadata.xml
index 9a74b67..ec5cc1f 100644
--- a/dev-lang/zig/metadata.xml
+++ b/gui-apps/wlsunset/metadata.xml
@@ -1,8 +1,7 @@
<?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>
+ <remote-id type="sourcehut">~kennylevinsen/wlsunset</remote-id>
</upstream>
</pkgmetadata>
diff --git a/gui-apps/wlsunset/wlsunset-0.3.0.ebuild b/gui-apps/wlsunset/wlsunset-0.3.0.ebuild
new file mode 100644
index 0000000..3a80af2
--- /dev/null
+++ b/gui-apps/wlsunset/wlsunset-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ "${PV}" == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/wlsunset"
+else
+ KEYWORDS="~amd64"
+ SRC_URI="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Day/night gamma adjustments for Wayland"
+HOMEPAGE="https://sr.ht/~kennylevinsen/wlsunset/"
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="
+ app-text/scdoc
+ dev-util/wayland-scanner
+"
+RDEPEND="dev-libs/wayland"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/wayland-protocols
+"
+
+src_configure() {
+ local emesonargs=(
+ -Dwerror=false
+ -Dman-pages=enabled
+ )
+
+ meson_src_configure
+}
diff --git a/gui-apps/wob/Manifest b/gui-apps/wob/Manifest
new file mode 100644
index 0000000..aab291a
--- /dev/null
+++ b/gui-apps/wob/Manifest
@@ -0,0 +1 @@
+DIST wob-0.14.2.tar.gz 21848 BLAKE2B 10dffa9a168ae9b17ec3aed651029100c35050d65fc392dcd6775a321d1ced46b085376c8b74b789c6712577f380ec97d7141d44429acf1a2def2443b20ca3b5 SHA512 933d6bb0469f3b446f8998738ebe7045a1d707a814345961848a025e53cd9bd367cf138c8c6deafe8906c887e783bef85f669e9f107c51c51d357f087aaad6b8
diff --git a/gui-apps/wob/metadata.xml b/gui-apps/wob/metadata.xml
new file mode 100644
index 0000000..78784e3
--- /dev/null
+++ b/gui-apps/wob/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <longdescription lang="en">
+ A lightweight overlay volume/backlight/progress/anything bar
+ for wlroots based Wayland compositors (requrires support for
+ wlr_layer_shell_unstable_v1). This project is inspired by
+ xob - X Overlay Bar
+ </longdescription>
+ <upstream>
+ <remote-id type="github">francma/wob</remote-id>
+ <bugs-to>https://github.com/francma/wob/issues</bugs-to>
+ </upstream>
+ <use>
+ <flag name="man">Install man page</flag>
+ <flag name="seccomp">Linux kernel syscall filtering</flag>
+ </use>
+</pkgmetadata>
diff --git a/gui-apps/wob/wob-0.14.2.ebuild b/gui-apps/wob/wob-0.14.2.ebuild
new file mode 100644
index 0000000..bf8f34d
--- /dev/null
+++ b/gui-apps/wob/wob-0.14.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Lightweight overlay volume/backlight/progress/anything bar for Wayland"
+HOMEPAGE="https://github.com/francma/wob"
+SRC_URI="https://github.com/francma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+man +seccomp"
+
+RDEPEND="dev-libs/wayland"
+DEPEND="${RDEPEND}
+ dev-libs/inih
+ dev-libs/wayland-protocols
+ seccomp? ( sys-libs/libseccomp )
+"
+BDEPEND="
+ dev-util/wayland-scanner
+ man? ( app-text/scdoc )
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature man man-pages)
+ $(meson_feature seccomp)
+ )
+ meson_src_configure
+}
diff --git a/gui-apps/wshowkeys/Manifest b/gui-apps/wshowkeys/Manifest
new file mode 100644
index 0000000..28ec7a2
--- /dev/null
+++ b/gui-apps/wshowkeys/Manifest
@@ -0,0 +1 @@
+DIST wshowkeys-1.0.tar.gz 26700 BLAKE2B e0898743878fcdcb28a3c132cc312fe0e4696e34ac8c58f52d857ca302a675c6aa10cdd370e2727a72502a5f881adfb4638a765992b4f46b5a85987e15e4e289 SHA512 09f190d9825cb051d61484801ea7d9766c2b3c9fee4171a8926237c905a00fa98327f5d85ff601a9faf845e1cb8d58c7056811ffc7d4904985bd03d750581e6a
diff --git a/gui-apps/wshowkeys/wshowkeys-9999.ebuild b/gui-apps/wshowkeys/wshowkeys-1.0.ebuild
index 2d5faf6..7254e38 100644
--- a/gui-apps/wshowkeys/wshowkeys-9999.ebuild
+++ b/gui-apps/wshowkeys/wshowkeys-1.0.ebuild
@@ -3,15 +3,15 @@
EAPI=7
-inherit git-r3 meson
+inherit meson
DESCRIPTION="Displays keys being pressed on a Wayland session"
HOMEPAGE="https://git.sr.ht/~sircmpwn/wshowkeys"
-EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/wshowkeys"
+SRC_URI="https://git.sr.ht/~sircmpwn/wshowkeys/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
diff --git a/gui-wm/tinywl/Manifest b/gui-wm/tinywl/Manifest
deleted file mode 100644
index 9433b60..0000000
--- a/gui-wm/tinywl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677
diff --git a/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch b/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch
deleted file mode 100644
index cff1f72..0000000
--- a/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7d950f3dac6cca62635d5e4ff2af33b35372f6db Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 19 Mar 2022 14:00:43 +0100
-Subject: [PATCH] tinywl: don't crash when there is no keyboard
-
-Running with WLR_BACKENDS=headless, there is no keyboard device.
-Avoid crashes like so:
-
- ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
- ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
- AddressSanitizer:DEADLYSIGNAL
- =================================================================
- ==331107==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000120 (pc 0x556ed03e4e99 bp 0x7ffce834bc10 sp 0x7ffce834bbb0 T0)
- ==331107==The signal is caused by a READ memory access.
- ==331107==Hint: address points to the zero page.
- #0 0x556ed03e4e99 in focus_view ../tinywl/tinywl.c:136
- #1 0x556ed03eb3be in xdg_toplevel_map ../tinywl/tinywl.c:603
- #2 0x7f75d6f768db in wlr_signal_emit_safe ../util/signal.c:29
- #3 0x7f75d6e9cac7 in xdg_surface_role_commit ../types/xdg_shell/wlr_xdg_surface.c:315
- #4 0x7f75d6eb6944 in surface_commit_state ../types/wlr_compositor.c:466
- #5 0x7f75d6eb7b02 in surface_handle_commit ../types/wlr_compositor.c:523
- #6 0x7f75d5714d49 (/usr/lib/libffi.so.8+0x6d49)
- #7 0x7f75d5714266 (/usr/lib/libffi.so.8+0x6266)
- #8 0x7f75d68cb322 (/usr/lib/libwayland-server.so.0+0xd322)
- #9 0x7f75d68c65cb (/usr/lib/libwayland-server.so.0+0x85cb)
- #10 0x7f75d68c91c9 in wl_event_loop_dispatch (/usr/lib/libwayland-server.so.0+0xb1c9)
- #11 0x7f75d68c6d36 in wl_display_run (/usr/lib/libwayland-server.so.0+0x8d36)
- #12 0x556ed03eef55 in main ../tinywl/tinywl.c:905
- #13 0x7f75d5d2330f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f)
- #14 0x7f75d5d233c0 in __libc_start_main@GLIBC_2.2.5 (/usr/lib/libc.so.6+0x2d3c0)
- #15 0x556ed03e46e4 in _start (/home/simon/src/wlroots/build/tinywl/tinywl+0x136e4)
----
- tinywl/tinywl.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
-index dd442aac..8796e9df 100644
---- a/tinywl/tinywl.c
-+++ b/tinywl/tinywl.c
-@@ -130,8 +130,10 @@ static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) {
- * track of this and automatically send key events to the appropriate
- * clients without additional work on your part.
- */
-- wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
-- keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+ if (keyboard != NULL) {
-+ wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
-+ keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+ }
- }
-
- static void keyboard_handle_modifiers(
---
-2.36.1
-
diff --git a/gui-wm/tinywl/tinywl-0.15.1.ebuild b/gui-wm/tinywl/tinywl-0.15.1.ebuild
deleted file mode 100644
index c8ddb20..0000000
--- a/gui-wm/tinywl/tinywl-0.15.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION='"minimum viable product" Wayland compositor based on wlroots'
-HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots/-/tree/tinywl"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git"
- inherit git-r3
-else
- SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PV}/wlroots-${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- >=gui-libs/wlroots-${PV}:=
- dev-libs/wayland-protocols
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="
- dev-libs/wayland-protocols
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/wlroots-${PV}
-
-PATCHES=(
- "${FILESDIR}/tinywl-don-t-crash-when-there-is-no-keyboard.patch"
-)
-
-S="${WORKDIR}/wlroots-${PV}/tinywl"
-
-src_prepare() {
- cd ..
- default
-}
-
-src_install() {
- dobin tinywl
-}
diff --git a/mail-client/astroid/astroid-9999.ebuild b/mail-client/astroid/astroid-9999.ebuild
index dfc7f6f..a75b422 100644
--- a/mail-client/astroid/astroid-9999.ebuild
+++ b/mail-client/astroid/astroid-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
: "${CMAKE_MAKEFILE_GENERATOR:=ninja}"
-inherit cmake git-r3 virtualx
+inherit cmake git-r3 optfeature virtualx
DESCRIPTION="lightweight graphical threads-with-tags style email client for notmuch"
HOMEPAGE="https://github.com/astroidmail/astroid"
diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index 4f83c43..3a78c49 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -1,3 +1,3 @@
-DIST NotoSansCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52
-DIST NotoSansMonoCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b
-DIST NotoSerifCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 56784876 BLAKE2B 31304b62bc3628a27ae9c1c3703177f2e7b64857e4422ec05d5c03e1959d1795416608d4bb39cc8a5c1e6bf02bc789b2399d1e0abcdfcae4ff1a40373171a0fd SHA512 6808964ecc5b64c492712ca22538ce076ac5df0807ec7cef4fd62258df5a2911dac7652a8c39f35d0f3889e948a532e8111fa7473adbf44f34992f8379035950
+DIST NotoSansCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52
+DIST NotoSansMonoCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b
+DIST NotoSerifCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 56909616 BLAKE2B 3c5dd25b60e438dab597beaa620e80a04eb5cf18e5636741296d8b6c8f768dfdb81b54cf1210da01730895bbe0b4ea18410323bb9ac36a99868fe5b1cfee8ae9 SHA512 fa6c1ef94ed9d30b046d20eb360311b630e1f8d727288d3f1d73751f4f6d4731558fdce895d2235fc86bbda1b5e52c9c48a4f5fb604a0dbb3d93a71dde749f50
diff --git a/media-fonts/noto-cjk/metadata.xml b/media-fonts/noto-cjk/metadata.xml
index 7c900b1..e969c6a 100644
--- a/media-fonts/noto-cjk/metadata.xml
+++ b/media-fonts/noto-cjk/metadata.xml
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <upstream>
+ <remote-id type="github">googlefonts/noto-cjk</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-fonts/noto-cjk/noto-cjk-20211026.ebuild b/media-fonts/noto-cjk/noto-cjk-20220126.ebuild
index c5c8988..56298d3 100644
--- a/media-fonts/noto-cjk/noto-cjk-20211026.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20220126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
DESCRIPTION="Google's CJK font family"
HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-cjk"
-COMMIT="9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"
+COMMIT="473da44c32fec739db7e5458c81a833513cb4084"
SRC_URI="
https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansCJK-VF.otf.ttc -> NotoSansCJK-VF-${COMMIT}.otf.ttc
https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansMonoCJK-VF.otf.ttc -> NotoSansMonoCJK-VF-${COMMIT}.otf.ttc
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
deleted file mode 100644
index 6e22e6a..0000000
--- a/media-fonts/noto-emoji/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Noto_Emoji.zip 4053149 BLAKE2B a2d0259807070742e807f17b283d409ce6b28496d373aea56904b6a111c36c53fafd1374127ab3b6034bb61fa35d034849807bb18076116549bcdef000dc2522 SHA512 ed2092f6e68e7f69b0986d92d4e1ff80fba4de9d1990ee8e2aec42115e2c0dd4d69befe4c74597d3d3b7c64a25b957282a93223ce5128cbb42d8dca96d15b996
diff --git a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
index f79faf0..ecdbbf0 100644
--- a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
@@ -6,16 +6,42 @@ 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=""
+PROPERTIES="live"
+
+BDEPEND="
+ app-arch/unzip
+ || (
+ net-misc/curl
+ net-misc/wget
+ )
+"
+
S="${WORKDIR}"
+get() {
+ if hash curl 2>/dev/null; then
+ curl -Lf --retry 3 --connect-timeout 60 --speed-limit 300 --speed-time 10 "$@"
+ elif hash wget 2>/dev/null; then
+ wget -O- "$@"
+ else
+ die
+ fi
+}
+
+src_unpack() {
+ get https://fonts.google.com/download?family=Noto%20Emoji > Noto_Emoji.zip || die
+ get https://fonts.google.com/download?family=Noto%20Color%20Emoji > Noto_Color_Emoji.zip || die
+ unzip Noto_Emoji.zip NotoEmoji-VariableFont_wght.ttf || die
+ unzip Noto_Color_Emoji.zip NotoColorEmoji-Regular.ttf || die
+}
+
src_install() {
insinto /usr/share/fonts/${PN}
doins NotoEmoji-VariableFont_wght.ttf
+ doins NotoColorEmoji-Regular.ttf
}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 83388dc..6133dda 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1 +1,4 @@
-DIST noto-fonts-29aa92a9a0768be2d58cf4c590adb5c18b8247c6.tar.xz 14477024 BLAKE2B 10952ddeab1a1a1da93b95247ee31aa6587b13fc1e3ead1118ef4d2fb7a33a4d060df0c7a58454eb1bc195e2df5888d75af03a590dca6fc6ceafdf318eec5517 SHA512 43ee8ecadbd1861341be423934c92828ad9ceeeff5f4bf6077ddfc9e4141ffcca6e10e4bb02843c64195c1f14286226232938e913561989d514ff5f42b082c18
+DIST NotoSans%5Bwdth%2Cwght%5D.ttf 2370304 BLAKE2B ddf2e7922a6c3670da55eea3bf65fb20aeed331713017374a3ace2d20df6ec183fe3b71e14c5b98f60b1233e1510e440981431ad0eb95be5b12527692320a28b SHA512 838abbf9158c91a559d04f1d3a471d6e5bc631b46dec04ef54eed5b1f148fc1119e9f154dcd87f48912f320c5903dbef54b74a45ae41ef5cca64d7a93fe547b5
+DIST NotoSans-Italic%5Bwdth%2Cwght%5D.ttf 2541752 BLAKE2B d8335ac4cc70dee748f4d389eec1d6e43cdfe88a2744540e9d7c81b83976e8bc5375643f517888adfb0007c110337dc4e8158973245bbe3f6e3c49f791b6e05e SHA512 31ae013b6175e87c68b1248d92626f66668527b6139c226da96d490f9b99d51002fac646662ea2613d5629d7d9aea67be229afa7f8c071f61ba9acca66e9f742
+DIST NotoSerif%5Bwdth%2Cwght%5D.ttf 2278204 BLAKE2B b7eff19e590956ffef243366d7244c2bec720b21be150f1dac08ffe423243bb2e7c7b45d2dfaa8cc4d849b08979b2e13b17f5bbab099e25bfbcae98dd6a794e8 SHA512 b0b507fbd1108aa62b896b414285a7f615050bb62cd7dd9a3a282016631c1efcfbdd3ed0f762836a7d351e2e0bdd56614eeeee591a2fc0f748cab890b74a3c0f
+DIST NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf 2294324 BLAKE2B 599a8796729222381f98101cff9cd723093956fe0ddd653d346f913145b23f420ac9fe590ec5d607583f7caa64a791966183e85428525c23ea2dfd747e27a7cc SHA512 c18908217dde40d78684111562b094fb57f6b15c3753de27f24bb56c1c4ff2f6bbd5b867606dd600d597eacfdc8ecea7b3d24c185353b6c740818a25a5afecd2
diff --git a/media-fonts/noto/noto-20211207.ebuild b/media-fonts/noto/noto-20211207.ebuild
deleted file mode 100644
index 86a15b8..0000000
--- a/media-fonts/noto/noto-20211207.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
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts"
-
-COMMIT="29aa92a9a0768be2d58cf4c590adb5c18b8247c6"
-SRC_URI="https://www.alxu.ca/noto-fonts-${COMMIT}.tar.xz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~*"
-IUSE=""
-
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
- # From ArchLinux
- "${FILESDIR}/66-noto-serif.conf"
- "${FILESDIR}/66-noto-mono.conf"
- "${FILESDIR}/66-noto-sans.conf"
-)
diff --git a/media-fonts/noto/noto-20230117.ebuild b/media-fonts/noto/noto-20230117.ebuild
new file mode 100644
index 0000000..d0503aa
--- /dev/null
+++ b/media-fonts/noto/noto-20230117.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts"
+
+COMMIT="6bff404f9a23cd603190277422d043a0afd7908e"
+SRC_URI="
+ https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans%5Bwdth%2Cwght%5D.ttf -> NotoSans[wdth,wght]-${COMMIT}.ttf
+ https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSans-Italic[wdth,wght]-${COMMIT}.ttf
+ https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable-ttf/NotoSerif%5Bwdth%2Cwght%5D.ttf -> NotoSerif[wdth,wght]-${COMMIT}.ttf
+ https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable-ttf/NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf
+ "
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~*"
+IUSE=""
+
+S="${DISTDIR}"
+
+src_install() {
+ insinto /usr/share/fonts/${PN}
+ newins "NotoSans[wdth,wght]-${COMMIT}.ttf" "NotoSans[wdth,wght].ttf"
+ newins "NotoSans-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSans-Italic[wdth,wght].ttf"
+ newins "NotoSerif[wdth,wght]-${COMMIT}.ttf" "NotoSerif[wdth,wght].ttf"
+ newins "NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSerif-Italic[wdth,wght].ttf"
+ insinto /etc/fonts/conf.avail
+ # From ArchLinux
+ doins "${FILESDIR}/66-noto-serif.conf"
+ doins "${FILESDIR}/66-noto-mono.conf"
+ doins "${FILESDIR}/66-noto-sans.conf"
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
deleted file mode 100644
index 31d8ebd..0000000
--- a/media-gfx/imagemagick/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 4a946da..0000000
--- a/media-gfx/imagemagick/files/imagemagick-9999-nocputuning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/files/policy-hardening.snippet b/media-gfx/imagemagick/files/policy-hardening.snippet
deleted file mode 100644
index c1a91b0..0000000
--- a/media-gfx/imagemagick/files/policy-hardening.snippet
+++ /dev/null
@@ -1,9 +0,0 @@
-<policymap>
- <!-- https://www.kb.cert.org/vuls/id/332928 mitigation / https://bugs.gentoo.org/664236 -->
- <policy domain="coder" rights="none" pattern="PS" />
- <policy domain="coder" rights="none" pattern="PS2" />
- <policy domain="coder" rights="none" pattern="PS3" />
- <policy domain="coder" rights="none" pattern="EPS" />
- <policy domain="coder" rights="none" pattern="PDF" />
- <policy domain="coder" rights="none" pattern="XPS" />
-
diff --git a/media-gfx/imagemagick/files/policy.test.xml b/media-gfx/imagemagick/files/policy.test.xml
deleted file mode 100644
index 6db44b7..0000000
--- a/media-gfx/imagemagick/files/policy.test.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policymap [
- <!ELEMENT policymap (policy)+>
- <!ATTLIST policymap xmlns CDATA #FIXED ''>
- <!ELEMENT policy EMPTY>
- <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
- name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
- stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-]>
-<policymap>
- <!-- Policy used for test suite only to allow passing test suite
- in case user has installed a restriction which would prevent
- the execution of some tests -->
- <policy domain="delegate" rights="read|write" pattern="*" />
- <policy domain="filter" rights="read|write" pattern="*" />
- <policy domain="coder" rights="read|write" pattern="*" />
-</policymap>
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
deleted file mode 100644
index 8d0425b..0000000
--- a/media-gfx/imagemagick/imagemagick-7.1.0.20-r1.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools 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 ~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"
-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 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-9999-nocputuning.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- eautoreconf
-
- # 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 jpegxl jxl)
- $(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
- )
- 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-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
deleted file mode 100644
index 229c87b..0000000
--- a/media-gfx/imagemagick/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <use>
- <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
- <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
- <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
- <flag name="hdri">Enable High Dynamic Range Images formats</flag>
- <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
- <flag name="jpegxl">Enable JPEG XL support</flag>
- <flag name="opencl">Enable OpenCL support</flag>
- <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
- <flag name="q32">Set quantum depth value to 32</flag>
- <flag name="q8">Set quantum depth value to 8</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gui-wm/tinywl/metadata.xml b/media-sound/pamixer/metadata.xml
index f32ad44..c0718b5 100644
--- a/gui-wm/tinywl/metadata.xml
+++ b/media-sound/pamixer/metadata.xml
@@ -5,4 +5,7 @@
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu (Hello71)</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">cdemoulins/pamixer</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
deleted file mode 100644
index daed6ca..0000000
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ /dev/null
@@ -1,589 +0,0 @@
-# Copyright 1999-2022 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=57.59.59
-
-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.xz"
-else # Release
- 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}"
-
-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 nvenc:ffnvcodec
- vorbis:libvorbis vpx:libvpx zvbi:libzvbi
- # libavfilter options
- appkit
- 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
- 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=(
- 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="
- 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}] )
- 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}] )
- 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/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}] )
- 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.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}] )
- 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:=[sftp,${MULTILIB_USEDEP}] )
- svg? (
- gnome-base/librsvg:2=[${MULTILIB_USEDEP}]
- x11-libs/cairo[${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}] )
- 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.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}] )
-"
-
-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}
- amf? ( media-libs/amf-headers )
- ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
- v4l? ( sys-kernel/linux-headers )
-"
-
-# += for verify-sig above
-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? ( nvenc )
- 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
-)
-
-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
-
- # -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
-}
-
-multilib_src_configure() {
- local myconf=( )
-
- # bug 842201
- use ia64 && tc-is-gcc && append-flags \
- -fno-tree-ccp \
- -fno-tree-dominator-opts \
- -fno-tree-fre \
- -fno-code-hoisting \
- -fno-tree-pre \
- -fno-tree-vrp
-
- 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 )
- has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 )
- 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
- --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)
- )
-
- # Fixed in 5.0.1? Waiting for verification from someone who hit the issue.
- local extra_libs
- if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; 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)" \
- --strip="$(tc-getSTRIP)" \
- --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" \
- 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"
-
- use amf && doenvd "${FILESDIR}"/amf-env-vulkan-override
-}
diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch
deleted file mode 100644
index 5147800..0000000
--- a/media-video/ffmpeg/files/chromium-r1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Allow libffmpeg to be built for Chromium-based browsers
-https://patchwork.ffmpeg.org/patch/4500/
-
-NOTE: This patch lacks the Makefile include line. We append it
-manually instead to make patching across different versions easier.
-
-diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak
-new file mode 100644
-index 0000000..992cf3c
---- /dev/null
-+++ b/ffbuild/libffmpeg.mak
-@@ -0,0 +1,27 @@
-+LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
-+LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
-+
-+ifeq ($(CONFIG_SHARED),yes)
-+LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
-+else
-+LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
-+endif
-+
-+$(LIBFFMPEG): $(LIBFFMPEG_DEPS)
-+ifeq ($(CONFIG_SHARED),yes)
-+ $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
-+else
-+ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
-+endif
-+
-+libffmpeg: $(LIBFFMPEG)
-+
-+install-libffmpeg: $(LIBFFMPEG)
-+ $(Q)mkdir -p "$(SHLIBDIR)/chromium"
-+ $(INSTALL) -m 755 $< "$(SHLIBDIR)/chromium/$<"
-+ $(STRIP) "$(SHLIBDIR)/chromium/$<"
-+
-+uninstall-libffmpeg:
-+ $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
-+
-+.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg
---
-2.13.1
-
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
deleted file mode 100644
index e6d40f8..0000000
--- a/media-video/ffmpeg/metadata.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<use>
- <flag name="amf">Enables support for AMD's Advanced Media Framework (AMF)</flag>
- <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
- <flag name="amrenc">Enables Adaptive Multi-Rate Audio encoding support with <pkg>media-libs/vo-amrwbenc</pkg>.</flag>
- <flag name="appkit">Enables Apple AppKit framework</flag>
- <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
- <flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
- <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
- <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
- <flag name="chromium">Builds libffmpeg.so to enable media playback in Chromium-based browsers like Opera and Vivaldi.</flag>
- <flag name="codec2">Enables codec2 low bit rate speech codec support via <pkg>media-libs/codec2</pkg>.</flag>
- <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
- <flag name="cuda">Enables CUDA-based acceleration. Mostly used for specific filters.</flag>
- <flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg>.</flag>
- <flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
- <flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
- <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
- <flag name="fribidi">Enables fribidi support in the drawtext filter.</flag>
- <flag name="gcrypt">Enables gcrypt support: Needed for rtmp(t)e support if openssl, librtmp or gmp is not used.</flag>
- <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
- <flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
- <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
- <flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
- <flag name="jpegxl">Enables JPEG XL decoding via <pkg>media-libs/libjxl</pkg>.</flag>
- <flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
- <flag name="libaom">Enables <pkg>media-libs/libaom</pkg> based AV1 codec support.</flag>
- <flag name="libaribb24">Enables ARIB text and caption decoding via <pkg>media-libs/aribb24</pkg>.</flag>
- <flag name="libdrm">Enables <pkg>x11-libs/libdrm</pkg> support for better screen grabbing and hardware accelerated codecs.</flag>
- <flag name="libilbc">Enables iLBC de/encoding via <pkg>media-libs/libilbc</pkg>.</flag>
- <flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
- <flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
- <flag name="libtesseract">Enables the OCR filter via <pkg>app-text/tesseract</pkg>.</flag>
- <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
- <flag name="libxml2">Uses <pkg>dev-libs/libxml2</pkg> to enable dash demuxing support.</flag>
- <flag name="lv2">Enables lv2 audio filter wrapper.</flag>
- <flag name="mipsdspr1">Enables MIPS DSP ASE R1 optimizations.</flag>
- <flag name="mipsdspr2">Enables MIPS DSP ASE R2 optimizations.</flag>
- <flag name="mipsfpu">Enables floating point MIPS optimizations.</flag>
- <flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
- <flag name="network">Enables network streaming support</flag>
- <flag name="opencl">Enable OpenCL support</flag>
- <flag name="openh264">Enables H.264 encoding suppoprt via <pkg>media-libs/openh264</pkg>.</flag>
- <flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
- <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
- <flag name="postproc">Build and install libpostproc.</flag>
- <flag name="rav1e">Enables AV1 encoding support via <pkg>media-video/rav1e</pkg>.</flag>
- <flag name="rubberband">Adds time-stretching and pitch-shifting audio filter based on <pkg>media-libs/rubberband</pkg>.</flag>
- <flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
- <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
- <flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
- <flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
- <flag name="svt-av1">Enables AV1 encoding support via <pkg>media-libs/svt-av1</pkg>.</flag>
- <flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
- <flag name="vidstab">Enables video stabilization filter using vid.stab library (<pkg>media-libs/vidstab</pkg>).</flag>
- <flag name="vmaf">Enables Netflix's perceptual video quality assessment filter using the library (<pkg>media-libs/libvmaf</pkg>).</flag>
- <flag name="vpx">Enables VP8 and VP9 codec support using libvpx: Decoding does not require this to be enabled but libvpx can also be used for decoding; encoding requires this useflag to be enabled though.</flag>
- <flag name="vulkan">Enables support for the vulkan API for GPU offload.</flag>
- <flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
- <flag name="zeromq">Enables <pkg>net-libs/zeromq</pkg> support with the zmq/azmq filters.</flag>
- <flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag>
- <flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag>
-</use>
-<slots>
- <slot name="0">For building against. This is the only slot that provides
- headers and command line tools. Binary compatibility slots come and go
- as required, so always pin dependencies to this slot when appropriate.</slot>
-</slots>
-</pkgmetadata>
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 4b4310e..280ff50 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,2 +1,2 @@
DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
-DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
+DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e
diff --git a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
new file mode 100644
index 0000000..42c1083
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/879739
+https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu
+
+Probe for strcasestr using the C++ compiler
+
+The C++ compiler may define _GNU_SOURCE, causing <string.h> to
+declare strcasestr, while the C compiler does not. As a result,
+the probe may fail, resulting in an incompatible declaration
+of strcasestr in compat/compat.h.
+
+Upstream discussion:
+
+ [PATCH] compat/strcasestr: Include correct header file
+ <https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu>
+
+--- a/compat/have_strcasestr.c
++++ b/compat/have_strcasestr.c
+@@ -1,4 +1,5 @@
+ #define _GNU_SOURCE
++#include <string.h>
+ #include <strings.h>
+
+ int
+
diff --git a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
index 6e3c8d3..5c9f86a 100644
--- a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
+++ b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch
@@ -1,8 +1,8 @@
diff --git a/configure b/configure
-index 6c3a38f1..39d1f8c6 100755
+index 5247e05a..097b2039 100755
--- a/configure
+++ b/configure
-@@ -464,215 +464,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+@@ -490,230 +490,9 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
gmime_cflags=$(pkg-config --cflags gmime-3.0)
gmime_ldflags=$(pkg-config --libs gmime-3.0)
@@ -68,11 +68,7 @@ index 6c3a38f1..39d1f8c6 100755
- rm -rf "$TEMP_GPG"
- fi
-
-- # see https://github.com/jstedfast/gmime/pull/90
-- # should be fixed in GMime in 3.2.7, but some distros might patch
-- printf "Checking for GMime X.509 certificate validity... "
--
-- cat > _check_x509_validity.c <<EOF
+- cat > _check_gmime_cert.c <<EOF
-#include <stdio.h>
-#include <gmime/gmime.h>
-
@@ -84,7 +80,6 @@ index 6c3a38f1..39d1f8c6 100755
- GMimeSignature *sig = NULL;
- GMimeCertificate *cert = NULL;
- GMimeObject *output = NULL;
-- GMimeValidity validity = GMIME_VALIDITY_UNKNOWN;
- int len;
-
- g_mime_init ();
@@ -105,16 +100,27 @@ index 6c3a38f1..39d1f8c6 100755
- if (sig == NULL) return !! fprintf (stderr, "no GMimeSignature found at position 0\n");
- cert = g_mime_signature_get_certificate (sig);
- if (cert == NULL) return !! fprintf (stderr, "no GMimeCertificate found\n");
-- validity = g_mime_certificate_get_id_validity (cert);
+-#ifdef CHECK_VALIDITY
+- GMimeValidity validity = g_mime_certificate_get_id_validity (cert);
- if (validity != GMIME_VALIDITY_FULL) return !! fprintf (stderr, "Got validity %d, expected %d\n", validity, GMIME_VALIDITY_FULL);
--
+-#endif
+-#ifdef CHECK_EMAIL
+- const char *email = g_mime_certificate_get_email (cert);
+- if (! email) return !! fprintf (stderr, "no email returned");
+- if (email[0] == '<') return 2;
+-#endif
- return 0;
-}
-EOF
+-
+- # see https://github.com/jstedfast/gmime/pull/90
+- # should be fixed in GMime in 3.2.7, but some distros might patch
+- printf "Checking for GMime X.509 certificate validity... "
+-
- if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
- printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
- errors=$((errors + 1))
-- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
+- elif ${CC} -DCHECK_VALIDITY ${CFLAGS} ${gmime_cflags} _check_gmime_cert.c ${gmime_ldflags} -o _check_x509_validity \
- && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
- && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
- && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
@@ -136,6 +142,15 @@ index 6c3a38f1..39d1f8c6 100755
- errors=$((errors + 1))
- fi
- fi
+- printf "Checking whether GMime emits email addresses with angle brackets... "
+- if ${CC} -DCHECK_EMAIL ${CFLAGS} ${gmime_cflags} _check_gmime_cert.c ${gmime_ldflags} -o _check_email &&
+- GNUPGHOME=${TEMP_GPG} ./_check_email; then
+- gmime_emits_angle_brackets=0
+- printf "No.\n"
+- else
+- gmime_emits_angle_brackets=1
+- printf "Yes.\n"
+- fi
- else
- printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
- errors=$((errors + 1))
@@ -217,6 +232,7 @@ index 6c3a38f1..39d1f8c6 100755
- fi
+ gmime_x509_cert_validity=1
+ gmime_verify_with_session_key=1
++ gmime_emits_angle_brackets=0
else
have_gmime=0
printf "No.\n"
diff --git a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild b/net-mail/notmuch/notmuch-0.37-r2.ebuild
index 8ab0efb..f9fd203 100644
--- a/net-mail/notmuch/notmuch-0.34.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.37-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_OPTIONAL=1
-NEED_EMACS="24.1"
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{9..12} pypy3 )
inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
@@ -18,14 +17,14 @@ 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 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
apidoc? ( doc )
nmbug? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? ( crypt emacs python valgrind )
+ test? ( crypt emacs python )
"
-IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind"
+IUSE="apidoc crypt doc emacs mutt nmbug python test"
RESTRICT="!test? ( test )"
BDEPEND="
@@ -36,7 +35,7 @@ BDEPEND="
dev-lang/perl
)
doc? (
- dev-python/sphinx
+ dev-python/sphinx[${PYTHON_USEDEP}]
sys-apps/texinfo
)
python? (
@@ -58,7 +57,9 @@ COMMON_DEPEND="
emacs? ( >=app-editors/emacs-${NEED_EMACS}:* )
python? (
${PYTHON_DEPS}
- virtual/python-cffi[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/cffi[${PYTHON_USEDEP}]
+ ' 'python*')
)
"
@@ -72,7 +73,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/openssl
)
)
- valgrind? ( dev-util/valgrind )
"
RDEPEND="${COMMON_DEPEND}
@@ -95,6 +95,7 @@ SITEFILE="50${PN}-gentoo.el"
PATCHES=(
"${FILESDIR}/notmuch-assume-modern-gmime.patch"
+ "${FILESDIR}"/${PN}-0.37-configure-clang16.patch
)
pkg_setup() {
@@ -239,9 +240,6 @@ src_install() {
default
if use doc; then
- pushd doc/_build/man/man1 > /dev/null || die
- ln notmuch.1 notmuch-setup.1 || die
- popd > /dev/null || die
if use apidoc; then
# rename overly generic manpage to avoid clashes
mv doc/_build/man/man3/deprecated.3 \
@@ -257,8 +255,8 @@ src_install() {
if use nmbug; then
# TODO: those guys need proper deps
- python_fix_shebang devel/nmbug/{nmbug,notmuch-report}
- dobin devel/nmbug/{nmbug,notmuch-report}
+ python_fix_shebang devel/nmbug/notmuch-report
+ dobin devel/nmbug/notmuch-report
fi
if use mutt; then
diff --git a/profiles/package.mask b/profiles/package.mask
index a135003..2ee9b05 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,3 +1,2 @@
# untested
dev-lang/zig
-sys-fs/ncdu
diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r2.ebuild
index 69616d4..d44ccf9 100644
--- a/sci-calculators/units/units-2.21-r1.ebuild
+++ b/sci-calculators/units/units-2.21-r2.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=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit python-r1
DESCRIPTION="Unit conversion program"
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
deleted file mode 100644
index a5f151e..0000000
--- a/sys-fs/ncdu/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ncdu-2.1.2.tar.gz 52702 BLAKE2B fb64058bec2e8f286fa82e16986cddd9126e5c94d513740d48ff1c971e7ee95270fe6c1cfbbe240bb8e99fba4e3fd6d2624f99870422835da44447a2507f0b8b SHA512 ff48f2b9625e1aba29e5598051d16c4b5dc1a634fab897709226dd69d3b48031e6e62527c8514ec4753874d2d96800e538d6ad90b4a5f9851410d10579ccc67c
diff --git a/sys-fs/ncdu/metadata.xml b/sys-fs/ncdu/metadata.xml
deleted file mode 100644
index 7c900b1..0000000
--- a/sys-fs/ncdu/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/sys-fs/ncdu/ncdu-2.1.2.ebuild b/sys-fs/ncdu/ncdu-2.1.2.ebuild
deleted file mode 100644
index 5a9c093..0000000
--- a/sys-fs/ncdu/ncdu-2.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="=dev-lang/zig-0.9*"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
- if [[ -z ${ZIG_FLAGS+x} && "$CFLAGS" != *-march=native* ]]; then
- die 'ZIG_FLAGS is unset! note that zig defaults to native cpu. set ZIG_FLAGS="" or ZIG_FLAGS="-mcpu baseline"'
- fi
- emake PREFIX=${EPREFIX}/usr
-}
-
-src_install() {
- emake PREFIX=${ED}/usr install
-}
diff --git a/virtual/jre/jre-11-r2.ebuild b/virtual/jre/jre-11-r3.ebuild
index faeb554..510db0f 100644
--- a/virtual/jre/jre-11-r2.ebuild
+++ b/virtual/jre/jre-11-r3.ebuild
@@ -11,4 +11,4 @@ RDEPEND="|| (
dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
virtual/jdk:${SLOT}
- )"
+)"
diff --git a/virtual/jre/jre-17.ebuild b/virtual/jre/jre-17-r1.ebuild
index faeb554..510db0f 100644
--- a/virtual/jre/jre-17.ebuild
+++ b/virtual/jre/jre-17-r1.ebuild
@@ -11,4 +11,4 @@ RDEPEND="|| (
dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
virtual/jdk:${SLOT}
- )"
+)"
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
deleted file mode 100644
index da015ef..0000000
--- a/www-client/firefox/Manifest
+++ /dev/null
@@ -1,99 +0,0 @@
-DIST firefox-101-patches-08j.tar.xz 40248 BLAKE2B 1dabb91b848b4baa6b1fc20cfaeeb92a7c669369f922a3929b0966d4dd98a0d4445ee3056079a3c33193d8da69780f8ff481160f58ff1216157b4144558d4a98 SHA512 d85203262166554efdcf91a913cf539da4e4443807c7ad756ae7784a738100e9a0e8b51226bfad578455f0d5b13bba2d4782d34d7974e573ccad28033c544da4
-DIST firefox-101.0.1-ach.xpi 443457 BLAKE2B 68a1ebdccbce17eeac8824e63e034f0db706a091b4dea9ce1c14d0b769ad404e36004e89a838ef68bfbc44336125bb3494ade8b076ce38e70ea15b78f394f8e5 SHA512 9ee130d4e96bb73ec2ec01bd75faa2687bcb620727f44e199ee17db3e523254e0a0e8bd8d1813f4eebeb80e575ba20b312677d23a4994aadc6a4d4fb9bbfa5b8
-DIST firefox-101.0.1-af.xpi 413389 BLAKE2B d531c87e3df019cd5ff8e497cb3e74f000d238b65329d4eff72fbe80c2e3052abbaa19bac17d9383df1a2d88e60fa20c9511b1c12ca3fc06fb986db4902da772 SHA512 c9ddeb4ddd6dd8704c17f5dd8bf8ebdb881d88ad1bb1e01737b70ba0efd3374fda0829123afcbfbf98b770be4c281a714fbab2ee30d6fceff3eacbfa398df9db
-DIST firefox-101.0.1-an.xpi 487249 BLAKE2B 7d7d6b1b0590940df28b4a432d3909200496e500cce58cefb71393e6778723e71a251fede6470c97bb63b7e66b2c807bd9cf23fe4f790a9ea86c1f4856a48206 SHA512 fa7d675d52d547c7168e402e6a9c4f4687a1b1dd251e8e75ed8d0b7e171960e2762ae42d94d950d1925467b6195141101dd0b662c39919822ff2fdd2a248613f
-DIST firefox-101.0.1-ar.xpi 552750 BLAKE2B ad12ce6e550dcd4979b2664f80f7e36b0059ff35430832ffda5e29f6e2eda241f558eda5936ea2682d030b423784907ceb8b066cf477be74dc09d49abdd3c9f7 SHA512 dc8a76c47eb7cb05c8c411da7066820b766d5b7af192c1ee9256479fb268f2d829442133e8073baae2945b6d1892a8c6aa40f1c0cc790819f3e4ef11cee04c6c
-DIST firefox-101.0.1-ast.xpi 485914 BLAKE2B e3948117361aa4963b01df83b432130e75b670a075464c59894fbf4b4035ec78cb5030a17709ea9753258d1b2cf430f3488afc60ec5fdae4385d40421d7edd7a SHA512 9777c5922246b3d010652191a90aa5a0be9d0938d0432fe9e3a2819ccf07c7d605ed7eaa1d8e06f103ded77b943afb3a16cd9995040e769fd9e328a5bd5071c8
-DIST firefox-101.0.1-az.xpi 477260 BLAKE2B 0366f231862dfa7441615973f661488862abf11a551c714cabd6e754a33e45a25438f37071b90c9657eeb14b959e87e2986d7715fac70a228589ac9807401b17 SHA512 7b7abffa5a3ab9ec79c061faddb5492233c632061503867fc591ae2438d294ea77838f955d1addb87ef7965533f0990a0e4ae0682079f2775204fb95ca266d82
-DIST firefox-101.0.1-be.xpi 614359 BLAKE2B ac110e7057583c6d8dcce3377cf3ef2b99d404062387889242919c603e5fa454b0c840fcf63f572a560fee1d923e82e38181d436ded155efd4c3c7f00f5c52d4 SHA512 4c16da60999be558aae25004e12a75ce06061efc896ed5f612981b12ec6c293b3b6a8d8d0f732ca9b4686c1a0671d4359e115c4bb2e61ebe61b2d86cc34d2851
-DIST firefox-101.0.1-bg.xpi 558763 BLAKE2B 5af9937802d4ea43497f2101b87d8cc671737ac0c973c396035d0ac5ee332423ce9cfd6d6f9b812c3a0e09df695e48cec41e5f54df87046db9a8ad8aa5849414 SHA512 805966779a30d517f33755c4fee9b16079afd51edac2eabda32a64d718837d2bd47319302fef94e7b85e63ec1bc86a63be308b7f12c1847b5b7ff759d5568432
-DIST firefox-101.0.1-bn.xpi 545251 BLAKE2B de6e023fb1ed7455ada6ebc428b9cbfbaea7c593642a0a9ff2f4870a2f1d5f79b699ba491b8e6a4516070a34a0eb769fcf2d78d992b5caa79771f11d8186aab4 SHA512 b4910642b958b0f5b8dfb3708f973b985039c4cc35932fc6b3d1f0ad24ae2df75457b1d103ba2b39864a651d4a3c0f19301ac29504db7cc7c339c4757382b5a2
-DIST firefox-101.0.1-br.xpi 519308 BLAKE2B ec18b7362563cda585bbc5f5c696b809741d6da2bf05b4b4b551dbff6bdb0a39d59ce90c0714369cda3293f01ad7e66ac8e5ed415a627c0b761d0f133ad96e0a SHA512 df65f9f0cf1bd875ac376b5c6c6e8f2e6db885a88573b6aa40323e09bdc07790164fe01d250975845c83a5f54cf836e3f77a47603d86110b22c75e4da2231fa4
-DIST firefox-101.0.1-bs.xpi 452138 BLAKE2B bad35baff87fc4a07d33567f0bd76a14f211c1bee15d4376b4d7d51866bd5c1408618bfa89f88cf2a05ca47e87d91787ff2ead210cb5deb467a2dc0737caafd8 SHA512 7af3553a7a773bd5c26e16c388b7cd07e097e88937dbee83c3fa8f31463f7845923a62a655aeb4ba7cbb06cc6bcd128ad6c9eb1fed4c76b594cc8f08be01d004
-DIST firefox-101.0.1-ca-valencia.xpi 526520 BLAKE2B fae0b9cd5642a7c1bee467ea8f2b55b46cc093759be0d32f075b1e7c4c177780a3e90492794ecb1acf519c1cfe0cf8ffd43cab97676e295dcf00c46f558cd232 SHA512 4697f74f258b85af0516bd85211438671ffd539462d58d3eac49e535c3a8c0a0d4fff7dac97dabf50f74db77aaccf9d664d534663312288ad65290c18bc0dc05
-DIST firefox-101.0.1-ca.xpi 521443 BLAKE2B a2200d34353e20af691ac336f9eeece6907455498b85bed08d42644c95a7e01fab2b2777efaa87fd170ad81d9066b43e9e6d329b32e12745077454eec4e31ce9 SHA512 94b10a1d80110152304336976dad57681fda31c0776116f4b6bfc8e16d16d8fb14945b470e5ef5eadf4b482a8c63ed705de05939021e837295134d5a14edd218
-DIST firefox-101.0.1-cak.xpi 539976 BLAKE2B e40ea9ed10d864aa18f787388e155560353413e62f4ab4466ebaf41892b1bf9233c17406af43b8ef081708c3c772d69372953143d6d2dff4e6aa8a8a63466c7b SHA512 ded2be93d946de8cc81534612c0f17cc20a9903f8f47fd69a07d3c20b7ed2f59b61a9f06d6223024cfafeecdf9803e8d26572480995569b91b425b34a616c57b
-DIST firefox-101.0.1-cs.xpi 557477 BLAKE2B 6883a85ab711c863b8db188f2cc0445f9d9d7842ef80d62f9bc052a149bf7c7307c2672495ea41a0cdc33f3f78664395d0fe4dd6f2f7b80a24255b4e7c5f80f3 SHA512 5416128c4a38da6eeaf14c74754fb09e76af5d1f8dcc8b26f55ccdd024e284fe4dcd3a7c20dfdc14d5c8e3e9a48c0c4e80d7be0c6e6c38f278367bc7a020e084
-DIST firefox-101.0.1-cy.xpi 534442 BLAKE2B f7769a3593c61d28f723231c3e015f022c461b9f42c388c6471734bf70f75dee8643d67b96b1e4e339f49035f41aa06c5f6eca65e79576bbd8622fd4b4c56cf2 SHA512 92e68512f1f7f583de04cf5fe2a5bf095f149e691f5ca29540e53c7e056da45aae973f90519a58b7b9fcd8e3f944a1d719294e72d1d996d6833ab50420b3b36b
-DIST firefox-101.0.1-da.xpi 526079 BLAKE2B 4167db60be422b4d3ead0c742528ba8b028ad13ea264cc27fedac2bae0e7c5ec6ed86fd897e9619c9e8e5c7d5e331debd494223c6049826a9df409cfb30039c9 SHA512 29d29eebcb75b5bd0f19fa659af8c839e7307854a597a59b345bf0bcf96217dd9596c24aab056d988b3f5f9b6b32c97e1143b2449d405ffdbd561f22dc0891b0
-DIST firefox-101.0.1-de.xpi 545591 BLAKE2B 339a654ff451eaf95b5607c6e9c9838400b0445e42cbd4d6a5a29922453c509377ac15e8854b0d3a2a0fbf1d2dba498d182aab19627afa531ee3b0de920da815 SHA512 b7e37f20df57c02a2e21221c9cdcdb8945585ffb738598c272f73336309e31f40cdd23c3abcf6b048b759a8807deaed2d5e005426255b5dc8adfe09d2e3b8bdd
-DIST firefox-101.0.1-dsb.xpi 558329 BLAKE2B 005d9561273853d9767a5672e17be380c8e650f961ba2b522fd66bf4ff3cfdd65430feff42cbfe0be94cfed72088c23ef1dfebfc3443230c7e59d7d8f08cebe6 SHA512 9c72d94014bf859aecca298cf7278be4ab9682631fe3303ecf8863c5fc82518e4fc468a31ba5c8a8fdeb3627122ed3c54a37621f8a817269d0e1e200f9042c2f
-DIST firefox-101.0.1-el.xpi 629456 BLAKE2B 38273ec783d09b7a46cf1d56739d2da87f8abb79412e6e8450441cb96e02b7c4ec90ffdf3440583e6dc6d0d48415a26c33b0af29c05273b9819490fd4bc59ea2 SHA512 1dc5c220cbf829463cf622eb7d28395a6fb68515e9c74ae316b126490901efcaf84bb8c5682c05f207efc54537983e2059f4991e1df9f6236fabda7cadc78f96
-DIST firefox-101.0.1-en-CA.xpi 502217 BLAKE2B edb994ba92fafce6b3153c71f92cb9cdcf1386eaab949f82ed407e19116eb70d75ea248961c54de46c3ee8dd9a716888451fb8ba67d7ac419f9094ecd26911c1 SHA512 c14c0c1c6dd289f2fa2ffb01d4848cdecf2f405494082c690f89d8524950b8ccd9410340a3e7314adce2e8d3d513e315cb8e0315097caaf61cf5b10746ec0250
-DIST firefox-101.0.1-en-GB.xpi 503125 BLAKE2B 08ce3db2d2ae644e563ec42b84df07ec61051b70ae0f484ccd32feb696e8476e881c3ce1a9c1669460823045b8dac0bae577c580f8dc14c587ecc9daa5220c65 SHA512 17fddd7ca3b2364f2e282124b68c725090b8064446767f866dd456e9b77e1b5570d4133d37839b80defbc3e388cf84938a3feaeccbbd65b76e38a9c2a5637715
-DIST firefox-101.0.1-eo.xpi 529043 BLAKE2B 724136c1e18bc0ec99c2dad23f566dbd8e283359f6798be6e0d9ec5cf72eb02af23211867c508dd4c387f41b1680f6e9de447ad8225a324dbe0cba0239f4ebb3 SHA512 7c9a7e10b5aad212c3de8dd5799410fe0b1ff80f3bdaac08c6a8b6927627d56a6a35f278b7dd3283510de37539a69c7f8356653ec3959d0ef33396222f19a510
-DIST firefox-101.0.1-es-AR.xpi 539056 BLAKE2B 18ed1bfbad86c11672ea35f62479c59035f8323ef1f94f7e7eb8ada77382c2db9ac166a53b4e8abf2f1a2d2560df5ad0e8f47db7c8ba5eb237461e0adad7cd78 SHA512 d1d272b84b613540a3385fe3c9228fddf3718ef1de6c63b11f750961d27c3b985fc2c3c906183b175bc5ca2e7d8f51512bbacb97c8eebb0647a16b0df8fa0762
-DIST firefox-101.0.1-es-CL.xpi 538152 BLAKE2B 12c7d172873ebfdfd53c43f73d6aa0148c1d3824048455010054f93f0c00c405aa6e65309ab3b79168af33424cbfcec5cfc6652972e71f2d2e2234d04826921f SHA512 ba27192bd5e696693723f4753758e4a5e6b3f3899eb551f806f84c027390d3a14f074fa2faa3317236c5bc0ec5f2f347ed979c58bf4674d9698f6bf2d7291c0b
-DIST firefox-101.0.1-es-ES.xpi 529115 BLAKE2B 033c070fd325992e500f32a791c23f7836e59e4fab53fe1bfebb643d8991b0e3e2bbef12de1169123a28f05f1a0a28deb285bad8322e98b459b2097d306f64df SHA512 3ac7261ea4af4a13c05b21a7b36e187688059ef8407bc9c731202931835c489ecab01b16e149b7effb8112bb05612cdb28ed1ccad748e634f8910000219ce422
-DIST firefox-101.0.1-es-MX.xpi 542146 BLAKE2B 1ad797c168ce6292c3562968446ffd60d4a58e11745b26d15184170363038d632e7f85854c8691a1fdea6a2f8c249dc0d9ec086508356c0e3213049f8a79e7d5 SHA512 0294e7f9b9f89c2cab0b2494da9369f51755934b1768caf97fb8fc19afe00181808c9a4b826bbb974d4679db196cf465f7b8cf66325affaababb4af92efb036f
-DIST firefox-101.0.1-et.xpi 520745 BLAKE2B fabe897d39e45a827cabbd05d38ac75279fd6b47002aacd9f94e659c577f50d358fc4b122292e5513c06b02967d1b5b621a7a2e1f6fe2f29f9dc3a0fcc1519de SHA512 9110b812fffaa00e8ad98c68a1ea872a60d9749082e543f04dee75982403f16a99ad89a315a1ca55dc80f1aa21e00b62a8a44eb3711fb46a600f12bc2f43d95a
-DIST firefox-101.0.1-eu.xpi 527791 BLAKE2B 92adec2270f666d4c271a6245d4d03ac5b9215c231dc473365d4e901b5badba8ce2e22587102c910e89c066a3dbc8b12803551d1fb316a53df1da0960ddaa3c3 SHA512 399b4de6bcc04625ab7b78b8f8ef82a38b14f57f86488b5bd0f29934bddf68aefe896b8b82c6f690b9a8227ab8732751f226bd3dff3f4777c3a75b2928ef4033
-DIST firefox-101.0.1-fa.xpi 551016 BLAKE2B f799ecc79b141367935249ec3732c2792989486c3baacbc4bda42f134dcaf20a5f4d9b48ad2f6dbfd6c6a0a3336c587b320c83e8f9d473061bf7de7d06e8539a SHA512 eccaa26d7846141b5d4f66b4a7ff01966070f904138fb255a7fd0171b05c70f0476560917b4e8b611cb9060bc264c5a058dea12482a5fa4e0b5f7745a1432a76
-DIST firefox-101.0.1-ff.xpi 461242 BLAKE2B 3f6d7b9a545ad71ac773d19537936f2f7d4dcb0c98686d26ac360c8aa646679a0bafc2dbe4234537990fbba971588009f4d347b823e988521aa4a23d4f84f3e6 SHA512 147dba504b74b8f9ca71965897c7bcbd7e0f1db6812c0f65776efda4bc9bdbfb24ac24f6fce367eb09778f7eef193b0d4b23f736a8f3b3faa91bfc2807ce8b4d
-DIST firefox-101.0.1-fi.xpi 523432 BLAKE2B ad70105133f7fbb70871b3e349d01055e44e7be9381461d815bb2964d9e028782196d41ce070c983b5ee4881f66d7ff84b6eae6caeb3fbbe8832490b465dc184 SHA512 30155ade86d2f3edd656d7fec404a2342c66b33bd475b5f2462fe6af53c6c8bda19a9c3597cf540bcfffdd059276c0f18943030e409b2ecd61b1858633886005
-DIST firefox-101.0.1-fr.xpi 549201 BLAKE2B 3565e0c60d765f9a792444a6199dd7afb092c72af1163a8a0c6767eddef7e441bf25ae3b41de58ff224706751a5893e3a687237bab597ba0e265e99bcf566b9c SHA512 36d8ff0888c0f46dbb6b0b6c2a9e0b5a4cc4600471341cfd134bea4a1ae7d52ed505f3e5c2d4914747277a0ed4bdd8a241ee267617e44e8b39b8cd77883b1109
-DIST firefox-101.0.1-fy-NL.xpi 535699 BLAKE2B 1ef5d1dde46529b56e21dda8d9158de148510d38466dd999e2926ff1920fd721091d57deb1595eba1145639b3e7baa208cd0e827cfc18460be83377232c4b8e4 SHA512 f422022a610686095027fee7a6e630765ffa8e23b44d4f61bc6be90e1466e2cf7b34a925a8b25f8fa619d7cec8c84915f90ba468578b77cf061eea64a12ab76b
-DIST firefox-101.0.1-ga-IE.xpi 461041 BLAKE2B 62b9b758ec12cf0f7ec4488caea72e4541cba57d6b061cbe51942681df638c8f6bd4c1b15edda81917cd1894faacfeefbd7a9c193707d5be48f955981f769020 SHA512 52b42928f5409a00eec57623c95198166884afac651587419a6ab26d2ee23eb206555ca1d27262bf837a6e4395ffd0f174b871d0e5901cec01b9ccc37ae42533
-DIST firefox-101.0.1-gd.xpi 520127 BLAKE2B da15bcec9091935ccc7401c58d9c64ea577667ec85471ac739353c0e9508037c2052f5db5ea0c9227e72a64365e733eb85e74c44daa31865fbe5ab4e2a8ce1af SHA512 ac4cf491ffa844ec5e7a27d50f2fbc55c746a42470ecd3ff5d28d94062d4fb0653235c56173ff11781a7a1b5b2ccabd5e3fd0e3f11017ac293786f63171bcc42
-DIST firefox-101.0.1-gl.xpi 528662 BLAKE2B 6cf1fdc4b55cb19f8c2179ac4fa3ba1f9ac8c228b18640acb0f41237526e1b65a719d86a6351f4f98e12d7945edc57df91d524fe6c9f0cb1e8518d0e081b7905 SHA512 6aa8945bc7bbe68204359b944af149c942baf265a27a1ccb04b3d197bb1a06c9f905f1bf8e522d9eb8ba72678bb09b717d6a8e9bfe84cbee119e36db315ca412
-DIST firefox-101.0.1-gn.xpi 549941 BLAKE2B f71b0e07f50cda91d593e71bd53b5e6c35be33439c837ab07eeeaf594a8413db56f592767a75cf7b081d703a4a2540a10a00c57973c7b1dbf31fe19d89e42c71 SHA512 17367b23bf8e3d648d04e81e8adce8bd130e74190ccfdfe360854064a7bf89ccef19543b60cc689cecd9681738fa81f86d13e41670da1f3e1bb647be177e5db9
-DIST firefox-101.0.1-gu-IN.xpi 516675 BLAKE2B 48b1fb7ab79957286a1a0ce9b984df72ce6a13340ea19a3d16ccf00235358f9ef054f102c7c82a6908da50d9b8c08f26d5e8e2b1649d6c14e8bca3b0ab915f39 SHA512 1ff94d348a3480d7820975d9c619361a44c54337c561f24612cdd6a0a64f1d076ada25750e89f4e998db1ace77e331799aece55d7105a4d2765d63993386b2a7
-DIST firefox-101.0.1-he.xpi 549791 BLAKE2B 7ae7388a08a815d313a3efcb5e004137d7b8821a0c3cf395bd8b8d3acfce9248beeaea96184cc7c7e438703ed229986ea3ebb726d1873fc6cd41df52051d9287 SHA512 c3944d9f9006d0d6e189a0aa17e785d5e4156c87243ca0f373de14ca2b4607092fad829f9223f0d8bbb7c5efb79dd57561cdd336ec81615fddb803224e9a70e3
-DIST firefox-101.0.1-hi-IN.xpi 546761 BLAKE2B baa387d2b56f1bc25714f3e0c508bc744bd8c9d78cc8734da463ac531695f5e818b489f728967bfc571585453d49544a967568b5b07a41d3dc78c6b925e0a634 SHA512 acc86cf51fbdcc81a1ba3492dc1115b19ee3fa764c8757ea34e64b3d179ad960afb12f05ec18c1d5b9e985e40ecffcc427d01d8e6c21a46b47836153ec2396a1
-DIST firefox-101.0.1-hr.xpi 519202 BLAKE2B d905a5c69abda8c4741a63cefe624d4cd5a49ed1a1b83c77a51c506d55709e53dacf631da839f68135c43c0d35ce8ae06a45269f89d63db2331932e134e66eb7 SHA512 cd5c54e19678798a924daceff182ed16e59c23f1103422fe230a6d6e70f2239513719fe60b1b91c60b7ef7df1d01ebbba8a1ecde2aa294ef61c78e98f05cc4cc
-DIST firefox-101.0.1-hsb.xpi 554545 BLAKE2B de8377948716c4a852934fd660ae56f0dbf8d6d3b2ff78ce983aa41242144d09e2d469f010c0431843546b8fd68a412bb20058f6ffe5d95d82afaa8933a5d0d5 SHA512 96dd047012df846b4178335a7ef1fe8b6055f137f44ae617d2579b98b0bb87b2d2d29c2a1b270edcdca70588b007c73508f7b8f1c36d5d8a98a29c011f331f71
-DIST firefox-101.0.1-hu.xpi 557573 BLAKE2B e691668a8cc865586bf18749b0998199483c067afcfbcc5044c2b8a179862859158d918511625d12ed6bc9a9854478145b906f5b3c465c5df67d692d9162f9dc SHA512 e9611d63874609f994971a1b6007b5acb75a915122697bb54c0fac4558055f8e9cc9fb5b8bc0892cd5fa8aafb02fd3b88328abebca9c967c2ee69a14b51edbf8
-DIST firefox-101.0.1-hy-AM.xpi 568380 BLAKE2B 567c02333742edc07a58b2015c940f4ae1a57ebfda8e092ec9a41041a30f8e1b4f342cbf9336b36bdc3d8d4af8195af6a2e1742e47afbef72b9ef243a7cc9b96 SHA512 6a8299578c7826356d8232e7246897752d1d328c0401d58a0c3414805c6ca18152f5f80376121b5ab241e58ac24471125ea69aec7e05bd9e08f3e8ec3bb048fb
-DIST firefox-101.0.1-ia.xpi 524537 BLAKE2B 3d65d754d5391ada925b50b6a5ba50af538703b77aa1c98b932df2cac736f59af2b80a049c9d117646e942e507429415bcc05ebe57b2bf1a2d05a8e6acdb9b99 SHA512 1dfcd38ed753b4fb74a60c730ca9fc88770cddafcb7dcc82cb4af86cf7363fe446cb4f6957b148e26257e07b242479f5802d8d33af5eeec6f1b508af7a13195e
-DIST firefox-101.0.1-id.xpi 521948 BLAKE2B 3e1de30912d1d0f7abbeabd7a05c31c7e0871ac176249ae5b9b56cab3264cfc4ae341a6f81130aa53133f6f29fbd5367dc3f21b80b0bb1fade08056a44f8fd13 SHA512 9d6a47a4b7ac64abdd35cfe0b1fc61c09a9b1e8713793fc61a49867f610b9610065a1ef0228dfba78245b8a035b0221334ce39d947d05f464e49115cf468df1a
-DIST firefox-101.0.1-is.xpi 529383 BLAKE2B 529c69c84556869807f35b7481dd01cbfbbd5506a36212504dc7776160ab07321fe95e239503e7589ba148ce7d06f361dce57a41a1bee2f2932585109f38cd45 SHA512 a009c7242f1c3d320396c4151a139cb64d08716cc62827f52da60281857fec813c225ea35a024eedd934db7622834072796075aa9f689675b514fa2a8359ce5b
-DIST firefox-101.0.1-it.xpi 454741 BLAKE2B ba85efdc153b872d39faf2eed7f0a978b42a1d03bac8815b339cc615bf0e28ee13737a1a3d92f1e9f1998b791150b88561ca7738fb31aac8fecc17fec20edb22 SHA512 84f8ed2a21413d5725d71ab2633814d756e57fad08db20c8a615ca94f1a7c040e170a57ea15b63da7e245e921eecbd0df0dc4f71e2cdba07a355df5133c36bc8
-DIST firefox-101.0.1-ja.xpi 579349 BLAKE2B 45e5c19edbcb3908c5e29488ebe41ab7778945316634d86f4e4d836e3935e3ed03c654a54616e58e457da9aa6d651b6980abe2707c562f9f5593758ef2e1b6e4 SHA512 bce195760416ce5dfdfefcfcacf53b413d3fa6dc6f368e3247af32120a88dc58c12a82975b3a05351767723448e6e52c36a229e724f30e97861b97b6d0fa42b5
-DIST firefox-101.0.1-ka.xpi 582469 BLAKE2B 145d910ab8488febb1046c5b074d98004172547e591e888e80bf366fd89cf422299abe8a9c8ff0e6bd8e40818396850568b05a03f2f2c5c09651c8e555570b5b SHA512 ff903313ec8d0ebc189cd64a4d3471b79651c19ef1da828cf466ee404fa8a6ac2664af7cad13828aa9ae49f617f51b65a0ffbeca76276c36ecf7c34b2d3d6e6d
-DIST firefox-101.0.1-kab.xpi 543575 BLAKE2B 8447e5f1716fac1968ea2d7b8d85e81203835ba4f4c986d885d3496cabe2f4e3ea4fba10520165d4d94885636b24c7781e7a3cea3e19e65aa4fff2fbe0cf39fe SHA512 15e10114dc2c0dee5bbcde8207acbd75948e9bf8f0b65e030c2db7a5d353c75b40efd70fec595679c7ab81b461ee1ede3db03f20eaedaa10cff632b584e816d1
-DIST firefox-101.0.1-kk.xpi 605356 BLAKE2B d82e0beecc65b48598cfb2dac172e282bfadbe086af1c298aa00dc5a12b84ce6f03c9abfad185c6924263b5b491b4f51a47fb31774f6a21facecbea090631ae3 SHA512 9353b5ade59913f5ca9167cddec374ce5ec9f46ded7d5b8eb839b0cd029ac99d2123e063742856cdc458adf825f0635fff9d8782b3fa5f11d758886c9cee0968
-DIST firefox-101.0.1-km.xpi 520290 BLAKE2B 12ddd52beb1343b96f972e5174a64d722c34322a01cf59bbb1ba655beb39ab5c6090c9753c3444451e1282d3415963647f1270a828f2268c2c7e26e3f8f37970 SHA512 8a01a95c904a98550ac75db70797d95386de0db7fc066ff7e064311d991efae15781eca662c57bbf62c203b0aba30681328741a647ab5e24e09667a0954ac4d6
-DIST firefox-101.0.1-kn.xpi 486511 BLAKE2B fa510f85f5ab1f7901ae1f561bd432b28ebb0645570315ee10d35c1546a5dd1d231888582269b5b27ff53e385dd8306e8b55995234ed8b56adf0b676f1e60fe1 SHA512 57770fb499873b140507930c501fadd37416708eda993f5f5295b59e05609660c015a6d6fa8d03982836736b8136129708a67b8b371087ee2f48e2bbc440a80c
-DIST firefox-101.0.1-ko.xpi 570887 BLAKE2B 479e3801561fb646abb4748deff2b10b81e9d3f7f628aa087aba28da29e77e52fe32f99634b798c056e51128b32dad64956d351bb2da03fefba1b8fc79f60ba2 SHA512 5aa8ff54522b6ab51c7576b34c245abdfb59e7384ebc4296cb9ccd4cbd2357c21bc6442842262e4a35d3c8c7abc142b4740ccf28e85b1146125ba8cd52a45106
-DIST firefox-101.0.1-lij.xpi 459509 BLAKE2B 93babbedb995b01bda06ff29be69b55dcb885cbe5e23f345aa19e9af993c396df98f6d5b397eb926534395bdf9b2dd42ba8aa40e4709da2bccadf86597b969aa SHA512 1f0394937b2ef74a8ad3194f16219c73c2c11dc811ab1c117b197bfbfc96d255f0037fc7fd61cba90cdebf7b4beb43ff96a35b41034db382b148e996e05fd775
-DIST firefox-101.0.1-lt.xpi 546501 BLAKE2B fc2359da140d778693215c78a2c71a513964733a5517b07de106b1fa6024218794d5c3595decd773a7db6c4cfa4d33a7b3ff1fa5a0f6f256211100c4a44354be SHA512 bceea54b45eb8039d826b28e48cbac2162e584050c45221e5bf4687dc329c9e028ff739cf4218d97ccaca5ef9fa89aac77ffba2651131a9c9328e94e3e73c84d
-DIST firefox-101.0.1-lv.xpi 452400 BLAKE2B bbb03b5d3c21f129910ea0cb35c40ccbe6ea9f900858b2e37cef9cbad1422c562474a9c76a51b1436abf14fd7775e2fcab9b72e2ed7c36862525a934d7d6e570 SHA512 0eb14aaef00b25c98f06c5a1be786f83af9b1d9d027ca655e524744773ac4bb424a77963c5d93885c70ce6719acc70b38ad9345084b264ca0992e823bb15d5e4
-DIST firefox-101.0.1-mk.xpi 463662 BLAKE2B f001143be9dde44fefffef44418dd1f70f3959350839b5462ad508b58632a920d1ed5e4908f75dee02dd58665a876432f01e08dda5054d1417a2bfe0f37e8064 SHA512 a572dc677a9c822a2f75a8ad81e3b30e45b7c018bac338ed8f04dfd81021cee74b4486ff3fee030f889ce202c73e73d75b8348ff55bda4bb82ddb7f8dcf07ec1
-DIST firefox-101.0.1-mr.xpi 520151 BLAKE2B da7f85de2a0db0d1b7b1c97f8443d35df22258294b1af9620f3d168d2b79a19d6ad29c331cb75d77991a9b30b219048f0011cd8c4414911aef20c73d1956f634 SHA512 2953238683b74a5682ab00a9d1510be488dcc1f9a23f16e33aae5dae3df34b63b118f5a6b2391bf08d44f654917ed80d19d408983bc6086252bd668197ccf85e
-DIST firefox-101.0.1-ms.xpi 437586 BLAKE2B a99b9ca34df26c535260770835ea954059b289018a767ae31bebefe234320ba3a8d5d7f3bb5e9f343e5e3b69ff12cfe4e709f4da6a0c0b6bff4ab7e29c5a806c SHA512 5408697a9d542c559de6099dea7f58860f32941dece96d04cedb293f05905617b0d1a3adf7eaa875a53037d994ba3c594e0208950000f0e1ac05b7fa256fd0de
-DIST firefox-101.0.1-my.xpi 503453 BLAKE2B 71c7da9a650665c1764de87b308d53dd0859b9831d260bb846b93b8153b219150c78158cca92058773772e31f3cc363f65e0b3978d9de2957cee2b62de84f048 SHA512 b661fb1c3ef3254ea3b33e8cd44c66885ec94ae32faadc74230e6d93acbe13ce27cb0806f25f2d5f2f98ba6a05a1c5e185499fefa90e25410b2ff94ae26efe4b
-DIST firefox-101.0.1-nb-NO.xpi 521733 BLAKE2B 96077c67ba92855753abcd1a0617a98fa9177c93aefa2cfc239f90bb129f07afd727c5262399734e11b4575ad2ee6bb893afb98e9fa91542479e27392e9644f6 SHA512 e86d1ed31eec6c8a61d9abfe39971a74c5d823eafa8856032959b37d190639adf1d70ac6d8cde880f464fbb8452202bf70e92737a3061ba50edccec5b5f7f33f
-DIST firefox-101.0.1-ne-NP.xpi 478321 BLAKE2B f4de378d35c0929b00458e13466094b3cf67d0f651ab2132c06913fa67f3d7baccccbb9a6f25691d8ccb913aa5ab7ccc23e9bb8a026a0be63d1bf63a6ce93e50 SHA512 3075f35fdbd961e1c29ac8f7a9f17bd6a50ab177cc504d7554fdf2834478f3972ce6c6bf17c6bb0198417786c073433423802a783636a9b858c2c1b6949b1d97
-DIST firefox-101.0.1-nl.xpi 529639 BLAKE2B 7ad96403ec356fe9ae86d0539f7b982b5d2da49513f58a757c050b358e7e6e6d8b75b7939e30c10a0450a344d610d1441212e7826f689a0c1f09eb9f69c26f3a SHA512 41b35f5b95870ac3334686b19f82f49582a1a5992c3ed12ef421d3fbb93e58fab8e1d433b2cfc982e5823a5c58d3ad3e95ed8207b9e03d9e3430b3758ac0649f
-DIST firefox-101.0.1-nn-NO.xpi 523773 BLAKE2B 07721608b28abc99427b815c8b2df4c6c9c8866e8d7d4258ac1bddd20580eeec8138d9fc54945ac267b2eb80137e07dbf85dcd24b0a294ffa09081bb6338231a SHA512 797178353a17b4b5ba0dbfc117ed3c2a38d3d093f30612125163b890e66ea6ea4d8c8740d627b059d29701c27a5e6730e4403844b0add42e9464809ff0def214
-DIST firefox-101.0.1-oc.xpi 544435 BLAKE2B c2ecb49ab664260de8a0e1ed721a9752787a240db35155dbe905ab456720959362740ed81e20b9f45aec4e0a62c339d014b7db09483840bc2b3c36c3fe06bab6 SHA512 7270260c538dee769a5d8ceacf691ae602195ad8f1dd17e890dbf585596713e9018506bb335c9e87e0251deef67e643a4e30af53ba236c446d5bbd16ea8af975
-DIST firefox-101.0.1-pa-IN.xpi 592181 BLAKE2B e6cf51abe4f20ac2e3d5c8686b8380f21a2a8550e923413a85dc0c9472d531aba62961e9658656d110d7a25e3932c750f6b253853e8cf1ea4ab0899f94ffbddf SHA512 aff33d63496f28f8435ce410ebca18dfecfafa7a321d83fa83a51a80b03b0535dec1878c3345e88f31791f3c68817e883d06d646a8242972e77fa6342826ef42
-DIST firefox-101.0.1-pl.xpi 549640 BLAKE2B 6412e4e8a7eeecabb12cef3f1e5ac42f99c27396fdb7057ab1bb7a927e948cbfdde8673223a9cc511275105785a9fba17c55ba92612e98a899614b9daca573a6 SHA512 239bb04a41d8b386b9ca4ab89d3067b45268c2d8001022e70a375532ba0b6d1366bc1182516e96936d9b2b674a5daabea35d19c9915e3323860cfa73c82f12e1
-DIST firefox-101.0.1-pt-BR.xpi 535137 BLAKE2B fc7dcc4651a63d8601b7fa03eea648531ff55b09186600643d1981c5613e6fe8466f33fc89b1b26c9ac310763ce251989a0d0ced1f803e8b4dde50dbedc6c1c5 SHA512 8f53cce58496f5e1ddbcfeb738499e99b1eb83df039cd164f95da84a1057b5f651f09817a6a0c77cbc5dc622512c5916ab0c5593cc2f34eea1b6a15415589b12
-DIST firefox-101.0.1-pt-PT.xpi 538698 BLAKE2B 1f9f3ff0039af0f0aef4b194c1e1c7ad41c7ca5d3891c1946f9d61724f589a90bbbc820671f0fc6f8e73d940a840885079af1693aa78378a16f9ce3deef36a43 SHA512 3404d89c8662fccb42e611797e85fdc1bf1f63cdacd8974312f028548f1ce7e54f9ce724dd9ae7b7f35aff95d3153e224cffe485aae4d870f8f6f97fc101470b
-DIST firefox-101.0.1-rm.xpi 528615 BLAKE2B 12b9ad7af2456f31dc8bce9ff513b0012546958ab80ef4b25a3ace54326ec6c8f891150796a5bc6d72d8c7a947986ba3bed40744452415e65517b3e347b08c97 SHA512 4f23976fa91004e8cf7828867535abab6951a5960ea14db21a6292eb36d2def36108fbafa21726e997715ccf96de7d2a7f59e7a6355c19d8a912bde088400d73
-DIST firefox-101.0.1-ro.xpi 516080 BLAKE2B 41910412b3fab6999ab21b324d6c7007f2048037ec7df9a089051a10d47bdd061d25f3a5648b9318bfdc9193fac9cf76617705918a012c6e7465df2ea02a2c34 SHA512 01eb61f6175d38dc76084907a0f80956d113eee82ba6d76116d75f850e7549ac9babf13eb8b440d6e0691b2f091f33dd8b30bb16482ebe09472f8e755034456a
-DIST firefox-101.0.1-ru.xpi 617791 BLAKE2B 231990cb8cec6c2a1daa0bbc4eeba911d3abb1c0b6c9822262e9c3addbc69a3b5bd57e790b24a681db336fea15706e1a7d146a27070780d37d4db16aba22443b SHA512 13caa350473a4ff088fe1f118027e0cf78196f5bf6219bca4a43724dd615e8235c13c14e217072d47ce8742b2bae46c8e3d9a9f9adad80d8a4f7228958703ba1
-DIST firefox-101.0.1-sco.xpi 490268 BLAKE2B e36790438270d65911d76c0550938f6f0919a463cfe780bfabe2ece514694a12f8858180b374a585fd9d45e5307ef97c9b18359612d3abd47d425088bba431ee SHA512 18b3c39a743736dee3abf760a45cea35cde55d45b6d29e425f4baa556836fbddcc6536b6c59387cda70e83b71df10ddc5464d328d57b72ef0ced49bd0d7309d1
-DIST firefox-101.0.1-si.xpi 476134 BLAKE2B d6cc9a0ca46506d6985c643efc9c51e74756dbc43e409911408bc1e1b3412c4a3325eaefd051e779fc8fdb5e112e2565cc48da551f2aaa42e4da087e3c97eba9 SHA512 af14c4098191528739ca45d4df9f9118106f220dcb7daf1075ce4ef7cb0530d40acbc2569ada9e48af19eafb6d59ae09d0fe57be7b4e71ec014e1547a250cf37
-DIST firefox-101.0.1-sk.xpi 558363 BLAKE2B 3aabf9ce0c159893e49ab11a347086a9cde3b4fe4846ea0cafc6cd08e50c3e8ac78196d14f60d9f06ac3e04bdc9c0e4516c0d9da5a1aedb28bdb84c438337549 SHA512 b7d7a3f4dcaacbf0038a9c8af1a7ce0255648c6a2302795929eb20478391672d7f5da9453b7c1b1dc27910dcf3ed433b3dac6ac8373a82cf36a377390bc5a3d1
-DIST firefox-101.0.1-sl.xpi 531097 BLAKE2B 3d38b8972425ac4fea5675e2d20b9a17807ac0ccc22a10eab4c7dfb27c6014851578245d140a2c1b7fc5bf2056c5b1cc9db55d5e2cae4d9035b1de51e65b7720 SHA512 10747900cd3edd9615aeaeb4b0a54a5158226285d02d0854d01b94d176bb476cd054df511c8b244b553a6b284167006493e39191f8db5d972cb12ef3d9129746
-DIST firefox-101.0.1-son.xpi 415536 BLAKE2B 461458e8f5329749a3f9c59ceef01e51ebdecde36d96152401c838d65f51269b242a6f03fd2b9c64c8bb63969cc7cea3dc7b5222b302c4132228eb264dd44c07 SHA512 5a9871bd70d2ea9d7b74a5a78b126c503433ec72fafadca990769015a7f91bf71d276b5108a3c695d13e54725280553b35fb825a208bd539b862428d680be734
-DIST firefox-101.0.1-sq.xpi 546736 BLAKE2B 57e58547241a476d5e1dcd3542b17cbb327ea83acb49371cdadbdad2c6c90e5f9e1b90610d183732d9782ac009390614fc2db7e2f48eea9b3240a57eaaed8563 SHA512 8c5267719dc7f54f9b2b32d332fb28f3419a5ab95cdd6e2c3aba6468acc4361ecc2cf9cd6fdb313cf8dfaefffaa9f0e5048707f10d34ccc48a04026b5f9ddc4d
-DIST firefox-101.0.1-sr.xpi 571511 BLAKE2B f43ae626d47c1ef8212cb92798a85dc6381aa236d00d68db101ba8a4ffe0f2924df8644649c1dfc216b7ecf057d470cc4aad08b824ff8f346ee2e1d00b4144bf SHA512 30252094fc660cdf8eafa654a91e83b565d56e26f2443cfa6fcd14759035082fa6cd872dedc899da207cf22c558b46c691afdebae032f7bacf2bc05c18724bd6
-DIST firefox-101.0.1-sv-SE.xpi 532152 BLAKE2B f2c8b3f310451f911d5b14189063b2555cfcf1f63bdfd299312039c3b02dc9a1b08842b77ace240ccc554c9b9aa51a338f4b00ad03651f27768b8b768310710e SHA512 c910d513eee696814580efcb713154d1ec8a998c4adc42697690425375081776ce4f6f3fe7ac36967013fdc53fea6c47190ca00d1e09d40fedd1884813616819
-DIST firefox-101.0.1-szl.xpi 502512 BLAKE2B dfc9465f4cfde7989ca028930250107a11f35a2915690d61a60388ea5238d5df16c5139e46792abff7d48a0e0e2027708bb18b241a0f5c310828fcb2db817be0 SHA512 afe15fe373c325264355fe8d3af21681fc947fa38ca32507337a7e073800fd0c7f7b6c25e4937eccec630b263553c7ce7c3e2d7f1af9f7a58db9525dc73f7c19
-DIST firefox-101.0.1-ta.xpi 500997 BLAKE2B 64a1d6397c84f16cb6fac2f160a2611749a46d939734f94a7c2a4f7f0793045ee64d350d8a7549abe33826f5c7b61327876f4848ac928da654442de18635a1b1 SHA512 635afda2bfee3e94e45db1ff1edc3176f588aa605a94b6a0a088ed7473c9a29fb8d23255ff26fd33981a062ccdbaf9f141a644159fec9963e554d33a39705e86
-DIST firefox-101.0.1-te.xpi 541010 BLAKE2B de214ded24bf0b5e1849402700c0cf9878aaf24e1387fac465bf3636e12ec4c99f1aa4be74153e43593b5aed6ae154477d524fef67fa57ab733082de86649069 SHA512 ca4f397d879e93fe72af8c36965571c68ba006b287f73abf1dc1164ce10facec7c9e83efe7e5d7c7bb318d580c03a08eb77b1f83d2e7178bca84ec4975a3d471
-DIST firefox-101.0.1-th.xpi 598575 BLAKE2B 68b752300955d0c8093d56fcdd4f4949e9191a9f0c920e9e2dd28c17b0f0847217f06cb7040fd832fb949128356d6880472742d0de96367bafada75c52ddd422 SHA512 9e1842aa7c5516c91573406bcfc545addb7f0df4b2173830a080bd4b7c488c2b05547998dedffb9139f4f78f35ba2191ab60e127027ad0b5c6fc781cb1ffd7b7
-DIST firefox-101.0.1-tl.xpi 505949 BLAKE2B 37ee6236b7af8789e25a9bfbab7cb1e7f2ee0dd2b93721ac955b7b6331079dcbeeb6ab9e0c54246063ffbe811de9a1c89c0522bd5798bb3cbffc4de508504a11 SHA512 3e7c066ccbfd9a3f954d09340301f06ef261a15a8ee45ed745e8773803cb84006070a7369678f1571946f33f34e8ba31ab5e577529c34389a92331c6ebb45ec0
-DIST firefox-101.0.1-tr.xpi 545474 BLAKE2B 4e62fabe85c79c9bfdff80124b3ebdfb0d8b6b6345e0794500a9a82699e862457f509f0c227de12d1cf07bfd7fa11ed1da6ee49ca0561f2ca6d524b6a46f3a1c SHA512 de60a361835e93ca97b2c00d65dad694546c552b1dbe419f768efec6d3a0192333d013083493764a8bddb5dce07c2289205c3bad01146144f952165b80f687c2
-DIST firefox-101.0.1-trs.xpi 480518 BLAKE2B 8cfc3baa60a8cbc380c7515c5032446275334f74f3af8855de0921f771f046701ea59504568a131bbfe021ef3e9464852d907496fc4677f90ec726b866dc1749 SHA512 0e801fe1b3e2f9b9ba53b29f5058836c7ea36d3a5e435cf82bf70b1185b02a44df0910cd6674d46d199e52289c7a8f89daee14320e78a1583c0124396c9fd960
-DIST firefox-101.0.1-uk.xpi 611843 BLAKE2B d1d73fa3a81df4a1a41d3193d3e4135a84c0f9629f3f45e5d34a99eac02f7158d08c000736d375d2b533266da73b0ffbd03269e82525f362c06a67cbb01c954c SHA512 4749000b5e7d72a1cc345a5e77e5c191d4aeb9283e999d552081d20b936ab7776d4409cc773275ad74980a888abf55f91ab09c2e823090ce66f99415cef61240
-DIST firefox-101.0.1-ur.xpi 548441 BLAKE2B ff9719307070fc2863e7aa5bfdb5fc5afdda2fb9c105c6b0a628401bd0663f6b896a9d106408a08d9586224d70035e39890265f6b86e11723ec46502561de572 SHA512 239b8f7b59e668099d97e46b0f34bc94a06a70ffdc8e87208d17399b0c4912cf63611f38531a6b308d88541ea4060e162225c801ffe60f43c396254ea6fafe47
-DIST firefox-101.0.1-uz.xpi 468688 BLAKE2B bfea0d2bd1f2ac97e9dd9a08c155e9d1ac22f3e4868ffe338a8d686c0c4ae0de6cc3fcc4c685ffaf2aaa88d8eb5be4f0d8eff7fda88f8ac5294c25dcd27a2b40 SHA512 74789f5e8ab27699b133d0f4219b0f017aab8a1e994453f7d622e72f9b0d4fe375439facee42f5e29a8ca87432413a722066e68eb4a0c1a07f7b6c41726ac9b9
-DIST firefox-101.0.1-vi.xpi 564697 BLAKE2B cc8c76f88829ea6bf62a8171e5b2e99a4f8f72df3aaacf1fc117939d33e525acabc795ca79eedae618b62132f1561d41e9fb74c8f7f3761997ce23c0b4b65350 SHA512 42991841f38a0b252f09ae44592830d0a2364feea7c401856f045bed050a874d76482d2f6668f9de78850899ae4fc82c923cd916cf6efeda4b41c6baa68fee4d
-DIST firefox-101.0.1-xh.xpi 418659 BLAKE2B 520914da5263161b9f9480e455b584cc48f42efd0b9344ddc4d7c6a4759580ebea78127a044bb2a9177bba0e07f436599fbea2fcebbc4c19d0252583a19df8d5 SHA512 2cdd0dca9047385441a8208a84609b17728061e4b698ec2066d1cd2f54662409ee461bb444b3d8bde63034867cfbef448e04f85f45204bad022df58e89b8f74f
-DIST firefox-101.0.1-zh-CN.xpi 567077 BLAKE2B d15b9f6881ac0198c90024fb8dbc3b1370b0e3858857732e49d72991aea2ff7b943c5c40fd2488230e857d0b9d41d25746691ce5ac86b90127a543e3a697b1c7 SHA512 848462ae18da62d79aa6163dcb0e53adb4ac0fe031a80dd1f3a0b943102060548682f8921b02431df552fd817bbd246bac5663e091762eb1ec040308f34fe639
-DIST firefox-101.0.1-zh-TW.xpi 567655 BLAKE2B f6a05838f02d95ad9ce8d2bde6b3f1b0c106fc11dbbd17000dcd4bf4c799a1f822f538bdc5667ac1bc87de34ce576dbd2e462d7dc6170a04f19f6fa3ee214116 SHA512 22fa87260421895813f5b3269e8a320d24b4477bad5c6108d0b68f80afeaaea2d90d367c436a49d643523a00bffbdf4c570c7d5544d3e6f1977a1c5b0473b3b5
-DIST firefox-101.0.1.source.tar.xz 486021240 BLAKE2B 8dce0083dc1fa7d9f04b1a87a02e6e171e19b18ddeab210a12940a4e582e8420aebaafb2fbbfcbfcadc36c2004a61b4a3a24b630838b3a7f146945ea735ec045 SHA512 435a7f6013582933e75c41e554a45beda30b5affd7d3ed7d2876026609ba7f17b2c20b507d9d0c9ce2379e335ec09b021257ba30ac55fabf02dca54b03ea70b4
diff --git a/www-client/firefox/files/disable-auto-update.policy.json b/www-client/firefox/files/disable-auto-update.policy.json
deleted file mode 100644
index f366220..0000000
--- a/www-client/firefox/files/disable-auto-update.policy.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "policies": {
- "DisableAppUpdate": true
- }
-}
diff --git a/www-client/firefox/files/distribution.ini b/www-client/firefox/files/distribution.ini
deleted file mode 100644
index 680512e..0000000
--- a/www-client/firefox/files/distribution.ini
+++ /dev/null
@@ -1,42 +0,0 @@
-[Global]
-id=gentoo
-version=1.0
-about=Mozilla Firefox for Gentoo
-about.de=Mozilla Firefox für Gentoo
-
-[Preferences]
-app.distributor="gentoo"
-app.distributor.channel="gentoo"
-startup.homepage_welcome_url="https://www.gentoo.org/"
-
-[BookmarksToolbar]
-item.1.type=default
-item.2.title=Gentoo's Bugzilla
-item.2.link=https://bugs.gentoo.org/
-item.3.title=Gentoo Forums
-item.3.link=https://forums.gentoo.org/
-item.4.title=Gentoo Packages
-item.4.link=https://packages.gentoo.org/
-item.5.title=Planet Gentoo
-item.5.link=https://planet.gentoo.org/
-item.6.title=Gentoo Wiki
-item.6.link=https://wiki.gentoo.org/
-
-[BookmarksMenu]
-item.1.title=Gentoo
-item.1.type=folder
-item.1.folderId=1
-
-[BookmarksFolder-1]
-item.1.title=Gentoo Linux
-item.1.link=https://www.gentoo.org/
-item.2.title=Gentoo's Bugzilla
-item.2.link=https://bugs.gentoo.org/
-item.3.title=Gentoo Forums
-item.3.link=https://forums.gentoo.org/
-item.4.title=Gentoo Packages
-item.4.link=https://packages.gentoo.org/
-item.5.title=Planet Gentoo
-item.5.link=https://planet.gentoo.org/
-item.6.title=Gentoo Wiki
-item.6.link=https://wiki.gentoo.org/
diff --git a/www-client/firefox/files/firefox-r1.sh b/www-client/firefox/files/firefox-r1.sh
deleted file mode 100644
index 853a4ef..0000000
--- a/www-client/firefox/files/firefox-r1.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-##
-## Usage:
-##
-## $ firefox
-##
-## This script is meant to run Mozilla Firefox in Gentoo.
-
-cmdname=$(basename "$0")
-
-##
-## Variables
-##
-MOZ_ARCH=$(uname -m)
-case ${MOZ_ARCH} in
- x86_64|s390x|sparc64)
- MOZ_LIB_DIR="@PREFIX@/lib64"
- SECONDARY_LIB_DIR="@PREFIX@/lib"
- ;;
- *)
- MOZ_LIB_DIR="@PREFIX@/lib"
- SECONDARY_LIB_DIR="@PREFIX@/lib64"
- ;;
-esac
-
-MOZ_FIREFOX_FILE="firefox"
-
-if [[ ! -r ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then
- if [[ ! -r ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} ]]; then
- echo "Error: ${MOZ_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2
- if [[ -d ${SECONDARY_LIB_DIR} ]]; then
- echo " ${SECONDARY_LIB_DIR}/firefox/${MOZ_FIREFOX_FILE} not found" >&2
- fi
- exit 1
- fi
- MOZ_LIB_DIR="${SECONDARY_LIB_DIR}"
-fi
-MOZILLA_FIVE_HOME="${MOZ_LIB_DIR}/firefox"
-MOZ_EXTENSIONS_PROFILE_DIR="${HOME}/.mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/${MOZ_FIREFOX_FILE}"
-
-##
-## Enable Wayland backend?
-##
-if @DEFAULT_WAYLAND@ && [[ -z ${MOZ_DISABLE_WAYLAND} ]]; then
- if [[ -n "${WAYLAND_DISPLAY}" ]]; then
- export MOZ_ENABLE_WAYLAND=1
- fi
-fi
-
-##
-## Use D-Bus remote exclusively when there's Wayland display.
-##
-if [[ -n "${WAYLAND_DISPLAY}" ]]; then
- export MOZ_DBUS_REMOTE=1
-fi
-
-##
-## Make sure that we set the plugin path
-##
-MOZ_PLUGIN_DIR="plugins"
-
-if [[ -n "${MOZ_PLUGIN_PATH}" ]]; then
- MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-else
- MOZ_PLUGIN_PATH=${MOZ_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-if [[ -d "${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}" ]]; then
- MOZ_PLUGIN_PATH=${MOZ_PLUGIN_PATH}:${SECONDARY_LIB_DIR}/mozilla/${MOZ_PLUGIN_DIR}
-fi
-
-export MOZ_PLUGIN_PATH
-
-##
-## Set MOZ_APP_LAUNCHER for gnome-session
-##
-export MOZ_APP_LAUNCHER="@PREFIX@/bin/${cmdname}"
-
-##
-## Disable the GNOME crash dialog, Mozilla has its own
-##
-if [[ "${XDG_CURRENT_DESKTOP}" == "GNOME" ]]; then
- GNOME_DISABLE_CRASH_DIALOG=1
- export GNOME_DISABLE_CRASH_DIALOG
-fi
-
-##
-## Enable Xinput2 (#617344)
-##
-
-# respect user settings
-MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2:-auto}
-
-if [[ ${MOZ_USE_XINPUT2} == auto && -n ${WAYLAND_DISPLAY} ]]; then
- # enabling XINPUT2 should be safe for all wayland users
- MOZ_USE_XINPUT2=1
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == KDE ]]; then
- # XINPUT2 is known to cause problems for KWin users
- MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto && ${XDG_CURRENT_DESKTOP^^} == LXQT ]]; then
- # LXQt uses KWin
- MOZ_USE_XINPUT2=0
-elif [[ ${MOZ_USE_XINPUT2} == auto ]]; then
- # should work on Mate, Xfce, FluxBox, OpenBox and all the others ...
- MOZ_USE_XINPUT2=1
-fi
-
-[[ ${MOZ_USE_XINPUT2} != 0 ]] && export MOZ_USE_XINPUT2=${MOZ_USE_XINPUT2}
-
-# Don't throw "old profile" dialog box.
-export MOZ_ALLOW_DOWNGRADE=1
-
-# Run the browser
-exec ${MOZ_PROGRAM} "${@}"
diff --git a/www-client/firefox/files/gentoo-default-prefs.js b/www-client/firefox/files/gentoo-default-prefs.js
deleted file mode 100644
index 0407f5d..0000000
--- a/www-client/firefox/files/gentoo-default-prefs.js
+++ /dev/null
@@ -1,12 +0,0 @@
-pref("general.smoothScroll", true);
-pref("general.autoScroll", false);
-pref("browser.urlbar.hideGoButton", true);
-pref("accessibility.typeaheadfind", true);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("browser.EULA.override", true);
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("intl.locale.requested", "");
-/* Disable DoH by default */
-pref("network.trr.mode", 5);
-/* Disable use of Mozilla Normandy service by default */
-pref("app.normandy.enabled", false);
diff --git a/www-client/firefox/files/gentoo-hwaccel-prefs.js-r2 b/www-client/firefox/files/gentoo-hwaccel-prefs.js-r2
deleted file mode 100644
index 48025ca..0000000
--- a/www-client/firefox/files/gentoo-hwaccel-prefs.js-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Force hardware accelerated rendering due to USE=hwaccel */
-pref("gfx.webrender.all", true);
-pref("layers.acceleration.force-enabled", true);
-pref("media.hardware-video-decoding.enabled", true);
-pref("webgl.force-enabled", true);
diff --git a/www-client/firefox/files/icon/firefox-r3.desktop b/www-client/firefox/files/icon/firefox-r3.desktop
deleted file mode 100644
index 8219e93..0000000
--- a/www-client/firefox/files/icon/firefox-r3.desktop
+++ /dev/null
@@ -1,236 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=@NAME@
-GenericName=Web Browser
-Comment=Browse the Web
-Exec=@EXEC@ %u
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=application/pdf;application/vnd.mozilla.xul+xml;application/xhtml+xml;text/html;text/mml;text/xml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
-Keywords=web;browser;internet;
-Actions=new-window;new-private-window;profile-manager-window;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Name[ach]=Dirica manyen
-Name[af]=Nuwe venster
-Name[an]=Nueva finestra
-Name[ar]=نافذة جديدة
-Name[as]=নতুন উইন্ডো
-Name[ast]=Ventana nueva
-Name[az]=Yeni Pəncərə
-Name[be]=Новае акно
-Name[bg]=Нов прозорец
-Name[bn_BD]=নতুন উইন্ডো (N)
-Name[bn_IN]=নতুন উইন্ডো
-Name[br]=Prenestr nevez
-Name[brx]=गोदान उइन्ड'(N)
-Name[bs]=Novi prozor
-Name[ca]=Finestra nova
-Name[cak]=K'ak'a' tzuwäch
-Name[cs]=Nové okno
-Name[cy]=Ffenestr Newydd
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[dsb]=Nowe wokno
-Name[el]=Νέο παράθυρο
-Name[en_GB]=New Window
-Name[en_US]=New Window
-Name[en_ZA]=New Window
-Name[eo]=Nova fenestro
-Name[es_AR]=Nueva ventana
-Name[es_CL]=Nueva ventana
-Name[es_ES]=Nueva ventana
-Name[es_MX]=Nueva ventana
-Name[et]=Uus aken
-Name[eu]=Leiho berria
-Name[fa]=پنجره جدید‌
-Name[ff]=Henorde Hesere
-Name[fi]=Uusi ikkuna
-Name[fr]=Nouvelle fenêtre
-Name[fy_NL]=Nij finster
-Name[ga_IE]=Fuinneog Nua
-Name[gd]=Uinneag ùr
-Name[gl]=Nova xanela
-Name[gn]=Ovetã pyahu
-Name[gu_IN]=નવી વિન્ડો
-Name[he]=חלון חדש
-Name[hi_IN]=नया विंडो
-Name[hr]=Novi prozor
-Name[hsb]=Nowe wokno
-Name[hu]=Új ablak
-Name[hy_AM]=Նոր Պատուհան
-Name[id]=Jendela Baru
-Name[is]=Nýr gluggi
-Name[it]=Nuova finestra
-Name[ja]=新しいウィンドウ
-Name[ja_JP-mac]=新規ウインドウ
-Name[ka]=ახალი ფანჯარა
-Name[kk]=Жаңа терезе
-Name[km]=បង្អួច​​​ថ្មី
-Name[kn]=ಹೊಸ ಕಿಟಕಿ
-Name[ko]=새 창
-Name[kok]=नवें जनेल
-Name[ks]=نئئ وِنڈو
-Name[lij]=Neuvo barcon
-Name[lo]=ຫນ້າຕ່າງໃຫມ່
-Name[lt]=Naujas langas
-Name[ltg]=Jauns lūgs
-Name[lv]=Jauns logs
-Name[mai]=नव विंडो
-Name[mk]=Нов прозорец
-Name[ml]=പുതിയ ജാലകം
-Name[mr]=नवीन पटल
-Name[ms]=Tetingkap Baru
-Name[my]=ဝင်းဒိုးအသစ်
-Name[nb_NO]=Nytt vindu
-Name[ne_NP]=नयाँ सञ्झ्याल
-Name[nl]=Nieuw venster
-Name[nn_NO]=Nytt vindauge
-Name[or]=ନୂତନ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ
-Name[pl]=Nowe okno
-Name[pt_BR]=Nova janela
-Name[pt_PT]=Nova janela
-Name[rm]=Nova fanestra
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sat]=नावा विंडो (N)
-Name[si]=නව කවුළුවක්
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[son]=Zanfun taaga
-Name[sq]=Dritare e Re
-Name[sr]=Нови прозор
-Name[sv_SE]=Nytt fönster
-Name[ta]=புதிய சாளரம்
-Name[te]=కొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni pencere
-Name[tsz]=Eraatarakua jimpani
-Name[uk]=Нове вікно
-Name[ur]=نیا دریچہ
-Name[uz]=Yangi oyna
-Name[vi]=Cửa sổ mới
-Name[wo]=Palanteer bu bees
-Name[xh]=Ifestile entsha
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=@EXEC@ --new-window %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Name[ach]=Dirica manyen me mung
-Name[af]=Nuwe privaatvenster
-Name[an]=Nueva finestra privada
-Name[ar]=نافذة خاصة جديدة
-Name[as]=নতুন ব্যক্তিগত উইন্ডো
-Name[ast]=Ventana privada nueva
-Name[az]=Yeni Məxfi Pəncərə
-Name[be]=Новае акно адасаблення
-Name[bg]=Нов прозорец за поверително сърфиране
-Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো
-Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো
-Name[br]=Prenestr merdeiñ prevez nevez
-Name[brx]=गोदान प्राइभेट उइन्ड'
-Name[bs]=Novi privatni prozor
-Name[ca]=Finestra privada nova
-Name[cak]=K'ak'a' ichinan tzuwäch
-Name[cs]=Nové anonymní okno
-Name[cy]=Ffenestr Breifat Newydd
-Name[da]=Nyt privat vindue
-Name[de]=Neues privates Fenster
-Name[dsb]=Nowe priwatne wokno
-Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης
-Name[en_GB]=New Private Window
-Name[en_US]=New Private Window
-Name[en_ZA]=New Private Window
-Name[eo]=Nova privata fenestro
-Name[es_AR]=Nueva ventana privada
-Name[es_CL]=Nueva ventana privada
-Name[es_ES]=Nueva ventana privada
-Name[es_MX]=Nueva ventana privada
-Name[et]=Uus privaatne aken
-Name[eu]=Leiho pribatu berria
-Name[fa]=پنجره ناشناس جدید
-Name[ff]=Henorde Suturo Hesere
-Name[fi]=Uusi yksityinen ikkuna
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[fy_NL]=Nij priveefinster
-Name[ga_IE]=Fuinneog Nua Phríobháideach
-Name[gd]=Uinneag phrìobhaideach ùr
-Name[gl]=Nova xanela privada
-Name[gn]=Ovetã ñemi pyahu
-Name[gu_IN]=નવી ખાનગી વિન્ડો
-Name[he]=חלון פרטי חדש
-Name[hi_IN]=नयी निजी विंडो
-Name[hr]=Novi privatni prozor
-Name[hsb]=Nowe priwatne wokno
-Name[hu]=Új privát ablak
-Name[hy_AM]=Սկսել Գաղտնի դիտարկում
-Name[id]=Jendela Mode Pribadi Baru
-Name[is]=Nýr huliðsgluggi
-Name[it]=Nuova finestra anonima
-Name[ja]=新しいプライベートウィンドウ
-Name[ja_JP-mac]=新規プライベートウインドウ
-Name[ka]=ახალი პირადი ფანჯარა
-Name[kk]=Жаңа жекелік терезе
-Name[km]=បង្អួច​ឯកជន​ថ្មី
-Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ
-Name[ko]=새 사생활 보호 모드
-Name[kok]=नवो खाजगी विंडो
-Name[ks]=نْو پرایوٹ وینڈو&amp;
-Name[lij]=Neuvo barcon privou
-Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່
-Name[lt]=Naujas privataus naršymo langas
-Name[ltg]=Jauns privatais lūgs
-Name[lv]=Jauns privātais logs
-Name[mai]=नया निज विंडो (W)
-Name[mk]=Нов приватен прозорец
-Name[ml]=പുതിയ സ്വകാര്യ ജാലകം
-Name[mr]=नवीन वैयक्तिक पटल
-Name[ms]=Tetingkap Persendirian Baharu
-Name[my]=New Private Window
-Name[nb_NO]=Nytt privat vindu
-Name[ne_NP]=नयाँ निजी सञ्झ्याल
-Name[nl]=Nieuw privévenster
-Name[nn_NO]=Nytt privat vindauge
-Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ
-Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ
-Name[pl]=Nowe okno prywatne
-Name[pt_BR]=Nova janela privativa
-Name[pt_PT]=Nova janela privada
-Name[rm]=Nova fanestra privata
-Name[ro]=Fereastră privată nouă
-Name[ru]=Новое приватное окно
-Name[sat]=नावा निजेराक् विंडो (W )
-Name[si]=නව පුද්ගලික කවුළුව (W)
-Name[sk]=Nové okno v režime Súkromné prehliadanie
-Name[sl]=Novo zasebno okno
-Name[son]=Sutura zanfun taaga
-Name[sq]=Dritare e Re Private
-Name[sr]=Нови приватан прозор
-Name[sv_SE]=Nytt privat fönster
-Name[ta]=புதிய தனிப்பட்ட சாளரம்
-Name[te]=కొత్త ఆంతరంగిక విండో
-Name[th]=หน้าต่างส่วนตัวใหม่
-Name[tr]=Yeni gizli pencere
-Name[tsz]=Juchiiti eraatarakua jimpani
-Name[uk]=Приватне вікно
-Name[ur]=نیا نجی دریچہ
-Name[uz]=Yangi maxfiy oyna
-Name[vi]=Cửa sổ riêng tư mới
-Name[wo]=Panlanteeru biir bu bees
-Name[xh]=Ifestile yangasese entsha
-Name[zh_CN]=新建隐私浏览窗口
-Name[zh_TW]=新增隱私視窗
-Exec=@EXEC@ --private-window %u
-
-[Desktop Action profile-manager-window]
-Name=Open the Profile Manager
-Name[de]=Profilverwaltung öffnen
-Name[cs]=Správa profilů
-Exec=@EXEC@ --ProfileManager
diff --git a/www-client/firefox/files/icon/firefox-symbolic.svg b/www-client/firefox/files/icon/firefox-symbolic.svg
deleted file mode 100644
index 2078eea..0000000
--- a/www-client/firefox/files/icon/firefox-symbolic.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="16"
- height="16"
- viewBox="0 0 16 16"
- version="1.1"
- id="svg3758"
- sodipodi:docname="firefox-symbolic-quantum.svg"
- inkscape:version="0.92.2 5c3e80d, 2017-08-06">
- <metadata
- id="metadata3764">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title>Gnome Symbolic Icon Theme</dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs3762" />
- <sodipodi:namedview
- pagecolor="#555753"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="1"
- inkscape:pageshadow="2"
- inkscape:window-width="1591"
- inkscape:window-height="909"
- id="namedview3760"
- showgrid="false"
- showborder="false"
- inkscape:snap-global="false"
- inkscape:zoom="1"
- inkscape:cx="3.8851213"
- inkscape:cy="12.517918"
- inkscape:window-x="143"
- inkscape:window-y="60"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg3758">
- <inkscape:grid
- type="xygrid"
- id="grid3768" />
- </sodipodi:namedview>
- <title
- id="title3754">Gnome Symbolic Icon Theme</title>
- <path
- d="m 15.054715,6.9884649 v 0 c -0.02034,-0.133652 -0.04071,-0.2122775 -0.04071,-0.2122775 0,0 -0.05225,0.060583 -0.138743,0.1748124 A 4.9808937,4.9808937 0 0 0 14.703694,6.0103229 6.4034781,6.4034781 0 0 0 14.270352,4.895288 4.6469845,4.6469845 0 0 0 13.87447,4.2163686 Q 13.793063,4.0947376 13.708437,3.9805045 C 13.444828,3.5499376 13.142365,3.2867867 12.792269,2.7891599 A 3.6101075,3.6101075 0 0 1 12.333953,1.5474054 5.0151173,5.0151173 0 0 0 12.113814,2.3599798 C 11.754468,1.997397 11.441832,1.7397963 11.253142,1.5640539 10.322171,0.69459485 10.430396,0.24367816 10.430396,0.24367816 v 0 c 0,0 -1.7389294,1.94102274 -0.9855522,3.96297904 a 3.8848199,3.8848199 0 0 0 1.2949452,1.726432 c 0.728868,0.6012222 1.513693,1.0743371 1.927612,2.2832561 A 3.8741829,3.8741829 0 0 0 11.21337,6.6823034 3.5023502,3.5023502 0 0 1 11.490854,8.0697401 3.2946971,3.2946971 0 0 1 7.4621982,11.27934 3.0343219,3.0343219 0 0 1 6.6459244,11.001852 3.3219834,3.3219834 0 0 1 5.667782,10.09771 l -0.00463,-0.0078 0.058274,0.02125 a 3.0061106,3.0061106 0 0 0 0.4162344,0.111409 2.6028293,2.6028293 0 0 0 1.6570605,-0.195631 C 8.3154732,9.7379218 8.6308831,9.5237932 8.8866339,9.6084266 h 0.0046 c 0.24974,0.079514 0.446755,-0.1628244 0.2682391,-0.4162632 A 1.3596868,1.3596868 0 0 0 7.8423564,8.6778985 C 7.3211426,8.7537416 6.8434027,9.1241907 6.1603222,8.7653097 a 1.4470953,1.4470953 0 0 1 -0.128107,-0.075371 c -0.04625,-0.026369 0.146605,0.040234 0.1017455,0.010233 A 3.3899676,3.3899676 0 0 1 5.7047808,8.4439577 c -0.010172,-0.00822 0.103133,0.032367 0.092497,0.024039 A 1.6561356,1.6561356 0 0 1 5.3495968,8.015168 0.80517516,0.80517516 0 0 1 5.3190728,7.2964766 0.63405807,0.63405807 0 0 1 5.5965603,7.0356384 c 0.088333,0.043485 0.1429059,0.076305 0.1429059,0.076305 0,0 -0.040235,-0.073997 -0.061972,-0.1128365 0.00786,-0.0027 0.014794,0 0.022662,-0.00513 0.077233,0.033293 0.248351,0.1202544 0.3385341,0.1734358 A 0.46987818,0.46987818 0 0 1 6.19362,7.3061637 c 0,0 0.030994,-0.015351 0.0079,-0.079998 A 0.41623066,0.41623066 0 0 0 6.0414753,7.0300927 h 0.0074 a 1.3596868,1.3596868 0 0 1 0.1970213,0.1225561 0.96149289,0.96149289 0 0 0 0.078625,-0.416232 0.54479973,0.54479973 0 0 0 -0.031914,-0.2312396 c -0.024511,-0.046254 0.013876,-0.064746 0.056885,-0.016135 A 0.45137905,0.45137905 0 0 0 6.3129456,6.378979 v -0.00372 0 c 0,0 0.024511,-0.031916 0.035615,-0.043486 A 0.66134433,0.66134433 0 0 1 6.4484481,6.2503678 4.6122987,4.6122987 0 0 1 7.1259793,5.9048971 C 7.3174429,5.8211545 7.4760733,5.7573477 7.5084475,5.7388339 a 1.0637007,1.0637007 0 0 0 0.1355052,-0.1040612 0.91015778,0.91015778 0 0 0 0.3052354,-0.5272274 0.73996569,0.73996569 0 0 0 0.0079,-0.082324 v -0.023118 -0.013967 0 -0.00552 0 -0.00611 0 C 7.9293085,4.872475 7.749868,4.7943251 6.8119611,4.7064478 A 0.81997449,0.81997449 0 0 1 6.1413599,4.0776254 v 0.0042 c -0.013416,0.034225 -0.025431,0.068909 -0.037456,0.1040572 0.012025,-0.034685 0.024051,-0.069373 0.037456,-0.1040572 v -0.00742 A 2.3762148,2.3762148 0 0 1 7.0598423,2.9339361 c 0.024051,-0.019416 -0.096192,0.00512 -0.072152,-0.014798 A 2.3845397,2.3845397 0 0 1 7.2328039,2.8155414 C 7.2748921,2.7979724 7.0524371,2.7128704 6.8558842,2.7336774 a 1.0174527,1.0174527 0 0 0 -0.3496338,0.082324 c 0.046253,-0.039773 0.1849968,-0.092498 0.1521605,-0.092498 a 2.2499581,2.2499581 0 0 0 -0.713142,0.2696255 0.14521828,0.14521828 0 0 1 0.01387,-0.064747 1.1099484,1.1099484 0 0 0 -0.4458297,0.3440843 0.58966016,0.58966016 0 0 0 0.00462,-0.080469 1.3300881,1.3300881 0 0 0 -0.2187525,0.2053404 l -0.00417,0.00321 A 2.9066776,2.9066776 0 0 0 3.6684873,3.2618132 l -0.00463,-0.0042 h 0.00554 A 1.3610743,1.3610743 0 0 1 3.3803631,2.9339159 l -0.0074,0.0018 -0.00877,-0.010174 C 3.3285694,2.8728322 3.2920343,2.813172 3.2545731,2.7465739 3.2277502,2.7003291 3.2004619,2.646216 3.1731756,2.5902563 c 0,-0.00372 -0.00416,-0.00513 -0.006,-0.00552 -0.0111,0 -0.01896,0.05133 -0.028212,0.037927 v -0.0028 A 1.9923577,1.9923577 0 0 1 3.0080744,1.8396896 l -0.0074,0.00372 A 0.87130958,0.87130958 0 0 0 2.6704677,2.2753541 c -0.028212,0.063362 -0.046248,0.098047 -0.064746,0.1327329 0,0.0028 0,-0.00461 0,-0.016194 0.00416,-0.031916 0.018037,-0.097585 0.014799,-0.092497 -0.00323,0.00513 -0.00553,0.00882 -0.00877,0.013415 A 0.80147532,0.80147532 0 0 0 2.4956586,2.4848515 1.0891367,1.0891367 0 0 0 2.4262868,2.661518 c -0.00276,0.00973 0,-0.00832 0,-0.029599 0,-0.02127 0.00416,-0.059199 0,-0.051331 L 2.4161148,2.600475 A 4.3935464,4.3935464 0 0 0 2.0461275,4.0040946 1.3976101,1.3976101 0 0 0 2.031791,4.252909 v 0.00742 A 3.0653076,3.0653076 0 0 0 1.6539417,4.7690529 7.2174403,7.2174403 0 0 0 0.85524217,6.725337 4.7871157,4.7871157 0 0 1 1.2830334,5.9756593 6.9371784,6.9371784 0 0 0 0.79974461,8.5192901 6.582457,6.582457 0 0 1 1.0078598,7.7659142 6.3854411,6.3854411 0 0 0 1.585032,10.755373 6.9542899,6.9542899 0 0 0 4.3372422,13.87618 v 0 a 6.0196208,6.0196208 0 0 0 1.6038754,0.768639 c 0.07492,0.02728 0.1507676,0.0541 0.2284646,0.08 -0.024511,-0.0096 -0.04625,-0.02034 -0.070761,-0.03098 A 7.2609132,7.2609132 0 0 0 8.179966,15 c 2.494615,0 3.318287,-0.949928 3.394136,-1.044738 v 0 A 1.2625664,1.2625664 0 0 0 11.8687,13.559386 v 0 q 0.07216,-0.02958 0.145679,-0.06335 l 0.03097,-0.01397 0.05597,-0.02635 a 5.2315572,5.2315572 0 0 0 1.053064,-0.659489 2.5436321,2.5436321 0 0 0 0.98184,-1.433687 v 0 a 0.89628343,0.89628343 0 0 0 0.01343,-0.660421 q 0.03838,-0.0606 0.0791,-0.129501 A 5.8762526,5.8762526 0 0 0 15.1107,7.7140393 v -0.0027 c 0,-0.027291 0,-0.054583 0,-0.081863 A 3.5754215,3.5754215 0 0 0 15.05473,6.9884887 Z"
- id="path3756"
- inkscape:connector-curvature="0"
- style="fill:#bebebe;fill-opacity:1;stroke-width:0.46247858" />
-</svg>
diff --git a/www-client/firefox/firefox-101.0.1-r11.ebuild b/www-client/firefox/firefox-101.0.1-r11.ebuild
deleted file mode 100644
index 04e2696..0000000
--- a/www-client/firefox/firefox-101.0.1-r11.ebuild
+++ /dev/null
@@ -1,1297 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-FIREFOX_PATCHSET="firefox-101-patches-08j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="manual"
-VIRTUALWL_REQUIRED="manual"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
- MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
- # Convert the ebuild version to the upstream Mozilla version
- MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
- MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
- MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
- # ESR releases have slightly different version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
- llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
- virtualwl virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
- MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
- https://dev.gentoo.org/~{juippis,polynomial-c,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
- ${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver +gmp-autoupdate screencast +X"
-
-REQUIRED_USE="debug? ( !system-av1 )
- pgo? ( lto )
- wayland? ( dbus )
- wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" || ( X wayland )"
-REQUIRED_USE+=" screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- >=dev-util/cbindgen-0.24.0
- >=net-libs/nodejs-10.23.1
- virtual/pkgconfig
- >=virtual/rust-1.59.0
- || (
- (
- sys-devel/clang:14
- sys-devel/llvm:14
- clang? (
- =sys-devel/lld-14*
- pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
- )
- )
- (
- sys-devel/clang:13
- sys-devel/llvm:13
- clang? (
- =sys-devel/lld-13*
- pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
- )
- )
- (
- sys-devel/clang:12
- sys-devel/llvm:12
- clang? (
- =sys-devel/lld-12*
- pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
- )
- )
- )
- amd64? ( >=dev-lang/nasm-2.14 )
- x86? ( >=dev-lang/nasm-2.14 )
- pgo? (
- X? ( ${VIRTUALX_DEPEND} )
- !X? ( wayland? ( ${VIRTUALWL_DEPEND} ) )
- )
-"
-
-COMMON_DEPEND="
- dev-libs/glib:2
- dev-libs/atk
- dev-libs/expat
- dev-libs/libffi:=
- >=dev-libs/nss-3.78
- >=dev-libs/nspr-4.32
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- media-libs/mesa
- media-video/ffmpeg
- sys-libs/zlib
- virtual/freedesktop-icon-theme
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/pango
- x11-libs/pixman
- dbus? (
- dev-libs/dbus-glib
- sys-apps/dbus
- )
- jack? ( virtual/jack )
- libproxy? ( net-libs/libproxy )
- selinux? ( sec-policy/selinux-mozilla )
- sndio? ( >=media-sound/sndio-1.8.0-r1 )
- screencast? ( media-video/pipewire:= )
- system-av1? (
- >=media-libs/dav1d-0.9.3:=
- >=media-libs/libaom-1.0.0:=
- )
- system-harfbuzz? (
- >=media-gfx/graphite2-1.3.13
- >=media-libs/harfbuzz-2.8.1:0=
- )
- system-icu? ( >=dev-libs/icu-71.1:= )
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
- system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
- system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
- system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
- system-webp? ( >=media-libs/libwebp-1.1.0:0= )
- wayland? (
- x11-libs/gtk+:3[wayland]
- x11-libs/libdrm
- x11-libs/libxkbcommon[wayland]
- )
- wifi? (
- kernel_linux? (
- dev-libs/dbus-glib
- net-misc/networkmanager
- sys-apps/dbus
- )
- )
- X? (
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/gtk+:3[X]
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libxkbcommon[X]
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxcb:=
- )"
-
-RDEPEND="${COMMON_DEPEND}
- !www-client/firefox:0
- !www-client/firefox:esr
- jack? ( virtual/jack )
- openh264? ( media-libs/openh264:*[plugin] )
- pulseaudio? (
- || (
- media-sound/pulseaudio
- >=media-sound/apulse-0.1.12-r4
- )
- )
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${COMMON_DEPEND}
- pulseaudio? (
- || (
- media-sound/pulseaudio
- >=media-sound/apulse-0.1.12-r4[sdk]
- )
- )
- X? (
- x11-libs/libICE
- x11-libs/libSM
- )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
- MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
- if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
- einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use clang ; then
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
- einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use pgo ; then
- if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
- einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
- fi
- fi
-
- einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
- af ar ast be bg br ca cak cs cy da de dsb
- el en-CA en-GB en-US es-AR es-ES et eu
- fi fr fy-NL ga-IE gd gl he hr hsb hu
- id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
- pa-IN pl pt-BR pt-PT rm ro ru
- sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
- # https://bugs.gentoo.org/587334
- local MOZ_TOO_REGIONALIZED_FOR_L10N=(
- fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
- )
-
- local lang xflag
- for lang in "${MOZ_LANGS[@]}" ; do
- # en and en_US are handled internally
- if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
- continue
- fi
-
- # strip region subtag if $lang is in the list
- if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
- xflag=${lang%%-*}
- else
- xflag=${lang}
- fi
-
- SRC_URI+=" l10n_${xflag/[_@]/-}? ("
- SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
- SRC_URI+=" )"
- IUSE+=" l10n_${xflag/[_@]/-}"
- done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -ne 1 ]] ; then
- die "${FUNCNAME} requires exact one argument"
- fi
-
- einfo "Clearing cargo checksums for ${1} ..."
-
- sed -i \
- -e 's/\("files":{\)[^}]*/\1/' \
- "${S}"/third_party/rust/${1}/.cargo-checksum.json \
- || die
-}
-
-moz_install_xpi() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local DESTDIR=${1}
- shift
-
- insinto "${DESTDIR}"
-
- local emid xpi_file xpi_tmp_dir
- for xpi_file in "${@}" ; do
- emid=
- xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
- # Unpack XPI
- unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
- # Determine extension ID
- if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
- emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
- [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
- elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
- emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
- [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
- else
- die "failed to determine extension id"
- fi
-
- einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
- newins "${xpi_file}" "${emid}.xpi"
- done
-}
-
-mozconfig_add_options_ac() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local reason=${1}
- shift
-
- local option
- for option in ${@} ; do
- echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
- done
-}
-
-mozconfig_add_options_mk() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local reason=${1}
- shift
-
- local option
- for option in ${@} ; do
- echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
- done
-}
-
-mozconfig_use_enable() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 1 ]] ; then
- die "${FUNCNAME} requires at least one arguments"
- fi
-
- local flag=$(use_enable "${@}")
- mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 1 ]] ; then
- die "${FUNCNAME} requires at least one arguments"
- fi
-
- local flag=$(use_with "${@}")
- mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- if use pgo ; then
- if ! has usersandbox $FEATURES ; then
- die "You must enable usersandbox as X server can not run as root!"
- fi
- fi
-
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug ; then
- CHECKREQS_DISK_BUILD="13500M"
- else
- CHECKREQS_DISK_BUILD="6600M"
- fi
-
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- if use pgo ; then
- if ! has userpriv ${FEATURES} ; then
- eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
- fi
- fi
-
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug ; then
- CHECKREQS_DISK_BUILD="13500M"
- else
- CHECKREQS_DISK_BUILD="6400M"
- fi
-
- check-reqs_pkg_setup
-
- llvm_pkg_setup
-
- if use clang && use lto ; then
- local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
- [[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
- [[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
- local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
- [[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
- [[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
- if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
- eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
- eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
- eerror " - Manually switch rust version using 'eselect rust' to match used LLVM version"
- eerror " - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
- eerror " - Build ${CATEGORY}/${PN} without USE=lto"
- eerror " - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
- eerror " llvm/clang/lld/rust chain depending on your @world updates)"
- die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
- fi
- fi
-
- if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
- && ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
- # bug 792705
- eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
- die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
- fi
-
- python-any-r1_pkg_setup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset \
- DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XAUTHORITY \
- XDG_CACHE_HOME \
- XDG_SESSION_COOKIE
-
- # Build system is using /proc/self/oom_score_adj, bug #604394
- addpredict /proc/self/oom_score_adj
-
- if use pgo ; then
- # Allow access to GPU during PGO run
- local ati_cards mesa_cards nvidia_cards render_cards
- shopt -s nullglob
-
- ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
- if [[ -n "${ati_cards}" ]] ; then
- addpredict "${ati_cards}"
- fi
-
- mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if [[ -n "${mesa_cards}" ]] ; then
- addpredict "${mesa_cards}"
- fi
-
- nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
- if [[ -n "${nvidia_cards}" ]] ; then
- addpredict "${nvidia_cards}"
- fi
-
- render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
- if [[ -n "${render_cards}" ]] ; then
- addpredict "${render_cards}"
- fi
-
- shopt -u nullglob
- fi
-
- if ! mountpoint -q /dev/shm ; then
- # If /dev/shm is not available, configure is known to fail with
- # a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
- ewarn "/dev/shm is not mounted -- expect build failures!"
- fi
-
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
- MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
- fi
-
- if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
- MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
- fi
-
- # Mozilla API keys (see https://location.services.mozilla.com/api)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
- MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
- fi
-
- # Ensure we use C locale when building, bug #746215
- export LC_ALL=C
- fi
-
- CONFIG_CHECK="~SECCOMP"
- WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
- linux-info_pkg_setup
-}
-
-src_unpack() {
- local _lp_dir="${WORKDIR}/language_packs"
- local _src_file
-
- if [[ ! -d "${_lp_dir}" ]] ; then
- mkdir "${_lp_dir}" || die
- fi
-
- for _src_file in ${A} ; do
- if [[ ${_src_file} == *.xpi ]]; then
- cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
- else
- unpack ${_src_file}
- fi
- done
-}
-
-src_prepare() {
- use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
- eapply "${WORKDIR}/firefox-patches"
-
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
-
- # Make cargo respect MAKEOPTS
- export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
- # Make LTO respect MAKEOPTS
- sed -i \
- -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
- "${S}"/build/moz.configure/lto-pgo.configure \
- || die "sed failed to set num_cores"
-
- # Make ICU respect MAKEOPTS
- sed -i \
- -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
- "${S}"/intl/icu_sources_data.py \
- || die "sed failed to set num_cores"
-
- # sed-in toolchain prefix
- sed -i \
- -e "s/objdump/${CHOST}-objdump/" \
- "${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
- || die "sed failed to set toolchain prefix"
-
- sed -i \
- -e 's/ccache_stats = None/return None/' \
- "${S}"/python/mozbuild/mozbuild/controller/building.py \
- || die "sed failed to disable ccache stats call"
-
- einfo "Removing pre-built binaries ..."
- find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
- # Clearing checksums where we have applied patches
- moz_clear_vendor_checksums target-lexicon-0.9.0
-
- # Create build dir
- BUILD_DIR="${WORKDIR}/${PN}_build"
- mkdir -p "${BUILD_DIR}" || die
-
- # Write API keys to disk
- echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
- echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
- echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
- xdg_environment_reset
-}
-
-src_configure() {
- # Show flags set at the beginning
- einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
- einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
- einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
- einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
- einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
- local have_switched_compiler=
- if use clang && ! tc-is-clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- have_switched_compiler=yes
- AR=llvm-ar
- AS=llvm-as
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- elif ! use clang && ! tc-is-gcc ; then
- # Force gcc
- have_switched_compiler=yes
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if [[ -n "${have_switched_compiler}" ]] ; then
- # Because we switched active compiler we have to ensure
- # that no unsupported flags are set
- strip-unsupported-flags
- fi
-
- # Ensure we use correct toolchain
- export HOST_CC="$(tc-getBUILD_CC)"
- export HOST_CXX="$(tc-getBUILD_CXX)"
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # Pass the correct toolchain paths through cbindgen
- if tc-is-cross-compiler ; then
- export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
- fi
-
- # Set MOZILLA_FIVE_HOME
- export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
- # python/mach/mach/mixin/process.py fails to detect SHELL
- export SHELL="${EPREFIX}/bin/bash"
-
- # Set state path
- export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
- # Set MOZCONFIG
- export MOZCONFIG="${S}/.mozconfig"
-
- # Initialize MOZCONFIG
- mozconfig_add_options_ac '' --enable-application=browser
-
- # Set Gentoo defaults
- export MOZILLA_OFFICIAL=1
-
- mozconfig_add_options_ac 'Gentoo default' \
- --allow-addon-sideload \
- --disable-cargo-incremental \
- --disable-crashreporter \
- --disable-gpsd \
- --disable-install-strip \
- --disable-parental-controls \
- --disable-strip \
- --disable-updater \
- --enable-negotiateauth \
- --enable-new-pass-manager \
- --enable-official-branding \
- --enable-release \
- --enable-system-ffi \
- --enable-system-pixman \
- --host="${CBUILD:-${CHOST}}" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --prefix="${EPREFIX}/usr" \
- --target="${CHOST}" \
- --without-ccache \
- --without-wasm-sandboxed-libraries \
- --with-intl-api \
- --with-libclang-path="$(llvm-config --libdir)" \
- --with-system-nspr \
- --with-system-nss \
- --with-system-zlib \
- --with-toolchain-prefix="${CHOST}-" \
- --with-unsigned-addon-scopes=app,system \
- --x-includes="${ESYSROOT}/usr/include" \
- --x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
- # Set update channel
- local update_channel=release
- [[ -n ${MOZ_ESR} ]] && update_channel=esr
- mozconfig_add_options_ac '' --update-channel=${update_channel}
-
- if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
- mozconfig_add_options_ac '' --enable-rust-simd
- fi
-
- # For future keywording: This is currently (97.0) only supported on:
- # amd64, arm, arm64 & x86.
- # Might want to flip the logic around if Firefox is to support more arches.
- if use ppc64; then
- mozconfig_add_options_ac '' --disable-sandbox
- else
- mozconfig_add_options_ac '' --enable-sandbox
- fi
-
- if [[ -s "${S}/api-google.key" ]] ; then
- local key_origin="Gentoo default"
- if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
- key_origin="User value"
- fi
-
- mozconfig_add_options_ac "${key_origin}" \
- --with-google-safebrowsing-api-keyfile="${S}/api-google.key"
- else
- einfo "Building without Google API key ..."
- fi
-
- if [[ -s "${S}/api-location.key" ]] ; then
- local key_origin="Gentoo default"
- if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
- key_origin="User value"
- fi
-
- mozconfig_add_options_ac "${key_origin}" \
- --with-google-location-service-api-keyfile="${S}/api-location.key"
- else
- einfo "Building without Location API key ..."
- fi
-
- if [[ -s "${S}/api-mozilla.key" ]] ; then
- local key_origin="Gentoo default"
- if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
- key_origin="User value"
- fi
-
- mozconfig_add_options_ac "${key_origin}" \
- --with-mozilla-api-keyfile="${S}/api-mozilla.key"
- else
- einfo "Building without Mozilla API key ..."
- fi
-
- mozconfig_use_with system-av1
- mozconfig_use_with system-harfbuzz
- mozconfig_use_with system-harfbuzz system-graphite2
- mozconfig_use_with system-icu
- mozconfig_use_with system-jpeg
- mozconfig_use_with system-libevent
- mozconfig_use_with system-libvpx
- mozconfig_use_with system-png
- mozconfig_use_with system-webp
-
- mozconfig_use_enable dbus
- mozconfig_use_enable libproxy
-
- use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
- mozconfig_use_enable geckodriver
-
- if use hardened ; then
- mozconfig_add_options_ac "+hardened" --enable-hardening
- append-ldflags "-Wl,-z,relro -Wl,-z,now"
- fi
-
- local myaudiobackends=""
- use jack && myaudiobackends+="jack,"
- use sndio && myaudiobackends+="sndio,"
- use pulseaudio && myaudiobackends+="pulseaudio,"
- ! use pulseaudio && myaudiobackends+="alsa,"
-
- mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
- mozconfig_use_enable wifi necko-wifi
-
- if use X && use wayland ; then
- mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
- elif ! use X && use wayland ; then
- mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland-only
- else
- mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
- fi
-
- if use lto ; then
- if use clang ; then
- # Upstream only supports lld when using clang
- mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
- mozconfig_add_options_ac '+lto' --enable-lto=cross
-
- else
- # ThinLTO is currently broken, see bmo#1644409
- mozconfig_add_options_ac '+lto' --enable-lto=full
- mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
- fi
-
- if use pgo ; then
- mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
- if use clang ; then
- # Used in build/pgo/profileserver.py
- export LLVM_PROFDATA="llvm-profdata"
- fi
- fi
- else
- # Avoid auto-magic on linker
- if use clang ; then
- # This is upstream's default
- mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
- else
- mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
- fi
- fi
-
- # LTO flag was handled via configure
- filter-flags '-flto*'
-
- mozconfig_use_enable debug
- if use debug ; then
- mozconfig_add_options_ac '+debug' --disable-optimize
- else
- if is-flag '-g*' ; then
- if use clang ; then
- mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
- else
- mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
- fi
- else
- mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
- fi
-
- if is-flag '-O0' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
- elif is-flag '-O4' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
- elif is-flag '-O3' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
- elif is-flag '-O1' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
- elif is-flag '-Os' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
- else
- mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
- fi
- fi
-
- # Debug flag was handled via configure
- filter-flags '-g*'
-
- # Optimization flag was handled via configure
- filter-flags '-O*'
-
- # Modifications to better support ARM, bug #553364
- if use cpu_flags_arm_neon ; then
- mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
- if ! tc-is-clang ; then
- # thumb options aren't supported when using clang, bug 666966
- mozconfig_add_options_ac '+cpu_flags_arm_neon' \
- --with-thumb=yes \
- --with-thumb-interwork=no
- fi
- fi
-
- if [[ ${CHOST} == armv*h* ]] ; then
- mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
- if ! use system-libvpx ; then
- sed -i \
- -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build \
- || die
- fi
- fi
-
- if use clang ; then
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
- # toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
- local disable_elf_hack=
- if use amd64 ; then
- disable_elf_hack=yes
- elif use x86 ; then
- disable_elf_hack=yes
- elif use arm ; then
- disable_elf_hack=yes
- fi
-
- if [[ -n ${disable_elf_hack} ]] ; then
- mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
- fi
- elif tc-is-gcc ; then
- if ver_test $(gcc-fullversion) -ge 10 ; then
- einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
- append-cxxflags -fno-tree-loop-vectorize
- fi
- fi
-
- # Additional ARCH support
- case "${ARCH}" in
- arm)
- # Reduce the memory requirements for linking
- if use clang ; then
- # Nothing to do
- :;
- elif use lto ; then
- append-ldflags -Wl,--no-keep-memory
- else
- append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
- fi
- ;;
- esac
-
- if ! use elibc_glibc ; then
- mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
- fi
-
- # Allow elfhack to work in combination with unstripped binaries
- # when they would normally be larger than 2GiB.
- append-ldflags "-Wl,--compress-debug-sections=zlib"
-
- # Make revdep-rebuild.sh happy; Also required for musl
- append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
- # Pass $MAKEOPTS to build system
- export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
- # Use system's Python environment
- PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
- if use system-python-libs; then
- export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
- else
- export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
- fi
-
- # Disable notification when build system has finished
- export MOZ_NOSPAM=1
-
- # Portage sets XARGS environment variable to "xargs -r" by default which
- # breaks build system's check_prog() function which doesn't support arguments
- mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
- # Set build dir
- mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
- # Show flags we will use
- einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
- einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
- einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
- einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
- einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
- # Handle EXTRA_CONF and show summary
- local ac opt hash reason
-
- # Apply EXTRA_ECONF entries to $MOZCONFIG
- if [[ -n ${EXTRA_ECONF} ]] ; then
- IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
- for opt in "${ac[@]}"; do
- mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
- done
- fi
-
- echo
- echo "=========================================================="
- echo "Building ${PF} with the following configuration"
- grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
- [[ -z ${hash} || ${hash} == \# ]] \
- || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
- printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}"
- done
- echo "=========================================================="
- echo
-
- ./mach configure || die
-}
-
-src_compile() {
- local virtx_cmd=
-
- if use pgo ; then
- if use X; then
- local -x GDK_BACKEND=x11
- virtx_cmd=virtx
- elif use wayland; then
- local -x GDK_BACKEND=wayland
- virtx_cmd=virtwl
- fi
-
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- addpredict /root
- fi
-
- ${virtx_cmd} ./mach build --verbose \
- || die
-}
-
-src_install() {
- # xpcshell is getting called during install
- pax-mark m \
- "${BUILD_DIR}"/dist/bin/xpcshell \
- "${BUILD_DIR}"/dist/bin/${PN} \
- "${BUILD_DIR}"/dist/bin/plugin-container
-
- DESTDIR="${D}" ./mach install || die
-
- # Upstream cannot ship symlink but we can (bmo#658850)
- rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
- dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
- # Don't install llvm-symbolizer from sys-devel/llvm package
- if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
- rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
- fi
-
- # Install policy (currently only used to disable application updates)
- insinto "${MOZILLA_FIVE_HOME}/distribution"
- newins "${FILESDIR}"/distribution.ini distribution.ini
- newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
- # Install system-wide preferences
- local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
- insinto "${PREFS_DIR}"
- newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
- local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
- # Set dictionary path to use system hunspell
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
- pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
- EOF
-
- # Force hwaccel prefs if USE=hwaccel is enabled
- if use hwaccel ; then
- cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
- >>"${GENTOO_PREFS}" \
- || die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-
- if use wayland; then
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
- pref("gfx.x11-egl.force-enabled", false);
- EOF
- else
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
- pref("gfx.x11-egl.force-enabled", true);
- EOF
- fi
- fi
-
- if ! use gmp-autoupdate ; then
- local plugin
- for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
- einfo "Disabling auto-update for ${plugin} plugin ..."
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
- pref("media.${plugin}.autoupdate", false);
- EOF
- done
- fi
-
- # Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
- if use system-harfbuzz ; then
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
- sticky_pref("gfx.font_rendering.graphite.enabled", true);
- EOF
- fi
-
- # Install language packs
- local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
- if [[ -n "${langpacks}" ]] ; then
- moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
- fi
-
- # Install geckodriver
- if use geckodriver ; then
- einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
- pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
- exeinto "${MOZILLA_FIVE_HOME}"
- doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
- dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
- fi
-
- # Install icons
- local icon_srcdir="${S}/browser/branding/official"
- local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
- insinto /usr/share/icons/hicolor/symbolic/apps
- newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
- local icon size
- for icon in "${icon_srcdir}"/default*.png ; do
- size=${icon%.png}
- size=${size##*/default}
-
- if [[ ${size} -eq 48 ]] ; then
- newicon "${icon}" ${PN}.png
- fi
-
- newicon -s ${size} "${icon}" ${PN}.png
- done
-
- # Install menu
- local app_name="Mozilla ${MOZ_PN^}"
- local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
- local desktop_filename="${PN}.desktop"
- local exec_command="${PN}"
- local icon="${PN}"
- local use_wayland="false"
-
- if use wayland ; then
- use_wayland="true"
- fi
-
- cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
- sed -i \
- -e "s:@NAME@:${app_name}:" \
- -e "s:@EXEC@:${exec_command}:" \
- -e "s:@ICON@:${icon}:" \
- "${WORKDIR}/${PN}.desktop-template" \
- || die
-
- newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
- rm "${WORKDIR}/${PN}.desktop-template" || die
-
- # Install wrapper script
- [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
- newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
- # Update wrapper
- sed -i \
- -e "s:@PREFIX@:${EPREFIX}/usr:" \
- -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
- -e "s:@APULSELIB_DIR@:${apulselib}:" \
- -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
- "${ED}/usr/bin/${PN}" \
- || die
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- # If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
- # does not need to be forced into the LD_LIBRARY_PATH
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
- einfo "APULSE found; Generating library symlinks for sound support ..."
- local lib
- pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
- for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
- # A quickpkg rolled by hand will grab symlinks as part of the package,
- # so we need to avoid creating them if they already exist.
- if [[ ! -L ${lib##*/} ]] ; then
- ln -s "${lib}" ${lib##*/} || die
- fi
- done
- popd &>/dev/null || die
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use gmp-autoupdate ; then
- elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
- elog "installing into new profiles:"
- local plugin
- for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
- elog "\t ${plugin}"
- done
- elog
- fi
-
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
- elog "Apulse was detected at merge time on this system and so it will always be"
- elog "used for sound. If you wish to use pulseaudio instead please unmerge"
- elog "media-sound/apulse."
- elog
- fi
-
- local show_doh_information
- local show_normandy_information
- local show_shortcut_information
-
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- # New install; Tell user that DoH is disabled by default
- show_doh_information=yes
- show_normandy_information=yes
- show_shortcut_information=no
- else
- local replacing_version
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "${replacing_version}" -lt 91.0 ; then
- # Tell user that we no longer install a shortcut
- # per supported display protocol
- show_shortcut_information=yes
- fi
- done
- fi
-
- if [[ -n "${show_doh_information}" ]] ; then
- elog
- elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
- elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
- elog "DNS traffic to Cloudflare by default is not a good idea and applications"
- elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
- elog "(\"Off by choice\") by default."
- elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
- fi
-
- # bug 713782
- if [[ -n "${show_normandy_information}" ]] ; then
- elog
- elog "Upstream operates a service named Normandy which allows Mozilla to"
- elog "push changes for default settings or even install new add-ons remotely."
- elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
- elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
- elog "concerns prevail, which is why we have switched off the use of this"
- elog "service by default."
- elog
- elog "To re-enable this service set"
- elog
- elog " app.normandy.enabled=true"
- elog
- elog "in about:config."
- fi
-
- if [[ -n "${show_shortcut_information}" ]] ; then
- elog
- elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
- elog "each supported display protocol. Instead we will only install"
- elog "one generic Mozilla ${PN^} shortcut."
- elog "If you still want to be able to select between running Mozilla ${PN^}"
- elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
- fi
-
- # bug 835078
- if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
- ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
- ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
- ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
- ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
- fi
-
- elog
- elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
- elog "useragent checks. To temporarily fix this, enter about:config and modify "
- elog "network.http.useragent.forceVersion preference to \"99\"."
- elog "Or install an addon to change your useragent."
- elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
- elog
-}
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
deleted file mode 100644
index 6670b0e..0000000
--- a/www-client/firefox/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>mozilla@gentoo.org</email>
- <name>Gentoo Mozilla Team</name>
-</maintainer>
-<use>
- <flag name="clang">Use Clang compiler instead of GCC</flag>
- <flag name="eme-free">Disable EME (DRM plugin) capability at build time</flag>
- <flag name="geckodriver">Enable WebDriver support</flag>
- <flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
- downloaded and kept up-to-date in user profiles</flag>
- <flag name="hwaccel">Force-enable hardware-accelerated rendering (Mozilla bug 594876)</flag>
- <flag name="libproxy">Enable libproxy support</flag>
- <flag name="lto">Enable Link Time Optimization (LTO) - Uses BFD linker with GCC and LLD
- linker with Clang</flag>
- <flag name="openh264">Use <pkg>media-libs/openh264</pkg> for H264 support
- instead of downloading binary blob from Mozilla at runtime</flag>
- <flag name="pgo">Add support for profile-guided optimization for faster binaries - this
- option will double the compile time</flag>
- <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
- <flag name="sndio">Enable support for the <pkg>media-sound/sndio</pkg> backend</flag>
- <flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg>
- and <pkg>media-libs/libaom</pkg> library instead of bundled</flag>
- <flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>
- and <pkg>media-gfx/graphite2</pkg> instead of bundled</flag>
- <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
- instead of bundled</flag>
- <flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
- instead of bundled</flag>
- <flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg>
- instead of bundled</flag>
- <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
- instead of bundled</flag>
- <flag name="system-png">Use the system-wide <pkg>media-libs/libpng</pkg>
- instead of bundled (requires APNG patches)</flag>
- <flag name="system-python-libs">Use system's python site instead of bundled python libraries</flag>
- <flag name="system-webp">Use the system-wide <pkg>media-libs/libwebp</pkg>
- instead of bundled</flag>
-</use>
-</pkgmetadata>
diff --git a/x11-apps/sx/metadata.xml b/x11-apps/sx/metadata.xml
index 004555a..4ac52f4 100644
--- a/x11-apps/sx/metadata.xml
+++ b/x11-apps/sx/metadata.xml
@@ -5,4 +5,7 @@
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu (Hello71)</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">Earnestly/sx</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-apps/sx/sx-2.1.7.ebuild b/x11-apps/sx/sx-2.1.7.ebuild
index abe083b..2349365 100644
--- a/x11-apps/sx/sx-2.1.7.ebuild
+++ b/x11-apps/sx/sx-2.1.7.ebuild
@@ -9,7 +9,6 @@ HOMEPAGE="https://github.com/Earnestly/sx"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Earnestly/sx.git"
- KEYWORDS=""
else
SRC_URI="https://github.com/Earnestly/sx/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
diff --git a/x11-apps/sx/sx-9999.ebuild b/x11-apps/sx/sx-9999.ebuild
index 2c2e7a2..6d97a9e 100644
--- a/x11-apps/sx/sx-9999.ebuild
+++ b/x11-apps/sx/sx-9999.ebuild
@@ -9,7 +9,6 @@ HOMEPAGE="https://github.com/Earnestly/sx"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Earnestly/sx.git"
- KEYWORDS=""
else
SRC_URI="https://github.com/Earnestly/sx/archive/${PV}.tar.gz"
KEYWORDS="~amd64 ~x86"