diff options
179 files changed, 2686 insertions, 6133 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/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest deleted file mode 100644 index bdde1c3..0000000 --- a/app-admin/keepassxc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST keepassxc-2.6.6.tar.gz 9809433 BLAKE2B cfaadae509ff2a4fb4190dde8672201af128c2ae17950b7a4effa694ed3dc00f0a7d275d5031175191ce0f4bd7e323d29cfb3fa586653f3d3cd31f1747ef8c2f SHA512 fb41d25b9b4ac97feddf9632e7a26140d7a9fbba4256ac0394814fd9097d0d30f810cb48939325b4b858cac1378747aadd1987eb468657c929e0008b736eddd7 diff --git a/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild b/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild deleted file mode 100644 index 9ac2485..0000000 --- a/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org" - -if [[ "${PV}" != 9999 ]] ; then - if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" - else - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" - fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype browser ccache doc keeshare +network test yubikey" - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/libgcrypt:= - >=dev-libs/libsodium-1.0.12:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-gfx/qrencode:= - sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - keeshare? ( dev-libs/quazip:0= ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 -" -BDEPEND=" - ccache? ( dev-util/ccache ) - doc? ( dev-ruby/asciidoctor ) -" - -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die - - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then - printf '%s' "${PV}" > .version || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_CCACHE="$(usex ccache)" - -DWITH_GUI_TESTS=OFF - -DWITH_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_DOCS="$(usex doc)" - -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_FDOSECRETS=ON - -DWITH_XC_KEESHARE="$(usex keeshare)" - -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" - -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_SSHAGENT=ON - -DWITH_XC_UPDATECHECK=OFF - -DWITH_XC_YUBIKEY="$(usex yubikey)" - ) - if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) - fi - cmake_src_configure -} diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild deleted file mode 100644 index 3b0d6d6..0000000 --- a/app-admin/keepassxc/keepassxc-9999.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic xdg - -DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition" -HOMEPAGE="https://keepassxc.org" - -if [[ "${PV}" != 9999 ]] ; then - if [[ "${PV}" == *_beta* ]] ; then - SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" - else - #SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - fi -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}" -fi - -LICENSE="LGPL-2.1 GPL-2 GPL-3" -SLOT="0" -IUSE="autotype browser ccache doc keeshare +network test yubikey" - -RESTRICT="!test? ( test )" - -RDEPEND=" - app-crypt/argon2:= - dev-libs/libgcrypt:= - >=dev-libs/libsodium-1.0.12:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-gfx/qrencode:= - sys-libs/readline:0= - sys-libs/zlib:= - autotype? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXtst - ) - keeshare? ( dev-libs/quazip:0= ) - yubikey? ( sys-auth/ykpers ) -" - -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 -" -BDEPEND=" - ccache? ( dev-util/ccache ) - doc? ( dev-ruby/asciidoctor ) -" - -src_prepare() { - use test || \ - sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die - - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != 9999 ]] && [[ ! -f .version ]] ; then - printf '%s' "${PV}" > .version || die - fi - - cmake_src_prepare -} - -src_configure() { - # https://github.com/keepassxreboot/keepassxc/issues/5801 - append-cxxflags -fPIC - - local mycmakeargs=( - -DWITH_CCACHE="$(usex ccache)" - -DWITH_GUI_TESTS=OFF - -DWITH_TESTS="$(usex test)" - -DWITH_XC_AUTOTYPE="$(usex autotype)" - -DWITH_XC_DOCS="$(usex doc)" - -DWITH_XC_BROWSER="$(usex browser)" - -DWITH_XC_FDOSECRETS=ON - -DWITH_XC_KEESHARE="$(usex keeshare)" - -DWITH_XC_KEESHARE_SECURE="$(usex keeshare)" - -DWITH_XC_NETWORKING="$(usex network)" - -DWITH_XC_SSHAGENT=ON - -DWITH_XC_UPDATECHECK=OFF - -DWITH_XC_YUBIKEY="$(usex yubikey)" - ) - if [[ "${PV}" == *_beta* ]] ; then - mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" ) - fi - cmake_src_configure -} diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml deleted file mode 100644 index 0445305..0000000 --- a/app-admin/keepassxc/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <use> - <flag name="autotype">Add support to autotype the passwords into other applications</flag> - <flag name="browser">Enables browser plugin support</flag> - <flag name="ccache">Use <pkg>dev-util/ccache</pkg> to build keepassxc</flag> - <flag name="keeshare">Enable KeeShare sharing integration</flag> - <flag name="network">Enable network support</flag> - <flag name="yubikey">Enable database unlocking via YubiKey.</flag> - </use> - <longdescription> - KeePassXC provides a safe location for your passwords and similar - data. It encrypts its databasee with AES either by passphrase or a key - file, compatible with a PDA and Windows version. - </longdescription> - <upstream> - <remote-id type="github">keepassxreboot/keepassxc</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-arch/7-zip/7-zip-21.03_beta-r1.ebuild b/app-arch/7-zip/7-zip-21.03_beta-r1.ebuild deleted file mode 100644 index 295b6de..0000000 --- a/app-arch/7-zip/7-zip-21.03_beta-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -MY_PV=${PV%%_*} -MY_PV=${MY_PV//./} - -DESCRIPTION="File archiver with a high compression ratio" -HOMEPAGE="https://7-zip.org/" -SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.7z" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="|| ( virtual/7z app-arch/libarchive app-arch/unar )" - -S=${WORKDIR}/7z${MY_PV}-src - -PATCHES=( ${FILESDIR}/7-zip-flags.patch ) - -src_unpack() { - if command -v 7z >/dev/null 2>&1; then - 7z x "${DISTDIR}/7z${MY_PV}-src.7z" -o"$S" || die - elif command -v bsdtar >/dev/null 2>&1; then - mkdir "$S" || die - bsdtar -C "$S" -xf "${DISTDIR}/7z${MY_PV}-src.7z" || die - elif command -v unar >/dev/null 2>&1; then - unar -d "$S" "${DISTDIR}/7z${MY_PV}-src.7z" || die - else - die "no 7z unpacker found" - fi -} - -src_compile() { - cd CPP/7zip/Bundles/Alone2 - make -f ../../cmpl_gcc.mak -} - -src_install() { - dobin CPP/7zip/Bundles/Alone2/b/g/7zz - dosym 7zz /usr/bin/7z - dodoc DOC/* -} diff --git a/app-arch/7-zip/Manifest b/app-arch/7-zip/Manifest deleted file mode 100644 index a855961..0000000 --- a/app-arch/7-zip/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST 7z2103-src.7z 1191375 BLAKE2B 002c20cbe0a47fbfce4c10f985972bf316d1e23c46e1047fbe98a9d4d27f1679d402cd6952c587fd6f78dd260896037896c328df9ae8a07865756c4693e93ad6 SHA512 6b2c00418333eb9a4f9d2ca23391dd644ed838b02832326a4c77065f762942d5daaa468f7330a8197b354a90aaf44f01d9412debb905f490351b54f63a3246df diff --git a/app-arch/7-zip/files/7-zip-flags.patch b/app-arch/7-zip/files/7-zip-flags.patch deleted file mode 100644 index 372819d..0000000 --- a/app-arch/7-zip/files/7-zip-flags.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak ---- a/CPP/7zip/7zip_gcc.mak 2021-07-16 08:23:49.524088300 -0400 -+++ b/CPP/7zip/7zip_gcc.mak 2021-08-14 14:43:34.618587556 -0400 -@@ -13,13 +13,13 @@ -
-
- ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
-+CFLAGS_WARN_WALL = -Wall -Wextra -Wno-misleading-indentation
- endif
-
- # for object file
- CFLAGS_BASE_LIST = -c
- # CFLAGS_BASE_LIST = -S
--CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
-+CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
- -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
- -fPIC
-
-@@ -62,17 +62,17 @@ -
- ifdef IS_MINGW
- SHARED_EXT=.dll
--LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC)
-+MY_LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC)
- else
- SHARED_EXT=.so
--LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC)
-+MY_LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC)
- CC_SHARED=-fPIC
- endif
-
-
- else
-
--LDFLAGS = $(LDFLAGS_STATIC)
-+MY_LDFLAGS = $(LDFLAGS_STATIC)
- # -s is not required for clang, do we need it for GGC ???
- # -s
-
-@@ -156,7 +156,7 @@ - $(MY_MKDIR) $(O)
-
- $(PROGPATH): $(OBJS)
-- $(CXX) -o $(PROGPATH) -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+ $(CXX) -o $(PROGPATH) $(MY_ARCH_2) $(LDFLAGS) $(MY_LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-
- # -s strips debug sections from executable in GCC
-
diff --git a/dev-libs/highway/metadata.xml b/app-arch/precomp-cpp/metadata.xml index 004555a..50e3faf 100644 --- a/dev-libs/highway/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-arch/unar/Manifest b/app-arch/unar/Manifest deleted file mode 100644 index 270ff06..0000000 --- a/app-arch/unar/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST XADMaster-1.10.7.tar.gz 2064770 BLAKE2B f6119dfb46f3d617fafb5847f41d6c0f3e5e87c8cd0763cd8e5986fae1d5b1c6e6761e9e7e4fa84125003979151b2b34d35ff47dc9be3271107cf53f1be22644 SHA512 3447b6d8f3f4fa5eea93c6628a1633017da6ff09c580d5ce4fd422027b3b79acbf38d6e41a059806d1e60eb25a9d66889938b32599168dc2c0ca648e1c1976b1 -DIST universal-detector-1.1.tar.gz 196274 BLAKE2B d84dc1f850031213d88c288341edcbb588197f23ae0d10632ed129e73e4cc2b7670c8c862bba2165fcc7421c265e4dc3e791ea188e3d2b647bd1ab9b428bb866 SHA512 e514670b3d37b2472ed3e9cb0fdc3298a8479772264b7573411f104be554222bec2e01f73e1f35db95620fe785bee2dcf9ddc9c2b1f4ff6b522fa64d14d020f5 diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml deleted file mode 100644 index b6ae255..0000000 --- a/app-arch/unar/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <upstream> - <remote-id type="github">MacPaw/XADMaster</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-arch/unar/unar-1.10.7-r1.ebuild b/app-arch/unar/unar-1.10.7-r1.ebuild deleted file mode 100644 index f076cb7..0000000 --- a/app-arch/unar/unar-1.10.7-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 toolchain-funcs - -DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3" -HOMEPAGE="https://unarchiver.c3.cx/" -SRC_URI=" - https://github.com/MacPaw/XADMaster/archive/v${PV}/XADMaster-${PV}.tar.gz - https://github.com/MacPaw/universal-detector/archive/1.1/universal-detector-1.1.tar.gz -" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64" - -RDEPEND=" - app-arch/bzip2:= - dev-libs/icu:= - gnustep-base/gnustep-base:= - media-sound/wavpack - sys-libs/zlib -" -DEPEND="${RDEPEND} - ${BDEPEND} - gnustep-base/gnustep-make[native-exceptions] -" - -S="${WORKDIR}/XADMaster-${PV}" - -src_prepare() { - default - # avoid jobserver warning "make[1]: warning: jobserver unavailable: using -j1" - sed -i -e 's:make:$(MAKE):g' Makefile.linux || die - mv "${WORKDIR}/universal-detector-1.1" "${WORKDIR}/UniversalDetector" || die -} - -src_compile() { - emake -f Makefile.linux \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - OBJCC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - OBJCFLAGS="${CFLAGS}" \ - LD="$(tc-getCXX)" \ - LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}" -} - -src_install() { - dobin {ls,un}ar - doman Extra/{ls,un}ar.1 - dobashcomp Extra/{ls,un}ar.bash_completion -} diff --git a/app-crypt/openpgp-keys-runescape/Manifest b/app-crypt/openpgp-keys-runescape/Manifest deleted file mode 100644 index f2c2299..0000000 --- a/app-crypt/openpgp-keys-runescape/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST runescape.gpg.key 942 BLAKE2B 7133cf56d71fa52cd14fc57b3ef18fdffaa49941a697beea24f8d181c1618ac803ab0c1bcae262e1fd4c269fabe6cfd360910934605f3ae6046a50b720e889f2 SHA512 4da91664eb9a298c693efaa3ffcdf2e9e271a3656b71feee47fc86a5f6eca2656114a8fb3f2918c64b8817466664a703908795415cc441fe876306348b53b742 diff --git a/app-crypt/openpgp-keys-runescape/openpgp-keys-runescape-0.ebuild b/app-crypt/openpgp-keys-runescape/openpgp-keys-runescape-0.ebuild deleted file mode 100644 index bab89ef..0000000 --- a/app-crypt/openpgp-keys-runescape/openpgp-keys-runescape-0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="OpenPGP keys used by Jagex to sign RuneScape packages for Ubuntu" -HOMEPAGE="https://www.runescape.com/" -SRC_URI="https://content.runescape.com/downloads/ubuntu/runescape.gpg.key" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~*" - -S=${WORKDIR} - -src_install() { - local files=( ${A} ) - insinto /usr/share/openpgp-keys - doins ${DISTDIR}/runescape.gpg.key -} diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest deleted file mode 100644 index 7d4f2bf..0000000 --- a/app-emulation/dxvk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dxvk-1.9.1.tar.gz 1135785 BLAKE2B 49bb4aefff8385da238e334bcd99f992263d7266efc23efb3ca1c459ad6c7e7012dbb0390c7581e9b1b3004d9dfb4ddf56e0aa30a7bb1e016c3310b141e8ba29 SHA512 012c1b2b854585696f438e13bfd2334498419650bb9f0fb9decff690562f79701a42fe93738e2567802fc201916a9b33885c44ca7494d5e12ac877e770ab1e36 diff --git a/app-emulation/dxvk/dxvk-1.9.1.ebuild b/app-emulation/dxvk/dxvk-1.9.1.ebuild deleted file mode 100644 index acb6291..0000000 --- a/app-emulation/dxvk/dxvk-1.9.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson multilib-minimal - -DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine" -HOMEPAGE="https://github.com/doitsujin/dxvk" -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git" -else - SRC_URI="https://github.com/doitsujin/dxvk/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="ZLIB" -SLOT="0" -if [[ "${PV}" == "9999" ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi -IUSE="+d3d9 +d3d10 +d3d11 debug +dxgi test" - -DEPEND=" - abi_x86_32? ( cross-i686-w64-mingw32/gcc ) - abi_x86_64? ( cross-x86_64-w64-mingw32/gcc ) - dev-util/vulkan-headers - dev-util/glslang -" -RDEPEND=" - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - || ( - >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan] - >=app-emulation/wine-vanilla-4.5[${MULTILIB_USEDEP},vulkan] - ) -" - -PATCHES=( - "${FILESDIR}/dxvk-1.8_add-compiler-flags.patch" -) - -RESTRICT="!test? ( test )" - -patch_build_flags() { - local bits="${MULTILIB_ABI_FLAG:8:2}" - - # Fix installation directory. - sed -i "s|\"x${bits}\"|\"usr/$(get_libdir)/dxvk\"|" setup_dxvk.sh || die - - # Add *FLAGS to cross-file. - sed -i \ - -e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS}")!" \ - -e "s!@CXXFLAGS@!$(_meson_env_array "${CXXFLAGS}")!" \ - -e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \ - "build-win${bits}.txt" || die -} - -src_prepare() { - default - - sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die - - # Delete installation instructions for unused ABIs. - if ! use abi_x86_64; then - sed -i '/installFile "$win64_sys_path"/d' setup_dxvk.sh || die - fi - if ! use abi_x86_32; then - sed -i '/installFile "$win32_sys_path"/d' setup_dxvk.sh || die - fi - - multilib_foreach_abi patch_build_flags - - # Load configuration file from /etc/dxvk.conf. - sed -Ei 's|filePath = "^(\s+)dxvk.conf";$|\1filePath = "/etc/dxvk.conf";|' \ - src/util/config/config.cpp || die -} - -multilib_src_configure() { - local bits="${MULTILIB_ABI_FLAG:8:2}" - - local emesonargs=( - --libdir="$(get_libdir)/dxvk" - --bindir="$(get_libdir)/dxvk" - --cross-file="${S}/build-win${bits}.txt" - --buildtype="release" - $(usex debug "" "--strip") - $(meson_use d3d9 "enable_d3d9") - $(meson_use d3d10 "enable_d3d10") - $(meson_use d3d11 "enable_d3d11") - $(meson_use dxgi "enable_dxgi") - $(meson_use test "enable_tests") - ) - meson_src_configure -} - -multilib_src_compile() { - EMESON_SOURCE="${S}" - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - # The .a files are needed during the install phase. - find "${D}" -name '*.a' -delete -print - - dobin setup_dxvk.sh - - insinto etc - doins "dxvk.conf" - - default -} diff --git a/app-emulation/dxvk/files/dxvk-1.8_add-compiler-flags.patch b/app-emulation/dxvk/files/dxvk-1.8_add-compiler-flags.patch deleted file mode 100644 index bd58737..0000000 --- a/app-emulation/dxvk/files/dxvk-1.8_add-compiler-flags.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fa1ead4a488b90593c05f5ce634fd3f9e8dd6b81 Mon Sep 17 00:00:00 2001 -From: tastytea <tastytea@tastytea.de> -Date: Wed, 13 Jan 2021 16:35:34 +0100 -Subject: [PATCH] Add compiler and linker flags. - ---- - build-win32.txt | 5 +++++ - build-win64.txt | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/build-win32.txt b/build-win32.txt -index a1406832..c3c9521c 100644 ---- a/build-win32.txt -+++ b/build-win32.txt -@@ -7,6 +7,11 @@ strip = 'i686-w64-mingw32-strip' - [properties] - needs_exe_wrapper = true - -+c_args = @CFLAGS@ -+cpp_args = @CXXFLAGS@ -+c_link_args = @LDFLAGS@ -+cpp_link_args = @LDFLAGS@ -+ - [host_machine] - system = 'windows' - cpu_family = 'x86' -diff --git a/build-win64.txt b/build-win64.txt -index 1aee4626..50960343 100644 ---- a/build-win64.txt -+++ b/build-win64.txt -@@ -7,6 +7,11 @@ strip = 'x86_64-w64-mingw32-strip' - [properties] - needs_exe_wrapper = true - -+c_args = @CFLAGS@ -+cpp_args = @CXXFLAGS@ -+c_link_args = @LDFLAGS@ -+cpp_link_args = @LDFLAGS@ -+ - [host_machine] - system = 'windows' - cpu_family = 'x86_64' --- -2.26.2 diff --git a/app-emulation/dxvk/metadata.xml b/app-emulation/dxvk/metadata.xml deleted file mode 100644 index df04ea0..0000000 --- a/app-emulation/dxvk/metadata.xml +++ /dev/null @@ -1,14 +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="d3d9">Direct3D 9 support</flag> - <flag name="d3d10">Direct3D 10 support</flag> - <flag name="d3d11">Direct3D 11 support</flag> - <flag name="dxgi">DXGI support</flag> - </use> -</pkgmetadata> diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest deleted file mode 100644 index 57fec11..0000000 --- a/app-text/evince/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST evince-40.4.tar.xz 2928100 BLAKE2B 491b2333e21093b032ec9c4f24c61cdaa31e4a46ee058b0f109b0998fb7216ada2c933e6202eae1d6193caad0cfa94a77434ef042555bab7cf4aeed959be759b SHA512 dbec3828f1e8f0b9b48dd90ce605ce83312e53cbeb8f8e7358c1318f1701680a69a9bcd26b7cf1da4b53679ae11e334ce514f5df4c5bbcc976581441e0d654cd diff --git a/app-text/evince/evince-40.4-r1.ebuild b/app-text/evince/evince-40.4-r1.ebuild deleted file mode 100644 index a06f5ce..0000000 --- a/app-text/evince/evince-40.4-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Simple document viewer for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Evince" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) -SLOT="0/evd3.4-evv3.3" -IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus nsplugin postscript spell t1lib tiff xps" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" - -# atk used in libview -# bundles unarr -DEPEND=" - dev-libs/atk - >=dev-libs/glib-2.44.0:2 - >=gui-libs/libhandy-1.0:1= - >=dev-libs/libxml2-2.5:2 - sys-libs/zlib:= - >=x11-libs/gdk-pixbuf-2.40:2 - >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.10:= - >=app-text/poppler-0.76.0[cairo] - >=app-arch/libarchive-3.2.0 - djvu? ( >=app-text/djvu-3.5.22:= ) - dvi? ( - >=app-text/libspectre-0.2:= - dev-libs/kpathsea:= - t1lib? ( >=media-libs/t1lib-5:= ) ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-libs/gst-plugins-good:1.0 ) - gnome? ( gnome-base/gnome-desktop:3= ) - gnome-keyring? ( >=app-crypt/libsecret-0.5 ) - introspection? ( >=dev-libs/gobject-introspection-1:= ) - nautilus? ( >=gnome-base/nautilus-3.28.0 ) - postscript? ( >=app-text/libspectre-0.2:= ) - spell? ( >=app-text/gspell-1.6.0:= ) - tiff? ( >=media-libs/tiff-3.6:0= ) - xps? ( >=app-text/libgxps-0.2.1:= ) -" -RDEPEND="${DEPEND} - || ( - >=x11-themes/adwaita-icon-theme-2.17.1 - >=x11-themes/hicolor-icon-theme-0.10 - ) -" -BDEPEND=" - gtk-doc? ( >=dev-util/gtk-doc-1.33 ) - app-text/docbook-xml-dtd:4.3 - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/40.0-internal-synctex.patch -) - -src_prepare() { - xdg_src_prepare - - # Do not depend on adwaita-icon-theme, bug #326855, #391859 - # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7 - sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die -} - -src_configure() { - local emesonargs=( - -Dplatform=gnome - - -Dviewer=true - -Dpreviewer=true - -Dthumbnailer=true - $(meson_use nsplugin browser_plugin) - $(meson_use nautilus) - - -Dcomics=enabled - $(meson_feature djvu) - $(meson_feature dvi) - -Dpdf=enabled - $(meson_feature postscript ps) - $(meson_feature tiff) - $(meson_feature xps) - - $(meson_use gtk-doc gtk_doc) - -Duser_doc=true - $(meson_use introspection) - -Ddbus=true - $(meson_feature gnome-keyring keyring) - $(meson_feature cups gtk_unix_print) - $(meson_feature gnome thumbnail_cache) - $(meson_feature gstreamer multimedia) - $(meson_feature spell gspell) - - $(meson_feature t1lib) - - -Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" - -Dsystemduserunitdir="$(systemd_get_userunitdir)" - - ) - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-text/evince/files/40.0-internal-synctex.patch b/app-text/evince/files/40.0-internal-synctex.patch deleted file mode 100644 index 8c45548..0000000 --- a/app-text/evince/files/40.0-internal-synctex.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ce976d98317535d17d8aabd67729918a94b24cea Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Mon, 12 Apr 2021 23:07:50 -0400 -Subject: [PATCH] build: always use internal synctex instead of automagically - -We don't have a separate synctex package and would have to pull in -all of texlive-core; so instead of fixing the automagic use of it, -just remove support for external synctex, as that's easier. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index abee124d..63c5040c 100644 ---- a/meson.build -+++ b/meson.build -@@ -251,7 +251,7 @@ config_h.set('HAVE_DESKTOP_SCHEMAS', gsettings_desktop_schemas_dep.found()) - - # *** libsynctex *** - synctex_dep = dependency('synctex', version: '>= 1.19', required: false) --external_synctex = synctex_dep.found() -+external_synctex = false - - # *** Mime types list *** - mime_types_list = { --- -2.26.3 - diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml deleted file mode 100644 index 12e5645..0000000 --- a/app-text/evince/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <use> - <flag name="dvi">Enable the built-in DVI viewer</flag> - <flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag> - <flag name="postscript" restrict=">=app-text/evince-3.26">Enable support for PostScript and Adobe Illustrator documents with <pkg>app-text/libspectre</pkg></flag> - <flag name="spell">Enable inline spell check for annotations via <pkg>app-text/gspell</pkg></flag> - <flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer - (<pkg>media-libs/t1lib</pkg>)</flag> - <flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag> - </use> -</pkgmetadata> diff --git a/app-text/pdfsizeopt/metadata.xml b/app-text/pdfsizeopt/metadata.xml deleted file mode 100644 index 004555a..0000000 --- a/app-text/pdfsizeopt/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> -</pkgmetadata> diff --git a/app-text/pdfsizeopt/pdfsizeopt-9999.ebuild b/app-text/pdfsizeopt/pdfsizeopt-9999.ebuild deleted file mode 100644 index 386d0d7..0000000 --- a/app-text/pdfsizeopt/pdfsizeopt-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -_PYTHON_ALLOW_PY27=1 -inherit git-r3 python-single-r1 - -DESCRIPTION="PDF file size optimizer" -HOMEPAGE="https://github.com/pts/pdfsizeopt" -EGIT_REPO_URI="https://github.com/pts/pdfsizeopt.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - app-text/ghostscript-gpl - media-gfx/tif22pnm - media-gfx/sam2p -" -BDEPEND="${PYTHON_DEPS}" - -src_prepare() { - default - python_fix_shebang mksingle.py -} - -src_compile() { - ./mksingle.py -} - -src_install() { - newbin pdfsizeopt.single pdfsizeopt -} 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 new file mode 100644 index 0000000..8148053 --- /dev/null +++ b/dev-dotnet/dotnet-runtime-bin/Manifest @@ -0,0 +1,18 @@ +DIST dotnet-runtime-6.0.36-linux-arm.tar.gz 28668069 BLAKE2B 38779311abe9eabf941d0e692575266170f380dfdae1a19a5aead83da71a38bb3a010037b041c834ec40fd35df0596f3a93268933849740c4963bbb8a658f3e7 SHA512 f3f9199a97db81d3e3ed249e0e9b8f17afb785e8b9ebad00016576382d3d0f2029a31eaf760be2509fde796a42efeb727b156488a42f48cc08013f87479cacfd +DIST dotnet-runtime-6.0.36-linux-arm64.tar.gz 28419386 BLAKE2B b42909acefc8a7dd2328e628877c5903fba654930b24efd31984ddce14b36694fb5d60982dcd72a0486d42ad0b413fd2ee0f3debfdcde3c09dc82b5f43a6bb72 SHA512 aa9a35f181204199ac6c44863c4773f8967b25adce218e23ce2822b40b26c38edc1e4e2ff323dabb81ae049bc187f14d209ef1365e68970fd6c32af21f0a1d44 +DIST dotnet-runtime-6.0.36-linux-musl-arm.tar.gz 28682171 BLAKE2B 9d7e42a723b6b5d5b66a7977223fa772aa08c215e571166287e6694101d96365a937a4e28b64297f99b34c8c3fa121790e5da825dd03a2b8969f327fdb5327e2 SHA512 3dd539816405ec2d818f611a7cb98fe4069960e8ac4664ccca04ff8b2e0679387b0a3f2cc5045bef95657626ac1045bedc4e502da304ee54678afbbe83dcc3b3 +DIST dotnet-runtime-6.0.36-linux-musl-arm64.tar.gz 28445012 BLAKE2B 9baebfd86b7eee765b18cff5600df9459ea1c71d3d12defa9a13bb56926d2f309150cbde2abe7b49347de49433f3c7cfb92056f1b48a3f0dc463284844c87035 SHA512 0830715511ab602242487c5fae0dc7a5b75e0c9d7705e624181ec13cc4726a06d7935df952aeddda0dc2c46db95ab14af9d8229a2302b1e6d2fd7e892b42267b +DIST dotnet-runtime-6.0.36-linux-musl-x64.tar.gz 30274917 BLAKE2B f91058ea230a8bf30aa1238f050d60fa20c197ad5a454c268c92a45149c1cc4ca0fa11a5769281fd6352107835406ca31dfe9e5ba6d247d6a4cc38205f448aa0 SHA512 56c2161c52901706fd769d2c9168cff5959576bd1a72d89f7c27858f467f59970624ea9a0559368462bc178e7c9ef7d86d0fda08c7dbdb72dd3e9084280823eb +DIST dotnet-runtime-6.0.36-linux-x64.tar.gz 30710677 BLAKE2B 0ce592fa15dcb7fab1b4f6a56ce75319c704a4a7f20dbf8459f2217bfb8addae300f04c3fe62315167868e123f124c662c47f704b22b053a2866992bbf7735fe SHA512 afb6018fcabec468ccd7ae2f1131d8c9de7f4de7645b8f0c223efbbdbfdc515fb0642a399ebfe372c02044416c4cae463c9c802cd156b9da4181efff0e33ee94 +DIST dotnet-runtime-8.0.11-linux-arm.tar.gz 29507762 BLAKE2B fe596a37f5ff52e93c458ad4086b227660b091f7c28c6fc955529496a82875cc64f4ee70239e52735c4ccdceed8dbf54007d40edc6df22acabe82e4a39aca799 SHA512 279b93bf6b5c5c2f45427b620c56bff0e22ec8f3fb9a4f3749e7a6a0d0d0ee8163851b5bd081c6814b758068df7ba1b9401c844ba5905b27a830020846ef6406 +DIST dotnet-runtime-8.0.11-linux-arm64.tar.gz 29865496 BLAKE2B 9f083e8dc662fd33f4404c57114ddd15315c0d2f6e8a6927fe2850e615c82d8c7e3858079613b2ec18fd98c6317bf78499e3460239f84ae5155309e6c15fe937 SHA512 f27d66dcdd249a6a2f87241b460238960240d163ffc081d8e7b42bd62702079f1a6784e3503dbd4ea8f9e816d82142fc829c759cbf9a1682b0340f0cebe16db5 +DIST dotnet-runtime-8.0.11-linux-musl-arm.tar.gz 29525229 BLAKE2B 1cf7d9c412ef07ea1ab30e9f0511ca52a343115f364bc2dae1a13f3c1fc6f59ac134a1a8926dd564e4d3e1da4a2402552cf23e134fa303255b4f8b7ba2313c31 SHA512 e29ec7c4c123debfb1c20aa49eccdbcb6c493a0bca8d480c113d0e413b2b546ed01767b1056dda4b0f58029c147f513c3af95669d29cb2babdbda4d358b2d0fd +DIST dotnet-runtime-8.0.11-linux-musl-arm64.tar.gz 29888696 BLAKE2B 7255f7948d8eec355b92445d8c8967a9efcb09cbf17cbacba1ab6bd2fb3810d45a0832acf4f9142206cc59624abf68fe83f02b263008f28f45385ee3a42d9284 SHA512 6a94ce888eb060f63a0ec9554985198c48c5c5612577db7c10204b58b2ef36ef96a597067d75574abdca61a87472914b5df3312be74773ac32fa7043d60370d8 +DIST dotnet-runtime-8.0.11-linux-musl-x64.tar.gz 31308143 BLAKE2B 72ef859e230be60a46a275b303fbcd11a6e8d3a46af482bcee82e5e7508c86385ce5670c73e447e438de1e180b0df1c5a17726cf34d397149af530d3b5565bc9 SHA512 ff00d19ced7ea204caccc6c11c484e5a1ecdb9ffa9ac9a6b8ed2f7f7c9089aad098e5b41d2ebe5c24cbbc0956df64032b62ed7277fac3d3b64b742c50209be61 +DIST dotnet-runtime-8.0.11-linux-x64.tar.gz 31277651 BLAKE2B a9f47f68b896461e8be209c5ca03e2cb17ee001a319dedce2a4cf18efedc633132afa905916344d4dd409f132b89dfe46c2673e5b5590c71bbc04bc4b9597361 SHA512 71ea528900c6fc7b54e951622296421d2a96191870c47e937117b84b28f91bf407d02046ddfecfe4ac37dc6182c65d1940927c33e45fa3d6f0179f81692490d6 +DIST dotnet-runtime-9.0.0-linux-arm.tar.gz 31224167 BLAKE2B 89713e8365b6307baa2849b437064f93536a6db58cad4c20fbfd116a70f83664ac07da05cd889acb188721d984484b661cd76b0bd2a1336538ec81235c638bcb SHA512 fab552df6d884090aba1f658c8812b5369e9bea17e6a1f905145cde512772b57db5d5cf586c6c2b7f2e56a8cb83c206f0cf7594bcf42d32844b8103538bd883f +DIST dotnet-runtime-9.0.0-linux-arm64.tar.gz 31797263 BLAKE2B e406e8de36edc2f2102b6dd4e0ee6d3a17e1376a5d94079fb53238f09f3d99e33a79f68706d80e6eb18c44326236a54319f503d16a23782606037487d5f1c4e0 SHA512 4f9c2dd544af0b8540c16352b9f01f75f828b8e4e084057a300a4dec652fb3d6532906cdd4246399cc13f16b571b17575812ec2f9c297e27bbed678baf4b2fde +DIST dotnet-runtime-9.0.0-linux-musl-arm.tar.gz 31214926 BLAKE2B 54e0b161d9a30a2c51c2f2a78e195689ff74b3e63e3f4a3b21804996c08ed10d1f05427a460caa7ad925948bd5cb755008efecabce242cb7e5669834f9983be8 SHA512 97dc1ddcac177d73b517d651326ec484eac52501c506c8c837c3f9ceaf476ddf929ccece9b6dc2c0a4e7d378576fd73930a8835814690631a560642527335b33 +DIST dotnet-runtime-9.0.0-linux-musl-arm64.tar.gz 31820840 BLAKE2B 906a367cbf4505e567ed49e0268c2a46043d8dc36583675e976f65af458d23dd7e84c2d4a5b031bf3876b01aa8327b370ad8389ed1b339ab26ce913dd77cf8a8 SHA512 33523364d9310b75d9819a4866b120c03b9ef7946bd3646b15930e37ff1e211de294c8a94b4ad6c1c0f7d291cb70601a4188e396d4252f5767a36a6dbe68502a +DIST dotnet-runtime-9.0.0-linux-musl-x64.tar.gz 33527934 BLAKE2B 37a46215147cbe82a64dfec490cab26018bd325d08c8b440aef314acc2fac6f6030a646de542abe47e38e1dc3134c618dedffe58d149d2518cfcad7dbc91c0c4 SHA512 9c33d73a898fa9b4e84ae1844468b69086979f7c2c8ea6b32db0fea62a4014513cea0619025f9edb23e67ab4ae4e2f2725d1d9bb892858bba7dfe8ed17aee799 +DIST dotnet-runtime-9.0.0-linux-x64.tar.gz 33497524 BLAKE2B eb64e433cebc129f39c4d657855a4b09ca98b8f0d3dd81684042cb1bf140f4e8a14773ae26bd5a56375b32df160a6d62ab16eba312c63c2bbfb62279d80172c6 SHA512 5176bd68637646cd36fce7a88f83effe1065fb075e6d4a46b8be3c33d5a8394740577f0ed4f8b4fb13fa69fe83b229eb55ab7f45caac90849bf0392a670ed5af diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.36.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.36.ebuild new file mode 100644 index 0000000..b3e3224 --- /dev/null +++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.36.ebuild @@ -0,0 +1,66 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" +HOMEPAGE="https://dotnet.microsoft.com/" + +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 ) + )" +} + +LICENSE="MIT" +SLOT="$(ver_cut 1-2)" +KEYWORDS="-* ~amd64 ~arm ~arm64" +IUSE="lttng" + +SRC_URI=" + $(gen_src_uri amd64 x64) + $(gen_src_uri arm) + $(gen_src_uri arm64) +" + +RDEPEND=" + sys-libs/zlib:0/1 + !dev-dotnet/dotnet-sdk-bin:${SLOT} + lttng? ( =dev-util/lttng-ust-2.12* ) +" +IDEPEND=" + app-eselect/eselect-dotnet +" + +S=${WORKDIR} + +QA_PREBUILT="*" +RESTRICT+=" splitdebug" + +delete() { + test -n "$(find . -name "$1" -print -delete)" +} + +src_compile() { + use lttng || delete libcoreclrtraceptprovider.so || die +} + +src_install() { + local dest="opt/${PN}-${SLOT}" + dodir "${dest%/*}" + + mv "${S}" "${ED}/${dest}" || die + mkdir "${S}" || die + fperms 0755 "/${dest}" + + dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" +} + +pkg_postinst() { + eselect dotnet update ifunset +} + +pkg_postrm() { + eselect dotnet update ifunset +} diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-8.0.11.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-8.0.11.ebuild new file mode 100644 index 0000000..b3e3224 --- /dev/null +++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-8.0.11.ebuild @@ -0,0 +1,66 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" +HOMEPAGE="https://dotnet.microsoft.com/" + +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 ) + )" +} + +LICENSE="MIT" +SLOT="$(ver_cut 1-2)" +KEYWORDS="-* ~amd64 ~arm ~arm64" +IUSE="lttng" + +SRC_URI=" + $(gen_src_uri amd64 x64) + $(gen_src_uri arm) + $(gen_src_uri arm64) +" + +RDEPEND=" + sys-libs/zlib:0/1 + !dev-dotnet/dotnet-sdk-bin:${SLOT} + lttng? ( =dev-util/lttng-ust-2.12* ) +" +IDEPEND=" + app-eselect/eselect-dotnet +" + +S=${WORKDIR} + +QA_PREBUILT="*" +RESTRICT+=" splitdebug" + +delete() { + test -n "$(find . -name "$1" -print -delete)" +} + +src_compile() { + use lttng || delete libcoreclrtraceptprovider.so || die +} + +src_install() { + local dest="opt/${PN}-${SLOT}" + dodir "${dest%/*}" + + mv "${S}" "${ED}/${dest}" || die + mkdir "${S}" || die + fperms 0755 "/${dest}" + + dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" +} + +pkg_postinst() { + eselect dotnet update ifunset +} + +pkg_postrm() { + eselect dotnet update ifunset +} diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-9.0.0.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-9.0.0.ebuild new file mode 100644 index 0000000..b3e3224 --- /dev/null +++ b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-9.0.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" +HOMEPAGE="https://dotnet.microsoft.com/" + +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 ) + )" +} + +LICENSE="MIT" +SLOT="$(ver_cut 1-2)" +KEYWORDS="-* ~amd64 ~arm ~arm64" +IUSE="lttng" + +SRC_URI=" + $(gen_src_uri amd64 x64) + $(gen_src_uri arm) + $(gen_src_uri arm64) +" + +RDEPEND=" + sys-libs/zlib:0/1 + !dev-dotnet/dotnet-sdk-bin:${SLOT} + lttng? ( =dev-util/lttng-ust-2.12* ) +" +IDEPEND=" + app-eselect/eselect-dotnet +" + +S=${WORKDIR} + +QA_PREBUILT="*" +RESTRICT+=" splitdebug" + +delete() { + test -n "$(find . -name "$1" -print -delete)" +} + +src_compile() { + use lttng || delete libcoreclrtraceptprovider.so || die +} + +src_install() { + local dest="opt/${PN}-${SLOT}" + dodir "${dest%/*}" + + mv "${S}" "${ED}/${dest}" || die + mkdir "${S}" || die + fperms 0755 "/${dest}" + + dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" +} + +pkg_postinst() { + eselect dotnet update ifunset +} + +pkg_postrm() { + eselect dotnet update ifunset +} diff --git a/dev-dotnet/dotnet-runtime-bin/metadata.xml b/dev-dotnet/dotnet-runtime-bin/metadata.xml new file mode 100644 index 0000000..196723c --- /dev/null +++ b/dev-dotnet/dotnet-runtime-bin/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>alex_y_xu@yahoo.ca</email> + <name>Alex Xu (Hello71)</name> + </maintainer> + <upstream> + <doc>https://docs.microsoft.com/en-us/dotnet/</doc> + </upstream> + <use> + <flag name="lttng"> + Install support libraries for LTTng with .NET. + </flag> + </use> +</pkgmetadata> diff --git a/dev-java/freemarker-bin/Manifest b/dev-java/freemarker-bin/Manifest deleted file mode 100644 index d95f30d..0000000 --- a/dev-java/freemarker-bin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST apache-freemarker-2.3.31-bin.tar.gz 3193874 BLAKE2B 5f11d07c6c37d84820d00c56cea420c4b0570259e5e35e6f87f7eb6c0204735c58f72d181a9bc22f0a7234ef09292cba34b00b88a60546c79ad590ab8cd49359 SHA512 c3d9aefa0c0d2703835d7fbed7c6d3074b4be97b4e7c3ec7995f69e7dbb34e24e559ecf8261aa048a7230c1916db593de685a7af3b03e08ec75b1996d1f811fb diff --git a/dev-java/freemarker-bin/freemarker-bin-2.3.31.ebuild b/dev-java/freemarker-bin/freemarker-bin-2.3.31.ebuild deleted file mode 100644 index 04be86b..0000000 --- a/dev-java/freemarker-bin/freemarker-bin-2.3.31.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 - -DESCRIPTION="A Java tool to generate text output based on templates (binary package)" -HOMEPAGE="https://freemarker.apache.org/" -SRC_URI="https://downloads.apache.org/freemarker/engine/${PV}/binaries/apache-freemarker-${PV}-bin.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - !dev-java/freemarker - >=virtual/jre-1.7 -" - -S="${WORKDIR}/apache-freemarker-${PV}-bin" - -src_install() { - java-pkg_dojar freemarker.jar -} diff --git a/dev-java/freemarker-bin/metadata.xml b/dev-java/freemarker-bin/metadata.xml deleted file mode 100644 index 004555a..0000000 --- a/dev-java/freemarker-bin/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> -</pkgmetadata> diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest index 5c0a132..998cf94 100644 --- a/dev-java/openj9-openjdk-bin/Manifest +++ b/dev-java/openj9-openjdk-bin/Manifest @@ -1,16 +1,18 @@ -DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.12_7_openj9-0.27.0.tar.gz 257296341 SHA256 c80416fd8e9f100746ca06166dd50a724d3b4b077162350f2b88ff6b746aefb8 -DIST ibm-semeru-open-debugimage_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 260567193 SHA256 bd8c8f9a07444c5b4c5e88de3bf952d27ef93e1f95485a027d84b4158141593f -DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.12_7_openj9-0.27.0.tar.gz 310406729 SHA256 b3f2a7de056bd6a817a28baaca93b7337163941fe88a49ea2460ce677f4144d5 -DIST ibm-semeru-open-debugimage_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 313671311 SHA256 92535ef6c071e6e00dba4988fb4ec2533cb1c27232d1b308cc872043ed4ffc98 -DIST ibm-semeru-open-debugimage_s390x_linux_11.0.12_7_openj9-0.27.0.tar.gz 275761551 SHA256 eb7b44331d65771f4ef72978b8088166007a340330c8eda0de0a6a29d566842c -DIST ibm-semeru-open-debugimage_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 279233218 SHA256 b771cd97b91cf9233b5ae3fa4970debac036c434ebce03c833bc73113f03986c -DIST ibm-semeru-open-debugimage_x64_linux_11.0.12_7_openj9-0.27.0.tar.gz 320291464 SHA256 a3bf2cf972394b0dfd4f984dfe2d71fea3552ba448c0c050057091c587bf4be3 -DIST ibm-semeru-open-debugimage_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 323689143 SHA256 24a871c4ea86fec1bca82df385ef28d2315703d62c841344839b52a1ac21d6ad -DIST ibm-semeru-open-jdk_aarch64_linux_11.0.12_7_openj9-0.27.0.tar.gz 197763167 SHA256 f025af94a65872653baeb6f889ec6d592ce9d92391fa04e82fb68a50b96178a7 -DIST ibm-semeru-open-jdk_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 200907027 SHA256 022cda1210331488c3db3d0d1282ea74467397fdabc34cb482cdfe81c45f6a15 -DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.12_7_openj9-0.27.0.tar.gz 203013889 SHA256 7d49a5b29a84831526f7bffaaee399ac9a26d05712ac4b9cb7ca0a370ed3f020 -DIST ibm-semeru-open-jdk_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 206337625 SHA256 d5901996f2c0889b2b92de97fed0b36d5068da308be0fbd6c8293a6b6b91634d -DIST ibm-semeru-open-jdk_s390x_linux_11.0.12_7_openj9-0.27.0.tar.gz 200393575 SHA256 991f8df53079378782b9de3bbfd4c52a19920ea9ba90e9a54c871ce47b599cdb -DIST ibm-semeru-open-jdk_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 203152325 SHA256 3a2741a2e14b9934405a6c0b6af9e865687a70814af355e62dd84025707ccfdc -DIST ibm-semeru-open-jdk_x64_linux_11.0.12_7_openj9-0.27.0.tar.gz 202156239 SHA256 4c2d776f69e3ff7d01cd57c0938b7a7f058264425faf18e3708b905e93f915c4 -DIST ibm-semeru-open-jdk_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 205317058 SHA256 1349eb9a1d9af491a1984d66a80126730357c4a5c4fcbe7112a2c832f6c0886e +DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 392541433 SHA256 db6da3a6b41410a4a2e75aa5b733e2500730baa480be0f60f4bf79273e0dabe1 +DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 388670023 SHA256 48514a5a6a42589221360a31086ef17962cbffb6161d7e2644c6bada110480d2 +DIST ibm-semeru-open-debugimage_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 392473040 SHA256 ea43a44ca03734f6616e9cddc7c85fac0a46cca094b2ba77e853eac8c9f08e7d +DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 406192866 SHA256 23a3b21a54649fbab4bce711571fbac747ea746782350f11b61b0027a98bd8bd +DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 402615768 SHA256 6f0843adb3685e3a9debf6e18253748c8bf8e309075903a847e99668f44b7e3f +DIST ibm-semeru-open-debugimage_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 406680845 SHA256 46c066f829cd752fe9d3c35f48df3269f9539655499b0f67c7497a6cb25afb16 +DIST ibm-semeru-open-debugimage_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 416188045 SHA256 49987b5f8c9cf9d4d9a267c7c735b6e9674608af7c3669765354e0600a552c14 +DIST ibm-semeru-open-debugimage_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 411832363 SHA256 fadb8e67da8af2201dde91d959f1698e5724b3ec1e4e0f5b8e3482e175fc19f7 +DIST ibm-semeru-open-debugimage_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 416057502 SHA256 747fa72c225040b1128e9d3311b5f89441730eae43132cf7b1dd4715243c5ae4 +DIST ibm-semeru-open-jdk_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 206134841 SHA256 41aa50c53f899ff3ae49fa84cf5e5ef218b5670ffd3822ed13df136339190417 +DIST ibm-semeru-open-jdk_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 209490355 SHA256 08a982b6fbca457718bc43d14f1e836d7aa93eeaec7cd308793f990f8a5755ed +DIST ibm-semeru-open-jdk_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 223101860 SHA256 a2bd932fc2737f7605172dbfc4f6a1dfa262cbf9606a21cb83ba1ea94c5898e0 +DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 216745194 SHA256 e6e9fde688965274b025b998d44a84d03d27428bcb2116dc38ddfd2dd25c7699 +DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 220764693 SHA256 41831486054fab00e1ea925b465ee162ba9ad8b65420d50ff7b3dbccd11e1542 +DIST ibm-semeru-open-jdk_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 234557620 SHA256 7e094e5a25b46452ef2067be50a8b5137a1a00d9fddf47993b0a1f56e70c1632 +DIST ibm-semeru-open-jdk_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 213541898 SHA256 13aa056c7f6b4bdee89d98b319fc5894f02deb2e019023f44699928281b6df69 +DIST ibm-semeru-open-jdk_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 217452384 SHA256 7df65eeedda313cd73d28e6f46029f48b96e4d329066f0438b9b2b43aaafad59 +DIST ibm-semeru-open-jdk_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 231105498 SHA256 70228be801934a3a51761cc6ec5531b4ab52a8942efd2f0f5033ae6b24ae1423 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.12.7.0.27.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild deleted file mode 100644 index 2473ff0..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 toolchain-funcs versionator - -abi_uri() { - echo "${2-$1}? ( - debug? ( - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz - ) - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz - )" -} - -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) - $(abi_uri x64 amd64) -" - -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 ~s390" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${JDK_PV}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -do_rm() { - rm -v $1 || die - if use debug ; then - rm -v "${S}-debug-image"/$1 || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - do_rm 'lib/libjsound.*' - fi - - if use headless-awt ; then - do_rm 'lib/lib*{[jx]awt,splashscreen}*' - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts \ - "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - use gentoo-vm && 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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild new file mode 100644 index 0000000..023e8ec --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + echo "${2-$1}? ( + debug? ( + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz + ) + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz + )" +} + +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 +SLOT=$(ver_cut 1) + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) +" + +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 headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${JDK_PV}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # prefer system copy # https://bugs.gentoo.org/776676 + rm -vf lib/libharfbuzz.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + 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-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild deleted file mode 100644 index 2473ff0..0000000 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 toolchain-funcs versionator - -abi_uri() { - echo "${2-$1}? ( - debug? ( - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz - ) - https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz - )" -} - -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) - $(abi_uri x64 amd64) -" - -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 ~s390" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${JDK_PV}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -do_rm() { - rm -v $1 || die - if use debug ; then - rm -v "${S}-debug-image"/$1 || die - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - do_rm 'lib/libjsound.*' - fi - - if use headless-awt ; then - do_rm 'lib/lib*{[jx]awt,splashscreen}*' - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts \ - "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - use gentoo-vm && 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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild new file mode 100644 index 0000000..023e8ec --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + echo "${2-$1}? ( + debug? ( + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz + ) + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz + )" +} + +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 +SLOT=$(ver_cut 1) + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) +" + +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 headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${JDK_PV}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # prefer system copy # https://bugs.gentoo.org/776676 + rm -vf lib/libharfbuzz.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + 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-21.0.7_p6.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild new file mode 100644 index 0000000..023e8ec --- /dev/null +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +abi_uri() { + echo "${2-$1}? ( + debug? ( + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz + ) + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz + )" +} + +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 +SLOT=$(ver_cut 1) + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) +" + +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 headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${JDK_PV}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_unpack() { + default + if [[ ${A} == *_mac_* ]] ; then + mv -v "${S}/Contents/Home/"* "${S}" || die + rm -Rf "${S}/Contents" # drop macOS executable + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + # on macOS if they would exist they would be called .dylib, but most + # importantly, there are no different providers, so everything + # that's shipped works. + if [[ ${A} != *_mac_* ]] ; then + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # prefer system copy # https://bugs.gentoo.org/776676 + rm -vf lib/libharfbuzz.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + fi + + if ! use source ; then + rm -v lib/src.zip || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + 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 f037b57..d3babd8 100644 --- a/dev-java/openj9-openjdk-jre-bin/Manifest +++ b/dev-java/openj9-openjdk-jre-bin/Manifest @@ -1,8 +1,9 @@ -DIST ibm-semeru-open-jre_aarch64_linux_11.0.12_7_openj9-0.27.0.tar.gz 41737266 SHA256 06fa66b99d3c9ba07f117860ef653d52bcb19dac1ea598c15f3b4eec9f832b36 -DIST ibm-semeru-open-jre_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 41451784 SHA256 575dc3827077fc661fd1103effaa13ccd0f1606d01a33643956ed2eb1ece9763 -DIST ibm-semeru-open-jre_ppc64le_linux_11.0.12_7_openj9-0.27.0.tar.gz 44324701 SHA256 285bd388a497db61408d26a9f3328f62004714ede94456718cf6440a109e25d2 -DIST ibm-semeru-open-jre_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 44063048 SHA256 51dac9a69b594c72adabb2c36634a121be04a17c4ce34628cf9b37fd5010c1a8 -DIST ibm-semeru-open-jre_s390x_linux_11.0.12_7_openj9-0.27.0.tar.gz 43083467 SHA256 6e5829aeb37abfb122e0944e438ecb2043c56df14fcdcce39bd4e3c9a55571a8 -DIST ibm-semeru-open-jre_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 42822005 SHA256 dba28e3e06bb7c76b4da2f46c48ed74dc72e168f9ee01439decadea181eb402c -DIST ibm-semeru-open-jre_x64_linux_11.0.12_7_openj9-0.27.0.tar.gz 43580993 SHA256 f352998f6fdf0b84f63c563608be57f30aa3f14c8117c1219422dbc712ad4f81 -DIST ibm-semeru-open-jre_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 43282252 SHA256 b077cd0b35d3ed1927c22e5b498264ecff67297992809056187b42662edfc536 +DIST ibm-semeru-open-jre_aarch64_linux_11.0.27_6_openj9-0.51.0.tar.gz 47804344 SHA256 7aa093df03eb825d62a72a64a60e238e9fde2d36ed18f6e5418e07318ad155a2 +DIST ibm-semeru-open-jre_aarch64_linux_17.0.15_6_openj9-0.51.0.tar.gz 47146898 SHA256 9a44da58055525719ddb87b2fe21a02562a0897b8b537a65b7a94b1ab28f7eb0 +DIST ibm-semeru-open-jre_aarch64_linux_21.0.7_6_openj9-0.51.0.tar.gz 51681810 SHA256 8a140dc3806d8e0ae23ca37cff6b4cf225eea45bc82b0749c05ad5f05b9cff36 +DIST ibm-semeru-open-jre_ppc64le_linux_11.0.27_6_openj9-0.51.0.tar.gz 52978070 SHA256 81c7c9ee709939cc66d5122f096cd36a4d1630851d275881799746b8f9d050da +DIST ibm-semeru-open-jre_ppc64le_linux_17.0.15_6_openj9-0.51.0.tar.gz 52265472 SHA256 e852a334a4a3f59bd8478ffe3190bbdb520fa37d8954e17fc7842ede979b15fa +DIST ibm-semeru-open-jre_ppc64le_linux_21.0.7_6_openj9-0.51.0.tar.gz 56894775 SHA256 c3e5287710e9a30a905e82cd0bb67a114cec08fc4a03f82798e76d22a1a7137e +DIST ibm-semeru-open-jre_x64_linux_11.0.27_6_openj9-0.51.0.tar.gz 51392477 SHA256 73b79ace5c4e01cf5b0c002799185a5db4a601b3158c690cb204e3b618ad7b6e +DIST ibm-semeru-open-jre_x64_linux_17.0.15_6_openj9-0.51.0.tar.gz 50712179 SHA256 c4cc045bfd63fc6412251fef184c91a1acad76d74ee48561fd48c174fb1278d3 +DIST ibm-semeru-open-jre_x64_linux_21.0.7_6_openj9-0.51.0.tar.gz 55276782 SHA256 1c439bacc90f3a119edc3a7f313512b49b21d583a960cb318094974fe5006246 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-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild index 206c839..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit java-vm-2 toolchain-funcs versionator +inherit java-vm-2 abi_uri() { echo "${2-$1}? ( @@ -11,27 +11,25 @@ abi_uri() { )" } -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) $(abi_uri x64 amd64) " DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" -HOMEPAGE="https://adoptopenjdk.net" +HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +KEYWORDS="~amd64 ~arm64 ~ppc64" +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 @@ -52,8 +50,13 @@ QA_PREBUILT="*" S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. @@ -66,15 +69,12 @@ src_install() { fi rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts dodir "${dest}" cp -pPR * "${ddest}" || die - # 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 @@ -82,15 +82,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi } diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild index 206c839..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit java-vm-2 toolchain-funcs versionator +inherit java-vm-2 abi_uri() { echo "${2-$1}? ( @@ -11,27 +11,25 @@ abi_uri() { )" } -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) $(abi_uri x64 amd64) " DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" -HOMEPAGE="https://adoptopenjdk.net" +HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +KEYWORDS="~amd64 ~arm64 ~ppc64" +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 @@ -52,8 +50,13 @@ QA_PREBUILT="*" S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. @@ -66,15 +69,12 @@ src_install() { fi rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts dodir "${dest}" cp -pPR * "${ddest}" || die - # 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 @@ -82,15 +82,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi } diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild new file mode 100644 index 0000000..3f1b111 --- /dev/null +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 + +abi_uri() { + echo "${2-$1}? ( + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jre_${1}_linux_${DL_PV/+/_}.tar.gz + )" +} + +JDK_PV=${PV//_p/+} +DL_PV=${JDK_PV}_openj9-0.51.0 +SLOT=$(ver_cut 1) + +SRC_URI=" + $(abi_uri aarch64 arm64) + $(abi_uri ppc64le ppc64) + $(abi_uri x64 amd64) +" + +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 headless-awt selinux" + +RDEPEND=" + media-libs/fontconfig:1.0 + media-libs/freetype:2 + >=sys-apps/baselayout-java-0.1.0-r1 + >=sys-libs/glibc-2.2.5:* + sys-libs/zlib + alsa? ( media-libs/alsa-lib ) + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/jdk-${JDK_PV}-jre" + +src_install() { + local dest="/opt/${PN}-${SLOT}" + local ddest="${ED}/${dest#/}" + + # Not sure why they bundle this as it's commonly available and they + # only do so on x86_64. It's needed by libfontmanager.so. IcedTea + # also has an explicit dependency while Oracle seemingly dlopens it. + rm -vf lib/libfreetype.so || die + + # Oracle and IcedTea have libjsoundalsa.so depending on + # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. + if ! use alsa ; then + rm -v lib/libjsound.* || die + fi + + if use headless-awt ; then + rm -v lib/lib*{[jx]awt,splashscreen}* || die + fi + + rm -v lib/security/cacerts || die + dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + 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 +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest index 89d0bef..533a846 100644 --- a/dev-java/openj9-openjdk/Manifest +++ b/dev-java/openj9-openjdk/Manifest @@ -1,4 +1,4 @@ -DIST openj9-0.27.1.tar.gz 16668711 BLAKE2B 091047b3770d86b652042b49f419c4d4597bb13630b853223a909fa0a135b0252d280e9ba2f1735c9f1c02dceb33a997e7906464d83669cd20d7993766ac46fc SHA512 1ba28787cf92eafb0e789ecac33b0f772bea6d4856f6120befe9c1928a8dcac04569808b053209fafa09a097c32fd3eed2c6c7137250a4e8b6cb96d37e4eec4e -DIST openj9-omr-0.27.1.tar.gz 7815053 BLAKE2B 97d4481dbcd8643e95e2ff50b873f1018c297dff0140207c3352ba5c5395092d21a1b2abcb5796f4d96daf4635f3a86cf76fab8376457fca7f8d1f4692ff9b03 SHA512 980d13ad900aec0d644058f3738f53b29467f4fbda03a2094ccceaa34955e79165002dc2d441af0fe878b523f62b15d315375dea2d5fa57942b5d1509e7afbbd -DIST openj9-openjdk-jdk11-openj9-0.27.1.tar.gz 108889106 BLAKE2B 32260d462fd1daab077cd72f5bd16ae793309d1efa930dcc5cbb2c56b1fc33194f93a4aaef904b23c9a6d16b0206042fbd3a1bc812005e2d115a3f5564849b6f SHA512 a33d0382c4a13cc608341715214c52ef3a81d8476291c078f6a808ebd0674b5f6153645fbd61ec818298e8e82d962b92107b73be67d3ab2610bbbae06804c28b -DIST openj9-openjdk-jdk16-openj9-0.27.1.tar.gz 90946973 BLAKE2B 6e06d96e74b8201fbec23eca14329b13f2a828a0abc6b29658a0b84af927f04142d2f9fd7810e93a00ab6d99e8bc71d38c21fc4bc26eb334166d596567b0f51b SHA512 c170ded18e3f1a41b3cc83d8d16202b4debdcd3d2fa4fbca7ce2c78be1d3d3fa8bc0d466b0a280b7c63a1161e3f50ece3b468096876a61e0cdb999d402895e06 +DIST openj9-0.48.0.tar.gz 18480709 BLAKE2B 4d3d593ce295c0ba40ef32cc79f0e00b4864d2bc5d36e26c0bd0e2c3aa3406888e8a764472c212ff45ab59d092055e9e9775231fd8d979643d91d022911bd147 SHA512 28247eb763056becf881f1a3f431a073f4605d062e26bfc30a8cad86cab7b7a9a114a44faff40743957315d808a42ff7636554ff794dac640578ec75e9328749 +DIST openj9-omr-0.48.0.tar.gz 8126272 BLAKE2B d343b0129d639cd2887c98fe64b92c66ff2932537520158faa2dbaa465cfb32d6ff0c5c7bf0a5591a8f57e25f85cfc1a85f34c7f6bd9f07e04a35d5b50eb09f7 SHA512 090aee202bb7dd46fcc93f94a7168d22f3b2546d86456d40ba12aba7d76699345502aafc25ca5b675ba7683cfa2414564113c91ba31ad720d1f6867d63f70aab +DIST openj9-openjdk-jdk11-openj9-0.48.0.tar.gz 102800187 BLAKE2B 82a04892e389a5e24c59a17d2efa95a37e092480dfbbf89f47da965179aaead0b56c1cbe26efcd905bfeb018667880faf077e410bf0d689a1b99178acf398fb4 SHA512 9288f83706aeb945a479b4478b365911408a92ac703f43418f3f98fc1beaefb008c8d0b46dd055200122a9d549da89cd727a2eef8598b7ba069cf36055d1207d +DIST openj9-openjdk-jdk21-openj9-0.48.0.tar.gz 100484633 BLAKE2B c23d1325c8db43a7076cc589ea0a485cae2d0d26668f8da5cb2a2db2cc6b43052a7e848d04e7c66f03f7696a19690a0812f9aff92deedf7c426ede03b9aa36c7 SHA512 5b4a390c53643ee10affd5b0c6277f5ac6be873f34035c28fb7b75fca04f9e08e91b66ed505e8a5c0eb114f0cf00d6af2bb8c42f2495e3b6913cc253a7969836 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 50669cc..dadf469 100644 --- a/dev-java/openj9-openjdk/metadata.xml +++ b/dev-java/openj9-openjdk/metadata.xml @@ -1,19 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <longdescription> - Java™ is the world's leading programming language and platform. - The code for Java is open source and available at OpenJDK™. - </longdescription> - <slots> - <slot name="11">Java™ version 11</slot> - </slots> + <maintainer type="person"> + <email>alex_y_xu@yahoo.ca</email> + <name>Alex Xu (Hello71)</name> + </maintainer> <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> </pkgmetadata> diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild index 12447f2..4e7eb58 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs -SLOT="$(get_major_version)" -OPENJ9_PV="$(get_version_component_range 2-4)" +SLOT="$(ver_cut 1)" +OPENJ9_PV="$(ver_cut 2-4)" OPENJ9_P=openj9-${OPENJ9_PV} -FREEMARKER_PV=2.3.30 -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" +DESCRIPTION="Extensions for OpenJDK for Eclipse OpenJ9" +HOMEPAGE="https://www.eclipse.org/openj9/" if [[ ${OPENJ9_PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" @@ -19,16 +18,20 @@ 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 -LICENSE="GPL-2" +LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) +" COMMON_DEPEND=" media-libs/freetype:2= @@ -37,12 +40,12 @@ COMMON_DEPEND=" media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) + media-libs/libjpeg-turbo:0= + systemtap? ( dev-debug/systemtap ) dev-libs/elfutils - dev-libs/libdwarf - sys-process/numactl + ddr? ( dev-libs/libdwarf ) + numa? ( sys-process/numactl ) " # Many libs are required to build, but not to run, make is possible to remove @@ -80,18 +83,14 @@ DEPEND=" x11-libs/libXtst javafx? ( dev-java/openjfx:${SLOT}= ) || ( - virtual/jdk:${SLOT} - virtual/jdk:$((SLOT-1)) + dev-java/openj9-openjdk-bin:${SLOT} + dev-java/openj9-openjdk:${SLOT} + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} ) " -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -if [[ ${OPENJ9_PV} == 9999 ]]; then - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" -else - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" -fi +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 @@ -110,13 +109,23 @@ pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - [[ $(gcc-major-version) == 11 ]] && die "gcc 11 hangs when optimizing exploded image" + + if use jitserver && tc-is-clang; then + die "jitserver does not compile with clang" + fi fi } pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return + + JAVA_PKG_WANT_BUILD_VM="openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT} openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + java-pkg-2_pkg_setup } @@ -142,31 +151,37 @@ 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 - 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 chmod +x configure || die } src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 + # Work around stack alignment issue, bug #647954. use x86 && append-flags -mincoming-stack-boundary=2 + # Strip some flags users may set, but should not. #818502 + filter-flags -fexceptions + + # Strip lto related flags, we rely on USE=lto and --with-jvm-features=link-time-opt + # https://bugs.gentoo.org/833097 + # https://bugs.gentoo.org/833098 + filter-lto + filter-flags -fdevirtualize-at-ltrans + # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and # graphviz are detected. pandoc has loads of dependencies anyway. local myconf=( --disable-ccache + --disable-precompiled-headers + --disable-warnings-as-errors{,-omr,-openj9} --enable-full-docs=no --with-boot-jdk="${JDK_HOME}" --with-extra-cflags="${CFLAGS}" @@ -186,19 +201,25 @@ src_configure() { --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" --with-vendor-version-string="${PVR}" --with-version-pre="" - --with-version-opt="" --with-zlib=system --enable-dtrace=$(usex systemtap yes no) --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") - --disable-warnings-as-errors{,-omr,-openj9} --with-cmake $(use_enable ddr) + $(use_enable jitserver) ) + use lto && myconf+=( --with-jvm-features=link-time-opt ) + if use javafx; then - local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + # this is not useful for users, just for upstream developers + # build system compares mesa version in md file + # https://bugs.gentoo.org/822612 + export LEGAL_EXCLUDES=mesa3d.md + + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" if [[ -r ${zip} ]]; then myconf+=( --with-import-modules="${zip}" ) else @@ -206,13 +227,6 @@ src_configure() { fi fi - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -222,21 +236,37 @@ src_configure() { } src_compile() { + # Too brittle - gets confused by e.g. -Oline + export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)" + unset GNUMAKEFLAGS MAKEFLAGS + + local mycmakeargsx=( + "-DCMAKE_C_FLAGS='${CFLAGS}'" + "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'" + "-DCMAKE_CXX_FLAGS='${CXXFLAGS}'" + "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'" + "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" + -DOMR_WARNINGS_AS_ERRORS=OFF + -DOMR_PORT_NUMA_SUPPORT=$(usex numa) + ) local myemakeargs=( JOBS=$(makeopts_jobs) - # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 - #LOG=debug + LOG=debug $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF" + 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 } src_install() { local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" + local ddest="${ED}/${dest#/}" cd "${S}"/build/*-release/images/jdk || die @@ -251,10 +281,6 @@ src_install() { rm -v lib/libjsound.* || die fi - if ! use examples ; then - rm -vr demo/ || die - fi - if ! use source ; then rm -v lib/src.zip || die fi @@ -264,34 +290,22 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym ../../../../../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 if use doc ; then docinto html dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" + dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi } diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild index c9285f0..6bf8ca9 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs -SLOT="$(get_major_version)" -OPENJ9_PV="$(get_version_component_range 2-4)" +SLOT="$(ver_cut 1)" +OPENJ9_PV="$(ver_cut 2-4)" OPENJ9_P=openj9-${OPENJ9_PV} -FREEMARKER_PV=2.3.30 -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" +DESCRIPTION="Extensions for OpenJDK for Eclipse OpenJ9" +HOMEPAGE="https://www.eclipse.org/openj9/" if [[ ${OPENJ9_PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" @@ -19,16 +18,20 @@ 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/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 -LICENSE="GPL-2" +LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver lto numa selinux source systemtap" + +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) +" COMMON_DEPEND=" media-libs/freetype:2= @@ -37,12 +40,12 @@ COMMON_DEPEND=" media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) + media-libs/libjpeg-turbo:0= + systemtap? ( dev-debug/systemtap ) dev-libs/elfutils - dev-libs/libdwarf - sys-process/numactl + ddr? ( dev-libs/libdwarf ) + numa? ( sys-process/numactl ) " # Many libs are required to build, but not to run, make is possible to remove @@ -80,7 +83,6 @@ DEPEND=" x11-libs/libXtst javafx? ( dev-java/openjfx:${SLOT}= ) || ( - virtual/jdk:${SLOT} dev-java/openj9-openjdk-bin:${SLOT} dev-java/openj9-openjdk:${SLOT} dev-java/openjdk-bin:${SLOT} @@ -88,13 +90,7 @@ DEPEND=" ) " -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -if [[ ${OPENJ9_PV} == 9999 ]]; then - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" -else - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}" -fi +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 @@ -113,7 +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" - [[ $(gcc-major-version) == 11 ]] && die "gcc 11 hangs when optimizing exploded image" + + if use jitserver && tc-is-clang; then + die "jitserver does not compile with clang" + fi fi } @@ -121,6 +120,8 @@ pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup + [[ ${MERGE_TYPE} == "binary" ]] && return + JAVA_PKG_WANT_BUILD_VM="openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT} openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" @@ -135,31 +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 - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ -z ${JDK_HOME} ]]; then - for slot in ${SLOT} $((SLOT-1)); do - for variant in openj9- ''; do - if has_version --host-root dev-java/${variant}openjdk:${slot}; then - JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${slot} - break - elif has_version --host-root dev-java/${variant}openjdk-bin:${slot}; then - JDK_HOME=$(best_version --host-root dev-java/${variant}openjdk-bin:${slot}) - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - break - fi - done - done - fi - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - export JDK_HOME - fi } src_unpack() { @@ -184,30 +165,48 @@ 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 '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \ - -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - closed/OpenJ9.gmk - 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 chmod +x configure || die } 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 + # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/codert_vm/thunkcrt.c:95: error: function 'icallVMprJavaSendVirtualL' redeclared as variable + # 95 | extern void * icallVMprJavaSendVirtualL; + # /tmp/portage/dev-java/openj9-openjdk-21.0.48.0/work/openj9-openjdk-jdk21-openj9-0.48.0/openj9/runtime/compiler/runtime/Runtime.cpp:341:1: note: previously declared here + # 341 | JIT_HELPER(icallVMprJavaSendVirtualL); + filter-lto + # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and # graphviz are detected. pandoc has loads of dependencies anyway. local myconf=( --disable-ccache + --disable-precompiled-headers + --disable-warnings-as-errors{,-omr,-openj9} --enable-full-docs=no --with-boot-jdk="${JDK_HOME}" --with-extra-cflags="${CFLAGS}" @@ -227,19 +226,20 @@ src_configure() { --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" --with-vendor-version-string="${PVR}" --with-version-pre="" - --with-version-opt="" --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) + --enable-jvm-feature-dtrace=$(usex systemtap yes no) --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") - --disable-warnings-as-errors{,-omr,-openj9} --with-cmake $(use_enable ddr) + $(use_enable jitserver) ) + use lto && myconf+=( --with-jvm-features=link-time-opt ) + if use javafx; then - local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" + local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" if [[ -r ${zip} ]]; then myconf+=( --with-import-modules="${zip}" ) else @@ -247,13 +247,6 @@ src_configure() { fi fi - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - ( unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS CFLAGS= CXXFLAGS= LDFLAGS= \ @@ -263,21 +256,33 @@ src_configure() { } src_compile() { + local mycmakeargsx=( + "-DCMAKE_C_FLAGS='${CFLAGS}'" + "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'" + "-DCMAKE_CXX_FLAGS='${CXXFLAGS}'" + "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'" + "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" + -DOMR_WARNINGS_AS_ERRORS=OFF + -DOMR_PORT_NUMA_SUPPORT=$(usex numa) + ) local myemakeargs=( JOBS=$(makeopts_jobs) - # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 - #LOG=debug + LOG=debug $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF" + 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 + emake "${myemakeargs[@]}" -j1 } src_install() { local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" + local ddest="${ED}/${dest#/}" cd "${S}"/build/*-release/images/jdk || die @@ -292,10 +297,6 @@ src_install() { rm -v lib/libjsound.* || die fi - if ! use examples ; then - rm -vr demo/ || die - fi - if ! use source ; then rm -v lib/src.zip || die fi @@ -305,12 +306,12 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts + dosym -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 @@ -323,16 +324,4 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi } diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest deleted file mode 100644 index 4f83a41..0000000 --- a/dev-java/openjdk-bin/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz 203066417 SHA256 3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85 -DIST OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz 187587741 SHA256 20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df -DIST OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz 186081896 SHA256 8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6 -DIST OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz 178964996 SHA256 421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f -DIST OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz 205449187 SHA256 7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f -DIST OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz 205463525 BLAKE2B 65b8cbf626840e8e3cf5daffda9aed3763ae5c4e2458e71c9854b955cbce8404d498222ec0b30ead9e718d1ee794559f2bcd7b60f630bd0c7e140f671546e873 SHA512 af25ffaeea4034c3d4b14daeacf719e9de87896069885d51c677aaddb3104bc64487fbb4ab33afb420ed88ea60771626f674d998eaed8d4237f1a7cb751c2146 diff --git a/dev-java/openjdk-bin/files/openjdk-bin.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh deleted file mode 100644 index 9e9c5ec..0000000 --- a/dev-java/openjdk-bin/files/openjdk-bin.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml deleted file mode 100644 index 4c0b1aa..0000000 --- a/dev-java/openjdk-bin/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription> - Java™ is the world's leading programming language and platform. - The code for Java is open source and available at OpenJDK™. - AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure. - </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/openjdk-bin/openjdk-bin-16.0.2_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-16.0.2_p7.ebuild deleted file mode 100644 index 82df0fe..0000000 --- a/dev-java/openjdk-bin/openjdk-bin-16.0.2_p7.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 toolchain-funcs - -abi_uri() { - echo "${2-$1}? ( - https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz - )" -} - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} - -SRC_URI=" - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" -IUSE="alsa cups +gentoo-vm headless-awt selinux source" - -RDEPEND=" - media-libs/fontconfig:1.0 - media-libs/freetype:2 - >=sys-apps/baselayout-java-0.1.0-r1 - >=sys-libs/glibc-2.2.5:* - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${MY_PV}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts \ - "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - use gentoo-vm && 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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest deleted file mode 100644 index 8fc1426..0000000 --- a/dev-java/openjdk-jre-bin/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz 47622188 SHA256 4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5 -DIST OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz 43628046 SHA256 c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7 -DIST OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz 44094924 SHA256 495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930 -DIST OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz 48818276 SHA256 5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40 diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh deleted file mode 100644 index ec0dca4..0000000 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="\${JAVA_HOME}/man" -PROVIDES_TYPE="JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml deleted file mode 100644 index 8fa79b5..0000000 --- a/dev-java/openjdk-jre-bin/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription> - Java™ is the world's leading programming language and platform. - The code for Java is open source and available at OpenJDK™. - AdoptOpenJDK provides prebuilt OpenJDK JRE binaries from a fully open source set of build scripts and infrastructure. - </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/openjdk-jre-bin/openjdk-jre-bin-16.0.1_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-16.0.1_p9.ebuild deleted file mode 100644 index 8e41243..0000000 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-16.0.1_p9.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-vm-2 - -abi_uri() { - echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz - )" -} - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} - -SRC_URI=" - $(abi_uri arm) - $(abi_uri aarch64 arm64) - $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) -" - -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="alsa cups +gentoo-vm 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 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/jdk-${MY_PV}-jre" - -src_install() { - local dest="/opt/${P}" - local ddest="${ED%/}/${dest#/}" - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die - fi - - rm -v lib/security/cacerts || die - dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - use gentoo-vm && 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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE" - ewarn "recognised by the system. This will almost certainly break things." - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java 11. This JRE must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/opt/${P}." - fi -} diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest deleted file mode 100644 index d28c01e..0000000 --- a/dev-java/openjdk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openjdk-17.0.0_p35.tar.gz 104576069 BLAKE2B 079865c8c679836b7edf04e2341b60713bbd7dbc43a608a23c03359e2a636d9dd972d2c79ec3c45bcd3ad7ea54dd15ef697480efb86ee5ad0022fd360818696d SHA512 6f263bc78f00f42612c42282fb40370315e7c93454d69ad12ad98463a3397f6eeda21e661a42749c9807d84f672ed90bfce59c889a407f3cf60744e205233fff diff --git a/dev-java/openjdk/files/openjdk.env.sh b/dev-java/openjdk/files/openjdk.env.sh deleted file mode 100644 index 96c4be7..0000000 --- a/dev-java/openjdk/files/openjdk.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="OpenJDK ${PV}" -JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml deleted file mode 100644 index e95815a..0000000 --- a/dev-java/openjdk/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <slots> - <slot name="14">Java™ version 14</slot> - </slots> - <use> - <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="source">Install JVM sources</flag> - <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> - </use> -</pkgmetadata> diff --git a/dev-java/openjdk/openjdk-17.0.0_p35.ebuild b/dev-java/openjdk/openjdk-17.0.0_p35.ebuild deleted file mode 100644 index d1b1e48..0000000 --- a/dev-java/openjdk/openjdk-17.0.0_p35.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs - -# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to -# set build version properly -MY_PV="${PV%_p*}" -MY_PV="${MY_PV%.0.0}-ga" -SLOT="${PV%%[.+]*}" - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" -SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/harfbuzz:= - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - || ( - virtual/jdk:${SLOT} - virtual/jdk:$((SLOT-1)) - ) - javafx? ( dev-java/openjfx:${SLOT}= ) -" - -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_prepare() { - default - chmod +x configure || die -} - -src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - # Enabling full docs appears to break doc building. If not - # explicitly disabled, the flag will get auto-enabled if pandoc and - # graphviz are detected. pandoc has loads of dependencies anyway. - - local myconf=( - --disable-ccache - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-freetype=system - --with-giflib=system - --with-harfbuzz=system - --with-lcms=system - --with-libjpeg=system - --with-libpng=system - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-string="${PV%_p*}" - --with-version-build="${PV#*_p}" - --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - $(tc-is-clang && echo "--with-toolchain-type=clang") - ) - - if use javafx; then - local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - local myemakeargs=( - JOBS=$(makeopts_jobs) - LOG=debug - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 #nowarn -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi -} diff --git a/dev-libs/highway/Manifest b/dev-libs/highway/Manifest deleted file mode 100644 index 30461b0..0000000 --- a/dev-libs/highway/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST highway-0.12.2.tar.gz 1487685 BLAKE2B 7304dc2b3b8c704aa0f138f24d7118a3d364ad5a7f1ae359dcad16444c3f02a12d1454855459290a3d0bfae5b25e7d6baec2a8c5fd00d6165cb0f6695e02b479 SHA512 857a3ecbeaf13d69b9807d6f7daf0a1dc791008c7ce0413cb20457eb057f60fa9a5836eff7cf28c884566bae746d9b7d850b3cf88767bb299f10fd1440a56e06 diff --git a/dev-libs/highway/highway-0.12.2.ebuild b/dev-libs/highway/highway-0.12.2.ebuild deleted file mode 100644 index 7f21cc2..0000000 --- a/dev-libs/highway/highway-0.12.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch" -HOMEPAGE="https://github.com/google/highway" -SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -DEPEND="test? ( dev-cpp/gtest )" -RDEPEND="" -BDEPEND="" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DHWY_SYSTEM_GTEST=ON - ) - cmake_src_configure -} diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest index b1547de..09c1620 100644 --- a/dev-libs/libdwarf/Manifest +++ b/dev-libs/libdwarf/Manifest @@ -1 +1 @@ -DIST libdwarf-0.1.1.tar.xz 1929280 BLAKE2B 1a542e982db03cbf380de52db2b1fa5c7d29f4a1b56a6373f011819cf3677f09ebe7446c7f28cfd84f61365f022f25469b869eccd148cd5781218fb6875d669c SHA512 eb2502d847fd5ee15928651dcc1ef30dab04b7e65d7e772dd245da74bb071ce525cfdf97d1af5dbceb50c1a12cccda5c762f461d03a16c55557ab5e94e79e8ab +DIST libdwarf-0.11.1.tar.xz 2747004 BLAKE2B b98467abd547e222594843263ef36a9362aa4a8c8ace770d128016e65a50c7ae15d91e769e6fd966ca9b8c5b5ed471d14e5e7259c713c126ac17e13d5d074a77 SHA512 d927b1d0e8dd1540c2f5da2a9d39b2914bb48225b2b9bdca94e7b36349358e1f537044eadc345f11d75de717fdda07ad99a8a7a5eb45e64fe4c79c37e165012f diff --git a/dev-libs/libdwarf/libdwarf-0.1.1.ebuild b/dev-libs/libdwarf/libdwarf-0.11.1.ebuild index 39a2c3c..5c4daa8 100644 --- a/dev-libs/libdwarf/libdwarf-0.1.1.ebuild +++ b/dev-libs/libdwarf/libdwarf-0.11.1.ebuild @@ -4,17 +4,19 @@ EAPI=7 DESCRIPTION="The DWARF Debugging Information Format" -HOMEPAGE="https://www.prevanders.net/dwarf.html" -SRC_URI="https://www.prevanders.net/${P}.tar.xz" +HOMEPAGE="https://github.com/davea42/libdwarf-code" +SRC_URI="https://github.com/davea42/libdwarf-code/releases/download/v${PV}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="dwarfexample dwarfgen static-libs" +IUSE="+decompression dwarfexample dwarfgen static-libs" DEPEND=" - sys-libs/zlib - dwarfgen? ( virtual/libelf ) + decompression? ( + app-arch/zstd + sys-libs/zlib + } " RDEPEND="${DEPEND}" @@ -22,10 +24,15 @@ src_configure() { local myeconfargs=( --includedir="${EPREFIX}/usr/include/${PN}" --enable-shared + $(use_enable decompression) $(use_enable dwarfexample) $(use_enable dwarfgen) - $(use_enable dwarfgen libelf) $(use_enable static-libs static) ) econf "${myeconfargs[@]}" } + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libdwarf/metadata.xml b/dev-libs/libdwarf/metadata.xml index c4a208f..086dc90 100644 --- a/dev-libs/libdwarf/metadata.xml +++ b/dev-libs/libdwarf/metadata.xml @@ -6,7 +6,11 @@ <name>Alex Xu (Hello71)</name> </maintainer> <use> - <flag name="dwarfexample">dwarfexample</flag> - <flag name="dwarfgen">dwarfgen</flag> + <flag name="decompression">Enable decompression with zlib/zstd</flag> + <flag name="dwarfexample">Install dwarfexample bin</flag> + <flag name="dwarfgen">Install dwarfgen bin</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 e9a287e..ff260cf 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,2 +1,2 @@ -DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8 -DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0 +DIST openssl-3.3.2.tar.gz 18076531 BLAKE2B cc53d45418673bc2a406d6697b8bd17ff6c726463c4ccc87bb2fa5a6592d0d178dc8cfeb2fbb980ea354a5dc2c86f31c48453427c6937896c7221273e623c9b5 SHA512 5ae47bf1aed2740a33ba5df7dc7345a6738aa6bfa3c9c4de5e51742485e24b25192988d7a2c1b8201ef70056ad8abd0ca78b3d55abe24c0b0373d83b47ed9b74 +DIST openssl-3.3.2.tar.gz.asc 833 BLAKE2B c318e2dcef085b83ced77048dc136d9bc8438d49a7985f3c6ebd4ffd0e5e290ece47e8fd1074c6cc056e87b2bae2101dd58b8d70dbc0eb99aa134d776125439c SHA512 981f8438bbd541b97e745aca1bb77cde68900ce4b5ffefc9eccc2f18c675292203f6b4c7bffefde2256a442b7310d8438279b52fb21aac65921e9a529bc00067 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/files/openssl-1.1.0j-parallel_install_fix.patch b/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch deleted file mode 100644 index c837e20..0000000 --- a/dev-libs/openssl/files/openssl-1.1.0j-parallel_install_fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/openssl/openssl/issues/7679 - ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -77,8 +77,14 @@ - # to. You're welcome. - sub dependmagic { - my $target = shift; -- -- return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target"; -+ my $magic = <<"_____"; -+$target: build_generated depend -+ \$(MAKE) _$target -+_$target -+_____ -+ # Remove line ending -+ $magic =~ s|\R$||; -+ return $magic; - } - ''; - -} diff --git a/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch b/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch deleted file mode 100644 index c94b032..0000000 --- a/dev-libs/openssl/files/openssl-1.1.1i-riscv32.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5b5e2985f355c8e99c196d9ce5d02c15bebadfbc Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Thu, 29 Aug 2019 13:56:21 -0700 -Subject: [PATCH] Add support for io_pgetevents_time64 syscall - -32-bit architectures that are y2038 safe don't include syscalls that use -32-bit time_t. Instead these architectures have suffixed syscalls that -always use a 64-bit time_t. In the case of the io_getevents syscall the -syscall has been replaced with the io_pgetevents_time64 syscall instead. - -This patch changes the io_getevents() function to use the correct -syscall based on the avaliable syscalls and the time_t size. We will -only use the new 64-bit time_t syscall if the architecture is using a -64-bit time_t. This is to avoid having to deal with 32/64-bit -conversions and relying on a 64-bit timespec struct on 32-bit time_t -platforms. As of Linux 5.3 there are no 32-bit time_t architectures -without __NR_io_getevents. In the future if a 32-bit time_t architecture -wants to use the 64-bit syscalls we can handle the conversion. - -This fixes build failures on 32-bit RISC-V. - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> - -Reviewed-by: Richard Levitte <levitte@openssl.org> -Reviewed-by: Paul Dale <paul.dale@oracle.com> -(Merged from https://github.com/openssl/openssl/pull/9819) ---- - engines/e_afalg.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/engines/e_afalg.c b/engines/e_afalg.c -index dacbe358cb..99516cb1bb 100644 ---- a/engines/e_afalg.c -+++ b/engines/e_afalg.c -@@ -125,7 +125,23 @@ static ossl_inline int io_getevents(aio_context_t ctx, long min, long max, - struct io_event *events, - struct timespec *timeout) - { -+#if defined(__NR_io_getevents) - return syscall(__NR_io_getevents, ctx, min, max, events, timeout); -+#elif defined(__NR_io_pgetevents_time64) -+ /* Let's only support the 64 suffix syscalls for 64-bit time_t. -+ * This simplifies the code for us as we don't need to use a 64-bit -+ * version of timespec with a 32-bit time_t and handle converting -+ * between 64-bit and 32-bit times and check for overflows. -+ */ -+ if (sizeof(timeout->tv_sec) == 8) -+ return syscall(__NR_io_pgetevents_time64, ctx, min, max, events, timeout, NULL); -+ else { -+ errno = ENOSYS; -+ return -1; -+ } -+#else -+# error "We require either the io_getevents syscall or __NR_io_pgetevents_time64." -+#endif - } - - static void afalg_waitfd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, --- -2.26.2 - diff --git a/dev-libs/openssl/files/openssl-3.3.2-CVE-2024-9143.patch b/dev-libs/openssl/files/openssl-3.3.2-CVE-2024-9143.patch new file mode 100644 index 0000000..5776c78 --- /dev/null +++ b/dev-libs/openssl/files/openssl-3.3.2-CVE-2024-9143.patch @@ -0,0 +1,193 @@ +https://bugs.gentoo.org/941643 +https://github.com/openssl/openssl/commit/c0d3e4d32d2805f49bec30547f225bc4d092e1f4 + +From c0d3e4d32d2805f49bec30547f225bc4d092e1f4 Mon Sep 17 00:00:00 2001 +From: Viktor Dukhovni <viktor@openssl.org> +Date: Thu, 19 Sep 2024 01:02:40 +1000 +Subject: [PATCH] Harden BN_GF2m_poly2arr against misuse. + +The BN_GF2m_poly2arr() function converts characteristic-2 field +(GF_{2^m}) Galois polynomials from a representation as a BIGNUM bitmask, +to a compact array with just the exponents of the non-zero terms. + +These polynomials are then used in BN_GF2m_mod_arr() to perform modular +reduction. A precondition of calling BN_GF2m_mod_arr() is that the +polynomial must have a non-zero constant term (i.e. the array has `0` as +its final element). + +Internally, callers of BN_GF2m_poly2arr() did not verify that +precondition, and binary EC curve parameters with an invalid polynomial +could lead to out of bounds memory reads and writes in BN_GF2m_mod_arr(). + +The precondition is always true for polynomials that arise from the +standard form of EC parameters for characteristic-two fields (X9.62). +See the "Finite Field Identification" section of: + + https://www.itu.int/ITU-T/formal-language/itu-t/x/x894/2018-cor1/ANSI-X9-62.html + +The OpenSSL GF(2^m) code supports only the trinomial and pentanomial +basis X9.62 forms. + +This commit updates BN_GF2m_poly2arr() to return `0` (failure) when +the constant term is zero (i.e. the input bitmask BIGNUM is not odd). + +Additionally, the return value is made unambiguous when there is not +enough space to also pad the array with a final `-1` sentinel value. +The return value is now always the number of elements (including the +final `-1`) that would be filled when the output array is sufficiently +large. Previously the same count was returned both when the array has +just enough room for the final `-1` and when it had only enough space +for non-sentinel values. + +Finally, BN_GF2m_poly2arr() is updated to reject polynomials whose +degree exceeds `OPENSSL_ECC_MAX_FIELD_BITS`, this guards against +CPU exhausition attacks via excessively large inputs. + +The above issues do not arise in processing X.509 certificates. These +generally have EC keys from "named curves", and RFC5840 (Section 2.1.1) +disallows explicit EC parameters. The TLS code in OpenSSL enforces this +constraint only after the certificate is decoded, but, even if explicit +parameters are specified, they are in X9.62 form, which cannot represent +problem values as noted above. + +Initially reported as oss-fuzz issue 71623. + +A closely related issue was earlier reported in +<https://github.com/openssl/openssl/issues/19826>. + +Severity: Low, CVE-2024-9143 + +Reviewed-by: Matt Caswell <matt@openssl.org> +Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> +Reviewed-by: Paul Dale <ppzgs1@gmail.com> +Reviewed-by: Tomas Mraz <tomas@openssl.org> +(Merged from https://github.com/openssl/openssl/pull/25639) + +(cherry picked from commit 8e008cb8b23ec7dc75c45a66eeed09c815b11cd2) +--- a/crypto/bn/bn_gf2m.c ++++ b/crypto/bn/bn_gf2m.c +@@ -15,6 +15,7 @@ + #include "bn_local.h" + + #ifndef OPENSSL_NO_EC2M ++# include <openssl/ec.h> + + /* + * Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should +@@ -1130,16 +1131,26 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, + /* + * Convert the bit-string representation of a polynomial ( \sum_{i=0}^n a_i * + * x^i) into an array of integers corresponding to the bits with non-zero +- * coefficient. Array is terminated with -1. Up to max elements of the array +- * will be filled. Return value is total number of array elements that would +- * be filled if array was large enough. ++ * coefficient. The array is intended to be suitable for use with ++ * `BN_GF2m_mod_arr()`, and so the constant term of the polynomial must not be ++ * zero. This translates to a requirement that the input BIGNUM `a` is odd. ++ * ++ * Given sufficient room, the array is terminated with -1. Up to max elements ++ * of the array will be filled. ++ * ++ * The return value is total number of array elements that would be filled if ++ * array was large enough, including the terminating `-1`. It is `0` when `a` ++ * is not odd or the constant term is zero contrary to requirement. ++ * ++ * The return value is also `0` when the leading exponent exceeds ++ * `OPENSSL_ECC_MAX_FIELD_BITS`, this guards against CPU exhaustion attacks, + */ + int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max) + { + int i, j, k = 0; + BN_ULONG mask; + +- if (BN_is_zero(a)) ++ if (!BN_is_odd(a)) + return 0; + + for (i = a->top - 1; i >= 0; i--) { +@@ -1157,12 +1168,13 @@ int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max) + } + } + +- if (k < max) { ++ if (k > 0 && p[0] > OPENSSL_ECC_MAX_FIELD_BITS) ++ return 0; ++ ++ if (k < max) + p[k] = -1; +- k++; +- } + +- return k; ++ return k + 1; + } + + /* +--- a/test/ec_internal_test.c ++++ b/test/ec_internal_test.c +@@ -155,6 +155,56 @@ static int field_tests_ecp_mont(void) + } + + #ifndef OPENSSL_NO_EC2M ++/* Test that decoding of invalid GF2m field parameters fails. */ ++static int ec2m_field_sanity(void) ++{ ++ int ret = 0; ++ BN_CTX *ctx = BN_CTX_new(); ++ BIGNUM *p, *a, *b; ++ EC_GROUP *group1 = NULL, *group2 = NULL, *group3 = NULL; ++ ++ TEST_info("Testing GF2m hardening\n"); ++ ++ BN_CTX_start(ctx); ++ p = BN_CTX_get(ctx); ++ a = BN_CTX_get(ctx); ++ if (!TEST_ptr(b = BN_CTX_get(ctx)) ++ || !TEST_true(BN_one(a)) ++ || !TEST_true(BN_one(b))) ++ goto out; ++ ++ /* Even pentanomial value should be rejected */ ++ if (!TEST_true(BN_set_word(p, 0xf2))) ++ goto out; ++ if (!TEST_ptr_null(group1 = EC_GROUP_new_curve_GF2m(p, a, b, ctx))) ++ TEST_error("Zero constant term accepted in GF2m polynomial"); ++ ++ /* Odd hexanomial should also be rejected */ ++ if (!TEST_true(BN_set_word(p, 0xf3))) ++ goto out; ++ if (!TEST_ptr_null(group2 = EC_GROUP_new_curve_GF2m(p, a, b, ctx))) ++ TEST_error("Hexanomial accepted as GF2m polynomial"); ++ ++ /* Excessive polynomial degree should also be rejected */ ++ if (!TEST_true(BN_set_word(p, 0x71)) ++ || !TEST_true(BN_set_bit(p, OPENSSL_ECC_MAX_FIELD_BITS + 1))) ++ goto out; ++ if (!TEST_ptr_null(group3 = EC_GROUP_new_curve_GF2m(p, a, b, ctx))) ++ TEST_error("GF2m polynomial degree > %d accepted", ++ OPENSSL_ECC_MAX_FIELD_BITS); ++ ++ ret = group1 == NULL && group2 == NULL && group3 == NULL; ++ ++ out: ++ EC_GROUP_free(group1); ++ EC_GROUP_free(group2); ++ EC_GROUP_free(group3); ++ BN_CTX_end(ctx); ++ BN_CTX_free(ctx); ++ ++ return ret; ++} ++ + /* test EC_GF2m_simple_method directly */ + static int field_tests_ec2_simple(void) + { +@@ -443,6 +493,7 @@ int setup_tests(void) + ADD_TEST(field_tests_ecp_simple); + ADD_TEST(field_tests_ecp_mont); + #ifndef OPENSSL_NO_EC2M ++ ADD_TEST(ec2m_field_sanity); + ADD_TEST(field_tests_ec2_simple); + #endif + ADD_ALL_TESTS(field_tests_default, crv_len); + diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml index 5ca8d93..23f356c 100644 --- a/dev-libs/openssl/metadata.xml +++ b/dev-libs/openssl/metadata.xml @@ -1,17 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> <use> <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag> - <flag name="bindist">Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI</flag> + <flag name="fips">Enable FIPS provider</flag> + <flag name="ktls">Enable support for Kernel implementation of TLS (kTLS)</flag> <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag> - <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag> - <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag> - <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag> + <flag name="tls-compression">Enable support for discouraged TLS compression</flag> + <flag name="weak-ssl-ciphers">Build support for SSL/TLS ciphers that are considered "weak"</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id> diff --git a/dev-libs/openssl/openssl-1.1.1l-r2.ebuild b/dev-libs/openssl/openssl-1.1.1l-r2.ebuild deleted file mode 100644 index 5b9585b..0000000 --- a/dev-libs/openssl/openssl-1.1.1l-r2.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs multilib-minimal - -MY_P=${P/_/-} - -# This patch set is based on the following files from Fedora 31, -# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec -# for more details: -# - hobble-openssl (SOURCE1) -# - ec_curve.c (SOURCE12) -- MODIFIED -# - ectest.c (SOURCE13) -# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED -BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz" - -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="https://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - bindist? ( - mirror://gentoo/${BINDIST_PATCH_SET} - https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} - )" - -LICENSE="openssl" -SLOT="0/1.1" # .so version of libssl/libcrypto -[[ "${PV}" = *_pre* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" -IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla" -RESTRICT="!bindist? ( bindist ) - !test? ( test )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - sys-process/procps - )" -PDEPEND="app-misc/ca-certificates" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 - "${FILESDIR}"/${PN}-1.1.1i-riscv32.patch -) - -S="${WORKDIR}/${MY_P}" - -# force upgrade to prevent broken login, bug 696950 -RDEPEND+=" !<net-misc/openssh-8.0_p1-r3" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl don't work with userpriv! - if use test && use sctp; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - 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 - - if use bindist; then - mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die - bash "${WORKDIR}"/hobble-openssl || die - - cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die - cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die - - eapply "${WORKDIR}"/bindist-patches/ec-curves.patch - - local known_failing_test - for known_failing_test in \ - 30-test_evp_extra.t \ - 80-test_ssl_new.t \ - ; do - ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist" - rm test/recipes/${known_failing_test} || die - eend $? - done - - # Also see the configure parts below: - # enable-ec \ - # $(use_ssl !bindist ec2m) \ - fi - - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # 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 - - if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi - fi - - eapply_user #332661 - - if use test && use sctp && has network-sandbox ${FEATURES}; then - ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox" - rm test/recipes/80-test_ssl_new.t || die - eend $? - fi - - # make sure the man pages are suffixed #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 - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - # Prefixify Configure shebang (#141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -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() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired https://en.wikipedia.org/wiki/MDC-2 - # RC5: Expired https://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - # Fedora hobbled-EC needs 'no-ec2m' - # 'srp' was restricted until early 2017 as well. - # "disable-deprecated" option breaks too many consumers. - # Don't set it without thorough revdeps testing. - # Make sure user flags don't get added *yet* to avoid duplicated - # flags. - CFLAGS= LDFLAGS= echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - enable-ec \ - $(use_ssl !bindist ec2m) \ - $(use_ssl !bindist sm2) \ - enable-srp \ - $(use elibc_musl && echo "no-async") \ - $(use amd64 && echo enable-ec_nistp_64_gcc_128) \ - enable-idea \ - enable-mdc2 \ - $(use_ssl sslv3 ssl3) \ - $(use_ssl sslv3 ssl3-method) \ - $(use_ssl asm) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl tls-compression zlib) \ - $(use_ssl tls-heartbeat heartbeats) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # 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 -} - -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 all -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED}/usr" ]]; then - # We can only create this directory once - mkdir "${ED}"/usr || die - fi - - emake DESTDIR="${D}" install - - # 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 - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el - - # 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} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # 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 :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-3.0.0-r1.ebuild b/dev-libs/openssl/openssl-3.0.0-r1.ebuild deleted file mode 100644 index 2f01d4b..0000000 --- a/dev-libs/openssl/openssl-3.0.0-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic linux-info toolchain-funcs multilib-minimal - -MY_P=${P/_/-} - -DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" -HOMEPAGE="https://www.openssl.org/" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/openssl/openssl.git" - - inherit git-r3 -else - SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" -fi - -LICENSE="Apache-2.0" -SLOT="0/3" # .so version of libssl/libcrypto - -IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=app-misc/c_rehash-1.7-r1 - tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) -" - -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - sys-process/procps - )" - -DEPEND="${COMMON_DEPEND}" - -RDEPEND="${COMMON_DEPEND}" - -PDEPEND="app-misc/ca-certificates" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/openssl/configuration.h -) - -pkg_setup() { - if use ktls ; then - if kernel_is -lt 4 18 ; then - ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" - else - 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!" - - linux-info_pkg_setup - fi - fi - - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl don't work with userpriv! - if use test && use sctp ; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - 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 - - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # 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 - - if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi - fi - - eapply_user - - if use test && use sctp && has network-sandbox ${FEATURES} ; then - einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." - rm test/recipes/80-test_ssl_new.t || die - fi - - # make sure the man pages are suffixed #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 - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - - # Prefixify Configure shebang (#141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -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() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export AR CC CXX RANLIB RC - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - local myeconfargs=( - ${sslout} - $(use cpu_flags_x86_sse2 || echo "no-sse2") - enable-camellia - enable-ec - enable-ec2m - enable-sm2 - enable-srp - $(use elibc_musl && echo "no-async") - $(use amd64 && echo enable-ec_nistp_64_gcc_128) - enable-idea - enable-mdc2 - $(use_ssl asm) - $(use_ssl ktls) - $(use_ssl rfc3779) - $(use_ssl sctp) - $(use_ssl tls-compression zlib) - --prefix="${EPREFIX}"/usr - --openssldir="${EPREFIX}"${SSL_CNF_DIR} - --libdir=$(get_libdir) - shared - threads - ) - - CFLAGS= LDFLAGS= echoit \ - ./${config} \ - "${myeconfargs[@]}" \ - || die - - # 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 -} - -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 all -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED}/usr" ]] ; then - # We can only create this directory once - mkdir "${ED}"/usr || die - fi - - emake DESTDIR="${D}" install - - # 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 - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs ; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el - - # 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 :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-3.3.2-r1.ebuild b/dev-libs/openssl/openssl-3.3.2-r1.ebuild new file mode 100644 index 0000000..4030adf --- /dev/null +++ b/dev-libs/openssl/openssl-3.3.2-r1.ebuild @@ -0,0 +1,292 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc +inherit edo flag-o-matic linux-info toolchain-funcs +inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig + +DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" +HOMEPAGE="https://openssl-library.org/" + +MY_P=${P/_/-} + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/openssl/openssl.git" + + inherit git-r3 +else + SRC_URI=" + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz + verify-sig? ( + https://github.com/openssl/openssl/releases/download/${P}/${P}.tar.gz.asc + ) + " + + if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then + KEYWORDS="~amd64 ~x86" + fi +fi + +S="${WORKDIR}"/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0/$(ver_cut 1)" # .so version of libssl/libcrypto +IUSE="+asm cpu_flags_x86_sse2 fips ktls quic rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + !<net-misc/openssh-9.2_p1-r3 + tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) +" +BDEPEND=" + >=dev-lang/perl-5 + sctp? ( >=net-misc/lksctp-tools-1.0.12 ) + test? ( + sys-apps/diffutils + app-alternatives/bc + sys-process/procps + ) + verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +PDEPEND="app-misc/ca-certificates" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/openssl/configuration.h +) + +PATCHES=( + "${FILESDIR}"/${P}-CVE-2024-9143.patch +) + +pkg_setup() { + if use ktls ; then + if kernel_is -lt 4 18 ; then + ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!" + else + 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 + fi + + [[ ${MERGE_TYPE} == binary ]] && return + + # must check in pkg_setup; sysctl doesn't work with userpriv! + if use test && use sctp ; then + # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" + # if sctp.auth_enable is not enabled. + local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) + if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then + die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" + fi + fi +} + +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}"/${MY_P}.tar.gz{,.asc} + fi + + 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 || die + + if ! use vanilla ; then + PATCHES+=( + # Add patches which are Gentoo-specific customisations here + ) + fi + + default + + if use test && use sctp && has network-sandbox ${FEATURES} ; then + einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..." + rm test/recipes/80-test_ssl_new.t || die + fi + + # 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 + # and 'make depend' uses -Werror for added fun (bug #417795 again) + tc-is-clang && append-flags -Qunused-arguments + + # We really, really need to build OpenSSL w/ strict aliasing disabled. + # It's filled with violations and it *will* result in miscompiled + # code. This has been in the ebuild for > 10 years but even in 2022, + # it's still relevant: + # - https://github.com/llvm/llvm-project/issues/55255 + # - https://github.com/openssl/openssl/issues/12247 + # - 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) + + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags + # Configure doesn't respect LIBS + export LDLIBS="${LIBS}" + + # bug #197996 + unset APPS + # bug #312551 + unset SCRIPTS + # bug #311473 + unset CROSS_COMPILE + + 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=$(bash "${FILESDIR}/gentoo.config-1.0.4") + einfo "Using configuration: ${sslout:-(openssl knows best)}" + + # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features + local myeconfargs=( + ${sslout} + + $(multilib_is_native_abi || echo "no-docs") + $(use cpu_flags_x86_sse2 || echo "no-sse2") + enable-camellia + enable-ec + enable-ec2m + enable-sm2 + enable-srp + $(use elibc_musl && echo "no-async") + enable-ec_nistp_64_gcc_128 + enable-idea + enable-mdc2 + $(use fips && echo "enable-fips") + $(use quic && echo "enable-quic") + $(use_ssl asm) + $(use_ssl ktls) + $(use_ssl rfc3779) + $(use_ssl sctp) + $(use test || echo "no-tests") + $(use_ssl tls-compression zlib) + $(use_ssl weak-ssl-ciphers) + + --prefix="${EPREFIX}"/usr + --openssldir="${EPREFIX}"${SSL_CNF_DIR} + --libdir=$(get_libdir) + + shared + threads + ) + + edo perl "${S}/Configure" "${myeconfargs[@]}" +} + +multilib_src_compile() { + emake build_sw +} + +multilib_src_test() { + # See https://github.com/openssl/openssl/blob/master/test/README.md for options. + # + # VFP = show subtests verbosely and show failed tests verbosely + # Normal V=1 would show everything verbosely but this slows things down. + # + # -j1 here for https://github.com/openssl/openssl/issues/21999, but it + # shouldn't matter as tests were already built earlier, and HARNESS_JOBS + # controls running the tests. + emake -Onone -j1 HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test +} + +multilib_src_install() { + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw + if use fips; then + emake DESTDIR="${D}" -j1 install_fips + # Regen this in pkg_preinst, bug 900625 + rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die + fi + + if multilib_is_native_abi; then + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 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 + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + if ! use static-libs ; then + rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die + fi +} + +multilib_src_install_all() { + # openssl installs perl version of c_rehash by default, but + # we provide a shell version via app-misc/c_rehash + rm "${ED}"/usr/bin/c_rehash || die + + dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el + + # Create the certs directory + keepdir ${SSL_CNF_DIR}/certs + + # bug #254521 + dodir /etc/sandbox.d + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + 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 + + preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +} + +pkg_postinst() { + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" + eend $? + + preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ + /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1) +} diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest deleted file mode 100644 index a3b2a04..0000000 --- a/dev-qt/qtgui/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17 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/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch deleted file mode 100644 index 30b5abc..0000000 --- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 9 Feb 2020 11:45:00 +0100 -Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14 - -In upstream commit: - -https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument -IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for -QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland. -During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some -reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their -cmake files regenerated, leading to cmake errors like: - -https://bugs.gentoo.org/703306 -https://bugs.gentoo.org/705198 - -From mkspecs/features/create_cmake.prf: - -# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties -# functions whether a Configuration specific generator expression needs to be added to the values -# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need -# configuration specific values. For singular builds (only release or only debug), we want the -# values to be applied regardless of the configuration. -# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to -# build a Debug configuration of an application, even if Qt was built in a Release configuration. - -qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease -optional and default to FALSE. - ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100 -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 -@@ -538,8 +538,14 @@ - - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - -- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION -- IsDebugAndRelease) -+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) -+ set(IsDebugAndRelease FALSE) -+ set (list_var ${ARGN}) -+ list(LENGTH list_var num_extra_arg) -+ if (${num_extra_arg} GREATER 0) -+ list(GET list_var 0 IsDebugAndRelease) -+ endif() -+ - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch b/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch deleted file mode 100644 index b7f6548..0000000 --- a/dev-qt/qtgui/files/qtgui-5.15.2-bogus-xcb-util-dep.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 61b07d75f96d4dfb07b485b2a9bd7aed099df987 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@qt.io> -Date: Tue, 1 Dec 2020 08:43:28 +0100 -Subject: [PATCH] Revert "xcb: add xcb-util dependency for xcb-image" -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -This reverts commit adc42bebcac764ca8de78578e3a4ac39b621bd09. - -adc42beb is wrong, the bug is for static build of qt with static -xcb. It adds the explicit dependency of xcb-util 0.3.9, which is -not available on Debian yet. - -Task-number: QTBUG-86287 -Fixes: QTBUG-88688 -Change-Id: Iffc821f49bdfcad3f2556951d3677c35a7682266 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> -(adapted from commit 92a57e0b016f811876ec1d62328ca8edfe452a3a) ---- - src/gui/configure.json | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/src/gui/configure.json b/src/gui/configure.json -index c8c4864eca6..1f08795c57b 100644 ---- a/src/gui/configure.json -+++ b/src/gui/configure.json -@@ -601,15 +601,6 @@ - ], - "use": "xcb" - }, -- "xcb_util": { -- "label": "XCB Util >= 0.3.9", -- "headers": "xcb/xcb_util.h", -- "sources": [ -- { "type": "pkgConfig", "args": "xcb-util >= 0.3.9" }, -- "-lxcb-util" -- ], -- "use": "xcb" -- }, - "xcb_image": { - "label": "XCB Image >= 0.3.9", - "headers": "xcb/xcb_image.h", -@@ -617,7 +608,7 @@ - { "type": "pkgConfig", "args": "xcb-image >= 0.3.9" }, - "-lxcb-image" - ], -- "use": "xcb_shm xcb_util xcb" -+ "use": "xcb_shm xcb" - }, - "xcb_keysyms": { - "label": "XCB Keysyms >= 0.3.9", -@@ -1065,7 +1056,6 @@ - "tail": "#undef explicit", - "include": [ - "xcb/xcb.h", -- "xcb/xcb_util.h", - "xcb/xcb_image.h", - "xcb/xcb_keysyms.h", - "xcb/randr.h", -@@ -1097,7 +1087,7 @@ - "xcb_xkb_get_kbd_by_name_replies_key_names_value_list_sizeof(nullptr, 0, 0, 0, 0, 0, 0, 0, 0);" - ] - }, -- "use": "xcb_icccm xcb_util xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" -+ "use": "xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xcb" - }, - "x11prefix": { - "label": "X11 prefix", --- -2.16.3 diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml deleted file mode 100644 index cfa040f..0000000 --- a/dev-qt/qtgui/metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <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="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.2-r12.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild deleted file mode 100644 index 161da7c..0000000 --- a/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" -SLOT=5/$(ver_cut 1-3) # bug 707658 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg - +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X" -REQUIRED_USE=" - accessibility? ( dbus X ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - X? ( gles2-only? ( egl ) ) -" - -RDEPEND=" - dev-libs/glib:2 - ~dev-qt/qtcore-${PV}:5= - dev-util/gtk-update-icon-cache - media-libs/fontconfig - >=media-libs/freetype-2.6.1:2 - >=media-libs/harfbuzz-1.6.0:= - sys-libs/zlib:= - dbus? ( ~dev-qt/qtdbus-${PV} ) - egl? ( media-libs/mesa[egl] ) - eglfs? ( - media-libs/mesa[gbm] - x11-libs/libdrm - ) - evdev? ( sys-libs/mtdev ) - gles2-only? ( media-libs/mesa[gles2] ) - !gles2-only? ( virtual/opengl ) - jpeg? ( virtual/jpeg:0 ) - libinput? ( - dev-libs/libinput:= - >=x11-libs/libxkbcommon-0.5.0 - ) - png? ( media-libs/libpng:0= ) - tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( ~dev-qt/qtnetwork-${PV} ) - udev? ( virtual/libudev:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:=[xkb] - >=x11-libs/libxkbcommon-0.5.0[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 ) - udev? ( sys-kernel/linux-headers ) -" -PDEPEND=" - ibus? ( app-i18n/ibus ) - wayland? ( ~dev-qt/qtwayland-${PV} ) -" - -QT5_TARGET_SUBDIRS=( - src/tools/qvkgen - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl:egl: - eglfs:eglfs: - eglfs:eglfs_egldevice: - eglfs:eglfs_gbm: - evdev:evdev: - evdev:mtdev: - :fontconfig: - :system-freetype:FREETYPE - !:no-freetype: - !gif:no-gif: - gles2-only::OPENGL_ES - gles2-only:opengles2:OPENGL_ES_2 - !:no-gui: - :system-harfbuzz: - !:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - libinput - libinput:xkbcommon: - :opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - tslib:tslib: - udev:libudev: - vulkan:vulkan: - X:xcb: - X:xcb-glx: - X:xcb-plugin: - X:xcb-render: - X:xcb-sm: - X:xcb-xlib: - X:xcb-xinput: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -PATCHES=( - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 -) - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die - - # egl_x11 is activated when both egl and X are enabled - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.pro || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(usex dbus -dbus-linked '') - $(qt_use egl) - $(qt_use eglfs) - $(usex eglfs '-gbm -kms' '') - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - $(usex 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) - $(usex X '-xcb-xlib -DUSE_X11' '') - ) - 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 4c73850..0000000 --- a/dev-util/android-udev-rules/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST android-udev-rules-20210501.tar.bz2 20765 BLAKE2B b2f4f95f75ed2d1cff3fc82659b1b50c592ca4ca861fd12540a2e367f7a84af2fbe3f76fb77b7129b6c47f7582b21405da34e703dfd3410aa18abba6e5a3b9ea SHA512 21d817ba751fcfc10d66128756dae0a6998e41a52eda6894281788de81db3f1f5dd4cce631cea07746f0031ac3eac7d02d210e0b79a80d86c9a0f1c002fea637 diff --git a/dev-util/android-udev-rules/android-udev-rules-20210501.ebuild b/dev-util/android-udev-rules/android-udev-rules-20210501.ebuild deleted file mode 100644 index 09153b6..0000000 --- a/dev-util/android-udev-rules/android-udev-rules-20210501.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit vcs-snapshot udev user - -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.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="virtual/udev" -DEPEND="${RDEPEND}" - -src_install() { - udev_dorules 51-android.rules -} - -pkg_setup() { - enewgroup adbusers -} - -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/dev-util/binaryen/Manifest b/dev-util/binaryen/Manifest deleted file mode 100644 index c08f9f0..0000000 --- a/dev-util/binaryen/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST binaryen-102.tar.gz 3901225 BLAKE2B 7b657c89dd8aedffd67c234fd5f198ab4ee2ee2a2b35376224e031b94e96b30a5e6abda3a227268a48b1f7d96e587240c4a4be0fb3d577ef121e39febddd46c2 SHA512 04ed9abca7469fc7f0d4b348e3fc6637585306b4c92683688f0ced50bc03a9f16ea7634daed45db96f7e543d9ac66440e17339187ba97b779a041a6032f7f279 diff --git a/dev-util/binaryen/binaryen-102.ebuild b/dev-util/binaryen/binaryen-102.ebuild deleted file mode 100644 index b2e42e7..0000000 --- a/dev-util/binaryen/binaryen-102.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Compiler and toolchain infrastructure library for WebAssembly" -HOMEPAGE="https://github.com/WebAssembly/binaryen" -SRC_URI="https://github.com/WebAssembly/binaryen/archive/version_${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# broken -RESTRICT="test" - -S="${WORKDIR}/binaryen-version_${PV}" - -PATCHES=(${FILESDIR}/binaryen-undo-compile-flag-braindamage.patch) - -src_configure() { - local mycmakeargs=( - -DENABLE_WERROR=no - -DBUILD_LLVM_DWARF=no - ) - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - "${S}/check.py" || die -} diff --git a/dev-util/binaryen/files/binaryen-undo-compile-flag-braindamage.patch b/dev-util/binaryen/files/binaryen-undo-compile-flag-braindamage.patch deleted file mode 100644 index 93a7b9a..0000000 --- a/dev-util/binaryen/files/binaryen-undo-compile-flag-braindamage.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -ru a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-04-16 14:09:26.000000000 -0400 -+++ b/CMakeLists.txt 2021-04-24 09:48:11.792348791 -0400 -@@ -137,17 +137,6 @@ - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY${SUFFIX} "${PROJECT_BINARY_DIR}/lib") - endforeach() - --option(BYN_ENABLE_LTO "Build with LTO" Off) --if(BYN_ENABLE_LTO) -- if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- message(FATAL_ERROR "ThinLTO is only supported by clang") -- endif() -- if(NOT APPLE) -- add_link_flag("-fuse-ld=lld") -- endif() -- add_compile_flag("-flto=thin") --endif() -- - if(MSVC) - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.0") # VS2013 and older explicitly need /arch:sse2 set, VS2015 no longer has that option, but always enabled. - add_compile_flag("/arch:sse2") -@@ -212,15 +201,6 @@ - set(CMAKE_THREAD_PREFER_PTHREAD ON) - find_package(Threads REQUIRED) - add_cxx_flag("-std=c++${CXX_STANDARD}") -- if(NOT EMSCRIPTEN) -- if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -- # wasm doesn't allow for x87 floating point math -- add_compile_flag("-msse2") -- add_compile_flag("-mfpmath=sse") -- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^armv[2-6]" AND NOT CMAKE_CXX_FLAGS MATCHES "-mfpu=") -- add_compile_flag("-mfpu=vfpv3") -- endif() -- endif() - add_compile_flag("-Wall") - if(ENABLE_WERROR) - add_compile_flag("-Werror") -@@ -244,14 +224,6 @@ - elseif(NOT EMSCRIPTEN) - add_compile_flag("-fPIC") - endif() -- add_debug_compile_flag("-O0") -- add_debug_compile_flag("-g3") -- if(EMSCRIPTEN) -- # really focus on minimizing output size when compiling sources -- add_nondebug_compile_flag("-Oz") -- else() -- add_nondebug_compile_flag("-O2") -- endif() - if(BYN_ENABLE_ASSERTIONS) - # On non-Debug builds cmake automatically defines NDEBUG, so we - # explicitly undefine it: -@@ -273,15 +245,6 @@ - add_nondebug_compile_flag("-flto") - endif() - --# clang doesn't print colored diagnostics when invoked from Ninja --if(UNIX AND CMAKE_GENERATOR STREQUAL "Ninja") -- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -- add_compile_flag("-fdiagnostics-color=always") -- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -- add_compile_flag("-fcolor-diagnostics") -- endif() --endif() -- - # Static libraries - # Current (partial) dependency structure is as follows: - # passes -> wasm -> asmjs -> support diff --git a/dev-util/binaryen/metadata.xml b/dev-util/binaryen/metadata.xml deleted file mode 100644 index 004555a..0000000 --- a/dev-util/binaryen/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> -</pkgmetadata> diff --git a/dev-util/pmbootstrap/Manifest b/dev-util/pmbootstrap/Manifest deleted file mode 100644 index 7497892..0000000 --- a/dev-util/pmbootstrap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pmbootstrap-1.35.0.tar.gz 206636 BLAKE2B 3890309eb4538e3536a2f07e219319e87a1157303f2362371cf3a22fb41f2450b79ef69064c4735d012037f1e56b43e4f0fd586473b6a1c09ba6ed582293aa90 SHA512 f3db6ff2b4a3d050583d2f803fcc8db8bf94a6243ced6e1ff00c580b517cee685fa205954d4a5c734d1f00a734d40b3a8c5128b042aa62ccfe89be30600e4d0a diff --git a/dev-util/pmbootstrap/metadata.xml b/dev-util/pmbootstrap/metadata.xml deleted file mode 100644 index 004555a..0000000 --- a/dev-util/pmbootstrap/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> -</pkgmetadata> diff --git a/dev-util/pmbootstrap/pmbootstrap-1.35.0.ebuild b/dev-util/pmbootstrap/pmbootstrap-1.35.0.ebuild deleted file mode 100644 index b3e63e9..0000000 --- a/dev-util/pmbootstrap/pmbootstrap-1.35.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..10} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="Sophisticated chroot/build/flash tool to develop and install postmarketOS" -HOMEPAGE="https://gitlab.com/postmarketOS/pmbootstrap" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# https://gitlab.com/postmarketOS/pmbootstrap/-/issues/1951 -RESTRICT="test" - -distutils_enable_tests pytest diff --git a/dev-util/wabt/Manifest b/dev-util/wabt/Manifest deleted file mode 100644 index 89aa1a8..0000000 --- a/dev-util/wabt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wabt-1.0.24.tar.xz 1933688 BLAKE2B 577e4ac11114d726a38ed5d36268315dc363ed4f614789123701e38217c7177b46e43ad8fbde73416de95cbed69dc152e073f297348f9487d680f8f375ba928f SHA512 12c8d5a9c36a698c9ca98d8b4ae3338276ea532b96ef6f5f9574ca24fecc9db2943eff45325d73906a36fe8c5633d250b7ec7749eb47faf50f1e8643026a8074 diff --git a/dev-util/wabt/metadata.xml b/dev-util/wabt/metadata.xml deleted file mode 100644 index 004555a..0000000 --- a/dev-util/wabt/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> -</pkgmetadata> diff --git a/dev-util/wabt/wabt-1.0.24.ebuild b/dev-util/wabt/wabt-1.0.24.ebuild deleted file mode 100644 index 506cdbd..0000000 --- a/dev-util/wabt/wabt-1.0.24.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="The WebAssembly Binary Toolkit" -HOMEPAGE="https://github.com/WebAssembly/wabt" -SRC_URI="https://github.com/WebAssembly/wabt/releases/download/${PV}/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -DEPEND=" - test? ( dev-cpp/gtest ) -" -RDEPEND="" -BDEPEND=" - test? ( dev-cpp/gtest ) -" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DUSE_SYSTEM_GTEST=ON - ) - cmake_src_configure -} diff --git a/eclass/virtualwl.eclass b/eclass/virtualwl.eclass new file mode 100644 index 0000000..9146425 --- /dev/null +++ b/eclass/virtualwl.eclass @@ -0,0 +1,103 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# @ECLASS: virtualwl.eclass +# @MAINTAINER: +# alex_y_xu@yahoo.ca +# @AUTHOR: +# Alex Xu (Hello71) <alex_y_xu@yahoo.ca> +# @SUPPORTED_EAPIS: 7 8 +# @BLURB: Similar to virtualx.eclass, but using Wayland. + +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI} unsupported." +esac + +if [[ ! ${_VIRTUALWL_ECLASS} ]]; then +_VIRTUALWL_ECLASS=1 + +# @ECLASS_VARIABLE: VIRTUALWL_REQUIRED +# @PRE_INHERIT +# @DESCRIPTION: +# Variable specifying the dependency on wayland. +# Possible special values are "always" and "manual", which specify +# the dependency to be set unconditionally or not at all. +# Any other value is taken as useflag desired to be in control of +# the dependency (eg. VIRTUALWL_REQUIRED="kde" will add the dependency +# into "kde? ( )" and add kde into IUSE. +: ${VIRTUALWL_REQUIRED:=test} + +# @ECLASS_VARIABLE: VIRTUALWL_DEPEND +# @OUTPUT_VARIABLE +# @DESCRIPTION: +# Standard dependencies string that is automatically added to BDEPEND +# unless VIRTUALWL_REQUIRED is set to "manual". +readonly VIRTUALWL_DEPEND=" + gui-wm/tinywl +" + +case ${VIRTUALWL_REQUIRED} in + manual) + ;; + always) + BDEPEND="${VIRTUALWL_DEPEND}" + ;; + *) + BDEPEND="${VIRTUALWL_REQUIRED}? ( ${VIRTUALWL_DEPEND} )" + IUSE="${VIRTUALWL_REQUIRED}" + [[ ${VIRTUALWL_REQUIRED} == "test" ]] && + RESTRICT+=" !test? ( test )" + ;; +esac + +# @FUNCTION: virtwl +# @USAGE: <command> [command arguments] +# @DESCRIPTION: +# Start a new wayland session and run commands in it. +# +# Example: +# +# @CODE +# src_test() { +# virtwl default +# } +# @CODE +# +# @CODE +# python_test() { +# virtwl py.test --verbose +# } +# @CODE +# +# @CODE +# my_test() { +# some_command +# return $? +# } +# +# src_test() { +# virtwl my_test +# } +# @CODE +virtwl() { + debug-print-function ${FUNCNAME} "$@" + + [[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument" + [[ -n $XDG_RUNTIME_DIR ]] || die "${FUNCNAME} needs XDG_RUNTIME_DIR to be set; try xdg_environment_reset" + tinywl -h >/dev/null || die 'tinywl -h failed' + + # TODO: don't run addpredict in utility function. WLR_RENDERER=pixman doesn't work + addpredict /dev/dri + 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}: $@" + "$@" + + [[ -n $VIRTWL_PID ]] || die "tinywl exited unexpectedly" + exec {VIRTWL[0]}<&- {VIRTWL[1]}>&- +} +fi diff --git a/games-rpg/runescape-launcher-launcher/Manifest b/games-rpg/runescape-launcher-launcher/Manifest new file mode 100644 index 0000000..cc1b93f --- /dev/null +++ b/games-rpg/runescape-launcher-launcher/Manifest @@ -0,0 +1 @@ +DIST runescape-launcher-launcher-1.3.tar.xz 56784 BLAKE2B 18551af39f62b5310503332617e6aaba938557201c80eb111247c6cd116aae6c4fec97b151212c0eb86d3bd58c2ae2fa935b01ac32ce9e788b724bcc079b681f SHA512 3a69af5b67acebd6c637c39297ec2b82b9845a79268c40c5f19a0c8d0ef7c144944930b5649ef2712e5f80fb98b5d28ac557094bef3c232a6308f6f373e7558f diff --git a/app-arch/7-zip/metadata.xml b/games-rpg/runescape-launcher-launcher/metadata.xml index 004555a..004555a 100644 --- a/app-arch/7-zip/metadata.xml +++ b/games-rpg/runescape-launcher-launcher/metadata.xml diff --git a/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3-r1.ebuild b/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3-r1.ebuild new file mode 100644 index 0000000..48b5a06 --- /dev/null +++ b/games-rpg/runescape-launcher-launcher/runescape-launcher-launcher-1.3-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xdg + +DESCRIPTION="Launcher for official RuneScape NXT client launcher" +HOMEPAGE="https://cgit.alxu.ca/runescape-launcher-launcher.git/" +SRC_URI="https://www.alxu.ca/${P}.tar.xz" + +LICENSE="0BSD RuneScape-EULA" +SLOT="0" +KEYWORDS="-* ~amd64" + +RDEPEND=" + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + sys-libs/libcap + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXxf86vm + dev-libs/openssl-compat:1.1.1 + x11-libs/pango + media-libs/libsdl2 +" + +src_compile() { + emake prefix="${EPREFIX}/usr" +} + +src_install() { + emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install +} diff --git a/games-rpg/runescape-launcher/Manifest b/games-rpg/runescape-launcher/Manifest deleted file mode 100644 index d0c1519..0000000 --- a/games-rpg/runescape-launcher/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST runescape-launcher_2.2.9_Packages 906 BLAKE2B d67ea3e957cd226de22385c95edcc618ed8a92eb70e9f66a3c0ea4a5cc2403d62a8fd2c47d70ed2218c7a03b195bde2f1a65112bd0e8cf1d8931afc22b4fffa6 SHA512 a4a2550b26a7dd943fccd61b15b1ada6b0ad8be8337675b9df977309b7e80561e5ccc2af9be8a41ebf008a75e4501d8cbb4523a482d013e8ca08f10fee58a40b -DIST runescape-launcher_2.2.9_Release 961 BLAKE2B 3d6cdb8eb32462991712e72438f3a5422ca3213eaa0d539e25c92d0b7d9123621518b82b2e39fd8c1cfe969b230a1cd25d5e688fae858646f799bf231997c864 SHA512 e7f934b7d168043f51b118339759b22199bc16821354ff119ede4ba2f709483d22b7ecbe113b5e3ab5b64186529845d8540fee4a458fb3ecbd7ea6ed01ef1910 -DIST runescape-launcher_2.2.9_Release.gpg 488 BLAKE2B d1bdba9fc3552e680ab13fb22f93e97e658f295e56b1788194ac412e4cf42c25dd83be63ba13df89662825f67cadc5da555df45eb4dca8bc7c2a50bb1a402dbc SHA512 4cee11514d5451f86cb0854370426d1c5dfa02f71ac8525c283a9eead6891bafadde8c1ada41462c33a3ed9685c86e9adcdc89b210145d353421d9d5eecc3d26 -DIST runescape-launcher_2.2.9_amd64.deb 3874760 BLAKE2B f5db69228e497dd8a8e973188b44bbc021b49f0bbf284f351f3d2f159155640cd6f9be20e0498a190c5eb95acccdcef3470222899da7114deb8ced6e2da0710a SHA512 7e09c100e9c2eae59000739c92b76970e9cc9088d5fdc2aa2c7304ab287765d069882174157d1021f605666f7d0ab5bde7f2b67176a4a038323ef44d05425afb diff --git a/games-rpg/runescape-launcher/metadata.xml b/games-rpg/runescape-launcher/metadata.xml deleted file mode 100644 index 004555a..0000000 --- a/games-rpg/runescape-launcher/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> -</pkgmetadata> diff --git a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild b/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild deleted file mode 100644 index 9362aea..0000000 --- a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit unpacker verify-sig xdg - -DESCRIPTION="Official RuneScape NXT client launcher" -HOMEPAGE="http://www.runescape.com" -SRC_URI="https://content.runescape.com/downloads/ubuntu/pool/non-free/${PN:0:1}/${PN}/${PN}_${PV}_amd64.deb - verify-sig? ( - https://content.runescape.com/downloads/ubuntu/dists/trusty/Release -> ${PN}_${PV}_Release - https://content.runescape.com/downloads/ubuntu/dists/trusty/Release.gpg -> ${PN}_${PV}_Release.gpg - https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages -> ${PN}_${PV}_Packages - ) -" - -LICENSE="RuneScape-EULA" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="kde" - -DEPEND="" -RDEPEND=" - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - sys-libs/libcap - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXxf86vm - dev-libs/openssl - x11-libs/pango - media-libs/libsdl2" -BDEPEND=" - verify-sig? ( app-crypt/openpgp-keys-runescape ) -" - -RESTRICT="bindist mirror strip" -QA_PREBUILT="/usr/share/games/runescape-launcher/runescape" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/runescape.gpg.key - -S="${WORKDIR}" - -src_unpack() { - if use verify-sig; then - local Release=${DISTDIR}/${PN}_${PV}_Release - local Packages=${DISTDIR}/${PN}_${PV}_Packages - local debfile=${DISTDIR}/${PN}_${PV}_amd64.deb - local _out - - einfo "Verifying 'Release' file (PGP)..." - - verify-sig_verify_detached "$Release"{,.gpg} - - einfo "Parsing 'Release' file..." - - _out=$(awk 'ok && $3 == "non-free/binary-amd64/Packages" {print $1; exit} - /^[^[:space:]]/ {ok=0} - /^SHA256:$/ {ok=1}' < "$Release") - if ! [[ $_out =~ ^[0-9a-f]{64}$ ]]; then - die "Could not find hash of 'non-free/binary-amd64/Packages' in the 'Release' file" - fi - - einfo "Verifying 'Packages' file (SHA256)..." - - if ! sha256sum --quiet --check <<< "$_out *$Packages"; then - die "Hash sum of 'Packages' did not match expected" - fi - - einfo "Parsing 'Packages' file..." - - _out=$(awk 'ok && /^SHA256:/ {print $2; exit} - /^Package:/ {ok=0} - /^Package: runescape-launcher$/ {ok=1}' < "$Packages") - if ! [[ $_out =~ ^[0-9a-f]{64}$ ]]; then - die "Could not find hash of '$debfile' in the 'Packages' file" - fi - - einfo "Verifying '$debfile' (SHA256)..." - - if ! sha256sum --quiet --check <<< "$_out *$debfile"; then - die "Hash sum of '$debfile' did not match expected" - fi - fi - unpacker ${PN}_${PV}_amd64.deb -} - -src_compile() { - mv usr/share/doc . || die - gunzip doc/runescape-launcher/changelog.gz || die - if ! use kde; then - rm -r usr/share/kde4 || die - fi -} - -src_install() { - doins -r usr - dodoc doc/runescape-launcher/* -} diff --git a/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/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/mail-client/astroid/astroid-9999.ebuild b/mail-client/astroid/astroid-9999.ebuild index dfc7f6f..76a54d6 100644 --- a/mail-client/astroid/astroid-9999.ebuild +++ b/mail-client/astroid/astroid-9999.ebuild @@ -3,9 +3,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" @@ -36,16 +34,18 @@ RDEPEND=" >=dev-cpp/gtkmm-3.10:3.0 dev-libs/boost[nls] dev-libs/libsass - >=dev-libs/protobuf-3.6.0:= - net-libs/libsoup:2.4 - >=net-libs/webkit-gtk-2.22.0:4 + >=dev-libs/protobuf-3.6.0:=[protobuf(+)] + || ( + >=net-libs/webkit-gtk-2.22.0:4.1 + >=net-libs/webkit-gtk-2.22.0:4 + ) net-mail/notmuch " DEPEND="${RDEPEND} doc? ( || ( app-text/scdoc - app-text/ronn + app-text/ronn-ng ) ) test? ( diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest new file mode 100644 index 0000000..586ea66 --- /dev/null +++ b/media-fonts/noto-cjk/Manifest @@ -0,0 +1,3 @@ +DIST NotoSansCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52 +DIST NotoSansMonoCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b +DIST NotoSerifCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 56820256 BLAKE2B 06dfc91de4de8fe87c35aed2a258ba04529c01a13d3498c05648891d8b23515f4cefe6d3989b5fa1da4d751d29ac57ff524c0c04a065b2e06b17612bdd7f8496 SHA512 87533362980d2447ca798d453999f0e919833e09fe5090bf7915471c40fa82dd653eac6162657240e3c542a6d69be04747966a96c05c59b4ebebfa54cd9769a6 diff --git a/media-fonts/noto-cjk/files/70-noto-cjk.conf b/media-fonts/noto-cjk/files/70-noto-cjk.conf new file mode 100644 index 0000000..c1052bb --- /dev/null +++ b/media-fonts/noto-cjk/files/70-noto-cjk.conf @@ -0,0 +1,147 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <match target="pattern"> + <test name="lang"> + <string>ja</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Serif CJK JP</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>ko</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Serif CJK KR</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>zh-cn</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Serif CJK SC</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>zh-tw</string> + </test> + <test name="family"> + <string>serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Serif CJK TC</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>ja</string> + </test> + <test name="family"> + <string>sans-serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans CJK JP</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>ko</string> + </test> + <test name="family"> + <string>sans-serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans CJK KR</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>zh-cn</string> + </test> + <test name="family"> + <string>sans-serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans CJK SC</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>zh-tw</string> + </test> + <test name="family"> + <string>sans-serif</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans CJK TC</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>ja</string> + </test> + <test name="family"> + <string>monospace</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans Mono CJK JP</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>ko</string> + </test> + <test name="family"> + <string>monospace</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans Mono CJK KR</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>zh-cn</string> + </test> + <test name="family"> + <string>monospace</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans Mono CJK SC</string> + </edit> + </match> + + <match target="pattern"> + <test name="lang"> + <string>zh-tw</string> + </test> + <test name="family"> + <string>monospace</string> + </test> + <edit name="family" mode="prepend"> + <string>Noto Sans Mono CJK TC</string> + </edit> + </match> +</fontconfig> diff --git a/media-fonts/noto-cjk/metadata.xml b/media-fonts/noto-cjk/metadata.xml new file mode 100644 index 0000000..e969c6a --- /dev/null +++ b/media-fonts/noto-cjk/metadata.xml @@ -0,0 +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-20230817.ebuild b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild new file mode 100644 index 0000000..ec3451a --- /dev/null +++ b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild @@ -0,0 +1,29 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Google's CJK font family" +HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-cjk" + +COMMIT="4efc595762d1f4b4fa504bccfe8e59de91fda063" +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 + https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Serif/Variable/OTC/NotoSerifCJK-VF.otf.ttc -> NotoSerifCJK-VF-${COMMIT}.otf.ttc +" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${DISTDIR}" + +src_install() { + insinto /usr/share/fonts/${PN} + newins NotoSansCJK-VF-${COMMIT}.otf.ttc NotoSansCJK-VF.otf.ttc + newins NotoSansMonoCJK-VF-${COMMIT}.otf.ttc NotoSansMonoCJK-VF.otf.ttc + newins NotoSerifCJK-VF-${COMMIT}.otf.ttc NotoSerifCJK-VF.otf.ttc + insinto /etc/fonts/conf.avail + doins "${FILESDIR}/70-noto-cjk.conf" # From ArchLinux +} diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest new file mode 100644 index 0000000..7cf18a2 --- /dev/null +++ b/media-fonts/noto-emoji/Manifest @@ -0,0 +1 @@ +DIST Noto-COLRv1-d79d23e6822e0f6e5731b114cbfb26b2a4e380da.ttf 4760384 BLAKE2B 7a3190ed3c5f46cd6b15027792d203fef8b863f6bd93cafc3f4a6d043263c58aeb0976ed2be03da227a8f9e308d033322b830734126b27da0fc33656f66d88c1 SHA512 b7fc0e7e4a4c68a02635f3efd0e88e2292a7e85d871e28efc7596da7a11ed1413703a38e7a7bc9c94d0d34a79a22db587547876e633a8391b00500bfc020dae6 diff --git a/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml new file mode 100644 index 0000000..7c900b1 --- /dev/null +++ b/media-fonts/noto-emoji/metadata.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +</pkgmetadata> diff --git a/media-fonts/noto-emoji/noto-emoji-20231130.ebuild b/media-fonts/noto-emoji/noto-emoji-20231130.ebuild new file mode 100644 index 0000000..5c0337f --- /dev/null +++ b/media-fonts/noto-emoji/noto-emoji-20231130.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit font + +DESCRIPTION="Google Noto Emoji fonts" +HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +COMMIT="d79d23e6822e0f6e5731b114cbfb26b2a4e380da" +SRC_URI="https://github.com/googlefonts/noto-emoji/raw/${COMMIT}/fonts/Noto-COLRv1.ttf -> Noto-COLRv1-${COMMIT}.ttf" + +S="${WORKDIR}" + +FONT_SUFFIX="ttf" + +src_compile() { + for f in "${DISTDIR}"/*.ttf; do + fn=${f##*/} + cp "$f" "${fn/-$COMMIT}" + done +} diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest new file mode 100644 index 0000000..7013cb3 --- /dev/null +++ b/media-fonts/noto/Manifest @@ -0,0 +1,4 @@ +DIST NotoSans-Italic[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2675320 BLAKE2B 763c2562ae44c74cd3889c9e9b222f5e8136d33c2382f9e2a4710a73d2f4675e49e30912458234bd7d799f9774fb7493dcd37b11bb7e84afa8efe1c21f59f448 SHA512 6c0a5a85f8ef0cdebd8d64b221f6fbfe1aff85ad21d518e8bc0acb8c59e78de495d58b013df53a9a26f6bbb056ee3876692308cdc9cf2459c5719387ece0e044 +DIST NotoSans[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2493792 BLAKE2B a2c8904c841d553d129cc57f7b35828034f9825c7fb63929f7bfbc889c7ecebc16009d5b39c5d79b69addf2226d10f2eb4979a479857130ee5dd3b9cdc2ff968 SHA512 a4ebea5ec83d554b35bca70ac22a077a19dd41cafe0a23622ade62a278b4a5a8d9f3b453945bc128f2a27469f8d287c669a77a8aad5d9cb93bde5a20e76dc5cc +DIST NotoSerif-Italic[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2448496 BLAKE2B 853301c53445355fcd0be6f13aaebdc7cd5d5820dcd2972bb8521a94e9a4aa80f1e8dab264c202eeb41ba383968d94918869256883746c62dd1b2a043bc1ff80 SHA512 fa63eef7fa9f30bc9c48ed62038031bbbad3c9408aae6f9854fb93bceb18c8247f6c5de79dbbcf3a5082a188f37ec847452cf094a9411bacd2e747ebe24f630d +DIST NotoSerif[wdth,wght]-8bcb8b16321f305a4fca87dcbdef453e19dfc987.ttf 2420628 BLAKE2B f19080179e54567a92edb576143940be99734e841479ba2fdea4c65862e637a5f3216082ca426f18354aadb962955a83dd47e89d1a24b4a8433fa825b10388d0 SHA512 c419f4d2777cd4c97038b97190eb50274bb9c2f2e508d5bdac53eb218c0b31ff7c7b8d0f4111fbd41ba866671f7224e3374f06e5b9179e8f0ab42eae6a077a38 diff --git a/media-fonts/noto/files/66-noto-mono.conf b/media-fonts/noto/files/66-noto-mono.conf new file mode 100644 index 0000000..21d6c36 --- /dev/null +++ b/media-fonts/noto/files/66-noto-mono.conf @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <alias> + <family>monospace</family> + <prefer> + <family>Noto Sans Mono</family> + </prefer> + </alias> + <alias> + <family>Noto Sans Mono</family> + <default> + <family>monospace</family> + </default> + </alias> +</fontconfig> diff --git a/media-fonts/noto/files/66-noto-sans.conf b/media-fonts/noto/files/66-noto-sans.conf new file mode 100644 index 0000000..012aebe --- /dev/null +++ b/media-fonts/noto/files/66-noto-sans.conf @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <alias> + <family>sans-serif</family> + <prefer> + <family>Noto Sans</family> + </prefer> + </alias> + <alias> + <family>Noto Sans</family> + <default> + <family>sans-serif</family> + </default> + </alias> +</fontconfig> diff --git a/media-fonts/noto/files/66-noto-serif.conf b/media-fonts/noto/files/66-noto-serif.conf new file mode 100644 index 0000000..036baf7 --- /dev/null +++ b/media-fonts/noto/files/66-noto-serif.conf @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <alias> + <family>serif</family> + <prefer> + <family>Noto Serif</family> + </prefer> + </alias> + <alias> + <family>Noto Serif</family> + <default> + <family>serif</family> + </default> + </alias> +</fontconfig> diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml new file mode 100644 index 0000000..7c900b1 --- /dev/null +++ b/media-fonts/noto/metadata.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +</pkgmetadata> diff --git a/media-fonts/noto/noto-20231001.ebuild b/media-fonts/noto/noto-20231001.ebuild new file mode 100644 index 0000000..15104ae --- /dev/null +++ b/media-fonts/noto/noto-20231001.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit font + +DESCRIPTION="Google's font family that aims to support all the world's languages" +HOMEPAGE="https://fonts.google.com/noto https://github.com/notofonts/notofonts.github.io" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMIT="8bcb8b16321f305a4fca87dcbdef453e19dfc987" +SRC_URI=" + https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable/NotoSans%5Bwdth%2Cwght%5D.ttf -> NotoSans[wdth,wght]-${COMMIT}.ttf + https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable/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/NotoSerif%5Bwdth%2Cwght%5D.ttf -> NotoSerif[wdth,wght]-${COMMIT}.ttf + https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable/NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf +" + +S="${WORKDIR}" + +FONT_SUFFIX="ttf" +FONT_CONF=( + # From ArchLinux + "${FILESDIR}/66-noto-serif.conf" + "${FILESDIR}/66-noto-mono.conf" + "${FILESDIR}/66-noto-sans.conf" +) + +src_compile() { + for f in "${DISTDIR}"/*.ttf; do + fn=${f##*/} + cp "$f" "${fn/-$COMMIT}" + done +} diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild deleted file mode 100644 index a2b5eaf..0000000 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit xdg cmake git-r3 - -DESCRIPTION="JPEG XL image format reference implementation" -HOMEPAGE="https://github.com/libjxl/libjxl" - -EGIT_REPO_URI="https://github.com/libjxl/libjxl.git" -EGIT_SUBMODULES=(third_party/lodepng third_party/skcms) - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="apng doc gif jpeg +man openexr static-libs test viewers" - -RDEPEND="app-arch/brotli - dev-libs/highway - apng? ( - media-libs/libpng - sys-libs/zlib - ) - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - man? ( app-text/asciidoc ) - openexr? ( media-libs/openexr:= ) - viewers? ( - dev-qt/qtwidgets - dev-qt/qtx11extras - ) -" -BDEPEND=" - doc? ( app-doc/doxygen ) -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) -" - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test ON OFF) - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_EXAMPLES=ON - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_MANPAGES=$(usex man ON OFF) - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr ON OFF) - -DJPEGXL_ENABLE_PLUGINS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_ENABLE_VIEWERS=$(usex viewers ON OFF) - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_WARNINGS_AS_ERRORS=OFF - - $(cmake_use_find_package apng PNG) - $(cmake_use_find_package apng ZLIB) - $(cmake_use_find_package doc Doxygen) - $(cmake_use_find_package gif GIF) - $(cmake_use_find_package jpeg JPEG) - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - dobin "${BUILD_DIR}/examples/jxlinfo" - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/libjxl{,_dec}.a || die - fi -} diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml deleted file mode 100644 index c8bb826..0000000 --- a/media-libs/libjxl/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="apng">APNG support</flag> - <flag name="viewers">Viewer programs</flag> - </use> -</pkgmetadata> diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest deleted file mode 100644 index 0f9abf8..0000000 --- a/media-libs/svt-av1/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543 diff --git a/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch deleted file mode 100644 index 81c82bb..0000000 --- a/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch +++ /dev/null @@ -1,123 +0,0 @@ -https://bugs.gentoo.org/766156 -https://github.com/AOMediaCodec/SVT-AV1/commit/09c90e4cfb602b9a247a8a256923bdbddaf2ed9b - -From 09c90e4cfb602b9a247a8a256923bdbddaf2ed9b Mon Sep 17 00:00:00 2001 -From: Slawomir Pawlowski <slawomir.pawlowski@intel.com> -Date: Fri, 18 Dec 2020 16:47:20 +0100 -Subject: [PATCH] Fix C only build - ---- - CMakeLists.txt | 5 ++++- - Source/Lib/Common/Codec/common_dsp_rtcd.c | 5 ++++- - Source/Lib/Common/Codec/common_dsp_rtcd.h | 2 ++ - Source/Lib/Decoder/CMakeLists.txt | 5 ++++- - Source/Lib/Encoder/CMakeLists.txt | 5 ++++- - Source/Lib/Encoder/Codec/firstpass.c | 2 +- - 6 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8baff740b1..efdd7385fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -302,6 +302,9 @@ if(BUILD_TESTING) - endif() - - add_subdirectory(third_party/fastfeat) --add_subdirectory(third_party/cpuinfo) -+ -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ add_subdirectory(third_party/cpuinfo) -+endif() - - install(DIRECTORY ${PROJECT_SOURCE_DIR}/Source/API/ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/svt-av1" FILES_MATCHING PATTERN "*.h") -diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.c b/Source/Lib/Common/Codec/common_dsp_rtcd.c -index e24f99f66b..c09f088b88 100644 ---- a/Source/Lib/Common/Codec/common_dsp_rtcd.c -+++ b/Source/Lib/Common/Codec/common_dsp_rtcd.c -@@ -17,8 +17,10 @@ - #include "EbPackUnPack_C.h" - #include "EbAvcStyleMcp.h" - -+#ifdef ARCH_X86_64 - // for get_cpu_flags - #include "cpuinfo.h" -+#endif - - /* - * DSP deprecated flags -@@ -69,7 +71,7 @@ int64_t svt_av1_block_error_c(const TranLow *coeff, const TranLow *dqcoeff, - /************************************** - * Instruction Set Support - **************************************/ -- -+#ifdef ARCH_X86_64 - CPU_FLAGS get_cpu_flags() { - CPU_FLAGS flags = 0; - -@@ -105,6 +107,7 @@ CPU_FLAGS get_cpu_flags_to_use() { - #endif - return flags; - } -+#endif /*ARCH_X86_64*/ - - #ifdef ARCH_X86_64 - #ifndef NON_AVX512_SUPPORT -diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.h b/Source/Lib/Common/Codec/common_dsp_rtcd.h -index b76882b003..f67243f3d4 100644 ---- a/Source/Lib/Common/Codec/common_dsp_rtcd.h -+++ b/Source/Lib/Common/Codec/common_dsp_rtcd.h -@@ -67,8 +67,10 @@ extern "C" { - #endif - - // Helper Functions -+#ifdef ARCH_X86_64 - CPU_FLAGS get_cpu_flags(); - CPU_FLAGS get_cpu_flags_to_use(); -+#endif - void setup_common_rtcd_internal(CPU_FLAGS flags); - void svt_aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h); - RTCD_EXTERN void(*svt_aom_blend_a64_vmask)(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h); -diff --git a/Source/Lib/Decoder/CMakeLists.txt b/Source/Lib/Decoder/CMakeLists.txt -index c8ffc57657..c71c4da0b8 100644 ---- a/Source/Lib/Decoder/CMakeLists.txt -+++ b/Source/Lib/Decoder/CMakeLists.txt -@@ -99,7 +99,9 @@ set_target_properties(SvtAv1Dec PROPERTI - set_target_properties(SvtAv1Dec PROPERTIES SOVERSION ${DEC_VERSION_MAJOR}) - add_dependencies(SvtAv1Dec EbVersionHeaderGen) - target_link_libraries(SvtAv1Dec PUBLIC ${PLATFORM_LIBS}) --target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public) -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public) -+endif() - install(TARGETS SvtAv1Dec DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc @ONLY) -diff --git a/Source/Lib/Encoder/CMakeLists.txt b/Source/Lib/Encoder/CMakeLists.txt -index 936592e1ce..ab310dcef1 100644 ---- a/Source/Lib/Encoder/CMakeLists.txt -+++ b/Source/Lib/Encoder/CMakeLists.txt -@@ -130,7 +130,9 @@ endif() - set_target_properties(SvtAv1Enc PROPERTIES VERSION ${ENC_VERSION}) - set_target_properties(SvtAv1Enc PROPERTIES SOVERSION ${ENC_VERSION_MAJOR}) - target_link_libraries(SvtAv1Enc PUBLIC ${PLATFORM_LIBS}) --target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public) -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public) -+endif() - install(TARGETS SvtAv1Enc DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Enc.pc @ONLY) -diff --git a/Source/Lib/Encoder/Codec/firstpass.c b/Source/Lib/Encoder/Codec/firstpass.c -index feb7a1fae7..80b7dd05d8 100644 ---- a/Source/Lib/Encoder/Codec/firstpass.c -+++ b/Source/Lib/Encoder/Codec/firstpass.c -@@ -1189,8 +1189,8 @@ static void first_pass_setup_me_context(MotionEstimationContext_t *context_ptr, - // set search method - context_ptr->me_context_ptr->hme_search_method = SUB_SAD_SEARCH; - -- uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]); - #ifdef ARCH_X86_64 -+ uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]); - //_MM_HINT_T0 //_MM_HINT_T1 //_MM_HINT_T2 //_MM_HINT_NTA - uint32_t i; - for (i = 0; i < sb_height; i++) { diff --git a/media-libs/svt-av1/metadata.xml b/media-libs/svt-av1/metadata.xml deleted file mode 100644 index 8b50750..0000000 --- a/media-libs/svt-av1/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <upstream> - <remote-id type="gitlab">AOMediaCodec/SVT-AV1</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild deleted file mode 100644 index d4f59a9..0000000 --- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit flag-o-matic cmake-multilib - -DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" -HOMEPAGE="https://github.com/AOMediaCodec/SVT-AV1" - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git" -else - SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231 - S="${WORKDIR}/SVT-AV1-${PV}" -fi - -# Also see "Alliance for Open Media Patent License 1.0" -LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" -SLOT="0" - -DEPEND="amd64? ( dev-lang/yasm )" - -PATCHES=( "${FILESDIR}"/${P}-fix-c-only-build.patch ) - -multilib_src_configure() { - append-ldflags -Wl,-z,noexecstack - local mycmakeargs=( - # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? - # undefined reference to `ifd_inspect' - # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 - -DBUILD_TESTING=OFF - ) - - cmake_src_configure -} diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild deleted file mode 100644 index dbdcc33..0000000 --- a/media-libs/svt-av1/svt-av1-9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit flag-o-matic cmake-multilib - -DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" -HOMEPAGE="https://github.com/AOMediaCodec/SVT-AV1" - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git" -else - SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231 - S="${WORKDIR}/SVT-AV1-${PV}" -fi - -# Also see "Alliance for Open Media Patent License 1.0" -LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" -SLOT="0" - -DEPEND="amd64? ( dev-lang/yasm )" - -multilib_src_configure() { - append-ldflags -Wl,-z,noexecstack - local mycmakeargs=( - # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? - # undefined reference to `ifd_inspect' - # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 - -DBUILD_TESTING=OFF - ) - - cmake_src_configure -} diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest deleted file mode 100644 index 09853fb..0000000 --- a/media-video/ffmpeg/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf SHA512 212c330f477e9452b9d7873d6d3c452a5c946b6b9c17b01d94c60fda66e61e53b78388ef7686b8d9415a27cd3e05d5f0d6639a02a22467dbf1ed483b5594c80f diff --git a/media-video/ffmpeg/ffmpeg-4.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4-r2.ebuild deleted file mode 100644 index 43b7e8c..0000000 --- a/media-video/ffmpeg/ffmpeg-4.4-r2.ebuild +++ /dev/null @@ -1,557 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=56.58.58 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_MIN_CLONE_TYPE="single" - EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" -fi - -inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" -HOMEPAGE="https://ffmpeg.org/" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot - SRC_URI="mirror://gentoo/${P}.tar.bz2" -else # Release - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2" -fi -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 bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r - fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab - rubberband:librubberband zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same as above but for encoders, i.e. they do something only with USE=encode. -FFMPEG_ENCODER_FLAG_MAP=( - amrenc:libvo-amrwbenc mp3:libmp3lame - kvazaar:libkvazaar libaom - openh264:libopenh264 rav1e:librav1e snappy:libsnappy - svt-av1:libsvtav1 theora:libtheora twolame:libtwolame - webp:libwebp x264:libx264 x265:libx265 xvid:libxvid -) - -IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l - ${FFMPEG_FLAG_MAP[@]%:*} - ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) -" -MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) -PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) -PPC_CPU_REQUIRED_USE=" - cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) - cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${MIPS_CPU_FEATURES[@]} - ${PPC_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${PPC_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) -IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) - bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) - codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) - dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] ) - encode? ( - amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] ) - rav1e? ( >=media-video/rav1e-0.4:=[capi] ) - snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) - flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] ) - fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) - gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) - gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) - gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - iec61883? ( - >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] - ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) - libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) - libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) - libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) - libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) - librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) - libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] ) - libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) - lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - mmal? ( media-libs/raspberrypi-userland ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) - samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) - svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) - svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) - vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] - ) - zeromq? ( >=net-libs/zeromq-4.1.6 ) - zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) - postproc? ( !media-libs/libpostproc ) -" - -RDEPEND="${RDEPEND} - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) -" - -DEPEND="${RDEPEND} - ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" -BDEPEND=" - >=sys-devel/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) - cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) - doc? ( sys-apps/texinfo ) - test? ( net-misc/wget sys-devel/bc ) -" - -# Code requiring FFmpeg to be built under gpl license -GPL_REQUIRED_USE=" - postproc? ( gpl ) - frei0r? ( gpl ) - cdio? ( gpl ) - rubberband? ( gpl ) - vidstab? ( gpl ) - samba? ( gpl ) - encode? ( - x264? ( gpl ) - x265? ( gpl ) - xvid? ( gpl ) - ) -" -REQUIRED_USE=" - cuda? ( video_cards_nvidia ) - libv4l? ( v4l ) - fftools_cws2fws? ( zlib ) - test? ( encode ) - ${GPL_REQUIRED_USE} - ${CPU_REQUIRED_USE}" -RESTRICT=" - !test? ( test ) - gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) -" - -S=${WORKDIR}/${P/_/-} - -PATCHES=( - "${FILESDIR}"/chromium-r1.patch -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -build_separate_libffmpeg() { - use opencl -} - -src_prepare() { - if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot - export revision=git-N-${FFMPEG_REVISION} - fi - default - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -multilib_src_configure() { - local myconf=( ) - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - use openssl && myconf+=( --enable-nonfree ) - use samba && myconf+=( --enable-version3 ) - - # Encoders - if use encode ; then - ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) - - # Licensing. - if use amrenc ; then - myconf+=( --enable-version3 ) - fi - else - myconf+=( --disable-encoders ) - fi - - # Indevs - use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) - for i in alsa oss jack sndio ; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - - # Outdevs - for i in alsa oss sndio ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - - # Decoders - use amr && myconf+=( --enable-version3 ) - use gmp && myconf+=( --enable-version3 ) - use libaribb24 && myconf+=( --enable-version3 ) - use fdk && use gpl && myconf+=( --enable-nonfree ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - if use openssl ; then - myconf+=( --disable-gnutls ) - fi - - # (temporarily) disable non-multilib deps - if ! multilib_is_native_abi; then - for i in librav1e libzmq ; do - myconf+=( --disable-${i} ) - done - fi - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - if use pic ; then - myconf+=( --enable-pic ) - # disable asm code if PIC is required - # as the provided asm decidedly is not PIC for x86. - [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) - fi - [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654 - is-flagq "-flto*" && myconf+=( "--enable-lto" ) - filter-flags "-flto*" - - # Mandatory configuration - myconf=( - --enable-avfilter - --enable-avresample - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - # doc - myconf+=( - $(multilib_native_use_enable doc) - $(multilib_native_use_enable doc htmlpages) - $(multilib_native_enable manpages) - ) - - local extra_libs - if use arm || use ppc ; then - # bug #782811 - # bug #790590 - extra_libs+="-latomic " - fi - - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --mandir="${EPREFIX}/usr/share/man" \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --extra-libs="${extra_libs}" \ - $(use_enable static-libs static) \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - echo "${@}" - "${@}" || die - - if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then - einfo "Configuring for Chromium" - mkdir -p ../chromium || die - pushd ../chromium >/dev/null || die - set -- "${@}" \ - --disable-shared \ - --enable-static \ - --enable-pic \ - --disable-opencl - echo "${@}" - "${@}" || die - popd >/dev/null || die - fi -} - -multilib_src_compile() { - emake V=1 - - if multilib_is_native_abi; then - for i in "${FFTOOLS[@]}" ; do - if use fftools_${i} ; then - emake V=1 tools/${i}$(get_exeext) - fi - done - - if use chromium; then - if build_separate_libffmpeg; then - einfo "Compiling for Chromium" - pushd ../chromium >/dev/null || die - emake V=1 libffmpeg - popd >/dev/null || die - else - emake V=1 libffmpeg - fi - fi - fi -} - -multilib_src_test() { - LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ - emake V=1 fate -} - -multilib_src_install() { - emake V=1 DESTDIR="${D}" install install-doc - - if multilib_is_native_abi; then - for i in "${FFTOOLS[@]}" ; do - if use fftools_${i} ; then - dobin tools/${i}$(get_exeext) - fi - done - - if use chromium; then - if build_separate_libffmpeg; then - einfo "Installing for Chromium" - pushd ../chromium >/dev/null || die - emake V=1 DESTDIR="${D}" install-libffmpeg - popd >/dev/null || die - else - emake V=1 DESTDIR="${D}" install-libffmpeg - - # When not built separately, libffmpeg has no code of - # its own so this QA check raises a false positive. - QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" - fi - fi - fi -} - -multilib_src_install_all() { - dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges - [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" -} diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild deleted file mode 100644 index 3647d65..0000000 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ /dev/null @@ -1,548 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Subslot: libavutil major.libavcodec major.libavformat major -# Since FFmpeg ships several libraries, subslot is kind of limited here. -# Most consumers will use those three libraries, if a "less used" library -# changes its soname, consumers will have to be rebuilt the old way -# (preserve-libs). -# If, for example, a package does not link to libavformat and only libavformat -# changes its ABI then this package will be rebuilt needlessly. Hence, such a -# package is free _not_ to := depend on FFmpeg but I would strongly encourage -# doing so since such a case is unlikely. -FFMPEG_SUBSLOT=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.bz2" -else # Release - SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2" -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 ~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 bluray:libbluray gme:libgme gsm:libgsm - libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh - speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec - vorbis:libvorbis vpx:libvpx zvbi:libzvbi - # libavfilter options - appkit - bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r - fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab - rubberband:librubberband zeromq:libzmq zimg:libzimg - # libswresample options - libsoxr - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -# Same as above but for encoders, i.e. they do something only with USE=encode. -FFMPEG_ENCODER_FLAG_MAP=( - amrenc:libvo-amrwbenc mp3:libmp3lame - kvazaar:libkvazaar libaom - openh264:libopenh264 rav1e:librav1e snappy:libsnappy - svt-av1:libsvtav1 theora:libtheora twolame:libtwolame - webp:libwebp x264:libx264 x265:libx265 xvid:libxvid -) - -IUSE=" - alsa chromium doc +encode oss pic sndio static-libs test v4l - ${FFMPEG_FLAG_MAP[@]%:*} - ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) -" -MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) -PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) -PPC_CPU_REQUIRED_USE=" - cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) - cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${MIPS_CPU_FEATURES[@]} - ${PPC_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${PPC_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) -IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) - bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) - bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) - chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) - codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) - dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] ) - encode? ( - amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) - kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) - openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] ) - rav1e? ( >=media-video/rav1e-0.4:=[capi] ) - snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) - theora? ( - >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) - webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) - ) - fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) - flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) - fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) - frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] ) - fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) - gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) - gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) - gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) - gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) - iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) - iec61883? ( - >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] - ) - ieee1394? ( - >=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}] - >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] - ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) - libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) - libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) - libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) - libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) - libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) - libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) - librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) - libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] ) - libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) - libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) - lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - mmal? ( media-libs/raspberrypi-userland ) - modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) - openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) - opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) - samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) - sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) - srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) - svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) - svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] ) - truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) - vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) - vorbis? ( - >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] - >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] - ) - vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) - vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] - ) - zeromq? ( >=net-libs/zeromq-4.1.6 ) - zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) - postproc? ( !media-libs/libpostproc ) -" - -RDEPEND="${RDEPEND} - openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) - !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) -" - -DEPEND="${RDEPEND} - ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) - v4l? ( sys-kernel/linux-headers ) -" -BDEPEND=" - >=sys-devel/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) - cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) - doc? ( sys-apps/texinfo ) - test? ( net-misc/wget sys-devel/bc ) -" - -# Code requiring FFmpeg to be built under gpl license -GPL_REQUIRED_USE=" - postproc? ( gpl ) - frei0r? ( gpl ) - cdio? ( gpl ) - rubberband? ( gpl ) - vidstab? ( gpl ) - samba? ( gpl ) - encode? ( - x264? ( gpl ) - x265? ( gpl ) - xvid? ( gpl ) - ) -" -REQUIRED_USE=" - cuda? ( video_cards_nvidia ) - libv4l? ( v4l ) - fftools_cws2fws? ( zlib ) - test? ( encode ) - ${GPL_REQUIRED_USE} - ${CPU_REQUIRED_USE}" -RESTRICT=" - !test? ( test ) - gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) -" - -S=${WORKDIR}/${P/_/-} - -PATCHES=( - "${FILESDIR}"/chromium-r1.patch -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libavutil/avconfig.h -) - -build_separate_libffmpeg() { - use opencl -} - -src_prepare() { - if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot - export revision=git-N-${FFMPEG_REVISION} - fi - default - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -multilib_src_configure() { - local myconf=( ) - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - use openssl && myconf+=( --enable-nonfree ) - use samba && myconf+=( --enable-version3 ) - - # Encoders - if use encode ; then - ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) - - # Licensing. - if use amrenc ; then - myconf+=( --enable-version3 ) - fi - else - myconf+=( --disable-encoders ) - fi - - # Indevs - use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) - for i in alsa oss jack sndio ; do - use ${i} || myconf+=( --disable-indev=${i} ) - done - - # Outdevs - for i in alsa oss sndio ; do - use ${i} || myconf+=( --disable-outdev=${i} ) - done - - # Decoders - use amr && myconf+=( --enable-version3 ) - use gmp && myconf+=( --enable-version3 ) - use libaribb24 && myconf+=( --enable-version3 ) - use fdk && use gpl && myconf+=( --enable-nonfree ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - if use openssl ; then - myconf+=( --disable-gnutls ) - fi - - # (temporarily) disable non-multilib deps - if ! multilib_is_native_abi; then - for i in librav1e libzmq ; do - myconf+=( --disable-${i} ) - done - fi - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - if use pic ; then - myconf+=( --enable-pic ) - # disable asm code if PIC is required - # as the provided asm decidedly is not PIC for x86. - [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) - fi - [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654 - is-flagq "-flto*" && myconf+=( "--enable-lto" ) - filter-flags "-flto*" - - # Mandatory configuration - myconf=( - --enable-avfilter - --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) - ) - - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --mandir="${EPREFIX}/usr/share/man" \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - $(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" -} 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 57aecd4..0000000 --- a/media-video/ffmpeg/metadata.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<use> - <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="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">Enable support for the SVT-AV1 encoder</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="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/media-video/mpv/Manifest b/media-video/mpv/Manifest deleted file mode 100644 index 761ee91..0000000 --- a/media-video/mpv/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b -DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d diff --git a/media-video/mpv/files/mpv-libplacebo-3.patch b/media-video/mpv/files/mpv-libplacebo-3.patch deleted file mode 100644 index b684df8..0000000 --- a/media-video/mpv/files/mpv-libplacebo-3.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 7c4465cefb27d4e0d07535d368febdf77b579566 Mon Sep 17 00:00:00 2001 -From: Niklas Haas <git@haasn.xyz> -Date: Thu, 3 Dec 2020 08:25:23 +0100 -Subject: [PATCH] vo_gpu: placebo: update for upstream API changes - -The concept of sample/address modes was moved from `pl_tex` to -`pl_desc_binding`. - -The `pl_tex_blit()` function also underwent an API change. ---- - video/out/placebo/ra_pl.c | 31 +++++++++++++++++++++++++++++-- - 1 file changed, 29 insertions(+), 2 deletions(-) - -diff --git a/video/out/placebo/ra_pl.c b/video/out/placebo/ra_pl.c -index f8df590511d..8244acff261 100644 ---- a/video/out/placebo/ra_pl.c -+++ b/video/out/placebo/ra_pl.c -@@ -144,8 +144,14 @@ bool mppl_wrap_tex(struct ra *ra, const struct pl_tex *pltex, - .blit_dst = pltex->params.blit_dst, - .host_mutable = pltex->params.host_writable, - .downloadable = pltex->params.host_readable, -+#if PL_API_VER >= 103 -+ // These don't exist upstream, so just pick something reasonable -+ .src_linear = pltex->params.format->caps & PL_FMT_CAP_LINEAR, -+ .src_repeat = false, -+#else - .src_linear = pltex->params.sample_mode == PL_TEX_SAMPLE_LINEAR, - .src_repeat = pltex->params.address_mode == PL_TEX_ADDRESS_REPEAT, -+#endif - }, - .priv = (void *) pltex, - }; -@@ -195,10 +201,12 @@ static struct ra_tex *tex_create_pl(struct ra *ra, - .blit_dst = params->blit_dst || params->render_dst, - .host_writable = params->host_mutable, - .host_readable = params->downloadable, -+#if PL_API_VER < 103 - .sample_mode = params->src_linear ? PL_TEX_SAMPLE_LINEAR - : PL_TEX_SAMPLE_NEAREST, - .address_mode = params->src_repeat ? PL_TEX_ADDRESS_REPEAT - : PL_TEX_ADDRESS_CLAMP, -+#endif - .initial_data = params->initial_data, - }); - -@@ -399,7 +407,18 @@ static void blit_pl(struct ra *ra, struct ra_tex *dst, struct ra_tex *src, - pldst.y1 = MPMIN(MPMAX(dst_rc->y1, 0), dst->params.h); - } - -+#if PL_API_VER >= 103 -+ pl_tex_blit(get_gpu(ra), &(struct pl_tex_blit_params) { -+ .src = src->priv, -+ .dst = dst->priv, -+ .src_rc = plsrc, -+ .dst_rc = pldst, -+ .sample_mode = src->params.src_linear ? PL_TEX_SAMPLE_LINEAR -+ : PL_TEX_SAMPLE_NEAREST, -+ }); -+#else - pl_tex_blit(get_gpu(ra), dst->priv, src->priv, pldst, plsrc); -+#endif - } - - static const enum pl_var_type var_type[RA_VARTYPE_COUNT] = { -@@ -627,9 +646,17 @@ static void renderpass_run_pl(struct ra *ra, - struct pl_desc_binding bind; - switch (inp->type) { - case RA_VARTYPE_TEX: -- case RA_VARTYPE_IMG_W: -- bind.object = (* (struct ra_tex **) val->data)->priv; -+ case RA_VARTYPE_IMG_W: { -+ struct ra_tex *tex = *((struct ra_tex **) val->data); -+ bind.object = tex->priv; -+#if PL_API_VER >= 103 -+ bind.sample_mode = tex->params.src_linear ? PL_TEX_SAMPLE_LINEAR -+ : PL_TEX_SAMPLE_NEAREST; -+ bind.address_mode = tex->params.src_repeat ? PL_TEX_ADDRESS_REPEAT -+ : PL_TEX_ADDRESS_CLAMP; -+#endif - break; -+ } - case RA_VARTYPE_BUF_RO: - case RA_VARTYPE_BUF_RW: - bind.object = (* (struct ra_buf **) val->data)->priv; diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml deleted file mode 100644 index 4039477..0000000 --- a/media-video/mpv/metadata.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <use> - <flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag> - <flag name="bluray">Enable playback of Blu-ray filesystems</flag> - <flag name="cli">Build mpv CLI player</flag> - <flag name="cplugins">Enable C plugins support</flag> - <flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag> - <flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag> - <flag name="egl">Enable support for various EGL-based video outputs / backends</flag> - <flag name="gamepad">Enable gamepad input support</flag> - <flag name="gbm">Enable Graphics Buffer Manager based EGL video backend</flag> - <flag name="jpeg">Enable support for saving screenshots in JPEG format</flag> - <flag name="libmpv">Build mpv shared library</flag> - <flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag> - <flag name="opengl" restrict="<media-video/mpv-0.28.0">Enable the recommended 'opengl' video output</flag> - <flag name="opengl" restrict=">=media-video/mpv-0.28.0">Enable support for various OpenGL-based video backends</flag> - <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> - <flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag> - <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs - (Note: these outputs exist for compatibility reasons only, avoid if possible)</flag> - <flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag> - <flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag> - <flag name="vulkan">Enable support for various Vulkan-based video backends</flag> - <flag name="zimg">Enable libzimg support (for vf_fingerprint)</flag> - </use> - <upstream> - <remote-id type="github">mpv-player/mpv</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-video/mpv/mpv-0.33.1-r2.ebuild b/media-video/mpv/mpv-0.33.1-r2.ebuild deleted file mode 100644 index 941c9e6..0000000 --- a/media-video/mpv/mpv-0.33.1-r2.ebuild +++ /dev/null @@ -1,360 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} luajit ) -PYTHON_COMPAT=( python3_{7..10} ) -PYTHON_REQ_USE='threads(+)' - -WAF_PV=2.0.9 - -inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils python-r1 toolchain-funcs waf-utils xdg-utils - -DESCRIPTION="Media player based on MPlayer and mplayer2" -HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux" - DOCS=( RELEASE_NOTES ) -else - EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" - inherit git-r3 - DOCS=(); SRC_URI="" -fi -SRC_URI+=" https://waf.io/waf-${WAF_PV}" -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst ) - -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC. -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC" -SLOT="0" -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb - dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv +lua - openal +opengl pulseaudio raspberry-pi rubberband sdl - selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" - -REQUIRED_USE=" - || ( cli libmpv ) - aqua? ( opengl ) - cuda? ( opengl ) - egl? ( || ( gbm X wayland ) ) - gamepad? ( sdl ) - gbm? ( drm egl opengl ) - lcms? ( opengl ) - lua? ( ${LUA_REQUIRED_USE} ) - opengl? ( || ( aqua egl X raspberry-pi !cli ) ) - raspberry-pi? ( opengl ) - test? ( opengl ) - tools? ( cli ) - uchardet? ( iconv ) - vaapi? ( || ( gbm X wayland ) ) - vdpau? ( X ) - vulkan? ( || ( X wayland ) ) - wayland? ( egl ) - X? ( egl? ( opengl ) ) - xv? ( X ) - ${PYTHON_REQUIRED_USE} -" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] - alsa? ( >=media-libs/alsa-lib-1.0.18 ) - archive? ( >=app-arch/libarchive-3.4.0:= ) - bluray? ( >=media-libs/libbluray-0.3.0:= ) - cdda? ( dev-libs/libcdio-paranoia - dev-libs/libcdio:= ) - drm? ( x11-libs/libdrm ) - dvd? ( - >=media-libs/libdvdnav-4.2.0:= - >=media-libs/libdvdread-4.1.0:= - ) - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) - gamepad? ( media-libs/libsdl2 ) - iconv? ( - virtual/libiconv - uchardet? ( app-i18n/uchardet ) - ) - jack? ( virtual/jack ) - javascript? ( >=dev-lang/mujs-1.0.0 ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)] - virtual/ttf-fonts - libcaca? ( >=media-libs/libcaca-0.99_beta18 ) - lua? ( ${LUA_DEPS} ) - openal? ( >=media-libs/openal-1.13 ) - pulseaudio? ( media-sound/pulseaudio ) - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) - rubberband? ( >=media-libs/rubberband-1.8.0 ) - sdl? ( media-libs/libsdl2[sound,threads,video] ) - vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) - vdpau? ( x11-libs/libvdpau ) - vulkan? ( - >=media-libs/libplacebo-2.72.2:=[vulkan] - media-libs/shaderc - ) - wayland? ( - >=dev-libs/wayland-1.6.0 - >=dev-libs/wayland-protocols-1.14 - >=x11-libs/libxkbcommon-0.3.0 - ) - X? ( - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - opengl? ( - x11-libs/libXdamage - virtual/opengl - ) - xv? ( x11-libs/libXv ) - ) - zlib? ( sys-libs/zlib ) - zimg? ( >=media-libs/zimg-2.9.2 ) -" -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 ) - dvb? ( virtual/linuxtv-dvb-headers ) -" -RDEPEND="${COMMON_DEPEND} - cuda? ( x11-drivers/nvidia-drivers[X] ) - selinux? ( sec-policy/selinux-mplayer ) - tools? ( ${PYTHON_DEPS} ) -" -BDEPEND="dev-python/docutils - virtual/pkgconfig - test? ( >=dev-util/cmocka-1.0.0 ) -" - -PATCHES=( "${FILESDIR}/mpv-libplacebo-3.patch" ) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die - chmod +x "${S}"/waf || die - default -} - -src_configure() { - python_setup - tc-export CC PKG_CONFIG AR - - if use raspberry-pi; then - append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" - append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" - fi - - local mywafargs=( - --confdir="${EPREFIX}/etc/${PN}" - - $(usex cli '' '--disable-cplayer') - $(use_enable libmpv libmpv-shared) - - --disable-libmpv-static - --disable-static-build - # See deep down below for build-date. - --disable-optimize # Don't add '-O2' to CFLAGS. - $(usex debug '' '--disable-debug-build') - - $(use_enable doc html-build) - --disable-pdf-build - --enable-manpage-build - $(use_enable cplugins) - $(use_enable test) - - $(use_enable iconv) - $(use_enable lua) - $(use_enable javascript) - $(use_enable zlib) - $(use_enable bluray libbluray) - $(use_enable dvd dvdnav) - $(use_enable cdda) - $(use_enable uchardet) - $(use_enable rubberband) - $(use_enable lcms lcms2) - --disable-vapoursynth # Only available in overlays. - $(use_enable archive libarchive) - - --enable-libavdevice - - # Audio outputs: - $(use_enable sdl sdl2) # Listed under audio, but also includes video. - $(use_enable pulseaudio pulse) - $(use_enable jack) - $(use_enable openal) - --disable-opensles - $(use_enable alsa) - $(use_enable coreaudio) - - # Video outputs: - $(use_enable aqua cocoa) - $(use_enable drm) - $(use_enable gbm) - $(use_enable wayland wayland-scanner) - $(use_enable wayland wayland-protocols) - $(use_enable wayland) - $(use_enable X x11) - $(use_enable xv) - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa') - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland') - $(use_enable vdpau) - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl. - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(use_enable libcaca caca) - $(use_enable jpeg) - $(use_enable vulkan shaderc) - $(use_enable vulkan libplacebo) - $(use_enable raspberry-pi rpi) - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl') - $(usex opengl '' '--disable-gl') - $(use_enable vulkan) - $(use_enable gamepad sdl2-gamepad) - - # HWaccels: - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332. - $(use_enable cuda cuda-hwaccel) - $(use_enable cuda cuda-interop) - - # TV features: - $(use_enable dvb dvbin) - - # Miscellaneous features: - $(use_enable zimg) - ) - if use lua; then - if use lua_single_target_luajit; then - mywafargs+=( --lua="luajit" ) - else - # Because it would be too simple to just let the user directly - # specify the package name to check, wouldn't it. - mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 $(lua_get_version)))" ) - fi - fi - - if use vaapi && use X; then - mywafargs+=( - $(use_enable egl vaapi-x-egl) - ) - fi - - # Not for us - mywafargs+=( - --disable-android - --disable-egl-android - --disable-uwp - --disable-audiounit - --disable-macos-media-player - --disable-wasapi - --disable-ios-gl - --disable-macos-touchbar - --disable-macos-cocoa-cb - --disable-tvos - --disable-egl-angle-win32 - ) - - mywafargs+=( - --bashdir="$(get_bashcompdir)" - --zshdir="${EPREFIX}"/usr/share/zsh/site-functions -) - - # Create reproducible non-live builds. - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) - - waf-utils_src_configure "${mywafargs[@]}" -} - -src_install() { - waf-utils_src_install - - if use lua; then - insinto /usr/share/${PN} - doins -r TOOLS/lua - fi - - if use cli && use lua_single_target_luajit; then - pax-mark -m "${ED}"/usr/bin/${PN} - fi - - if use tools; then - dobin TOOLS/{mpv_identify.sh,umpv} - newbin TOOLS/idet.sh mpv_idet.sh - python_replicate_script "${ED}"/usr/bin/umpv - fi -} - -pkg_postinst() { - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0 - - for rv in ${REPLACING_VERSIONS}; do - ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1 - ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1 - ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1 - ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1 - done - - if [[ ${softvol_0_18_1} -eq 1 ]]; then - elog "Since version 0.18.1 the software volume control is always enabled." - elog "This means that volume controls don't change the system volume," - elog "e.g. per-application volume with PulseAudio." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1" - elog - fi - - if [[ ${osc_0_21_0} -eq 1 ]]; then - elog "In version 0.21.0 the default OSC layout was changed." - elog "If you want to restore the previous layout, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0" - elog - fi - - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded." - elog "If you want to restore the previous behaviour, please refer to" - elog - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0" - elog - fi - - if [[ ${opengl_0_25_0} -eq 1 ]]; then - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to" - elog "the 'opengl' video output and no longer explicitly requires" - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag." - fi - - optfeature "URL support" net-misc/youtube-dl - - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -src_test() { - cd "${S}"/build/test || die - local test - for test in *; do - if [[ -x ${test} ]]; then - ./"${test}" || die "Test suite failed" - fi - done -} diff --git a/media-video/rav1e/Manifest b/media-video/rav1e/Manifest deleted file mode 100644 index e3ea1ca..0000000 --- a/media-video/rav1e/Manifest +++ /dev/null @@ -1,172 +0,0 @@ -DIST addr2line-0.16.0.crate 33440 BLAKE2B b59a006ba732935d408d0574799037ef0a424ad3c27b894fbd7a9c91664460972a8c464aaad4e9b82b94e4cc35ee9016490bd469fa21358e11e6d78126378038 SHA512 7ea8fffcdff7f8f25c0a588fe2ee652053988ab2e1d39ac740f5199d6e7d30beed0272403d04b86ec5de6ad5459698cdf28f8efd5caab7b6693102df7ec4889c -DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 -DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 -DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00 -DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa -DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671 -DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3 -DIST aom-sys-0.3.0.crate 3064 BLAKE2B 210de17df81b78af866336bc4f3c00803d0c62a503809b288883fcf8bcfab6262b2bec35ab9fc8d8d4ec31d38665ca74069bf5f866daa8a2ab3f04c16ecc91de SHA512 9bb02069b5951dce34a445427f3c49c9995464213104786f0a800f7cb6629e5f6cfb5c4d736dce7963d1bdddee2cc8caf3cfa9df801d5a9cea93397aaf38b53f -DIST arbitrary-0.4.7.crate 26282 BLAKE2B 1a304154926c9f24a80eced744f13379814377f067f8340672c2588edad22b26088b359b304c1c22f068bf6c7a1da09715caefa28eab046fe79085e67ecb259e SHA512 17968466d1403903a8cb5ec7f8af403e2ecbbbd8beed3df41035c34af1c19bc9d57596e1751f3aaf4c6021fe8fc7e23a7f0c1bbd1a5942d94f9dcafd0b19c1a6 -DIST arg_enum_proc_macro-0.3.1.crate 4687 BLAKE2B a35b8077b49836f9f8eb310b81052414cc5c9a35c7658e2cb1262a067dd2e0319bd88a3e5dc9837942a4ac40ea622ea47816b2932d8fa6b5935d0e7add3fb769 SHA512 b4c4472393ca6ee00e5859478caefa011f0fa51acd9072457d02c0dc7a9afbf18871ff1135bfe0ac9a26b8a2c419dfdeb878f2a2cab87f8714101f1a59ea1963 -DIST arrayvec-0.7.1.crate 28812 BLAKE2B d56dd76553748442c302307a5106e3c0b2eed8bea82ebbbb29800d1585ff09ba84df6c3d36c3bd28d5e9c5cd39eaa9bed194b0c3f6ebe810e2f298446b59aa52 SHA512 564376ac5e00113c0b12c02c7eded4b219fbe20e1d78a85798707abbf9da61e3412d327b630839f6a634274a5d7d4ecb068f04921ae4cc9e622b96282adeb2a1 -DIST assert_cmd-2.0.0.crate 27912 BLAKE2B f78b64ffe8e25292ff9b1fd6de06d11dc723160a56a1374b9225b66cf9fd706d32c2ff26c36573ea2e3026b1669ddcb045cef093e1386e8809ef3b78098bcd53 SHA512 0dbe82fb9165520b04ef0bde20ff33f3d709ae7ca4b02339ce79d751dbea07b730b8dc00f2d232cc1bd17ee5f04d4d8aed903c4e7d8d827b51fd538958fdade7 -DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 -DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b -DIST av-metrics-0.6.2.crate 22396 BLAKE2B 300827869d546f4d093a3e1246cf3b4c67d0c7a483028b7ef1b7e400dec2f55ca31238c0c918b799cd73ae94c8184570c6a31b4b4f3c909bf603da7f83ee09bd SHA512 47aae94ef05302c0ac2bd20dfed97c3ca41db0f63ced9bbac206824bbef017e0abcd39e9805eac268c88adb2bdf6ef3b662a7865e6f3ce311795dba1e84cc996 -DIST backtrace-0.3.61.crate 74284 BLAKE2B 3e66726d5ed8130963a988dbb751828447073467bb6ab4bfa1c385d74f991b52a0f3ccf00823b74a48de3d043e6dfcb474644f7a81ea9cca7242b272cf715aca SHA512 209105f135720b54d584c7ccecdb16b49381cc7531c94b81ff7279a44752ee11075cd85960f86f809a22ecb3dac6728afa05903c1d355df3ad8abf4503eec861 -DIST bindgen-0.58.1.crate 201394 BLAKE2B d82f0f35d946eda77029c838660f66b1fcfc95b7369eb7207cdd988e505a489a854591d629211787f47d7cc585a824e66cbbde094563bb54713928b611ac2cc8 SHA512 53a05692d5e76f6b70a057abb9b3f7a5b24076ba69eb4d1477e7daef629c4d50198baceb02234b60c57a598446de16f6558b2dcd535a6e403c6379eb5d7801d1 -DIST bitflags-1.3.1.crate 22434 BLAKE2B c28ca81865f90d548623e6259170b07b6e8934bfb7391b919565622e88a3e0d204b4eeab60dd43e08195380a0ba5688c68cad112c8b9b6849acfd091d871182b SHA512 f61f201499efddf76f0a3f172a92941ca3f2ae8f81a6dafb1f654027a65b8570cb2ef3ffbc5091d7b3a52f0307efde1f521909a5a2c6348442579c9c4aa1829f -DIST bitstream-io-1.2.0.crate 27108 BLAKE2B 1e22302fa66f9afb8f45abbc319af67fdafdd33b6072b92bf7cf35b3e96750c515285f4d364d5f5160913aca3685d9f48d1a25180f56c9098d935672614ac2b5 SHA512 04c44cde341aadc2acbc38533797039c94b7c46d2c762b7824f4d1ac46518a3812ac8fe6c2853d4b5af163aba61e54b7434212d9444a46936383e72f98e32072 -DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac -DIST bumpalo-3.7.0.crate 134261 BLAKE2B 15c4944abc803537c57076dfa8f5fb4b59949909450edd9e043a6cd438ddd227820e20e95236324c06e40cb27ec1e4d958bebf3d38df90f0723b8e30df79b6ef SHA512 0b570e1baee530b5c3f775330ead7cf5f8878eab75e5a6a61b5d3f64d4d82912cb26de1c098ec9492c29c7a04fc49565db97a54373c546d8ef58aab276d77c59 -DIST bytemuck-1.7.2.crate 27489 BLAKE2B 2541a7561eb34351f58266451a020858d8ac1ad30ecb95b97d576e72532cae37ef0b747e2259aaf6052b65f951586425044f824a00dfabf54bba9462edf94c2a SHA512 fae361f5abe67215a7591d421a0b713b77b437123c56e21dd00421e95ab86d9dd9b0bf1daa6623b833ea65681fbeeb58f6feab9d323964304a3250f24df1ace2 -DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa -DIST cast-0.2.7.crate 11222 BLAKE2B 8a09b6493d68b08539b38fef39ac3abae829c8b899d5243bda3c3d8acada44f4c57416e3247c82a9a4b82180d7f96c96f048b8cdbf21a8fc184ca6957b237ad9 SHA512 24d204acf21366e088f721714c48bb6431895882263ef3a08f6644abbca5c06f430729fa8bbb4c9f37c95a6baa1b824d3fad95c5f0889e92587490d51bebb4d6 -DIST cc-1.0.69.crate 56044 BLAKE2B adcd10bf4faf6835ae8feb79ce5e7a4895700d9714fc4322dd52e37bdd8db66b849d5e59aceba6ef0edcf9a5c7c0e2bc616de4acd98b71999bd63592c1c69dda SHA512 ba2b84fb61b4097a96f9013f9925b1985263ccd75274186f5d37589444e390ae8d5d1f88c210822a9e9dac2db551c24aee2b12bb61801aef8b31a72b2ac77437 -DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37 -DIST cfg-expr-0.7.4.crate 34162 BLAKE2B 24314b3e3ae62be22ecbb147272fc2dafec5e7978c98b7dfbd4865387a8219e0b2168aaba42ed0d22b584f7087e46af1d96a9c3a9cb0a4a1c45855f617e9c129 SHA512 13b52f443ea10f28a475aa6c3077a8a97743935d44dfe6567ee044893bbab696af9f95fedc9b89582f388e2eaacc2cb0786ca62d2202973ade9270082ae0f9b7 -DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff -DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980 -DIST clang-sys-1.2.0.crate 36874 BLAKE2B ff4bb39ae79280632aae404566ccde614e059d0a04aeeed1475080755fb07853da63353343b0ad66d97588679f461c7f5e5f69b753372174799c52ee7fc3e7d0 SHA512 64577b5f82878ff465eee0bd5f154522640e9bae7e6d52c1c8b868412a2297ded69b104b85b7ca6b6031d6a6eef60579933cb6502bb7342af1f9aa593428a256 -DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf -DIST cmake-0.1.45.crate 14375 BLAKE2B aaeb4b910087bcc735f2cef65fb46184de3c3181add90715ec709c3162c081cc506ed4c7f4f3e6ed6d76aef8213ce80b9b865b2e737166b498a50b60acb7c83b SHA512 7de4ae0c3a50806f2b060e145948be6c6dd0db3975b626e0432301f454612fb7bc7fd2f4549529deaf7a1a55063a11dd553efb59a9dd5aa61ede5e63371d6b2d -DIST color_quant-1.1.0.crate 6649 BLAKE2B 9a2488dd00b7a33e15e05531ea49ef1961131f0be0922ba41e2d74d2b1a047daed483ac3a9dd87c847a81cce70a347395c557cad8228ab9a8dc5be7cc0f1bcaa SHA512 690c928bda4b7b57425f38ea68ac89cde2473b7a91b7e62c04a8f2c5a0fa3505e26b065d48b7ad0a8bb491f92f600f896fefdad3ce0e86e43cbf4f9a89e94201 -DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6c44679acf0a90667f37a40528ff2155130aa72be2ade1fdef4e6512dfb404b0eff181d77fbafb00c25dd6c5c SHA512 2c85d1938faca5163dd7eede2a8a07569e536c92fd0fbc7f6e6ed91c60fa7f947f0ae101817ed943b0668c4d98ddfd3149033c83614786b5d841b19a8b011c91 -DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e -DIST criterion-0.3.5.crate 110662 BLAKE2B deac65befe648cabfca827b8c37a57a0c48ba1edf34b6e32799117dba9147eceee91b652244b2eb5523c88d8521ae3800d05fbec13b3b3548eabdb13a56f2763 SHA512 ad5d0cf9270c3be5d76c87ada41198d0fbdcdd9831f092ae7179b57e16df153d2aebc0bb70ad7b6fc98966240a902ed5f6fc7adf044be0420bbaa95b951e5be1 -DIST criterion-plot-0.4.4.crate 22546 BLAKE2B ab1326f804cbfbedcb415baadfee2d11b4a67544856fd94dae0f3f3a9bfe46550d23a29a0c8a3a84da6e18565dfb330580aaddfd69a42284499a36b2ae596fef SHA512 4f8fdfdf4ed5e1c410b8e133b36bf9add3d86d56bb23d75d37d92b1095b81850915209c7e4d19fd6aec7cf1b1270a9b968b8e37adc491cfc76b6df71c4619943 -DIST crossbeam-0.8.1.crate 10429 BLAKE2B 4f915d623533a226370eeceefa5c196438b1b332a8b5eb6223853e416385ac4e1a207bf1989646478b219f7a68c8ca0656a808e87db58361f1d77a5554cc2a76 SHA512 564f5623d1a4da7b0253f14946f2e71d14ac9195d80ab3b0ad8e2ba6fc7229745c8c70c2899852d48fc93cef009109d7d7cf2dc9c875273cb8ce9223b92b0beb -DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b -DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4 -DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064 -DIST crossbeam-queue-0.3.2.crate 14993 BLAKE2B b22d68d0bebcee8eeb53fe431f54ae2193a837a0ce8dfe7a49c3c1a42c2de895dea1ef1d71b0909abf9e89442efb14c8fde932553ba13dff8af9d155d7e6dab7 SHA512 7e67037b7a7f134a50e34728813b85a4a6e062895b9f482fa4ef7b1e1e9cc15c9c2836b9b5dec2a4ec36eee57065dc2f1066937e1ffc5b77fae253f60cf3f05a -DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f -DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc -DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328 -DIST ctor-0.1.20.crate 9328 BLAKE2B bc2f4ce53f6b7d6a2fb441317a3f91b8852c541261f95f0b7d12adb35ec1c943810242ce71e514445479c5d225b735cd50fa4dfb514e6b121be753555ab3c30c SHA512 877f4663f8079a368d198a3351e98551c6d8123dd5e53b812529b77b09f1c08296e6df817d7429e4c70a73a6203fd98bce5ec2ce7b09baabe4f348bd54a9c0dd -DIST dav1d-sys-0.3.4.crate 2748 BLAKE2B 64cb5dc703ca302e2348af9d81951c91dcbb52128ea1b2792e538044fd2e1007baeaab1d27b54982afbb3255b7dfc0c1cf94932e88a0f509542d035e20b8fc75 SHA512 950c1a2e4ab0072321b2e55ec3c7494e0b67bf86721563a8d3ab4ae51dd23b308552cf98cb5e293c4ef4633bade2b02412541dfc2b526352ffd0761ff56ca4fd -DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2 -DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16 -DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 -DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba -DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf -DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 -DIST env_logger-0.8.4.crate 33342 BLAKE2B b1bb359be2f34ca6f93f72154c86920b8254f574b48f693b2ae7296cd1ff25d34dea61e95fb2954569fdebb6c522c851ef7499c107005528aa2226df13b0de33 SHA512 9e4478ff609a2e1e1a902a55b221af43a52622fdb5668dc33fb0be354b964708b7b6d13b7f1ef11982f45fa7e71f0712a2ab3fd4ea98155a5115e5a7c3d33049 -DIST fern-0.6.0.crate 299856 BLAKE2B e7adf3beaa2f5fc029acc8d87411c5ef8d3288100b5521d0c1379db6868bcaae73e197f456509bf29f52429ec72bc6e5ef297e971ce9cf6d7cc6232b5d9813fd SHA512 d0524c272cba970b5193d845d4e84698d64bc28c75b38dd2f265f1a132e1c9ea177ebdc38741614f6a6f3d106c7c50565b8562378a50d59ed093e00aee8ca382 -DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d -DIST gimli-0.25.0.crate 705238 BLAKE2B 61b3da99b6cfa732b35d1fd71eb5bf5003b0caa5464e6da8daeb31486d8066443eeeb693b1e84d49f390a0c33f24fd3c0332aec01986127ffe26f7e770a94614 SHA512 f4e90703b8b7d83c36a63ca7a3d4ee48eec2b0762419780670558c4496ee840489b6a275eb2b635676ba25a010c0e378bae429b54aa4591b9d9868b48e0f0beb -DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 -DIST half-1.7.1.crate 36168 BLAKE2B 632fefc24ad4b44c64ef6d3da745392ac016580baa5ba898c45bf41598ebb9ea86bb11c041b8813df73aaa755e323cc762b9e95b834aff7118d0d77e1834e7d5 SHA512 cd678b9277fd909083b67eb86c1fe92f464c92e1932246c6793dd835069aac5af6b9dc16bfbdcfbcdd75d3a641bc1f2240effd83dff6068a41b6c54d3739f73e -DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f -DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a -DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c -DIST image-0.23.14.crate 226804 BLAKE2B 0debec9484b54cb56eedbf07c246b80afc6de99b03e5f41b5cb9aa29ad2269cb7e9891b7377ef7ff53200959317bd38b24e823ebe5c2125677ef2588eec81ae8 SHA512 4eb07fd698c2d902979ab06ae0baef4a53db74da78493c45f0c32d5903c5399cb8a1a25a2e89bf504ffb612e8153eaba4ae41df3d17f02c27e7991fdca518f63 -DIST interpolate_name-0.2.3.crate 4165 BLAKE2B 4399a4330a833c45918b94c78a269e9166a616714faec00998a69484e3fcb8cef20b2a0fc266fa6dea5abda2830e0f9bc958f51497b249c01e1f60373e198a59 SHA512 964944384c39d0c085c05a7643ed2e8a25e224e6b28fd9da9d971567b4d56e7c4887a61e107c718cd95c19c6d83f355256d1130206491f7b286a68899eb7b894 -DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc -DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3 -DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f -DIST jobserver-0.1.23.crate 22758 BLAKE2B 005377202e0e2e0db012c7ba7cbb38cf1ef20158fb1a82281f349f086bca528f7171288e851ac11678f25635694fc9c35724d8f24217e0b84ca0f6bb42177d63 SHA512 86e930fe7fb563a6738102fe85524289ba3a2607026be19c29ad01c1ba18fb4a23589da55cbb12474597d2e3310db3cc448b6d0d1b27335cb0355e6e76e007cf -DIST js-sys-0.3.52.crate 67616 BLAKE2B 3d55c771d19abfb4afdc61ba22017b169bddf38dd3c25c31a87b3b24e11b91e5143101c0fbe3e9185e22d36736565de4de0e2934ecfe8d32b5fd5d0a5ba00534 SHA512 97f699d7e37eecc6ec854f233b7e820b4f5029ee1bc6f23917331834ba86eb458cde688b45ea417b8a53cb9799ee46f67040a0618e036dea85d77bd02272b3a8 -DIST lab-0.8.2.crate 13245 BLAKE2B c8e8c42301205355a29ff165bd52a3a6425bd3ff4b4171d51547875fb99d8569816cebab8e883e84ff5a3dc0e0a3e2732f8c00baf672004343e1042f31f05b8e SHA512 a08f0fb5daa02a24ea2fdacf818a9def23793f6ba614d971ade84e05381631ded6d2d7bf7e57e7fdc0d27bf27180a28862551929874101bd8afbcc0ffe620d6c -DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 -DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d -DIST libc-0.2.99.crate 524997 BLAKE2B 9b78f524c5c5b51a5927c6e72ba24276cfd751a6f75905c6bdff0c8055912edec2caa23d9e5132d58995736f8d4d34e22aaeff63bd07aaa6eeed6d31da967a5d SHA512 91a4ae007c897e0b5fa91ecd742c45271c5d0d63819806dedb65bbab81bb1e3faf4f7332899c694df9135222de23ec12ef463f9a2508b6adcd2c0ac5cc113c9c -DIST libfuzzer-sys-0.3.5.crate 112480 BLAKE2B 0c566e9f8187e51708b8df88333a9ad92f80e62be22c6dcede44729c87a245f41ad254dd4bcbb76f5f6be3c7c426770b0800e82ad6e4b1e5b598e54ac033ee9e SHA512 d07c49351ff8bdb1cfc62f60cbf9147213bfd524e26dc50ca17f2374868a05581c432822c396222fbb9c72098fe47a57d97423f4b40fc2e7577801b829a8e796 -DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28 -DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc -DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb -DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d -DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e -DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f -DIST nasm-rs-0.2.1.crate 9490 BLAKE2B 614ad8176549c9ae15211a6c6a77bf5489629c394794d14b540f3df9e7cf07b27c3af12ab89540d273da8183d77e68b1249b9456da9f9e004f424fd191b7efbf SHA512 4084f91ff6681d4a7e2a7ecfa1a1774597aca7837764f282ada2e9792001f51fcb2c24e21621e37978b428b26cd0d453d2186cdd77072f5021fbd2c304d53529 -DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca -DIST noop_proc_macro-0.3.0.crate 2157 BLAKE2B 0be977f9820fe4cab4035e866d6ebc77a07cf634ee6889dc91581a9eb43f308b0fc60b87c8bcf200742bcea4af14a94c69c5b9dfbb32b95454219a4197fd5228 SHA512 a5ad22e815b8c574b42f7b70486a3fac319c24334ade74726ec07b976a838954d1de2d3632fc55ce6c8de2673e62b987fb4607a49c576f60959b1609e47b3771 -DIST num-derive-0.3.3.crate 14545 BLAKE2B 3af73d35ced61f8e4fa2f2bef695f72a3cf1f1a67c77982d3518d9383331f34c1222dd7d72802cec22baa108ae08a87805a11942132c565ab8439c4983e99871 SHA512 e0f4d06fff26c2d2b140ff5ec1ba655a46c8d8fda484f03a8ad4910e8cf1392f0130d5c0bfbbe3bfb95da1f93e964f73364de6551fddd81e6fc27bfa35c15053 -DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771 -DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e -DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837 -DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e -DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f -DIST object-0.26.0.crate 237724 BLAKE2B ef550309ed83a55325778d13d84bae1d75fed882b840cbae9780a941a0c3596b58693365933cfeb757a1cdf585d394566cf92e0c9d43418555c30bcc9fd36ba8 SHA512 a050755beb401e56538c7f1acc264b0526b7052fb6325824cba64b7708e5bbeb882651d2f41b44ea589deb8e21c374b39428280c44deac91da83d7834b8fc345 -DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9 -DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036 -DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22 -DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721 -DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9 -DIST plotters-0.3.1.crate 8595577 BLAKE2B 7c500c43c2b2875d9dc17e4eab57cbd8a470c6064deadf4e78c429abe2f1e97511f64bc67782b4e03e7cc47c8ac54aadfa5f7cc8c27d3b4453d2ee8252896c99 SHA512 c7bcdf9da56c2d1c03053f61256d44d2384fac1a9a7e0db058090c13b359bce76a2a96bbcbfde04fdcde0a9dd3db8a1a22bc57508b0b6e4a374c8b35ec6c9707 -DIST plotters-backend-0.3.2.crate 13524 BLAKE2B cfd42df0fcea4e5ee944a6b8c48e3b7fcecefd6d97f07e1c333067193c211da9eba29fb56e9fc8b861cfa2d1baa3c042fddb494bb66b9109656b26bde7901f7d SHA512 116bc6866094a2ec40a9ab9363378566ff37eeb4a4e3805562dd3e95f1d5e8664b54d3dc858a2c9974b125e308e46b77c294de2a655f836d342712c32f0242a3 -DIST plotters-svg-0.3.1.crate 7596 BLAKE2B ac8dffc5dea833c0506c472567056be0804e5519828b68f7b3bec9ee63dd59f9aa828c10732a50e004214512df06c7eaf164eb9613cda75b2753270fa358c0d6 SHA512 4d3cd02534440dc26f5eaa3b4966081901626c61d9fabe0092fed87c48929cb9be070d9c34486fc7c7bef308337ff4890d30f9581a613549e507db60dd9d8876 -DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee -DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1 -DIST predicates-2.0.1.crate 27077 BLAKE2B eca1527c1734b3bbd674dd5fadbe040187b95f66480b6cbf322f225db0b47e49d5a510bb97e861fb28a6ddaf56a1f10ae8c3136a22953c86a491086d63c08848 SHA512 81d5faa0224c430d467d22edc20a02dc214852d937f948ca1d51eac61788f4340a279a93ecb8a9bea495f2a45e2c86a42b8b495c431f50e752c2ee0c422b946f -DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab -DIST predicates-tree-1.0.3.crate 6370 BLAKE2B 6e123197e18c5c08892a0e76de41285522253ae0bb8d477fde0bda0c64bc426615f8ac408d5b1f444957b6363750c3fce6f4551f940797c39f9582f9c79db468 SHA512 bcf05c9770d26c8c6407b8103f670cd6bbfa48683c19f37caeb03c11d16a56e5011b329d9af6eb59c930db376b7be2f436e1650b7c15e70817316f6af1163ad9 -DIST pretty_assertions-0.7.2.crate 79200 BLAKE2B b7736ce11bbc5d2a778c2525e80993858c5d2a7182123c3f5aa2cde6ffe5621ab8033a91d578f4fba9badc3f503a0f14873d234b41974161f8148f2b27510e12 SHA512 edf898bbb15f4f56d2d7688d90d44d0ee7913b7d78b4774548eb7a88e8f75b0de9635c93b107744a2501839202ecf828004d179c6edf84706ae160186d47d177 -DIST proc-macro2-1.0.28.crate 38732 BLAKE2B f2d4765789d03d5d26c9de7e1283ce6e4086ca640d95a36649f8fdfe96533ad768b2a8ba56726e0462ba4fcd8f332fc455307987e0b7c79a5e96f2e75a641162 SHA512 2a4e34ab2bb692c3661db40ebc6d22f3dbcbc30c2f4d88e1a7f022f8522e943ffe2a1c9b92411c7e04941dc0156cb365e0de953fa45d8710e39b660ee9028741 -DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8 -DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e -DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 -DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87 -DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5 -DIST rav1e-0.5.0_beta.tar.gz 2692676 BLAKE2B 23f1bcedb425cdac3b36160fbea0221fddd60bd3157d14660ccd984178c4732301ac695d396caa7026f74c115f75d272014472f2a7b6a58502a1208d5c597993 SHA512 581462f31360b65968812486e5288b8ede0773d1449b237b00c6aecf16e20268a6b7d29b802286156545cdad0ac37cff995f66a3aa7d6b57b9f637455f77bea3 -DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9 -DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78 -DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19 -DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f -DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5 -DIST rust_hawktracer-0.7.0.crate 4718 BLAKE2B 269902116f53e1f50cfb524bedd4594c9c43d481ae5eebb16dc12f4314024afa16e224fbccc97907429534cfb74e06cc263c69da3ac1cc2f04b49ec4b8b29890 SHA512 62756c6c99a1ff1dd78565a522cebec3a9bed637a157b3d5d7ab91f7ce74d6de809604e8406b7e80807f34a7fa7b72fc9b6df51bcbd41e4fb503425d0b8cbc02 -DIST rust_hawktracer_normal_macro-0.4.1.crate 3000 BLAKE2B 9126ff8bd5dd0300e4c6df4311a94c96c1b0ffc23973fdde752593c7072ed687393a5165d5e4a27df28ab56490a0cf4af67556c1829103298963f1210dab7161 SHA512 19d2d10da7728d28baf3c5be0f7a9df7b23e63188d7f6f2acae199d081a06fcc6a78c778d56cbaeeb83dfcc5e0c775f1d608074c95461a17b6a1ff84017129a9 -DIST rust_hawktracer_proc_macro-0.4.1.crate 3028 BLAKE2B aa2d70be709d0926a2edc4e29c31fb2bb1412d2e9c2144a604d19a4b903e92c59ed2a9892a2182c859963704ea0d6035304e0621e8f8bb432ca7cb888b1bc4a5 SHA512 f23b23cedbf1992a58e238d03acf75d627a9a4442019597c913e8c23d133511c2501e80a839f61af816efd55d6b9d8a6b045454652dced927e06b480dec53140 -DIST rust_hawktracer_sys-0.4.2.crate 319968 BLAKE2B 251fd00f03338cd5287c79a58a5589cc03890b9e044fe679b2ede657816256caab8d7b09765b540b1ff50b0fcc52b9138a63b41e6b6def35ead81168e0c3ca13 SHA512 9a145263b5debed91980151229fbf61583f67b187c904cd9976d8837c0c8b348e53b47e58cd0d34b7a23609ecec8cd40d241f08d0da585931a203915e36bcc24 -DIST rustc-demangle-0.1.20.crate 23298 BLAKE2B 74479b2724130d67a934176be4b667b9db38603bc093ac547ddcaa9263dedd6e52a5ee690349d75519c173e74a098a20dee234c8fbe14b003cc77109a0efa16b SHA512 edb31174340fc3956eb225c2175a9e8868a8b70f30991531bdbdde77e5924e7a778a7a5ef44ebaca776def262c9045d82c046a83e0ba407431744e1259add001 -DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 -DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db -DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c -DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c -DIST scan_fmt-0.2.6.crate 9676 BLAKE2B eb314c3e456de46b31d4286016b9194e663f7c3aea0b699a2693d180b2f0fa549448609b845afbbd0053661b5777a8912c2c607ffb26e490f86fd43ee2c2a1ab SHA512 ac24f699aa39d6fb29c309a9716eda9bda7331769114f52ab51f4aa781ecb3c7694ac385c7d60cec9b87e134fa2a5d8f586b54166ee9d58cc4bc34c83943ecc0 -DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9 -DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef -DIST serde_cbor-0.11.1.crate 43947 BLAKE2B 4c1dc444089276b4bfb1b1237eeaefbb6954fa8b613e539fa6eabe01ddda990be50c5e5ce72e5f765835224e9de4fb0fdb26d2fada2b18d6b03f77665e2c41cc SHA512 165192ed999cfdbe162abd3aff92f86f4300ffa9347e57fda2ef3c32c69a18183d468db059d9dd80218bf01de15fec6fde7cf6dbb8cc2a6158785484353f2192 -DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416 -DIST serde_json-1.0.66.crate 115121 BLAKE2B c46c65339ff79138649df206f2ec759945c31ac11bac4807a8d1e76095c1937211b0b4ebf88c69d2d22cbd90ba25643a74cafeb291e815ddeb5c5ca208eec9e6 SHA512 8cbb64a24781a94e9448dd39f9429830fff6fe61be3772c1ca825f7d489ac3c06b189c42730129e281d8f43f7128b3b9cd2308727e625763588bbaf61b54d1d1 -DIST shlex-1.0.0.crate 4555 BLAKE2B c39f219b68e7a85fc0a0bb2df38d3b232a80815f5e541a03173d308c0274f55c61e54887c95c22d51b2e62339365bf5deac5b0d0ab3bb5d40fb70b8f75f1755b SHA512 aea9827adb630b9ed71423fb216113ee20dba31e5f1e7d078445e8bd77e7e9bfe64ea2e73f3be0fcaa472023b724793f86c06ff8efb9e4cc133f805bcf11c560 -DIST signal-hook-0.3.9.crate 48416 BLAKE2B 1075d4b767f3d3c2e556ad1ca2511eee4eea8674989ee76cf4234ebac78f1351291f3dfff72605ec9fe92e978fc9ba25298182564e5a17676fb14441de6bb6e4 SHA512 bcb6cfd4d062ed4a2a83a7fbb35ec90f7dfa5e875807fe6b7c65d0393447b56fee613eac2b3dd08dae0cf2e3cdee920f2c3b3d27ccd1f6f8dbec849c3e6e4261 -DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d -DIST simd_helpers-0.1.0.crate 1527 BLAKE2B dc556646a3fc94548f1e16e837e94fa2e28b78b650260aa50535a45e92fdcd952bf0eebddfc2fcb9e653871447e9b9db82f3f8c1090fe09442b7916c65ade3e7 SHA512 20577ab7615f955ee3a88c617630fc6c88703d455629d5b3838a551baebbeae8c64a2587871ec5a4fb6bc203945cace50593a238e4765b5fa2313bac30237ca7 -DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad -DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 -DIST strum-0.21.0.crate 5296 BLAKE2B 6910f08a5dcbbe6008b777a2948a8f01ca18d30be76ff6a89dcfcb28b05353a860fc1b59412933b9c54b9ad424a1366e0b81773e38b04e9a5f9a038b2d1bf082 SHA512 687a99aa93616e16510213b66f53be35561d19cd19f9776084e9d6d33f8576f5eec7a806a0e48997da2b41e6f563a05424c1d5cb5ab2b4a2310cfe1d3b10a5a6 -DIST strum_macros-0.21.1.crate 16280 BLAKE2B 48e4eb3f5e5431684a4688feb55cbf024a810b39df37fa869b4d417bf16c245c3eb901fe2c544da206f1dd4a3c2e62653b4080a9dc02eb446c6795225b34d857 SHA512 85ea12f8e03f04c427b99e027065279bd559ea1c51532c6f35cc842218e350e27349258f0fe25f5efc9fca047387da3ec5d670f94a50d574b15f4b5f1c99ddea -DIST syn-1.0.74.crate 232974 BLAKE2B fc17dc2645fbe2d1ee409f895732b86cb77dc14837d35d7773e7f9f055e0b56f70be86203f13c549f0b43e1e4e1e777cc5bee2f08a733fe447f907dfaa443da7 SHA512 5aae03a68a4a8c1234d4e9a69cd37b9f6c698e2b635f10a030c0fac22cf00414c2a5e7523e0efe43181bc29c17abe6abc0eab103391259c97ce566713e3349f6 -DIST system-deps-3.1.2.crate 20920 BLAKE2B 4e5c2e208a35c59522dfbdf23b36bbfe1ab2a9e32bf4c7663de55aee4919de934ccbbe2914e4f32ef1e7f6430f24ef84ef8bd2344c2f443a6df6bc5446037d10 SHA512 ed96a370fdb4e57b575987b1a9a6985088bb4d1d59e8162e043504e7028ec1e814e39cd9b8ecd26513e362c7fde98785c2964b206da2acac8989639ef6dcc716 -DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c -DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201 -DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a -DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b -DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921 -DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25 -DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9 -DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082 -DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824 -DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495 -DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0 -DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8 -DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9 -DIST version-compare-0.0.11.crate 15208 BLAKE2B b2b463f1965739369aa168b4d58775cd35c9a072ddc3775c439026e3b7a9cad5b60e9745980cebf498d22ca85932e1c670409007c4206ee6112d95096d552161 SHA512 dc0871daf7a1eb1890b70d5b876291f10b5f61b19f276a104176901f46671799e0254f0af8bb9c4106e3c8255b4d3fd65f6f408e51f080d79947c2fea4eb3558 -DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd -DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 -DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da -DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7 -DIST wasm-bindgen-0.2.75.crate 160048 BLAKE2B 5e0fb4b5093e51d59007d202a4fc30ebfe0d174101a7178412c7cf0c11de1e1dfda2a86ce403f925eda5f286dfcf07d348143108905b912d2c4222f07ef414b9 SHA512 6e44827bddf78f38203f864564e7315744b4ee232a20b62f74551d9c8099005e5289074ca123acdb98f367e6e09ceb694124649d26ca16aa5c4137dd9494df91 -DIST wasm-bindgen-backend-0.2.75.crate 25521 BLAKE2B 8b4d494cc903e1d37f4b5f0cf0dad2304f35534a15a4381cf511384b090b635f9926647eccb434c148c0fe86f0621e8aaaab3fc38c8c61d2b45363a2c8ddcaaf SHA512 27231ae632b3377f54dba755c7db2334c77f75d2f2d6062fe9be27d19ee071552b8c36f037f5bf5cf383f262a88464a0fb5018fef2c301202c9927e0abd08637 -DIST wasm-bindgen-macro-0.2.75.crate 11550 BLAKE2B 160805abd3343c43634c2d8cfc2ae9eafdd18be207fbb849caefeef47d6ffad70e436775b86c3432ccb78d994ce81cee97c1b41c29484148d23946392a5dc9fa SHA512 200999b53937df7daae4779ec7aa1b78bb10d399c3ebe7dc8d9806ef697cfe6c4111296623610fb4aea48cf7cfdc6ac2fe66398db781796f8fdad32e4809a4cd -DIST wasm-bindgen-macro-support-0.2.75.crate 17883 BLAKE2B 007f789084f42f7aee7db984763c0d224ad16b04d134aa2208b53a93911b408a4e95ad51e3f6e010157ee2a4ba8f9e52cffc20f2c47ecc7ffece797814c99b10 SHA512 cb0bb02c7f0bb6ad7de3adff606d18e7eae3f4dfd276abd540de6dbf30d995445347781e681ae6f71a943cc2b7c4da36459f49af32cd1574e5634948ee65421f -DIST wasm-bindgen-shared-0.2.75.crate 7177 BLAKE2B 89da1efd60d9f1a5f99fe216a1ddb56aaa53e75591dbdb11aeb07f350f95dc436e68d7e16c182fa10385b7eb07788fdaa87f374a007d687a473a7049d585f6be SHA512 35c8ef834dc0ffdc245a52d987a543483f4caeee0f2d831e2a48bd7c0dd43bedf02b460323ef0d40a4e7945b351768cc4a07112771f197b93702887b828e9821 -DIST web-sys-0.3.52.crate 663882 BLAKE2B 8e0de45d084c801ca8a1f1a23dc7b5b510c0cd56d3cf2edbda241b4a7124962a750c823ad617a5fb102497751ca916937576356bb6d5c95c8ddb1eb6632a45df SHA512 03f2cc2d0173cc865005026daaf8c596a0df3f7d4da5937f3c6121280a55904180ef052e9663865ee3c74156f32af91a5ecfe146b72abe25ddaa4b05db4653cf -DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5 -DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 -DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 -DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd -DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 -DIST y4m-0.7.0.crate 12045 BLAKE2B 4f48eb7ad5be2486e0f723b9beb9109cd1b38a0d0c5ac4a64411fce0bd9371d45496e5e0e839d15e7d1616b3888cfc1a0fc1ca364e65ac508306cad9a4ed44a7 SHA512 b85b0dd6df46c9bf125eee3e51ea39545ea1c794a2a097bba0aa31c682532ed3a9ba141745c61915fff13535fc5fff5a490d7c9e731c75bb5ce38a702075467e diff --git a/media-video/rav1e/metadata.xml b/media-video/rav1e/metadata.xml deleted file mode 100644 index 74c3efb..0000000 --- a/media-video/rav1e/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>lu_zero@gentoo.org</email> - </maintainer> - <maintainer type="project"> - <email>media-video@gentoo.org</email> - </maintainer> - <use> - <flag name="capi">Build the C-API library and header file</flag> - </use> -</pkgmetadata> diff --git a/media-video/rav1e/rav1e-0.5.0_beta-r1.ebuild b/media-video/rav1e/rav1e-0.5.0_beta-r1.ebuild deleted file mode 100644 index fbb0466..0000000 --- a/media-video/rav1e/rav1e-0.5.0_beta-r1.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# Copyright 2017-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CRATES=" -addr2line-0.16.0 -adler-1.0.2 -adler32-1.2.0 -aho-corasick-0.7.18 -ansi_term-0.11.0 -ansi_term-0.12.1 -anyhow-1.0.43 -aom-sys-0.3.0 -arbitrary-0.4.7 -arg_enum_proc_macro-0.3.1 -arrayvec-0.7.1 -assert_cmd-2.0.0 -atty-0.2.14 -autocfg-1.0.1 -av-metrics-0.6.2 -backtrace-0.3.61 -bindgen-0.58.1 -bitflags-1.3.1 -bitstream-io-1.2.0 -bstr-0.2.16 -bumpalo-3.7.0 -bytemuck-1.7.2 -byteorder-1.4.3 -cast-0.2.7 -cc-1.0.69 -cexpr-0.4.0 -cfg-expr-0.7.4 -cfg-if-1.0.0 -chrono-0.4.19 -clang-sys-1.2.0 -clap-2.33.3 -cmake-0.1.45 -color_quant-1.1.0 -console-0.14.1 -crc32fast-1.2.1 -criterion-0.3.5 -criterion-plot-0.4.4 -crossbeam-0.8.1 -crossbeam-channel-0.5.1 -crossbeam-deque-0.8.1 -crossbeam-epoch-0.9.5 -crossbeam-queue-0.3.2 -crossbeam-utils-0.8.5 -csv-1.1.6 -csv-core-0.1.10 -ctor-0.1.20 -dav1d-sys-0.3.4 -deflate-0.8.6 -diff-0.1.12 -difflib-0.4.0 -doc-comment-0.3.3 -either-1.6.1 -encode_unicode-0.3.6 -env_logger-0.8.4 -fern-0.6.0 -getrandom-0.2.3 -gimli-0.25.0 -glob-0.3.0 -half-1.7.1 -heck-0.3.3 -hermit-abi-0.1.19 -humantime-2.1.0 -image-0.23.14 -interpolate_name-0.2.3 -itertools-0.8.2 -itertools-0.10.1 -itoa-0.4.7 -jobserver-0.1.23 -js-sys-0.3.52 -lab-0.8.2 -lazy_static-1.4.0 -lazycell-1.3.0 -libc-0.2.99 -libfuzzer-sys-0.3.5 -libloading-0.7.0 -log-0.4.14 -memchr-2.4.0 -memoffset-0.6.4 -miniz_oxide-0.3.7 -miniz_oxide-0.4.4 -nasm-rs-0.2.1 -nom-5.1.2 -noop_proc_macro-0.3.0 -num-derive-0.3.3 -num-integer-0.1.44 -num-iter-0.1.42 -num-rational-0.3.2 -num-traits-0.2.14 -num_cpus-1.13.0 -object-0.26.0 -oorandom-11.1.3 -output_vt100-0.1.2 -paste-1.0.5 -peeking_take_while-0.1.2 -pkg-config-0.3.19 -plotters-0.3.1 -plotters-backend-0.3.2 -plotters-svg-0.3.1 -png-0.16.8 -ppv-lite86-0.2.10 -predicates-2.0.1 -predicates-core-1.0.2 -predicates-tree-1.0.3 -pretty_assertions-0.7.2 -proc-macro2-1.0.28 -quote-1.0.9 -rand-0.8.4 -rand_chacha-0.3.1 -rand_core-0.6.3 -rand_hc-0.3.1 -rayon-1.5.1 -rayon-core-1.9.1 -regex-1.5.4 -regex-automata-0.1.10 -regex-syntax-0.6.25 -rust_hawktracer-0.7.0 -rust_hawktracer_normal_macro-0.4.1 -rust_hawktracer_proc_macro-0.4.1 -rust_hawktracer_sys-0.4.2 -rustc-demangle-0.1.20 -rustc-hash-1.1.0 -rustc_version-0.4.0 -ryu-1.0.5 -same-file-1.0.6 -scan_fmt-0.2.6 -scopeguard-1.1.0 -semver-1.0.4 -serde-1.0.127 -serde_cbor-0.11.1 -serde_derive-1.0.127 -serde_json-1.0.66 -shlex-1.0.0 -signal-hook-0.3.9 -signal-hook-registry-1.4.0 -simd_helpers-0.1.0 -smallvec-1.6.1 -strsim-0.8.0 -strum-0.21.0 -strum_macros-0.21.1 -syn-1.0.74 -system-deps-3.1.2 -termcolor-1.1.2 -terminal_size-0.1.17 -textwrap-0.11.0 -thiserror-1.0.26 -thiserror-impl-1.0.26 -time-0.1.43 -tinytemplate-1.2.1 -toml-0.5.8 -treeline-0.1.0 -unicode-segmentation-1.8.0 -unicode-width-0.1.8 -unicode-xid-0.2.2 -vec_map-0.8.2 -version-compare-0.0.11 -version_check-0.9.3 -wait-timeout-0.2.0 -walkdir-2.3.2 -wasi-0.10.2+wasi-snapshot-preview1 -wasm-bindgen-0.2.75 -wasm-bindgen-backend-0.2.75 -wasm-bindgen-macro-0.2.75 -wasm-bindgen-macro-support-0.2.75 -wasm-bindgen-shared-0.2.75 -web-sys-0.3.52 -which-3.1.1 -winapi-0.3.9 -winapi-i686-pc-windows-gnu-0.4.0 -winapi-util-0.1.5 -winapi-x86_64-pc-windows-gnu-0.4.0 -y4m-0.7.0 -" - -inherit cargo - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/xiph/rav1e.git" - inherit git-r3 -else - SRC_URI=" - https://github.com/xiph/rav1e/archive/v${PV//_/-}.tar.gz -> ${P}.tar.gz - $(cargo_crate_uris ${CRATES}) - " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="The fastest and safest AV1 encoder" -HOMEPAGE="https://github.com/xiph/rav1e/" -RESTRICT="" -LICENSE="BSD-2 Apache-2.0 MIT Unlicense" -SLOT="0" - -IUSE="+capi static-libs" - -ASM_DEP=">=dev-lang/nasm-2.15" -BDEPEND=" - amd64? ( ${ASM_DEP} ) - capi? ( dev-util/cargo-c ) -" - -S=${WORKDIR}/${P//_/-} - -src_unpack() { - if [[ "${PV}" == *9999* ]]; then - git-r3_src_unpack - cargo_live_src_unpack - else - default - cargo_src_unpack - fi -} - -src_compile() { - export CARGO_HOME="${ECARGO_HOME}" - local args=$(usex debug "" --release) - - cargo build ${args} \ - || die "cargo build failed" - - if use capi; then - cargo cbuild ${args} --target-dir="capi" \ - --prefix="/usr" --libdir="/usr/$(get_libdir)" \ - --library-type=$(usex static-libs cdylib,staticlib cdylib) \ - || die "cargo cbuild failed" - fi -} - -src_install() { - export CARGO_HOME="${ECARGO_HOME}" - local args=$(usex debug --debug "") - - if use capi; then - cargo cinstall $args --target-dir="capi" \ - --prefix="/usr" --libdir="/usr/$(get_libdir)" --destdir="${ED}" \ - --library-type=$(usex static-libs cdylib,staticlib cdylib) \ - || die "cargo cinstall failed" - fi - - cargo_src_install -} diff --git a/metadata/layout.conf b/metadata/layout.conf index 0e3ae1b..390ba9f 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,5 +1,5 @@ repo-name = alxu -masters = gentoo crossdev +masters = gentoo thin-manifests = true use-manifests = true manifest-hashes = BLAKE2B SHA512 diff --git a/net-dns/libidn-compat/Manifest b/net-dns/libidn-compat/Manifest index 43e891c..8be52ee 100644 --- a/net-dns/libidn-compat/Manifest +++ b/net-dns/libidn-compat/Manifest @@ -1,2 +1 @@ -DIST libidn-1.33-security_backports-01.tar.xz 3420 BLAKE2B c0311d83dee53b83bceab7777e9508ffdc2737e31eec71dc7e67b29ee75cdcef8558db0e89d857ed8c402980fdd7c3419fbb123eba91dddc2358a06684114811 SHA512 e925d20c9258b47821d444c563c75f09f003d1c6b367c934a808242ce4c259ff83e9d67e886cb3e832117df1cd9cae4b18417c48fbf9c77266ab379d3afcd4f4 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 diff --git a/net-dns/libidn-compat/libidn-compat-1.33.ebuild b/net-dns/libidn-compat/libidn-compat-1.33.ebuild index cda239e..ae8027a 100644 --- a/net-dns/libidn-compat/libidn-compat-1.33.ebuild +++ b/net-dns/libidn-compat/libidn-compat-1.33.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools multilib-minimal libtool MY_PN=libidn @@ -11,7 +11,6 @@ DESCRIPTION="Internationalized Domain Names (IDN) implementation" HOMEPAGE="https://www.gnu.org/software/libidn/" SRC_URI=" mirror://gnu/libidn/${MY_P}.tar.gz - https://dev.gentoo.org/~polynomial-c/${MY_P}-security_backports-01.tar.xz " LICENSE="GPL-2 GPL-3 LGPL-3" @@ -29,8 +28,6 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - eapply "${WORKDIR}"/patches - # breaks eautoreconf sed '/AM_INIT_AUTOMAKE/s@ -Werror@@' -i configure.ac || die # Breaks build because --disable-gtk-doc* gets ignored diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest new file mode 100644 index 0000000..0b58477 --- /dev/null +++ b/net-mail/notmuch/Manifest @@ -0,0 +1,2 @@ +DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 +DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19 diff --git a/net-mail/notmuch/files/50notmuch-gentoo.el b/net-mail/notmuch/files/50notmuch-gentoo.el new file mode 100644 index 0000000..95e0624 --- /dev/null +++ b/net-mail/notmuch/files/50notmuch-gentoo.el @@ -0,0 +1,7 @@ +(add-to-list 'load-path "@SITELISP@") +(if (boundp 'image-load-path) + (add-to-list 'image-load-path "@SITEETC@" t)) +(autoload 'notmuch "notmuch" nil t) +(autoload 'notmuch-search "notmuch" nil t) +(autoload 'notmuch-hello "notmuch-hello" nil t) +(autoload 'notmuch-show "notmuch-show" nil t) 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 new file mode 100644 index 0000000..a138814 --- /dev/null +++ b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch @@ -0,0 +1,236 @@ +--- a/configure ++++ b/configure +@@ -502,230 +502,9 @@ + gmime_cflags=$(pkg-config --cflags gmime-3.0) + gmime_ldflags=$(pkg-config --libs gmime-3.0) + +- printf "Checking for GMime session key extraction support... " +- +- cat > _check_session_keys.c <<EOF +-#include <gmime/gmime.h> +-#include <stdio.h> +- +-int main () { +- GError *error = NULL; +- GMimeParser *parser = NULL; +- GMimeMultipartEncrypted *body = NULL; +- GMimeDecryptResult *decrypt_result = NULL; +- GMimeObject *output = NULL; +- +- g_mime_init (); +- parser = g_mime_parser_new (); +- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("$srcdir/test/corpora/crypto/basic-encrypted.eml", "r", &error)); +- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/crypto/basic-encrypted.eml\n"); +- +- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL))); +- if (body == NULL) return !! fprintf (stderr, "did not find a multipart encrypted message\n"); +- +- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_EXPORT_SESSION_KEY, NULL, &decrypt_result, &error); +- if (error || output == NULL) return !! fprintf (stderr, "decryption failed\n"); +- +- if (decrypt_result == NULL) return !! fprintf (stderr, "no GMimeDecryptResult found\n"); +- if (decrypt_result->session_key == NULL) return !! fprintf (stderr, "GMimeDecryptResult has no session key\n"); +- +- printf ("%s\n", decrypt_result->session_key); +- return 0; +-} +-EOF +- if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then +- printf 'No.\nCould not make tempdir for testing session-key support.\n' +- errors=$((errors + 1)) +- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \ +- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \ +- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ +- && [ $SESSION_KEY = 9:496A0B6D15A5E7BA762FB8E5FE6DEE421D4D9BBFCEAD1CDD0CCF636D07ADE621 ] +- then +- printf "OK.\n" +- else +- cat <<EOF +-No. +-*** Error: Could not extract session keys from encrypted message. +- +-This is likely due to your GMime having been built against a old +-version of GPGME. +- +-Please try to rebuild your version of GMime against a more recent +-version of GPGME (at least GPGME 1.8.0). +-EOF +- if GPGME_VERS="$(pkg-config --modversion gpgme || gpgme-config --version)"; then +- printf 'Your current GPGME development version is: %s\n' "$GPGME_VERS" +- else +- printf 'You do not have the GPGME development libraries installed.\n' +- fi +- errors=$((errors + 1)) +- fi +- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then +- rm -rf "$TEMP_GPG" +- fi +- +- cat > _check_gmime_cert.c <<EOF +-#include <stdio.h> +-#include <gmime/gmime.h> +- +-int main () { +- GError *error = NULL; +- GMimeParser *parser = NULL; +- GMimeApplicationPkcs7Mime *body = NULL; +- GMimeSignatureList *sig_list = NULL; +- GMimeSignature *sig = NULL; +- GMimeCertificate *cert = NULL; +- GMimeObject *output = NULL; +- int len; +- +- g_mime_init (); +- parser = g_mime_parser_new (); +- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("$srcdir/test/corpora/pkcs7/smime-onepart-signed.eml", "r", &error)); +- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/pkcs7/smime-onepart-signed.eml\n"); +- +- body = GMIME_APPLICATION_PKCS7_MIME(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL))); +- if (body == NULL) return !! fprintf (stderr, "did not find a application/pkcs7 message\n"); +- +- sig_list = g_mime_application_pkcs7_mime_verify (body, GMIME_VERIFY_NONE, &output, &error); +- if (error || output == NULL) return !! fprintf (stderr, "verify failed\n"); +- +- if (sig_list == NULL) return !! fprintf (stderr, "no GMimeSignatureList found\n"); +- len = g_mime_signature_list_length (sig_list); +- if (len != 1) return !! fprintf (stderr, "expected 1 signature, got %d\n", len); +- sig = g_mime_signature_list_get_signature (sig_list, 0); +- 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"); +-#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} -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 +- then +- if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then +- gmime_x509_cert_validity=1 +- printf "Yes.\n" +- else +- gmime_x509_cert_validity=0 +- printf "No.\n" +- if pkg-config --exists "gmime-3.0 >= 3.2.7"; then +- cat <<EOF +-*** Error: GMime fails to calculate X.509 certificate validity, and +-is later than 3.2.7, which should have fixed this issue. +- +-Please follow up on https://github.com/jstedfast/gmime/pull/90 with +-more details. +-EOF +- 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)) +- fi +- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then +- rm -rf "$TEMP_GPG" +- fi +- +- # see https://dev.gnupg.org/T3464 +- # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1 +- printf "Checking signature verification when decrypting using session keys... " +- +- cat > _verify_sig_with_session_key.c <<EOF +-#include <stdio.h> +-#include <gmime/gmime.h> +- +-int main () { +- GError *error = NULL; +- GMimeParser *parser = NULL; +- GMimeMultipartEncrypted *body = NULL; +- GMimeDecryptResult *result = NULL; +- GMimeSignatureList *sig_list = NULL; +- GMimeSignature *sig = NULL; +- GMimeObject *output = NULL; +- GMimeSignatureStatus status; +- int len; +- +- g_mime_init (); +- parser = g_mime_parser_new (); +- g_mime_parser_init_with_stream (parser, g_mime_stream_file_open("$srcdir/test/corpora/crypto/encrypted-signed.eml", "r", &error)); +- if (error) return !! fprintf (stderr, "failed to instantiate parser with test/corpora/pkcs7/smime-onepart-signed.eml\n"); +- +- body = GMIME_MULTIPART_ENCRYPTED(g_mime_message_get_mime_part (g_mime_parser_construct_message (parser, NULL))); +- if (body == NULL) return !! fprintf (stderr, "did not find a multipart/encrypted message\n"); +- +- output = g_mime_multipart_encrypted_decrypt (body, GMIME_DECRYPT_NONE, "9:9E1CDF53BBF794EA34F894B5B68E1E56FB015EA69F81D2A5EAB7F96C7B65783E", &result, &error); +- if (error || output == NULL) return !! fprintf (stderr, "decrypt failed\n"); +- +- sig_list = g_mime_decrypt_result_get_signatures (result); +- if (sig_list == NULL) return !! fprintf (stderr, "sig_list is NULL\n"); +- +- if (sig_list == NULL) return !! fprintf (stderr, "no GMimeSignatureList found\n"); +- len = g_mime_signature_list_length (sig_list); +- if (len != 1) return !! fprintf (stderr, "expected 1 signature, got %d\n", len); +- sig = g_mime_signature_list_get_signature (sig_list, 0); +- if (sig == NULL) return !! fprintf (stderr, "no GMimeSignature found at position 0\n"); +- status = g_mime_signature_get_status (sig); +- if (status & GMIME_SIGNATURE_STATUS_KEY_MISSING) return !! fprintf (stderr, "signature status contains KEY_MISSING (see https://dev.gnupg.org/T3464)\n"); +- +- return 0; +-} +-EOF +- if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then +- printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n' +- errors=$((errors + 1)) +- elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \ +- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \ +- && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key +- then +- if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then +- gmime_verify_with_session_key=1 +- printf "Yes.\n" +- else +- gmime_verify_with_session_key=0 +- printf "No.\n" +- cat <<EOF +-*** Error: GMime fails to verify signatures when decrypting with a session key. +- +-This is most likely due to a buggy version of GPGME, which should be fixed in 1.13.2 or later. +-See https://dev.gnupg.org/T3464 for more details. +-EOF +- fi +- else +- printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n' +- errors=$((errors + 1)) +- fi +- if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then +- rm -rf "$TEMP_GPG" +- 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/metadata.xml b/net-mail/notmuch/metadata.xml new file mode 100644 index 0000000..cf5cb52 --- /dev/null +++ b/net-mail/notmuch/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <use> + <flag name="apidoc">Provide doxygen generated API docs</flag> + <flag name="doc">Install API documentation</flag> + <flag name="crypt">Support decryption and verification of PGP/MIME + messages and in Emacs UI - encryption; support also S/MIME + signature verification since version 0.22</flag> + <flag name="emacs">Install Emacs UI (the main one)</flag> + <flag name="mutt">Install helper script for Mutt</flag> + <flag name="nmbug">Install experimental tag sharing / + pseudo-bug-tracking script for Notmuch + (see http://notmuchmail.org/nmbug/)</flag> + </use> + <longdescription lang="en"> + Notmuch is a system for indexing, searching, reading, and tagging large + collections of email messages in maildir or mh format. It uses the + Xapian library to provide fast, full-text search with a convenient + search syntax. + </longdescription> +</pkgmetadata> diff --git a/net-mail/notmuch/notmuch-0.38.3.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild new file mode 100644 index 0000000..92fc94f --- /dev/null +++ b/net-mail/notmuch/notmuch-0.38.3.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_{10..13} pypy3 ) + +inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils + +DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" +HOMEPAGE="https://notmuchmail.org/" +SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz + test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )" + +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" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + apidoc? ( doc ) + nmbug? ( python ) + test? ( crypt emacs python ) +" +IUSE="apidoc crypt doc emacs mutt nmbug python test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-arch/xz-utils[extra-filters(-)] + virtual/pkgconfig + apidoc? ( + app-text/doxygen + dev-lang/perl + ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + sys-apps/texinfo + ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) + ) + test? ( + app-shells/bash + sys-process/parallel + ) +" + +COMMON_DEPEND=" + dev-libs/glib + dev-libs/gmime:3.0[crypt?] + >=dev-libs/xapian-1.4.0:= + sys-libs/talloc + sys-libs/zlib:= + emacs? ( >=app-editors/emacs-${NEED_EMACS}:* ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') + ) +" + +DEPEND="${COMMON_DEPEND} + test? ( + >=app-editors/emacs-${NEED_EMACS}:*[libxml2] + app-misc/dtach + dev-debug/gdb[python] + crypt? ( + app-crypt/gnupg + dev-libs/openssl + ) + ) +" + +RDEPEND="${COMMON_DEPEND} + crypt? ( app-crypt/gnupg ) + mutt? ( + dev-perl/File-Which + dev-perl/Mail-Box + dev-perl/MailTools + dev-perl/Term-ReadLine-Gnu + virtual/perl-Digest-SHA + virtual/perl-File-Path + virtual/perl-Getopt-Long + dev-perl/Pod-Parser + ) + nmbug? ( dev-vcs/git ) +" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + "${FILESDIR}/notmuch-assume-modern-gmime.patch" +) + +pkg_setup() { + use emacs && elisp-check-emacs-version +} + +src_unpack() { + unpack "${P}".tar.xz + if use test; then + mkdir -p "${S}"/test/test-databases || die + cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die + fi +} + +src_prepare() { + default + + use python && distutils-r1_src_prepare + + mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die + + # Override 'install' target, we want to install manpages with doman, but let it install texinfo files. + sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die + + use test && append-flags '-g' + + # Non-autoconf configure + [[ ${CHOST} == *-solaris* ]] && append-ldflags '-lnsl' '-lsocket' + + # sphinx-4 broke everything. https://bugs.gentoo.org/789492 + echo 'man_make_section_directory = False' >> doc/conf.py || die +} + +src_configure() { + python_setup # For sphinx + + tc-export CC CXX + + local myconf=( + --bashcompletiondir="$(get_bashcompdir)" + --emacslispdir="${EPREFIX}/${SITELISP}/${PN}" + --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}" + --without-desktop + --without-ruby + --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" + $(use_with apidoc api-docs) + $(use_with doc docs) + $(use_with emacs) + ) + + # FIXME: + # Checking for GMime session key extraction support... * ACCESS DENIED: open_wr: /dev/bus/usb/001/011 + # notmuch configure compiles a program _check_session_keys.c, inline in ./configure script + # gmime/gpg/scdaemon tries to open usb devices in GMime test + # we pretend to allow it, without actually allowing it to read or write. + # https://bugs.gentoo.org/821328 + addpredict /dev/bus/usb + + econf "${myconf[@]}" +} + +python_compile() { + pushd bindings/python-cffi > /dev/null || die + distutils-r1_python_compile + # copy stuff just in case + if use test; then + mkdir -p build/stage/tests || die + cp -v tests/*.py build/stage/tests || die + fi + popd > /dev/null || die + + # TODO: we want to drop those, research revdeps + pushd bindings/python > /dev/null || die + distutils-r1_python_compile + popd > /dev/null || die +} + +python_compile_all() { + use doc && emake -C bindings/python/docs html +} + +src_compile() { + python_setup # For sphinx + + # prevent race in emacs doc generation + # FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti' + if use emacs; then + use doc && emake -j1 -C emacs docstring.stamp V=1 + fi + + emake V=1 + + use python && distutils-r1_src_compile + + if use mutt; then + emake -C contrib/notmuch-mutt notmuch-mutt.1 + fi +} + +python_test() { + # we only have tests for cffi bindings + pushd bindings/python-cffi > /dev/null || die + rm -f tox.ini || die + pytest -vv || die "Tests failed with ${EPYTHON}" + popd > /dev/null || die +} + +src_test() { + local test_failures=() + pax-mark -m notmuch + + # we run pytest via eclass phasefunc, so delete upstream launcher + use python && { rm -v test/T391-python-cffi.sh || die ; } + + # These both fail because of line wrapping in the output + rm test/T315-emacs-tagging.sh test/T310-emacs.sh || die + + LD_LIBRARY_PATH="${S}/lib" nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" ) + pax-mark -ze notmuch + + # both lib and bin needed for testsuite. + if use python; then + LD_LIBRARY_PATH="${S}/lib" \ + PATH="${S}:${PATH}" \ + nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" ) + fi + + [[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}" +} + +python_install() { + pushd bindings/python-cffi > /dev/null || die + distutils-r1_python_install + popd > /dev/null || die + + pushd bindings/python > /dev/null || die + distutils-r1_python_install + popd > /dev/null || die +} + +src_install() { + default + + if use doc; then + if use apidoc; then + # rename overly generic manpage to avoid clashes + mv doc/_build/man/man3/deprecated.3 \ + doc/_build/man/man3/notmuch-deprecated.3 || die + fi + doman doc/_build/man/man?/*.? + fi + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + domenu emacs/notmuch-emacs-mua.desktop + fi + + if use nmbug; then + # TODO: those guys need proper deps + python_fix_shebang devel/nmbug/notmuch-report + dobin devel/nmbug/notmuch-report + fi + + if use mutt; then + pushd contrib/notmuch-mutt > /dev/null || die + dobin notmuch-mutt + # this manpage is built by pod2man + doman notmuch-mutt.1 + insinto /etc/mutt + doins notmuch-mutt.rc + dodoc README-mutt + popd > /dev/null || die + fi + + local DOCS=( README{,.rst} INSTALL NEWS ) + einstalldocs + + if use python; then + use doc && local HTML_DOCS=( bindings/python/docs/html/. ) + distutils-r1_src_install + fi +} + +pkg_preinst() { + local _rcfile="/etc/mutt/notmuch-mutt.rc" + if use mutt && ! [[ -e "${EROOT}"${_rcfile} ]]; then + elog "To enable notmuch support in mutt, add the following line" + elog "to your mutt config file:" + elog "" + elog " source ${_rcfile}" + fi +} + +pkg_postinst() { + if use emacs; then + elisp-site-regen + xdg_desktop_database_update + fi +} + +pkg_postrm() { + if use emacs; then + elisp-site-regen + xdg_desktop_database_update + fi +} diff --git a/profiles/eapi b/profiles/eapi new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/profiles/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/package.mask b/profiles/package.mask index 3750f1d..7fb4701 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,3 @@ -# https://github.com/pts/pdfsizeopt/issues/139 -app-text/pdfsizeopt - -# 16.0.2 is out but no binaries yet -=dev-java/openjdk-jre-bin-16.0.1_p9 +# untested +dev-lang/zig +dev-java/openj9-openjdk:11 diff --git a/profiles/package.use.mask b/profiles/package.use.mask index 48e6287..12ac400 100644 --- a/profiles/package.use.mask +++ b/profiles/package.use.mask @@ -1,11 +1,3 @@ -# Depends on vulnerable old version of icedtea-web #711392 -# new version is not packaged yet -# package/useflag is not going away anytime soon, -# just masked. unmask as needed. -dev-java/openj9-openjdk nsplugin webstart -dev-java/openj9-openjdk-bin nsplugin webstart -dev-java/openj9-openjdk-jre-bin nsplugin webstart - # java.nio.file.NoSuchFileException: /tmp/portage/dev-java/openj9-openjdk-14.0.21.0/temp/j9nls.jar2321438573006199763.jar -> /tmp/portage/dev-java/openj9-openjdk-14.0.21.0/work/openj9-openjdk-jdk14-openj9-0.21.0/build/linux-x86_64-server-release/bootcycle-build/support/j9tools/j9nls.jar # at java.base/sun.nio.fs.UnixException.translateToIOException(UnixException.java:92) # at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:111) @@ -17,7 +9,5 @@ dev-java/openj9-openjdk-jre-bin nsplugin webstart # at jdk.jartool/sun.tools.jar.Main.main(Main.java:1649) dev-java/openj9-openjdk jbootstrap -# openjfx 14 is not implemented yet +# not implemented yet dev-java/openj9-openjdk javafx -dev-java/openjdk javafx -dev-java/openjdk-bin javafx diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 new file mode 100644 index 0000000..4d32a6a --- /dev/null +++ b/profiles/updates/4Q-2021 @@ -0,0 +1 @@ +move dev-libs/highway dev-cpp/highway diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest deleted file mode 100644 index 62a5de3..0000000 --- a/sci-calculators/units/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 diff --git a/sci-calculators/units/files/units-2.17-network-sandbox.patch b/sci-calculators/units/files/units-2.17-network-sandbox.patch deleted file mode 100644 index e457610..0000000 --- a/sci-calculators/units/files/units-2.17-network-sandbox.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -107,7 +107,7 @@ - -e "s@/usr/bin/python@$(PYTHON)@" \ - $(srcdir)/units_cur > units_cur_inst - --install-support: definitions.units units_cur_inst currency-units-update -+install-support: definitions.units units_cur_inst - $(MKDIR_P) $(DESTDIR)@UDAT@ $(DESTDIR)$(bindir) $(DESTDIR)@CDAT@ - $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units - -rm -f $(DESTDIR)@UDAT@currency.units diff --git a/sci-calculators/units/files/units-2.20-readerror.patch b/sci-calculators/units/files/units-2.20-readerror.patch deleted file mode 100644 index ccb12c6..0000000 --- a/sci-calculators/units/files/units-2.20-readerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/units.c -+++ b/units.c -@@ -761,7 +761,7 @@ - } - - --#define readerror (goterr=1) && errfile && fprintf -+#define readerror(...) do { goterr=1; if (errfile) fprintf(__VA_ARGS__); } while (0) - - #define VAGUE_ERR "%s: error in units file '%s' line %d\n", \ - progname, file, linenum diff --git a/sci-calculators/units/files/units_cur-urllib.patch b/sci-calculators/units/files/units_cur-urllib.patch deleted file mode 100644 index e77ff96..0000000 --- a/sci-calculators/units/files/units_cur-urllib.patch +++ /dev/null @@ -1,60 +0,0 @@ -Only in a: currency.units -diff -ru a/units_cur b/units_cur ---- a/units_cur 2018-09-15 16:30:09.000000000 -0400 -+++ b/units_cur 2021-07-11 18:01:29.030260473 -0400 -@@ -28,8 +28,12 @@ - # - # - --version = '5.0' -+version = '5.1' - -+# Version 5.1: -+# -+# Switch to urllib to avoid requests dependency. -+# - # Version 5.0: - # - # Rewrite to support multiple different data sources due to disappearance -@@ -54,8 +58,11 @@ - # Python 2 or Python 3. Thanks to Ray Hamel for some help with this update. - - # Normal imports --import requests - import codecs -+import json -+import urllib.error -+import urllib.parse -+import urllib.request - from argparse import ArgumentParser - from collections import OrderedDict - from datetime import date -@@ -288,11 +295,12 @@ - currency[code][rate_index])) - - def getjson(address,args=None): -+ if args: -+ address = address + "?" + urllib.parse.urlencode(args) - try: -- res = requests.get(address,args) -- res.raise_for_status() -- return(res.json()) -- except requests.exceptions.RequestException as e: -+ res = urllib.request.urlopen(address) -+ return(json.load(res)) -+ except urllib.error.URLError as e: - stderr.write('Error connecting to currency server:\n{}.\n'.format(e)) - exit(1) - -@@ -323,9 +331,8 @@ - stderr.write('European bank uses euro for base currency. Specified base {} ignored.\n'.format(base)) - import xml.etree.ElementTree as ET - try: -- res=requests.get('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml') -- res.raise_for_status() -- data = ET.fromstring(res.content)[2][0] -+ res=urllib.request.urlopen('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml') -+ data = ET.fromstring(res.read())[2][0] - except requests.exceptions.RequestException as e: - stderr.write('Error connecting to currency server:\n{}.\n'. - format(e)) diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml deleted file mode 100644 index fc2b905..0000000 --- a/sci-calculators/units/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-needed --> -<use> -<flag name="units-cur">Install the units_cur python script that updates currencies</flag> -</use> -</pkgmetadata> diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r1.ebuild deleted file mode 100644 index 6c005df..0000000 --- a/sci-calculators/units/units-2.21-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit python-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units-cur" -REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units-cur? ( - ${PYTHON_DEPS} - ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.17-network-sandbox.patch - "${FILESDIR}"/${PN}-2.20-readerror.patch - "${FILESDIR}"/units_cur-urllib.patch -) - -DOCS=( ChangeLog NEWS README ) - -src_configure() { - econf \ - --sharedstatedir="${EPREFIX}"/var/lib \ - ac_cv_path_PYTHON=no -} - -src_compile() { - emake ${PN} -} - -src_install() { - default - - if use units-cur; then - sed \ - -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - -e 's|^#!|&/usr/bin/python|g' \ - units_cur_inst > units_cur || die - python_foreach_impl python_doscript units_cur - fi -} diff --git a/sys-boot/limine/Manifest b/sys-boot/limine/Manifest new file mode 100644 index 0000000..515aa98 --- /dev/null +++ b/sys-boot/limine/Manifest @@ -0,0 +1 @@ +DIST limine-8.0.13.tar.xz 407784 BLAKE2B 2722b6a644766b181bb456605a16fb957eecfa2808303443fc890b28074bfe11961f8f3ffa904c890b867ad7c4eca105bb6d727a98d405c075ad603ecea2e011 SHA512 116082e74e15a1f2cc0e13a14b215929902589da08ff2dc8617de1a87e9ae9ba9fe81f6e40f56f00860841034feac93609601fc2557df25ee602d71933784be3 diff --git a/sys-boot/limine/limine-8.0.13.ebuild b/sys-boot/limine/limine-8.0.13.ebuild new file mode 100644 index 0000000..5d41343 --- /dev/null +++ b/sys-boot/limine/limine-8.0.13.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Limine is a modern, advanced, and portable BIOS/UEFI multiprotocol bootloader" +HOMEPAGE="https://limine-bootloader.org/" +SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="abi_x86_32 abi_x86_64 bios bios-pxe bios-cd uefi uefi-cd" + +BDEPEND=" + app-alternatives/gzip + dev-lang/nasm + sys-apps/findutils + uefi-cd? ( sys-fs/mtools ) +" + +REQUIRED_USE=" + bios? ( || ( amd64 x86 ) ) + bios-cd? ( || ( amd64 x86 ) ) + bios-pxe? ( || ( amd64 x86 ) ) +" + +src_configure() { + local myconf=( + $(use_enable bios) + $(use_enable bios-cd) + $(use_enable bios-pxe) + + $(use_enable uefi-cd) + ) + + if use uefi; then + myconf+=( + $(use_enable abi_x86_32 uefi-ia32) + $(use_enable abi_x86_64 uefi-x86-64) + $(use_enable arm64 uefi-aarch64) + $(use_enable riscv uefi-riscv64) + ) + fi + + econf "${myconf[@]}" +} diff --git a/sys-boot/limine/metadata.xml b/sys-boot/limine/metadata.xml new file mode 100644 index 0000000..6b13f02 --- /dev/null +++ b/sys-boot/limine/metadata.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>arsen@gentoo.org</email> + <name>Arsen Arsenović</name> + </maintainer> + <upstream> + <remote-id type="github">limine-bootloader/limine</remote-id> + </upstream> + <use> + <flag name="uefi-cd"> + Enable building cd-efi.bin using <pkg>sys-fs/mtools</pkg>. + This flag was previously known as eltorito-efi. + </flag> + + <flag name="bios"> + Enable BIOS/MBR boot support. + </flag> + <flag name="bios-pxe"> + Enables BIOS PXE boot support. + </flag> + <flag name="bios-cd"> + Enables BIOS boot support for CDs. + </flag> + </use> +</pkgmetadata> diff --git a/tools/adoptopenjdk-manifest b/tools/adoptopenjdk-manifest index 1789fdf..c286527 100755 --- a/tools/adoptopenjdk-manifest +++ b/tools/adoptopenjdk-manifest @@ -10,14 +10,16 @@ import httpx import portage async def do_manifest(client, filename, size, url): - resp = await client.get(f'{url}.sha256.txt') + resp = await client.get(f'{url}.sha256.txt', follow_redirects=True) + resp.raise_for_status() sha256 = resp.text.split(' ')[0] return (filename, size, sha256) async def do_api(client, ghauth, tagl): owner, repo, tag = tagl apiurl = f'https://api.github.com/repos/{owner}/{repo}/releases/tags/{tag}' - resp = await client.get(apiurl, auth=ghauth) + resp = await client.get(apiurl, auth=ghauth, follow_redirects=True) + resp.raise_for_status() return {asset['browser_download_url']: asset['size'] for asset in resp.json()['assets']} diff --git a/virtual/jdk/jdk-11-r2.ebuild b/virtual/jdk/jdk-11-r3.ebuild index a18c1a8..a18c1a8 100644 --- a/virtual/jdk/jdk-11-r2.ebuild +++ b/virtual/jdk/jdk-11-r3.ebuild diff --git a/virtual/jdk/jdk-17.ebuild b/virtual/jdk/jdk-17.ebuild deleted file mode 100644 index a18c1a8..0000000 --- a/virtual/jdk/jdk-17.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -RDEPEND="|| ( - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] -)" diff --git a/virtual/jdk/jdk-16.ebuild b/virtual/jdk/jdk-21-r1.ebuild index a18c1a8..a18c1a8 100644 --- a/virtual/jdk/jdk-16.ebuild +++ b/virtual/jdk/jdk-21-r1.ebuild diff --git a/virtual/jre/jre-11-r2.ebuild b/virtual/jre/jre-11-r2.ebuild deleted file mode 100644 index faeb554..0000000 --- a/virtual/jre/jre-11-r2.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Virtual for Java Runtime Environment (JRE)" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -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-16.ebuild b/virtual/jre/jre-11-r3.ebuild index faeb554..0986578 100644 --- a/virtual/jre/jre-16.ebuild +++ b/virtual/jre/jre-11-r3.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Virtual for Java Runtime Environment (JRE)" SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" 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-21-r1.ebuild index faeb554..08a3961 100644 --- a/virtual/jre/jre-17.ebuild +++ b/virtual/jre/jre-21-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Virtual for Java Runtime Environment (JRE)" SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" RDEPEND="|| ( dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)] dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)] virtual/jdk:${SLOT} - )" +)" 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" |