diff options
104 files changed, 869 insertions, 1820 deletions
diff --git a/acct-group/adbusers/adbusers-0.ebuild b/acct-group/adbusers/adbusers-0.ebuild deleted file mode 100644 index f8d84ac..0000000 --- a/acct-group/adbusers/adbusers-0.ebuild +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit acct-group - -DESCRIPTION="Android Debug Bridge user group" -ACCT_GROUP_ID=-1 diff --git a/acct-group/adbusers/metadata.xml b/acct-group/adbusers/metadata.xml deleted file mode 100644 index f453528..0000000 --- a/acct-group/adbusers/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> -</pkgmetadata> diff --git a/app-arch/7-zip/7-zip-22.01.ebuild b/app-arch/7-zip/7-zip-22.01.ebuild deleted file mode 100644 index 81229fc..0000000 --- a/app-arch/7-zip/7-zip-22.01.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -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.tar.xz" - -LICENSE="LGPL-2.1+ BSD rar? ( unRAR )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+asm rar" - -BDEPEND=" - asm? ( dev-lang/jwasm ) -" -RDEPEND="!app-arch/p7zip" - -S=${WORKDIR} - -PATCHES=( - "${FILESDIR}/7-zip-flags.patch" - "${FILESDIR}/7-zip-less-asm.patch" -) - -src_compile() { - cd CPP/7zip/Bundles/Alone2 || die - local myemakeargs=( - CC="$(tc-getCC) ${CFLAGS} -fno-strict-aliasing ${LDFLAGS}" - CXX="$(tc-getCXX) ${CXXFLAGS} -fno-strict-aliasing ${LDFLAGS}" - ) - if use asm; then - myemakeargs+=(USE_ASM=1 USE_JWASM=1) - if use amd64; then - myemakeargs+=(IS_X64=1) - elif use arm64; then - myemakeargs+=(IS_ARM64=1) - elif use x86; then - myemakeargs+=(IS_X86=1) - else - einfo "asm is not supported on this arch, ignoring" - fi - fi - use rar || myemakeargs+=(DISABLE_RAR=1) - mkdir -p b/g || die - emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}" -} - -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 ac40149..0000000 --- a/app-arch/7-zip/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST 7z2201-src.tar.xz 1291560 BLAKE2B 1d88234fdf9d7074e3dc6c243c209f694897ac23f82d7f5d4767186114245c1aa9c4290c8a538dc3cdd1074385ae9142f1efd22771942ec63d8c00ed38b7082b SHA512 3f391b1bd65a0654eb5b31b50f1d400f0ec38ab191d88e15849a6e4d164b7bf2ce4a6d70ec8b6e27bde1b83bb2d45b65c03129499334669e05ee025784be455a 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 963037c..0000000 --- a/app-arch/7-zip/files/7-zip-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak ---- a/CPP/7zip/7zip_gcc.mak 2021-11-20 04:00:00.000000000 -0500 -+++ b/CPP/7zip/7zip_gcc.mak 2021-12-16 11:01:16.236763027 -0500 -@@ -14,13 +14,13 @@ -
-
- ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
-+CFLAGS_WARN_WALL = -Wall -Wextra
- 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
-
-@@ -162,7 +162,7 @@ - $(O):
- $(MY_MKDIR) $(O)
-
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
- $(PROGPATH): $(OBJS)
- $(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
-
diff --git a/app-arch/7-zip/files/7-zip-less-asm.patch b/app-arch/7-zip/files/7-zip-less-asm.patch deleted file mode 100644 index 040b445..0000000 --- a/app-arch/7-zip/files/7-zip-less-asm.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/CPP/7zip/7zip_gcc.mak 2021-12-25 09:00:00.000000000 -0500 -+++ b/CPP/7zip/7zip_gcc.mak 2022-05-13 12:20:17.539629635 -0400 -@@ -1127,21 +1127,6 @@ - endif
- endif
-
--ifdef USE_X86_ASM
--$O/7zCrcOpt.o: ../../../../Asm/x86/7zCrcOpt.asm
-- $(MY_ASM) $(AFLAGS) $<
--$O/XzCrc64Opt.o: ../../../../Asm/x86/XzCrc64Opt.asm
-- $(MY_ASM) $(AFLAGS) $<
--$O/Sha1Opt.o: ../../../../Asm/x86/Sha1Opt.asm
-- $(MY_ASM) $(AFLAGS) $<
--$O/Sha256Opt.o: ../../../../Asm/x86/Sha256Opt.asm
-- $(MY_ASM) $(AFLAGS) $<
--
--ifndef USE_JWASM
--USE_X86_ASM_AES=1
--endif
--
--else
- $O/7zCrcOpt.o: ../../../../C/7zCrcOpt.c
- $(CC) $(CFLAGS) $<
- $O/XzCrc64Opt.o: ../../../../C/XzCrc64Opt.c
-@@ -1150,16 +1135,10 @@ - $(CC) $(CFLAGS) $<
- $O/Sha256Opt.o: ../../../../C/Sha256Opt.c
- $(CC) $(CFLAGS) $<
--endif
-
-
--ifdef USE_X86_ASM_AES
--$O/AesOpt.o: ../../../../Asm/x86/AesOpt.asm
-- $(MY_ASM) $(AFLAGS) $<
--else
- $O/AesOpt.o: ../../../../C/AesOpt.c
- $(CC) $(CFLAGS) $<
--endif
-
-
- ifdef USE_X64_ASM
diff --git a/app-arch/7-zip/metadata.xml b/app-arch/7-zip/metadata.xml deleted file mode 100644 index d212dd9..0000000 --- a/app-arch/7-zip/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="asm">Use assembly implementations (currently only amd64, arm64, x86)</flag> - <flag name="rar">RAR archive support, requires accepting unRAR license</flag> - </use> -</pkgmetadata> diff --git a/app-arch/precomp-cpp/metadata.xml b/app-arch/precomp-cpp/metadata.xml index 004555a..50e3faf 100644 --- a/app-arch/precomp-cpp/metadata.xml +++ b/app-arch/precomp-cpp/metadata.xml @@ -5,4 +5,7 @@ <email>alex_y_xu@yahoo.ca</email> <name>Alex Xu (Hello71)</name> </maintainer> + <upstream> + <remote-id type="github">schnaader/precomp-cpp</remote-id> + </upstream> </pkgmetadata> diff --git a/app-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 30a0409..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-text/zathura/Manifest b/app-text/zathura/Manifest deleted file mode 100644 index fe867e8..0000000 --- a/app-text/zathura/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zathura-0.4.9.tar.gz 206194 BLAKE2B 0dd4b153cf7f8e3ddd4ede5514389b2c5e4aa88e2c416646acc38f7e19419e11165c2a5b51548a05d69a1b947e661b885f7c9d8c100179d0d23d8754cb441d97 SHA512 fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10 diff --git a/app-text/zathura/files/zathura-docutils.patch b/app-text/zathura/files/zathura-docutils.patch deleted file mode 100644 index 7d313f6..0000000 --- a/app-text/zathura/files/zathura-docutils.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/doc/man/conf.py b/doc/man/conf.py -deleted file mode 100644 -index 2aad25f..0000000 ---- a/doc/man/conf.py -+++ /dev/null -@@ -1,36 +0,0 @@ --# -*- coding: utf-8 -*- --# --# SPDX-License-Identifier: Zlib -- --import os.path --import glob --import time -- --dirname = os.path.dirname(__file__) --files = glob.glob(os.path.join(dirname, '*.rst')) -- --maxdate = 0 --for path in files: -- s = os.stat(path) -- maxdate = max(maxdate, s.st_mtime) -- --# -- General configuration ------------------------------------------------ -- --source_suffix = '.rst' --master_doc = 'zathura.1' --templates_path = ['_templates'] --today = time.strftime('%Y-%m-%d', time.gmtime(maxdate)) -- --# -- Project configuration ------------------------------------------------ -- --project = 'zathura' --copyright = '2009-2018, pwmt.org' --version = '0.2.7' --release = '0.2.7' -- --# -- Options for manual page output --------------------------------------- -- --man_pages = [ -- ('zathura.1', 'zathura', 'a document viewer', ['pwmt.org'], 1), -- ('zathurarc.5', 'zathurarc', 'zathura configuration file', ['pwmt.org'], 5) --] -diff --git a/doc/man/zathura.1.rst b/doc/man/zathura.1.rst -index 089dbf7..19cc44c 100644 ---- a/doc/man/zathura.1.rst -+++ b/doc/man/zathura.1.rst -@@ -1,5 +1,14 @@ --Manpage - ======= -+zathura -+======= -+ -+----------------- -+a document viewer -+----------------- -+ -+:Author: pwmt.org -+:Copyright: 2009-2018, pwmt.org -+:Manual section: 1 - - Synopsis - -------- -diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst -index bf519ae..1ec6462 100644 ---- a/doc/man/zathurarc.5.rst -+++ b/doc/man/zathurarc.5.rst -@@ -2,6 +2,14 @@ - zathurarc - ********* - -+-------------------------- -+zathura configuration file -+-------------------------- -+ -+:Author: pwmt.org -+:Copyright: 2009-2018, pwmt.org -+:Manual section: 5 -+ - SYNOPSIS - ======== - -diff --git a/doc/meson.build b/doc/meson.build -index b67c8ab..a02116b 100644 ---- a/doc/meson.build -+++ b/doc/meson.build -@@ -1,24 +1,10 @@ --sphinx = find_program('sphinx-build', required: get_option('manpages')) --if sphinx.found() -- custom_target('man pages', -- command: [ -- sphinx, -- '-b', 'man', -- '-D', 'version=' + version, -- '-D', 'release=' + version, -- join_paths(meson.current_source_dir(), 'man'), -- meson.current_build_dir()], -- output: ['zathura.1', 'zathurarc.5'], -- input: [ -- 'man/conf.py', -- 'man/zathurarc.5.rst', -- 'man/zathura.1.rst' -- ], -- build_by_default: true, -- install: true, -- install_dir: [ -- join_paths(get_option('mandir'), 'man1'), -- join_paths(get_option('mandir'), 'man5') -- ] -- ) -+rst2man = find_program('rst2man', 'rst2man.py', required: get_option('manpages')) -+ -+if rst2man.found() -+ custom_target('zathura.1', input: [ 'man/zathura.1.rst' ], output: [ 'zathura.1' ], -+ command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, -+ install_dir: join_paths(get_option('mandir'), 'man1')) -+ custom_target('zathurarc.5', input: [ 'man/zathurarc.5.rst' ], output: [ 'zathurarc.5' ], -+ command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, -+ install_dir: join_paths(get_option('mandir'), 'man5')) - endif diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml deleted file mode 100644 index f7b9cf8..0000000 --- a/app-text/zathura/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>slashbeast@gentoo.org</email> - <name>Piotr Karbowski</name> - </maintainer> - <use> - <flag name="synctex">Use libsynctex to get latex codeline from pdf</flag> - </use> - <upstream> - <maintainer status="active"> - <email>mlq@pwmt.org</email> - <name>Moritz Lipp</name> - </maintainer> - <maintainer status="active"> - <email>sebastian+dev@ramacher.at</email> - <name>Sebastian Ramacher</name> - </maintainer> - <changelog>http://pwmt.org/projects/zathura/download/</changelog> - <doc lang="en">http://pwmt.org/projects/zathura/</doc> - <bugs-to>http://bugs.pwmt.org/</bugs-to> - </upstream> -</pkgmetadata> diff --git a/app-text/zathura/zathura-0.4.9-r1.ebuild b/app-text/zathura/zathura-0.4.9-r1.ebuild deleted file mode 100644 index fdb219d..0000000 --- a/app-text/zathura/zathura-0.4.9-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson virtualx xdg - -DESCRIPTION="A highly customizable and functional document viewer" -HOMEPAGE="https://pwmt.org/projects/zathura/" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="ZLIB" -SLOT="0" -IUSE="doc +magic seccomp sqlite synctex test" - -RESTRICT="!test? ( test )" - -DEPEND=">=dev-libs/girara-0.3.7 - >=dev-libs/glib-2.50:2 - >=sys-devel/gettext-0.19.8 - x11-libs/cairo - >=x11-libs/gtk+-3.22:3 - magic? ( sys-apps/file ) - seccomp? ( sys-libs/libseccomp ) - sqlite? ( >=dev-db/sqlite-3.5.9:3 ) - synctex? ( app-text/texlive-core )" - -RDEPEND="${DEPEND}" - -BDEPEND="doc? ( dev-python/docutils ) - test? ( dev-libs/appstream-glib - dev-libs/check ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/zathura-docutils.patch" -) - -src_configure() { - local emesonargs=( - -Dconvert-icon=disabled - -Dmagic=$(usex magic enabled disabled) - -Dmanpages=$(usex doc enabled disabled) - -Dseccomp=$(usex seccomp enabled disabled) - -Dsqlite=$(usex sqlite enabled disabled) - -Dsynctex=$(usex synctex enabled disabled) - ) - meson_src_configure -} - -src_test() { - virtx meson_src_test -} diff --git a/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild index 4d63e4a..55d3c63 100644 --- a/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild +++ b/dev-cpp/tbb-compat/tbb-compat-2020.3.ebuild @@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="" -RDEPEND="!=dev-cpp/tbb-2020.3" +RDEPEND="!=dev-cpp/tbb-2020.3*" S="${WORKDIR}/oneTBB-${MY_PV}" src_prepare() { diff --git a/dev-dotnet/dotnet-runtime-bin/Manifest b/dev-dotnet/dotnet-runtime-bin/Manifest index 1b6e27a..8148053 100644 --- a/dev-dotnet/dotnet-runtime-bin/Manifest +++ b/dev-dotnet/dotnet-runtime-bin/Manifest @@ -1,6 +1,18 @@ -DIST dotnet-runtime-3.1.25-linux-arm.tar.gz 31848614 BLAKE2B 2cdd2667f619dc6b8e9c9c0fcaa7011840e077988fa679aaf937ac1e5a9ca6cd0ef3505239a4850e8d893208eb7af3258df910403df7af3494494f945f73a12e SHA512 a0950ef427e07e4de7111411fb12389fda15193a84f22ca04c8a43e16bfe451ba34338def07dcfd3cf530cda0b14b4e69dac83e38da753e8cc708d6090c62dfe -DIST dotnet-runtime-3.1.25-linux-arm64.tar.gz 30295532 BLAKE2B 5228e50adac1b2f52d130756d0c69b0294c62dd8f8d3618bb3049dae62fa3c8a528d70d0b1febde6d4a7774f0fd975d47ec1c70c7967122c2797c1a34d083e50 SHA512 894efe2c65702b6b99812fdea82672ec8534fa3cee66185266ff06c7fc7d6e9bb5ab12c1a9aee7a9f8f0873fe1eef402a22f34da1860d1f9ec068574380cba10 -DIST dotnet-runtime-3.1.25-linux-x64.tar.gz 30459553 BLAKE2B 2843ad2690bcc7d584dadaefe3fbe58136769fc4e7aee2ce8230ed487e4df3910da1353645d5db06ea12edf657559972a699f9ac638fd7a75bc83fa500dfb2b2 SHA512 e5155a0d26837b53bfc9275bfcd69eb7400bd8b2004be69e339f62ce36b6333f1f2da8d391bb98e4cb3630a20b68a0a0f4e6f8d1558a4cb0a53da796a71c214c -DIST dotnet-runtime-6.0.5-linux-arm.tar.gz 28627995 BLAKE2B 95f835311a2cd4969c66dfe5085986369ca73266b5fbd456d2c735bd0a436c5c6e04ac70f861ac5ad87f54c6f4e1a8508c2fa794fb04c9537eeda337b08afd33 SHA512 5180bc076629afa91096ed500ce966d1d62e7b1b6248a6a33d6e758a3bca8fdff382d90793d847f049a330f4a0964dd29b18ac8cbd374492f19d74056a608252 -DIST dotnet-runtime-6.0.5-linux-arm64.tar.gz 28386959 BLAKE2B 03783c433506a098bdd56a8ab4945c6e10d8abb62024e78721799bbdf87cdce5c3ddff9196dcb18ce52b3092639d9fe1e991aee6290fad4be70ac054cdc43fff SHA512 bed49b74ad60d2701ddd638c61c215ad48f5c6eb88df140545d29901df60c6667474ca9d3bed6583dba605282ec64989ff2b431f098f0afc6ed155af59f7126d -DIST dotnet-runtime-6.0.5-linux-x64.tar.gz 30681960 BLAKE2B aa4f1b34860d23e0c3d8eb92aa688cd9a23047031122aec046915cb663cef5ee3a6d7e9036a54b9225bb6722968e54e4d48b95ab6de4e9ecf98c6b8ea03587df SHA512 c228f0ba0ecc4ccda708e97529b248dd6d70f7f747ead6453623be77e8e1529b54db52f5df1b5e00b5b7f92b73389560832f80607fc07e50879d55ce905afcf7 +DIST dotnet-runtime-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-3.1.25.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.25.ebuild deleted file mode 100644 index 12d4b2a..0000000 --- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-3.1.25.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" -HOMEPAGE="https://dotnet.microsoft.com/" -LICENSE="MIT" - -SRC_URI=" -amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz ) -arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz ) -arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz ) -" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE="dotnet-symlink kerberos lttng" -REQUIRED_USE="elibc_glibc" -QA_PREBUILT="*" -RESTRICT="splitdebug" -RDEPEND=" - kerberos? ( app-crypt/mit-krb5:0/0 ) - lttng? ( dev-util/lttng-ust:0 ) - sys-libs/zlib:0/1 - dotnet-symlink? ( - !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] - !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] - !dev-dotnet/dotnet-runtime[dotnet-symlink(+)] - ) -" - -S=${WORKDIR} - -delete() { - local x - x=$(find . -name "$1" -print -delete) && [ -n "$x" ] -} - -src_compile() { - use kerberos || delete System.Net.Security.Native.so || die - use lttng || delete libcoreclrtraceptprovider.so || die -} - -src_install() { - local dest="opt/${PN}-${SLOT}" - dodir "${dest%/*}" - - { mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die - dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" - - if use dotnet-symlink; then - dosym "../../${dest}/dotnet" "/usr/bin/dotnet" - dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}" - - # set an env-variable for 3rd party tools - echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die - doenvd "${T}/90${PN}-${SLOT}" - fi -} diff --git a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.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-6.0.5.ebuild b/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.5.ebuild deleted file mode 100644 index fb09294..0000000 --- a/dev-dotnet/dotnet-runtime-bin/dotnet-runtime-bin-6.0.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION=".NET is a free, cross-platform, open-source developer platform" -HOMEPAGE="https://dotnet.microsoft.com/" -LICENSE="MIT" - -SRC_URI=" -amd64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-x64.tar.gz ) -arm? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm.tar.gz ) -arm64? ( https://dotnetcli.azureedge.net/dotnet/Runtime/${PV}/dotnet-runtime-${PV}-linux-arm64.tar.gz ) -" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64" -IUSE="+dotnet-symlink kerberos lttng" -REQUIRED_USE="elibc_glibc" -QA_PREBUILT="*" -RESTRICT="splitdebug" -RDEPEND=" - kerberos? ( app-crypt/mit-krb5:0/0 ) - lttng? ( dev-util/lttng-ust:0 ) - sys-libs/zlib:0/1 - dotnet-symlink? ( - !dev-dotnet/dotnet-sdk[dotnet-symlink(+)] - !dev-dotnet/dotnet-sdk-bin[dotnet-symlink(+)] - !dev-dotnet/dotnet-runtime[dotnet-symlink(+)] - ) -" - -S=${WORKDIR} - -delete() { - local x - x=$(find . -name "$1" -print -delete) && [ -n "$x" ] -} - -src_compile() { - use kerberos || delete libSystem.Net.Security.Native.so || die - use lttng || delete libcoreclrtraceptprovider.so || die -} - -src_install() { - local dest="opt/${PN}-${SLOT}" - dodir "${dest%/*}" - - { mv "${S}" "${ED}/${dest}" && mkdir "${S}" && fperms 0755 "/${dest}"; } || die - - if use dotnet-symlink; then - dosym "../../${dest}/dotnet" "/usr/bin/dotnet" - dosym "../../${dest}/dotnet" "/usr/bin/dotnet-${SLOT}" - dosym "../../${dest}/dotnet" "/usr/bin/dotnet-bin-${SLOT}" - - # set an env-variable for 3rd party tools - echo "DOTNET_ROOT=/${dest}" > "${T}/90${PN}-${SLOT}" || die - doenvd "${T}/90${PN}-${SLOT}" - fi -} diff --git a/dev-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 index 5eeaef8..196723c 100644 --- a/dev-dotnet/dotnet-runtime-bin/metadata.xml +++ b/dev-dotnet/dotnet-runtime-bin/metadata.xml @@ -9,9 +9,6 @@ <doc>https://docs.microsoft.com/en-us/dotnet/</doc> </upstream> <use> - <flag name="dotnet-symlink"> - Install a dotnet symlink that points to dotnet-bin. - </flag> <flag name="lttng"> Install support libraries for LTTng with .NET. </flag> diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest index a9be015..998cf94 100644 --- a/dev-java/openj9-openjdk-bin/Manifest +++ b/dev-java/openj9-openjdk-bin/Manifest @@ -1,18 +1,18 @@ -DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 266165569 SHA256 56c56a608a017213c7691044dc21b301e0ad14cf4836ade0c530ac3a16511318 -DIST ibm-semeru-open-debugimage_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 278563585 SHA256 d44cadcd0aaf4b43ae2052a5bbfa110086da9b466f0fce08e32c2e938ed741d1 -DIST ibm-semeru-open-debugimage_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 276015436 SHA256 419ad53dea8d29818c923a84f58060dd979beb6231b6ed19f17b1d980d10c235 -DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 334833532 SHA256 76eb77ce53a0241082946b056e191e96f3d090eac391c93569ae1a734aef37ab -DIST ibm-semeru-open-debugimage_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 349451254 SHA256 d049f1844bac2c17ca708857c02da11e0d8836e18936c0816ca11398325f2217 -DIST ibm-semeru-open-debugimage_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 343357345 SHA256 ed5005276244a06c51f0ab916ae19ce77536ba1eff6ff329424e10c609a1c015 -DIST ibm-semeru-open-debugimage_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 343385445 SHA256 a092faaee2fc7dc98549f1c90adc6e97da059fc8b03eb229c9322497fa4ce14f -DIST ibm-semeru-open-debugimage_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 361884479 SHA256 cfba718579c05ec2ecf43eeff78930d8c4c1feb521187b0519f85ce7a1b6bccd -DIST ibm-semeru-open-debugimage_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 355530873 SHA256 e0a3fa9021b20ca4d64bab1f4e0c123ab50ee4842fd7b34acae9dfdf642ce12b -DIST ibm-semeru-open-jdk_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 199269440 SHA256 1fb196b4eb3e45e2337883e252955ec56a6cdeb3d7200c95ded75ab0e4f3aefa -DIST ibm-semeru-open-jdk_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 203852153 SHA256 693604e48eef24c20d785f3a7e81e538a30e436ed36b7539a5e23e0008b2c405 -DIST ibm-semeru-open-jdk_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 205000099 SHA256 00e46a2b8be005eb03e3e4d939d4cf9b8331f22ee50ed75b84136d3f0ead7498 -DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 204694186 SHA256 b384c25ab6b5ab9787777eff2bceb6c5837765f2d5760055518d9a98810ad93d -DIST ibm-semeru-open-jdk_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 210025609 SHA256 3158c8e46be057ddacab25a52c2ded470102f994719025ccfa77c23d1106daa9 -DIST ibm-semeru-open-jdk_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 211212622 SHA256 e111cee65c1487eb3421763f7d0fd69850e0dda34fbe295cae8b15c8219f1647 -DIST ibm-semeru-open-jdk_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 203782113 SHA256 9c5cbca0a171c7e573047744e9a753923c341f6afb38606ae68f29d6209f2c9c -DIST ibm-semeru-open-jdk_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 207765361 SHA256 b46de9cd00af8a0223f4b50deb2627ab91fe515a69383a96fd2c12757cef24fe -DIST ibm-semeru-open-jdk_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 209237550 SHA256 b694d47666035b1f7870bc3749aa7c1903d50976eab3772fd81c32dab2aa8e64 +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-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild index 83b69ab..023e8ec 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-18.0.2_p9.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.27_p6.ebuild @@ -15,7 +15,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.33.1 +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" +IUSE="alsa cups debug headless-awt selinux source" RDEPEND=" >=sys-apps/baselayout-java-0.1.0-r1 @@ -110,7 +110,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild index 8da6a88..023e8ec 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.17_p8.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.15_p6.ebuild @@ -15,7 +15,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" +IUSE="alsa cups debug headless-awt selinux source" RDEPEND=" >=sys-apps/baselayout-java-0.1.0-r1 @@ -110,7 +110,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild index 8da6a88..023e8ec 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-17.0.5_p8.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-21.0.7_p6.ebuild @@ -15,7 +15,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -28,7 +28,7 @@ DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" +IUSE="alsa cups debug headless-awt selinux source" RDEPEND=" >=sys-apps/baselayout-java-0.1.0-r1 @@ -110,7 +110,7 @@ src_install() { # provide stable symlink dosym "${P}" "/opt/${PN}-${SLOT}" - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest index 51ce6a8..d3babd8 100644 --- a/dev-java/openj9-openjdk-jre-bin/Manifest +++ b/dev-java/openj9-openjdk-jre-bin/Manifest @@ -1,9 +1,9 @@ -DIST ibm-semeru-open-jre_aarch64_linux_11.0.17_8_openj9-0.35.0.tar.gz 45395879 SHA256 ab7f01a961559b49ce9b0a76af20191b7c047c6c1b6e5258e38f6c38de8cdc3f -DIST ibm-semeru-open-jre_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz 45322621 SHA256 8f934ce1745f52a067bdeb56b3b9e9192f51e674ff2956a1e53b33e44ea5ca42 -DIST ibm-semeru-open-jre_aarch64_linux_18.0.2_9_openj9-0.33.1.tar.gz 45244476 SHA256 cf42a289c53e6098223223326cd21a152d7102859030e23c52287d82d6d9560e -DIST ibm-semeru-open-jre_ppc64le_linux_11.0.17_8_openj9-0.35.0.tar.gz 48098550 SHA256 fba1dd9c25b0cce7efe124151b006624eeb2d2b0764284ca892d0e50ee457a41 -DIST ibm-semeru-open-jre_ppc64le_linux_17.0.5_8_openj9-0.35.0.tar.gz 48355201 SHA256 d54972fb938f655a3665512c7181c2c5813e3bfe742650d6081e2f480388ef2f -DIST ibm-semeru-open-jre_ppc64le_linux_18.0.2_9_openj9-0.33.1.tar.gz 48263242 SHA256 57726d73c644107de26fe6c252a58f477e691b9aa81de0c23251318f87aa621b -DIST ibm-semeru-open-jre_x64_linux_11.0.17_8_openj9-0.35.0.tar.gz 47254074 SHA256 b1d31a4165cabcad66771a05acf8ff750f40953558494ba8d88e97fac55af6a9 -DIST ibm-semeru-open-jre_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz 47171747 SHA256 759f9c507e0faf53b260ee9f492bab8fdeb8091bdecad904134861714e4d913b -DIST ibm-semeru-open-jre_x64_linux_18.0.2_9_openj9-0.33.1.tar.gz 47105731 SHA256 4fb19cedab5967359991b9bcb3be09744fc9ac027d0b773870ee7f7aaf539666 +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-17.0.5_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild index 624390d..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.5_p8.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.27_p6.ebuild @@ -12,7 +12,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -25,12 +25,11 @@ DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild index febf680..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-18.0.2_p9.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-17.0.15_p6.ebuild @@ -12,7 +12,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.33.1 +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -25,12 +25,11 @@ DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild index 624390d..3f1b111 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.17_p8.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-21.0.7_p6.ebuild @@ -12,7 +12,7 @@ abi_uri() { } JDK_PV=${PV//_p/+} -DL_PV=${JDK_PV}_openj9-0.35.0 +DL_PV=${JDK_PV}_openj9-0.51.0 SLOT=$(ver_cut 1) SRC_URI=" @@ -25,12 +25,11 @@ DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="alsa cups +gentoo-vm headless-awt selinux" +IUSE="alsa cups headless-awt selinux" RDEPEND=" media-libs/fontconfig:1.0 media-libs/freetype:2 - >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest index ffc3344..533a846 100644 --- a/dev-java/openj9-openjdk/Manifest +++ b/dev-java/openj9-openjdk/Manifest @@ -1,4 +1,4 @@ -DIST openj9-0.33.1.tar.gz 17354965 BLAKE2B c5b9c64ea45eefb2a0c67cd414844e52486481b939b8c62c68444f28f9490ebc2bf04913229576e4fff616b63ef6c242e4748a7ad9dea212714e40d9dbb3bd17 SHA512 fdb75916c868473465687c4fc15eafc1abf02ecff4c88b9998bcbc88e6583868ae3012be89f75734c08b636cf41d04946ec3e7bf29afef0575c8b1146616c9a5 -DIST openj9-omr-0.33.1.tar.gz 7932300 BLAKE2B 9fe2d80119dd7a61058d88ea04220db884e95d781f140247a95014acc80da90783849999f6fbe4e0cfb02e95675265875cbf3dfc1309c09e79226bc4d3b5c603 SHA512 b9322aba18bd487407e77f97a751c9e268577e6a03762070bb7c612276ee149891f6177affb2cabfccdacb2eb1e95c500f4a4473095651cc3f30debe10897d10 -DIST openj9-openjdk-jdk11-openj9-0.33.1.tar.gz 109332234 BLAKE2B c289f81a3fdeb4331fe11f0de7e0a6b78f784025048844b3118e5cff12c68623e989b8d776388956c8c5ed056dd91799d06e20410b0036ca7e50ffdba054eb21 SHA512 fb7e4627d1505887aeb67a1feccd3260f2f997190b9081acd5f22fbad395683e3fbefadab4073b119317744bb7afad54befa7bf9f9ceb15db59c806a5d1e4f81 -DIST openj9-openjdk-jdk17-openj9-0.33.1.tar.gz 94013661 BLAKE2B f5f4155fa3b449b09582782ac2c64a69cd37caa10dd731c6fdb0441b87149f1c867a3d622fd04c242e45a5ad9e07f55c824db1c77baa83493ef7314f63c509b9 SHA512 d5a2cefa683b2ec254db0bf636e02f312db4153c25daff41afdd41c8d8aa529aa87f60476edd229dfb5bb5cb9a67030ab67efac44282f355a9b6d5128a169a2e +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/metadata.xml b/dev-java/openj9-openjdk/metadata.xml index 7148c44..dadf469 100644 --- a/dev-java/openj9-openjdk/metadata.xml +++ b/dev-java/openj9-openjdk/metadata.xml @@ -8,7 +8,6 @@ <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> diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild index 11e1f9f..4e7eb58 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.33.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.48.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs SLOT="$(ver_cut 1)" OPENJ9_PV="$(ver_cut 2-4)" @@ -18,16 +18,16 @@ 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 +gentoo-vm headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" +IUSE="alsa cups ddr debug doc headless-awt javafx +jbootstrap jitserver numa selinux source systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) @@ -41,7 +41,7 @@ COMMON_DEPEND=" media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) dev-libs/elfutils ddr? ( dev-libs/libdwarf ) @@ -83,14 +83,14 @@ DEPEND=" x11-libs/libXtst javafx? ( dev-java/openjfx:${SLOT}= ) || ( - dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] + dev-java/openj9-openjdk-bin:${SLOT} + dev-java/openj9-openjdk:${SLOT} + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} ) " -S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" +S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but @@ -162,9 +162,18 @@ src_prepare() { } 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. @@ -202,7 +211,14 @@ src_configure() { $(use_enable jitserver) ) + use lto && myconf+=( --with-jvm-features=link-time-opt ) + if use javafx; then + # 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}" ) @@ -220,6 +236,10 @@ 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}'" @@ -282,6 +302,10 @@ src_install() { 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 +} diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild index 8a7494e..6bf8ca9 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.33.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-21.0.48.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs SLOT="$(ver_cut 1)" OPENJ9_PV="$(ver_cut 2-4)" @@ -18,16 +18,16 @@ 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 +gentoo-vm headless-awt javafx +jbootstrap jitserver numa 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 ) @@ -41,7 +41,7 @@ COMMON_DEPEND=" media-libs/lcms:2= sys-libs/zlib media-libs/libjpeg-turbo:0= - systemtap? ( dev-util/systemtap ) + systemtap? ( dev-debug/systemtap ) dev-libs/elfutils ddr? ( dev-libs/libdwarf ) @@ -90,7 +90,7 @@ DEPEND=" ) " -S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" +S="${WORKDIR}/${PN}-jdk${SLOT}-${OPENJ9_P}" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but @@ -193,6 +193,12 @@ src_configure() { # 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. @@ -221,7 +227,7 @@ src_configure() { --with-vendor-version-string="${PVR}" --with-version-pre="" --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") @@ -230,6 +236,8 @@ src_configure() { $(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" if [[ -r ${zip} ]]; then @@ -269,7 +277,7 @@ src_compile() { OPENJ9_TAG=${OPENJ9_P} OPENJ9OMR_SHA=${OPENJ9_P} ) - emake "${myemakeargs[@]}" -j1 #nowarn + emake "${myemakeargs[@]}" -j1 } src_install() { @@ -298,12 +306,12 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die - dosym8 -r /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 @@ -313,3 +321,7 @@ src_install() { dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" fi } + +pkg_postinst() { + java-vm-2_pkg_postinst +} diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest deleted file mode 100644 index daf4475..0000000 --- a/dev-lang/zig/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d diff --git a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch b/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch deleted file mode 100644 index 70f807f..0000000 --- a/dev-lang/zig/files/zig-0.9.1-fix-single-threaded.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 638f39f7e..791477c41 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -787,7 +787,7 @@ else() - set(ZIG1_RELEASE_ARG -OReleaseFast --strip) - endif() - if(ZIG_SINGLE_THREADED) -- set(ZIG1_SINGLE_THREADED_ARG "-fsingle-threaded") -+ set(ZIG1_SINGLE_THREADED_ARG "--single-threaded") - else() - set(ZIG1_SINGLE_THREADED_ARG "") - endif() diff --git a/dev-lang/zig/metadata.xml b/dev-lang/zig/metadata.xml deleted file mode 100644 index 9a74b67..0000000 --- a/dev-lang/zig/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="github">ziglang/zig</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1.ebuild deleted file mode 100644 index 2227501..0000000 --- a/dev-lang/zig/zig-0.9.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_MAX_SLOT=13 -inherit cmake llvm check-reqs - -DESCRIPTION="A robust, optimal, and maintainable programming language" -HOMEPAGE="https://ziglang.org/" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ziglang/zig.git" - inherit git-r3 -else - SRC_URI="https://ziglang.org/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test +threads" -RESTRICT="!test? ( test )" - -PATCHES=("${FILESDIR}/${P}-fix-single-threaded.patch") - -BUILD_DIR="${S}/build" - -# According to zig's author, zig builds that do not support all targets are not -# supported by the upstream project. -ALL_LLVM_TARGETS=( - AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 NVPTX - PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore -) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS="${ALL_LLVM_TARGETS[@]/%/(-)?}" - -IUSE="test threads ${ALL_LLVM_TARGETS[*]}" - -RDEPEND=" - sys-devel/clang:${LLVM_MAX_SLOT} - >=sys-devel/lld-${LLVM_MAX_SLOT} - <sys-devel/lld-$((${LLVM_MAX_SLOT} + 1)) - sys-devel/llvm:${LLVM_MAX_SLOT}[${LLVM_TARGET_USEDEPS// /,}] -" -DEPEND="${RDEPEND}" - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -# see https://github.com/ziglang/zig/wiki/Troubleshooting-Build-Issues#high-memory-requirements -CHECKREQS_MEMORY="10G" - -pkg_setup() { - llvm_pkg_setup - check-reqs_pkg_setup -} - -src_configure() { - local mysedargs=() llvm_target arch - for target in "${ALL_LLVM_TARGETS[@]}"; do - if ! use $target; then - llvm_target=${target#llvm_targets_} - case $llvm_target in - AArch64) arch=(aarch64 aarch64_be aarch64_32);; - AMDGPU) arch=(amdgcn);; - ARM) arch=(thumb thumbeb arm armeb);; - AVR) arch=(avr);; - BPF) arch=(bpfel bpfeb);; - Hexagon) arch=(hexagon);; - Lanai) arch=(lanai);; - Mips) arch=(mips mipsel mips64 mips64el);; - MSP430) arch=(msp430);; - NVPTX) arch=(nvptx nvptx64);; - PowerPC) arch=(powerpc powerpcle powerpc64 powerpc64le);; - RISCV) arch=(riscv32 riscv64);; - Sparc) arch=(sparc sparcv9 sparcel);; - SystemZ) arch=(s390x);; - WebAssembly) arch=(wasm32 wasm64);; - X86) arch=(i386 x86_64);; - XCore) arch=(xcore);; - *) die "unhandled target" - esac - for a in ${arch[@]}; do - mysedargs+=( - -e "/^pub fn targetTriple(/,/^}/s/\.$a => .*/.$a => return error.@\"Zig compiled without LLVM $llvm_target\",/" - ) - done - mysedargs+=( - -e " - /^fn initializeLLVMTarget(/,/^}/ { - /\.$a => {/,/},$/ { - s/=>.*/=> unreachable,/ - /=>/!d - } - } - " - ) - fi - done - sed -i "${mysedargs[@]}" src/codegen/llvm.zig || die - - local mycmakeargs=( - -DZIG_USE_CCACHE=OFF - -DZIG_PREFER_CLANG_CPP_DYLIB=ON - -DZIG_SINGLE_THREADED="$(usex threads OFF ON)" - ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die - ./zig build test || die -} diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest index e69b4d1..09c1620 100644 --- a/dev-libs/libdwarf/Manifest +++ b/dev-libs/libdwarf/Manifest @@ -1 +1 @@ -DIST libdwarf-0.4.2.tar.xz 2419592 BLAKE2B 403b79222c541f65c1e826449228c3184ab6c5e42920512dce46169b32b113f3c3a49644777d0d4d1dfc37639cd551a78bd422a98ab40f96ad693b82b22b0493 SHA512 6d2a3ebf0104362dd9cecec272935684f977db119810eea0eec88c9f56a042f260a4f6ed3bbabde8592fe16f98cbd81b4ab2878005140e05c8f475df6380d1c2 +DIST libdwarf-0.11.1.tar.xz 2747004 BLAKE2B b98467abd547e222594843263ef36a9362aa4a8c8ace770d128016e65a50c7ae15d91e769e6fd966ca9b8c5b5ed471d14e5e7259c713c126ac17e13d5d074a77 SHA512 d927b1d0e8dd1540c2f5da2a9d39b2914bb48225b2b9bdca94e7b36349358e1f537044eadc345f11d75de717fdda07ad99a8a7a5eb45e64fe4c79c37e165012f diff --git a/dev-libs/libdwarf/libdwarf-0.4.2.ebuild b/dev-libs/libdwarf/libdwarf-0.11.1.ebuild index ee99812..5c4daa8 100644 --- a/dev-libs/libdwarf/libdwarf-0.4.2.ebuild +++ b/dev-libs/libdwarf/libdwarf-0.11.1.ebuild @@ -10,11 +10,13 @@ SRC_URI="https://github.com/davea42/libdwarf-code/releases/download/v${PV}/${P}. 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,9 +24,9 @@ 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[@]}" 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 14cd35d..ff260cf 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,2 +1,2 @@ -DIST openssl-3.0.5.tar.gz 15074407 BLAKE2B 7bf89e042417c003ef02a8bb1278590a52ce4a3d50f66795c66b750f90248840edb0d3352811caaaaff708c7e65b77384142e316916a6c311f1d2b4747f44816 SHA512 782b0df3d0252468aa696bd74a3b661810499819c0df849aa9698ba0e06a845820dc856aac650fced4be234f1271e576d4317ac3ab1406cf0ffe087d695d20fe -DIST openssl-3.0.5.tar.gz.asc 862 BLAKE2B 24f1839227be7acec45eb6b748cea7be0b5e66b5cf745814861f7290670733936bf1af2c1dc9357439b31a2ca28f418880d63726d4be6fa994902ac95b51e401 SHA512 516da9ef291601400576adaba7271854af3caa23dc1d70116004360f580e4c28fe61d51e86477d341e4c5bf0ca5f98db8264581ed6cc2c8df124da83ad3e40be +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-3.0.5-test-memcmp.patch b/dev-libs/openssl/files/openssl-3.0.5-test-memcmp.patch deleted file mode 100644 index 8fa0387..0000000 --- a/dev-libs/openssl/files/openssl-3.0.5-test-memcmp.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7f58de577c05ae0bbd20eee9b2971cfa1cd062c8 Mon Sep 17 00:00:00 2001 -From: Gregor Jasny <gjasny@googlemail.com> -Date: Tue, 5 Jul 2022 12:57:06 +0200 -Subject: [PATCH] Add missing header for memcmp - -CLA: trivial ---- - test/v3ext.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/v3ext.c b/test/v3ext.c -index 926f3884b138..a8ab64b2714b 100644 ---- a/test/v3ext.c -+++ b/test/v3ext.c -@@ -8,6 +8,7 @@ - */ - - #include <stdio.h> -+#include <string.h> - #include <openssl/x509.h> - #include <openssl/x509v3.h> - #include <openssl/pem.h> 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/openssl-3.0.5-r1.ebuild b/dev-libs/openssl/openssl-3.3.2-r1.ebuild index 5aa7087..4030adf 100644 --- a/dev-libs/openssl/openssl-3.0.5-r1.ebuild +++ b/dev-libs/openssl/openssl-3.3.2-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig +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://www.openssl.org/" +HOMEPAGE="https://openssl-library.org/" MY_P=${P/_/-} @@ -16,20 +17,27 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else - SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - verify-sig? ( mirror://openssl/source/${MY_P}.tar.gz.asc )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" + 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/3" # .so version of libssl/libcrypto -IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compression vanilla verify-sig weak-ssl-ciphers" +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=" - >=app-misc/c_rehash-1.7-r1 + !<net-misc/openssh-9.2_p1-r3 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) " BDEPEND=" @@ -37,11 +45,11 @@ BDEPEND=" sctp? ( >=net-misc/lksctp-tools-1.0.12 ) test? ( sys-apps/diffutils - sys-devel/bc + app-alternatives/bc sys-process/procps ) - verify-sig? ( sec-keys/openpgp-keys-openssl )" - + verify-sig? ( >=sec-keys/openpgp-keys-openssl-20240920 ) +" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" PDEPEND="app-misc/ca-certificates" @@ -51,7 +59,7 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - "${FILESDIR}"/${P}-test-memcmp.patch + "${FILESDIR}"/${P}-CVE-2024-9143.patch ) pkg_setup() { @@ -62,6 +70,7 @@ pkg_setup() { CONFIG_CHECK="~TLS ~TLS_DEVICE" ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!" ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!" + use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER" linux-info_pkg_setup fi @@ -84,23 +93,16 @@ src_unpack() { # Can delete this once test fix patch is dropped if use verify-sig ; then # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} fi default } 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 + rm -f Makefile || die if ! use vanilla ; then PATCHES+=( @@ -115,18 +117,13 @@ src_prepare() { rm test/recipes/80-test_ssl_new.t || die fi - # - Make sure the man pages are suffixed (bug #302165) - # - Don't bother building man pages if they're disabled - # - Make DOCDIR Gentoo compliant - sed -i \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ - Configurations/unix-Makefile.tmpl \ - || die + # Test fails depending on kernel configuration, bug #699134 + rm test/recipes/30-test_afalg.t || die +} + +src_configure() { + # Keep this in sync with app-misc/c_rehash + SSL_CNF_DIR="/etc/ssl" # Quiet out unknown driver argument warnings since openssl # doesn't have well-split CFLAGS and we're making it even worse @@ -138,33 +135,24 @@ src_prepare() { # 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) - # Prefixify Configure shebang (bug #141906) - sed \ - -e "1s,/usr/bin/env,${BROOT}&," \ - -i Configure || die - - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi - - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" + # bug #895308 -- check inserts GNU ld-compatible arguments + [[ ${CHOST} == *-darwin* ]] || append-atomic-flags + # Configure doesn't respect LIBS + export LDLIBS="${LIBS}" - multilib_copy_sources -} - -multilib_src_configure() { # bug #197996 unset APPS # bug #312551 @@ -174,19 +162,22 @@ multilib_src_configure() { tc-export AR CC CXX RANLIB RC + multilib-minimal_src_configure +} + +multilib_src_configure() { use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - local sslout=$(./gentoo.config) + local sslout=$(bash "${FILESDIR}/gentoo.config-1.0.4") einfo "Using configuration: ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" # https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features local myeconfargs=( ${sslout} + $(multilib_is_native_abi || echo "no-docs") $(use cpu_flags_x86_sse2 || echo "no-sse2") enable-camellia enable-ec @@ -194,10 +185,11 @@ multilib_src_configure() { enable-sm2 enable-srp $(use elibc_musl && echo "no-async") - $(use amd64 && echo "enable-ec_nistp_64_gcc_128") + enable-ec_nistp_64_gcc_128 enable-idea enable-mdc2 $(use fips && echo "enable-fips") + $(use quic && echo "enable-quic") $(use_ssl asm) $(use_ssl ktls) $(use_ssl rfc3779) @@ -214,49 +206,39 @@ multilib_src_configure() { threads ) - CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}" - - # Clean out hardcoded flags that openssl uses - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ - -e 's:\(^\| \)-fomit-frame-pointer::g' \ - -e 's:\(^\| \)-O[^ ]*::g' \ - -e 's:\(^\| \)-march=[^ ]*::g' \ - -e 's:\(^\| \)-mcpu=[^ ]*::g' \ - -e 's:\(^\| \)-m[^ ]*::g' \ - -e 's:^ *::' \ - -e 's: *$::' \ - -e 's: \+: :g' \ - -e 's:\\:\\\\:g' - ) - - # Now insert clean default flags with user flags - sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ - Makefile \ - || die + edo perl "${S}/Configure" "${myeconfargs[@]}" } multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - - emake all + 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. - emake HARNESS_JOBS="$(makeopts_jobs)" VFP=1 test + # + # -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() { - # We need to create ${ED}/usr on our own to avoid a race condition (bug #665130) - dodir /usr + # 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 - emake DESTDIR="${D}" install + 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 @@ -278,38 +260,6 @@ multilib_src_install_all() { # Create the certs directory keepdir ${SSL_CNF_DIR}/certs - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man || die - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} - d=${d#./} - m=${m##*/} - - [[ ${m} == openssl.1* ]] && continue - - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - - mv ${d}/{,ssl-}${m} || die - - # Fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die - ln -s ssl-${m} ${d}/openssl-${m} || die - - # Locate any symlinks that point to this man page - # We assume that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - - rm -f ${d}/${s} - - # We don't want to "|| die" here - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - # bug #254521 dodir /etc/sandbox.d echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl @@ -318,8 +268,25 @@ multilib_src_install_all() { keepdir ${SSL_CNF_DIR}/private } +pkg_preinst() { + if use fips; then + # Regen fipsmodule.cnf, bug 900625 + ebegin "Running openssl fipsinstall" + "${ED}/usr/bin/openssl" fipsinstall -quiet \ + -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" + eend $? + fi + + 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 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" eend $? + + 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 88d6a49..0000000 --- a/dev-qt/qtgui/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f -DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf -DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87 diff --git a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch b/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch deleted file mode 100644 index 0d0acdf..0000000 --- a/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 97acde2828c8814671f4938e0c4805d945a4d110 Mon Sep 17 00:00:00 2001 -From: Tang Haixiang <tanghaixiang@uniontech.com> -Date: Thu, 25 Feb 2021 18:05:17 +0800 -Subject: [PATCH] xcb: Update _NET_SUPPORTED when the window manager changes it -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In some cases, the application may start before the window manager, and in some window managers -_NET_SUPPORTED may be changed. These situations will cause the _NET_SUPPORTED value obtained by Qt -to be inconsistent with the window manager. - -Fixes: QTBUG-91396 -Change-Id: I63c6934ad2538cdb9f05926b3748216bd0dcf04e -Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> - - -(cherry picked from commit acb0065cc7e4ee849cc87ce72e46b05a61370c43) ---- - src/plugins/platforms/xcb/qxcbconnection.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp -index 8477e28df1..6aa61e0d34 100644 ---- a/src/plugins/platforms/xcb/qxcbconnection.cpp -+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp -@@ -659,6 +659,8 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) - QXcbVirtualDesktop *virtualDesktop = virtualDesktopForRootWindow(propertyNotify->window); - if (virtualDesktop) - virtualDesktop->updateWorkArea(); -+ } else if (propertyNotify->atom == atom(QXcbAtom::_NET_SUPPORTED)) { -+ m_wmSupport->updateNetWMAtoms(); - } else { - HANDLE_PLATFORM_WINDOW_EVENT(xcb_property_notify_event_t, window, handlePropertyNotifyEvent); - } --- -GitLab - diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml deleted file mode 100644 index 6edd18d..0000000 --- a/dev-qt/qtgui/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <use> - <flag name="egl">Enable EGL integration</flag> - <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag> - <flag name="evdev">Enable support for input devices via evdev</flag> - <flag name="ibus">Build the IBus input method plugin</flag> - <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> - <flag name="linuxfb">Enable Linux framebuffer support for embedded devices</flag> - <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> - <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag> - <flag name="vulkan">Enable support for Vulkan</flag> - <flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag> - <flag name="X">Build the XCB platform plugin and enable X11 integration</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>https://doc.qt.io/</doc> - </upstream> - <slots> - <subslots> - Must only be used by packages that are known to use private parts of the Qt API. - </subslots> - </slots> -</pkgmetadata> diff --git a/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild deleted file mode 100644 index 16eeea1..0000000 --- a/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT5_KDEPATCHSET_REV=2 -QT5_MODULE="qtbase" -inherit qt5-build - -DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" -SLOT=5/${QT5_PV} # bug 707658 - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg - +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X" -REQUIRED_USE=" - accessibility? ( dbus X ) - eglfs? ( egl ) - ibus? ( dbus ) - libinput? ( udev ) - X? ( gles2-only? ( egl ) ) -" - -RDEPEND=" - dev-libs/glib:2 - =dev-qt/qtcore-${QT5_PV}*:5= - dev-util/gtk-update-icon-cache - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - sys-libs/zlib:= - dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) - eglfs? ( - media-libs/mesa[gbm(+)] - x11-libs/libdrm - ) - evdev? ( sys-libs/mtdev ) - jpeg? ( media-libs/libjpeg-turbo:= ) - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X] ) - libinput? ( - dev-libs/libinput:= - x11-libs/libxkbcommon - ) - png? ( media-libs/libpng:= ) - tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) - udev? ( virtual/libudev:= ) - vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb:=[xkb] - x11-libs/libxkbcommon[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) -" -DEPEND="${RDEPEND} - evdev? ( sys-kernel/linux-headers ) - linuxfb? ( sys-kernel/linux-headers ) - udev? ( sys-kernel/linux-headers ) -" -PDEPEND=" - ibus? ( app-i18n/ibus ) - wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) -" - -QT5_TARGET_SUBDIRS=( - src/tools/qvkgen - src/gui - src/openglextensions - src/platformheaders - src/platformsupport - src/plugins/generic - src/plugins/imageformats - src/plugins/platforms - src/plugins/platforminputcontexts -) - -QT5_GENTOO_CONFIG=( - accessibility:accessibility-atspi-bridge - egl:egl: - eglfs:eglfs: - eglfs:eglfs_egldevice: - eglfs:eglfs_gbm: - evdev:evdev: - evdev:mtdev: - :fontconfig: - :system-freetype:FREETYPE - !:no-freetype: - !gif:no-gif: - gles2-only::OPENGL_ES - gles2-only:opengles2:OPENGL_ES_2 - !:no-gui: - :system-harfbuzz: - !:no-harfbuzz: - jpeg:system-jpeg:IMAGEFORMAT_JPEG - !jpeg:no-jpeg: - libinput - libinput:xkbcommon: - :opengl - png:png: - png:system-png:IMAGEFORMAT_PNG - !png:no-png: - tslib:tslib: - udev:libudev: - vulkan:vulkan: - X:xcb: - X:xcb-glx: - X:xcb-plugin: - X:xcb-render: - X:xcb-sm: - X:xcb-xlib: - X:xcb-xinput: -) - -QT5_GENTOO_PRIVATE_CONFIG=( - :gui -) - -# https://bugs.kde.org/show_bug.cgi?id=449196 -# https://bugreports.qt.io/browse/QTBUG-91396 -PATCHES=( # kde/5.15 branch - "${FILESDIR}/${P}"-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch -) - -src_prepare() { - # don't add -O3 to CXXFLAGS, bug 549140 - sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die - - # egl_x11 is activated when both egl and X are enabled - use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:) - - qt_use_disable_config dbus dbus \ - src/platformsupport/themes/genericunix/genericunix.pri - - qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro - - qt_use_disable_mod ibus dbus \ - src/plugins/platforminputcontexts/platforminputcontexts.pro - - use vnc || sed -i -e '/SUBDIRS += vnc/d' \ - src/plugins/platforms/platforms.pro || die - - qt5-build_src_prepare -} - -src_configure() { - local myconf=( - $(usev dbus -dbus-linked) - $(qt_use egl) - $(qt_use eglfs) - $(usev eglfs '-gbm -kms') - $(qt_use evdev) - $(qt_use evdev mtdev) - -fontconfig - -system-freetype - $(usev !gif -no-gif) - -gui - -system-harfbuzz - $(qt_use jpeg libjpeg system) - $(qt_use libinput) - $(qt_use linuxfb) - -opengl $(usex gles2-only es2 desktop) - $(qt_use png libpng system) - $(qt_use tslib) - $(qt_use udev libudev) - $(qt_use vulkan) - $(qt_use X xcb) - $(usev X '-xcb-xlib') - ) - if use libinput || use X; then - myconf+=( -xkbcommon ) - fi - qt5-build_src_configure -} diff --git a/gui-apps/gammastep/Manifest b/gui-apps/gammastep/Manifest deleted file mode 100644 index 0616039..0000000 --- a/gui-apps/gammastep/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gammastep-2.0.8.tar.bz2 539944 BLAKE2B 6a572c5eb26339ddd2f597dff1b2f5d9f1f232e6465e1fdd4e4a93df616cf785bfdf75a03c6d9ae8b3606382ed95bd2ad5d12802fca075eae00e2f3e48d6d189 SHA512 9ffc79f1970672f551513ddd4df3c3fe5cdc71883471ebfb1dbe65f2f6ee77248c0b2ef704ab5879d2b183d4b7b6e19ed380b9f3a3c82b9013c52252c3bbfa5e diff --git a/gui-apps/gammastep/gammastep-2.0.8.ebuild b/gui-apps/gammastep/gammastep-2.0.8.ebuild deleted file mode 100644 index cf33697..0000000 --- a/gui-apps/gammastep/gammastep-2.0.8.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/gui-wm/tinywl/Manifest b/gui-wm/tinywl/Manifest deleted file mode 100644 index 9433b60..0000000 --- a/gui-wm/tinywl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677 diff --git a/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch b/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch deleted file mode 100644 index cff1f72..0000000 --- a/gui-wm/tinywl/files/tinywl-don-t-crash-when-there-is-no-keyboard.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7d950f3dac6cca62635d5e4ff2af33b35372f6db Mon Sep 17 00:00:00 2001 -From: Simon Ser <contact@emersion.fr> -Date: Sat, 19 Mar 2022 14:00:43 +0100 -Subject: [PATCH] tinywl: don't crash when there is no keyboard - -Running with WLR_BACKENDS=headless, there is no keyboard device. -Avoid crashes like so: - - ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard' - ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard' - AddressSanitizer:DEADLYSIGNAL - ================================================================= - ==331107==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000120 (pc 0x556ed03e4e99 bp 0x7ffce834bc10 sp 0x7ffce834bbb0 T0) - ==331107==The signal is caused by a READ memory access. - ==331107==Hint: address points to the zero page. - #0 0x556ed03e4e99 in focus_view ../tinywl/tinywl.c:136 - #1 0x556ed03eb3be in xdg_toplevel_map ../tinywl/tinywl.c:603 - #2 0x7f75d6f768db in wlr_signal_emit_safe ../util/signal.c:29 - #3 0x7f75d6e9cac7 in xdg_surface_role_commit ../types/xdg_shell/wlr_xdg_surface.c:315 - #4 0x7f75d6eb6944 in surface_commit_state ../types/wlr_compositor.c:466 - #5 0x7f75d6eb7b02 in surface_handle_commit ../types/wlr_compositor.c:523 - #6 0x7f75d5714d49 (/usr/lib/libffi.so.8+0x6d49) - #7 0x7f75d5714266 (/usr/lib/libffi.so.8+0x6266) - #8 0x7f75d68cb322 (/usr/lib/libwayland-server.so.0+0xd322) - #9 0x7f75d68c65cb (/usr/lib/libwayland-server.so.0+0x85cb) - #10 0x7f75d68c91c9 in wl_event_loop_dispatch (/usr/lib/libwayland-server.so.0+0xb1c9) - #11 0x7f75d68c6d36 in wl_display_run (/usr/lib/libwayland-server.so.0+0x8d36) - #12 0x556ed03eef55 in main ../tinywl/tinywl.c:905 - #13 0x7f75d5d2330f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f) - #14 0x7f75d5d233c0 in __libc_start_main@GLIBC_2.2.5 (/usr/lib/libc.so.6+0x2d3c0) - #15 0x556ed03e46e4 in _start (/home/simon/src/wlroots/build/tinywl/tinywl+0x136e4) ---- - tinywl/tinywl.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c -index dd442aac..8796e9df 100644 ---- a/tinywl/tinywl.c -+++ b/tinywl/tinywl.c -@@ -130,8 +130,10 @@ static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) { - * track of this and automatically send key events to the appropriate - * clients without additional work on your part. - */ -- wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, -- keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); -+ if (keyboard != NULL) { -+ wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface, -+ keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers); -+ } - } - - static void keyboard_handle_modifiers( --- -2.36.1 - diff --git a/gui-wm/tinywl/metadata.xml b/gui-wm/tinywl/metadata.xml deleted file mode 100644 index f32ad44..0000000 --- a/gui-wm/tinywl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>alex_y_xu@yahoo.ca</email> - <name>Alex Xu (Hello71)</name> - </maintainer> -</pkgmetadata> diff --git a/gui-wm/tinywl/tinywl-0.15.1.ebuild b/gui-wm/tinywl/tinywl-0.15.1.ebuild deleted file mode 100644 index c8ddb20..0000000 --- a/gui-wm/tinywl/tinywl-0.15.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION='"minimum viable product" Wayland compositor based on wlroots' -HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots/-/tree/tinywl" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PV}/wlroots-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="CC0-1.0" -SLOT="0" -IUSE="" - -DEPEND=" - >=gui-libs/wlroots-${PV}:= - dev-libs/wayland-protocols -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - dev-libs/wayland-protocols - virtual/pkgconfig -" - -S=${WORKDIR}/wlroots-${PV} - -PATCHES=( - "${FILESDIR}/tinywl-don-t-crash-when-there-is-no-keyboard.patch" -) - -S="${WORKDIR}/wlroots-${PV}/tinywl" - -src_prepare() { - cd .. - default -} - -src_install() { - dobin tinywl -} diff --git a/mail-client/astroid/astroid-9999.ebuild b/mail-client/astroid/astroid-9999.ebuild index a75b422..76a54d6 100644 --- a/mail-client/astroid/astroid-9999.ebuild +++ b/mail-client/astroid/astroid-9999.ebuild @@ -3,8 +3,6 @@ EAPI=7 -: "${CMAKE_MAKEFILE_GENERATOR:=ninja}" - inherit cmake git-r3 optfeature virtualx DESCRIPTION="lightweight graphical threads-with-tags style email client for notmuch" @@ -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 index 4f83c43..586ea66 100644 --- a/media-fonts/noto-cjk/Manifest +++ b/media-fonts/noto-cjk/Manifest @@ -1,3 +1,3 @@ -DIST NotoSansCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52 -DIST NotoSansMonoCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b -DIST NotoSerifCJK-VF-9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d.otf.ttc 56784876 BLAKE2B 31304b62bc3628a27ae9c1c3703177f2e7b64857e4422ec05d5c03e1959d1795416608d4bb39cc8a5c1e6bf02bc789b2399d1e0abcdfcae4ff1a40373171a0fd SHA512 6808964ecc5b64c492712ca22538ce076ac5df0807ec7cef4fd62258df5a2911dac7652a8c39f35d0f3889e948a532e8111fa7473adbf44f34992f8379035950 +DIST NotoSansCJK-VF-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/metadata.xml b/media-fonts/noto-cjk/metadata.xml index 7c900b1..e969c6a 100644 --- a/media-fonts/noto-cjk/metadata.xml +++ b/media-fonts/noto-cjk/metadata.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <upstream> + <remote-id type="github">googlefonts/noto-cjk</remote-id> + </upstream> </pkgmetadata> diff --git a/media-fonts/noto-cjk/noto-cjk-20211026.ebuild b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild index c5c8988..ec3451a 100644 --- a/media-fonts/noto-cjk/noto-cjk-20211026.ebuild +++ b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 DESCRIPTION="Google's CJK font family" HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-cjk" -COMMIT="9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d" +COMMIT="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 @@ -15,8 +15,7 @@ SRC_URI=" LICENSE="OFL-1.1" SLOT="0" -KEYWORDS="~*" -IUSE="" +KEYWORDS="~amd64 ~x86" S="${DISTDIR}" diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest index 6e22e6a..7cf18a2 100644 --- a/media-fonts/noto-emoji/Manifest +++ b/media-fonts/noto-emoji/Manifest @@ -1 +1 @@ -DIST Noto_Emoji.zip 4053149 BLAKE2B a2d0259807070742e807f17b283d409ce6b28496d373aea56904b6a111c36c53fafd1374127ab3b6034bb61fa35d034849807bb18076116549bcdef000dc2522 SHA512 ed2092f6e68e7f69b0986d92d4e1ff80fba4de9d1990ee8e2aec42115e2c0dd4d69befe4c74597d3d3b7c64a25b957282a93223ce5128cbb42d8dca96d15b996 +DIST Noto-COLRv1-d79d23e6822e0f6e5731b114cbfb26b2a4e380da.ttf 4760384 BLAKE2B 7a3190ed3c5f46cd6b15027792d203fef8b863f6bd93cafc3f4a6d043263c58aeb0976ed2be03da227a8f9e308d033322b830734126b27da0fc33656f66d88c1 SHA512 b7fc0e7e4a4c68a02635f3efd0e88e2292a7e85d871e28efc7596da7a11ed1413703a38e7a7bc9c94d0d34a79a22db587547876e633a8391b00500bfc020dae6 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-emoji/noto-emoji-99999999.ebuild b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild deleted file mode 100644 index 8ee3a59..0000000 --- a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Google Noto Emoji fonts" -HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji" - -SRC_URI="https://fonts.google.com/download?family=Noto%20Emoji -> Noto_Emoji.zip" - -LICENSE="OFL-1.1" -SLOT="0" -KEYWORDS="~*" -IUSE="" - -BDEPEND=" - app-arch/unzip -" - -S="${WORKDIR}" - -src_install() { - insinto /usr/share/fonts/${PN} - doins NotoEmoji-VariableFont_wght.ttf -} diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest index 83388dc..7013cb3 100644 --- a/media-fonts/noto/Manifest +++ b/media-fonts/noto/Manifest @@ -1 +1,4 @@ -DIST noto-fonts-29aa92a9a0768be2d58cf4c590adb5c18b8247c6.tar.xz 14477024 BLAKE2B 10952ddeab1a1a1da93b95247ee31aa6587b13fc1e3ead1118ef4d2fb7a33a4d060df0c7a58454eb1bc195e2df5888d75af03a590dca6fc6ceafdf318eec5517 SHA512 43ee8ecadbd1861341be423934c92828ad9ceeeff5f4bf6077ddfc9e4141ffcca6e10e4bb02843c64195c1f14286226232938e913561989d514ff5f42b082c18 +DIST NotoSans-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/noto-20211207.ebuild b/media-fonts/noto/noto-20211207.ebuild deleted file mode 100644 index 86a15b8..0000000 --- a/media-fonts/noto/noto-20211207.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit font - -DESCRIPTION="Google's font family that aims to support all the world's languages" -HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-fonts" - -COMMIT="29aa92a9a0768be2d58cf4c590adb5c18b8247c6" -SRC_URI="https://www.alxu.ca/noto-fonts-${COMMIT}.tar.xz" - -LICENSE="OFL-1.1" -SLOT="0" -KEYWORDS="~*" -IUSE="" - -S="${WORKDIR}/${PN}-fonts-${COMMIT}" - -FONT_SUFFIX="ttf" -FONT_CONF=( - # From ArchLinux - "${FILESDIR}/66-noto-serif.conf" - "${FILESDIR}/66-noto-mono.conf" - "${FILESDIR}/66-noto-sans.conf" -) diff --git a/media-fonts/noto/noto-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-fonts/source-pro/Manifest b/media-fonts/source-pro/Manifest deleted file mode 100644 index 99d65ef..0000000 --- a/media-fonts/source-pro/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST source-code-pro-20210115.tar.gz 6818951 BLAKE2B b133aa317bf5057e8b346d81491bf08c0c257066ed05b2001a9e327308a63a3ef943da3b12b5933c217c31839750fbb3947b4f566f48aac6e88c7096cbbf82cd SHA512 96981af2a470027a372ab8a02265d34a6b2a810c4cca0b498b01e613019a04c9760d95e21fb740af2c7fff076098bb36f5c282bf9b8f1875eed72ed70e4b3ac9 -DIST source-sans-pro-20210115.tar.gz 12105836 BLAKE2B 3e2fed594f74614afd49ef731497b9abd6c75a78850cc1c5abbae0c246f454a0d06b82d4b7eaeefe8fb6b0d8246adb3f2751b4de6e2637f05f6cc20ead66faba SHA512 4b53ca10053bf10b23f3a2488d562b79a8dfd39f1402d068098856bbd1bd5bd9ddbb8f269acea45f003289dc95378229ed14e21fdcd39d49e3d6864693c0fbb4 -DIST source-serif-pro-20210115.tar.gz 40747188 BLAKE2B 9c91fbb5d9b29c28e1e64f36e410afce8ae6f0e6d030a6ee4e6069a20d270bf7852967641eb54b33bfe9a23eae024448f6c22de25d766a9f8a830cce04d29db1 SHA512 fff923121f1d536886468fd4887e036d9d85603e57c4ecabe64f73af4506b15265481ca69cbe7d83751f93ff72f7f9dce3aae56dacdd2c4da1bc1e7285f76d6b diff --git a/media-fonts/source-pro/files/63-source-pro.conf b/media-fonts/source-pro/files/63-source-pro.conf deleted file mode 100644 index 4265e65..0000000 --- a/media-fonts/source-pro/files/63-source-pro.conf +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> -<fontconfig> - <alias> - <family>Source Code Pro</family> - <default> - <family>monospace</family> - </default> - </alias> - <alias> - <family>monospace</family> - <prefer> - <family>Source Code Pro</family> - </prefer> - </alias> - <alias> - <family>Source Sans Pro</family> - <default> - <family>sans-serif</family> - </default> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>Source Sans Pro</family> - </prefer> - </alias> - <alias> - <family>Source Serif Pro</family> - <default> - <family>serif</family> - </default> - </alias> - <alias> - <family>serif</family> - <prefer> - <family>Source Serif Pro</family> - </prefer> - </alias> -</fontconfig> diff --git a/media-fonts/source-pro/metadata.xml b/media-fonts/source-pro/metadata.xml deleted file mode 100644 index bcdcbf1..0000000 --- a/media-fonts/source-pro/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>fonts@gentoo.org</email> - <name>Fonts</name> - </maintainer> - <upstream> - <remote-id type="github">adobe-fonts/source-code-pro</remote-id> - <remote-id type="sourceforge">sourcesans.adobe</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-fonts/source-pro/source-pro-20210115.ebuild b/media-fonts/source-pro/source-pro-20210115.ebuild deleted file mode 100644 index 00605fc..0000000 --- a/media-fonts/source-pro/source-pro-20210115.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit font - -SANSV="3.046R" -SERIFV="4.004R" -CODEV="2.038R-ro/1.058R-it/1.018R-VAR" - -DESCRIPTION="Adobe's open source typeface family designed for UI environments" -HOMEPAGE="https://adobe-fonts.github.io/source-sans/ - https://adobe-fonts.github.io/source-serif/ - https://adobe-fonts.github.io/source-code-pro/" -SRC_URI="https://github.com/adobe-fonts/source-sans/archive/${SANSV}.tar.gz -> source-sans-pro-${PV}.tar.gz - https://github.com/adobe-fonts/source-serif/archive/${SERIFV}.tar.gz -> source-serif-pro-${PV}.tar.gz - https://github.com/adobe-fonts/source-code-pro/archive/${CODEV}.tar.gz -> source-code-pro-${PV}.tar.gz" -S="${WORKDIR}" - -LICENSE="OFL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" -IUSE="cjk" - -RESTRICT="binchecks strip" - -RDEPEND=" - media-libs/fontconfig - cjk? ( media-fonts/source-han-sans ) -" - -FONT_CONF=( "${FILESDIR}"/63-${PN}.conf ) -FONT_SUFFIX="otf" - -src_prepare() { - default - mv source-*/OTF/*.otf . || die -} diff --git a/media-sound/pamixer/Manifest b/media-sound/pamixer/Manifest deleted file mode 100644 index 996e474..0000000 --- a/media-sound/pamixer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pamixer-1.4.tar.gz 17614 BLAKE2B afd8b26d987d85c043e88870805b5504ff1f7fb96583b8002dfe106ba4d9a25cf429d7ff81d4ab8a2c75501d5926136089b68fe919c997dd3bb6d4662957c66b SHA512 e3916ed8dc020bb43e57994a9f35a506147a0fde42b88c30c661cbeffa40e0f74cae66cd015394e524684c32f9674de3e3763a1396a3e1b9aecbfdc3ed117fe4 diff --git a/media-sound/pamixer/pamixer-1.4.ebuild b/media-sound/pamixer/pamixer-1.4.ebuild deleted file mode 100644 index a9205dd..0000000 --- a/media-sound/pamixer/pamixer-1.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Pulseaudio command line mixer." -HOMEPAGE="https://github.com/cdemoulins/pamixer" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cdemoulins/pamixer" -else - SRC_URI="https://github.com/cdemoulins/pamixer/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" - -RDEPEND=" - dev-libs/boost - media-sound/pulseaudio" - -DEPEND="${RDEPEND}" - -src_install() { - dobin ${PN} - dodoc README.rst -} diff --git a/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 index 280ff50..0b58477 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -1,2 +1,2 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 -DIST notmuch-0.37.tar.xz 792568 BLAKE2B 0a968b776efc39ddc09bb2cb2721609fcdf65171978d285b6877abd4c3aa7d0221b25f1052a211be1864c57d961c7a1f0c9915fd9c65497a9e4bce3a2cdbc1c0 SHA512 31cac1ff03b139b18a4fec5e29907ba0e3a965f0a7bf5f2f2b0f75980f9663173745be854e83943f344a09cdb7f5615fa48218e327c4ade7a55b3a22b2a9c45e +DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19 diff --git a/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch new file mode 100644 index 0000000..42c1083 --- /dev/null +++ b/net-mail/notmuch/files/notmuch-0.37-configure-clang16.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/879739 +https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu + +Probe for strcasestr using the C++ compiler + +The C++ compiler may define _GNU_SOURCE, causing <string.h> to +declare strcasestr, while the C compiler does not. As a result, +the probe may fail, resulting in an incompatible declaration +of strcasestr in compat/compat.h. + +Upstream discussion: + + [PATCH] compat/strcasestr: Include correct header file + <https://nmbug.notmuchmail.org/nmweb/show/20221202191908.848227-1-qsx%40chaotikum.eu> + +--- a/compat/have_strcasestr.c ++++ b/compat/have_strcasestr.c +@@ -1,4 +1,5 @@ + #define _GNU_SOURCE ++#include <string.h> + #include <strings.h> + + int + diff --git a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch index 5c9f86a..a138814 100644 --- a/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch +++ b/net-mail/notmuch/files/notmuch-assume-modern-gmime.patch @@ -1,8 +1,6 @@ -diff --git a/configure b/configure -index 5247e05a..097b2039 100755 --- a/configure +++ b/configure -@@ -490,230 +490,9 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then +@@ -502,230 +502,9 @@ gmime_cflags=$(pkg-config --cflags gmime-3.0) gmime_ldflags=$(pkg-config --libs gmime-3.0) @@ -41,9 +39,9 @@ index 5247e05a..097b2039 100755 - 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/gnupg-secret-key.asc \ +- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/openpgp4-secret-key.asc \ - && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ -- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] +- && [ $SESSION_KEY = 9:496A0B6D15A5E7BA762FB8E5FE6DEE421D4D9BBFCEAD1CDD0CCF636D07ADE621 ] - then - printf "OK.\n" - else @@ -57,8 +55,8 @@ index 5247e05a..097b2039 100755 -Please try to rebuild your version of GMime against a more recent -version of GPGME (at least GPGME 1.8.0). -EOF -- if command -v gpgme-config >/dev/null; then -- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" +- 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 @@ -186,7 +184,7 @@ index 5247e05a..097b2039 100755 - 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:13607E4217515A70EC8DF9DBC16C5327B94577561D98AD1246FA8756659C7899", &result, &error); +- 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); @@ -207,7 +205,7 @@ index 5247e05a..097b2039 100755 - 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/gnupg-secret-key.asc \ +- && 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 diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml index e186496..cf5cb52 100644 --- a/net-mail/notmuch/metadata.xml +++ b/net-mail/notmuch/metadata.xml @@ -12,7 +12,6 @@ <flag name="nmbug">Install experimental tag sharing / pseudo-bug-tracking script for Notmuch (see http://notmuchmail.org/nmbug/)</flag> - <flag name="valgrind">Depend on dev-util/valgrind for test suite</flag> </use> <longdescription lang="en"> Notmuch is a system for indexing, searching, reading, and tagging large diff --git a/net-mail/notmuch/notmuch-0.37-r1.ebuild b/net-mail/notmuch/notmuch-0.38.3.ebuild index 050d50a..92fc94f 100644 --- a/net-mail/notmuch/notmuch-0.37-r1.ebuild +++ b/net-mail/notmuch/notmuch-0.38.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 -NEED_EMACS="24.1" -PYTHON_COMPAT=( python3_{8..11} pypy3 ) +PYTHON_COMPAT=( python3_{10..13} pypy3 ) inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils @@ -20,19 +20,19 @@ LICENSE="GPL-3" SLOT="0/5" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} apidoc? ( doc ) nmbug? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( crypt emacs python valgrind ) + test? ( crypt emacs python ) " -IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind" +IUSE="apidoc crypt doc emacs mutt nmbug python test" RESTRICT="!test? ( test )" BDEPEND=" app-arch/xz-utils[extra-filters(-)] virtual/pkgconfig apidoc? ( - app-doc/doxygen + app-text/doxygen dev-lang/perl ) doc? ( @@ -58,7 +58,9 @@ COMMON_DEPEND=" emacs? ( >=app-editors/emacs-${NEED_EMACS}:* ) python? ( ${PYTHON_DEPS} - virtual/python-cffi[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/cffi[${PYTHON_USEDEP}] + ' 'python*') ) " @@ -66,13 +68,12 @@ DEPEND="${COMMON_DEPEND} test? ( >=app-editors/emacs-${NEED_EMACS}:*[libxml2] app-misc/dtach - sys-devel/gdb[python] + dev-debug/gdb[python] crypt? ( app-crypt/gnupg dev-libs/openssl ) ) - valgrind? ( dev-util/valgrind ) " RDEPEND="${COMMON_DEPEND} @@ -81,7 +82,6 @@ RDEPEND="${COMMON_DEPEND} dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools - dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu virtual/perl-Digest-SHA virtual/perl-File-Path @@ -182,7 +182,7 @@ src_compile() { # 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 #nowarn + use doc && emake -j1 -C emacs docstring.stamp V=1 fi emake V=1 @@ -190,9 +190,7 @@ src_compile() { use python && distutils-r1_src_compile if use mutt; then - pushd contrib/notmuch-mutt > /dev/null || die - emake notmuch-mutt.1 - popd > /dev/null || die + emake -C contrib/notmuch-mutt notmuch-mutt.1 fi } @@ -211,8 +209,10 @@ src_test() { # we run pytest via eclass phasefunc, so delete upstream launcher use python && { rm -v test/T391-python-cffi.sh || die ; } - LD_LIBRARY_PATH="${S}/lib" \ - nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" ) + # 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. @@ -239,9 +239,6 @@ src_install() { default if use doc; then - pushd doc/_build/man/man1 > /dev/null || die - ln notmuch.1 notmuch-setup.1 || die - popd > /dev/null || die if use apidoc; then # rename overly generic manpage to avoid clashes mv doc/_build/man/man3/deprecated.3 \ @@ -257,8 +254,8 @@ src_install() { if use nmbug; then # TODO: those guys need proper deps - python_fix_shebang devel/nmbug/{nmbug,notmuch-report} - dobin devel/nmbug/{nmbug,notmuch-report} + python_fix_shebang devel/nmbug/notmuch-report + dobin devel/nmbug/notmuch-report fi if use mutt; then diff --git a/profiles/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 2ee9b05..7fb4701 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,2 +1,3 @@ # untested dev-lang/zig +dev-java/openj9-openjdk:11 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 b0c61f9..0000000 --- a/sci-calculators/units/files/units_cur-urllib.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 69616d4..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,11} ) -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/virtual/jdk/jdk-18-r1.ebuild b/virtual/jdk/jdk-18-r1.ebuild deleted file mode 100644 index 2848b43..0000000 --- a/virtual/jdk/jdk-18-r1.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="" - -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-17-r1.ebuild b/virtual/jdk/jdk-21-r1.ebuild index a18c1a8..a18c1a8 100644 --- a/virtual/jdk/jdk-17-r1.ebuild +++ b/virtual/jdk/jdk-21-r1.ebuild diff --git a/virtual/jre/jre-11-r3.ebuild b/virtual/jre/jre-11-r3.ebuild index 510db0f..0986578 100644 --- a/virtual/jre/jre-11-r3.ebuild +++ b/virtual/jre/jre-11-r3.ebuild @@ -1,11 +1,11 @@ -# 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(+)] diff --git a/virtual/jre/jre-18-r1.ebuild b/virtual/jre/jre-18-r1.ebuild deleted file mode 100644 index abb6f5b..0000000 --- a/virtual/jre/jre-18-r1.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="" - -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-r1.ebuild b/virtual/jre/jre-21-r1.ebuild index 510db0f..08a3961 100644 --- a/virtual/jre/jre-17-r1.ebuild +++ b/virtual/jre/jre-21-r1.ebuild @@ -1,11 +1,11 @@ -# 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(+)] 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> |