diff options
Diffstat (limited to 'x11-terms')
58 files changed, 608 insertions, 1022 deletions
diff --git a/x11-terms/alacritty/Manifest b/x11-terms/alacritty/Manifest index f153b19d8d3..4ad265c1454 100644 --- a/x11-terms/alacritty/Manifest +++ b/x11-terms/alacritty/Manifest @@ -1,6 +1,6 @@ DIST ab_glyph_rasterizer-0.1.4.crate 6641 BLAKE2B fc70a45030d969f8af31d1bc3f83069acc014b33cde31817063ab1d40f8caebe12f3896b6a249620a8f2a2d0adc149fcc402f2af25b31ebe223ad0779028d843 SHA512 a942a3b0848386677ed5c651034b001c0e24c7bd101be6a25bfed815310f3a530c8cb9e67e96ea3c36f4d7f09731552f734d5e73f705e3e8f2bf40d5151a7a91 DIST adler32-1.2.0.crate 6411 BLAKE2B 51d44ccfd774158687b8244e83377e40ff896364e3d41e9015665131cc2a176d4ca0ab5a84df027dec0869ee735ee36f5687a06c1d2341de666070cdbab89483 SHA512 8ed72612fb78e213fc92963fdae0508ef26988656c939e6c9cddccbe2658d4a956a8ae934d9658262a8b2687dc446b3f1ee7614128b440487c81e606526dfda3 -DIST alacritty-0.10.0_rc4.tar.gz 1437540 BLAKE2B 097c06f983801cb54b93f66cb33b02d2e11bbbf01c02e95c564b56cf67615c7553643a7134f5c9eab822de930c937c12ebe4fbfee6bc9f1626c32bb4d9d4d2cc SHA512 00d9311b7a2f0982676e90032c432d1fe63ce2e1c9bc7fb353b92a28ee76508bfc2296a7af2c3d17813340a4689748a550bb44b8e828546dfab83f35dc769461 +DIST alacritty-0.10.1.tar.gz 1439045 BLAKE2B 327fbf7158459dbbc6e2a974184daa540e50613503c227ddd39e6deef6a0cb07a172f9277906615032f0557c9f5b6eb0df6fad37e46e329ad8a5c6cfb5095c5d SHA512 1321cfdf1ecc7210511ed84912e0d7a06951e21931c521decd3db8d0c1f50da4e50c01d9b39b4c77ce3a7ce0187f1f81abf3d3edc27388e6ec2e42c6c679f2d6 DIST alacritty-0.9.0.tar.gz 1422571 BLAKE2B 0b9531b92e57e36f86ae2a855c9dca4d3789e21b2ade9df2d22d32b9cf0967748df2acd1c79a1defba4d9eac21b2477550b799e5ffc4f9cb1444793ae9ca36e4 SHA512 17b53a1f98e8435a3ab120e39040c591d96a05d793b78030732f5624e2b717ab6a06c8de67fb25c6a502f3f3064f08a2a3c64cf7a1b7f3f7fda699e7fd95f931 DIST andrew-0.3.1.crate 14030 BLAKE2B 5224eb5a5ad5ba7dd07259a98b8dc04f92154dcc7b5a53c89b4f7fd3c1a12d834093350ce9f7cd69a935d70cff50c0fbc68305eea9f918b334ec1a6e9e979ae2 SHA512 c4fc8903d4c2542c91e7f099d5d9d2b9179ade3f4c3e83ccd8027b06cb582ef700777cf440a07c2478311c1b7c2f7ca64d53fb390f9f5753dcb32491003db8d3 DIST android_glue-0.2.3.crate 1572 BLAKE2B 8404cc69af7d1c9e851e67a69b5b18195388b50924b6a8afc7203bc5101babe9ae007724e552a929947fa9c639eb8ae13cdae0aedbc2d54b0b8d48373f15b7a3 SHA512 16ff1f0e1f50cd120dfbe57d45ebac1725fa75447c964a5b05a1a0565b13b0bc3b6c153edb4a50083ef5d802a889c9f9007e2e21a58dc408f9fb12e9437bd01b diff --git a/x11-terms/alacritty/alacritty-0.10.0_rc4.ebuild b/x11-terms/alacritty/alacritty-0.10.1.ebuild index 42733ab1bde..42733ab1bde 100644 --- a/x11-terms/alacritty/alacritty-0.10.0_rc4.ebuild +++ b/x11-terms/alacritty/alacritty-0.10.1.ebuild diff --git a/x11-terms/aterm/aterm-1.0.1-r4.ebuild b/x11-terms/aterm/aterm-1.0.1-r5.ebuild index 8cad83593e2..6d10a56641e 100644 --- a/x11-terms/aterm/aterm-1.0.1-r4.ebuild +++ b/x11-terms/aterm/aterm-1.0.1-r5.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit flag-o-matic eutils +EAPI=8 DESCRIPTION="rxvt compatible terminal emulator with transparency support" HOMEPAGE="http://aterm.sourceforge.net" @@ -15,9 +13,9 @@ KEYWORDS="amd64" IUSE="background cjk xgetdefault" RDEPEND=" - virtual/jpeg:0 + media-libs/libjpeg-turbo:0= media-libs/libpng:0= - background? ( x11-wm/afterstep ) + background? ( media-libs/libafterimage ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE @@ -27,14 +25,16 @@ DEPEND="${RDEPEND} x11-libs/libXt " -src_prepare() { +PATCHES=( # Security bug #219746 - eapply "${FILESDIR}/${P}-display-security-issue.patch" - eapply "${FILESDIR}"/${P}-deadkeys.patch - eapply "${FILESDIR}/${P}-dpy.patch" - eapply "${FILESDIR}/${P}-remove-streams.patch" + "${FILESDIR}/${P}-display-security-issue.patch" + "${FILESDIR}/${P}-deadkeys.patch" + "${FILESDIR}/${P}-dpy.patch" + "${FILESDIR}/${P}-remove-streams.patch" +) - #fix pre-stripped files +src_prepare() { + # fix pre-stripped files sed -i -e "/INSTALL_PROGRAM/ s:-s::" autoconf/Make.common.in || die "sed Makefile failed" default @@ -56,19 +56,15 @@ src_configure() { econf \ $(use_enable xgetdefault) \ - $(use_enable background background-image) \ + $(use_with background afterimage-config "${EPREFIX}"/usr/bin) \ --with-terminfo="${EPREFIX}"/usr/share/terminfo \ --enable-transparency \ - --enable-fading \ - --enable-background-image \ - --enable-menubar \ - --enable-graphics \ --with-x \ ${myconf} } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install fowners root:utmp /usr/bin/aterm fperms g+s /usr/bin/aterm diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest index 5925d546414..2199c60f8d3 100644 --- a/x11-terms/gnome-terminal/Manifest +++ b/x11-terms/gnome-terminal/Manifest @@ -1,5 +1,3 @@ -DIST gnome-terminal-3.40.1-cntr-ntfy-autottl-ts.patch.xz 33548 BLAKE2B 50952d21a6a5758b500665aed21b95d8b4295240e24ea69dd806321a32338aeb904c60cd7dbb713d3d456bdc9199c7c4b4e2d65bc7078fa9bbf6a7d94c227265 SHA512 0efc106b35c25199ed8d4edc5c36a10a1013e62100c0b3397a5bb04386d7d2f548e811451c8577bc123ffbe935cea2a8f10d08473de5fadc4d07db0f301ab3bc -DIST gnome-terminal-3.40.2.tar.xz 2608032 BLAKE2B 8d7a355623d6eee9f4e3d4ff219dbd12c34987ea1ab1b7dc960c5bf19772d57de3bd81f63ceae61e87e932f05d47208390738dd8df30cbca71d8d0ad5d4b7887 SHA512 d3c75dcf46775492149f98c0c1a9739ac8c8e816487160c1e859034bc8cbcaeb0ff81f7e87e577e248f662db64ee914974bda0cb3e548ab12fb4b431d82af100 -DIST gnome-terminal-3.40.3.tar.xz 2609060 BLAKE2B cc0ef61b2ffbe7dd93117acad6ad2b1f737fb74417c2c84a98cdf3c28d29a7aaeaae4461a0160549eaac8bf9fdc1852e67ffb2e2570b456132bc1726a7033486 SHA512 a4de627f88069f3a1cc69a53dfe4c29ebdd22ee604b0e0b1702dd1c7a14a5fb877968c020bece7f0d5d7dc496019ffef0f9b2d15cb17c80c0a99b331a64f8346 -DIST gnome-terminal-3.42.2-cntr-ntfy-autottl-ts.patch.xz 33980 BLAKE2B e0400f960064907c84a059b2210a9299e353b280e4bbe2fb98a887f9806fc2eb5f7de9d3e6dee243f6297275479ec546d47292bb30ea02e8f4a887fafbe04e71 SHA512 4afab38bff15963e88bc756914b5c379634c68d59f0be1189d969ea0a8b7f3f6c0a077199455cc4c2eca96e5c3df06bddebdc32b786aaba3a885e21cb710f210 -DIST gnome-terminal-3.42.2.tar.xz 1806388 BLAKE2B 9e3068d9731689dd5dc012405384073a6ea07d59370340bcccdc3383e24f5a5424a14b5e903a01b4cca3925758f9b2f5cd7861b30658324297f817807fefbb66 SHA512 001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e +DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187 +DIST gnome-terminal-3.44.0.tar.xz 1810124 BLAKE2B 041aa7400cbf0f075c37f6276d06dbffb0b87da13d8bcb9d13e62b13a1e16ae612970d1ec6462c7c257f7bcf2da222b48df1d8d28ce24b216ae3d11c76f05341 SHA512 0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6 +DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283 diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch new file mode 100644 index 00000000000..aff2237db90 --- /dev/null +++ b/x11-terms/gnome-terminal/files/gnome-terminal-3.44.1-fix-missing-wexitcode.patch @@ -0,0 +1,21 @@ +https://gitlab.gnome.org/GNOME/vte/-/issues/72 +Someone already tried to upstream a similar patch to gnome vte that +would fix this but was rejected by maintainer. More info can be found +on the link above. + +W_EXITCODE is missing in musl thus causing gnome-terminal build to fail. +This patch checks if W_EXITCODE is not defined and then defines it. +--- a/src/terminal.cc ++++ b/src/terminal.cc +@@ -47,6 +47,11 @@ + GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) + #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) + ++/* fix for musl */ ++#ifndef W_EXITCODE ++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++#endif ++ + /* Wait-for-exit helper */ + + typedef struct { diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild deleted file mode 100644 index 5476cb9249a..00000000000 --- a/x11-terms/gnome-terminal/gnome-terminal-3.40.3.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome2 readme.gentoo-r1 - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="debug +gnome-shell +nautilus vanilla" -SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch.xz )" - -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" - -# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960 -RDEPEND=" - >=dev-libs/glib-2.52:2 - >=x11-libs/gtk+-3.22.27:3 - >=x11-libs/vte-0.64.0:2.91[!vanilla?] - >=dev-libs/libpcre2-10 - >=gnome-base/dconf-0.14 - >=gnome-base/gsettings-desktop-schemas-0.1.0 - sys-apps/util-linux - gnome-shell? ( gnome-base/gnome-shell ) - nautilus? ( >=gnome-base/nautilus-3.28.0 ) -" -DEPEND="${RDEPEND}" -# itstool required for help/* with non-en LINGUAS, see bug #549358 -# xmllint required for glib-compile-resources, see bug #549304 -BDEPEND=" - dev-libs/libxml2:2 - dev-libs/libxslt - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -DOC_CONTENTS="To get previous working directory inherited in new opened tab, or - notifications of long-running commands finishing, you will need - to add the following line to your ~/.bashrc:\n - . /etc/profile.d/vte-2.91.sh" - -src_prepare() { - if ! use vanilla; then - # https://bugzilla.gnome.org/show_bug.cgi?id=695371 - # Fedora patches: - # Restore transparency support (with compositing WMs only) - # OSC 777 desktop notification support (notifications on tabs for long-running commands completing) - # Restore "Set title" support - # Automatic title updating based on currently running foreground process - # https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch - # Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE - eapply "${WORKDIR}"/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch - fi - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable debug) \ - $(use_enable gnome-shell search-provider) \ - $(use_with nautilus nautilus-extension) -} - -src_install() { - DOCS=( AUTHORS ChangeLog HACKING NEWS ) - gnome2_src_install - if ! use vanilla; then - # Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal" - insinto /usr/share/glib-2.0/schemas - newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - readme.gentoo_print_elog -} diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild index f134dbb1f61..de2616fb840 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.40.2.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg -inherit gnome2 readme.gentoo-r1 - -DESCRIPTION="The Gnome Terminal" -HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/" +DESCRIPTION="A terminal emulator for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal" LICENSE="GPL-3+" SLOT="0" IUSE="debug +gnome-shell +nautilus vanilla" -SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch.xz )" +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960 RDEPEND=" >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 - >=x11-libs/vte-0.64.0:2.91[!vanilla?] + >=x11-libs/vte-0.68.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 @@ -31,6 +31,7 @@ DEPEND="${RDEPEND}" # itstool required for help/* with non-en LINGUAS, see bug #549358 # xmllint required for glib-compile-resources, see bug #549304 BDEPEND=" + ${PYTHON_DEPS} dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen @@ -55,22 +56,23 @@ src_prepare() { # Automatic title updating based on currently running foreground process # https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch # Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE - eapply "${WORKDIR}"/${PN}-3.40.1-cntr-ntfy-autottl-ts.patch + eapply "${WORKDIR}"/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch fi - gnome2_src_prepare + default } src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable debug) \ - $(use_enable gnome-shell search-provider) \ - $(use_with nautilus nautilus-extension) + local emesonargs=( + $(meson_use debug dbg) + -Ddocs=false + $(meson_use nautilus nautilus_extension) + $(meson_use gnome-shell search_provider) + ) + meson_src_configure } src_install() { - DOCS=( AUTHORS ChangeLog HACKING NEWS ) - gnome2_src_install + meson_src_install if ! use vanilla; then # Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal" insinto /usr/share/glib-2.0/schemas @@ -80,6 +82,12 @@ src_install() { } pkg_postinst() { - gnome2_pkg_postinst + xdg_pkg_postinst + gnome2_schemas_update readme.gentoo_print_elog } + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild index 066ebe755cd..079de738bb0 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg +EAPI=8 +PYTHON_COMPAT=( python3_{8..11} ) +inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg DESCRIPTION="A terminal emulator for GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal" @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/g LICENSE="GPL-3+" SLOT="0" IUSE="debug +gnome-shell +nautilus vanilla" -SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch.xz )" +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ RDEPEND=" >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 - >=x11-libs/vte-0.64.0:2.91[!vanilla?] + >=x11-libs/vte-0.68.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 @@ -31,6 +31,7 @@ DEPEND="${RDEPEND}" # itstool required for help/* with non-en LINGUAS, see bug #549358 # xmllint required for glib-compile-resources, see bug #549304 BDEPEND=" + ${PYTHON_DEPS} dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen @@ -46,6 +47,7 @@ DOC_CONTENTS="To get previous working directory inherited in new opened tab, or . /etc/profile.d/vte-2.91.sh" src_prepare() { + eapply "${FILESDIR}"/${P}-fix-missing-wexitcode.patch if ! use vanilla; then # https://bugzilla.gnome.org/show_bug.cgi?id=695371 # Fedora patches: @@ -55,7 +57,7 @@ src_prepare() { # Automatic title updating based on currently running foreground process # https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch # Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE - eapply "${WORKDIR}"/${PN}-3.42.2-cntr-ntfy-autottl-ts.patch + eapply "${WORKDIR}"/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch fi default } diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest index dfad83dab87..d2205e05ab6 100644 --- a/x11-terms/guake/Manifest +++ b/x11-terms/guake/Manifest @@ -1 +1 @@ -DIST guake-3.8.1.tar.gz 1127132 BLAKE2B e91f74bf119c76ad214b5c29bceb4fe18f19c97f14dbb2973c6118bbb9affc06e919c56e0cd24f96b710d9c2468006289fcf1c13a2050e93cc01972f0c9ebe99 SHA512 5fbf4cc37bc501e4533bd27c1c7e1f783e570457867289702ab2122fcb6a55708df151e4307c4cf84a242ac1d2874ef5e8eb9411318e24eca140102a42b426f4 +DIST guake-3.8.5.tar.gz 1112897 BLAKE2B 221e6a388c3a5904cd20a762e6a669e30b59a742a550e5c2a411534c3b0730c7622f42c67fdc72785fac199c432a297beb9fb53be2b5e2b7545a5b03c2b8b545 SHA512 40605fadb3a0149ea488a7e93f1b7e4f5250f62fe058292f2c02f03f837f22e13171b28c4a9d1a14c2e4897c0066a683cae547e03862397310bc650d149181fb diff --git a/x11-terms/guake/guake-3.8.1.ebuild b/x11-terms/guake/guake-3.8.5.ebuild index c7b0ddb9600..b0161dd6782 100644 --- a/x11-terms/guake/guake-3.8.1.ebuild +++ b/x11-terms/guake/guake-3.8.5.ebuild @@ -4,8 +4,11 @@ EAPI=8 DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 gnome2-utils virtualx xdg-utils +inherit distutils-r1 gnome2-utils plocale virtualx xdg + +PLOCALES="ca cs de el es fa fi fr gl hr hu id it ja ko nb nl pa pl pt_BR ru sv tr uk zh_CN zh_TW" DESCRIPTION="Drop-down terminal for GNOME" HOMEPAGE="http://guake-project.org/" @@ -20,8 +23,7 @@ RDEPEND=" $(python_gen_cond_dep ' dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') + dev-python/pygobject:3[${PYTHON_USEDEP}]') dev-libs/keybinder:3[introspection] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] @@ -29,24 +31,27 @@ RDEPEND=" utempter? ( sys-libs/libutempter )" BDEPEND=" $(python_gen_cond_dep ' - dev-python/pbr[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}] test? ( dev-python/pyfakefs[${PYTHON_USEDEP}] dev-python/pytest-mock[${PYTHON_USEDEP}] - ) - ') + )') dev-libs/glib:2 gnome-base/gsettings-desktop-schemas sys-devel/gettext" distutils_enable_tests pytest -python_prepare_all() { - distutils-r1_python_prepare_all +src_prepare() { + distutils-r1_src_prepare + + export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} # needed with github's tarball - emake PREFIX="${EPREFIX}/usr" prepare-install # paths.py.in -> paths.py + local po=($(plocale_get_locales disabled)) + po=("${po[@]/%/.po}") + (( ! ${#po[@]} )) || rm "${po[@]/#/po/}" || die - export PBR_VERSION=${PV} # needed if using github's tarball + emake PREFIX="${EPREFIX}"/usr prepare-install # paths.py.in -> paths.py } python_test() { @@ -56,27 +61,26 @@ python_test() { } python_install() { - # done here so tests don't use the system's + # use right schema/data dirs, done here so tests don't use the system's sed -e "/^SCHEMA_DIR/s|=.*|= \"${EPREFIX}/usr/share/glib-2.0/schemas\"|" \ -e "/def get_default_data_dir/{n;s|=.*|= \"${EPREFIX}/usr/share/guake\"|}" \ - -i "${BUILD_DIR}"/lib/guake/paths.py || die - rm -r "${BUILD_DIR}"/lib/guake/tests || die + -i "${BUILD_DIR}/install$(python_get_sitedir)"/guake/paths.py || die distutils-r1_python_install } python_install_all() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-{locale,schemas} + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install-{locale,schemas} dodoc NEWS.rst README.rst } pkg_postinst() { + xdg_pkg_postinst gnome2_schemas_update - xdg_desktop_database_update } pkg_postrm() { + xdg_pkg_postrm gnome2_schemas_update - xdg_desktop_database_update } diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest index 0e4fcc8541d..96283c4cadf 100644 --- a/x11-terms/kitty-shell-integration/Manifest +++ b/x11-terms/kitty-shell-integration/Manifest @@ -1 +1 @@ -DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389 +DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6 diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.1.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild index 80e3667e641..e4411a8cbd8 100644 --- a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.24.1.ebuild +++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.25.2.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" RESTRICT="test" # intended to be ran on the full kitty package src_compile() { :; } @@ -31,4 +31,7 @@ src_install() { dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty # zsh integration is handled automatically without needing to modify rc files, # but may require user intervention depending on zsh invocation or if remote + + # this is used internally by the ssh kitten and is not useful there + rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die } diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild index 4bf3e29efd4..c50ecb7f91d 100644 --- a/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild +++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-9999.ebuild @@ -31,4 +31,7 @@ src_install() { dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty # zsh integration is handled automatically without needing to modify rc files, # but may require user intervention depending on zsh invocation or if remote + + # this is used internally by the ssh kitten and is not useful there + rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die } diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest index c98b6b58110..96283c4cadf 100644 --- a/x11-terms/kitty-terminfo/Manifest +++ b/x11-terms/kitty-terminfo/Manifest @@ -1,2 +1 @@ -DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 -DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389 +DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6 diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.24.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.24.1.ebuild deleted file mode 100644 index 35ff98034a8..00000000000 --- a/x11-terms/kitty-terminfo/kitty-terminfo-0.24.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/" -SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz" -S="${WORKDIR}/kitty-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -RESTRICT="test" # intended to be ran on the full kitty package - -BDEPEND="sys-libs/ncurses" - -src_compile() { :; } - -src_install() { - dodir /usr/share/terminfo - tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die -} diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild index 39ccb7d51e9..dc5bddaad25 100644 --- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild +++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.25.2.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/kitty-${PV}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~ppc64 x86" RESTRICT="test" # intended to be ran on the full kitty package BDEPEND="sys-libs/ncurses" diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 007a587a204..866620661c4 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,3 +1,2 @@ -DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 -DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389 -DIST kitty-0.24.1.tar.xz.sig 566 BLAKE2B efff022baff8b16a4b576c1eb1aba83a7a931857850ae2815f54c06d7e9e7110c8bc27f89bec6ba679a4d1df133e1ec13e061cd880dbef02680a2d8021beadf8 SHA512 a2943d1fe20f6c36015db8b9cb8ddef9461fe6503110eb2dce6646afb141b3a3ceb7ab62ec2cbc027d2e2dc2a25c16a207dfc45f619b6464c0ce1995bae54144 +DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6 +DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9 diff --git a/x11-terms/kitty/kitty-0.23.1-r1.ebuild b/x11-terms/kitty/kitty-0.23.1-r1.ebuild deleted file mode 100644 index ee5228eceb6..00000000000 --- a/x11-terms/kitty/kitty-0.23.1-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X debug test wayland" -REQUIRED_USE=" - || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - sys-apps/dbus - sys-libs/zlib:= - x11-libs/libxkbcommon[X?] - x11-misc/xkeyboard-config - ~x11-terms/kitty-terminfo-${PV} - >x11-terms/kitty-terminfo-0.23.1-r0 - X? ( x11-libs/libX11 ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - ${PYTHON_DEPS} - sys-libs/ncurses - virtual/pkgconfig - test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) - wayland? ( dev-util/wayland-scanner )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.23.1-flags.patch -) - -src_prepare() { - default - - sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die - sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \ - -i kitty_tests/check_build.py || die - use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die - - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local setup=( - ${EPYTHON} setup.py - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --update-check-interval=0 - --verbose - $(usev debug --debug) - linux-package - ) - - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" - - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty -} - -pkg_postinst() { - xdg_icon_cache_update - - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick - optfeature "audio-based terminal bell support" media-libs/libcanberra -} diff --git a/x11-terms/kitty/kitty-0.24.1.ebuild b/x11-terms/kitty/kitty-0.25.2.ebuild index 1b783a910a3..b8455230a16 100644 --- a/x11-terms/kitty/kitty-0.24.1.ebuild +++ b/x11-terms/kitty/kitty-0.25.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 toolchain-funcs xdg +inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]] ; then inherit git-r3 @@ -15,7 +15,7 @@ else https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="amd64 ~ppc64 x86" fi DESCRIPTION="Fast, feature-rich, GPU-based terminal" @@ -29,10 +29,10 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE}" RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" +# dlopen: fontconfig,libglvnd RDEPEND=" ${PYTHON_DEPS} media-libs/fontconfig - media-libs/freetype:2 media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] @@ -71,7 +71,9 @@ PATCHES=( src_prepare() { default - sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die + sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ + -e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \ + -i setup.py || die if use !transfer; then sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die @@ -81,6 +83,9 @@ src_prepare() { # test relies on 'who' command which doesn't detect users with pid-sandbox rm kitty_tests/utmp.py || die + # test may fail/hang depending on environment and shell initialization scripts + rm kitty_tests/{shell_integration,ssh}.py || die + # skip docs for live version [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die } @@ -116,12 +121,14 @@ src_install() { insinto /usr doins -r linux-package/. - fperms +x /usr/bin/kitty + fperms +x /usr/bin/kitty \ + /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} } pkg_postinst() { - xdg_icon_cache_update + xdg_pkg_postinst optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick optfeature "audio-based terminal bell support" media-libs/libcanberra + optfeature "opening links from the terminal" x11-misc/xdg-utils } diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 1b783a910a3..531d4fb7df9 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 toolchain-funcs xdg +inherit optfeature multiprocessing python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]] ; then inherit git-r3 @@ -29,10 +29,10 @@ REQUIRED_USE=" ${PYTHON_REQUIRED_USE}" RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" +# dlopen: fontconfig,libglvnd RDEPEND=" ${PYTHON_DEPS} media-libs/fontconfig - media-libs/freetype:2 media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] @@ -71,7 +71,9 @@ PATCHES=( src_prepare() { default - sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die + sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ + -e "/num_workers = /s/=.*/= $(makeopts_jobs)/" \ + -i setup.py || die if use !transfer; then sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die @@ -81,6 +83,9 @@ src_prepare() { # test relies on 'who' command which doesn't detect users with pid-sandbox rm kitty_tests/utmp.py || die + # test may fail/hang depending on environment and shell initialization scripts + rm kitty_tests/{shell_integration,ssh}.py || die + # skip docs for live version [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die } @@ -116,12 +121,14 @@ src_install() { insinto /usr doins -r linux-package/. - fperms +x /usr/bin/kitty + fperms +x /usr/bin/kitty \ + /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} } pkg_postinst() { - xdg_icon_cache_update + xdg_pkg_postinst optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick optfeature "audio-based terminal bell support" media-libs/libcanberra + optfeature "opening links from the terminal" x11-misc/xdg-utils } diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild index af088b2a1eb..ddf348ab3a5 100644 --- a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild +++ b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" fi DESCRIPTION="The MATE Terminal" diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest index f45d3f27e4d..7e221d71d4c 100644 --- a/x11-terms/mlterm/Manifest +++ b/x11-terms/mlterm/Manifest @@ -1 +1,2 @@ DIST mlterm-3.9.1.tar.gz 4175186 BLAKE2B 030d9144e7c835c895269fd19f89ece7c0dae9ca3f1d4425a1d409b9ac78a530431a4e05ef685d178748a35f9fae77414286a38a412a0496433b8324a22a73dd SHA512 1337b884971b2c4c2c3140388f07927101a947b0268f547611f4f4ece49c8d0954c068789ee7c92c82db114021c77c08416db30233149c8964e827ab901cc870 +DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf diff --git a/x11-terms/mlterm/mlterm-3.9.2.ebuild b/x11-terms/mlterm/mlterm-3.9.2.ebuild new file mode 100644 index 00000000000..966f76c450a --- /dev/null +++ b/x11-terms/mlterm/mlterm-3.9.2.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit desktop + +DESCRIPTION="A multi-lingual terminal emulator" +HOMEPAGE="http://mlterm.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="+X bidi brltty cairo debug fbcon fcitx freewnn gtk harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft" +REQUIRED_USE="|| ( X fbcon wayland )" + +RDEPEND="virtual/libcrypt:= + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + ) + bidi? ( dev-libs/fribidi ) + brltty? ( app-accessibility/brltty ) + cairo? ( x11-libs/cairo[X(+)] ) + fbcon? ( media-fonts/unifont ) + fcitx? ( app-i18n/fcitx ) + freewnn? ( app-i18n/freewnn ) + gtk? ( x11-libs/gtk+:3 ) + harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) + ibus? ( app-i18n/ibus ) + libssh2? ( net-libs/libssh2 ) + m17n-lib? ( dev-libs/m17n-lib ) + nls? ( virtual/libintl ) + regis? ( + || ( + media-libs/sdl-ttf + media-libs/sdl2-ttf + ) + ) + scim? ( app-i18n/scim ) + skk? ( + || ( + virtual/skkserv + app-i18n/skk-jisyo + ) + ) + uim? ( app-i18n/uim ) + utempter? ( sys-libs/libutempter ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + ) + xft? ( x11-libs/libXft )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}"/${PN}-font.patch ) +DOCS=( doc/{en,ja} ) + +src_prepare() { + # default config + sed -i \ + -e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \ + -e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \ + etc/main + + default +} + +src_configure() { + local myconf=( + $(use_enable bidi fribidi) + $(use_enable brltty brlapi) + $(use_enable debug) + $(use_enable fcitx) + $(use_enable freewnn wnn) + $(use_enable harfbuzz otl) + $(use_enable ibus) + $(use_enable libssh2 ssh2) + $(use_enable m17n-lib m17nlib) + $(use_enable nls) + $(use_enable scim) + $(use_enable skk) + $(use_enable uim) + $(use_with X x) + --with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "") + --with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "") + --with-utmp=$(usex utempter utempter none) + --enable-optimize-redrawing + --enable-vt52 + --disable-canna + --disable-static + ) + + local scrollbars="sample,extra" + local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom" + if use gtk; then + myconf+=( + --with-gtk=3.0 + --with-imagelib=gdk-pixbuf + ) + scrollbars+=",pixmap_engine" + tools+=",mlconfig,mlimgloader" + else + myconf+=( --without-gtk ) + fi + if use regis; then + tools+=",registobmp" + fi + myconf+=( --with-scrollbars="${scrollbars}" ) + myconf+=( --with-tools="${tools}" ) + + addpredict /dev/ptmx + econf "${myconf[@]}" +} + +src_test() { + : +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + docinto contrib/icon + dodoc contrib/icon/README + + doicon contrib/icon/${PN}* + make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator" +} diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest index 2d8ba1eb896..de82955cc1c 100644 --- a/x11-terms/qterminal/Manifest +++ b/x11-terms/qterminal/Manifest @@ -1 +1,3 @@ DIST qterminal-0.17.0.tar.xz 194332 BLAKE2B bf972608601cd3b4412a95dc4930183655a74d93963f20aadde289eb79d1967737e69d1e25983edc587fb097e1c65c5580dbcdbe79a71aa7f37d62b04819450b SHA512 c5d4ead74feeaec19b917389e7ff6fc4630671deb3442335b8e8c96ec6022c3460343475c95cd40cbaab4c0f813236c23557508b10e26e82ddf1546662f1de57 +DIST qterminal-1.0.0.tar.xz 201644 BLAKE2B e294c575590964710aeb4b433db51844f75fe0f73b966ef5acde148b3f779aa89ae3c5f1d73d3a3877b14d932150702ff871267399cbcab3b4aefc445c942922 SHA512 d3fd04ef94d683aae641367e56185723cf32d2390ab505b956c6736fe674144f6f270ef0def43b1f2d3aec659a2a7735cfb3713da07f49697823f9384572b3a0 +DIST qterminal-1.1.0.tar.xz 209908 BLAKE2B 1ff732f9ae2c84ef063c97679fb4acd1c4b0eb9a981ab99aba689d1f48496fa8721b5b7bfbaae3d7e440e74385d47b4dddb834685f03d2b308a597329af463c1 SHA512 422ba05ebed00ac7f355cd9599f930f861141b9f69ff3e475ac9bb1e74aa02b4787d18fe52c03350dcb3b9b579d67b67d5d4e3b86aa204084d16c1097dc3b291 diff --git a/x11-terms/qterminal/qterminal-1.0.0.ebuild b/x11-terms/qterminal/qterminal-1.0.0.ebuild new file mode 100644 index 00000000000..52947cd89a2 --- /dev/null +++ b/x11-terms/qterminal/qterminal-1.0.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt-based multitab terminal emulator" +HOMEPAGE="https://lxqt-project.org/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +fi + +LICENSE="GPL-2 GPL-2+" +SLOT="0" + +BDEPEND=">=dev-util/lxqt-build-tools-0.10.0" +DEPEND=" + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + x11-libs/libX11 + ~x11-libs/qtermwidget-${PV}:= +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/qterminal-0.16.1-appdata.patch" ) + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-terms/qterminal/qterminal-1.1.0.ebuild b/x11-terms/qterminal/qterminal-1.1.0.ebuild new file mode 100644 index 00000000000..894a3242fa8 --- /dev/null +++ b/x11-terms/qterminal/qterminal-1.1.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt-based multitab terminal emulator" +HOMEPAGE="https://lxqt-project.org/" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" +else + SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2 GPL-2+" +SLOT="0" + +BDEPEND=">=dev-util/lxqt-build-tools-0.11.0" +DEPEND=" + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 + x11-libs/libX11 + ~x11-libs/qtermwidget-${PV}:= +" +RDEPEND="${DEPEND}" + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild index fc217e25da7..894a3242fa8 100644 --- a/x11-terms/qterminal/qterminal-9999.ebuild +++ b/x11-terms/qterminal/qterminal-9999.ebuild @@ -1,38 +1,36 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake xdg-utils DESCRIPTION="Qt-based multitab terminal emulator" -HOMEPAGE="https://lxqt.github.io/" +HOMEPAGE="https://lxqt-project.org/" if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+" SLOT="0" -BDEPEND=">=dev-util/lxqt-build-tools-0.9.0" +BDEPEND=">=dev-util/lxqt-build-tools-0.11.0" DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 x11-libs/libX11 - ~x11-libs/qtermwidget-${PV} + ~x11-libs/qtermwidget-${PV}:= " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-0.16.1-appdata.patch" ) - pkg_postinst() { xdg_icon_cache_update } diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml index 86e310cbd37..6c7c659978a 100644 --- a/x11-terms/roxterm/metadata.xml +++ b/x11-terms/roxterm/metadata.xml @@ -1,15 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ewoud+gentoo@kohlvanwijngaarden.nl</email> - <name>Ewoud Kohl van Wijngaarden</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - + <!-- maintainer-needed --> <upstream> <remote-id type="github">realh/roxterm</remote-id> </upstream> diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index b65012ab176..9def648f873 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -1,4 +1,2 @@ -DIST rxvt-unicode-9.26.tar.bz2 904950 BLAKE2B 1790d02eeadf630cc9bc718288af2f6bd19c3e320d3dbfa44c8cef516c8e790e0abfbfe4e557795749ddd3ec41b8358f6eac623c060240f091b3e84a549151ad SHA512 35560b57730e17c9542ea4a615fd86ce703c4e6421323e8fe1570007737a880fde90d17943e5af9e170be4111b9769f4aa7e57efca5428421fdc1c299112f8e0 -DIST rxvt-unicode-9.26_24-bit-color_aur-20210516+eautoreconf.patch.xz 11716 BLAKE2B 7e18b0f884dbb9574515db8cfb4e1521e1e3287ac194750db288409c7e4d0bb120964e4559ce7e3b91e169935ded93f3af3045fc7c1737a5a6de2710ee2e107b SHA512 8cbcc1c04bdb83996ce08ece559ef9e7f5f530140a2a66291e0ffd049808da60787a68520b4a990dc12e1272de861a85b199ddd10ac8b245eafbfe16dc521199 DIST rxvt-unicode-9.29_24-bit-color_aur-9.26-20210712.patch.xz 7568 BLAKE2B 8ea5d813e00fd4012d145acf70e3d9b0974dddffd203fbec4bf06a0da1c9368ec316fc2903dccae3a5d71d684fd93b2a09ed208f26be1e85f77c702494db4e54 SHA512 baa226ca9adf6025a72dea925ec3be16186502bb4aab21dd61ef1f7c3e2eb793e7a1dc9619ed8228166758daa2879a465da2ace3f3b14545808955388bd2b74b DIST rxvt-unicode-9.30.tar.bz2 877186 BLAKE2B 645164e37e9e484c66f5047836689e4e4727575dfdcbefc64affb70d9110497529fdcc7d476f77737efed5cee4af314e1e1ccbcb42b506bb7e653b827c24a0c7 SHA512 048d5f635a61bc1a739d5cbc09e7a9f77cee18c81df468ce1ff0a62866ced06fc4ec258bb015d2484a7e7bad2339f0bdd79bd824d649c2553a80bdef9f199e99 diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml index fc597b93c84..87501861070 100644 --- a/x11-terms/rxvt-unicode/metadata.xml +++ b/x11-terms/rxvt-unicode/metadata.xml @@ -22,8 +22,6 @@ <flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag> <flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag> <flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag> - <flag name="utmp">Enable utmp support</flag> - <flag name="wtmp">Enable wtmp support</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id> diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild deleted file mode 100644 index 131c98ce2cc..00000000000 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.26-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop systemd prefix - -COLOUR_PATCH_NAME="${PN}-9.26_24-bit-color_aur-20210516+eautoreconf.patch" - -DESCRIPTION="rxvt clone with xft and unicode support" -HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" -SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2 - https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" -IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel - +perl startup-notification unicode3 +utmp +wtmp xft" - -RDEPEND=">=sys-libs/ncurses-5.7-r6:= - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - kernel_Darwin? ( dev-perl/Mac-Pasteboard ) - perl? ( dev-lang/perl:= ) - startup-notification? ( x11-libs/startup-notification ) - xft? ( x11-libs/libXft )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch - "${FILESDIR}"/${PN}-9.21-xsubpp.patch -) -DOCS=( - Changes - README.FAQ - doc/README.xvt - doc/changes.txt - doc/etc/${PN}.term{cap,info} - doc/rxvt-tabbed -) - -src_prepare() { - default - - # Current patch is too aggressive to apply unconditionally, see Bug #801571 - if use 24-bit-color; then - eapply "${WORKDIR}"/${COLOUR_PATCH_NAME} - fi - - # kill the rxvt-unicode terminfo file - #192083 - sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" - - # use xsubpp from Prefix - #506500 - hprefixify -q '"' -w "/xsubpp/" src/Makefile.in -} - -src_configure() { - # --enable-everything goes first: the order of the arguments matters - local myconf=( - --enable-everything - $(use_enable 256-color) - $(use_enable blink text-blink) - $(use_enable fading-colors fading) - $(use_enable font-styles) - $(use_enable gdk-pixbuf pixbuf) - $(use_enable iso14755) - $(use_enable mousewheel) - $(use_enable perl) - $(use_enable startup-notification) - $(use_enable unicode3) - $(use_enable utmp) - $(use_enable wtmp) - $(use_enable xft) - ) - if use 24-bit-color; then - myconf+=( --enable-24-bit-color ) - fi - econf "${myconf[@]}" -} - -src_compile() { - default - - sed -i \ - -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \ - "${S}"/doc/rxvt-tabbed || die -} - -src_install() { - default - - systemd_douserunit "${FILESDIR}"/urxvtd.service - systemd_douserunit "${FILESDIR}"/urxvtd.socket - - make_desktop_entry urxvt rxvt-unicode utilities-terminal \ - "System;TerminalEmulator" -} - -pkg_postinst() { - if use 24-bit-color; then - ewarn - ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE." - ewarn "You may or may not encounter visual glitches or stability issues. When in doubt," - ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)." - ewarn - fi -} diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild index a0b503f4a33..627d10b5c1d 100644 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.30.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,13 +10,16 @@ COLOUR_PATCH_NAME="${PN}-9.29_24-bit-color_aur-9.26-20210712.patch" DESCRIPTION="rxvt clone with xft and unicode support" HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2 - https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz" + https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${COLOUR_PATCH_NAME}.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel - +perl startup-notification unicode3 xft" + perl startup-notification unicode3 xft" + +# Bug #830329 +REQUIRED_USE="perl? ( fading-colors )" RDEPEND=">=sys-libs/ncurses-5.7-r6:= dev-libs/libptytty @@ -25,7 +28,6 @@ RDEPEND=">=sys-libs/ncurses-5.7-r6:= x11-libs/libXrender x11-libs/libXt gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - kernel_Darwin? ( dev-perl/Mac-Pasteboard ) perl? ( dev-lang/perl:= ) startup-notification? ( x11-libs/startup-notification ) xft? ( x11-libs/libXft )" diff --git a/x11-terms/sakura/Manifest b/x11-terms/sakura/Manifest index 7e6ee2bc09f..6263e2f6df9 100644 --- a/x11-terms/sakura/Manifest +++ b/x11-terms/sakura/Manifest @@ -1,2 +1 @@ -DIST sakura-3.8.3.tar.bz2 57773 BLAKE2B 20a7b2823d8e2a494c11b15eac4900b935a7a7c99d5cd67a8470e3441b2e8ff7924dd92c35d188863c9c420dcefbfca8d1dcd9dcff06a77d3cd95f855230c23b SHA512 82e77940b4b4c90948235459a0135e74c5778c3bc1df4e803571b316e6ec6298493468a0c8c2517ca6b1680fcdbba6d0e36c8bad696205e3aa3e5b4f402c2a8e DIST sakura-3.8.4.tar.bz2 70492 BLAKE2B 4f53a86813de49d1f76c0a209a825b19601a22b4078744a0e4dfe21afd000e524a3705e8125b275b3615b35e5e7f38934270baa73d190e06dabf4284d4dab536 SHA512 9450f523555a40c66375304cb4134686dddd1b15233a70e488d1220fbdacd46b8e93cb679bbd1c235cc8d08f08551743b4780130d282d94d258247436a84ed61 diff --git a/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch b/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch deleted file mode 100644 index c9f2c5a85f4..00000000000 --- a/x11-terms/sakura/files/sakura-3.8.3-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,8 +40,2 @@ - --IF (${CMAKE_BUILD_TYPE} MATCHES "Debug") -- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") --ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug") -- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations") --ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") -- - INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS}) -@@ -59,3 +53,2 @@ - ENDIF (POD2MAN) --INSTALL (FILES README.md DESTINATION share/doc/sakura) - diff --git a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch b/x11-terms/sakura/files/sakura-3.8.3-opacity.patch deleted file mode 100644 index 4bb4ba88f18..00000000000 --- a/x11-terms/sakura/files/sakura-3.8.3-opacity.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix regression with opacity not being applied on startup. -https://bugs.launchpad.net/sakura/+bug/1942665 -https://github.com/dabisu/sakura/pull/5 ---- a/src/sakura.c -+++ b/src/sakura.c -@@ -2180,4 +2180,8 @@ - gtk_widget_add_events(sakura.notebook, GDK_SCROLL_MASK); - -+ screen = gtk_widget_get_screen (GTK_WIDGET (sakura.main_window)); -+ GdkVisual *visual = gdk_screen_get_rgba_visual (screen); -+ if (visual != NULL && gdk_screen_is_composited (screen)) -+ gtk_widget_set_visual (GTK_WIDGET (sakura.main_window), visual); - - /*** Command line options initialization ***/ diff --git a/x11-terms/sakura/sakura-3.8.3.ebuild b/x11-terms/sakura/sakura-3.8.3.ebuild deleted file mode 100644 index 717bbf73513..00000000000 --- a/x11-terms/sakura/sakura-3.8.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="GTK/VTE based terminal emulator" -HOMEPAGE="https://www.pleyades.net/david/projects/sakura" -SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~x86-linux" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:3[X] - x11-libs/pango - x11-libs/vte:2.91" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - x11-libs/libX11" -BDEPEND=" - sys-devel/gettext - virtual/perl-podlators" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-opacity.patch -) - -src_prepare() { - cmake_src_prepare - - if [[ -v LINGUAS ]]; then - local lingua - for lingua in po/*.po; do - lingua=${lingua#*/} - lingua=${lingua%.*} - has ${lingua} ${LINGUAS} || rm po/${lingua}.po || die - done - fi -} diff --git a/x11-terms/sakura/sakura-3.8.4.ebuild b/x11-terms/sakura/sakura-3.8.4.ebuild index e5eb80e686b..ffbb0678d52 100644 --- a/x11-terms/sakura/sakura-3.8.4.ebuild +++ b/x11-terms/sakura/sakura-3.8.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/sakura/trunk/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-linux" +KEYWORDS="amd64 x86 ~x86-linux" RDEPEND=" dev-libs/glib:2 diff --git a/x11-terms/terminator/terminator-2.1.1-r1.ebuild b/x11-terms/terminator/terminator-2.1.1-r1.ebuild new file mode 100644 index 00000000000..e6ed9f78c84 --- /dev/null +++ b/x11-terms/terminator/terminator-2.1.1-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +inherit distutils-r1 optfeature verify-sig virtualx xdg + +DESCRIPTION="Multiple GNOME terminals in one window" +HOMEPAGE="https://github.com/gnome-terminator/terminator" +SRC_URI=" + https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz.asc ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ~riscv x86" +IUSE="test" + +RDEPEND=" + dev-libs/glib:2 + dev-python/configobj[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + gnome-base/gsettings-desktop-schemas[introspection] + x11-libs/gtk+:3 + x11-libs/vte:2.91[introspection] +" +BDEPEND=" + dev-util/intltool + sys-devel/gettext + test? ( + dev-python/dbus-python[${PYTHON_USEDEP}] + x11-libs/libnotify[introspection] + ) + verify-sig? ( sec-keys/openpgp-keys-terminator ) +" +distutils_enable_tests pytest + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/terminator.asc + +PATCHES=( + "${FILESDIR}"/terminator-1.91-without-icon-cache.patch + "${FILESDIR}"/terminator-1.91-desktop.patch +) + +src_prepare() { + xdg_environment_reset + sed -i -e '/pytest-runner/d' setup.py || die + distutils-r1_src_prepare +} + +src_test() { + virtx distutils-r1_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "D-Bus" dev-python/dbus-python + optfeature "desktop notifications" "x11-libs/libnotify[introspection]" + optfeature "global keyboard shortcuts" "dev-libs/keybinder:3[introspection]" +} diff --git a/x11-terms/terminology/terminology-1.12.1-r1.ebuild b/x11-terms/terminology/terminology-1.12.1-r1.ebuild index 701ba06d6ca..7ae281d7342 100644 --- a/x11-terms/terminology/terminology-1.12.1-r1.ebuild +++ b/x11-terms/terminology/terminology-1.12.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit meson python-any-r1 xdg @@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/terminology/${P}.tar.xz htt LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="extras nls" RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest index d3c3f650a47..61d79a84567 100644 --- a/x11-terms/tilda/Manifest +++ b/x11-terms/tilda/Manifest @@ -1 +1,2 @@ DIST tilda-1.5.2.tar.gz 485261 BLAKE2B 2ce0059ad695ac3e920cf8e40841b850967ff1e05b88a1c527b7154112c88a3435b66d0f31b882b6fdaf0dee038b7a7e6ab0401184ab701bed8d23d44a2856d8 SHA512 5f950696626005d6f8711fe1403313b36f065796ac07946e9782997aaf67a4bfdb3bfa5e37889bff95d77655d3546100a48327bfa175aa24c39a28685ee0306a +DIST tilda-1.5.4.tar.gz 485611 BLAKE2B beced68e0712fdc3f4f46a1d839a87e91ecf7e84dec500908efa510d7b43d0c0bf6b5e296c3df255ea462cf08f5107aa324d5a0a6abb134917a054366912a068 SHA512 6982a14a89d148c04e08df0c7566ea7b3e340252fa1a3e434450443f7464e6805caee46afda9b385633a4b9c22d2f2d283641082a1e009f301c3a1bf508c3b29 diff --git a/x11-terms/tilda/tilda-1.5.4.ebuild b/x11-terms/tilda/tilda-1.5.4.ebuild new file mode 100644 index 00000000000..8a62f1c1038 --- /dev/null +++ b/x11-terms/tilda/tilda-1.5.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters" +HOMEPAGE="https://github.com/lanoxx/tilda" +SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="x11-libs/vte:2.91 + >=dev-libs/glib-2.8.4:2 + dev-libs/confuse:= + gnome-base/libglade + x11-libs/gtk+:3 + x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + sys-devel/gettext" + +S="${WORKDIR}/${PN}-${P}" + +src_prepare() { + default + append-cflags -std=c99 + eautoreconf +} diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest index 8fceacf7ca3..bf38604af8a 100644 --- a/x11-terms/xfce4-terminal/Manifest +++ b/x11-terms/xfce4-terminal/Manifest @@ -1,3 +1,3 @@ -DIST xfce4-terminal-0.8.10.tar.bz2 978071 BLAKE2B a74f6037b3ea28ac5561e7251368c0e039a43af1968abab86c44fee5575d1fe9c61b3521be156b48bd7084f7169fdcd9757cb6bfe0c99b539bcb865e9150e358 SHA512 92310837445adf3b611c069d28abea05650b93d54500c0436fb90e0a9be8846122d6ca69f8e6f89a11f2067dc4bfae5557bb11af48d62135b2e5eb395ccdb0f4 -DIST xfce4-terminal-0.9.0.tar.bz2 1006628 BLAKE2B a96d661a38865af67119729ce0d401f2b08a43ed3ade891fc65756b007b40b43485d4fdad83529323984a6c9f6df4ea7548c9bcbadf7ec25dce97add5d0f0592 SHA512 c431cc3ba93695683301d4a742758ad26994d892d00f394d166315b62a70d00c04e32752fa478b9afbf5642916a0da9470ea22079f9698fbb8455f45f05e2453 -DIST xfce4-terminal-0.9.1.tar.bz2 1017371 BLAKE2B fd15c6994de5584e8153004dc20cb66ae16a94092d2ecaef8d576f51a1a0767b1a1ba3d5e1d677e5b56c5888e16f054900e0bf8028c881aa49425808830aa3f9 SHA512 0481db0ba300737a955b1f3fe3269315c3b6852ef574c24a4ecd72714d73e0cdf39eea5be4cbac2df3f5030e22455467c92455284a0dba1f0471376aee42f318 +DIST xfce4-terminal-1.0.2.tar.bz2 1001720 BLAKE2B c3759f5199da51ffae3bcacb0c1cfcfd54d9c4e11f52c7681ca335042164a0311990174defc0ef82cbb3aea6e6cf89400dd9de4406e3843d17f5da8e7ed048fe SHA512 0ac33e01b2975c2ab4cc6078075ba83a77c260ea914e89d1dce8393c307aa4956f0cb0db13c3ecff0bec7659d33e02834343211852787a691b61a19d40a0c757 +DIST xfce4-terminal-1.0.3.tar.bz2 1000750 BLAKE2B 7d8f39725619f9c67b671a0ba3f358c448e53b47d8454233ab97c31735a64d6050e180d1612cbaa9cddf619daf9b12dbb77d97e0737f81337ffe5cb5d9303e4a SHA512 b9d93c3def9cd1237b985ee95664e210595f450e78b9e23fd5928d66cd978fca38db8be1e3c2968b6cb9a8abb5ab978975eed6b8afa3b49509fecf16b66580d3 +DIST xfce4-terminal-1.0.4.tar.bz2 1009367 BLAKE2B 48a618f8ea98ad0408d8e54d4489358874e9e0e3c6a7011f298d0fed21512783258598cc59013c7406128e68d7311ddf64fdb13f9517306a819db50edc0555cc SHA512 76ea8f296fe1c128dc70d8aabf23447300ba83405d52e844abec89049968bac51fe47fd7545a76e4a421275c6a2f230f326ed3a25083bf536f17fc3218b05fce diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.2.ebuild index 4f057f1b94b..8faf23b0abf 100644 --- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.10.ebuild +++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit xdg-utils @@ -14,19 +14,24 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="utempter" -RDEPEND=">=dev-libs/glib-2.42:2= +RDEPEND=" + >=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= - >=x11-libs/vte-0.46:2.91= - >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] - >=xfce-base/xfconf-4.14:= - utempter? ( sys-libs/libutempter:= )" -DEPEND="${RDEPEND}" + >=x11-libs/vte-0.51.3:2.91= + >=xfce-base/libxfce4ui-4.16:=[gtk3(+)] + >=xfce-base/xfconf-4.16:= + utempter? ( sys-libs/libutempter:= ) +" +DEPEND=" + ${RDEPEND} +" BDEPEND=" dev-libs/libxml2 dev-util/intltool sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" src_configure() { local myconf=( diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.3.ebuild index 182386ffe3a..515d1165885 100644 --- a/x11-terms/xfce4-terminal/xfce4-terminal-0.9.0.ebuild +++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,19 +14,24 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="utempter" -RDEPEND=">=dev-libs/glib-2.42:2= +RDEPEND=" + >=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= - >=x11-libs/vte-0.46:2.91= - >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] - >=xfce-base/xfconf-4.14:= - utempter? ( sys-libs/libutempter:= )" -DEPEND="${RDEPEND}" + >=x11-libs/vte-0.51.3:2.91= + >=xfce-base/libxfce4ui-4.16:=[gtk3(+)] + >=xfce-base/xfconf-4.16:= + utempter? ( sys-libs/libutempter:= ) +" +DEPEND=" + ${RDEPEND} +" BDEPEND=" dev-libs/libxml2 dev-util/intltool sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" src_configure() { local myconf=( diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.9.1.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild index 182386ffe3a..515d1165885 100644 --- a/x11-terms/xfce4-terminal/xfce4-terminal-0.9.1.ebuild +++ b/x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,19 +14,24 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" IUSE="utempter" -RDEPEND=">=dev-libs/glib-2.42:2= +RDEPEND=" + >=dev-libs/glib-2.42:2= >=x11-libs/gtk+-3.22:3= x11-libs/libX11:= - >=x11-libs/vte-0.46:2.91= - >=xfce-base/libxfce4ui-4.14:=[gtk3(+)] - >=xfce-base/xfconf-4.14:= - utempter? ( sys-libs/libutempter:= )" -DEPEND="${RDEPEND}" + >=x11-libs/vte-0.51.3:2.91= + >=xfce-base/libxfce4ui-4.16:=[gtk3(+)] + >=xfce-base/xfconf-4.16:= + utempter? ( sys-libs/libutempter:= ) +" +DEPEND=" + ${RDEPEND} +" BDEPEND=" dev-libs/libxml2 dev-util/intltool sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" src_configure() { local myconf=( diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest index e4f4411385e..65588746f27 100644 --- a/x11-terms/xterm/Manifest +++ b/x11-terms/xterm/Manifest @@ -1,5 +1 @@ -DIST xterm-366.tgz 1445992 BLAKE2B 4724851b84ae0682b39e5f1b070ba9f04c627511aa20a5b1c76e740666e14436a0095d8a1be4f6ad54eb1e5d841ef766b0bf4d840ebddcaea0889285f1377900 SHA512 ffab7e0970b92a25488bd57da2dfe2856279208c489a632e0e92788deec2a4f99510f76e1c88e55f389dfe984c323add0fab31b04d2a1d774ce6d3b2c9c642ef -DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4 -DIST xterm-368.tgz 1451700 BLAKE2B 3fe939b8248e8839ba8b73b0971ab380e5f6528f51bd1993cc26d53755177fd5537cdbf2044f7fedad20663b3a7b42bc7f8b1c138233d44eb91472840f8448e1 SHA512 ea2f27722795c47a406cf4956ecdd05bae19aee621a0183aa167d188a90767a859ce41c6d1b1352b5ebd94d920360d3f26248ec0bb2068c253583d460baeafda -DIST xterm-369.tgz 1461310 BLAKE2B 0b807b07c71af39df6b38b16b45f8f24a77e00bf41243c1109cf25c7ff448729b0ed64d62a99e954e0939e4f8ac6298afdc61b4098cf489eadbef55940e0f277 SHA512 b574e75e8bc7918f6e637534a39ebbc72cfbc74e4ff3e2b914962722b9c6e60adee49d74ebe1e778bcb35556e04098baa4465d1694fde61fbcca6434e6e706a7 -DIST xterm-370.tgz 1500208 BLAKE2B 973cda2511e761be64332746f004ed9ea716c8f5b7065cef2ef60d789e6186138b671920f23135b5c66d3226ce17c1d195db456350c94f5f0973e29610896b1a SHA512 24f1836c4f5aec175c45db77e9bc829b45ee2c93cf12c20252b22bee470392ef0637cfbbb6e90074b1c038ac023f74a4fb713bbd4abf2b5b86d064667caf38dd +DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf diff --git a/x11-terms/xterm/xterm-366.ebuild b/x11-terms/xterm/xterm-366.ebuild deleted file mode 100644 index 99c8680dc55..00000000000 --- a/x11-terms/xterm/xterm-366.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop flag-o-matic toolchain-funcs - -DESCRIPTION="Terminal Emulator for X Windows" -HOMEPAGE="https://invisible-island.net/xterm/" -SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama" - -BDEPEND="virtual/pkgconfig - x11-base/xorg-proto" -DEPEND=" - kernel_linux? ( sys-libs/libutempter ) - media-libs/fontconfig:1.0 - >=sys-libs/ncurses-5.7-r7:0= - x11-apps/xmessage - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXft - x11-libs/libxkbfile - x11-libs/libXmu - x11-libs/libXrender - x11-libs/libXt - unicode? ( x11-apps/luit ) - Xaw3d? ( x11-libs/libXaw3d ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${DEPEND} - media-fonts/font-misc-misc - x11-apps/rgb" - -DOCS=( README{,.i18n} ctlseqs.txt ) - -pkg_setup() { - DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults -} - -src_configure() { - # 454736 - # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using - # something sane like pkg-config or ncurses5-config and stops guessing libs - # Everything gets linked against ncurses anyways, so don't shout - append-libs $($(tc-getPKG_CONFIG) --libs ncurses) - - local myeconfargs=( - --disable-full-tgetent - --disable-imake - --disable-setgid - --disable-setuid - --enable-256-color - --enable-broken-osc - --enable-broken-st - --enable-dabbrev - --enable-exec-xterm - --enable-i18n - --enable-load-vt-fonts - --enable-logging - --enable-screen-dumps - --enable-warnings - --enable-wide-chars - --libdir="${EPREFIX}"/etc - --with-app-defaults="${DEFAULTS_DIR}" - --with-utempter - --with-x - $(use_enable openpty) - $(use_enable sixel sixel-graphics) - $(use_enable toolbar) - $(use_enable truetype freetype) - $(use_enable unicode luit) - $(use_enable unicode mini-luit) - $(use_with Xaw3d) - $(use_with xinerama) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - docinto html - dodoc xterm.log.html - domenu *.desktop - - # Fix permissions -- it grabs them from live system, and they can - # be suid or sgid like they were in pre-unix98 pty or pre-utempter days, - # respectively (#69510). - # (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org> - fperms 0755 /usr/bin/xterm - - # restore the navy blue - sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die -} diff --git a/x11-terms/xterm/xterm-367.ebuild b/x11-terms/xterm/xterm-367.ebuild deleted file mode 100644 index 99c8680dc55..00000000000 --- a/x11-terms/xterm/xterm-367.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop flag-o-matic toolchain-funcs - -DESCRIPTION="Terminal Emulator for X Windows" -HOMEPAGE="https://invisible-island.net/xterm/" -SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama" - -BDEPEND="virtual/pkgconfig - x11-base/xorg-proto" -DEPEND=" - kernel_linux? ( sys-libs/libutempter ) - media-libs/fontconfig:1.0 - >=sys-libs/ncurses-5.7-r7:0= - x11-apps/xmessage - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXft - x11-libs/libxkbfile - x11-libs/libXmu - x11-libs/libXrender - x11-libs/libXt - unicode? ( x11-apps/luit ) - Xaw3d? ( x11-libs/libXaw3d ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${DEPEND} - media-fonts/font-misc-misc - x11-apps/rgb" - -DOCS=( README{,.i18n} ctlseqs.txt ) - -pkg_setup() { - DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults -} - -src_configure() { - # 454736 - # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using - # something sane like pkg-config or ncurses5-config and stops guessing libs - # Everything gets linked against ncurses anyways, so don't shout - append-libs $($(tc-getPKG_CONFIG) --libs ncurses) - - local myeconfargs=( - --disable-full-tgetent - --disable-imake - --disable-setgid - --disable-setuid - --enable-256-color - --enable-broken-osc - --enable-broken-st - --enable-dabbrev - --enable-exec-xterm - --enable-i18n - --enable-load-vt-fonts - --enable-logging - --enable-screen-dumps - --enable-warnings - --enable-wide-chars - --libdir="${EPREFIX}"/etc - --with-app-defaults="${DEFAULTS_DIR}" - --with-utempter - --with-x - $(use_enable openpty) - $(use_enable sixel sixel-graphics) - $(use_enable toolbar) - $(use_enable truetype freetype) - $(use_enable unicode luit) - $(use_enable unicode mini-luit) - $(use_with Xaw3d) - $(use_with xinerama) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - docinto html - dodoc xterm.log.html - domenu *.desktop - - # Fix permissions -- it grabs them from live system, and they can - # be suid or sgid like they were in pre-unix98 pty or pre-utempter days, - # respectively (#69510). - # (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org> - fperms 0755 /usr/bin/xterm - - # restore the navy blue - sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die -} diff --git a/x11-terms/xterm/xterm-368.ebuild b/x11-terms/xterm/xterm-368.ebuild deleted file mode 100644 index b29486ec821..00000000000 --- a/x11-terms/xterm/xterm-368.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop flag-o-matic toolchain-funcs - -DESCRIPTION="Terminal Emulator for X Windows" -HOMEPAGE="https://invisible-island.net/xterm/" -SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama" - -BDEPEND="virtual/pkgconfig - x11-base/xorg-proto" -DEPEND=" - kernel_linux? ( sys-libs/libutempter ) - media-libs/fontconfig:1.0 - >=sys-libs/ncurses-5.7-r7:0= - x11-apps/xmessage - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXft - x11-libs/libxkbfile - x11-libs/libXmu - x11-libs/libXrender - x11-libs/libXt - unicode? ( x11-apps/luit ) - Xaw3d? ( x11-libs/libXaw3d ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${DEPEND} - media-fonts/font-misc-misc - x11-apps/rgb" - -DOCS=( README{,.i18n} ctlseqs.txt ) - -pkg_setup() { - DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults -} - -src_configure() { - # 454736 - # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using - # something sane like pkg-config or ncurses5-config and stops guessing libs - # Everything gets linked against ncurses anyways, so don't shout - append-libs $($(tc-getPKG_CONFIG) --libs ncurses) - - local myeconfargs=( - --disable-full-tgetent - --disable-imake - --disable-setgid - --disable-setuid - --enable-256-color - --enable-broken-osc - --enable-broken-st - --enable-dabbrev - --enable-exec-xterm - --enable-i18n - --enable-load-vt-fonts - --enable-logging - --enable-screen-dumps - --enable-warnings - --enable-wide-chars - --libdir="${EPREFIX}"/etc - --with-app-defaults="${DEFAULTS_DIR}" - --with-utempter - --with-x - $(use_enable openpty) - $(use_enable sixel sixel-graphics) - $(use_enable toolbar) - $(use_enable truetype freetype) - $(use_enable unicode luit) - $(use_enable unicode mini-luit) - $(use_with Xaw3d) - $(use_with xinerama) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - docinto html - dodoc xterm.log.html - domenu *.desktop - - # Fix permissions -- it grabs them from live system, and they can - # be suid or sgid like they were in pre-unix98 pty or pre-utempter days, - # respectively (#69510). - # (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org> - fperms 0755 /usr/bin/xterm - - # restore the navy blue - sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die -} diff --git a/x11-terms/xterm/xterm-370.ebuild b/x11-terms/xterm/xterm-370.ebuild deleted file mode 100644 index 57e07cc5fdd..00000000000 --- a/x11-terms/xterm/xterm-370.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop flag-o-matic toolchain-funcs - -DESCRIPTION="Terminal Emulator for X Windows" -HOMEPAGE="https://invisible-island.net/xterm/" -SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama" - -BDEPEND="virtual/pkgconfig - x11-base/xorg-proto" -DEPEND=" - kernel_linux? ( sys-libs/libutempter ) - media-libs/fontconfig:1.0 - >=sys-libs/ncurses-5.7-r7:0= - x11-apps/xmessage - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXft - x11-libs/libxkbfile - x11-libs/libXmu - x11-libs/libXrender - x11-libs/libXt - unicode? ( x11-apps/luit ) - Xaw3d? ( x11-libs/libXaw3d ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${DEPEND} - media-fonts/font-misc-misc - x11-apps/rgb" - -DOCS=( README{,.i18n} ctlseqs.txt ) - -pkg_setup() { - DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults -} - -src_configure() { - # 454736 - # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using - # something sane like pkg-config or ncurses5-config and stops guessing libs - # Everything gets linked against ncurses anyways, so don't shout - append-libs $($(tc-getPKG_CONFIG) --libs ncurses) - - local myeconfargs=( - --disable-full-tgetent - --disable-imake - --disable-setgid - --disable-setuid - --enable-256-color - --enable-broken-osc - --enable-broken-st - --enable-dabbrev - --enable-exec-xterm - --enable-i18n - --enable-load-vt-fonts - --enable-logging - --enable-screen-dumps - --enable-warnings - --enable-wide-chars - --libdir="${EPREFIX}"/etc - --with-app-defaults="${DEFAULTS_DIR}" - --with-utempter - --with-x - $(use_enable openpty) - $(use_enable sixel sixel-graphics) - $(use_enable toolbar) - $(use_enable truetype freetype) - $(use_enable unicode luit) - $(use_enable unicode mini-luit) - $(use_with Xaw3d) - $(use_with xinerama) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - docinto html - dodoc xterm.log.html - domenu *.desktop - - # Fix permissions -- it grabs them from live system, and they can - # be suid or sgid like they were in pre-unix98 pty or pre-utempter days, - # respectively (#69510). - # (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org> - fperms 0755 /usr/bin/xterm - - # restore the navy blue - sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die -} diff --git a/x11-terms/xterm/xterm-369.ebuild b/x11-terms/xterm/xterm-372.ebuild index 57e07cc5fdd..c17106412ab 100644 --- a/x11-terms/xterm/xterm-369.ebuild +++ b/x11-terms/xterm/xterm-372.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop flag-o-matic toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama" BDEPEND="virtual/pkgconfig @@ -38,12 +38,10 @@ RDEPEND="${DEPEND} DOCS=( README{,.i18n} ctlseqs.txt ) -pkg_setup() { +src_configure() { DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults -} -src_configure() { - # 454736 + # bug #454736 # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using # something sane like pkg-config or ncurses5-config and stops guessing libs # Everything gets linked against ncurses anyways, so don't shout @@ -78,6 +76,7 @@ src_configure() { $(use_with Xaw3d) $(use_with xinerama) ) + econf "${myeconfargs[@]}" } diff --git a/x11-terms/zutty/Manifest b/x11-terms/zutty/Manifest index 6c7979a79c5..b6740d9b697 100644 --- a/x11-terms/zutty/Manifest +++ b/x11-terms/zutty/Manifest @@ -1,2 +1,2 @@ -DIST zutty-0.10.tar.gz 336599 BLAKE2B 0041bbbc268ff042bac6bea1984ebf05d958f622b4c2e736bfe3d18e3a224238f27a7ef9920b8f7bc820705ce7560f20819650ec27fb3e5fc13dbef76fc6d0af SHA512 f499fb499779f8b5936a03c48e3c042f5fa0f0c99d3b24a4c9b963c2df8151561ac82456625d768e65f75aea641539a036300f1f99404eecfd15a0a25aeb6779 -DIST zutty-0.9.tar.gz 336534 BLAKE2B 61d2ae02e2c0b08a9c536190f61f14300b0cd1bacb83f5da33e92a6c8502df6adda72805e58f3d679c7258c30338178b4488c0f7bfbfaf8b5e922401e6442427 SHA512 590cf090c0d80e683d4473828cdb8bbe4f60bc5bc3c5e9e63039a59757e281ecefc774709f08777fe36ab596fb102f392c8bf643449e62914e5b88d0ebc728c0 +DIST zutty-0.11.tar.gz 343469 BLAKE2B 9cd040e72d0ea76a526d099265b3a0974d40b1b8b679ff3baafc47f827b140943ac8bc13676831245e219ca1335ded7aca1e7826baf175fc63e88012791785e1 SHA512 84e8402a310adc80c698ded38fa3eb8ba44034f391e2538bccbdbc4082e239dc0d6ceb20504eeab4e5d2499ded55ef0941ae2e5d07eeb809d1059e5449cdb708 +DIST zutty-0.12.tar.gz 348226 BLAKE2B 8d065928fe3e8049e63f1e679d4e8d2ef6643b01b098698594d536c6fa9494a2a934dce3e4fe60594be4f1b56691a83a8e7fab0dd1ec6c09e12eeb1e69354f5e SHA512 d10289a51469ec6352a5b1feefb732dce7cf507b02ce57e64f8f65443f4533b8d61f357dec92cb00b58386416470928d763290a6d4ff714f65f98f1f09d60083 diff --git a/x11-terms/zutty/files/zutty-0.11-cxxflags.patch b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch new file mode 100644 index 00000000000..19b6649bb56 --- /dev/null +++ b/x11-terms/zutty/files/zutty-0.11-cxxflags.patch @@ -0,0 +1,27 @@ +From 06927a1f2f88bd9d5f4bb8056661ffbc4a0aeb77 Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matt@offtopica.uk> +Date: Wed, 19 Jan 2022 18:07:55 +0000 +Subject: [PATCH] Remove default CXXFLAGS and LINKFLAGS + +--- + wscript | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/wscript b/wscript +index d2bfbc8..b38b50b 100644 +--- a/wscript ++++ b/wscript +@@ -69,10 +69,6 @@ def configure(cfg): + ['-DDEBUG', '-Og', '-g', '-ggdb']) + else: + cfg.env.target = 'zutty' +- cfg.env.append_value('CXXFLAGS', +- ['-Werror', '-O3', '-march=native', '-mtune=native', '-flto']) +- cfg.env.append_value('LINKFLAGS', +- ['-flto']) + + cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'], + uselib_store='FT') +-- +2.34.1 + diff --git a/x11-terms/zutty/files/zutty-0.12-cxxflags.patch b/x11-terms/zutty/files/zutty-0.12-cxxflags.patch new file mode 100644 index 00000000000..11b3066e50b --- /dev/null +++ b/x11-terms/zutty/files/zutty-0.12-cxxflags.patch @@ -0,0 +1,27 @@ +From 06927a1f2f88bd9d5f4bb8056661ffbc4a0aeb77 Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matt@offtopica.uk> +Date: Wed, 19 Jan 2022 18:07:55 +0000 +Subject: [PATCH] Remove default CXXFLAGS and LINKFLAGS + +--- + wscript | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/wscript b/wscript +index d2bfbc8..b38b50b 100644 +--- a/wscript ++++ b/wscript +@@ -69,10 +69,6 @@ def configure(cfg): + ['-DDEBUG', '-Og', '-g', '-ggdb']) + else: + cfg.env.target = 'zutty' +- cfg.env.append_value('CXXFLAGS', +- ['-Werror', '-O3', '-flto']) +- cfg.env.append_value('LINKFLAGS', +- ['-flto']) + + cfg.check_cfg(package='freetype2', args=['--cflags', '--libs'], + uselib_store='FT') +-- +2.34.1 + diff --git a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch b/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch deleted file mode 100644 index b5d62204e6b..00000000000 --- a/x11-terms/zutty/files/zutty-0.9-freetype-2.11.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c73c99d6b024047d9f9e53e263be56093b6bf986 Mon Sep 17 00:00:00 2001 -From: Matt Smith <matt@offtopica.uk> -Date: Sun, 29 Aug 2021 19:15:01 +0100 -Subject: [PATCH] Prevent rendering glyphs twice - -Characters are loaded with FT_LOAD_RENDER. Calling FT_Render_Glyph -again causes an error in Freetype 2.11.0 and later. - -Thanks to Stephan Hartmann <sultan@gentoo.org> for debugging and creating initial patch. - -Bug: https://bugs.gentoo.org/809611 ---- - src/font.cc | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/font.cc b/src/font.cc -index f8da582..350a1a6 100644 ---- a/src/font.cc -+++ b/src/font.cc -@@ -255,12 +255,6 @@ namespace zutty - std::to_string (c)); - } - -- if (FT_Render_Glyph (face->glyph, FT_RENDER_MODE_NORMAL)) -- throw std::runtime_error ( -- std::string ("FreeType: Failed to render glyph for char ") + -- std::to_string (c)); -- -- - // destination pixel offset - const unsigned int dx = face->glyph->bitmap_left > 0 - ? face->glyph->bitmap_left : 0; --- -2.33.0 - diff --git a/x11-terms/zutty/metadata.xml b/x11-terms/zutty/metadata.xml index 6e6c2928381..081fbf57c87 100644 --- a/x11-terms/zutty/metadata.xml +++ b/x11-terms/zutty/metadata.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>matt@offtopica.uk</email> - <name>Matt Smith</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> </maintainer> <longdescription lang="en"> Zutty is a terminal emulator for the X Window System, functionally diff --git a/x11-terms/zutty/zutty-0.9-r1.ebuild b/x11-terms/zutty/zutty-0.11.ebuild index cdf1da5f9cd..382faeb02b3 100644 --- a/x11-terms/zutty/zutty-0.9-r1.ebuild +++ b/x11-terms/zutty/zutty-0.11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) PYTHON_REQ_USE="threads(+)" inherit python-any-r1 waf-utils @@ -16,9 +16,15 @@ LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64" +# It is possible to run the tests using virtualx, but it seems to take +# screenshots of the terminal window, and compares checksums that never +# seem to match. +RESTRICT="test" + RDEPEND=" media-libs/freetype:2 - media-libs/libglvnd[X] + virtual/opengl + x11-libs/libX11 x11-libs/libXmu " DEPEND="${RDEPEND}" @@ -28,8 +34,8 @@ BDEPEND=" " PATCHES=( - # Bug 809611 - "${FILESDIR}"/${PN}-0.9-freetype-2.11.0.patch + # Remove default CXX/LDFLAGS, bug #830405. + "${FILESDIR}"/${PN}-0.11-cxxflags.patch ) DOCS=( doc/KEYS.org doc/USAGE.org ) diff --git a/x11-terms/zutty/zutty-0.10.ebuild b/x11-terms/zutty/zutty-0.12.ebuild index cc6a1b77922..10690f8057c 100644 --- a/x11-terms/zutty/zutty-0.10.ebuild +++ b/x11-terms/zutty/zutty-0.12.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) PYTHON_REQ_USE="threads(+)" inherit python-any-r1 waf-utils @@ -14,11 +14,17 @@ SRC_URI="https://github.com/tomszilagyi/zutty/archive/refs/tags/${PV}.tar.gz -> LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" + +# It is possible to run the tests using virtualx, but it seems to take +# screenshots of the terminal window, and compares checksums that never +# seem to match. +RESTRICT="test" RDEPEND=" media-libs/freetype:2 - media-libs/libglvnd[X] + virtual/opengl + x11-libs/libX11 x11-libs/libXmu " DEPEND="${RDEPEND}" @@ -27,4 +33,9 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + # Remove default CXX/LDFLAGS, bug #830405. + "${FILESDIR}"/${PN}-0.12-cxxflags.patch +) + DOCS=( doc/KEYS.org doc/USAGE.org ) |