summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/alacarte/alacarte-3.44.2.ebuild4
-rw-r--r--x11-misc/alacarte/metadata.xml11
-rw-r--r--x11-misc/albert/Manifest4
-rw-r--r--x11-misc/albert/albert-0.17.3.ebuild4
-rw-r--r--x11-misc/albert/albert-0.17.5.ebuild94
-rw-r--r--x11-misc/albert/albert-0.17.6.ebuild94
-rw-r--r--x11-misc/arandr/Manifest1
-rw-r--r--x11-misc/arandr/arandr-0.1.10-r3.ebuild (renamed from x11-misc/arandr/arandr-0.1.10-r2.ebuild)9
-rw-r--r--x11-misc/arandr/arandr-0.1.11.ebuild25
-rw-r--r--x11-misc/autorandr/Manifest1
-rw-r--r--x11-misc/autorandr/autorandr-1.12.1-r2.ebuild (renamed from x11-misc/autorandr/autorandr-1.12.1.ebuild)20
-rw-r--r--x11-misc/autorandr/autorandr-1.13.3.ebuild76
-rw-r--r--x11-misc/autorandr/autorandr-9999.ebuild23
-rw-r--r--x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch28
-rw-r--r--x11-misc/autorandr/metadata.xml17
-rw-r--r--x11-misc/bbcd/bbcd-0.3.1-r5.ebuild2
-rw-r--r--x11-misc/colord/colord-1.4.6-r1.ebuild (renamed from x11-misc/colord/colord-1.4.6.ebuild)4
-rw-r--r--x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch33
-rw-r--r--x11-misc/compose-tables/Manifest2
-rw-r--r--x11-misc/compose-tables/compose-tables-1.8.3.ebuild (renamed from x11-misc/compose-tables/compose-tables-1.8.1.ebuild)2
-rw-r--r--x11-misc/compose-tables/metadata.xml15
-rw-r--r--x11-misc/copyq/metadata.xml9
-rw-r--r--x11-misc/dclock/dclock-2.2.2_p12.ebuild2
-rw-r--r--x11-misc/devilspie2/devilspie2-0.44.ebuild1
-rw-r--r--x11-misc/dex/dex-0.8.0.ebuild4
-rw-r--r--x11-misc/dex/dex-0.9.0.ebuild4
-rw-r--r--x11-misc/dmenu/Manifest1
-rw-r--r--x11-misc/dmenu/dmenu-5.2.ebuild62
-rw-r--r--x11-misc/dmenu/files/dmenu-5.2-gentoo.patch26
-rw-r--r--x11-misc/efax-gtk/efax-gtk-3.2.15-r1.ebuild (renamed from x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild)4
-rw-r--r--x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.1.ebuild54
-rw-r--r--x11-misc/emacs-desktop-mail/metadata.xml (renamed from x11-misc/unclutter/metadata.xml)5
-rw-r--r--x11-misc/fbpanel/fbpanel-7.0-r2.ebuild4
-rw-r--r--x11-misc/gammastep/Manifest1
-rw-r--r--x11-misc/gammastep/gammastep-2.0.9-r1.ebuild85
-rw-r--r--x11-misc/gammastep/gammastep-2.0.9.ebuild85
-rw-r--r--x11-misc/gammastep/metadata.xml13
-rw-r--r--x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild4
-rw-r--r--x11-misc/gccmakedep/metadata.xml11
-rw-r--r--x11-misc/gmrun/Manifest1
-rw-r--r--x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch40
-rw-r--r--x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch84
-rw-r--r--x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch11
-rw-r--r--x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch35
-rw-r--r--x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch41
-rw-r--r--x11-misc/gmrun/gmrun-0.9.2-r2.ebuild37
-rw-r--r--x11-misc/gmrun/gmrun-1.4w-r1.ebuild (renamed from x11-misc/gmrun/gmrun-1.4w.ebuild)25
-rw-r--r--x11-misc/gpaste/gpaste-3.42.5.ebuild3
-rw-r--r--x11-misc/grub2-theme-preview/Manifest3
-rw-r--r--x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0-r1.ebuild (renamed from x11-misc/grub2-theme-preview/grub2-theme-preview-2.5.0.ebuild)7
-rw-r--r--x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild (renamed from x11-misc/grub2-theme-preview/grub2-theme-preview-2.6.0.ebuild)6
-rw-r--r--x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch202
-rw-r--r--x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild (renamed from x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild)48
-rw-r--r--x11-misc/gtkdialog/gtkdialog-99999.ebuild31
-rw-r--r--x11-misc/gtkdialog/metadata.xml3
-rw-r--r--x11-misc/gxmessage/metadata.xml11
-rw-r--r--x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild4
-rw-r--r--x11-misc/i3lock/i3lock-2.14.1-r2.ebuild (renamed from x11-misc/i3lock/i3lock-2.14.1.ebuild)3
-rw-r--r--x11-misc/imake/Manifest2
-rw-r--r--x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch (renamed from x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch)21
-rw-r--r--x11-misc/imake/imake-1.0.9.ebuild (renamed from x11-misc/imake/imake-1.0.8-r1.ebuild)14
-rw-r--r--x11-misc/imake/metadata.xml11
-rw-r--r--x11-misc/kronometer/Manifest3
-rw-r--r--x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch24
-rw-r--r--x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch24
-rw-r--r--x11-misc/kronometer/kronometer-2.2.3.ebuild38
-rw-r--r--x11-misc/kronometer/kronometer-2.3.0.ebuild (renamed from x11-misc/kronometer/kronometer-2.2.80.ebuild)4
-rw-r--r--x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch29
-rw-r--r--x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch13
-rw-r--r--x11-misc/ktsuss/ktsuss-2.1-r1.ebuild45
-rw-r--r--x11-misc/ktsuss/ktsuss-2.1.ebuild32
-rw-r--r--x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild4
-rw-r--r--x11-misc/lightdm/lightdm-1.32.0-r1.ebuild2
-rw-r--r--x11-misc/lightdm/lightdm-1.32.0-r2.ebuild167
-rw-r--r--x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-configure-clang16.patch14
-rw-r--r--x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild (renamed from x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild)5
-rw-r--r--x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-configure-clang16.patch14
-rw-r--r--x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild (renamed from x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild)5
-rw-r--r--x11-misc/lineakd/lineakd-0.9.0-r4.ebuild4
-rw-r--r--x11-misc/lndir/Manifest2
-rw-r--r--x11-misc/lndir/lndir-1.0.3-r2.ebuild44
-rw-r--r--x11-misc/lndir/lndir-1.0.4.ebuild14
-rw-r--r--x11-misc/lndir/lndir-9999.ebuild44
-rw-r--r--x11-misc/lndir/metadata.xml11
-rw-r--r--x11-misc/makedepend/Manifest2
-rw-r--r--x11-misc/makedepend/makedepend-1.0.8.ebuild (renamed from x11-misc/makedepend/makedepend-1.0.6.ebuild)7
-rw-r--r--x11-misc/makedepend/metadata.xml11
-rw-r--r--x11-misc/mate-notification-daemon/Manifest1
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild54
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild2
-rw-r--r--x11-misc/menulibre/menulibre-2.2.3.ebuild7
-rw-r--r--x11-misc/menumaker/menumaker-0.99.12.ebuild4
-rw-r--r--x11-misc/meteo/meteo-0.9.9.1-r2.ebuild (renamed from x11-misc/meteo/meteo-0.9.9.1.ebuild)22
-rw-r--r--x11-misc/mozo/Manifest3
-rw-r--r--x11-misc/mozo/mozo-1.24.1.ebuild69
-rw-r--r--x11-misc/mozo/mozo-1.26.1.ebuild (renamed from x11-misc/mozo/mozo-1.24.0-r1.ebuild)16
-rw-r--r--x11-misc/mugshot/mugshot-0.4.3-r2.ebuild (renamed from x11-misc/mugshot/mugshot-0.4.3-r1.ebuild)6
-rw-r--r--x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch35
-rw-r--r--x11-misc/nitrogen/metadata.xml9
-rw-r--r--x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild (renamed from x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild)9
-rw-r--r--x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch24
-rw-r--r--x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild72
-rw-r--r--x11-misc/obconf-qt/Manifest1
-rw-r--r--x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild49
-rw-r--r--x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild1
-rw-r--r--x11-misc/obmenu-generator/Manifest1
-rw-r--r--x11-misc/obmenu-generator/obmenu-generator-0.90.ebuild36
-rw-r--r--x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild2
-rw-r--r--x11-misc/oroborus-deskmenu/metadata.xml4
-rw-r--r--x11-misc/oroborus-keylaunch/metadata.xml4
-rw-r--r--x11-misc/pcmanfm-qt/Manifest3
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild52
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-1.2.0.ebuild (renamed from x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild)4
-rw-r--r--x11-misc/picom/Manifest3
-rw-r--r--x11-misc/picom/picom-10.1.ebuild (renamed from x11-misc/picom/picom-8.2-r3.ebuild)4
-rw-r--r--x11-misc/picom/picom-10.2.ebuild (renamed from x11-misc/picom/picom-8.2-r2.ebuild)11
-rw-r--r--x11-misc/picom/picom-9.1.ebuild4
-rw-r--r--x11-misc/picom/picom-9999.ebuild6
-rw-r--r--x11-misc/polybar/polybar-3.6.3-r2.ebuild (renamed from x11-misc/polybar/polybar-3.6.3-r1.ebuild)6
-rw-r--r--x11-misc/polybar/polybar-3.6.3.ebuild61
-rw-r--r--x11-misc/py3status/Manifest2
-rw-r--r--x11-misc/py3status/metadata.xml1
-rw-r--r--x11-misc/py3status/py3status-3.48.ebuild (renamed from x11-misc/py3status/py3status-3.46.ebuild)7
-rw-r--r--x11-misc/qps/Manifest3
-rw-r--r--x11-misc/qps/qps-2.3.0.ebuild38
-rw-r--r--x11-misc/qps/qps-2.6.0.ebuild (renamed from x11-misc/qps/qps-2.4.0-r1.ebuild)8
-rw-r--r--x11-misc/qtfm/Manifest1
-rw-r--r--x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch38
-rw-r--r--x11-misc/qtfm/qtfm-6.2.0.ebuild57
-rw-r--r--x11-misc/qtfm/qtfm-6.2.1.ebuild2
-rw-r--r--x11-misc/redshift/Manifest1
-rw-r--r--x11-misc/redshift/files/redshift-1.12-apparmor.patch35
-rw-r--r--x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch33
-rw-r--r--x11-misc/redshift/redshift-1.12-r10.ebuild92
-rw-r--r--x11-misc/redshift/redshift-1.12-r6.ebuild4
-rw-r--r--x11-misc/redshift/redshift-1.12-r7.ebuild85
-rw-r--r--x11-misc/redshift/redshift-1.12-r8.ebuild87
-rw-r--r--x11-misc/redshift/redshift-1.12-r9.ebuild91
-rw-r--r--x11-misc/rendercheck/metadata.xml11
-rw-r--r--x11-misc/revelation/revelation-0.5.4-r1.ebuild4
-rw-r--r--x11-misc/revelation/revelation-0.5.5.ebuild4
-rw-r--r--x11-misc/rofi-file-browser-extended/Manifest1
-rw-r--r--x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch32
-rw-r--r--x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch23
-rw-r--r--x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild41
-rw-r--r--x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild (renamed from x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild)6
-rw-r--r--x11-misc/rofi/Manifest1
-rw-r--r--x11-misc/rofi/files/rofi-0.15.12-Werror.patch11
-rw-r--r--x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch13
-rw-r--r--x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch30
-rw-r--r--x11-misc/rofi/rofi-1.6.1-r1.ebuild62
-rw-r--r--x11-misc/rofi/rofi-1.7.3-r1.ebuild5
-rw-r--r--x11-misc/rofi/rofi-1.7.5.ebuild5
-rw-r--r--x11-misc/rofi/rofi-99999.ebuild7
-rw-r--r--x11-misc/safeeyes/Manifest5
-rw-r--r--x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch25
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild4
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild (renamed from x11-misc/safeeyes/safeeyes-2.1.3.ebuild)21
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.4.ebuild (renamed from x11-misc/safeeyes/safeeyes-2.1.1.ebuild)16
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild (renamed from x11-misc/safeeyes/safeeyes-2.0.9-r2.ebuild)28
-rw-r--r--x11-misc/safeeyes/safeeyes-2.1.5.ebuild (renamed from x11-misc/safeeyes/safeeyes-2.1.2.ebuild)21
-rw-r--r--x11-misc/screengrab/Manifest3
-rw-r--r--x11-misc/screengrab/screengrab-2.2.0.ebuild41
-rw-r--r--x11-misc/screengrab/screengrab-2.5.0.ebuild (renamed from x11-misc/screengrab/screengrab-2.3.0.ebuild)4
-rw-r--r--x11-misc/screenkey/Manifest3
-rw-r--r--x11-misc/screenkey/screenkey-1.3-r1.ebuild46
-rw-r--r--x11-misc/screenkey/screenkey-1.5-r3.ebuild (renamed from x11-misc/screenkey/screenkey-1.5-r2.ebuild)8
-rw-r--r--x11-misc/screenkey/screenkey-1.5_p20230109.ebuild (renamed from x11-misc/screenkey/screenkey-1.4-r1.ebuild)33
-rw-r--r--x11-misc/screenkey/screenkey-9999.ebuild25
-rw-r--r--x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch28
-rw-r--r--x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch33
-rw-r--r--x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch46
-rw-r--r--x11-misc/sddm/metadata.xml1
-rw-r--r--x11-misc/sddm/sddm-0.18.1-r8.ebuild (renamed from x11-misc/sddm/sddm-0.18.1-r6.ebuild)5
-rw-r--r--x11-misc/shutter/Manifest1
-rw-r--r--x11-misc/shutter/shutter-0.99.ebuild82
-rw-r--r--x11-misc/slock/Manifest1
-rw-r--r--x11-misc/slock/slock-1.5.ebuild66
-rw-r--r--x11-misc/spnavcfg/Manifest1
-rw-r--r--x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch23
-rw-r--r--x11-misc/spnavcfg/spnavcfg-1.1.ebuild48
-rw-r--r--x11-misc/sunflower/sunflower-0.5-r1.ebuild4
-rw-r--r--x11-misc/tint2/Manifest3
-rw-r--r--x11-misc/tint2/metadata.xml1
-rw-r--r--x11-misc/tint2/tint2-16.7.ebuild48
-rw-r--r--x11-misc/tint2/tint2-17.0.1-r1.ebuild48
-rw-r--r--x11-misc/tint2/tint2-17.0.2.ebuild2
-rw-r--r--x11-misc/tint2/tint2-17.1.3.ebuild68
-rw-r--r--x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch24
-rw-r--r--x11-misc/trayer-srg/metadata.xml15
-rw-r--r--x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild39
-rw-r--r--x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch19
-rw-r--r--x11-misc/trayer/trayer-1.0-r5.ebuild42
-rw-r--r--x11-misc/unclutter/Manifest1
-rw-r--r--x11-misc/unclutter/files/unclutter-8-FocusOut.patch17
-rw-r--r--x11-misc/unclutter/files/unclutter-8-include.patch10
-rw-r--r--x11-misc/unclutter/unclutter-8-r4.ebuild35
-rw-r--r--x11-misc/urxvt-tabbedex/Manifest1
-rw-r--r--x11-misc/urxvt-tabbedex/metadata.xml7
-rw-r--r--x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild30
-rw-r--r--x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild2
-rw-r--r--x11-misc/util-macros/metadata.xml11
-rw-r--r--x11-misc/vdpauinfo/Manifest2
-rw-r--r--x11-misc/vdpauinfo/metadata.xml3
-rw-r--r--x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild2
-rw-r--r--x11-misc/virtualgl/Manifest2
-rw-r--r--x11-misc/virtualgl/virtualgl-3.0.2.ebuild (renamed from x11-misc/virtualgl/virtualgl-3.0-r1.ebuild)0
-rw-r--r--x11-misc/vnc2swf/Manifest1
-rw-r--r--x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch45
-rw-r--r--x11-misc/vnc2swf/metadata.xml16
-rw-r--r--x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild54
-rw-r--r--x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild8
-rw-r--r--x11-misc/x2x/x2x-1.30-r1.ebuild5
-rw-r--r--x11-misc/xaos/metadata.xml2
-rw-r--r--x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild4
-rw-r--r--x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch8
-rw-r--r--x11-misc/xbattbar/xbattbar-1.4.9.ebuild15
-rw-r--r--x11-misc/xcalendar/xcalendar-4.0-r3.ebuild1
-rw-r--r--x11-misc/xclip/xclip-0.13.ebuild2
-rw-r--r--x11-misc/xcompmgr/Manifest2
-rw-r--r--x11-misc/xcompmgr/metadata.xml11
-rw-r--r--x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild (renamed from x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild)8
-rw-r--r--x11-misc/xdg-user-dirs-gtk/Manifest2
-rw-r--r--x11-misc/xdg-user-dirs-gtk/metadata.xml9
-rw-r--r--x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.11.ebuild (renamed from x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild)4
-rw-r--r--x11-misc/xdg-user-dirs/Manifest1
-rw-r--r--x11-misc/xdg-user-dirs/metadata.xml9
-rw-r--r--x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild32
-rw-r--r--x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild2
-rw-r--r--x11-misc/xdg-utils/Manifest1
-rw-r--r--x11-misc/xdg-utils/files/xdg-utils-egrep.patch25
-rw-r--r--x11-misc/xdg-utils/metadata.xml3
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild78
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild (renamed from x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild)4
-rw-r--r--x11-misc/xdialog/xdialog-2.3.1-r1.ebuild (renamed from x11-misc/xdialog/xdialog-2.3.1.ebuild)18
-rw-r--r--x11-misc/xdock/files/xdock-0.3.0-clang16.patch19
-rw-r--r--x11-misc/xdock/xdock-0.3.0-r1.ebuild (renamed from x11-misc/xdock/xdock-0.3.0.ebuild)18
-rw-r--r--x11-misc/xdotool/xdotool-3.20211022.1.ebuild7
-rw-r--r--x11-misc/xearth/xearth-1.1-r1.ebuild4
-rw-r--r--x11-misc/xfishtank/xfishtank-2.5.ebuild5
-rw-r--r--x11-misc/xflux-gui/Manifest2
-rw-r--r--x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch37
-rw-r--r--x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild (renamed from x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild)18
-rw-r--r--x11-misc/xfractint/metadata.xml2
-rw-r--r--x11-misc/xkeyboard-config/Manifest2
-rw-r--r--x11-misc/xkeyboard-config/metadata.xml15
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild (renamed from x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild)4
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild4
-rw-r--r--x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch18
-rw-r--r--x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild1
-rw-r--r--x11-misc/xlockmore/Manifest2
-rw-r--r--x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch28
-rw-r--r--x11-misc/xlockmore/xlockmore-5.69.ebuild4
-rw-r--r--x11-misc/xlockmore/xlockmore-5.71.ebuild (renamed from x11-misc/xlockmore/xlockmore-5.66.ebuild)21
-rw-r--r--x11-misc/xmobar/xmobar-0.44.1.ebuild2
-rw-r--r--x11-misc/xnee/Manifest1
-rw-r--r--x11-misc/xnee/files/xnee-3.18-linker.patch10
-rw-r--r--x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch117
-rw-r--r--x11-misc/xnee/files/xnee-3.19-slibtool.patch19
-rw-r--r--x11-misc/xnee/metadata.xml5
-rw-r--r--x11-misc/xnee/xnee-3.19-r2.ebuild80
-rw-r--r--x11-misc/xorg-cf-files/metadata.xml11
-rw-r--r--x11-misc/xowl/metadata.xml8
-rw-r--r--x11-misc/xowl/xowl-9999.ebuild48
-rw-r--r--x11-misc/xpad/xpad-5.4.0.ebuild6
-rw-r--r--x11-misc/xpad/xpad-5.7.0.ebuild6
-rw-r--r--x11-misc/xpad/xpad-5.8.0.ebuild6
-rw-r--r--x11-misc/xplanet/xplanet-1.3.1-r4.ebuild (renamed from x11-misc/xplanet/xplanet-1.3.1-r2.ebuild)4
-rw-r--r--x11-misc/xscreensaver/Manifest5
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch25
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch29
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch27
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch43
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch13
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch42
-rw-r--r--x11-misc/xscreensaver/metadata.xml9
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild224
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild239
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-6.03.ebuild)49
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-6.04.ebuild)47
-rw-r--r--x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild3
-rw-r--r--x11-misc/xsnap/xsnap-1.5.15-r3.ebuild4
-rw-r--r--x11-misc/xsnow/Manifest1
-rw-r--r--x11-misc/xsnow/metadata.xml3
-rw-r--r--x11-misc/xsnow/xsnow-3.5.3-r1.ebuild (renamed from x11-misc/xsnow/xsnow-3.5.3.ebuild)1
-rw-r--r--x11-misc/xsnow/xsnow-3.6.0-r1.ebuild54
-rw-r--r--x11-misc/xtermcontrol/metadata.xml27
-rw-r--r--x11-misc/xtitle/metadata.xml5
-rw-r--r--x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild4
-rw-r--r--x11-misc/xvfb-run/Manifest3
-rw-r--r--x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild32
-rw-r--r--x11-misc/xvfb-run/xvfb-run-21.1.4.3.ebuild (renamed from x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild)8
-rw-r--r--x11-misc/zim/Manifest5
-rw-r--r--x11-misc/zim/zim-0.73.5.ebuild73
-rw-r--r--x11-misc/zim/zim-0.74.0.ebuild73
-rw-r--r--x11-misc/zim/zim-0.74.2.ebuild73
-rw-r--r--x11-misc/zim/zim-0.74.3.ebuild6
-rw-r--r--x11-misc/zim/zim-0.75.1.ebuild (renamed from x11-misc/zim/zim-0.74.1.ebuild)57
298 files changed, 3264 insertions, 3353 deletions
diff --git a/x11-misc/alacarte/alacarte-3.44.2.ebuild b/x11-misc/alacarte/alacarte-3.44.2.ebuild
index f5d5418af06..c9c4ffadba9 100644
--- a/x11-misc/alacarte/alacarte-3.44.2.ebuild
+++ b/x11-misc/alacarte/alacarte-3.44.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
inherit gnome2 python-single-r1
diff --git a/x11-misc/alacarte/metadata.xml b/x11-misc/alacarte/metadata.xml
index 7b343b06be8..c6a01ca2cfa 100644
--- a/x11-misc/alacarte/metadata.xml
+++ b/x11-misc/alacarte/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/alacarte</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 6fa10387b2e..2f4fb01d3cc 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -5,7 +5,11 @@ DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294b
DIST albert-0.17.2-xkcd-python-extension.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
DIST albert-0.17.2.tar.gz 72652 BLAKE2B af5398307bf4dce928cfe92766551c761c407d9d98cc0a4b730cc8e95509d15c5b8ccfaef6e19d3dd2ded5e56403b14c3ac08fce90845abdfdb74ce7b3ff8b71 SHA512 ce2e32fa0018b210196e09cda8a3cce0a2cafecfdef5edae4610c621c39b66e3b4b039449d1900deb9689b5fa14178d079f7f0a7917cc1019d26b48a0a3ca415
DIST albert-0.17.3.tar.gz 73536 BLAKE2B 21755a9dfa2532ad43b812bb7de70d381c8ad75b815520f51ca7b2afd98c78bb83ec55b715c7f5cfdf065b4e0db51f4e645d7c21d22a128d8337a01ec9029959 SHA512 2734eb2a05067883c9e55bd6533928256240bfc7fd10be2bf0c2fa80da60cf19f62e23843ae4a1a009c5f8d937e791bbb5af9db30f7b0741e28c34b7780e8cf9
+DIST albert-0.17.5.tar.gz 73506 BLAKE2B 427c95878b4388fc891cd7cb2195cae748a09b68d86974877570cf8b5afc6845c63df2b282946c894ef4ce9de12670ec68a6bf9e4b10cdd6021890bddbf1ff7d SHA512 4535c4fc212da10fd4469643636ca020c5c8cfe0aad2c81231ccd1b1b20f9c090db5bfffa3ea189c34180a2e5fc71c6b4e0691f70a4c85d2e272e10e60fee9c0
+DIST albert-0.17.6.tar.gz 71453 BLAKE2B 7c39e1cdc0c6245269088b28b8aefab1e6c727be1c2f00461e247d4de1e5e6b79d2e7ad51e728e506d0437817ac21d26e482294fe03250f36fff32dc6fc3ecba SHA512 86589b32719e9b53ea963fa230474b8add016364724e2a34c6cb6dd17882d3e8c06fd8554a81afe1cb97690c43dd26342f225fd72a9759e6405e6a91e04996d2
DIST albert-jetbrains-python-extension-b7157473cc923fe4f15023c85a032eeab3627652.tar.gz 17062 BLAKE2B fa5da8a7df5e1bb337af75a30b7fbb2584eaa49745d14e88eeea18037d70c55e9885fdbeaeab8aaaa94531e73286c69e14b4864011875d59dcb790a10fd91e88 SHA512 53b9a0d9f972dd495648dd563df8d3b1c973aa02dce99ce7bb8a9da3bcf43174094d5a03035fbaf132072d834ccf918b17076d4f522265bea77c4220140b31de
+DIST albert-plugins-1bc69826f8eabc215cdeb1765bb4750f84133d1b.tar.gz 548693 BLAKE2B 98e2f19fa51d8fd422b4f0258ab9c08eced946239002cedbfd73fc37ff49c638ddcd4e7591ea8b27d575ac5940452f6d0bc18062d1e3b6624e366ac9a4724d21 SHA512 376e5dac161a4f69d3ab7efed9216e7ad186d92d911627b2fdff7dbf600498ee5effcd47f6393e1c8b172d590527cb24f3f507e0bf690c69f3563d79309c424f
+DIST albert-plugins-22881af568d70a3d4c16a901cd49c0e233c14a7a.tar.gz 548330 BLAKE2B 780bd1ff7d71a6f0c4c921d637d064c765d3052591af2e2c371b1763b366dd1340de2a7d5f3eb5cebecc1d611ae86bc626ee62b7545b01d7275b9e3478d05c00 SHA512 eb7e7ed9b24471422e7a7cdf319276071d6ff9613b9932d0752488c5992478dedcab96230359031f50ea1826d8b15dc0eba1edb205e1e9779690f1a973d4060d
DIST albert-plugins-ee55048e138028b4889d71e0574e85b2c4d69541.tar.gz 548351 BLAKE2B 6433ccf690cc57a649e6bfabe378c4458e005306529c6f3a143c0e7c0fb64e2c4216a9f17b7283a69684b36f676c5a9e27bcba8a76fc04f5ea4d7d4812f62d1d SHA512 85c6c6cabbdad91b926c446e44c02684cc2f619ca041faf3a23b432046db1f02413fc82dea9eba9aece560ac442a3202d2e9246b98fd36bdadf47470ff160c5a
DIST albert-python-extensions-7f571aceaf8e60eee8bb21e1ec4efa0e95523d13.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
DIST albert-xkcd-python-extension-bf88a964473d65b39c9e09eb48dabb847206f06f.tar.gz 729219 BLAKE2B f3c571bf2bf97f43a5aee7d8201f16732e12b589c8f7bfd58fe1ce138d728ba7416fed7eb203813922a5be5b3066f0c1d4bff136c61d480146fcf5da87dceb35 SHA512 0cdedb94bc82c2db8f3006efe43a084c098414aa711ebd88a011db6f1ef892f8114a73761d8b2f2a1d1be4603177f957eeb41ee642e1c31460d1507bca6fd402
diff --git a/x11-misc/albert/albert-0.17.3.ebuild b/x11-misc/albert/albert-0.17.3.ebuild
index eab6ec58d30..c4bd8605e9d 100644
--- a/x11-misc/albert/albert-0.17.3.ebuild
+++ b/x11-misc/albert/albert-0.17.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit cmake python-single-r1 xdg-utils
diff --git a/x11-misc/albert/albert-0.17.5.ebuild b/x11-misc/albert/albert-0.17.5.ebuild
new file mode 100644
index 00000000000..05d2458a910
--- /dev/null
+++ b/x11-misc/albert/albert-0.17.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-single-r1 xdg-utils
+
+DESCRIPTION="A fast and flexible keyboard launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+
+PLUGINS_HASH="22881af568d70a3d4c16a901cd49c0e233c14a7a"
+PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13"
+JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652"
+XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f"
+
+SRC_URI="
+ https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_HASH}.tar.gz
+ python-extensions? (
+ https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${PN}-python-extensions-${PYTHON_EXTENSIONS_COMMIT}.tar.gz
+ https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-jetbrains-python-extension-${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz
+ https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-xkcd-python-extension-${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz
+ )
+"
+
+LICENSE="all-rights-reserved" # unclear licensing #766129
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug +python +python-extensions +statistics virtualbox"
+RESTRICT="mirror bindist"
+
+REQUIRED_USE="
+ python-extensions? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ dev-cpp/muParser
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgraphicaleffects:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ python? ( ${PYTHON_DEPS} )
+ statistics? (
+ dev-qt/qtcharts:5
+ dev-qt/qtxml:5
+ )
+ virtualbox? ( app-emulation/virtualbox[sdk,vboxwebsrv] )
+"
+DEPEND="${RDEPEND}
+ python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') )"
+
+PATCHES=("${FILESDIR}/${PN}-0.17.3-find-and-use-python-libraries-and-headers.patch")
+
+src_prepare() {
+ mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die
+ if use python-extensions; then
+ mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die
+ mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die
+ mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DEBUG=$(usex debug)
+ -DBUILD_PYTHON=$(usex python)
+ -DBUILD_VIRTUALBOX=$(usex virtualbox)
+ -DBUILD_WITH_QTCHARTS=$(usex statistics)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/x11-misc/albert/albert-0.17.6.ebuild b/x11-misc/albert/albert-0.17.6.ebuild
new file mode 100644
index 00000000000..46ce8a108f0
--- /dev/null
+++ b/x11-misc/albert/albert-0.17.6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-single-r1 xdg-utils
+
+DESCRIPTION="A fast and flexible keyboard launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+
+PLUGINS_HASH="1bc69826f8eabc215cdeb1765bb4750f84133d1b"
+PYTHON_EXTENSIONS_COMMIT="7f571aceaf8e60eee8bb21e1ec4efa0e95523d13"
+JETBRAINS_PYTHON_EXTENSION_COMMIT="b7157473cc923fe4f15023c85a032eeab3627652"
+XKCD_PYTHON_EXTENSION_COMMIT="bf88a964473d65b39c9e09eb48dabb847206f06f"
+
+SRC_URI="
+ https://github.com/albertlauncher/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/albertlauncher/plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_HASH}.tar.gz
+ python-extensions? (
+ https://github.com/albertlauncher/python/archive/${PYTHON_EXTENSIONS_COMMIT}.tar.gz -> ${PN}-python-extensions-${PYTHON_EXTENSIONS_COMMIT}.tar.gz
+ https://github.com/mqus/jetbrains-albert-plugin/archive/${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-jetbrains-python-extension-${JETBRAINS_PYTHON_EXTENSION_COMMIT}.tar.gz
+ https://github.com/bergercookie/xkcd-albert-plugin/archive/${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz -> ${PN}-xkcd-python-extension-${XKCD_PYTHON_EXTENSION_COMMIT}.tar.gz
+ )
+"
+
+LICENSE="all-rights-reserved" # unclear licensing #766129
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug +python +python-extensions +statistics virtualbox"
+RESTRICT="mirror bindist"
+
+REQUIRED_USE="
+ python-extensions? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ dev-cpp/muParser
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgraphicaleffects:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ python? ( ${PYTHON_DEPS} )
+ statistics? (
+ dev-qt/qtcharts:5
+ dev-qt/qtxml:5
+ )
+ virtualbox? ( app-emulation/virtualbox[sdk,vboxwebsrv] )
+"
+DEPEND="${RDEPEND}
+ python? ( $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') )"
+
+PATCHES=("${FILESDIR}/${PN}-0.17.3-find-and-use-python-libraries-and-headers.patch")
+
+src_prepare() {
+ mv "${WORKDIR}"/plugins-${PLUGINS_HASH}/* "${S}"/plugins || die
+ if use python-extensions; then
+ mv "${WORKDIR}"/python-${PYTHON_EXTENSIONS_COMMIT}/* "${S}"/plugins/python/share/modules || die
+ mv "${WORKDIR}"/jetbrains-albert-plugin-${JETBRAINS_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/jetbrains_projects || die
+ mv "${WORKDIR}"/xkcd-albert-plugin-${XKCD_PYTHON_EXTENSION_COMMIT}/* "${S}"/plugins/python/share/modules/xkcd || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DEBUG=$(usex debug)
+ -DBUILD_PYTHON=$(usex python)
+ -DBUILD_VIRTUALBOX=$(usex virtualbox)
+ -DBUILD_WITH_QTCHARTS=$(usex statistics)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/x11-misc/arandr/Manifest b/x11-misc/arandr/Manifest
index 79536a1bd95..7e6c05abfb4 100644
--- a/x11-misc/arandr/Manifest
+++ b/x11-misc/arandr/Manifest
@@ -1 +1,2 @@
DIST arandr-0.1.10.tar.gz 100203 BLAKE2B b5754dda4c4f9c5e957a9fc75b7236480417b899c2705bc5aee514899c664d39b5902921c69ac425aff99f3a6ea512bfc0c2c0259519c1a6e0fc553f6e367cc2 SHA512 12c2fe5b36f8d8e688d990e352c1cfa3e8512c0b647b78a8af93f9472704e4867fac4c56c207465fb7b420c9022dc545dea8ad8a29af3037758ab4587dcd38ba
+DIST arandr-0.1.11.tar.gz 100603 BLAKE2B cbceaec815cb0b43731d10004a6fa3829e7ecbb1358b206a1dc2d8a1285884199e677a0e8a155ceaeca10d33515a1942754440569f3e338b79faa1b8351d4807 SHA512 5f3ccabbffac0ea9e05b9d8c229f4f3b05f06ef285fb05a1ce2d7f88fd1723fd680636f5b97764b0aeb3cedac16863c4ccb154d65bf6fe987a1b3cc8a0026584
diff --git a/x11-misc/arandr/arandr-0.1.10-r2.ebuild b/x11-misc/arandr/arandr-0.1.10-r3.ebuild
index 503f283eced..0e702d60d0b 100644
--- a/x11-misc/arandr/arandr-0.1.10-r2.ebuild
+++ b/x11-misc/arandr/arandr-0.1.10-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{8..10} )
-
+DISTUTILS_USE_PEP517=setuptools
+# Fails w/ py3.11, bug #889986
+PYTHON_COMPAT=( python3_{9..10} )
inherit distutils-r1
DESCRIPTION="Another XRandR GUI"
@@ -21,7 +21,6 @@ RDEPEND="
x11-libs/gtk+:3[introspection]
x11-apps/xrandr
"
-
BDEPEND="dev-python/docutils[${PYTHON_USEDEP}]"
PATCHES=( "${FILESDIR}/${PN}-0.1.10-manpages.patch" )
diff --git a/x11-misc/arandr/arandr-0.1.11.ebuild b/x11-misc/arandr/arandr-0.1.11.ebuild
new file mode 100644
index 00000000000..1070e68f54e
--- /dev/null
+++ b/x11-misc/arandr/arandr-0.1.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Another XRandR GUI"
+HOMEPAGE="https://christian.amsuess.com/tools/arandr/"
+SRC_URI="https://christian.amsuess.com/tools/arandr/files/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ dev-python/pygobject:3=[${PYTHON_USEDEP},cairo]
+ x11-libs/gtk+:3[introspection]
+ x11-apps/xrandr
+"
+BDEPEND="dev-python/docutils[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-0.1.10-manpages.patch" )
diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest
index b7513c4b18c..a7ff290a655 100644
--- a/x11-misc/autorandr/Manifest
+++ b/x11-misc/autorandr/Manifest
@@ -1 +1,2 @@
DIST autorandr-1.12.1.tar.gz 45550 BLAKE2B 5b434325d13c00c3fa70b5d09edb540cdcf3bb921307c60f2c616231e7a87ea85f60e39500ed8116f28619139f71ecc4a8fa153ffadc6b8d74df570736a0d815 SHA512 a7e095eb96e7e0d3a5b3b2122d68a3d3a5121d8be7a86ddd9f837ad42b7a53ed5ee45151f23861c5b900e214a4dfc0c575f45fe70c8c5587562a4035458137a0
+DIST autorandr-1.13.3.tar.gz 47630 BLAKE2B fb53316af4d3fa399f278be874e95d06cbd188bebf1e22793ca30ad4f9a8817674390c7d02d501f4a35a0a6f23b16202e97f2a6559727e67e908d21121de8a56 SHA512 6c3f99da52a029a8f1717020ebafbd7afb58d97651776a6620f47e299584704ab65c37be5e9497cca3c53d6268ebde11481f32967ec289adf606a73e587e874f
diff --git a/x11-misc/autorandr/autorandr-1.12.1.ebuild b/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild
index 2235547cc76..5f8e8128a64 100644
--- a/x11-misc/autorandr/autorandr-1.12.1.ebuild
+++ b/x11-misc/autorandr/autorandr-1.12.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit bash-completion-r1 distutils-r1 systemd udev
@@ -20,7 +21,7 @@ HOMEPAGE="https://github.com/phillipberndt/autorandr"
LICENSE="GPL-3"
SLOT="0"
-IUSE="launcher udev"
+IUSE="launcher systemd udev"
RDEPEND="
x11-apps/xrandr
@@ -30,6 +31,11 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ # https://github.com/phillipberndt/autorandr/pull/306
+ "${FILESDIR}"/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch
+)
+
src_compile() {
distutils-r1_src_compile
@@ -46,8 +52,8 @@ src_install() {
local targets=(
autostart_config
bash_completion
- systemd
$(usev launcher)
+ $(usev systemd)
$(usev udev)
)
@@ -63,3 +69,9 @@ pkg_postinst() {
udev_reload
fi
}
+
+pkg_postrm() {
+ if use udev; then
+ udev_reload
+ fi
+}
diff --git a/x11-misc/autorandr/autorandr-1.13.3.ebuild b/x11-misc/autorandr/autorandr-1.13.3.ebuild
new file mode 100644
index 00000000000..5a4cdc0e7c9
--- /dev/null
+++ b/x11-misc/autorandr/autorandr-1.13.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 distutils-r1 systemd udev
+
+if [[ "${PV}" = "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/phillipberndt/${PN}.git"
+else
+ SRC_URI="https://github.com/phillipberndt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Automatically select a display configuration based on connected devices"
+HOMEPAGE="https://github.com/phillipberndt/autorandr"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="launcher systemd udev"
+
+RDEPEND="
+ x11-apps/xrandr
+ launcher? ( x11-libs/libxcb )
+ udev? ( virtual/udev )
+"
+DEPEND="${RDEPEND}"
+# desktop-file-util: uses desktop-file-edit in Makefile
+BDEPEND="
+ dev-util/desktop-file-utils
+ virtual/pkgconfig
+"
+
+src_compile() {
+ distutils-r1_src_compile
+
+ if use launcher; then
+ emake contrib/autorandr_launcher/autorandr-launcher
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ doman autorandr.1
+
+ local targets=(
+ autostart_config
+ bash_completion
+ $(usev launcher)
+ $(usev systemd)
+ $(usev udev)
+ )
+
+ emake DESTDIR="${D}" \
+ BASH_COMPLETIONS_DIR="$(get_bashcompdir)" \
+ SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" \
+ UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+ $(printf "install_%s " "${targets[@]}")
+}
+
+pkg_postinst() {
+ if use udev; then
+ udev_reload
+ fi
+}
+
+pkg_postrm() {
+ if use udev; then
+ udev_reload
+ fi
+}
diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild
index 4433c9b58d7..5a4cdc0e7c9 100644
--- a/x11-misc/autorandr/autorandr-9999.ebuild
+++ b/x11-misc/autorandr/autorandr-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit bash-completion-r1 distutils-r1 systemd udev
@@ -20,7 +21,7 @@ HOMEPAGE="https://github.com/phillipberndt/autorandr"
LICENSE="GPL-3"
SLOT="0"
-IUSE="launcher udev"
+IUSE="launcher systemd udev"
RDEPEND="
x11-apps/xrandr
@@ -28,7 +29,11 @@ RDEPEND="
udev? ( virtual/udev )
"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+# desktop-file-util: uses desktop-file-edit in Makefile
+BDEPEND="
+ dev-util/desktop-file-utils
+ virtual/pkgconfig
+"
src_compile() {
distutils-r1_src_compile
@@ -46,8 +51,8 @@ src_install() {
local targets=(
autostart_config
bash_completion
- systemd
$(usev launcher)
+ $(usev systemd)
$(usev udev)
)
@@ -63,3 +68,9 @@ pkg_postinst() {
udev_reload
fi
}
+
+pkg_postrm() {
+ if use udev; then
+ udev_reload
+ fi
+}
diff --git a/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch b/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch
new file mode 100644
index 00000000000..ff3b31d0132
--- /dev/null
+++ b/x11-misc/autorandr/files/autorandr-Makefile-fix-install_udev-target-by-s-TARGETS-MAKECM.patch
@@ -0,0 +1,28 @@
+From 4b8d397fc7a0d22a51ee13428ae13d892c0cc911 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Thu, 20 Oct 2022 10:48:54 +0200
+Subject: [PATCH] Makefile: fix install_udev target by s/TARGETS/MAKECMDGOALS/
+
+A Gentoo user reported [1] that the 'install_udev' target would
+install a systemd-flavored udev rules, despite the 'systemd' target
+not being selected. Replacing 'TARGETS' with 'MAKECMDGOALS' in the
+Makefile rule fixes this .
+
+I am not sure where the TARGETS variable origniates from, but GNU make
+uses MAKECMDGOALS (FreeBSD make uses .TARGETS, i.e., with a leading
+dot). So if further portability between make variants is required,
+then this needs to be adjusted.
+
+1: https://bugs.gentoo.org/803545#c3
+Fixes: ae1f18a06039 ("udev rule: Dynamically call either systemd or autorandr directly depending on whether systemd unit is available")
+--- a/Makefile
++++ b/Makefile
+@@ -129,7 +129,7 @@ endif
+ install_udev:
+ $(if $(UDEV_RULES_DIR),,$(error UDEV_RULES_DIR is not defined))
+ mkdir -p ${DESTDIR}/${UDEV_RULES_DIR}/
+- echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(TARGETS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules
++ echo 'ACTION=="change", SUBSYSTEM=="drm", RUN+="$(if $(findstring systemd, $(MAKECMDGOALS)),/bin/systemctl start --no-block autorandr.service,${PREFIX}/bin/autorandr --batch --change --default default)"' > ${DESTDIR}/${UDEV_RULES_DIR}/40-monitor-hotplug.rules
+ @echo
+ @echo "To activate the udev rules, run this command as root:"
+ @echo " udevadm control --reload-rules"
diff --git a/x11-misc/autorandr/metadata.xml b/x11-misc/autorandr/metadata.xml
index fa31b93bb66..e3c13225712 100644
--- a/x11-misc/autorandr/metadata.xml
+++ b/x11-misc/autorandr/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>flow@gentoo.org</email>
- <name>Florian Schmaus</name>
-</maintainer>
-<use>
- <flag name="launcher">Install the launcher, i.e., an alternative to the udev/systemd hooks</flag>
-</use>
+ <maintainer type="person">
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <use>
+ <flag name="launcher">Install the launcher, i.e., an alternative to the udev/systemd hooks</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">phillipberndt/autorandr</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild
index 87a0f10e975..250968d07f3 100644
--- a/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild
+++ b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND=">=media-libs/libcdaudio-0.99.12-r4
diff --git a/x11-misc/colord/colord-1.4.6.ebuild b/x11-misc/colord/colord-1.4.6-r1.ebuild
index 6b1521b25a0..58918a6d770 100644
--- a/x11-misc/colord/colord-1.4.6.ebuild
+++ b/x11-misc/colord/colord-1.4.6-r1.ebuild
@@ -57,6 +57,10 @@ BDEPEND="
vala? ( $(vala_depend) )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-lcms2-corruption.patch
+)
+
src_prepare() {
default
use vala && vala_src_prepare
diff --git a/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch b/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
new file mode 100644
index 00000000000..4df6773cfb4
--- /dev/null
+++ b/x11-misc/colord/files/colord-1.4.6-lcms2-corruption.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/880865
+
+https://github.com/mm2/Little-CMS/issues/344
+https://github.com/hughsie/colord/issues/145
+
+https://github.com/hughsie/colord/commit/91a3cc2e994be587def3b70762f15461101d43a1
+
+From 91a3cc2e994be587def3b70762f15461101d43a1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Nov 2022 17:03:37 +0000
+Subject: [PATCH] lib: avoid destructing LCMS plugin twice with lcms 2.14
+
+lcms 2.14 contains a change to avoid a memory leak, but that change
+assumes correct API usage. It's not necessary to both cmsUnregisterPluginsTHR()
+and then cmsDeleteContext() -- we can just straight up delete the LCMS
+context instead (cmsDeleteContext()).
+
+So, follow upstream's suggestion & do that. This fixes memory corruption
+when building colord on x86, for example.
+
+Bug: https://github.com/mm2/Little-CMS/issues/344
+Fixes: https://github.com/hughsie/colord/issues/145
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/lib/colord/cd-context-lcms.c
++++ b/lib/colord/cd-context-lcms.c
+@@ -163,7 +163,6 @@ cd_context_lcms_free (gpointer ctx)
+ g_clear_error (error_ctx);
+ g_free (error_ctx);
+
+- cmsUnregisterPluginsTHR (ctx);
+ cmsDeleteContext (ctx);
+ }
+
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 5a548468b38..fa660d47935 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1 +1 @@
-DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
+DIST libX11-1.8.3.tar.xz 1811712 BLAKE2B 0adc92c13ba4bdec5d927349ca8c02adbb851eb376f19aa5f39e13caddb36c089be227c1f2dc61b34f882aae794f2b46ae237345c12c8e897be8df01e9fb3ef2 SHA512 bc862338fed855986659e9ffa641db6b36c3ac9abced590d1b164e3cc24446671936e3688cdca18393129c4ea41777977eeb37e87d8edc14d6cc5d194a9c0325
diff --git a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild b/x11-misc/compose-tables/compose-tables-1.8.3.ebuild
index 851f8bce119..23230b505b4 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/x11-misc/compose-tables/metadata.xml b/x11-misc/compose-tables/metadata.xml
index 63a0c8ad1f1..2e0798c9827 100644
--- a/x11-misc/compose-tables/metadata.xml
+++ b/x11-misc/compose-tables/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
-<upstream>
- <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
+ <remote-id type="freedesktop-gitlab">xorg/lib/libX11</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/copyq/metadata.xml b/x11-misc/copyq/metadata.xml
index b99cf962cce..7606b24718c 100644
--- a/x11-misc/copyq/metadata.xml
+++ b/x11-misc/copyq/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person" proxied="yes">
- <email>onigino@protonmail.com</email>
- <name>Gino</name>
- </maintainer>
- <maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">hluk/CopyQ</remote-id>
</upstream>
diff --git a/x11-misc/dclock/dclock-2.2.2_p12.ebuild b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
index 40e1bc5b557..6ff7ea856b3 100644
--- a/x11-misc/dclock/dclock-2.2.2_p12.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p12.ebuild
@@ -45,6 +45,8 @@ src_prepare() {
}
src_configure() {
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
if use xft; then
append-cppflags \
-DXFT_SUPPORT \
diff --git a/x11-misc/devilspie2/devilspie2-0.44.ebuild b/x11-misc/devilspie2/devilspie2-0.44.ebuild
index b919988753f..8f5a37e52d0 100644
--- a/x11-misc/devilspie2/devilspie2-0.44.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.44.ebuild
@@ -40,6 +40,7 @@ src_compile() {
LUA=${ELUA}
)
+ mkdir obj || die # race condition (bug #881473)
emake "${DEVILSPIE2_ARGS[@]}"
}
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
index 0b4cd2340db..56393cf8cc9 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-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+PYTHON_COMPAT=( python{3_9,3_10} )
inherit python-r1
diff --git a/x11-misc/dex/dex-0.9.0.ebuild b/x11-misc/dex/dex-0.9.0.ebuild
index 191bf3097bc..9a26bc92b00 100644
--- a/x11-misc/dex/dex-0.9.0.ebuild
+++ b/x11-misc/dex/dex-0.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit python-r1
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 8b4995d4ede..641869ae733 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,2 +1,3 @@
DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
DIST dmenu-5.1.tar.gz 16096 BLAKE2B 22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c SHA512 2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453
+DIST dmenu-5.2.tar.gz 16196 BLAKE2B f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d SHA512 7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3
diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
new file mode 100644
index 00000000000..de7dd36d35c
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="https://tools.suckless.org/dmenu/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+ media-libs/fontconfig
+ x11-libs/libX11
+ >=x11-libs/libXft-2.3.5
+ xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.2-gentoo.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's|^ @| |g' \
+ -e '/^ echo/d' \
+ Makefile || die
+
+ restore_config config.h
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+ "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
+ "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+ "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \
+ "XINERAMAFLAGS=$(
+ usex xinerama "-DXINERAMA $(
+ $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+ )" ''
+ )" \
+ "XINERAMALIBS=$(
+ usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+ )"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+ save_config config.h
+}
diff --git a/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
new file mode 100644
index 00000000000..91ee6f353bd
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
@@ -0,0 +1,26 @@
+From 3c494e2289c93ab6262409f9498866bdfd57bcf4 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 7 Oct 2022 11:29:04 -0700
+Subject: [PATCH] gentoo patch
+
+--- a/config.mk
++++ b/config.mk
+@@ -20,13 +20,13 @@ FREETYPEINC = /usr/include/freetype2
+ #MANPREFIX = ${PREFIX}/man
+
+ # includes and libs
+-INCS = -I$(X11INC) -I$(FREETYPEINC)
+-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
++INCS = $(X11INC) $(FREETYPEINC)
++LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS)
+
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS = $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
++CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS += $(LIBS)
+
+ # compiler and linker
+ CC = cc
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.15-r1.ebuild
index fd4111a4aa7..b14cb1e40f4 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.15.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
RDEPEND="
>=dev-libs/glib-2.10
- media-libs/tiff:0=
+ media-libs/tiff:=
x11-libs/libX11
x11-libs/c++-gtk-utils:0[gtk]
x11-libs/gtk+:3
diff --git a/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.1.ebuild b/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.1.ebuild
new file mode 100644
index 00000000000..92d93860fb2
--- /dev/null
+++ b/x11-misc/emacs-desktop-mail/emacs-desktop-mail-1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=28
+
+inherit elisp desktop xdg-utils
+
+DESCRIPTION="Desktop entries for handling mailto URIs with GNU Emacs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+ newmenu - emacs-mail.desktop <<-EOF
+ [Desktop Entry]
+ Type=Application
+ Name=GNU Emacs (mail)
+ NoDisplay=true
+ Exec=${EPREXIX}/usr/bin/emacs -f message-mailto %u
+ Terminal=false
+ MimeType=x-scheme-handler/mailto;
+ EOF
+
+ # The Desktop Entry Specification does not allow field codes like %u
+ # inside a quoted argument, therefore we need a shell wrapper.
+ # We want to pass a literal '"(message-mailto \"$1\")"' in the -c
+ # command, but in the desktop entry '"', '\', and '$' must be escaped
+ # as '\\"', '\\\\', and '\\$', respectively. Yet another level of
+ # backslash escapes is needed for '\' and '$' in the here-document.
+ newmenu - emacsclient-mail.desktop <<-EOF
+ [Desktop Entry]
+ Type=Application
+ Name=Emacsclient (mail)
+ NoDisplay=true
+ Exec=${EPREFIX}/bin/bash -c "exec ${EPREFIX}/usr/bin/emacsclient \
+--eval \\\\"(message-mailto \\\\\\\\\\\\"\\\\\$1\\\\\\\\\\\\")\\\\"" bash %u
+ Terminal=false
+ MimeType=x-scheme-handler/mailto;
+ EOF
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/x11-misc/unclutter/metadata.xml b/x11-misc/emacs-desktop-mail/metadata.xml
index 3ab9b4a739d..986088003fe 100644
--- a/x11-misc/unclutter/metadata.xml
+++ b/x11-misc/emacs-desktop-mail/metadata.xml
@@ -2,7 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
</maintainer>
+<stabilize-allarches/>
</pkgmetadata>
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
index 94e70477e40..be22542d46a 100644
--- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit python-any-r1 toolchain-funcs
diff --git a/x11-misc/gammastep/Manifest b/x11-misc/gammastep/Manifest
new file mode 100644
index 00000000000..8271eaf5c96
--- /dev/null
+++ b/x11-misc/gammastep/Manifest
@@ -0,0 +1 @@
+DIST gammastep-v2.0.9.tar.bz2 540120 BLAKE2B cfc29b157ad2dbd3d6bb0ac4bdb26c958ba07cad3e817931c2ee4c2e4d15c157b7c0b8b891869ddcc2cdfc39c1d52afb8437991ae60501afee84500e1f28c694 SHA512 d8b23e5890d6135cef79057408e1b7c1dbc36444dfbfaf7c80a3f36c46df19eaded1829c2cd52365413779cc752d0911a44669b5abce16d7e266b92b15c035fb
diff --git a/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild
new file mode 100644
index 00000000000..6024a5b5201
--- /dev/null
+++ b/x11-misc/gammastep/gammastep-2.0.9-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="https://gitlab.com/chinstrap/gammastep"
+SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator geoclue gtk nls wayland"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libdrm
+ appindicator? ( dev-libs/libayatana-appindicator )
+ geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+ gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+ gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}"/${PN}-v${PV}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ use gtk && python_setup
+
+ econf \
+ $(use_enable nls) \
+ --enable-drm \
+ $(use_enable wayland) \
+ --enable-randr \
+ --enable-vidmode \
+ $(use_enable geoclue geoclue2) \
+ $(use_enable gtk gui) \
+ --enable-apparmor \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
+
+_impl_specific_src_install() {
+ emake DESTDIR="${D}" \
+ PYTHON="${PYTHON}" \
+ pythondir="$(python_get_sitedir)" \
+ -C src/gammastep_indicator install
+}
+
+src_install() {
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+ if use gtk; then
+ python_foreach_impl _impl_specific_src_install
+ python_replicate_script "${D}"/usr/bin/gammastep-indicator
+
+ python_foreach_impl python_optimize
+ fi
+
+ insinto /etc/gammastep/
+ newins gammastep.conf.sample config.ini.example
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/gammastep/gammastep-2.0.9.ebuild b/x11-misc/gammastep/gammastep-2.0.9.ebuild
new file mode 100644
index 00000000000..59e51f985f0
--- /dev/null
+++ b/x11-misc/gammastep/gammastep-2.0.9.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="https://gitlab.com/chinstrap/gammastep"
+SRC_URI="https://gitlab.com/chinstrap/gammastep/-/archive/v${PV}/gammastep-v${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator geoclue gtk nls wayland"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libdrm
+ appindicator? ( dev-libs/libappindicator:3[introspection] )
+ geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+ gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+ gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}"/${PN}-v${PV}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ use gtk && python_setup
+
+ econf \
+ $(use_enable nls) \
+ --enable-drm \
+ $(use_enable wayland) \
+ --enable-randr \
+ --enable-vidmode \
+ $(use_enable geoclue geoclue2) \
+ $(use_enable gtk gui) \
+ --enable-apparmor \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
+
+_impl_specific_src_install() {
+ emake DESTDIR="${D}" \
+ PYTHON="${PYTHON}" \
+ pythondir="$(python_get_sitedir)" \
+ -C src/gammastep_indicator install
+}
+
+src_install() {
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+ if use gtk; then
+ python_foreach_impl _impl_specific_src_install
+ python_replicate_script "${D}"/usr/bin/gammastep-indicator
+
+ python_foreach_impl python_optimize
+ fi
+
+ insinto /etc/gammastep/
+ newins gammastep.conf.sample config.ini.example
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/gammastep/metadata.xml b/x11-misc/gammastep/metadata.xml
new file mode 100644
index 00000000000..e737ed45991
--- /dev/null
+++ b/x11-misc/gammastep/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>sping@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">chinstrap/gammastep</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
index 8207bd2715a..9db630f28c5 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
LIVE_DEPEND=">=x11-misc/util-macros-1.18"
else
SRC_URI="https://www.x.org/releases/individual/util/${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 ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="MIT"
diff --git a/x11-misc/gccmakedep/metadata.xml b/x11-misc/gccmakedep/metadata.xml
index e17a5bccb78..956fda190a1 100644
--- a/x11-misc/gccmakedep/metadata.xml
+++ b/x11-misc/gccmakedep/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/util/gccmakedep</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index 8087db6e09b..9c3720eb890 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,2 +1 @@
-DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
DIST gmrun-1.4w.tar.xz 43304 BLAKE2B 14c4ffc0770b37d851ad101c7967f691801bf2e95abb8c7fc06abc7c39f94ffac289253febb51bdba6e5237abdea38981e8072ceb997fb410620f691b8fc7ae7 SHA512 3e36304782d4d288abf2e81b4dee60230d262fa9e3ca8ab236d52619f0a226cfa95c8cc830e6506308ed65191ff7295501a9dfe162b54d67ce1f9154d33d9473
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
deleted file mode 100644
index e1d4d6d211a..00000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/src/gtkcompletionline.cc
-+++ b/src/gtkcompletionline.cc
-@@ -29,6 +29,7 @@
- #include <set>
- #include <sstream>
- #include <string>
-+#include <cstring>
- #include <vector>
- using namespace std;
-
---- a/src/ci_string.h
-+++ b/src/ci_string.h
-@@ -7,6 +7,7 @@
- #define __CI_STRING_H__
-
- #include <string>
-+#include <cstring>
- #include <ctype.h>
-
- struct ci_char_traits : public std::char_traits<char>
---- a/src/prefs.cc
-+++ b/src/prefs.cc
-@@ -13,6 +13,7 @@
- #include <fstream>
- #include <iostream>
- #include <stdio.h>
-+#include <stdlib.h>
-
- #include <list>
-
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -14,6 +14,7 @@
- #include <gdk/gdkkeysyms.h>
-
- #include <string>
-+#include <cstring>
- #include <iostream>
- #include <sstream>
- #include <vector>
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
deleted file mode 100644
index 3ef46c7bd65..00000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-gcc6-pie.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 351d355835532dbea8430902977873e887dd1c12 Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucian.poston@gmail.com>
-Date: Wed, 6 Dec 2017 04:22:28 -0800
-Subject: [PATCH] fix segfault in gcc-6
-
----
- src/gtkcompletionline.cc | 27 +++++++++++++++------------
- src/gtkcompletionline.h | 2 +-
- 2 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/src/gtkcompletionline.cc b/src/gtkcompletionline.cc
-index eb324b5..537fafb 100644
---- a/src/gtkcompletionline.cc
-+++ b/src/gtkcompletionline.cc
-@@ -77,22 +77,25 @@ static gboolean
- on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
-
- /* get_type */
--guint gtk_completion_line_get_type(void)
-+GType gtk_completion_line_get_type(void)
- {
-- static guint type = 0;
-+ static GType type = 0;
- if (type == 0)
- {
-- GtkTypeInfo type_info =
-+ static const GTypeInfo type_info =
- {
-- "GtkCompletionLine",
-- sizeof(GtkCompletionLine),
- sizeof(GtkCompletionLineClass),
-- (GtkClassInitFunc)gtk_completion_line_class_init,
-- (GtkObjectInitFunc)gtk_completion_line_init,
-- /*(GtkArgSetFunc)*/NULL /* reserved */,
-- /*(GtkArgGetFunc)*/NULL /* reserved */
-+ NULL,
-+ NULL,
-+ (GClassInitFunc)gtk_completion_line_class_init,
-+ NULL,
-+ NULL,
-+ sizeof(GtkCompletionLine),
-+ 0,
-+ (GInstanceInitFunc)gtk_completion_line_init,
-+ NULL
- };
-- type = gtk_type_unique(gtk_entry_get_type(), &type_info);
-+ type = g_type_register_static(GTK_TYPE_ENTRY, "GtkCompletionLine", &type_info, (GTypeFlags)0);
- }
- return type;
- }
-@@ -114,7 +117,7 @@ gtk_completion_line_class_init(GtkCompletionLineClass *klass)
-
- gtk_completion_line_signals[NOTUNIQUE] =
- gtk_signal_new("notunique",
-- GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
-+ GTK_RUN_FIRST, G_TYPE_FROM_CLASS(object_class),
- GTK_SIGNAL_OFFSET(GtkCompletionLineClass,
- notunique),
- gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
-@@ -778,7 +781,7 @@ complete_line(GtkCompletionLine *object)
- GtkWidget *
- gtk_completion_line_new()
- {
-- return GTK_WIDGET(gtk_type_new(gtk_completion_line_get_type()));
-+ return GTK_WIDGET(g_object_new(gtk_completion_line_get_type(), NULL));
- }
-
- static void
-diff --git a/src/gtkcompletionline.h b/src/gtkcompletionline.h
-index 5e14cd7..0d7f2dc 100644
---- a/src/gtkcompletionline.h
-+++ b/src/gtkcompletionline.h
-@@ -76,7 +76,7 @@ extern "C++" {
- void (* cancel)(GtkCompletionLine *cl);
- };
-
-- guint gtk_completion_line_get_type(void);
-+ GType gtk_completion_line_get_type(void);
- GtkWidget *gtk_completion_line_new();
-
- void gtk_completion_line_last_history_item(GtkCompletionLine*);
---
-2.13.6
-
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
deleted file mode 100644
index 6e12a56f431..00000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gtkcompletionline.cc
-+++ b/src/gtkcompletionline.cc
-@@ -376,7 +377,7 @@
- return 0;
- }
-
--int my_alphasort(const void* va, const void* vb) {
-+int my_alphasort(const dirent** va, const dirent** vb) {
- const struct dirent** a = (const struct dirent**)va;
- const struct dirent** b = (const struct dirent**)vb;
-
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch b/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch
deleted file mode 100644
index 426f652a0c2..00000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-stlport.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=164339
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
-
- INCLUDES = \
-- @GTK_CFLAGS@ @STLPORT_CXXFLAGS@
-+ @GTK_CFLAGS@
-
- bin_PROGRAMS = gmrun
-
-@@ -13,7 +13,7 @@
-
- # gmrun_LDFLAGS = -s
-
--gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
-+gmrun_LDADD = @GTK_LIBS@
-
- AM_CPPFLAGS = \
- -DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
---- a/configure.in
-+++ b/configure.in
-@@ -37,8 +37,8 @@
- AC_HEADER_DIRENT
- AC_HEADER_STDC
- AC_PROG_CXX
--AC_PATH_STLPORT_LIB
--AC_PATH_STLPORT_INC
-+dnl REMOVED _LIB
-+dnl REMOVED _INC
-
-
- AC_CHECK_FUNC( poptGetContext,
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
deleted file mode 100644
index 92db743a8df..00000000000
--- a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-http://bugs.gentoo.org/292856
-
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -1,6 +1,6 @@
- # $Id$
-
--myrcdir = @PACKAGE_DATA_DIR@
-+myrcdir = $(sysconfdir)
- myrc_DATA = gmrunrc
-
- EXTRA_DIST = gmrunrc
---- a/config.h.in
-+++ b/config.h.in
-@@ -10,7 +10,6 @@
- #undef HAVE_STPCPY
- #undef HAVE_LIBSM
- #undef PACKAGE_LOCALE_DIR
--#undef PACKAGE_DATA_DIR
- #undef PACKAGE_SOURCE_DIR
-
- /* Define if you have the <dirent.h> header file. */
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,3 +15,5 @@
-
- gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
-
-+AM_CPPFLAGS = \
-+ -DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
---- a/src/prefs.cc
-+++ b/src/prefs.cc
-@@ -30,7 +30,7 @@
-
- Prefs::Prefs()
- {
-- string file_name = PACKAGE_DATA_DIR"/";
-+ string file_name = PACKAGE_SYSCONF_DIR"/";
- file_name += GMRUNRC;
- init(file_name);
-
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
deleted file mode 100644
index 8ccf8afd6f0..00000000000
--- a/x11-misc/gmrun/gmrun-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
-HOMEPAGE="https://sourceforge.net/projects/gmrun/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/popt
- x11-libs/gtk+:2
-"
-DEPEND="
- ${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.10 )
- sys-apps/sed
- virtual/pkgconfig
-"
-
-src_prepare() {
- eapply \
- "${FILESDIR}"/${P}-gcc43.patch \
- "${FILESDIR}"/${P}-gcc6-pie.patch \
- "${FILESDIR}"/${P}-sysconfdir.patch \
- "${FILESDIR}"/${P}-glibc210.patch \
- "${FILESDIR}"/${P}-stlport.patch
-
- eapply_user
- eautoreconf
-}
diff --git a/x11-misc/gmrun/gmrun-1.4w.ebuild b/x11-misc/gmrun/gmrun-1.4w-r1.ebuild
index 3385f765aee..7f630b5887a 100644
--- a/x11-misc/gmrun/gmrun-1.4w.ebuild
+++ b/x11-misc/gmrun/gmrun-1.4w-r1.ebuild
@@ -3,13 +3,13 @@
EAPI=8
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/WdesktopX/${PN}.git"
EGIT_BRANCH="master"
else
SRC_URI="https://github.com/wdlkmpx/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~mips ~ppc x86"
+ KEYWORDS="amd64 ~mips ppc x86"
fi
DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
@@ -17,20 +17,15 @@ HOMEPAGE="https://github.com/wdlkmpx/gmrun"
LICENSE="ISC"
SLOT="0"
-IUSE="elibc_glibc nls xdg"
+IUSE="nls xdg"
-RDEPEND="
- x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- elibc_glibc? ( >=sys-libs/glibc-2.10 )"
+RDEPEND="x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_configure() {
- econf --disable-gtk2 $(use_enable nls) $(use_enable xdg)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog README.md
+ econf \
+ --disable-gtk2 \
+ $(use_enable nls) \
+ $(use_enable xdg)
}
diff --git a/x11-misc/gpaste/gpaste-3.42.5.ebuild b/x11-misc/gpaste/gpaste-3.42.5.ebuild
index ab7970b32e4..f435b161cbe 100644
--- a/x11-misc/gpaste/gpaste-3.42.5.ebuild
+++ b/x11-misc/gpaste/gpaste-3.42.5.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-VALA_MIN_API_VERSION="0.42"
VALA_USE_DEPEND="vapigen"
inherit meson vala gnome2-utils
diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest
index 731607b7d39..2f6acbb0ec6 100644
--- a/x11-misc/grub2-theme-preview/Manifest
+++ b/x11-misc/grub2-theme-preview/Manifest
@@ -1,2 +1 @@
-DIST grub2-theme-preview-2.5.0.tar.gz 202863 BLAKE2B 62d83cec805f7b65f6469ba22849c4b5cb0e4b845f9bfaea7aed6b05a997fc8d15b8804b2fe0bb75b0ad40f39ed215e8bd711cc4f7bda6f5decf66f38e4f0213 SHA512 83780bc581b3194cda6a47460e16ccf6cf520c8c9f52c19f8bd2779b5ba7e834c83821da47439d8d110770b573424a69ab0801a680983325e8fd6652d7a0652c
-DIST grub2-theme-preview-2.6.0.tar.gz 202962 BLAKE2B 61349270e339a4e82efa57c5ff67bc23e07eb94744a0539e544ce21ec6db26525938403e053af2d07e00f7bb2c75e801f6c688c149858456bf0d794030a72287 SHA512 9a2fc6a9270a10d00c6a7a711a28264f188cd15ca4bc1a84a80cf9e9255af824f65cac457db9a4f78bd0d8c954f7e1a8a4ed51b43e8b6949fabb267dcc2d0f16
+DIST grub2-theme-preview-2.7.0.tar.gz 203112 BLAKE2B 6279ece40999cea94c04396b4b6161bb90b060b5cc2d7573367d52d42321c9d598a839e9c6cd263b8aef5022a6296d9c5ae5919b0a228456b85e027ec059cc8c SHA512 4ea79b598342b60d1ff1f54eb27b1c4c92fa2a74c874a7107b6dad0aa0838a41e9e033a0f44a87307c0a5022c782b2fc51fa15f8599a63d2d5e10ac4e5b137e1
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.5.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0-r1.ebuild
index 9c69943a3a5..e5b2d043270 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.5.0.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.6.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild
index f11369c1652..4fe300bbbd5 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.6.0.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch
new file mode 100644
index 00000000000..fd6ff011f81
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-fix-build-for-clang16.patch
@@ -0,0 +1,202 @@
+Clang16 will not allow implicit function declarations and implicit integers etc.
+This patch overhauls the source code for modern C.
+
+Bug: https://bugs.gentoo.org/875704
+Upstream PR: https://github.com/oshazard/gtkdialog/pull/81
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/src/actions.c
++++ b/src/actions.c
+@@ -36,6 +36,7 @@
+ #include "attributes.h"
+ #include "variables.h"
+ #include "tag_attributes.h"
++#include "gtkdialog_parser.h"
+
+ extern gchar *option_include_file;
+
+--- a/src/automaton.c
++++ b/src/automaton.c
+@@ -35,6 +35,7 @@
+ */
+
+ #include <gtk/gtk.h>
++#include <glib/gprintf.h>
+
+ #include "config.h"
+ #include "gtkdialog.h"
+@@ -87,6 +88,8 @@
+ #undef TOOLTIPS
+
+ extern gboolean option_no_warning;
++extern void push_widget(GtkWidget * widget, int widgettype);
++int instruction_execute(instruction command);
+
+ instruction *program = NULL;
+ int instruction_counter = 0; /* The first available memory cell */
+@@ -323,8 +326,7 @@ void print_command(instruction command)
+ fflush(stdout);
+ }
+
+-void
+-print_program()
++void print_program()
+ {
+ gint pc;
+ instruction command;
+@@ -580,8 +582,7 @@ finalize:
+ }
+
+
+-int
+-instruction_execute(instruction command)
++int instruction_execute(instruction command)
+ {
+ GList *element;
+ token Token;
+@@ -911,9 +912,11 @@ gboolean widget_moved(GtkWidget *widget,
+ //gtk_widget_set_usize(window,
+ // configure->width -20,
+ // configure->height);
++#if HAVE_GTK==2
+ gtk_widget_set_uposition(GTK_WIDGET(window),
+ configure->x,
+ configure->y);
++#endif
+ }
+
+ fflush(stderr);
+--- a/src/gtkdialog.h
++++ b/src/gtkdialog.h
+@@ -65,5 +65,6 @@ gint get_program_from_variable(gchar *name);
+ void set_program_name(gchar *name);
+ gchar *get_program_name(void);
+ void load_styles_file(gchar *filename);
++int getnextchar(void);
+
+ #endif
+--- a/src/gtkdialog_parser.h
++++ b/src/gtkdialog_parser.h
+@@ -385,3 +385,8 @@ typedef union YYSTYPE
+ extern YYSTYPE gtkdialog_lval;
+
+
++extern int gtkdialog_error(char *c);
++extern void run_program(void);
++extern void print_program();
++extern int gtkdialog_lex (void);
++extern int gtkdialog_parse (void);
+--- a/src/printing.c
++++ b/src/printing.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <gtk/gtk.h>
++#include <glib/gprintf.h>
+ #include "gtkdialog.h"
+ #include "printing.h"
+
+--- a/src/signals.c
++++ b/src/signals.c
+@@ -40,6 +40,8 @@
+ //#define DEBUG_CONTENT
+ //#define DEBUG_TRANSITS
+
++extern gboolean variables_is_avail_by_name(const char *name);
++
+ /* Local variables */
+ char *condexpr[] = {
+ "active_is_true(", "active_is_false(", "active_is_true (", "active_is_false (",
+--- a/src/stringman.c
++++ b/src/stringman.c
+@@ -30,6 +30,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <ctype.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <gtk/gtk.h>
+--- a/src/variables.c
++++ b/src/variables.c
+@@ -59,6 +59,7 @@
+ #endif
+
+ extern gboolean option_no_warning;
++extern int yywarning(char *c);
+
+ /* Local function prototypes */
+ #ifdef DEBUG
+--- a/src/widget_notebook.c
++++ b/src/widget_notebook.c
+@@ -28,6 +28,7 @@
+ #include "automaton.h"
+ #include "widgets.h"
+ #include "tag_attributes.h"
++#include "signals.h"
+
+ /* Defines */
+ //#define DEBUG_CONTENT
+--- a/src/widget_timer.c
++++ b/src/widget_timer.c
+@@ -28,6 +28,7 @@
+ #include "automaton.h"
+ #include "widgets.h"
+ #include "tag_attributes.h"
++#include "signals.h"
+
+ /* Defines */
+ //#define DEBUG_CONTENT
+--- a/src/widgets.h
++++ b/src/widgets.h
+@@ -38,6 +38,38 @@
+ #include "variables.h"
+ #include "automaton.h"
+
++#include "widget_window.h"
++#include "widget_vbox.h"
++#include "widget_tree.h"
++#include "widget_timer.h"
++#include "widget_text.h"
++#include "widget_terminal.h"
++#include "widget_template.h"
++#include "widget_table.h"
++#include "widget_statusbar.h"
++#include "widget_spinbutton.h"
++#include "widget_radiobutton.h"
++#include "widget_progressbar.h"
++#include "widget_pixmap.h"
++#include "widget_notebook.h"
++#include "widget_menuitem.h"
++#include "widget_menubar.h"
++#include "widget_list.h"
++#include "widget_hseparator.h"
++#include "widget_hscale.h"
++#include "widget_hbox.h"
++#include "widget_frame.h"
++#include "widget_fontbutton.h"
++#include "widget_expander.h"
++#include "widget_eventbox.h"
++#include "widget_entry.h"
++#include "widget_edit.h"
++#include "widget_comboboxtext.h"
++#include "widget_combobox.h"
++#include "widget_colorbutton.h"
++#include "widget_checkbox.h"
++#include "widget_button.h"
++
+ char *widget_get_text_value(GtkWidget *widget, int type);
+ FILE *widget_opencommand(const char *command);
+ char *widgets_to_str(int itype);
+--- a/src/gtkdialog.c
++++ b/src/gtkdialog.c
+@@ -345,7 +345,7 @@ get_program_from_file(char *name)
+ * required because the #! is not included in the language.
+ */
+ program_src = NULL;
+- result = getline(&program_src, &tmp, sourcefile);
++ result = getline(&program_src, (size_t*)&tmp, sourcefile);
+ if (program_src[0] != '#') {
+ fclose(sourcefile);
+ sourcefile = fopen(name, "r");
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild
index 98d5e081d8c..cd27d5e63dd 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202-r1.ebuild
@@ -1,38 +1,41 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit autotools xdg-utils
+EAPI=8
+
+inherit autotools xdg
+
+if [[ "${PV}" == "99999" ]]; then
+ EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
+ KEYWORDS="amd64 ppc x86"
+fi
DESCRIPTION="A small utility for fast and easy GUI building"
HOMEPAGE="https://github.com/oshazard/gtkdialog"
-SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk2"
RDEPEND="
- gtk2? (
- x11-libs/gtk+:2
- x11-libs/vte:0=
- )
- !gtk2? (
- x11-libs/gtk+:3
- x11-libs/vte:2.91=
- )
+ dev-libs/glib
+ x11-libs/gtk+:3
+ x11-libs/vte:2.91=
"
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-apps/texinfo
sys-devel/flex
virtual/pkgconfig
- virtual/yacc
+ app-alternatives/yacc
"
+
PATCHES=(
"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
"${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
+ "${FILESDIR}"/${PN}-0.8.3-fix-build-for-clang16.patch
)
src_prepare() {
@@ -41,8 +44,7 @@ src_prepare() {
}
src_configure() {
- econf \
- $(usex gtk2 --disable-gtk3 --enable-gtk3)
+ econf --enable-gtk3
}
src_compile() {
@@ -55,11 +57,3 @@ src_install() {
emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
einstalldocs
}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index c23bccd2c83..883b6172ce8 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools git-r3 xdg-utils
+inherit autotools xdg
-DESCRIPTION="Small utility for fast and easy GUI building"
+if [[ "${PV}" == "99999" ]]; then
+ EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="A small utility for fast and easy GUI building"
HOMEPAGE="https://github.com/oshazard/gtkdialog"
-EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-IUSE=""
RDEPEND="
+ dev-libs/glib
x11-libs/gtk+:3
x11-libs/vte:2.91=
"
@@ -23,12 +29,13 @@ BDEPEND="
sys-apps/texinfo
sys-devel/flex
virtual/pkgconfig
- virtual/yacc
+ app-alternatives/yacc
"
PATCHES=(
"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
"${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
+ "${FILESDIR}"/${PN}-0.8.3-fix-build-for-clang16.patch
)
src_prepare() {
@@ -50,11 +57,3 @@ src_install() {
emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
einstalldocs
}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 756afb6ff8d..97441428731 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -14,7 +14,4 @@
<upstream>
<remote-id type="github">oshazard/gtkdialog</remote-id>
</upstream>
- <use>
- <flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
- </use>
</pkgmetadata>
diff --git a/x11-misc/gxmessage/metadata.xml b/x11-misc/gxmessage/metadata.xml
index 410408b3d17..eb26924f8f4 100644
--- a/x11-misc/gxmessage/metadata.xml
+++ b/x11-misc/gxmessage/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
- </maintainer>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="savannah">gxmessage</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
index b588938c663..104cad3b941 100644
--- a/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
+++ b/x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,5 +53,5 @@ pkg_postinst() {
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"
+ optfeature "ytdl-mpv" "media-fonts/fontawesome media-video/mpv[lua] x11-misc/xclip net-misc/yt-dlp"
}
diff --git a/x11-misc/i3lock/i3lock-2.14.1.ebuild b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
index 782393b8505..ce0e41df1a3 100644
--- a/x11-misc/i3lock/i3lock-2.14.1.ebuild
+++ b/x11-misc/i3lock/i3lock-2.14.1-r2.ebuild
@@ -17,9 +17,10 @@ RDEPEND="
dev-libs/libev
sys-libs/pam
x11-libs/cairo[X,xcb(+)]
- x11-libs/libxcb[xkb]
+ x11-libs/libxcb
x11-libs/libxkbcommon[X]
x11-libs/xcb-util
+ x11-libs/xcb-util-image
x11-libs/xcb-util-xrm"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 766a015901e..bb0f43c35a8 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -1 +1 @@
-DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
+DIST imake-1.0.9.tar.xz 153332 BLAKE2B d9de997016112833e50d1151448366c538b9796622630724552cc0476deed165621edc1a01318a83b577a85fcfc78b753e6fa9fbdf4c71413319abe542f1beca SHA512 e7587cf80369c8f4fcc1207c13bcb74a53d838b504ac8a7f3b98fb8f5f595cc7b8e5e9fad50cadcf40cf27bd02ef4eae7fe458854bbed7bea27d474d66520644
diff --git a/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch
index 15520046115..131b7978165 100644
--- a/x11-misc/imake/files/imake-1.0.8-no-get-gcc.patch
+++ b/x11-misc/imake/files/imake-1.0.9-no-get-gcc.patch
@@ -6,28 +6,33 @@ call it without using get_gcc(). Validity of using NULL should be
verified if there's ever a new version.
--- a/imake.c
+++ b/imake.c
-@@ -1341,4 +1341,5 @@
+@@ -1331,6 +1331,7 @@ get_gcc_version(FILE *inFile, char *name)
+ }
#endif
+#if defined CROSSCOMPILE
static boolean
get_gcc(char *cmd)
-@@ -1394,5 +1395,4 @@
+ {
+@@ -1384,7 +1385,6 @@ get_gcc(char *cmd)
+ return FALSE;
}
-#ifdef CROSSCOMPILE
static void
get_gcc_incdir(FILE *inFile, char* name)
-@@ -1640,12 +1640,14 @@
+ {
+@@ -1630,14 +1630,16 @@ define_os_defaults(FILE *inFile)
+ if (gnu_c)
# endif
{
+# if defined CROSSCOMPILE
- char name[PATH_MAX];
- if (get_gcc(name)) {
- get_gcc_version (inFile,name);
+ char gcc_name[PATH_MAX];
+ if (get_gcc(gcc_name)) {
+ get_gcc_version (inFile, gcc_name);
-# if defined CROSSCOMPILE
if (sys != emx)
- get_gcc_incdir(inFile,name);
+ get_gcc_incdir(inFile, gcc_name);
-# endif
}
+# else
@@ -35,3 +40,5 @@ verified if there's ever a new version.
+# endif
}
# endif
+ # if defined __FreeBSD__
+--
diff --git a/x11-misc/imake/imake-1.0.8-r1.ebuild b/x11-misc/imake/imake-1.0.9.ebuild
index b121c1a2505..12436d8ee0a 100644
--- a/x11-misc/imake/imake-1.0.8-r1.ebuild
+++ b/x11-misc/imake/imake-1.0.9.ebuild
@@ -1,21 +1,21 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
inherit toolchain-funcs xorg-3
DESCRIPTION="C preprocessor interface to the make utility"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"
+DEPEND="x11-base/xorg-proto"
PATCHES=(
- "${FILESDIR}"/${P}-cpp-args.patch
- "${FILESDIR}"/${P}-no-get-gcc.patch
- "${FILESDIR}"/${P}-respect-LD.patch
- "${FILESDIR}"/${P}-xmkmf-pass-cc-ld.patch
+ "${FILESDIR}"/${PN}-1.0.8-cpp-args.patch
+ "${FILESDIR}"/${PN}-1.0.9-no-get-gcc.patch
+ "${FILESDIR}"/${PN}-1.0.8-respect-LD.patch
+ "${FILESDIR}"/${PN}-1.0.8-xmkmf-pass-cc-ld.patch
)
src_configure() {
diff --git a/x11-misc/imake/metadata.xml b/x11-misc/imake/metadata.xml
index e17a5bccb78..10f1cbc5c6a 100644
--- a/x11-misc/imake/metadata.xml
+++ b/x11-misc/imake/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/util/imake</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 3e4e24794c8..6a32cca715a 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,2 +1 @@
-DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1
-DIST kronometer-2.2.80.tar.xz 134264 BLAKE2B db83b0c3bb6b22650c99371d00a31cc30cdbdac7b97b925d5a79f3a9fcf90be797e35e4f61d2bbdaf704340b3991451975250e0ffee7e4460d8d43d898265e24 SHA512 27dfa5a50f9adfb926fe6873267757c60cba2dcb2502407367626b01528bcfd49bcab065076bf789f975cc8587ed19a2f8202eb7b26615bf720f6c01d9d5986c
+DIST kronometer-2.3.0.tar.xz 136140 BLAKE2B b5ae57711b06ff53d3d096b6ce004620951132f4ab451aeaf67ac679e5154a4942d3cb910ed1d64ac32473b7fde59da0fd3b143171bb6f81ff29b81b29eceb2d SHA512 23321db24a0850be744765dc5eb17b3848d82b20e0bcc0520b5ee9bce6537650405aafeb435248459fd924fcfcd8acc113d8ca440edadd1d7c8f86dc282dd2e2
diff --git a/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch b/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch
deleted file mode 100644
index 5b73598a43e..00000000000
--- a/x11-misc/kronometer/files/kronometer-2.2.3-missing-dep.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 04499b5e063e5595f66d7624be851a53d85a5948 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 21 Mar 2022 21:00:59 +0100
-Subject: [PATCH] Add missing find_package for KCoreAddons
-
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 31fc597..2773638 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,6 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
-
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
- COMPONENTS
-+ CoreAddons
- Config
- Crash
- DocTools
---
-GitLab
-
diff --git a/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch b/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch
deleted file mode 100644
index f08cb9459cb..00000000000
--- a/x11-misc/kronometer/files/kronometer-2.2.3-missing-link.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2894243edd8c636d9855615522300b4361e2f258 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 20 Mar 2022 18:07:50 +0100
-Subject: [PATCH] Add missing KCoreAddons link
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7f510b8..be8805d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,6 +10,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- endif()
-
- target_link_libraries(kronometer
-+ KF5::CoreAddons
- KF5::Crash
- gui)
-
---
-GitLab
-
diff --git a/x11-misc/kronometer/kronometer-2.2.3.ebuild b/x11-misc/kronometer/kronometer-2.2.3.ebuild
deleted file mode 100644
index df7872459d8..00000000000
--- a/x11-misc/kronometer/kronometer-2.2.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Stopwatch application"
-HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-missing-dep.patch"
- "${FILESDIR}/${P}-missing-link.patch"
-)
diff --git a/x11-misc/kronometer/kronometer-2.2.80.ebuild b/x11-misc/kronometer/kronometer-2.3.0.ebuild
index bc1bda71d18..0c50aa9f6fd 100644
--- a/x11-misc/kronometer/kronometer-2.2.80.ebuild
+++ b/x11-misc/kronometer/kronometer-2.3.0.ebuild
@@ -12,11 +12,11 @@ inherit ecm kde.org
DESCRIPTION="Stopwatch application"
HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="5"
-# KEYWORDS="~amd64"
+KEYWORDS="amd64"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch b/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch
new file mode 100644
index 00000000000..e0763c688a6
--- /dev/null
+++ b/x11-misc/ktsuss/files/ktsuss-2.1-clang16.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/874540
+--- a/src/ktsuss.c
++++ b/src/ktsuss.c
+@@ -38,2 +38,3 @@
+ #include <sys/types.h>
++#include <err.h>
+ #include <errno.h>
+--- a/src/su_backend.c
++++ b/src/su_backend.c
+@@ -40,2 +40,3 @@
+ #include <sys/types.h>
++#include <err.h>
+ #include <errno.h>
+@@ -54,2 +55,4 @@
+
++void tty_raw(int ttyfd);
++
+ static struct termios orig_termios;
+--- a/src/sudo_backend.c
++++ b/src/sudo_backend.c
+@@ -40,2 +40,3 @@
+ #include <sys/types.h>
++#include <err.h>
+ #include <errno.h>
+@@ -55,2 +56,4 @@
+
++void tty_raw(int ttyfd);
++
+ static struct termios orig_termios;
diff --git a/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch b/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch
new file mode 100644
index 00000000000..12909025c18
--- /dev/null
+++ b/x11-misc/ktsuss/files/ktsuss-2.1-no-which.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/781185
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,3 +25,3 @@
+ AC_MSG_CHECKING([whether we can locate the su program])
+- supath=`which su 2>/dev/null`
++ supath=`command -v su 2>/dev/null`
+ if test "x$supath" = "x"; then
+@@ -36,3 +36,3 @@
+ AC_MSG_CHECKING([whether we can locate the sudo program])
+- sudopath=`which sudo 2>/dev/null`
++ sudopath=`command -v sudo 2>/dev/null`
+ if test "x$sudopath" = "x"; then
diff --git a/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild b/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild
new file mode 100644
index 00000000000..87718a58667
--- /dev/null
+++ b/x11-misc/ktsuss/ktsuss-2.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Graphical version of su written in C and GTK+ 2"
+HOMEPAGE="https://github.com/nomius/ktsuss/"
+SRC_URI="https://github.com/nomius/ktsuss/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
+IUSE="sudo"
+
+RDEPEND="
+ x11-libs/gtk+:2
+ dev-libs/glib:2
+ sudo? ( app-admin/sudo )
+ !sudo? (
+ || (
+ sys-apps/util-linux[su]
+ sys-apps/shadow[su]
+ )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( Changelog CREDITS README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-clang16.patch
+ "${FILESDIR}"/${P}-no-which.patch
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable sudo)
+}
diff --git a/x11-misc/ktsuss/ktsuss-2.1.ebuild b/x11-misc/ktsuss/ktsuss-2.1.ebuild
deleted file mode 100644
index 957f0076fb1..00000000000
--- a/x11-misc/ktsuss/ktsuss-2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Graphical version of su written in C and GTK+ 2"
-HOMEPAGE="https://github.com/nomius/ktsuss"
-SRC_URI="https://github.com/nomius/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="sudo"
-
-RDEPEND=">=x11-libs/gtk+-2.12.11:2
- >=dev-libs/glib-2.16.5:2
- sudo? ( app-admin/sudo )"
-DEPEND="virtual/pkgconfig
- ${RDEPEND}"
-
-DOCS=( Changelog CREDITS README.md )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable sudo)
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
index 0335db2c4cf..93c9ae3b00f 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.73.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit python-single-r1 xdg
diff --git a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
index 7fd8d6e1114..3573551b00d 100644
--- a/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.32.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.x
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="audit +gnome +gtk +introspection non-root qt5 vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild
new file mode 100644
index 00000000000..1209f8df2a3
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.32.0-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://github.com/canonical/lightdm"
+SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.xz
+ mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="audit elogind +gnome +gtk +introspection non-root qt5 systemd vala"
+
+REQUIRED_USE="^^ ( elogind systemd )
+ vala? ( introspection )"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.44.0:2
+ dev-libs/libgcrypt:=
+ dev-libs/libxml2
+ sys-libs/pam
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5
+ audit? ( sys-process/audit )
+ gnome? ( sys-apps/accountsservice )
+ introspection? ( >=dev-libs/gobject-introspection-1 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/lightdm
+ acct-group/video
+ acct-user/lightdm
+ >=sys-auth/pambase-20101024-r2
+ elogind? ( sys-auth/elogind[pam] )
+ systemd? ( sys-apps/systemd[pam] )"
+DEPEND="${COMMON_DEPEND}
+ gnome? ( gnome-base/gnome-common )
+"
+BDEPEND="
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+ "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
+DOCS=( NEWS )
+
+pkg_setup() {
+ export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
+ vala_setup
+}
+
+src_prepare() {
+ xdg_environment_reset
+
+ sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+ sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+ einfo "Fixing the session-wrapper variable in lightdm.conf"
+ sed -i -e \
+ "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+ # use correct version of qmake. bug #566950
+ sed \
+ -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+ -i configure.ac || die
+
+ default
+
+ # Remove bogus Makefile statement. This needs to go upstream
+ sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+ if has_version dev-libs/gobject-introspection; then
+ eautoreconf
+ else
+ AT_M4DIR=${WORKDIR} eautoreconf
+ fi
+}
+
+src_configure() {
+ # Set default values if global vars unset
+ local _greeter _session _user
+ _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+ _session=${LIGHTDM_SESSION:=gnome}
+ _user="$(usex non-root "${LIGHTDM_USER}" root)"
+ # Let user know how lightdm is configured
+ einfo "Gentoo configuration"
+ einfo "Default greeter: ${_greeter}"
+ einfo "Default session: ${_session}"
+ einfo "Greeter user: ${_user}"
+
+ # also disable tests because libsystem.c does not build. Tests are
+ # restricted so it does not matter anyway.
+ local myeconfargs=(
+ --localstatedir=/var
+ --disable-static
+ --disable-tests
+ $(use_enable audit libaudit)
+ $(use_enable introspection)
+ $(use_enable qt5 liblightdm-qt5)
+ $(use_enable vala)
+ --with-user-session=${_session}
+ --with-greeter-session=${_greeter}
+ --with-greeter-user=${_user}
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # Delete apparmor profiles because they only work with Ubuntu's
+ # apparmor package. Bug #494426
+ if [[ -d ${ED}/etc/apparmor.d ]]; then
+ rm -r "${ED}/etc/apparmor.d" || die \
+ "Failed to remove apparmor profiles"
+ fi
+
+ insinto /etc/${PN}
+ doins data/{${PN},keys}.conf
+ newins "${FILESDIR}"/Xsession-r1 Xsession
+ fperms +x /etc/${PN}/Xsession
+ # /var/lib/lightdm-data could be useful. Bug #522228
+ keepdir /var/lib/${PN}-data
+
+ find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die
+ rm -r "${ED}"/etc/init || die
+
+ # Remove existing pam file. We will build a new one. Bug #524792
+ rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die
+ pamd_mimic system-local-login ${PN} auth account password session #372229
+ pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+ dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+ readme.gentoo_create_doc
+
+ systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_postinst() {
+ systemd_reenable "${PN}.service"
+
+ # Bug #886607
+ ewarn
+ ewarn "If you have a Nvidia GPU and ${PN} fails to launch X, edit /etc/${PN}/${PN}.conf to include the line"
+ ewarn
+ ewarn "logind-check-graphical=false"
+ ewarn
+ ewarn "in the section [LightDM]. See https://github.com/canonical/lightdm/issues/263 for details."
+}
diff --git a/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-configure-clang16.patch b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-configure-clang16.patch
new file mode 100644
index 00000000000..17818dc42cf
--- /dev/null
+++ b/x11-misc/lineak-defaultplugin/files/lineak-defaultplugin-0.9.0-configure-clang16.patch
@@ -0,0 +1,14 @@
+autoreconf fails and it's a trivial fix to the generated configure, so let's
+just patch that instead. This is fixed in autoconf itself in newer versions.
+
+https://bugs.gentoo.org/879781
+--- a/configure
++++ b/configure
+@@ -7685,6 +7685,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild
index 823e1081286..3c59326074c 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MY_P=${P/.0/}
@@ -26,6 +26,7 @@ DOCS=( AUTHORS README )
PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
)
src_prepare() {
diff --git a/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-configure-clang16.patch b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-configure-clang16.patch
new file mode 100644
index 00000000000..256903d502e
--- /dev/null
+++ b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-configure-clang16.patch
@@ -0,0 +1,14 @@
+autoreconf fails and it's a trivial fix to the generated configure, so let's
+just patch that instead. This is fixed in autoconf itself in newer versions.
+
+https://bugs.gentoo.org/879783
+--- a/configure
++++ b/configure
+@@ -7153,6 +7153,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild
index 5ad5aca6757..0f57d3d1965 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MY_P=${P/.0/}
DESCRIPTION="Xosd plugin for LINEAK"
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
)
src_configure() {
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild
index 8f2fca9f6c7..7e5d738ba2a 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE="debug"
RDEPEND="x11-libs/libICE
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index f6b17c474d3..ef8e3819d29 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1 +1 @@
-DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
+DIST lndir-1.0.4.tar.xz 120136 BLAKE2B dbc9370c66bfffe02a9dfa2004a354f006dad1252c6d76f9707fa6b420be2b4072941c9c65bf695dbf6f0a7a01f6ef8152146d6aa3b5eda310e6f3f1412a6747 SHA512 71ebebaa9edb1ffe9d833cf23241bd7d99f4704a2eec20638eb9af1ff34bd42882557dadbcbe84a9e26f9d885caf1e555dca4756efd9915ca7642e39a8c6f711
diff --git a/x11-misc/lndir/lndir-1.0.3-r2.ebuild b/x11-misc/lndir/lndir-1.0.3-r2.ebuild
deleted file mode 100644
index 57a38b96a8c..00000000000
--- a/x11-misc/lndir/lndir-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/lndir"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/lndir.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/util/${P}.tar.bz2"
- KEYWORDS="amd64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
- virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="
- ${LIVE_DEPEND}
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- local econfargs=(
- --disable-selective-werror
- )
-
- econf "${econfargs[@]}"
-}
diff --git a/x11-misc/lndir/lndir-1.0.4.ebuild b/x11-misc/lndir/lndir-1.0.4.ebuild
new file mode 100644
index 00000000000..687c72d9f78
--- /dev/null
+++ b/x11-misc/lndir/lndir-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+inherit xorg-3
+
+DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+RDEPEND="dev-libs/libbsd"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
diff --git a/x11-misc/lndir/lndir-9999.ebuild b/x11-misc/lndir/lndir-9999.ebuild
deleted file mode 100644
index 14cec61a311..00000000000
--- a/x11-misc/lndir/lndir-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/lndir"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/util/lndir.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/util/${P}.tar.bz2"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
- virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="
- ${LIVE_DEPEND}
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- local econfargs=(
- --disable-selective-werror
- )
-
- econf "${econfargs[@]}"
-}
diff --git a/x11-misc/lndir/metadata.xml b/x11-misc/lndir/metadata.xml
index e17a5bccb78..c115b9d12d7 100644
--- a/x11-misc/lndir/metadata.xml
+++ b/x11-misc/lndir/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/util/lndir</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 2e4f1d9077a..7a3942ff94e 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1 +1 @@
-DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
+DIST makedepend-1.0.8.tar.xz 141304 BLAKE2B 15c29c9b727cf2fd7bb560596376f86f94d5ebd4dddeaf95c39acbed7f3a0b891db80bbc40cec4dae76e7019795d06d30869d2606f756ed5c4e2f8736101813d SHA512 6707b1107c07d4ffbcf008181e877d18a0bcc4aea03860ee1158f5630c7fdce4cf9ad7bee3b38ee420c3a44819ed4b56a6f2428a5b695c0dbd17fb3e60825a6d
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.8.ebuild
index ab0b176326a..8123954619a 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.8.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
inherit xorg-3
DESCRIPTION="create dependencies in makefiles"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/x11-misc/makedepend/metadata.xml b/x11-misc/makedepend/metadata.xml
index e17a5bccb78..2ddc5a9641c 100644
--- a/x11-misc/makedepend/metadata.xml
+++ b/x11-misc/makedepend/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/util/makedepend</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 7ca94cab62c..f9eb9dc0439 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,2 +1 @@
-DIST mate-notification-daemon-1.24.2.tar.xz 396156 BLAKE2B 64bbada24bc53f296076ff80b364e156fecfe28f4b1d8b77a0f05910939ccc2378e0635861442cc5cff8c95db5ccda55484de8aaf3315e28eb8df75c1a4bc20d SHA512 be9db249bec6dc2206d69998b972f06ab4e2ee5c30b5bcf44c43b508954a9984a37bc9a2fe9989aec55969492256ed742fb2a9618b751e47ff43b66c383c1bd4
DIST mate-notification-daemon-1.26.0.tar.xz 421032 BLAKE2B 3f55a281cc51e63245371a1bf4ddadb2be4fa09bf16a4ffac701d4530f519a65e2ff69c7e58e6589fa923d3af86315e36d5445a6a1915a6857271933605eaaac SHA512 5249cf14ba93f2e74b9774226c5d0f5e90a517df07569e16a23af7053f5ef160afe98c8a3452baf80c243272763eee1fde0b84f434f55df1f9de26298361a1dc
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild
deleted file mode 100644
index 1c0ecf0f180..00000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.24.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk
- >=dev-libs/glib-2.50:2
- >=dev-libs/libxml2-2.9.0
- >=sys-apps/dbus-1
- x11-libs/cairo
- >=x11-libs/gdk-pixbuf-2.22:2
- >=x11-libs/libnotify-0.7
- x11-libs/libX11
- virtual/libintl
- >=x11-libs/gtk+-3.22:3
- >=x11-libs/libwnck-3:3
- >=media-libs/libcanberra-0.4:0[gtk3]
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
- !x11-misc/notify-osd
- !x11-misc/qtnotifydaemon
- !x11-misc/notification-daemon
-"
-
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- dev-util/gdbus-codegen
- >=sys-devel/gettext-0.19.8
- >=sys-devel/libtool-2.2.6:2
- virtual/pkgconfig
-"
-
-src_install() {
- mate_src_install
-
- insinto /usr/share/dbus-1/services
- doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild
index 07ccfba4087..d34108e27c3 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
fi
DESCRIPTION="MATE Notification daemon"
diff --git a/x11-misc/menulibre/menulibre-2.2.3.ebuild b/x11-misc/menulibre/menulibre-2.2.3.ebuild
index 8d270e63e84..edeabe5b03f 100644
--- a/x11-misc/menulibre/menulibre-2.2.3.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1 xdg
@@ -27,7 +27,8 @@ RDEPEND="
x11-themes/hicolor-icon-theme"
BDEPEND="
$(python_gen_cond_dep '
- dev-python/python-distutils-extra[${PYTHON_USEDEP}]')"
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]')
+ dev-util/intltool"
python_prepare_all() {
distutils-r1_python_prepare_all
diff --git a/x11-misc/menumaker/menumaker-0.99.12.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
index c865064930c..3485ef894ea 100644
--- a/x11-misc/menumaker/menumaker-0.99.12.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit autotools python-single-r1
diff --git a/x11-misc/meteo/meteo-0.9.9.1.ebuild b/x11-misc/meteo/meteo-0.9.9.1-r2.ebuild
index 6f69fd93946..ee8a03bdb61 100644
--- a/x11-misc/meteo/meteo-0.9.9.1.ebuild
+++ b/x11-misc/meteo/meteo-0.9.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
inherit gnome2-utils meson python-any-r1 vala xdg
DESCRIPTION="Forecast application using OpenWeatherMap API"
@@ -13,9 +13,12 @@ SRC_URI="https://gitlab.com/bitseater/meteo/-/archive/${PV}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
+# One test needs network (#828052), the other simply checks desktop file
+# validation, that we also test with our QA tests
+RESTRICT="test"
DEPEND="
- dev-libs/libappindicator:3
+ dev-libs/libayatana-appindicator:0
dev-libs/glib:2
dev-libs/json-glib
net-libs/libsoup:2.4
@@ -30,15 +33,12 @@ BDEPEND="${PYTHON_DEPS}
dev-libs/appstream-glib
dev-util/intltool
virtual/pkgconfig
+ $(vala_depend)
"
-# One test needs network (#828052), the other simply checks desktop file
-# validation, that we also test with our QA tests
-RESTRICT="test"
-
-src_prepare() {
- default
- vala_src_prepare
+src_configure() {
+ vala_setup
+ meson_src_configure
}
src_install() {
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 7f3c70c9ea4..23cdee565c1 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,2 +1 @@
-DIST mozo-1.24.0.tar.xz 228180 BLAKE2B 6eb880b82dcb608f84efd8df74e77812f9da68dfa877ec896c6f04fa18088e8e4a82641c715e3620201dbb8a1bea8bb4ded09dd72f50770edae09c1326cbf453 SHA512 e0d217d2e7bb7d2c8df777e51bfb20e8bf4fa1bee0f9f3a9348ec1c8501b386a4afbd8848735ecfa61a0f9576382d784d3ef5b884a2a34af6ba33d3a126fe193
-DIST mozo-1.24.1.tar.xz 231032 BLAKE2B 27938aca9810943d19074cc5761ac58bb1dc2c1918b2fefea983f7a1b8788cb555311555515bb4387944c7b48a309de4a80da9003d212ca68ea257fa9ab06c8d SHA512 04b7e93e7302b46a3959f78655de4a6f8b17896be2c506c0e8a9041a9a2d5247e8c2ac00b5c8f86616f6c39a533584923feacfe4b81ae58d41080632af2a24bd
+DIST mozo-1.26.1.tar.xz 242836 BLAKE2B 59047b087e531792c0e831779d06a2dc7d9d2709bef7a7c8ba4a21d6f9fe1a79f917e2ba4e4912d655ad94391c0f7789e6ad6394be1a7bcb482881781f81c9ff SHA512 8570db4719d88bb34269a23acaa63638c5b7e50bf840bca73db718040c9d585670f1fd3be128c51ff22b4314f59dad6050907db8ce60bb506e4d46c3f807707e
diff --git a/x11-misc/mozo/mozo-1.24.1.ebuild b/x11-misc/mozo/mozo-1.24.1.ebuild
deleted file mode 100644
index 0019c072618..00000000000
--- a/x11-misc/mozo/mozo-1.24.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit mate python-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~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/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.26.1.ebuild
index 53a32a72176..145332a6ed9 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.26.1.ebuild
@@ -1,22 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
inherit mate python-r1
-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}
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
@@ -29,7 +26,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
RDEPEND="${COMMON_DEPEND}
virtual/libintl
"
-
DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
diff --git a/x11-misc/mugshot/mugshot-0.4.3-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild
index 61fadeb0cba..07a085adf15 100644
--- a/x11-misc/mugshot/mugshot-0.4.3-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 gnome2-utils xdg-utils
diff --git a/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch b/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch
new file mode 100644
index 00000000000..f9a86056b4a
--- /dev/null
+++ b/x11-misc/nitrogen/files/nitrogen-1.6.1-fix-appdata-install-location.patch
@@ -0,0 +1,35 @@
+From d7816bc17d03c018e532a4a1b37bd9190f7b65ef Mon Sep 17 00:00:00 2001
+From: Dylan Wolf <etc404@protonmail.com>
+Date: Wed, 12 Oct 2022 17:07:43 -0600
+Subject: [PATCH] Updated appdata installation location to
+ /usr/share/metainfo/nitrogen.metainfo.xml (appdata is deprecated)
+
+Signed-off-by: Dylan Wolf <etc404@protonmail.com>
+---
+ data/Makefile.am | 6 +++---
+ data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} | 0
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ rename data/{nitrogen.appdata.xml => nitrogen.metainfo.xml} (100%)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 7fa36c5..961b761 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -1,9 +1,9 @@
+ SUBDIRS = icons
+
+-appdatadir = $(datarootdir)/appdata
++metainfodir = $(datarootdir)/metainfo
+ desktopdir = $(datadir)/applications
+ desktop_DATA = nitrogen.desktop
+-appdata_DATA = nitrogen.appdata.xml
++metainfo_DATA = nitrogen.metainfo.xml
+
+ UPDATE_DESKTOP = update-desktop-database $(datadir)/applications || :
+
+@@ -12,5 +12,5 @@ install-data-hook:
+ uninstall-hook:
+ $(UPDATE_DESKTOP)
+
+-EXTRA_DIST = icon-theme-installer nitrogen.appdata.xml
++EXTRA_DIST = icon-theme-installer nitrogen.metainfo.xml
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml
index 85e4ed814fa..11058dd6ade 100644
--- a/x11-misc/nitrogen/metadata.xml
+++ b/x11-misc/nitrogen/metadata.xml
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>etc404@protonmail.com</email>
+ <name>Dylan Wolf</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild
index 2f606225b1a..4c91440c944 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools flag-o-matic xdg-utils
@@ -27,8 +27,13 @@ DEPEND="
xinerama? ( x11-base/xorg-proto )
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-appdata-install-location.patch" # https://github.com/l3ib/nitrogen/pull/156
+)
+
src_prepare() {
default
+ mv data/nitrogen.{appdata,metainfo}.xml || die
sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
diff --git a/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch b/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch
new file mode 100644
index 00000000000..3dffeebf497
--- /dev/null
+++ b/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch
@@ -0,0 +1,24 @@
+Clang16 will not allow implicit pointer to integer
+conversions by default. (-Werror=int-conversion by default)
+This patch fixes the pointer to integer conversion.
+
+Bug: https://bugs.gentoo.org/879035
+Patch is upstreamed here: https://answers.launchpad.net/notify-osd/+question/704024
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/src/bubble-window.c
++++ b/src/bubble-window.c
+@@ -78,8 +78,8 @@ bubble_window_get_accessible (GtkWidget *widget)
+ {
+ AtkObjectFactory *factory = NULL;
+ AtkRegistry *registry = NULL;
+- GType derived_type = NULL;
+- GType derived_atk_type = NULL;
++ GType derived_type = 0;
++ GType derived_atk_type = 0;
+
+ /*
+ * Figure out whether accessibility is enabled by looking at the
+--
+2.38.1
+
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild
new file mode 100644
index 00000000000..37513942a8c
--- /dev/null
+++ b/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools gnome2-utils savedconfig
+
+DESCRIPTION="Canonical's on-screen-display notification agent"
+HOMEPAGE="https://launchpad.net/notify-osd"
+SRC_URI="https://launchpad.net/${PN}/precise/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+ gnome-base/gsettings-desktop-schemas
+ !minimal? ( x11-themes/notify-osd-icons )
+"
+DEPEND="
+ dev-util/glib-utils
+ gnome-base/gnome-common
+ x11-base/xorg-proto
+ virtual/pkgconfig
+ >=dev-libs/dbus-glib-0.98
+ >=dev-libs/glib-2.16:2
+ >=x11-libs/gtk+-3.2:3
+ >=x11-libs/libnotify-0.7
+ >=x11-libs/libwnck-3:3
+ x11-libs/libX11
+ x11-libs/pixman
+ !x11-misc/notification-daemon
+ !x11-misc/qtnotifydaemon
+"
+
+RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
+
+# Patch is upstreamed here: https://answers.launchpad.net/notify-osd/+question/704024
+PATCHES=( "${FILESDIR}/${P}-fix-integer-conversion.patch" )
+
+src_prepare() {
+ default
+ sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
+ restore_config src/{bubble,defaults,dnd}.c #428134
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf --libexecdir="/usr/$(get_libdir)/${PN}"
+}
+
+src_install() {
+ default
+ save_config src/{bubble,defaults,dnd}.c
+ rm -f "${ED}"/usr/share/${PN}/icons/*/*/*/README
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ gnome2_schemas_update
+}
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index 39ee0abe459..1f6656be099 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,2 +1 @@
-DIST obconf-qt-0.16.0.tar.xz 101588 BLAKE2B 94407df40878c64a40343ad2a8fdbebc78a99beaf017485fda52d6043f2597467c67da465dd191a78ba7c084f1072152d4033f7b5b41f257946941efda37a9e3 SHA512 ab0ddc013ca877f2434da956c314b248f6a7ef5ced1e5c605de0652d0b8c5c0e84f1e6fdf8b21c6f3d450d57a1413d625d0a31b84cac2c9062dc0f101d8e57ab
DIST obconf-qt-0.16.2.tar.xz 111080 BLAKE2B 1ea6d4f5afb3e34db288bb1cfeb0c76345704b592230ebbaaff464206b13b9dfde7ff0ae07dd164e1d925e93e51a9a9bd6c571f55b81f3bbfc1537bfa620f521 SHA512 bd91a5669f07471966d296b91d78e2a40e2e3640405de2179513457088eb7d6cb063dbfaff623db6f404985734e986b52c1e3155a050f374b7afa58f7d720c0d
diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
deleted file mode 100644
index aed7ee4ebea..00000000000
--- a/x11-misc/obconf-qt/obconf-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI Openbox Configuration Tool"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
- SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.8.0
- sys-apps/sed
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- x11-libs/libX11
- x11-wm/openbox:3
-"
-RDEPEND="${DEPEND}
- !lxqt-base/lxqt-l10n
-"
-
-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/obconf-qt/obconf-qt-0.16.2.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
index 82809bc1622..5e05c035e15 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
BDEPEND="
dev-qt/linguist-tools:5
>=dev-util/lxqt-build-tools-0.8.0
- sys-apps/sed
virtual/pkgconfig
"
RDEPEND="
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 8e5cf16698c..2a41e3de2f3 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,2 +1 @@
-DIST obmenu-generator-0.90.tar.gz 20649 BLAKE2B 073b93ac427ac20ba236746bf8072988afaa293065b056ec02701cdf1bca68bbadfcdf22cccb093e73788b38ede4a386ea481705a6c7f4926060115405267cc0 SHA512 871be843273e51ce66c87bba5c17f50c1c67920c116663f7314b011fe55d4466acdc929b7b3a0a1fa2673b351685c9e801626b33b903cb55d48af89cf4a40bfc
DIST obmenu-generator-0.91.tar.gz 20648 BLAKE2B 669508f51a5ee84d2e68c7568f6eefc33c8a5984c702a54f4f9d057021c03da92bb3c8e29efa5448e71175552618affda9d07e6755b9bc814d604ab8a36be450 SHA512 9829b8cac6464eabec197d9c9c51beefad3619d42e602181d6873ddd1ed1c848a8eeed6ca6495c332fe97e82a55a05e34c42cc3a95b4ff22c9481470a9ea6ef5
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.90.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.90.ebuild
deleted file mode 100644
index 85fc189858a..00000000000
--- a/x11-misc/obmenu-generator/obmenu-generator-0.90.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="A fast pipe/static menu generator for the Openbox Window Manager"
-HOMEPAGE="https://github.com/trizen/obmenu-generator"
-SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-lang/perl[gdbm]
- dev-perl/Data-Dump
- >=dev-perl/Linux-DesktopFiles-0.90.0
- x11-wm/openbox
-"
-
-src_install() {
- dobin ${PN}
-
- insinto /etc/xdg/obmenu-generator
- doins schema.pl
-
- dodoc README.md
-}
-
-pkg_postinst() {
- optfeature_header "For icon (-i) functionality, install:"
- optfeature "support via gtk+:2 (enabled via config)" dev-perl/Gtk2
- optfeature "support via gtk+:3 (default)" dev-perl/Gtk3
-}
diff --git a/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild
index bfd7c16ed6c..b2b926f8c68 100644
--- a/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/obmenu-generator/archive/${PV}.tar.gz -> ${P}
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/perl[gdbm]
diff --git a/x11-misc/oroborus-deskmenu/metadata.xml b/x11-misc/oroborus-deskmenu/metadata.xml
index 8075914b0bd..13f54c18fac 100644
--- a/x11-misc/oroborus-deskmenu/metadata.xml
+++ b/x11-misc/oroborus-deskmenu/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
+ <!-- maintainer-needed -->
+ <longdescription>
DeskMenu is a root menu program which is activated by clicking the root window.
It is configured from a .deskmenurc file in your home directory. DeskMenu is
useful for window managers which do not provide a menu such as Oroborus.
diff --git a/x11-misc/oroborus-keylaunch/metadata.xml b/x11-misc/oroborus-keylaunch/metadata.xml
index 187adf28087..328cab6b777 100644
--- a/x11-misc/oroborus-keylaunch/metadata.xml
+++ b/x11-misc/oroborus-keylaunch/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
+ <!-- maintainer-needed -->
+ <longdescription>
KeyLaunch is a small utility for binding commands to a hot key. It reads a configuration
file in ~/.keylaunchrc. KeyLaunch uses Ctrl, Alt and Shift as modifier keys,
the hotkey is up to the user.
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index 70372f44c2f..6a1ee3deb04 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,3 +1,2 @@
-DIST pcmanfm-qt-0.17.0.tar.xz 296000 BLAKE2B bfe6a7ed701d375030c8a20fca3a9b1076810c426388e03644bca0a0482f5b86ac784e197463c7316514e78fe72ab360c73df75cb1ee16dc22a2fe313d4f9d01 SHA512 6de9083b90a2d06db892941e50dc9817e1ab8cf5bab80e331cd083c4756b7ede1207ca35fc1fc43b81b52651acb57dfd85953ab8f8deef2a2c0d362374726daa
-DIST pcmanfm-qt-1.0.0.tar.xz 317624 BLAKE2B fc66a21b9cc4c0dc9cb9b06ef757faa0a268c5e1c4dfa5765128b1701a051178a3f76d3132293fa7479eee7aad1398f863742489fd5aa64a1dc31c558a195463 SHA512 66f8badf47f32482f880009e24b506ad409ac4a939d4cbc0b6b9adf29874a6d76e5c154e5611329007485fe9c34985be7f67a1ec769ea0e0a107d16d48f2fd7f
DIST pcmanfm-qt-1.1.0.tar.xz 331652 BLAKE2B 055660b841feb1cced2ec8c67493e0db9656825c4925e5699c27904ed1c7c6483bc1fbba98838c39a2e55fb4b8cb0a67bb2e8eee58fab6224448ad9300dad0b6 SHA512 b453b56bd10a94b6c4cbf6e999a470208c7817384f3868ef230a65d39ff3b1e2b2e6db8c08ca894c4e226288efd38dbdddeb1294fa4f8507836cf84594b956ef
+DIST pcmanfm-qt-1.2.0.tar.xz 352536 BLAKE2B 4da72028fc22c9cc5711a2c5f4b7f92bdccc0f2006fb501b5111144df7441473ffe2719d161335b7b7d72f8a7fd3b545a73267a3a1b5b9716333c03c2e67241f SHA512 30e4d606a1eb5f3f64f0f6a3c3e855cca62a012f6e18e76a9f5738f304d2934fb0607fa579fa7ddf00ee863b8cd85f03bdb6e10eeb8bc61f5d50081ccc1db32b
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
deleted file mode 100644
index c554918e99e..00000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg-utils
-
-DESCRIPTION="Qt GUI Tabbed Filemanager"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
- SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.9.0
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- 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/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}
- >=lxde-base/lxmenu-data-0.1.5
-"
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- optfeature "mount password storing" gnome-base/gnome-keyring
- ! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.2.0.ebuild
index fc9216b2005..2911b656b08 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.0.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.2.0.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
@@ -23,7 +23,7 @@ SLOT="0"
BDEPEND="
>=dev-qt/linguist-tools-5.15:5
- >=dev-util/lxqt-build-tools-0.10.0
+ >=dev-util/lxqt-build-tools-0.12.0
"
DEPEND="
dev-libs/glib:2
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index 9007b171700..28a2e222497 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,2 +1,3 @@
-DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
+DIST picom-10.1.tar.gz 286934 BLAKE2B 0a6637c5615cfed514b746d85c2627b398fb0dd45b1027967b5145e1309e9ec4f2ac2e77a1459c06cb1db70fa3b12c350f42c6a0299ae7e4acc41270ca88dbbd SHA512 6c97f0f0665be5cd38f844d0902cc7cac7f97af578f9df585aaa43b5f7b0a20c3660a2fcb44b1af5ae87407f4a0691c976ab1e6ad09939f385c3bcb8c0d4a351
+DIST picom-10.2.tar.gz 287166 BLAKE2B feaa07fc5f0a53396675dfd4d8f2507caf6ce355b2db242b25b3559b287845b0505c48194e51c9c7fc6809dd10b871be6adf3e9fc87d91a41f01ccfeb87803ab SHA512 9c0351fbe8a9e76533243c8e76f8e7d10c1e49292f1c8e6c06f31fb0b512542a67970abe803d061c953546ff8d3e704488c263002a5a831f68deb010caee481d
DIST picom-9.1.tar.gz 263924 BLAKE2B 093f2fe12f3388b7979379d2e2b695a779cc9ebf95cbfa5b4f39c4fcc7cd6fc82be662bb9b0355fbadca66c0b0d7ac0d1e463272b0dbe4bbcca985691b6255e9 SHA512 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df
diff --git a/x11-misc/picom/picom-8.2-r3.ebuild b/x11-misc/picom/picom-10.1.ebuild
index de4a44606af..096c4965a20 100644
--- a/x11-misc/picom/picom-8.2-r3.ebuild
+++ b/x11-misc/picom/picom-10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-any-r1 virtualx xdg
DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-10.2.ebuild
index 7a6033f14d3..096c4965a20 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-any-r1 virtualx xdg
DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -12,14 +12,13 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0 MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="+config-file dbus +doc +drm opengl pcre test"
REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"
RESTRICT="test" # but tests require dbus_next
-RDEPEND="
- dev-libs/libev
+RDEPEND="dev-libs/libev
dev-libs/uthash
x11-libs/libX11
x11-libs/libxcb
diff --git a/x11-misc/picom/picom-9.1.ebuild b/x11-misc/picom/picom-9.1.ebuild
index 436488091d1..540e2e03889 100644
--- a/x11-misc/picom/picom-9.1.ebuild
+++ b/x11-misc/picom/picom-9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit meson python-any-r1 virtualx xdg
DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index cfa8461b6cf..e1b85646fdb 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit git-r3 meson python-any-r1 virtualx xdg
DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
@@ -31,7 +31,7 @@ RDEPEND="dev-libs/libev
dbus? ( sys-apps/dbus )
drm? ( x11-libs/libdrm )
opengl? ( virtual/opengl )
- pcre? ( dev-libs/libpcre )
+ pcre? ( dev-libs/libpcre2:= )
!x11-misc/compton"
DEPEND="${RDEPEND}
x11-base/xorg-proto"
diff --git a/x11-misc/polybar/polybar-3.6.3-r1.ebuild b/x11-misc/polybar/polybar-3.6.3-r2.ebuild
index 8d59630c731..6abbfc9d38c 100644
--- a/x11-misc/polybar/polybar-3.6.3-r1.ebuild
+++ b/x11-misc/polybar/polybar-3.6.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit cmake python-single-r1
@@ -24,7 +24,7 @@ DEPEND="
media-libs/fontconfig
media-libs/freetype
x11-libs/cairo[X,xcb(+)]
- x11-libs/libxcb:=[xkb]
+ x11-libs/libxcb:=
x11-libs/xcb-util
x11-libs/xcb-util-cursor
x11-libs/xcb-util-image
diff --git a/x11-misc/polybar/polybar-3.6.3.ebuild b/x11-misc/polybar/polybar-3.6.3.ebuild
deleted file mode 100644
index 770a50edd7b..00000000000
--- a/x11-misc/polybar/polybar-3.6.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/polybar/polybar"
-SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
- dev-libs/libuv:=
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/cairo[X,xcb(+)]
- x11-libs/libxcb:=[xkb]
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-image
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- alsa? ( media-libs/alsa-lib )
- curl? ( net-misc/curl )
- doc? ( dev-python/sphinx )
- i3wm? (
- dev-libs/jsoncpp:=
- || ( x11-wm/i3 x11-wm/i3-gaps )
- )
- mpd? ( media-libs/libmpdclient )
- network? ( dev-libs/libnl:3 )
- pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_ALSA="$(usex alsa)"
- -DENABLE_CURL="$(usex curl)"
- -DBUILD_DOC="$(usex doc)"
- -DENABLE_I3="$(usex i3wm)"
- -DBUILD_POLYBAR_MSG="$(usex ipc)"
- -DENABLE_MPD="$(usex mpd)"
- -DENABLE_NETWORK="$(usex network)"
- -DENABLE_PULSEAUDIO="$(usex pulseaudio)"
- # Bug 767949
- -DENABLE_CCACHE="OFF"
- )
-
- cmake_src_configure
-}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 44a1b2683c6..0d5750b09ac 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-3.46.tar.gz 417945 BLAKE2B 99eb560ac36f8b958d125adacf11eb349a3f3a50618ea85fbca9ecb88ad0a36fa55c876ae12e67aae95cff22d4344957043dbfe7ced1c557023d5b096d0ac16d SHA512 ac5335a89c36f109fce9f1f0f3fc6464ef5654507a4837ba777c7795a462428c3d5d4cf1acd08b57ff21269f29cf4cb7bfdf72b8042f5d0564fc81d82ff00b79
+DIST py3status-3.48.tar.gz 420799 BLAKE2B 4676ca711a34649fd9abf449e5b9eccf43f70dfcf46569a5e68a9f03504fbc7276d64e4247ede002b2f77dde8603b13bab5c44de227078ef415773912cb5aae3 SHA512 7f1d6bd88f3b40b427564bbca638e0e173140bd92bc9b4f0c3e554abacc15945c550027330968f6c5875eb78d9856f4abbbf6356d15b5362ada9422acd7444d1
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
index e3a14215d9e..deb1ffbd6ce 100644
--- a/x11-misc/py3status/metadata.xml
+++ b/x11-misc/py3status/metadata.xml
@@ -10,7 +10,6 @@
<remote-id type="github">ultrabug/py3status</remote-id>
</upstream>
<use>
- <flag name="gevent">Install extra requirement <pkg>dev-python/gevent</pkg> to enable green threads.</flag>
<flag name="minimal">Don't depend on <pkg>x11-misc/i3status</pkg> if you don't plan to use any of its built-in modules.</flag>
<flag name="udev">Install extra requirement <pkg>dev-python/pyudev</pkg> to enable udev events monitoring on modules.</flag>
</use>
diff --git a/x11-misc/py3status/py3status-3.46.ebuild b/x11-misc/py3status/py3status-3.48.ebuild
index feeede8caa4..c149a1d0f3d 100644
--- a/x11-misc/py3status/py3status-3.46.ebuild
+++ b/x11-misc/py3status/py3status-3.48.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
+PYTHON_COMPAT=( python{3_9,3_10,3_11} )
DISTUTILS_USE_SETUPTOOLS=rdepend
SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -18,14 +18,13 @@ HOMEPAGE="https://github.com/ultrabug/py3status"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="gevent minimal +udev"
+IUSE="minimal +udev"
# It feels useless to run tests on this simple package
# since upstream (I) runs tox on CI
RESTRICT="test"
RDEPEND="
!minimal? ( x11-misc/i3status )
- gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] )
udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] )
"
DEPEND="${RDEPEND}
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 33d7a500a58..382ce368003 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,3 +1,2 @@
-DIST qps-2.3.0.tar.xz 212660 BLAKE2B d52521f11775fe3d169b81851dc78b9e62641bef9d35d3a6b90b440fd6509e228ffe4ad5f51130e901c90710eab525f459c1b384cb01ba23f123841c3b3702c6 SHA512 1b884088fbdfeeaf4814453df4f7a345ebbb1825da0c09e768a655e8266f2089e7c2b9cca5f8d84dc0316a97d884a91ca5b8d9c2336a195c14432302db71171a
-DIST qps-2.4.0.tar.xz 226424 BLAKE2B e06816bc5f716be51fae5e9bedc9cc2b0261a6fdd7ca345676d29b613984d1e3fef34f64e0f11bc522afb823f53ac3f1a96e8e840676fd5e87199f2f4b28f3cc SHA512 ee71ca88ba21644d0a144730b7e36131890c0626ffea6b2082bc3d8a2f7f6230335632a7dbb95aa0ae4068f278cca58c628c72fe74dda2a7c8a8021b0ff87825
DIST qps-2.5.0.tar.xz 289796 BLAKE2B 9af9127d45eb3340177e7ed39242332d976f52c91de415da645baddd60583d010c4b7576efd0bf37f76459ce1487ec422601deb9f9baa2cfd6bb669baf7974d7 SHA512 58e8473eb9266a102e5df68025a2beb496a32e6c5cac54232242253abaede5adbf693a8b9f089693990687b53e20c1e23cc800b7928fe68e18f05e3b3d344dca
+DIST qps-2.6.0.tar.xz 295320 BLAKE2B e6a917993b64ace2333fec11d2406a0d9770bd8f3287ba38c586b7debd2572c342ebfb6e5e8c42f71f7ae6b6135995ba21f597258948538da5721daa8cde69c4 SHA512 c405841b2a455daeaf57e86c90a85e2d1e7c9a012d29262cba2b25f4b26ef693ae902d7d97b82504124d1b4562341af9c782b06745903616f1d3b809979d569a
diff --git a/x11-misc/qps/qps-2.3.0.ebuild b/x11-misc/qps/qps-2.3.0.ebuild
deleted file mode 100644
index c8a67fd2b99..00000000000
--- a/x11-misc/qps/qps-2.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI Process Manager"
-HOMEPAGE="https://lxqt.github.io/"
-SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.9.0
-"
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- >=lxqt-base/liblxqt-0.17.0
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/x11-misc/qps/qps-2.4.0-r1.ebuild b/x11-misc/qps/qps-2.6.0.ebuild
index f7efb430eda..7c995b4b42c 100644
--- a/x11-misc/qps/qps-2.4.0-r1.ebuild
+++ b/x11-misc/qps/qps-2.6.0.ebuild
@@ -11,19 +11,17 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
BDEPEND="
>=dev-qt/linguist-tools-5.15:5
- >=dev-util/lxqt-build-tools-0.10.0
+ >=dev-util/lxqt-build-tools-0.12.0
"
DEPEND="
>=dev-qt/qtcore-5.15:5
- >=dev-qt/qtdbus-5.15:5
>=dev-qt/qtgui-5.15:5
>=dev-qt/qtwidgets-5.15:5
- >=dev-qt/qtx11extras-5.15:5
- >=lxqt-base/liblxqt-1:=
+ >=lxqt-base/liblxqt-1.2:=
"
RDEPEND="${DEPEND}"
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 8b36857b40c..bc1f91b2384 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,2 +1 @@
-DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
DIST qtfm-6.2.1.tar.gz 410958 BLAKE2B fe542b935dfa0d16198f9a0dc3fb5e0b43718056ebc0987ef73ff8c56258e8ba660ef7f294cc424aab397cd26a2aba37048806d9175fe86004298129443c707b SHA512 911c90a6f9bcfe539aaacf3476d660116f2dc18821b23cc420615be649bbffd530abf640ebf77d80ee85b61779e4844e0bc10f8fd3f3b0686366e6b5372f9f2c
diff --git a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
deleted file mode 100644
index 783d33d4232..00000000000
--- a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c80a7f7e89f5810fab889dc2660d078438727c05 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 14 Jun 2020 20:25:46 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- libfm/iconlist.cpp | 2 ++
- libfm/iconview.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/libfm/iconlist.cpp b/libfm/iconlist.cpp
-index ca72f2e..9b25dd2 100644
---- a/libfm/iconlist.cpp
-+++ b/libfm/iconlist.cpp
-@@ -1,5 +1,7 @@
- #include "iconlist.h"
-
-+#include <QPainterPath>
-+
- QSize IconListDelegate::sizeHint(const QStyleOptionViewItem &option,
- const QModelIndex &index) const
- {
-diff --git a/libfm/iconview.cpp b/libfm/iconview.cpp
-index 7b72bfb..f1abbd2 100644
---- a/libfm/iconview.cpp
-+++ b/libfm/iconview.cpp
-@@ -1,5 +1,7 @@
- #include "iconview.h"
-
-+#include <QPainterPath>
-+
- bool IconViewDelegate::eventFilter(QObject *object,
- QEvent *event)
- {
---
-2.27.0
-
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
deleted file mode 100644
index 2701a220c7e..00000000000
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Small, lightweight file manager based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+dbus shared"
-
-BDEPEND="
- app-arch/unzip
- dev-qt/linguist-tools:5
-"
-RDEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- sys-apps/file
- dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
-
-src_configure() {
- eqmake5 \
- $(usex dbus '' 'CONFIG+=no_dbus CONFIG+=no_tray') \
- $(usex shared 'CONFIG+=sharedlib' '') \
- $(usex shared 'CONFIG+=with_includes' '') \
- LIBDIR="/usr/$(get_libdir)" \
- PREFIX="/usr" \
- XDGDIR="/etc/xdg"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
- einstalldocs
-}
-
-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/qtfm/qtfm-6.2.1.ebuild b/x11-misc/qtfm/qtfm-6.2.1.ebuild
index 82c4fe88eab..9e46320ebd0 100644
--- a/x11-misc/qtfm/qtfm-6.2.1.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+dbus shared"
RDEPEND="
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index e4397643934..d091a9428ea 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1 +1,2 @@
DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
+DIST redshift-1.12.tar.xz 486072 BLAKE2B b7ce74ae134a8f6954ff978e99670f24c447b23ab5e8d69a62109806bfe38c5e1b41e5f65cd6b182298aaf3e0b9187a2c70ea3148fd4ccba8b9c17697024944d SHA512 225e222e5f2c55be4571094ccaf02a92e162dfc35fd0fe504084e21e358b888a72f9992f9f9edaf1d496eb673af74a0d825ae5cf6ef7f0f1ab51d32419722c32
diff --git a/x11-misc/redshift/files/redshift-1.12-apparmor.patch b/x11-misc/redshift/files/redshift-1.12-apparmor.patch
new file mode 100644
index 00000000000..cb939994bf5
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.12-apparmor.patch
@@ -0,0 +1,35 @@
+From c740a3a733a59782c26f2f90a073befec2e2324d Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 27 Dec 2022 01:27:35 +0100
+Subject: [PATCH] Fix AppArmor profile
+
+Inspired by:
+- https://github.com/jonls/redshift/pull/864
+- https://gitlab.com/chinstrap/gammastep/-/blob/9db19f5ccfad20ab7b501daedcfd5ef137860dd2/data/apparmor/usr.bin.redshift.in
+---
+ data/apparmor/usr.bin.redshift.in | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/data/apparmor/usr.bin.redshift.in b/data/apparmor/usr.bin.redshift.in
+index d6696db..9b71f0d 100644
+--- a/data/apparmor/usr.bin.redshift.in
++++ b/data/apparmor/usr.bin.redshift.in
+@@ -35,8 +35,13 @@
+ # Allow but log any other dbus activity
+ audit dbus bus=system,
+
+- owner @{HOME}/.config/redshift.conf r,
++ owner @{HOME}/.config/{,redshift/}redshift.conf r,
++ owner @{HOME}/.config/redshift/hooks/ r,
++ owner @{HOME}/.config/redshift/hooks/* Ux,
++
++ # Required by getpwuid() call in config-ini.c.
++ /etc/passwd* r,
+
+ # Site-specific additions and overrides. See local/README for details.
+- #include <local/usr.bin.redshift>
++ #include if exists <local/usr.bin.redshift>
+ }
+--
+2.39.0
+
diff --git a/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch b/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch
new file mode 100644
index 00000000000..e2ff7a7c100
--- /dev/null
+++ b/x11-misc/redshift/files/redshift-1.12-libayatana-appindicator.patch
@@ -0,0 +1,33 @@
+From f2df94b6ad23eceea8c163f9c910e1f6ea122428 Mon Sep 17 00:00:00 2001
+From: Kentaro Hayashi <kenhys@gmail.com>
+Date: Mon, 27 Apr 2020 11:56:02 +0900
+Subject: [PATCH] redshift-gtk: use Ayatana AppIndicator3 instead of App
+ Indicator3
+
+libappindicator was deprecated and it will be removed in the
+future Debian release.
+
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895037
+
+There is a successor API compatible library - Ayatana Indicator.
+
+ https://ayatanaindicators.github.io/code/
+---
+ src/redshift-gtk/statusicon.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/redshift-gtk/statusicon.py b/src/redshift-gtk/statusicon.py
+index b4adfb00..68752ed6 100644
+--- a/src/redshift-gtk/statusicon.py
++++ b/src/redshift-gtk/statusicon.py
+@@ -33,8 +33,8 @@
+ from gi.repository import Gtk, GLib
+
+ try:
+- gi.require_version('AppIndicator3', '0.1')
+- from gi.repository import AppIndicator3 as appindicator
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as appindicator
+ except (ImportError, ValueError):
+ appindicator = None
+
diff --git a/x11-misc/redshift/redshift-1.12-r10.ebuild b/x11-misc/redshift/redshift-1.12-r10.ebuild
new file mode 100644
index 00000000000..a63b6864529
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libdrm
+ appindicator? ( dev-libs/libayatana-appindicator )
+ geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+ gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+ gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-apparmor.patch
+ "${FILESDIR}"/${P}-libayatana-appindicator.patch
+)
+
+src_configure() {
+ use gtk && python_setup
+
+ # Fix compile for Clang (bug #732438)
+ append-cflags -fPIE
+
+ econf \
+ $(use_enable nls) \
+ --enable-drm \
+ --enable-randr \
+ --enable-vidmode \
+ --disable-wingdi \
+ \
+ --disable-corelocation \
+ $(use_enable geoclue geoclue2) \
+ \
+ $(use_enable gtk gui) \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \
+ --enable-apparmor \
+ --disable-quartz \
+ --disable-ubuntu
+}
+
+_impl_specific_src_install() {
+ emake DESTDIR="${D}" \
+ PYTHON="${PYTHON}" \
+ pythondir="$(python_get_sitedir)" \
+ -C src/redshift-gtk install
+}
+
+src_install() {
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+ if use gtk; then
+ python_foreach_impl _impl_specific_src_install
+ python_replicate_script "${D}"/usr/bin/redshift-gtk
+ dosym redshift-gtk /usr/bin/gtk-redshift
+
+ python_foreach_impl python_optimize
+
+ # https://bugs.gentoo.org/784281
+ mv "${D}"/usr/share/{appdata,metainfo}/ || die
+ fi
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/redshift/redshift-1.12-r6.ebuild b/x11-misc/redshift/redshift-1.12-r6.ebuild
index 997257dbf0c..de25b572c07 100644
--- a/x11-misc/redshift/redshift-1.12-r6.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit flag-o-matic systemd autotools xdg-utils python-r1
diff --git a/x11-misc/redshift/redshift-1.12-r7.ebuild b/x11-misc/redshift/redshift-1.12-r7.ebuild
new file mode 100644
index 00000000000..dd358b255f2
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libdrm
+ appindicator? ( dev-libs/libappindicator:3[introspection] )
+ geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+ gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+ gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+src_configure() {
+ use gtk && python_setup
+
+ # Fix compile for Clang (bug #732438)
+ append-cflags -fPIE
+
+ econf \
+ $(use_enable nls) \
+ --enable-drm \
+ --enable-randr \
+ --enable-vidmode \
+ --disable-wingdi \
+ \
+ --disable-corelocation \
+ $(use_enable geoclue geoclue2) \
+ \
+ $(use_enable gtk gui) \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \
+ --enable-apparmor \
+ --disable-quartz \
+ --disable-ubuntu
+}
+
+_impl_specific_src_install() {
+ emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
+ -C src/redshift-gtk install
+}
+
+src_install() {
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+ if use gtk; then
+ python_foreach_impl _impl_specific_src_install
+ python_replicate_script "${D}"/usr/bin/redshift-gtk
+ dosym redshift-gtk /usr/bin/gtk-redshift
+
+ python_foreach_impl python_optimize
+
+ # https://bugs.gentoo.org/784281
+ mv "${D}"/usr/share/{appdata,metainfo}/ || die
+ fi
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/redshift/redshift-1.12-r8.ebuild b/x11-misc/redshift/redshift-1.12-r8.ebuild
new file mode 100644
index 00000000000..9bed05ef1b7
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libdrm
+ appindicator? ( dev-libs/libappindicator:3[introspection] )
+ geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+ gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+ gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+src_configure() {
+ use gtk && python_setup
+
+ # Fix compile for Clang (bug #732438)
+ append-cflags -fPIE
+
+ econf \
+ $(use_enable nls) \
+ --enable-drm \
+ --enable-randr \
+ --enable-vidmode \
+ --disable-wingdi \
+ \
+ --disable-corelocation \
+ $(use_enable geoclue geoclue2) \
+ \
+ $(use_enable gtk gui) \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \
+ --enable-apparmor \
+ --disable-quartz \
+ --disable-ubuntu
+}
+
+_impl_specific_src_install() {
+ emake DESTDIR="${D}" \
+ PYTHON="${PYTHON}" \
+ pythondir="$(python_get_sitedir)" \
+ -C src/redshift-gtk install
+}
+
+src_install() {
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+ if use gtk; then
+ python_foreach_impl _impl_specific_src_install
+ python_replicate_script "${D}"/usr/bin/redshift-gtk
+ dosym redshift-gtk /usr/bin/gtk-redshift
+
+ python_foreach_impl python_optimize
+
+ # https://bugs.gentoo.org/784281
+ mv "${D}"/usr/share/{appdata,metainfo}/ || die
+ fi
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/redshift/redshift-1.12-r9.ebuild b/x11-misc/redshift/redshift-1.12-r9.ebuild
new file mode 100644
index 00000000000..76823b83401
--- /dev/null
+++ b/x11-misc/redshift/redshift-1.12-r9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit flag-o-matic systemd xdg-utils python-r1
+
+DESCRIPTION="A screen color temperature adjusting software"
+HOMEPAGE="http://jonls.dk/redshift/"
+SRC_URI="https://github.com/jonls/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="appindicator geoclue gtk nls"
+
+COMMON_DEPEND=">=x11-libs/libX11-1.4
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libdrm
+ appindicator? ( dev-libs/libappindicator:3[introspection] )
+ geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
+ gtk? ( ${PYTHON_DEPS} )"
+RDEPEND="${COMMON_DEPEND}
+ gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ dev-python/pyxdg[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ nls? ( sys-devel/gettext )
+"
+REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-apparmor.patch
+)
+
+src_configure() {
+ use gtk && python_setup
+
+ # Fix compile for Clang (bug #732438)
+ append-cflags -fPIE
+
+ econf \
+ $(use_enable nls) \
+ --enable-drm \
+ --enable-randr \
+ --enable-vidmode \
+ --disable-wingdi \
+ \
+ --disable-corelocation \
+ $(use_enable geoclue geoclue2) \
+ \
+ $(use_enable gtk gui) \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \
+ --enable-apparmor \
+ --disable-quartz \
+ --disable-ubuntu
+}
+
+_impl_specific_src_install() {
+ emake DESTDIR="${D}" \
+ PYTHON="${PYTHON}" \
+ pythondir="$(python_get_sitedir)" \
+ -C src/redshift-gtk install
+}
+
+src_install() {
+ emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
+
+ if use gtk; then
+ python_foreach_impl _impl_specific_src_install
+ python_replicate_script "${D}"/usr/bin/redshift-gtk
+ dosym redshift-gtk /usr/bin/gtk-redshift
+
+ python_foreach_impl python_optimize
+
+ # https://bugs.gentoo.org/784281
+ mv "${D}"/usr/share/{appdata,metainfo}/ || die
+ fi
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/x11-misc/rendercheck/metadata.xml b/x11-misc/rendercheck/metadata.xml
index e17a5bccb78..60df35fd321 100644
--- a/x11-misc/rendercheck/metadata.xml
+++ b/x11-misc/rendercheck/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/test/rendercheck</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/revelation/revelation-0.5.4-r1.ebuild b/x11-misc/revelation/revelation-0.5.4-r1.ebuild
index ef1516172cb..ff85436ffe6 100644
--- a/x11-misc/revelation/revelation-0.5.4-r1.ebuild
+++ b/x11-misc/revelation/revelation-0.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_9 )
inherit gnome2-utils python-single-r1 meson xdg
diff --git a/x11-misc/revelation/revelation-0.5.5.ebuild b/x11-misc/revelation/revelation-0.5.5.ebuild
index f66d489a5da..31deaaf4245 100644
--- a/x11-misc/revelation/revelation-0.5.5.ebuild
+++ b/x11-misc/revelation/revelation-0.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit gnome2-utils python-single-r1 meson xdg
diff --git a/x11-misc/rofi-file-browser-extended/Manifest b/x11-misc/rofi-file-browser-extended/Manifest
index 51c29886b88..2dafe33fb12 100644
--- a/x11-misc/rofi-file-browser-extended/Manifest
+++ b/x11-misc/rofi-file-browser-extended/Manifest
@@ -1,2 +1 @@
-DIST rofi-file-browser-extended-1.2.0.tar.gz 23560 BLAKE2B bb5637e9a56009949b4241c218a73fdb79cf5065906b7f48874ee64e3d38d4b68a751eec937eededd040086b2560f6e6f92440d9cc0900be3f3dee54a03f8f83 SHA512 74e5adeadaa0322e1d489bda79db58b416553daefbbc353012b82855529875aefd42c53458efe059ee1aa7ea6b7550b791dd56a11c207c5cc6f4ed46d17bdb81
DIST rofi-file-browser-extended-1.3.1.tar.gz 27169 BLAKE2B ced5ae91a865b136bcb2182a17c7a49cbdfcc861f8d1063415691afb13f5bdf3f1c2c0fc56a21a0dec31ee656c2379e55a4f60899c59ca7e056438142675aeb2 SHA512 269e33d62e5fdf7f6c48763ae4309fac53873d53af4ebf78f731b709ac6ff41d8f8cf21de917866fe5a80f4949d70d3be6e516c3825a8768106c706438a5b3d1
diff --git a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
deleted file mode 100644
index 410943815ac..00000000000
--- a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 47f61ae6b971e71c55788b790146ffe63d64c834 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Tue, 1 Jun 2021 11:05:05 +0200
-Subject: [PATCH] Do not install man page
-
----
- CMakeLists.txt | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ab8168df336..901de539097e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,15 +28,3 @@ target_link_libraries(filebrowser
- )
-
- install(TARGETS filebrowser DESTINATION ${ROFI_PLUGINS_DIR})
--
--
--
--# Manpage
--
--add_custom_command(OUTPUT "doc/rofi-file-browser-extended.1.gz"
-- COMMAND gzip -k "doc/rofi-file-browser-extended.1"
-- COMMENT "Packing manpage")
--
--add_custom_target(manpage ALL DEPENDS "doc/rofi-file-browser-extended.1.gz")
--
--install(FILES "doc/rofi-file-browser-extended.1.gz" DESTINATION "/usr/share/man/man1")
---
-2.31.1
-
diff --git a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch
new file mode 100644
index 00000000000..0cfff428660
--- /dev/null
+++ b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch
@@ -0,0 +1,23 @@
+From 6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Fri, 11 Nov 2022 15:03:32 +0100
+Subject: [PATCH] Fix function pointer initialization
+
+Fix
+
+src/filebrowser.c:380:27: warning: incompatible function pointer types initializing '_mode_get_icon' (aka 'struct _cairo_surface *(*)(const struct rofi_mode *, unsigned int, unsigned int)') with an expression of type 'cairo_surface_t *(const Mode *, unsigned int, int)' (aka 'struct _cairo_surface *(const struct rofi_mode *, unsigned int, int)') [-Wincompatible-function-pointer-types]
+ ._get_icon = file_browser_get_icon,
+ ^~~~~~~~~~~~~~~~~~~~~
+
+See also https://bugs.gentoo.org/880985
+--- a/src/filebrowser.c
++++ b/src/filebrowser.c
+@@ -263,7 +263,7 @@ static char *file_browser_get_display_value ( const Mode *sw, unsigned int selec
+ }
+ }
+
+-static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, int height )
++static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int selected_line, unsigned int height )
+ {
+ FileBrowserModePrivateData *pd = ( FileBrowserModePrivateData * ) mode_get_private_data ( sw );
+ FileBrowserFileData *fd = &pd->file_data;
diff --git a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
deleted file mode 100644
index 5dd899576fa..00000000000
--- a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A file browser for rofi"
-HOMEPAGE="https://github.com/marvinkreis/rofi-file-browser-extended"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/marvinkreis/${PN}.git"
-else
- SRC_URI="https://github.com/marvinkreis/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
- dev-libs/glib:2
- x11-misc/rofi
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/cairo
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-do-not-install-man-page.patch"
-)
-
-src_install() {
- cmake_src_install
- doman "doc/${PN}.1"
-}
diff --git a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild
index 2be17da588a..a3fe3b3b176 100644
--- a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild
+++ b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild
@@ -30,10 +30,14 @@ DEPEND="
"
RDEPEND="${COMMON_DEPEND}"
+PATCHES=(
+ # https://bugs.gentoo.org/880985 https://github.com/marvinkreis/rofi-file-browser-extended/pull/49
+ "${FILESDIR}/${PN}-1.3.1-fix-function-pointer-initialization.patch"
+)
+
src_prepare() {
# Delete the lines in CMakeLists.txt that install the man page.
sed -i "45,56d" CMakeLists.txt || die
- default
cmake_src_prepare
}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 8a869c056aa..10428745748 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,3 +1,2 @@
-DIST rofi-1.6.1.tar.xz 404372 BLAKE2B b338382104b84f068024eff3a04bed1bbc895d6977204a9abdc55e3b382e6e6a9e5646f6155011b17d43943d9a7a9fb92aa7dca24789b260e73b5e3b134001de SHA512 c9794a7e4921e58ecc5fc7096218203f548efe2a49ffa6971accc12e9172248bda856ad06f8c11ada9abb62b9a43c7fffce1c1be9a3fe1365c94561b170a8b73
DIST rofi-1.7.3.tar.xz 755776 BLAKE2B af746e72ce5d09f3815960eb533bf58160c56141a116d1d950db498445e07696d0af2abe36a661ce67178f2040bfba7a39ac6c8eacdfc4db9f75e5f74daf47f5 SHA512 bba9ee25c7ff2168370ad1fd21a2286706f9db1efccdab84c55abd3bfa822ed10d23128388c69c964e81b2c51e1a95b3a3c7ca503a4564d0bdb3a993d8a9553d
DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0
diff --git a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch b/x11-misc/rofi/files/rofi-0.15.12-Werror.patch
deleted file mode 100644
index 89755ee4d0c..00000000000
--- a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@
- dnl Setup automake to be silent and in foreign mode.
- dnl We want xz distribution
- dnl ---------------------------------------------------------------------
--AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-xz])
-+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-xz])
- AM_SILENT_RULES([yes])
-
- dnl ---------------------------------------------------------------------
diff --git a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch b/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
deleted file mode 100644
index 82aa264ac29..00000000000
--- a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/subprojects/libnkutils/libnkutils-common.mk
-+++ b/subprojects/libnkutils/libnkutils-common.mk
-@@ -130,8 +130,8 @@
- %D%/src/gtk-settings.c \
- %D%/src/nkutils-gtk-settings.h
-
--_libnkutils_tests += \
-- %D%/tests/gtk-settings.test
-+#_libnkutils_tests += \
-+# %D%/tests/gtk-settings.test
- endif
-
- if NK_ENABLE_XDG_DE
diff --git a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch b/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
deleted file mode 100644
index d2ac9510d3c..00000000000
--- a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7e426c597539c1b6f33c34300b84d2074f94c9b6 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 4 Jan 2021 22:27:37 +0100
-Subject: [PATCH] configure.ac: Remove argument from AC_PROG_LEX
-
-autoconf-2.70 only accepts "yywrap" and "noyywrap" as arguments to
-AC_PROG_LEX. Calling it with no arguments will trigger the old behavior
-from autoconf-2.69.
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e0968b65..03dc1d2f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@ AH_BOTTOM([#include "gitconfig.h"])
- dnl ---------------------------------------------------------------------
- dnl Lex & Bison language parser.
- dnl ---------------------------------------------------------------------
--AC_PROG_LEX([flex])
-+AC_PROG_LEX
- AC_PROG_YACC
-
-
---
-2.30.0
-
diff --git a/x11-misc/rofi/rofi-1.6.1-r1.ebuild b/x11-misc/rofi/rofi-1.6.1-r1.ebuild
deleted file mode 100644
index 664fa0b6b46..00000000000
--- a/x11-misc/rofi/rofi-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/davatorium/rofi"
-SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+drun test +windowmode"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- dev-libs/glib:2
- gnome-base/librsvg:2
- media-libs/freetype
- virtual/jpeg
- x11-libs/cairo[X,xcb(+)]
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libxcb
- x11-libs/libxkbcommon[X]
- x11-libs/pango[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
- x11-misc/xkeyboard-config
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- test? ( >=dev-libs/check-0.11 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.15.12-Werror.patch
- "${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
- "${FILESDIR}"/${PN}-1.6.1-autoconf-2.70.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- tc-export CC
-
- local myeconfargs=(
- $(use_enable drun)
- $(use_enable test check)
- $(use_enable windowmode)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/x11-misc/rofi/rofi-1.7.3-r1.ebuild b/x11-misc/rofi/rofi-1.7.3-r1.ebuild
index f3c69c98bc6..803fb05e422 100644
--- a/x11-misc/rofi/rofi-1.7.3-r1.ebuild
+++ b/x11-misc/rofi/rofi-1.7.3-r1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
BDEPEND="
sys-devel/bison
- sys-devel/flex
+ >=sys-devel/flex-2.5.39
virtual/pkgconfig
"
RDEPEND="
@@ -45,6 +45,9 @@ src_prepare() {
}
src_configure() {
+ # Doesn't work with reflex, bug #887049
+ export LEX=flex
+
tc-export CC
local myeconfargs=(
diff --git a/x11-misc/rofi/rofi-1.7.5.ebuild b/x11-misc/rofi/rofi-1.7.5.ebuild
index 83071b30f34..c51049b5e10 100644
--- a/x11-misc/rofi/rofi-1.7.5.ebuild
+++ b/x11-misc/rofi/rofi-1.7.5.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
BDEPEND="
sys-devel/bison
- sys-devel/flex
+ >=sys-devel/flex-2.5.39
virtual/pkgconfig
"
RDEPEND="
@@ -45,6 +45,9 @@ src_prepare() {
}
src_configure() {
+ # Doesn't work with reflex, bug #887049
+ export LEX=flex
+
tc-export CC
local myeconfargs=(
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 66b4e07790b..88dba687d9d 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
BDEPEND="
sys-devel/bison
- sys-devel/flex
+ >=sys-devel/flex-2.5.39
virtual/pkgconfig
"
RDEPEND="
@@ -49,6 +49,9 @@ src_prepare() {
}
src_configure() {
+ # Doesn't work with reflex, bug #887049
+ export LEX=flex
+
tc-export CC
local myeconfargs=(
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index 4bd148f1a32..242aeade11f 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,4 +1,3 @@
-DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2
-DIST safeeyes-2.1.1.tar.gz 342791 BLAKE2B 0051267daacb1a8f5dcd6c88c0132d09483cc5181c59a19f34b956ea97672a44fbefc78b8b1ec2223428df159dab3074280afd3069618dc3b3257f3703e9078e SHA512 ad1f7810646010902b30effc899743c986a5bc56734f6ded0f22f0e428ec772b419aa11348d75c406f931b126737a809fabf9e029a4936976f889714629ac0b1
-DIST safeeyes-2.1.2.tar.gz 348431 BLAKE2B 03d51c435f62e00703aba4c1224a5a961b1a187d22e3470993a7bb4c2537dc27dfe784d4c53403905853fa79aaa1ef8e8bfb2333045a2e0d2ec48452483baa7f SHA512 2d67c198fbbf7d5813d900450c6608870f5ca692f533cbb68d36e7f34e197e2e9b52b3210b328318d5c64fc430092748ddd2dfa6e493a585fdada920f933a434
DIST safeeyes-2.1.3.tar.gz 354494 BLAKE2B 5f7977a8de280f5022cb226689c5b1d48f494932babd014b9ee8affcf9aaa0ef8dfe3ed18c33dbfa4ebaf1c5bfdbed4efc3b69c1ce3065e3ff3c82e83fa71723 SHA512 8a708b3e8f40f75659092a2effb0318b0fb7f47345e3f430f6b83ff2fc3c7de46b2dc881bf69902055bc8233f539946e60822e6ab7a6149f2c99441af1191f48
+DIST safeeyes-2.1.4.tar.gz 383245 BLAKE2B 307d58fd589c0a8b01f0c20c21f06a0f81b0d8a43f81e71e79a273a124e00df7cdd2c7c498a4918f6b56abc03fa7cb58db231124a96806a2fe60d6f9dab7f6c8 SHA512 547d00f18e06679464e225ab62f76c43e8efb733e945ae93c02c7cf55ab0bcf5fc078ffc41ad2842a324fff2513050cced404e8bd53d63b78ba7fb1f862c1ad3
+DIST safeeyes-2.1.5.tar.gz 284690 BLAKE2B deedf39bc0a69ee70a692061c96e0ea5ce6aeb09513d7469710d25b8660eaed854b3ee711de4702f839dbfb1f04aee84cb05ebc24d4567fc2b56c04e319f5c63 SHA512 0e4ed1d9f4473b45f6f5d4a74ba4817fca08199072fe937fd3b7ceed1ef543729c618e672198cf4dfeba8ed896b24779ca725f2f2c98bf1c9cdf1a8e9c147dc8
diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch b/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch
new file mode 100644
index 00000000000..e494dfc1a2c
--- /dev/null
+++ b/x11-misc/safeeyes/files/safeeyes-2.1.5-python-3.11.patch
@@ -0,0 +1,25 @@
+From 1fabfb9eddc2b67d174dffba0e46ecb4fb4dec71 Mon Sep 17 00:00:00 2001
+From: tibequadorian <tibequadorian@posteo.de>
+Date: Tue, 24 Jan 2023 18:39:49 +0100
+Subject: [PATCH] utility.py: Fix getargspec error with python 3.11
+
+---
+ safeeyes/utility.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/safeeyes/utility.py b/safeeyes/utility.py
+index bf2dede..7e08735 100644
+--- a/safeeyes/utility.py
++++ b/safeeyes/utility.py
+@@ -666,7 +666,7 @@ def has_method(module, method_name, no_of_args=0):
+ Check whether the given function is defined in the module or not.
+ """
+ if hasattr(module, method_name):
+- if len(inspect.getargspec(getattr(module, method_name)).args) == no_of_args:
++ if len(inspect.getfullargspec(getattr(module, method_name)).args) == no_of_args:
+ return True
+ return False
+
+--
+2.39.1
+
diff --git a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
index d32153bf1da..329df210ab2 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
inherit xdg distutils-r1
diff --git a/x11-misc/safeeyes/safeeyes-2.1.3.ebuild b/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild
index 9f1c4ee6589..a00135abf2f 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.3.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py
inherit xdg distutils-r1
@@ -14,14 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE=""
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
- >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
- "
-RDEPEND="${CDEPEND}
+RDEPEND="
dev-libs/libappindicator:3[introspection]
dev-python/Babel[${PYTHON_USEDEP}]
dev-python/croniter[${PYTHON_USEDEP}]
@@ -40,6 +36,11 @@ DOCS=(
README.md
)
+src_prepare() {
+ default
+ find . -type f -name \*.pyc -delete # bug #864765
+}
+
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
diff --git a/x11-misc/safeeyes/safeeyes-2.1.1.ebuild b/x11-misc/safeeyes/safeeyes-2.1.4.ebuild
index 3371d997dd1..2e6849d06d7 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py
inherit xdg distutils-r1
@@ -14,14 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE=""
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
- >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
- "
-RDEPEND="${CDEPEND}
+RDEPEND="
dev-libs/libappindicator:3[introspection]
dev-python/Babel[${PYTHON_USEDEP}]
dev-python/croniter[${PYTHON_USEDEP}]
diff --git a/x11-misc/safeeyes/safeeyes-2.0.9-r2.ebuild b/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild
index aa561a0edce..debfe192fcf 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.9-r2.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.5-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py
+DISTUTILS_USE_PEP517=setuptools
inherit xdg distutils-r1
@@ -14,16 +15,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE=""
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
- >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
- "
-RDEPEND="${CDEPEND}
- dev-libs/libappindicator:3[introspection]
+PATCHES=(
+ "${FILESDIR}"/${P}-python-3.11.patch
+)
+
+RDEPEND="
+ dev-libs/libayatana-appindicator
dev-python/Babel[${PYTHON_USEDEP}]
+ dev-python/croniter[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -35,10 +37,6 @@ RDEPEND="${CDEPEND}
x11-misc/xprintidle
"
-DOCS=(
- README.md
-)
-
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
diff --git a/x11-misc/safeeyes/safeeyes-2.1.2.ebuild b/x11-misc/safeeyes/safeeyes-2.1.5.ebuild
index 9f1c4ee6589..5bbf7b03b88 100644
--- a/x11-misc/safeeyes/safeeyes-2.1.2.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.1.5.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py
+DISTUTILS_USE_PEP517=setuptools
inherit xdg distutils-r1
@@ -14,14 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
IUSE=""
-CDEPEND="${PYTHON_DEPS}"
-DEPEND="${CDEPEND}
- >=dev-python/setuptools-38.6.0[${PYTHON_USEDEP}]
- "
-RDEPEND="${CDEPEND}
+RDEPEND="
dev-libs/libappindicator:3[introspection]
dev-python/Babel[${PYTHON_USEDEP}]
dev-python/croniter[${PYTHON_USEDEP}]
@@ -36,10 +33,6 @@ RDEPEND="${CDEPEND}
x11-misc/xprintidle
"
-DOCS=(
- README.md
-)
-
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 13b0d7db4f6..ee6abdde4c3 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,3 +1,2 @@
-DIST screengrab-2.2.0.tar.xz 136940 BLAKE2B 2263e0a887dc87ec708d96ca1cd9bce2aaa134fab9751341e1c96cd4a8b59132ca6a00719cf97dd218cc48ceb1abe5d943bad5fc80dd095c263fc84dabf3468a SHA512 14add5567abcbc03bd5e3e0e017129863ccd69aab83a1dfb3f8e6059af97fa4fff164e42fb3d0b4e8968d661b51b21def7d9c12ca68692a11288c99cdb16237d
-DIST screengrab-2.3.0.tar.xz 142160 BLAKE2B 2d375cc9dcaeb921530570efc91d29a178cc7c1f1099d0ee7d76622fb08ea77de3cc7adebb807fcf9f56818ccc6caec28a13a6da89c7f11d63d73da3539f3d60 SHA512 3898504bdf6d61d47236953e25693e9950dcc953abe85ba9b74484b55ce8af77b5f6a76f39906b2c4c0e8f4985ae6cb24679ec5e7d167b2d32638cdd7324f175
DIST screengrab-2.4.0.tar.xz 336400 BLAKE2B f60bc298dba5a2f4153804c3d37b263f1191c7d4bc3099def037dc7dcedaf5c59bf2b67d2649f279f870d030260272e906d8d23f7eb0b4e49fa340054824ae90 SHA512 88aec38b957256f93bebf13facf33135a5a80ed879325342d19d3b102e7103fd23f1f7b3c1702c4bff01898e2b3029b07e50e4fde0de9e206a74484e4aa395ee
+DIST screengrab-2.5.0.tar.xz 336852 BLAKE2B 7c59cadbac952cf982873f427bc9d6ff594b6e517b7dcda287f80dc51d272b17250d3cb78f264d09eb348bc0c8ce783b22e1ce5f67ec52004d4091f86866e84c SHA512 681adc0e9e26ad591aceb8002095e9117534ba20cc1086e7e2be5c6707d2b308c7bb9e4201563692891678b40b45f4a2e7db20008676af9ca513c34c00c0fc02
diff --git a/x11-misc/screengrab/screengrab-2.2.0.ebuild b/x11-misc/screengrab/screengrab-2.2.0.ebuild
deleted file mode 100644
index 3eeed6bffba..00000000000
--- a/x11-misc/screengrab/screengrab-2.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI Screenshot Utility"
-HOMEPAGE="https://lxqt.github.io/"
-SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE=""
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
- >=dev-libs/libqtxdg-3.7.0
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kwindowsystem:5[X]
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXfixes
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/x11-misc/screengrab/screengrab-2.3.0.ebuild b/x11-misc/screengrab/screengrab-2.5.0.ebuild
index fbf6fa3c229..7962f498a9d 100644
--- a/x11-misc/screengrab/screengrab-2.3.0.ebuild
+++ b/x11-misc/screengrab/screengrab-2.5.0.ebuild
@@ -11,12 +11,12 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
IUSE=""
BDEPEND="dev-qt/linguist-tools:5"
DEPEND="
- >=dev-libs/libqtxdg-3.7.0
+ >=dev-libs/libqtxdg-3.10.0
>=dev-qt/qtcore-5.15:5
>=dev-qt/qtdbus-5.15:5
>=dev-qt/qtgui-5.15:5
diff --git a/x11-misc/screenkey/Manifest b/x11-misc/screenkey/Manifest
index 3669c103c44..9fc437d3e30 100644
--- a/x11-misc/screenkey/Manifest
+++ b/x11-misc/screenkey/Manifest
@@ -1,3 +1,2 @@
-DIST screenkey-1.3.tar.gz 82732 BLAKE2B 53cf700f7211783c360552667d5bc77dfa467137476c4ae57944fe7a1e3e9da9b4488cade9c2f091b2be51cb393e063509ae858f6cca1b34ceadd3e158586e05 SHA512 16aceeb1e1a0ed5add06ed2bfd1eca04b9909537bbb979f531a98270c33af3d5e667534e73546a85c3f58ef837795a35891f00f8cf41e5ea10c45b7992334e96
-DIST screenkey-1.4.tar.gz 83784 BLAKE2B 4d4264ff88fdd57b27709091c5bd79dba304f94209465e4bbaf3d6ee965b2088fcbf3afc96e0c785fa954b5bb96fc26d4d79e9aeb2dd774daf519055fc301030 SHA512 f22afbdeb2c7d7884f97faec3601bfe13f65d33a2e284cccda6d6851d0838e4a4c6860c93abd4c11f21170fb970e6cb12b52cb0cd4cb1fb58cfcf44f0945ad2d
DIST screenkey-1.5.tar.gz 87449 BLAKE2B 1ca3a7d643c65e2a82ce51feb4de022ccb0bb35848c0bb63871343b499e4b7a677e7df379ad259c149ba4a93d98cc36a05d9fb58976cc96d20b3fe98b54301db SHA512 bc9457b17c9e2fea3cefc97546dfd89a019a527608ec79960d1a712c1f1bbc97cf37404a1d84ca1c4587ae4d52163e2de30797f75b9a4a1da45ac585b8b650cf
+DIST screenkey-1.5_p20230109.tar.bz2 77229 BLAKE2B 8b6d089bdecbbd0d9057ccad12d72321de5b9c6df60785398e15e9196b21fec2b88e27b2e068c53caf5c699ed7b7dcd3bacfbdf86d14b3c4c4a3b2125dfa66c7 SHA512 b6b5121c2b4f68cd8df409176e32019b0747da637c6baa7f45d6268c1605144d32cb099aa16a91748ae672d6386be2579af1bef167488bcdc5e1b452d39d2eee
diff --git a/x11-misc/screenkey/screenkey-1.3-r1.ebuild b/x11-misc/screenkey/screenkey-1.3-r1.ebuild
deleted file mode 100644
index e54264430a8..00000000000
--- a/x11-misc/screenkey/screenkey-1.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 xdg
-
-DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
-HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
-
-if [[ "${PV}" == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
-else
- SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
- S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-RESTRICT="test"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="appindicator"
-
-BDEPEND="
- dev-python/python-distutils-extra[${PYTHON_USEDEP}]
- sys-devel/gettext
-"
-RDEPEND="
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/pygobject[${PYTHON_USEDEP}]
- media-fonts/fontawesome
- x11-libs/gtk+:3[X,introspection]
- x11-misc/slop
- appindicator? ( dev-libs/libappindicator:3[introspection] )
-"
-
-src_prepare() {
- # Change the doc install path
- sed -i "s|share/doc/screenkey|share/doc/${PF}|g" setup.py || die
-
- default
-}
diff --git a/x11-misc/screenkey/screenkey-1.5-r2.ebuild b/x11-misc/screenkey/screenkey-1.5-r3.ebuild
index b06bc7524e7..83969fb16f7 100644
--- a/x11-misc/screenkey/screenkey-1.5-r2.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 xdg
@@ -16,7 +16,7 @@ if [[ "${PV}" == *9999* ]]; then
EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
else
SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
S="${WORKDIR}/${PN}-v${PV}"
fi
diff --git a/x11-misc/screenkey/screenkey-1.4-r1.ebuild b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
index 30bdb3afd52..907a2a7510f 100644
--- a/x11-misc/screenkey/screenkey-1.4-r1.ebuild
+++ b/x11-misc/screenkey/screenkey-1.5_p20230109.ebuild
@@ -1,41 +1,50 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 xdg
DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
else
- SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+ if [[ ${PV} == *_p20230109 ]] ; then
+ H=7bdba66574244061c6e1934c4f204d02d570f182
+ SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/${H}/${PN}-${H}.tar.bz2
+ -> ${P}.tar.bz2"
+ S="${WORKDIR}"/${PN}-${H}
+ else
+ SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+ -> ${P}.tar.bz2"
+ S="${WORKDIR}"/${PN}-v${PV}
+ fi
KEYWORDS="~amd64"
- S="${WORKDIR}/${PN}-v${PV}"
fi
-RESTRICT="test"
LICENSE="GPL-3+"
SLOT="0"
IUSE="appindicator"
+RESTRICT="test"
-BDEPEND="
- dev-python/Babel[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
-"
RDEPEND="
+ dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject[${PYTHON_USEDEP}]
media-fonts/fontawesome
x11-libs/gtk+:3[X,introspection]
x11-misc/slop
- appindicator? ( dev-libs/libappindicator:3[introspection] )
+ appindicator? ( dev-libs/libayatana-appindicator )
+"
+BDEPEND="
+ dev-python/Babel[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
"
src_prepare() {
diff --git a/x11-misc/screenkey/screenkey-9999.ebuild b/x11-misc/screenkey/screenkey-9999.ebuild
index b06bc7524e7..dcc40424412 100644
--- a/x11-misc/screenkey/screenkey-9999.ebuild
+++ b/x11-misc/screenkey/screenkey-9999.ebuild
@@ -1,34 +1,31 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 xdg
DESCRIPTION="A screencast tool to display your keys inspired by Screenflick"
HOMEPAGE="https://www.thregr.org/~wavexx/software/screenkey/"
-if [[ "${PV}" == *9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.com/screenkey/${PN}.git"
else
- SRC_URI="https://gitlab.com/screenkey/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://gitlab.com/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
+ -> ${P}.tar.bz2"
+ S="${WORKDIR}"/${PN}-v${PV}
KEYWORDS="~amd64"
- S="${WORKDIR}/${PN}-v${PV}"
fi
-RESTRICT="test"
LICENSE="GPL-3+"
SLOT="0"
IUSE="appindicator"
+RESTRICT="test"
-BDEPEND="
- dev-python/Babel[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
-"
RDEPEND="
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
@@ -36,7 +33,11 @@ RDEPEND="
media-fonts/fontawesome
x11-libs/gtk+:3[X,introspection]
x11-misc/slop
- appindicator? ( dev-libs/libappindicator:3[introspection] )
+ appindicator? ( dev-libs/libayatana-appindicator )
+"
+BDEPEND="
+ dev-python/Babel[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
"
src_prepare() {
diff --git a/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch b/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch
new file mode 100644
index 00000000000..70efa284803
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch
@@ -0,0 +1,28 @@
+From 9a440ba5917ff93c6a78726380c6267d91c13f19 Mon Sep 17 00:00:00 2001
+From: Alex <alex.shaw.as@gmail.com>
+Date: Mon, 30 Sep 2019 16:50:16 -0400
+Subject: [PATCH] Prevent duplicate session name.
+
+Several desktop sessions (e.g. KDE Plasma) already include the string " (Wayland)" in the session name. When this happens, the session name displayed to the user is "Plasma (Wayland) (Wayland)". This change makes it so that only "Plasma (Wayland)" will be displayed.
+
+(cherry picked from commit f9a0648ff3f841b68a07c139c3540b9e75bfd279)
+---
+ src/common/Session.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/Session.cpp b/src/common/Session.cpp
+index aa4dad3..923ecd4 100644
+--- a/src/common/Session.cpp
++++ b/src/common/Session.cpp
+@@ -169,7 +169,7 @@ namespace SDDM {
+
+ if (line.startsWith(QLatin1String("Name="))) {
+ if (type == WaylandSession)
+- m_displayName = QObject::tr("%1 (Wayland)").arg(line.mid(5));
++ m_displayName = QObject::tr("%1").arg(line.mid(5));
+ else
+ m_displayName = line.mid(5);
+ }
+--
+2.38.1
+
diff --git a/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch b/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch
new file mode 100644
index 00000000000..65e9b857335
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch
@@ -0,0 +1,33 @@
+From 5fe712d0e73c6263647bf306f40fbac94a52f4a6 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 24 Oct 2022 13:15:48 +0200
+Subject: disable automatic portal launching
+
+in Qt6 (and the KDE patch collection for Qt 5) genericunixservices will
+internally attempt to probe the portal tech early on in the app life
+cycle. this causes the protal system to launch app and then crash
+because we aren't actually providing a fully functional session. instead
+opt out of this altogether
+
+(cherry picked from commit fc24321541f6f65b7d1aac89cd82336ffd53e1a0)
+---
+ src/greeter/GreeterApp.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
+index 4e117a7..a491f4d 100644
+--- a/src/greeter/GreeterApp.cpp
++++ b/src/greeter/GreeterApp.cpp
+@@ -318,6 +318,9 @@ int main(int argc, char **argv)
+ QSurfaceFormat::setDefaultFormat(format);
+ }
+
++ // Qt internally may load the xdg portal system early on, prevent this, we do not have a functional session running.
++ qputenv("QT_NO_XDG_DESKTOP_PORTAL", "1");
++
+ QGuiApplication app(argc, argv);
+
+ QCommandLineParser parser;
+--
+2.38.1
+
diff --git a/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch b/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch
new file mode 100644
index 00000000000..ab2fc18cbcb
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch
@@ -0,0 +1,46 @@
+From 76c11653522453efcf86f6f2f53bca1a497ea350 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 28 Mar 2019 11:43:37 +0000
+Subject: Enable QSurfaceFormat::ResetNotification on new Qt
+
+This fixes graphical glitches on nvidia after VT switching.
+
+It's opt-in as it requires code paths to handle glGetError differently.
+The version comparison is because my early implementations missed a code
+path. This was fixed in 5.12.2, but we may as well play safe
+
+(cherry picked from commit cd4e1fa21e1ab7178fa5d2ef858f3271575fd315)
+---
+ src/greeter/GreeterApp.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
+index d47998e..4e117a7 100644
+--- a/src/greeter/GreeterApp.cpp
++++ b/src/greeter/GreeterApp.cpp
+@@ -40,6 +40,9 @@
+ #include <QDebug>
+ #include <QTimer>
+ #include <QTranslator>
++#include <QLibraryInfo>
++#include <QVersionNumber>
++#include <QSurfaceFormat>
+
+ #include <iostream>
+
+@@ -309,6 +312,12 @@ int main(int argc, char **argv)
+ qDebug() << "High-DPI autoscaling not Enabled";
+ }
+
++ if (QLibraryInfo::version() >= QVersionNumber(5, 13, 0)) {
++ auto format(QSurfaceFormat::defaultFormat());
++ format.setOption(QSurfaceFormat::ResetNotification);
++ QSurfaceFormat::setDefaultFormat(format);
++ }
++
+ QGuiApplication app(argc, argv);
+
+ QCommandLineParser parser;
+--
+2.38.1
+
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 4250b6ff295..86353a72d16 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -16,5 +16,6 @@
</longdescription>
<upstream>
<remote-id type="github">sddm/sddm</remote-id>
+ <remote-id type="cpe">cpe:/a:sddm_project:sddm</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
index c2cc2cb95d7..6394fe47a72 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
@@ -26,7 +26,7 @@ COMMON_DEPEND="
dev-qt/qtgui:5
dev-qt/qtnetwork:5
x11-base/xorg-server
- x11-libs/libxcb[xkb]
+ x11-libs/libxcb:=
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
!pam? ( virtual/libcrypt:= )
@@ -60,6 +60,9 @@ PATCHES=(
# upstream git develop branch:
"${FILESDIR}/${P}-qt-5.15.2.patch"
"${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104
+ "${FILESDIR}/${P}-nvidia-glitches-vt-switch.patch"
+ "${FILESDIR}/${P}-drop-wayland-suffix.patch"
+ "${FILESDIR}/${P}-fix-qt-5.15.7.patch" # KDE-bug 458865
)
pkg_setup() {
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 238e7114e46..ab38e67eb73 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -1,2 +1 @@
DIST shutter-0.99.2.tar.gz 1733886 BLAKE2B 19596b5385a11f179c9fbbf81a97f2a5d9661d52d14f33be72595c26c096548095aa6cdbbc4932413f0a3103b30a78e2e870d2e7e904fb9cf0fd17ee43ad45fb SHA512 5fcb094f0e6f732da3648e58ef62aa1e5537132ffb0bff80972e1891f58fe5e63ec63bc7bec63e84268c095e3cd43d60d358be61e2d050dfcc49ffb042d34cfb
-DIST shutter-0.99.tar.gz 1734356 BLAKE2B c261d7792a2a7508fb8e73b968e1e07edbea0338b857132674caee5ec1bb7a3d58eb2e35645c581af652027007a27df6120b035218c41d8671bc53293b6548e7 SHA512 335c85730f49978d4b69ee2d5bbaa5d660d652d386a70618fdeb46c639bd209cee99743b44a8ef1019404f52328692de91bfbe47b14bea202efd089f80d36f82
diff --git a/x11-misc/shutter/shutter-0.99.ebuild b/x11-misc/shutter/shutter-0.99.ebuild
deleted file mode 100644
index b1392c23fef..00000000000
--- a/x11-misc/shutter/shutter-0.99.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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]
-"
-BDEPEND="sys-devel/gettext"
-
-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 +x {} + \
- || die "failed to make plugins executables"
- find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
- -name "*.pm" -exec chmod +x {} + || 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/slock/Manifest b/x11-misc/slock/Manifest
index 9f3c59274d6..4de919f78f4 100644
--- a/x11-misc/slock/Manifest
+++ b/x11-misc/slock/Manifest
@@ -1 +1,2 @@
DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f
+DIST slock-1.5.tar.gz 6898 BLAKE2B f3435311b24c20fef656589f468b4cd6bbed30568459cb1d525b7dd5b57e5759ee287787d7506ad6cb922fd092bad504f38ab8c57b41deebec4f6aa554269a41 SHA512 2402b1e49f5dbe06cca2f3a31efedce6359413b240f2b98c57147483591a873c3c5457dbf6707485167002ff6d7ee0e9005d9fa506a51bf71337624e8728bb43
diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild
new file mode 100644
index 00000000000..34bb4c6a6a2
--- /dev/null
+++ b/x11-misc/slock/slock-1.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps savedconfig toolchain-funcs
+
+DESCRIPTION="simple X display locker"
+HOMEPAGE="https://tools.suckless.org/slock"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+
+RDEPEND="
+ virtual/libcrypt:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/slock-1.4-fix-link-paths.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+ -e '/^CC/d' \
+ -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+ config.mk || die
+ sed -i \
+ -e 's|@${CC}|$(CC)|g' \
+ Makefile || die
+
+ restore_config config.h
+
+ tc-export CC
+}
+
+src_compile() {
+ emake slock
+}
+
+src_install() {
+ dobin slock
+ save_config config.h
+}
+
+pkg_postinst() {
+ # cap_dac_read_search used to be enough for shadow access
+ # but now slock wants to write to /proc/self/oom_score_adj
+ # and for that it needs:
+ fcaps \
+ cap_dac_override,cap_setgid,cap_setuid,cap_sys_resource \
+ /usr/bin/slock
+
+ savedconfig_pkg_postinst
+}
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 2f8e6a85d95..77bc7b18b21 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,2 +1,3 @@
DIST spnavcfg-0.3.1.tar.gz 215460 BLAKE2B f2bd35022399ec085d5c8b08c7514fdac8e974b33e9923a79446fa9552827d5986abf136fdb95ed31d7dbec419eb34ce13039955c6255cff971ffedcd3cc8a02 SHA512 b5e0ef2036eebc971298d95e8a91bd89ade956933919a4a5dc062fd977ff159bba392b0092ac36142fb317a9758c26319b07680b473f9957eda0163146be5408
DIST spnavcfg-1.0.tar.gz 496695 BLAKE2B 59d79cc1707881ba50e809c73a41cb94dbfd15e5e184114190efa2394fe4b53f25960a828611007a200687a3e9827bc4df30d3d06ca3764b23573a1f51fb2974 SHA512 271d1d66fdfb4aff9faa521c51c776dbccf77320b0783a5dbdcc4a28d4190ef3ba6c3d277d706dafc35e2e6ceed1d244d346d4a91cf8e1f5ba3141c24d065ea8
+DIST spnavcfg-1.1.tar.gz 497896 BLAKE2B 874489904970182f6f56d0a7bd63cc3847f101729b2c6866677fc0c17fab4bad42132ac0f93a39ef9a35654acde8ef6cd42a462756dd7f0c3914424a5fc54dd2 SHA512 4d5c9dc37d1906dbc99535a758554d9419e20ad773adcf2d2062795a8e194a88b68c360341a08e3ac236df08a2e389c4475f341b5bac662a4526dada0bb891a6
diff --git a/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch b/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch
new file mode 100644
index 00000000000..0476d7a1015
--- /dev/null
+++ b/x11-misc/spnavcfg/files/spnavcfg-1.1-makefile.patch
@@ -0,0 +1,23 @@
+From fd9aa10fb8e19a257398757943b3d8e79906e583 Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sun, 8 Jan 2023 21:49:12 +0200
+Subject: [PATCH] Make sure there are no duplicate object files. Closes issue
+ #29
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b760f4d..f66ba22 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -2,7 +2,7 @@ csrc = $(wildcard src/*.c)
+ ccsrc = $(wildcard src/*.cc)
+ mochdr = src/ui.h
+ mocsrc = $(mochdr:.h=.moc.cc)
+-obj = $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o) res.cc
++obj = $(sort $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o)) res.cc
+ dep = $(csrc:.c=.d) $(ccsrc:.cc=.d)
+ bin = spnavcfg
+
diff --git a/x11-misc/spnavcfg/spnavcfg-1.1.ebuild b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild
new file mode 100644
index 00000000000..6d9bd749d26
--- /dev/null
+++ b/x11-misc/spnavcfg/spnavcfg-1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Qt-based GUI to configure a space navigator device"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/spacenav/spacenavd%20config%20gui/${PN}%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/libspnav-1[X]
+ dev-qt/qtcore
+ dev-qt/qtgui
+ dev-qt/qtwidgets
+ x11-libs/libX11"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+ >=app-misc/spacenavd-1[X]"
+
+src_configure() {
+ # Note: Makefile uses $(add_cflags) inside $(CXXFLAGS)
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ econf --disable-debug --disable-opt
+}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+)
+
+src_compile() {
+ local args=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ MOC="$(qt5_get_bindir)/moc"
+ RCC="$(qt5_get_bindir)/rcc"
+ UIC="$(qt5_get_bindir)/uic"
+ libpath="-L/usr/$(get_libdir)"
+ )
+ emake "${args[@]}"
+}
diff --git a/x11-misc/sunflower/sunflower-0.5-r1.ebuild b/x11-misc/sunflower/sunflower-0.5-r1.ebuild
index e019671e4ce..64f224e63fa 100644
--- a/x11-misc/sunflower/sunflower-0.5-r1.ebuild
+++ b/x11-misc/sunflower/sunflower-0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1 xdg
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 39e0ea97036..4095172010b 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,3 +1,2 @@
-DIST tint2-v16.7.tar.gz 551197 BLAKE2B ef1c5b3dea255e12f6dcea80a29f016e32e48f729f4be3e1fd7421c6fbdbbacde70f42f3052547dca8421b8343d4b41fbf2ea52b07aa4471974f9f0cc6eea7a7 SHA512 a9bb0b55536e09f70b1d14a5748635f5c5ec1b7b22517453a963b240ab593aae43c56e5cbc7b79d5f19103f0e13200faceb2d25afd66c3d941580424ae6d9d31
-DIST tint2-v17.0.1.tar.gz 553523 BLAKE2B 112186c95561af22d67707a0d4d17462c3d32bd4c97165066a1c491c628359eabba3563b271a46e980dd65abaf42a4b59dc36c42ee3cdb2b6d6cde616e0acfe5 SHA512 cc887d1d9eb8b69135ec6f1e591c38b374605f36fa7609fc580de6a81f33ec98c74af0ba2ab326f1ae25d52b75d2056a48cc2a76d78da1fd27dfdf7818fe429b
DIST tint2-v17.0.2.tar.gz 553734 BLAKE2B 73cd89757963f1a3c3460a2e8e61891e77eb12b9809590dbbbc00df00d03e82d33d6175c7e3ff4623a3390e35fe1530263915b4574dedfd46d9401fbc90d769f SHA512 9bfdf9ba33183ed60b95f73e58d9c1c22af83e9973a0e07ff2825d66d19c7103364426753a07eaecd4dbca278dfc6e22737bc6ce38d9b577b65f672f146e7aa2
+DIST tint2-v17.1.3.tar.gz 573472 BLAKE2B 459833b0bde126bd99f7aa016df81ca81866d641ff8b55c54d397c7eef7f80b2bcb219d56dfdb42e10d21f09856d2d97fafe712c1b9f6002f6f0350c4dbc3685 SHA512 dfdfd011d35130955f243bf390f014fcc691448f284d635a9238616595155a3cd815aa229fd570ae58e94c58b439ae1545f7e13090e174117c50ca48679d0135
diff --git a/x11-misc/tint2/metadata.xml b/x11-misc/tint2/metadata.xml
index ac98df0a369..ede6d14f0e5 100644
--- a/x11-misc/tint2/metadata.xml
+++ b/x11-misc/tint2/metadata.xml
@@ -7,6 +7,7 @@
<use>
<flag name="battery">Enable battery status plugin</flag>
<flag name="tint2conf">Build/Install tint2conf as well</flag>
+ <flag name="sanitize">Enable ASAN</flag>
</use>
<longdescription lang="en">tint2 is a simple panel/taskbar intentionally made for
<pkg>x11-wm/openbox</pkg>3, but should also work with other window managers.
diff --git a/x11-misc/tint2/tint2-16.7.ebuild b/x11-misc/tint2/tint2-16.7.ebuild
deleted file mode 100644
index 3195e3b1420..00000000000
--- a/x11-misc/tint2/tint2-16.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Lightweight panel/taskbar for Linux"
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-S=${WORKDIR}/${PN}-v${PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc x86"
-IUSE="battery startup-notification svg tint2conf"
-
-DEPEND="
- dev-libs/glib:2
- svg? ( gnome-base/librsvg:2 )
- >=media-libs/imlib2-1.4.2[X,png]
- x11-libs/cairo[X]
- x11-libs/pango
- tint2conf? ( x11-libs/gtk+:2 )
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.3
- x11-libs/libXrender
- startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_BATTERY="$(usex battery)"
- -DENABLE_TINT2CONF="$(usex tint2conf)"
- -DENABLE_SN="$(usex startup-notification)"
- -DENABLE_RSVG="$(usex svg)"
- )
- cmake_src_configure
-}
diff --git a/x11-misc/tint2/tint2-17.0.1-r1.ebuild b/x11-misc/tint2/tint2-17.0.1-r1.ebuild
deleted file mode 100644
index 2486a789a67..00000000000
--- a/x11-misc/tint2/tint2-17.0.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Lightweight panel/taskbar for Linux"
-HOMEPAGE="https://gitlab.com/o9000/tint2"
-SRC_URI="https://gitlab.com/o9000/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-S=${WORKDIR}/${PN}-v${PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="battery startup-notification svg tint2conf"
-
-DEPEND="
- dev-libs/glib:2
- svg? ( gnome-base/librsvg:2 )
- >=media-libs/imlib2-1.4.2[X,png]
- x11-libs/cairo[X]
- x11-libs/pango
- tint2conf? ( x11-libs/gtk+:3 )
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.3
- x11-libs/libXrender
- startup-notification? ( x11-libs/startup-notification )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_BATTERY="$(usex battery)"
- -DENABLE_TINT2CONF="$(usex tint2conf)"
- -DENABLE_SN="$(usex startup-notification)"
- -DENABLE_RSVG="$(usex svg)"
- )
- cmake_src_configure
-}
diff --git a/x11-misc/tint2/tint2-17.0.2.ebuild b/x11-misc/tint2/tint2-17.0.2.ebuild
index 2486a789a67..bf1274bc041 100644
--- a/x11-misc/tint2/tint2-17.0.2.ebuild
+++ b/x11-misc/tint2/tint2-17.0.2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-v${PV}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
IUSE="battery startup-notification svg tint2conf"
DEPEND="
diff --git a/x11-misc/tint2/tint2-17.1.3.ebuild b/x11-misc/tint2/tint2-17.1.3.ebuild
new file mode 100644
index 00000000000..0c3ec79c99a
--- /dev/null
+++ b/x11-misc/tint2/tint2-17.1.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Lightweight panel/taskbar for Linux"
+HOMEPAGE="https://gitlab.com/nick87720z/tint2"
+SRC_URI="https://gitlab.com/nick87720z/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S=${WORKDIR}/${PN}-v${PV}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="battery debug startup-notification sanitize svg tint2conf"
+
+DEPEND="
+ dev-libs/glib:2
+ svg? ( gnome-base/librsvg:2 )
+ >=media-libs/imlib2-1.4.2[X,png]
+ x11-libs/cairo[X]
+ x11-libs/pango
+ tint2conf? ( x11-libs/gtk+:3 )
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXinerama
+ >=x11-libs/libXrandr-1.3
+ x11-libs/libXrender
+ startup-notification? ( x11-libs/startup-notification )
+ debug? (
+ sys-libs/libunwind
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cmake_src_prepare
+ xdg_environment_reset
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+ -DENABLE_ASAN=$(usex sanitize)
+ -DENABLE_BATTERY=$(usex battery)
+ -DENABLE_TINT2CONF=$(usex tint2conf)
+ -DENABLE_SN=$(usex startup-notification)
+ -DENABLE_RSVG=$(usex svg)
+ -DENABLE_BACKTRACE=$(usex debug)
+ -DENABLE_BACKTRACE_ON_SIGNAL=$(usex debug)
+ -DENABLE_TRACING=$(usex debug)
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch
new file mode 100644
index 00000000000..c0cc5a562da
--- /dev/null
+++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-avoid-prestripping-of-files.patch
@@ -0,0 +1,24 @@
+Date: Sat, 3 Dec 2022 17:24:58 +0100
+Subject: [PATCH] avoid prestripping of files
+
+Bug: https://bugs.gentoo.org/837260
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/Makefile
++++ b/Makefile
+@@ -20,9 +20,9 @@ endif
+ TARGET = trayer
+ $(TARGET): $(OBJ)
+ $(CC) $(LDFLAGS) $(OBJ) -o $@ $(LIBS)
+-ifeq (,$(DEVEL))
+- strip $@
+-endif
++# ifeq (,$(DEVEL))
++# strip $@
++# endif
+
+ all: $(TARGET)
+
+--
+2.38.1
+
diff --git a/x11-misc/trayer-srg/metadata.xml b/x11-misc/trayer-srg/metadata.xml
index 652c2be274b..a1757eadc52 100644
--- a/x11-misc/trayer-srg/metadata.xml
+++ b/x11-misc/trayer-srg/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">sargon/trayer-srg</remote-id>
- </upstream>
+ <maintainer type="person" proxied="yes">
+ <email>pascal.jaeger@leimstift.de</email>
+ <name>Pascal Jäger</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">sargon/trayer-srg</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild
new file mode 100644
index 00000000000..66b135e9ea5
--- /dev/null
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
+HOMEPAGE="https://github.com/sargon/trayer-srg"
+SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-trayer-${PV}
+
+LICENSE="MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ x11-libs/gdk-pixbuf:2
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-avoid-prestripping-of-files.patch" )
+
+src_configure() {
+ ./configure --prefix="${EPREFIX}" || die
+}
+
+src_compile() {
+ emake TARGET=${PN} CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin ${PN}
+ einstalldocs
+}
diff --git a/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
new file mode 100644
index 00000000000..e2d75064121
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
@@ -0,0 +1,19 @@
+Clang16 will not allow incompatible pointer types by default.
+
+Bug: https://bugs.gentoo.org/881081
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/plugin.h
++++ b/plugin.h
+@@ -9,6 +9,8 @@
+ #include <stdio.h>
+ #include "panel.h"
+
++struct _plugin;
++
+ typedef struct {
+ /* common */
+ char *fname;
+--
+2.38.1
+
diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild
new file mode 100644
index 00000000000..051d15d9245
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
+SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+ "${FILESDIR}"/${P}-dont-include-libXmu.patch
+ "${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-fix-incompatible-pointer-types.patch
+)
+
+src_compile() {
+ tc-export PKG_CONFIG
+
+ emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray
+ emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+}
+
+src_install() {
+ dobin trayer
+ doman "${FILESDIR}"/trayer.1
+ einstalldocs
+}
diff --git a/x11-misc/unclutter/Manifest b/x11-misc/unclutter/Manifest
deleted file mode 100644
index 197c6f0ac6c..00000000000
--- a/x11-misc/unclutter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST unclutter-8.tar.Z 12344 BLAKE2B 10090ec2f3772c17d00cbcb27f416fb528b75641b7d57eeb36ab7e19af2510ebc5901a0394c0ee590a38afb8bf64d4b2b2ed069b0b1a44edcb9b37701f89c9b5 SHA512 9a64e6eceae685cf34b1ea85818735f8f85514ba1eea262476653886d74e469cfd6b9a39edbd098b138a5c89e6b97b42cf251bee59272c76cbeba190979744b4
diff --git a/x11-misc/unclutter/files/unclutter-8-FocusOut.patch b/x11-misc/unclutter/files/unclutter-8-FocusOut.patch
deleted file mode 100644
index d26ef8e6a65..00000000000
--- a/x11-misc/unclutter/files/unclutter-8-FocusOut.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fixes blinking pointer and 100% CPU usage with GTK applications
-Author: Tao Nelson <taobert@gmail.com>
-Debian-Bug: 266118
-
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -399,7 +399,9 @@
- do{
- XNextEvent(display,&event);
- }while(event.type!=LeaveNotify &&
-- event.type!=FocusOut &&
-+ /* Some gtk applications seem not to like this:
-+ * event.type!=FocusOut &&
-+ */
- event.type!=UnmapNotify &&
- event.type!=ConfigureNotify &&
- event.type!=CirculateNotify &&
diff --git a/x11-misc/unclutter/files/unclutter-8-include.patch b/x11-misc/unclutter/files/unclutter-8-include.patch
deleted file mode 100644
index 688fa129c56..00000000000
--- a/x11-misc/unclutter/files/unclutter-8-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/unclutter.c
-+++ b/unclutter.c
-@@ -24,6 +24,7 @@
- #include <X11/Xutil.h>
- #include <X11/Xproto.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include "vroot.h"
-
- char *progname;
diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild
deleted file mode 100644
index eb64cdd7a8d..00000000000
--- a/x11-misc/unclutter/unclutter-8-r4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Hides mouse pointer while not in use"
-HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README"
-SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
- "${FILESDIR}"/${P}-include.patch
- "${FILESDIR}"/${P}-FocusOut.patch
-)
-
-src_compile() {
- emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
- dobin unclutter
- newman unclutter.man unclutter.1x
- einstalldocs
-}
diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest
index c0e7fd8f990..464ddb74101 100644
--- a/x11-misc/urxvt-tabbedex/Manifest
+++ b/x11-misc/urxvt-tabbedex/Manifest
@@ -1,2 +1 @@
-DIST urxvt-tabbedex-21.47.tar.gz 33557 BLAKE2B c9d32cf466df00f5cc0c86b939bc8b87bab6edc6b74ada6c6576176d9becdc842b6af7a8d38a200906a4b6614788dbfd1658abb6b2eaee787426466ff9b8b330 SHA512 6459f04ad0e2524a356e0056d9bc08bfe04e3ba6c5c00f3aafa76ad1df3ddb8161c8feee56370cf3e1f4fe47c61b63635cc91f3222f5a8f1161574237c870e7d
DIST urxvt-tabbedex-22.32.tar.gz 34582 BLAKE2B 58b133f8bc950caacd47a7ec2286a8e2f1b1086d074c21be8204a137d618454c4821da054df0bddfae82128464f5c32a6ffb417f24a91879a1aa2645e1e54034 SHA512 5322c05c5d1fc37d213eac8673d8af5b2f3c6bd378d91097fcd2099e59bf61b2a78697fdee8e394bc3943c7c0d5c6fafbe5efd240da8ef1507681031293711d2
diff --git a/x11-misc/urxvt-tabbedex/metadata.xml b/x11-misc/urxvt-tabbedex/metadata.xml
index 70c16c0f82d..bfb18a0dbbf 100644
--- a/x11-misc/urxvt-tabbedex/metadata.xml
+++ b/x11-misc/urxvt-tabbedex/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <stabilize-allarches/>
+ <!-- maintainer-needed -->
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="github">mina86/urxvt-tabbedex</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild
deleted file mode 100644
index 810342261df..00000000000
--- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="An extended version of rxvt-unicode's tabbed perl extension"
-HOMEPAGE="https://github.com/mina86/urxvt-tabbedex"
-
-MY_PN=${PN/urxvt-/}
-SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-terms/rxvt-unicode[perl]"
-
-DOCS=( AUTHORS README.md command-runner.sample )
-
-src_compile() { :; }
-
-src_install() {
- einstalldocs
-
- insinto /usr/$(get_libdir)/urxvt/perl/
- doins ${MY_PN}
-
- insinto /usr/$(get_libdir)/urxvt/
- newins pgid-cd.pl tabbedex-pgid-cd
-}
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild
index 7d280b9d961..810342261df 100644
--- a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild
+++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mina86/urxvt-tabbedex/archive/v${PV}.tar.gz -> ${P}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="x11-terms/rxvt-unicode[perl]"
diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml
index e17a5bccb78..926332c2bb6 100644
--- a/x11-misc/util-macros/metadata.xml
+++ b/x11-misc/util-macros/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/util/macros</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 0f7eeed3910..6ecc4d6e9f3 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1 +1 @@
-DIST vdpauinfo-1.5.tar.gz 12246 BLAKE2B 5673eb6d00e501234cab3434ee06ef428495f86cf18304eed628e41dd0b17f8fe25aff8ef3bb896f4f70eefe2121446eae740c638b48b3ae1bc3547de4cb3102 SHA512 f3d359242443de919803ae0b8d89809c71e94d59d8ee9994f8f315036b829ad24030b75d953346989c1d0ddf436107041491e299c3212b013ad1d2b3c0571e59
+DIST vdpauinfo-1.5.tar.bz2 11851 BLAKE2B bb4ee88083fbdf718e3c0e427e6a9c0d5b56148feaf6fa9c7dbb07823f19df44eb7bd08c031d3a40e7929e6fd8fa5c1665dece41758c806cb7ab7c853b7fb3d2 SHA512 a41fd78983dbe5833142535a0860641523ca06e12f5fdf0ed25b6e5b3de82760a8fd8f72a489a596e4453905f614a62992c484d5b53220613827455cd78cfb31
diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml
index 06d84e396dc..d9f02a54825 100644
--- a/x11-misc/vdpauinfo/metadata.xml
+++ b/x11-misc/vdpauinfo/metadata.xml
@@ -5,4 +5,7 @@
<email>ionen@gentoo.org</email>
<name>Ionen Wolkens</name>
</maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">vdpau/vdpauinfo</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
index 1094701a0a2..0a5e0bfd4cc 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic
DESCRIPTION="Displays info about your card's VDPAU support"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/"
-SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 017d98d4d09..d9eec5b6ca9 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,2 @@
DIST VirtualGL-3.0.1.tar.gz 1217488 BLAKE2B 7ed73406361a5032806a6d9196328b48e23caf4dea668f6cbbf2ebcee3a0e76925141a826072f3b317327c71773683df65d5ecb16ffd92a1c5ddb088a63a3f6f SHA512 d953b9c31ec3608a05da0069d83e7115a42e2c98bf169dcf97bf2d271cf7a5673e32d66247f0184aa40741597ca0732edb5f7992a82c5bc48bac25f1cb1889ef
-DIST VirtualGL-3.0.tar.gz 1244024 BLAKE2B f540a90cd84efa0bee5ad124cb2ded8c1b863be8b719581c5daf67afcec7ef5ef2c78720962a4d3159de91e9cba068cea18a278a3c4f7eb65c98b4f13792044c SHA512 9d2f56d44dba936f653ecf0350c581298c4c51d6deb114570df32c044991a61313d59fb140517864e760bc6f7fd93bd27ffd35e2ff8a024243472a822d5cfd98
+DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37
diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
index 8cb6671d67d..8cb6671d67d 100644
--- a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild
diff --git a/x11-misc/vnc2swf/Manifest b/x11-misc/vnc2swf/Manifest
deleted file mode 100644
index 837abe1a6c2..00000000000
--- a/x11-misc/vnc2swf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vnc2swf-0.5.0.tar.gz 438058 BLAKE2B bb0effab90934746451efbe23610b3534de31ca1f5f8331dfc1f907b9733f69e78d960bd8d27cc6d75cb0ef688045b019b9b984dcd0e6207819e0590b35fa183 SHA512 f1551015eaafb7810b5d6367b73605f97bc5c0d4d3449dfe1a98af90f743133c0534c8988ee72ce2fc8599926a5f3ed5a785bf18788522b4a7c3cb8bc0529913
diff --git a/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch b/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch
deleted file mode 100644
index 4c03bb7e5c1..00000000000
--- a/x11-misc/vnc2swf/files/vnc2swf-0.5.0-respect-AR.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -12,6 +12,9 @@
- AC_PROG_MAKE_SET
- AC_LANG_CPLUSPLUS
-
-+AC_ARG_VAR([AR], [the archiver to use])
-+AC_CHECK_TOOL([AR], [ar])
-+
- case "`(uname -sr) 2>/dev/null`" in
- "SunOS 5"*)
- SOLARIS=yes
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -95,7 +95,7 @@
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@
- RANLIB = @RANLIB@
--AR = ar cq
-+AR = @AR@ cq
-
- prefix = /usr/X11R6
- exec_prefix = $(prefix)
---- a/rdr/Makefile.in
-+++ b/rdr/Makefile.in
-@@ -37,7 +37,7 @@
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@
- RANLIB = @RANLIB@
--AR = ar cq
-+AR = @AR@ cq
-
- .SUFFIXES:
- .SUFFIXES: .cxx .c .o
---- a/rfb/Makefile.in
-+++ b/rfb/Makefile.in
-@@ -36,7 +36,7 @@
- LIBS = @LIBS@
- LDFLAGS = @LDFLAGS@
- RANLIB = @RANLIB@
--AR = ar cq
-+AR = @AR@ cq
-
- .SUFFIXES:
- .SUFFIXES: .cxx .c .o
diff --git a/x11-misc/vnc2swf/metadata.xml b/x11-misc/vnc2swf/metadata.xml
deleted file mode 100644
index 4c6374289b6..00000000000
--- a/x11-misc/vnc2swf/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
- </maintainer>
- <longdescription>
- Vnc2swf is a cross-platform screen recording tool for ShockWave Flash (swf)
- format. Vnc2swf comes with two different implementations, a Python one
- (pyvnc2swf) and C one (vnc2swf).
- </longdescription>
- <use>
- <flag name="x11vnc">Install script that depends on x11vnc</flag>
- </use>
-</pkgmetadata>
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
deleted file mode 100644
index a589a99435c..00000000000
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for recording Flash SWF movies from VNC sessions"
-HOMEPAGE="https://www.unixuser.org/~euske/vnc2swf/"
-SRC_URI="https://www.unixuser.org/~euske/vnc2swf/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="x11vnc"
-
-RDEPEND="
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- x11vnc? ( x11-misc/x11vnc )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}"/${P}-respect-AR.patch # bug 726264
-)
-
-src_prepare() {
- default
- sed -i -e "s:docs:html:" README || die
- sed -i -e "s:-mouse ::" -e "s:./vnc2swf:vnc2swf:" recordwin.sh || die
-
- mv configure.{in,ac} || die
- eautoconf
-}
-
-src_install() {
- dobin vnc2swf
- if use x11vnc; then
- # this USE flag is needed because recordwin
- # only works on x11vnc
- newbin recordwin.sh recordwin
- fi
- insinto /etc/X11/app-defaults
- newins Vnc2Swf.ad Vnc2Swf
- dodoc README*
-
- docinto html
- dodoc docs/*.{html,swf}
-}
diff --git a/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
index 03384930c47..610ab7161a8 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r2.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+inherit flag-o-matic
+
DESCRIPTION="Control a remote computer running VNC from X"
HOMEPAGE="https://fredrik.hubbe.net/x2vnc.html"
SRC_URI="https://fredrik.hubbe.net/x2vnc/${P}.tar.gz"
@@ -31,6 +33,12 @@ PATCHES=(
"${FILESDIR}"/${P}-clang16.patch
)
+src_configure() {
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
+ default
+}
+
src_install() {
dodir /usr/share /usr/bin
emake DESTDIR="${D}" install
diff --git a/x11-misc/x2x/x2x-1.30-r1.ebuild b/x11-misc/x2x/x2x-1.30-r1.ebuild
index 505f19649f0..202c42f4beb 100644
--- a/x11-misc/x2x/x2x-1.30-r1.ebuild
+++ b/x11-misc/x2x/x2x-1.30-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="A utility to connect the mouse and keyboard to another X"
HOMEPAGE="https://github.com/dottedmag/x2x"
@@ -31,7 +31,10 @@ DOCS=( README AUTHORS INSTALL ChangeLog ChangeLog.old )
src_prepare() {
default
+
eautoreconf
+
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
}
src_compile() {
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
index f16ae2304fc..cfa060648fe 100644
--- a/x11-misc/xaos/metadata.xml
+++ b/x11-misc/xaos/metadata.xml
@@ -12,7 +12,7 @@
provided for both the points inside and outside the selected set. XaoS
supports switching between Julia and Mandelbrot fractal types and
on-the-fly plane switching.
-</longdescription>
+ </longdescription>
<upstream>
<remote-id type="sourceforge">xaos</remote-id>
</upstream>
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
index 460d865a6a0..d9e0581b39b 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
MY_PV=${PV/_rc/pr}
@@ -36,6 +36,8 @@ PATCHES=(
)
src_configure() {
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
}
diff --git a/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch
new file mode 100644
index 00000000000..8ee0b80ecb3
--- /dev/null
+++ b/x11-misc/xbattbar/files/xbattbar-1.4.9-implicit-int.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/875059
+--- a/xbattbar.c
++++ b/xbattbar.c
+@@ -234,3 +234,3 @@
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
diff --git a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
index 660160d4007..ff02fcb15ec 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic toolchain-funcs
@@ -9,7 +9,7 @@ DESCRIPTION="Advanced Power Management battery status display for X"
HOMEPAGE="https://packages.qa.debian.org/x/xbattbar.html"
SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
@@ -24,14 +24,13 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.5-Makefile.patch
"${FILESDIR}"/${PN}-1.4.8-const.patch
+ "${FILESDIR}"/${PN}-1.4.9-implicit-int.patch
)
src_prepare() {
default
- sed -i \
- -e "s:usr/lib:usr/$(get_libdir):" \
- xbattbar.c || die
+ sed -i "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" xbattbar.c || die
}
src_configure() {
@@ -40,6 +39,6 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
- dodoc README
+ emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
+ einstalldocs
}
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r3.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r3.ebuild
index e400aa3e3cd..77be8a1f274 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r3.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r3.ebuild
@@ -42,6 +42,7 @@ src_prepare() {
src_compile() {
tc-export CC
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
if use motif; then
append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xmu xt || die)
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 6c1a8d0c552..de004756c80 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
x11-libs/libX11
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 05dc7b0a594..2aba4b8c52e 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1 +1 @@
-DIST xcompmgr-1.1.8.tar.bz2 138806 BLAKE2B 85a7cd04c97c3594ab9acf7888aa0024b60027654dc8fa609c8f2fb801b5cd58105aa50c2afe9c322a02657eeea6e57da3f35720ac63c191a81c62fbf9ee4468 SHA512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d
+DIST xcompmgr-1.1.9.tar.xz 132676 BLAKE2B ece3717d582df62dcaaabb347d07ffda373f9660a74688b9637ea824eb9ac32003bddf323d9b1478f3abdf51b68005abb4c024720a75689d1ed70b45a8e026c2 SHA512 699117492af7fd84b36d317dcbf422d5ec86a7f21e29370caa737cd940d8ff866a5c8704ba2e7bd17a64e085d77fd23b628263d619813dead85cd669ff5b860e
diff --git a/x11-misc/xcompmgr/metadata.xml b/x11-misc/xcompmgr/metadata.xml
index e17a5bccb78..f399c98ad45 100644
--- a/x11-misc/xcompmgr/metadata.xml
+++ b/x11-misc/xcompmgr/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/app/xcompmgr</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild
index 7f73b708e97..81c0ec91dde 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
XORG_MODULE=app/
+XORG_TARBALL_SUFFIX="xz"
inherit xorg-3
DESCRIPTION="X Compositing manager"
LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86"
RDEPEND="
x11-libs/libXrender
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index 054a42dca71..b5b48378a03 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1 +1 @@
-DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
+DIST xdg-user-dirs-gtk-0.11.tar.xz 126488 BLAKE2B 45b8c3ab0b43214a1c1b39d368a283fb566bee115549468eb85e1e9e5407025690dbe320698df107523a3ea0d7cd8d0d3ef8d2296c80c79a74863d50eb581581 SHA512 2a650c6372126f807ac90fb0508e1b11636b38b5960a3037b547e9f1bb1a6b82653f20da7d5aae1144eebec040e3af89a02fbf70c1768724019b384f6d9cf85a
diff --git a/x11-misc/xdg-user-dirs-gtk/metadata.xml b/x11-misc/xdg-user-dirs-gtk/metadata.xml
index d0b58801b31..2fde1d68913 100644
--- a/x11-misc/xdg-user-dirs-gtk/metadata.xml
+++ b/x11-misc/xdg-user-dirs-gtk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>freedesktop-bugs@gentoo.org</email>
- </maintainer>
+ <maintainer type="project">
+ <email>freedesktop-bugs@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/xdg-user-dirs-gtk</remote-id>
+ </upstream>
</pkgmetadata>
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.11.ebuild
index a51c2844672..5e0d6345925 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.11.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome.org readme.gentoo-r1 toolchain-funcs
DESCRIPTION="Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications"
@@ -12,7 +12,7 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
- dev-libs/glib
+ dev-libs/glib:2
>=x11-libs/gtk+-3.5.1:3
>=x11-misc/xdg-user-dirs-0.14
"
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 4aa0745e72c..fdd9d5e93e7 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,2 +1 @@
-DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
DIST xdg-user-dirs-0.18.tar.gz 273556 BLAKE2B e9d05a2399040229eaed4947098bb587a3962860a0c162fd5bd939451df592130faa2fc5201440787a6a481e966f7769912b46ca1028e57a834fc7ddd950f904 SHA512 f523b2ba4f840a3c2a5730f72182fb5bb798187db769bfb7d36e9f780442813278a2c1bad656b4fb38428131241a51d07200a62b4d7b935d49a74be53f969716
diff --git a/x11-misc/xdg-user-dirs/metadata.xml b/x11-misc/xdg-user-dirs/metadata.xml
index d0b58801b31..53a236d2d5c 100644
--- a/x11-misc/xdg-user-dirs/metadata.xml
+++ b/x11-misc/xdg-user-dirs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>freedesktop-bugs@gentoo.org</email>
- </maintainer>
+ <maintainer type="project">
+ <email>freedesktop-bugs@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xdg/xdg-user-dirs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
deleted file mode 100644
index 4496577b85a..00000000000
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tool to help manage 'well known' user directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="gtk"
-
-RDEPEND=""
-# libxslt is mandatory because 0.15 tarball is broken, re:
-# https://bugs.freedesktop.org/show_bug.cgi?id=66251
-BDEPEND="app-text/docbook-xml-dtd:4.3
- dev-libs/libxslt
- sys-devel/gettext"
-PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-0.15-libiconv.patch )
-
-src_prepare() {
- default
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
- eautoreconf # for the above patch
-}
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
index e7768e1b855..b1201dddc1f 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="gtk"
BDEPEND="app-text/docbook-xml-dtd:4.3
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 4bcf0300d16..a362143699c 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,3 +1,2 @@
DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51
-DIST xdg-utils-1.1.3_p20200220.tar.bz2 287080 BLAKE2B eb9067527d5073f290d10ad36bcda24d4b813f3c98776b57955a7f254956795c26f1536c858ac104259f68f755746976d2cfc3aeccb9b9b35eaca5ea5eb89806 SHA512 8445109e87fb9e92edeebbf6b07a41b79344bc5016eb7224f5f2b7e599c6d075363337c81dd2ddf8f3007c633debba7f814631188c02db3ae002f622b4c323ec
DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71
diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
new file mode 100644
index 00000000000..71608552a08
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch
@@ -0,0 +1,25 @@
+From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001
+From: E5ten <ethancsommer@gmail.com>
+Date: Thu, 16 Jan 2020 02:06:09 +0000
+Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E"
+
+---
+ scripts/xdg-open.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 202f3e3..35b0522 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -72,7 +72,7 @@ get_key()
+ is_file_url_or_path()
+ {
+ if echo "$1" | grep -q '^file://' \
+- || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
++ || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then
+ return 0
+ else
+ return 1
+--
+GitLab
+
diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml
index d4390c2eb58..e44a98a0f12 100644
--- a/x11-misc/xdg-utils/metadata.xml
+++ b/x11-misc/xdg-utils/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xdg/xdg-utils</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
deleted file mode 100644
index ee52ffb4345..00000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20200220-r5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-EGIT_COMMIT="9816ebb3e6fd9f23e993b8b7fcbd56f92d9c9197"
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-SRC_URI="
- https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${EGIT_COMMIT}/${P}.tar.bz2"
-S=${WORKDIR}/xdg-utils-${EGIT_COMMIT}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc gnome"
-REQUIRED_USE="gnome? ( dbus )"
-
-RDEPEND="
- dev-util/desktop-file-utils
- dev-perl/File-MimeInfo
- dbus? (
- sys-apps/dbus
- gnome? (
- dev-perl/Net-DBus
- dev-perl/X11-Protocol
- )
- )
- x11-misc/shared-mime-info
- x11-apps/xprop
- x11-apps/xset
-"
-BDEPEND="
- >=app-text/xmlto-0.0.28-r3[text(+)]
- virtual/awk
-"
-
-DOCS=( ChangeLog README RELEASE_NOTES TODO )
-
-# Tests run random system programs, including interactive programs
-# that block forever
-RESTRICT="test"
-
-src_prepare() {
- default
- # If you choose to do git snapshot instead of patchset, you need to remember
- # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
- # all the files
- eautoreconf
-}
-
-src_configure() {
- export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
- default
- emake -C scripts scripts-clean
-}
-
-src_install() {
- default
-
- newdoc scripts/xsl/README README.xsl
- use doc && dodoc -r scripts/html
-
- # Install default XDG_DATA_DIRS, bug #264647
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
- echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
- doenvd 30xdg-data-local
-
- echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
- echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
- doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
- [[ -x $(type -P gtk-update-icon-cache) ]] \
- || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
index baa74ea8d11..561fb1c79f9 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
"
BDEPEND="
>=app-text/xmlto-0.0.28-r3[text(+)]
- virtual/awk
+ app-alternatives/awk
"
DOCS=( ChangeLog README RELEASE_NOTES TODO )
@@ -46,6 +46,8 @@ RESTRICT="test"
PATCHES=(
"${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch
+ # https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21
+ "${FILESDIR}"/${PN}-egrep.patch
)
src_prepare() {
diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1-r1.ebuild
index e2052afacdc..b04058431d6 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -28,10 +28,16 @@ S="${WORKDIR}/${P/x/X}"
DOCS=( AUTHORS BUGS ChangeLog README )
-PATCHES=( "${FILESDIR}"/${P}-{no-strip,install}.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-no-strip.patch
+ "${FILESDIR}"/${P}-install.patch
+)
src_prepare() {
default
+
+ sed -i -e 's:configure.in:configure.ac:' configure.in || die
+
eautoreconf
}
@@ -44,12 +50,12 @@ src_configure() {
src_install() {
default
- rm -r "${D}"/usr/share/doc || die
+ rm -r "${ED}"/usr/share/doc || die
use doc && local HTML_DOCS=( doc/. )
einstalldocs
if use examples; then
- insinto "/usr/share/doc/${PF}/examples"
- doins samples/*
+ docinto examples
+ dodoc samples/*
fi
}
diff --git a/x11-misc/xdock/files/xdock-0.3.0-clang16.patch b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch
new file mode 100644
index 00000000000..17db7dbb043
--- /dev/null
+++ b/x11-misc/xdock/files/xdock-0.3.0-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/871549
+--- a/src/docks/xdcalendar.c
++++ b/src/docks/xdcalendar.c
+@@ -1,2 +1,3 @@
+ #include <xdock.h>
++#include <ctype.h>
+ #include <getopt.h>
+--- a/src/docks/xdmemory.c
++++ b/src/docks/xdmemory.c
+@@ -1,2 +1,3 @@
+ #include <xdock.h>
++#include <ctype.h>
+ #include <getopt.h>
+--- a/src/lib/network.c
++++ b/src/lib/network.c
+@@ -10,2 +10,3 @@
+ # include <fcntl.h>
++# include <unistd.h>
+ # define INVALID_SOCKET -1
diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0-r1.ebuild
index dad806f3220..4c830a3fe0f 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
DESCRIPTION="Emulates Window Maker docks (runs in any window manager)"
-HOMEPAGE="http://xdock.sourceforge.net"
+HOMEPAGE="https://xdock.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
@@ -14,12 +14,15 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto"
DOCS=( API AUTHORS ChangeLog README TODO )
PATCHES=(
"${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_prepare() {
@@ -29,11 +32,8 @@ src_prepare() {
eautoreconf
}
-src_configure() {
- econf --disable-static
-}
-
src_install() {
default
- find "${ED}" -name '*.la' -delete || die
+
+ find "${ED}" -type f -name '*.la' -delete || die
}
diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild
index dd2a934b7fd..b1799611bdb 100644
--- a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit toolchain-funcs
+DOCS_BUILDER="doxygen"
+
+inherit docs toolchain-funcs
DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
@@ -40,6 +42,7 @@ DOCS=( CHANGELIST README.md )
src_compile() {
tc-export CC LD PKG_CONFIG
emake PREFIX="${EPREFIX}/usr"
+ use doc && docs_compile
}
src_install() {
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index d80d0c43e7e..afcf07d5a87 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Set the X root window to an image of the Earth"
HOMEPAGE="https://hewgill.com/xearth/original/"
@@ -33,6 +33,8 @@ PATCHES=(
DOCS=( BUILT-IN GAMMA-TEST HISTORY README )
src_configure() {
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
}
diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
index 48df2a9e84c..22bdac1cd66 100644
--- a/x11-misc/xfishtank/xfishtank-2.5.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit toolchain-funcs
+
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Turns your root window into an aquarium"
HOMEPAGE="https://jim.rees.org/computers/xfishtank.html"
@@ -29,6 +30,8 @@ BDEPEND="
S=${WORKDIR}/${PN}
src_configure() {
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
}
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 920d5083f8c..dd41064d889 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1 +1 @@
-DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
+DIST xflux-gui-2.0.tar.gz 35805 BLAKE2B 7a15371d682b31c900f35bebd36e12b70d6095c4cdc9c33f43bad031d72b82d8d3800f7f34f7e31965725dfe075dc6934512eeced98aa685d0023a57dfb61103 SHA512 4a5235feecb06ee95d28d4c05bb710014aea120943b3cbe23f2d2130486de82295891d8211a02e52385edb577da3438dd1c2ba45b209ab4359eb3469df08eade
diff --git a/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch b/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch
deleted file mode 100644
index dc14be17339..00000000000
--- a/x11-misc/xflux-gui/files/xflux-gui-1.2.0-disable-gschemas-compiled.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 674d17b100f7b8a471d65b61749ca892567f8d58 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Fri, 16 Aug 2019 16:02:59 +0200
-Subject: [PATCH] setup.py: add posbility to disable compilation of gschema
-
-When you install fluxgui, it also compiles the gschema, which is for
-most distros fine. But on source distros like Gentoo, which do the
-compilation of gschema separately, this will lead to a file collision,
-as packages unter Gentoo are not allowed to install such files.
-
-So we introduce a new env variable called DISABLE_GSCHEMA_COMPILED which
-needs to be set to disable this behaviour.
-
-Closes: https://github.com/xflux-gui/fluxgui/issues/124
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- setup.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 8a8fa14..4bd404d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -76,9 +76,10 @@ def run(self):
- super().run()
-
- # Compile '*.gschema.xml' to update or create 'gschemas.compiled'.
-- info("compiling gsettings schemas")
-- gschema_dir = os.path.join(self.install_dir, gschema_dir_suffix)
-- self.spawn(["glib-compile-schemas", gschema_dir])
-+ if os.environ.get('DISABLE_GSCHEMAS_COMPILED', None) is None:
-+ info("compiling gsettings schemas")
-+ gschema_dir = os.path.join(self.install_dir, gschema_dir_suffix)
-+ self.spawn(["glib-compile-schemas", gschema_dir])
-
- setup(name = "f.lux indicator applet",
- version = "1.2.1~pre",
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild
index dcbcc417a9a..04205646c15 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-2.0-r1.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{9..11} )
inherit distutils-r1 gnome2-utils xdg-utils
DESCRIPTION="A GUI for f.lux"
HOMEPAGE="https://github.com/xflux-gui/fluxgui/"
-SRC_URI="https://github.com/${PN}/fluxgui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/fluxgui/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/fluxgui-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-PATCHES=( "${FILESDIR}/${P}-disable-gschemas-compiled.patch" )
+KEYWORDS="-* ~amd64 ~x86"
RDEPEND="
- dev-libs/libappindicator:3
+ dev-libs/libayatana-appindicator
dev-python/pexpect[${PYTHON_USEDEP}]
dev-python/pygobject[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
@@ -28,12 +26,12 @@ RDEPEND="
x11-misc/xflux
"
-python_install() {
+python_compile() {
# Don't let the package compiling the schemas,
# as this could cause a file collision
export DISABLE_GSCHEMAS_COMPILED="true"
- distutils-r1_python_install
+ distutils-r1_python_compile
}
pkg_postinst() {
diff --git a/x11-misc/xfractint/metadata.xml b/x11-misc/xfractint/metadata.xml
index 106bd3bd959..4f7fdcabe5c 100644
--- a/x11-misc/xfractint/metadata.xml
+++ b/x11-misc/xfractint/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
- <email>ddenoncin@gmail.com</email>
+ <email>gentoo@denoncin.fr</email>
<name>David Denoncin</name>
</maintainer>
<maintainer type="project" proxied="proxy">
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 1a27319e27e..ef0114fb8d2 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1 +1 @@
-DIST xkeyboard-config-2.36.tar.xz 880776 BLAKE2B 3ce6d9e5a1e763beb15614cd1b559ff6d56c2f6438b1c0680755a029ac90e48de4a939b1bcc0054a510cc0e08f6ffa6db98fecd4bf11e01510b151aa664425c3 SHA512 a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
+DIST xkeyboard-config-2.37.tar.xz 879744 BLAKE2B 58cc62d48a857b0935bfe7415b4a28921d02218402ca0125e8644be04a14f897e357a224fed12f9a85c6d147b4fa659241004bf49ac16c19b7f5fceb2b6d3295 SHA512 3b2da77996d48bf7b6a5f5784bbcb62070ba6ab8eabb6f255d1addd7fa58080a329464010050e894c9acc901e42e3669333db2966140c78802efb8a86620ac0e
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index 58256883cb2..386b7d63b88 100644
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
-<upstream>
- <remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id>
-</upstream>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id>
+ <remote-id type="freedesktop-gitlab">xkeyboard-config/xkeyboard-config</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
index fa640550337..1441c0c806c 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.37.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-any-r1
DESCRIPTION="X keyboard configuration database"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 007071e3699..a73d92e50be 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-any-r1
DESCRIPTION="X keyboard configuration database"
diff --git a/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
new file mode 100644
index 00000000000..99dc6f4ea82
--- /dev/null
+++ b/x11-misc/xkeycaps/files/xkeycaps-2.47_p7-clang16.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/871129
+--- a/commands.c
++++ b/commands.c
+@@ -1754,3 +1754,3 @@
+ }
+- XawListChange (box->keysym_list, keysym_name_buffer, 0, 0, True);
++ XawListChange (box->keysym_list, (const char **) keysym_name_buffer, 0, 0, True);
+ }
+@@ -2528,3 +2528,3 @@
+ box->set = &keyboard_sets [i];
+- XawListChange (box->keymap_list, (char **) box->set->maps, 0, 0, True);
++ XawListChange (box->keymap_list, (const char **) box->set->maps, 0, 0, True);
+ for (i = 0; i < box->set->map_count; i++)
+@@ -2599,3 +2599,3 @@
+
+- XawListChange (box->keyboard_list, list, 0, 0, True);
++ XawListChange (box->keyboard_list, (const char **) list, 0, 0, True);
+ XawListHighlight (box->keyboard_list, kbd);
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
index be540734790..136ec95c516 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
@@ -35,6 +35,7 @@ BDEPEND="
DOCS=( README defining.txt hierarchy.txt sgi-microsoft.txt )
PATCHES=(
"${FILESDIR}"/${P/_p*}-Imakefile.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
S=${WORKDIR}/${P/_p*}
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 319f4fb8911..51644f013aa 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,2 +1,2 @@
-DIST xlockmore-5.66.tar.xz 1995064 BLAKE2B 630643f2968a5015dd35b4e1a24cd3d4e7ef9d6d75b0916416e93ab28bacb5a161983b036d9042a5686b2f17ba493ad510e2df9f7443488f9b988662e644ec7a SHA512 d0a4665e23b32cc3370703e55396cd5c9659f836aa13a1737dd709632746cf9221acd66a529b9e05af981e5bef539e70582959b9d821854b93ef735ad1cd928d
DIST xlockmore-5.69.tar.xz 2008396 BLAKE2B 69341456769f34c1ac537f382b4baf287b5da47f4620581cbea5ab92749a26467781ebb6d7f3dfa9bd1eedf92d21fb8e501715af681972f06007408a5a44f4e5 SHA512 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9
+DIST xlockmore-5.71.tar.xz 2048496 BLAKE2B 417bd4175a483d350cfa098c8a2488f81df9758874c1b53c36a6c2ae23f3b17c942c089d8ecce432f8db244cd8c4df7e79854ff9f2156153ee838ac98f2778ad SHA512 d09cd28dbca37db5e8fa7a388f4d797369b82a856b509414dd6dca5b586506c466b0fb112947a6a0c71e8c8de7cc125ef19c0fa358edc2a521ad38c255946e58
diff --git a/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch b/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch
new file mode 100644
index 00000000000..a6bd223373b
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.71-fix-build-for-clang16.patch
@@ -0,0 +1,28 @@
+Clang16 will not allow assigning imcompatbile function pointer types.
+Therefore this patch adds casts to the function pointers.
+
+Bug: https://bugs.gentoo.org/880909
+This patch has been sent to upstream via mail.
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-07)
+
+--- a/xlock/vtlock_proc.c
++++ b/xlock/vtlock_proc.c
+@@ -188,7 +188,7 @@ find_x_proc(int disp_nr, dev_t lxdev, ino_t lxino)
+ lencmd = strlen(xcmd_ref);
+ if ( stat( PROCDIR, &stbuf ) == -1 ) return( (pid_t)-1 );
+ namelist = (struct dirent **) malloc(sizeof (struct dirent *));
+- if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, alphasort)) == -1 )
++ if ((names = scan_dir(PROCDIR, &namelist, proc_dir_select, (int (*)(const void *, const void *))alphasort)) == -1 )
+ {
+ free(namelist);
+ return( (pid_t)-1 );
+@@ -301,7 +301,7 @@ scan_x_fds( struct inode_ref *inotab, int ln_ttys, pid_t proc )
+
+ (void) sprintf(xfddir, PROCDIR "/%d/fd", proc);
+ namelist = (struct dirent **) malloc(sizeof (struct dirent *));
+- if (scan_dir(xfddir, &namelist, NULL, alphasort) == -1) {
++ if (scan_dir(xfddir, &namelist, NULL, (int (*)(const void *, const void *))alphasort) == -1) {
+ free(namelist);
+ return 0;
+ }
diff --git a/x11-misc/xlockmore/xlockmore-5.69.ebuild b/x11-misc/xlockmore/xlockmore-5.69.ebuild
index f8548d0929a..1baf305fb5f 100644
--- a/x11-misc/xlockmore/xlockmore-5.69.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_alpha/ALPHA}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86"
IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
REQUIRED_USE="
diff --git a/x11-misc/xlockmore/xlockmore-5.66.ebuild b/x11-misc/xlockmore/xlockmore-5.71.ebuild
index 767c041c2b8..b774e8bccb8 100644
--- a/x11-misc/xlockmore/xlockmore-5.66.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.71.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools flag-o-matic pam
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/_alpha/ALPHA}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~riscv sparc x86"
IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
REQUIRED_USE="
@@ -53,7 +53,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.46-freetype261.patch
"${FILESDIR}"/${PN}-5.47-CXX.patch
"${FILESDIR}"/${PN}-5.47-strip.patch
- "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+ #"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-5.71-fix-build-for-clang16.patch
)
src_prepare() {
@@ -69,13 +70,17 @@ src_prepare() {
}
src_configure() {
+ # #864761
+ filter-lto
+
local myconf=()
if use opengl && use truetype; then
- myconf=( --with-ftgl )
- append-cppflags -DFTGL213
- else
- myconf=( --without-ftgl )
+ append-cppflags -DFTGL213
+
+ myconf=( --with-ftgl )
+ else
+ myconf=( --without-ftgl )
fi
myconf+=(
diff --git a/x11-misc/xmobar/xmobar-0.44.1.ebuild b/x11-misc/xmobar/xmobar-0.44.1.ebuild
index d09d7919119..4a7d43bb005 100644
--- a/x11-misc/xmobar/xmobar-0.44.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.44.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
IUSE="alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?]
diff --git a/x11-misc/xnee/Manifest b/x11-misc/xnee/Manifest
deleted file mode 100644
index 906651bd746..00000000000
--- a/x11-misc/xnee/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xnee-3.19.tar.gz 1893109 BLAKE2B 17f416d06dac092c79d4c9838e0f69219e617d695d7c56bee8c84cdf6a5de7e3f02eb1dc9f9f278e78ebf4090893557ede30b2cd5039acafcd743cff11e5602b SHA512 a4a82839a4597b0d7f5b65ad76092f03eb5c665d36298505a320475daacbf66f30b022c04284ce8795360e4481fdfb1d9138f0b8b173b66d23b7f1542d0acbe8
diff --git a/x11-misc/xnee/files/xnee-3.18-linker.patch b/x11-misc/xnee/files/xnee-3.18-linker.patch
deleted file mode 100644
index b841bc0182e..00000000000
--- a/x11-misc/xnee/files/xnee-3.18-linker.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libxnee/src/Makefile.am
-+++ b/libxnee/src/Makefile.am
-@@ -78,6 +78,7 @@
- libxnee_la_LDFLAGS = -rpath '$(libdir)'
- #dnl libxnee_la_SOURCES = $(LIB_XNEE_SOURCE_FILES)
- libxnee_a_CFLAGS = $(AM_CFLAGS)
-+libxnee_la_LIBADD = @X11_LIBS@
-
- #noinst_LIBRARIES = libxnee.a
-
diff --git a/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch b/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch
deleted file mode 100644
index 4e80dacd20b..00000000000
--- a/x11-misc/xnee/files/xnee-3.19-libgnomeui-only-for-applets.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- a/configure.in 2014/05/06 14:13:59 1.134
-+++ b/configure.in 2018/01/01 23:06:56 1.135
-@@ -382,62 +382,63 @@
- fi
-
-
-- GNOMEUI2_MODULE="libgnomeui-2.0"
-- GNOMEUI2_VERSION="2.0.0"
--
--
-- if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION`
-- then
-- GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE"
-- GTK_ERR=1
-- fi
--
-- libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE `
-- libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE `
--
--
-- AC_SUBST(libgnomeui_CFLAGS)
-- AC_SUBST(libgnomeui_LIBS)
--
- PIXMAP_DIR=pixmap
-
--
-- if test x$buildgapplet = xtrue ;
-+ if test x$buildgapplet = xtrue;
- then
--
-- if test x$GTKCONF = x ;
-- then
-- echo " **************************************** "
-- echo " * WARNING, missing program: gtk-config *"
-- echo " **************************************** "
-- echo ""
-- echo " On Debian based distros, install sth like: libgtk2.0-dev"
-- echo ""
-- echo "However, I will try my best to continue without gtk-config. "
-- echo "Will not be able to check for gtk/gnome header files properly"
-- echo "On most platforms this implies no problem"
-- echo ""
-- else
-- GTK_PREFIX=`$GTKCONF --prefix`
-- GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/
-- GNOME_H_FILE=$GTK_INC_PATH/gnome.h
--
-- ls -l $GNOME_H_FILE 2>/dev/null >/dev/null
--
-- MISSING_GNOME_H=$?
-
-- if test x$MISSING_GNOME_H != x0 ;
-+ GNOMEUI2_MODULE="libgnomeui-2.0"
-+ GNOMEUI2_VERSION="2.0.0"
-+
-+
-+ if `$PKGCFG --exists $GNOMEUI2_MODULE >= $GNOMEUI2_VERSION`
-+ then
-+ GTK_MODULES="$GTK_MODULES $GNOMEUI2_MODULE"
-+ GTK_ERR=1
-+ fi
-+
-+ libgnomeui_CFLAGS=`$PKGCFG --cflags $GNOMEUI2_MODULE `
-+ libgnomeui_LIBS=`$PKGCFG --libs $GNOMEUI2_MODULE `
-+
-+
-+ AC_SUBST(libgnomeui_CFLAGS)
-+ AC_SUBST(libgnomeui_LIBS)
-+
-+
-+
-+ if test x$GTKCONF = x ;
- then
-- echo "Missing GNOME header file (gnome.h), you need to install development packages"
-- echo "On a Debian based distro system do:"
-- echo ""
-- echo " sudo apt-get install libgnome2-dev"
-- echo ""
--echo exit 1
-- fi
-- fi
--
-- fi
-+ echo " **************************************** "
-+ echo " * WARNING, missing program: gtk-config *"
-+ echo " **************************************** "
-+ echo ""
-+ echo " On Debian based distros, install sth like: libgtk2.0-dev"
-+ echo ""
-+ echo "However, I will try my best to continue without gtk-config. "
-+ echo "Will not be able to check for gtk/gnome header files properly"
-+ echo "On most platforms this implies no problem"
-+ echo ""
-+ else
-+ GTK_PREFIX=`$GTKCONF --prefix`
-+ GTK_INC_PATH=$GTK_PREFIX/include/$GNOMEUI2_MODULE/
-+ GNOME_H_FILE=$GTK_INC_PATH/gnome.h
-+
-+ ls -l $GNOME_H_FILE 2>/dev/null >/dev/null
-+
-+ MISSING_GNOME_H=$?
-+
-+ if test x$MISSING_GNOME_H != x0 ;
-+ then
-+ echo "Missing GNOME header file (gnome.h), you need to install development packages"
-+ echo "On a Debian based distro system do:"
-+ echo ""
-+ echo " sudo apt-get install libgnome2-dev"
-+ echo ""
-+ echo exit 1
-+ fi
-+ fi
-+
-+ fi
- fi
-
-
diff --git a/x11-misc/xnee/files/xnee-3.19-slibtool.patch b/x11-misc/xnee/files/xnee-3.19-slibtool.patch
deleted file mode 100644
index 411cfd61749..00000000000
--- a/x11-misc/xnee/files/xnee-3.19-slibtool.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/778962
-https://savannah.gnu.org/support/index.php?110470
-
-Author: orbea <orbea@riseup.net>
-Date: Thu Apr 1 14:39:10 2021 -0700
-
- build: Fix build with slibtool.
-
---- a/cnee/src/Makefile.am
-+++ b/cnee/src/Makefile.am
-@@ -63,7 +63,7 @@ endif
-
-
- AM_CFLAGS = -I../include -I${LIBXNEE_DIR}/include ${PEDANTIC_FLAGS} ${X_CFLAGS} -g ${VERBOSE_FLAG} ${BUF_VERBOSE_FLAG} ${USER_CFLAGS} ${GCOV_FLAG} ${GPROF_FLAG} ${XNEE_XINPUT_SUPPORT_FLAGS} ${XNEE_XINPUT_SUPPORT_FLAGS}
--cnee_LDADD = -L${LIBXNEE_DIR}/src -lxnee ${X_LIBS} ${X11_LIBS} ${LIBDL} ${LIBXI}
-+cnee_LDADD = $(top_srcdir)/libxnee/src/libxnee.la ${X_LIBS} ${X11_LIBS} ${LIBDL} ${LIBXI}
-
- if BUILD_STATIC
- STATIC_FLAGS = -static
diff --git a/x11-misc/xnee/metadata.xml b/x11-misc/xnee/metadata.xml
deleted file mode 100644
index 85e4ed814fa..00000000000
--- a/x11-misc/xnee/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/xnee/xnee-3.19-r2.ebuild b/x11-misc/xnee/xnee-3.19-r2.ebuild
deleted file mode 100644
index f87a29dadb4..00000000000
--- a/x11-misc/xnee/xnee-3.19-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic virtualx
-
-DESCRIPTION="Program suite to record, replay and distribute user actions"
-HOMEPAGE="https://xnee.wordpress.com/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome xosd"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXtst
- x11-libs/libxcb
- gnome? (
- >=gnome-base/gconf-2
- x11-libs/gtk+:2
- )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- virtual/pkgconfig
- sys-devel/gettext
- gnome? ( virtual/imagemagick-tools[jpeg,png] )
-"
-
-# This needs RECORD extension from X.org server which isn't necessarily
-# enabled. Xlib: extension "RECORD" missing on display ":0.0".
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ NEWS README TODO )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.18-linker.patch
- "${FILESDIR}"/${P}-libgnomeui-only-for-applets.patch
- "${FILESDIR}"/${P}-slibtool.patch
-)
-
-src_prepare() {
- default
-
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- append-cflags -fcommon
- econf \
- $(use_enable gnome gui) \
- $(use_enable xosd buffer_verbose) \
- $(use_enable xosd verbose) \
- $(use_enable xosd) \
- --disable-gnome-applet \
- --disable-static \
- --disable-static-programs \
- --enable-cli \
- --enable-lib
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- default
- use gnome && make_desktop_entry gnee Gnee ${PN} "Utility;GTK"
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-misc/xorg-cf-files/metadata.xml b/x11-misc/xorg-cf-files/metadata.xml
index e17a5bccb78..dc313ef5387 100644
--- a/x11-misc/xorg-cf-files/metadata.xml
+++ b/x11-misc/xorg-cf-files/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freedesktop-gitlab">xorg/util/cf</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/xowl/metadata.xml b/x11-misc/xowl/metadata.xml
deleted file mode 100644
index 1e7482581ef..00000000000
--- a/x11-misc/xowl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">seanpringle/xowl</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-misc/xowl/xowl-9999.ebuild b/x11-misc/xowl/xowl-9999.ebuild
deleted file mode 100644
index e563aab3766..00000000000
--- a/x11-misc/xowl/xowl-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic git-r3 savedconfig toolchain-funcs
-
-DESCRIPTION="X11 Obstinate Window Lister"
-HOMEPAGE="https://github.com/seanpringle/xowl"
-EGIT_REPO_URI="https://github.com/seanpringle/xowl"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXinerama
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- restore_config config.h
-}
-
-src_configure() {
- tc-export CC PKG_CONFIG
-}
-
-src_compile() {
- XOAT_COMPILE=(
- ${CC} -o ${PN} ${PN}.c ${CFLAGS} -std=c99 ${LDFLAGS}
- $(${PKG_CONFIG} --cflags --libs x11 xft xinerama)
- )
- echo ${XOAT_COMPILE[@]}
- ${XOAT_COMPILE[@]} || die
-}
-
-src_install() {
- dobin xowl
- dodoc xowl.md
- doman xowl.1
- save_config config.h
-}
diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
index a1ae20d7ee7..cf0357f56a9 100644
--- a/x11-misc/xpad/xpad-5.4.0.ebuild
+++ b/x11-misc/xpad/xpad-5.4.0.ebuild
@@ -14,8 +14,10 @@ KEYWORDS="amd64 ~arm ppc x86"
RDEPEND="
>=dev-libs/glib-2.56:2
- app-accessibility/at-spi2-atk
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
sys-devel/gettext
x11-libs/gdk-pixbuf
x11-libs/gtk+:3[X]
diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild
index 2df4a07a8d0..90ae5daec21 100644
--- a/x11-misc/xpad/xpad-5.7.0.ebuild
+++ b/x11-misc/xpad/xpad-5.7.0.ebuild
@@ -14,8 +14,10 @@ SLOT="0"
KEYWORDS="amd64 ~arm ppc x86"
RDEPEND="
- app-accessibility/at-spi2-atk
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
>=dev-libs/glib-2.58:2
x11-libs/gdk-pixbuf
x11-libs/gtk+:3[X]
diff --git a/x11-misc/xpad/xpad-5.8.0.ebuild b/x11-misc/xpad/xpad-5.8.0.ebuild
index 2df4a07a8d0..90ae5daec21 100644
--- a/x11-misc/xpad/xpad-5.8.0.ebuild
+++ b/x11-misc/xpad/xpad-5.8.0.ebuild
@@ -14,8 +14,10 @@ SLOT="0"
KEYWORDS="amd64 ~arm ppc x86"
RDEPEND="
- app-accessibility/at-spi2-atk
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
>=dev-libs/glib-2.58:2
x11-libs/gdk-pixbuf
x11-libs/gtk+:3[X]
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
index c557e893a08..b38aaede781 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r2.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r4.ebuild
@@ -15,12 +15,12 @@ IUSE="gif jpeg png tiff truetype X"
RDEPEND="
gif? ( media-libs/giflib:= )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
png? (
media-libs/libpng:0=
media-libs/netpbm
)
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:= )
truetype? (
media-libs/freetype:2
x11-libs/pango
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index cb133020e65..34ec3cfca17 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,4 +1 @@
-DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
-DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
-DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B 1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce SHA512 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
-DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B 42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b SHA512 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
+DIST xscreensaver-6.05.1.tar.gz 26110057 BLAKE2B 97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3 SHA512 c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch b/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
deleted file mode 100644
index 1f70ad29dbb..00000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-6.01-gtk-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9ff9a74152ebd8c04df12d340ab6e7c726690a82 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 17 Jul 2021 23:50:16 +0200
-Subject: [PATCH 2/2] Fix detection of GTK+ for systems without gdk-pixbuf
-
----
- configure.ac | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4cb3385..bef0d1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2819,8 +2819,6 @@ if test "$with_gtk" = yes; then
- pkg_check_version gtk+-2.0 2.22.0 ; ac_gtk_version_string="$vers"
- pkg_check_version gmodule-2.0 2.0.0
- pkg_check_version libxml-2.0 2.4.6
-- pkg_check_version gdk-pixbuf-2.0 2.0.0
-- pkg_check_version gdk-pixbuf-xlib-2.0 2.0.0
- have_gtk="$ok"
-
- if test "$have_gtk" = no; then
---
-2.32.0
-
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch
new file mode 100644
index 00000000000..a8ef464d2db
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-configure-exit-codes.patch
@@ -0,0 +1,29 @@
+The configure scripts exits on a non zero exit code even with a warning. Even
+though for upstream this is just a warning, for portage this means failure and
+it will exit.
+We therefore alter the exit codes where neccesary.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+ else
+ warnL "The GTK libraries do not seem to be available; the"
+ warn2 "\`xscreensaver-settings' program requires them."
+- CONF_STATUS=1
+ # echo ''
+ # warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ # warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then
+ warn "GTK is being used, but the GDK-Pixbuf library and/or"
+ warn2 "headers were not found. That can't be good. Please"
+ warn2 "install the GDK-Pixbuf development kit and re-configure."
+- CONF_STATUS=1
+ fi
+
+ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
+@@ -4733,7 +4731,6 @@ if test "$have_png" = no ; then
+
+ if test "$png_halfassed" = yes ; then halfassery ; fi
+ warn2 "Many things aren't going to work right."
+- CONF_STATUS=1
+ fi
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
new file mode 100644
index 00000000000..4147540e118
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-get-dirs-from-gtk3.0-in-configure.patch
@@ -0,0 +1,27 @@
+Even though xscreensaver now uses GTK+3 instead of GTK+2 since version 6.05
+it still gets its directories from GTK+2 which results in an empty prefix
+when GTK+2 is not installed.
+
+Bug: https://bugs.gentoo.org/878875
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2822,7 +2822,7 @@ if test "$with_gtk" = yes; then
+
+ GTK_DATADIR=""
+ if test "$have_gtk" = yes; then
+- GTK_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++ GTK_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+ GTK_DATADIR="$GTK_DATADIR/share"
+ fi
+
+@@ -4282,6 +4282,6 @@ AC_MSG_CHECKING([for locale directory])
+ if test -n "$GTK_DATADIR" ; then
+ PO_DATADIR="$GTK_DATADIR"
+ elif test "$have_gtk" = yes; then
+- PO_DATADIR=`$pkg_config --variable=prefix gtk+-2.0`
++ PO_DATADIR=`$pkg_config --variable=prefix gtk+-3.0`
+ PO_DATADIR="$PO_DATADIR/share"
+ fi
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
new file mode 100644
index 00000000000..d69e5965ca2
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-r2-configure-exit-codes.patch
@@ -0,0 +1,43 @@
+The configure scripts exits on a non zero exit code even with a warning. Even
+though for upstream this is just a warning, for portage this means failure and
+it will exit.
+We therefore alter the exit codes where neccesary.
+
+Bug: https://bugs.gentoo.org/885441
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-15)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -4588,7 +4588,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+ else
+ warnL "The GTK libraries do not seem to be available; the"
+ warn2 "\`xscreensaver-settings' program requires them."
+- CONF_STATUS=1
+ # echo ''
+ # warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ # warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4615,7 +4614,6 @@ if test "$have_gtk" = yes -a "$have_gdk_pixbuf" = no ; then
+ warn "GTK is being used, but the GDK-Pixbuf library and/or"
+ warn2 "headers were not found. That can't be good. Please"
+ warn2 "install the GDK-Pixbuf development kit and re-configure."
+- CONF_STATUS=1
+ fi
+
+ if test "$have_motif" = yes -a "$have_lesstif" = yes ; then
+@@ -4714,7 +4712,6 @@ if test "$have_jpeg" = no ; then
+ warn2 "This means that it won't be possible for the image-manipulating"
+ warn2 "display modes to load files from disk; and it also means that"
+ warn2 "the \`webcollage' program will be much slower."
+- CONF_STATUS=1
+ else
+ warn2 "This means the \`webcollage' program will be much slower."
+ fi
+@@ -4733,7 +4730,6 @@ if test "$have_png" = no ; then
+
+ if test "$png_halfassed" = yes ; then halfassery ; fi
+ warn2 "Many things aren't going to work right."
+- CONF_STATUS=1
+ fi
+
+
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch
new file mode 100644
index 00000000000..7d9ffdfae4d
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-remove-update-icon-cache.patch
@@ -0,0 +1,13 @@
+Remove update icon cache as it is a sandbox access violation.
+We do this in the ebuild by ourselves instead.
+
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -564,7 +564,6 @@ install-gnome:: $(LOGO)
+ fi
+
+ install-gnome:: uninstall-old-gnome-icons
+-install-gnome:: update-icon-caches
+
+ update-icon-caches::
+ @for f in /usr/share/icons/index.theme
diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch
new file mode 100644
index 00000000000..0f09d970a92
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-6.05-teach-handsy-some-manners.patch
@@ -0,0 +1,42 @@
+This is to teach handly some good manners and get his mind out of the gutter. He let himself go quite a bit lately.
+Fixes: https://bugs.gentoo.org/869218
+
+
+--- a/hacks/glx/handsy_anim.h
++++ b/hacks/glx/handsy_anim.h
+@@ -770,7 +770,6 @@ static const hand_anim goatse_anim[] = {
+ /**************************************************************************/
+
+ static const hand_anim_pair all_hand_anims[] = {
+- {{ middle_anim, middle_anim }, 0.2 },
+ {{ tap_anim, tap_anim }, 0.7 },
+ {{ tap_anim, tap_anim }, 0.7 },
+ {{ tap_anim, tap_anim }, 0.7 },
+@@ -778,15 +777,12 @@ static const hand_anim_pair all_hand_anims[] = {
+ {{ spock_anim, hidden_anim}, 0 },
+ {{ horns_anim, horns_anim}, 0 },
+ {{ horns_anim, horns_anim}, 0 },
+- {{ bs1_anim, bs2_anim }, 0 },
+- {{ upyours_anim, hidden_anim }, 0 },
+ {{ peace_anim, hidden_anim }, 0 },
+ {{ scissor1_anim, scissor2_anim }, 0 },
+ {{ wave_anim, hidden_anim }, 0 },
+ {{ wave2_anim, hidden_anim }, 0 },
+ {{ jazzhands_anim, jazzhands_anim }, 0 },
+ {{ ok_anim, ok_anim }, 0 },
+- {{ inout1_anim, inout2_anim }, 0 },
+ {{ clap_anim, clap_anim }, 0 },
+ {{ slow_clap_anim, slow_clap_anim }, 0 },
+ {{ pray_anim, pray_anim }, 0 },
+@@ -795,11 +791,9 @@ static const hand_anim_pair all_hand_anims[] = {
+ {{ thumbsup_anim, thumbsup_anim }, 0 },
+ {{ thumbsdn_anim, thumbsdn_anim }, 0 },
+ {{ thisguy_anim, thisguy_anim }, 0 },
+- {{ outtahere_anim, hidden_anim }, 0 },
+ {{ stahhhp_anim, stahhhp_anim }, 0 },
+ {{ gun_anim, gun_anim }, 0.25 },
+ {{ walk_anim, walk_anim }, 0.3 },
+- {{ goatse_anim, goatse_anim }, 0 },
+ {{ 0, }}};
+
+ #endif /* __HANDSY_ANIM__ */
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index e6446e8ce0e..11a85b2711e 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>pascal.jaeger@leimstift.de</email>
+ <name>Pascal Jäger</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<maintainer>
<email>jwz@jwz.org</email>
diff --git a/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
deleted file mode 100644
index f09ec976e77..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# 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 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- gtk? ( png )
- opengl? ( png )
- elogind? ( !systemd )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- xft? ( 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 )
- png? ( media-libs/libpng:= )
- 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
- "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
- "${FILESDIR}"/${PN}-6.01-gtk-detection.patch
- "${FILESDIR}"/${PN}-6.01-configure-install_sh.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
-
- # Must be eauto*re*conf, to force the rebuild
- eautoreconf
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
-
- # WARNING: This is NOT a normal autoconf script
- # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
- ECONF_OPTS=(
- $(use_enable locking)
- $(use_with elogind)
- $(use_with gdk-pixbuf pixbuf)
- $(use_with gtk)
- $(use_with new-login login-manager)
- $(use_with opengl gl)
- $(use_with pam)
- $(use_with suid setuid-hacks)
- $(use_with systemd)
- $(use_with xinerama xinerama-ext)
- --with-jpeg=$(usex jpeg yes no)
- --with-png=$(usex png yes no)
- --with-xft=$(usex xft yes no)
- --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
- --with-configdir="${EPREFIX}"/usr/share/${PN}/config
- --with-dpms-ext
- --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
- --with-proc-interrupts
- --with-randr-ext
- --with-text-file="${EPREFIX}"/etc/gentoo-release
- --with-xdbe-ext
- --with-xf86gamma-ext
- --with-xf86vmode-ext
- --with-xinput-ext
- --with-xkb-ext
- --with-xshm-ext
- --without-gle
- --without-kerberos
- --without-motif
- --with-proc-oom
- --x-includes="${EPREFIX}"/usr/include
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
- )
- # WARNING: This is NOT a normal autoconf script
- econf "${ECONF_OPTS[@]}"
-}
-
-src_compile() {
- # stock target is "default", which is broken in some releases.
- emake all
-}
-
-src_install() {
- use pam && dodir /etc/pam.d/
- emake install_prefix="${D}" DESTDIR="${D}" install
-
- if use fonts; then
- # Do not install fonts with unclear licensing
- rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
-
- # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
- rm -v "${ED}${FONTDIR}"/luximr.ttf || die
-
- font_xfont_config
- else
- rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
- rmdir -v "${ED}${FONTDIR}" || die #812473
- fi
-
- dodoc README{,.hacking}
-
- if use pam; then
- rm -f "${ED}/etc/pam.d/xscreensaver" # install our version instead
- 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/xscreensaver/xscreensaver-6.02-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
deleted file mode 100644
index b7f191412b7..00000000000
--- a/x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic font optfeature pam strip-linguas
-
-DESCRIPTION="Modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
-
-# Font license mapping for folder ./hacks/fonts/ as following:
-# clacon.ttf -- MIT
-# gallant12x22.ttf -- unclear, hence dropped
-# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf)
-# OCRAStd.otf -- unclear, hence dropped
-# SpecialElite.ttf -- Apache-2.0
-LICENSE="BSD fonts? ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- gles? ( !glx opengl )
- glx? ( opengl )
- gtk? ( png )
- opengl? ( png )
- ?? ( elogind systemd )
-"
-
-COMMON_DEPEND="
- dev-libs/libxml2
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXt
- x11-libs/libXxf86vm
- elogind? ( sys-auth/elogind )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- locking? ( virtual/libcrypt:= )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- png? ( media-libs/libpng:= )
- systemd? ( >=sys-apps/systemd-221 )
- xft? ( x11-libs/libXft )
- xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
- ${COMMON_DEPEND}
- media-gfx/fbida
- perl? (
- dev-lang/perl
- dev-perl/libwww-perl
- virtual/perl-Digest-MD5
- )
- selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/bc
- sys-devel/gettext
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-6.01-interix.patch
- "${FILESDIR}"/${PN}-5.31-pragma.patch
- "${FILESDIR}"/${PN}-6.01-gentoo.patch
- "${FILESDIR}"/${PN}-5.45-gcc.patch
- "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
- "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
- "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
- "${FILESDIR}"/${PN}-6.01-gtk-detection.patch
- "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
-)
-
-DOCS=( README{,.hacking} )
-
-src_prepare() {
- default
-
- sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
- strip-linguas -i po/
- export ALL_LINGUAS="${LINGUAS}"
-
- if use new-login && ! use gdm; then #392967
- sed -i \
- -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
- configure{,.ac} || die
- fi
-
- # We are patching driver/XScreenSaver.ad.in, so let's delete the
- # header generated from it so that it gets back in sync during build:
- rm driver/XScreenSaver_ad.h || die
-
- if ! use offensive; then
- sed -i \
- -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
- hacks/barcode.c || die
- sed -i \
- -e 's|erect penis|shuffle board|g' \
- -e 's|flaccid penis|flaccid anchor|g' \
- -e 's|vagina|engagement ring|g' \
- -e 's|Penis|Shuttle|g' \
- hacks/glx/glsnake.c || die
- sed -i \
- 's| Stay.*fucking mask\.$||' \
- hacks/glx/covid19.man \
- hacks/config/covid19.xml || die
- fi
-
- # Must be eauto*re*conf, to force the rebuild
- eautoreconf
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
-
- # Works similarly to -Werror,
- # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
- filter-flags -pedantic-errors
-
- # WARNING: This is NOT a normal autoconf script
- # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
- ECONF_OPTS=(
- $(use_enable locking)
- $(use_with elogind)
- $(use_with gdk-pixbuf pixbuf)
- $(use_with gles)
- $(use_with glx)
- $(use_with gtk)
- $(use_with new-login login-manager)
- $(use_with opengl gl)
- $(use_with pam)
- $(use_with suid setuid-hacks)
- $(use_with systemd)
- $(use_with xinerama xinerama-ext)
- --with-jpeg=$(usex jpeg yes no)
- --with-png=$(usex png yes no)
- --with-xft=$(usex xft yes no)
- --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
- --with-configdir="${EPREFIX}"/usr/share/${PN}/config
- --with-dpms-ext
- --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
- --with-proc-interrupts
- --with-randr-ext
- --with-text-file="${EPREFIX}"/etc/gentoo-release
- --with-xdbe-ext
- --with-xf86gamma-ext
- --with-xf86vmode-ext
- --with-xinput-ext
- --with-xkb-ext
- --with-xshm-ext
- --without-gle
- --without-kerberos
- --without-motif
- --with-proc-oom
- --x-includes="${EPREFIX}"/usr/include
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
- )
- # WARNING: This is NOT a normal autoconf script
- econf "${ECONF_OPTS[@]}"
-}
-
-src_compile() {
- # stock target is "default", which is broken in some releases.
- emake all
-}
-
-src_install() {
- use pam && dodir /etc/pam.d/
- emake install_prefix="${D}" DESTDIR="${D}" install
-
- if use fonts; then
- # Do not install fonts with unclear licensing
- rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
-
- # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
- rm -v "${ED}${FONTDIR}"/luximr.ttf || die
-
- font_xfont_config
- else
- rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
- rmdir -v "${ED}${FONTDIR}" || die #812473
- fi
-
- einstalldocs
-
- if use pam; then
- fperms 755 /usr/bin/${PN}
- pamd_mimic_system ${PN} auth
- fi
-
- # bugs #809599, #828869
- if ! use gtk; then
- rm "${ED}/usr/bin/xscreensaver-demo" || die
- fi
-}
-
-pkg_postinst() {
- use fonts && font_pkg_postinst
-
- # bug #811885
- if ! use glx && use opengl; then
- elog "Enable USE='glx' if OpenGL screensavers are crashing."
- fi
-
- optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
- optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
- optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
-}
-
-pkg_postrm() {
- use fonts && font_pkg_postrm
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
index c56932d1468..c724289feed 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.03.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools flag-o-matic font optfeature pam strip-linguas
DESCRIPTION="Modular screen saver and locker for the X Window System"
HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz"
# Font license mapping for folder ./hacks/fonts/ as following:
# clacon.ttf -- MIT
@@ -17,19 +17,16 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- gles? ( !glx opengl )
- glx? ( opengl )
- gtk? ( png )
- opengl? ( png )
+ gles? ( !glx )
?? ( elogind systemd )
+ gtk? ( || ( gdk-pixbuf png ) )
"
COMMON_DEPEND="
- dev-libs/libxml2
+ >=dev-libs/libxml2-2.4.6
x11-apps/appres
x11-apps/xwininfo
x11-libs/libX11
@@ -43,21 +40,19 @@ COMMON_DEPEND="
x11-libs/gdk-pixbuf-xlib
>=x11-libs/gdk-pixbuf-2.42.0:2
)
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
+ gtk? ( >=x11-libs/gtk+-2.22.0:3 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
locking? ( virtual/libcrypt:= )
new-login? (
gdm? ( gnome-base/gdm )
!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
)
- opengl? (
- virtual/glu
- virtual/opengl
- )
+ virtual/glu
+ virtual/opengl
pam? ( sys-libs/pam )
png? ( media-libs/libpng:= )
systemd? ( >=sys-apps/systemd-221 )
- xft? ( x11-libs/libXft )
+ >=x11-libs/libXft-2.1.0
xinerama? ( x11-libs/libXinerama )
"
# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
@@ -89,9 +84,11 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
- "${FILESDIR}"/${PN}-6.01-gtk-detection.patch
"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+ "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
+ "${FILESDIR}"/${PN}-6.05-configure-exit-codes.patch
+ "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
)
DOCS=( README{,.hacking} )
@@ -127,6 +124,7 @@ src_prepare() {
's| Stay.*fucking mask\.$||' \
hacks/glx/covid19.man \
hacks/config/covid19.xml || die
+ eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
fi
config_rpath_update "${S}"/config.rpath
@@ -143,10 +141,6 @@ src_configure() {
unset BC_ENV_ARGS #24568
- # Works similarly to -Werror,
- # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
- filter-flags -pedantic-errors
-
# /proc/interrupts won't always have the keyboard bits needed
# Not clear this does anything in 6.03+(?) but let's keep it for now in case.
# (See also: configure argument)
@@ -162,14 +156,13 @@ src_configure() {
$(use_with glx)
$(use_with gtk)
$(use_with new-login login-manager)
- $(use_with opengl gl)
$(use_with pam)
$(use_with suid setuid-hacks)
$(use_with systemd)
$(use_with xinerama xinerama-ext)
--with-jpeg=$(usex jpeg yes no)
--with-png=$(usex png yes no)
- --with-xft=$(usex xft yes no)
+ --with-xft=yes
--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
--with-configdir="${EPREFIX}"/usr/share/${PN}/config
--with-dpms-ext
@@ -201,7 +194,7 @@ src_compile() {
src_install() {
use pam && dodir /etc/pam.d/
- emake install_prefix="${D}" DESTDIR="${D}" install
+ emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install
if use fonts; then
# Do not install fonts with unclear licensing
@@ -227,13 +220,17 @@ src_install() {
if ! use gtk; then
rm "${ED}/usr/bin/xscreensaver-demo" || die
fi
+ # Makefile installs xscreensaver.service regardless of --without-systemd
+ if ! use systemd; then
+ rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
+ fi
}
pkg_postinst() {
use fonts && font_pkg_postinst
# bug #811885
- if ! use glx && use opengl; then
+ if ! use glx; then
elog "Enable USE='glx' if OpenGL screensavers are crashing."
fi
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
index 300a5d4c25c..a8c07d03c41 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.05-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic font optfeature pam strip-linguas
DESCRIPTION="Modular screen saver and locker for the X Window System"
HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.1.tar.gz"
# Font license mapping for folder ./hacks/fonts/ as following:
# clacon.ttf -- MIT
@@ -18,18 +18,16 @@ SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
LICENSE="BSD fonts? ( MIT Apache-2.0 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive pam +perl +png selinux suid systemd xinerama"
REQUIRED_USE="
- gdk-pixbuf? ( gtk )
- gles? ( !glx opengl )
- glx? ( opengl )
- gtk? ( png )
- opengl? ( png )
+ gles? ( !glx )
?? ( elogind systemd )
+ gtk? ( gdk-pixbuf )
+ pam? ( locking )
"
COMMON_DEPEND="
- dev-libs/libxml2
+ >=dev-libs/libxml2-2.4.6
x11-apps/appres
x11-apps/xwininfo
x11-libs/libX11
@@ -43,21 +41,19 @@ COMMON_DEPEND="
x11-libs/gdk-pixbuf-xlib
>=x11-libs/gdk-pixbuf-2.42.0:2
)
- gtk? ( x11-libs/gtk+:2 )
+ gtk? ( >=x11-libs/gtk+-2.22.0:3 )
jpeg? ( media-libs/libjpeg-turbo:= )
locking? ( virtual/libcrypt:= )
new-login? (
gdm? ( gnome-base/gdm )
!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
)
- opengl? (
- virtual/glu
- virtual/opengl
- )
+ virtual/glu
+ virtual/opengl
pam? ( sys-libs/pam )
png? ( media-libs/libpng:= )
systemd? ( >=sys-apps/systemd-221 )
- xft? ( x11-libs/libXft )
+ >=x11-libs/libXft-2.1.0
xinerama? ( x11-libs/libXinerama )
"
# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
@@ -89,9 +85,11 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
- "${FILESDIR}"/${PN}-6.01-gtk-detection.patch
"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+ "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch
+ "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch
+ "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch
)
DOCS=( README{,.hacking} )
@@ -127,6 +125,7 @@ src_prepare() {
's| Stay.*fucking mask\.$||' \
hacks/glx/covid19.man \
hacks/config/covid19.xml || die
+ eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch"
fi
config_rpath_update "${S}"/config.rpath
@@ -143,10 +142,6 @@ src_configure() {
unset BC_ENV_ARGS #24568
- # Works similarly to -Werror,
- # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
- filter-flags -pedantic-errors
-
# /proc/interrupts won't always have the keyboard bits needed
# Not clear this does anything in 6.03+(?) but let's keep it for now in case.
# (See also: configure argument)
@@ -162,14 +157,13 @@ src_configure() {
$(use_with glx)
$(use_with gtk)
$(use_with new-login login-manager)
- $(use_with opengl gl)
$(use_with pam)
$(use_with suid setuid-hacks)
$(use_with systemd)
$(use_with xinerama xinerama-ext)
--with-jpeg=$(usex jpeg yes no)
--with-png=$(usex png yes no)
- --with-xft=$(usex xft yes no)
+ --with-xft=yes
--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
--with-configdir="${EPREFIX}"/usr/share/${PN}/config
--with-dpms-ext
@@ -201,7 +195,7 @@ src_compile() {
src_install() {
use pam && dodir /etc/pam.d/
- emake install_prefix="${D}" DESTDIR="${D}" install
+ emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install
if use fonts; then
# Do not install fonts with unclear licensing
@@ -227,13 +221,20 @@ src_install() {
if ! use gtk; then
rm "${ED}/usr/bin/xscreensaver-demo" || die
fi
+ # Makefile installs xscreensaver.service regardless of --without-systemd
+ if ! use systemd; then
+ rm "${ED}/usr/share/${PN}/xscreensaver.service" || die
+ fi
+
+ # bug #885989
+ fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth
}
pkg_postinst() {
use fonts && font_pkg_postinst
# bug #811885
- if ! use glx && use opengl; then
+ if ! use glx; then
elog "Enable USE='glx' if OpenGL screensavers are crashing."
fi
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
index 9a57075caf2..f60d3ec97ea 100644
--- a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -20,7 +20,6 @@ RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
"
-BDEPEND=">=dev-util/cmake-3.15"
src_configure() {
local mycmakeargs=(
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
index 560e1574bb6..c68de841d51 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen"
HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
@@ -52,6 +52,8 @@ src_prepare() {
}
src_configure() {
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
}
diff --git a/x11-misc/xsnow/Manifest b/x11-misc/xsnow/Manifest
index 2259f6d239b..947c76d9d52 100644
--- a/x11-misc/xsnow/Manifest
+++ b/x11-misc/xsnow/Manifest
@@ -1,2 +1,3 @@
DIST xsnow-3.3.0.tar.gz 405967 BLAKE2B d2b6d87b781c894c09157ff2f06389d0b1cf401eff735b812ec324560d295195c5afaa3c9c755f569f10f4ff4cd9738dbcc393044dbdebc13454bfeb8e1a9065 SHA512 b2674039ed26c5788a137cf44396b18f07458e926ea0552034d2c78cefaeaffce35ef42f2da386ee48b8b4d8f98960a4a31edfcf737c6d269485785699f9227a
DIST xsnow-3.5.3.tar.gz 474540 BLAKE2B 8b7e841cb2cefe44787b8457d55cc526114b09d7f1f4c435d89519b49295ac89ca73d15a026e2d7095e0f450775ea59763c7d253026fefcc90241390b5d17142 SHA512 e1172660c4fd344454a7b1619321cfe773d35430311f108c6aa7b04f8da7fe4fdf2886a7cd8b4093ad7d2f6fbb0046a12b29598b6ab46d3ad35f8eadb76ff0a5
+DIST xsnow-3.6.0.tar.gz 495875 BLAKE2B 9ebc87254ce81b7fd051bbc0170faa7198390679a8dbaccdfa3674b1f584ad298fa73506b7eb8ff63fe04f168ebafcd30bc2101510c4e912e029edefe4813c65 SHA512 e2684e6d011a8add8819e16b6b649f8d501525c41a4baa0ef32d90b7603e30910a77093c2d21f52a7adb72f0ba18076f9265557e70dc246b365e0fd2b8ed4ab1
diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml
index 96729a07e76..bf049228080 100644
--- a/x11-misc/xsnow/metadata.xml
+++ b/x11-misc/xsnow/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="person">
<email>dilfridge@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type='sourceforge'>xsnow</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/xsnow/xsnow-3.5.3.ebuild b/x11-misc/xsnow/xsnow-3.5.3-r1.ebuild
index e0918534a97..d57c9e3051f 100644
--- a/x11-misc/xsnow/xsnow-3.5.3.ebuild
+++ b/x11-misc/xsnow/xsnow-3.5.3-r1.ebuild
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="
dev-libs/glib:2
+ sci-libs/gsl:=
sys-apps/dbus
x11-libs/cairo
x11-libs/gtk+:3
diff --git a/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild
new file mode 100644
index 00000000000..b1390bb2529
--- /dev/null
+++ b/x11-misc/xsnow/xsnow-3.6.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools xdg
+
+DESCRIPTION="let it snow on your desktop and windows"
+HOMEPAGE="https://www.ratrabbit.nl/ratrabbit/xsnow/"
+SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ dev-libs/glib:2
+ sci-libs/gsl:=
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpm
+ x11-libs/libXtst
+ x11-libs/libxkbcommon
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.7-gamesdir.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ # Install xscreensaver hack, which calls xsnow with the correct
+ # arguments. xscreensaver calls all hacks with --root, however xsnow
+ # only understands -root and will exit with an error if an unknown
+ # argument (--root) is provided.
+ exeinto usr/$(get_libdir)/misc/xscreensaver
+ newexe - xsnow <<-EOF
+ #/usr/bin/env bash
+ exec "${EPREFIX}/usr/bin/xsnow" -nomenu -root
+EOF
+}
diff --git a/x11-misc/xtermcontrol/metadata.xml b/x11-misc/xtermcontrol/metadata.xml
index 0f96e73da2a..07b403500c2 100644
--- a/x11-misc/xtermcontrol/metadata.xml
+++ b/x11-misc/xtermcontrol/metadata.xml
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>x11@gentoo.org</email>
- <name>X11</name>
-</maintainer>
-<longdescription>
-xtermcontrol enables dynamic control of xterm properties.
-It makes it easy to change colors, title, font and geometry of a running xterm,
-as well as to report the current settings of the aforementioned properties.
-Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported.
-To complete the feature set; xtermcontrol lets advanced users issue any xterm control
-sequence of their choosing.
-</longdescription>
+ <maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+ <longdescription>
+ xtermcontrol enables dynamic control of xterm properties.
+ It makes it easy to change colors, title, font and geometry of a running xterm,
+ as well as to report the current settings of the aforementioned properties.
+ Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported.
+ To complete the feature set; xtermcontrol lets advanced users issue any xterm control
+ sequence of their choosing.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">JessThrysoee/xtermcontrol</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/xtitle/metadata.xml b/x11-misc/xtitle/metadata.xml
index 2c47fcf0059..115e9d64a66 100644
--- a/x11-misc/xtitle/metadata.xml
+++ b/x11-misc/xtitle/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zlogene@gentoo.org</email>
- <name>Mikle Kolyada</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index f6dfa47f234..c8cafd651d2 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
HOMEPAGE="http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README"
@@ -25,6 +25,8 @@ BDEPEND="
>=x11-misc/imake-1.0.8-r1"
src_configure() {
+ append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
}
diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest
index e5f25cc108a..ef075996f29 100644
--- a/x11-misc/xvfb-run/Manifest
+++ b/x11-misc/xvfb-run/Manifest
@@ -1,3 +1,2 @@
-DIST xorg-server_1.20.10-2.diff.gz 152303 BLAKE2B beb1d07e86378a62bad956990ee210375c3cfa0135acd51e2756c0ddc2933d13092e400a53909a72755b3c1dfb31faa32a137c7ff719fdb8dcc23f11cca72e05 SHA512 c19e16764720b79df53b8032947ca64bb4ca0b9c380d4c2e3317c37b6fa2937815de01e82019ec93921919690c0a5ae1b59bf1fae189d8f7e9e80fb4860fd713
DIST xorg-server_1.20.10-3.diff.gz 152420 BLAKE2B e87d8800a905962cf3ddeb41e5e9cf0962c5b3ff16ee8ce4d31de96a3d94798fc70dee4ee3f05759d16758f2083436fb91c212ab22f719bd3f086fac51ee5d73 SHA512 16fffd2c92d30c985f55093f46249440388a1eeeca9bd70cd06883f75052170c9717925b18dd01b16ce55d03758bbbf5f2b10c76de00f752b3e7ff64e74e646d
-DIST xorg-server_1.20.8-2.diff.gz 171769 BLAKE2B 5572320e4bc1de63ba221e5c9804d6676cc7c918d417b4069572fec4385d62b73e5636a4f17eebb1897f410e323e190dff68056abd888373df4ccdd688ed7c47 SHA512 89115023fc802a3cf2fc21fabed4499112b1e6f52967eb134795f041194b05d86c59b1477d8b9001c2935efdeb64e8a0dd281a43a6252802df2d19349972f7d7
+DIST xorg-server_21.1.4-3.diff.gz 163364 BLAKE2B 66211f1b0c2332266af6e317ebbb2e21fe03e32b9c3f1ef7b71df045fe0694162aa62b27f2f7e6e6b72aaa365334a0acf98880674111e57d4042c49ac6521563 SHA512 e0a3805a4a4dce9e7851aca586d808723cbca09da4ce3191d1602497469a4240bffb68835a343e28b6eb2a50f7c815fac12378c08bdcc62b88cb488f13d6c966
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
deleted file mode 100644
index 8e246007a20..00000000000
--- a/x11-misc/xvfb-run/xvfb-run-1.20.10_p2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=xorg-server
-MY_PV=${PV/_p/-}
-DESCRIPTION="Run a command in a virtual X server environment"
-HOMEPAGE="https://packages.debian.org/sid/xvfb"
-SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/patchutils"
-RDEPEND="x11-apps/xauth
- x11-base/xorg-server[xvfb]"
-
-S="${WORKDIR}"/
-
-src_prepare() {
- # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare"
- filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die
- eapply_user
-}
-
-src_install() {
- doman ${PN}.1
- dobin ${PN}
-}
diff --git a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.4.3.ebuild
index 99fd0aba31d..2d1dd7dabee 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.20.8_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-21.1.4.3.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MY_PN=xorg-server
-MY_PV=${PV/_p/-}
+MY_PV="$(ver_cut 1-3)-$(ver_cut 4)"
DESCRIPTION="Run a command in a virtual X server environment"
HOMEPAGE="https://packages.debian.org/sid/xvfb"
SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE=""
DEPEND="dev-util/patchutils"
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 4ed875a7efd..e2b02b40ab6 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,5 +1,2 @@
-DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
-DIST zim-0.74.0.tar.gz 2917916 BLAKE2B 32b1086395142d07b46425264e3ee6d6782d62f138fb661c0bc392b09054f0664e7a2d8b75f409a843b1e85c93a11e41e041019f69ef657e11d311253ba804ae SHA512 39e3849c14bc474b90583a708c8ead287b27a8eb5f714ad63f168f205fb6584c4ff2f9df45755aa3e3b012639891587c7153ae4e0fef71276241ddce6e32c01f
-DIST zim-0.74.1.tar.gz 2994036 BLAKE2B 9de89ce74bc08ec0b60f34d693ffdb3b8220efe6f03e3d77686c9d3db135713d7eb5e0beed35eb6f979e489f12b9d65b9b66e0e7449c45b955711684154ae6b8 SHA512 f78bf1ee6082488efe2e581984c85ffbddbfb7e5adfdf491232e93a8376580275f329e2d02c482afd70bbc70f62ca6f0b3bce636cff58b0a1d592dd4b8194e3a
-DIST zim-0.74.2.tar.gz 3008954 BLAKE2B d0ecf666804931412f6e32aef54193ed96c67049e0fd3e7a373973d4826f16a9483eaa0940cc953573c104c704115905b036e5d0355961c0be86bebc6189bd9a SHA512 112c1e9d28a10643711f665e03c8a37259637b3471338aaca0a834afcc96c658ca5bf863e63bd5f01ce1fcdfb3eef3f2dcf1d10f8113d2158af2e91234b023b9
DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d
+DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5
diff --git a/x11-misc/zim/zim-0.73.5.ebuild b/x11-misc/zim/zim-0.73.5.ebuild
deleted file mode 100644
index db96dd8a545..00000000000
--- a/x11-misc/zim/zim-0.73.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
- https://zim-wiki.org/
- https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-RESTRICT="test"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- ')
- x11-libs/gtk+:3[introspection]
- x11-misc/xdg-utils
-"
-DEPEND="
- ${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
- sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
- if [[ ${LINGUAS} ]]; then
- local lingua
- for lingua in translations/*.po; do
- lingua=${lingua/.po}
- lingua=${lingua/translations\/}
- has ${lingua} ${LINGUAS} || \
- { rm translations/${lingua}.po || die; }
- done
- fi
-
- distutils-r1_python_prepare_all
- export XDG_RUNTIME_DIR=fakethis
-}
-
-python_install() {
- distutils-r1_python_install
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- if ! has_version ${CATEGORY}/${PN}; then
- elog "Please install these packages for additional functionality"
- elog " dev-lang/R"
- elog " dev-python/gtkspell-python"
- elog " dev-vcs/bzr"
- elog " media-gfx/graphviz"
- elog " media-gfx/imagemagick"
- elog " media-gfx/scrot"
- elog " media-sound/lilypond"
- elog " sci-visualization/gnuplot"
- elog " virtual/latex-base app-text/dvipng"
- fi
-}
diff --git a/x11-misc/zim/zim-0.74.0.ebuild b/x11-misc/zim/zim-0.74.0.ebuild
deleted file mode 100644
index 131369dc028..00000000000
--- a/x11-misc/zim/zim-0.74.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
- https://zim-wiki.org/
- https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- ')
- x11-libs/gtk+:3[introspection]
- x11-misc/xdg-utils
-"
-DEPEND="
- ${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
- sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
- if [[ ${LINGUAS} ]]; then
- local lingua
- for lingua in translations/*.po; do
- lingua=${lingua/.po}
- lingua=${lingua/translations\/}
- has ${lingua} ${LINGUAS} || \
- { rm translations/${lingua}.po || die; }
- done
- fi
-
- distutils-r1_python_prepare_all
- export XDG_RUNTIME_DIR=fakethis
-}
-
-python_install() {
- distutils-r1_python_install
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- if ! has_version ${CATEGORY}/${PN}; then
- elog "Please install these packages for additional functionality"
- elog " dev-lang/R"
- elog " dev-python/gtkspell-python"
- elog " dev-vcs/bzr"
- elog " media-gfx/graphviz"
- elog " media-gfx/imagemagick"
- elog " media-gfx/scrot"
- elog " media-sound/lilypond"
- elog " sci-visualization/gnuplot"
- elog " virtual/latex-base app-text/dvipng"
- fi
-}
diff --git a/x11-misc/zim/zim-0.74.2.ebuild b/x11-misc/zim/zim-0.74.2.ebuild
deleted file mode 100644
index 131369dc028..00000000000
--- a/x11-misc/zim/zim-0.74.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
- https://zim-wiki.org/
- https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- ')
- x11-libs/gtk+:3[introspection]
- x11-misc/xdg-utils
-"
-DEPEND="
- ${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
- sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
- if [[ ${LINGUAS} ]]; then
- local lingua
- for lingua in translations/*.po; do
- lingua=${lingua/.po}
- lingua=${lingua/translations\/}
- has ${lingua} ${LINGUAS} || \
- { rm translations/${lingua}.po || die; }
- done
- fi
-
- distutils-r1_python_prepare_all
- export XDG_RUNTIME_DIR=fakethis
-}
-
-python_install() {
- distutils-r1_python_install
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- if ! has_version ${CATEGORY}/${PN}; then
- elog "Please install these packages for additional functionality"
- elog " dev-lang/R"
- elog " dev-python/gtkspell-python"
- elog " dev-vcs/bzr"
- elog " media-gfx/graphviz"
- elog " media-gfx/imagemagick"
- elog " media-gfx/scrot"
- elog " media-sound/lilypond"
- elog " sci-visualization/gnuplot"
- elog " virtual/latex-base app-text/dvipng"
- fi
-}
diff --git a/x11-misc/zim/zim-0.74.3.ebuild b/x11-misc/zim/zim-0.74.3.ebuild
index 04a70d299ef..c29427e989c 100644
--- a/x11-misc/zim/zim-0.74.3.ebuild
+++ b/x11-misc/zim/zim-0.74.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{9,10} )
PYTHON_REQ_USE="sqlite"
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS=no
@@ -60,8 +60,8 @@ pkg_postinst() {
xdg_pkg_postinst
if ! has_version ${CATEGORY}/${PN}; then
elog "Please install these packages for additional functionality"
+ elog " app-text/gtkspell[introspection]"
elog " dev-lang/R"
- elog " dev-python/gtkspell-python"
elog " dev-vcs/bzr"
elog " media-gfx/graphviz"
elog " media-gfx/imagemagick"
diff --git a/x11-misc/zim/zim-0.74.1.ebuild b/x11-misc/zim/zim-0.75.1.ebuild
index 131369dc028..c5d76bac3fa 100644
--- a/x11-misc/zim/zim-0.74.1.ebuild
+++ b/x11-misc/zim/zim-0.75.1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517=setuptools
DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
+VIRTUALX_REQUIRED=test
+inherit distutils-r1 optfeature virtualx xdg
DESCRIPTION="A desktop wiki"
HOMEPAGE="
@@ -18,7 +20,6 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
LICENSE="BSD GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
RDEPEND="
$(python_gen_cond_dep '
@@ -28,16 +29,13 @@ RDEPEND="
x11-libs/gtk+:3[introspection]
x11-misc/xdg-utils
"
-DEPEND="
- ${RDEPEND}
-"
+DEPEND="${RDEPEND}"
+
DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
python_prepare_all() {
- sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
if [[ ${LINGUAS} ]]; then
local lingua
for lingua in translations/*.po; do
@@ -52,22 +50,31 @@ python_prepare_all() {
export XDG_RUNTIME_DIR=fakethis
}
-python_install() {
- distutils-r1_python_install
+python_test() {
+ if has_version dev-vcs/git; then
+ git config --global user.email "git@example.com" || die
+ git config --global user.name "GitExample" || die
+ fi
+
+ virtx ./test.py
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ insinto /usr/share/icons
+ doins -r xdg/hicolor
}
pkg_postinst() {
xdg_pkg_postinst
- if ! has_version ${CATEGORY}/${PN}; then
- elog "Please install these packages for additional functionality"
- elog " dev-lang/R"
- elog " dev-python/gtkspell-python"
- elog " dev-vcs/bzr"
- elog " media-gfx/graphviz"
- elog " media-gfx/imagemagick"
- elog " media-gfx/scrot"
- elog " media-sound/lilypond"
- elog " sci-visualization/gnuplot"
- elog " virtual/latex-base app-text/dvipng"
- fi
+
+ optfeature "Spell checker" app-text/gtkspell[introspection]
+ optfeature "GNU R Plot Editor" dev-lang/R
+ optfeature "Version control Bazaar support" dev-vcs/bzr
+ optfeature "Diagram Editor" media-gfx/graphviz
+ optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot"
+ optfeature "Score Editor" media-sound/lilypond
+ optfeature "Gnuplot Editor" sci-visualization/gnuplot
+ optfeature "Equation Editor" virtual/latex-base app-text/dvipng
}