diff options
Diffstat (limited to 'x11-misc')
305 files changed, 3567 insertions, 2830 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild deleted file mode 100644 index 3db14eaad53..00000000000 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="OpenGL virtual desktop switching" -HOMEPAGE="https://sourceforge.net/projects/desk3d/" -SRC_URI="mirror://sourceforge/desk3d/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND=" - >=media-libs/freetype-2 - media-libs/freeglut - media-libs/imlib2[X] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXxf86vm -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -DOCS=( AUTHORS TODO ChangeLog README README.windowmanagers ) -PATCHES=( - "${FILESDIR}"/${P}-gcc4.patch - "${FILESDIR}"/${P}-asneeded.patch - "${FILESDIR}"/${P}-missing-include.patch - "${FILESDIR}"/${P}-gl_init.patch - "${FILESDIR}"/${P}-Options_Options.patch -) - -src_prepare() { - default - - eautoreconf -} - -pkg_postinst() { - echo - elog "This ebuild installed a configuration file called /etc/3ddesktop.conf" - elog "The default configuration makes a screenshot of the virtual desktops" - elog "every X seconds. This is non-optimal behavior." - elog - elog "To enable a more intelligent way of updating the virtual desktops," - elog "execute the following:" - elog - elog " echo \"AutoAcquire 0\" >> /etc/3ddesktop.conf" - elog - elog "This will cause 3ddesktop to update the virtual desktop snapshots" - elog "only when a 3d desktop switch is required." -} diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest deleted file mode 100644 index 07e15f9410f..00000000000 --- a/x11-misc/3ddesktop/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST 3ddesktop-0.2.9.tar.gz 182278 BLAKE2B fb963a8bbfcea97da13cbc28890d74ac9d29655e298d76a485ceed5b67ac3557a8e731988e30d5a3009b774d66f8bfb270b0464ed6ffdf27070797ca8440d3d9 SHA512 87de83561bc1614e4dde623197b04e482e04ad363ba88adf4e4e9950a942a5725d2a7199406949981c1a4aeba5d71fb9a1693f99aefa21ed7b83e083bb902686 diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch deleted file mode 100644 index 00e8b8c1ee5..00000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-Options_Options.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/config.cpp -+++ b/config.cpp -@@ -64,7 +64,7 @@ - } - - --Options::Options(char *n = NULL) -+Options::Options(char *n) - { - - if (n) diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch deleted file mode 100644 index 2534535dee1..00000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/206817 - ---- a/Makefile.am -+++ b/Makefile.am -@@ -37,7 +37,7 @@ - camera.cpp \ - config.cpp - --3ddeskd_LDFLAGS = $(imlib2_libs) @GL_LIBS@ -+3ddeskd_LDADD = $(imlib2_libs) @GL_LIBS@ - - noinst_HEADERS = 3ddesk.h \ - arrange.hpp \ diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch deleted file mode 100644 index a67753fcee3..00000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/118458 - ---- a/event.hpp -+++ b/event.hpp -@@ -74,7 +74,7 @@ - list<Event *>::iterator k; - for (k = events.begin(); k != events.end(); ++k) { - Event *e = *k; -- printf(":: Event %d 0x%x\n", e->type, (unsigned int)(e->function)); -+ printf(":: Event %d %p\n", e->type, e->function); - } - } - - diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch deleted file mode 100644 index d817cea54ec..00000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gl_init.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/123762 - ---- a/3ddeskd.cpp -+++ b/3ddeskd.cpp -@@ -2411,15 +2411,15 @@ - - // initialize opengl - -- // our own init function. -- gl_init(); -- - GLWin.open_display(); - - - GLWin.create_GL_window("Enhanced 3-dimensional workspace visualization magic machine", - cfg->options->do_fullscreen); - -+ // our own init function. -+ gl_init(); -+ - cfg->texture_size = GLWin.get_best_texture_size(cfg->texture_size); - - // Loads up the correct perspective matrix diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch deleted file mode 100644 index 328cbcad6d2..00000000000 --- a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentoo.org/228217 - ---- a/config.hpp -+++ b/config.hpp -@@ -24,6 +24,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <cstring> - - #include <errno.h> - #include <unistd.h> diff --git a/x11-misc/3ddesktop/metadata.xml b/x11-misc/3ddesktop/metadata.xml deleted file mode 100644 index 17de2101081..00000000000 --- a/x11-misc/3ddesktop/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <longdescription> -3d Destkop is an OpenGL program for switching virtual desktops in a seamless -3-dimensional manner. The current desktop is mapped into a 3D space where you -may choose other screens. Several different visualization modes are available. -</longdescription> - <upstream> - <remote-id type="sourceforge">desk3d</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest index 2acc7ec0cda..456e1e7e4dc 100644 --- a/x11-misc/alacarte/Manifest +++ b/x11-misc/alacarte/Manifest @@ -1 +1,2 @@ -DIST alacarte-3.36.0.tar.xz 201088 BLAKE2B 26c924a8a88c014358db38496cb8a20eca82e9b3d514a9feefa64db3674527cef454346c538a1cdb04ebbb384a64dee395738d8d2a19f4d2445e887f5714f8d6 SHA512 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9 +DIST alacarte-3.42.0.tar.xz 203836 BLAKE2B e020529acd5b6b716c8e1b876b3edc1107cf61fbcebb648ce7f593e830f0ae7ea3445a5ccda2cd798e0441e999cff2e9e4630a7b2fe0b711adef56bf59931c25 SHA512 df56f79e0697268ceebd15614c9e6c6bbef82c10c64c90b39eac1718043edb1a1ea71d03798705d94407cf2dcc3fead6c2d08ff6c5a9ca710574eb15ffed68d1 +DIST alacarte-3.44.1.tar.xz 253364 BLAKE2B ebd542430f909291d06c1094aac52f87760547013f012167fa5616609251a6cb48b258122424a119b3ab10e6e2289d9a282dd66da3dcf5590b09d9c686a8934b SHA512 84b1cebdcbb53e2cca5a1425829b00db0b2a11e308584ea96179c2d0451d8c77fa6a995ae4671a024fab72869c7d2e9986dc310bfab38fe8b7b2f54d383501ca diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.42.0.ebuild index 46c67df8409..5010be1235b 100644 --- a/x11-misc/alacarte/alacarte-3.36.0.ebuild +++ b/x11-misc/alacarte/alacarte-3.42.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) PYTHON_REQ_USE="xml" inherit gnome2 python-single-r1 diff --git a/x11-misc/alacarte/alacarte-3.44.1.ebuild b/x11-misc/alacarte/alacarte-3.44.1.ebuild new file mode 100644 index 00000000000..c78a03bfd63 --- /dev/null +++ b/x11-misc/alacarte/alacarte-3.44.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml" + +inherit gnome2 python-single-r1 + +DESCRIPTION="Simple GNOME menu editor" +HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') + >=gnome-base/gnome-menus-3.5.3:3[introspection] +" +RDEPEND="${DEPEND} + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_install() { + gnome2_src_install + python_optimize +} diff --git a/x11-misc/albert/albert-0.17.2.ebuild b/x11-misc/albert/albert-0.17.2-r1.ebuild index 037b2adeeee..688d62bc66b 100644 --- a/x11-misc/albert/albert-0.17.2.ebuild +++ b/x11-misc/albert/albert-0.17.2-r1.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 cmake xdg-utils @@ -41,6 +41,7 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 + dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] diff --git a/x11-misc/alock/alock-1.0.0-r1.ebuild b/x11-misc/alock/alock-1.0.0-r1.ebuild index 33a86aadaf0..476253fafda 100644 --- a/x11-misc/alock/alock-1.0.0-r1.ebuild +++ b/x11-misc/alock/alock-1.0.0-r1.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=7 @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/tidy-printf.patch "${FILESDIR}"/fix-aliasing.patch "${FILESDIR}"/no-xf86misc.patch + "${FILESDIR}"/no-which.patch ) src_configure() { diff --git a/x11-misc/alock/files/no-which.patch b/x11-misc/alock/files/no-which.patch new file mode 100644 index 00000000000..1764be32c82 --- /dev/null +++ b/x11-misc/alock/files/no-which.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/844886 +--- a/configure ++++ b/configure +@@ -26,7 +26,7 @@ msg_chkfor() { + check_docs() { + + msg_chkfor "asciidoc" +- if which asciidoc 1> /dev/null 2>&3 ++ if command -v asciidoc 1> /dev/null 2>&3 + then + echo "ok." + echo "#_______________________" >&4 +@@ -40,7 +40,7 @@ check_docs() { + check_tools() { + + msg_chkfor "compiler $CC" +- if which "$CC" 1> /dev/null 2>&3 ++ if command -v "$CC" 1> /dev/null 2>&3 + then + echo "ok." + echo "---------------------------------" 1>&3 +@@ -56,7 +56,7 @@ check_tools() { + check_imlib2() { + + msg_chkfor "imlib2-config" +- if which imlib2-config 1> /dev/null 2>&3 ++ if command -v imlib2-config 1> /dev/null 2>&3 + then + echo "ok." + cat << EOF > tmp.c diff --git a/x11-misc/arandr/arandr-0.1.10-r2.ebuild b/x11-misc/arandr/arandr-0.1.10-r2.ebuild index 93d18823f08..38050789d83 100644 --- a/x11-misc/arandr/arandr-0.1.10-r2.ebuild +++ b/x11-misc/arandr/arandr-0.1.10-r2.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,7 +14,7 @@ SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 arm arm64 x86" RDEPEND=" dev-python/pygobject:3=[${PYTHON_USEDEP},cairo] diff --git a/x11-misc/arandr/metadata.xml b/x11-misc/arandr/metadata.xml index 60d207fc1c2..1917a0e78ea 100644 --- a/x11-misc/arandr/metadata.xml +++ b/x11-misc/arandr/metadata.xml @@ -10,6 +10,6 @@ Relative monitor positions are shown graphically and can be changed in a drag-and-drop way. </longdescription> <upstream> - <remote-id type="github">arandr/arandr</remote-id> + <remote-id type="gitlab">arandr/arandr</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/autocutsel/Manifest b/x11-misc/autocutsel/Manifest index 941ddf97a6c..21d74fd9b06 100644 --- a/x11-misc/autocutsel/Manifest +++ b/x11-misc/autocutsel/Manifest @@ -1 +1,2 @@ DIST autocutsel-0.10.0.tar.gz 329527 BLAKE2B 1ab17fec1dde40fae6a98a9cc079f7080add2a30b3384e7a4cfbe7e85ca13a7394ce96ba1dd32a9d147f123ce44fc4ff7fbbf77a02eacd2301b91fafc3096232 SHA512 2d9b7114fde67ee217ceee673e32b407eef5b266a9d457a83b35d1c6227e5873cc7928aa10f7d84ce5e8c78d4940ee29985696f49b4015269584f1559f6b6d1d +DIST autocutsel-0.10.1.tar.gz 337872 BLAKE2B df1d924bf61c5e2b3dc2930b85f5b3b2f906892fa84932cfb4511be3e94dcc8763a8af1d4a6685da013d65b82e8f003f194fcb0522c35e43bc88269611132109 SHA512 a4f68342b389ef94fde8052f5d9e4b4585bab8fa8364985a2b0a3ec3e6f81ed58ba45be9349aa6e16c70ca623a7c315796cf0440ef6f4ffa9606ed7b7981a4a2 diff --git a/x11-misc/autocutsel/autocutsel-0.10.1.ebuild b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild new file mode 100644 index 00000000000..77f67d12b9f --- /dev/null +++ b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools + +DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications" +HOMEPAGE="https://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel" +SRC_URI="https://github.com/sigmike/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND=" + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +src_prepare() { + default + eautoreconf +} diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml index b63e2b2a7a3..342aa9fb57f 100644 --- a/x11-misc/autocutsel/metadata.xml +++ b/x11-misc/autocutsel/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <longdescription>autocutsel synchronizes the two copy/paste buffers mainly used by X applications. It unifies "clipboards" between VNC servers and Windows.</longdescription> <upstream> <remote-id type="github">sigmike/autocutsel</remote-id> diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest index 6523b0b03b9..19ff7ec2eab 100644 --- a/x11-misc/autorandr/Manifest +++ b/x11-misc/autorandr/Manifest @@ -1 +1,2 @@ DIST autorandr-1.11.tar.gz 48791 BLAKE2B 57203b15eebdecab943c706745701e8569eb0a66dab69ae4429abfa863da736a5ed8b5333f6d948bcf8cae30f48c68eb1b35f2e84080526c1507ab78dba02efb SHA512 93de0461653aa5145956a8aafdc9fb257491495ca335e4213e7b6f1f313ebfd2332c38615ac648204494026439d77861a7eefd97e80cd49a5fe3d9b75db54ec1 +DIST autorandr-1.12.1.tar.gz 45550 BLAKE2B 5b434325d13c00c3fa70b5d09edb540cdcf3bb921307c60f2c616231e7a87ea85f60e39500ed8116f28619139f71ecc4a8fa153ffadc6b8d74df570736a0d815 SHA512 a7e095eb96e7e0d3a5b3b2122d68a3d3a5121d8be7a86ddd9f837ad42b7a53ed5ee45151f23861c5b900e214a4dfc0c575f45fe70c8c5587562a4035458137a0 diff --git a/x11-misc/autorandr/autorandr-1.11.ebuild b/x11-misc/autorandr/autorandr-1.11-r1.ebuild index adc50ea424e..392d59491a5 100644 --- a/x11-misc/autorandr/autorandr-1.11.ebuild +++ b/x11-misc/autorandr/autorandr-1.11-r1.ebuild @@ -23,6 +23,7 @@ SLOT="0" IUSE="launcher udev" RDEPEND=" + x11-apps/xrandr launcher? ( x11-libs/libxcb ) udev? ( virtual/udev ) " diff --git a/x11-misc/autorandr/autorandr-1.12.1.ebuild b/x11-misc/autorandr/autorandr-1.12.1.ebuild new file mode 100644 index 00000000000..392d59491a5 --- /dev/null +++ b/x11-misc/autorandr/autorandr-1.12.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit bash-completion-r1 distutils-r1 systemd udev + +if [[ "${PV}" = "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git" +else + SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Automatically select a display configuration based on connected devices" +HOMEPAGE="https://github.com/phillipberndt/autorandr" + +LICENSE="GPL-3" +SLOT="0" +IUSE="launcher udev" + +RDEPEND=" + x11-apps/xrandr + launcher? ( x11-libs/libxcb ) + udev? ( virtual/udev ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + distutils-r1_src_compile + + if use launcher; then + emake contrib/autorandr_launcher/autorandr-launcher + fi +} + +src_install() { + distutils-r1_src_install + + doman autorandr.1 + + local targets=( + autostart_config + bash_completion + systemd + $(usev launcher) + $(usev udev) + ) + + emake DESTDIR="${D}" \ + BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \ + SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \ + UDEV_RULES_DIR="$(get_udevdir)"/rules.d \ + $(printf "install_%s " "${targets[@]}") +} + +pkg_postinst() { + if use udev; then + udev_reload + fi +} diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild index adc50ea424e..392d59491a5 100644 --- a/x11-misc/autorandr/autorandr-9999.ebuild +++ b/x11-misc/autorandr/autorandr-9999.ebuild @@ -23,6 +23,7 @@ SLOT="0" IUSE="launcher udev" RDEPEND=" + x11-apps/xrandr launcher? ( x11-libs/libxcb ) udev? ( virtual/udev ) " diff --git a/x11-misc/barrier/barrier-2.4.0.ebuild b/x11-misc/barrier/barrier-2.4.0.ebuild index 5acabd7ab66..f086465e060 100644 --- a/x11-misc/barrier/barrier-2.4.0.ebuild +++ b/x11-misc/barrier/barrier-2.4.0.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gui test" RESTRICT="!test? ( test )" diff --git a/x11-misc/bbcd/bbcd-0.3.1-r3.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r4.ebuild index ee2e46b6956..8fe5e8ee889 100644 --- a/x11-misc/bbcd/bbcd-0.3.1-r3.ebuild +++ b/x11-misc/bbcd/bbcd-0.3.1-r4.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=6 +EAPI=8 inherit flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="http://tranber1.free.fr/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="media-libs/libcdaudio @@ -32,5 +32,5 @@ src_configure() { src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbcd || die + rm "${ED}/usr/share/bbtools/README.bbcd" || die } diff --git a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild index 34d873c0c0b..e6e27136388 100644 --- a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild +++ b/x11-misc/bbdate/bbdate-0.2.4-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools DESCRIPTION="blackbox date display" @@ -30,9 +30,9 @@ src_prepare() { src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbdate || die + rm "${ED}"/usr/share/bbtools/README.bbdate || die # since multiple bbtools packages provide this file, install # it in /usr/share/doc/${PF} - mv "${ED%/}"/usr/share/bbtools/bbtoolsrc.in \ - "${ED%/}"/usr/share/doc/${PF}/bbtoolsrc.example || die + mv "${ED}"/usr/share/bbtools/bbtoolsrc.in \ + "${ED}"/usr/share/doc/${PF}/bbtoolsrc.example || die } diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r2.ebuild index 2a8ecbf0cd7..82cb99da07b 100644 --- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild +++ b/x11-misc/bbmail/bbmail-0.9.3-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools diff --git a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild b/x11-misc/bbpager/bbpager-0.4.7-r2.ebuild index dd26ebbbdab..bc28729bf98 100644 --- a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild +++ b/x11-misc/bbpager/bbpager-0.4.7-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -15,8 +15,8 @@ KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND="x11-wm/blackbox" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS BUGS ChangeLog README TODO data/README.bbpager ) PATCHES=( @@ -31,5 +31,5 @@ src_prepare() { src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbpager || die + rm "${ED}"/usr/share/bbtools/README.bbpager || die } diff --git a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild index ec831a2a80e..8c74fcf000b 100644 --- a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild +++ b/x11-misc/bbtime/bbtime-0.1.5-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="x11-libs/libX11" @@ -28,9 +28,9 @@ src_prepare() { src_install() { default - rm "${ED%/}"/usr/share/bbtools/README.bbtime || die + rm "${ED}"/usr/share/bbtools/README.bbtime || die # since multiple bbtools packages provide this file, install # it in /usr/share/doc/${PF} - mv "${ED%/}/usr/share/bbtools/bbtoolsrc.in" \ - "${ED%/}/usr/share/doc/${PF}/bbtoolsrc.example" || die + mv "${ED}/usr/share/bbtools/bbtoolsrc.in" \ + "${ED}/usr/share/doc/${PF}/bbtoolsrc.example" || die } diff --git a/x11-misc/birdtray/birdtray-1.9.0.ebuild b/x11-misc/birdtray/birdtray-1.9.0.ebuild index cd9cdf2f737..25cc5efe468 100644 --- a/x11-misc/birdtray/birdtray-1.9.0.ebuild +++ b/x11-misc/birdtray/birdtray-1.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ SLOT="0" RDEPEND="dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtnetwork:5 + dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 diff --git a/x11-misc/birdtray/birdtray-9999.ebuild b/x11-misc/birdtray/birdtray-9999.ebuild index 92d300f4bfb..4fb71861085 100644 --- a/x11-misc/birdtray/birdtray-9999.ebuild +++ b/x11-misc/birdtray/birdtray-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ SLOT="0" RDEPEND="dev-db/sqlite:= dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtnetwork:5 + dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest index 998ace34435..80a38418d58 100644 --- a/x11-misc/cbatticon/Manifest +++ b/x11-misc/cbatticon/Manifest @@ -1 +1 @@ -DIST cbatticon-1.6.10.tar.gz 32402 BLAKE2B 91ba6eb581b4cd0b31ae5a49b12970fc7d02d1ba790bffc80886c05ad2b0573ee1aca479d90591498dd6d816bb7e24bee6918e5a8fa8823cf376a3a3da598993 SHA512 cf499eb7ac1d775918a7af01700a9e8eeefd9e31a44fd63c9f38bff83945cea9fb21dde960052768f8d0a0c004caeea115f2d80cb3838789859d43e432eae055 +DIST cbatticon-1.6.12.tar.gz 34670 BLAKE2B cfae33c7e5393626a4e17d649bb7e242d35cfe7f79fda1b85e058a93a6b1c6da61ed9ff4463a44b5d6efa17d78f960021671d6bde1581af3e3eae70f369b6d52 SHA512 4946bf8a0514c0d595dd335a1388fd0e2c1cbb4d4e7fa774ab58bca4914d635d23cf32d7299dc9cad0f4dc7a37d88b875d9432234bfea0251f699d7776e5b019 diff --git a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild b/x11-misc/cbatticon/cbatticon-1.6.12.ebuild index 5992136aee4..a39ecac5a48 100644 --- a/x11-misc/cbatticon/cbatticon-1.6.10.ebuild +++ b/x11-misc/cbatticon/cbatticon-1.6.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=6 +EAPI=8 -inherit eutils toolchain-funcs +inherit strip-linguas toolchain-funcs DESCRIPTION="A lightweight and fast battery icon that sits in your system tray" HOMEPAGE="https://github.com/valr/cbatticon" @@ -11,18 +11,16 @@ SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~riscv x86" +KEYWORDS="amd64 ~riscv ~x86" IUSE="libnotify" -RDEPEND=" - dev-libs/glib:2 +RDEPEND="dev-libs/glib:2 x11-libs/gtk+:3 - libnotify? ( x11-libs/libnotify ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" + libnotify? ( x11-libs/libnotify )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( Changelog README ) src_prepare() { default @@ -47,5 +45,5 @@ src_install() { V=1 VERSION="${PF}" \ install - dodoc Changelog + einstalldocs } diff --git a/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild new file mode 100644 index 00000000000..a3194cfe732 --- /dev/null +++ b/x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="Clipboard management" +HOMEPAGE="https://github.com/cdown/clipmenu" +SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="+dmenu fzf rofi" +REQUIRED_USE="?? ( dmenu fzf rofi )" + +RDEPEND=" + x11-misc/clipnotify + x11-misc/xsel + dmenu? ( x11-misc/dmenu ) + fzf? ( app-shells/fzf ) + rofi? ( x11-misc/rofi ) +" + +src_prepare() { + default + + if use rofi ; then + sed -i 's|CM_LAUNCHER=dmenu|CM_LAUNCHER=rofi|' clipmenu || die "sed failed" + elif use fzf ; then + sed -i 's|CM_LAUNCHER=dmenu|CM_LAUNCHER=fzf|' clipmenu || die "sed failed" + fi +} + +src_compile() { + : +} + +src_install() { + local binfile + for binfile in clipctl clipdel clipfsck clipmenu clipmenud; do + dobin ${binfile} + done + + dodoc README.md + + systemd_douserunit "init/clipmenud.service" +} + +pkg_postinst() { + if ! use dmenu && ! use fzf && ! use rofi ; then + ewarn "Clipmenu has been installed without a launcher." + ewarn "You will need to set \$CM_LAUNCHER to a dmenu-compatible app for clipmenu to work." + ewarn "Please refer to the documents for more info." + fi +} diff --git a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild b/x11-misc/clipmenu/clipmenu-6.2.0.ebuild deleted file mode 100644 index 5ae7092c8f4..00000000000 --- a/x11-misc/clipmenu/clipmenu-6.2.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd - -DESCRIPTION="Clipboard management using dmenu" -HOMEPAGE="https://github.com/cdown/clipmenu" -SRC_URI="https://github.com/cdown/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - x11-misc/clipnotify - x11-misc/dmenu - x11-misc/xsel -" - -src_compile() { - : -} - -src_install() { - local binfile - for binfile in clipctl clipdel clipfsck clipmenu clipmenud; do - dobin ${binfile} - done - - systemd_douserunit "init/clipmenud.service" -} diff --git a/x11-misc/clipmenu/metadata.xml b/x11-misc/clipmenu/metadata.xml index a057b342f48..ad77c07f77a 100644 --- a/x11-misc/clipmenu/metadata.xml +++ b/x11-misc/clipmenu/metadata.xml @@ -9,4 +9,9 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <use> + <flag name="dmenu">Use dmenu as default launcher</flag> + <flag name="rofi">Use rofi as default launcher</flag> + <flag name="fzf">Use fzf as default launcher</flag> + </use> </pkgmetadata> diff --git a/x11-misc/clipnotify/clipnotify-1.0.2.ebuild b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild index 4a8c1f9e890..51099e860d1 100644 --- a/x11-misc/clipnotify/clipnotify-1.0.2.ebuild +++ b/x11-misc/clipnotify/clipnotify-1.0.2.ebuild @@ -18,6 +18,12 @@ DEPEND=" " RDEPEND="${DEPEND}" +src_compile() { + # Running into parallel jobs issues with -j16 on v1.0.2. There's only one .c file + # to compile. Go figure... + emake -j1 +} + src_install() { dobin clipnotify } diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest index b954e9b2b18..fcc9473fc54 100644 --- a/x11-misc/colord/Manifest +++ b/x11-misc/colord/Manifest @@ -1,2 +1 @@ -DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f -DIST colord-1.4.5.tar.xz 1869084 BLAKE2B 34c886bade6f71b0b81bbed216695d839873fba46423f6422b80ef2f62e88a403edd1686bb705ef78bcaeb352477e0581d784ccd388961cd42d880661b4b31ab SHA512 b6cc8087ceff4a99b7d764087208cc72e1219d9f6bb52bd3e3eb13bb62e3c1e99aefef36237dceff46925ab7680c76795f59057b7a4d1c8a123de6270708e03c +DIST colord-1.4.6.tar.xz 1872528 BLAKE2B bf87ed1abe0a827ad81b5467847975d70e4cb83c1973fac3bcb1650875b7a0b375d48633bb1b01c7da1e8acd62cc4cf19f0efe9722e12bde3d8ec4833800ef2c SHA512 d55d3322199d0bfee74eee9e183c9246ec33e755f0144d96087acb3c43ab5a3d872086fcef9f29cdd2295be71daac703cdf90ad10bf183622fdd84347e7af123 diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild deleted file mode 100644 index e8a2b5c59e3..00000000000 --- a/x11-misc/colord/colord-1.3.5.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME2_EAUTORECONF="yes" -VALA_USE_DEPEND="vapigen" - -inherit bash-completion-r1 check-reqs gnome2 systemd udev vala multilib-minimal toolchain-funcs - -DESCRIPTION="System service to accurately color manage input and output devices" -HOMEPAGE="https://www.freedesktop.org/software/colord/" -SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/2" # subslot = libcolord soname version -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" - -# We prefer policykit enabled by default, bug #448058 -IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala" -REQUIRED_USE=" - gusb? ( udev ) - scanner? ( udev ) - vala? ( introspection ) -" - -DEPEND=" - dev-db/sqlite:3=[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}] - >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] - argyllcms? ( media-gfx/argyllcms ) - gusb? ( >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) - policykit? ( >=sys-auth/polkit-0.104 ) - scanner? ( - media-gfx/sane-backends - sys-apps/dbus - ) - systemd? ( >=sys-apps/systemd-44:0= ) - udev? ( - dev-libs/libgudev:=[${MULTILIB_USEDEP}] - virtual/libudev:=[${MULTILIB_USEDEP}] - virtual/udev - ) -" -RDEPEND="${DEPEND} - acct-group/colord - acct-user/colord - !<=media-gfx/colorhug-client-0.1.13 - !media-gfx/shared-color-profiles -" -BDEPEND=" - acct-group/colord - acct-user/colord - dev-libs/libxslt - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - extra-print-profiles? ( media-gfx/argyllcms ) - vala? ( $(vala_depend) ) -" -# These dependencies are required to build native build-time programs. -BDEPEND="${BDEPEND} - dev-libs/glib:2 - media-libs/lcms -" - -# FIXME: needs pre-installed dbus service files -RESTRICT="test" - -# According to upstream comment in colord.spec.in, building the extra print -# profiles requires >=4G of memory -CHECKREQS_MEMORY="4G" - -pkg_pretend() { - use extra-print-profiles && check-reqs_pkg_pretend -} - -pkg_setup() { - use extra-print-profiles && check-reqs_pkg_setup -} - -src_prepare() { - # Adapt to Gentoo paths - sed -i -e 's/spotread/argyll-spotread/' \ - src/sensors/cd-sensor-argyll.c \ - configure.ac || die - - use vala && vala_src_prepare - gnome2_src_prepare - multilib_copy_sources -} - -multilib_src_configure() { - if multilib_is_native_abi && tc-is-cross-compiler; then - mkdir -p "${S}-native" - pushd "${S}-native" >/dev/null 2>&1 || die - ECONF_SOURCE="${S}" econf_build --enable-static \ - --disable-{argyllcms-sensor,print-profiles,shared,udev} \ - {BASH_COMPLETION,GUDEV,GUSB,POLKIT,SQLITE,UDEV}_{CFLAG,LIB}S=-DSKIP - popd >/dev/null 2>&1 || die - fi - - # Reverse tools require gusb - # bash-completion test does not work on gentoo - local myconf=( - --disable-bash-completion - --disable-examples - --disable-static - --enable-libcolordcompat - --with-daemon-user=colord - --localstatedir="${EPREFIX}"/var - $(multilib_native_use_enable argyllcms argyllcms-sensor) - $(multilib_native_use_enable extra-print-profiles print-profiles) - $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") - $(use_enable gusb) - $(multilib_native_use_enable gusb reverse) - $(multilib_native_use_enable introspection) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_enable scanner sane) - $(multilib_native_use_enable systemd systemd-login) - $(use_enable udev) - --with-udevrulesdir="$(get_udevdir)"/rules.d - $(multilib_native_use_enable vala) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - - ECONF_SOURCE=${S} \ - gnome2_src_configure "${myconf[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - if tc-is-cross-compiler; then - emake -C "${S}-native/lib/colord" libcolord.la - emake -C "${S}-native/client" cd-create-profile cd-it8 - emake \ - CD_CREATE_PROFILE="${S}-native/client/cd-create-profile" \ - CD_IT8="${S}-native/client/cd-it8" - else - emake - fi - else - emake -C lib/colord - use gusb && emake -C lib/colorhug - emake -C lib/compat - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - default - else - emake -C lib/colord check - use gusb && emake -C lib/colorhug check - emake -C lib/compat check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - gnome2_src_install - else - gnome2_src_install -j1 -C lib/colord - use gusb && gnome2_src_install -j1 -C lib/colorhug - gnome2_src_install -j1 -C lib/compat - gnome2_src_install -j1 -C contrib/session-helper install-libcolord_includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - - newbashcomp data/colormgr colormgr - - # Ensure config and profile directories exist and /var/lib/colord/* - # is writable by colord user - keepdir /var/lib/color{,d}/icc - fowners colord:colord /var/lib/colord{,/icc} - - if use examples; then - docinto examples - dodoc examples/*.c - fi -} diff --git a/x11-misc/colord/colord-1.4.5-r1.ebuild b/x11-misc/colord/colord-1.4.6.ebuild index 53a2909463e..e549989e284 100644 --- a/x11-misc/colord/colord-1.4.5-r1.ebuild +++ b/x11-misc/colord/colord-1.4.6.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 VALA_USE_DEPEND="vapigen" -inherit bash-completion-r1 meson-multilib vala +inherit bash-completion-r1 meson-multilib tmpfiles vala DESCRIPTION="System service to accurately color manage input and output devices" HOMEPAGE="https://www.freedesktop.org/software/colord/" @@ -14,53 +14,49 @@ LICENSE="GPL-2+" SLOT="0/2" # subslot = libcolord soname version KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala" +IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner selinux systemd test vala" RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp -REQUIRED_USE=" - scanner? ( udev ) - vala? ( introspection ) -" +REQUIRED_USE="vala? ( introspection )" DEPEND=" >=dev-libs/glib-2.58.0:2[${MULTILIB_USEDEP}] >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}] dev-db/sqlite:3=[${MULTILIB_USEDEP}] >=dev-libs/libgusb-0.2.7[introspection?,${MULTILIB_USEDEP}] - udev? ( - dev-libs/libgudev:=[${MULTILIB_USEDEP}] - virtual/libudev:=[${MULTILIB_USEDEP}] - virtual/udev - ) + + dev-libs/libgudev:=[${MULTILIB_USEDEP}] + virtual/libudev:=[${MULTILIB_USEDEP}] + virtual/udev + systemd? ( >=sys-apps/systemd-44:0= ) scanner? ( media-gfx/sane-backends sys-apps/dbus ) - >=sys-auth/polkit-0.104 + >=sys-auth/polkit-0.114 argyllcms? ( media-gfx/argyllcms ) - introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) + introspection? ( >=dev-libs/gobject-introspection-1.56:= ) " RDEPEND="${DEPEND} acct-group/colord acct-user/colord + selinux? ( sec-policy/selinux-colord ) " BDEPEND=" acct-group/colord acct-user/colord app-text/docbook-xsl-ns-stylesheets dev-libs/libxslt - >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig extra-print-profiles? ( media-gfx/argyllcms ) + gtk-doc? ( + dev-util/gtk-doc + app-text/docbook-xml-dtd:4.1.2 + ) vala? ( $(vala_depend) ) " -PATCHES=( - "${FILESDIR}"/${PV}-tests-Don-t-use-exact-floating-point-comparisons.patch - "${FILESDIR}"/${PV}-optional-introspection.patch -) - src_prepare() { default use vala && vala_src_prepare @@ -85,11 +81,10 @@ multilib_src_configure() { local emesonargs=( $(meson_native_true daemon) -Dbash_completion=false - $(meson_use udev udev_rules) + $(meson_native_true udev_rules) # Install udev rules only from native build $(meson_native_use_bool systemd) -Dlibcolordcompat=true $(meson_native_use_bool argyllcms argyllcms_sensor) - -Dreverse=false $(meson_native_use_bool scanner sane) $(meson_native_use_bool introspection) $(meson_native_use_bool vala vapi) @@ -97,7 +92,7 @@ multilib_src_configure() { $(meson_use test tests) -Dinstalled_tests=false -Ddaemon_user=colord - -Dman=true + $(meson_native_true man) $(meson_use gtk-doc docs) --localstatedir="${EPREFIX}"/var ) @@ -117,3 +112,7 @@ multilib_src_install_all() { dodoc examples/*.c fi } + +pkg_postinst() { + tmpfiles_process colord.conf +} diff --git a/x11-misc/colord/files/1.4.5-optional-introspection.patch b/x11-misc/colord/files/1.4.5-optional-introspection.patch deleted file mode 100644 index 8bc4580bebe..00000000000 --- a/x11-misc/colord/files/1.4.5-optional-introspection.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e73723cabe4d5a2e2b281d2f1ea751b2d75bccc6 Mon Sep 17 00:00:00 2001 -From: David Michael <fedora.dm0@gmail.com> -Date: Fri, 30 Apr 2021 16:28:17 -0400 -Subject: [PATCH] build: Make introspection optional in meson - -It defaults to enabled to preserve existing behavior. ---- - lib/colord/meson.build | 2 ++ - lib/colorhug/meson.build | 2 ++ - meson_options.txt | 1 + - 3 files changed, 5 insertions(+) - -diff --git a/lib/colord/meson.build b/lib/colord/meson.build -index dbb3d196..fe9d1cdb 100644 ---- a/lib/colord/meson.build -+++ b/lib/colord/meson.build -@@ -146,6 +146,7 @@ pkgg.generate( - description : 'colord is a system daemon for managing color devices', - ) - -+if get_option('introspection') - libcolord_girtarget = gnome.generate_gir(colord, - sources : [ - 'cd-client.c', -@@ -202,6 +203,7 @@ libcolord_girtarget = gnome.generate_gir(colord, - ) - libcolord_gir = libcolord_girtarget[0] - libcolord_typelib = libcolord_girtarget[1] -+endif - - if get_option('vapi') - gnome.generate_vapi('colord', -diff --git a/lib/colorhug/meson.build b/lib/colorhug/meson.build -index 9526ea4d..c0ce2887 100644 ---- a/lib/colorhug/meson.build -+++ b/lib/colorhug/meson.build -@@ -73,6 +73,7 @@ pkgg.generate( - description : 'ColorHug is a simple display hardware colorimeter', - ) - -+if get_option('introspection') - libcolorhug_gir = gnome.generate_gir(colorhug, - sources : [ - 'ch-common.c', -@@ -107,6 +108,7 @@ libcolorhug_gir = gnome.generate_gir(colorhug, - ], - install : true - ) -+endif - - if get_option('tests') - e = executable( -diff --git a/meson_options.txt b/meson_options.txt -index c184898e..10517622 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -7,6 +7,7 @@ option('systemd', type : 'boolean', value : true, description : 'Enable systemd - option('argyllcms_sensor', type : 'boolean', value : true, description : 'Enable ArgllCMS sensor') - option('reverse', type : 'boolean', value : false, description : 'Enable reverse engineering tools') - option('sane', type : 'boolean', value : false, description : 'Enable SANE support') -+option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files') - option('vapi', type : 'boolean', value : false, description : 'Build vala bindings') - option('print_profiles', type : 'boolean', value : false, description : 'Build extra print profiles') - option('tests', type : 'boolean', value : true, description : 'Build self tests') diff --git a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch b/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch deleted file mode 100644 index de56fe14544..00000000000 --- a/x11-misc/colord/files/1.4.5-tests-Don-t-use-exact-floating-point-comparisons.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d68cd11cd31d379e4f3bb4c964b17fd50c8c54a6 Mon Sep 17 00:00:00 2001 -From: Christopher James Halse Rogers <raof@ubuntu.com> -Date: Wed, 11 Nov 2020 17:13:19 +1100 -Subject: [PATCH] tests: Don't use exact floating point comparisons. - -The tests asserting that cd_icc_get_version are exactly equal to 3.4 or -2.09 fail on (at least) i386, armel, and s390x because floating point is -hateful. - -Signed-off-by: Christopher James Halse Rogers <raof@ubuntu.com> ---- - lib/colord/cd-test-private.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/colord/cd-test-private.c b/lib/colord/cd-test-private.c -index 4b16ca5..231c4ae 100644 ---- a/lib/colord/cd-test-private.c -+++ b/lib/colord/cd-test-private.c -@@ -1494,7 +1494,7 @@ colord_icc_func (void) - /* check profile properties */ - g_assert_cmpint (cd_icc_get_size (icc), ==, 25244); - g_assert_cmpstr (cd_icc_get_checksum (icc), ==, "9ace8cce8baac8d492a93a2a232d7702"); -- g_assert_cmpfloat (cd_icc_get_version (icc), ==, 3.4); -+ g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 3.4, 0.01); - g_assert (g_str_has_suffix (cd_icc_get_filename (icc), "ibm-t61.icc")); - g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_DISPLAY_DEVICE); - g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_RGB); -@@ -1727,7 +1727,7 @@ colord_icc_save_func (void) - g_object_unref (file); - - /* verify changed values */ -- g_assert_cmpfloat (cd_icc_get_version (icc), ==, 2.09); -+ g_assert_cmpfloat_with_epsilon (cd_icc_get_version (icc), 2.09, 0.001); - g_assert_cmpint (cd_icc_get_kind (icc), ==, CD_PROFILE_KIND_OUTPUT_DEVICE); - g_assert_cmpint (cd_icc_get_colorspace (icc), ==, CD_COLORSPACE_XYZ); - g_assert_cmpstr (cd_icc_get_metadata_item (icc, "SelfTest"), ==, "true"); --- -2.26.3 - diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml index 70d3bf45508..d0fe4e35f08 100644 --- a/x11-misc/colord/metadata.xml +++ b/x11-misc/colord/metadata.xml @@ -9,7 +9,5 @@ <flag name="argyllcms">Enable ArgyllCMS sensor</flag> <flag name="extra-print-profiles">Generate extra print profiles. Warning: significant build time and memory requirements.</flag> - <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for - colorimeter drivers</flag> </use> </pkgmetadata> diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest index b64f51ba668..c311c057cff 100644 --- a/x11-misc/compose-tables/Manifest +++ b/x11-misc/compose-tables/Manifest @@ -1 +1,4 @@ -DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7 +DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294 +DIST libX11-1.7.4.tar.xz 1872992 BLAKE2B 6a25e5008ead53be5af7411f51711789eb410473f9aefc49fb4d0bf7227b89c5fd71f0f61fef9bc3f83e585e4815644f42884d5e5cf0bdcdd120abe6fe8a741b SHA512 8bfaaf9fc3081c47152d533d30cdc0b2521bfeb088ff813b041c08ffd518c80ba3725bb68cac7c21b521a4bace546f99424700fe21955b498015d14c2f7f9a57 +DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347 +DIST libX11-1.8.tar.xz 1782508 BLAKE2B 15a41cbcdb54d68cd54b6fa4147d55d277a6c091af7d38341ec261b42c547acf981270ceebec5abb3fcc15da5c1e05b7908114e157555f8184234922e3c05fde SHA512 64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b diff --git a/x11-misc/compose-tables/compose-tables-1.7.2-r1.ebuild b/x11-misc/compose-tables/compose-tables-1.7.3.ebuild index e6d977c1355..884e98ec633 100644 --- a/x11-misc/compose-tables/compose-tables-1.7.2-r1.ebuild +++ b/x11-misc/compose-tables/compose-tables-1.7.3.ebuild @@ -1,9 +1,10 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 XORG_MULTILIB=no +XORG_TARBALL_SUFFIX=xz inherit xorg-3 # Note: please bump this with x11-libs/libX11 diff --git a/x11-misc/compose-tables/compose-tables-1.7.4.ebuild b/x11-misc/compose-tables/compose-tables-1.7.4.ebuild new file mode 100644 index 00000000000..4cdfc490b63 --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.7.4.ebuild @@ -0,0 +1,42 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_MULTILIB=no +XORG_TARBALL_SUFFIX=xz +inherit xorg-3 + +# Note: please bump this with x11-libs/libX11 +DESCRIPTION="X.Org Compose Key tables from libX11" +# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package +SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}" +S="${WORKDIR}/libX11-${PV}/" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# Only needed by configure +DEPEND=" + x11-base/xorg-proto + >=x11-libs/libxcb-1.11.1 + x11-libs/xtrans" +RDEPEND="!<x11-libs/libX11-1.7.0" + +XORG_CONFIGURE_OPTIONS=( + --without-xmlto + --without-fop + --disable-specs + --disable-xkb +) + +src_compile() { + emake -C nls +} + +src_test() { + :; +} + +src_install() { + emake DESTDIR="${D}" -C nls install +} diff --git a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild new file mode 100644 index 00000000000..681b98026ec --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_MULTILIB=no +XORG_TARBALL_SUFFIX=xz +inherit xorg-3 + +# Note: please bump this with x11-libs/libX11 +DESCRIPTION="X.Org Compose Key tables from libX11" +# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package +SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}" +S="${WORKDIR}/libX11-${PV}/" + +KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# Only needed by configure +DEPEND=" + x11-base/xorg-proto + >=x11-libs/libxcb-1.11.1 + x11-libs/xtrans" +RDEPEND="!<x11-libs/libX11-1.7.0" + +XORG_CONFIGURE_OPTIONS=( + --without-xmlto + --without-fop + --disable-specs + --disable-xkb +) + +src_compile() { + emake -C nls +} + +src_test() { + :; +} + +src_install() { + emake DESTDIR="${D}" -C nls install +} diff --git a/x11-misc/compose-tables/compose-tables-1.8.ebuild b/x11-misc/compose-tables/compose-tables-1.8.ebuild new file mode 100644 index 00000000000..64f043d5d3e --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.8.ebuild @@ -0,0 +1,42 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_MULTILIB=no +XORG_TARBALL_SUFFIX=xz +inherit xorg-3 + +# Note: please bump this with x11-libs/libX11 +DESCRIPTION="X.Org Compose Key tables from libX11" +# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package +SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}" +S="${WORKDIR}/libX11-${PV}/" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# Only needed by configure +DEPEND=" + x11-base/xorg-proto + >=x11-libs/libxcb-1.11.1 + x11-libs/xtrans" +RDEPEND="!<x11-libs/libX11-1.7.0" + +XORG_CONFIGURE_OPTIONS=( + --without-xmlto + --without-fop + --disable-specs + --disable-xkb +) + +src_compile() { + emake -C nls +} + +src_test() { + :; +} + +src_install() { + emake DESTDIR="${D}" -C nls install +} diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest index 7deddd722f8..0f51d753732 100644 --- a/x11-misc/devilspie2/Manifest +++ b/x11-misc/devilspie2/Manifest @@ -1 +1 @@ -DIST devilspie2_0.43-src.tar.gz 48666 BLAKE2B 3657693547f1dbdfe8542f123601f228086261855dc8e99997cea76ef586b744aacb260222000300dbe34d3030646044fc046e94c2285e6386995853ceaaffda SHA512 0f44f3991e31f68a2d38eac32ea6fe4275a56e8b5e9439490d1e819fd69b5455ede565aa2b09b70c20ac852c465ac2c05c339ae1e5c1b7824685c46a28871abd +DIST devilspie2-0.44.tar.xz 46028 BLAKE2B e9ec3115781575c331d91e982fd1c71361ea57004a1b7ff234957998d3d44fd4e9a0ca1fde9d133e9e4c2d01b6e8d192921554eae8b83acfb0e3fa44b0c9fd23 SHA512 f01f2d044a670dd9b1b97e896a3e8ebcac3e67daea9f08a14bce26fe8084b85f7fdaa0ed147aba91626200f882eddeba7e0ec18f0f565cb7557ffb2ac74a4a64 diff --git a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild b/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild deleted file mode 100644 index abeaa7126aa..00000000000 --- a/x11-misc/devilspie2/devilspie2-0.43-r100.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} luajit ) -PLOCALES="fi fr it ja nl pt_BR ru sv" - -inherit lua-single plocale toolchain-funcs - -DESCRIPTION="Devilspie like window matching utility, using LUA for scripting" -HOMEPAGE="https://www.nongnu.org/devilspie2/" -SRC_URI="https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${PV}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} - >=dev-libs/glib-2.32.4:2 - >=x11-libs/gtk+-3.4.4:3 - >=x11-libs/libwnck-3.4.4:3 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.43-lua-pkgconfig.patch" -) - -src_compile() { - tc-export PKG_CONFIG - emake CC="$(tc-getCC)" PREFIX="/usr" LANGUAGES="$(plocale_get_locales)" -} - -src_install() { - emake PREFIX="/usr" DESTDIR="${ED}" LANGUAGES="$(plocale_get_locales)" install - einstalldocs - doman devilspie2.1 -} diff --git a/x11-misc/devilspie2/devilspie2-0.44.ebuild b/x11-misc/devilspie2/devilspie2-0.44.ebuild new file mode 100644 index 00000000000..b919988753f --- /dev/null +++ b/x11-misc/devilspie2/devilspie2-0.44.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +inherit lua-single plocale toolchain-funcs + +DESCRIPTION="Window matching utility with Lua scripting" +HOMEPAGE="https://www.nongnu.org/devilspie2/" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +REQUIRED_USE="${LUA_REQUIRED_USE}" + +RDEPEND=" + ${LUA_DEPS} + dev-libs/glib:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXinerama + x11-libs/libwnck:3" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + +src_compile() { + tc-export CC PKG_CONFIG + + local PLOCALES="fi fr it ja nl pt_BR ru sv" + + DEVILSPIE2_ARGS=( + PREFIX="${EPREFIX}"/usr + LANGUAGES="$(plocale_get_locales)" + LUA=${ELUA} + ) + + emake "${DEVILSPIE2_ARGS[@]}" +} + +src_install() { + emake DESTDIR="${D}" "${DEVILSPIE2_ARGS[@]}" install + einstalldocs + + dodoc -r doc/examples +} diff --git a/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch b/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch deleted file mode 100644 index 4b832e6a7fc..00000000000 --- a/x11-misc/devilspie2/files/devilspie2-0.43-lua-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ - endif - --LIB_CFLAGS=$(shell pkg-config --cflags --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua) -+LIB_CFLAGS=$(shell ${PKG_CONFIG} --cflags $(PKG_GTK) $(PKG_WNCK) lua) - STD_LDFLAGS= --LIBS=-lX11 $(shell pkg-config --libs --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua) -+LIBS=-lX11 $(shell ${PKG_CONFIG} --libs $(PKG_GTK) $(PKG_WNCK) lua) - - LOCAL_CFLAGS=$(STD_CFLAGS) $(DEPRECATED) $(CFLAGS) $(LIB_CFLAGS) diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml index 06d84e396dc..e02d812d6f0 100644 --- a/x11-misc/devilspie2/metadata.xml +++ b/x11-misc/devilspie2/metadata.xml @@ -5,4 +5,7 @@ <email>ionen@gentoo.org</email> <name>Ionen Wolkens</name> </maintainer> + <upstream> + <remote-id type="github">dsalt/devilspie2</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest index 1dd247ef321..bb41aa8b1a1 100644 --- a/x11-misc/dex/Manifest +++ b/x11-misc/dex/Manifest @@ -1 +1,2 @@ DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a +DIST dex-0.9.0.tar.gz 10056 BLAKE2B 7abc01ccc6938e926840e4448eb6436db77703c1f8e1fef334d97196803a0b59af0f05fc507d1ac4337367120f7d9d9a211aecec6ac3644424edee3599067a89 SHA512 d68f5482cb0948f27a724437ddfc6de9a0f502bfd0d5c60c76fb85dda3c30e4c432013e530f6a91138c9ac9ff36b3824cd5e382e9d29bb9fb2ec2b9de4133094 diff --git a/x11-misc/dex/dex-0.9.0.ebuild b/x11-misc/dex/dex-0.9.0.ebuild new file mode 100644 index 00000000000..191bf3097bc --- /dev/null +++ b/x11-misc/dex/dex-0.9.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit python-r1 + +DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries" +HOMEPAGE="http://e-jc.de/" +SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="doc" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS}" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx )" + +src_compile() { + # Makefile is for creating man page only + use doc && emake +} + +src_install() { + dobin dex + python_replicate_script "${ED}/usr/bin/dex" + dodoc CHANGELOG.md README.rst + use doc && doman dex.1 +} diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index 849feaa2712..8b4995d4ede 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -1 +1,2 @@ DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3 +DIST dmenu-5.1.tar.gz 16096 BLAKE2B 22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c SHA512 2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453 diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild index a6e9cace9bc..a8602b9f9bb 100644 --- a/x11-misc/dmenu/dmenu-5.0.ebuild +++ b/x11-misc/dmenu/dmenu-5.0.ebuild @@ -40,7 +40,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) \ + emake CC="$(tc-getCC)" \ "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ diff --git a/x11-misc/dmenu/dmenu-5.1.ebuild b/x11-misc/dmenu/dmenu-5.1.ebuild new file mode 100644 index 00000000000..98db03cf8f3 --- /dev/null +++ b/x11-misc/dmenu/dmenu-5.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit savedconfig toolchain-funcs + +DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" +HOMEPAGE="https://tools.suckless.org/dmenu/" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +IUSE="xinerama" + +RDEPEND=" + media-libs/fontconfig + x11-libs/libX11 + x11-libs/libXft + xinerama? ( x11-libs/libXinerama ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-4.9-gentoo.patch +) + +src_prepare() { + default + + sed -i \ + -e 's|^ @| |g' \ + -e '/^ echo/d' \ + Makefile || die + + restore_config config.h +} + +src_compile() { + emake CC="$(tc-getCC)" \ + "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ + "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ + "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ + "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \ + "XINERAMAFLAGS=$( + usex xinerama "-DXINERAMA $( + $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null + )" '' + )" \ + "XINERAMALIBS=$( + usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' + )" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + + save_config config.h +} diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild index bcc3080b34a..49e950d0bb9 100644 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ b/x11-misc/dmenu/dmenu-9999.ebuild @@ -40,7 +40,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) \ + emake CC="$(tc-getCC)" \ "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest index c17bfc8f0b6..fa2968213d5 100644 --- a/x11-misc/dunst/Manifest +++ b/x11-misc/dunst/Manifest @@ -1,2 +1 @@ -DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf4c4de9af87d4eab7dd90b61908f140db3f1238b6a79d370fc3bb89c062c6b4deeefae6c9c0069b55017e907 SHA512 079ffd0ff75f1865b68cb8db261849cbe4f68b5c632c39ef8f7a3d193ff3eba3734bca31cb7268f27c9a411aec56e4c484c383b419bc0b4755b7d80ede84cd96 -DIST dunst-1.7.1.tar.gz 4585838 BLAKE2B 3bc11b4d5e6826ca03b70aa4a2cca38e2d54170cf53e8912d55129ce23eb3bacf618f8242a6be5ddcb35d7d26d6e327b9210492af2898041eae7cdec9acd9f16 SHA512 5e3e0af3cff79b371e38ddf836b53ae65e2ff32d709f7bf29c29445071e98c786d430105aa61b5a80f9c709daa07f02389f141edfd4a3dcfa53b2c667782c9a9 +DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9 diff --git a/x11-misc/dunst/dunst-1.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild deleted file mode 100644 index fb0a1988036..00000000000 --- a/x11-misc/dunst/dunst-1.6.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd toolchain-funcs - -DESCRIPTION="Customizable and lightweight notification-daemon" -HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/dunst-project/dunst" -else - SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="test wayland" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/glib:2 - sys-apps/dbus - x11-libs/cairo[X,glib] - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libnotify - x11-libs/pango[X] - wayland? ( dev-libs/wayland ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-lang/perl - virtual/pkgconfig - wayland? ( dev-libs/wayland-protocols ) -" - -PATCHES=( "${FILESDIR}"/${PN}-1.6.1-no-Os.patch ) - -src_configure() { - tc-export CC PKG_CONFIG - default -} - -src_compile() { - emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 - sed -e "s|##PREFIX##|${EPREFIX}/usr|" \ - dunst.systemd.service.in > dunst.service || die -} - -src_install() { - emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \ - DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - systemd_douserunit dunst.service -} diff --git a/x11-misc/dunst/dunst-1.7.1-r1.ebuild b/x11-misc/dunst/dunst-1.8.1.ebuild index 8eaab62529e..37336b25c79 100644 --- a/x11-misc/dunst/dunst-1.7.1-r1.ebuild +++ b/x11-misc/dunst/dunst-1.8.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=8 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="wayland" DEPEND=" @@ -57,6 +57,7 @@ src_configure() { src_compile() { local myemakeargs=( + SYSCONFDIR="${EPREFIX}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) @@ -67,7 +68,7 @@ src_compile() { src_install() { local myemakeargs=( PREFIX="${ED}/usr" - SYSCONFDIR="${ED}/etc" + SYSCONFDIR="${ED}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild index c26bd529c4b..bb3f803de88 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-9999.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 @@ -57,6 +57,7 @@ src_configure() { src_compile() { local myemakeargs=( + SYSCONFDIR="${EPREFIX}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) @@ -67,7 +68,7 @@ src_compile() { src_install() { local myemakeargs=( PREFIX="${ED}/usr" - SYSCONFDIR="${ED}/etc" + SYSCONFDIR="${ED}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" ) diff --git a/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch b/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch deleted file mode 100644 index 90a1de94de9..00000000000 --- a/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config.mk b/config.mk -index 54426a7..2e18031 100644 ---- a/config.mk -+++ b/config.mk -@@ -36,7 +36,7 @@ endif - - # flags - DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\" --DEFAULT_CFLAGS = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${ENABLE_WAYLAND} -+DEFAULT_CFLAGS = --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${ENABLE_WAYLAND} - DEFAULT_LDFLAGS = -lm -lrt - - CPPFLAGS_DEBUG := -DDEBUG_BUILD diff --git a/x11-misc/e16-keyedit/e16-keyedit-0.9.ebuild b/x11-misc/e16-keyedit/e16-keyedit-0.9-r1.ebuild index 5e260218fef..10b596a42d6 100644 --- a/x11-misc/e16-keyedit/e16-keyedit-0.9.ebuild +++ b/x11-misc/e16-keyedit/e16-keyedit-0.9-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Key binding editor for Enlightenment DR16" HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/" @@ -10,19 +10,17 @@ KEYWORDS="~amd64 ~x86" LICENSE="MIT-with-advertising" SLOT="0" -IUSE="gtk2" BDEPEND=" virtual/pkgconfig " DEPEND=" - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) + x11-libs/gtk+:3 " RDEPEND="${DEPEND} !x11-misc/e16keyedit " src_configure() { - econf --with-gtk=$(usex gtk2 gtk2 gtk3) + econf --with-gtk=gtk3 } diff --git a/x11-misc/e16-keyedit/metadata.xml b/x11-misc/e16-keyedit/metadata.xml index 99c019473c9..c351ebbf5c9 100644 --- a/x11-misc/e16-keyedit/metadata.xml +++ b/x11-misc/e16-keyedit/metadata.xml @@ -5,9 +5,6 @@ <email>bircoph@gentoo.org</email> <name>Andrew Savchenko</name> </maintainer> - <use> - <flag name="gtk2">Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag> - </use> <upstream> <remote-id type="sourceforge">enlightenment</remote-id> </upstream> diff --git a/x11-misc/easystroke/metadata.xml b/x11-misc/easystroke/metadata.xml index 95170589d36..4119740a57f 100644 --- a/x11-misc/easystroke/metadata.xml +++ b/x11-misc/easystroke/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">easystroke</remote-id> </upstream> diff --git a/x11-misc/evolvotron/metadata.xml b/x11-misc/evolvotron/metadata.xml index 5d820e33af8..154ded0b9b6 100644 --- a/x11-misc/evolvotron/metadata.xml +++ b/x11-misc/evolvotron/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">evolvotron</remote-id> </upstream> diff --git a/x11-misc/fbpager/fbpager-20090221-r1.ebuild b/x11-misc/fbpager/fbpager-20090221-r1.ebuild deleted file mode 100644 index f8cd87157bf..00000000000 --- a/x11-misc/fbpager/fbpager-20090221-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -DESCRIPTION="A Pager for fluxbox" -HOMEPAGE="http://git.fluxbox.org/fbpager.git/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~mips ppc ~sparc x86" -IUSE="+xrender" - -DEPEND="x11-libs/libX11 - xrender? ( x11-libs/libXrender )" -RDEPEND="${DEPEND}" - -src_prepare() { - append-cxxflags "-std=c++14" - - default -} - -src_configure() { - econf $(use_enable xrender) -} - -pkg_postinst() { - einfo "To run fbpager inside the FluxBox slit, use fbpager -w" -} diff --git a/x11-misc/fbpager/fbpager-20090221-r2.ebuild b/x11-misc/fbpager/fbpager-20090221-r2.ebuild index 6980614a462..c56f9d59fa2 100644 --- a/x11-misc/fbpager/fbpager-20090221-r2.ebuild +++ b/x11-misc/fbpager/fbpager-20090221-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~mips ppc ~sparc x86" IUSE="+xrender" DEPEND="x11-libs/libX11 diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index bec7e0e0220..94e70477e40 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 toolchain-funcs @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-images.patch "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch + "${FILESDIR}"/${PN}-7.0-python3.10.patch ) src_prepare() { diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch new file mode 100644 index 00000000000..1c7a5c0ac38 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch @@ -0,0 +1,9 @@ +python3.10 does not allow concatenating a string with None and +this shouldn't be ran either way if None. +--- a/configure ++++ b/configure +@@ -75,3 +75,3 @@ + self).add_argument_group(title, description) +- if name != 'help' and len(name.split()) == 1: ++ if name != 'help' and len(name.split()) == 1 and title is not None: + self.add_argument("--help-" + name, group = 'help', diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml index 052217703e6..6237463911e 100644 --- a/x11-misc/fireflies/metadata.xml +++ b/x11-misc/fireflies/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="github">mpcomplete/fireflies</remote-id> - </upstream> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="github">mpcomplete/fireflies</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild index 0b5059a75c4..4f7df3a77d8 100644 --- a/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild +++ b/x11-misc/fraqtive/fraqtive-0.4.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 inherit qmake-utils toolchain-funcs xdg DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals" -HOMEPAGE="https://fraqtive.mimec.org/" +HOMEPAGE="https://fraqtive.mimec.org/ https://github.com/mimecorg/fraqtive" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" diff --git a/x11-misc/fraqtive/metadata.xml b/x11-misc/fraqtive/metadata.xml index 45bdd4629ff..c8122e8ebae 100644 --- a/x11-misc/fraqtive/metadata.xml +++ b/x11-misc/fraqtive/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">fraqtive</remote-id> - </upstream> +<!-- maintainer-needed --> + <upstream> + <remote-id type="sourceforge">fraqtive</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest deleted file mode 100644 index 1e52ffdd565..00000000000 --- a/x11-misc/gcolor2/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gcolor2-0.4.tar.gz 375217 BLAKE2B c8bc8581c9790106a9461cda03e40c201faec95c9c0d7890dbb8903346a85208c506dd8c9cd0735036b4a294205f44c857edbae8282574d195e77f4954bae91c SHA512 9b9677b4be8797c9b03deef9bf1b96e6497d2adf85f74d01f1b478f04d92cb912790c4d5fb74f403295219cac6c0d3fcabaa7de340975bbcdb68b0347f6042a3 -DIST gcolor2.svg 12742 BLAKE2B 40f5e6624a0a90d8d8c81dd5814d836741bab04f19d73cfbd96f224baa78165447d1642c18a55ef282771a02de4bddd77d975c4aa75bb74b98d63227f87031ea SHA512 377dbd494e5a3f881df65415ee66310cd96b4e4ac668101aa068bfe6f575b694c930817cec942e885f93465d05ccc604950f2154e26be95618d6f272d81ffe1b diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch b/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch deleted file mode 100644 index cd06a8315f9..00000000000 --- a/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c ---- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 -+++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 -@@ -4,6 +4,9 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "callbacks.h" - #include "interface.h" -@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate - gtk_clipboard_set_text (cb, hex, strlen (hex)); - } - -+void add_rgb_file (gchar *filename, gchar *type); -+gchar* get_system_file (void); -+ - void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data) - { - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) -@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton * - gtk_widget_destroy (savedialog); - } - -+void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color); -+ - void add_color_to_treeview () - { - GtkTreeView *treeview; -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c ---- gcolor2-0.4.orig/src/main.c 2005-07-11 10:55:49.000000000 -0400 -+++ gcolor2-0.4/src/main.c 2007-02-17 19:18:23.000000000 -0500 -@@ -4,6 +4,10 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "interface.h" - #include "support.h" diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch b/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch deleted file mode 100644 index f30552a13e6..00000000000 --- a/x11-misc/gcolor2/files/gcolor2-0.4-fno-common.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/src/callbacks.c -+++ b/src/callbacks.c -@@ -13,6 +13,9 @@ - #include "support.h" - - -+GtkWidget *gcolor2; -+GtkWidget *menu; -+GdkColor colorvalue; - GtkWidget *savedialog; - gchar *colorname; - static GtkWidget *aboutdialog = NULL; ---- a/src/callbacks.h -+++ b/src/callbacks.h -@@ -42,9 +42,9 @@ - "\302\267 Usability / user interface enhancements\n" \ - "\302\267 Code cleanup" - --GtkWidget *gcolor2; --GtkWidget *menu; --GdkColor colorvalue; -+extern GtkWidget *gcolor2; -+extern GtkWidget *menu; -+extern GdkColor colorvalue; - - enum - { diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch deleted file mode 100644 index c3fcca0af71..00000000000 --- a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -26,6 +26,7 @@ - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - AC_PROG_INTLTOOL([0.27]) -+PKG_PROG_PKG_CONFIG - - - GETTEXT_PACKAGE=gcolor2 diff --git a/x11-misc/gcolor2/files/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch deleted file mode 100644 index 798fe57e2e3..00000000000 --- a/x11-misc/gcolor2/files/modular-rgb.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/callbacks.h -+++ b/src/callbacks.h -@@ -12,6 +12,7 @@ - #define SYSTEM_FILE_2 "/usr/lib/X11/rgb.txt" - #define SYSTEM_FILE_3 "/etc/X11/rgb.txt" - #define SYSTEM_FILE_4 "/usr/openwin/lib/X11/rgb.txt" -+#define SYSTEM_FILE_5 "/usr/share/X11/rgb.txt" - - /* about dialog text */ - #define ABOUT_CREDITS_TEXT "Developer:\n" \ ---- a/src/main.c -+++ b/src/main.c -@@ -36,6 +36,8 @@ - sys_filename = SYSTEM_FILE_3; - else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS)) - sys_filename = SYSTEM_FILE_4; -+ else if (g_file_test (SYSTEM_FILE_5, G_FILE_TEST_EXISTS)) -+ sys_filename = SYSTEM_FILE_5; - else - return FALSE; - return TRUE; diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild deleted file mode 100644 index ec842bfb9d4..00000000000 --- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop xdg - -DESCRIPTION="A GTK+ color selector" -HOMEPAGE="http://gcolor2.sourceforge.net" -SRC_URI=" - mirror://sourceforge/${PN}/${P}.tar.gz - https://dev.gentoo.org/~pacho/gnome/${PN}.svg" - -LICENSE="GPL-2 public-domain" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" - -RDEPEND=">=x11-libs/gtk+-2.4:2" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-util/intltool-0.27 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/modular-rgb.patch - "${FILESDIR}"/${P}-amd64.patch - "${FILESDIR}"/${P}-pkg-config-macro.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_prepare() { - xdg_src_prepare - - # To check at each bump. - sed "s/^#.*/[encoding: UTF-8]/" -i po/POTFILES.in || die "sed failed" - echo "gcolor2.glade" >> po/POTFILES.in || die - - eautoreconf -} - -src_install() { - default - - # Icon from https://sourceforge.net/p/gcolor2/patches/5/ - doicon -s scalable "${DISTDIR}/${PN}.svg" - make_desktop_entry ${PN} Gcolor2 ${PN} Graphics -} diff --git a/x11-misc/gcolor2/metadata.xml b/x11-misc/gcolor2/metadata.xml deleted file mode 100644 index b025a2b2520..00000000000 --- a/x11-misc/gcolor2/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">gcolor2</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest index e80b091a12e..40da6f970f6 100644 --- a/x11-misc/gpaste/Manifest +++ b/x11-misc/gpaste/Manifest @@ -1 +1 @@ -DIST gpaste-3.36.3.tar.gz 186352 BLAKE2B b00af3f32076bbeb4f06853a7892772901d0c72dd972d08fff0520afae388bed0c9eee81892a2492f4bb972b3a80a924519e1c137edb660fa5f9dfa2fab31856 SHA512 e5fe4a31367e96089aefd1af5ed0a3ad591eee009bbc74b1b33c9c736061831979d79f2d6a5c072cf55fc6f1982ade581fe73d2039c5dbd607081683860c7b9f +DIST gpaste-3.42.5.tar.gz 301630 BLAKE2B bb1151ab67a798322a2c23cdc12581bf7c660dd9d7769725afe30d34619dabc6550f2ad1b22ed00f350ed8ef07230ca1de9cbd777e816959849f71d59d8cdd82 SHA512 e9ef9403131aefc5c8b5452053feaad1061274e6b2b77efd9012da418d154017833789764d8e834fcd82164948111d21000909943bd102cc9932770af7e58ebb diff --git a/x11-misc/gpaste/gpaste-3.36.3.ebuild b/x11-misc/gpaste/gpaste-3.42.5.ebuild index c80647c39d7..ab7970b32e4 100644 --- a/x11-misc/gpaste/gpaste-3.36.3.ebuild +++ b/x11-misc/gpaste/gpaste-3.42.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -VALA_MIN_API_VERSION="0.30" +VALA_MIN_API_VERSION="0.42" VALA_USE_DEPEND="vapigen" inherit meson vala gnome2-utils @@ -23,20 +23,20 @@ REQUIRED_USE=" DEPEND=" dev-libs/appstream-glib - >=dev-libs/glib-2.48:2 + >=dev-libs/glib-2.7:2 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 - >=x11-libs/gtk+-3.20:3 + >=x11-libs/gtk+-3.24:3 x11-libs/libX11 x11-libs/libXi x11-libs/pango gnome? ( - >=x11-wm/mutter-3.36 + >=x11-wm/mutter-41.3 ) introspection? ( dev-libs/gjs >=dev-libs/gobject-introspection-1.48.0 - >=x11-wm/mutter-3.36[introspection] + >=x11-wm/mutter-41.3[introspection] ) " BDEPEND=" diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r1.ebuild index 83184db0136..5c81d81cc75 100644 --- a/x11-misc/gromit/gromit-20041213-r1.ebuild +++ b/x11-misc/gromit/gromit-20041213-r1.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 @@ -25,7 +25,7 @@ PATCHES=( src_compile() { tc-export PKG_CONFIG - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest index bc52d8a3e59..731607b7d39 100644 --- a/x11-misc/grub2-theme-preview/Manifest +++ b/x11-misc/grub2-theme-preview/Manifest @@ -1,2 +1,2 @@ -DIST grub2-theme-preview-2.3.0.tar.gz 198904 BLAKE2B d6dfb1f98bfcc472de9c2f61ea58e18c72f37346cbaca0b68db0a07febba9d972d8760b38867f3a8b39e13b6884dc1868ef1c8667259f761c35c4dbad415e33b SHA512 fc170cc7f72773d4c8ecb809b95c2ead33e292ed1e854a08a7c3c9b20a0d2b3a85658795f92eb72ecb4a68dd9e4442e3d779a62a605a14d826c2560855e9ea06 -DIST grub2-theme-preview-2.4.1.tar.gz 199152 BLAKE2B dfc7f862f8276b37cab60226319210bd20a246ec01e18b1434f802300770435c8195278c64bc8dfe28ade95dd9969bbce11ab751e836edd013cc8524bf1a1d17 SHA512 13571d01d47f276b2516e379a249b3134fdf10119ed07267e44e6a429642ad816c557d81d52443cacfe20e7a46709a58e7c787000fd92d08caec8974d3af5ce0 +DIST grub2-theme-preview-2.5.0.tar.gz 202863 BLAKE2B 62d83cec805f7b65f6469ba22849c4b5cb0e4b845f9bfaea7aed6b05a997fc8d15b8804b2fe0bb75b0ad40f39ed215e8bd711cc4f7bda6f5decf66f38e4f0213 SHA512 83780bc581b3194cda6a47460e16ccf6cf520c8c9f52c19f8bd2779b5ba7e834c83821da47439d8d110770b573424a69ab0801a680983325e8fd6652d7a0652c +DIST grub2-theme-preview-2.6.0.tar.gz 202962 BLAKE2B 61349270e339a4e82efa57c5ff67bc23e07eb94744a0539e544ce21ec6db26525938403e053af2d07e00f7bb2c75e801f6c688c149858456bf0d794030a72287 SHA512 9a2fc6a9270a10d00c6a7a711a28264f188cd15ca4bc1a84a80cf9e9255af824f65cac457db9a4f78bd0d8c954f7e1a8a4ed51b43e8b6949fabb267dcc2d0f16 diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0-r1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0-r1.ebuild deleted file mode 100644 index b4a6ce2f5cb..00000000000 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit distutils-r1 - -DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU" -HOMEPAGE="https://github.com/hartwork/grub2-theme-preview" -SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="grub_platforms_efi-64" - -RDEPEND="app-emulation/qemu - dev-libs/libisoburn - sys-fs/mtools - grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_efi-64] - sys-firmware/edk2-ovmf - ) - !grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_pc] - ) -" diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.4.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.5.0.ebuild index b4a6ce2f5cb..9c69943a3a5 100644 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.4.1.ebuild +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.5.0.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="7" @@ -27,3 +27,6 @@ RDEPEND="app-emulation/qemu sys-boot/grub:2[grub_platforms_pc] ) " +DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )" + +distutils_enable_tests pytest diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.6.0.ebuild index 6ff7801b0bf..f11369c1652 100644 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.3.0.ebuild +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.6.0.ebuild @@ -1,10 +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..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 @@ -28,3 +27,6 @@ RDEPEND="app-emulation/qemu sys-boot/grub:2[grub_platforms_pc] ) " +DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )" + +distutils_enable_tests pytest diff --git a/x11-misc/gtk2fontsel/Manifest b/x11-misc/gtk2fontsel/Manifest deleted file mode 100644 index 468d1af2603..00000000000 --- a/x11-misc/gtk2fontsel/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gtk2fontsel-0.1.tar.gz 60706 BLAKE2B e1269d0dadf09fb7332dff983aa13bc42d30860acb55779e1ffdc0079d71f500f33d0db213afc1bf6cf931a59fd9ce7464d180aab5c7c34f6a80a9141316830a SHA512 5854777853bd41da7465321bf0f73062b98979bbecc727c3a611aa193e4d436d388fea9492b8bb11f26fa97cd4a7716c34b6a621c0a6448708ca207493998294 diff --git a/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild b/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild deleted file mode 100644 index 56c2a137042..00000000000 --- a/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A font selection tool similar to xfontsel" -HOMEPAGE="http://gtk2fontsel.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" diff --git a/x11-misc/gtk2fontsel/metadata.xml b/x11-misc/gtk2fontsel/metadata.xml deleted file mode 100644 index b28a2290b5c..00000000000 --- a/x11-misc/gtk2fontsel/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">gtk2fontsel</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml index aa14c0976d5..756afb6ff8d 100644 --- a/x11-misc/gtkdialog/metadata.xml +++ b/x11-misc/gtkdialog/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> gtkdialog is a GUI-creation utility that can be used with an arbitrary interpreter. It enables the programmer to describe a graphical user interface diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest deleted file mode 100644 index ce4b06b9268..00000000000 --- a/x11-misc/habak/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277 diff --git a/x11-misc/habak/files/README.en b/x11-misc/habak/files/README.en deleted file mode 100644 index 0bdbc259119..00000000000 --- a/x11-misc/habak/files/README.en +++ /dev/null @@ -1,165 +0,0 @@ -Habak - "Ha" Background -========= - -Compilation: - We need a compiler, X server and Imlib2. Just run make, that's all. - -Installation: - Well, place a ready binary where you want. - -A short review: - - -Habak is using layers. The lowest layer is just a black screen. -On this you can place other objects, called habaks. There are -three kinds of habaks: graphic files (images), fonts and "internal objects" -(internals). Wallaper is created by putting on a black screen -one or more habaks. An order of habaks in command line is an order -of putting them on desktop, so the last habak will be drawed above -previous habaks. - -Kinds of habaks: - - -Files (images) are included by -i option, ie: - -./habak -i ~/graphics/wallpaper.jpg - -will include to desktop wallpaper.jpg file. If you typed after -i not a file, -but a directory, habak would create a list of files contained within, randomly -select any one of them, and then try to load it. In other words, -if you have a lot of pictures in ~/gfx/nice_wallpapers/ then habak -can choose random image. You only need to run './habak -i ~/gfx/nice_wallpapers/' - -Aside from files, you can use fonts (TrueType). Option -f will be useful in this -case. By means of -f option you have to point a file with TrueType font, ie. - -./habak -f ~/.fonts/nice_font.ttf - -You can set a size of font, by typing it following slash after font name, ie -'./habak -f ~/.fonts/nice_font.ttf/50' - -Third (and last) type of habaks are internal habaks. You can enable them -by the -I option. They are not adopting any external data, but -themself generate some patterns. At this moment only two patterns -are available, "int" and "INT", which do an interlacing. For example: - -./habak -I int - -Internal habak "int" do an interlacing, by turning out even lines -of image. Very nice effect, especially if wallpaper is gaudy. -"INT" habak works identical as "int", but turns out odd lines -(by putting together "int" and "INT" you can turn out all lines of screen). - -By default lines aren't turned out in fact, but darked (in my opinion -it generates a better effect), but you can control it by --c color modifier (i will tell about it later). - - -USAGE PHILOSOPHY -You can (and you should to) put habaks together, ie. - -./habak -i ~/gfx/cool.jpg -I int -i ~/gfx/small_logo.png -f ~/.fonts/deltafont.ttf -f ~/.fonts/deltafont.ttf/10 - -that syntax means, that habak will firstly draw coll.jpg file, -then put on internal habak "interlace", and then will draw small_logo.png -image, then deltafont.ttf font, and eventually one more time deltafont.ttf -file, but this time with size of 10 pixels. Simple. - -MODIFIERS -Obviously, alone habaks wouldn't be so elastic, so there are available a lot -of modifiers that affect on them look. Some modifiers are even -necessary. Modifiers are options, that are given following -a definition of any habak - they affect only just followed habak. - -Modifier -C --C is a centering modifier. Habak that is followed by this modifier will be -centered on the screen. - -Modifier -S --S is a scaling modifier. Habak treated by this modifier will be scaled -to fill whole screen (but with proportions saved). Using it have a sense -only for file habaks (images). - -Modifier -p --p is a position modifier. It precisely determines position of habak -on desktop. This modifier requires also additional parameter, in the -form of 'x,y', ie. - -./habak -i ~/gfx/meggy.jpg -p 10,50 - -will render meggy.jpg file with upper-left corner in point 10,50 on desktop. -Coortinates can be negative, so position will be calculated from the -opposite side of screen, ie. - -./habak -i ~/gfx/meggy.jpg -p -10,50 - -will calculate "the beggining" position of habak to a ten pixels from -right and 50 pixels from upper side of screen. To place habak for example -in upper-right corner, you should use '-p -0,0' - -Modifier -c --c is a color modifier. Some habaks supports choosing a color -(at this time only font habaks and internal habaks). -C option -require parameter, that describe color in form of R,G,B,A, ie. - -./habak -I int -c 50,60,70,190 - -means using "int" habak with color: -- red component set to 50 -- green component set to 60 -- blue component set to 70 -- alpha channel set to 190 - -All numbers accepts numbers from 0 (minimal saturation) to 255 -(maximal saturation). - -For example '-c 0,0,0,255' means black, fully not transparent color, -'-c 255,255,255,0' means white, fully transparent color (so just -not visible), and '-c 200,0,0,128' is a strong red and transparent -in 50% color. - -Modifier -t -This modifier is a text modifier, works only with font habak. -As parameter accepts only one line of text, that is rendered -by the font habak. Any text is accepted, you can write kernel -version, date, your name, name of favourite distribution or -image of cat that have a lie-in on your printer. Select something, -i like a date, text will be nicely antialiased, if you want to use -not ASCII characters, you have to use utf-8 encoding. - -For example. - -./habak -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-0 -c 240,240,240,200 - -will render on a black screen for example text "User gregory on day -2003-12-21", using deltafont.ttf font in size of 15 pixels. Text -will be placed in lower-left corner of screen, gray color and will -be transparent a little. - -Obviously it is a so simple example, you can complicate it: - -./habak -i /usr/local/share/backgrounds/lens -C -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-0 -c 240,240,240,200 - -Now on the background firstly will be placed centered image -from /usr/local/share/backgrounds/lens directory, and that -text will be rendered on it. You can complicate it yet: - -./habak -i /usr/local/share/backgrounds/lens -C -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 5,-0 -c 240,240,240,100 -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-5 -c 240,240,240,255 - -This situation is simpilar, but i complicated text a little - -i generats *two* font habaks with the same content, but -one of it is displacemented a little, and have smaller -transparency. It gives so nice effect of shadow under text. By -putting together *several* such shadows differenced in size of font -and intensivity of transparency you can achieve fantastic effects. - -Finally, fire up: - -./habak -i /usr/local/share/backgrounds/lens -C -I int -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 5,-0 -c 240,240,240,100 -f ~/.fonts/deltafont.ttf/15 -t "User $USER on day `date +%Y-%m-%d`" -p 0,-5 -c 240,240,240,255 - -Here i added an internal habak "interlace", between picture -from /usr/local/share/backgrounds/lens and font habaks, so -image is faced by small grid of interlacing, but text is not -(because it is placed above interlacing). - diff --git a/x11-misc/habak/files/habak-0.2.5-fno-common.patch b/x11-misc/habak/files/habak-0.2.5-fno-common.patch deleted file mode 100644 index 0fad5f4df56..00000000000 --- a/x11-misc/habak/files/habak-0.2.5-fno-common.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/random.c -+++ b/src/random.c -@@ -8,12 +8,15 @@ - #include <regex.h> - - #include <errno.h> -+ -+#include "i.h" -+ - extern int errno; - int syserr; - - #define ALLOC_STEP 1000 - regex_t regexp; --int size_files=0, used_files=0, i=0; -+int size_files=0, used_files=0; - char **files, *wyjscie; - regmatch_t matchpos; - ---- a/src/habak.c -+++ b/src/habak.c -@@ -14,6 +14,7 @@ - #include <Imlib2.h> - #include "types.h" - #include "proto.h" -+#include "i.h" - - habak_l *current_list_item=NULL, *first_list_item=NULL; - habak_t *current_habak; ---- /dev/null -+++ b/src/i.h -@@ -0,0 +1 @@ -+extern int i; diff --git a/x11-misc/habak/files/habak-0.2.5-gentoo.patch b/x11-misc/habak/files/habak-0.2.5-gentoo.patch deleted file mode 100644 index 2dd77451f8a..00000000000 --- a/x11-misc/habak/files/habak-0.2.5-gentoo.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/Makefile ---- b/src/Makefile -@@ -2,22 +2,22 @@ - #LDFLAGS = -L/usr/X11R6/lib -lImlib2 -lm -g -ggdb - - CFLAGS += -I/usr/X11R6/include -Wall --LDFLAGS += -L/usr/X11R6/lib -lImlib2 -lm -+LIBS = -lm $(shell $(PKG_CONFIG) --libs imlib2 x11) - - all: habak - ln -f habak ../habak - - habak: xcore.o random.o habak.o -- gcc $(LDFLAGS) -o habak xcore.o random.o habak.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o habak xcore.o random.o habak.o $(LIBS) - - habak.o: habak.c types.h defaults.h proto.h -- gcc $(CFLAGS) -c habak.c -o habak.o -+ $(CC) $(CFLAGS) -c habak.c -o habak.o - - random.o: random.c proto.h -- gcc $(CFLAGS) -c random.c -o random.o -+ $(CC) $(CFLAGS) -c random.c -o random.o - - xcore.o: xcore.c -- gcc $(CFLAGS) -c xcore.c -o xcore.o -+ $(CC) $(CFLAGS) -c xcore.c -o xcore.o - - clean: - rm habak *.o diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild deleted file mode 100644 index 4f033af7e17..00000000000 --- a/x11-misc/habak/habak-0.2.5-r3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="A simple but powerful tool to set desktop wallpaper" -HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/" -SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" - -RDEPEND=" - media-libs/imlib2[X] - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en ) -PATCHES=( - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-gentoo.patch -) - -src_compile() { - tc-export CC PKG_CONFIG - emake -C src ${PN} -} - -src_install() { - dobin src/${PN} - einstalldocs -} diff --git a/x11-misc/habak/metadata.xml b/x11-misc/habak/metadata.xml deleted file mode 100644 index 3ab9b4a739d..00000000000 --- a/x11-misc/habak/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> -</pkgmetadata> diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest index 5cebdc38823..8691957b4ef 100644 --- a/x11-misc/i3blocks-contrib/Manifest +++ b/x11-misc/i3blocks-contrib/Manifest @@ -1,2 +1 @@ -DIST i3blocks-contrib-1.4.0_p20201127.tar.gz 738457 BLAKE2B 1db16c40323d0c191bb44c50d6a66523391adfdf9652976f78238fffe0ee50d99d3bd6fbcfd1a0eeef8308fd466a3eeda479299f462b4d4d31ae2f2bc7ea6b31 SHA512 ff09c7b8e4b630d014f0441342835dbf03642f32de6806a1204eccb6166eade190abe43b331ef72aaa3ba5a77f9690ae8c36a9ef9aa6d312ae5e543a46b99a72 DIST i3blocks-contrib-2.0.0.tar.gz 840332 BLAKE2B e220566edea4249c25ac80dcba3e24fc37de842049ad072a14fd5003e298ec9a4b4f36cd3937682ab00355b1f1c3fc7ea795ac6593f24aed2438b465ad338d8f SHA512 30cf9297e710a2d685b275d424de817e7940a487c615e64ffaf15e0f90e937bedbd3921dfeece081e32f720b6add92c0790fa7a29e4e8f81f85c3a74cbcea835 diff --git a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch deleted file mode 100644 index 15d36b130db..00000000000 --- a/x11-misc/i3blocks-contrib/files/i3blocks-contrib-respect-CFLAGS.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur a/bandwidth2/Makefile b/bandwidth2/Makefile ---- a/bandwidth2/Makefile 2021-02-02 07:03:47.002894030 -0600 -+++ b/bandwidth2/Makefile 2021-02-02 07:05:21.556854777 -0600 -@@ -1,6 +1,6 @@ - P=bandwidth2 - OBJECTS= --CFLAGS=-g -Wall -Werror -O2 -std=c11 -+CFLAGS ?= -g -Wall -Werror -O2 -std=c11 - LDLIBS= - - $(P): $(OBJECTS) -diff -ur a/cpu_usage2/Makefile b/cpu_usage2/Makefile ---- a/cpu_usage2/Makefile 2021-02-02 07:03:47.004894029 -0600 -+++ b/cpu_usage2/Makefile 2021-02-02 07:05:51.138842328 -0600 -@@ -1,6 +1,6 @@ - P=cpu_usage2 - OBJECTS= --CFLAGS=-g -Wall -Werror -O2 -std=gnu11 -+CFLAGS ?= -g -Wall -Werror -O2 -std=gnu11 - LDLIBS= - - $(P): $(OBJECTS) diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild deleted file mode 100644 index 517105977ba..00000000000 --- a/x11-misc/i3blocks-contrib/i3blocks-contrib-1.4.0_p20201127.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit optfeature vcs-snapshot - -COMMIT=154001e5713c26c70063446022919225b6f916f0 - -DESCRIPTION="A set of scripts for i3blocks, contributed by the community" -HOMEPAGE="https://github.com/vivien/i3blocks-contrib" -SRC_URI="https://github.com/vivien/i3blocks-contrib/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" - -DEPEND="" -RDEPEND="!<x11-misc/i3blocks-1.5 - >=x11-misc/i3blocks-1.5" -BDEPEND="" - -PATCHES=( "${FILESDIR}"/${PN}-respect-CFLAGS.patch ) - -src_prepare() { - sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile - default -} - -src_install() { - emake DESTDIR="${D}" PREFIX=/usr install -} - -pkg_postinst() { - optfeature_header "The following deps may be required for certain ${PN} scripts:" - optfeature "backlight" sys-power/acpilight x11-apps/xbacklight - optfeature "battery{,2,bar}" sys-power/acpi - optfeature "cpu_usage" app-admin/sysstat - optfeature "disk-io" app-admin/sysstat - optfeature "email" dev-python/keyring gnome-base/gnome-keyring - optfeature "gpu-load" x11-drivers/nvidia-drivers app-misc/radeontop - optfeature "kbdd_layout" x11-misc/kbdd - optfeature "key_light" sys-power/upower - optfeature "kubernetes" sys-cluster/kubectl - optfeature "monitor_manager" "dev-lang/python[tk] media-fonts/fontawesome x11-apps/xrandr" - optfeature "rofi-calendar" x11-misc/rofi - optfeature "ssid and wlan-dbm" net-wireless/iw - optfeature "temperature" sys-apps/lm-sensors - optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv x11-misc/xclip net-misc/youtube-dl" -} diff --git a/x11-misc/i3status/i3status-2.14.ebuild b/x11-misc/i3status/i3status-2.14.ebuild index a79b79410fe..7c79b758c1c 100644 --- a/x11-misc/i3status/i3status-2.14.ebuild +++ b/x11-misc/i3status/i3status-2.14.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit fcaps autotools meson +inherit fcaps meson DESCRIPTION="generates a status bar for dzen2, xmobar or similar" HOMEPAGE="https://i3wm.org/i3status/" diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml index cca318ab811..5e2d40ca239 100644 --- a/x11-misc/i855crt/metadata.xml +++ b/x11-misc/i855crt/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <longdescription lang="en"> i855crt is a tool to send the output of a i855-based graphic card to the external VGA, primarily used for presentations. diff --git a/x11-misc/iconbox/iconbox-0.2.ebuild b/x11-misc/iconbox/iconbox-0.2.ebuild index 5e38129b6e8..3e0ccd702c2 100644 --- a/x11-misc/iconbox/iconbox-0.2.ebuild +++ b/x11-misc/iconbox/iconbox-0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 MY_P=${P/-/_} DESCRIPTION="App for placing icons in a menu which auto-hides" -HOMEPAGE="https://packages.gentoo.org/" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" SRC_URI="mirror://gentoo/${MY_P}.tar.gz" LICENSE="GPL-2" diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild index 8a8d8c7525b..1ad6b767f43 100644 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18.ebuild +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -10,6 +10,7 @@ MY_PV="r${PV}" DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop" HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop" SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3+" SLOT="0" @@ -20,8 +21,6 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-cpp/catch:1 )" RDEPEND="dmenu? ( x11-misc/dmenu )" -S="${WORKDIR}/${PN}-${MY_PV}" - src_prepare() { cmake_src_prepare diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest index ef201b6237d..f8ca7508572 100644 --- a/x11-misc/kdocker/Manifest +++ b/x11-misc/kdocker/Manifest @@ -1,2 +1,2 @@ -DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64 DIST KDocker-5.3.tar.gz 180861 BLAKE2B b9ee9c2b035fb477e947b1b451d55e76fb4d9ae8788469fc2d05e1721b5ab71657e00e31331b5be6cf8776b37b7032720d4609df29f57e5c66a44d9fc5d38318 SHA512 8e5af389c402f337c75f861b4cc83036486903a9728fbcb6ea812392c297203fad7eec4e7b11eb1db83514fd615094ab9826277b73312ae8ea13b012d82524c4 +DIST KDocker-5.4.tar.gz 181166 BLAKE2B 7a301cd36f73112f5a6df6ce65fc11c30b16089ccec98f46d435694b2bfb373eac11c2ba3be5c4e56a56cec1f5fad9bc17b014e47e55f886f0685b6f11707c51 SHA512 1bc1bc445ccc2406f3fe21deb68d9654b3d384ab88bce4bc49f123c343ece3dcc3dfdc49b796f6ad5251d050e57b4ad13e1900851519b3643263137550f0ccc9 diff --git a/x11-misc/kdocker/files/qt-5.14.patch b/x11-misc/kdocker/files/qt-5.14.patch deleted file mode 100644 index ca1237965aa..00000000000 --- a/x11-misc/kdocker/files/qt-5.14.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1579ee388749a7b056ccdd8ef2d4deafe21bd3e7 Mon Sep 17 00:00:00 2001 -From: Nikos Chantziaras <realnc@gmail.com> -Date: Mon, 30 Dec 2019 16:03:16 +0200 -Subject: [PATCH] Fix building with Qt 5.14 - -Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a -'None' macro. Work around the resulting mess by temporarily undefining the -macro. ---- - src/trayitem.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/trayitem.h b/src/trayitem.h -index 7698ea4..4b54cdd 100644 ---- a/src/trayitem.h -+++ b/src/trayitem.h -@@ -21,6 +21,10 @@ - #ifndef _TRAYITEM_H - #define _TRAYITEM_H - -+// Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a 'None' macro. -+#pragma push_macro("None") -+#undef None -+ - #include <QAction> - #include <QEvent> - #include <QIcon> -@@ -32,6 +36,10 @@ - - #include "xlibutil.h" - -+#ifndef None -+#pragma pop_macro("None") -+#endif -+ - #define DEFAULT_CustomIcon QString() - #define DEFAULT_BalloonTimeout 4000 // 4 seconds - #define DEFAULT_SkipTaskbar false diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.4.ebuild index e75cbf9228c..43d293885e6 100644 --- a/x11-misc/kdocker/kdocker-5.2.ebuild +++ b/x11-misc/kdocker/kdocker-5.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit bash-completion-r1 qmake-utils xdg @@ -12,7 +12,7 @@ SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.ta LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND=" @@ -29,10 +29,6 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO ) -PATCHES=( - "${FILESDIR}"/qt-5.14.patch -) - S=${WORKDIR}/${MY_P} src_prepare() { @@ -40,6 +36,8 @@ src_prepare() { sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \ kdocker.pro || die "sed failed" + sed -i -e 's|/usr/share/appdata|/usr/share/metainfo|g' kdocker.pro \ + || die "sed failed" } src_configure() { diff --git a/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch b/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch new file mode 100644 index 00000000000..5b73598a43e --- /dev/null +++ b/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch @@ -0,0 +1,24 @@ +From 04499b5e063e5595f66d7624be851a53d85a5948 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 21 Mar 2022 21:00:59 +0100 +Subject: [PATCH] Add missing find_package for KCoreAddons + +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31fc597..2773638 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,6 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED + COMPONENTS ++ CoreAddons + Config + Crash + DocTools +-- +GitLab + diff --git a/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch b/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch new file mode 100644 index 00000000000..f08cb9459cb --- /dev/null +++ b/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch @@ -0,0 +1,24 @@ +From 2894243edd8c636d9855615522300b4361e2f258 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 20 Mar 2022 18:07:50 +0100 +Subject: [PATCH] Add missing KCoreAddons link + +--- + src/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7f510b8..be8805d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -10,6 +10,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + endif() + + target_link_libraries(kronometer ++ KF5::CoreAddons + KF5::Crash + gui) + +-- +GitLab + diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.2.3.ebuild index efd9ec24975..df7872459d8 100644 --- a/x11-misc/kronometer/kronometer-2.2.3.ebuild +++ b/x11-misc/kronometer/kronometer-2.2.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Stopwatch application" -HOMEPAGE="https://apps.kde.org/en/kronometer https://userbase.kde.org/Kronometer" +HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer" SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" LICENSE="GPL-2+" @@ -31,3 +31,8 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-missing-dep.patch" + "${FILESDIR}/${P}-missing-link.patch" +) diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest index fb5cc8b8f5c..65576df0893 100644 --- a/x11-misc/libinput-gestures/Manifest +++ b/x11-misc/libinput-gestures/Manifest @@ -1 +1,2 @@ DIST libinput-gestures-2.56.tar.gz 26293 BLAKE2B b48a33c13efc63545bcb5ae722066493bd6aba083a07b1ebbf10eea69afa2a8f9d80a92b60dda3e8472a55851b70e84cf7c10e0bf3428c2278dd3ef5b6f65d0d SHA512 f215444dbe7e70ae137404beb25d5a60c5a618fb2d3d20eb9b4cf3f94cbc93a7e42a5fa82efdea082e2fa229c95d86c02df91c59f4a51c067e47ccf5dcf79fa7 +DIST libinput-gestures-2.73.tar.gz 28771 BLAKE2B 9f3c546b637b0038431517e2df5e3dfba4fbb7db708f108dd7a979e6674b2bdd44b2b877b5e200c05373a57bfeffefadfde59bc6c403f7188e349c2e051d8683 SHA512 8e46931c76541eb836b1bd79295f05fdc0e22091d1693eac1cc9c16407830806f9e56819e5fb8ba3eed7a26664946010d24d62d99131bcf71b1d8a3682f34ec6 diff --git a/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch new file mode 100644 index 00000000000..4d14f13f2b8 --- /dev/null +++ b/x11-misc/libinput-gestures/files/libinput-gestures-2.73-python-39-tests.patch @@ -0,0 +1,13 @@ +diff --git a/internal b/internal +index 432179d..6898173 100755 +--- a/internal ++++ b/internal +@@ -1,7 +1,7 @@ + #!/usr/bin/env python3 + 'Command line program to exercise/test/debug the _internal command.' + # Mark Blakeney, Oct 2019 +-import sys, importlib, argparse ++import sys, importlib.util, importlib.machinery, argparse + from pathlib import Path + + CMD = '_internal' diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild new file mode 100644 index 00000000000..0335db2c4cf --- /dev/null +++ b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit python-single-r1 xdg + +DESCRIPTION="Actions gestures on your touchpad using libinput" +HOMEPAGE="https://github.com/bulletmark/libinput-gestures" +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git" +else + SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +# This is completely broken +RESTRICT="test" + +RDEPEND="${PYTHON_DEPS} + dev-libs/libinput + x11-misc/wmctrl + x11-misc/xdotool +" +DEPEND=" + dev-libs/libinput + dev-util/desktop-file-utils +" + +PATCHES=( + "${FILESDIR}/${P}-python-39-tests.patch" +) + +src_prepare() { + default + + # Fix docdir installation path + sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \ + || die "sed failed for libinput-gestures-setup" +} + +src_test() { + emake test +} + +src_install() { + default + # Actually respect the python target setting + python_doscript "${PN}" +} + +pkg_postinst() { + xdg_icon_cache_update + + elog "You must be in the input group to read the touchpad device." + + if ! has_version x11-libs/gtk+:3 ; then + elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3." + fi + if ! has_version kde-plasma/kde-cli-tools:5 ; then + elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5." + fi +} diff --git a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild index bd8fd0cb9b0..5f13b6bcc1a 100644 --- a/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild +++ b/x11-misc/lightdm/lightdm-1.30.0-r3.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 autotools pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils +inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils DESCRIPTION="A lightweight display manager" HOMEPAGE="https://github.com/CanonicalLtd/lightdm" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta LICENSE="GPL-3 LGPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86" -IUSE="audit +gnome +gtk +introspection non_root qt5 vala" +IUSE="audit +gnome +gtk +introspection non-root qt5 vala" COMMON_DEPEND=" >=dev-libs/glib-2.44.0:2 @@ -31,6 +31,9 @@ COMMON_DEPEND=" ) " RDEPEND="${COMMON_DEPEND} + acct-group/lightdm + acct-group/video + acct-user/lightdm >=sys-auth/pambase-20101024-r2" DEPEND="${COMMON_DEPEND} gnome? ( gnome-base/gnome-common ) @@ -50,12 +53,6 @@ REQUIRED_USE="vala? ( introspection )" pkg_setup() { export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} - if use non_root ; then - enewgroup ${LIGHTDM_USER} - enewgroup video # Just in case it hasn't been created yet - enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video - esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER} - fi } src_prepare() { @@ -92,7 +89,7 @@ src_configure() { local _greeter _session _user _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} _session=${LIGHTDM_SESSION:=gnome} - _user="$(usex non_root "${LIGHTDM_USER}" root)" + _user="$(usex non-root "${LIGHTDM_USER}" root)" # Let user know how lightdm is configured einfo "Gentoo configuration" einfo "Default greeter: ${_greeter}" diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml index eb41c0a7d70..0dbf6a9da96 100644 --- a/x11-misc/lightdm/metadata.xml +++ b/x11-misc/lightdm/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <use> <flag name="gtk">Pull in the gtk+ greeter</flag> - <flag name="non_root">Use non-root user by default</flag> + <flag name="non-root">Use non-root user by default</flag> </use> <upstream> <remote-id type="github">CanonicalLtd/lightdm</remote-id> diff --git a/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch b/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch new file mode 100644 index 00000000000..a3587e42426 --- /dev/null +++ b/x11-misc/lineakd/files/lineakd-0.9.0-automake-linking-libdl.patch @@ -0,0 +1,58 @@ +* configure.in change from Debian to fix autoreconf: https://sources.debian.org/src/lineakd/1%253A0.9-6/debian/patches/005_configure_in.diff/#L19 +* Rest is to fix libdl linkage (and general LDFLAGS issues): https://bugs.gentoo.org/722372 +--- a/configure.in ++++ b/configure.in +@@ -28,10 +28,12 @@ + + dnl Process this file with autoconf to produce a configure script. + +-AC_INIT(acinclude.m4) dnl a source file from your sub dir +- ++AC_INIT + dnl This is so we can use kde-common + AC_CONFIG_AUX_DIR(admin) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++LT_INIT + + dnl This ksh/zsh feature conflicts with `cd blah ; pwd` + unset CDPATH + +--- a/configure.in ++++ b/configure.in +@@ -81,7 +81,7 @@ KDE_PROG_LIBTOOL + + dnl activate the next macro call for DLOPEN tests and setting LIBDL + dnl (n.b. KDE_MISC_TESTS does the same to you, so use either this or the next one) +-dnl KDE_CHECK_DLOPEN ++KDE_CHECK_DLOPEN + + dnl activate the next macro call for some additional tests + dnl (compat, crypt, socket, nsl, dlopen, ...) + +--- a/lineak/Makefile.am ++++ b/lineak/Makefile.am +@@ -19,8 +19,8 @@ liblineak_la_SOURCES = pluginmanager.cpp globals.cpp displayctrl.cpp xmgr.cpp cd + # liblineak_la_LDFLAGS = -version-info 8:0:8 $(all_libraries); \ + #fi; + +-liblineak_la_LIBADD = -lX11 -lXext $(X_LIBS) -lXt -lSM -lICE -L/usr/X11R6/lib +-liblineak_la_LDFLAGS = -version-info 8:0:8 $(all_libraries) -L/usr/X11R6/lib @X_LIBS@ @X_PRE_LIBS@ -lpthread ++liblineak_la_LIBADD = -lX11 -lXext $(X_LIBS) -lXt -lSM -lICE -L/usr/X11R6/lib $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ $(PTHREAD_LIBS) @LIBDL@ ++liblineak_la_LDFLAGS = -version-info 8:0:8 + + lineak_HEADERS = configdirectives.h configloader.h definitions.h defloader.h lconfig.h lconfigdata.h ldef.h lobject.h lkbd.h lkey.h lbutton.h loader.h msgpasser.h saver.h lcommand.h lockctrl.h lineak_util_functions.h lineak_core_functions.h cdromctrl.h xmgr.h displayctrl.h plugin_definitions.h commandexec.h pluginmanager.h + +--- a/lineakd/Makefile.am ++++ b/lineakd/Makefile.am +@@ -1,8 +1,8 @@ + bin_PROGRAMS = lineakd + + lineakd_SOURCES = lineakd_core_functions.cpp cmdprefs.cpp main.cpp +-lineakd_LDADD = -lpthread -llineak -lXext -lX11 -ldl +-lineakd_LDFLAGS = -rdynamic -L../lineak $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ ++lineakd_LDADD = -llineak -lXext -lX11 $(PTHREAD_LIBS) @LIBDL@ $(all_libraries) @X_LIBS@ @X_PRE_LIBS@ ++lineakd_LDFLAGS = -rdynamic -L../lineak + + EXTRA_DIST = main.cpp eakprocs.h cmdprefs.cpp cmdprefs.h lineakkb.def lineakd.1.bz2 OLDCODE lineakd_core_functions.h lineakd_core_functions.cpp + diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild index 00a75e407fb..8b2026bc430 100644 --- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild +++ b/x11-misc/lineakd/lineakd-0.9.0-r3.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=7 diff --git a/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild new file mode 100644 index 00000000000..8f2fca9f6c7 --- /dev/null +++ b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P=${P/.0/} +DESCRIPTION="Linux support for Easy Access and Internet Keyboards" +HOMEPAGE="http://lineak.sourceforge.net" +SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug" + +RDEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libxkbfile + x11-libs/libXt + x11-libs/libXtst" + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch + "${FILESDIR}"/${P}-automake-linking-libdl.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # admin/lineakd.m4.in contains Bashisms but fixes it causes a confusing + # autotools avalanche, so workaround it with CONFIG_SHELL as bash. + CONFIG_SHELL="${BROOT}/bin/bash" econf \ + $(use_enable debug) \ + --with-x +} + +src_install() { + sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile || die + + dodir /usr/share/man/man8 + + emake -j1 DESTDIR="${D}" install + + dodoc AUTHORS README TODO + + keepdir /usr/$(get_libdir)/lineakd/plugins + + insinto /etc/lineak + doins lineakd.conf.example lineakd.conf.kde.example + + find "${ED}"/usr/share/man -name '*.bz2' -exec bunzip2 {} \; || die + find "${ED}" -name '*.la' -delete || die +} diff --git a/x11-misc/lineakd/metadata.xml b/x11-misc/lineakd/metadata.xml index 70081a0cac6..c2ee77af29e 100644 --- a/x11-misc/lineakd/metadata.xml +++ b/x11-misc/lineakd/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">lineak</remote-id> </upstream> diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild index b8a9c80500f..ab0b176326a 100644 --- a/x11-misc/makedepend/makedepend-1.0.6.ebuild +++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit xorg-3 DESCRIPTION="create dependencies in makefiles" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="" diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest index d33b52b955f..437744af615 100644 --- a/x11-misc/mate-notification-daemon/Manifest +++ b/x11-misc/mate-notification-daemon/Manifest @@ -1,2 +1 @@ -DIST mate-notification-daemon-1.24.1.tar.xz 395444 BLAKE2B dca166664216c7027b2e816c7df64636c3f1c7ae25db253167f9c5d1b296cd9bf3c7533e1f7a33a7d4f2bf5fe074e8f0911462463fffa5b839fd8decd62a4716 SHA512 7c799e31229860cb34fa4a19421360a4a93d81826bc4381ed284e1ec280bae67d2f5bdf5d751f3dad6a1da424a5c598b2def60b7b24fd6ea41da5f126f456bac DIST mate-notification-daemon-1.24.2.tar.xz 396156 BLAKE2B 64bbada24bc53f296076ff80b364e156fecfe28f4b1d8b77a0f05910939ccc2378e0635861442cc5cff8c95db5ccda55484de8aaf3315e28eb8df75c1a4bc20d SHA512 be9db249bec6dc2206d69998b972f06ab4e2ee5c30b5bcf44c43b508954a9984a37bc9a2fe9989aec55969492256ed742fb2a9618b751e47ff43b66c383c1bd4 diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild deleted file mode 100644 index c39f4ba5c13..00000000000 --- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="MATE Notification daemon" -LICENSE="GPL-2+ GPL-3+" -SLOT="0" - -IUSE="" - -COMMON_DEPEND="dev-libs/atk - >=dev-libs/glib-2.50:2 - >=dev-libs/libxml2-2.9.0 - >=sys-apps/dbus-1 - x11-libs/cairo - >=x11-libs/gdk-pixbuf-2.22:2 - >=x11-libs/libnotify-0.7 - x11-libs/libX11 - virtual/libintl - >=x11-libs/gtk+-3.22:3 - >=x11-libs/libwnck-3:3 - >=media-libs/libcanberra-0.4:0[gtk3] -" - -RDEPEND="${COMMON_DEPEND} - virtual/libintl - !x11-misc/notify-osd - !x11-misc/qtnotifydaemon - !x11-misc/notification-daemon -" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-util/gdbus-codegen - >=sys-devel/gettext-0.19.8 - >=sys-devel/libtool-2.2.6:2 - virtual/pkgconfig -" - -src_install() { - mate_src_install - - insinto /usr/share/dbus-1/services - doins "${FILESDIR}/org.freedesktop.Notifications.service" -} diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild index f16fa79e958..0cfababe83c 100644 --- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild +++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild @@ -8,7 +8,7 @@ MATE_LA_PUNT="yes" inherit mate if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" fi DESCRIPTION="MATE Notification daemon" diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest index cb8b268cdf8..7cefa9c09d5 100644 --- a/x11-misc/menulibre/Manifest +++ b/x11-misc/menulibre/Manifest @@ -1 +1 @@ -DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f +DIST menulibre-2.2.3.tar.gz 488117 BLAKE2B 2bb157f6f8fb1af8c5059bfa2f93dbf99eb3a0cf9b3072cae28284d50c6a7d847da7a7dc5905ff59386f7d69029f7ffd7c39cb9137e029355fea2f52741283c6 SHA512 bd554606ad35cdd41272ed656427ae3f610d6aacfc9e91e4de6ed342034e1bb6070812017a1372d04b0df4008ae1cd7207ca243142a874b6abb0a00893740da3 diff --git a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild deleted file mode 100644 index 1cd6aaa6ce4..00000000000 --- a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE="xml" -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 xdg-utils - -DESCRIPTION="Advanced freedesktop.org compliant menu editor" -HOMEPAGE="https://bluesabre.org/menulibre/" -SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - dev-python/python-distutils-extra[${PYTHON_USEDEP}] -" -RDEPEND=" - dev-libs/gobject-introspection - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - gnome-base/gnome-menus[introspection] - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2[introspection] - x11-libs/gtk+:3[X,introspection] - x11-libs/gtksourceview:3.0[introspection] - x11-themes/hicolor-icon-theme -" - -python_prepare_all() { - # too many categories - sed -i \ - -e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \ - -e '/^OnlyShowIn/d' \ - menulibre.desktop.in || die - - local i - # fix incorrect behavior when LINGUAS is set to an empty string - # https://bugs.launchpad.net/python-distutils-extra/+bug/1133594 - if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set - for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language - if ! has ${i} ${LINGUAS} ; then # if language is disabled - rm po/${i}.po || die - fi - done - fi - - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - python_optimize - rm -r "${ED}"/usr/share/doc/${PN} || die -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/menulibre/menulibre-2.2.3.ebuild b/x11-misc/menulibre/menulibre-2.2.3.ebuild new file mode 100644 index 00000000000..6f10b016ac7 --- /dev/null +++ b/x11-misc/menulibre/menulibre-2.2.3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml(+)" +inherit distutils-r1 xdg + +DESCRIPTION="Advanced freedesktop.org compliant menu editor" +HOMEPAGE="https://bluesabre.org/menulibre/" +SRC_URI="https://github.com/bluesabre/menulibre/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}]') + gnome-base/gnome-menus:3[introspection] + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + x11-themes/hicolor-icon-theme" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/python-distutils-extra[${PYTHON_USEDEP}]')" + +python_prepare_all() { + distutils-r1_python_prepare_all + + # show desktop entry in all DEs + sed -i '/^OnlyShowIn/d' menulibre.desktop.in || die + + # workaround incorrect behavior when LINGUAS is set to an empty string + # https://bugs.launchpad.net/python-distutils-extra/+bug/1133594 + ! [[ -v LINGUAS && -z ${LINGUAS} ]] || rm po/*.po || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -r "${ED}"/usr/share/doc/${PN} || die +} diff --git a/x11-misc/menulibre/metadata.xml b/x11-misc/menulibre/metadata.xml index 4079a9f1f64..dad0ffbbf1e 100644 --- a/x11-misc/menulibre/metadata.xml +++ b/x11-misc/menulibre/metadata.xml @@ -2,7 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <stabilize-allarches/> <upstream> - <remote-id type="launchpad">menulibre</remote-id> + <remote-id type="github">bluesabre/menulibre</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/meteo/meteo-0.9.9.1.ebuild b/x11-misc/meteo/meteo-0.9.9.1.ebuild index 13bc758b8d4..6f69fd93946 100644 --- a/x11-misc/meteo/meteo-0.9.9.1.ebuild +++ b/x11-misc/meteo/meteo-0.9.9.1.ebuild @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit gnome2-utils meson vala xdg +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome2-utils meson python-any-r1 vala xdg DESCRIPTION="Forecast application using OpenWeatherMap API" HOMEPAGE="https://gitlab.com/bitseater/meteo" @@ -24,12 +26,16 @@ RDEPEND="${DEPEND} gnome-base/gsettings-desktop-schemas x11-themes/hicolor-icon-theme " -BDEPEND=" +BDEPEND="${PYTHON_DEPS} dev-libs/appstream-glib dev-util/intltool virtual/pkgconfig " +# One test needs network (#828052), the other simply checks desktop file +# validation, that we also test with our QA tests +RESTRICT="test" + src_prepare() { default vala_src_prepare diff --git a/x11-misc/mugshot/mugshot-0.4.3.ebuild b/x11-misc/mugshot/mugshot-0.4.3-r1.ebuild index 1b7d2a74654..61fadeb0cba 100644 --- a/x11-misc/mugshot/mugshot-0.4.3.ebuild +++ b/x11-misc/mugshot/mugshot-0.4.3-r1.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 DISTUTILS_USE_SETUPTOOLS="no" PYTHON_COMPAT=( python3_{8..10} ) @@ -11,6 +11,7 @@ inherit distutils-r1 gnome2-utils xdg-utils DESCRIPTION="A lightweight user-configuration application" HOMEPAGE="https://github.com/bluesabre/mugshot" SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-3+" SLOT="0" @@ -57,8 +58,6 @@ BDEPEND=" dev-util/intltool " -S="${WORKDIR}/${PN}-${P}" - python_install() { distutils-r1_python_install diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild index 5d4050ff9f5..60e3534a37f 100644 --- a/x11-misc/numlockx/numlockx-1.2.ebuild +++ b/x11-misc/numlockx/numlockx-1.2.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=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~riscv sparc x86" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest index 073756acf16..39ee0abe459 100644 --- a/x11-misc/obconf-qt/Manifest +++ b/x11-misc/obconf-qt/Manifest @@ -1 +1,2 @@ DIST obconf-qt-0.16.0.tar.xz 101588 BLAKE2B 94407df40878c64a40343ad2a8fdbebc78a99beaf017485fda52d6043f2597467c67da465dd191a78ba7c084f1072152d4033f7b5b41f257946941efda37a9e3 SHA512 ab0ddc013ca877f2434da956c314b248f6a7ef5ced1e5c605de0652d0b8c5c0e84f1e6fdf8b21c6f3d450d57a1413d625d0a31b84cac2c9062dc0f101d8e57ab +DIST obconf-qt-0.16.2.tar.xz 111080 BLAKE2B 1ea6d4f5afb3e34db288bb1cfeb0c76345704b592230ebbaaff464206b13b9dfde7ff0ae07dd164e1d925e93e51a9a9bd6c571f55b81f3bbfc1537bfa620f521 SHA512 bd91a5669f07471966d296b91d78e2a40e2e3640405de2179513457088eb7d6cb063dbfaff623db6f404985734e986b52c1e3155a050f374b7afa58f7d720c0d diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild index de5da1b411b..aed7ee4ebea 100644 --- a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-0.16.0.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=7 @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then 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" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild new file mode 100644 index 00000000000..0ea4ab64be4 --- /dev/null +++ b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Openbox Configuration Tool" +HOMEPAGE="https://lxqt.github.io/" + +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-qt/linguist-tools:5 + >=dev-util/lxqt-build-tools-0.8.0 + sys-apps/sed + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-wm/openbox:3 +" +DEPEND="${RDEPEND}" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild index 616287e4131..1feb6e43a52 100644 --- a/x11-misc/openbox-menu/openbox-menu-0.8.1.ebuild +++ b/x11-misc/openbox-menu/openbox-menu-0.8.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=7 @@ -35,7 +35,7 @@ PATCHES=( ) src_compile() { - emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) \ + emake CC="$(tc-getCC)" PKG_CONFIG=$(tc-getPKG_CONFIG) \ WITH_ICONS=$(usex icons '1' '0') \ WITH_SVG=$(usex svg '1' '0') } diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest index f3cff2395c9..70372f44c2f 100644 --- a/x11-misc/pcmanfm-qt/Manifest +++ b/x11-misc/pcmanfm-qt/Manifest @@ -1 +1,3 @@ DIST pcmanfm-qt-0.17.0.tar.xz 296000 BLAKE2B bfe6a7ed701d375030c8a20fca3a9b1076810c426388e03644bca0a0482f5b86ac784e197463c7316514e78fe72ab360c73df75cb1ee16dc22a2fe313d4f9d01 SHA512 6de9083b90a2d06db892941e50dc9817e1ab8cf5bab80e331cd083c4756b7ede1207ca35fc1fc43b81b52651acb57dfd85953ab8f8deef2a2c0d362374726daa +DIST pcmanfm-qt-1.0.0.tar.xz 317624 BLAKE2B fc66a21b9cc4c0dc9cb9b06ef757faa0a268c5e1c4dfa5765128b1701a051178a3f76d3132293fa7479eee7aad1398f863742489fd5aa64a1dc31c558a195463 SHA512 66f8badf47f32482f880009e24b506ad409ac4a939d4cbc0b6b9adf29874a6d76e5c154e5611329007485fe9c34985be7f67a1ec769ea0e0a107d16d48f2fd7f +DIST pcmanfm-qt-1.1.0.tar.xz 331652 BLAKE2B 055660b841feb1cced2ec8c67493e0db9656825c4925e5699c27904ed1c7c6483bc1fbba98838c39a2e55fb4b8cb0a67bb2e8eee58fab6224448ad9300dad0b6 SHA512 b453b56bd10a94b6c4cbf6e999a470208c7817384f3868ef230a65d39ff3b1e2b2e6db8c08ca894c4e226288efd38dbdddeb1294fa4f8507836cf84594b956ef diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild new file mode 100644 index 00000000000..fc9216b2005 --- /dev/null +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake optfeature xdg-utils + +DESCRIPTION="Qt GUI Tabbed Filemanager" +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+ LGPL-2.1+" +SLOT="0" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.10.0 +" +DEPEND=" + dev-libs/glib:2 + >=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 + sys-apps/util-linux + virtual/freedesktop-icon-theme + =x11-libs/libfm-qt-${MY_PV}*:= + x11-libs/libxcb:= + x11-misc/xdg-utils +" +RDEPEND="${DEPEND} + >=lxde-base/lxmenu-data-0.1.5 +" + +pkg_postinst() { + xdg_desktop_database_update + + optfeature "mount password storing" gnome-base/gnome-keyring + ! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild new file mode 100644 index 00000000000..ccf8cc45ea0 --- /dev/null +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PV="$(ver_cut 1-2)" + +inherit cmake optfeature xdg-utils + +DESCRIPTION="Qt GUI Tabbed Filemanager" +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+ LGPL-2.1+" +SLOT="0" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.11.0 +" +DEPEND=" + dev-libs/glib:2 + >=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 + sys-apps/util-linux + virtual/freedesktop-icon-theme + =x11-libs/libfm-qt-${MY_PV}*:= + x11-libs/libxcb:= + x11-misc/xdg-utils +" +RDEPEND="${DEPEND} + >=lxde-base/lxmenu-data-0.1.5 +" + +pkg_postinst() { + xdg_desktop_database_update + + optfeature "mount password storing" gnome-base/gnome-keyring + ! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest index 8c5a4fc6841..9007b171700 100644 --- a/x11-misc/picom/Manifest +++ b/x11-misc/picom/Manifest @@ -1,2 +1,2 @@ DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1 -DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a +DIST picom-9.1.tar.gz 263924 BLAKE2B 093f2fe12f3388b7979379d2e2b695a779cc9ebf95cbfa5b4f39c4fcc7cd6fc82be662bb9b0355fbadca66c0b0d7ac0d1e463272b0dbe4bbcca985691b6255e9 SHA512 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild index 8c0a8512f14..d1eb0ff6f95 100644 --- a/x11-misc/picom/picom-8.2-r2.ebuild +++ b/x11-misc/picom/picom-8.2-r2.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=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0 MIT" SLOT="0" -KEYWORDS="amd64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="+config-file dbus +doc +drm opengl pcre test" REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" diff --git a/x11-misc/picom/picom-8-r1.ebuild b/x11-misc/picom/picom-8.2-r3.ebuild index a266247cac0..c26adc87f47 100644 --- a/x11-misc/picom/picom-8-r1.ebuild +++ b/x11-misc/picom/picom-8.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit meson python-any-r1 virtualx xdg DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" @@ -12,14 +12,13 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MPL-2.0 MIT" SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="+config-file dbus +doc +drm opengl pcre test" REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" RESTRICT="test" # but tests require dbus_next -RDEPEND=" - dev-libs/libev +RDEPEND="dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb @@ -42,6 +41,8 @@ BDEPEND="virtual/pkgconfig test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') ) " +DOCS=( README.md picom.sample.conf ) + python_check_deps() { has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]" } diff --git a/x11-misc/picom/picom-9.1.ebuild b/x11-misc/picom/picom-9.1.ebuild new file mode 100644 index 00000000000..c26adc87f47 --- /dev/null +++ b/x11-misc/picom/picom-9.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit meson python-any-r1 virtualx xdg + +DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" +HOMEPAGE="https://github.com/yshui/picom" +SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+config-file dbus +doc +drm opengl pcre test" + +REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!" +RESTRICT="test" # but tests require dbus_next + +RDEPEND="dev-libs/libev + dev-libs/uthash + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXext + x11-libs/pixman + x11-libs/xcb-util-image + x11-libs/xcb-util-renderutil + config-file? ( + dev-libs/libconfig:= + ) + dbus? ( sys-apps/dbus ) + drm? ( x11-libs/libdrm ) + opengl? ( virtual/opengl ) + pcre? ( dev-libs/libpcre ) + !x11-misc/compton" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig + doc? ( app-text/asciidoc ) + test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') ) +" + +DOCS=( README.md picom.sample.conf ) + +python_check_deps() { + has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + $(meson_use config-file config_file) + $(meson_use dbus) + $(meson_use doc with_docs) + $(meson_use opengl) + $(meson_use pcre regex) + ) + + meson_src_configure +} + +src_test() { + virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}" +} diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild index 7551a069f44..3e335b94532 100644 --- a/x11-misc/picom/picom-9999.ebuild +++ b/x11-misc/picom/picom-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) -inherit git-r3 python-any-r1 meson virtualx xdg +PYTHON_COMPAT=( python3_{8..10} ) +inherit git-r3 meson python-any-r1 virtualx xdg DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)" HOMEPAGE="https://github.com/yshui/picom" diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest index 2698335a484..d6c256125df 100644 --- a/x11-misc/polybar/Manifest +++ b/x11-misc/polybar/Manifest @@ -1,4 +1,6 @@ DIST i3ipcpp-86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz 43693 BLAKE2B a84525b0bd00d4ab4ed8afed00fd92eee965efea9960670dcea3efaa259834df5bb7cf8e79a894dd4d4f92f28643ad1b43ccbb374ade96174c6c2f6fc63f5ddc SHA512 f4643bea5a78bd9518fecc9d56ece8d679539b99016440a6e4d45305984c02963d80e00c5375cc53ac7418e2f24f57279930428b331e077eaafa8d0717677662 -DIST polybar-3.5.6.tar.gz 282964 BLAKE2B 518e8b2e1d2e0698540c4c93cdfce5283c5479b077859dfc98d57072ad23f6140cc2e7d34c34f5af71aeaf9e86642d111f409c53baba0b9398d923ad9b4058a4 SHA512 5022f7876489cc28805a52894c8ea42c2afc0600c84f6ce27f1a7c738fcc48fbf5f5d5537472378eae4f3d5ca36fc2fc8b069b379e35b1047d12a3b294e1857f DIST polybar-3.5.7.tar.gz 283520 BLAKE2B 3f7cad2886c0f8352b92e636035607b2abab6dafd0966e6edb9f3b768fc6e5b180be2479f81812eb792f66edada6fe2625af5c3ecc9216763c141a393ab90474 SHA512 6336613d37ae45ca43d1cc2e1e2126bcd09247dbf81b3df979def44b240e2a736035503cf5aaeff0a86c830deb956f9ef7057c7fa1ac3da5119b8e6c1db0fe7f +DIST polybar-3.6.1.tar.gz 437027 BLAKE2B 87cd05b235128834daacd5e48b7bba4d610c1018bbdc6280996d23314b4398a2c7322a425a047b55ad952c7a0e6a73c3076f57df6b4f7ab8fcdffcc0e40ef165 SHA512 973b623464d3683f28484606e418473f9a241c2f6d6e59877a487b61aa2d91f4f44702926c19c47d87720991bccf0a4b6ac0b00d015806d345a3bf701e327d2b +DIST polybar-3.6.2.tar.gz 438843 BLAKE2B 0d2e3662fd4b5150b3feea4d8c3cc9acc61e0d7f609b0c88c26905384f5023b3924e0b9c528677fe8e017b5136404ac507a3cdb1ec18dcbf2b89c57d3116d1af SHA512 b45ed2a89f4ddc4ee232d6e47416390611b666f8c765fe3916343dbd45ddb877c9ecf764a7d025762caaee6ec2f8c2b9b232cd52d301e70650e4031d029a4f5d +DIST polybar-3.6.3.tar.gz 439838 BLAKE2B 522e95bb11e947008f0909401a769ba7ef44733e7edb4a067185bad610ac70077e1370e0e9da9fbff27b9f981b5285561f7c86e12fc5da79c383d794da6b4a86 SHA512 d8e08d2b217a353b967f58eb61907b05ed7b9c2b9e1b3a891f4cac91b37f1cf751b10b1e93e74e6414eb0beb1696f4ae64a0a43bfc6c0afa3863b72293217c2e DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4 diff --git a/x11-misc/polybar/polybar-3.5.7.ebuild b/x11-misc/polybar/polybar-3.5.7.ebuild index d36b8fef936..0086e86f649 100644 --- a/x11-misc/polybar/polybar-3.5.7.ebuild +++ b/x11-misc/polybar/polybar-3.5.7.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..10} ) XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6" I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727" diff --git a/x11-misc/polybar/polybar-3.5.6.ebuild b/x11-misc/polybar/polybar-3.6.1.ebuild index d36b8fef936..22e5d89b918 100644 --- a/x11-misc/polybar/polybar-3.5.6.ebuild +++ b/x11-misc/polybar/polybar-3.6.1.ebuild @@ -1,21 +1,17 @@ -# 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,9} ) -XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6" -I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727" +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-single-r1 DESCRIPTION="A fast and easy-to-use tool for creating status bars" HOMEPAGE="https://github.com/polybar/polybar" -SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz - https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz" +SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" LICENSE="MIT" SLOT="0" IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" @@ -24,8 +20,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') + dev-libs/libuv:= + media-libs/fontconfig + media-libs/freetype x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb[xkb] + x11-libs/libxcb:=[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm @@ -37,29 +38,18 @@ DEPEND=" || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) - network? ( net-wireless/wireless-tools ) + network? ( dev-libs/libnl:3 ) pulseaudio? ( media-sound/pulseaudio ) " - RDEPEND="${DEPEND}" -src_prepare() { - rmdir "${S}/lib/xpp" || die - mv "${WORKDIR}/xpp-${XPP_COMMIT}" "${S}/lib/xpp" || die - - rmdir "${S}/lib/i3ipcpp" || die - mv "${WORKDIR}/i3ipcpp-${I3IPCPP_COMMIT}" "${S}/lib/i3ipcpp" || die - - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DENABLE_ALSA="$(usex alsa)" -DENABLE_CURL="$(usex curl)" -DBUILD_DOC="$(usex doc)" -DENABLE_I3="$(usex i3wm)" - -DBUILD_IPC_MSG="$(usex ipc)" + -DBUILD_POLYBAR_MSG="$(usex ipc)" -DENABLE_MPD="$(usex mpd)" -DENABLE_NETWORK="$(usex network)" -DENABLE_PULSEAUDIO="$(usex pulseaudio)" diff --git a/x11-misc/polybar/polybar-3.6.2.ebuild b/x11-misc/polybar/polybar-3.6.2.ebuild new file mode 100644 index 00000000000..22e5d89b918 --- /dev/null +++ b/x11-misc/polybar/polybar-3.6.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-single-r1 + +DESCRIPTION="A fast and easy-to-use tool for creating status bars" +HOMEPAGE="https://github.com/polybar/polybar" +SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" + +KEYWORDS="~amd64 ~x86" +LICENSE="MIT" +SLOT="0" +IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') + dev-libs/libuv:= + media-libs/fontconfig + media-libs/freetype + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb:=[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm + alsa? ( media-libs/alsa-lib ) + curl? ( net-misc/curl ) + doc? ( dev-python/sphinx ) + i3wm? ( + dev-libs/jsoncpp:= + || ( x11-wm/i3 x11-wm/i3-gaps ) + ) + mpd? ( media-libs/libmpdclient ) + network? ( dev-libs/libnl:3 ) + pulseaudio? ( media-sound/pulseaudio ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_ALSA="$(usex alsa)" + -DENABLE_CURL="$(usex curl)" + -DBUILD_DOC="$(usex doc)" + -DENABLE_I3="$(usex i3wm)" + -DBUILD_POLYBAR_MSG="$(usex ipc)" + -DENABLE_MPD="$(usex mpd)" + -DENABLE_NETWORK="$(usex network)" + -DENABLE_PULSEAUDIO="$(usex pulseaudio)" + # Bug 767949 + -DENABLE_CCACHE="OFF" + ) + + cmake_src_configure +} diff --git a/x11-misc/polybar/polybar-3.6.3.ebuild b/x11-misc/polybar/polybar-3.6.3.ebuild new file mode 100644 index 00000000000..22e5d89b918 --- /dev/null +++ b/x11-misc/polybar/polybar-3.6.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit cmake python-single-r1 + +DESCRIPTION="A fast and easy-to-use tool for creating status bars" +HOMEPAGE="https://github.com/polybar/polybar" +SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" + +KEYWORDS="~amd64 ~x86" +LICENSE="MIT" +SLOT="0" +IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') + dev-libs/libuv:= + media-libs/fontconfig + media-libs/freetype + x11-libs/cairo[X,xcb(+)] + x11-libs/libxcb:=[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-image + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm + alsa? ( media-libs/alsa-lib ) + curl? ( net-misc/curl ) + doc? ( dev-python/sphinx ) + i3wm? ( + dev-libs/jsoncpp:= + || ( x11-wm/i3 x11-wm/i3-gaps ) + ) + mpd? ( media-libs/libmpdclient ) + network? ( dev-libs/libnl:3 ) + pulseaudio? ( media-sound/pulseaudio ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DENABLE_ALSA="$(usex alsa)" + -DENABLE_CURL="$(usex curl)" + -DBUILD_DOC="$(usex doc)" + -DENABLE_I3="$(usex i3wm)" + -DBUILD_POLYBAR_MSG="$(usex ipc)" + -DENABLE_MPD="$(usex mpd)" + -DENABLE_NETWORK="$(usex network)" + -DENABLE_PULSEAUDIO="$(usex pulseaudio)" + # Bug 767949 + -DENABLE_CCACHE="OFF" + ) + + cmake_src_configure +} diff --git a/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch b/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch new file mode 100644 index 00000000000..7c7ff0f4105 --- /dev/null +++ b/x11-misc/projecteur/files/projecteur-0.9.2-gcc12.patch @@ -0,0 +1,21 @@ +From 2e989dabcf853da5ab82ab67e3eca8619cb6669a Mon Sep 17 00:00:00 2001 +From: Jahn F <jahnf@users.noreply.github.com> +Date: Tue, 3 May 2022 09:02:05 +0200 +Subject: [PATCH] Add missing <array> include + +--- + src/device.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/device.h b/src/device.h +index 1c51585..1ce24fe 100644 +--- a/src/device.h ++++ b/src/device.h +@@ -7,6 +7,7 @@ + + #include "devicescan.h" + ++#include <array> + #include <memory> + #include <vector> + diff --git a/x11-misc/projecteur/projecteur-0.9.2.ebuild b/x11-misc/projecteur/projecteur-0.9.2.ebuild index a98d6fdab61..34852f249fa 100644 --- a/x11-misc/projecteur/projecteur-0.9.2.ebuild +++ b/x11-misc/projecteur/projecteur-0.9.2.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 @@ -33,7 +33,10 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${PN}-0.9.1-dont-compress-manpage.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-0.9.1-dont-compress-manpage.patch" + "${FILESDIR}/${PN}-0.9.2-gcc12.patch" +) src_prepare() { cmake_src_prepare diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest index 3a49f8d30d8..96e041b9f79 100644 --- a/x11-misc/py3status/Manifest +++ b/x11-misc/py3status/Manifest @@ -1 +1 @@ -DIST py3status-3.40.tar.gz 411970 BLAKE2B c280ead17f0dc2a4c15f259eb7daa0317f11bf36b853d4bd7edb82e5bdd88abeac98dace99570989dc956a7f989a8a8126ba044b8857b7473eb54289bdf1feee SHA512 61b0d805cf53e95d444efa352b16e9192b7e0f93c3729287e881e7e13af72b276d05e6691f7a49c3b1981e957b5ddf04bb3aca499925e97a42cb71285f11fe08 +DIST py3status-3.44.tar.gz 413211 BLAKE2B 0287f84de34e6674987d898a3ba288e348c897b5489f9fad74d092a70963e31403f0237a2547750c97a915e4f3703c5bf327babcdb3aafc3a03bfb0280b90e5c SHA512 f135c5793759350ec4c58af8b80e56e3c25359675da7ccd8e6c1da994f67df13259a3d4f2b9d9047b9fcb0bf14f08526630a60f0f148bf364ce874fc13fb162a diff --git a/x11-misc/py3status/py3status-3.40.ebuild b/x11-misc/py3status/py3status-3.44.ebuild index c58eef39cc4..feeede8caa4 100644 --- a/x11-misc/py3status/py3status-3.40.ebuild +++ b/x11-misc/py3status/py3status-3.44.ebuild @@ -1,8 +1,8 @@ -# 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=( python{3_7,3_8,3_9} ) +PYTHON_COMPAT=( python{3_8,3_9,3_10} ) DISTUTILS_USE_SETUPTOOLS=rdepend SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz" diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest index b2ab7c37393..33d7a500a58 100644 --- a/x11-misc/qps/Manifest +++ b/x11-misc/qps/Manifest @@ -1 +1,3 @@ DIST qps-2.3.0.tar.xz 212660 BLAKE2B d52521f11775fe3d169b81851dc78b9e62641bef9d35d3a6b90b440fd6509e228ffe4ad5f51130e901c90710eab525f459c1b384cb01ba23f123841c3b3702c6 SHA512 1b884088fbdfeeaf4814453df4f7a345ebbb1825da0c09e768a655e8266f2089e7c2b9cca5f8d84dc0316a97d884a91ca5b8d9c2336a195c14432302db71171a +DIST qps-2.4.0.tar.xz 226424 BLAKE2B e06816bc5f716be51fae5e9bedc9cc2b0261a6fdd7ca345676d29b613984d1e3fef34f64e0f11bc522afb823f53ac3f1a96e8e840676fd5e87199f2f4b28f3cc SHA512 ee71ca88ba21644d0a144730b7e36131890c0626ffea6b2082bc3d8a2f7f6230335632a7dbb95aa0ae4068f278cca58c628c72fe74dda2a7c8a8021b0ff87825 +DIST qps-2.5.0.tar.xz 289796 BLAKE2B 9af9127d45eb3340177e7ed39242332d976f52c91de415da645baddd60583d010c4b7576efd0bf37f76459ce1487ec422601deb9f9baa2cfd6bb669baf7974d7 SHA512 58e8473eb9266a102e5df68025a2beb496a32e6c5cac54232242253abaede5adbf693a8b9f089693990687b53e20c1e23cc800b7928fe68e18f05e3b3d344dca diff --git a/x11-misc/qps/qps-2.4.0-r1.ebuild b/x11-misc/qps/qps-2.4.0-r1.ebuild new file mode 100644 index 00000000000..f7efb430eda --- /dev/null +++ b/x11-misc/qps/qps-2.4.0-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Process Manager" +HOMEPAGE="https://lxqt-project.org/" +SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=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 + >=lxqt-base/liblxqt-1:= +" +RDEPEND="${DEPEND}" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/qps/qps-2.5.0.ebuild b/x11-misc/qps/qps-2.5.0.ebuild new file mode 100644 index 00000000000..1876e762c8f --- /dev/null +++ b/x11-misc/qps/qps-2.5.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Qt GUI Process Manager" +HOMEPAGE="https://lxqt-project.org/" +SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" + +LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + +BDEPEND=" + >=dev-qt/linguist-tools-5.15:5 + >=dev-util/lxqt-build-tools-0.11.0 +" +DEPEND=" + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=lxqt-base/liblxqt-1.1:= +" +RDEPEND="${DEPEND}" + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index 83d450ff6a1..40866f5b141 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1,2 +1 @@ -DIST qt5ct-1.3.tar.bz2 80506 BLAKE2B eda2d69fcddf80553358d3c9e9bd0ef33355919c5b62912d8e79a84a36ee5a25d1dab553b6413d78e16ce69435861a01b298ae97202a77f1f50ed805f14445dd SHA512 9f4397d5cfc3dec14330759f213ae99b02ae36d3ea48dfdb3015c3b7d3fe12cde619af855d7320566ca32120e8689e4b39f78e4fdf9886e2472aef570beb75bd DIST qt5ct-1.5.tar.bz2 81089 BLAKE2B 8bf02a6c53c68f30e0647ff7c40c9d80044cbf914ee13f9e7f13ad6424e5cf73b9460af70ea484d498bfb693e8f8b018f7e32cac6205ffa2dba05930c6d0610c SHA512 fc16c7849a89aa8ee9480162888294638bc01f83b89d86c978397e58f6da4360cf07b9f558635b8a5b13bd10d18f3ad49663fe8a76183da9ae55aac23230b1e5 diff --git a/x11-misc/qt5ct/qt5ct-1.3.ebuild b/x11-misc/qt5ct/qt5ct-1.3.ebuild deleted file mode 100644 index 5bbd45ce15d..00000000000 --- a/x11-misc/qt5ct/qt5ct-1.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=7 - -inherit cmake - -DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" -HOMEPAGE="https://sourceforge.net/projects/qt5ct/" -SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc64 x86" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5=[dbus] - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - dev-qt/qtpaths:5 -" - -src_install() { - cmake_src_install - - newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct' -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - ewarn "qt5ct configuration won't be applied to the currently running sessions." - ewarn "Please relogin." - fi - if ! has_version 'dev-qt/qtsvg:5'; then - elog - elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." - elog - fi -} diff --git a/x11-misc/qt5ct/qt5ct-1.5.ebuild b/x11-misc/qt5ct/qt5ct-1.5.ebuild index 79f26d2c1bc..ee2fded801c 100644 --- a/x11-misc/qt5ct/qt5ct-1.5.ebuild +++ b/x11-misc/qt5ct/qt5ct-1.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ppc64 x86" RDEPEND=" dev-qt/qtconcurrent:5 diff --git a/x11-misc/qterm/qterm-0.7.3.ebuild b/x11-misc/qterm/qterm-0.7.3-r1.ebuild index 6b63700224d..3100adfc838 100644 --- a/x11-misc/qterm/qterm-0.7.3.ebuild +++ b/x11-misc/qterm/qterm-0.7.3-r1.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="6" +EAPI=8 -inherit cmake-utils gnome2-utils xdg-utils +inherit cmake xdg DESCRIPTION="A BBS client based on Qt" HOMEPAGE="https://github.com/qterm/qterm" @@ -22,9 +22,10 @@ RDEPEND="dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-libs/libX11 - dev-libs/openssl:0=" + dev-libs/openssl:=" DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 + x11-base/xorg-proto" +BDEPEND="dev-qt/linguist-tools:5 dev-qt/qthelp:5 x11-base/xorg-proto" @@ -32,24 +33,16 @@ DOCS=( README.rst RELEASE_NOTES TODO doc/script.txt ) src_prepare() { # file collision with sys-cluster/torque, bug #176533 - sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt - sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop + sed -i "/PROGRAME /s/qterm/QTerm/" CMakeLists.txt || die + sed -i "s/Exec=qterm/Exec=QTerm/" src/${PN}.desktop || die - cmake-utils_src_prepare - xdg_environment_reset + cmake_src_prepare } src_configure() { local mycmakeargs=( -DQT5=ON ) - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update -} -pkg_postrm() { - gnome2_icon_cache_update + cmake_src_configure } diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml index 93c88029181..3b19574b614 100644 --- a/x11-misc/qtfm/metadata.xml +++ b/x11-misc/qtfm/metadata.xml @@ -5,10 +5,6 @@ <email>qt@gentoo.org</email> <name>Gentoo Qt Project</name> </maintainer> -<maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> <use> <flag name="dbus">Install the qtfm-tray removable device manager</flag> <flag name="shared">Install the libQtFM shared library and headers</flag> diff --git a/x11-misc/quitcount/Manifest b/x11-misc/quitcount/Manifest index df66285e507..b61fb9ec946 100644 --- a/x11-misc/quitcount/Manifest +++ b/x11-misc/quitcount/Manifest @@ -1 +1 @@ -DIST quitcount-3.1.3.tar.gz 403607 BLAKE2B 90f02961afa25f3df6ee81174828ed7a0e61403d91c048cf9d092f0a7c68f6530acd38ff1410d24a93046618773444adb4e3a903f1ac6400956973191ead6d2b SHA512 92e088b8272657f14e60d91589963cfcefe84ead9f4d90aa3a77ac9612fe216f558e0378788edde7680a3dba131021bf72129fbc1291eca83cd232490f486f9f +DIST quitcount-3.1.4.tar.gz 438256 BLAKE2B 65ba36ace7dfa4f9e494c4d0ffd0bc9cba0ed22a22d82767913aafdf6d4724ee7fca7e8dd0f6a94b45082fb3f15bd81d5dafb35021c1283c69e1555efe1d9ac6 SHA512 c4b0d3d35141f63b3c60ddc49b9c717f79dbbfb63690ae2ae4f7a014b24182df04006b7dd0cce5918006dc53c8fbe1dde4005ad49f4f8974f1c262e8f02e7ec3 diff --git a/x11-misc/quitcount/quitcount-3.1.3-r1.ebuild b/x11-misc/quitcount/quitcount-3.1.4.ebuild index 427e0fd4f5d..b64d6cd1229 100644 --- a/x11-misc/quitcount/quitcount-3.1.3-r1.ebuild +++ b/x11-misc/quitcount/quitcount-3.1.4.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit xdg -# The string in SRC_URI doesn't follow standard naming convention -MV="3.1" -DESCRIPTION="A simple applet that shows what you saved since you quit smoking." +DESCRIPTION="A simple applet that shows what you saved since you quit smoking" HOMEPAGE="http://quitcount.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MV}/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/$(ver_cut 1-2)/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -18,6 +16,7 @@ KEYWORDS="~amd64 ~x86" DEPEND=" x11-libs/gtk+:3 >=dev-libs/glib-2.6:2 + x11-libs/gdk-pixbuf:2 " RDEPEND="${DEPEND}" diff --git a/x11-misc/redshift/redshift-1.12-r5.ebuild b/x11-misc/redshift/redshift-1.12-r5.ebuild index 9c1e4b29422..555749807f2 100644 --- a/x11-misc/redshift/redshift-1.12-r5.ebuild +++ b/x11-misc/redshift/redshift-1.12-r5.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 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="appindicator geoclue gtk nls" COMMON_DEPEND=">=x11-libs/libX11-1.4 diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest index 9780704989a..62230acdf44 100644 --- a/x11-misc/revelation/Manifest +++ b/x11-misc/revelation/Manifest @@ -1 +1,2 @@ DIST revelation-0.5.4.tar.xz 282600 BLAKE2B 519b01252b82acf0e927a9d19783792f83822cc1f1a4c3be4af3678d5446f8012d993e12397f44aae616aca88257970de7391a1269e24cc1ebc08275d0c962ed SHA512 bd536f6c03e443d91a20606765b661dc54f3e4c1f45d060d3829a894a31e553a61785bb31d7508267abd66e057fc1d93f1716ed1b553566d92a2580ad696606f +DIST revelation-0.5.5.tar.xz 282252 BLAKE2B 7c4c430d24d79b820139dd2b4989dc2d78c967b16c864149d2aafa9e91ddc26a3351f42b5782812202f77a36529c46d9515cc1aea73346c7e8e017079b810a7d SHA512 17bfeda87e27c00f12bc068446d053cee394282e5eabea6d075ac262b5f400f31520d2f9b29f99097d1d6ad72bbcf5d2d9d4da2a0eba2806ff0adbf1bb47bb0f diff --git a/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch b/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch new file mode 100644 index 00000000000..4a224fc529d --- /dev/null +++ b/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch @@ -0,0 +1,11 @@ +https://github.com/mikelolasagasti/revelation/issues/87 +--- a/data/meson.build ++++ b/data/meson.build +@@ -59,7 +59,6 @@ rvl_appstreamdir = join_paths(rvl_datadir, 'metainfo') + + # Merge the translations with the appdata file + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: join_paths(meson.source_root(), 'po'), diff --git a/x11-misc/revelation/revelation-0.5.4-r1.ebuild b/x11-misc/revelation/revelation-0.5.4-r1.ebuild index 61972b294f0..ef1516172cb 100644 --- a/x11-misc/revelation/revelation-0.5.4-r1.ebuild +++ b/x11-misc/revelation/revelation-0.5.4-r1.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=7 @@ -33,6 +33,8 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/revelation-0.5.4-issue87-fix-meson-0.60.patch ) + src_prepare() { find -name '*.py' -exec \ sed -i -e 's:Cryptodome:Crypto:' meson.build {} + || die diff --git a/x11-misc/revelation/revelation-0.5.5.ebuild b/x11-misc/revelation/revelation-0.5.5.ebuild new file mode 100644 index 00000000000..f66d489a5da --- /dev/null +++ b/x11-misc/revelation/revelation-0.5.5.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit gnome2-utils python-single-r1 meson xdg + +DESCRIPTION="A password manager for GNOME" +HOMEPAGE="https://revelation.olasagasti.info/ https://github.com/mikelolasagasti/revelation" +SRC_URI="https://github.com/mikelolasagasti/revelation/releases/download/${P}/${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Upstream does not provide any test suite. +RESTRICT="test" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/defusedxml[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + dev-libs/libpwquality[python,${PYTHON_USEDEP}] + ') + x11-libs/gtk+:3 + dev-libs/glib + dev-libs/gobject-introspection +" + +DEPEND="${RDEPEND}" + +src_prepare() { + find -name '*.py' -exec \ + sed -i -e 's:Cryptodome:Crypto:' meson.build {} + || die + default +} + +src_install() { + meson_src_install + python_fix_shebang "${ED}" + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/x11-misc/rofi-file-browser-extended/Manifest b/x11-misc/rofi-file-browser-extended/Manifest index c3a86416068..51c29886b88 100644 --- a/x11-misc/rofi-file-browser-extended/Manifest +++ b/x11-misc/rofi-file-browser-extended/Manifest @@ -1 +1,2 @@ DIST rofi-file-browser-extended-1.2.0.tar.gz 23560 BLAKE2B bb5637e9a56009949b4241c218a73fdb79cf5065906b7f48874ee64e3d38d4b68a751eec937eededd040086b2560f6e6f92440d9cc0900be3f3dee54a03f8f83 SHA512 74e5adeadaa0322e1d489bda79db58b416553daefbbc353012b82855529875aefd42c53458efe059ee1aa7ea6b7550b791dd56a11c207c5cc6f4ed46d17bdb81 +DIST rofi-file-browser-extended-1.3.1.tar.gz 27169 BLAKE2B ced5ae91a865b136bcb2182a17c7a49cbdfcc861f8d1063415691afb13f5bdf3f1c2c0fc56a21a0dec31ee656c2379e55a4f60899c59ca7e056438142675aeb2 SHA512 269e33d62e5fdf7f6c48763ae4309fac53873d53af4ebf78f731b709ac6ff41d8f8cf21de917866fe5a80f4949d70d3be6e516c3825a8768106c706438a5b3d1 diff --git a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild new file mode 100644 index 00000000000..2be17da588a --- /dev/null +++ b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A file browser for rofi" +HOMEPAGE="https://github.com/marvinkreis/rofi-file-browser-extended" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/marvinkreis/${PN}.git" +else + SRC_URI="https://github.com/marvinkreis/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +BDEPEND="virtual/pkgconfig" +COMMON_DEPEND=" + dev-libs/glib:2 + x11-misc/rofi +" +DEPEND=" + ${COMMON_DEPEND} + x11-libs/cairo +" +RDEPEND="${COMMON_DEPEND}" + +src_prepare() { + # Delete the lines in CMakeLists.txt that install the man page. + sed -i "45,56d" CMakeLists.txt || die + default + cmake_src_prepare +} + +src_install() { + cmake_src_install + doman "doc/${PN}.1" +} diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest index 412bc352a09..6ec043f0bb0 100644 --- a/x11-misc/rofi/Manifest +++ b/x11-misc/rofi/Manifest @@ -1,3 +1,3 @@ -DIST rofi-1.6.1.tar.gz 569262 BLAKE2B 938b45f8326b5a28e349ac9f7028c476274faa4f932a773acc350d5e1dc8d5c05c7cfb7ec10f1ab5d8c83590074424c3379768671d37ee799d78e508b8c4a4cb SHA512 b54e75818a98fa9262a3016260051837de189d49beff4f4a158cb2e7f41438641377e11d75c164f423e6a86d8b8fca3b76e2630611678525465d06c21b393f60 -DIST rofi-1.7.0.tar.gz 902294 BLAKE2B 281f48702650f65e4b037fdbbe6861e173dd3465cf6a80a1d2038271511a9f85ebdb19d8e7a1854f82d52172bbfea6eb1b1685228fc4ff874773033406c9267b SHA512 84a42ecf519c7eed8093c4af3b66731b890939a2bf2a63290e599103705f6bacaba59ade1b8a1bc854f6b767e8d44ee42c20e44f63886bcacbfdbe0468d350b4 -DIST rofi-1.7.2.tar.gz 921356 BLAKE2B 88daaac60f4deab18b9ca00cdd490c57aef7ba103ca947a25a204c4e1da9d5b5a3eb2af4e88cd0f0c920315ee30a49982f521fdd9fde2f5de99b061d52ca410b SHA512 5a3d2b118c0d74e6f9499709000e7d6de270d7c51abcc1a376ecd3838b159ff311cc171e8a1968d6872fcbb6deed565e7d777b687f49756c5ba85351f2f089ea +DIST rofi-1.6.1.tar.xz 404372 BLAKE2B b338382104b84f068024eff3a04bed1bbc895d6977204a9abdc55e3b382e6e6a9e5646f6155011b17d43943d9a7a9fb92aa7dca24789b260e73b5e3b134001de SHA512 c9794a7e4921e58ecc5fc7096218203f548efe2a49ffa6971accc12e9172248bda856ad06f8c11ada9abb62b9a43c7fffce1c1be9a3fe1365c94561b170a8b73 +DIST rofi-1.7.2.tar.xz 747768 BLAKE2B c6bc6decebe40fdc020d9fc0f4b998cae2c309d5c582af17092a9a54fcd49d6bcc0a05d4c6e24c7fce42ea85c28b219dd5cd88b13aa22c843724cdd38d223e57 SHA512 78605beb4261ce5f930f6b7f80e9350f37ab1b6249675c7b63625a4ea8d22803bcc7c9aaa07aa569b1c0b72692a8499d35e6e24554fc4a7ff23cd107a8355b1a +DIST rofi-1.7.3.tar.xz 755776 BLAKE2B af746e72ce5d09f3815960eb533bf58160c56141a116d1d950db498445e07696d0af2abe36a661ce67178f2040bfba7a39ac6c8eacdfc4db9f75e5f74daf47f5 SHA512 bba9ee25c7ff2168370ad1fd21a2286706f9db1efccdab84c55abd3bfa822ed10d23128388c69c964e81b2c51e1a95b3a3c7ca503a4564d0bdb3a993d8a9553d diff --git a/x11-misc/rofi/rofi-1.6.1-r1.ebuild b/x11-misc/rofi/rofi-1.6.1-r1.ebuild index e654777a5b5..664fa0b6b46 100644 --- a/x11-misc/rofi/rofi-1.6.1-r1.ebuild +++ b/x11-misc/rofi/rofi-1.6.1-r1.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=7 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="A window switcher, run dialog and dmenu replacement" HOMEPAGE="https://github.com/davatorium/rofi" -SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" LICENSE="MIT" SLOT="0" diff --git a/x11-misc/rofi/rofi-1.7.2.ebuild b/x11-misc/rofi/rofi-1.7.2.ebuild index 813b6e07de0..03869ad9b2a 100644 --- a/x11-misc/rofi/rofi-1.7.2.ebuild +++ b/x11-misc/rofi/rofi-1.7.2.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 @@ -7,15 +7,19 @@ inherit autotools toolchain-funcs DESCRIPTION="A window switcher, run dialog and dmenu replacement" HOMEPAGE="https://github.com/davatorium/rofi" -SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" IUSE="+drun test +windowmode" RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" RDEPEND=" dev-libs/glib:2 gnome-base/librsvg:2 diff --git a/x11-misc/rofi/rofi-1.7.0-r1.ebuild b/x11-misc/rofi/rofi-1.7.3-r1.ebuild index 4a3d7dce86d..f3c69c98bc6 100644 --- a/x11-misc/rofi/rofi-1.7.0-r1.ebuild +++ b/x11-misc/rofi/rofi-1.7.3-r1.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 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="A window switcher, run dialog and dmenu replacement" HOMEPAGE="https://github.com/davatorium/rofi" -SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" LICENSE="MIT" SLOT="0" @@ -15,22 +15,22 @@ KEYWORDS="amd64 arm64 x86" IUSE="+drun test +windowmode" RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" RDEPEND=" dev-libs/glib:2 - gnome-base/librsvg:2 - media-libs/freetype - virtual/jpeg x11-libs/cairo[X,xcb(+)] - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libxcb + x11-libs/gdk-pixbuf:2 + x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util + x11-libs/xcb-util-cursor x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm x11-misc/xkeyboard-config " DEPEND=" diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild index 080d7067050..66b4e07790b 100644 --- a/x11-misc/rofi/rofi-99999.ebuild +++ b/x11-misc/rofi/rofi-99999.ebuild @@ -15,7 +15,11 @@ KEYWORDS="" IUSE="+drun test +windowmode" RESTRICT="!test? ( test )" -BDEPEND="virtual/pkgconfig" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" RDEPEND=" dev-libs/glib:2 gnome-base/librsvg:2 diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest index 78d252bfe7d..77a211c1e2e 100644 --- a/x11-misc/screen-message/Manifest +++ b/x11-misc/screen-message/Manifest @@ -1,3 +1 @@ -DIST screen-message_0.24.orig.tar.gz 348147 BLAKE2B f8973c1af5165fa21061c8202788061a78100c94325f9e3dcc9628ef0e02cef43017a58439cf1ebb49378b84182ca5a3b6650306e38f691c87e0ced3992f1173 SHA512 0553c43fc4357c756d2a6ce6dab7e8d3fa880faf90a4bee68b706a0cd8b2a0b92a2e77bd3930e473deaeca75afadcadd946cd3d5c9d116786a4bd0f5cee80506 -DIST screen-message_0.25.orig.tar.gz 348684 BLAKE2B 04d067b71b5d23862a8750a3f403938e2ec243bd25c79f601770b89f86ddcf066e05a3550c26be8479707d5571e67f187d5d556af6662682099f35e45704f1ba SHA512 30fb47fa0d0707c7219517df5384f559c4a56b5b259d2d1940b50e05834052142d97c8c776d9b22d52f2fe502b7bfe15ee5667f7d2aaa8dc3a29f5677560be41 DIST screen-message_0.26.orig.tar.gz 347704 BLAKE2B 5ba40db417fbb391aa3e3be44dc5cf78cdff4117df4d22f5d790906a90f7a5a338ae7c20fb31bd60fdffd4ee6d332a5fb87643a4906a2b59ebadc3f4237e41b3 SHA512 3364c4b2cedbadc40c0f885b2810dfbb3b57a067288b8c5bacc62f76c68a5293a4d5215fc31717310526e0ae3fb8b791ceeacf958587dbeef14debfe9bd346eb diff --git a/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.24.ebuild deleted file mode 100644 index 9ddb6ea960f..00000000000 --- a/x11-misc/screen-message/screen-message-0.24.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -DESCRIPTION="Display a multi-line message large, fullscreen, black on white" -HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message" -SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/gtk+:3 - x11-libs/cairo - >=x11-libs/pango-1.16" -RDEPEND="${DEPEND}" - -src_install() { - default - - dodir /usr/bin - mv "${D}"/usr/{games,bin}/sm || die - sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die -} diff --git a/x11-misc/screen-message/screen-message-0.25.ebuild b/x11-misc/screen-message/screen-message-0.25.ebuild deleted file mode 100644 index 2c0b4650470..00000000000 --- a/x11-misc/screen-message/screen-message-0.25.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Display a multi-line message large, fullscreen, black on white" -HOMEPAGE="http://www.joachim-breitner.de/projects#screen-message" -SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/gtk+:3 - x11-libs/cairo - >=x11-libs/pango-1.16" -RDEPEND="${DEPEND}" - -src_install() { - default - - dodir /usr/bin - mv "${D}"/usr/{games,bin}/sm || die - sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die -} diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest index 537a76747bb..13b0d7db4f6 100644 --- a/x11-misc/screengrab/Manifest +++ b/x11-misc/screengrab/Manifest @@ -1,5 +1,3 @@ -DIST screengrab-1.101.tar.xz 130248 BLAKE2B 0a81b80249322a8c6b4767b9bae70d43eaa41619927fdd799179d6dc9e15fe0cfb8ef50794890d9f9c84787bb88b447f84452b64f88e114aa3393466b1cf443c SHA512 f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13 -DIST screengrab-2.0.0.tar.xz 119296 BLAKE2B 0f3c55a78fb80569b4f42e63b9443018b7296c1b48ad4aa0af4270df19f939c44dbfc932731d6b16b0e15b6a735db333387e110ca221f88aab033ecb7b56cc96 SHA512 f08cd37489062d4b9c66278203b2fdd0298d1222e42e9240c5812779216289728f84a6567d7570ad3bf209834df4549acd9d31550c328f7785da6176b237d7e7 -DIST screengrab-2.0.1.tar.xz 123628 BLAKE2B 62cad8ccbf89c4cb3728311b6dd4883676a0be514f84c6f54633e7001a39470b7209b7416e42a19603cd1ad74661eea87d015cb0c70ed8ff3e181ecc25dbeb71 SHA512 f65d1aa4a36bf7e11e29bd1d1ad009f979e3c66a27204cd74c7ef7a54bde4027efdf030933cb81d2f9cb8b67715e868e1454a1faf7bbbb63cf162214bad8dc02 -DIST screengrab-2.1.0.tar.xz 128616 BLAKE2B d62078eb131fe20ec52545751cf1a0951514a201edf434ddedb69d15b9f9f9aa4e926a749d30560afebcf2950b70dfe2fb319b9e447a1d7ace70369cf9a0d104 SHA512 dd14d8d6c957a58c60d73cf82d6a65fc182c85a9f078663caf6686e424b292a1c579d493acac03c6ee2acd4605fc025d5a5e94b3161f3c30778cc1452056af27 DIST screengrab-2.2.0.tar.xz 136940 BLAKE2B 2263e0a887dc87ec708d96ca1cd9bce2aaa134fab9751341e1c96cd4a8b59132ca6a00719cf97dd218cc48ceb1abe5d943bad5fc80dd095c263fc84dabf3468a SHA512 14add5567abcbc03bd5e3e0e017129863ccd69aab83a1dfb3f8e6059af97fa4fff164e42fb3d0b4e8968d661b51b21def7d9c12ca68692a11288c99cdb16237d +DIST screengrab-2.3.0.tar.xz 142160 BLAKE2B 2d375cc9dcaeb921530570efc91d29a178cc7c1f1099d0ee7d76622fb08ea77de3cc7adebb807fcf9f56818ccc6caec28a13a6da89c7f11d63d73da3539f3d60 SHA512 3898504bdf6d61d47236953e25693e9950dcc953abe85ba9b74484b55ce8af77b5f6a76f39906b2c4c0e8f4985ae6cb24679ec5e7d167b2d32638cdd7324f175 +DIST screengrab-2.4.0.tar.xz 336400 BLAKE2B f60bc298dba5a2f4153804c3d37b263f1191c7d4bc3099def037dc7dcedaf5c59bf2b67d2649f279f870d030260272e906d8d23f7eb0b4e49fa340054824ae90 SHA512 88aec38b957256f93bebf13facf33135a5a80ed879325342d19d3b102e7103fd23f1f7b3c1702c4bff01898e2b3029b07e50e4fde0de9e206a74484e4aa395ee diff --git a/x11-misc/screengrab/screengrab-1.101.ebuild b/x11-misc/screengrab/screengrab-1.101.ebuild deleted file mode 100644 index 6070e93aa8e..00000000000 --- a/x11-misc/screengrab/screengrab-1.101.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Qt application for getting screenshots" -HOMEPAGE="https://lxqt.github.io/" -SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" - -BDEPEND="dev-qt/linguist-tools:5" -DEPEND=" - >=dev-libs/libqtxdg-3.3.1 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtnetwork:5 - kde-frameworks/kwindowsystem:5[X] - x11-libs/libxcb - x11-libs/libX11 -" -RDEPEND="${DEPEND}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-misc/screengrab/screengrab-2.0.0.ebuild b/x11-misc/screengrab/screengrab-2.0.0.ebuild deleted file mode 100644 index b58f948c724..00000000000 --- a/x11-misc/screengrab/screengrab-2.0.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Qt application for getting screenshots" -HOMEPAGE="https://lxqt.github.io/" -SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="" - -BDEPEND="dev-qt/linguist-tools:5" -DEPEND=" - >=dev-libs/libqtxdg-3.3.1 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtnetwork:5 - kde-frameworks/kwindowsystem:5[X] - x11-libs/libxcb - x11-libs/libX11 - x11-libs/libXfixes -" -RDEPEND="${DEPEND}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-misc/screengrab/screengrab-2.2.0.ebuild b/x11-misc/screengrab/screengrab-2.2.0.ebuild index 9a021a145f8..3eeed6bffba 100644 --- a/x11-misc/screengrab/screengrab-2.2.0.ebuild +++ b/x11-misc/screengrab/screengrab-2.2.0.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=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2 GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" IUSE="" BDEPEND="dev-qt/linguist-tools:5" diff --git a/x11-misc/screengrab/screengrab-2.0.1.ebuild b/x11-misc/screengrab/screengrab-2.3.0.ebuild index 1ba1ca00519..fbf6fa3c229 100644 --- a/x11-misc/screengrab/screengrab-2.0.1.ebuild +++ b/x11-misc/screengrab/screengrab-2.3.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 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 @@ -11,22 +11,21 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2 GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" IUSE="" BDEPEND="dev-qt/linguist-tools:5" DEPEND=" - >=dev-libs/libqtxdg-3.5.0 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtnetwork:5 + >=dev-libs/libqtxdg-3.7.0 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtnetwork-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 kde-frameworks/kwindowsystem:5[X] - x11-libs/libxcb x11-libs/libX11 - x11-libs/libXfixes + x11-libs/libxcb:= " RDEPEND="${DEPEND}" diff --git a/x11-misc/screengrab/screengrab-2.1.0.ebuild b/x11-misc/screengrab/screengrab-2.4.0.ebuild index 3d6f8350eae..a510fdb00b0 100644 --- a/x11-misc/screengrab/screengrab-2.1.0.ebuild +++ b/x11-misc/screengrab/screengrab-2.4.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 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 @@ -11,22 +11,21 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" LICENSE="GPL-2 GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" IUSE="" BDEPEND="dev-qt/linguist-tools:5" DEPEND=" - >=dev-libs/libqtxdg-3.6.0 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + >=dev-libs/libqtxdg-3.9.0 + >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtdbus-5.15:5 + >=dev-qt/qtgui-5.15:5 + >=dev-qt/qtnetwork-5.15:5 + >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtx11extras-5.15:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXfixes + x11-libs/libxcb:= " RDEPEND="${DEPEND}" diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest index 743ab584e95..3669c103c44 100644 --- a/x11-misc/screenkey/Manifest +++ b/x11-misc/screenkey/Manifest @@ -1,2 +1,3 @@ DIST screenkey-1.3.tar.gz 82732 BLAKE2B 53cf700f7211783c360552667d5bc77dfa467137476c4ae57944fe7a1e3e9da9b4488cade9c2f091b2be51cb393e063509ae858f6cca1b34ceadd3e158586e05 SHA512 16aceeb1e1a0ed5add06ed2bfd1eca04b9909537bbb979f531a98270c33af3d5e667534e73546a85c3f58ef837795a35891f00f8cf41e5ea10c45b7992334e96 DIST screenkey-1.4.tar.gz 83784 BLAKE2B 4d4264ff88fdd57b27709091c5bd79dba304f94209465e4bbaf3d6ee965b2088fcbf3afc96e0c785fa954b5bb96fc26d4d79e9aeb2dd774daf519055fc301030 SHA512 f22afbdeb2c7d7884f97faec3601bfe13f65d33a2e284cccda6d6851d0838e4a4c6860c93abd4c11f21170fb970e6cb12b52cb0cd4cb1fb58cfcf44f0945ad2d +DIST screenkey-1.5.tar.gz 87449 BLAKE2B 1ca3a7d643c65e2a82ce51feb4de022ccb0bb35848c0bb63871343b499e4b7a677e7df379ad259c149ba4a93d98cc36a05d9fb58976cc96d20b3fe98b54301db SHA512 bc9457b17c9e2fea3cefc97546dfd89a019a527608ec79960d1a712c1f1bbc97cf37404a1d84ca1c4587ae4d52163e2de30797f75b9a4a1da45ac585b8b650cf diff --git a/x11-misc/screenkey/metadata.xml b/x11-misc/screenkey/metadata.xml index 11c8ae69ef0..2a52ec37acf 100644 --- a/x11-misc/screenkey/metadata.xml +++ b/x11-misc/screenkey/metadata.xml @@ -9,7 +9,24 @@ <email>sultan@gentoo.org</email> <name>Stephan Hartmann</name> </maintainer> + <longdescription> + A screencast tool to display your keys, inspired by Screenflick. + Featuring: + several keyboard translation methods, + key composition/input method support, + configurable font/size/position, + highlighting of recent keystrokes, + improved backspace processing, + normal/Emacs/Mac caps modes, + multi-monitor support, + dynamic recording control, + switch for visible shift and modifier sequences only, + repeats compression, + countless bug fixes, + mouse buttons support. + </longdescription> <upstream> + <bugs-to>https://gitlab.com/screenkey/screenkey/-/issues</bugs-to> <remote-id type="gitlab">screenkey/screenkey</remote-id> </upstream> </pkgmetadata> diff --git a/x11-misc/screenkey/screenkey-1.3.ebuild b/x11-misc/screenkey/screenkey-1.3-r1.ebuild index 5aded2be34d..e54264430a8 100644 --- a/x11-misc/screenkey/screenkey-1.3.ebuild +++ b/x11-misc/screenkey/screenkey-1.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 xdg diff --git a/x11-misc/screenkey/screenkey-1.4.ebuild b/x11-misc/screenkey/screenkey-1.4-r1.ebuild index 0b52f31fef0..30bdb3afd52 100644 --- a/x11-misc/screenkey/screenkey-1.4.ebuild +++ b/x11-misc/screenkey/screenkey-1.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 xdg diff --git a/x11-misc/screenkey/screenkey-1.5-r2.ebuild b/x11-misc/screenkey/screenkey-1.5-r2.ebuild new file mode 100644 index 00000000000..b06bc7524e7 --- /dev/null +++ b/x11-misc/screenkey/screenkey-1.5-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_USE_SETUPTOOLS=bdepend + +inherit distutils-r1 xdg + +DESCRIPTION="A screencast tool to display your keys inspired by Screenflick" +HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/" + +if [[ "${PV}" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git" +else + SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}-v${PV}" +fi + +RESTRICT="test" +LICENSE="GPL-3+" +SLOT="0" +IUSE="appindicator" + +BDEPEND=" + dev-python/Babel[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] +" +RDEPEND=" + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + media-fonts/fontawesome + x11-libs/gtk+:3[X,introspection] + x11-misc/slop + appindicator? ( dev-libs/libappindicator:3[introspection] ) +" + +src_prepare() { + # Change the doc install path + sed -i "s|share/doc/screenkey|share/doc/${PF}|g" setup.py || die + + default +} diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild index 0b52f31fef0..b06bc7524e7 100644 --- a/x11-misc/screenkey/screenkey-9999.ebuild +++ b/x11-misc/screenkey/screenkey-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=bdepend inherit distutils-r1 xdg @@ -30,6 +30,7 @@ BDEPEND=" dev-python/wheel[${PYTHON_USEDEP}] " RDEPEND=" + dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pygobject[${PYTHON_USEDEP}] media-fonts/fontawesome diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 09a0d01520a..d1006dba157 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,2 +1 @@ -DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch deleted file mode 100644 index bbe2a272840..00000000000 --- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch +++ /dev/null @@ -1,20 +0,0 @@ -SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2 -has the same interface names as logind. - -This patch forces sddm to use legacy behaviour when consolekit2 is detected. - -Bug: https://bugs.gentoo.org/633920 -Bug: https://github.com/sddm/sddm/issues/903 -Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99 - ---- a/src/daemon/LogindDBusTypes.cpp -+++ b/src/daemon/LogindDBusTypes.cpp -@@ -60,7 +60,7 @@ - - if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) { - qDebug() << "Console kit interface found"; -- available = true; -+ available = false; - serviceName = QStringLiteral("org.freedesktop.ConsoleKit"); - managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager"); - managerIfaceName = QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't match logind diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch index 41c813a0664..e1e3c1527be 100644 --- a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch +++ b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch @@ -1,11 +1,11 @@ ---- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 -+++ b/data/scripts/Xsession 2017-10-21 15:25:47.668886596 +0200 +--- a/data/scripts/Xsession ++++ b/data/scripts/Xsession @@ -50,6 +50,10 @@ ;; esac -+# Make D-Bus and ConsoleKit start properly, see: -+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit} ++# Make D-Bus start properly, see: ++# /etc/X11/xinit/xinitrc.d/80-dbus +command="$@" + [ -f /etc/xprofile ] && . /etc/xprofile diff --git a/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch b/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch new file mode 100644 index 00000000000..8209c0739dc --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch @@ -0,0 +1,94 @@ +From be202f533ab98a684c6a007e8d5b4357846bc222 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt <fabian@ritter-vogt.de> +Date: Tue, 6 Oct 2020 21:21:38 +0200 +Subject: [PATCH] Fix X not having access control on startup + +If the auth file is empty, X allows any local application (= any user on the +system) to connect. This is currently the case until X wrote the display +number to sddm and sddm used that to write the entry into the file. +To work around this chicken-and-egg problem, make use of the fact that X +doesn't actually look at the display number in the passed auth file and just +use :0 unconditionally. Also make sure that writing the entry was actually +successful. + +CVE-2020-28049 +--- + src/daemon/XorgDisplayServer.cpp | 25 ++++++++++++++++++++----- + src/daemon/XorgDisplayServer.h | 2 +- + 2 files changed, 21 insertions(+), 6 deletions(-) + +diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp +index d04f6344..df685b2d 100644 +--- a/src/daemon/XorgDisplayServer.cpp ++++ b/src/daemon/XorgDisplayServer.cpp +@@ -88,7 +88,7 @@ namespace SDDM { + return m_cookie; + } + +- void XorgDisplayServer::addCookie(const QString &file) { ++ bool XorgDisplayServer::addCookie(const QString &file) { + // log message + qDebug() << "Adding cookie to" << file; + +@@ -104,13 +104,13 @@ namespace SDDM { + + // check file + if (!fp) +- return; ++ return false; + fprintf(fp, "remove %s\n", qPrintable(m_display)); + fprintf(fp, "add %s . %s\n", qPrintable(m_display), qPrintable(m_cookie)); + fprintf(fp, "exit\n"); + + // close pipe +- pclose(fp); ++ return pclose(fp) == 0; + } + + bool XorgDisplayServer::start() { +@@ -127,6 +127,15 @@ namespace SDDM { + // log message + qDebug() << "Display server starting..."; + ++ // generate auth file. ++ // For the X server's copy, the display number doesn't matter. ++ // An empty file would result in no access control! ++ m_display = QStringLiteral(":0"); ++ if(!addCookie(m_authPath)) { ++ qCritical() << "Failed to write xauth file"; ++ return false; ++ } ++ + if (daemonApp->testing()) { + QStringList args; + QDir x11socketDir(QStringLiteral("/tmp/.X11-unix")); +@@ -217,8 +226,14 @@ namespace SDDM { + emit started(); + } + +- // generate auth file +- addCookie(m_authPath); ++ // The file is also used by the greeter, which does care about the ++ // display number. Write the proper entry, if it's different. ++ if(m_display != QStringLiteral(":0")) { ++ if(!addCookie(m_authPath)) { ++ qCritical() << "Failed to write xauth file"; ++ return false; ++ } ++ } + changeOwner(m_authPath); + + // set flag +diff --git a/src/daemon/XorgDisplayServer.h b/src/daemon/XorgDisplayServer.h +index d2bdf6d4..e97a0b53 100644 +--- a/src/daemon/XorgDisplayServer.h ++++ b/src/daemon/XorgDisplayServer.h +@@ -40,7 +40,7 @@ namespace SDDM { + + const QString &cookie() const; + +- void addCookie(const QString &file); ++ bool addCookie(const QString &file); + + public slots: + bool start(); diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch index fc450169792..6801fa799ea 100644 --- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch +++ b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch @@ -1,9 +1,8 @@ -diff -u CMakeLists.txt CMakeLists.txt ---- a/CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 -+++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 -@@ -35,22 +35,6 @@ +--- a/CMakeLists.txt 2020-10-12 13:03:39.000000000 +0200 ++++ b/CMakeLists.txt 2020-10-12 23:40:04.480687143 +0200 +@@ -41,22 +41,6 @@ # Definitions - add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) + add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH) -# Default build type -if(NOT CMAKE_BUILD_TYPE) diff --git a/x11-misc/sddm/files/sddm.tmpfiles b/x11-misc/sddm/files/sddm.tmpfiles new file mode 100644 index 00000000000..300d646138c --- /dev/null +++ b/x11-misc/sddm/files/sddm.tmpfiles @@ -0,0 +1 @@ +d /var/lib/sddm 0755 sddm sddm diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index ff51f919ae3..4250b6ff295 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -1,24 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>lxqt@gentoo.org</email> - <name>LXQt</name> - </maintainer> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag> - </use> - <longdescription lang="en"> - SDDM is a modern display manager for X11 aiming to be fast, simple - and beatiful. It uses modern technologies like QtQuick, which in - turn gives the designer the ability to create smooth, animated - user interfaces. - </longdescription> - <upstream> - <remote-id type="github">sddm/sddm</remote-id> - </upstream> + <maintainer type="project"> + <email>lxqt@gentoo.org</email> + <name>LXQt</name> + </maintainer> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <longdescription lang="en"> + SDDM is a modern display manager aiming to be fast, simple + and beautiful. It uses modern technologies like QtQuick, which + gives the designer the ability to create smooth, animated UIs. + </longdescription> + <upstream> + <remote-id type="github">sddm/sddm</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/sddm/sddm-0.15.0-r2.ebuild b/x11-misc/sddm/sddm-0.15.0-r2.ebuild deleted file mode 100644 index 6c3a8e611fc..00000000000 --- a/x11-misc/sddm/sddm-0.15.0-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils systemd user - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 x86" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -IUSE="elogind +pam systemd" - -REQUIRED_USE="?? ( elogind systemd )" - -RDEPEND=" - >=dev-qt/qtcore-5.6:5 - >=dev-qt/qtdbus-5.6:5 - >=dev-qt/qtgui-5.6:5 - >=dev-qt/qtdeclarative-5.6:5 - >=dev-qt/qtnetwork-5.6:5 - >=x11-base/xorg-server-1.15.1 - x11-libs/libxcb[xkb] - elogind? ( sys-auth/elogind ) - pam? ( sys-libs/pam ) - !pam? ( virtual/libcrypt:= ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( sys-power/upower )" - -DEPEND="${RDEPEND} - dev-python/docutils - >=dev-qt/linguist-tools-5.6:5 - >=dev-qt/qttest-5.6:5 - kde-frameworks/extra-cmake-modules - virtual/pkgconfig" - -# fix for flags handling and bug 563108 -PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" ) - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - cmake-utils_src_configure -} - -pkg_postinst() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video - - systemd_reenable sddm.service -} diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild b/x11-misc/sddm/sddm-0.18.1-r6.ebuild index 20b12756299..2eef0e69502 100644 --- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild +++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" -inherit cmake plocale systemd user +inherit cmake linux-info systemd tmpfiles DESCRIPTION="Simple Desktop Display Manager" HOMEPAGE="https://github.com/sddm/sddm" @@ -13,24 +12,20 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" SLOT="0" KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="elogind +pam systemd test" -RESTRICT="!test? ( test )" +IUSE="+elogind +pam systemd test" REQUIRED_USE="?? ( elogind systemd )" +RESTRICT="!test? ( test )" -BDEPEND=" - dev-python/docutils - >=dev-qt/linguist-tools-5.9.4:5 - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig -" -RDEPEND=" - >=dev-qt/qtcore-5.9.4:5 - >=dev-qt/qtdbus-5.9.4:5 - >=dev-qt/qtdeclarative-5.9.4:5 - >=dev-qt/qtgui-5.9.4:5 - >=dev-qt/qtnetwork-5.9.4:5 - >=x11-base/xorg-server-1.15.1 +COMMON_DEPEND=" + acct-group/sddm + acct-user/sddm + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + x11-base/xorg-server x11-libs/libxcb[xkb] elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) @@ -38,13 +33,22 @@ RDEPEND=" systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) " -DEPEND="${RDEPEND} - test? ( >=dev-qt/qttest-5.9.4:5 ) +DEPEND="${COMMON_DEPEND} + test? ( dev-qt/qttest:5 ) +" +RDEPEND="${COMMON_DEPEND} + !systemd? ( gui-libs/display-manager-init ) +" +BDEPEND=" + dev-python/docutils + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig " PATCHES=( - "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" - "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210 + "${FILESDIR}/${P}-respect-user-flags.patch" + "${FILESDIR}/${P}-Xsession.patch" # bug 611210 "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch" # fix for groups: https://github.com/sddm/sddm/issues/1159 "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch" @@ -52,21 +56,20 @@ PATCHES=( # fix for ReuseSession=true "${FILESDIR}/${P}-only-reuse-online-sessions.patch" # TODO: fix properly - "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 "${FILESDIR}/pam-1.4-substack.patch" # upstream git develop branch: "${FILESDIR}/${P}-qt-5.15.2.patch" + "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104 ) +pkg_setup() { + local CONFIG_CHECK="~DRM" + use kernel_linux && linux-info_pkg_setup +} + src_prepare() { cmake_src_prepare - disable_locale() { - sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die - } - plocale_find_changes "data/translations" "" ".ts" - plocale_for_each_disabled_locale disable_locale - if ! use test; then sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die cmake_comment_add_subdirectory test @@ -87,6 +90,8 @@ src_configure() { src_install() { cmake_src_install + newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf" + # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement local confd="/usr/share/sddm/sddm.conf.d" dodir ${confd} @@ -100,12 +105,25 @@ src_install() { } pkg_postinst() { + tmpfiles_process "${PN}.conf" + elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf" elog "Use it to override specific options. SDDM defaults are now" elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf" - - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video + elog + elog "NOTE: If SDDM startup appears to hang then entropy pool is too low." + elog "This can be fixed by configuring one of the following:" + elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel" + elog " - # emerge sys-apps/haveged && rc-update add haveged boot" + elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot" + elog + elog "For more information on how to configure SDDM, please visit the wiki:" + elog " https://wiki.gentoo.org/wiki/SDDM" + if has_version x11-drivers/nvidia-drivers; then + elog + elog " Nvidia GPU owners in particular should pay attention" + elog " to the troubleshooting section." + fi systemd_reenable sddm.service } diff --git a/x11-misc/sent/sent-1-r1.ebuild b/x11-misc/sent/sent-1-r1.ebuild index 8324b45871a..4a36a2f9f46 100644 --- a/x11-misc/sent/sent-1-r1.ebuild +++ b/x11-misc/sent/sent-1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -36,7 +36,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/sent/sent-9999.ebuild b/x11-misc/sent/sent-9999.ebuild index 95b2d9227ca..08ec94ec84d 100644 --- a/x11-misc/sent/sent-9999.ebuild +++ b/x11-misc/sent/sent-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -35,7 +35,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest index c111c1487da..3585101d2d2 100644 --- a/x11-misc/shared-mime-info/Manifest +++ b/x11-misc/shared-mime-info/Manifest @@ -1 +1,3 @@ DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0 +DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e +DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8 diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild new file mode 100644 index 00000000000..baf056de38b --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson toolchain-funcs xdg-utils + +# Keep an eye on https://gitlab.freedesktop.org/xdg/xdgmime/-/merge_requests/25! +# xdgmime is used for tests but doesn't make releases nowadays; do what +# Fedora does and use a snapshot so we can run the test suite. +MY_XDGMIME_COMMIT="92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7" +DESCRIPTION="The Shared MIME-info Database specification" +HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" +SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.gz" +SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND=" + dev-libs/glib:2 + dev-libs/libxml2 +" +DEPEND="${RDEPEND}" + +DOCS=( HACKING.md NEWS README.md ) + +src_prepare() { + default + + if use test ; then + # Drop empty dir (it's a submodule in upstream git repo) + rm -r "${S}"/xdgmime || die + # Lead Meson to our snapshot + ln -s "${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} xdgmime || die + # Don't break parallel make + sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die + fi +} + +src_configure() { + # We have to trick Meson into thinking it's there now so that + # we can run meson then emake to build xdgmime later, rather than + # building before running meson which would mean doing something + # unexpected in src_configure. + if use test ; then + # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 + touch xdgmime/src/{print,test}-mime{,-data} || die + chmod +x xdgmime/src/{print,test}-mime{,-data} || die + fi + + local emesonargs=( + -Dbuild-tools=true + -Dupdate-mimedb=false + ) + + meson_src_configure +} + +src_compile() { + if use test ; then + tc-export CC + + # xdgmime only has a homebrew Makefile + emake -C xdgmime + fi + + meson_src_compile +} + +src_install() { + meson_src_install + + # in prefix, install an env.d entry such that prefix patch is used/added + if use prefix; then + echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die + doenvd "${T}"/50mimeinfo + fi +} + +pkg_postinst() { + use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share + xdg_mimeinfo_database_update +} diff --git a/x11-misc/shutter/shutter-0.99.2.ebuild b/x11-misc/shutter/shutter-0.99.2.ebuild index 8a35f2c4fbd..f428414ecaa 100644 --- a/x11-misc/shutter/shutter-0.99.2.ebuild +++ b/x11-misc/shutter/shutter-0.99.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-lang/perl diff --git a/x11-misc/sisctrl/Manifest b/x11-misc/sisctrl/Manifest deleted file mode 100644 index cb8311abbba..00000000000 --- a/x11-misc/sisctrl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sisctrl-0.0.20051202.tar.gz 666749 BLAKE2B 8e99581cd9708a17ed3d01934c3a70e660213df91cbbac71816eb16dd5c41da725d92fc66d336fdc88b61704d9e7259f77b3da2becf2d2ab901d72e71f1e8c9c SHA512 26fe6561c2c14ff6cf952b89b8089b4fbdbc0c142bbcbf1358afe610b219a05dcf4d0bc835365cd0cf13558fed142b8aa2a0aa91c4fec8f40f0fc82590feabd1 diff --git a/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch b/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch deleted file mode 100644 index 6c61b8485bc..00000000000 --- a/x11-misc/sisctrl/files/sisctrl-0.0.20051202-no-xv.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/sisctrl.c -+++ b/src/sisctrl.c -@@ -4067,7 +4067,9 @@ - ( (!(sc.sdflags & SiS_SD_SUPPORT2OVL)) || (sc.sd2flags & SiS_SD2_SUPPORT760OO) ) ) ? - 1 : 0; - -+#ifdef USEXV - gl.noxvdemo = (sc.noxvdemo) ? 1 : 0; -+#endif - - #ifdef USE_STRAY - gl.dontusesystemtray = sc.dontusesystemtray; diff --git a/x11-misc/sisctrl/metadata.xml b/x11-misc/sisctrl/metadata.xml deleted file mode 100644 index d3e0f463125..00000000000 --- a/x11-misc/sisctrl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> -</pkgmetadata> diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild deleted file mode 100644 index 931f27d4658..00000000000 --- a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="tool that allows you to tune SiS drivers from X" -HOMEPAGE="http://www.winischhofer.net/linuxsispart1.shtml#sisctrl" -SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" - -BDEPEND="virtual/pkgconfig" -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:2 - x11-libs/libXrender - x11-libs/libXv - x11-libs/libXxf86vm -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -PATCHES=( - "${FILESDIR}"/${P}-no-xv.patch -) - -src_configure() { - append-libs -lm - econf \ - --with-xv-path="${ESYSROOT}/usr/$(get_libdir)" -} diff --git a/x11-misc/skippy/metadata.xml b/x11-misc/skippy/metadata.xml index 410408b3d17..85e4ed814fa 100644 --- a/x11-misc/skippy/metadata.xml +++ b/x11-misc/skippy/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch b/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch new file mode 100644 index 00000000000..f137d94e836 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch @@ -0,0 +1,11 @@ +diff -Naur slim-1.3.6.orig/panel.cpp slim-1.3.6/panel.cpp +--- slim-1.3.6.orig/panel.cpp 2014-06-18 11:04:57.958630814 -0400 ++++ slim-1.3.6/panel.cpp 2014-06-18 11:05:10.675631393 -0400 +@@ -11,6 +11,7 @@ + + #include <sstream> + #include <poll.h> ++#include <libgen.h> + #include <X11/extensions/Xrandr.h> + #include "panel.h" + diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild index ee566409d2d..6e80951c7db 100644 --- a/x11-misc/slim/slim-1.3.6-r5.ebuild +++ b/x11-misc/slim/slim-1.3.6-r5.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=7 @@ -22,8 +22,7 @@ RDEPEND="x11-libs/libXmu media-libs/libpng:0= virtual/jpeg:= x11-apps/sessreg - pam? ( sys-libs/pam - !x11-misc/slimlock )" + pam? ( sys-libs/pam )" DEPEND="${RDEPEND} x11-base/xorg-proto" BDEPEND="virtual/pkgconfig" @@ -43,17 +42,13 @@ PATCHES=( "${FILESDIR}"/${P}-drop-zlib.patch "${FILESDIR}"/${P}-freetype.patch "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch + "${FILESDIR}"/${PN}-1.3.6-add-missing-libgen_h.patch "${FILESDIR}"/${PN}-1.3.6-gcc11.patch ) src_prepare() { cmake_src_prepare - if use elibc_FreeBSD; then - sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ - || die - fi - if use branding; then sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die fi diff --git a/x11-misc/slock/slock-1.4-r1.ebuild b/x11-misc/slock/slock-1.4-r1.ebuild index 2753a844971..0f6f4a03565 100644 --- a/x11-misc/slock/slock-1.4-r1.ebuild +++ b/x11-misc/slock/slock-1.4-r1.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=7 @@ -40,10 +40,6 @@ src_prepare() { -e 's|@${CC}|$(CC)|g' \ Makefile || die - if use elibc_FreeBSD; then - sed -i -e 's/-DHAVE_SHADOW_H//' config.mk || die - fi - restore_config config.h tc-export CC diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest index 4dace195982..1760412cfce 100644 --- a/x11-misc/slop/Manifest +++ b/x11-misc/slop/Manifest @@ -1,2 +1 @@ -DIST slop-7.5.tar.gz 51060 BLAKE2B 8d0fcf932181dfc482be7c54cf5a08605a32c85bcd8b27223a4cd8a08323382e802a7f20faa6c51fe67583b1d320cf783c7b5cc8b871e534ea11a32b827e1f45 SHA512 c02e40c5b924841996617fcc9629a6a739a04b6128c18e1eb06dc285d2f8026d847e67077fb59a111fc45c112f871a6e5faef20108c3d777271e1d4aca7f4737 DIST slop-7.6.tar.gz 198605 BLAKE2B fcf8b0e1212f50044aa3e3a15d208ee3fda9e1883b9601beba6b29ad574555db83f382547bbe064570765e1ed1e7c0c92bf891edadf89f006bfdf10a5b469c66 SHA512 d1abc50cad124cfb11e9b57c38c824efb2ece3dffce8e54e451ce4adc4a7ad441c6171b7df5d1c8dfa66c875a12cf07b206ba3b87229c0e5f2ddf744d7922fc3 diff --git a/x11-misc/slop/slop-7.5.ebuild b/x11-misc/slop/slop-7.5.ebuild deleted file mode 100644 index 2a2d4fd07ad..00000000000 --- a/x11-misc/slop/slop-7.5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Application that queries the user for a selection for printing" -HOMEPAGE="https://github.com/naelstrof/slop" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/naelstrof/slop.git" -else - SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${PV}" -IUSE="opengl" - -RDEPEND=" - dev-libs/icu:= - x11-libs/libX11 - x11-libs/libXext - opengl? ( - media-libs/glew:0= - media-libs/libglvnd - virtual/opengl - x11-libs/libXrender:= - ) -" -DEPEND="${RDEPEND} - media-libs/glm -" - -PATCHES=( - "${FILESDIR}"/${P}-missing-header.patch -) - -src_configure() { - local mycmakeargs=( - -DSLOP_OPENGL=$(usex opengl) - ) - cmake_src_configure -} diff --git a/x11-misc/slop/slop-7.6.ebuild b/x11-misc/slop/slop-7.6.ebuild index 849d37f0f0a..eae133af55d 100644 --- a/x11-misc/slop/slop-7.6.ebuild +++ b/x11-misc/slop/slop-7.6.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 @@ -8,7 +8,7 @@ inherit cmake DESCRIPTION="Application that queries the user for a selection for printing" HOMEPAGE="https://github.com/naelstrof/slop" SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" LICENSE="GPL-3" SLOT="0/${PV}" diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest index 37c190bfda1..2f8e6a85d95 100644 --- a/x11-misc/spnavcfg/Manifest +++ b/x11-misc/spnavcfg/Manifest @@ -1 +1,2 @@ DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408 +DIST spnavcfg-1.0.tar.gz 496695 BLAKE2B 59d79cc1707881ba50e809c73a41cb94dbfd15e5e184114190efa2394fe4b53f25960a828611007a200687a3e9827bc4df30d3d06ca3764b23573a1f51fb2974 SHA512 271d1d66fdfb4aff9faa521c51c776dbccf77320b0783a5dbdcc4a28d4190ef3ba6c3d277d706dafc35e2e6ceed1d244d346d4a91cf8e1f5ba3141c24d065ea8 diff --git a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild index ae66b229878..3cec1650f54 100644 --- a/x11-misc/spnavcfg/spnavcfg-0.3.1.ebuild +++ b/x11-misc/spnavcfg/spnavcfg-0.3.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=7 @@ -25,5 +25,5 @@ src_configure() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } diff --git a/x11-misc/spnavcfg/spnavcfg-1.0.ebuild b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild new file mode 100644 index 00000000000..d49c3125f96 --- /dev/null +++ b/x11-misc/spnavcfg/spnavcfg-1.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs qmake-utils + +DESCRIPTION="GTK-based GUI to configure a space navigator device" +HOMEPAGE="http://spacenav.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMON_DEPEND=">=dev-libs/libspnav-1[X] + dev-qt/qtcore + dev-qt/qtgui + dev-qt/qtwidgets + x11-libs/libX11" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + >=app-misc/spacenavd-1[X]" + +src_configure() { + econf --disable-debug --disable-opt +} + +src_compile() { + local args=( + CC="$(tc-getCC)" + MOC="$(qt5_get_bindir)/moc" + RCC="$(qt5_get_bindir)/rcc" + UIC="$(qt5_get_bindir)/uic" + ) + emake "${args[@]}" +} diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml index 0cf80030987..85e4ed814fa 100644 --- a/x11-misc/sselp/metadata.xml +++ b/x11-misc/sselp/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>desktop-misc@gentoo.org</email> -<name>Gentoo Desktop Miscellaneous Project</name> -</maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/stalonetray/stalonetray-0.8.4.ebuild b/x11-misc/stalonetray/stalonetray-0.8.4.ebuild index bf278325f3d..f63dff43749 100644 --- a/x11-misc/stalonetray/stalonetray-0.8.4.ebuild +++ b/x11-misc/stalonetray/stalonetray-0.8.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=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/kolbusa/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="debug +graceful-exit" RDEPEND="x11-libs/libICE diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index 2f108652571..b817cd6697e 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,5 +1,3 @@ DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880 DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab -DIST synergy-core-1.14.0.4-stable.tar.gz 8835907 BLAKE2B 56e59eb3494e9823feca7744602c9ce1ae709a6d74c80c6d06f861333d938331760eb02b83d980afd932e1760a638849ba498fc0d919eeb431e54d3a1602f77e SHA512 278ff319c5d308052e9f89a8ae53a99aacaa2b394d28e353b3779a4ee672cb09d91f37a4b0564788456d8e0bed90936d924739e74f7aa2a85482926164dc2fc8 -DIST synergy-core-1.14.1.31-rc.tar.gz 4617773 BLAKE2B 3124165e755a494bfe6601dfb20a85fb595c3ff660e0c84a86b91ef90a8a6dd430693f78f7da0115133d8e77dd12178510c7095649e956edd43a8d38903092be SHA512 2ceec51c308815758083cb8ac7739834316cbf821e813c1a1f1dae864d2e7ffbaf43fc306b471e104ce5fa691d9ddb175be3daa7fb7200b9b86ea58b46cc6dd3 DIST synergy-core-1.14.1.32-stable.tar.gz 4617994 BLAKE2B c015ddff44175ea6b0436ab0d7eccfc4e693d7697a67a1b256d310784d794589b1f1815c95fc5948b9987b2c8d11b6bd0685efe08fc87291835fb03b7dcce970 SHA512 c0835d9f1b3f05a994d8340c7abdeb4ed7ab68739d3c0f05e61f639924978d2de1ed1ded58b398287aa29d013a73114b71a578572d2ad6f96e3fce3e0e1a8bc6 diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml index 8ea24a43755..429e10cbb5c 100644 --- a/x11-misc/synergy/metadata.xml +++ b/x11-misc/synergy/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">symless/synergy-core</remote-id> </upstream> diff --git a/x11-misc/synergy/synergy-1.14.0.4.ebuild b/x11-misc/synergy/synergy-1.14.0.4.ebuild deleted file mode 100644 index 70331d27a48..00000000000 --- a/x11-misc/synergy/synergy-1.14.0.4.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg-utils virtualx - -[[ ${PV} == *_* ]] && MY_PV=${PV/_/-} || MY_PV=${PV}-stable -MY_P=synergy-core-${MY_PV} -GTEST_COMMIT=18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6 - -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" -HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core/" -SRC_URI=" - https://github.com/symless/synergy-core/archive/${MY_PV}.tar.gz - -> ${MY_P}.tar.gz - https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png - test? ( - https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz - -> googletest-${GTEST_COMMIT}.tar.gz - ) -" -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="gui test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/openssl:= - x11-libs/libICE:= - x11-libs/libSM:= - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXi:= - x11-libs/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXtst:= - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - gui? ( - dev-qt/linguist-tools:5 - )" - -DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) - -src_prepare() { - # broken on Xvfb - rm src/test/integtests/platform/XWindowsScreenTests.cpp || die - - if use test; then - rmdir ext/googletest || die - mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYNERGY_BUILD_LEGACY_GUI=$(usex gui) - -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF - -DBUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} - -my_test() { - "${BUILD_DIR}"/bin/unittests && - "${BUILD_DIR}"/bin/integtests -} - -src_test() { - virtx my_test -} - -src_install() { - dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool} - - if use gui; then - newbin "${BUILD_DIR}"/bin/synergy qsynergy - newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png - make_desktop_entry qsynergy Synergy qsynergy 'Utility;' - fi - - insinto /etc - newins doc/synergy.conf.example synergy.conf - - newman doc/synergyc.man synergyc.1 - newman doc/synergys.man synergys.1 - - einstalldocs -} - -pkg_postinst() { - use gui && xdg_icon_cache_update -} - -pkg_postrm() { - use gui && xdg_icon_cache_update -} diff --git a/x11-misc/synergy/synergy-1.14.1.31_rc.ebuild b/x11-misc/synergy/synergy-1.14.1.31_rc.ebuild deleted file mode 100644 index a78eee5c4b7..00000000000 --- a/x11-misc/synergy/synergy-1.14.1.31_rc.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop xdg-utils virtualx - -[[ ${PV} == *_* ]] && MY_PV=${PV/_/-} || MY_PV=${PV}-stable -MY_P=synergy-core-${MY_PV} -GTEST_COMMIT=18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6 - -DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" -HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core/" -SRC_URI=" - https://github.com/symless/synergy-core/archive/${MY_PV}.tar.gz - -> ${MY_P}.tar.gz - https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png - test? ( - https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz - -> googletest-${GTEST_COMMIT}.tar.gz - ) -" -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="gui test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/glib - dev-libs/openssl:= - dev-qt/qtdbus:5 - x11-libs/gdk-pixbuf - x11-libs/libICE:= - x11-libs/libSM:= - x11-libs/libX11:= - x11-libs/libXext:= - x11-libs/libXi:= - x11-libs/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXtst:= - x11-libs/libnotify - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - gui? ( - dev-qt/linguist-tools:5 - )" - -DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) - -src_prepare() { - # broken on Xvfb - rm src/test/integtests/platform/XWindowsScreenTests.cpp || die - - if use test; then - rmdir ext/googletest || die - mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSYNERGY_BUILD_LEGACY_GUI=$(usex gui) - -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF - -DBUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} - -my_test() { - "${BUILD_DIR}"/bin/unittests && - "${BUILD_DIR}"/bin/integtests -} - -src_test() { - virtx my_test -} - -src_install() { - dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool} - - if use gui; then - newbin "${BUILD_DIR}"/bin/synergy qsynergy - newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png - make_desktop_entry qsynergy Synergy qsynergy 'Utility;' - fi - - insinto /etc - newins doc/synergy.conf.example synergy.conf - - newman doc/synergyc.man synergyc.1 - newman doc/synergys.man synergys.1 - - einstalldocs -} - -pkg_postinst() { - use gui && xdg_icon_cache_update -} - -pkg_postrm() { - use gui && xdg_icon_cache_update -} diff --git a/x11-misc/tabbed/tabbed-0.6-r1.ebuild b/x11-misc/tabbed/tabbed-0.6-r1.ebuild index 7351759f031..44798c1dea9 100644 --- a/x11-misc/tabbed/tabbed-0.6-r1.ebuild +++ b/x11-misc/tabbed/tabbed-0.6-r1.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=7 @@ -40,7 +40,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { default diff --git a/x11-misc/tdrop/Manifest b/x11-misc/tdrop/Manifest index de7426df186..62e11fadfb1 100644 --- a/x11-misc/tdrop/Manifest +++ b/x11-misc/tdrop/Manifest @@ -1,2 +1,2 @@ -DIST tdrop-0.3.0.tar.gz 19495 BLAKE2B 5f72090e6ccacaa4f708715cb1a2eb43bb8acec79f43301da67dbe0a8d81637806603d06b9ad0b2815e8aea1f481271f5b8f8adddba60079ad48ec621f8e8e8f SHA512 3e1c30e42ce96570fabd43b89fd9f17a23d74c4943ef9ab5d1edb4967ffa6c4c0259df4449ef2a18b396d1057f4a19a413fec817ff708d3e41906695cebb67ca DIST tdrop-0.4.0.tar.gz 21550 BLAKE2B 673ad98aa294410b4547fce842d191fd3c5512cca79361cae35fcb646afd328615daab1fa112bcba9e28cdea6bbeb2ca696bcc78d54c0302d32a91324a8a16d9 SHA512 679fed509e29752ebe3df378e68d9701c9edb53c9162854a8cb623f2da53499b933dad59fa6fc865ac44c67544cd6bcb779316ee4312e87c39559ade1ab313d8 +DIST tdrop-0.5.0.tar.gz 24726 BLAKE2B d0043bcc28115999b89fe6d89790ea4d1d6da71dec7034a283c4f3b5b2b8f065482f8727d6e0d900f5ae00c3ea3d7a06ce03a82902286d509a8b04dd5b46025d SHA512 cfccbdb73b00ea8c1376f34debe2b7f550343100fd47e7f45a859ad692f42abbf58e26316a95813691f4bda05cce657490bfcc7b3765585d9afb396580aefce5 diff --git a/x11-misc/tdrop/metadata.xml b/x11-misc/tdrop/metadata.xml index 361ed25e685..00bdb75dd30 100644 --- a/x11-misc/tdrop/metadata.xml +++ b/x11-misc/tdrop/metadata.xml @@ -6,6 +6,7 @@ <name>Georgy Yakovlev</name> </maintainer> <upstream> - <remote-id type="github">octuid/tdrop</remote-id> + <remote-id type="github">noctuid/tdrop</remote-id> + <changelog>https://github.com/noctuid/tdrop/blob/master/Changelog.org</changelog> </upstream> </pkgmetadata> diff --git a/x11-misc/tdrop/tdrop-0.3.0.ebuild b/x11-misc/tdrop/tdrop-0.5.0.ebuild index 1031384a291..252c3456998 100644 --- a/x11-misc/tdrop/tdrop-0.3.0.ebuild +++ b/x11-misc/tdrop/tdrop-0.5.0.ebuild @@ -1,7 +1,9 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit optfeature DESCRIPTION="WM-Independent Dropdown Creator" HOMEPAGE="https://github.com/noctuid/tdrop" @@ -20,6 +22,7 @@ IUSE="" RDEPEND=" app-shells/bash + sys-apps/gawk sys-process/procps x11-apps/xprop x11-apps/xrandr @@ -36,3 +39,7 @@ src_install() { doman tdrop.1 dodoc README.org } + +pkg_postinst() { + optfeature "tmux session support" app-misc/tmux +} diff --git a/x11-misc/tdrop/tdrop-9999.ebuild b/x11-misc/tdrop/tdrop-9999.ebuild index 695b437b87d..252c3456998 100644 --- a/x11-misc/tdrop/tdrop-9999.ebuild +++ b/x11-misc/tdrop/tdrop-9999.ebuild @@ -1,7 +1,9 @@ -# Copyright 2019-2021 Gentoo Authors +# Copyright 2019-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +inherit optfeature DESCRIPTION="WM-Independent Dropdown Creator" HOMEPAGE="https://github.com/noctuid/tdrop" @@ -20,6 +22,7 @@ IUSE="" RDEPEND=" app-shells/bash + sys-apps/gawk sys-process/procps x11-apps/xprop x11-apps/xrandr @@ -36,3 +39,7 @@ src_install() { doman tdrop.1 dodoc README.org } + +pkg_postinst() { + optfeature "tmux session support" app-misc/tmux +} diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest index 793379334e4..39e0ea97036 100644 --- a/x11-misc/tint2/Manifest +++ b/x11-misc/tint2/Manifest @@ -1,2 +1,3 @@ DIST tint2-v16.7.tar.gz 551197 BLAKE2B ef1c5b3dea255e12f6dcea80a29f016e32e48f729f4be3e1fd7421c6fbdbbacde70f42f3052547dca8421b8343d4b41fbf2ea52b07aa4471974f9f0cc6eea7a7 SHA512 a9bb0b55536e09f70b1d14a5748635f5c5ec1b7b22517453a963b240ab593aae43c56e5cbc7b79d5f19103f0e13200faceb2d25afd66c3d941580424ae6d9d31 DIST tint2-v17.0.1.tar.gz 553523 BLAKE2B 112186c95561af22d67707a0d4d17462c3d32bd4c97165066a1c491c628359eabba3563b271a46e980dd65abaf42a4b59dc36c42ee3cdb2b6d6cde616e0acfe5 SHA512 cc887d1d9eb8b69135ec6f1e591c38b374605f36fa7609fc580de6a81f33ec98c74af0ba2ab326f1ae25d52b75d2056a48cc2a76d78da1fd27dfdf7818fe429b +DIST tint2-v17.0.2.tar.gz 553734 BLAKE2B 73cd89757963f1a3c3460a2e8e61891e77eb12b9809590dbbbc00df00d03e82d33d6175c7e3ff4623a3390e35fe1530263915b4574dedfd46d9401fbc90d769f SHA512 9bfdf9ba33183ed60b95f73e58d9c1c22af83e9973a0e07ff2825d66d19c7103364426753a07eaecd4dbca278dfc6e22737bc6ce38d9b577b65f672f146e7aa2 diff --git a/x11-misc/tint2/tint2-17.0.1.ebuild b/x11-misc/tint2/tint2-17.0.1-r1.ebuild index 7b5eec7cee8..2486a789a67 100644 --- a/x11-misc/tint2/tint2-17.0.1.ebuild +++ b/x11-misc/tint2/tint2-17.0.1-r1.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 @@ -21,7 +21,7 @@ DEPEND=" >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) + tint2conf? ( x11-libs/gtk+:3 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage diff --git a/x11-misc/tint2/tint2-17.0.2.ebuild b/x11-misc/tint2/tint2-17.0.2.ebuild new file mode 100644 index 00000000000..2486a789a67 --- /dev/null +++ b/x11-misc/tint2/tint2-17.0.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Lightweight panel/taskbar for Linux" +HOMEPAGE="https://gitlab.com/o9000/tint2" +SRC_URI="https://gitlab.com/o9000/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz" +S=${WORKDIR}/${PN}-v${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +IUSE="battery startup-notification svg tint2conf" + +DEPEND=" + dev-libs/glib:2 + svg? ( gnome-base/librsvg:2 ) + >=media-libs/imlib2-1.4.2[X,png] + x11-libs/cairo[X] + x11-libs/pango + tint2conf? ( x11-libs/gtk+:3 ) + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXinerama + >=x11-libs/libXrandr-1.3 + x11-libs/libXrender + startup-notification? ( x11-libs/startup-notification ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -DENABLE_BATTERY="$(usex battery)" + -DENABLE_TINT2CONF="$(usex tint2conf)" + -DENABLE_SN="$(usex startup-notification)" + -DENABLE_RSVG="$(usex svg)" + ) + cmake_src_configure +} diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild new file mode 100644 index 00000000000..5e24fffa7f0 --- /dev/null +++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase" +HOMEPAGE="https://github.com/sargon/trayer-srg" +SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + x11-libs/gdk-pixbuf:2 + dev-libs/glib:2 + x11-libs/gtk+:2 + x11-libs/libX11 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}"/${PN}-trayer-${PV} + +src_configure() { + ./configure --prefix="${EPREFIX}" || die +} + +src_compile() { + emake TARGET=${PN} CC="$(tc-getCC)" +} + +src_install() { + dobin ${PN} + einstalldocs +} diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild index d83e08e8ded..5afa3ceb9ee 100644 --- a/x11-misc/trayer/trayer-1.0-r4.ebuild +++ b/x11-misc/trayer/trayer-1.0-r4.ebuild @@ -1,27 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop" HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/" SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -RDEPEND=" - dev-libs/glib:2 +RDEPEND="dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" + x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest index 2284fe0bf15..fd4248f5343 100644 --- a/x11-misc/urxvt-tabbedex/Manifest +++ b/x11-misc/urxvt-tabbedex/Manifest @@ -1,2 +1 @@ -DIST urxvt-tabbedex-20.49.tar.gz 33239 BLAKE2B fd5e3619c7b639cbf65364895389145dc7b5d819808a4d40d99732f2d1154ac4418f0a9324b4e8f001ca6786c959886e58df2b8f81e3b9a723b948708c869a40 SHA512 27e508f388e5725866465fe3c3e6ff052eabd14e9a72c22788c61ebed2a9db69517f676071d648a693ba5b9a438ac14d5b9a9ea1208a044001255c2d2562fc48 DIST urxvt-tabbedex-21.47.tar.gz 33557 BLAKE2B c9d32cf466df00f5cc0c86b939bc8b87bab6edc6b74ada6c6576176d9becdc842b6af7a8d38a200906a4b6614788dbfd1658abb6b2eaee787426466ff9b8b330 SHA512 6459f04ad0e2524a356e0056d9bc08bfe04e3ba6c5c00f3aafa76ad1df3ddb8161c8feee56370cf3e1f4fe47c61b63635cc91f3222f5a8f1161574237c870e7d diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild deleted file mode 100644 index bf69aac9a9e..00000000000 --- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-20.49.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="An extended version of rxvt-unicode's tabbed perl extension" -HOMEPAGE="https://github.com/mina86/urxvt-tabbedex" - -MY_PN=${PN/urxvt-/} -SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="x11-terms/rxvt-unicode[perl]" - -DOCS=( AUTHORS README.md command-runner.sample ) - -src_compile() { :; } - -src_install() { - einstalldocs - - insinto /usr/$(get_libdir)/urxvt/perl/ - doins ${MY_PN} - - insinto /usr/$(get_libdir)/urxvt/ - newins pgid-cd.pl tabbedex-pgid-cd -} diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild index b7de4a4f3d3..810342261df 100644 --- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild +++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}. LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="x11-terms/rxvt-unicode[perl]" diff --git a/x11-misc/util-macros/util-macros-1.19.3.ebuild b/x11-misc/util-macros/util-macros-1.19.3.ebuild index d7faee095ba..cd703a10a56 100644 --- a/x11-misc/util-macros/util-macros-1.19.3.ebuild +++ b/x11-misc/util-macros/util-macros-1.19.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=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" # there is nothing to compile for this package, all its contents are produced by # configure. the only make job that matters is make install diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest index 11e8d6993fd..4b656479e43 100644 --- a/x11-misc/vdpauinfo/Manifest +++ b/x11-misc/vdpauinfo/Manifest @@ -1 +1 @@ -DIST vdpauinfo-1.4.tar.bz2 11811 BLAKE2B bf0c268505b8eafb9da7c799518296498f2c04bde33443101625c4a80cfde6418428d3969e9ac0f4222a6985b53f3bd4dff688fc03af29de7576f3af3605e07c SHA512 7227205f35d5ad9bc64537d4e47e1924e7efbcd1185420f5f575eadff23f2932484db9c39c377282ed88fa7fd43d436064b10961082ccbf66c49dac72b4129a3 +DIST vdpauinfo-1.4_p20220208.tar.gz 12251 BLAKE2B 14b2a6bb81ac1843d30f0ae9c976971cd3409b50bd6b9adcb59d9132535fcebd3dda7a7f772aabce03bb6877e8140991301a770a58bcc4e82c864c10494773ed SHA512 a87f92a4467f87293fc931a2c5c003763aab8551adcce7fa7281b20f5520a8d2a9df2ff06bb66814cdd059266381a145c851fd7169749e8066e80e4a578cccaa diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml index 85e4ed814fa..06d84e396dc 100644 --- a/x11-misc/vdpauinfo/metadata.xml +++ b/x11-misc/vdpauinfo/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild deleted file mode 100644 index 1f24203192d..00000000000 --- a/x11-misc/vdpauinfo/vdpauinfo-1.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Displays info about your card's VDPAU support" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - >=x11-libs/libvdpau-1.4 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - default - eautoreconf -} diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild new file mode 100644 index 00000000000..133cc3bc678 --- /dev/null +++ b/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +VDPAUINFO_COMMIT="da66af25aa327d21179d478f3a6d8c03b6c7f574" + +DESCRIPTION="Displays info about your card's VDPAU support" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" +SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${VDPAUINFO_COMMIT}/${P}.tar.gz" +S="${WORKDIR}/${PN}-${VDPAUINFO_COMMIT}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + >=x11-libs/libvdpau-1.5 + x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + eautoreconf +} diff --git a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild b/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild deleted file mode 100644 index 1c399e6d205..00000000000 --- a/x11-misc/vdpauinfo/vdpauinfo-99999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="Displays info about your card's VDPAU support" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU" -EGIT_REPO_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - >=x11-libs/libvdpau-1.4 - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" - -src_prepare() { - default - eautoreconf -} diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index a868d4cd7b8..87e3548f133 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -1 +1,2 @@ DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532 +DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c SHA512 9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98 diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild new file mode 100644 index 00000000000..762d51d6aaa --- /dev/null +++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +CMAKE_ECLASS=cmake + +inherit cmake-multilib flag-o-matic systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" + inherit git-r3 +else + MY_PN="VirtualGL" + MY_P="${MY_PN}-${PV}" + S="${WORKDIR}/${MY_P}" + SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz" + KEYWORDS="amd64 x86" +fi + +DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" +HOMEPAGE="https://www.virtualgl.org/" + +SLOT="0" +LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" +IUSE="ssl" + +RDEPEND=" + ssl? ( + dev-libs/openssl:0=[${MULTILIB_USEDEP}] + ) + media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] + x11-libs/libXv[${MULTILIB_USEDEP}] + x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] + virtual/opencl[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + amd64? ( abi_x86_32? ( + >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] + >=x11-libs/libX11-1.6.2[abi_x86_32] + >=x11-libs/libXext-1.3.2[abi_x86_32] + >=x11-libs/libXtst-1.2.3[abi_x86_32] + >=x11-libs/libXv-1.0.10[abi_x86_32] + x11-libs/xcb-util-keysyms[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32] + virtual/opencl[abi_x86_32] + >=virtual/opengl-7.0-r1[abi_x86_32] + ) ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + # Use /var/lib, bug #428122 + sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ + server/vglrun.in server/vglgenkey server/vglserver_config || die + + cmake_src_prepare +} + +src_configure() { + # Completely breaks steam/wine for discrete graphics otherwise + # see https://github.com/VirtualGL/virtualgl/issues/16 + append-ldflags "-Wl,--no-as-needed" + + abi_configure() { + local mycmakeargs=( + -DVGL_USESSL="$(usex ssl)" + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" + -DTJPEG_INCLUDE_DIR=/usr/include + -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL + -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so + -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) + ) + cmake_src_configure + } + multilib_parallel_foreach_abi abi_configure +} + +src_install() { + cmake-multilib_src_install + + # Make config dir + keepdir /var/lib/VirtualGL + fowners root:video /var/lib/VirtualGL + fperms 0750 /var/lib/VirtualGL + newinitd "${FILESDIR}/vgl.initd-r4" vgl + newconfd "${FILESDIR}/vgl.confd-r2" vgl + + exeinto /usr/libexec + doexe "${FILESDIR}/vgl-helper.sh" + systemd_dounit "${FILESDIR}/vgl.service" + + # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs + # and eglinfo to veglinto because of conflict with mesa-progs[egl] + mv "${D}"/usr/bin/{,v}glxinfo || die + mv "${D}"/usr/bin/{,v}eglinfo || die + + # Remove license files, bug 536284 + rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die +} diff --git a/x11-misc/x2x/Manifest b/x11-misc/x2x/Manifest index b7569af88c5..afbe097daec 100644 --- a/x11-misc/x2x/Manifest +++ b/x11-misc/x2x/Manifest @@ -1,4 +1,5 @@ DIST x2x-1.27-keymap.diff.gz 1145 BLAKE2B cca78c368a9f5a27c94121eec12ab800322d1b0549c1be940b22dd455cbd42761283d1646bba8e098b94364cd6023ef6e615df9f788cf68913af967077eb6de9 SHA512 46e0d9cef4b985523e4bf2d6c550d68f488c0975a007433f2a6c03d77541ce0cbdffd44ea29472fa6db4e8b804503cdaf9e8b5f9d72c56d902270cf3291ca37f DIST x2x-1.27.tar.gz 16776 BLAKE2B 8f78d801c1911928b0d5bb37b406bcf5285d3a54daf5067abae40125ad4e4f7fc52b8cc74f4e1c35b99350fc794f80c26120cae48e5076326746ec87d7aee0f3 SHA512 c5f8b1ec49f9871bf0d8142a047a2dff9a6ee262dfafd459044c977973dd45e297186961a8793938fc8e328f2553ec4de97e06343bdf3550f3bc3f2368b23131 +DIST x2x-1.30.tar.gz 52760 BLAKE2B fae2eeb9aa68241c3ba9e79021aa9313a5852048f23b6be8ad5de7dd090d2cd09c006f4c1b1403ccfa8057f314657c2248463a7c53187e41291742cfaa04139a SHA512 cb14b40e1511e3fe6c927443f5f411a827ebf6c313bfb46af0165eebdd534c8aa3abcc8064b89420b7f44c23c518ed4f02bab4c23bbcfaece8910a3f824c9c11 DIST x2x_1.27-8-initvars.patch.gz 494 BLAKE2B 97d48f4a2e7b65fd6755860c51399e5b6343bd0c7e6c79c7dd311792a899a02ed0ac6991d16495e96ca34913fbcec011b106bac6d0f9798540fb5704ca12f4cf SHA512 53060affef7575106932380063616473103c738193fdeab9118e0fb9ec1d1de2fe63f4112e5af82fe38198d0b42a10effde574bb9dee95c8fefdbdf680dbdf01 DIST x2x_1.27-8.diff.gz 13291 BLAKE2B 4a4a0bf34a864596cff2f0722163bfe53968e30892bd0a18ed18ca6c3ef8f5bc763b215381c46792b499839397dbecab033bd9095646fad36613ad11beba1240 SHA512 8201ab5fd0efd93adec53cec3b48f7b4de907b2db184ffa6e85a1e16739b4d0021f4562820d0b4730a0f6a2779985b5574973c2b0ceb04b241f0d7dc15060b71 diff --git a/x11-misc/x2x/files/x2x_1.30-10-keymap.patch b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch new file mode 100644 index 00000000000..b9bb1f9b962 --- /dev/null +++ b/x11-misc/x2x/files/x2x_1.30-10-keymap.patch @@ -0,0 +1,115 @@ +--- a./x2x.c ++++ b./x2x.c +@@ -321,6 +321,12 @@ typedef struct _sticky { + KeySym keysym; + } STICKY, *PSTICKY; + ++typedef struct _keymap { ++ struct _keymap * pNext; ++ KeySym from; ++ KeySym to; ++} KEYMAP, *PKEYMAP; ++ + typedef int (*HANDLER)(); /* event handler function */ + + /* These prototypes need the typedefs */ +@@ -377,6 +383,7 @@ static Bool doDpmsMouse = False; + static int logicalOffset= 0; + static int nButtons = 0; + static KeySym buttonmap[N_BUTTONS + 1][MAX_BUTTONMAPEVENTS + 1]; ++static PKEYMAP keymaps = NULL; + static Bool noScale = False; + static int compRegLeft = 0; + static int compRegRight = 0; +@@ -571,7 +578,8 @@ char **argv; + PSHADOW pShadow; + extern char *lawyerese; + PSTICKY pNewSticky; +- KeySym keysym; ++ PKEYMAP pNewKeymap; ++ KeySym keysym,keysym2; + int button; + int eventno; + char *keyname, *argptr; +@@ -703,6 +711,22 @@ char **argv; + } else { + printf("x2x: warning: can't translate %s\n", argv[arg]); + } ++ } else if (!strcasecmp(argv[arg], "-keymap")) { ++ if ((++arg+1) >= argc) Usage(); ++ if (((keysym = XStringToKeysym(argv[arg])) != NoSymbol) && ++ ((keysym2 = XStringToKeysym(argv[arg+1])) != NoSymbol)) { ++ pNewKeymap = (PKEYMAP)malloc(sizeof(KEYMAP)); ++ pNewKeymap->pNext = keymaps; ++ pNewKeymap->from = keysym; ++ pNewKeymap->to = keysym2; ++ keymaps = pNewKeymap; ++#ifdef DEBUG ++ printf("will translate key %s to %s\n", argv[arg],argv[arg+1]); ++#endif ++ } else { ++ printf("x2x: warning: can't translate %s or %s\n", argv[arg],argv[arg+1]); ++ } ++ arg++; + } else if (!strcasecmp(argv[arg], "-buttonmap")) { + if (++arg >= argc) Usage(); + button = atoi(argv[arg]); +@@ -842,6 +842,7 @@ static void Usage() + printf(" -completeregionup <COORDINATE>\n"); + printf(" -completeregionlow <COORDINATE>\n"); + printf(" -struts\n"); ++ printf(" -keymap <FROM-KEYSYM> <TO-KEYSYM>\n"); + #ifdef WIN_2_X + printf(" -offset [-]<pixel offset of \"to\">\n"); + printf("WIN_2_X build allows Windows or X as -from display\n"); +@@ -2200,6 +2224,7 @@ XKeyEvent *pEv; + PSHADOW pShadow; + Bool bPress; + PSTICKY pSticky; ++ PKEYMAP pKeymap; + Bool DoFakeShift = False; + KeyCode toShiftCode; + +@@ -2211,6 +2236,15 @@ XKeyEvent *pEv; + XKeysymToString(keysym), (bPress ? "pressed" : "released"), pEv->state); + #endif + ++ for (pKeymap = keymaps; pKeymap; pKeymap = pKeymap->pNext) ++ if (keysym == pKeymap->from) { ++ keysym = pKeymap->to; ++#ifdef DEBUG ++ printf("Key mapped from %x to %x\n", pKeymap->from, pKeymap->to); ++#endif ++ } ++ ++ + /* If CapsLock is on, we need to do some funny business to make sure the */ + /* "to" display does the right thing */ + if(doCapsLkHack && (pEv->state & 0x2)) + +--- a./x2x.1 ++++ b./x2x.1 +@@ -309,6 +309,12 @@ Describes uppermost coordinate of complete rectangle region in from-display. + .B \-completeregionlow + .IP + Describes lowermost coordinate of complete rectangle region in from-display. ++.TP ++.B \-keymap \fIfrom-keysym\fP \fIto-keysym\fP ++.IP ++Translates the \fIfrom-keysym\fP keysym of the first X to \fIto-keysym\fP of the second X. ++See X11/keysymdef.h for available keysyms. ++Alternatively you can use setxkbmap, as described in the BUGS section. + .SH EXAMPLES + Calling the system whose keyboard is to be used "primary" and the + other system "secondary", you need to specify either \-from +@@ -329,6 +333,10 @@ secondary $ ssh \-X primary x2x \-from :0 \-west + run directly indirectly on primary: + .IP + primary $ ssh \-A secondary env DISPLAY=:0.0 ssh \-X primary x2x \-from :0 \-east ++.TP ++set a custom keymap binding: ++.IP ++x2x -keymap ISO_Level3_Shift Mode_switch + + .RE + If your primary display is configured with several monitors having different diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml index 115e9d64a66..5d2f87cc317 100644 --- a/x11-misc/x2x/metadata.xml +++ b/x11-misc/x2x/metadata.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>rndxelement@protonmail.com</email> + <name>Philipp Rösner</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/x11-misc/x2x/x2x-1.30.ebuild b/x11-misc/x2x/x2x-1.30.ebuild new file mode 100644 index 00000000000..e1ea883c0b2 --- /dev/null +++ b/x11-misc/x2x/x2x-1.30.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="A utility to connect the mouse and keyboard to another X" +HOMEPAGE="https://github.com/dottedmag/x2x" +SRC_URI="https://github.com/dottedmag/x2x/archive/refs/tags/debian/${PV}-10.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~mips ppc x86" +IUSE="" + +RDEPEND="x11-libs/libX11 + x11-libs/libXtst + x11-libs/libXext" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/rman + x11-base/xorg-proto + >=x11-misc/imake-1.0.8-r1" + +S="${WORKDIR}"/${PN}-debian-1.30-10 + +PATCHES=( + # Patch to fix bug #126939 + # AltGr does not work in x2x with different keymaps: + "${FILESDIR}"/${PN}_1.30-10-keymap.patch +) +DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old ) + +src_prepare() { + default + eautoreconf +} + +src_compile() { + emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ + EXTRA_LDOPTIONS="${LDFLAGS}" +} + +src_install() { + default + dodoc -r docs/ +} diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest index 84765264890..ec1e9c60886 100644 --- a/x11-misc/xaos/Manifest +++ b/x11-misc/xaos/Manifest @@ -1,2 +1,3 @@ DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 +DIST xaos-4.2.1_p20210828.tar.gz 10918756 BLAKE2B c1431596b503d9b99c880945edae577c493ff4061020052d16dafe79f3abce0b137b789493b103a35d96ac954a47d76aa47d32972feaab0406d2cedc0e685504 SHA512 847315566c72d6b793f32b2c468b0c90e69877d9e9620f1f871e768cfdaf5b156c0d5b568274f3fb89b58ffb74c990108a96a94c21a753965b682adc5e99dbf3 DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262 diff --git a/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild new file mode 100644 index 00000000000..cb49a8809e6 --- /dev/null +++ b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VIRTUALX_REQUIRED="always" +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" + +inherit docs qmake-utils + +COMMIT="de9e4f16849c5388760ba3a2e3b0955c5a39b71a" + +DESCRIPTION="Very fast real-time fractal zoomer" +HOMEPAGE="https://xaos-project.github.io/" +SRC_URI="https://github.com/xaos-project/XaoS/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/XaoS-${COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools" + +src_configure() { + # install into /usr/ instead of /usr/local + sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:g" XaoS.pro || die + eqmake5 + # Don't strip, this requires running X/wayland session + sed -i -e '/$(STRIP) $(TARGET)/d' Makefile || die + # Fix INSTALL_ROOT ignored for examples dir + sed -i -e "s:cp {} /usr/share/XaoS/examples:cp {} \${INSTALL_ROOT}/usr/share/XaoS/examples:g" Makefile || die +} + +src_compile() { + default + docs_compile +} + +src_install() { + INSTALL_ROOT="${ED}" default +} diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml index c3c8dd954d2..14a946e7a1c 100644 --- a/x11-misc/xautolock/metadata.xml +++ b/x11-misc/xautolock/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <longdescription lang="en"> If no user activity is detected after a set timeout, xautolock runs a program for you. If you want that program (with optional arguments) to be a screen diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild index 35d49280bb0..3eba2a59a23 100644 --- a/x11-misc/xbindkeys/xbindkeys-1.8.7-r1.ebuild +++ b/x11-misc/xbindkeys/xbindkeys-1.8.7-r2.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit autotools + DESCRIPTION="Tool for launching commands on keystrokes" SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz" HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html" @@ -14,16 +16,23 @@ IUSE="guile tk" RDEPEND=" x11-libs/libX11 - guile? ( >=dev-scheme/guile-1.8.4[deprecated] ) + guile? ( >=dev-scheme/guile-1.8.4:=[deprecated] ) tk? ( dev-lang/tk ) " DEPEND=" ${RDEPEND} x11-base/xorg-proto " -DOCS=" - AUTHORS BUGS ChangeLog README TODO xbindkeysrc -" + +DOCS=( AUTHORS BUGS ChangeLog README TODO xbindkeysrc ) + +src_prepare() { + default + + # Regenerate to pick up newer versions of Guile macros + # bug #828532 + eautoreconf +} src_configure() { econf \ diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild index a38b0dc4176..26d847e1f7b 100644 --- a/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.ebuild +++ b/x11-misc/xbitmaps/xbitmaps-1.1.2-r1.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=7 @@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/data/${P}.tar.bz2" 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 ~x64-solaris ~x86-solaris ~x86-winnt" +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 ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" RDEPEND="" diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild index f51f6b3fc41..107d3891e50 100644 --- a/x11-misc/xclip/xclip-0.13.ebuild +++ b/x11-misc/xclip/xclip-0.13.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" RDEPEND=" x11-libs/libX11 diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild index d23ebd52d83..4496577b85a 100644 --- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild +++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="gtk" RDEPEND="" diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest index 5dc536bc22f..4bcf0300d16 100644 --- a/x11-misc/xdg-utils/Manifest +++ b/x11-misc/xdg-utils/Manifest @@ -1 +1,3 @@ +DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51 DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec +DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71 diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild index 013d4ccde69..ee52ffb4345 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.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=7 @@ -13,7 +13,7 @@ S=${WORKDIR}/xdg-utils-${EGIT_COMMIT} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="dbus doc gnome" REQUIRED_USE="gnome? ( dbus )" diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild new file mode 100644 index 00000000000..db26c50443b --- /dev/null +++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9" +DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/" +SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2" +# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24 +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz" +S="${WORKDIR}"/xdg-utils-${MY_COMMIT} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="dbus doc gnome" +REQUIRED_USE="gnome? ( dbus )" + +RDEPEND=" + dev-util/desktop-file-utils + dev-perl/File-MimeInfo + dbus? ( + sys-apps/dbus + gnome? ( + dev-perl/Net-DBus + dev-perl/X11-Protocol + ) + ) + x11-misc/shared-mime-info + x11-apps/xprop + x11-apps/xset +" +BDEPEND=" + >=app-text/xmlto-0.0.28-r3[text(+)] + virtual/awk +" + +DOCS=( ChangeLog README RELEASE_NOTES TODO ) + +# Tests run random system programs, including interactive programs +# that block forever +RESTRICT="test" + +PATCHES=( + "${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch +) + +src_prepare() { + default + + # If you choose to do git snapshot instead of patchset, you need to remember + # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh + # all the files + eautoreconf +} + +src_configure() { + export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 + default + emake -C scripts scripts-clean +} + +src_install() { + default + + newdoc scripts/xsl/README README.xsl + use doc && dodoc -r scripts/html + + # Install default XDG_DATA_DIRS, bug #264647 + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local + echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local + doenvd 30xdg-data-local + + echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base + echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base + doenvd 90xdg-data-base +} + +pkg_postinst() { + [[ -x $(type -P gtk-update-icon-cache) ]] \ + || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." +} diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest index 31f3cdddb1e..675c2f3d49a 100644 --- a/x11-misc/xdotool/Manifest +++ b/x11-misc/xdotool/Manifest @@ -1,2 +1 @@ -DIST xdotool-3.20210903.1.tar.gz 115051 BLAKE2B d1be4fc2f5c86991804b63b85c95748dc04098f85a515b3427d980dac3d355133da0408d3e91a39e5363ae6242b02d268a8b5bc014fdd5faf51e43e24fb54176 SHA512 446ba8d354031df6a21957df92220c7dcaae5bacbb8878568a57f31097db72a88701717ec8bcd35cca3f5356bfaf47eb3ed65d2159f03b0c7a7ae5550a9b1dce DIST xdotool-3.20211022.1.tar.gz 115237 BLAKE2B 1269775848905253936b113ac45e2a5126f1414eeacb5dd91aea6dc0cb6993f9fa0da969f30c83e0e03d435894a31ba633dc02269b38f9056772b513f0c86889 SHA512 f11d7b079f19d1650adfb549ecc96e840805935bf4925beefc3238154ad0afbff36b134c78bfc73a9dc07fc869ab75676575d6de50cfd54484d2c35d6913ea27 diff --git a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild b/x11-misc/xdotool/xdotool-3.20210903.1.ebuild deleted file mode 100644 index dd2a934b7fd..00000000000 --- a/x11-misc/xdotool/xdotool-3.20210903.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows" -HOMEPAGE="https://www.semicomplete.com/projects/xdotool/" -SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" -IUSE="examples" - -# Many the tests want to manually start Xvfb regardless of whether there -# is an X server running or not (i.e. does not play nicely with virtualx), -# some tests require x11-wm/openbox, some try to run a complete Gnome -# session. All of them require a Ruby interpreter with dev-ruby/minitest -# installed. In short, supporting tests here will need MUCH work. -RESTRICT="test" - -RDEPEND="x11-libs/libX11 - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXtst - x11-libs/libxkbcommon" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/${PN}-3.20210804.2-no_hardcoded_pkg-config.patch - "${FILESDIR}"/${PN}-3.20210804.2-no_ldconfig.patch -) - -DOCS=( CHANGELIST README.md ) - -src_compile() { - tc-export CC LD PKG_CONFIG - emake PREFIX="${EPREFIX}/usr" -} - -src_install() { - emake PREFIX="${ED}/usr" INSTALLMAN="${ED}/usr/share/man" INSTALLLIB="${ED}/usr/$(get_libdir)" install - - use examples && DOCS+=( examples ) - einstalldocs -} diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild index 849e4a9503b..dd2a934b7fd 100644 --- a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild +++ b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" IUSE="examples" # Many the tests want to manually start Xvfb regardless of whether there diff --git a/x11-misc/xfe/metadata.xml b/x11-misc/xfe/metadata.xml index d2c81c70e33..532bd5a1c5e 100644 --- a/x11-misc/xfe/metadata.xml +++ b/x11-misc/xfe/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">xfe</remote-id> </upstream> diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r2.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild index 5f37b1f64e8..dcbcc417a9a 100644 --- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r2.ebuild +++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.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 DISTUTILS_USE_SETUPTOOLS="no" PYTHON_COMPAT=( python3_{8..10} ) diff --git a/x11-misc/xflux/xflux-20130927-r1.ebuild b/x11-misc/xflux/xflux-20130927-r2.ebuild index c34eac9ddae..f51b9bab56b 100644 --- a/x11-misc/xflux/xflux-20130927-r1.ebuild +++ b/x11-misc/xflux/xflux-20130927-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Makes the color of your computer's display adapt to the time of the day" HOMEPAGE="https://justgetflux.com/" @@ -9,6 +9,7 @@ SRC_URI=" amd64? ( https://justgetflux.com/linux/${PN}64.tgz -> ${PN}64-${PV}.tar.gz ) x86? ( https://justgetflux.com/linux/${PN}-pre.tgz -> ${P}.tar.gz ) " +S="${WORKDIR}" KEYWORDS="-* amd64 x86" LICENSE="f.lux" @@ -23,8 +24,6 @@ RDEPEND=" x11-libs/libXxf86vm " -S="${WORKDIR}" - QA_PREBUILT="usr/bin/xflux" src_install() { diff --git a/x11-misc/xflux/xflux-20170103.ebuild b/x11-misc/xflux/xflux-20170103-r1.ebuild index c5897e2e715..c3e0c5cab0e 100644 --- a/x11-misc/xflux/xflux-20170103.ebuild +++ b/x11-misc/xflux/xflux-20170103-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Makes the color of your computer's display adapt to the time of the day" HOMEPAGE="https://justgetflux.com/" SRC_URI="https://justgetflux.com/linux/${PN}12.tgz -> ${PN}12-${PV}.tar.gz" +S="${WORKDIR}" KEYWORDS="-* amd64" LICENSE="f.lux" @@ -20,8 +21,6 @@ RDEPEND=" x11-libs/libXxf86vm " -S="${WORKDIR}" - QA_PREBUILT="usr/bin/xflux" src_install() { diff --git a/x11-misc/xhkeys/metadata.xml b/x11-misc/xhkeys/metadata.xml index d3e0f463125..85e4ed814fa 100644 --- a/x11-misc/xhkeys/metadata.xml +++ b/x11-misc/xhkeys/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild index f5d1deed298..120fccb46e3 100644 --- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild +++ b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -DESCRIPTION="assign particular actions to any key or key combination" +DESCRIPTION="Assign particular actions to any key or key combination" HOMEPAGE="http://wmalms.tripod.com/#XHKEYS" -SRC_URI="mirror://gentoo/${P}.tar.gz" +SRC_URI="https://wmalms.tripod.com/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild index 47ac617ee11..125b8f843a5 100644 --- a/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild +++ b/x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,7 +38,7 @@ PATCHES=( ) src_compile() { - emake CC=$(tc-getCC) INC_PATH= LIB_PATH= + emake CC="$(tc-getCC)" INC_PATH= LIB_PATH= } src_install() { diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index b7d8bc0d3b4..596e676504f 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1 +1,2 @@ DIST xkeyboard-config-2.34.tar.bz2 1763558 BLAKE2B 4417ab66f476de9914113296437b6a1b558c57561169353f533695bbe95831e73045c87bb3a072d1e3c103d2f69aedc3a73e5290c90ecaa8a131419d0d8ca3aa SHA512 cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb +DIST xkeyboard-config-2.35.1.tar.xz 873196 BLAKE2B 22a57cf8858f85dedb78c6fb8d29914e3ba07fc1bafacce40ea1aca485d5db510140af3a5df286ccf3247e8e2715820ea6b6ef412d808b448236f04325eefb8f SHA512 0c62246aa45c9cb883979cc32ba01a6ebf1c3e40673603ddd304a46f1583b997b17ade708849102285f01fe0caafb35abf9c7686ef8be49f4f2b521e03418f94 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild index 8e66ef95b6d..d4fd5d0d6e3 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.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=7 @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" fi LICENSE="MIT" @@ -25,6 +25,7 @@ DEPEND="" RDEPEND="" BDEPEND=" ${PYTHON_DEPS} + dev-lang/perl dev-libs/libxslt sys-devel/gettext " diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild new file mode 100644 index 00000000000..61ee79dadc7 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit meson python-any-r1 + +DESCRIPTION="X keyboard configuration database" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" + inherit git-r3 +else + SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" + +DEPEND="" +RDEPEND="" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + dev-libs/libxslt + sys-devel/gettext +" + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_configure() { + local emesonargs=( + -Dxkb-base="${EPREFIX}/usr/share/X11/xkb" + -Dcompat-rules=true + ) + meson_src_configure +} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 9e1a13130f3..5220bb275be 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.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..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit meson python-any-r1 DESCRIPTION="X keyboard configuration database" @@ -13,18 +13,18 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" inherit git-r3 else - SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" + SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" fi LICENSE="MIT" SLOT="0" -IUSE="" DEPEND="" RDEPEND="" BDEPEND=" ${PYTHON_DEPS} + dev-lang/perl dev-libs/libxslt sys-devel/gettext " diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest index c4055b96dab..319f4fb8911 100644 --- a/x11-misc/xlockmore/Manifest +++ b/x11-misc/xlockmore/Manifest @@ -1,2 +1,2 @@ -DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8 DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d +DIST xlockmore-5.69.tar.xz 2008396 BLAKE2B 69341456769f34c1ac537f382b4baf287b5da47f4620581cbea5ab92749a26467781ebb6d7f3dfa9bd1eedf92d21fb8e501715af681972f06007408a5a44f4e5 SHA512 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9 diff --git a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.69.ebuild index d620594421d..f8548d0929a 100644 --- a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.69.ebuild @@ -1,7 +1,8 @@ -# 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 autotools flag-o-matic pam DESCRIPTION="Just another screensaver application for X" @@ -10,10 +11,11 @@ SRC_URI=" https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.tar.xz " +S="${WORKDIR}/${P/_alpha/ALPHA}" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock" REQUIRED_USE=" @@ -21,7 +23,14 @@ REQUIRED_USE=" pam? ( !xlockrc ) xlockrc? ( !pam ) " + +BDEPEND="virtual/pkgconfig" RDEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) @@ -33,16 +42,10 @@ RDEPEND=" ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt xinerama? ( x11-libs/libXinerama ) " DEPEND=" ${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto " @@ -50,12 +53,18 @@ PATCHES=( "${FILESDIR}"/${PN}-5.46-freetype261.patch "${FILESDIR}"/${PN}-5.47-CXX.patch "${FILESDIR}"/${PN}-5.47-strip.patch - "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch + #"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch ) -S=${WORKDIR}/${P/_alpha/ALPHA} src_prepare() { default + + sed -i \ + -e '/XLOCKLIBPATHS="-L/d' \ + -e '/XMLOCKLIBPATHS="-L/d' \ + -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \ + configure.ac || die + eautoreconf } @@ -63,10 +72,11 @@ src_configure() { local myconf=() if use opengl && use truetype; then - myconf=( --with-ftgl ) - append-cppflags -DFTGL213 - else - myconf=( --without-ftgl ) + append-cppflags -DFTGL213 + + myconf=( --with-ftgl ) + else + myconf=( --without-ftgl ) fi myconf+=( @@ -91,6 +101,7 @@ src_configure() { --without-esound --without-gtk ) + econf "${myconf[@]}" } diff --git a/x11-misc/xnee/metadata.xml b/x11-misc/xnee/metadata.xml index d3e0f463125..85e4ed814fa 100644 --- a/x11-misc/xnee/metadata.xml +++ b/x11-misc/xnee/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild deleted file mode 100644 index 3f2faa519ab..00000000000 --- a/x11-misc/xnots/xnots-9999.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic git-r3 toolchain-funcs - -DESCRIPTION="A desktop sticky note program for the unix geek" -HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots" -EGIT_REPO_URI="https://github.com/thePalindrome/xnots" - -LICENSE="GPL-2" -SLOT="0" -IUSE="vim-syntax" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/pango[X] -" - -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - sed -i -e 's|LICENCE||g' Makefile || die - - append-cflags -std=gnu89 -} - -src_compile() { - emake CC="$(tc-getCC)" NO_DEBUG=1 -} - -src_install() { - emake \ - DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} \ - mandir=/usr/share/man \ - prefix=/usr \ - install - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins etc/xnots.vim - fi -} diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest index aa66759aaa1..8da6af7e465 100644 --- a/x11-misc/xpad/Manifest +++ b/x11-misc/xpad/Manifest @@ -1 +1,2 @@ DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f +DIST xpad-5.7.0.tar.bz2 162675 BLAKE2B 2166816696d2e00a261fcc8e9483841be7803121dc3669ab35fdd014728f16a47860448dd6b754836a3dfcd0fbbd1805b87e470f96c0b692fbe3a588c81ee35f SHA512 ab9319473cbec9a7022e520e2284853270fccca88ad19e8cb52024ce79a2dd8049251009a22b97e2387de12b9e75576e50d4d17a7236cb8e0eb4c840c3400ef3 diff --git a/x11-misc/xpad/metadata.xml b/x11-misc/xpad/metadata.xml index cc080979fe1..93bd8f933be 100644 --- a/x11-misc/xpad/metadata.xml +++ b/x11-misc/xpad/metadata.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> + <maintainer type="person" proxied="yes"> + <email>rndxelement@protonmail.com</email> + <name>Philipp Rösner</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="launchpad">xpad</remote-id> - <changelog>https://launchpadlibrarian.net/253130440/ChangeLog</changelog> + <changelog>https://launchpadlibrarian.net/589705902/ChangeLog</changelog> </upstream> </pkgmetadata> diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild index 56d33df0119..a1ae20d7ee7 100644 --- a/x11-misc/xpad/xpad-5.4.0.ebuild +++ b/x11-misc/xpad/xpad-5.4.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools -DESCRIPTION="a sticky note application for jotting down things to remember" +DESCRIPTION="A sticky note application for GTK" HOMEPAGE="https://launchpad.net/xpad" SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild new file mode 100644 index 00000000000..91cad0d9159 --- /dev/null +++ b/x11-misc/xpad/xpad-5.7.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools xdg-utils + +DESCRIPTION="A sticky note application for GTK" +HOMEPAGE="https://launchpad.net/xpad" +SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86" + +RDEPEND=" + app-accessibility/at-spi2-atk + dev-libs/atk + >=dev-libs/glib-2.58:2 + x11-libs/gdk-pixbuf + x11-libs/gtk+:3[X] + x11-libs/gtksourceview:4 + x11-libs/libICE + x11-libs/libSM + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/intltool-0.31 + sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + eautoreconf +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch new file mode 100644 index 00000000000..ebf090f30bc --- /dev/null +++ b/x11-misc/xplanet/files/xplanet-1.3.1-narrowing_conversion.patch @@ -0,0 +1,87 @@ +diff -Naur xplanet-1.3.1.orig/src/readConfig.cpp xplanet-1.3.1/src/readConfig.cpp +--- xplanet-1.3.1.orig/src/readConfig.cpp 2013-02-16 20:37:47.000000000 +0100 ++++ xplanet-1.3.1/src/readConfig.cpp 2021-12-21 10:06:22.434195435 +0100 +@@ -46,10 +46,10 @@ + { + case ARC_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->ArcColor(color); + } + else +@@ -176,10 +176,10 @@ + break; + case COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->Color(color); + } + else +@@ -241,10 +241,10 @@ + break; + case GRID_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->GridColor(color); + } + else +@@ -293,10 +293,10 @@ + break; + case MARKER_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->MarkerColor(color); + } + else +@@ -400,10 +400,10 @@ + break; + case ORBIT_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->OrbitColor(color); + } + else +@@ -470,10 +470,10 @@ + break; + case TEXT_COLOR: + { +- int r, g, b; +- if (sscanf(returnString, "%d,%d,%d", &r, &g, &b) == 3) ++ unsigned char r, g, b; ++ if (sscanf(returnString, "%hhu,%hhu,%hhu", &r, &g, &b) == 3) + { +- unsigned char color[3] = { r & 0xff, g & 0xff, b & 0xff }; ++ unsigned char color[3] = { r, g, b }; + currentProperties->TextColor(color); + } + else diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml index 15e6d93ab40..002d6c17652 100644 --- a/x11-misc/xplanet/metadata.xml +++ b/x11-misc/xplanet/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> <upstream> <remote-id type="sourceforge">xplanet</remote-id> </upstream> diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild index ac79390deb7..c557e893a08 100644 --- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild +++ b/x11-misc/xplanet/xplanet-1.3.1-r2.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=7 @@ -40,6 +40,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-giflib.patch + "${FILESDIR}"/${P}-narrowing_conversion.patch "${FILESDIR}"/${P}-remove-null-comparison.patch "${FILESDIR}"/${P}-freetype_pkgconfig.patch #788136 ) @@ -68,5 +69,5 @@ src_configure() { } src_compile() { - emake AR=$(tc-getAR) + emake AR="$(tc-getAR)" } diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml index 1e8fc45040d..b411a863a98 100644 --- a/x11-misc/xscreensaver-app/metadata.xml +++ b/x11-misc/xscreensaver-app/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">xscreensaverapp</remote-id> - </upstream> + <maintainer type="person"> + <email>voyageur@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">xscreensaverapp</remote-id> + </upstream> </pkgmetadata> diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild index 9b0667e303b..702dcdc3550 100644 --- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild +++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools toolchain-funcs +inherit autotools MY_PN=${PN/-a/.A} MY_PN=${MY_PN/xs/XS} diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index b90a0a6ec0d..bf490a51728 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1 +1,3 @@ DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a +DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff +DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B 1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce SHA512 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630 diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch new file mode 100644 index 00000000000..e1996291bd3 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.03-without-gl-configure.patch @@ -0,0 +1,12 @@ +Upstream don't support this anymore (https://github.com/gentoo/gentoo/pull/24404#issuecomment-1061128526) +but it's a trivial patch so let's keep it going for now. +--- xscreensaver-6.03.orig/configure.ac 2022-03-04 11:23:24.415172769 -0700 ++++ xscreensaver-6.03/configure.ac 2022-03-04 11:27:40.419205257 -0700 +@@ -4737,7 +4737,6 @@ + CONF_STATUS=1 + elif test "$with_gl_req" = no ; then + noteL 'The OpenGL 3D library is not being used.' +- CONF_STATUS=1 + else + noteL 'The OpenGL 3D library was not found.' + CONF_STATUS=1 diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml index 41a55d69ca6..e6446e8ce0e 100644 --- a/x11-misc/xscreensaver/metadata.xml +++ b/x11-misc/xscreensaver/metadata.xml @@ -12,6 +12,8 @@ <flag name="fonts">Install the fonts shipped with XScreenSaver that have clear licensing</flag> <flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag> <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag> + <flag name="gles" restrict=">=x11-misc/xscreensaver-6.0.2">Emulate OpenGL 1.3 in terms of OpenGL ES 1.x</flag> + <flag name="glx" restrict=">=x11-misc/xscreensaver-6.0.2">Use GLX to interface OpenGL and X11 instead of EGL</flag> <flag name="locking">Compile in support for locking the display</flag> <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag> </use> diff --git a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild new file mode 100644 index 00000000000..b7f191412b7 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild @@ -0,0 +1,239 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic font optfeature pam strip-linguas + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama" +REQUIRED_USE=" + gdk-pixbuf? ( gtk ) + gles? ( !glx opengl ) + glx? ( opengl ) + gtk? ( png ) + opengl? ( png ) + ?? ( elogind systemd ) +" + +COMMON_DEPEND=" + dev-libs/libxml2 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + gdk-pixbuf? ( + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + ) + gtk? ( x11-libs/gtk+:2 ) + jpeg? ( virtual/jpeg:0 ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + opengl? ( + virtual/glu + virtual/opengl + ) + pam? ( sys-libs/pam ) + png? ( media-libs/libpng:= ) + systemd? ( >=sys-apps/systemd-221 ) + xft? ( x11-libs/libXft ) + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + sys-devel/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-6.01-interix.patch + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-5.45-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch + "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch + "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-gtk-detection.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch +) + +DOCS=( README{,.hacking} ) + +src_prepare() { + default + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + fi + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # Works similarly to -Werror, + # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration + filter-flags -pedantic-errors + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + $(use_with gdk-pixbuf pixbuf) + $(use_with gles) + $(use_with glx) + $(use_with gtk) + $(use_with new-login login-manager) + $(use_with opengl gl) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=$(usex png yes no) + --with-xft=$(usex xft yes no) + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die + rmdir -v "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + # bugs #809599, #828869 + if ! use gtk; then + rm "${ED}/usr/bin/xscreensaver-demo" || die + fi +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx && use opengl; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf +} + +pkg_postrm() { + use fonts && font_pkg_postrm +} diff --git a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild new file mode 100644 index 00000000000..c56932d1468 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-6.03.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic font optfeature pam strip-linguas + +DESCRIPTION="Modular screen saver and locker for the X Window System" +HOMEPAGE="https://www.jwz.org/xscreensaver/" +SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz" + +# Font license mapping for folder ./hacks/fonts/ as following: +# clacon.ttf -- MIT +# gallant12x22.ttf -- unclear, hence dropped +# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) +# OCRAStd.otf -- unclear, hence dropped +# SpecialElite.ttf -- Apache-2.0 +LICENSE="BSD fonts? ( MIT Apache-2.0 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama" +REQUIRED_USE=" + gdk-pixbuf? ( gtk ) + gles? ( !glx opengl ) + glx? ( opengl ) + gtk? ( png ) + opengl? ( png ) + ?? ( elogind systemd ) +" + +COMMON_DEPEND=" + dev-libs/libxml2 + x11-apps/appres + x11-apps/xwininfo + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86vm + elogind? ( sys-auth/elogind ) + gdk-pixbuf? ( + x11-libs/gdk-pixbuf-xlib + >=x11-libs/gdk-pixbuf-2.42.0:2 + ) + gtk? ( x11-libs/gtk+:2 ) + jpeg? ( virtual/jpeg:0 ) + locking? ( virtual/libcrypt:= ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) + ) + opengl? ( + virtual/glu + virtual/opengl + ) + pam? ( sys-libs/pam ) + png? ( media-libs/libpng:= ) + systemd? ( >=sys-apps/systemd-221 ) + xft? ( x11-libs/libXft ) + xinerama? ( x11-libs/libXinerama ) +" +# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` +RDEPEND=" + ${COMMON_DEPEND} + media-gfx/fbida + perl? ( + dev-lang/perl + dev-perl/libwww-perl + virtual/perl-Digest-MD5 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + dev-util/intltool + sys-devel/bc + sys-devel/gettext + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-6.01-interix.patch + "${FILESDIR}"/${PN}-5.31-pragma.patch + "${FILESDIR}"/${PN}-6.01-gentoo.patch + "${FILESDIR}"/${PN}-5.45-gcc.patch + "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch + "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch + "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch + "${FILESDIR}"/${PN}-6.01-gtk-detection.patch + "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch + "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch +) + +DOCS=( README{,.hacking} ) + +src_prepare() { + default + + sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.ac} || die + fi + + # We are patching driver/XScreenSaver.ad.in, so let's delete the + # header generated from it so that it gets back in sync during build: + rm driver/XScreenSaver_ad.h || die + + if ! use offensive; then + sed -i \ + -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ + hacks/barcode.c || die + sed -i \ + -e 's|erect penis|shuffle board|g' \ + -e 's|flaccid penis|flaccid anchor|g' \ + -e 's|vagina|engagement ring|g' \ + -e 's|Penis|Shuttle|g' \ + hacks/glx/glsnake.c || die + sed -i \ + 's| Stay.*fucking mask\.$||' \ + hacks/glx/covid19.man \ + hacks/config/covid19.xml || die + fi + + config_rpath_update "${S}"/config.rpath + + # Must be eauto*re*conf, to force the rebuild + eautoreconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + + # Works similarly to -Werror, + # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration + filter-flags -pedantic-errors + + # /proc/interrupts won't always have the keyboard bits needed + # Not clear this does anything in 6.03+(?) but let's keep it for now in case. + # (See also: configure argument) + export ac_cv_have_proc_interrupts=yes + + # WARNING: This is NOT a normal autoconf script + # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" + ECONF_OPTS=( + $(use_enable locking) + $(use_with elogind) + $(use_with gdk-pixbuf pixbuf) + $(use_with gles) + $(use_with glx) + $(use_with gtk) + $(use_with new-login login-manager) + $(use_with opengl gl) + $(use_with pam) + $(use_with suid setuid-hacks) + $(use_with systemd) + $(use_with xinerama xinerama-ext) + --with-jpeg=$(usex jpeg yes no) + --with-png=$(usex png yes no) + --with-xft=$(usex xft yes no) + --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults + --with-configdir="${EPREFIX}"/usr/share/${PN}/config + --with-dpms-ext + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} + --with-proc-interrupts + --with-randr-ext + --with-text-file="${EPREFIX}"/etc/gentoo-release + --with-xdbe-ext + --with-xf86gamma-ext + --with-xf86vmode-ext + --with-xinput-ext + --with-xkb-ext + --with-xshm-ext + --without-gle + --without-kerberos + --without-motif + --with-proc-oom + --x-includes="${EPREFIX}"/usr/include + --x-libraries="${EPREFIX}"/usr/$(get_libdir) + ) + # WARNING: This is NOT a normal autoconf script + econf "${ECONF_OPTS[@]}" +} + +src_compile() { + # stock target is "default", which is broken in some releases. + emake all +} + +src_install() { + use pam && dodir /etc/pam.d/ + emake install_prefix="${D}" DESTDIR="${D}" install + + if use fonts; then + # Do not install fonts with unclear licensing + rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die + + # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) + rm -v "${ED}${FONTDIR}"/luximr.ttf || die + + font_xfont_config + else + rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die + rmdir -v "${ED}${FONTDIR}" || die #812473 + fi + + einstalldocs + + if use pam; then + fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + fi + + # bugs #809599, #828869 + if ! use gtk; then + rm "${ED}/usr/bin/xscreensaver-demo" || die + fi +} + +pkg_postinst() { + use fonts && font_pkg_postinst + + # bug #811885 + if ! use glx && use opengl; then + elog "Enable USE='glx' if OpenGL screensavers are crashing." + fi + + optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi + optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi + optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf +} + +pkg_postrm() { + use fonts && font_pkg_postrm +} diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild index 7ddcfa1117c..41a76c33645 100644 --- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild +++ b/x11-misc/xsel/xsel-1.2.0-r1.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 @@ -9,7 +9,7 @@ SRC_URI="http://www.vergenet.net/~conrad/software/${PN}/download/${P}.tar.gz" LICENSE="HPND" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" RDEPEND="x11-libs/libX11 diff --git a/x11-misc/xsnow/xsnow-3.3.0.ebuild b/x11-misc/xsnow/xsnow-3.3.0.ebuild index b088c85f491..9f7a2365db3 100644 --- a/x11-misc/xsnow/xsnow-3.3.0.ebuild +++ b/x11-misc/xsnow/xsnow-3.3.0.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=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" LICENSE="freedist" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xss-lock/metadata.xml b/x11-misc/xss-lock/metadata.xml index 754f97dd20c..7bc558c06d3 100644 --- a/x11-misc/xss-lock/metadata.xml +++ b/x11-misc/xss-lock/metadata.xml @@ -1,14 +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>sir.suriv@gmail.com</email> - <name>Diogo Pereira</name> -</maintainer> -<maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> -</maintainer> +<!-- maintainer-needed --> <longdescription lang="en"> xss-lock hooks up your favorite locker to the MIT screen saver extension for X and also to systemd's login manager. diff --git a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild deleted file mode 100644 index 5beaf9edeac..00000000000 --- a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils vcs-snapshot - -DESCRIPTION="Use external locker as X screen saver" -HOMEPAGE="https://bitbucket.org/raymonad/xss-lock" -SRC_URI="https://bitbucket.org/raymonad/xss-lock/get/1e158fb20108058dbd62bd51d8e8c003c0a48717.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+man" - -RDEPEND="dev-libs/glib:2 - x11-libs/libxcb - x11-libs/xcb-util" -DEPEND="${RDEPEND} - man? ( dev-python/docutils )" - -src_install() { - cmake-utils_src_install - - dodoc -r "${ED%/}/usr/share/doc/${PN}/." - rm -r "${ED%/}/usr/share/doc/${PN}" || die -} diff --git a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r2.ebuild b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r2.ebuild new file mode 100644 index 00000000000..a8dc3542b07 --- /dev/null +++ b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake vcs-snapshot + +MY_COMMIT="1e158fb20108058dbd62bd51d8e8c003c0a48717" +DESCRIPTION="Use external locker as X screen saver" +HOMEPAGE="https://bitbucket.org/raymonad/xss-lock" +SRC_URI="https://bitbucket.org/raymonad/xss-lock/get/${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="+man" + +RDEPEND="dev-libs/glib:2 + x11-libs/libxcb + x11-libs/xcb-util" +DEPEND="${RDEPEND}" +BDEPEND="man? ( dev-python/docutils )" + +src_install() { + cmake_src_install + + dodoc -r "${ED}"/usr/share/doc/${PN}/. + rm -r "${ED}"/usr/share/doc/${PN} || die +} diff --git a/x11-misc/xvkbd/metadata.xml b/x11-misc/xvkbd/metadata.xml index 410408b3d17..115e9d64a66 100644 --- a/x11-misc/xvkbd/metadata.xml +++ b/x11-misc/xvkbd/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest index a460779bfdb..24b4414b228 100644 --- a/x11-misc/xwallpaper/Manifest +++ b/x11-misc/xwallpaper/Manifest @@ -1,2 +1 @@ -DIST xwallpaper-0.7.2.tar.xz 86212 BLAKE2B 1958ad8eb3f80f2cccdd969230e32986e7d144bf820a4c820a93d0bfdbcaa5512f08eb4014a8b57edb40f1ed55ce54080835c2d2dd46205c399b2ea6adcf1df1 SHA512 2b7166b719edae0d21460682d6c8991739d1a753078920bccb253f905300c694cb6fb12695456be58707d895f8adacd6007023c8e1abd23a0e369e9e80e5106e DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19 diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild deleted file mode 100644 index 2c89348e8c2..00000000000 --- a/x11-misc/xwallpaper/xwallpaper-0.7.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Wallpaper setting utility for X" -HOMEPAGE="https://github.com/stoeckmann/xwallpaper" - -if [ ${PV} == "9999" ] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git" -else - SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ppc64 x86" -fi - -LICENSE="ISC" -SLOT="0" -IUSE="+jpeg +png seccomp xpm" - -RDEPEND=" - x11-libs/pixman - x11-libs/xcb-util - x11-libs/xcb-util-image - jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( media-libs/libpng:0= ) - seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) - xpm? ( x11-libs/libXpm ) -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - $(use_with jpeg) - $(use_with png) - $(use_with seccomp) - $(use_with xpm) - --with-randr - ) - econf "${myconf[@]}" -} diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild index 548fe349669..82ae178851d 100644 --- a/x11-misc/xwallpaper/xwallpaper-0.7.3.ebuild +++ b/x11-misc/xwallpaper/xwallpaper-0.7.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=7 @@ -8,12 +8,12 @@ inherit autotools DESCRIPTION="Wallpaper setting utility for X" HOMEPAGE="https://github.com/stoeckmann/xwallpaper" -if [ ${PV} == "9999" ] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git" else SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ppc64 x86" fi LICENSE="ISC" diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild index 4b3d2579685..eabdc06bd22 100644 --- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild +++ b/x11-misc/xwallpaper/xwallpaper-9999.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=7 @@ -8,17 +8,17 @@ inherit autotools DESCRIPTION="Wallpaper setting utility for X" HOMEPAGE="https://github.com/stoeckmann/xwallpaper" -if [ ${PV} == "9999" ] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git" else SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi LICENSE="ISC" SLOT="0" -IUSE="jpeg png seccomp xpm" +IUSE="+jpeg +png seccomp xpm" RDEPEND=" x11-libs/pixman diff --git a/x11-misc/xxkb/metadata.xml b/x11-misc/xxkb/metadata.xml index 885a0aff067..c1da2d8e308 100644 --- a/x11-misc/xxkb/metadata.xml +++ b/x11-misc/xxkb/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>desktop-misc@gentoo.org</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> +<!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">xxkb</remote-id> </upstream> diff --git a/x11-misc/xystray/xystray-1.0.ebuild b/x11-misc/xystray/xystray-1.0-r1.ebuild index d640d249daf..0479175fa36 100644 --- a/x11-misc/xystray/xystray-1.0.ebuild +++ b/x11-misc/xystray/xystray-1.0-r1.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A simple implementation of freedesktop.org notification area for X" -HOMEPAGE="https://steelman.github.com/xystray/" +HOMEPAGE="https://steelman.github.io/xystray/" SRC_URI="https://github.com/steelman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" +KEYWORDS="amd64 ~x86" -CDEPEND=" - x11-libs/libX11 +RDEPEND="x11-libs/libX11 x11-libs/libXt" -DEPEND="${CDEPEND} +DEPEND="${RDEPEND} x11-libs/libXaw" -RDEPEND="${CDEPEND}" PATCHES=( "${FILESDIR}/${P}-ldflags.patch" diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest index 7eeeb63b2e6..4ed875a7efd 100644 --- a/x11-misc/zim/Manifest +++ b/x11-misc/zim/Manifest @@ -2,3 +2,4 @@ DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00f DIST zim-0.74.0.tar.gz 2917916 BLAKE2B 32b1086395142d07b46425264e3ee6d6782d62f138fb661c0bc392b09054f0664e7a2d8b75f409a843b1e85c93a11e41e041019f69ef657e11d311253ba804ae SHA512 39e3849c14bc474b90583a708c8ead287b27a8eb5f714ad63f168f205fb6584c4ff2f9df45755aa3e3b012639891587c7153ae4e0fef71276241ddce6e32c01f DIST zim-0.74.1.tar.gz 2994036 BLAKE2B 9de89ce74bc08ec0b60f34d693ffdb3b8220efe6f03e3d77686c9d3db135713d7eb5e0beed35eb6f979e489f12b9d65b9b66e0e7449c45b955711684154ae6b8 SHA512 f78bf1ee6082488efe2e581984c85ffbddbfb7e5adfdf491232e93a8376580275f329e2d02c482afd70bbc70f62ca6f0b3bce636cff58b0a1d592dd4b8194e3a DIST zim-0.74.2.tar.gz 3008954 BLAKE2B d0ecf666804931412f6e32aef54193ed96c67049e0fd3e7a373973d4826f16a9483eaa0940cc953573c104c704115905b036e5d0355961c0be86bebc6189bd9a SHA512 112c1e9d28a10643711f665e03c8a37259637b3471338aaca0a834afcc96c658ca5bf863e63bd5f01ce1fcdfb3eef3f2dcf1d10f8113d2158af2e91234b023b9 +DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d diff --git a/x11-misc/zim/zim-0.74.3.ebuild b/x11-misc/zim/zim-0.74.3.ebuild new file mode 100644 index 00000000000..fafc803ef25 --- /dev/null +++ b/x11-misc/zim/zim-0.74.3.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_REQ_USE="sqlite" +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=no +inherit distutils-r1 virtualx xdg + +DESCRIPTION="A desktop wiki" +HOMEPAGE=" + https://zim-wiki.org/ + https://github.com/zim-desktop-wiki/zim-desktop-wiki +" +SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +RESTRICT="test" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ') + x11-libs/gtk+:3[introspection] + x11-misc/xdg-utils +" +DEPEND=" + ${RDEPEND} +" +DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) +PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) +S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} + +python_prepare_all() { + sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die + + if [[ ${LINGUAS} ]]; then + local lingua + for lingua in translations/*.po; do + lingua=${lingua/.po} + lingua=${lingua/translations\/} + has ${lingua} ${LINGUAS} || \ + { rm translations/${lingua}.po || die; } + done + fi + + distutils-r1_python_prepare_all + export XDG_RUNTIME_DIR=fakethis +} + +python_install() { + distutils-r1_python_install +} + +pkg_postinst() { + xdg_pkg_postinst + if ! has_version ${CATEGORY}/${PN}; then + elog "Please install these packages for additional functionality" + elog " dev-lang/R" + elog " dev-python/gtkspell-python" + elog " dev-vcs/bzr" + elog " media-gfx/graphviz" + elog " media-gfx/imagemagick" + elog " media-gfx/scrot" + elog " media-sound/lilypond" + elog " sci-visualization/gnuplot" + elog " virtual/latex-base app-text/dvipng" + fi +} |