summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/accessx/accessx-0951-r3.ebuild (renamed from x11-misc/accessx/accessx-0951-r2.ebuild)27
-rw-r--r--x11-misc/alacarte/Manifest1
-rw-r--r--x11-misc/alacarte/alacarte-3.44.1.ebuild36
-rw-r--r--x11-misc/alacarte/alacarte-3.44.2.ebuild2
-rw-r--r--x11-misc/albert/Manifest5
-rw-r--r--x11-misc/albert/albert-0.17.3.ebuild94
-rw-r--r--x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch33
-rw-r--r--x11-misc/albert/metadata.xml2
-rw-r--r--x11-misc/appmenu-gtk-module/Manifest2
-rw-r--r--x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild (renamed from x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild)38
-rw-r--r--x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch10
-rw-r--r--x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch28
-rw-r--r--x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch56
-rw-r--r--x11-misc/appmenu-gtk-module/metadata.xml5
-rw-r--r--x11-misc/autocutsel/Manifest1
-rw-r--r--x11-misc/autocutsel/autocutsel-0.10.0.ebuild24
-rw-r--r--x11-misc/autocutsel/autocutsel-0.10.1.ebuild2
-rw-r--r--x11-misc/bbcd/bbcd-0.3.1-r5.ebuild44
-rw-r--r--x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild12
-rw-r--r--x11-misc/bumblebee/bumblebee-9999.ebuild12
-rw-r--r--x11-misc/bumblebee/metadata.xml4
-rw-r--r--x11-misc/cbatticon/Manifest1
-rw-r--r--x11-misc/cbatticon/cbatticon-1.6.12.ebuild49
-rw-r--r--x11-misc/cbatticon/cbatticon-1.6.13.ebuild2
-rw-r--r--x11-misc/colord/metadata.xml3
-rw-r--r--x11-misc/compose-tables/Manifest1
-rw-r--r--x11-misc/compose-tables/compose-tables-1.7.5.ebuild42
-rw-r--r--x11-misc/compose-tables/compose-tables-1.8.1.ebuild2
-rw-r--r--x11-misc/devilspie/devilspie-0.23-r2.ebuild9
-rw-r--r--x11-misc/dunst/Manifest1
-rw-r--r--x11-misc/dunst/dunst-1.8.1.ebuild79
-rw-r--r--x11-misc/dunst/dunst-1.9.0.ebuild2
-rw-r--r--x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild (renamed from x11-misc/fbdesk/fbdesk-1.4.1.ebuild)4
-rw-r--r--x11-misc/fireflies/fireflies-2.08-r1.ebuild5
-rw-r--r--x11-misc/gmrun/Manifest1
-rw-r--r--x11-misc/gmrun/gmrun-1.4w.ebuild36
-rw-r--r--x11-misc/gmrun/metadata.xml15
-rw-r--r--x11-misc/grsync/Manifest2
-rw-r--r--x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch36
-rw-r--r--x11-misc/grsync/grsync-1.2.6.ebuild26
-rw-r--r--x11-misc/grsync/grsync-1.2.8.ebuild28
-rw-r--r--x11-misc/grsync/grsync-1.3.0.ebuild4
-rw-r--r--x11-misc/i3lock/i3lock-2.14.1.ebuild2
-rw-r--r--x11-misc/idesk/Manifest2
-rw-r--r--x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch40
-rw-r--r--x11-misc/idesk/idesk-0.7.8.ebuild (renamed from x11-misc/idesk/idesk-1.ebuild)31
-rw-r--r--x11-misc/idesk/metadata.xml2
-rw-r--r--x11-misc/kapow/kapow-1.5.10.ebuild16
-rw-r--r--x11-misc/kronometer/Manifest1
-rw-r--r--x11-misc/kronometer/kronometer-2.2.80.ebuild33
-rw-r--r--x11-misc/libinput-gestures/Manifest1
-rw-r--r--x11-misc/libinput-gestures/libinput-gestures-2.56.ebuild53
-rw-r--r--x11-misc/libinput-gestures/libinput-gestures-9999.ebuild53
-rw-r--r--x11-misc/lightdm/Manifest1
-rw-r--r--x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch42
-rw-r--r--x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch26
-rw-r--r--x11-misc/lightdm/lightdm-1.30.0-r3.ebuild5
-rw-r--r--x11-misc/lightdm/lightdm-1.32.0.ebuild153
-rw-r--r--x11-misc/lightdm/metadata.xml2
-rw-r--r--x11-misc/mate-notification-daemon/Manifest1
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild63
-rw-r--r--x11-misc/menulibre/menulibre-2.2.3.ebuild2
-rw-r--r--x11-misc/mozo/mozo-1.24.0-r1.ebuild4
-rw-r--r--x11-misc/mozo/mozo-1.24.1.ebuild2
-rw-r--r--x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild4
-rw-r--r--x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild2
-rw-r--r--x11-misc/obmenu-generator/Manifest1
-rw-r--r--x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild36
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild2
-rw-r--r--x11-misc/picom/picom-8.2-r2.ebuild2
-rw-r--r--x11-misc/picom/picom-8.2-r3.ebuild2
-rw-r--r--x11-misc/picom/picom-9.1.ebuild2
-rw-r--r--x11-misc/picom/picom-9999.ebuild2
-rw-r--r--x11-misc/polybar/Manifest5
-rw-r--r--x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch13
-rw-r--r--x11-misc/polybar/polybar-3.5.7.ebuild71
-rw-r--r--x11-misc/polybar/polybar-3.6.2.ebuild61
-rw-r--r--x11-misc/polybar/polybar-3.6.3-r1.ebuild (renamed from x11-misc/polybar/polybar-3.6.1.ebuild)5
-rw-r--r--x11-misc/polybar/polybar-3.6.3.ebuild2
-rw-r--r--x11-misc/primus/metadata.xml5
-rw-r--r--x11-misc/py3status/Manifest2
-rw-r--r--x11-misc/py3status/py3status-3.46.ebuild (renamed from x11-misc/py3status/py3status-3.45.ebuild)0
-rw-r--r--x11-misc/qlipper/qlipper-5.1.2.ebuild11
-rw-r--r--x11-misc/qps/qps-2.5.0.ebuild2
-rw-r--r--x11-misc/redshift/redshift-1.12-r3.ebuild87
-rw-r--r--x11-misc/redshift/redshift-1.12-r4.ebuild90
-rw-r--r--x11-misc/redshift/redshift-1.12-r5.ebuild94
-rw-r--r--x11-misc/rofi/Manifest2
-rw-r--r--x11-misc/rofi/rofi-1.7.5.ebuild (renamed from x11-misc/rofi/rofi-1.7.2.ebuild)20
-rw-r--r--x11-misc/screengrab/screengrab-2.4.0.ebuild2
-rw-r--r--x11-misc/sent/sent-1-r1.ebuild2
-rw-r--r--x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch14
-rw-r--r--x11-misc/skippy/skippy-0.5.0-r2.ebuild (renamed from x11-misc/skippy/skippy-0.5.0-r1.ebuild)6
-rw-r--r--x11-misc/snixembed/metadata.xml3
-rw-r--r--x11-misc/sunflower/Manifest2
-rw-r--r--x11-misc/sunflower/sunflower-0.5-r1.ebuild (renamed from x11-misc/sunflower/sunflower-0.4_p20200716-r2.ebuild)17
-rw-r--r--x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild2
-rw-r--r--x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild40
-rw-r--r--x11-misc/urxvt-perls/metadata.xml5
-rw-r--r--x11-misc/urxvt-tabbedex/Manifest1
-rw-r--r--x11-misc/urxvt-tabbedex/metadata.xml5
-rw-r--r--x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild30
-rw-r--r--x11-misc/vdpauinfo/Manifest2
-rw-r--r--x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild (renamed from x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild)11
-rw-r--r--x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch140
-rw-r--r--x11-misc/virtualgl/metadata.xml5
-rw-r--r--x11-misc/virtualgl/virtualgl-3.0-r1.ebuild1
-rw-r--r--x11-misc/virtualgl/virtualgl-3.0.1.ebuild8
-rw-r--r--x11-misc/wmctrl/files/amd64-Xlib.patch28
-rw-r--r--x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch12
-rw-r--r--x11-misc/wmctrl/wmctrl-1.07-r3.ebuild (renamed from x11-misc/wmctrl/wmctrl-1.07-r2.ebuild)17
-rw-r--r--x11-misc/xautolock/metadata.xml16
-rw-r--r--x11-misc/xautolock/xautolock-2.2_p7.ebuild4
-rw-r--r--x11-misc/xbindkeys/Manifest1
-rw-r--r--x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch28
-rw-r--r--x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild29
-rw-r--r--x11-misc/xclip/xclip-0.13.ebuild2
-rw-r--r--x11-misc/xclip/xclip-9999.ebuild2
-rw-r--r--x11-misc/xdaliclock/Manifest1
-rw-r--r--x11-misc/xdaliclock/files/xdaliclock-2.47-DESTDIR.patch59
-rw-r--r--x11-misc/xdaliclock/xdaliclock-2.47.ebuild59
-rw-r--r--x11-misc/xdg-user-dirs/Manifest1
-rw-r--r--x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch31
-rw-r--r--x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild30
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild2
-rw-r--r--x11-misc/xidle/xidle-26052015-r1.ebuild (renamed from x11-misc/xidle/xidle-26052015.ebuild)23
-rw-r--r--x11-misc/xmobar/Manifest2
-rw-r--r--x11-misc/xmobar/metadata.xml31
-rw-r--r--x11-misc/xmobar/xmobar-0.44.1.ebuild (renamed from x11-misc/xmobar/xmobar-0.37.ebuild)34
-rw-r--r--x11-misc/xosview/Manifest2
-rw-r--r--x11-misc/xosview/xosview-1.20-r1.ebuild57
-rw-r--r--x11-misc/xosview/xosview-1.22.ebuild57
-rw-r--r--x11-misc/xpad/xpad-5.8.0.ebuild2
-rw-r--r--x11-misc/xprintidle/Manifest1
-rw-r--r--x11-misc/xprintidle/xprintidle-2.0.ebuild36
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.04.ebuild2
-rw-r--r--x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch75
-rw-r--r--x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild (renamed from x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild)16
-rw-r--r--x11-misc/xssstate/files/xssstate-1.1-libdir.patch23
-rw-r--r--x11-misc/xssstate/xssstate-1.1-r1.ebuild42
-rw-r--r--x11-misc/xwallpaper/Manifest1
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild50
-rw-r--r--x11-misc/xwallpaper/xwallpaper-9999.ebuild2
143 files changed, 1563 insertions, 1355 deletions
diff --git a/x11-misc/accessx/accessx-0951-r2.ebuild b/x11-misc/accessx/accessx-0951-r3.ebuild
index effe98e9c55..852c3f4ae74 100644
--- a/x11-misc/accessx/accessx-0951-r2.ebuild
+++ b/x11-misc/accessx/accessx-0951-r3.ebuild
@@ -1,39 +1,44 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="Interface to the XKEYBOARD extension in X11"
HOMEPAGE="http://cita.disability.uiuc.edu/software/accessx/freewareaccessx.php"
SRC_URI="http://cmos-eng.rehab.uiuc.edu/${PN}/software/${PN}${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
+RDEPEND="
+ dev-lang/tk:=
+ x11-libs/libX11
x11-libs/libXext
- dev-lang/tk:0="
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+)
src_prepare() {
default
+
sed -i \
-e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \
Makefile || die
}
src_compile() {
- emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" XLIBDIR="-L/usr/$(get_libdir)" \
+ emake \
+ CC="$(tc-getCXX)" \
+ OPTS="${CXXFLAGS}" \
+ XLIBDIR="-L${ESYSROOT}/usr/$(get_libdir)" \
LLIBS="$($(tc-getPKG_CONFIG) --libs xext) $($(tc-getPKG_CONFIG) --libs x11)"
}
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 645bbbe9999..635e21745e2 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,2 +1 @@
-DIST alacarte-3.44.1.tar.xz 253364 BLAKE2B ebd542430f909291d06c1094aac52f87760547013f012167fa5616609251a6cb48b258122424a119b3ab10e6e2289d9a282dd66da3dcf5590b09d9c686a8934b SHA512 84b1cebdcbb53e2cca5a1425829b00db0b2a11e308584ea96179c2d0451d8c77fa6a995ae4671a024fab72869c7d2e9986dc310bfab38fe8b7b2f54d383501ca
DIST alacarte-3.44.2.tar.xz 253580 BLAKE2B 206eea28b50ef6d0cf228031ff72c16c6ebd130dfa623b96eb727ef62aad3db0003f3a97bc188f4b8a0e9d18cc184a9230fb332131d37afb0abe71dc3d13ee1e SHA512 b62c15ca37717e988b1d64f0ab565970ae15a4bc11a3f31da8574a0b4f10a9cf8b94d0a85be34d871c106ab34c63b2dfbf535b46eb630829e73c14023b99053e
diff --git a/x11-misc/alacarte/alacarte-3.44.1.ebuild b/x11-misc/alacarte/alacarte-3.44.1.ebuild
deleted file mode 100644
index bd4396e3b88..00000000000
--- a/x11-misc/alacarte/alacarte-3.44.1.ebuild
+++ /dev/null
@@ -1,36 +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} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
- >=gnome-base/gnome-menus-3.5.3:3[introspection]
-"
-RDEPEND="${DEPEND}
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
-"
-BDEPEND="
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_install() {
- gnome2_src_install
- python_optimize
-}
diff --git a/x11-misc/alacarte/alacarte-3.44.2.ebuild b/x11-misc/alacarte/alacarte-3.44.2.ebuild
index 933c87cb4a3..f5d5418af06 100644
--- a/x11-misc/alacarte/alacarte-3.44.2.ebuild
+++ b/x11-misc/alacarte/alacarte-3.44.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index 1c8475d3735..6fa10387b2e 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -4,3 +4,8 @@ DIST albert-0.17.2-pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b
DIST albert-0.17.2-python-extensions.tar.gz 483617 BLAKE2B 34a1b8626c17d0297294be5cd77fe3f9b4abd985541bd995d1665e5e4a3a9dd64b393c5aba6f00347e0a4c031df2a04672246caff1038858df286c271dd33975 SHA512 13e14ce180787cde9abd0c06970109d9217f67e0b4596d73768efb1a183f6493552766e89bea6fc83703a4c0cc1b4961459cbbf5953c530d2c09d53e686ccc53
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-jetbrains-python-extension-b7157473cc923fe4f15023c85a032eeab3627652.tar.gz 17062 BLAKE2B fa5da8a7df5e1bb337af75a30b7fbb2584eaa49745d14e88eeea18037d70c55e9885fdbeaeab8aaaa94531e73286c69e14b4864011875d59dcb790a10fd91e88 SHA512 53b9a0d9f972dd495648dd563df8d3b1c973aa02dce99ce7bb8a9da3bcf43174094d5a03035fbaf132072d834ccf918b17076d4f522265bea77c4220140b31de
+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
new file mode 100644
index 00000000000..eab6ec58d30
--- /dev/null
+++ b/x11-misc/albert/albert-0.17.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-single-r1 xdg-utils
+
+DESCRIPTION="A fast and flexible keyboard launcher"
+HOMEPAGE="https://albertlauncher.github.io/"
+
+PLUGINS_HASH="ee55048e138028b4889d71e0574e85b2c4d69541"
+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}/${P}-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/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch b/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch
new file mode 100644
index 00000000000..943e5d8acf2
--- /dev/null
+++ b/x11-misc/albert/files/albert-0.17.3-find-and-use-python-libraries-and-headers.patch
@@ -0,0 +1,33 @@
+From aa89c47db62163eddea623beb48f7ffd8d76062c Mon Sep 17 00:00:00 2001
+From: Buchan Milne <bgmilne@gmail.com>
+Date: Thu, 14 Jun 2018 08:10:31 +0200
+Subject: [PATCH] Find and use python libraries and headers
+
+---
+ plugins/python/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plugins/python/CMakeLists.txt b/plugins/python/CMakeLists.txt
+index 2dd085d..0dc9b91 100644
+--- a/plugins/python/CMakeLists.txt
++++ b/plugins/python/CMakeLists.txt
+@@ -5,7 +5,8 @@ PROJECT(python)
+ FILE(GLOB_RECURSE SRC src/*)
+
+ find_package(Qt5 5.5.0 REQUIRED COMPONENTS Widgets)
+-add_subdirectory(pybind11)
++find_package(PythonLibs)
++include_directories(${PYTHON_INCLUDE_DIRS})
+
+ add_library(${PROJECT_NAME} SHARED ${SRC} ${PROJECT_NAME}.qrc metadata.json)
+
+@@ -14,8 +15,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE src/)
+ target_link_libraries(${PROJECT_NAME}
+ PUBLIC
+ Qt5::Widgets
++ ${PYTHON_LIBRARIES}
+ PRIVATE
+- pybind11::embed
+ albert::lib
+ xdg
+ )
diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml
index a7f644f7bbd..954705f29c0 100644
--- a/x11-misc/albert/metadata.xml
+++ b/x11-misc/albert/metadata.xml
@@ -16,6 +16,6 @@
<flag name="debug">Enable debugging informations</flag>
<flag name="python-extensions">Install default python extensions system-wide</flag>
<flag name="statistics">Enable local statistics</flag>
- <flag name="virtualbox">Enable app-emulation/virtualbox extension</flag>
+ <flag name="virtualbox">Enable <pkg>app-emulation/virtualbox</pkg> extension</flag>
</use>
</pkgmetadata>
diff --git a/x11-misc/appmenu-gtk-module/Manifest b/x11-misc/appmenu-gtk-module/Manifest
index 2ab8f70f6a5..a2be37478ac 100644
--- a/x11-misc/appmenu-gtk-module/Manifest
+++ b/x11-misc/appmenu-gtk-module/Manifest
@@ -1 +1 @@
-DIST appmenu-gtk-module-0.7.3.tar.xz 48460 BLAKE2B b7008aa618e643a95445aad25bc19eed5b887810891318a891f088284f8f128e6392671226742a8b0c70699a9455739ee61ed56aec32129532ba53dc69809913 SHA512 d7df7e3cea3ccb66d013b23ae8796b8cbb0e0787f37f54078715c4863797c28d44ff38d7ac965b6eb0fd5cb327c1a4b891c74c66ba95b9b9a06e2c06ba5b2ad8
+DIST appmenu-gtk-module-0.7.6.tar.xz 41212 BLAKE2B 7d37107e36502e44a38a1dc4e7ab02a761ec368b791182b223a4ae2631bad2eb52d9fec913ae0274f95f15a1cfbefb47f4807f1e83e8e3985fd4af7c6f0d075b SHA512 6efad2a13a04ae0a2a5e87fdc62eb7a37c8c85051339a3774fd8b579eea97b4633b10e064325205b3f10597530bab003deae24986c3175429a899c292e8786d5
diff --git a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild
index 46a05319bac..a711dd4c2b5 100644
--- a/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild
+++ b/x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.6.ebuild
@@ -1,48 +1,48 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake gnome2-utils systemd
+inherit gnome2-utils meson systemd
DESCRIPTION="Application menu module for GTK"
HOMEPAGE="https://gitlab.com/vala-panel-project/vala-panel-appmenu"
-SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/570a2d1a65e77d42cb19e5972d0d1b84/${P}.tar.xz"
+SRC_URI="https://gitlab.com/vala-panel-project/vala-panel-appmenu/uploads/e0b6a32a340922cd05060292b0757162/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="LGPL-3+"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="wayland"
+IUSE="gtk2 wayland"
RDEPEND="
dev-libs/glib[dbus]
- >=x11-libs/gtk+-2.24.0:2
>=x11-libs/gtk+-3.22.0:3[wayland=]
+ gtk2? ( >=x11-libs/gtk+-2.24.0:2 )
"
DEPEND="${RDEPEND}
- dev-libs/wayland
+ wayland? ( dev-libs/wayland )
"
+BDEPEND="virtual/pkgconfig"
-src_prepare() {
- cmake_src_prepare
- sed -i -e "/^pkg_check_modules(SYSTEMD/d" data/CMakeLists.txt || die
-}
+PATCHES=(
+ "${FILESDIR}/${P}-no-automagic-gtk.patch"
+ "${FILESDIR}/${P}-no-automagic-unitdir.patch"
+ "${FILESDIR}/${P}-fix-pkgconfig.patch"
+)
src_configure() {
- local mycmakeargs=(
- -DGSETTINGS_COMPILE=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_VCM=ON
- )
- cmake_src_configure
+ # outputs [ '2', '3' ] OR [ '3' ]
+ local gtks="[$(usex gtk2 " '2'," '') '3' ]"
+
+ meson_src_configure -Dgtk="${gtks}" -Duserunitdir="$(systemd_get_userunitdir)"
}
src_install() {
- cmake_src_install
+ meson_src_install
exeinto /etc/X11/xinit/xinitrc.d
newexe "${FILESDIR}"/${PN} 85-${PN}
-
- systemd_dounit "${BUILD_DIR}"/data/appmenu-gtk-module.service
}
pkg_postinst() {
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch
new file mode 100644
index 00000000000..f8b5439b28c
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-fix-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/meson.build 2020-10-28 22:05:23.000000000 +0100
++++ b/meson.build 2022-07-17 09:53:55.047880112 +0200
+@@ -1,6 +1,6 @@
+ project('appmenu-gtk-module', 'c',
+ meson_version: '>=0.49.0',
+- version: '0.7',
++ version: '0.7.6',
+ license: ['LGPL-3.0-or-later'],
+ default_options: [
+ 'c_std=gnu11',
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch
new file mode 100644
index 00000000000..716aefa3761
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-gtk.patch
@@ -0,0 +1,28 @@
+From 59994f8b0a431f61786de5715c45c24b0dd76cd1 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 4 Jan 2022 18:33:12 -0800
+Subject: [PATCH] appmenu-gtk-module/meson.build: only build gtk if requested
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ subprojects/appmenu-gtk-module/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/subprojects/appmenu-gtk-module/meson.build b/subprojects/appmenu-gtk-module/meson.build
+index 06ab76d..7279f97 100644
+--- a/meson.build
++++ b/meson.build
+@@ -41,8 +41,8 @@ gtk3_ver = '>=3.22.0'
+ gtk2 = dependency('gtk+-2.0', version: gtk2_ver, required: gtk2_requested)
+ gtk3 = dependency('gtk+-3.0', version: gtk3_ver, required: gtk3_requested)
+
+-build_gtk2 = gtk2.found()
+-build_gtk3 = gtk3.found()
++build_gtk2 = gtk2_requested and gtk2.found()
++build_gtk3 = gtk3_requested and gtk3.found()
+
+ #################
+ # Configuration #
+--
+2.34.1
+
diff --git a/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch
new file mode 100644
index 00000000000..e46fe74c073
--- /dev/null
+++ b/x11-misc/appmenu-gtk-module/files/appmenu-gtk-module-0.7.6-no-automagic-unitdir.patch
@@ -0,0 +1,56 @@
+From c60d530583a8bd07aea22c4f3f3aa8b0aaf271c1 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 4 Jan 2022 19:06:37 -0800
+Subject: [PATCH] appmenu-gtk-module: add userunitdir option
+
+allows setting systemd unit on systemd-less systems
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ .../appmenu-gtk-module/data/meson.build | 19 ++++++++++++-------
+ .../appmenu-gtk-module/meson_options.txt | 1 +
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/subprojects/appmenu-gtk-module/data/meson.build b/subprojects/appmenu-gtk-module/data/meson.build
+index 8378965..d0d1717 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,14 +2,19 @@ install_data([
+ 'org.appmenu.gtk-module.gschema.xml'
+ ], install_dir: schema_dir)
+
++userunitdir = get_option('userunitdir')
+ systemd = dependency('systemd', required: false)
+
+-if systemd.found()
++if userunitdir == ''
++ if systemd.found()
+ userunitdir = systemd.get_pkgconfig_variable('systemduserunitdir')
+- configure_file(
+- input: 'appmenu-gtk-module.service.in',
+- output: 'appmenu-gtk-module.service',
+- install_dir: userunitdir,
+- configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
+- )
++ else
++ userunitdir = '/usr/lib/systemd/user'
++ endif
+ endif
++configure_file(
++ input: 'appmenu-gtk-module.service.in',
++ output: 'appmenu-gtk-module.service',
++ install_dir: userunitdir,
++ configuration: {'CMAKE_INSTALL_FULL_BINDIR': join_paths(prefix,get_option('bindir'))}
++)
+diff --git a/subprojects/appmenu-gtk-module/meson_options.txt b/subprojects/appmenu-gtk-module/meson_options.txt
+index f93877a..ec0b3a6 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,3 +1,4 @@
+ option('gtk', type: 'array', choices : ['2','3'], value: ['2','3'], description: 'Supported GTK versions')
+ option('tests', type : 'boolean', value : false, description: 'Parser tests')
+ option('gtk_doc', type: 'boolean', value: false, description: 'Build API reference')
++option('userunitdir', type: 'string', description: 'Installation path for user unit file (optional)')
+--
+2.34.1
+
diff --git a/x11-misc/appmenu-gtk-module/metadata.xml b/x11-misc/appmenu-gtk-module/metadata.xml
index c73224cc9ad..5d2727e6e6b 100644
--- a/x11-misc/appmenu-gtk-module/metadata.xml
+++ b/x11-misc/appmenu-gtk-module/metadata.xml
@@ -6,6 +6,9 @@
<name>Gentoo KDE Project</name>
</maintainer>
<upstream>
- <remote-id type="github">derat/xsettingsd</remote-id>
+ <remote-id type="gitlab">vala-panel-project/vala-panel-appmenu</remote-id>
</upstream>
+ <use>
+ <flag name="gtk2">Build module for GTK+2</flag>
+ </use>
</pkgmetadata>
diff --git a/x11-misc/autocutsel/Manifest b/x11-misc/autocutsel/Manifest
index 21d74fd9b06..b7fcf460440 100644
--- a/x11-misc/autocutsel/Manifest
+++ b/x11-misc/autocutsel/Manifest
@@ -1,2 +1 @@
-DIST autocutsel-0.10.0.tar.gz 329527 BLAKE2B 1ab17fec1dde40fae6a98a9cc079f7080add2a30b3384e7a4cfbe7e85ca13a7394ce96ba1dd32a9d147f123ce44fc4ff7fbbf77a02eacd2301b91fafc3096232 SHA512 2d9b7114fde67ee217ceee673e32b407eef5b266a9d457a83b35d1c6227e5873cc7928aa10f7d84ce5e8c78d4940ee29985696f49b4015269584f1559f6b6d1d
DIST autocutsel-0.10.1.tar.gz 337872 BLAKE2B df1d924bf61c5e2b3dc2930b85f5b3b2f906892fa84932cfb4511be3e94dcc8763a8af1d4a6685da013d65b82e8f003f194fcb0522c35e43bc88269611132109 SHA512 a4f68342b389ef94fde8052f5d9e4b4585bab8fa8364985a2b0a3ec3e6f81ed58ba45be9349aa6e16c70ca623a7c315796cf0440ef6f4ffa9606ed7b7981a4a2
diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
deleted file mode 100644
index f7dec4fbc60..00000000000
--- a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications"
-HOMEPAGE="http://www.nongnu.org/autocutsel/ https://github.com/sigmike/autocutsel"
-SRC_URI="https://github.com/sigmike/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
diff --git a/x11-misc/autocutsel/autocutsel-0.10.1.ebuild b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild
index 77f67d12b9f..4f5b4c05363 100644
--- a/x11-misc/autocutsel/autocutsel-0.10.1.ebuild
+++ b/x11-misc/autocutsel/autocutsel-0.10.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/sigmike/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
RDEPEND="
x11-libs/libX11
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild
new file mode 100644
index 00000000000..87a0f10e975
--- /dev/null
+++ b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Basic CD Player for blackbox wm"
+HOMEPAGE="http://tranber1.free.fr/bbcd.html"
+SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libcdaudio-0.99.12-r4
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ x11-libs/libXt"
+
+PATCHES=(
+ "${FILESDIR}"/${P}_${PV}a.diff
+ "${FILESDIR}"/${P}-gcc3.3.patch
+ "${FILESDIR}"/${P}-gcc4.3.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -std=c++14
+ econf \
+ --with-x \
+ --x-includes=/usr/include/X11 \
+ --x-libraries=/usr/lib64/x86_64-linux-gnu
+}
+
+src_install() {
+ default
+ rm "${ED}/usr/share/bbtools/README.bbcd" || die
+}
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
index 25bad11dfed..b0690088fc3 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools readme.gentoo-r1 systemd
+inherit autotools readme.gentoo-r1 systemd udev
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -91,3 +91,11 @@ src_install() {
You may need to setup your /etc/bumblebee/bumblebee.conf"
readme.gentoo_create_doc
}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild
index 4c2cecf46ce..bd63a859462 100644
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild
+++ b/x11-misc/bumblebee/bumblebee-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools readme.gentoo-r1 systemd
+inherit autotools readme.gentoo-r1 systemd udev
if [[ ${PV} == 9999 ]]; then
inherit git-r3
@@ -91,3 +91,11 @@ src_install() {
You may need to setup your /etc/bumblebee/bumblebee.conf"
readme.gentoo_create_doc
}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 9e6e4750ffa..6499ab49525 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>np-hardass@gentoo.org</email>
- <name>Adam Feldman</name>
- </maintainer>
- <maintainer type="person">
<email>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
</maintainer>
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index ff8109e496a..fbb85b77572 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,2 +1 @@
-DIST cbatticon-1.6.12.tar.gz 34670 BLAKE2B cfae33c7e5393626a4e17d649bb7e242d35cfe7f79fda1b85e058a93a6b1c6da61ed9ff4463a44b5d6efa17d78f960021671d6bde1581af3e3eae70f369b6d52 SHA512 4946bf8a0514c0d595dd335a1388fd0e2c1cbb4d4e7fa774ab58bca4914d635d23cf32d7299dc9cad0f4dc7a37d88b875d9432234bfea0251f699d7776e5b019
DIST cbatticon-1.6.13.tar.gz 35330 BLAKE2B b4079be2158d1f776a0af086b2bf03b22d43b28ae4b92564af715d05def4b59bddce39b6ad235789114214256609b60b6708571b80be215197cb33610fc43ce7 SHA512 5f232dd96501e71c80fbdd1d722a8cedcdb12204655965b65e551aa8ab2bb10b8227c110aa5cc13070b03ad97e46ce907b9086cf808f7e79374f245f58b43a59
diff --git a/x11-misc/cbatticon/cbatticon-1.6.12.ebuild b/x11-misc/cbatticon/cbatticon-1.6.12.ebuild
deleted file mode 100644
index a39ecac5a48..00000000000
--- a/x11-misc/cbatticon/cbatticon-1.6.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit strip-linguas toolchain-funcs
-
-DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
-HOMEPAGE="https://github.com/valr/cbatticon"
-SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-IUSE="libnotify"
-
-RDEPEND="dev-libs/glib:2
- x11-libs/gtk+:3
- libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( Changelog README )
-
-src_prepare() {
- default
-
- strip-linguas -i .
-}
-
-src_compile() {
- tc-export CC
- emake \
- $(usex libnotify WITH_NOTIFY=1 WITH_NOTIFY=0) \
- V=1 \
- VERSION="${PF}" \
- WITH_GTK3=1
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- DOCDIR="/usr/share/doc/${PF}" \
- LANGUAGES="${LINGUAS}" \
- V=1 VERSION="${PF}" \
- install
-
- einstalldocs
-}
diff --git a/x11-misc/cbatticon/cbatticon-1.6.13.ebuild b/x11-misc/cbatticon/cbatticon-1.6.13.ebuild
index aec71acea6c..a39ecac5a48 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.13.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/valr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
IUSE="libnotify"
RDEPEND="dev-libs/glib:2
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index d0fe4e35f08..3e7d77091c2 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -10,4 +10,7 @@
<flag name="extra-print-profiles">Generate extra print profiles.
Warning: significant build time and memory requirements.</flag>
</use>
+ <upstream>
+ <remote-id type="github">hughsie/colord</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 7721105b25f..5a548468b38 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,2 +1 @@
-DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
DIST libX11-1.8.1.tar.xz 1818460 BLAKE2B 7602b4d8c65ea3160f81096b4e022b5462e49d96b36dee70fe06e972329dc9d70bbd462e2079da03ba5647d7a72bf03e29aab23c60bcc206c95d770655622226 SHA512 2e36d2c47519e0cb2697f588c0ccdf73fbe75c2163f0855c78f7052dc9e920bca081f9d5e39c707a14067f101faef74fc758c8862eeba675b1535b43119d533a
diff --git a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
deleted file mode 100644
index 884e98ec633..00000000000
--- a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
- x11-base/xorg-proto
- >=x11-libs/libxcb-1.11.1
- x11-libs/xtrans"
-RDEPEND="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
- --without-xmlto
- --without-fop
- --disable-specs
- --disable-xkb
-)
-
-src_compile() {
- emake -C nls
-}
-
-src_test() {
- :;
-}
-
-src_install() {
- emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
index 64f043d5d3e..851f8bce119 100644
--- a/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.8.1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
S="${WORKDIR}/libX11-${PV}/"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# Only needed by configure
DEPEND="
diff --git a/x11-misc/devilspie/devilspie-0.23-r2.ebuild b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
index 0b9696b3ff2..985daf2b245 100644
--- a/x11-misc/devilspie/devilspie-0.23-r2.ebuild
+++ b/x11-misc/devilspie/devilspie-0.23-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Window matching utility similar to Sawfish's Matched Windows"
-HOMEPAGE="http://www.burtonini.com/blog/tag/devilspie.html"
-SRC_URI="http://www.burtonini.com/computing/${P}.tar.xz"
+HOMEPAGE="https://www.burtonini.com/blog/tag/devilspie.html"
+SRC_URI="https://www.burtonini.com/computing/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
@@ -25,5 +25,6 @@ BDEPEND="
src_prepare() {
default
+
sed -i "/doc\//s@devilspie..@${PF}/@" devilspie.1 || die
}
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index b7c6a5098e4..bcdd1211825 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,2 +1 @@
-DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9
DIST dunst-1.9.0.tar.gz 4609222 BLAKE2B 4879122e342c1e518bca079bacd4ae769fd7da41db681230613c61531e62df94223757372c428c06710afd843200dcb78883d352f4e25098f0672b5c89ab0d87 SHA512 e43c960561d1f804c1d8f73f9376b33f61bf1ba5c5d0579c9875ef96da6522e214d5b74166ca3375dff1b4b0291b611b2d9ac1fb41fa8722db04c21e898824d1
diff --git a/x11-misc/dunst/dunst-1.8.1.ebuild b/x11-misc/dunst/dunst-1.8.1.ebuild
deleted file mode 100644
index 37336b25c79..00000000000
--- a/x11-misc/dunst/dunst-1.8.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Lightweight replacement for common notification daemons"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-DEPEND="
- dev-libs/glib:2
- sys-apps/dbus
- x11-libs/cairo[X,glib]
- x11-libs/gdk-pixbuf:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXScrnSaver
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libnotify
- x11-libs/pango[X]
- x11-misc/xdg-utils
- wayland? ( dev-libs/wayland )
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
- dev-lang/perl
- virtual/pkgconfig
- wayland? ( dev-libs/wayland-protocols )
-"
-
-src_prepare() {
- default
-
- # Respect users CFLAGS
- sed -e 's/-Os//' -i config.mk || die
-
- # Use correct path for dbus and system unit
- sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
- sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
-}
-
-src_configure() {
- tc-export CC PKG_CONFIG
-
- default
-}
-
-src_compile() {
- local myemakeargs=(
- SYSCONFDIR="${EPREFIX}/etc/xdg"
- SYSTEMD="0"
- WAYLAND="$(usex wayland 1 0)"
- )
-
- emake "${myemakeargs[@]}"
-}
-
-src_install() {
- local myemakeargs=(
- PREFIX="${ED}/usr"
- SYSCONFDIR="${ED}/etc/xdg"
- SYSTEMD="0"
- WAYLAND="$(usex wayland 1 0)"
- )
-
- emake "${myemakeargs[@]}" install
-
- systemd_newuserunit dunst.systemd.service.in dunst.service
-}
diff --git a/x11-misc/dunst/dunst-1.9.0.ebuild b/x11-misc/dunst/dunst-1.9.0.ebuild
index e3f5d7b97fd..37336b25c79 100644
--- a/x11-misc/dunst/dunst-1.9.0.ebuild
+++ b/x11-misc/dunst/dunst-1.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
IUSE="wayland"
DEPEND="
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild
index 8676ac0f523..4542d471945 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop"
HOMEPAGE="http://fluxbox.sourceforge.net/fbdesk/"
diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
index 74dcafcc87e..12f1009cf6e 100644
--- a/x11-misc/fireflies/fireflies-2.08-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,8 @@ RDEPEND="
media-libs/libsdl[X,opengl,video]
virtual/glu
virtual/opengl
- x11-libs/libX11"
+ x11-libs/libX11
+ elibc_musl? ( sys-libs/argp-standalone )"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/autoconf-archive" # for AX_CXX_BOOL macro
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index 0c1fd75d5ce..8087db6e09b 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1 +1,2 @@
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/gmrun-1.4w.ebuild b/x11-misc/gmrun/gmrun-1.4w.ebuild
new file mode 100644
index 00000000000..3385f765aee
--- /dev/null
+++ b/x11-misc/gmrun/gmrun-1.4w.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+fi
+
+DESCRIPTION="A GTK-2 based launcher box with bash style auto completion!"
+HOMEPAGE="https://github.com/wdlkmpx/gmrun"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="elibc_glibc nls xdg"
+
+RDEPEND="
+ x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ elibc_glibc? ( >=sys-libs/glibc-2.10 )"
+
+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
+}
diff --git a/x11-misc/gmrun/metadata.xml b/x11-misc/gmrun/metadata.xml
index 44bfdb981c5..067b91cb34e 100644
--- a/x11-misc/gmrun/metadata.xml
+++ b/x11-misc/gmrun/metadata.xml
@@ -5,11 +5,22 @@
<email>slashbeast@gentoo.org</email>
<name>Piotr Karbowski</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>henning@hennsch.de</email>
+ <name>Henning Schild</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
- A run utility intended to replace grun or gnome-run. Most prominent
+ A run utility intended to replace <pkg>x11-misc/grun</pkg> or gnome-run. Most prominent
features include slim design and bash style auto-completion.
</longdescription>
<upstream>
- <remote-id type="sourceforge">gmrun</remote-id>
+ <remote-id type="github">wdlkmpx/gmrun</remote-id>
</upstream>
+ <use>
+ <flag name="xdg">Enable xdg spec for configuration and history files location</flag>
+ </use>
</pkgmetadata>
diff --git a/x11-misc/grsync/Manifest b/x11-misc/grsync/Manifest
index 3dddff17665..022f1de4f64 100644
--- a/x11-misc/grsync/Manifest
+++ b/x11-misc/grsync/Manifest
@@ -1,3 +1 @@
-DIST grsync-1.2.6.tar.gz 333540 BLAKE2B 20719580309aba5737b74e85629b21b9715ceb8d97bd00d1840a5eda0e04316439d90999b7b787cdf8b368fff90ba489dcfc3b91992dd599f7ae05f4a565f1e7 SHA512 a7aac0cf264c968d50896156730dc0b925045def6e513adf1f2783e19fd1cdd423aa69480963479b95927fb4e863f110f3fc0439661ef7cfcacc7376fe95ff1d
-DIST grsync-1.2.8.tar.gz 352885 BLAKE2B fc63db9b2739bc7a253b64cb1820a7c51c7408ebbe5bb950672b6ab08942726467a4966eea3da67c7c7e21e0acc703a06183d58e2fbcd1ec38370257b57bad63 SHA512 7feee6c405b20f147641e9a9a114645a7132345fcfc33c656a190aba0d2b7fedcd40f98328dfb0b123f38d8648d041a2f53cabbae0b8d53a243d3a6029bf0963
DIST grsync-1.3.0.tar.gz 304725 BLAKE2B 4e58eb7db8082b733468b95db995a2e7f7f970cebe2b3eb614e0a828d2fb34bc20fc2163f8bca7d5d87e648cfe0dd45a0cd22319d6504e9bd491a6da462ee8a3 SHA512 2d2d9e7910f18e061c5259f51510cd5e3c14c1c15b649618ea096777531780c2d5821a7bb415cd762a695302146b4835d793d31c032667431e227ac11a7aa108
diff --git a/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch b/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch
deleted file mode 100644
index 4460f1ac94a..00000000000
--- a/x11-misc/grsync/files/grsync-1.2.6-gcc-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur grsync-1.2.6.orig/src/callbacks.h grsync-1.2.6/src/callbacks.h
---- grsync-1.2.6.orig/src/callbacks.h 2013-04-30 13:48:54.000000000 +0200
-+++ grsync-1.2.6/src/callbacks.h 2020-02-27 11:34:50.861824303 +0100
-@@ -7,11 +7,11 @@
- #define ICON_PACKAGE PACKAGE_DATA_DIR "/" ICON_SOURCE
- #define ICON_PACKAGE_BUSY PACKAGE_DATA_DIR "/" ICON_SOURCE_BUSY
-
--GtkBuilder *builder;
--GtkWidget *main_window;
--gchar *argv_session, *argv_filename, *icon, *icon_busy;
--gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
--GtkListStore *liststore_session;
-+extern GtkBuilder *builder;
-+extern GtkWidget *main_window;
-+extern gchar *argv_session, *argv_filename, *icon, *icon_busy;
-+extern gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
-+extern GtkListStore *liststore_session;
-
- void save_settings(gchar *session, gchar *filename);
- gboolean load_groups(gchar *session);
-diff -Naur grsync-1.2.6.orig/src/main.c grsync-1.2.6/src/main.c
---- grsync-1.2.6.orig/src/main.c 2013-04-30 13:48:54.000000000 +0200
-+++ grsync-1.2.6/src/main.c 2020-02-27 11:35:08.548834429 +0100
-@@ -10,6 +10,12 @@
- # include <libosso.h>
- #endif
-
-+GtkBuilder *builder;
-+GtkWidget *main_window;
-+gchar *argv_session, *argv_filename, *icon, *icon_busy;
-+gboolean cmdline_session, cmdline_execute, cmdline_stayopen, cmdline_import;
-+GtkListStore *liststore_session;
-+
- int main (int argc, char *argv[]) {
- #ifdef ENABLE_NLS
- bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
deleted file mode 100644
index 53875ffebda..00000000000
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A gtk frontend to rsync"
-HOMEPAGE="http://www.opbyte.it/grsync/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
-
-RDEPEND=">=x11-libs/gtk+-2.16:2
- net-misc/rsync"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dev-util/intltool"
-
-DOCS="AUTHORS NEWS README"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
-
-src_configure() {
- econf --disable-unity
-}
diff --git a/x11-misc/grsync/grsync-1.2.8.ebuild b/x11-misc/grsync/grsync-1.2.8.ebuild
deleted file mode 100644
index d866f840856..00000000000
--- a/x11-misc/grsync/grsync-1.2.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="A gtk frontend to rsync"
-HOMEPAGE="http://www.opbyte.it/grsync/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
-
-DEPEND=">=x11-libs/gtk+-2.16:2"
-RDEPEND="${DEPEND}
- net-misc/rsync"
-BDEPEND="virtual/pkgconfig
- dev-util/intltool"
-
-DOCS="AUTHORS NEWS README"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.6-gcc-10.patch )
-
-src_configure() {
- econf --disable-unity
-}
diff --git a/x11-misc/grsync/grsync-1.3.0.ebuild b/x11-misc/grsync/grsync-1.3.0.ebuild
index a941d3f0832..2fc9967fc91 100644
--- a/x11-misc/grsync/grsync-1.3.0.ebuild
+++ b/x11-misc/grsync/grsync-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="+gtk3"
DEPEND="
diff --git a/x11-misc/i3lock/i3lock-2.14.1.ebuild b/x11-misc/i3lock/i3lock-2.14.1.ebuild
index ac578fdbe9a..782393b8505 100644
--- a/x11-misc/i3lock/i3lock-2.14.1.ebuild
+++ b/x11-misc/i3lock/i3lock-2.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
RDEPEND="
dev-libs/libev
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 4a677bc53c3..5648bdfbefb 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1 +1 @@
-DIST idesk-v1.tar.gz 195147 BLAKE2B 2b2b0dacbfb1d8fb950c88d990e3674bf8b4cf82d9022ed2f7be1f32082c46ae32d8200957e2e19d0d21ea1e4d59ec092f4cba90e712f79700a04f05c3a3aa14 SHA512 3190fca7a5c9fb36b66159107d22b5f6e50b4573afa21a3a4d8b8e3e5953dabda077c924e45d2607b849ee5fea141eb80f5b89ce5288ebc2490679f319edf768
+DIST idesk-0.7.8.tar.gz 202949 BLAKE2B 93f902ab8b073d5b8e4a03d65ce99379e4adcf7ae6220be858ef7f1ce1f326cbbcc50c6d99424d8153ad498c9498939f39c51de1aa231c392a18636ee53788ee SHA512 0456646788ab70d1fc05ee0fc5f9d811f9f67c2420039ec525f42b6634ec92c1e3f8f061af5c407a22ab81db873efde216ad5c4fccba6fb27f1777d2e66a5535
diff --git a/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch b/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch
new file mode 100644
index 00000000000..7f062c94280
--- /dev/null
+++ b/x11-misc/idesk/files/idesk-0.7.8-use-pkg-config-imlib2.patch
@@ -0,0 +1,40 @@
+https://github.com/antonialoytorrens/idesk/pull/1
+https://github.com/neagix/idesk/pull/9
+https://github.com/neagix/idesk/issues/7
+
+From b13626bbe2669b8a267ad53df93f1060379a462e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 15 Jul 2022 08:22:12 +0100
+Subject: [PATCH] build: use pkg-config to find imlib2
+
+imlib2 1.7.5+ drops imlib2-config, hence pkg-config
+must now be used to find it.
+
+Bug: https://bugs.gentoo.org/828962
+--- a/configure.in
++++ b/configure.in
+@@ -94,19 +94,10 @@ LIBS="$LIBS $Xext_lib"
+
+ dnl Imlib2 detection
+
+-AC_PATH_GENERIC(imlib2, , [
+- AC_SUBST(IMLIB_LIBS)
+- AC_SUBST(IMLIB_CXXFLAGS) ],
+- AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?
+- You need Imlib2 to build Idesk. Verify that you have Imlib2-dev))
+-
+-dnl the above doesn't work for some reason :/
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
+-AC_SUBST(IMLIB_LIBS)
+-AC_SUBST(IMLIB_CXXFLAGS)
+-
+-CXXFLAGS="$CXXFLAGS $IMLIB_CXXFLAGS"
++PKG_PROG_PKG_CONFIG
++PKG_CHECK_MODULES([IMLIB], [imlib2 > 1.0])
++
++CXXFLAGS="$CXXFLAGS $IMLIB_CFLAGS"
+ LIBS="$LIBS $IMLIB_LIBS"
+
+
+
diff --git a/x11-misc/idesk/idesk-1.ebuild b/x11-misc/idesk/idesk-0.7.8.ebuild
index d32a60e327c..b6e6b14254a 100644
--- a/x11-misc/idesk/idesk-1.ebuild
+++ b/x11-misc/idesk/idesk-0.7.8.ebuild
@@ -1,19 +1,18 @@
-# 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_P="${PN}-v${PV}"
+inherit autotools
DESCRIPTION="Utility to place icons on the root window"
-HOMEPAGE="https://github.com/antonialoytorrens/idesk/"
-SRC_URI="https://github.com/antonialoytorrens/idesk/releases/download/v1/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/neagix/idesk"
+SRC_URI="https://github.com/neagix/idesk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${MY_P}"
+IUSE="svg"
RDEPEND="
dev-libs/glib
@@ -21,20 +20,32 @@ RDEPEND="
media-libs/freetype
media-libs/imlib2[X]
media-libs/libart_lgpl
+ x11-libs/libXft
x11-libs/gtk+:3
x11-libs/pango
x11-libs/startup-notification
+ svg? (
+ gnome-base/librsvg
+ x11-libs/gdk-pixbuf
+ )
"
-
+DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.7.8-use-pkg-config-imlib2.patch
+)
src_prepare() {
default
+
sed -i -e 's,/usr/local/,/usr/,' examples/default.lnk || die
+
+ eautoreconf
}
src_configure() {
- econf --enable-libsn
+ econf \
+ --enable-libsn \
+ $(use_enable svg)
}
diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml
index 67600fcfca2..03c3aedb73c 100644
--- a/x11-misc/idesk/metadata.xml
+++ b/x11-misc/idesk/metadata.xml
@@ -3,6 +3,6 @@
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
- <remote-id type="github">antonialoytorrens/idesk</remote-id>
+ <remote-id type="github">neagix/idesk</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-misc/kapow/kapow-1.5.10.ebuild b/x11-misc/kapow/kapow-1.5.10.ebuild
index f9dd263d627..99d2b1b4ae5 100644
--- a/x11-misc/kapow/kapow-1.5.10.ebuild
+++ b/x11-misc/kapow/kapow-1.5.10.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit qmake-utils xdg-utils
DESCRIPTION="A punch clock program designed to easily keep track of your hours"
@@ -19,13 +20,10 @@ RDEPEND="
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
"
-DEPEND="
- ${RDEPEND}
- dev-qt/linguist-tools:5
-"
-K_LANGS="
- ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+K_LANGS="ar bg cs da de el en es fr it lt nl no pl pt_BR pt ro ru sv tr uk"
for K_LANG in ${K_LANGS}; do
IUSE+=" l10n_${K_LANG/_/-}"
done
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index c23babb047a..3e4e24794c8 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1 +1,2 @@
DIST kronometer-2.2.3.tar.xz 124208 BLAKE2B f9d91bf19ba64e2c337b8181e2529b409a450c1e821c6b1358a1d57627959c65b5c4db0acd15a4c8f4cd3fb12197ce6a1bf3b95d4dc4922409223b528f5f62aa SHA512 77f948ae3a03b15a0cd49bc1048897bff0788a4831beff8f336270d8af6ee1a245d2174f5a3adc224257e9f319958197af7900ce8389b312f8fe7cd6c53a71d1
+DIST kronometer-2.2.80.tar.xz 134264 BLAKE2B db83b0c3bb6b22650c99371d00a31cc30cdbdac7b97b925d5a79f3a9fcf90be797e35e4f61d2bbdaf704340b3991451975250e0ffee7e4460d8d43d898265e24 SHA512 27dfa5a50f9adfb926fe6873267757c60cba2dcb2502407367626b01528bcfd49bcab065076bf789f975cc8587ed19a2f8202eb7b26615bf720f6c01d9d5986c
diff --git a/x11-misc/kronometer/kronometer-2.2.80.ebuild b/x11-misc/kronometer/kronometer-2.2.80.ebuild
new file mode 100644
index 00000000000..bc1bda71d18
--- /dev/null
+++ b/x11-misc/kronometer/kronometer-2.2.80.ebuild
@@ -0,0 +1,33 @@
+# 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.96.0
+QTMIN=5.15.5
+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/unstable/${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}"
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 65576df0893..f8c64f82b33 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,2 +1 @@
-DIST libinput-gestures-2.56.tar.gz 26293 BLAKE2B b48a33c13efc63545bcb5ae722066493bd6aba083a07b1ebbf10eea69afa2a8f9d80a92b60dda3e8472a55851b70e84cf7c10e0bf3428c2278dd3ef5b6f65d0d SHA512 f215444dbe7e70ae137404beb25d5a60c5a618fb2d3d20eb9b4cf3f94cbc93a7e42a5fa82efdea082e2fa229c95d86c02df91c59f4a51c067e47ccf5dcf79fa7
DIST libinput-gestures-2.73.tar.gz 28771 BLAKE2B 9f3c546b637b0038431517e2df5e3dfba4fbb7db708f108dd7a979e6674b2bdd44b2b877b5e200c05373a57bfeffefadfde59bc6c403f7188e349c2e051d8683 SHA512 8e46931c76541eb836b1bd79295f05fdc0e22091d1693eac1cc9c16407830806f9e56819e5fb8ba3eed7a26664946010d24d62d99131bcf71b1d8a3682f34ec6
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.56.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.56.ebuild
deleted file mode 100644
index a3a54df298e..00000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-2.56.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
- SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libinput
- x11-misc/wmctrl
- x11-misc/xdotool"
-DEPEND="dev-libs/libinput
- dev-util/desktop-file-utils"
-
-src_prepare() {
- default
-
- # Fix docdir installation path
- sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
- || die "sed failed for libinput-gestures-setup"
-}
-
-src_test() { :; }
-
-pkg_postinst() {
- xdg_icon_cache_update
-
- elog "You must be in the input group to read the touchpad device."
-
- if ! has_version x11-libs/gtk+:3 ; then
- elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3."
- fi
- if ! has_version kde-plasma/kde-cli-tools:5 ; then
- elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
- fi
-}
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
deleted file mode 100644
index a3a54df298e..00000000000
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-single-r1 xdg
-
-DESCRIPTION="Actions gestures on your touchpad using libinput"
-HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
-else
- SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/libinput
- x11-misc/wmctrl
- x11-misc/xdotool"
-DEPEND="dev-libs/libinput
- dev-util/desktop-file-utils"
-
-src_prepare() {
- default
-
- # Fix docdir installation path
- sed -i "/^DOCDIR/s@\$NAME@${PF}@" libinput-gestures-setup \
- || die "sed failed for libinput-gestures-setup"
-}
-
-src_test() { :; }
-
-pkg_postinst() {
- xdg_icon_cache_update
-
- elog "You must be in the input group to read the touchpad device."
-
- if ! has_version x11-libs/gtk+:3 ; then
- elog "${PN}-setup script supports GNOME via x11-libs/gtk+:3."
- fi
- if ! has_version kde-plasma/kde-cli-tools:5 ; then
- elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
- fi
-}
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index d4211aad442..599ecb3f367 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,2 +1,3 @@
DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
+DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766aaaaa87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc99992628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716
diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch
new file mode 100644
index 00000000000..46c65d79f76
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch
@@ -0,0 +1,42 @@
+https://github.com/canonical/lightdm/pull/261
+
+# Fix LC_IDENTIFICATION undeclared on musl or other libc that doesn't have it defined
+# Patch is taken from Alpine linux [1]
+# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-language.patch
+# Closes: https://bugs.gentoo.org/766866
+diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c
+index 3d4fa96..e38f5ce 100644
+--- a/liblightdm-gobject/language.c
++++ b/liblightdm-gobject/language.c
+@@ -210,6 +210,7 @@ lightdm_language_get_name (LightDMLanguage *language)
+
+ if (!priv->name)
+ {
++#if HAVE_LC_IDENTIFICATION
+ g_autofree gchar *locale = get_locale_name (priv->code);
+ if (locale)
+ {
+@@ -223,6 +224,7 @@ lightdm_language_get_name (LightDMLanguage *language)
+
+ setlocale (LC_ALL, current);
+ }
++#endif
+ if (!priv->name)
+ {
+ g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2);
+@@ -250,6 +252,7 @@ lightdm_language_get_territory (LightDMLanguage *language)
+
+ if (!priv->territory && strchr (priv->code, '_'))
+ {
++#if HAVE_LC_IDENTIFICATION
+ g_autofree gchar *locale = get_locale_name (priv->code);
+ if (locale)
+ {
+@@ -263,6 +266,7 @@ lightdm_language_get_territory (LightDMLanguage *language)
+
+ setlocale (LC_ALL, current);
+ }
++#endif
+ if (!priv->territory)
+ {
+ g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3);
diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch
new file mode 100644
index 00000000000..0df9bd4f051
--- /dev/null
+++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch
@@ -0,0 +1,26 @@
+https://github.com/canonical/lightdm/pull/261
+
+# A little bit modified version of Alpine linux patch [1]. On musl the default
+# implementation of updwtmpx will give conflicting types error and build will
+# fail. This patch should fix that. This issue is noticed together with bug
+# 766866 [2].
+# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-updwtmpx.patch
+# [2]: https://bugs.gentoo.org/766866
+diff --git a/src/session-child.c b/src/session-child.c
+index eef51e4..0052904 100644
+--- a/src/session-child.c
++++ b/src/session-child.c
+@@ -193,8 +193,13 @@ read_xauth (void)
+ }
+
+ /* GNU provides this but we can't rely on that so let's make our own version */
++#if defined(__GLIBC__)
+ static void
+ updwtmpx (const gchar *wtmp_file, struct utmpx *ut)
++#else // use this version in libc's other than glibc
++void
++updwtmpx (const char *wtmp_file, const struct utmpx *ut)
++#endif
+ {
+ struct utmp u;
+ memset (&u, 0, sizeof (u));
diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
index 2c0883c92e0..5f23bb293fa 100644
--- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild
@@ -51,6 +51,11 @@ DOCS=( NEWS )
RESTRICT="test"
REQUIRED_USE="vala? ( introspection )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+ "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
pkg_setup() {
export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
}
diff --git a/x11-misc/lightdm/lightdm-1.32.0.ebuild b/x11-misc/lightdm/lightdm-1.32.0.ebuild
new file mode 100644
index 00000000000..9c50443b7a3
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.32.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2022 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 +gnome +gtk +introspection non-root qt5 vala"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.44.0:2
+ 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"
+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 )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+REQUIRED_USE="vala? ( introspection )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch
+ "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch
+)
+
+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
+ doins "${FILESDIR}"/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_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ systemd_reenable "${PN}.service"
+}
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index ac417af345a..3371b6a35b8 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -10,6 +10,6 @@
<flag name="non-root">Use non-root user by default</flag>
</use>
<upstream>
- <remote-id type="github">CanonicalLtd/lightdm</remote-id>
+ <remote-id type="github">canonical/lightdm</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index 437744af615..7ca94cab62c 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1 +1,2 @@
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.26.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild
new file mode 100644
index 00000000000..07ccfba4087
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.26.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="nls X wayland"
+REQUIRED_USE="|| ( X wayland )"
+
+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/gtk+-3.22:3
+ >=media-libs/libcanberra-0.4:0[gtk3]
+ X? (
+ x11-libs/libX11
+ >=x11-libs/libwnck-3:3
+ )
+ wayland? ( gui-libs/gtk-layer-shell )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !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
+ virtual/pkgconfig
+ mate-base/mate-panel
+"
+
+src_configure() {
+ mate_src_configure \
+ $(use_enable nls)
+ $(use_enable X x11) \
+ $(use_enable wayland)
+}
+
+src_install() {
+ mate_src_install
+
+ insinto /usr/share/dbus-1/services
+ doins "${FILESDIR}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/menulibre/menulibre-2.2.3.ebuild b/x11-misc/menulibre/menulibre-2.2.3.ebuild
index 6f10b016ac7..8d270e63e84 100644
--- a/x11-misc/menulibre/menulibre-2.2.3.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.3.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="xml(+)"
inherit distutils-r1 xdg
DESCRIPTION="Advanced freedesktop.org compliant menu editor"
-HOMEPAGE="https://bluesabre.org/menulibre/"
+HOMEPAGE="https://bluesabre.org/projects/menulibre"
SRC_URI="https://github.com/bluesabre/menulibre/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-3"
diff --git a/x11-misc/mozo/mozo-1.24.0-r1.ebuild b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
index 35f56168a3a..53a32a72176 100644
--- a/x11-misc/mozo/mozo-1.24.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
inherit mate python-r1
diff --git a/x11-misc/mozo/mozo-1.24.1.ebuild b/x11-misc/mozo/mozo-1.24.1.ebuild
index eb4001283a5..0019c072618 100644
--- a/x11-misc/mozo/mozo-1.24.1.ebuild
+++ b/x11-misc/mozo/mozo-1.24.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
-PYTHON_REQ_USE="xml"
+PYTHON_REQ_USE="xml(+)"
inherit mate python-r1
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
index f68339f0a72..7e28a746c19 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.28:2
diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
index 304842737a2..82809bc1622 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.16.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2 GPL-2+"
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 5e34e920970..8e5cf16698c 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1 +1,2 @@
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.91.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild
new file mode 100644
index 00000000000..bfd7c16ed6c
--- /dev/null
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.91.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 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/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild
index 4f99a625adb..7b2b1951b85 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-1.1.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 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
fi
LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index d1eb0ff6f95..7a6033f14d3 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -45,7 +45,7 @@ BDEPEND="virtual/pkgconfig
DOCS=( README.md picom.sample.conf )
python_check_deps() {
- has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git a/x11-misc/picom/picom-8.2-r3.ebuild b/x11-misc/picom/picom-8.2-r3.ebuild
index c26adc87f47..de4a44606af 100644
--- a/x11-misc/picom/picom-8.2-r3.ebuild
+++ b/x11-misc/picom/picom-8.2-r3.ebuild
@@ -44,7 +44,7 @@ BDEPEND="virtual/pkgconfig
DOCS=( README.md picom.sample.conf )
python_check_deps() {
- has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git a/x11-misc/picom/picom-9.1.ebuild b/x11-misc/picom/picom-9.1.ebuild
index 0e86323b3f7..436488091d1 100644
--- a/x11-misc/picom/picom-9.1.ebuild
+++ b/x11-misc/picom/picom-9.1.ebuild
@@ -44,7 +44,7 @@ BDEPEND="virtual/pkgconfig
DOCS=( README.md picom.sample.conf )
python_check_deps() {
- has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
index 3e335b94532..cfa8461b6cf 100644
--- a/x11-misc/picom/picom-9999.ebuild
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -43,7 +43,7 @@ BDEPEND="virtual/pkgconfig
DOCS=( README.md picom.sample.conf )
python_check_deps() {
- has_version -b "dev-python/xcffib[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/xcffib[${PYTHON_USEDEP}]"
}
pkg_setup() {
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index d6c256125df..dbdf109b7ea 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1 @@
-DIST i3ipcpp-86ddf7102c6903ae0cc543071e2d375403fc0727.tar.gz 43693 BLAKE2B a84525b0bd00d4ab4ed8afed00fd92eee965efea9960670dcea3efaa259834df5bb7cf8e79a894dd4d4f92f28643ad1b43ccbb374ade96174c6c2f6fc63f5ddc SHA512 f4643bea5a78bd9518fecc9d56ece8d679539b99016440a6e4d45305984c02963d80e00c5375cc53ac7418e2f24f57279930428b331e077eaafa8d0717677662
-DIST polybar-3.5.7.tar.gz 283520 BLAKE2B 3f7cad2886c0f8352b92e636035607b2abab6dafd0966e6edb9f3b768fc6e5b180be2479f81812eb792f66edada6fe2625af5c3ecc9216763c141a393ab90474 SHA512 6336613d37ae45ca43d1cc2e1e2126bcd09247dbf81b3df979def44b240e2a736035503cf5aaeff0a86c830deb956f9ef7057c7fa1ac3da5119b8e6c1db0fe7f
-DIST polybar-3.6.1.tar.gz 437027 BLAKE2B 87cd05b235128834daacd5e48b7bba4d610c1018bbdc6280996d23314b4398a2c7322a425a047b55ad952c7a0e6a73c3076f57df6b4f7ab8fcdffcc0e40ef165 SHA512 973b623464d3683f28484606e418473f9a241c2f6d6e59877a487b61aa2d91f4f44702926c19c47d87720991bccf0a4b6ac0b00d015806d345a3bf701e327d2b
-DIST polybar-3.6.2.tar.gz 438843 BLAKE2B 0d2e3662fd4b5150b3feea4d8c3cc9acc61e0d7f609b0c88c26905384f5023b3924e0b9c528677fe8e017b5136404ac507a3cdb1ec18dcbf2b89c57d3116d1af SHA512 b45ed2a89f4ddc4ee232d6e47416390611b666f8c765fe3916343dbd45ddb877c9ecf764a7d025762caaee6ec2f8c2b9b232cd52d301e70650e4031d029a4f5d
DIST polybar-3.6.3.tar.gz 439838 BLAKE2B 522e95bb11e947008f0909401a769ba7ef44733e7edb4a067185bad610ac70077e1370e0e9da9fbff27b9f981b5285561f7c86e12fc5da79c383d794da6b4a86 SHA512 d8e08d2b217a353b967f58eb61907b05ed7b9c2b9e1b3a891f4cac91b37f1cf751b10b1e93e74e6414eb0beb1696f4ae64a0a43bfc6c0afa3863b72293217c2e
-DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
diff --git a/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch b/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch
new file mode 100644
index 00000000000..1007d7237af
--- /dev/null
+++ b/x11-misc/polybar/files/polybar-3.6.3-fix-prefix.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f71801c8..0979f8af 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,7 +63,7 @@ endif()
+
+ if(BUILD_CONFIG)
+ install(FILES ${CMAKE_SOURCE_DIR}/doc/config.ini
+- DESTINATION /etc/${PROJECT_NAME}
++ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}
+ COMPONENT config)
+ endif()
+
diff --git a/x11-misc/polybar/polybar-3.5.7.ebuild b/x11-misc/polybar/polybar-3.5.7.ebuild
deleted file mode 100644
index 0086e86f649..00000000000
--- a/x11-misc/polybar/polybar-3.5.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-XPP_COMMIT="044e69d05db7f89339bda1ccd1efe0263b01c8f6"
-I3IPCPP_COMMIT="86ddf7102c6903ae0cc543071e2d375403fc0727"
-
-inherit cmake python-single-r1
-
-DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/polybar/polybar"
-SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
- https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
-
-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}]')
- x11-libs/cairo[X,xcb(+)]
- x11-libs/libxcb[xkb]
- 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? ( net-wireless/wireless-tools )
- pulseaudio? ( media-sound/pulseaudio )
-"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- rmdir "${S}/lib/xpp" || die
- mv "${WORKDIR}/xpp-${XPP_COMMIT}" "${S}/lib/xpp" || die
-
- rmdir "${S}/lib/i3ipcpp" || die
- mv "${WORKDIR}/i3ipcpp-${I3IPCPP_COMMIT}" "${S}/lib/i3ipcpp" || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_ALSA="$(usex alsa)"
- -DENABLE_CURL="$(usex curl)"
- -DBUILD_DOC="$(usex doc)"
- -DENABLE_I3="$(usex i3wm)"
- -DBUILD_IPC_MSG="$(usex ipc)"
- -DENABLE_MPD="$(usex mpd)"
- -DENABLE_NETWORK="$(usex network)"
- -DENABLE_PULSEAUDIO="$(usex pulseaudio)"
- # Bug 767949
- -DENABLE_CCACHE="OFF"
- )
-
- cmake_src_configure
-}
diff --git a/x11-misc/polybar/polybar-3.6.2.ebuild b/x11-misc/polybar/polybar-3.6.2.ebuild
deleted file mode 100644
index 22e5d89b918..00000000000
--- a/x11-misc/polybar/polybar-3.6.2.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/polybar/polybar-3.6.1.ebuild b/x11-misc/polybar/polybar-3.6.3-r1.ebuild
index 22e5d89b918..8d59630c731 100644
--- a/x11-misc/polybar/polybar-3.6.1.ebuild
+++ b/x11-misc/polybar/polybar-3.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
LICENSE="MIT"
SLOT="0"
IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
@@ -43,6 +43,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-fix-prefix.patch" )
+
src_configure() {
local mycmakeargs=(
-DENABLE_ALSA="$(usex alsa)"
@@ -55,6 +57,7 @@ src_configure() {
-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
# Bug 767949
-DENABLE_CCACHE="OFF"
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/"
)
cmake_src_configure
diff --git a/x11-misc/polybar/polybar-3.6.3.ebuild b/x11-misc/polybar/polybar-3.6.3.ebuild
index 22e5d89b918..770a50edd7b 100644
--- a/x11-misc/polybar/polybar-3.6.3.ebuild
+++ b/x11-misc/polybar/polybar-3.6.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
LICENSE="MIT"
SLOT="0"
IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
diff --git a/x11-misc/primus/metadata.xml b/x11-misc/primus/metadata.xml
index 39bcb7c4f4d..4b4e0221679 100644
--- a/x11-misc/primus/metadata.xml
+++ b/x11-misc/primus/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>np-hardass@gentoo.org</email>
- <name>Adam Feldman</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="libglvnd">Use <pkg>media-libs/libglvnd</pkg> for dispatch</flag>
</use>
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 245f756ea36..44a1b2683c6 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1 +1 @@
-DIST py3status-3.45.tar.gz 415867 BLAKE2B 4484f8b9e4a8dbe19427d4083679bf23a961908fe63c4c58f3bba14b77d3584cd0e8e237290907f2679573713a5964818e98ee4addfa59157989624d9411f310 SHA512 e121a60cd2c57e1e3525e15fc165d44cd18ea6e2bd3aa704ea826ea0297ee66385b8ca3b88aadff89b7dd77771dca895fc51efce241880e99b8510a162a7334e
+DIST py3status-3.46.tar.gz 417945 BLAKE2B 99eb560ac36f8b958d125adacf11eb349a3f3a50618ea85fbca9ecb88ad0a36fa55c876ae12e67aae95cff22d4344957043dbfe7ced1c557023d5b096d0ac16d SHA512 ac5335a89c36f109fce9f1f0f3fc6464ef5654507a4837ba777c7795a462428c3d5d4cf1acd08b57ff21269f29cf4cb7bfdf72b8042f5d0564fc81d82ff00b79
diff --git a/x11-misc/py3status/py3status-3.45.ebuild b/x11-misc/py3status/py3status-3.46.ebuild
index feeede8caa4..feeede8caa4 100644
--- a/x11-misc/py3status/py3status-3.45.ebuild
+++ b/x11-misc/py3status/py3status-3.46.ebuild
diff --git a/x11-misc/qlipper/qlipper-5.1.2.ebuild b/x11-misc/qlipper/qlipper-5.1.2.ebuild
index 746b675f1bd..c8baf97ee0d 100644
--- a/x11-misc/qlipper/qlipper-5.1.2.ebuild
+++ b/x11-misc/qlipper/qlipper-5.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake xdg-utils
@@ -14,16 +14,15 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-# bundles x11-libs/libqxt but no qt5 system version is available yet
+# TODO: still accurate? bundles x11-libs/libqxt but no qt5 system version is available yet
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
x11-libs/libX11
"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
pkg_postinst() {
xdg_icon_cache_update
diff --git a/x11-misc/qps/qps-2.5.0.ebuild b/x11-misc/qps/qps-2.5.0.ebuild
index 1876e762c8f..cddee09ea46 100644
--- a/x11-misc/qps/qps-2.5.0.ebuild
+++ b/x11-misc/qps/qps-2.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
BDEPEND="
>=dev-qt/linguist-tools-5.15:5
diff --git a/x11-misc/redshift/redshift-1.12-r3.ebuild b/x11-misc/redshift/redshift-1.12-r3.ebuild
deleted file mode 100644
index 9a6d3445dca..00000000000
--- a/x11-misc/redshift/redshift-1.12-r3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit systemd autotools gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 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_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- use gtk && python_setup
-
- 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
- fi
-}
-
-pkg_preinst() {
- use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-misc/redshift/redshift-1.12-r4.ebuild b/x11-misc/redshift/redshift-1.12-r4.ebuild
deleted file mode 100644
index 82c613726fe..00000000000
--- a/x11-misc/redshift/redshift-1.12-r4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit flag-o-matic systemd autotools gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~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_prepare() {
- default
- eautoreconf
-}
-
-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
- fi
-}
-
-pkg_preinst() {
- use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-misc/redshift/redshift-1.12-r5.ebuild b/x11-misc/redshift/redshift-1.12-r5.ebuild
deleted file mode 100644
index 555749807f2..00000000000
--- a/x11-misc/redshift/redshift-1.12-r5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit flag-o-matic systemd autotools gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-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_prepare() {
- default
- eautoreconf
-}
-
-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_preinst() {
- use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 6ec043f0bb0..8a869c056aa 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,3 +1,3 @@
DIST rofi-1.6.1.tar.xz 404372 BLAKE2B b338382104b84f068024eff3a04bed1bbc895d6977204a9abdc55e3b382e6e6a9e5646f6155011b17d43943d9a7a9fb92aa7dca24789b260e73b5e3b134001de SHA512 c9794a7e4921e58ecc5fc7096218203f548efe2a49ffa6971accc12e9172248bda856ad06f8c11ada9abb62b9a43c7fffce1c1be9a3fe1365c94561b170a8b73
-DIST rofi-1.7.2.tar.xz 747768 BLAKE2B c6bc6decebe40fdc020d9fc0f4b998cae2c309d5c582af17092a9a54fcd49d6bcc0a05d4c6e24c7fce42ea85c28b219dd5cd88b13aa22c843724cdd38d223e57 SHA512 78605beb4261ce5f930f6b7f80e9350f37ab1b6249675c7b63625a4ea8d22803bcc7c9aaa07aa569b1c0b72692a8499d35e6e24554fc4a7ff23cd107a8355b1a
DIST rofi-1.7.3.tar.xz 755776 BLAKE2B af746e72ce5d09f3815960eb533bf58160c56141a116d1d950db498445e07696d0af2abe36a661ce67178f2040bfba7a39ac6c8eacdfc4db9f75e5f74daf47f5 SHA512 bba9ee25c7ff2168370ad1fd21a2286706f9db1efccdab84c55abd3bfa822ed10d23128388c69c964e81b2c51e1a95b3a3c7ca503a4564d0bdb3a993d8a9553d
+DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0
diff --git a/x11-misc/rofi/rofi-1.7.2.ebuild b/x11-misc/rofi/rofi-1.7.5.ebuild
index 03869ad9b2a..4fe9af65277 100644
--- a/x11-misc/rofi/rofi-1.7.2.ebuild
+++ b/x11-misc/rofi/rofi-1.7.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs xdg-utils
DESCRIPTION="A window switcher, run dialog and dmenu replacement"
HOMEPAGE="https://github.com/davatorium/rofi"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+drun test +windowmode"
RESTRICT="!test? ( test )"
@@ -22,19 +22,15 @@ BDEPEND="
"
RDEPEND="
dev-libs/glib:2
- gnome-base/librsvg:2
- media-libs/freetype
- virtual/jpeg
x11-libs/cairo[X,xcb(+)]
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libxcb
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libxcb:=
x11-libs/libxkbcommon[X]
x11-libs/pango[X]
x11-libs/startup-notification
x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
x11-misc/xkeyboard-config
"
DEPEND="
@@ -68,4 +64,10 @@ pkg_postinst() {
elog "For more information, please see https://github.com/davatorium/rofi/releases/tag/1.7.0"
fi
done
+
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
}
diff --git a/x11-misc/screengrab/screengrab-2.4.0.ebuild b/x11-misc/screengrab/screengrab-2.4.0.ebuild
index a510fdb00b0..07c912db124 100644
--- a/x11-misc/screengrab/screengrab-2.4.0.ebuild
+++ b/x11-misc/screengrab/screengrab-2.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
IUSE=""
BDEPEND="dev-qt/linguist-tools:5"
diff --git a/x11-misc/sent/sent-1-r1.ebuild b/x11-misc/sent/sent-1-r1.ebuild
index 4a36a2f9f46..6780cb174a4 100644
--- a/x11-misc/sent/sent-1-r1.ebuild
+++ b/x11-misc/sent/sent-1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
DEPEND="
media-libs/fontconfig
diff --git a/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch b/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch
new file mode 100644
index 00000000000..c109b4e3186
--- /dev/null
+++ b/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/828943
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ PREFIX = /usr
+ BINDIR = ${PREFIX}/bin
+
+-CFLAGS += `imlib2-config --cflags` `${PKG_CONFIG} xft --cflags` -pedantic -Wall
+-LDLIBS = -lX11 -lm `imlib2-config --libs` `${PKG_CONFIG} xft --libs`
++CFLAGS += `${PKG_CONFIG} --cflags imlib2` `${PKG_CONFIG} xft --cflags` -pedantic -Wall
++LDLIBS = -lX11 -lm `${PKG_CONFIG} --libs imlib2` `${PKG_CONFIG} xft --libs`
+
+ # Comment these out to disable Xinerama support
+ CFLAGS += -DXINERAMA
diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r2.ebuild
index adbe43ec367..519bef1bd83 100644
--- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0-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 toolchain-funcs
@@ -27,12 +27,14 @@ PATCHES=(
"${FILESDIR}"/${PN}-pointer-size.patch
"${FILESDIR}"/${P}-Makefile.patch
"${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-imlib2-pkg-config.patch
)
DOCS=( CHANGELOG skippyrc-default )
src_compile() {
tc-export CC PKG_CONFIG
+
default
}
diff --git a/x11-misc/snixembed/metadata.xml b/x11-misc/snixembed/metadata.xml
index 6da2e8686fd..07d2ac5f676 100644
--- a/x11-misc/snixembed/metadata.xml
+++ b/x11-misc/snixembed/metadata.xml
@@ -5,4 +5,7 @@
<email>steils@gentoo.org</email>
<name>Stefan Strogin</name>
</maintainer>
+ <upstream>
+ <remote-id type="sourcehut">~steef/snixembed</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index ecbe1e0c9cc..515eda905f3 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -1 +1 @@
-DIST sunflower-0.4_p20200716.tar.xz 830248 BLAKE2B 673b320bf08c0e0600fae06a531f75403b0e76bd8a267918986da84537a5213f0a1d99c9de74820f15652b80959e9029566f4611138893f08919f389a66a8032 SHA512 0e30bbadb3d60a64e2a2b629104c2a3ad88d997d581c1c76ef593afa1d3c48aafd185b4cd36da25bed5c3e9b9d1389f0709aaa40e796e883dccfe71b214620ed
+DIST 0.5-63.tar.gz 784093 BLAKE2B eef6fe3749137ac44cddb730549ca4eeed240d17bd7c4d0ac5b70f95e16f5eb57590a22a87150fabac31051219837aeeef32869f07d5def37784526181a3dd32 SHA512 ddf303dc873d38c4e5f8b2026f70088d40cb82ea2a10c91bd9c21938467fb797dd6bae3211b82cb2328fa212f880d878f2a799c2688da725ac5a448a11c3244d
diff --git a/x11-misc/sunflower/sunflower-0.4_p20200716-r2.ebuild b/x11-misc/sunflower/sunflower-0.5-r1.ebuild
index 40f32e2ea59..e019671e4ce 100644
--- a/x11-misc/sunflower/sunflower-0.4_p20200716-r2.ebuild
+++ b/x11-misc/sunflower/sunflower-0.5-r1.ebuild
@@ -1,16 +1,19 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1 xdg
+MY_PN="Sunflower"
+MY_PV="${PV}-63"
+
DESCRIPTION="Small and highly customizable twin-panel file manager with plugin-support"
HOMEPAGE="https://github.com/MeanEYE/Sunflower
https://sunflower-fm.org/"
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
+SRC_URI="https://github.com/MeanEYE/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -24,4 +27,14 @@ DEPEND="
RDEPEND="${DEPEND}
dev-python/pycairo[${PYTHON_USEDEP}]
+ x11-libs/vte
"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+ default
+
+ # Upstream's get_version requires a lot of BDEPENDS we do not want.
+ sed 's%version=get_version()%version="0.5"%g' -i setup.py
+}
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
index 5e24fffa7f0..857f7def615 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.g
LICENSE="MIT GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
x11-libs/gdk-pixbuf:2
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
deleted file mode 100644
index d8bdfca96e1..00000000000
--- a/x11-misc/trayer-srg/trayer-srg-1.1.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase"
-HOMEPAGE="https://github.com/sargon/trayer-srg"
-SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${PN}-trayer-${PV}
-
-src_configure() {
- # Custom configure script
- ./configure --prefix="${EPREFIX}" || die
-}
-
-src_compile() {
- emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)"
-}
-
-src_install() {
- dobin ${PN}
- einstalldocs
-}
diff --git a/x11-misc/urxvt-perls/metadata.xml b/x11-misc/urxvt-perls/metadata.xml
index 22b5798282b..8dcf2d1a3af 100644
--- a/x11-misc/urxvt-perls/metadata.xml
+++ b/x11-misc/urxvt-perls/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>juippis@gentoo.org</email>
- <name>Joonas Niilola</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="deprecated">Install scripts which have been marked as deprecated by upstream</flag>
</use>
diff --git a/x11-misc/urxvt-tabbedex/Manifest b/x11-misc/urxvt-tabbedex/Manifest
index fd4248f5343..c0e7fd8f990 100644
--- a/x11-misc/urxvt-tabbedex/Manifest
+++ b/x11-misc/urxvt-tabbedex/Manifest
@@ -1 +1,2 @@
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 42361307323..70c16c0f82d 100644
--- a/x11-misc/urxvt-tabbedex/metadata.xml
+++ b/x11-misc/urxvt-tabbedex/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>juippis@gentoo.org</email>
- <name>Joonas Niilola</name>
- </maintainer>
+ <!-- maintainer-needed -->
<stabilize-allarches/>
</pkgmetadata>
diff --git a/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild
new file mode 100644
index 00000000000..7d280b9d961
--- /dev/null
+++ b/x11-misc/urxvt-tabbedex/urxvt-tabbedex-22.32.ebuild
@@ -0,0 +1,30 @@
+# 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/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 4b656479e43..0f7eeed3910 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1 +1 @@
-DIST vdpauinfo-1.4_p20220208.tar.gz 12251 BLAKE2B 14b2a6bb81ac1843d30f0ae9c976971cd3409b50bd6b9adcb59d9132535fcebd3dda7a7f772aabce03bb6877e8140991301a770a58bcc4e82c864c10494773ed SHA512 a87f92a4467f87293fc931a2c5c003763aab8551adcce7fa7281b20f5520a8d2a9df2ff06bb66814cdd059266381a145c851fd7169749e8066e80e4a578cccaa
+DIST vdpauinfo-1.5.tar.gz 12246 BLAKE2B 5673eb6d00e501234cab3434ee06ef428495f86cf18304eed628e41dd0b17f8fe25aff8ef3bb896f4f70eefe2121446eae740c638b48b3ae1bc3547de4cb3102 SHA512 f3d359242443de919803ae0b8d89809c71e94d59d8ee9994f8f315036b829ad24030b75d953346989c1d0ddf436107041491e299c3212b013ad1d2b3c0571e59
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
index 133cc3bc678..1094701a0a2 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.5-r1.ebuild
@@ -3,14 +3,11 @@
EAPI=8
-inherit autotools
-
-VDPAUINFO_COMMIT="da66af25aa327d21179d478f3a6d8c03b6c7f574"
+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/${VDPAUINFO_COMMIT}/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${VDPAUINFO_COMMIT}"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU/"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/vdpauinfo/-/archive/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
@@ -28,4 +25,6 @@ src_prepare() {
default
eautoreconf
+
+ append-flags -fno-strict-aliasing #864755
}
diff --git a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
new file mode 100644
index 00000000000..dd37d6c3b66
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
@@ -0,0 +1,140 @@
+From 46d09529563127fef0d42a4fb2681ae8d65a856b Mon Sep 17 00:00:00 2001
+From: DRC <information@virtualgl.org>
+Date: Thu, 7 Jul 2022 17:22:57 -0500
+Subject: [PATCH] Build: Fix compilation errors with libX11 1.8.x
+
+Fixes #205
+---
+ ChangeLog.md | 2 ++
+ server/CMakeLists.txt | 10 ++++++++++
+ server/FakePbuffer.cpp | 2 +-
+ server/faker-sym.h | 6 ++++++
+ server/faker-x11.cpp | 7 ++++++-
+ server/faker.cpp | 4 ++--
+ 6 files changed, 27 insertions(+), 4 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 292a5a94..4b9cc36f 100644
+--- a/ChangeLog.md
++++ b/ChangeLog.md
+@@ -8,6 +8,8 @@ module when using recent versions of nVidia's proprietary drivers. In some
+ cases, this led to incorrect device permissions for **/dev/nvidia*** after the
+ display manager was restarted.
+
++2. Fixed compilation errors when building with libX11 1.8.x.
++
+
+ 3.0.1
+ =====
+diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
+index 574521a0..2ce92856 100644
+--- a/server/CMakeLists.txt
++++ b/server/CMakeLists.txt
+@@ -91,6 +91,16 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
+ > ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/faker-mapfile.c)
+
++include(CheckPrototypeDefinition)
++set(CMAKE_REQUIRED_INCLUDES ${X11_X11_INCLUDE_PATH})
++check_prototype_definition(XkbOpenDisplay
++ "Display *XkbOpenDisplay(_Xconst char *, int *, int *, int *, int *, int *)"
++ NULL X11/XKBlib.h LIBX11_18)
++unset(CMAKE_REQUIRED_INCLUDES)
++if(LIBX11_18)
++ add_definitions(-DLIBX11_18)
++endif()
++
+ set(FAKER_SOURCES
+ backend.cpp
+ ContextHash.cpp
+diff --git a/server/FakePbuffer.cpp b/server/FakePbuffer.cpp
+index bfa55279..64aab775 100644
+--- a/server/FakePbuffer.cpp
++++ b/server/FakePbuffer.cpp
+@@ -10,11 +10,11 @@
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ // wxWindows Library License for more details.
+
++#include <X11/Xlibint.h>
+ #include "FakePbuffer.h"
+ #include "TempContextEGL.h"
+ #include "BufferState.h"
+ #include "ContextHashEGL.h"
+-#include <X11/Xlibint.h>
+
+ using namespace util;
+ using namespace backend;
+diff --git a/server/faker-sym.h b/server/faker-sym.h
+index 0fa1e5cd..3c6f94e8 100644
+--- a/server/faker-sym.h
++++ b/server/faker-sym.h
+@@ -704,9 +704,15 @@ FUNCDEF2(int, XNextEvent, Display *, dpy, XEvent *, xe, XNextEvent)
+
+ FUNCDEF1(Display *, XOpenDisplay, _Xconst char *, name, XOpenDisplay)
+
++#ifdef LIBX11_18
++FUNCDEF6(Display *, XkbOpenDisplay, _Xconst char *, display_name,
++ int *, event_rtrn, int *, error_rtrn, int *, major_in_out,
++ int *, minor_in_out, int *, reason_rtrn, XkbOpenDisplay)
++#else
+ FUNCDEF6(Display *, XkbOpenDisplay, char *, display_name, int *, event_rtrn,
+ int *, error_rtrn, int *, major_in_out, int *, minor_in_out,
+ int *, reason_rtrn, XkbOpenDisplay)
++#endif
+
+ FUNCDEF5(Bool, XQueryExtension, Display *, dpy, _Xconst char *, name,
+ int *, major_opcode, int *, first_event, int *, first_error,
+diff --git a/server/faker-x11.cpp b/server/faker-x11.cpp
+index 99e8bf17..a233f3b1 100644
+--- a/server/faker-x11.cpp
++++ b/server/faker-x11.cpp
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011-2016, 2018-2021 D. R. Commander
++// Copyright (C)2009, 2011-2016, 2018-2022 D. R. Commander
+ //
+ // This library is free software and may be redistributed and/or modified under
+ // the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -586,8 +586,13 @@ Display *XOpenDisplay(_Xconst char *name)
+ // within libX11, VirtualGL cannot intercept it on some platforms. Thus we
+ // need to interpose XkbOpenDisplay().
+
++#ifdef LIBX11_18
++Display *XkbOpenDisplay(_Xconst char *display_name, int *event_rtrn,
++ int *error_rtrn, int *major_in_out, int *minor_in_out, int *reason_rtrn)
++#else
+ Display *XkbOpenDisplay(char *display_name, int *event_rtrn, int *error_rtrn,
+ int *major_in_out, int *minor_in_out, int *reason_rtrn)
++#endif
+ {
+ Display *dpy = NULL;
+
+diff --git a/server/faker.cpp b/server/faker.cpp
+index ec537a62..601cfa3e 100644
+--- a/server/faker.cpp
++++ b/server/faker.cpp
+@@ -1,6 +1,6 @@
+ // Copyright (C)2004 Landmark Graphics Corporation
+ // Copyright (C)2005, 2006 Sun Microsystems, Inc.
+-// Copyright (C)2009, 2011, 2013-2016, 2019-2021 D. R. Commander
++// Copyright (C)2009, 2011, 2013-2016, 2019-2022 D. R. Commander
+ //
+ // This library is free software and may be redistributed and/or modified under
+ // the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -14,6 +14,7 @@
+
+ #include <unistd.h>
+ #include "Mutex.h"
++#include <X11/Xlibint.h>
+ #include "ContextHash.h"
+ #ifdef EGLBACKEND
+ #include "ContextHashEGL.h"
+@@ -27,7 +28,6 @@
+ #include "fakerconfig.h"
+ #include "threadlocal.h"
+ #include <dlfcn.h>
+-#include <X11/Xlibint.h>
+ #include "faker.h"
+
+
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 1142ff47521..1e624dab8a8 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>np-hardass@gentoo.org</email>
- <name>Adam Feldman</name>
- </maintainer>
- <maintainer type="person">
<email>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
</maintainer>
@@ -22,6 +18,7 @@
the ability to run OpenGL applications with full 3D hardware acceleration.
</longdescription>
<upstream>
+ <remote-id type="github">virtualgl/virtualgl</remote-id>
<remote-id type="sourceforge">virtualgl</remote-id>
</upstream>
</pkgmetadata>
diff --git a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
index 762d51d6aaa..8cb6671d67d 100644
--- a/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0-r1.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-CMAKE_ECLASS=cmake
inherit cmake-multilib flag-o-matic systemd
diff --git a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
index bdd5c8a49e5..b78a84a80c3 100644
--- a/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-3.0.1.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-CMAKE_ECLASS=cmake
inherit cmake-multilib flag-o-matic systemd
@@ -14,7 +13,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
@@ -51,6 +50,11 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ # https://github.com/VirtualGL/virtualgl/issues/205 (from 'master')
+ "${FILESDIR}"/${P}-libX11-1.8.patch
+)
+
src_prepare() {
# Use /var/lib, bug #428122
sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
diff --git a/x11-misc/wmctrl/files/amd64-Xlib.patch b/x11-misc/wmctrl/files/amd64-Xlib.patch
deleted file mode 100644
index a1039a82502..00000000000
--- a/x11-misc/wmctrl/files/amd64-Xlib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- wmctrl-1.07.orig/main.c
-+++ wmctrl-1.07/main.c
-@@ -1425,6 +1425,16 @@
- *
- * long_length = Specifies the length in 32-bit multiples of the
- * data to be retrieved.
-+ *
-+ * NOTE: see
-+ * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
-+ * In particular:
-+ *
-+ * When the X window system was ported to 64-bit architectures, a
-+ * rather peculiar design decision was made. 32-bit quantities such
-+ * as Window IDs, atoms, etc, were kept as longs in the client side
-+ * APIs, even when long was changed to 64 bits.
-+ *
- */
- if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False,
- xa_prop_type, &xa_ret_type, &ret_format,
-@@ -1441,6 +1451,8 @@
-
- /* null terminate the result to make string handling easier */
- tmp_size = (ret_format / 8) * ret_nitems;
-+ /* Correct 64 Architecture implementation of 32 bit data */
-+ if(ret_format==32) tmp_size *= sizeof(long)/4;
- ret = g_malloc(tmp_size + 1);
- memcpy(ret, ret_prop, tmp_size);
- ret[tmp_size] = '\0';
diff --git a/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch
new file mode 100644
index 00000000000..8888a032087
--- /dev/null
+++ b/x11-misc/wmctrl/files/wmctrl-1.07-64bit-xlib.patch
@@ -0,0 +1,12 @@
+http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
+--- a/main.c
++++ b/main.c
+@@ -1441,6 +1451,8 @@
+
+ /* null terminate the result to make string handling easier */
+ tmp_size = (ret_format / 8) * ret_nitems;
++ /* Correct 64 Architecture implementation of 32 bit data */
++ if(ret_format==32) tmp_size *= sizeof(long)/4;
+ ret = g_malloc(tmp_size + 1);
+ memcpy(ret, ret_prop, tmp_size);
+ ret[tmp_size] = '\0';
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
index f7701592d69..a7bad8f520b 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r3.ebuild
@@ -1,25 +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
DESCRIPTION="Command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl"
-SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
+HOMEPAGE="http://tripie.sweb.cz/utils/wmctrl/"
+SRC_URI="http://tripie.sweb.cz/utils/wmctrl/dist/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
RDEPEND="
dev-libs/glib:2
x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt"
+ x11-libs/libXmu"
DEPEND="
${RDEPEND}
x11-base/xorg-proto"
BDEPEND="
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/amd64-Xlib.patch" )
+PATCHES=(
+ "${FILESDIR}"/${P}-64bit-xlib.patch
+)
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
index 14a946e7a1c..d6616b3af88 100644
--- a/x11-misc/xautolock/metadata.xml
+++ b/x11-misc/xautolock/metadata.xml
@@ -1,16 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="person">
+<email>graaff@gentoo.org</email>
+</maintainer>
<longdescription lang="en">
If no user activity is detected after a set timeout, xautolock runs a program
for you. If you want that program (with optional arguments) to be a screen
locker, then one of these packages might fit your purpose:
- x11-misc/alock
- x11-misc/i3lock
- x11-misc/slim
- x11-misc/slock
- x11-misc/xlockmore
- x11-misc/xtrlock
+ <pkg>x11-misc/alock</pkg>
+ <pkg>x11-misc/i3lock</pkg>
+ <pkg>x11-misc/slim</pkg>
+ <pkg>x11-misc/slock</pkg>
+ <pkg>x11-misc/xlockmore</pkg>
+ <pkg>x11-misc/xtrlock</pkg>
</longdescription>
</pkgmetadata>
diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
index 7ffba8cfdf6..03cb72de3b8 100644
--- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 sparc x86"
RDEPEND="
x11-libs/libXScrnSaver
diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index 8c5f2f19b9c..084a2ff8da2 100644
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -1,2 +1 @@
-DIST xbindkeys-1.8.6.tar.gz 151941 BLAKE2B f5eafb8f3655cbfa1ae7d7c5ed0bcdac97d4105df8df7a0aeecc267e08fbae8297713fc14c3e36871493e23959b624d5a88ba45cbef715a79df7de1f0927152f SHA512 3c77541eae9f87d2020c2272984c221094276dae2a8690c5cec9fe1b23c0139229b8f56876170da70684aeaa128642349b6835c375d473186cbf8123517173ba
DIST xbindkeys-1.8.7.tar.gz 177532 BLAKE2B 9ff6c9cd10bb6f2bf96a288482edb50e6671c9e4e3b5c136bdfaa92796f9e9bcfc42ab69ca3546c3871bdcdba1e952631cbd3d288dce9738986c20680e91c316 SHA512 a6b1478e8ef4bedc686fdd15abc11a8a592ac17c69e1a5a13f60e735e9be9646faed62e980cdac4aa7bc7e3253237465de38dee98935dd3f9911d4e48209b2e9
diff --git a/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch b/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch
deleted file mode 100644
index 427983e2d12..00000000000
--- a/x11-misc/xbindkeys/files/xbindkeys-apply-mask-on-release-event-status.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit ceb7093f8d77cf5952e8e7778db02a6f3e8d8872
-Author: Alberto <address@hidden>
-Date: Mon Feb 10 09:21:57 2014 +0200
-
- fix keyboard layout problems
-
-diff --git a/xbindkeys.c b/xbindkeys.c
-index b0adef9..162e47e 100644
---- a/xbindkeys.c
-+++ b/xbindkeys.c
-@@ -377,7 +377,7 @@ event_loop (Display * d)
- printf ("e.xbutton.state=%d\n", e.xbutton.state);
- }
-
-- e.xbutton.state &= ~(numlock_mask | capslock_mask | scrolllock_mask
-+ e.xbutton.state &= 0x1FFF && ~(numlock_mask | capslock_mask | scrolllock_mask
- | Button1Mask | Button2Mask | Button3Mask
- | Button4Mask | Button5Mask);
-
-@@ -409,7 +409,7 @@ event_loop (Display * d)
- printf ("e.xbutton.state=%d\n", e.xbutton.state);
- }
-
-- e.xbutton.state &= ~(numlock_mask | capslock_mask | scrolllock_mask
-+ e.xbutton.state &= 0x1FFF && ~(numlock_mask | capslock_mask | scrolllock_mask
- | Button1Mask | Button2Mask | Button3Mask
- | Button4Mask | Button5Mask);
-
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
deleted file mode 100644
index ff72ad31364..00000000000
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Tool for launching commands on keystrokes"
-SRC_URI="https://www.nongnu.org/${PN}/${P}.tar.gz"
-HOMEPAGE="https://www.nongnu.org/xbindkeys/xbindkeys.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="guile tk"
-
-RDEPEND="x11-libs/libX11
- guile? ( >=dev-scheme/guile-1.8.4[deprecated] )
- tk? ( dev-lang/tk )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}/${PN}-apply-mask-on-release-event-status.patch"
-)
-
-src_configure() {
- econf \
- $(use_enable tk) \
- $(use_enable guile)
-}
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 107d3891e50..6c1a8d0c552 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools
diff --git a/x11-misc/xclip/xclip-9999.ebuild b/x11-misc/xclip/xclip-9999.ebuild
index 12a50d1de86..ffdfc0010b1 100644
--- a/x11-misc/xclip/xclip-9999.ebuild
+++ b/x11-misc/xclip/xclip-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools git-r3
DESCRIPTION="Copy data from standard input to X clipboard"
diff --git a/x11-misc/xdaliclock/Manifest b/x11-misc/xdaliclock/Manifest
index 9b15593b2f2..52cf3b050cb 100644
--- a/x11-misc/xdaliclock/Manifest
+++ b/x11-misc/xdaliclock/Manifest
@@ -1 +1,2 @@
DIST xdaliclock-2.44.tar.gz 17727649 BLAKE2B 170f1a7f9e5c10799b62b2ae76b33ab64230e4ade8f0b79c2aff7481536009e3e4e0f19239dd806d7b16c69225744fa381f5aabbeec6e0e92d8b875bd8ca0aeb SHA512 82082a8e16a85c7115bdd0a44e7845aedfad93f94226a14cf606493564829c7ffe55eb4d17cb43c41bd0e6c97c090457d6aa2d184f60462cea3a89f47ef72e00
+DIST xdaliclock-2.47.tar.gz 3410612 BLAKE2B 64d2e98693f055887959c34021a3e595bd46fb8ba453c58af76d78977a2d7b6a0092c9c9e174c53d65b7af5723e9fb3c434a48e4d39f2986dac8d6b80f3fa9f7 SHA512 d51930240170bad5694cc502251aeb88aed8b78cee086bda704624c2599acf94e30368a971f26eb59a824df3273b6eb58c6fd2017684f8f421d678828e41db7f
diff --git a/x11-misc/xdaliclock/files/xdaliclock-2.47-DESTDIR.patch b/x11-misc/xdaliclock/files/xdaliclock-2.47-DESTDIR.patch
new file mode 100644
index 00000000000..eee6682f17d
--- /dev/null
+++ b/x11-misc/xdaliclock/files/xdaliclock-2.47-DESTDIR.patch
@@ -0,0 +1,59 @@
+https://cgit.freebsd.org/ports/tree/x11-clocks/xdaliclock/files/patch-Makefile.in?id=b4521d44c7f02e022fa92fdd445ee4274aa96948
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -92,35 +92,35 @@ $(install_prefix)$(SCHEMA_DIR):
+ $(install_prefix)$(GTK_APPDIR) \
+ $(install_prefix)$(GTK_ICONDIR) \
+ $(install_prefix)$(SCHEMA_DIR):
+- mkdir -p $@
++# mkdir -p $@
+
+ install-program: xdaliclock $(install_prefix)$(bindir)
+- $(INSTALL_PROGRAM) $< $(install_prefix)$(bindir)/xdaliclock
++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(install_prefix)$(bindir)/xdaliclock
+
+ # If /usr/share/glib-2.0/schemas/org.jwz.xdaliclock.gschema.xml" does
+ # not exist, the app won't launch. This is an amazing design. Spectacular.
+ # No notes.
+ #
+ install-schema: $(SCHEMA) $(install_prefix)$(SCHEMA_DIR)
+- $(INSTALL_DATA) $< $(install_prefix)$(SCHEMA_DIR)/
+- $(GLIB_COMPILE_SCHEMAS) $(install_prefix)$(SCHEMA_DIR)
++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(SCHEMA_DIR)/
++ $(GLIB_COMPILE_SCHEMAS) $(DESTDIR)$(install_prefix)$(SCHEMA_DIR)
+
+ # /usr/share/pixmaps/xdaliclock.png
+ install-gnome:: $(LOGO) $(install_prefix)$(GTK_ICONDIR)
+- $(INSTALL_DATA) $< $(install_prefix)$(GTK_ICONDIR)/
++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(GTK_ICONDIR)/
+
+ # /usr/share/applications/xdaliclock.desktop
+ install-gnome:: $(DESK) $(install_prefix)$(GTK_APPDIR)
+- $(INSTALL_DATA) $< $(install_prefix)$(GTK_APPDIR)/
++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(GTK_APPDIR)/
+
+ # /usr/share/pixmaps/index.theme
+ install-gnome:: update-icon-caches
+ update-icon-caches::
+ @\
+- for f in $(install_prefix)$(datadir)/icons/index.theme \
+- $(install_prefix)$(datadir)/icons/*/index.theme \
+- $(install_prefix)$(datadir)/pixmaps/index.theme \
+- $(install_prefix)$(datadir)/pixmaps/*/index.theme ; do \
++ for f in $(DESTDIR)$(install_prefix)$(datadir)/icons/index.theme \
++ $(DESTDIR)$(install_prefix)$(datadir)/icons/*/index.theme \
++ $(DESTDIR)$(install_prefix)$(datadir)/pixmaps/index.theme \
++ $(DESTDIR)$(install_prefix)$(datadir)/pixmaps/*/index.theme ; do \
+ if [ -f $$f ]; then \
+ f=`dirname $$f` ; \
+ echo $(UPDATE_ICON_CACHE) --force --quiet $$f ; \
+@@ -129,7 +129,7 @@ install-man: xdaliclock.man $(install_prefix)$(man1dir
+ done
+
+ install-man: xdaliclock.man $(install_prefix)$(man1dir)
+- $(INSTALL_DATA) $< $(install_prefix)$(man1dir)/xdaliclock.$(mansuffix)
++ $(INSTALL_DATA) $< $(DESTDIR)$(install_prefix)$(man1dir)/xdaliclock.$(mansuffix)
+
+
+ uninstall-program:
+
diff --git a/x11-misc/xdaliclock/xdaliclock-2.47.ebuild b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
new file mode 100644
index 00000000000..1fe477c682f
--- /dev/null
+++ b/x11-misc/xdaliclock/xdaliclock-2.47.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils xdg
+
+DESCRIPTION="Dali Clock is a digital clock. When a digit changes, it melts into its new shape"
+HOMEPAGE="https://www.jwz.org/xdaliclock"
+SRC_URI="https://www.jwz.org/xdaliclock/${P}.tar.gz"
+S="${WORKDIR}"/${P}/X11
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ virtual/opengl
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/xdaliclock-2.47-DESTDIR.patch
+)
+
+src_install() {
+ dodir /usr/bin /usr/share/pixmaps
+ dodir /usr/share/glib-2.0/schemas /usr/share/man/man1/
+ dodir /usr/share/applications/
+
+ default
+
+ # Will collide with dev-libs/glib
+ rm "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+
+ #dobin ${PN}
+ #newman ${PN}.man ${PN}.1
+ #dodoc ../README
+
+ #doicon xdaliclock.png
+ #domenu xdaliclock.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index dc216c40fd9..4aa0745e72c 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1 +1,2 @@
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/files/xdg-user-dirs-0.15-libiconv.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
index bf5910882c3..7fa9e48b323 100644
--- a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
+++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
@@ -1,11 +1,32 @@
-http://bugs.gentoo.org/366885
-http://bugs.gentoo.org/499940
+https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/9
+From f310c0534c1394410e98e610cf5cd34d1f4c07e4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 16 Aug 2022 23:14:39 +0100
+Subject: [PATCH] Makefile.am: link with libiconv when needed
+
+Fixes issues on systems with libiconv separate from libc
+(e.g. Darwin/macOS, uclibc).
+
+We already ask configure to do detection for us
+of whether we need an explicit library link line
+for libintl and libiconv, so let's use the result.
+
+This will have no effect if the variable is empty
+of course, as will be the case on many systems
+(everywhere it worked before).
+
+We've been carrying this patch in Gentoo for quite some time
+with no issues.
+
+Bug: https://bugs.gentoo.org/366885
+Bug: https://bugs.gentoo.org/499940
+Signed-off-by: Sam James <sam@gentoo.org>
--- a/Makefile.am
+++ b/Makefile.am
-@@ -16,7 +16,7 @@
- xdgdir=$(sysconfdir)/xdg
- xdg_DATA=user-dirs.conf user-dirs.defaults
+@@ -22,7 +22,7 @@ xdg_DATA=user-dirs.conf user-dirs.defaults
+ xdgautostartdir=$(xdgdir)/autostart
+ xdgautostart_DATA = xdg-user-dirs.desktop
-libraries = $(LIBINTL)
+libraries = $(LIBINTL) $(LIBICONV)
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
new file mode 100644
index 00000000000..e7768e1b855
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.18.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="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"
+
+BDEPEND="app-text/docbook-xml-dtd:4.3
+ 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
+
+ # For libiconv patch
+ eautoreconf
+}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
index db26c50443b..baa74ea8d11 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/xdg-utils-${MY_COMMIT}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="dbus doc gnome"
REQUIRED_USE="gnome? ( dbus )"
diff --git a/x11-misc/xidle/xidle-26052015.ebuild b/x11-misc/xidle/xidle-26052015-r1.ebuild
index 635de43fc73..39252add1d5 100644
--- a/x11-misc/xidle/xidle-26052015.ebuild
+++ b/x11-misc/xidle/xidle-26052015-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit toolchain-funcs
+EAPI=8
+
+inherit edo toolchain-funcs
DESCRIPTION="Monitors inactivity in X and runs the specified program when a timeout occurs"
HOMEPAGE="http://www.freebsdsoftware.org/x11/xidle.html"
@@ -11,24 +12,20 @@ SRC_URI="http://distcache.freebsd.org/local-distfiles/novel/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
RDEPEND="
x11-libs/libX11
x11-libs/libXScrnSaver
"
-DEPEND="
- ${DEPEND}
- virtual/pkgconfig
-"
+DEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/${P}-dead.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-dead.patch"
+)
src_compile() {
- local my_compile="$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN}{,.c}
- $($(tc-getPKG_CONFIG) --libs xscrnsaver) $($(tc-getPKG_CONFIG) --libs x11)"
- echo ${my_compile} || die
- eval ${my_compile} || die
+ edo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN}{,.c} $($(tc-getPKG_CONFIG) --libs xscrnsaver) $($(tc-getPKG_CONFIG) --libs x11)
}
src_install() {
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 3a0dfd778cd..b3c8e55f3b5 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1 +1 @@
-DIST xmobar-0.37.tar.gz 139585 BLAKE2B b7f115dc18f1ec6f2dc767c0cf6f4f94a9e3691cd5823302cc033542a10430bd3f29f906c4b1d8705cfae7e999695ac85d03d0c3ecfe4f7efaeac627a5e61d3f SHA512 a2904f3658ea32654ba343cd2c815928900e29e819dbc5ddff931601f42bae244365d2636ffce8b52c4dc57f88f3abebeffc62924fd3b39e197698d7b0da7d5d
+DIST xmobar-0.44.1.tar.gz 156756 BLAKE2B bee81627744146989b402ae04d36edb5e4a69686b546457afebad81cda96ece4ce0ace8a2855bd5136610be3fc396c2f62121ea062fffb1ad837145cf3238fdb SHA512 e04f3f9f40ffa4095df2b523916686d93d28b4cbb880f7732cf63d6f1915e721043764b9d723ed8b3c4938c3df749d0e5a9ddb9a9e64a2a015f8f0d6b3f46c97
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 86ecf67faf1..85386171573 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -6,25 +6,16 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="alsa">Use alsa-mixer to get the volume from soundcards</flag>
- <flag name="dbus">Publish a service on the session bus for controlling xmobar</flag>
- <flag name="inotify">inotify support (modern Linux only). Required for the Mail and MBox plugins</flag>
- <flag name="mpd">Support mpd plugin</flag>
- <flag name="timezone">Enables localized date support</flag>
- <flag name="mpris">Enables MPRIS v1, v2 support</flag>
- <flag name="rtsopts">Reduce process wakekups frequency to decrease CPU usage</flag>
- <flag name="uvmeter">Plugin to show UV data for Australia</flag>
- <flag name="weather">Enable weather plugin</flag>
- <flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux</flag>
- <flag name="iwlib">Wireless info support via Wext ioctls (deprecated)</flag>
- <flag name="xft">Use Xft to render text. UTF-8 support included</flag>
- <flag name="xpm">Enable usage of xpm for icons</flag>
+ <flag name="alsa">Use alsa-mixer to get the volume from soundcards.</flag>
+ <flag name="dbus">Publish a service on the session bus for controlling xmobar.</flag>
+ <flag name="mpd">MPD support. Needs libmpd installed.</flag>
+ <flag name="mpris">MPRIS v1, v2 support.</flag>
+ <flag name="rtsopts">Use -with-rtsopts=-V0 to reduce wakeups.</flag>
+ <flag name="timezone">Enables localized date support.</flag>
+ <flag name="uvmeter">UVMeter only useful to australians.</flag>
+ <flag name="weather">Enable weather plugin.</flag>
+ <flag name="wifi">Wireless info support via nl80211. Required for the Wireless plugin on systems running Linux, the kernel.</flag>
+ <flag name="xft">Use Xft to render text. UTF-8 support included.</flag>
+ <flag name="xpm">Enable usage of xpm for icons.</flag>
</use>
- <longdescription>
- Xmobar is a minimalistic text based status bar.
-
- Inspired by the Ion3 status bar, it supports similar
- features, like dynamic color management, output templates,
- and extensibility through plugins.
- </longdescription>
</pkgmetadata>
diff --git a/x11-misc/xmobar/xmobar-0.37.ebuild b/x11-misc/xmobar/xmobar-0.44.1.ebuild
index df9b615bd71..d09d7919119 100644
--- a/x11-misc/xmobar/xmobar-0.37.ebuild
+++ b/x11-misc/xmobar/xmobar-0.44.1.ebuild
@@ -1,28 +1,27 @@
-# 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
-# ebuild generated by hackport 0.6.7
-#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:iwlib,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm,with_nl80211:wifi
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -all_extensions,+with_threaded,+with_utf8,-with_iwlib,with_nl80211:wifi,+with_inotify
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="https://xmobar.org"
+HOMEPAGE="https://codeberg.org/xmobar/xmobar"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify iwlib mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="alsa dbus mpd mpris +rtsopts timezone uvmeter +weather wifi xft xpm"
-RDEPEND="dev-haskell/async:=[profile?]
+RDEPEND=">=dev-haskell/aeson-1.4.7.1:=[profile?]
+ dev-haskell/async:=[profile?]
>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
- >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
dev-haskell/old-locale:=[profile?]
- >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
>=dev-haskell/parsec-numbers-0.1.0:=[profile?]
dev-haskell/regex-compat:=[profile?]
>=dev-haskell/stm-2.3:=[profile?] <dev-haskell/stm-2.6:=[profile?]
@@ -41,7 +40,7 @@ RDEPEND="dev-haskell/async:=[profile?]
!dbus? ( !uvmeter? ( weather? ( !xpm? ( dev-haskell/http-client-tls:=[profile?]
dev-haskell/http-conduit:=[profile?]
dev-haskell/http-types:=[profile?] ) ) ) )
- inotify? ( >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?] )
+ >=dev-haskell/hinotify-0.3:=[profile?] <dev-haskell/hinotify-0.5:=[profile?]
mpd? ( >=dev-haskell/libmpd-0.9.2.0:=[profile?] )
mpris? ( >=dev-haskell/dbus-1:=[profile?]
!dbus? ( !uvmeter? ( weather? ( dev-haskell/http-client-tls:=[profile?]
@@ -61,9 +60,7 @@ RDEPEND="dev-haskell/async:=[profile?]
uvmeter? ( dev-haskell/http-conduit:=[profile?]
dev-haskell/http-types:=[profile?] )
wifi? ( >=dev-haskell/cereal-0.5.8.1:=[profile?]
- >=dev-haskell/netlink-1.1.1.0:=[profile?] )
- !wifi? ( iwlib? ( >=dev-haskell/iwlib-0.1.0:=[profile?] <dev-haskell/iwlib-0.2:=[profile?]
- net-wireless/wireless-tools ) )
+ >=dev-haskell/netlink-1.1.1.0:=[profile?] )
xft? ( >=dev-haskell/x11-xft-0.2:=[profile?] <dev-haskell/x11-xft-0.4:=[profile?] )
"
DEPEND="${RDEPEND}
@@ -75,14 +72,14 @@ DEPEND="${RDEPEND}
src_configure() {
haskell-cabal_src_configure \
--flag=-all_extensions \
+ --flag=-with_iwlib \
+ --flag=with_inotify \
$(cabal_flag alsa with_alsa) \
$(cabal_flag timezone with_datezone) \
$(cabal_flag dbus with_dbus) \
- $(cabal_flag inotify with_inotify) \
- $(cabal_flag wifi with_nl80211) \
$(cabal_flag mpd with_mpd) \
$(cabal_flag mpris with_mpris) \
- $(cabal_flag iwlib with_iwlib) \
+ $(cabal_flag wifi with_nl80211) \
$(cabal_flag rtsopts with_rtsopts) \
--flag=with_threaded \
--flag=with_utf8 \
@@ -95,5 +92,6 @@ src_configure() {
src_install() {
cabal_src_install
- dodoc examples/xmobar.config examples/xmobar.hs readme.md changelog.md
+# dodoc readme.md
+ dodoc examples/xmobar.config examples/xmobar.hs changelog.md
}
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 4cb2050ba58..5197d620a90 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,3 +1 @@
-DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
-DIST xosview-1.22.tar.gz 146459 BLAKE2B 7f4920b5b5a765f574694ab64e1d34ad6dbc33893cb816bb73119b4f72b7d23900528cb0db9302b24d20d7b8ce1738ce2d00be572c9fd4b391724f277afb02d5 SHA512 9bf37f557d9c07a300f6f9c21e197d25d4c5a4bb6e67b40af9c44a3159ea5010d7ba5bf427a9cec9729fa423da132a1364d0ac7027e9bc9bcd33f490d9e8282a
DIST xosview-1.23.tar.gz 146299 BLAKE2B ba336ac152ac6c44bd51c84c160d7c1b565fe23c17aa89db36be7325f4f1caa1ab84a1ad386041841a0aacb62208fb5d59f5dd7a9d2bf071c76dff2901eb2c60 SHA512 10a25f644ec3d896071990117c6d80e553a17baf64809f11bc778652dca1498f81c333ac0f21a809ef617d7e6cbe65afaa14d5bc96908958d8f997234e660ba1
diff --git a/x11-misc/xosview/xosview-1.20-r1.ebuild b/x11-misc/xosview/xosview-1.20-r1.ebuild
deleted file mode 100644
index 3ecc36b3b66..00000000000
--- a/x11-misc/xosview/xosview-1.20-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="X11 operating system viewer"
-HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
-SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="suid"
-
-COMMON_DEPS="x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt"
-RDEPEND="${COMMON_DEPS}
- media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPS}
- x11-base/xorg-proto"
-
-DOCS=( CHANGES README.linux TODO )
-
-src_prepare() {
- default
-
- sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die
- sed -i -e "s:Git:${PV}:g" ${PN}.cc || die
- tc-export CXX
-}
-
-src_compile() {
- emake OPTFLAGS=''
-}
-
-src_install() {
- emake PREFIX="${D%/}/usr" install
- use suid && fperms 4755 /usr/bin/${PN}
- insinto /usr/share/X11/app-defaults
- newins Xdefaults XOsview
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- if ! use suid ; then
- ewarn "If you want to use serial meters ${PN} needs to be executed as root."
- ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/x11-misc/xosview/xosview-1.22.ebuild b/x11-misc/xosview/xosview-1.22.ebuild
deleted file mode 100644
index e47a5770c69..00000000000
--- a/x11-misc/xosview/xosview-1.22.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="X11 operating system viewer"
-HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
-SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="suid"
-
-COMMON_DEPS="x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt"
-RDEPEND="${COMMON_DEPS}
- media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPS}
- x11-base/xorg-proto"
-
-DOCS=( CHANGES README.linux TODO )
-
-src_prepare() {
- default
-
- sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die
- sed -i -e "s:Git:${PV}:g" ${PN}.cc || die
- tc-export CXX
-}
-
-src_compile() {
- emake OPTFLAGS=''
-}
-
-src_install() {
- emake PREFIX="${D}/usr" install
- use suid && fperms 4755 /usr/bin/${PN}
- insinto /usr/share/X11/app-defaults
- newins Xdefaults XOsview
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- if ! use suid ; then
- ewarn "If you want to use serial meters ${PN} needs to be executed as root."
- ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/x11-misc/xpad/xpad-5.8.0.ebuild b/x11-misc/xpad/xpad-5.8.0.ebuild
index 91cad0d9159..2df4a07a8d0 100644
--- a/x11-misc/xpad/xpad-5.8.0.ebuild
+++ b/x11-misc/xpad/xpad-5.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
RDEPEND="
app-accessibility/at-spi2-atk
diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest
index 228dd3e632e..dd3f58283b3 100644
--- a/x11-misc/xprintidle/Manifest
+++ b/x11-misc/xprintidle/Manifest
@@ -1,2 +1 @@
-DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e682b7b1e5de4982a50bb757b263044cf54edcd5452fea7fd93f435b86da3da6d0ef38dbacee761bc77399f43665 SHA512 cc2f62b33ef387366246ee9a195be4cde68b2d13a49a4d1299640da2d42f7042152bfdf6932e7904a7f4211b0dc22486bbd62b47fdaf9d5d3db895e296b5f2f9
DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5
diff --git a/x11-misc/xprintidle/xprintidle-2.0.ebuild b/x11-misc/xprintidle/xprintidle-2.0.ebuild
deleted file mode 100644
index 83b621d16fe..00000000000
--- a/x11-misc/xprintidle/xprintidle-2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Prints user's X server idle time in milliseconds"
-HOMEPAGE="https://github.com/lucianposton/xprintidle"
-SRC_URI="https://github.com/lucianposton/xprintidle/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXScrnSaver
- "
-RDEPEND="${DEPEND}"
-
-DOCS=(
- AUTHORS
- ChangeLog
- NEWS
- README
-)
-
-src_prepare() {
- eapply_user
-
- # Address "configure: WARNING: 'missing' script is too old or missing"
- eautoreconf
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
index 630db4ff367..300a5d4c25c 100644
--- a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
@@ -17,7 +17,7 @@ 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"
+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"
REQUIRED_USE="
gdk-pixbuf? ( gtk )
diff --git a/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch b/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch
new file mode 100644
index 00000000000..3235053c8b7
--- /dev/null
+++ b/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch
@@ -0,0 +1,75 @@
+https://bugs.gentoo.org/870571
+
+Not sent upstream as it's a generated file and configure.in
+is written for autoconf 2.13.
+--- a/configure
++++ b/configure
+@@ -1057,7 +1057,7 @@ cat > conftest.$ac_ext << EOF
+ #line 1058 "configure"
+ #include "confdefs.h"
+
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
+@@ -1304,6 +1304,7 @@ else
+ #line 1305 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
++#include <stdlib.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+@@ -2477,7 +2478,7 @@ for ac_kw in inline __inline__ __inline; do
+ #include "confdefs.h"
+
+ int main() {
+-} $ac_kw foo() {
++} int $ac_kw foo() {
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+@@ -2855,13 +2856,14 @@ else
+ cat > conftest.$ac_ext <<EOF
+ #line 2857 "configure"
+ #include "confdefs.h"
++#include <unistd.h>
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char $ac_func();
++int $ac_func();
+
+ int main() {
+
+@@ -2934,14 +2936,13 @@ else
+ * does it exist and is it safe to write into the mmap'd area
+ * how to use it (BSD variants) */
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <stdlib.h>
++#include <unistd.h>
+
+-/* This mess was copied from the GNU getpagesize.h. */
+ #ifndef HAVE_GETPAGESIZE
+-# ifdef HAVE_UNISTD_H
+-# include <unistd.h>
+-# endif
+
+ /* Assume that all systems that can run configure have sys/param.h. */
+ # ifndef HAVE_SYS_PARAM_H
+@@ -2981,7 +2982,7 @@ else
+ #ifdef __cplusplus
+ extern "C" { void *malloc(unsigned); }
+ #else
+-char *malloc();
++void *malloc();
+ #endif
+
+ int
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild
index 1de8663792e..5a8da903b1c 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+
inherit toolchain-funcs
-DESCRIPTION="small tool to report and change the keyboard LED states of an X display"
+DESCRIPTION="Small tool to report and change the keyboard LED states of an X display"
HOMEPAGE="https://github.com/bmeurer/xsetleds"
SRC_URI="
ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz
@@ -23,14 +24,15 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
"
+
PATCHES=(
"${FILESDIR}"/${P}-assignment.patch
"${FILESDIR}"/${P}-isalpha.patch
+ "${FILESDIR}"/${P}-configure-implicit-function-decl.patch
)
-src_prepare() {
- default
+src_configure() {
tc-export CC
-}
-DOCS=( AUTHORS ChangeLog README TODO )
+ default
+}
diff --git a/x11-misc/xssstate/files/xssstate-1.1-libdir.patch b/x11-misc/xssstate/files/xssstate-1.1-libdir.patch
new file mode 100644
index 00000000000..cedde569f12
--- /dev/null
+++ b/x11-misc/xssstate/files/xssstate-1.1-libdir.patch
@@ -0,0 +1,23 @@
+Bug: https://bugs.gentoo.org/732450
+Upstream-Commit: https://git.suckless.org/xssstate/commit/5d8e9b49ce2970f786f1e5aa12bbaae83900453f.html
+
+From: orbea <orbea@riseup.net>
+Date: Fri, 23 Sep 2022 21:17:01 -0700
+Subject: [PATCH] config.mk: Add LIBDIR
+
+--- a/config.mk
++++ b/config.mk
+@@ -5,11 +5,12 @@ VERSION = 1.1
+
+ # paths
+ PREFIX = /usr/local
++LIBDIR = ${PREFIX}/lib
+ MANPREFIX = ${PREFIX}/share/man
+
+ # includes and libs
+ INCS = -I. -I/usr/include
+-LIBS = -L/usr/lib -lc -lX11 -lXss
++LIBS = -L${LIBDIR} -lc -lX11 -lXss
+
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\"
diff --git a/x11-misc/xssstate/xssstate-1.1-r1.ebuild b/x11-misc/xssstate/xssstate-1.1-r1.ebuild
new file mode 100644
index 00000000000..a28494199a2
--- /dev/null
+++ b/x11-misc/xssstate/xssstate-1.1-r1.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="A simple tool to retrieve the X screensaver state"
+HOMEPAGE="https://tools.suckless.org/x/xssstate"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+"
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch
+ "${FILESDIR}"/${PN}-1.1-libdir.patch #732450
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake install \
+ DESTDIR="${D}" \
+ PREFIX="${EPREFIX}"/usr \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+ dodoc README xsidle.sh
+ doman ${PN}.1
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 24b4414b228..00c689ce109 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1 +1,2 @@
DIST xwallpaper-0.7.3.tar.xz 86388 BLAKE2B 45942dbe7e3627fbbf99ac5ab94c88ecea919e48131f268f0be10a0fba15a4feddf207c0787ac47f75bc6a5cc94f2b78d599e97950609196930a73073ae21ec1 SHA512 7fa9cc9ca2445afdfcb647724a6dc8bb3b52b9a6c91d237f6b443cf1fe6624c67d16d611bf4e435c5f3dcdae6cbf73bbde257a4e194bc127dc13dca1f8067c19
+DIST xwallpaper-0.7.4.tar.xz 86432 BLAKE2B c10a69ab5734e43e99a746872bff427797e1d8f9de06d241fa81435036527b029031bb49733cf2119e8725883f20b9253b779ef9113d32d1b4f77bd73511a76a SHA512 f6eaf41befe724ad55d14f607bdfe9d05c79139054deb6590198ce767cf42173f068459dd894b284f3e8dbc95fc482d8ed7ed1c615f7b72b249897a6a01d51ba
diff --git a/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild b/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild
new file mode 100644
index 00000000000..70132cc575a
--- /dev/null
+++ b/x11-misc/xwallpaper/xwallpaper-0.7.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Wallpaper setting utility for X"
+HOMEPAGE="https://github.com/stoeckmann/xwallpaper"
+
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
+else
+ SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+jpeg +png seccomp xpm"
+
+RDEPEND="
+ x11-libs/pixman
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:0= )
+ seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+ xpm? ( x11-libs/libXpm )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_with jpeg)
+ $(use_with png)
+ $(use_with seccomp)
+ $(use_with xpm)
+ --with-randr
+ )
+ econf "${myconf[@]}"
+}
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index eabdc06bd22..70132cc575a 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.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 autotools