From 111df125781f2206940359a27f26358e1a887dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?= Date: Wed, 3 Apr 2024 15:20:44 +0100 Subject: [PATCH 1/6] gui-libs/libdecor: add missing gtk useflag * improve ebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gonçalo Negrier Duarte --- gui-libs/libdecor/libdecor-0.2.2.ebuild | 20 +++++++++++++------- gui-libs/libdecor/libdecor-9999.ebuild | 21 ++++++++++++++------- gui-libs/libdecor/metadata.xml | 13 +++++++++++-- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/gui-libs/libdecor/libdecor-0.2.2.ebuild b/gui-libs/libdecor/libdecor-0.2.2.ebuild index 7a320ed516..1adc093e6b 100644 --- a/gui-libs/libdecor/libdecor-0.2.2.ebuild +++ b/gui-libs/libdecor/libdecor-0.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,21 +7,27 @@ inherit meson DESCRIPTION="A client-side decorations library for Wayland clients" HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor" -SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2" - +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64" +fi LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" -IUSE="+dbus examples" +IUSE="+dbus +gtk examples" DEPEND=" >=dev-libs/wayland-1.18 >=dev-libs/wayland-protocols-1.15 x11-libs/pango + x11-libs/cairo + x11-libs/gtk+ dbus? ( sys-apps/dbus ) examples? ( virtual/opengl - media-libs/mesa[egl(+)] + media-libs/mesa[opengl(+)] x11-libs/libxkbcommon ) " @@ -31,7 +37,7 @@ src_configure() { local emesonargs=( # Avoid auto-magic, built-in feature of meson -Dauto_features=disabled - + $(meson_feature gtk) $(meson_feature dbus) $(meson_use examples demo) -Dinstall_demo=true diff --git a/gui-libs/libdecor/libdecor-9999.ebuild b/gui-libs/libdecor/libdecor-9999.ebuild index bbcd2b2e3d..1adc093e6b 100644 --- a/gui-libs/libdecor/libdecor-9999.ebuild +++ b/gui-libs/libdecor/libdecor-9999.ebuild @@ -1,26 +1,33 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit meson git-r3 +inherit meson DESCRIPTION="A client-side decorations library for Wayland clients" HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor" -EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git" - +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64" +fi LICENSE="MIT" SLOT="0" -IUSE="+dbus examples" +IUSE="+dbus +gtk examples" DEPEND=" >=dev-libs/wayland-1.18 >=dev-libs/wayland-protocols-1.15 x11-libs/pango + x11-libs/cairo + x11-libs/gtk+ dbus? ( sys-apps/dbus ) examples? ( virtual/opengl - media-libs/mesa[egl(+)] + media-libs/mesa[opengl(+)] x11-libs/libxkbcommon ) " @@ -30,7 +37,7 @@ src_configure() { local emesonargs=( # Avoid auto-magic, built-in feature of meson -Dauto_features=disabled - + $(meson_feature gtk) $(meson_feature dbus) $(meson_use examples demo) -Dinstall_demo=true diff --git a/gui-libs/libdecor/metadata.xml b/gui-libs/libdecor/metadata.xml index 67df2efa9f..954491ca9b 100644 --- a/gui-libs/libdecor/metadata.xml +++ b/gui-libs/libdecor/metadata.xml @@ -2,9 +2,18 @@ - Enable dbus to query current cursor theme + Enable dbus to query current cursor theme + Build GTK plugin Build and install examples + + chewi@gentoo.org + James Le Cuirot + + + proxy-maint@gentoo.org + Gentoo Proxy Maintainers + gonegrier.duarte@gmail.com Gonçalo Negrier Duarte @@ -12,4 +21,4 @@ libdecor/libdecor - \ No newline at end of file + From 98ce48eba9c5f07d5856cf3b3e3d83c560f965f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Date: Wed, 3 Apr 2024 17:30:51 +0200 Subject: [PATCH 2/6] sys-boot/limine: add 7.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Arsen Arsenović --- sys-boot/limine/Manifest | 1 + sys-boot/limine/limine-7.3.0.ebuild | 44 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 sys-boot/limine/limine-7.3.0.ebuild diff --git a/sys-boot/limine/Manifest b/sys-boot/limine/Manifest index c0660c195d..29e5ff6ab2 100644 --- a/sys-boot/limine/Manifest +++ b/sys-boot/limine/Manifest @@ -1,3 +1,4 @@ DIST limine-7.0.0.tar.xz 1318064 BLAKE2B 7986d948fe84c80b338e5cc66edca5f511d277d2e854484c87183666bf1b075480b61213c177b6e39a1145502cc9e07b9e1442c3dcf3171339af5b55ac9c184f SHA512 40575711e0e51799cbca2b2de74eff813022ab760c32de7d485f0cb70aa6daa8c842d20ed3d740e8c59e4be63eab43969b0cf809f2e796107d7e9be221bd9bf6 DIST limine-7.0.3.tar.xz 371416 BLAKE2B 7450784d53ef86993f53c84da4f51ee8a1beb826153da8fa2cef1a0669688de370a53ced321a92276e4b53fb7c9c1081f71b4a4c7adf432b271d395e96f00595 SHA512 d8d92f237f56249555fa54b5608ad2bdeff7c7b53e055f925acb3a7feeb783407c4c5d7ce092dba0b9a93441cfd1d0dcc4ec01a9e94c14e1742119a50f63aa06 DIST limine-7.0.5.tar.xz 371612 BLAKE2B 029953e1a5adeac2b1cd92bfff3b3a893b8ad1f458f1560b194ad0607638a3cc77d4927f1f4376a958d7ae513400ec615ab092ef97cbb220e5866821e83f7fdc SHA512 149bc59785d06b293a9a9d18722afee66301e698fdd349bc5bd211720873213239617af0de665e22dc43299e7a580359d4d407c9eb6ffd6ac85c1de484124055 +DIST limine-7.3.0.tar.gz 523910 BLAKE2B aabe52c9013f17e61520aa8df0886339d6be16e3dea0b13b13160ed61b811355880e93b2928c0d73fdf8a7f80132569a7cd783dd720915235f5e78deecd4048d SHA512 fc25375f86c18ae991f6f6d11fa127b47d1fdfa81059ed663a82202f9de95b9774516e1bf5a648abaedde8e04fe004c296666b6ec3a1eeaf5cf3472aca87c0c5 diff --git a/sys-boot/limine/limine-7.3.0.ebuild b/sys-boot/limine/limine-7.3.0.ebuild new file mode 100644 index 0000000000..b2a359cdc0 --- /dev/null +++ b/sys-boot/limine/limine-7.3.0.ebuild @@ -0,0 +1,44 @@ +# 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.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+bios +bios-pxe +bios-cd +cd-efi +uefi32 +uefi64 +uefiaa64 +uefirv64" + +MY_LLVM_TARGETS="AArch64 ARM X86 RISCV" +MY_LLVM_FLAGS="llvm_targets_${MY_LLVM_TARGETS// /(-),llvm_targets_}(-)" + +BDEPEND=" + app-alternatives/gzip + dev-lang/nasm + sys-apps/findutils + sys-devel/clang[${MY_LLVM_FLAGS}] + sys-devel/lld + sys-devel/llvm[${MY_LLVM_FLAGS}] + + cd-efi? ( sys-fs/mtools ) +" + +src_configure() { + local myconf=( + "$(use_enable bios)" + "$(use_enable bios-cd)" + "$(use_enable bios-pxe)" + + "$(use_enable uefi32 uefi-ia32)" + "$(use_enable uefi64 uefi-x86-64)" + "$(use_enable uefiaa64 uefi-aarch64)" + "$(use_enable uefirv64 uefi-riscv64)" + "$(use_enable cd-efi uefi-cd)" + ) + + TOOLCHAIN_FOR_TARGET=llvm \ + econf "${myconf[@]}" +} From db49ab1951afdf123a4f2cb4bb679a5406a0aad4 Mon Sep 17 00:00:00 2001 From: Robert Greener Date: Wed, 3 Apr 2024 19:25:47 +0100 Subject: [PATCH 3/6] media-fonts/nerdfonts: New revision 3.1.1-r1 Make sure otf fonts install, and require at least one use flag Bug: https://bugs.gentoo.org/928433 Signed-off-by: Robert Greener --- .../nerdfonts/nerdfonts-3.1.1-r1.ebuild | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 media-fonts/nerdfonts/nerdfonts-3.1.1-r1.ebuild diff --git a/media-fonts/nerdfonts/nerdfonts-3.1.1-r1.ebuild b/media-fonts/nerdfonts/nerdfonts-3.1.1-r1.ebuild new file mode 100644 index 0000000000..73536f00c1 --- /dev/null +++ b/media-fonts/nerdfonts/nerdfonts-3.1.1-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit font + +DESCRIPTION="Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts: Hack, Source Code Pro, more. Glyph collections: Font Awesome, Material Design Icons, Octicons, & more" +IUSE="0xproto 3270 agave anonymouspro arimo aurulentsansmono bigblueterminal bitstreamverasansmono +cascadiacode cascadiamono codenewroman comicshannsmono commitmono cousine d2coding daddytimemono +dejavusansmono droidsansmono envycoder fantasquesansmono firacode firamono geistmono gomono gohu +hack hasklig heavydata hermit iawriter ibmplexmono inconsolata inconsolatago inconsolatalgc +intelonemono iosevka iosevkaterm iosevkatermslab jetbrainsmono lekton liberationmono lilex +martianmono meslo monaspace monofur monoid mononoki mplus nerdfontssymbolsonly noto opendyslexic +overpass profont proggyclean robotomono sharetechmono sourcecodepro spacemono terminus tinos ubuntu +ubuntumono victormono" +REQUIRED_USE="|| ( 0xproto 3270 agave anonymouspro arimo aurulentsansmono bigblueterminal bitstreamverasansmono +cascadiacode cascadiamono codenewroman comicshannsmono commitmono cousine d2coding daddytimemono +dejavusansmono droidsansmono envycoder fantasquesansmono firacode firamono geistmono gomono gohu +hack hasklig heavydata hermit iawriter ibmplexmono inconsolata inconsolatago inconsolatalgc +intelonemono iosevka iosevkaterm iosevkatermslab jetbrainsmono lekton liberationmono lilex +martianmono meslo monaspace monofur monoid mononoki mplus nerdfontssymbolsonly noto opendyslexic +overpass profont proggyclean robotomono sharetechmono sourcecodepro spacemono terminus tinos ubuntu +ubuntumono victormono )" +HOMEPAGE="https://github.com/ryanoasis/nerd-fonts" +SRC_URI=" + 0xproto? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/0xProto.tar.xz -> 0xProto-${PV}.tar.xz ) + 3270? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/3270.tar.xz -> 3270-${PV}.tar.xz ) + agave? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Agave.tar.xz -> Agave-${PV}.tar.xz ) + anonymouspro? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/AnonymousPro.tar.xz -> AnonymousPro-${PV}.tar.xz ) + arimo? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Arimo.tar.xz -> Arimo-${PV}.tar.xz ) + aurulentsansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/AurulentSansMono.tar.xz -> AurulentSansMono-${PV}.tar.xz ) + bigblueterminal? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/BigBlueTerminal.tar.xz -> BigBlueTerminal-${PV}.tar.xz ) + bitstreamverasansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/BitstreamVeraSansMono.tar.xz -> BitstreamVeraSansMono-${PV}.tar.xz ) + cascadiacode? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CascadiaCode.tar.xz -> CascadiaCode-${PV}.tar.xz ) + cascadiamono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CascadiaMono.tar.xz -> CascadiaMono-${PV}.tar.xz ) + codenewroman? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CodeNewRoman.tar.xz -> CodeNewRoman-${PV}.tar.xz ) + comicshannsmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ComicShannsMono.tar.xz -> ComicShannsMono-${PV}.tar.xz ) + commitmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CommitMono.tar.xz -> CommitMono-${PV}.tar.xz ) + cousine? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Cousine.tar.xz -> Cousine-${PV}.tar.xz ) + d2coding? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/D2Coding.tar.xz -> D2Coding-${PV}.tar.xz ) + daddytimemono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/DaddyTimeMono.tar.xz -> DaddyTimeMono-${PV}.tar.xz ) + dejavusansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/DejaVuSansMono.tar.xz -> DejaVuSansMono-${PV}.tar.xz ) + droidsansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/DroidSansMono.tar.xz -> DroidSansMono-${PV}.tar.xz ) + envycoder? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/EnvyCodeR.tar.xz -> EnvyCodeR-${PV}.tar.xz ) + fantasquesansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FantasqueSansMono.tar.xz -> FantasqueSansMono-${PV}.tar.xz ) + firacode? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraCode.tar.xz -> FiraCode-${PV}.tar.xz ) + firamono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraMono.tar.xz -> FiraMono-${PV}.tar.xz ) + geistmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/GeistMono.tar.xz -> GeistMono-${PV}.tar.xz ) + gomono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Go-Mono.tar.xz -> Go-Mono-${PV}.tar.xz ) + gohu? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Gohu.tar.xz -> Gohu-${PV}.tar.xz ) + hack? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Hack.tar.xz -> Hack-${PV}.tar.xz ) + hasklig? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Hasklig.tar.xz -> Hasklig-${PV}.tar.xz ) + heavydata? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/HeavyData.tar.xz -> HeavyData-${PV}.tar.xz ) + hermit? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Hermit.tar.xz -> Hermit-${PV}.tar.xz ) + iawriter? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/iA-Writer.tar.xz -> iA-Writer-${PV}.tar.xz ) + ibmplexmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IBMPlexMono.tar.xz -> IBMPlexMono-${PV}.tar.xz ) + inconsolata? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Inconsolata.tar.xz -> Inconsolata-${PV}.tar.xz ) + inconsolatago? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/InconsolataGo.tar.xz -> InconsolataGo-${PV}.tar.xz ) + inconsolatalgc? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/InconsolataLGC.tar.xz -> InconsolataLGC-${PV}.tar.xz ) + intelonemono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IntelOneMono.tar.xz -> IntelOneMono-${PV}.tar.xz ) + iosevka? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.tar.xz -> Iosevka-${PV}.tar.xz ) + iosevkaterm? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IosevkaTerm.tar.xz -> IosevkaTerm-${PV}.tar.xz ) + iosevkatermslab? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IosevkaTermSlab.tar.xz -> IosevkaTermSlab-${PV}.tar.xz ) + jetbrainsmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/JetBrainsMono.tar.xz -> JetBrainsMono-${PV}.tar.xz ) + lekton? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Lekton.tar.xz -> Lekton-${PV}.tar.xz ) + liberationmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/LiberationMono.tar.xz -> LiberationMono-${PV}.tar.xz ) + lilex? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Lilex.tar.xz -> Lilex-${PV}.tar.xz ) + martianmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/MartianMono.tar.xz -> MartianMono-${PV}.tar.xz ) + meslo? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Meslo.tar.xz -> Meslo-${PV}.tar.xz ) + monaspace? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Monaspace.tar.xz -> Monaspace-${PV}.tar.xz ) + monofur? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Monofur.tar.xz -> Monofur-${PV}.tar.xz ) + monoid? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Monoid.tar.xz -> Monoid-${PV}.tar.xz ) + mononoki? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Mononoki.tar.xz -> Mononoki-${PV}.tar.xz ) + mplus? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/MPlus.tar.xz -> MPlus-${PV}.tar.xz ) + nerdfontssymbolsonly? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/NerdFontsSymbolsOnly.tar.xz -> NerdFontsSymbolsOnly-${PV}.tar.xz ) + noto? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Noto.tar.xz -> Noto-${PV}.tar.xz ) + opendyslexic? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/OpenDyslexic.tar.xz -> OpenDyslexic-${PV}.tar.xz ) + overpass? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Overpass.tar.xz -> Overpass-${PV}.tar.xz ) + profont? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ProFont.tar.xz -> ProFont-${PV}.tar.xz ) + proggyclean? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ProggyClean.tar.xz -> ProggyClean-${PV}.tar.xz ) + robotomono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/RobotoMono.tar.xz -> RobotoMono-${PV}.tar.xz ) + sharetechmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ShareTechMono.tar.xz -> ShareTechMono-${PV}.tar.xz ) + sourcecodepro? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/SourceCodePro.tar.xz -> SourceCodePro-${PV}.tar.xz ) + spacemono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/SpaceMono.tar.xz -> SpaceMono-${PV}.tar.xz ) + terminus? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Terminus.tar.xz -> Terminus-${PV}.tar.xz ) + tinos? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Tinos.tar.xz -> Tinos-${PV}.tar.xz ) + ubuntu? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Ubuntu.tar.xz -> Ubuntu-${PV}.tar.xz ) + ubuntumono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/UbuntuMono.tar.xz -> UbuntuMono-${PV}.tar.xz ) + victormono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/VictorMono.tar.xz -> VictorMono-${PV}.tar.xz ) +" + +RDEPEND=" + firacode? ( !media-fonts/firacode-nerdfont ) + iosevka? ( !media-fonts/iosevka-nerdfont ) + jetbrainsmono? ( !media-fonts/jetbrainsmono-nerdfont ) + robotomono? ( !media-fonts/robotomono-nerdfont ) + ubuntumono? ( !media-fonts/ubuntumono-nerdfont ) +" + +LICENSE="OFL-1.1" +SLOT="0" +KEYWORDS="~amd64" + +S="${WORKDIR}" + +FONT_SUFFIX="ttf otf" + + +# From font.eclass +src_install() { + local dir suffix commondoc + + if [[ -n ${FONT_OPENTYPE_COMPAT} ]] && in_iuse opentype-compat && use opentype-compat ; then + font_wrap_opentype_compat + fi + + if [[ $(declare -p FONT_S 2>/dev/null) == "declare -a"* ]]; then + # recreate the directory structure if FONT_S is an array + for dir in "${FONT_S[@]}"; do + pushd "${dir}" > /dev/null || die "pushd ${dir} failed" + insinto "${FONTDIR}/${dir#"${S}"}" + for suffix in ${FONT_SUFFIX}; do + if compgen -G "*.${suffix}" > /dev/null; then + doins *.${suffix} + fi + done + font_xfont_config "${dir}" + popd > /dev/null || die + done + else + pushd "${FONT_S:-${S}}" > /dev/null \ + || die "pushd ${FONT_S:-${S}} failed" + insinto "${FONTDIR}" + for suffix in ${FONT_SUFFIX}; do + if compgen -G "*.${suffix}" > /dev/null; then + doins *.${suffix} + fi + done + font_xfont_config + popd > /dev/null || die + fi + + font_fontconfig + + einstalldocs + + # install common docs + for commondoc in COPYRIGHT FONTLOG.txt; do + [[ -s ${commondoc} ]] && dodoc ${commondoc} + done +} From 696a65f505b1f19ed00a703f9609e9fb7d71c8c4 Mon Sep 17 00:00:00 2001 From: Robert Greener Date: Wed, 3 Apr 2024 19:27:08 +0100 Subject: [PATCH 4/6] media-fonts/nerdfonts: Drop obselete revision 3.1.1 Closes: https://bugs.gentoo.org/928433 Signed-off-by: Robert Greener --- media-fonts/nerdfonts/nerdfonts-3.1.1.ebuild | 98 -------------------- 1 file changed, 98 deletions(-) delete mode 100644 media-fonts/nerdfonts/nerdfonts-3.1.1.ebuild diff --git a/media-fonts/nerdfonts/nerdfonts-3.1.1.ebuild b/media-fonts/nerdfonts/nerdfonts-3.1.1.ebuild deleted file mode 100644 index 2082636efe..0000000000 --- a/media-fonts/nerdfonts/nerdfonts-3.1.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit font - -DESCRIPTION="Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts: Hack, Source Code Pro, more. Glyph collections: Font Awesome, Material Design Icons, Octicons, & more" -IUSE="0xproto 3270 agave anonymouspro arimo aurulentsansmono bigblueterminal bitstreamverasansmono -cascadiacode cascadiamono codenewroman comicshannsmono commitmono cousine d2coding daddytimemono -dejavusansmono droidsansmono envycoder fantasquesansmono firacode firamono geistmono gomono gohu -hack hasklig heavydata hermit iawriter ibmplexmono inconsolata inconsolatago inconsolatalgc -intelonemono iosevka iosevkaterm iosevkatermslab jetbrainsmono lekton liberationmono lilex -martianmono meslo monaspace monofur monoid mononoki mplus nerdfontssymbolsonly noto opendyslexic -overpass profont proggyclean robotomono sharetechmono sourcecodepro spacemono terminus tinos ubuntu -ubuntumono victormono" -HOMEPAGE="https://github.com/ryanoasis/nerd-fonts" -SRC_URI=" - 0xproto? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/0xProto.tar.xz -> 0xProto-${PV}.tar.xz ) - 3270? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/3270.tar.xz -> 3270-${PV}.tar.xz ) - agave? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Agave.tar.xz -> Agave-${PV}.tar.xz ) - anonymouspro? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/AnonymousPro.tar.xz -> AnonymousPro-${PV}.tar.xz ) - arimo? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Arimo.tar.xz -> Arimo-${PV}.tar.xz ) - aurulentsansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/AurulentSansMono.tar.xz -> AurulentSansMono-${PV}.tar.xz ) - bigblueterminal? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/BigBlueTerminal.tar.xz -> BigBlueTerminal-${PV}.tar.xz ) - bitstreamverasansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/BitstreamVeraSansMono.tar.xz -> BitstreamVeraSansMono-${PV}.tar.xz ) - cascadiacode? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CascadiaCode.tar.xz -> CascadiaCode-${PV}.tar.xz ) - cascadiamono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CascadiaMono.tar.xz -> CascadiaMono-${PV}.tar.xz ) - codenewroman? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CodeNewRoman.tar.xz -> CodeNewRoman-${PV}.tar.xz ) - comicshannsmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ComicShannsMono.tar.xz -> ComicShannsMono-${PV}.tar.xz ) - commitmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/CommitMono.tar.xz -> CommitMono-${PV}.tar.xz ) - cousine? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Cousine.tar.xz -> Cousine-${PV}.tar.xz ) - d2coding? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/D2Coding.tar.xz -> D2Coding-${PV}.tar.xz ) - daddytimemono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/DaddyTimeMono.tar.xz -> DaddyTimeMono-${PV}.tar.xz ) - dejavusansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/DejaVuSansMono.tar.xz -> DejaVuSansMono-${PV}.tar.xz ) - droidsansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/DroidSansMono.tar.xz -> DroidSansMono-${PV}.tar.xz ) - envycoder? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/EnvyCodeR.tar.xz -> EnvyCodeR-${PV}.tar.xz ) - fantasquesansmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FantasqueSansMono.tar.xz -> FantasqueSansMono-${PV}.tar.xz ) - firacode? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraCode.tar.xz -> FiraCode-${PV}.tar.xz ) - firamono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/FiraMono.tar.xz -> FiraMono-${PV}.tar.xz ) - geistmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/GeistMono.tar.xz -> GeistMono-${PV}.tar.xz ) - gomono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Go-Mono.tar.xz -> Go-Mono-${PV}.tar.xz ) - gohu? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Gohu.tar.xz -> Gohu-${PV}.tar.xz ) - hack? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Hack.tar.xz -> Hack-${PV}.tar.xz ) - hasklig? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Hasklig.tar.xz -> Hasklig-${PV}.tar.xz ) - heavydata? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/HeavyData.tar.xz -> HeavyData-${PV}.tar.xz ) - hermit? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Hermit.tar.xz -> Hermit-${PV}.tar.xz ) - iawriter? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/iA-Writer.tar.xz -> iA-Writer-${PV}.tar.xz ) - ibmplexmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IBMPlexMono.tar.xz -> IBMPlexMono-${PV}.tar.xz ) - inconsolata? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Inconsolata.tar.xz -> Inconsolata-${PV}.tar.xz ) - inconsolatago? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/InconsolataGo.tar.xz -> InconsolataGo-${PV}.tar.xz ) - inconsolatalgc? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/InconsolataLGC.tar.xz -> InconsolataLGC-${PV}.tar.xz ) - intelonemono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IntelOneMono.tar.xz -> IntelOneMono-${PV}.tar.xz ) - iosevka? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Iosevka.tar.xz -> Iosevka-${PV}.tar.xz ) - iosevkaterm? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IosevkaTerm.tar.xz -> IosevkaTerm-${PV}.tar.xz ) - iosevkatermslab? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/IosevkaTermSlab.tar.xz -> IosevkaTermSlab-${PV}.tar.xz ) - jetbrainsmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/JetBrainsMono.tar.xz -> JetBrainsMono-${PV}.tar.xz ) - lekton? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Lekton.tar.xz -> Lekton-${PV}.tar.xz ) - liberationmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/LiberationMono.tar.xz -> LiberationMono-${PV}.tar.xz ) - lilex? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Lilex.tar.xz -> Lilex-${PV}.tar.xz ) - martianmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/MartianMono.tar.xz -> MartianMono-${PV}.tar.xz ) - meslo? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Meslo.tar.xz -> Meslo-${PV}.tar.xz ) - monaspace? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Monaspace.tar.xz -> Monaspace-${PV}.tar.xz ) - monofur? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Monofur.tar.xz -> Monofur-${PV}.tar.xz ) - monoid? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Monoid.tar.xz -> Monoid-${PV}.tar.xz ) - mononoki? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Mononoki.tar.xz -> Mononoki-${PV}.tar.xz ) - mplus? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/MPlus.tar.xz -> MPlus-${PV}.tar.xz ) - nerdfontssymbolsonly? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/NerdFontsSymbolsOnly.tar.xz -> NerdFontsSymbolsOnly-${PV}.tar.xz ) - noto? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Noto.tar.xz -> Noto-${PV}.tar.xz ) - opendyslexic? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/OpenDyslexic.tar.xz -> OpenDyslexic-${PV}.tar.xz ) - overpass? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Overpass.tar.xz -> Overpass-${PV}.tar.xz ) - profont? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ProFont.tar.xz -> ProFont-${PV}.tar.xz ) - proggyclean? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ProggyClean.tar.xz -> ProggyClean-${PV}.tar.xz ) - robotomono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/RobotoMono.tar.xz -> RobotoMono-${PV}.tar.xz ) - sharetechmono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/ShareTechMono.tar.xz -> ShareTechMono-${PV}.tar.xz ) - sourcecodepro? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/SourceCodePro.tar.xz -> SourceCodePro-${PV}.tar.xz ) - spacemono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/SpaceMono.tar.xz -> SpaceMono-${PV}.tar.xz ) - terminus? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Terminus.tar.xz -> Terminus-${PV}.tar.xz ) - tinos? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Tinos.tar.xz -> Tinos-${PV}.tar.xz ) - ubuntu? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/Ubuntu.tar.xz -> Ubuntu-${PV}.tar.xz ) - ubuntumono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/UbuntuMono.tar.xz -> UbuntuMono-${PV}.tar.xz ) - victormono? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/VictorMono.tar.xz -> VictorMono-${PV}.tar.xz ) -" - -RDEPEND=" - firacode? ( !media-fonts/firacode-nerdfont ) - iosevka? ( !media-fonts/iosevka-nerdfont ) - jetbrainsmono? ( !media-fonts/jetbrainsmono-nerdfont ) - robotomono? ( !media-fonts/robotomono-nerdfont ) - ubuntumono? ( !media-fonts/ubuntumono-nerdfont ) -" - -LICENSE="OFL-1.1" -SLOT="0" -KEYWORDS="~amd64" - -S="${WORKDIR}" -FONT_SUFFIX="ttf" From 7b290faa3669cd7a05c2e43fb5b06e3ef7477269 Mon Sep 17 00:00:00 2001 From: Robert Greener Date: Wed, 3 Apr 2024 19:42:41 +0100 Subject: [PATCH 5/6] dev-java/corretto-bin: New revision 8.402.08.1-r1 Remove faulty use flags Bug: https://bugs.gentoo.org/928434 Signed-off-by: Robert Greener --- .../corretto-bin-8.402.08.1-r1.ebuild | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 dev-java/corretto-bin/corretto-bin-8.402.08.1-r1.ebuild diff --git a/dev-java/corretto-bin/corretto-bin-8.402.08.1-r1.ebuild b/dev-java/corretto-bin/corretto-bin-8.402.08.1-r1.ebuild new file mode 100644 index 0000000000..ff357b12e6 --- /dev/null +++ b/dev-java/corretto-bin/corretto-bin-8.402.08.1-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-vm-2 toolchain-funcs + +MY_PV=${PV/_p/+} +SLOT=$(ver_cut 1) + +SRC_URI=" + https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz +" + +DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services" +HOMEPAGE="https://aws.amazon.com/corretto" +LICENSE="GPL-2-with-classpath-exception" +KEYWORDS="~amd64" +IUSE="cups headless-awt selinux source" + +RDEPEND=" + >=sys-apps/baselayout-java-0.1.0-r1 + kernel_linux? ( + media-libs/fontconfig:1.0 + media-libs/freetype:2 + media-libs/harfbuzz + elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) + elibc_musl? ( sys-libs/musl ) + sys-libs/zlib + cups? ( net-print/cups ) + selinux? ( sec-policy/selinux-java ) + !headless-awt? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + )" + +RESTRICT="preserve-libs splitdebug" +QA_PREBUILT="*" + +S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}/${dest#/}" + + if use headless-awt ; then + rm -v lib/amd64/libjawt.so || die + fi + + if ! use source ; then + rm -v src.zip || die + fi + + dodir "${dest}" + cp -pPR * "${ddest}" || die + + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + + java-vm_install-env "${FILESDIR}"/${PN}-8.env.sh + java-vm_set-pax-markings "${ddest}" + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} + +pkg_postinst() { + java-vm-2_pkg_postinst +} \ No newline at end of file From d4d4a6b4bfa0da8f0c75932edf0840f898bfbe75 Mon Sep 17 00:00:00 2001 From: Robert Greener Date: Wed, 3 Apr 2024 19:43:58 +0100 Subject: [PATCH 6/6] dev-java/corretto-bin: Drop revision 8.402.08.1 Closes: https://bugs.gentoo.org/928434 Signed-off-by: Robert Greener --- .../corretto-bin-8.402.08.1.ebuild | 88 ------------------- 1 file changed, 88 deletions(-) delete mode 100644 dev-java/corretto-bin/corretto-bin-8.402.08.1.ebuild diff --git a/dev-java/corretto-bin/corretto-bin-8.402.08.1.ebuild b/dev-java/corretto-bin/corretto-bin-8.402.08.1.ebuild deleted file mode 100644 index a173e68f37..0000000000 --- a/dev-java/corretto-bin/corretto-bin-8.402.08.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-vm-2 toolchain-funcs - -MY_PV=${PV/_p/+} -SLOT=$(ver_cut 1) - -SRC_URI=" - https://corretto.aws/downloads/resources/${PV}/amazon-corretto-${PV}-linux-x64.tar.gz -" - -DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services" -HOMEPAGE="https://aws.amazon.com/corretto" -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64" -IUSE="alsa cups headless-awt selinux source" - -RDEPEND=" - >=sys-apps/baselayout-java-0.1.0-r1 - kernel_linux? ( - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/harfbuzz - elibc_glibc? ( >=sys-libs/glibc-2.2.5:* ) - elibc_musl? ( sys-libs/musl ) - sys-libs/zlib - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) - )" - -RESTRICT="preserve-libs splitdebug" -QA_PREBUILT="*" - -S="${WORKDIR}/amazon-corretto-${MY_PV}-linux-x64" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}/${dest#/}" - - # prefer system copy # https://bugs.gentoo.org/776676 - rm -vf lib/libharfbuzz.so || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die - fi - - if ! use source ; then - rm -v src.zip || die - fi - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - # provide stable symlink - dosym "${P}" "/opt/${PN}-${SLOT}" - - java-vm_install-env "${FILESDIR}"/${PN}-8.env.sh - java-vm_set-pax-markings "${ddest}" - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter -} - -pkg_postinst() { - java-vm-2_pkg_postinst -} \ No newline at end of file