summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/cbatticon/Manifest1
-rw-r--r--x11-misc/cbatticon/cbatticon-1.6.9.ebuild50
-rw-r--r--x11-misc/colord/colord-1.3.5.ebuild2
-rw-r--r--x11-misc/dmenu/dmenu-4.9.ebuild2
-rw-r--r--x11-misc/gigolo/gigolo-0.4.91-r1.ebuild36
-rw-r--r--x11-misc/grsync/grsync-1.2.6.ebuild4
-rw-r--r--x11-misc/gxmessage/gxmessage-3.4.3.ebuild2
-rw-r--r--x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild2
-rw-r--r--x11-misc/kronometer/Manifest2
-rw-r--r--x11-misc/kronometer/kronometer-2.2.2.ebuild (renamed from x11-misc/kronometer/kronometer-2.2.1.ebuild)5
-rw-r--r--x11-misc/light-locker/Manifest1
-rw-r--r--x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch287
-rw-r--r--x11-misc/light-locker/light-locker-1.9.0-r2.ebuild72
-rw-r--r--x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild2
-rw-r--r--x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild2
-rw-r--r--x11-misc/lightdm/Manifest1
-rw-r--r--x11-misc/lightdm/lightdm-1.26.0-r1.ebuild2
-rw-r--r--x11-misc/lightdm/lightdm-1.28.0.ebuild2
-rw-r--r--x11-misc/lightdm/lightdm-1.30.0.ebuild154
-rw-r--r--x11-misc/lightdm/metadata.xml1
-rw-r--r--x11-misc/menulibre/Manifest2
-rw-r--r--x11-misc/menulibre/menulibre-2.2.1.ebuild (renamed from x11-misc/menulibre/menulibre-2.1.5.ebuild)16
-rw-r--r--x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild4
-rw-r--r--x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild2
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild2
-rw-r--r--x11-misc/peksystray/Manifest1
-rw-r--r--x11-misc/peksystray/peksystray-0.2.1.ebuild29
-rw-r--r--x11-misc/polybar/Manifest1
-rw-r--r--x11-misc/polybar/polybar-3.3.1.ebuild75
-rw-r--r--x11-misc/polybar/polybar-9999.ebuild39
-rw-r--r--x11-misc/qps/qps-1.10.20.ebuild2
-rw-r--r--x11-misc/qtfm/Manifest2
-rw-r--r--x11-misc/qtfm/files/qtfm-99999-cmake.patch47
-rw-r--r--x11-misc/qtfm/metadata.xml4
-rw-r--r--x11-misc/qtfm/qtfm-6.2.0.ebuild (renamed from x11-misc/qtfm/qtfm-6.1.8.ebuild)11
-rw-r--r--x11-misc/qtfm/qtfm-99999.ebuild53
-rw-r--r--x11-misc/sddm/sddm-0.18.0.ebuild4
-rw-r--r--x11-misc/util-macros/util-macros-1.19.2-r1.ebuild2
-rw-r--r--x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild2
-rw-r--r--x11-misc/virtualgl/virtualgl-2.5.2.ebuild88
-rw-r--r--x11-misc/x11vnc/Manifest1
-rw-r--r--x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch26
-rw-r--r--x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch93
-rw-r--r--x11-misc/x11vnc/metadata.xml9
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild55
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild75
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild (renamed from x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild)50
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.16.ebuild56
-rw-r--r--x11-misc/xdotool/xdotool-3.20160805.1.ebuild2
-rw-r--r--x11-misc/xfe/Manifest2
-rw-r--r--x11-misc/xfe/xfe-1.43.2.ebuild (renamed from x11-misc/xfe/xfe-1.43.ebuild)15
-rw-r--r--x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild2
-rw-r--r--x11-misc/xflux/xflux-20130927-r1.ebuild2
-rw-r--r--x11-misc/xiccd/Manifest1
-rw-r--r--x11-misc/xiccd/xiccd-0.3.0.ebuild24
-rw-r--r--x11-misc/xkeyboard-config/Manifest1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild51
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.42.ebuild4
-rw-r--r--x11-misc/xwallpaper/Manifest3
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild48
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild2
-rw-r--r--x11-misc/xwallpaper/xwallpaper-0.6.0.ebuild (renamed from x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild)6
-rw-r--r--x11-misc/xwallpaper/xwallpaper-9999.ebuild2
-rw-r--r--x11-misc/zim/Manifest1
-rw-r--r--x11-misc/zim/zim-0.71.1.ebuild77
65 files changed, 1263 insertions, 361 deletions
diff --git a/x11-misc/cbatticon/Manifest b/x11-misc/cbatticon/Manifest
index d595d951584e..f80cb1752520 100644
--- a/x11-misc/cbatticon/Manifest
+++ b/x11-misc/cbatticon/Manifest
@@ -1,3 +1,4 @@
DIST cbatticon-1.6.5.tar.gz 27951 BLAKE2B 41d43bd7bfd5741e37365bed1541c88e255998a4ba69143f80a9c59ac4f51c280b7d07f3f9aba95063a8c3779c9637f7b4e27b771fade0e6092215b529813bd7 SHA512 5e1648cf3b31fe42aefd0a5e79c4e5dc22c3ce4b6f594f0933229494ca6f2e28e44a7e078ef839de1df0b8c1ba494fce8a58866ad70d056799320f4dea32713b
DIST cbatticon-1.6.7.tar.gz 30086 BLAKE2B 460f185688e7aa8eec3f075454440705e1b6989ae9640f026f17c50511518ae181901e69efd987a879eabad47df5725c444bee9973e2faaa2d78775d2f6d83a9 SHA512 730d1be1350ba9b906f438c58c4e3172c4041d0e7c73ffbd91cbe5a01688e400bb9a7d89ccd86bff658afc803776dd5691323c720e6d41b1b1e3aeb58707f6e9
DIST cbatticon-1.6.8.tar.gz 31185 BLAKE2B d8d7d2fe13764bf4b9c091eaebb8bd90b2daeeb10a2093c3b3724c5009a5f56e55788e0390cc81ad2e5c50937f8348bbee74d32f0768a15114a22ad9e02756ab SHA512 61d6f64cc57672f672869f8eb3b5ccb8f95dfdaa0b6eb1e91c824e22e4aba195cc164aab0b0353599c1c1a07f6d00a7a2f177829a15534c96a4e24e4cdfd0986
+DIST cbatticon-1.6.9.tar.gz 32257 BLAKE2B de10cae916ddd80638e2f2ea4c64038d5141524c102abce0dcf090517eadd8e375a383d438778e06b9881e617d28cfb999476f75e37ce1ed2a04a811abf5ac4e SHA512 bbaef2b24eddc52e3ad63033e063620960aa791f6bcb06cd1b981ca2a4f38450ee2c2177426b171ece2b5fff0db8f360bd9ca9ef1a3351ec9ad1f5ea34f925f4
diff --git a/x11-misc/cbatticon/cbatticon-1.6.9.ebuild b/x11-misc/cbatticon/cbatticon-1.6.9.ebuild
new file mode 100644
index 000000000000..c50d042f8226
--- /dev/null
+++ b/x11-misc/cbatticon/cbatticon-1.6.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A lightweight and fast battery icon that sits in your system tray"
+HOMEPAGE="https://github.com/ColinJones/cbatticon"
+SRC_URI="https://github.com/ColinJones/cbatticon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/gtk+:3
+ libnotify? ( x11-libs/libnotify )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+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
+
+ dodoc Changelog
+}
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index 515755ea8835..112cce6f6a7e 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0/2" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
# We prefer policykit enabled by default, bug #448058
IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index dafe23ddeda1..c8171c859d8b 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="xinerama"
RDEPEND="
diff --git a/x11-misc/gigolo/gigolo-0.4.91-r1.ebuild b/x11-misc/gigolo/gigolo-0.4.91-r1.ebuild
new file mode 100644
index 000000000000..8a8013bbe625
--- /dev/null
+++ b/x11-misc/gigolo/gigolo-0.4.91-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
+HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16
+ >=x11-libs/gtk+-3.14:3"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig"
+
+src_prepare() {
+ rm COPYING || die
+ # https://git.xfce.org/apps/gigolo/commit/?id=fb63ddf0fa4ed93789366aefb7a2a2b44e919386
+ sed -i -e 's:gvfs-open:gio open:' src/settings.c || die
+ default
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index 86540cbfa78e..3476502ec396 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="A gtk frontend to rsync"
HOMEPAGE="http://www.opbyte.it/grsync/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE=""
SRC_URI="http://www.opbyte.it/release/${P}.tar.gz"
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index 56b561885485..d06b773c8c53 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
LICENSE="GPL-3 public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
index c94e1d9cbba9..132952a0bfef 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
DEPEND="test? ( dev-cpp/catch:1 )"
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 5301ecf30c4f..b0b884f8f324 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1 +1 @@
-DIST kronometer-2.2.1.tar.xz 121952 BLAKE2B 02d7ae02e9fc53ccef4d8d247043c5a69a9096a5fec9c3f98491298f75b649762983acff41cfffe863935640d75ef703278accdac542e0110127ee9e86c4cf57 SHA512 d635b55c0513427e7c98c7317813fd62886b7fb6aab7cb238ac6ba058ff37c7e9302c46c48e2248fa13e50d32d90a39ddd8d4bb88663a4019cd981f54e46a42c
+DIST kronometer-2.2.2.tar.xz 123980 BLAKE2B 2652c2a48de5571de22a95aa0b42f4b6620fb538033c0ec7d2c63c8ae8729b6feeecd8b7acc9c7542fe6eb2be0fb145a9dab53e5e9f97ff0511e2a12f5017dbb SHA512 2c808d7b3fafdc2cf507b0bb64be1b36be166a43543b18569e430d86f75cc64505de9dafd9a06e5b8b9e7fde0c0e624f598da7539026885b12585e3628067f93
diff --git a/x11-misc/kronometer/kronometer-2.2.1.ebuild b/x11-misc/kronometer/kronometer-2.2.2.ebuild
index 009aec994148..dff9d003d23c 100644
--- a/x11-misc/kronometer/kronometer-2.2.1.ebuild
+++ b/x11-misc/kronometer/kronometer-2.2.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
KDE_HANDBOOK="forceoptional"
KDE_TEST="forceoptional"
-QT_MINIMAL="5.9.3"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index e9775ab77494..cef115de5602 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1 +1,2 @@
DIST light-locker-1.8.0.tar.bz2 449898 BLAKE2B d5ff454958138ec535b94492a9646dd5a4fc8196095ef3ae933d661e44eb62960ca49fe070fd88a794e2a9c5a6586317845b0d55d8cfd65107e49e31206a727a SHA512 bbad73c0b82a50ddca240d5e1bd325a99d0c60364d136fe6d9d52f196319953373c9d03cf38ebd75d4498d080e96702e09fc97c35b4b69cbe963f065719549d5
+DIST light-locker-1.9.0.tar.gz 124753 BLAKE2B 510447a5fa107988a06e92cc99d7750bc0df526356630694c5dc718460bd437879bbdcb69e0778bdb58d399aafdbea762bfda53d2e2205a1c4bade27dbff78c5 SHA512 c6f84b38affa20cf0bd7d2341f5a8eff36891ed55401955715a68a011c84c7f2300db670abb95a320eb40aee90885fe044ddf0a721e418ee4724af3e4f6a61a4
diff --git a/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
new file mode 100644
index 000000000000..aa630bd1fd28
--- /dev/null
+++ b/x11-misc/light-locker/files/light-locker-1.9.0-elogind.patch
@@ -0,0 +1,287 @@
+From 0b5dbd25a21a16b93c371fd892b910969e4b2d58 Mon Sep 17 00:00:00 2001
+From: Robert Dyer <robert.dyer@sony.com>
+Date: Mon, 3 Jun 2019 22:17:08 -0500
+Subject: [PATCH] fix-up light-locker-1.9.0-elogind.patch
+
+---
+ README.md | 2 ++
+ configure.ac.in | 39 ++++++++++++++++++++++++++++++++++++++-
+ src/Makefile.am | 4 +++-
+ src/gs-listener-dbus.c | 32 +++++++++++++++++---------------
+ src/light-locker.c | 6 ++++++
+ 5 files changed, 66 insertions(+), 17 deletions(-)
+
+diff --git a/README.md b/README.md
+index 86b66d0..b093a4f 100644
+--- a/README.md
++++ b/README.md
+@@ -38,6 +38,8 @@ Here is a list of the different dependencies and their configuration flags:
+
+ --with-systemd: This adds the support for systemd logind. This option requires the development files to be installed.
+
++ --with-elogind: This adds support for elogind, a standalone version of systemd's logind daemon. Requires the elogind development files be installed. This option cannot be enabled at the same time as the --with-systemd option above.
++
+ --with-upower: This adds the support for UPower.
+
+ --with-mit-ext: This enables the lock-after-screensaver feature. This options requires the X11 Screen Saver extension development files to be installed.
+diff --git a/configure.ac.in b/configure.ac.in
+index 67c271b..2c0678f 100644
+--- a/configure.ac.in
++++ b/configure.ac.in
+@@ -408,7 +408,7 @@ if test "x$with_systemd" = "xauto" ; then
+ use_systemd=yes
+ fi
+ else
+- use_systemd=$with_systemd
++ use_systemd=$with_systemd
+ fi
+
+ if test "x$use_systemd" = "xyes"; then
+@@ -421,6 +421,42 @@ fi
+ AC_SUBST(SYSTEMD_CFLAGS)
+ AC_SUBST(SYSTEMD_LIBS)
+
++dnl ---------------------------------------------------------------------------
++dnl elogind
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH(elogind,
++ AS_HELP_STRING([--with-elogind],
++ [Add elogind support]),
++ [with_elogind=$withval], [with_elogind=auto])
++
++if test "x$with_systemd" = "xyes" && test "x$with_elogind" = "xyes"; then
++ AC_MSG_ERROR([Conflicting options: --with-systemd and --with-elogind])
++fi
++
++PKG_CHECK_MODULES(ELOGIND,
++ [libelogind],
++ [have_elogind=yes], [have_elogind=no])
++
++if test "x$with_elogind" = "xauto" ; then
++ if test x$have_elogind = xno ; then
++ use_elogind=no
++ else
++ use_elogind=yes
++ fi
++else
++ use_elogind=$with_elogind
++fi
++
++if test "x$use_elogind" = "xyes"; then
++ if test "x$have_elogind" = "xno"; then
++ AC_MSG_ERROR([Elogind support explicitly required, but elogind not found])
++ fi
++ AC_DEFINE(WITH_ELOGIND, 1, [elogind support])
++fi
++AC_SUBST(ELOGIND_CFLAGS)
++AC_SUBST(ELOGIND_LIBS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl UPower
+ dnl ---------------------------------------------------------------------------
+@@ -640,6 +676,7 @@ echo "
+ Platform:
+ ---------
+ systemd: ${use_systemd}
++ elogind: ${use_elogind}
+ UPower: ${use_upower}
+
+ Features:
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0fa4ef9..be6fb0d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
+ $(DBUS_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
+ $(SYSTEMD_CFLAGS) \
++ $(ELOGIND_CFLAGS) \
+ $(NULL)
+
+ bin_PROGRAMS = \
+@@ -90,7 +91,8 @@ light_locker_SOURCES = \
+ light_locker_LDADD = \
+ $(LIGHT_LOCKER_LIBS) \
+ $(SAVER_LIBS) \
+- $(SYSTEMD_LIBS) \
++ $(SYSTEMD_LIBS) \
++ $(ELOGIND_LIBS) \
+ $(NULL)
+
+ light_locker_LDFLAGS = -export-dynamic
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 044a2bf..3ba476e 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -41,6 +41,8 @@
+
+ #ifdef WITH_SYSTEMD
+ #include <systemd/sd-login.h>
++#elif WITH_ELOGIND
++#include <elogind/systemd/sd-login.h>
+ #endif
+
+ #include "gs-listener-dbus.h"
+@@ -78,7 +80,7 @@ struct GSListenerPrivate
+ char *session_id;
+ char *seat_path;
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ gboolean have_systemd;
+ char *sd_session_id;
+ int delay_fd;
+@@ -134,7 +136,7 @@ gs_listener_send_switch_greeter (GSListener *listener)
+
+ gs_debug ("Send switch greeter");
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ /* Compare with 0. On failure this will return < 0.
+ * In the later case we probably aren't using systemd.
+ */
+@@ -175,7 +177,7 @@ gs_listener_send_lock_session (GSListener *listener)
+
+ gs_debug ("Send lock session");
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ /* Compare with 0. On failure this will return < 0.
+ * In the later case we probably aren't using systemd.
+ */
+@@ -359,7 +361,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+
+ gs_debug ("Send idle hint: %d", idle);
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ if (listener->priv->have_systemd) {
+
+ if (listener->priv->system_connection == NULL) {
+@@ -400,7 +402,7 @@ gs_listener_set_idle_hint (GSListener *listener, gboolean idle)
+ void
+ gs_listener_delay_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ DBusMessage *message;
+ DBusMessage *reply;
+ DBusError error;
+@@ -473,7 +475,7 @@ gs_listener_delay_suspend (GSListener *listener)
+ void
+ gs_listener_resume_suspend (GSListener *listener)
+ {
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ gs_debug ("Resume suspend: fd=%d", listener->priv->delay_fd);
+
+ if (listener->priv->delay_fd >= 0) {
+@@ -1076,7 +1078,7 @@ _listener_message_path_is_our_session (GSListener *listener,
+ return FALSE;
+ }
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ static gboolean
+ query_session_active (GSListener *listener)
+ {
+@@ -1212,7 +1214,7 @@ query_lid_closed (GSListener *listener)
+ #endif
+ #endif
+
+-#if defined(WITH_SYSTEMD) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND) || (defined(WITH_UPOWER) && defined(WITH_LOCK_ON_LID))
+ static gboolean
+ properties_changed_match (DBusMessage *message,
+ const char *property)
+@@ -1307,7 +1309,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
+ dbus_message_get_destination (message));
+ #endif
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+
+ if (listener->priv->have_systemd) {
+
+@@ -1880,7 +1882,7 @@ gs_listener_acquire (GSListener *listener,
+ listener_dbus_system_filter_function,
+ listener,
+ NULL);
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ if (listener->priv->have_systemd) {
+ dbus_bus_add_match (listener->priv->system_connection,
+ "type='signal'"
+@@ -1971,7 +1973,7 @@ query_session_id (GSListener *listener)
+
+ dbus_error_init (&error);
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ if (listener->priv->have_systemd) {
+ dbus_uint32_t pid = getpid();
+
+@@ -2022,7 +2024,7 @@ query_session_id (GSListener *listener)
+ return NULL;
+ }
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ static char *
+ query_sd_session_id (GSListener *listener)
+ {
+@@ -2053,7 +2055,7 @@ init_session_id (GSListener *listener)
+ else
+ gs_debug ("Got session-id: %s", listener->priv->session_id);
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ g_free (listener->priv->sd_session_id);
+ listener->priv->sd_session_id = query_sd_session_id (listener);
+ if (listener->priv->sd_session_id == NULL)
+@@ -2150,7 +2152,7 @@ gs_listener_init (GSListener *listener)
+ {
+ listener->priv = GS_LISTENER_GET_PRIVATE (listener);
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ /* check if logind is running */
+ listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
+ listener->priv->delay_fd = -1;
+@@ -2179,7 +2181,7 @@ gs_listener_finalize (GObject *object)
+ g_free (listener->priv->session_id);
+ g_free (listener->priv->seat_path);
+
+-#ifdef WITH_SYSTEMD
++#if defined(WITH_SYSTEMD) || defined(WITH_ELOGIND)
+ g_free (listener->priv->sd_session_id);
+ #endif
+
+diff --git a/src/light-locker.c b/src/light-locker.c
+index aefc4c6..612e300 100644
+--- a/src/light-locker.c
++++ b/src/light-locker.c
+@@ -139,6 +139,7 @@ main (int argc,
+ gs_debug ("Platform:\n"
+ "gtk: %d\n"
+ "systemd: %s\n"
++ "elogind: %s\n"
+ "UPower: %s",
+ GTK_MAJOR_VERSION,
+ #ifdef WITH_SYSTEMD
+@@ -146,6 +147,11 @@ main (int argc,
+ #else
+ "no",
+ #endif
++#ifdef WITH_ELOGIND
++ "yes",
++#else
++ "no",
++#endif
+ #ifdef WITH_UPOWER
+ "yes"
+ #else
+--
+2.21.0
+
diff --git a/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..34e6e91e705d
--- /dev/null
+++ b/x11-misc/light-locker/light-locker-1.9.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome2-utils
+
+DESCRIPTION="A simple locker using lightdm"
+HOMEPAGE="https://github.com/the-cavalry/light-locker"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dpms elogind +screensaver systemd +upower"
+
+BDEPEND="dev-lang/perl
+ dev-perl/XML-Parser
+ dev-util/intltool
+ sys-devel/gettext"
+DEPEND="dev-libs/dbus-glib
+ dev-libs/glib
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/pango
+ x11-libs/libXxf86vm
+ dpms? ( x11-libs/libXext )
+ elogind? ( sys-auth/elogind )
+ screensaver? ( x11-libs/libXScrnSaver )
+ systemd? ( sys-apps/systemd )
+ upower? ( sys-power/upower )"
+RDEPEND="${DEPEND}
+ x11-misc/lightdm"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+DOCS=( AUTHORS HACKING NEWS README )
+
+PATCHES=(
+ "${FILESDIR}/${P}-elogind.patch"
+)
+
+src_prepare() {
+ default
+ # Fixed upstream right after the release, remove this next time you bump
+ ln -sf README.md README || die
+ # remove xdt-autogen specific macro (just like upstream do) as we need to autoreconf
+ sed -e "/XDT_I18N/d" configure.ac.in > configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with dpms dpms-ext)
+ $(use_with screensaver x)
+ $(use_with screensaver mit-ext)
+ $(use_with systemd)
+ $(use_with elogind)
+ $(use_with upower)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index 09ed49940b3d..318ca61e70da 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range
LICENSE="GPL-3 LGPL-3
branding? ( CC-BY-3.0 )"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="ayatana branding"
COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
index 04096992f34b..36a61c7f46fd 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+downloa
LICENSE="GPL-3 LGPL-3
branding? ( CC-BY-3.0 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="ayatana branding"
COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index fbbc49eb359a..6615ab8b3c5f 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,3 +1,4 @@
DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
+DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 8277072aab4e..15b2902a69e4 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
IUSE="audit +gnome +gtk +introspection qt5 vala"
COMMON_DEPEND="
diff --git a/x11-misc/lightdm/lightdm-1.28.0.ebuild b/x11-misc/lightdm/lightdm-1.28.0.ebuild
index c8b6c608fa3d..f5fc252f32eb 100644
--- a/x11-misc/lightdm/lightdm-1.28.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.28.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="audit +gnome +gtk +introspection qt5 vala"
COMMON_DEPEND="
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild
new file mode 100644
index 000000000000..2dbffbe278b9
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.30.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
+SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
+ mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.44.0:2
+ dev-libs/libxml2
+ virtual/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}
+ >=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"
+
+pkg_setup() {
+ export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
+ if use non_root ; then
+ enewgroup ${LIGHTDM_USER}
+ enewgroup video # Just in case it hasn't been created yet
+ enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video
+ esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER}
+ fi
+}
+
+src_prepare() {
+ 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
+
+ use vala && vala_src_prepare
+}
+
+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}"
+
+ use qt5 && append-cxxflags -std=c++11
+
+ # 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)
+ --disable-liblightdm-qt
+ $(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 35133937b2af..65cd70df4916 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="gtk">Pull in the gtk+ greeter</flag>
+ <flag name="non_root">Use non-root user by default</flag>
</use>
<upstream>
<remote-id type="github">CanonicalLtd/lightdm</remote-id>
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index aa9ea202a9df..d61f580d46b9 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,3 +1,3 @@
DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
-DIST menulibre-2.1.5.tar.gz 443986 BLAKE2B 5397e1f9d4371c017c8d2358e65bdad58b0ac10765f00fa51b2b20d9e404f19229da00719c6cb209020e5894708882d42adb30f4668e82929e0d1904ca7d3cf5 SHA512 d1bcd055d7f5c77df02470b4b6362ea5af8a6f4dd41f217c73673b63f413c3edca0ae18ccb6cff179a514ee0218613c3201e7687ec36de34436556b8a60a0856
DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
+DIST menulibre-2.2.1.tar.gz 453217 BLAKE2B 86b3d2d8b20bfc7dcfcba380f656ec1e99f1d5dbc3779eadb9e7cc3a2b8c96afc0c2efe72802d0c93833f6c705c67d05a4ba6cc6cf9b95e0c9b9850ae4424fee SHA512 cf1425d604af26b7bde92106aa758a1f7dcc66ad1fbcdcd4c23db90bc7b6de5fe1160b917035f1d949daa1af8ba6b1145d7376ae637c8937a25cb108bf8cd15f
diff --git a/x11-misc/menulibre/menulibre-2.1.5.ebuild b/x11-misc/menulibre/menulibre-2.2.1.ebuild
index 8cd4a64b1072..c0aa8ef2a8d2 100644
--- a/x11-misc/menulibre/menulibre-2.1.5.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.1.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
PYTHON_COMPAT=( python3_{5,6} )
PYTHON_REQ_USE="xml"
DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 eutils gnome2-utils versionator
+inherit desktop distutils-r1 xdg-utils
DESCRIPTION="Advanced freedesktop.org compliant menu editor"
HOMEPAGE="https://bluesabre.org/projects/menulibre/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -35,6 +35,7 @@ python_prepare_all() {
# too many categories
sed -i \
-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+ -e '/^OnlyShowIn/d' \
menulibre.desktop.in || die
local i
@@ -53,16 +54,13 @@ python_prepare_all() {
python_install_all() {
distutils-r1_python_install_all
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
+ rm -r "${ED}"/usr/share/doc/${PN} || die
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index 93b3ba18d43c..07a5e708c20e 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
index a969ba2d4885..f67003d63b24 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
LICENSE="GPL-2+"
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
index e8f40638bef8..1a76e7238fba 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.14.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Fast lightweight tabbed filemanager (Qt port)"
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index edf8dc83b12a..32f9f4a145dc 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,2 +1 @@
-DIST peksystray-0.2.1.tar.gz 70261 BLAKE2B 8ff1d72e4cb0d35afc92b46acd7809095ded33630a896638e73bb64ad5b4eafbdcd02f53a4ef1251f567e7f9770dbce7161f47013b8e4543612506238c95b000 SHA512 c52fa6b7c8d5c57831fba993e85eb153d9b03ec04149b4d081bdde4854b099ccb423bb2e6eb36420093918f57449d208ed20dcca17344115eb989a095b69cbb2
DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
diff --git a/x11-misc/peksystray/peksystray-0.2.1.ebuild b/x11-misc/peksystray/peksystray-0.2.1.ebuild
deleted file mode 100644
index cfd9973fa440..000000000000
--- a/x11-misc/peksystray/peksystray-0.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DESCRIPTION="A system tray dockapp for window managers supporting docking"
-HOMEPAGE="http://freshmeat.net/projects/peksystray"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- econf --x-libraries=/usr/$(get_libdir) || die
- emake || die
-}
-
-src_install() {
- dobin src/peksystray
- dodoc AUTHORS NEWS README THANKS TODO
-}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index b6a13b55204f..e9570d0e6699 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,3 +1,4 @@
DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3ccefdb1acf202c6d2873a634e4d096658b850e8534c5c8c56e42ac66b3b8e80dabf5625491e5f56523b043ddf SHA512 e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
+DIST polybar-3.3.1.tar.gz 248790 BLAKE2B 30c2cd2ff537f3a2fe2fe7ce489b5a0ab76a54cd42bbdf8b3727e5f4298898e289c6ea10a460385d8bcdc8ab11749255573bf7d728a01eae895a1ed8a2214c27 SHA512 c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
diff --git a/x11-misc/polybar/polybar-3.3.1.ebuild b/x11-misc/polybar/polybar-3.3.1.ebuild
new file mode 100644
index 000000000000..d90ec9a2e765
--- /dev/null
+++ b/x11-misc/polybar/polybar-3.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A fast and easy-to-use tool for creating status bars"
+HOMEPAGE="https://github.com/jaagr/polybar"
+
+if [[ ${PV} != *9999* ]]; then
+ XPP_VERSION="1.4.0"
+ I3IPCPP_VERSION="0.7.1"
+ SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+ https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
+ EGIT_CLONE_TYPE="shallow"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="alsa curl i3wm ipc mpd network pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ x11-base/xcb-proto
+ x11-libs/cairo[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 )
+ i3wm? ( dev-libs/jsoncpp )
+ mpd? ( media-libs/libmpdclient )
+ network? ( net-wireless/wireless-tools )
+ pulseaudio? ( media-sound/pulseaudio )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if [[ ${PV} != *9999* ]]; then
+ rmdir "${S}"/lib/xpp || die
+ mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+ rmdir "${S}"/lib/i3ipcpp || die
+ mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+ sed -i "s/.*cpp_error,.*/&\n\t 'eventstruct' : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_ALSA="$(usex alsa)"
+ -DENABLE_CURL="$(usex curl)"
+ -DENABLE_I3="$(usex i3wm)"
+ -DBUILD_IPC_MSG="$(usex ipc)"
+ -DENABLE_MPD="$(usex mpd)"
+ -DENABLE_NETWORK="$(usex network)"
+ -DENABLE_PULSEAUDIO="$(usex pulseaudio)"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index 3d18bd3871c8..70e8d426aaf5 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -1,19 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
-inherit cmake-utils git-r3 python-single-r1
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1
DESCRIPTION="A fast and easy-to-use tool for creating status bars"
HOMEPAGE="https://github.com/jaagr/polybar"
-EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
-EGIT_CLONE_TYPE="shallow"
+
+if [[ ${PV} != *9999* ]]; then
+ XPP_VERSION="1.4.0"
+ I3IPCPP_VERSION="0.7.1"
+ SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
+ https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
+ EGIT_CLONE_TYPE="shallow"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS=""
IUSE="alsa curl i3wm ipc mpd network pulseaudio"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -36,6 +46,20 @@ DEPEND="
RDEPEND="${DEPEND}"
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if [[ ${PV} != *9999* ]]; then
+ rmdir "${S}"/lib/xpp || die
+ mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
+
+ rmdir "${S}"/lib/i3ipcpp || die
+ mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
+
+ sed -i "s/.*cpp_error,.*/&\n\t 'eventstruct' : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
+ fi
+}
+
src_configure() {
local mycmakeargs=(
-DENABLE_ALSA="$(usex alsa)"
@@ -46,5 +70,6 @@ src_configure() {
-DENABLE_NETWORK="$(usex network)"
-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
)
+
cmake-utils_src_configure
}
diff --git a/x11-misc/qps/qps-1.10.20.ebuild b/x11-misc/qps/qps-1.10.20.ebuild
index 67921d696b43..707dc0fadb37 100644
--- a/x11-misc/qps/qps-1.10.20.ebuild
+++ b/x11-misc/qps/qps-1.10.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2+ LGPL-2.1+ QPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="debug"
BDEPEND="
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 0cb435b31d32..5a685d41e6f7 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,3 +1,3 @@
DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
-DIST qtfm-6.1.8.tar.gz 248195 BLAKE2B e99e9a545a3c534af9e8bd5443f8f99d92b63ece1adf7544272e5c5940e4ebb34dad52fb1d5023c3bbeeb6abb50dfb8f46d2034fa01a23bf649a761bc31f9a3d SHA512 04f82e2cb9bb7a9d68c86ffcb7d5a238e68ade38fad145d699030f743343d33b438234cbb132ebf12a1dad67c331bed14bcbb6e89e78a6d1e812461f2102c15b
DIST qtfm-6.1.9.tar.gz 248313 BLAKE2B 4c9970754925de3210cc688f8f9ad8caea753b78e8e8377ee8a0a6dec014ab3c4459f20882b00c6d16c7bc36878cf8f483b38af0e9102d097679b12a6a6e0db9 SHA512 44765e219f4774f30e43027056fde04d23579e8c91b72215432ff4718fc702f85ddb9752b166eef8aa1aa89ab7bcc6a14585fce05f447c264087ee8274d4bfea
+DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
new file mode 100644
index 000000000000..a89d090510df
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
@@ -0,0 +1,47 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ add_definitions(-DMAGICK7)
+ endif()
+ find_package(PkgConfig REQUIRED)
+- pkg_check_modules(MAGICK REQUIRED ImageMagick++)
++ pkg_check_modules(MAGICK REQUIRED Magick++)
+ # ffmpeg
+ if(ENABLE_FFMPEG)
+ pkg_check_modules(AVDEVICE REQUIRED libavdevice)
+@@ -66,7 +66,7 @@
+ find_package(Qt5Concurrent REQUIRED)
+
+ # inotify
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(NOTIFY REQUIRED libinotify)
+ endif()
+@@ -123,7 +123,7 @@
+ ${PROJECT_VERSION_MAJOR}
+ )
+ if(ENABLE_MAGICK OR ENABLE_MAGICK7)
+- target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
++ target_compile_options(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
+ target_link_libraries(QtFM ${MAGICK_LIBRARIES})
+ if(ENABLE_FFMPEG)
+ target_include_directories(QtFM
+@@ -161,7 +161,7 @@
+ if(ENABLE_DBUS)
+ target_link_libraries(QtFM Qt5::DBus QtFMBus)
+ endif()
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ target_link_libraries(QtFM ${NOTIFY_LIBRARIES})
+ endif()
+ if(APPLE)
+@@ -192,7 +192,7 @@
+ if(ENABLE_DBUS)
+ target_link_libraries(${PROJECT_NAME} Qt5::DBus)
+ endif()
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+ target_link_libraries(${PROJECT_NAME} ${NOTIFY_LIBRARIES})
+ endif()
+ if(APPLE)
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index 3e91ecae7c1c..004b55d08e68 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/metadata.xml
@@ -9,4 +9,8 @@
<email>desktop-misc@gentoo.org</email>
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
+<use>
+<flag name='dbus'>Install the qtfm-tray removable device manager</flag>
+<flag name='shared'>Install the libQtFM shared library and headers</flag>
+</use>
</pkgmetadata>
diff --git a/x11-misc/qtfm/qtfm-6.1.8.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index e80647d017f5..e330a1bea393 100644
--- a/x11-misc/qtfm/qtfm-6.1.8.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -11,15 +11,16 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
+IUSE="+dbus shared"
RDEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
- dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
sys-apps/file
+ dbus? ( dev-qt/qtdbus:5 )
"
DEPEND="
${RDEPEND}
@@ -28,7 +29,13 @@ DEPEND="
"
src_configure() {
- eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
+ eqmake5 \
+ $(usex dbus '' 'CONFIG+=no_dbus CONFIG+=no_tray') \
+ $(usex shared 'CONFIG+=sharedlib' '') \
+ $(usex shared 'CONFIG+=with_includes' '') \
+ LIBDIR="/usr/$(get_libdir)" \
+ PREFIX="/usr" \
+ XDGDIR="/etc/xdg"
}
src_install() {
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
new file mode 100644
index 000000000000..012984f236ab
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 xdg-utils cmake-utils
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="https://qtfm.eu/"
+EGIT_REPO_URI="https://github.com/rodlie/qtfm/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="+dbus ffmpeg imagemagick"
+
+RDEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ sys-apps/file
+ dbus? ( dev-qt/qtdbus:5 )
+ ffmpeg? ( virtual/ffmpeg )
+ imagemagick? ( >=media-gfx/imagemagick-7:= )
+"
+DEPEND="
+ ${RDEPEND}
+ app-arch/unzip
+ dev-qt/linguist-tools:5
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-99999-cmake.patch
+)
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_DBUS="$(usex dbus)"
+ -DENABLE_FFMPEG="$(usex ffmpeg)"
+ -DENABLE_MAGICK7="$(usex imagemagick)"
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
index 4763b8f4f54a..11c784821bb0 100644
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
DESCRIPTION="Simple Desktop Display Manager"
HOMEPAGE="https://github.com/sddm/sddm"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
SLOT="0"
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
index 18a2a719c4ef..30b7160e06ab 100644
--- a/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xorg/util/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# there is nothing to compile for this package, all its contents are produced by
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
index aa35612ba1ba..6b5db86e75b8 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="libressl ssl"
RDEPEND="
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
deleted file mode 100644
index 7b5b05a5b7cf..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib flag-o-matic multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="http://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- )
- media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXv[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- amd64? ( abi_x86_32? (
- >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
- >=x11-libs/libX11-1.6.2[abi_x86_32]
- >=x11-libs/libXext-1.3.2[abi_x86_32]
- >=x11-libs/libXv-1.0.10[abi_x86_32]
- >=virtual/glu-9.0-r1[abi_x86_32]
- >=virtual/opengl-7.0-r1[abi_x86_32]
- ) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Use /var/lib, bug #428122
- sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
- server/vglrun.in server/vglgenkey server/vglserver_config || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # Completely breaks steam/wine for discrete graphics otherwise
- # see https://github.com/VirtualGL/virtualgl/issues/16
- append-ldflags "-Wl,--no-as-needed"
-
- abi_configure() {
- local mycmakeargs=(
- -DVGL_USESSL="$(usex ssl)"
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
- -DTJPEG_INCLUDE_DIR=/usr/include
- -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
- -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
- -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
- )
- cmake-utils_src_configure
- }
- multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
- cmake-multilib_src_install
-
- # Make config dir
- dodir /var/lib/VirtualGL
- fowners root:video /var/lib/VirtualGL
- fperms 0750 /var/lib/VirtualGL
- newinitd "${FILESDIR}/vgl.initd-r3" vgl
- newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
- exeinto /usr/libexec
- doexe "${FILESDIR}/vgl-helper.sh"
- systemd_dounit "${FILESDIR}/vgl.service"
-
- # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
- mv "${D}"/usr/bin/{,v}glxinfo || die
-
- # Remove license files, bug 536284
- rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 522ebcdadc26..99593c73b350 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,2 +1 @@
-DIST x11vnc-0.9.14_p20161013.tar.gz 1702047 BLAKE2B 3c2487208a2318816af408a3396d4b6cd7cbcd5b3aa7879f0390a1a6e0200cbe0bb2cc0c50581b3e3e4de916dae3fdb4426547de7203ebe95ddc62722e4219eb SHA512 82207e4d721dde633aaa13dbd1e6a18799615f8e3c225c33d4f8b01775fb81fb6b92a817e7d014653ac7b2349b0b31e46be8db25c5fd5e3ecee8fb93ca665b97
DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
new file mode 100644
index 000000000000..3dafb9aa6b0c
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch
@@ -0,0 +1,26 @@
+From b9cf79fd3d61a7586fe6b24b3141e406cdf334eb Mon Sep 17 00:00:00 2001
+From: Jim Broadus <jbroadus@xevo.com>
+Date: Wed, 2 Jan 2019 17:37:40 -0800
+Subject: [PATCH] Fix anonymous SSL. In version 1.1.0, openssl introduced a
+ security level concept. Only level 0 allows the use of unauthenticated cipher
+ suites such as ADH.
+
+---
+ src/sslhelper.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 1a3e7474..04c2e273 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -1596,6 +1596,10 @@ static int switch_to_anon_dh(void) {
+ if (ssl_client_mode) {
+ return 1;
+ }
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ /* Security level must be set to 0 for unauthenticated suites. */
++ SSL_CTX_set_security_level(ctx, 0);
++#endif
+ if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) {
+ return 0;
+ }
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
new file mode 100644
index 000000000000..8e5d8a692175
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-libressl.patch
@@ -0,0 +1,93 @@
+diff --git a/src/sslhelper.c b/src/sslhelper.c
+index 04c2e27..fb9daa6 100644
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, int rwflag,
+ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ const ASN1_INTEGER *revoked_serial;
+ X509_STORE_CTX *store_ctx;
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT *obj;
+ #else
+ X509_OBJECT obj;
+@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ * the current certificate in order to verify it's integrity. */
+ store_ctx = X509_STORE_CTX_new();
+ X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ obj = X509_OBJECT_new();
+ rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
+ crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ rfbLog("Invalid signature on CRL\n");
+ X509_STORE_CTX_set_error(callback_ctx,
+ X509_V_ERR_CRL_SIGNATURE_FAILURE);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ rfbLog("Found CRL has invalid nextUpdate field\n");
+ X509_STORE_CTX_set_error(callback_ctx,
+ X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ rfbLog("Found CRL is expired - "
+ "revoking all certificates until you get updated CRL\n");
+ X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CRL_HAS_EXPIRED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+ #endif
+ return 0; /* Reject connection */
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ * the current certificate in order to check for revocation. */
+ store_ctx = X509_STORE_CTX_new();
+ X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ obj = X509_OBJECT_new();
+ rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
+ crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ "revoked per CRL from issuer %s\n", serial, serial, cp);
+ OPENSSL_free(cp);
+ X509_STORE_CTX_set_error(callback_ctx, X509_V_ERR_CERT_REVOKED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ return 0; /* Reject connection */
+ }
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -1596,7 +1596,7 @@ static int switch_to_anon_dh(void) {
+ if (ssl_client_mode) {
+ return 1;
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ /* Security level must be set to 0 for unauthenticated suites. */
+ SSL_CTX_set_security_level(ctx, 0);
+ #endif
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index ff9539136145..40fa3182ee05 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>alexander@tsoy.me</email>
+ <name>Alexander Tsoy</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
The primary goal of this program is to create a portable and
simple command-line server utility that allows a VNC viewer
diff --git a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild b/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
deleted file mode 100644
index ebf7c1d17f60..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.14_p20161013.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/e191071c1f375d04ba8f955ea0a30292a485999e.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl xinerama zeroconf"
-
-RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- >=x11-libs/libXtst-1.1.0
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- xinerama? ( x11-libs/libXinerama )
- zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libXt"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # --without-v4l because of missing video4linux 2.x support wrt #389079
- econf \
- $(use_with crypt) \
- $(use_with fbcon fbdev) \
- $(use_with ssl) \
- $(use_with ssl crypto) \
- --without-v4l \
- $(use_with xinerama) \
- $(use_with zeroconf avahi)
-}
-
-src_install() {
- default
- doinitd "${FILESDIR}/x11vnc.init.d"
- doconfd "${FILESDIR}/x11vnc.conf.d"
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
new file mode 100644
index 000000000000..7ddfb82395ea
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+
+COMMON_DEPEND="
+ >=net-libs/libvncserver-0.9.8[ssl]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ >=x11-libs/libXtst-1.1.0
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ xcomposite? ( x11-libs/libXcomposite )
+ xdamage? ( x11-libs/libXdamage )
+ xfixes? ( x11-libs/libXfixes )
+ xinerama? ( x11-libs/libXinerama )
+ xrandr? ( x11-libs/libXrandr )
+ zeroconf? ( >=net-dns/avahi-0.6.4 )
+"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+ x11-libs/libXt
+"
+# https://bugzilla.redhat.com/show_bug.cgi?id=920554
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/tk:0
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+ "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # --without-v4l because of missing video4linux 2.x support wrt #389079
+ # --with-crypto --with-ssl because USE=-ssl is broken (bug #686494)
+ econf \
+ --with-crypto \
+ --with-ssl \
+ --without-v4l \
+ --without-xkeyboard \
+ --without-fbpm \
+ --without-dpms \
+ $(use_with crypt) \
+ $(use_with fbcon fbdev) \
+ $(use_with xcomposite) \
+ $(use_with xdamage) \
+ $(use_with xfixes) \
+ $(use_with xinerama) \
+ $(use_with xrandr) \
+ $(use_with zeroconf avahi)
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
+ newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
index b4e3e583f68f..752f08e414d2 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r1.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild
@@ -1,20 +1,21 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools vcs-snapshot
+EAPI=7
-DESCRIPTION="A VNC server for real X displays"
+inherit autotools
+
+DESCRIPTION="VNC server for real X displays"
HOMEPAGE="https://libvnc.github.io/"
SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+-with-openssl-exception"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
COMMON_DEPEND="
- >=net-libs/libvncserver-0.9.8[ssl?]
+ >=net-libs/libvncserver-0.9.8[ssl=]
x11-libs/libX11
x11-libs/libXcursor
x11-libs/libXext
@@ -35,11 +36,14 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXt
"
# https://bugzilla.redhat.com/show_bug.cgi?id=920554
-RDEPEND="dev-lang/tk:0"
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/tk:0
+"
PATCHES=(
- # https://github.com/LibVNC/x11vnc/issues/86
- "${FILESDIR}"/${P}-crypto.patch
+ "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86
+ "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85
+ "${FILESDIR}"/${P}-libressl.patch
)
src_prepare() {
@@ -49,21 +53,23 @@ src_prepare() {
src_configure() {
# --without-v4l because of missing video4linux 2.x support wrt #389079
- econf \
- --without-v4l \
- --without-xkeyboard \
- --without-fbpm \
- --without-dpms \
- $(use_with crypt) \
- $(use_with fbcon fbdev) \
- $(use_with ssl) \
- $(use_with ssl crypto) \
- $(use_with xcomposite) \
- $(use_with xdamage) \
- $(use_with xfixes) \
- $(use_with xinerama) \
- $(use_with xrandr) \
+ local myconf=(
+ --without-v4l
+ --without-xkeyboard
+ --without-fbpm
+ --without-dpms
+ $(use_with crypt)
+ $(use_with fbcon fbdev)
+ $(use_with ssl)
+ $(use_with ssl crypto)
+ $(use_with xcomposite)
+ $(use_with xdamage)
+ $(use_with xfixes)
+ $(use_with xinerama)
+ $(use_with xrandr)
$(use_with zeroconf avahi)
+ )
+ econf "${myconf[@]}"
}
src_install() {
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
deleted file mode 100644
index fdb0b5c8392a..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vcs-snapshot
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="https://libvnc.github.io/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl xinerama zeroconf"
-
-RDEPEND=">=net-libs/libvncserver-0.9.8[ssl?]
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- >=x11-libs/libXtst-1.1.0
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- xinerama? ( x11-libs/libXinerama )
- zeroconf? ( >=net-dns/avahi-0.6.4 )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libXt"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # --without-v4l because of missing video4linux 2.x support wrt #389079
- econf \
- --without-v4l \
- $(use_with crypt) \
- $(use_with fbcon fbdev) \
- $(use_with ssl) \
- $(use_with ssl crypto) \
- $(use_with xinerama) \
- $(use_with zeroconf avahi)
-}
-
-src_install() {
- default
- newinitd "${FILESDIR}/x11vnc.init.d" x11vnc
- newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
-}
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index 8dc6d7406c21..fcd7fd283af2 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
IUSE="examples"
RDEPEND="
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index ee51ae02fe3d..a5ce6bfabb48 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,3 +1,3 @@
DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
DIST xfe-1.43.1.tar.gz 2776237 BLAKE2B fc82e2ea21643ecc3875512538af24daddb0db0e8829ce23c7589dc90d68e896282f70d771dcf885ea746acfa88adbb7abe6a0c354e74afa5f722dcfacf77350 SHA512 3c697ff5d0246c8bab86c9824dd4a3475ed3775d2933c63eb8e78f02b4455edb4ca98f86123eac77f611eee6ad660bf0a909c4c2791af19506a4f1744395008e
-DIST xfe-1.43.tar.gz 2775098 BLAKE2B 41a9d36da0bd2c58de8c928daf5714c90cd24952934ba22550651a7e6829b4f3386fd7ef89c93907eb2b28f2c7086ced1c8b5282b00beaa3ad79c9443f12e5b2 SHA512 e1b8e2d1509de913ceb76d05c7480842ae7c5389df2f02d39c1f80bd7387ce6ff77e82a95f0f1853a976e27ceb5380024337e261621ea3233996d2dec48f82a3
+DIST xfe-1.43.2.tar.gz 2834576 BLAKE2B 5ac7ebf229febb75a99e4829a38a3675d6674ec6eced13dc5be70d2b68ce88f6394621dffec2d8359e72da7eace582883b72491e90597ab4a8925685cb577fcb SHA512 ad7b450d0828747f801219c23824b0751fc2a7f0eea791369c4adb3090ffe1279056fa8804ef97b25a2f810e00d37357efc962dc9d4087c3d7cc5f8ffb37d51d
diff --git a/x11-misc/xfe/xfe-1.43.ebuild b/x11-misc/xfe/xfe-1.43.2.ebuild
index 46f9ac9b1d80..57333f1ae0f0 100644
--- a/x11-misc/xfe/xfe-1.43.ebuild
+++ b/x11-misc/xfe/xfe-1.43.2.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
+EAPI=7
PLOCALES="
bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
zh_CN zh_TW
"
-inherit l10n
+inherit l10n xdg-utils
DESCRIPTION="MS-Explorer-like minimalist file manager for X"
HOMEPAGE="http://roland65.free.fr/xfe"
@@ -66,3 +65,11 @@ src_configure() {
$(use_enable startup-notification sn) \
--enable-minimalflags
}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild b/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
index 7a2c2383e72f..cb52d99934d6 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="A GUI for f.lux"
HOMEPAGE="https://justgetflux.com/"
SRC_URI="https://github.com/xflux-gui/fluxgui/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
LICENSE="MIT"
SLOT="0"
diff --git a/x11-misc/xflux/xflux-20130927-r1.ebuild b/x11-misc/xflux/xflux-20130927-r1.ebuild
index 4f56590f7b46..c34eac9ddae4 100644
--- a/x11-misc/xflux/xflux-20130927-r1.ebuild
+++ b/x11-misc/xflux/xflux-20130927-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
x86? ( https://justgetflux.com/linux/${PN}-pre.tgz -> ${P}.tar.gz )
"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
LICENSE="f.lux"
SLOT="0"
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index 6a9be77ef10f..fb97d68d0915 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1 +1,2 @@
DIST xiccd-0.2.4.tar.gz 30981 BLAKE2B 079b743f88308b3fff5826bccef125c90636182cf1e6311166e91a337b24be824ac564696f1c65d112fccf737bfbff968ce3d96a2a31ba29cca1069377e16695 SHA512 40101467a38e9369b171b44d5d7fd4b07968dfcd74ace89e15f3dfad32131a3dc3b26249af2340e408908bd3df766785b46e885a3b68ff26b24ed2627a40cd2c
+DIST xiccd-0.3.0.tar.gz 31676 BLAKE2B a6ef614a5f34827011196474fdf73c0cebfdd6af25f0ee8925edadf4e3338dbb17a43c2da3cb1fee3531f4bbb3cbd760fe350e3860451e7188452cdfd595674e SHA512 d507d91ba1a6d702c0ca63d1583e0ba330210e8c143ec72b866fd042ed9b8987820fb793fa8100077d59f4c01bc068eff68b8377ed4156956ad44c07f448a45f
diff --git a/x11-misc/xiccd/xiccd-0.3.0.ebuild b/x11-misc/xiccd/xiccd-0.3.0.ebuild
new file mode 100644
index 000000000000..2a0748e9c409
--- /dev/null
+++ b/x11-misc/xiccd/xiccd-0.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A desktop environment-independent bridge between colord and X"
+HOMEPAGE="https://github.com/agalakhov/xiccd"
+SRC_URI="https://github.com/agalakhov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2
+ x11-apps/xrandr
+ x11-misc/colord"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 9e15000f7a6c..d59ff364863f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,2 +1,3 @@
DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
DIST xkeyboard-config-2.26.tar.bz2 1061733 BLAKE2B d07bbe28d5621aa146fdca089f60ebf293aa9b39b60fb6f7335cef934ff9edc6a11475ff00b7279a960cd9941f91260f25b7502fbe421bd8bf5c0da53f7a3471 SHA512 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
+DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
new file mode 100644
index 000000000000..18bac7384839
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+ inherit autotools git-r3
+ # x11-misc/util-macros only required on live ebuilds
+ LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+ SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+RDEPEND="
+ !<x11-apps/xkbcomp-1.2.3
+ !<x11-libs/libX11-1.4.3
+"
+DEPEND="
+ ${LIVE_DEPEND}
+"
+
+src_prepare() {
+ default
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ local econfargs=(
+ --with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+ --enable-compat-rules
+ # do not check for runtime deps
+ --disable-runtime-deps
+ --with-xkb-rules-symlink=xorg
+ )
+
+ econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index 941a5d01d775..9a77361bdd1e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
COMMON_DEPEND="
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 75f7016b28ef..908696627365 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,3 +1,2 @@
-DIST xwallpaper-0.3.0.tar.gz 104300 BLAKE2B 23ec3b4ccbaf910c9ba4afbd1d9237223654a85c90b0a147141b017a9b3917316f745e1dd70a89e385110d380d5bbba8ee7c2d1ed4188d87a98ba0e94c5a7b6c SHA512 c73583fdbd573329951178d7db36fb1ae18a4294207de85dfb93e367be0ed103e8de7e2dd8ec61a0a23541457c930e8b0e5eb12dd5024808de3e02ddefb6b4a3
-DIST xwallpaper-0.4.1.tar.gz 106110 BLAKE2B 13d40274910b5a82271207292ef7b5d5aeb21fe015c0f3a9780d164d805b9f212a017b4aea8cc8c92ad3a9392eb01c3ea5cddf66888ac4ec146d12109675bdd8 SHA512 febfca202d3356c5a2f584921eace61a6f16e19bf0b0812604bccb441b11a0748c997d0818fb8d9f6a37f502a0a38f13b78f7f61c2de2768a85807a8725c070c
DIST xwallpaper-0.5.0.tar.xz 81000 BLAKE2B bb30871d24538b3fb04e1158df75bc82701ed184d3b8f60179990f60d91e03eb974ab3c72446c8f0bacbf3aa27d0cbe4446cf38e34d484a46dcaa66fcfe9682c SHA512 92cf424fb90dbdbe8e47ea7cc3650200da9f480afaef605e2ddbd7a828361f61754c2ed93c9be099c340f80eb60f8c1aa2f44004512cbe846401cb8ef73403a2
+DIST xwallpaper-0.6.0.tar.xz 82100 BLAKE2B afb8760c6725904f574040652683e028a107bf269428b7986b4571e6ae61575a4b80fefff9f1dce64c95ebbdc03a206146dc4a8bad2032aa44ad0f2ff9b0a01b SHA512 18cd4997d8a0de49e4f663ffe9028516fd9703c0da61426ee9b98f1c15c4770275dd1712b17385be7ccc7bc984f02c9692e41b9d55b1ab803ead3de08fe304bf
diff --git a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
deleted file mode 100644
index 914adac64a90..000000000000
--- a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.gz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="jpeg png seccomp xpm"
-
-DEPEND="
- x11-libs/pixman
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- jpeg? ( virtual/jpeg:0= )
- png? ( media-libs/libpng:0= )
- seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
- xpm? ( x11-libs/libXpm )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-}
-src_configure() {
- local myconf=(
- $(use_with jpeg)
- $(use_with png)
- $(use_with seccomp)
- $(use_with xpm)
- --with-randr
- --with-zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
- )
- econf "${myconf[@]}"
-}
diff --git a/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
index bcf9073e961d..2c976e02c0ca 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.5.0.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
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 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild b/x11-misc/xwallpaper/xwallpaper-0.6.0.ebuild
index f6075177a910..1424bee1d7b7 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.4.1.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.6.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -12,8 +12,8 @@ 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.gz"
- KEYWORDS="amd64 x86"
+ SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="ISC"
diff --git a/x11-misc/xwallpaper/xwallpaper-9999.ebuild b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
index bcf9073e961d..1424bee1d7b7 100644
--- a/x11-misc/xwallpaper/xwallpaper-9999.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index c7aa5957bb4c..d31a1828cdd7 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,3 +1,4 @@
DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
DIST zim-0.71.0.tar.gz 2882942 BLAKE2B f1701baf547d43d7a9687e6a1d72313649064f1d3927e14bffd5c8e348fa7a311e307f9b1704c19058bfad07d6715c79399acfdc5701efa9291db3e68065175a SHA512 7c82e19d547795f57c563383aca04a51da02463df71cfe18c4cab0307f46fb425ff0f348b43ae0ab26cb29037bc9d99aed63dbf721a542d071f9674f17f0a64a
+DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
new file mode 100644
index 000000000000..757e353f8877
--- /dev/null
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+ https://zim-wiki.org/
+ https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ x11-misc/xdg-utils
+"
+DEPEND="
+ ${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+ sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+ if [[ ${LINGUAS} ]]; then
+ local lingua
+ for lingua in translations/*.po; do
+ lingua=${lingua/.po}
+ lingua=${lingua/translations\/}
+ has ${lingua} ${LINGUAS} || \
+ { rm translations/${lingua}.po || die; }
+ done
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_install() {
+ distutils-r1_python_install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ if ! has_version ${CATEGORY}/${PN}; then
+ elog "Please install these packages for additional functionality"
+ elog " dev-lang/R"
+ elog " dev-python/gtkspell-python"
+ elog " dev-vcs/bzr"
+ elog " media-gfx/graphviz"
+ elog " media-gfx/imagemagick"
+ elog " media-gfx/scrot"
+ elog " media-sound/lilypond"
+ elog " sci-visualization/gnuplot"
+ elog " virtual/latex-base app-text/dvipng"
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}