summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/alacarte/alacarte-3.36.0.ebuild2
-rw-r--r--x11-misc/bbkeys/Manifest1
-rw-r--r--x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild26
-rw-r--r--x11-misc/colord/colord-1.4.5-r1.ebuild30
-rw-r--r--x11-misc/compose-tables/Manifest2
-rw-r--r--x11-misc/compose-tables/compose-tables-1.7.1.ebuild41
-rw-r--r--x11-misc/compose-tables/compose-tables-1.7.2.ebuild41
-rw-r--r--x11-misc/devilspie/metadata.xml8
-rw-r--r--x11-misc/devilspie2/metadata.xml8
-rw-r--r--x11-misc/dex/dex-0.8.0.ebuild4
-rw-r--r--x11-misc/dunst/dunst-1.6.1.ebuild2
-rw-r--r--x11-misc/dzen/metadata.xml8
-rw-r--r--x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild26
-rw-r--r--x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch21
-rw-r--r--x11-misc/fbpager/fbpager-20090221-r1.ebuild10
-rw-r--r--x11-misc/fbpager/fbpager-20090221-r2.ebuild33
-rw-r--r--x11-misc/fbpanel/fbpanel-7.0-r2.ebuild6
-rw-r--r--x11-misc/fbpanel/metadata.xml6
-rw-r--r--x11-misc/fracplanet/fracplanet-0.5.1.ebuild4
-rw-r--r--x11-misc/i3blocks-contrib/Manifest1
-rw-r--r--x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch68
-rw-r--r--x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild57
-rw-r--r--x11-misc/imake/imake-1.0.8-r1.ebuild2
-rw-r--r--x11-misc/libinput-gestures/Manifest1
-rw-r--r--x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild57
-rw-r--r--x11-misc/macopix/Manifest1
-rw-r--r--x11-misc/macopix/files/macopix-1.7.4-windres.patch58
-rw-r--r--x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch10
-rw-r--r--x11-misc/macopix/macopix-1.7.4-r1.ebuild86
-rw-r--r--x11-misc/macopix/macopix-1.7.4-r2.ebuild83
-rw-r--r--x11-misc/macopix/macopix-3.4.0.ebuild9
-rw-r--r--x11-misc/menulibre/menulibre-2.2.1-r2.ebuild6
-rw-r--r--x11-misc/menumaker/menumaker-0.99.12.ebuild2
-rw-r--r--x11-misc/mozo/mozo-1.24.0-r1.ebuild4
-rw-r--r--x11-misc/mozo/mozo-1.24.0.ebuild69
-rw-r--r--x11-misc/nitrogen/metadata.xml5
-rw-r--r--x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild12
-rw-r--r--x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild2
-rw-r--r--x11-misc/numlockx/metadata.xml8
-rw-r--r--x11-misc/obconf/Manifest2
-rw-r--r--x11-misc/obconf/obconf-2.0.4_p20150213.ebuild (renamed from x11-misc/obconf/obconf-2.0.4.ebuild)32
-rw-r--r--x11-misc/obconf/obconf-9999.ebuild41
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild (renamed from x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild)2
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild (renamed from x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild)2
-rw-r--r--x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild (renamed from x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild)2
-rw-r--r--x11-misc/picom/picom-8-r1.ebuild8
-rw-r--r--x11-misc/picom/picom-8.2-r2.ebuild10
-rw-r--r--x11-misc/picom/picom-9999.ebuild25
-rw-r--r--x11-misc/polybar/Manifest5
-rw-r--r--x11-misc/polybar/polybar-3.5.6.ebuild (renamed from x11-misc/polybar/polybar-3.4.3.ebuild)18
-rw-r--r--x11-misc/py3status/Manifest2
-rw-r--r--x11-misc/py3status/py3status-3.37.ebuild (renamed from x11-misc/py3status/py3status-3.36.ebuild)0
-rw-r--r--x11-misc/read-edid/Manifest1
-rw-r--r--x11-misc/read-edid/read-edid-1.4.2.ebuild16
-rw-r--r--x11-misc/read-edid/read-edid-3.0.2-r1.ebuild2
-rw-r--r--x11-misc/read-edid/read-edid-3.0.2.ebuild27
-rw-r--r--x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch11
-rw-r--r--x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch10
-rw-r--r--x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild2
-rw-r--r--x11-misc/shutter/Manifest1
-rw-r--r--x11-misc/shutter/shutter-0.96-r1.ebuild81
-rw-r--r--x11-misc/spacefm/spacefm-1.0.6-r1.ebuild5
-rw-r--r--x11-misc/spacefm/spacefm-9999.ebuild5
-rw-r--r--x11-misc/sunflower/metadata.xml7
-rw-r--r--x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild18
-rw-r--r--x11-misc/superswitcher/Manifest1
-rw-r--r--x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch27
-rw-r--r--x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch62
-rw-r--r--x11-misc/superswitcher/metadata.xml15
-rw-r--r--x11-misc/superswitcher/superswitcher-0.6-r1.ebuild44
-rw-r--r--x11-misc/sxhkd/sxhkd-0.6.2.ebuild2
-rw-r--r--x11-misc/synergy/Manifest3
-rw-r--r--x11-misc/synergy/synergy-1.14.0.1_rc.ebuild114
-rw-r--r--x11-misc/synergy/synergy-1.14.0.3_rc.ebuild114
-rw-r--r--x11-misc/synergy/synergy-1.14.0.4.ebuild114
-rw-r--r--x11-misc/unclutter-xfixes/metadata.xml8
-rw-r--r--x11-misc/wmctrl/metadata.xml8
-rw-r--r--x11-misc/xaos/xaos-3.6.ebuild2
-rw-r--r--x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild4
-rw-r--r--x11-misc/xkeyboard-config/Manifest1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild58
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild2
-rw-r--r--x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild4
-rw-r--r--x11-misc/xscreensaver/Manifest2
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch32
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch16
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch40
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch120
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch47
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch30
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch28
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch49
-rw-r--r--x11-misc/xscreensaver/metadata.xml1
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-5.45.ebuild)9
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild)35
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild172
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.01.ebuild199
-rw-r--r--x11-misc/xstroke/Manifest1
-rw-r--r--x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch13
-rw-r--r--x11-misc/xstroke/files/xstroke-0.6-underlinking.patch11
-rw-r--r--x11-misc/xstroke/metadata.xml11
-rw-r--r--x11-misc/xstroke/xstroke-0.6-r1.ebuild39
-rw-r--r--x11-misc/xtermcontrol/Manifest2
-rw-r--r--x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild (renamed from x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild)3
-rw-r--r--x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild2
-rw-r--r--x11-misc/xwallpaper/Manifest1
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild3
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild3
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild3
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild1
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.7.0.ebuild50
-rw-r--r--x11-misc/xwallpaper/xwallpaper-9999.ebuild9
-rw-r--r--x11-misc/zim/zim-0.73.5.ebuild2
113 files changed, 1626 insertions, 1046 deletions
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
index 5a2ea11ced1..46c67df8409 100644
--- a/x11-misc/alacarte/alacarte-3.36.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="xml"
inherit gnome2 python-single-r1
diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
index fd73128e3ff..8e2b3fb186c 100644
--- a/x11-misc/bbkeys/Manifest
+++ b/x11-misc/bbkeys/Manifest
@@ -1,2 +1 @@
-DIST bbkeys-0.9.1.tar.gz 226941 BLAKE2B 43a946210f25679dfe7d5a383fbd3f938ae71b19a635a288590b958fc47f3588c690a1e901b44fdb1b31eb1a8ee7252ceeee85b5d012585b261de61cc0f012ab SHA512 c8643d51dbb8f080cf70149d545f33160d15f00a0c3cefdd6d3856dfdee224ff3f63fce0988669036249c75f70878be63711a697dfaa45d4357d2141a28b13bd
DIST bbkeys-0.9.2.tar.gz 116313 BLAKE2B 03b9cb10b7a10380ef805f28605b0ed1969d2197ffc1a19704a3ae230d3555f265d721c800ec45e37af4fb28fa01587999c078d0122826589f688b146fbebef7 SHA512 3205bd37052589b6cba9447032e6906c09afc80b36d7f7869204d290faa7f5726b7b9de74ee06c73c25b794f88eb4e13663f8b096f78bd246d1764bc4ab8984d
diff --git a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
deleted file mode 100644
index 642de9a75e6..00000000000
--- a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Use keyboard shortcuts in the blackbox wm"
-HOMEPAGE="http://bbkeys.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=x11-wm/blackbox-0.70.0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_install() {
- emake DESTDIR="${D}" install
- rm -rf "${ED%/}"/usr/share/doc || die
- einstalldocs
-
- echo PRELINK_PATH_MASK=\""${EPREFIX}"/usr/bin/bbkeys\" > "${T}"/99bbkeys || die
- doenvd "${T}"/99bbkeys
-}
diff --git a/x11-misc/colord/colord-1.4.5-r1.ebuild b/x11-misc/colord/colord-1.4.5-r1.ebuild
index a3b707ebd6d..6431f775af6 100644
--- a/x11-misc/colord/colord-1.4.5-r1.ebuild
+++ b/x11-misc/colord/colord-1.4.5-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
VALA_USE_DEPEND="vapigen"
-inherit bash-completion-r1 meson multilib-minimal systemd udev vala
+inherit bash-completion-r1 meson-multilib systemd udev vala
DESCRIPTION="System service to accurately color manage input and output devices"
HOMEPAGE="https://www.freedesktop.org/software/colord/"
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="gtk-doc argyllcms examples extra-print-profiles +introspection scanner systemd test +udev vala"
RESTRICT="!test? ( test ) test" # Tests try to read and write files in /tmp
@@ -83,18 +83,18 @@ src_prepare() {
multilib_src_configure() {
local emesonargs=(
- -Ddaemon=$(multilib_is_native_abi && echo true || echo false)
+ $(meson_native_true daemon)
-Dexamples=false
-Dbash_completion=false
$(meson_use udev udev_rules)
- -Dsystemd=$(multilib_native_usex systemd true false)
+ $(meson_native_use_bool systemd)
-Dlibcolordcompat=true
- -Dargyllcms_sensor=$(multilib_native_usex argyllcms true false)
+ $(meson_native_use_bool argyllcms argyllcms_sensor)
-Dreverse=false
- -Dsane=$(multilib_native_usex scanner true false)
- -Dintrospection=$(multilib_native_usex introspection true false)
- -Dvapi=$(multilib_native_usex vala true false)
- -Dprint_profiles=$(multilib_native_usex extra-print-profiles true false)
+ $(meson_native_use_bool scanner sane)
+ $(meson_native_use_bool introspection)
+ $(meson_native_use_bool vala vapi)
+ $(meson_native_use_bool extra-print-profiles print_profiles)
$(meson_use test tests)
-Dinstalled_tests=false
-Ddaemon_user=colord
@@ -105,18 +105,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- meson_src_test
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
multilib_src_install_all() {
newbashcomp data/colormgr colormgr
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index e3fb1475398..7ff1125d796 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1 +1,3 @@
DIST libX11-1.7.0.tar.bz2 2409144 BLAKE2B 1eb6aa8f2fe50ddb2f6d324429b3d9cecfb48833c3f52f22ae8e32846be614c8db63c57d25e2b1c46612b6b333ff61ceab8ac0b605b117bcea1224f918af8e6d SHA512 f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb
+DIST libX11-1.7.1.tar.bz2 2426509 BLAKE2B 18db9146f1d1907bccc4c5a48c8d6707b070b8b76703ece1948f53a0307996ba3e538e429df6ea0d9c32f577f9d019ba8a1ae63ab28f840d2c35ee9aa01b6748 SHA512 a76f0a82fce6f9b50646a7cd7ec5ee046650f225816050226068a7548fa083ef07d146d40faaf44e033c59c17b0fda5ffdee3a127dac3ab56cee02133819aa3d
+DIST libX11-1.7.2.tar.bz2 2392982 BLAKE2B ce64bd8172fcf4f5bf0783c4f25f4d220fa0eceb211b7a852802256f7241f543769565f70a59c1ff14e0bb1ae7d3f05914f8f0b1bd423dcb20181cfb2227c70d SHA512 d01e5c1848c76218605e5af2d353de6b301a251555b52a38dbe930e6635d5e8a92d1486eb6d328ad5d42a5939e0d16868ffa19a75e5a7863d1a32e0d0727bdc7
diff --git a/x11-misc/compose-tables/compose-tables-1.7.1.ebuild b/x11-misc/compose-tables/compose-tables-1.7.1.ebuild
new file mode 100644
index 00000000000..4b1e8e42f32
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+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.2.ebuild b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
new file mode 100644
index 00000000000..759d3b58ed5
--- /dev/null
+++ b/x11-misc/compose-tables/compose-tables-1.7.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=no
+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/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
index f65b774ed44..5350da50796 100644
--- a/x11-misc/devilspie/metadata.xml
+++ b/x11-misc/devilspie/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>sudinave@gmail.com</email>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
<name>Ionen Wolkens</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
</pkgmetadata>
diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
index f65b774ed44..5350da50796 100644
--- a/x11-misc/devilspie2/metadata.xml
+++ b/x11-misc/devilspie2/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>sudinave@gmail.com</email>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
<name>Ionen Wolkens</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
</pkgmetadata>
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
index 02c2927fb3d..0b4cd2340db 100644
--- a/x11-misc/dex/dex-0.8.0.ebuild
+++ b/x11-misc/dex/dex-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_8,3_9,3_10} )
inherit python-r1
diff --git a/x11-misc/dunst/dunst-1.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild
index 9e6ef65b51b..fb0a1988036 100644
--- a/x11-misc/dunst/dunst-1.6.1.ebuild
+++ b/x11-misc/dunst/dunst-1.6.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
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"
+ KEYWORDS="amd64 ~arm x86"
fi
LICENSE="BSD"
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
index ae6e159abcf..15a88de636e 100644
--- a/x11-misc/dzen/metadata.xml
+++ b/x11-misc/dzen/metadata.xml
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>sudinave@gmail.com</email>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
<name>Ionen Wolkens</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<upstream>
<remote-id type="github">robm/dzen</remote-id>
</upstream>
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
index 2cfacb68a55..52497e1e248 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit qmake-utils
DESCRIPTION="Generative art image evolver"
-HOMEPAGE="
- https://sourceforge.net/projects/evolvotron/
-"
+HOMEPAGE="https://sourceforge.net/projects/evolvotron/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
@@ -23,13 +23,12 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-DOCS=(
- BUGS NEWS README TODO USAGE
-)
-HTML_DOCS=(
- evolvotron.html
+DOCS=( BUGS NEWS README TODO USAGE )
+HTML_DOCS=( evolvotron.html )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.1-gcc11-predicate-decl.patch
)
-S=${WORKDIR}/${PN}
src_configure() {
eqmake5 main.pro
@@ -37,9 +36,9 @@ src_configure() {
src_compile() {
local etsubdir
- for etsubdir in \
- libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate
- do
+ local targets=( libfunction libevolvotron evolvotron evolvotron_render evolvotron_mutate )
+
+ for etsubdir in ${targets[@]}; do
emake sub-${etsubdir}
done
}
@@ -49,6 +48,7 @@ src_install() {
for bin in ${PN}{,_mutate,_render}; do
dobin ${bin}/${bin}
done
+
doman man/man1/*
einstalldocs
}
diff --git a/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch b/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch
new file mode 100644
index 00000000000..e21de137f74
--- /dev/null
+++ b/x11-misc/evolvotron/files/evolvotron-0.7.1-gcc11-predicate-decl.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/787101
+--- a/libevolvotron/mutatable_image_computer_farm.h
++++ b/libevolvotron/mutatable_image_computer_farm.h
+@@ -45,7 +45,7 @@ class MutatableImageComputerFarm
+ {
+ public:
+ //! Compare task priorities.
+- bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1)
++ bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) const
+ {
+ return (t0->priority() < t1->priority());
+ }
+@@ -56,7 +56,7 @@ class MutatableImageComputerFarm
+ {
+ public:
+ //! Compare task priorities.
+- bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1)
++ bool operator()(const boost::shared_ptr<const MutatableImageComputerTask>& t0,const boost::shared_ptr<const MutatableImageComputerTask>& t1) const
+ {
+ return (t0->priority() > t1->priority());
+ }
diff --git a/x11-misc/fbpager/fbpager-20090221-r1.ebuild b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
index 9a43ae1ded1..f8cd87157bf 100644
--- a/x11-misc/fbpager/fbpager-20090221-r1.ebuild
+++ b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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"
@@ -16,6 +18,12 @@ DEPEND="x11-libs/libX11
xrender? ( x11-libs/libXrender )"
RDEPEND="${DEPEND}"
+src_prepare() {
+ append-cxxflags "-std=c++14"
+
+ default
+}
+
src_configure() {
econf $(use_enable xrender)
}
diff --git a/x11-misc/fbpager/fbpager-20090221-r2.ebuild b/x11-misc/fbpager/fbpager-20090221-r2.ebuild
new file mode 100644
index 00000000000..6980614a462
--- /dev/null
+++ b/x11-misc/fbpager/fbpager-20090221-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
index 1014743e1e7..bec7e0e0220 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{8,9} )
+
inherit python-any-r1 toolchain-funcs
DESCRIPTION="light-weight X11 desktop panel"
diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml
index 2e82215a420..f2b886e8710 100644
--- a/x11-misc/fbpanel/metadata.xml
+++ b/x11-misc/fbpanel/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://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">fbpanel</remote-id>
<remote-id type="github">aanatoly/fbpanel</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
index 86a237d3189..5f89bd2b1b4 100644
--- a/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ RDEPEND="
dev-libs/boost:=
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtopengl:5
+ dev-qt/qtopengl:5[-gles2-only]
dev-qt/qtwidgets:5
virtual/glu
virtual/opengl
diff --git a/x11-misc/i3blocks-contrib/Manifest b/x11-misc/i3blocks-contrib/Manifest
index 3cc417c32e8..5cebdc38823 100644
--- a/x11-misc/i3blocks-contrib/Manifest
+++ b/x11-misc/i3blocks-contrib/Manifest
@@ -1 +1,2 @@
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-2.0.0-respect-CFLAGS.patch b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
new file mode 100644
index 00000000000..764cd4b2b73
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/files/i3blocks-contrib-2.0.0-respect-CFLAGS.patch
@@ -0,0 +1,68 @@
+--- a/bandwidth2/Makefile
++++ b/bandwidth2/Makefile
+@@ -1,6 +1,6 @@
+ P=bandwidth2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+
+ $(P): $(OBJECTS)
+--- a/brightness/Makefile
++++ b/brightness/Makefile
+@@ -1,6 +1,6 @@
+-CC=gcc
+-AS=as
+-LD=ld
++CC ?= gcc
++AS ?= as
++LD ?= ld
+ OBJDUMP=objdump
+ OBJCOPY=objcopy
+ SIZE=size
+@@ -16,14 +16,14 @@
+
+ PRG = brightness
+ INCLUDES := -Iinc
+-CFLAGS := $(INCLUDES) $(DEFS) $(WARN_LEVEL) -pipe -O0 -g3 -std=c11
++CFLAGS ?= -pipe -O0 -g3 -std=c11
+
+ debug: CFLAGS += -O0 -g3
+ debug: all
+
+ release: CFLAGS += -O2
+ release: all
+-LDFLAGS = $(LIBS) -ffunction-sections -Wl,--gc-sections
++LDFLAGS ?= -ffunction-sections -Wl,--gc-sections
+
+ SRC_C := $(wildcard *.c) $(wildcard src/*.c)
+ SRC_A := $(wildcard src/*.s)
+@@ -41,7 +41,7 @@
+
+ $(OBJ_DIR)/%.o: %.c
+ @mkdir -p $(@D)
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CFLAGS) $(INCLUDES) $(DEFS) $(WARN_LEVEL) -o $@ -c $<
+
+ $(BIN_DIR)/$(PRG): $(OBJECTS)
+ @mkdir -p $(@D)
+--- a/cpu_usage2/Makefile
++++ b/cpu_usage2/Makefile
+@@ -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)
+--- a/memory2/Makefile
++++ b/memory2/Makefile
+@@ -1,6 +1,6 @@
+ P=memory2
+ OBJECTS=
+-CFLAGS=-g -Wall -Werror -O2 -std=c11
++CFLAGS ?= -g -Wall -Werror -O2 -std=c11
+ LDLIBS=
+
+ $(P): $(OBJECTS)
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
new file mode 100644
index 00000000000..88dab674b53
--- /dev/null
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit optfeature toolchain-funcs
+
+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/v${PV}.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}"/${P}-respect-CFLAGS.patch )
+
+src_prepare() {
+ sed -i -e '/^$(_BLOCKS):/ s/$/ installdirs/' Makefile
+ default
+}
+
+src_compile() {
+ tc-export AR CC LD
+ 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 "colorpicker" x11-misc/grabc x11-misc/xdotool
+ optfeature "cpu_usage" app-admin/sysstat
+ optfeature "disk-io" app-admin/sysstat
+ optfeature "email" dev-python/keyring gnome-base/gnome-keyring
+ optfeature "eyedropper" media-fonts/fontawesome x11-misc/grabc x11-misc/xclip
+ optfeature "github" dev-util/github-cli media-fonts/fontawesome
+ optfeature "gpu-load" x11-drivers/nvidia-drivers app-misc/radeontop
+ optfeature "i3-focusedwindow" x11-apps/xprop
+ 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 "purpleair" app-misc/jq net-misc/curl
+ 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/imake/imake-1.0.8-r1.ebuild b/x11-misc/imake/imake-1.0.8-r1.ebuild
index 288d12c0a9c..830b9e883a5 100644
--- a/x11-misc/imake/imake-1.0.8-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.8-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit toolchain-funcs xorg-3
DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
RDEPEND="x11-misc/xorg-cf-files"
BDEPEND="x11-base/xorg-proto"
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 983b5ebd910..fb5cc8b8f5c 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,2 +1 @@
-DIST libinput-gestures-2.48.tar.gz 22858 BLAKE2B 67fada253a0d02791e14c6c2175f37f75c2e4ff04b04360070d1c045cf064a9d7b362c28a1e8130e6cc435bd487370c69ded3af41d53b935f7024d722aca9593 SHA512 6ad510f2067ab6cef9c9a94f1c300fe91aa811904a0e85209dc06b3afdd4a2be8ae7bda8ccb40210cc59c3758e3b14b53285f7c3c29c6982a3894952b678a840
DIST libinput-gestures-2.56.tar.gz 26293 BLAKE2B b48a33c13efc63545bcb5ae722066493bd6aba083a07b1ebbf10eea69afa2a8f9d80a92b60dda3e8472a55851b70e84cf7c10e0bf3428c2278dd3ef5b6f65d0d SHA512 f215444dbe7e70ae137404beb25d5a60c5a618fb2d3d20eb9b4cf3f94cbc93a7e42a5fa82efdea082e2fa229c95d86c02df91c59f4a51c067e47ccf5dcf79fa7
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
deleted file mode 100644
index 17b89dfda60..00000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.48.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-single-r1 xdg-utils
-
-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"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-libs/libinput-1.8.0
- x11-misc/wmctrl
- x11-misc/xdotool"
-DEPEND=">=dev-libs/libinput-1.8.0
- dev-util/desktop-file-utils"
-
-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() { :; }
-
-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 3 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
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 560229d73c8..a43d64dec42 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,4 +1,3 @@
-DIST macopix-1.7.4.tar.bz2 725481 BLAKE2B 1712dba8efe53fa78077d77faf7a84654bb87c72b6d9067484ce8b54da448326543082e2a245fbe1b61c824084744f51c0de321076a0e23586514c694840a040 SHA512 6010f98ecd3aad4325e81f037589cc4e79d857d513687f5243adb6ef3768ace5cddf4f5cdce977a75a4dc769b52bb541bdeefe92cdc012471de950ee81592db7
DIST macopix-3.4.0.tar.gz 2854634 BLAKE2B 95ecb17588562a86db7e2c7b8c0832ebaea5b56e2c80814c365058954ce2655ac91f0109b1b0db4f7b8c1a98fde7162ee6c23fe3b2187cbeb22681714df2a595 SHA512 99b9dbbc7ca0cb3fa9c1881800e019ccae1c6439f300f479625a5b4877a0578b4a68b131ecbc0adc4a4393a867fd0ac9df7b52adaf2057f14142d1ddaf54fd53
DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 BLAKE2B 943f30f19bf2108a7e412ca0404f8c47324fc2e9bac5c13c9fcf35d6a4c9944f25afee3754898e6449f46247572c35a42cbe9f7c1b123f3e9e00fc0f33a0a260 SHA512 8897bd6d30fe3372e91d00add2a1af5d7fd7384ce7668aa9b21952d5be863d04c63af8bb98846c59f54a87af3b60acbd008f6c62b68a22038f29a07e7ba19333
DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 BLAKE2B d2a7022cad1856dcebc7594acad449d4de1909ab7f33788b69c562c2d376427d91e993b2c4300a968566d7fed8d3a7e6f7596ef3adcc7897ed6a1c8fd3bb5815 SHA512 b71a586faef6b878c150e7e8e412c70d8d08919736695108efe2f119aaa01347befcaf222990fbaba10daa57120645e5c77b5534df0e4224feddbaa15c80ecf2
diff --git a/x11-misc/macopix/files/macopix-1.7.4-windres.patch b/x11-misc/macopix/files/macopix-1.7.4-windres.patch
deleted file mode 100644
index e26bf62e7b7..00000000000
--- a/x11-misc/macopix/files/macopix-1.7.4-windres.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -145,26 +145,10 @@
- [use Gtk+1.2 insted of Gtk+2]),
- [use_gtk1=yes])
-
--if test x"${use_gtk1}" = "xyes"; then
--AM_PATH_GLIB(1.2.6,,
-- AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
-- gthread)
--AM_PATH_GTK(1.2.0, ,
-- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
--AM_PATH_GDK_PIXBUF(0.7.0, ,
-- AC_MSG_ERROR(Cannot find GdkPixbuf: Is gdk-pixbuf-config in path?))
--dnl for libpng (In the case of Gtk+2, gdk_pixbuf_save are used.)
--AC_CHECK_LIB(png,png_create_write_struct,
-- [PNGLIB_LIBS="-lz -lpng -lm"],
-- [AC_MSG_ERROR(libpng is required.)],
-- -lz -lm)
--
--else
- AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([glib-2.x is required]), gthread gobject)
- AM_PATH_GTK_2_0(2.0.0,, AC_MSG_ERROR([gtk+-2.x is required]), gthread gobject)
- AC_DEFINE(USE_GTK2,[], [Use Gtk+2.x instead of Gtk+1.x])
- PNGLIB_LIBS=""
--fi
- AC_SUBST(PNGLIB_LIBS)
-
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -9,14 +9,6 @@
- bmp.h sockmsg.h codeconv.h unmime.h base64.h quoted-printable.h\
- macopix_icon.h tar32api.h ssl.h
-
--if HAVE_WINDRES
--MACOPIX_RES = macopix.res
--macopix.res: macopix_res.rc
-- $(WINDRES) $< -O coff -o $@
--else
--MACOPIX_RES =
--endif
--
- EXTRA_DIST = \
- macopix_res.rc.in\
- macopix.ico\
-@@ -25,9 +17,9 @@
- tar32.dll\
- libtar32.a
-
--INCLUDES = @GTK_CFLAGS@ @GDK_PIXBUF_CFLAGS@ $(GNUTLS_CFLAGS)\
-+INCLUDES = @GTK_CFLAGS@ $(GNUTLS_CFLAGS)\
- $(DISABLE_DEPRECATED)
--LDADD = @GTK_LIBS@ @GDK_PIXBUF_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\
-+LDADD = @GTK_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\
- $(MACOPIX_RES) $(WINSOCK_LIBS) $(UNLHA32_LIBS) $(TAR32_LIBS) $(GNUTLS_LIBS) $(WIN32_ICONV_LIBS)
- CLEANFILES = *~
- DISTCLEANFILES = .deps/*.P
diff --git a/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch
new file mode 100644
index 00000000000..7d816e7d5e5
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch
@@ -0,0 +1,10 @@
+--- a/src/http-client.c
++++ b/src/http-client.c
+@@ -516,7 +516,6 @@
+ SSL_shutdown(ssl);
+ SSL_free(ssl);
+ SSL_CTX_free(ctx);
+- ERR_free_strings();
+
+ close(command_socket);
+
diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
deleted file mode 100644
index 2d547a63583..00000000000
--- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
-HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
-
-BASE_URI="http://rosegray.sakura.ne.jp/macopix"
-SRC_URI="${BASE_URI}/${P}.tar.bz2"
-
-# NOTE: These mascots are not redistributable on commercial CD-ROM.
-# The author granted to use them under Gentoo Linux.
-MY_MASCOTS="
- macopix-mascot-HxB-euc-ja-0.30
- macopix-mascot-marimite-euc-ja-2.20
- macopix-mascot-cosmos-euc-ja-1.02
- macopix-mascot-mizuiro-euc-ja-1.02
- macopix-mascot-pia2-euc-ja-1.02
- macopix-mascot-tsukihime-euc-ja-1.02
- macopix-mascot-triangle_heart-euc-ja-1.02
- macopix-mascot-comic_party-euc-ja-1.02
- macopix-mascot-kanon-euc-ja-1.02
- macopix-mascot-one-euc-ja-1.02
-"
-
-for i in ${MY_MASCOTS} ; do
- SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
-done
-
-# programme itself is GPL-2, and mascots are free-noncomm
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnutls nls"
-
-RDEPEND="
- dev-libs/glib:2
- media-libs/libpng:0=
- sys-devel/gettext
- x11-libs/gtk+:2
- gnutls? ( net-libs/gnutls )
- !gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${P}-windres.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- append-libs -lX11
-
- econf $(use_with gnutls)
-}
-
-src_install() {
- default
-
- dodoc AUTHORS ChangeLog* NEWS *README*
-
- # install mascots
- for d in ${MY_MASCOTS} ; do
- einfo "Installing ${d}..."
- cd "${WORKDIR}/${d}" || die
- insinto /usr/share/"${PN}"
- for i in *.mcpx *.menu ; do
- doins "$i"
- done
- insinto /usr/share/"${PN}"/pixmap
- for i in *.png ; do
- doins "$i"
- done
- docinto "${d}"
- dodoc README.jp
- done
-}
diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
deleted file mode 100644
index 21fa93789d0..00000000000
--- a/x11-misc/macopix/macopix-1.7.4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
-HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
-
-BASE_URI="http://rosegray.sakura.ne.jp/macopix"
-SRC_URI="${BASE_URI}/${P}.tar.bz2"
-
-# NOTE: These mascots are not redistributable on commercial CD-ROM.
-# The author granted to use them under Gentoo Linux.
-MACOPIX_MASCOTS="
- macopix-mascot-HxB-euc-ja-0.30
- macopix-mascot-marimite-euc-ja-2.20
- macopix-mascot-cosmos-euc-ja-1.02
- macopix-mascot-mizuiro-euc-ja-1.02
- macopix-mascot-pia2-euc-ja-1.02
- macopix-mascot-tsukihime-euc-ja-1.02
- macopix-mascot-triangle_heart-euc-ja-1.02
- macopix-mascot-comic_party-euc-ja-1.02
- macopix-mascot-kanon-euc-ja-1.02
- macopix-mascot-one-euc-ja-1.02
-"
-
-for i in ${MACOPIX_MASCOTS} ; do
- SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
-done
-
-# programme itself is GPL-2, and mascots are free-noncomm
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnutls nls"
-
-RDEPEND="
- dev-libs/glib:2
- media-libs/libpng:0=
- sys-devel/gettext
- x11-libs/gtk+:2
- gnutls? ( net-libs/gnutls )
- !gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${P}-windres.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- append-cflags -fcommon
- append-libs -lX11
-
- econf $(use_with gnutls)
-}
-
-src_install() {
- default
-
- dodoc AUTHORS ChangeLog* NEWS *README*
-
- # install mascots
- for d in ${MACOPIX_MASCOTS} ; do
- einfo "Installing ${d}..."
- cd "${WORKDIR}/${d}" || die
- insinto /usr/share/"${PN}"
- doins *.mcpx *.menu
- insinto /usr/share/"${PN}"/pixmap
- doins *.png
- docinto "${d}"
- dodoc README.jp
- done
-}
diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index b7351081a80..530a80225d7 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools
DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
@@ -32,7 +33,7 @@ done
# program itself is GPL-2, and mascots are free-noncomm
LICENSE="GPL-2 free-noncomm"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="gnutls nls"
RDEPEND="
@@ -43,15 +44,17 @@ RDEPEND="
!gnutls? ( dev-libs/openssl:0= )
x11-libs/gtk+:3
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
"
+
PATCHES=(
"${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch
"${FILESDIR}"/${PN}-3.4.0-Werror.patch
"${FILESDIR}"/${PN}-3.4.0-fno-common.patch
"${FILESDIR}"/${PN}-3.4.0-windres.patch
+ "${FILESDIR}"/${PN}-3.4.0-openssl-1.1.0.patch
)
src_prepare() {
diff --git a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
index addb2bb8bd7..49bff656b3a 100644
--- a/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,10 +6,10 @@ EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="xml"
DISTUTILS_IN_SOURCE_BUILD=1
-inherit desktop distutils-r1 xdg-utils
+inherit distutils-r1 xdg-utils
DESCRIPTION="Advanced freedesktop.org compliant menu editor"
-HOMEPAGE="https://bluesabre.org/projects/menulibre/"
+HOMEPAGE="https://bluesabre.org/menulibre/"
SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/x11-misc/menumaker/menumaker-0.99.12.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
index 1c1fad134bf..c865064930c 100644
--- a/x11-misc/menumaker/menumaker-0.99.12.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.12.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit autotools python-single-r1
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index 2ef330c227b..b47cd465c03 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{8..9} )
PYTHON_REQ_USE="xml"
inherit mate python-r1
diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
deleted file mode 100644
index 44cf4f3240e..00000000000
--- a/x11-misc/mozo/mozo-1.24.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.21.0[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- >=x11-libs/gtk+-3.22:3[introspection]
- !!x11-misc/mate-menu-editor
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
-"
-
-src_prepare() {
- mate_src_prepare
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir mate_src_configure \
- --disable-icon-update
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
- installing() {
- mate_src_install
-
- # Massage shebang to make python_doscript happy
- sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
- -i mozo || die
-
- python_doscript mozo
- python_optimize
- }
-
- python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml
index bc1b97e1eb7..6f49eba8f49 100644
--- a/x11-misc/nitrogen/metadata.xml
+++ b/x11-misc/nitrogen/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://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/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
index 52647c78a86..2f606225b1a 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
@@ -1,19 +1,20 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools flag-o-matic gnome2-utils xdg-utils
+inherit autotools flag-o-matic xdg-utils
DESCRIPTION="A background browser and setter for X"
HOMEPAGE="https://github.com/l3ib/nitrogen"
SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz"
+KEYWORDS="amd64 ~ppc x86"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
IUSE="nls xinerama"
+BDEPEND="virtual/pkgconfig"
RDEPEND="
>=dev-cpp/gtkmm-2.10:2.4
>=gnome-base/librsvg-2.20:2
@@ -22,7 +23,6 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- virtual/pkgconfig
nls? ( sys-devel/gettext )
xinerama? ( x11-base/xorg-proto )
"
@@ -43,11 +43,11 @@ src_configure() {
}
pkg_postinst() {
- gnome2_icon_cache_update
xdg_desktop_database_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
xdg_desktop_database_update
+ xdg_icon_cache_update
}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index 0d5daee27e4..f68339f0a72 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.28:2
diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml
index f65b774ed44..5350da50796 100644
--- a/x11-misc/numlockx/metadata.xml
+++ b/x11-misc/numlockx/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>sudinave@gmail.com</email>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
<name>Ionen Wolkens</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
</pkgmetadata>
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index d3f8c0f552d..72ea3646391 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1 +1 @@
-DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
+DIST obconf-2.0.4_p20150213.tar.gz 154638 BLAKE2B 9ff9d206b8f789d2c7bf68f6f959f34d19f368645bc4efb77b5a730a8f69db5309ddecc0afb09e7cd2f9cb2af4e705112f3365f43dfbe94c4ff523d8a7f0dff5 SHA512 987c97729b248e9d9fb4c82a131517ee8f31df5dd455b5b658730204c354bf17f7876c269c1d1ec6497ca360698a393c7275b9e7ada5b31abb75ed7b06092e30
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
index cdca961153a..ffe3dca0ef4 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4_p20150213.ebuild
@@ -1,30 +1,40 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit xdg-utils
+COMMIT=63ec47c5e295ad4f09d1df6d92afb7e10c3fec39
+inherit autotools xdg-utils
-DESCRIPTION="ObConf is a tool for configuring the Openbox window manager"
+DESCRIPTION="Tool for configuring the Openbox window manager"
HOMEPAGE="http://openbox.org/wiki/ObConf:About"
-SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
+SRC_URI="http://git.openbox.org/?p=dana/obconf.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT:0:7}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
IUSE="nls"
-RDEPEND="gnome-base/libglade:2.0
- x11-libs/gtk+:2
+RDEPEND="
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
x11-libs/startup-notification
- >=x11-wm/openbox-3.5.2"
-DEPEND="${RDEPEND}
+ >=x11-wm/openbox-3.5.2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
- nls? ( sys-devel/gettext )"
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
src_configure() {
- econf \
- $(use_enable nls)
+ econf $(use_enable nls)
}
pkg_postinst() {
diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
deleted file mode 100644
index 182f34ce49f..00000000000
--- a/x11-misc/obconf/obconf-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools xdg-utils git-r3
-
-DESCRIPTION="ObConf is a tool for configuring the Openbox window manager"
-HOMEPAGE="http://openbox.org/wiki/ObConf:About"
-EGIT_REPO_URI="git://git.openbox.org/dana/obconf.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:3
- x11-libs/startup-notification
- =x11-wm/openbox-9999"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild
index 471e0052a4b..ca97c1aaa28 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.16.0-r1.ebuild
@@ -30,10 +30,10 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
+ sys-apps/util-linux
=x11-libs/libfm-qt-$(ver_cut 1-2)*
x11-libs/libxcb:=
x11-misc/xdg-utils
- virtual/eject
virtual/freedesktop-icon-theme
"
RDEPEND="${DEPEND}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
index fe8612da014..11ef42c9971 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
@@ -30,10 +30,10 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
+ sys-apps/util-linux
=x11-libs/libfm-qt-$(ver_cut 1-2)*
x11-libs/libxcb:=
x11-misc/xdg-utils
- virtual/eject
virtual/freedesktop-icon-theme
"
RDEPEND="${DEPEND}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
index a57bad0e46c..f157cddc9ac 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.3.2.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
dev-libs/atk
>=dev-libs/glib-2.18:2
>=lxde-base/menu-cache-1.1.0-r1
- virtual/eject
+ sys-apps/util-linux
virtual/freedesktop-icon-theme
x11-libs/cairo
x11-libs/gdk-pixbuf:2
diff --git a/x11-misc/picom/picom-8-r1.ebuild b/x11-misc/picom/picom-8-r1.ebuild
index ff42b3981ea..a266247cac0 100644
--- a/x11-misc/picom/picom-8-r1.ebuild
+++ b/x11-misc/picom/picom-8-r1.ebuild
@@ -42,6 +42,14 @@ BDEPEND="virtual/pkgconfig
test? ( $(python_gen_any_dep 'dev-python/xcffib[${PYTHON_USEDEP}]') )
"
+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)
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index b0f96899955..dbceb7f81df 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -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 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="+config-file dbus +doc +drm opengl pcre test"
REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
@@ -44,6 +44,14 @@ BDEPEND="virtual/pkgconfig
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)
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index ae0a2c9641a..7551a069f44 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-inherit git-r3 meson xdg
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit git-r3 python-any-r1 meson virtualx xdg
DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
HOMEPAGE="https://github.com/yshui/picom"
@@ -11,8 +12,10 @@ EGIT_REPO_URI="https://github.com/yshui/picom.git"
LICENSE="MPL-2.0 MIT"
SLOT="0"
-KEYWORDS=""
-IUSE="+config-file dbus +doc +drm opengl pcre"
+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
@@ -33,10 +36,20 @@ RDEPEND="dev-libs/libev
DEPEND="${RDEPEND}
x11-base/xorg-proto"
BDEPEND="virtual/pkgconfig
- doc? ( app-text/asciidoc )"
+ 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)
@@ -48,3 +61,7 @@ src_configure() {
meson_src_configure
}
+
+src_test() {
+ virtx "${S}/tests/run_tests.sh" "${BUILD_DIR}/src/${PN}"
+}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 8926f8a43d8..020c164b248 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,5 @@
-DIST i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz 191599 BLAKE2B 85488a6c2ab9c6f653b499ceaa6d8e803dd8b32cd701a7fbbe151f7f3ea2dc30555c520ded53f023a21b119be97c2b07ae1ab413479cfde677e2073f3d48e36b SHA512 0000ba136bd531899ce9e87d458bd6f7d16f45509def37e4fd7aafc16d0e122fe5f56d0eb9dbc3e722dbb6c9812913a7aafa4b749a9c727ab0988908b1e2a425
+DIST i3ipcpp-86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz 43693 BLAKE2B a84525b0bd00d4ab4ed8afed00fd92eee965efea9960670dcea3efaa259834df5bb7cf8e79a894dd4d4f92f28643ad1b43ccbb374ade96174c6c2f6fc63f5ddc SHA512 f4643bea5a78bd9518fecc9d56ece8d679539b99016440a6e4d45305984c02963d80e00c5375cc53ac7418e2f24f57279930428b331e077eaafa8d0717677662
DIST i3ipcpp-cb008b30fc5f3febfe467884cb0211ee3c16386b.tar.gz 43681 BLAKE2B a17c9764f429edd4a65d173ff43c139083a8831d9ee68d3024c033f039409efd486178a6225d06e3313642a9918298b1b60da1da75d49243973f8e2dd1fc855f SHA512 27a90d80f2de45743c2347be5ec5c88db58c4f3bb2aa44093c2a1e3178bfd5761ec806bdec9c6b6a4de6d1e67d5f14d4518e99611bf7e2984cfc880898357133
-DIST polybar-3.4.3.tar.gz 253207 BLAKE2B 213b5ea67cc337c47f62afcdce9cacf66516e6f410d2d93570567cddf9f0f5b93764f16e3eaf7c03c56a5ddad62ade92bd83fcfe30c6b91d067c2343f7264342 SHA512 20ac34375da4634a7fd596f38e98a245186c94f8fd624d1dfdcd6633a3c8470fcc57946a50a59177e9d34689aeb5f6cde49e95b30ad699239a2aabbf0635d31a
DIST polybar-3.5.5.tar.gz 282816 BLAKE2B c6bd7283fa30197446cc328f52b0d9ed6eadefaf6b19327898f559f860009b43d9923ad1d00bcf173f6a3663af6813c368563a9b59e91828ab8966aef722eea8 SHA512 f4174e82871aafcd890145eba472fc8c3055dafff4ea19123fa844d8bce2e85152e0e597496df8af257ef00d676e744249d204bb52668e3f303cc57a6fe3fcee
+DIST polybar-3.5.6.tar.gz 282964 BLAKE2B 518e8b2e1d2e0698540c4c93cdfce5283c5479b077859dfc98d57072ad23f6140cc2e7d34c34f5af71aeaf9e86642d111f409c53baba0b9398d923ad9b4058a4 SHA512 5022f7876489cc28805a52894c8ea42c2afc0600c84f6ce27f1a7c738fcc48fbf5f5d5537472378eae4f3d5ca36fc2fc8b069b379e35b1047d12a3b294e1857f
DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
-DIST xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz 83974 BLAKE2B 6ea8599136288c006b6993bd6c704ec32d82773153733b4bc6a9c3f326eaf6f3b155d92f270eeb14d57b399f7b5ea0f6bdd5cee41bb5bdf4c1650f337b77f857 SHA512 92874b25305b3be777e739122ff82f1ba16b8e2e445e8ee4891918074ea8ea371f2016d7901cfc477d0286a9e15910c4cee431a11eb71e32728bfbf561313e4f
diff --git a/x11-misc/polybar/polybar-3.4.3.ebuild b/x11-misc/polybar/polybar-3.5.6.ebuild
index bb2d1dab4f8..609e610e799 100644
--- a/x11-misc/polybar/polybar-3.4.3.ebuild
+++ b/x11-misc/polybar/polybar-3.5.6.ebuild
@@ -4,8 +4,8 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-XPP_COMMIT="8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33"
-I3IPCPP_COMMIT="21ce9060ac7c502225fdbd2f200b1cbdd8eca08d"
+XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
+I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727"
inherit cmake python-single-r1
@@ -15,10 +15,10 @@ 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"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
LICENSE="MIT"
SLOT="0"
-IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
@@ -31,6 +31,7 @@ DEPEND="
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 )
@@ -43,11 +44,11 @@ DEPEND="
RDEPEND="${DEPEND}"
src_prepare() {
- rmdir "${S}"/lib/xpp || die
- mv "${WORKDIR}"/xpp-$XPP_COMMIT "${S}"/lib/xpp || die
+ 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
+ rmdir "${S}/lib/i3ipcpp" || die
+ mv "${WORKDIR}/i3ipcpp-${I3IPCPP_COMMIT}" "${S}/lib/i3ipcpp" || die
cmake_src_prepare
}
@@ -56,6 +57,7 @@ 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)"
-DENABLE_MPD="$(usex mpd)"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 5831734b286..6a6653b9737 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-3.36.tar.gz 410011 BLAKE2B 29df68e75f652ef964ccbcb26da624fdb3934474f4d03c51dcc8fe8b5f49906eadecd2f53a1d30b7b9d97677b50b3b729f379f2354784ecb7c5b4ecf1017d7ec SHA512 a05a76ce9159407503d4667c688cf23944593cd04d17585a4077f6ee2410041ca420337790905011794aaea326ea2ff736b907d1b67270ed7577041a60b37ebe
+DIST py3status-3.37.tar.gz 409398 BLAKE2B da4707290466a291f581c725f58021f5fe3b7248b4e906d1ec8ea5b1b3e07cbef34acc090b2fc418d50187827bec083c3d66ec8359f02b3b451db280934bac1b SHA512 97ad32c11e7a1cdac2e38583cb9a76e5311d109967f0ffd02b0f98070322a9ebbcf8753846f72e5d61d0db85e2bd9ba1138207fa723437298d8b3ddbbf65e128
diff --git a/x11-misc/py3status/py3status-3.36.ebuild b/x11-misc/py3status/py3status-3.37.ebuild
index 249cd9474c6..249cd9474c6 100644
--- a/x11-misc/py3status/py3status-3.36.ebuild
+++ b/x11-misc/py3status/py3status-3.37.ebuild
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index 484287bc425..e77014bb262 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,2 +1 @@
-DIST read-edid-1.4.2.tar.gz 84138 BLAKE2B 300d2bf71477ffaf4a3ee2a100f6935635e17db3bd8419ea13e6d7c7fafc2e2d9476bdeadb231c73a71e299ecf9e62dfe7830187167ac40b92ef6e65e54c509c SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550
DIST read-edid-3.0.2.tar.gz 17508 BLAKE2B bd27f01fba0b9bf5ca5e5d8d4af422cc14120ce280ec1abe047f31e11f85fbe1b8a8e729b97ef2272e2ab3354871175e91bc11f8c15b2aec0cd10d37aceba392 SHA512 779ebe7f1ffb6e7952762b5f886e07974f2c0fe5fa9be0722b928559466b56aae450f741817bb91bb2e33ca66ab27af39cea3c7af220c99b85dae81734138aac
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
deleted file mode 100644
index e21cc086c58..00000000000
--- a/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Get EDID information from a PnP monitor"
-HOMEPAGE="http://www.polypux.org/projects/read-edid/"
-SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-
-src_configure() {
- econf --mandir=/usr/share/man
-}
diff --git a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
index a0505646508..66c7ab83c0b 100644
--- a/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
IUSE="vbe-mode"
DEPEND="vbe-mode? ( >=dev-libs/libx86-1.1 )"
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
deleted file mode 100644
index b0e3a798eb3..00000000000
--- a/x11-misc/read-edid/read-edid-3.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Program that can get information from a PnP monitor"
-HOMEPAGE="http://www.polypux.org/projects/read-edid/"
-SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-libs/libx86-1.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e 's|COPYING||g;s|share/doc/read-edid|&-'"${PV}"'|g' \
- CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- append-cflags -fcommon
- cmake-utils_src_configure
-}
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch
new file mode 100644
index 00000000000..4527f8710f8
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-bashism.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -52,7 +52,7 @@
+ AC_HEADER_STDC
+ AC_PATH_XTRA
+
+-if test "x${ac_cv_have_x:0:10}" != "xhave_x=yes"; then
++if test "x$have_x" != "xyes"; then
+ AC_MSG_ERROR([X11 is missing but required.])
+ fi
+
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch
new file mode 100644
index 00000000000..6a6e286f873
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/Implicit/impSurface.h
++++ b/src/Implicit/impSurface.h
+@@ -25,6 +25,7 @@
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
++#include <cstddef>
+ #include <vector>
+ #include <GL/gl.h>
+
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
index 28f3cef7b41..7db369224cb 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
@@ -42,6 +42,8 @@ PATCHES=(
"${FILESDIR}"/${P}-c++11-narrowing.patch
"${FILESDIR}"/${P}-hang.patch
"${FILESDIR}"/${P}-matrixview-copy-font.patch
+ "${FILESDIR}"/${P}-missing-include.patch
+ "${FILESDIR}"/${P}-bashism.patch
)
src_prepare() {
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index ef12e8346f6..5e01852827d 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,2 +1,3 @@
DIST shutter-0.94.3_p20200621.tar.gz 2571420 BLAKE2B 0567d03d1b511f3bbe889ad6dda3bfa347dc69d96c7ab89368e6e97925d8d4cccb378ee0da179a65a482e6d22117aaff390088e7cac5d695edd3b8fee7c6a396 SHA512 3426b1cc475356cbcbcaba89e59e904907d61ceafb96b7d7994ff3d9a1fcb1f8151099a2361cd8de63b16fe02c1246f0cb50fb7166d666bc502f18e6fdda6d5f
DIST shutter-0.95.tar.gz 2567849 BLAKE2B ecb29ef21990dfcb29f71c87b690f0e0609890f88edb2ed3ae3d0650456974242ff278e443a13bd3081625491b86c5d53642c5c2c997a37fcd1d7752994a7cab SHA512 77df43b952c10e6280b12170de997c12e0e13d5868f80f1ab22ad9a062b4b67eb93dfc540d4ed0f5db2e950eaae8a258f3d01d9ddf6043d26f8f16f0ce93e75a
+DIST shutter-0.96.tar.gz 2558287 BLAKE2B cce48a08345502b97be67c6299fa1a011c813519620c7c4c1ff09bf25d6fb525e71b7439037fcbed96900b191e18f551dcac8af1ef0bdce756d4489b2b0b9d95 SHA512 0c7d13950bed216571278cec730a4986aae87effbf385d39805c0f0206c9fda30ec0cba4fe7cb36eebd9cd228c4ada35e21fd5170c9c442eee6934dac41c0c0f
diff --git a/x11-misc/shutter/shutter-0.96-r1.ebuild b/x11-misc/shutter/shutter-0.96-r1.ebuild
new file mode 100644
index 00000000000..a93ac100854
--- /dev/null
+++ b/x11-misc/shutter/shutter-0.96-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature prefix xdg
+
+DESCRIPTION="Feature-rich screenshot program"
+HOMEPAGE="https://shutter-project.org/"
+SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/perl
+ dev-perl/Carp-Always
+ dev-perl/libxml-perl
+ dev-perl/libwww-perl
+ dev-perl/Glib-Object-Introspection
+ dev-perl/GooCanvas2
+ dev-perl/GooCanvas2-CairoTypes
+ dev-perl/Gtk3
+ >=dev-perl/Gtk3-ImageView-9
+ dev-perl/File-DesktopEntry
+ dev-perl/File-HomeDir
+ dev-perl/File-Which
+ dev-perl/JSON
+ dev-perl/File-Copy-Recursive
+ dev-perl/File-MimeInfo
+ dev-perl/Locale-gettext
+ dev-perl/Net-DBus
+ dev-perl/Number-Bytes-Human
+ dev-perl/Pango
+ dev-perl/Proc-Simple
+ dev-perl/Proc-ProcessTable
+ dev-perl/Sort-Naturally
+ dev-perl/WWW-Mechanize
+ dev-perl/X11-Protocol
+ dev-perl/XML-Simple
+ virtual/imagemagick-tools[perl]
+ x11-libs/libwnck:3[introspection]
+"
+
+src_prepare() {
+ hprefixify bin/shutter
+ default
+}
+
+src_install() {
+ dobin bin/shutter
+ dodoc README
+ domenu share/applications/shutter.desktop
+ doicon share/pixmaps/shutter.png
+ doman share/man/man1/shutter.1
+
+ insinto /usr/share
+ doins -r share/shutter
+ doins -r share/locale
+ doins -r share/icons
+
+ insinto /usr/share/metainfo
+ doins share/appdata/shutter.appdata.xml
+
+ # .po doesn't belong to installed system, only .mo
+ rm -r "${ED}"/usr/share/shutter/resources/po || die
+
+ # shutter executes perl scripts as standalone scripts, and after that "require"s them.
+ find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
+ || die "failed to make plugins executables"
+ find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
+ -name "*.pm" -exec chmod 755 {} \; || die "failed to make upload plugins executables"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "writing Exif information" media-libs/exiftool
+ optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Net-OAuth dev-perl/Path-Class"
+}
diff --git a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
index b206e28490a..bf27995498f 100644
--- a/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -58,7 +58,8 @@ pkg_postinst() {
optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
- optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
+ # sys-apps/util-linux is required for eject
+ optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
if ! has_version 'sys-fs/udisks' ; then
elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index b206e28490a..bf27995498f 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -58,7 +58,8 @@ pkg_postinst() {
optfeature "mounting as non-root user" sys-apps/udevil sys-apps/pmount sys-fs/udisks
optfeature "supporting ftp/nfs/smb/ssh URLs in the path bar" sys-apps/udevil
optfeature "performing as root" x11-misc/ktsuss kde-plasma/kde-cli-tools[kdesu]
- optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof virtual/eject
+ # sys-apps/util-linux is required for eject
+ optfeature "other optional dependencies" sys-apps/dbus sys-process/lsof sys-apps/util-linux
if ! has_version 'sys-fs/udisks' ; then
elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
index a92806229f3..dc8678ed582 100644
--- a/x11-misc/sunflower/metadata.xml
+++ b/x11-misc/sunflower/metadata.xml
@@ -5,7 +5,8 @@
<email>slashbeast@gentoo.org</email>
<name>Piotr Karbowski</name>
</maintainer>
-<upstream>
- <remote-id type="github">MeanEYE/Sunflower</remote-id>
-</upstream>
+ <upstream>
+ <remote-id type="github">MeanEYE/Sunflower</remote-id>
+ <remote-id type="gitlab">MeanEYE/Sunflower</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
index 18bd85007e5..957034424c2 100644
--- a/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
+++ b/x11-misc/sunflower/sunflower-0.4_p20200716-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1 xdg-utils
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1 xdg
DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
HOMEPAGE="https://github.com/MeanEYE/Sunflower
@@ -14,8 +14,6 @@ SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
@@ -26,13 +24,3 @@ DEPEND="
RDEPEND="${DEPEND}
dev-python/pycairo[${PYTHON_USEDEP}]
"
-
-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/superswitcher/Manifest b/x11-misc/superswitcher/Manifest
deleted file mode 100644
index ffe91226240..00000000000
--- a/x11-misc/superswitcher/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST superswitcher-0.6.tar.gz 183184 BLAKE2B c1f6abb573f34b6c2f823d66e2a7ebe0575b690823246705a7c37aa342e3776f1e2240791192af5b9544efb702925b81ec2c9f5a4ecbe868d11135224ba1d2de SHA512 7385c14537a81f3e78509ff7399e1caf84f46fae22ce844f70f7cd72c8865d3808af77229744443178da691dfbcf61cae908c2eb54ef1564c83473ed9ff6ae0b
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch b/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch
deleted file mode 100644
index fe324998287..00000000000
--- a/x11-misc/superswitcher/files/superswitcher-0.6-glib-single-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: superswitcher-0.6/src/dbus-object.h
-===================================================================
---- superswitcher-0.6.orig/src/dbus-object.h
-+++ superswitcher-0.6/src/dbus-object.h
-@@ -4,7 +4,7 @@
- #ifndef SUPERSWITCHER_DBUS_OBJECT_H
- #define SUPERSWITCHER_DBUS_OBJECT_H
-
--#include <glib/gtypes.h>
-+#include <glib.h>
-
- #include "forward_declarations.h"
-
-Index: superswitcher-0.6/src/forward_declarations.h
-===================================================================
---- superswitcher-0.6.orig/src/forward_declarations.h
-+++ superswitcher-0.6/src/forward_declarations.h
-@@ -18,8 +18,7 @@ typedef struct _SSXineramaScreen SSXiner
- #define ABNORMAL_EXIT_CODE_ANOTHER_INSTANCE_IS_RUNNING 1
- #define ABNORMAL_EXIT_CODE_UNKNOWN_COMMAND_LINE_OPTION 2
-
--#include <glib/gerror.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- gboolean superswitcher_hide_popup (void *, GError **);
- gboolean superswitcher_show_popup (void *, GError **);
- gboolean superswitcher_toggle_popup (void *, GError **);
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
deleted file mode 100644
index 90919a57485..00000000000
--- a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-It seems like wnck_window_is_skip_pager isn't all we need to check.
-
---- superswitcher/src/screen.c
-+++ superswitcher/src/screen.c
-@@ -505,6 +505,7 @@
- static SSWindow *
- add_window_to_screen (SSScreen *screen, WnckWindow *wnck_window)
- {
-+ WnckWorkspace *wnck_workspace;
- SSWindow *window;
- SSWorkspace *workspace;
- int n;
-@@ -513,7 +514,13 @@
- return NULL;
- }
-
-- n = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
-+ wnck_workspace = wnck_window_get_workspace (wnck_window);
-+
-+ if (wnck_workspace == NULL) {
-+ return NULL;
-+ }
-+
-+ n = wnck_workspace_get_number (wnck_workspace);
- workspace = ss_screen_get_nth_workspace (screen, n);
-
- window = ss_window_new (workspace, wnck_window);
---- superswitcher/src/window.c
-+++ superswitcher/src/window.c
-@@ -254,6 +254,7 @@
- static void
- on_workspace_changed (WnckWindow *wnck_window, gpointer data)
- {
-+ WnckWorkspace *wnck_workspace;
- SSWindow *window;
- SSWorkspace *old_workspace;
- SSWorkspace *new_workspace;
-@@ -261,12 +262,19 @@
-
- window = (SSWindow *) data;
- old_workspace = window->workspace;
-- new_workspace_id = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
-- new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
--
- ss_workspace_remove_window (old_workspace, window);
-+
-+ wnck_workspace = wnck_window_get_workspace (wnck_window);
-+ if (wnck_workspace) {
-+ new_workspace_id = wnck_workspace_get_number (wnck_workspace);
-+ new_workspace = ss_screen_get_nth_workspace (old_workspace->screen, new_workspace_id);
-+
-+ ss_workspace_add_window (new_workspace, window);
-+ window->workspace = new_workspace;
-+ } else {
-+ window->workspace = NULL;
-+ }
-+
-- window->workspace = new_workspace;
-- ss_workspace_add_window (new_workspace, window);
- window->new_window_index = -1;
- gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget));
- }
diff --git a/x11-misc/superswitcher/metadata.xml b/x11-misc/superswitcher/metadata.xml
deleted file mode 100644
index 496532cac02..00000000000
--- a/x11-misc/superswitcher/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>desktop-misc@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
-SuperSwitcher is a (more feature-ful) replacement for the Alt-Tab window
-switching behavior and Ctrl-Alt-Left/Right/Up/Down workspace switching behavior
-that is currently provided by Metacity.
-</longdescription>
-<upstream>
-<remote-id type="google-code">superswitcher</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild b/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild
deleted file mode 100644
index 63e4756b5b1..00000000000
--- a/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A more feature-full replacement of the Alt-Tab window switching behavior"
-HOMEPAGE="https://code.google.com/p/superswitcher/"
-SRC_URI="https://superswitcher.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/dbus-glib
- dev-libs/glib:2
- >=gnome-base/gconf-2:2
- x11-libs/gtk+:2
- >=x11-libs/libwnck-2.10:1
- x11-libs/libXcomposite
- x11-libs/libXinerama
- x11-libs/libXrender"
-DEPEND="${RDEPEND}
- gnome-base/gnome-common
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-wnck-workspace.patch
- "${FILESDIR}"/${PN}-0.6-glib-single-include.patch
-)
-
-src_prepare() {
- default
- sed -i \
- -e '/-DG.*_DISABLE_DEPRECATED/d' \
- src/Makefile.am || die #338906
-
- mv configure.{in,ac} || die #426262
-
- eautoreconf
-}
diff --git a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
index da492d24eb9..0bb670aea4e 100644
--- a/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.6.2.ebuild
@@ -22,6 +22,6 @@ src_compile() {
}
src_install() {
- emake DESTDIR="${D}" PREFIX=/usr DOCPREFIX="/usr/share/doc/${PF}" install
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" DOCPREFIX="${EPREFIX}/usr/share/doc/${PF}" install
systemd_dounit contrib/systemd/${PN}.service
}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 9fc7f52e914..e24456df1c5 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,3 +1,6 @@
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.13.1.41-stable.tar.gz 8663717 BLAKE2B 13d0722b183080361492382d3dd489b911cfe2384390c7b614d17df7f681dfbd8be94fa79cc4088602ea3d431fee793aaebc07f1d976cdd9c22493fba2212392 SHA512 3743ea4ccf8734928d021d414c2f10839056cdac64768f2e3e89b73392969b392030a0d9250041a1c2c21db06659088c8ca66d952c07395baada154df0311b87
+DIST synergy-core-1.14.0.1-rc.tar.gz 8835075 BLAKE2B 45752196811736ca5790f098bd6d6dce2323b29f21c9c566549ded9fe1cc132b4dc29564a3df8417ed949382c2cef5252579be526a8054c3bb694c4dc530cd8d SHA512 dd8b01dbe07be879814d1ed90fab03280de552f6c87f470721bd2608ed372f5b7c0cb013249910436b8e0b2a5a024d402afa64a2ae7bb85a320cb37260cfc615
+DIST synergy-core-1.14.0.3-rc.tar.gz 8834856 BLAKE2B 7021c251fe7d6f620c7f7efab7bcd17876e1a749a4268957e424aa9e0f8cc2454632d1caaa28b727bb4215369f36914f656fd87011bd83ec9eae475d3386cd81 SHA512 be070483ae8028197d1e2550b0dcb77e28ffc45a348757277e30127ebc21ae3f7795aaa016def2a62580699c9312c2c1730f151121ddfe4ce780fcebdced4e10
+DIST synergy-core-1.14.0.4-stable.tar.gz 8835907 BLAKE2B 56e59eb3494e9823feca7744602c9ce1ae709a6d74c80c6d06f861333d938331760eb02b83d980afd932e1760a638849ba498fc0d919eeb431e54d3a1602f77e SHA512 278ff319c5d308052e9f89a8ae53a99aacaa2b394d28e353b3779a4ee672cb09d91f37a4b0564788456d8e0bed90936d924739e74f7aa2a85482926164dc2fc8
diff --git a/x11-misc/synergy/synergy-1.14.0.1_rc.ebuild b/x11-misc/synergy/synergy-1.14.0.1_rc.ebuild
new file mode 100644
index 00000000000..e621bed9e26
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.14.0.1_rc.ebuild
@@ -0,0 +1,114 @@
+# 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.0.3_rc.ebuild b/x11-misc/synergy/synergy-1.14.0.3_rc.ebuild
new file mode 100644
index 00000000000..e621bed9e26
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.14.0.3_rc.ebuild
@@ -0,0 +1,114 @@
+# 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.0.4.ebuild b/x11-misc/synergy/synergy-1.14.0.4.ebuild
new file mode 100644
index 00000000000..e621bed9e26
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.14.0.4.ebuild
@@ -0,0 +1,114 @@
+# 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/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml
index 981765a60f1..db59f9b725b 100644
--- a/x11-misc/unclutter-xfixes/metadata.xml
+++ b/x11-misc/unclutter-xfixes/metadata.xml
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>sudinave@gmail.com</email>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
<name>Ionen Wolkens</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
<upstream>
<remote-id type="github">Airblader/unclutter-xfixes</remote-id>
</upstream>
diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index f65b774ed44..5350da50796 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>sudinave@gmail.com</email>
+ <maintainer type="person">
+ <email>ionen@gentoo.org</email>
<name>Ionen Wolkens</name>
</maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index e5f86137a93..ffe1c9122b5 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aalib doc -gtk nls png svga threads X"
+IUSE="aalib doc gtk nls png svga threads X"
RDEPEND="
sci-libs/gsl:=
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 2d9acf66e61..7798361ee00 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
dev-libs/glib
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 32d90d595ae..00f850e111c 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,2 +1 @@
-DIST xkeyboard-config-2.31.tar.bz2 1705328 BLAKE2B a6fe680a8f32f1ca58363faeb0955ae621712f045570f66ce1c211093f0021f60e7fa29076b9dac80ee6c07ef1e4abb738ad64fd01a75ad776e582e2dbcc286e SHA512 f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
DIST xkeyboard-config-2.32.tar.bz2 1742570 BLAKE2B 98374e1bbbeaf24268754df8f050c663f8d07cec770c8bb86cb11bc434f6463acc9221b75b8f5dec79c8e47ac9e77deeb919a8bd3377ba712aac1fe1ce64ccc8 SHA512 c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.31.ebuild
deleted file mode 100644
index fd5be0d8560..00000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.31.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
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit 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 autotools git-r3
- # x11-misc/util-macros only required on live ebuilds
- LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-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"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="${LIVE_DEPEND}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- local econfargs=(
- --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
- --enable-compat-rules
- # do not check for runtime deps
- --disable-runtime-deps
- --with-xkb-rules-symlink=xorg
- )
-
- econf "${econfargs[@]}"
-}
-
-src_test() {
- :;
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
index 268d593d98c..45904724f42 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.32.ebuild
@@ -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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
index c44c96e2fa9..728aed4cf89 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6-r2.ebuild
@@ -10,7 +10,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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
IUSE=""
BDEPEND="
@@ -37,7 +37,7 @@ src_install() {
default
echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> \
"${ED}"/usr/$(get_libdir)/X11/config/host.def || die
- sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" \
+ sed -i -e "s|LibDirName *lib$|LibDirName $(get_libdir)|" \
"${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" \
"${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f3efd33ba39..237089b7aff 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1,2 @@
-DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
+DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
deleted file mode 100644
index 2a5eead4879..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.05-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru xscreensaver-5.05.orig/driver/prefs.c xscreensaver-5.05/driver/prefs.c
---- xscreensaver-5.05.orig/driver/prefs.c 2006-05-24 00:03:47 +0200
-+++ xscreensaver-5.05/driver/prefs.c 2008-03-11 09:20:58 +0100
-@@ -951,9 +951,12 @@
- {
- p->init_file_date = write_date;
-
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- /* Since the .xscreensaver file is used for IPC, let's try and make
- sure that the bits actually land on the disk right away. */
- sync ();
-+#endif
-
- status = 0; /* wrote and renamed successfully! */
- }
-diff -ru xscreensaver-5.05.orig/driver/setuid.c xscreensaver-5.05/driver/setuid.c
---- xscreensaver-5.05.orig/driver/setuid.c 2006-02-09 03:33:29 +0100
-+++ xscreensaver-5.05/driver/setuid.c 2008-03-11 09:22:59 +0100
-@@ -136,9 +136,12 @@
- if (uid == (uid_t) -1) uid = (uid_t) -2;
-
- errno = 0;
-+
-+#ifndef __INTERIX
- if (setgroups_needed_p (gid) &&
- setgroups (1, &gid) < 0)
- sgs_errno = errno ? errno : -1;
-+#endif
-
- errno = 0;
- if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
deleted file mode 100644
index 16493e1fd1d..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -468,11 +468,11 @@
-
- AC_DEFUN([AC_CHECK_GCC_ARG],
- [if test -n "$GCC"; then
-- AC_CACHE_CHECK([whether gcc accepts [$2]],
-+ AC_CACHE_CHECK([whether [$CC] accepts [$2]],
- ac_cv_gcc_accepts_[$1],
- [rm -rf conftest.$ac_ext
- touch conftest.$ac_ext
-- if ( ( gcc -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
-+ if ( ( $CC -c [$2] conftest.$ac_ext -o/dev/null >/dev/null ) 2>&1 | \
- grep unrecognized >/dev/null ); then
- ac_cv_gcc_accepts_[$1]=no
- else
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
new file mode 100644
index 00000000000..3d002b40877
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
@@ -0,0 +1,40 @@
+From c1e43f7fa01b7536bc90ad5a9b61c568f4db4dd1 Mon Sep 17 00:00:00 2001
+From: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
+Date: Tue, 18 May 2021 15:41:55 +0200
+Subject: [PATCH] Fix updating outputs info
+
+When an output is disconnected, update_screen_layout() will try to unset
+a property on window assigned to that output. It does that by iterating
+si->screens up to 'count', while 'good_count' signifies how many outputs
+are currently connected (good_count <= count). si->screens has few more
+entries allocated (at start 10), but if there are more disconnected
+outputs, the iteration will go beyond si->screens array.
+The only out of bound access there is reading window ID to delete
+property from, which in most cases will be a bogus number -> crashing
+xscreensaver with BadWindow error.
+
+Fix this by allocating array up to full 'count' entries, even if much
+fewer outputs are connected at the moment.
+---
+ driver/screens.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/driver/screens.c b/driver/screens.c
+index 5aeb55d..16d6ec3 100644
+--- a/driver/screens.c
++++ b/driver/screens.c
+@@ -1020,9 +1020,9 @@ update_screen_layout (saver_info *si)
+ calloc (sizeof(*si->screens), si->ssi_count);
+ }
+
+- if (si->ssi_count <= good_count)
++ if (si->ssi_count <= count)
+ {
+- si->ssi_count = good_count + 10;
++ si->ssi_count = count;
+ si->screens = (saver_screen_info *)
+ realloc (si->screens, sizeof(*si->screens) * si->ssi_count);
+ memset (si->screens + si->nscreens, 0,
+--
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
new file mode 100644
index 00000000000..fe56f927e20
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-configure.ac-sandbox.patch
@@ -0,0 +1,120 @@
+From 0f4d029102c651ccbc69860bf222126d2c58e36e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 13 Jun 2021 23:41:42 +0200
+Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
+ Gentoo
+
+---
+ configure.ac | 96 ----------------------------------------------------
+ 1 file changed, 96 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b8641e..2eaea28 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4833,102 +4833,6 @@ for bad_choice in xscreensaver xscreensaver-settings xscreensaver-command ; do
+ done
+
+
+-# Warn if there's a previous RPM package installed.
+-
+-rpm_vers=
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+- # Don't bother with this test if we are currently *building* an RPM.
+- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras
+- xscreensaver-data xscreensaver-data-extra"
+-
+- # M4 sucks!!
+- changequote(X,Y)
+- pkg_vers=`(rpm -qv $rpmnames) 2>&- | \
+- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.].*\)/\1/p' | head -1`
+- rpm_vers="$pkg_vers"
+- changequote([,])
+-fi
+-
+-if test \! -z "$rpm_vers" ; then
+-
+- # M4 sucks!!
+- changequote(A,B)
+- pkg_bindir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+- pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+- pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+- pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+- pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+- pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
+-
+- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+- changequote([,])
+-fi
+-
+-
+-# Warn if there's a previous Debian package installed.
+-#
+-deb_vers=
+-if test -z "$pkg_vers" ; then
+- debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
+- pkg_vers=''
+- for dpkg in $debnames ; do
+- if test -z "$pkg_vers"; then
+- pkg_vers=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
+- deb_vers="$pkg_vers"
+- fi
+- done
+-fi
+-
+-if test \! -z "$deb_vers" ; then
+-
+- # M4 sucks!!
+- changequote(A,B)
+- pkg_bindir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p'`
+- pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
+- pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
+- pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
+- pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
+- pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
+- changequote([,])
+-
+- if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
+-fi
+-
+-bindir_err=
+-hackdir_err=
+-confdir_err=
+-fontdir_err=
+-addir_err=
+-if ! test -z "$pkg_vers" ; then
+-
+- err=" (DIFFERS)"
+-
+- if test -z "$pkg_bindir" ; then pkg_bindir='???'
+- elif test "$pkg_bindir" != "${bindir}/" ; then bindir_err="$err" ; fi
+-
+- if test -z "$pkg_hackdir" ; then pkg_hackdir='???'
+- elif test "$pkg_hackdir" != "${HACKDIR}/" ; then hackdir_err="$err"; fi
+-
+- if test -z "$pkg_confdir" ; then pkg_confdir='???'
+- elif test "$pkg_confdir" != "${HACK_CONF_DIR}/" ; then confdir_err="$err"; fi
+-
+- if test -z "$pkg_fontdir" ; then pkg_fontdir='none'
+- elif test "$pkg_fontdir/" != "${FONT_DIR}" ; then fontdir_err="$err"; fi
+-
+- if test -z "$pkg_addir" ; then pkg_addir='???'
+- elif test "$pkg_addir" != "${APPDEFAULTS}/" ; then addir_err="$err" ; fi
+-
+- warning=no
+- warnL "There is already an installed package of xscreensaver"
+- warn2 "version \"$pkg_vers\", in these directories:"
+- echo ""
+- warn2 "User programs: $pkg_bindir$bindir_err"
+- warn2 "Screen savers: $pkg_hackdir$hackdir_err"
+- warn2 "Configuration: $pkg_confdir$confdir_err"
+- warn2 "Extra fonts: $pkg_fontdir$fontdir_err"
+- warn2 "App Defaults: $pkg_addir$addir_err"
+-fi
+-
+ echo ""
+ echo "$warnsep"
+ echo ""
+--
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
new file mode 100644
index 00000000000..41f8d7b7d08
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-gentoo.patch
@@ -0,0 +1,47 @@
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
+@@ -31,21 +31,21 @@
+ *mode: random
+ *timeout: 0:10:00
+ *cycle: 0:10:00
+-*lockTimeout: 0:00:00
++*lockTimeout: 0:30:00
+ *passwdTimeout: 0:00:30
+-*dpmsEnabled: False
++*dpmsEnabled: True
+ *dpmsQuickoffEnabled: False
+ *dpmsStandby: 2:00:00
+ *dpmsSuspend: 2:00:00
+ *dpmsOff: 4:00:00
+-*grabDesktopImages: True
++*grabDesktopImages: False
+ *grabVideoFrames: False
+ *chooseRandomImages: @DEFAULT_IMAGES_P@
+ ! This can be a local directory name, or the URL of an RSS or Atom feed.
+ *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
+ *nice: 10
+ *memoryLimit: 0
+-*lock: False
++*lock: True
+ *verbose: False
+ *fade: True
+ *unfade: True
+@@ -62,7 +62,7 @@
+ *textLiteral: XScreenSaver
+ *textFile: @DEFAULT_TEXT_FILE@
+ *textProgram: fortune
+-*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
++*textURL: https://planet.gentoo.org/rss20.xml
+
+ ! This is what the "Settings" button on the splash screen runs.
+ *demoCommand: xscreensaver-settings
+@@ -103,7 +103,8 @@
+
+
+ ! The strftime(3) format string for printing the time on the password dialog.
+-*dateFormat: %I:%M %p, %a %b %e
++!*dateFormat: %I:%M %p, %a %b %e
++*dateFormat: %x %X
+ ! DD MMM:
+ ! *dateFormat: %I:%M %p, %e %b (%a)
+ ! 12 hour time only:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
new file mode 100644
index 00000000000..72aa6535f13
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-interix.patch
@@ -0,0 +1,30 @@
+diff -Nru a/driver/prefsw.c b/driver/prefsw.c
+--- a/driver/prefsw.c 2021-02-19 02:52:32.000000000 +0100
++++ b/driver/prefsw.c 2021-05-07 15:20:09.280321274 +0200
+@@ -798,7 +798,10 @@
+ sure that the bits actually land on the disk right away. */
+ /* Update 2020: Apparently here in the future, this sometimes takes
+ 3+ seconds, so let's not. */
++/* Interix has no sync() or alike. */
++#ifndef __INTERIX
+ /* sync(); */
++#endif
+
+ status = 0; /* wrote and renamed successfully! */
+ }
+diff -Nru a/driver/setuid.c b/driver/setuid.c
+--- a/driver/setuid.c 2021-02-05 16:16:23.000000000 +0100
++++ b/driver/setuid.c 2021-05-07 15:21:05.987949943 +0200
+@@ -104,9 +104,12 @@
+ if (uid == (uid_t) -1) uid = (uid_t) -2;
+
+ errno = 0;
++
++#ifndef __INTERIX
+ if (setgroups_needed_p (gid) &&
+ setgroups (1, &gid) < 0)
+ sgs_errno = errno ? errno : -1;
++#endif
+
+ errno = 0;
+ if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
new file mode 100644
index 00000000000..c98d5297e9b
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.01-without-gl-makefile.patch
@@ -0,0 +1,28 @@
+From fa531a3ff2dd8aa4e0b6767e3390f88bfbaca791 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 14 Jun 2021 12:11:32 +0200
+Subject: [PATCH] hacks/glx/Makefile.in: Fix target install-program for
+ --without-gl
+
+Symptom was:
+/usr/bin/install: cannot stat 'sonar': No such file or directory
+---
+ hacks/glx/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
+index ed07a1f..6ae969c 100644
+--- a/hacks/glx/Makefile.in
++++ b/hacks/glx/Makefile.in
+@@ -320,7 +320,7 @@ install-program:: $(EXES)
+ $(INSTALL_PROGRAM) $$program $$idir/$$program ; \
+ done ; \
+ \
+- exes="$(SUID_EXES)" ; \
++ exes="@SUID_EXES@" ; \
+ if [ @SETUID_HACKS@ = yes ]; then \
+ sinst="$(INSTALL_SETUID)" ; \
+ else \
+--
+2.31.1
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
deleted file mode 100644
index 79ffcd7098c..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-remove-libXxf86misc-dep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-libXxf86misc is the client-side code of an X extension that has not been
-supported by the Xserver in more than 10 years. Since xscreensaver's dependency
-on it is automagic, we have to patch configure.in to safely remove it.
-
-https://bugs.gentoo.org/720158
-
-diff -ruN xscreensaver.orig/configure.in xscreensaver/configure.in
---- xscreensaver.orig/configure.in 2020-05-02 18:09:23.169324761 -0700
-+++ xscreensaver/configure.in 2020-05-02 18:09:52.578233240 -0700
-@@ -104,12 +104,6 @@
- (It's available if the file /usr/include/X11/extensions/XInput.h
- exists.)])
-
--AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
-- [Define this if you have the XF86MiscSetGrabKeysState function
-- (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
-- sequences to be temporarily disabled. Sadly, it doesn't affect
-- Ctrl-Alt-BS or Ctrl-Alt-F1.)])
--
- AH_TEMPLATE([HAVE_RANDR],
- [Define this if you have the Resize and Rotate extension.
- This is standard on sufficiently-recent XFree86 systems, and
-@@ -1888,25 +1882,6 @@
- fi
-
-
--###############################################################################
--#
--# Check for XF86MiscSetGrabKeysState (but only bother if we are already
--# using other XF86 stuff.)
--#
--###############################################################################
--
--have_xf86miscsetgrabkeysstate=no
--if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
-- AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
-- [have_xf86miscsetgrabkeysstate=yes],
-- [true], -lXext -lX11)
-- if test "$have_xf86miscsetgrabkeysstate" = yes ; then
-- SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
-- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
-- fi
--fi
--
--
- ###############################################################################
- #
- # Check for HP XHPDisableReset and XHPEnableReset.
-
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 8893ad3c39c..31e771cd6ac 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -9,6 +9,7 @@
</maintainer>
</upstream>
<use>
+ <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="locking">Compile in support for locking the display</flag>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
index 593985b9f95..661463a8b2b 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.45.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r1.ebuild
@@ -2,13 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib optfeature pam
+inherit autotools flag-o-matic l10n multilib optfeature pam
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+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
-"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -77,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.44-gentoo.patch
"${FILESDIR}"/${PN}-5.45-gcc.patch
"${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
+ "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
)
src_prepare() {
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
index 46e166226f0..22af82cbaec 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r2.ebuild
@@ -2,24 +2,21 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools desktop eutils flag-o-matic multilib pam
+inherit autotools flag-o-matic l10n multilib optfeature pam
-DESCRIPTION="A modular screen saver and locker for the X Window System"
+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
-"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
"
COMMON_DEPEND="
- >=gnome-base/libglade-2
dev-libs/libxml2
media-libs/netpbm
x11-apps/appres
@@ -48,11 +45,13 @@ COMMON_DEPEND="
virtual/opengl
)
pam? ( sys-libs/pam )
+ systemd? ( >=sys-apps/systemd-221 )
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
@@ -69,23 +68,25 @@ DEPEND="
x11-base/xorg-proto
"
PATCHES=(
- "${FILESDIR}"/${PN}-remove-libXxf86misc-dep.patch
- "${FILESDIR}"/${PN}-5.05-interix.patch
+ "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
+ "${FILESDIR}"/${PN}-5.45-interix.patch
"${FILESDIR}"/${PN}-5.31-pragma.patch
"${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
"${FILESDIR}"/${PN}-5.44-gentoo.patch
- "${FILESDIR}"/${PN}-5.44-gcc.patch
+ "${FILESDIR}"/${PN}-5.45-gcc.patch
+ "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
+ "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
)
src_prepare() {
- sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+ 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{,.in} || die
+ configure{,.ac} || die
fi
default
@@ -127,14 +128,15 @@ src_configure() {
$(use_with opengl gl) \
$(use_with pam) \
$(use_with suid setuid-hacks) \
+ $(use_with systemd) \
$(use_with xinerama xinerama-ext) \
+ --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-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
--with-xdbe-ext \
--with-xf86gamma-ext \
--with-xf86vmode-ext \
@@ -159,3 +161,8 @@ src_install() {
rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
}
+
+pkg_postinst() {
+ optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+ optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
new file mode 100644
index 00000000000..584b0e0ec50
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.45-r3.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic l10n multilib optfeature pam
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ media-libs/netpbm
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/libXxf86vm
+ caps? ( sys-libs/libcap )
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf-xlib
+ >=x11-libs/gdk-pixbuf-2.42.0:2
+ )
+ gtk? ( x11-libs/gtk+:2 )
+ jpeg? ( virtual/jpeg:0 )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pam? ( sys-libs/pam )
+ systemd? ( >=sys-apps/systemd-221 )
+ 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}
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
+ "${FILESDIR}"/${PN}-5.45-interix.patch
+ "${FILESDIR}"/${PN}-5.31-pragma.patch
+ "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
+ "${FILESDIR}"/${PN}-5.44-gentoo.patch
+ "${FILESDIR}"/${PN}-5.45-gcc.patch
+ "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
+ "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
+)
+
+src_prepare() {
+ 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
+
+ default
+
+ 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
+
+ eapply_user
+
+ eautoconf
+ eautoheader
+}
+
+src_configure() {
+ if use ppc || use ppc64; then
+ filter-flags -maltivec -mabi=altivec
+ append-flags -U__VEC__
+ fi
+
+ unset BC_ENV_ARGS #24568
+ export RPM_PACKAGE_VERSION=no #368025
+
+ econf \
+ $(use_enable locking) \
+ $(use_with caps setcap-hacks) \
+ $(use_with gdk-pixbuf pixbuf) \
+ $(use_with gtk) \
+ $(use_with jpeg) \
+ $(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-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-xshm-ext \
+ --without-gle \
+ --without-kerberos \
+ --without-motif \
+ --x-includes="${EPREFIX}"/usr/include \
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+ emake install_prefix="${D}" install
+
+ dodoc README{,.hacking}
+
+ if use pam; then
+ fperms 755 /usr/bin/${PN}
+ pamd_mimic_system ${PN} auth
+ fi
+
+ rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+ optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+ optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
new file mode 100644
index 00000000000..a3c8734ec8e
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.01.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic font multilib optfeature pam
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
+REQUIRED_USE="
+ gdk-pixbuf? ( gtk )
+ elogind? ( !systemd )
+"
+
+COMMON_DEPEND="
+ dev-libs/libxml2
+ media-libs/netpbm
+ x11-apps/appres
+ x11-apps/xwininfo
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXi
+ x11-libs/libXmu
+ 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 )
+ new-login? (
+ gdm? ( gnome-base/gdm )
+ !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+ )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ pam? ( sys-libs/pam )
+ systemd? ( >=sys-apps/systemd-221 )
+ 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}
+ dev-util/intltool
+ sys-devel/bc
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-base/xorg-proto
+"
+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
+)
+
+src_prepare() {
+ 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
+
+ default
+
+ # 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
+
+ eapply_user
+
+ eautoconf
+ eautoheader
+}
+
+src_configure() {
+ if use ppc || use ppc64; then
+ filter-flags -maltivec -mabi=altivec
+ append-flags -U__VEC__
+ fi
+
+ unset BC_ENV_ARGS #24568
+
+ econf \
+ $(use_enable locking) \
+ $(use_with elogind) \
+ $(use_with gdk-pixbuf pixbuf) \
+ $(use_with gtk) \
+ $(use_with jpeg) \
+ $(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-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-xshm-ext \
+ --without-gle \
+ --without-kerberos \
+ --without-motif \
+ --x-includes="${EPREFIX}"/usr/include \
+ --x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+ emake install_prefix="${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
+ fi
+
+ dodoc README{,.hacking}
+
+ if use pam; then
+ fperms 755 /usr/bin/${PN}
+ pamd_mimic_system ${PN} auth
+ fi
+
+ rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}
+
+pkg_postinst() {
+ use fonts && font_pkg_postinst
+
+ 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/xstroke/Manifest b/x11-misc/xstroke/Manifest
deleted file mode 100644
index 9053cdd5b36..00000000000
--- a/x11-misc/xstroke/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xstroke-0.6.tar.bz2 140237 BLAKE2B 0419c0375e8579d758730d129c2d2db0de8ecc2f0c73a026b08db8e18818dc2c4d1c4ffff6e9794c48bd645176decbce2e477e182cf78402fc859234438266a3 SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a
diff --git a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch b/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
deleted file mode 100644
index b36958849f5..00000000000
--- a/x11-misc/xstroke/files/xstroke-0.6-sigsegv_sprintf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru xstroke-0.6.vanilla/sprintf_alloc.c xstroke-0.6/sprintf_alloc.c
---- xstroke-0.6.vanilla/sprintf_alloc.c 2005-11-26 01:55:32.000000000 +0100
-+++ xstroke-0.6/sprintf_alloc.c 2005-11-26 01:55:55.000000000 +0100
-@@ -74,7 +74,8 @@
- {
- char *new_str;
- /* Guess we need no more than 100 bytes. */
-- int n, size = 100;
-+ /* yeah... right... */
-+ int n, size = 512;
-
- if ((*str = malloc (size)) == NULL)
- return -1;
diff --git a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch b/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
deleted file mode 100644
index 52b39ddf451..00000000000
--- a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -40,7 +40,7 @@
- BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c
- AM_YFLAGS = -d
-
--xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst
-+xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst -lX11 -lXrender -lXext -ldl
- AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS)
-
- EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet
diff --git a/x11-misc/xstroke/metadata.xml b/x11-misc/xstroke/metadata.xml
deleted file mode 100644
index 4150784c3af..00000000000
--- a/x11-misc/xstroke/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://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="freshmeat">xstroke</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
deleted file mode 100644
index a3662daa190..00000000000
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Gesture/Handwriting recognition engine for X"
-HOMEPAGE="http://freshmeat.net/projects/xstroke/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc sparc x86"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXtst"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc"
-
-PATCHES=(
- "${FILESDIR}"/${P}-sigsegv_sprintf.patch
- "${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 8b49bf2d552..1cbda4530a7 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -1 +1 @@
-DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081
+DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
index 857f12bcce5..5a84b2b84a6 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,4 +10,3 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
-IUSE=""
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
index 78d927365aa..4c53cd93e98 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.20.10.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
IUSE=""
DEPEND="dev-util/patchutils"
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 175b7d7bc35..541e075415e 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -2,3 +2,4 @@ DIST xwallpaper-0.6.2.tar.xz 82600 BLAKE2B 2e2b1121fcc2481c4a1e3c78e357534b9609b
DIST xwallpaper-0.6.4.tar.xz 82752 BLAKE2B e81a1a9ec56ffe0a1953f1186c945c9ebb143ff683b8c0c01b819506b79520738935d04725420a24b38119221cbb71d9a5562bffd03e03736c65ba7e3c6a1713 SHA512 531910957c44f7e5ce7357fa46737967f673aeca53868012211eb91507f78bd028f8d84fcbee6e1237107816a09f8247cd0445c0907b60792ff5d07416630d56
DIST xwallpaper-0.6.5.tar.xz 82696 BLAKE2B 8c12bcce2a2eeb9580038b172b51284cc9fa851f01bef34e7cfeb13ccc05879f5443ef0b7fd39a4f0d5abcc399ec614db28f6f6db6847505855128348fd22d4b SHA512 99c911c6a4f7501101d85532cfb9956fa4affb57f7836e9216e5e0d873ed34c9e7d0a9983def442a4728a682a3351268905e22174dc9a14d003dc36c42ed9615
DIST xwallpaper-0.6.6.tar.xz 85368 BLAKE2B fcb0861d4cecbafc980208b3d2a174b9931a93cd8110b6f2c38eddae19e890295ce5d6d75dc4f09924279a2b0463234f4efdb4dda758ed14ed728abfec6b9bf3 SHA512 e37055b9adfa6950fb423228ff880afaa03dbdf2a7ced6ab1e110dbf4813f68aae3c9147668ebd20665b582bea195470c39b6948cd36879afe54d61c90b6f8d9
+DIST xwallpaper-0.7.0.tar.xz 86224 BLAKE2B bc201d2136b8c0f04e54a83b624d4cdd45409cdc451f2103a826e261fe7fbee2dd450297f67a9f9411b8723c82bc8032c2177ab318eaa95dbcad1007c47c982c SHA512 b8b01a1c0d5768beba9e57c376b89f5d777360ba27edd20d0fab0bb018f25a11cb3bcd1aa36099dd1bd43f689d470aa07c0c0a52ab782ea0cf12ba13ba4cc818
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
index ed317b228bd..7552811e1d3 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,6 +37,7 @@ src_prepare() {
default
eautoreconf
}
+
src_configure() {
local myconf=(
$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild
index 2b1e1615823..c91d1b571af 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,6 +37,7 @@ src_prepare() {
default
eautoreconf
}
+
src_configure() {
local myconf=(
$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild
index 2b1e1615823..c91d1b571af 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,6 +37,7 @@ src_prepare() {
default
eautoreconf
}
+
src_configure() {
local myconf=(
$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
index ce50a5f5764..c91d1b571af 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.6.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
default
eautoreconf
}
+
src_configure() {
local myconf=(
$(use_with jpeg)
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.0.ebuild
new file mode 100644
index 00000000000..4b3d2579685
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# 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 ~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-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index ce50a5f5764..4b3d2579685 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -27,16 +27,17 @@ RDEPEND="
jpeg? ( media-libs/libjpeg-turbo:= )
png? ( media-libs/libpng:0= )
seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
- xpm? ( x11-libs/libXpm )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+ xpm? ( x11-libs/libXpm )
"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
src_prepare() {
default
eautoreconf
}
+
src_configure() {
local myconf=(
$(use_with jpeg)
diff --git a/x11-misc/zim/zim-0.73.5.ebuild b/x11-misc/zim/zim-0.73.5.ebuild
index 3ddba84025c..2f81c04016f 100644
--- a/x11-misc/zim/zim-0.73.5.ebuild
+++ b/x11-misc/zim/zim-0.73.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
LICENSE="BSD GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
RESTRICT="test"
RDEPEND="