summaryrefslogtreecommitdiff
path: root/x11-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
commit8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree4d26462d027b14926335894749d2e01d982234d0 /x11-misc
parent5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
gentoo resync : 27.03.2021
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/Manifest.gzbin48640 -> 48646 bytes
-rw-r--r--x11-misc/bumblebee/Manifest8
-rw-r--r--x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild (renamed from x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild)0
-rw-r--r--x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r3.ebuild94
-rw-r--r--x11-misc/bumblebee/bumblebee-9999.ebuild2
-rw-r--r--x11-misc/bumblebee/files/bumblebee.initd-r123
-rw-r--r--x11-misc/bumblebee/metadata.xml4
-rw-r--r--x11-misc/gigolo/Manifest2
-rw-r--r--x11-misc/gigolo/gigolo-0.5.2.ebuild36
-rw-r--r--x11-misc/obconf-qt/Manifest2
-rw-r--r--x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild49
-rw-r--r--x11-misc/pcmanfm-qt/Manifest2
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild52
-rw-r--r--x11-misc/primus/Manifest3
-rw-r--r--x11-misc/primus/metadata.xml2
-rw-r--r--x11-misc/primus/primus-0.2.ebuild40
-rw-r--r--x11-misc/py3status/Manifest4
-rw-r--r--x11-misc/py3status/py3status-3.35.ebuild (renamed from x11-misc/py3status/py3status-3.34.ebuild)0
-rw-r--r--x11-misc/qps/Manifest2
-rw-r--r--x11-misc/qps/qps-2.1.0-r1.ebuild38
-rw-r--r--x11-misc/rss-glx/Manifest4
-rw-r--r--x11-misc/rss-glx/files/rss-glx-0.9.1-hang.patch14
-rw-r--r--x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch27
-rw-r--r--x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild (renamed from x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild)2
-rw-r--r--x11-misc/synergy/Manifest14
-rw-r--r--x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch42
-rw-r--r--x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch57
-rw-r--r--x11-misc/synergy/files/synergy-1.9.1-pthread.patch11
-rw-r--r--x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch31
-rw-r--r--x11-misc/synergy/files/synergy-1.9.1-test.patch33
-rw-r--r--x11-misc/synergy/synergy-1.12.0.ebuild118
-rw-r--r--x11-misc/synergy/synergy-1.13.0.ebuild4
-rw-r--r--x11-misc/synergy/synergy-1.13.1.41.ebuild4
-rw-r--r--x11-misc/synergy/synergy-1.9.1-r1.ebuild121
-rw-r--r--x11-misc/virtualgl/Manifest8
-rw-r--r--x11-misc/virtualgl/files/vgl.initd-r445
-rw-r--r--x11-misc/virtualgl/metadata.xml4
-rw-r--r--x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild (renamed from x11-misc/virtualgl/virtualgl-2.6.5.ebuild)0
-rw-r--r--x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild104
-rw-r--r--x11-misc/virtualgl/virtualgl-9999.ebuild4
-rw-r--r--x11-misc/x11vnc/Manifest2
-rw-r--r--x11-misc/x11vnc/files/x11vnc.init.d-r170
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild81
-rw-r--r--x11-misc/xaos/Manifest2
-rw-r--r--x11-misc/xaos/xaos-3.6.ebuild2
45 files changed, 536 insertions, 631 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ed4bd14226db..927eb93d3286 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 0c01b72854e0..26647fb4ab96 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -2,9 +2,11 @@ AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f41
AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc4309bdef5dd1cfa44953a3488bde8d0af67b8cf4b14b7b5de77ab125067b6b59379ceba75863fc45 SHA512 5c733a901e2bed20082d01f0db2e8d168106b082f2f6300388edbeec7f5b7a70ddfed908012c8ccf9a3caf070669cfb550368237dd6f8ff62018f8b767012cd7
+AUX bumblebee.initd-r1 500 BLAKE2B c37a4ca616b31b2cc151cae750475178c471ce9e2f7f1a9491a93980a882bd8c1b5baaec8ee2ec211acb77e243b36d6a077a25c14aff96ce01a6a493cd88f4c8 SHA512 a3b7e055eb70c46516319cfc9c9e59038568ad646865bcd5cd953d2774c48c4989c8f2a77f644993543d56fb128fedfdc90904a3370dbf8325300932cf7e1d08
DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2295 BLAKE2B ee30265b3733279db824a9a97a62428d0c480590543475b18eed9450c1735dafb26410a838467f1ce0c98617b9d705f02015f63ee8e4662847d07c7bab296696 SHA512 e4cb4d0c2083134ca248f59e5d709ab61b36429f13ee2a4f3cff8bb5ea8bbd384d759f7193151bff146c11e96914ac70e6eaa0e88b4d1742b69980aa08f735a7
-EBUILD bumblebee-3.2.1_p20210112.ebuild 2188 BLAKE2B 6501cb6761a95fc3b4eceb1abcb5401f46da02520c38cb457043c90834fe610a5c791df08befff23acca37f26e0ccca7fbeef12fdc6e22c37b3740df40f0ad33 SHA512 b9f7bf526f7804fc9810f16488147b674d30294caa303c2ad6eb2e1c21cf7d06e08e0360852aff5b20ec49517d00244d94337ab8fc2f37f566881a2eae9abe20
-EBUILD bumblebee-9999.ebuild 2199 BLAKE2B e19016ca68387e551f0694b924217680f46752f81e6fa5126b14217c33f0dfe29b41fd7d8555ab05ef69a11c31aa94013f6d705538002d3daf80c4afad36b36d SHA512 a483f2303cba245bbcc94d8cf984e606539ad200d7db9bd53e36152719dc9f64038b2b4046ca7121d8db0af4f1b8400c1e006fffa17e0cd75c5dac7065555f9a
-MISC metadata.xml 1141 BLAKE2B 441886a10ea50d12e995e2de4dce097741958d7dd88396f670249dca04c9441371e46bb2a8b39351351d3e7039ad4ea6389c004a76d82ac792656c2e9349e49f SHA512 6d530cd8b214a7c5b9c2122bcd32e4f3fb2ecb8fb0411a0527a21c0683982d19916a4f4ba75bcbb23527192928f49b691a99f563d9d6f974208b3e9608abbc50
+EBUILD bumblebee-3.2.1_p20210112-r1.ebuild 2188 BLAKE2B 6501cb6761a95fc3b4eceb1abcb5401f46da02520c38cb457043c90834fe610a5c791df08befff23acca37f26e0ccca7fbeef12fdc6e22c37b3740df40f0ad33 SHA512 b9f7bf526f7804fc9810f16488147b674d30294caa303c2ad6eb2e1c21cf7d06e08e0360852aff5b20ec49517d00244d94337ab8fc2f37f566881a2eae9abe20
+EBUILD bumblebee-3.2.1_p20210112-r3.ebuild 2193 BLAKE2B eb474aab9b516f1c5e7d1414ffa8519dc9bb223c845b9884c648d18ee56b4c502e601a626f87549e6a77698212b1fd5f5656ef18ab0340c5cdad120f2e5c2afe SHA512 31805ff90100ab826e48ff7ee82d6c64ddae23c89f0d98b319342c963776bba2c11aacbbc6cc0e28099d19c6e9fb3fbc4a2f1add53645bb8586fafc23bce7632
+EBUILD bumblebee-9999.ebuild 2202 BLAKE2B a427123a698832721063aac463d06a873027fd226161b95656ef53e83f32c6e468957d28370fec47d41c86726a6e64a17115a315f0bbc9e39620fcc4b557c1eb SHA512 d89511ba58ddb48e8bd3e68fd976c6e87fe749974ee9e94538c83a54915d49ed3f89fed850b504ce13213c7bd108ee55beb7b7edb2e5848cce1fd598e5ae6ef6
+MISC metadata.xml 1143 BLAKE2B 2f0cc1faa1d3cf4bbb1bad28b72bdf32ffbace0ef02ecefb2a786401bb23123233b647860b0a0b1b7f24e37dc11470a820b1799ac6fd8e716f8b2c8f05d95677 SHA512 e1098847284529bf6840c313198664dfc037abf0a812e22f93a55d6cced08b0d49eb12316b7ca12c26728a3560dd5a5527b01fb218f6857e9a991cfd75b90bf3
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
index 4984d378312b..4984d378312b 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r1.ebuild
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r3.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r3.ebuild
new file mode 100644
index 000000000000..6c6e83af37a9
--- /dev/null
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd user
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
+ EGIT_BRANCH="develop"
+else
+ COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec"
+ SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+
+ S="${WORKDIR}/Bumblebee-${COMMIT}"
+fi
+
+DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
+HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/libbsd
+ sys-apps/kmod
+ x11-libs/libX11
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/opengl
+ x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
+ bbswitch? ( sys-power/bbswitch )
+"
+
+DEPEND="${COMMON_DEPEND}
+ sys-apps/help2man
+ virtual/pkgconfig
+"
+
+PDEPEND="
+ || (
+ x11-misc/primus
+ x11-misc/virtualgl
+ )
+"
+
+REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
+
+pkg_setup() {
+ enewgroup bumblebee
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ if use video_cards_nvidia ; then
+ # Get paths to GL libs for all ABIs
+ local i nvlib=""
+ for i in $(get_all_libdirs) ; do
+ nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
+ done
+
+ local nvpref="/usr/$(get_libdir)/opengl/nvidia"
+ local xorgpref="/usr/$(get_libdir)/xorg/modules"
+ ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
+ CONF_LDPATH_NVIDIA=${nvlib#:} \
+ CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
+ fi
+
+ econf \
+ ${ECONF_PARAMS}
+}
+
+src_install() {
+ default
+
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newenvd "${FILESDIR}"/${PN}.envd 99${PN}
+ systemd_dounit scripts/systemd/bumblebeed.service
+
+ local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
+ You may need to setup your /etc/bumblebee/bumblebee.conf"
+ readme.gentoo_create_doc
+}
diff --git a/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild
index e66fb829acb9..b9699790cb80 100644
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild
+++ b/x11-misc/bumblebee/bumblebee-9999.ebuild
@@ -84,7 +84,7 @@ src_install() {
default
newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
newenvd "${FILESDIR}"/${PN}.envd 99${PN}
systemd_dounit scripts/systemd/bumblebeed.service
diff --git a/x11-misc/bumblebee/files/bumblebee.initd-r1 b/x11-misc/bumblebee/files/bumblebee.initd-r1
new file mode 100644
index 000000000000..0780fb902b48
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.initd-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ need display-manager
+ want vgl
+}
+
+PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}"
+
+start() {
+ ebegin "Starting BumbleBee Daemon"
+ start-stop-daemon -S -p "${PIDFILE}" -x /usr/sbin/bumblebeed -- -D ${BUMBLEBEE_EXTRA_OPTS} --pidfile "${PIDFILE}"
+ eend $?
+}
+
+stop() {
+
+ ebegin "Stopping BumbleBee Daemon"
+ start-stop-daemon -K -p "${PIDFILE}" -R SIGTERM/10
+ eend $?
+}
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 33a45f6774e3..6edb74642ffc 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>NP-Hardass@gentoo.org</email>
- <name>NP-Hardass</name>
+ <email>np-hardass@gentoo.org</email>
+ <name>Adam Feldman</name>
</maintainer>
<maintainer type="person">
<email>pacho@gentoo.org</email>
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 21894b8dbf35..b7c07d256ccb 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,3 +1,5 @@
DIST gigolo-0.5.1.tar.bz2 246788 BLAKE2B 524307017a5d07107ded81af71e7758c60538abec2e75e5ab4e4f3c57ff82ea557e6f7b009ecbd6d7cd42fdf8fe8a8872ff973fc5051753dcc70341fee953bc5 SHA512 a21e2e808db4a16b7bcd9019e936cac57f67a76d6a9a9e34ed3eb7faa4cd5997bc561d1e9817d8e77efbf8ab0a954bc7f25719941672f604cc415caf0cb61e09
+DIST gigolo-0.5.2.tar.bz2 294210 BLAKE2B 67ac4f161ddac212b15456713b1abbcda83a0ceb744606b7050b185d7ebb286ec087d4a25dfd2adaf269f7b57b627232157a259c3cca8c22b84551ab17eac0ab SHA512 2277186495a5ae5f4b4a30ca738b6c35287d6fa51d0df11d31ac627811a67ad31202c3c78225e3035b92c3bf111e6ff098bc7ba83482e0bea0e5e2edcfaec0c7
EBUILD gigolo-0.5.1.ebuild 702 BLAKE2B 45ac139c748651de3cbefa4c664d251e9cf768f98cd1ccf307ccf10c1b77bd9f5665981b1a7f8d23a203d673f454837b0d633f1bf59c157d9d3231d3c14fafab SHA512 ad928f09dc22ef67b8a002f4d09350d63b582fdd9392b51cb657476bf37d134e4ca45c0c61378e50630fc39950be55a3560601a8ae02f9c9224357356a816413
+EBUILD gigolo-0.5.2.ebuild 750 BLAKE2B b18f2ca3bbfb25e86118590d3b80284f0c00e9f72d4b39c846c42151596e7c9f66d4a46821348cfc90709785bfd9d520e4eb517d12d9689e7c5c1695a1c9ca16 SHA512 c40f1273ba83af0ba5d08e511ab07e87e8d7ba052e79878d085ec7006170bda0adc9e81297f93f7b35f68446ce415cc03c667d15c43f3d08bc6b58e65bd83525
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.5.2.ebuild b/x11-misc/gigolo/gigolo-0.5.2.ebuild
new file mode 100644
index 000000000000..81868a80b703
--- /dev/null
+++ b/x11-misc/gigolo/gigolo-0.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 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
+ default
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
index abf1b9a1ed83..49dae25b22eb 100644
--- a/x11-misc/obconf-qt/Manifest
+++ b/x11-misc/obconf-qt/Manifest
@@ -1,5 +1,3 @@
-DIST obconf-qt-0.15.0.tar.xz 99976 BLAKE2B 7c7aede61cfc7a26c56de7e6ab49410dc82f4f9fb4f293fa0f0896f1b14cff63d34d00dd56347ec8daca375e226fed4ebb58c633061129708fd5107daa97d074 SHA512 a723dcd3b409afc7b16572d293cbf0543e00a7177a9819e2374632c00c765de74896429f6e19a54fcee83e20ce2e0876f857447c374db2f4f925dec92be71279
DIST obconf-qt-0.16.0.tar.xz 101588 BLAKE2B 94407df40878c64a40343ad2a8fdbebc78a99beaf017485fda52d6043f2597467c67da465dd191a78ba7c084f1072152d4033f7b5b41f257946941efda37a9e3 SHA512 ab0ddc013ca877f2434da956c314b248f6a7ef5ced1e5c605de0652d0b8c5c0e84f1e6fdf8b21c6f3d450d57a1413d625d0a31b84cac2c9062dc0f101d8e57ab
-EBUILD obconf-qt-0.15.0.ebuild 907 BLAKE2B a004fcc83626c5abc8673361e9ed2d0a34ce6cc6640b245b3312a2bc2c68be9ac8c208eb7d5ea06473e02f1239c3b4eb10a371337d2c8aa80b54357709e78003 SHA512 857a0b53d75f1e4c769096d70242471234f7331b7828f345c08111d01d30ea52bd262103c371e7f97d9e88fdb01c1bd0fc6a0d7b74e5f4dadbaca8e4073eb5e8
EBUILD obconf-qt-0.16.0.ebuild 907 BLAKE2B f8c9c221dcae3f63bc84d8152b81a1faada6d46c1a848562d11017c72bf4575c3cacf8e313b94f2f580f96eed73bb8f9168b32f14e125125ce542fb0c11d2e6c SHA512 910969c17b53693ea452d5461a8065e26febccbea098e99910e570648c3c94f4dc00d7e311c29a9dece9c9a4f3c9bfb947f7c7e470c5080437122ecef705b614
MISC metadata.xml 315 BLAKE2B aba8e92e822b0a8f7213a6a2a723ada9cc5be720aa857152cfb2e395b8cae65dac8ce4c13e36e3ba774e22d800890c5ec7878f0266157b92e4f0332fd2ff8dc0 SHA512 b210ddb7b5f688fc122fead9a5fbac67653099db7671e442c53cf5246f091c8f58a6db94f2be7d3250a8fe24a619c6c9269b31f6c52f62049c40963dd8a6212a
diff --git a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild b/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
deleted file mode 100644
index 82d22dcca954..000000000000
--- a/x11-misc/obconf-qt/obconf-qt-0.15.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI Openbox Configuration Tool"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
- SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.7.0
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- sys-apps/sed
- x11-wm/openbox:3
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}
- !lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/x11-misc/pcmanfm-qt/Manifest b/x11-misc/pcmanfm-qt/Manifest
index a6dbd6dd7fcd..97334b4c42ae 100644
--- a/x11-misc/pcmanfm-qt/Manifest
+++ b/x11-misc/pcmanfm-qt/Manifest
@@ -1,5 +1,3 @@
-DIST pcmanfm-qt-0.15.1.tar.xz 257832 BLAKE2B 78c8f5723b529b7f8a00870f017818183a498d8a1f68f8f24ab756eeda9b35d8d998b42d87f78e4a8fb6725bf3e812dca74bc1464f285a6a984dae1996b43f46 SHA512 db0d3cc683b5c94cabab5a8c68b3ae8bf5938735b34989a420692e933bb54d53ebb15da9af4a59039bfd101de0cc00c521c08207e81bfad9d80315e2d94bc559
DIST pcmanfm-qt-0.16.0.tar.xz 275792 BLAKE2B 65deed6a6d942a57c6cdf497d254d5052b1bcca219198f3cbaa2bcd29048976610afcfc31cc2101f8ddad88f436bc8dba2483b8305ff55f178dd65c91a549814 SHA512 42c754267966b29722bd771d6f6f09c20cdb3b33bbe49deec982bdac98379dff92ac13f6f70b603aea963a3e1003034475cb682ec4264cfcf581c189826ea727
-EBUILD pcmanfm-qt-0.15.1.ebuild 1098 BLAKE2B a775a49e89656b9a857aa2095d3f770ff31a1df5591e6e69f0eb2308723449ec3e3dc7bba053fbab8074d63b1a821f3dfe1b8d1df0a869c6c9b58e3526d3295f SHA512 360c8d2adbfa632a5803ab2c1d00324a5b157322e64b4efaa050d6e51aed33fe355c7b81775731c7b4278397ea1e94eea8f5193577ac0f64804604f914e0ac2c
EBUILD pcmanfm-qt-0.16.0.ebuild 1098 BLAKE2B 8e337b446f6c3c948a5cee463bffac0899bfc3f15006c52a97f5a2de0d07c6886a11c814e741b6312519e2a72ad823c108728a3f757772e1768baca186ffd350 SHA512 71288802c33d465ae74c1a9bef001a287ad8c7b2a4fd519c5811a1935a5226e482684d64c648a1f6df8cc8126908fcf133e4bf011d8037a74a6bec291685d8ee
MISC metadata.xml 316 BLAKE2B bdf0d6e5b1f3c247fee5717c1aa5bf04bc87254e12fe1bbfef77d8479686585c2d9101b13c2c7b1ac00a4876f809271a59667bceb648c7c034500f529d919558 SHA512 d38170dda875860b80d34ffd83fe0daa56edd14dbc1dd06ab23a21a9f45f95971754299bd488ebc4cc328c0347dc9cdf2265964aab04759b908232d6aea441ea
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
deleted file mode 100644
index f5972ef58337..000000000000
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.15.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg-utils
-
-DESCRIPTION="Qt GUI Tabbed Filemanager"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
- SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.7.0
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- =x11-libs/libfm-qt-$(ver_cut 1-2)*
- x11-libs/libxcb:=
- x11-misc/xdg-utils
- virtual/eject
- virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}
- !lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- optfeature "mount password storing" gnome-base/gnome-keyring
- ! has_version lxqt-base/lxqt-meta && optfeature "trash functionality" gnome-base/gvfs
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/x11-misc/primus/Manifest b/x11-misc/primus/Manifest
index c66750ed13e9..3116b2501c90 100644
--- a/x11-misc/primus/Manifest
+++ b/x11-misc/primus/Manifest
@@ -2,5 +2,4 @@ AUX primus-0.2-libglvnd-workaround.patch 662 BLAKE2B c2a4af4171487405ca08248c162
AUX primus-0.2-respect-ldflags.patch 733 BLAKE2B fae740396454d1051f3e4b5714e281edf9cab2b11144cbf5af2edfb6010c1e5adeb501a64289d7093105cfd039928e06c13246c845fc6dabf0a4b23b921a1f1a SHA512 d15fbebb12c5f9d299fcb9b7bf8004e2933d7739b754fc2de45cf13232938000ec187369eee28be85ea4502844b67b991f3c49b7ed31c0036e2da974e72e3248
DIST primus-0.2.tar.gz 26248 BLAKE2B 5e7822e66f3abadc442c30792c03dc731814a084ca2911b9e0333efda1fdfd36ce3c31be612426ae3747d7be0575aca2e7562054ba4ae719812cf800ffc04ff5 SHA512 4108f4e721c9cd8f8dc592a41706230b29bbcfcb8ba49e61d1f07f715c81304471e0d00407bc59a314568b3b42e19f0962ba1dbb8ef1996fe0d4ac13af2e3d2b
EBUILD primus-0.2-r3.ebuild 1625 BLAKE2B 276ed5d7fc7bcf0879da96237306e9cb34a602dba6a305b45d9abd7e361d312029e854c80a78bae6defcbf2e37b8283db440f05c059a32b2df946168d207813f SHA512 d8df53124cdf5ffd6fd5ad4ae33dcd445fa83a5936be8274e689e74450c5487884e395ddae8e2c2cc3145f71ce291638ffa2dde2c29330229dbb4d65feb92f6c
-EBUILD primus-0.2.ebuild 919 BLAKE2B b1eb99e7e0b18b69e24a7ade73729228b6829a36da518539072bb7919dd54c338c0c9bedcf8a69a557563bcc85e7a61d716ad851e2ae084ebf767c8fa0827635 SHA512 9c967343163ac52b2ef9e5e061b8ca6be8d3cb0b7be1e51ad0a913c8fd9953ee486fa70a697b41814440d5739eebf39f3d6b84f09d2c3cdbc4082a75ee7debe3
-MISC metadata.xml 423 BLAKE2B b55ae11da7b5968ec0b88042f4180c690d818c28690824eaf0511890dd747d64d0bd12510c2389e067e5ad190d295c27ed6a6e8ca43b8fd1abffbc22a3581096 SHA512 7d9a32f2d32a8973f17679e8658ebf461c7c88ba028f85209629767c097f66c4bfd0e3e1c9fd80d7a6b88bd4d6ccc52bd56a5650a61a68f6259278b172aab72d
+MISC metadata.xml 423 BLAKE2B 95d66f3d6dc768b6d76076472cac6fb0ad052925328bd8d4c5bf9aec354e2905ab1a0d1f915249ca395fddab005ebc0429b9c5103eccf9d5703e019b1254368e SHA512 79809694557ccfd9a89d24e94ec1389d67f22da8a7b02b59a75558e8ed2f33775135205f3204acdb06f9c282f4af79b1982a52377588933db91654f13df1f847
diff --git a/x11-misc/primus/metadata.xml b/x11-misc/primus/metadata.xml
index 80d44a9dc986..65474908db8e 100644
--- a/x11-misc/primus/metadata.xml
+++ b/x11-misc/primus/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>NP-Hardass@gentoo.org</email>
+ <email>np-hardass@gentoo.org</email>
<name>Adam Feldman</name>
</maintainer>
<use>
diff --git a/x11-misc/primus/primus-0.2.ebuild b/x11-misc/primus/primus-0.2.ebuild
deleted file mode 100644
index 6cd89d1ee185..000000000000
--- a/x11-misc/primus/primus-0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Faster OpenGL offloading for Bumblebee"
-HOMEPAGE="https://github.com/amonakov/primus"
-SRC_URI="https://github.com/amonakov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/amonakov/${PN}.git"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- x11-misc/bumblebee
- x11-drivers/nvidia-drivers[compat]
-"
-DEPEND="virtual/opengl"
-
-src_compile() {
- export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1'
- mymake() {
- emake LIBDIR=$(get_libdir)
- }
- multilib_parallel_foreach_abi mymake
-}
-
-src_install() {
- sed -i -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun
- dobin primusrun
- myinst() {
- insinto /usr/$(get_libdir)/primus
- doins "${S}"/$(get_libdir)/libGL.so.1
- }
- multilib_foreach_abi myinst
-}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 3dbbc6187844..966fda20f220 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.34.tar.gz 409041 BLAKE2B 2322eedfc37c993f58b2dc45b14a3cb0167e139b0d62fe17de6fdcdd170bda826208b7462e45776b3a42c53a3c4dbee84175c1bf5551bb46fcf1f7b65edfd3c4 SHA512 a018c698ea11fb7a2f150833c13b9eec97c04db023646381f346c9d8f4873f8526dd0696d11ae93eaada3364e041d614a23b59d250b4e3e8fa83303634fce54a
-EBUILD py3status-3.34.ebuild 778 BLAKE2B 8b0c7a516b0d05f1e3848f7ef7e50e3374df19c5a051518d59ab8a4a4c01ea23e277e9f4d02ca4fac98bcf0addaad27ab19bd74170ba4ddbce2ccbce31cd07ff SHA512 589cdc28ce2158df8aa1c3269d6a1ae7d243ef35c15deb89ccc9bf025b01e81103cd20efacb7178cba223dc6217b4cf7d01b4970e9debfcd1f3286d69b1b87ad
+DIST py3status-3.35.tar.gz 409496 BLAKE2B 5d527846cc4acf5b341b33ed1726165e5f09c7fa59dbda61e4526fadc8151831f8a9c977c60c5f84b37073705448e9258e9311638e8ca929c3d93452cecf8627 SHA512 d2f120818d7d7e100b93d355096cd985c933d9859539a7ffb32ca5830d034617851cfdfbdd2c472f931d30f17e178b134f05a503219a126f8fbf0e920b263157
+EBUILD py3status-3.35.ebuild 778 BLAKE2B 8b0c7a516b0d05f1e3848f7ef7e50e3374df19c5a051518d59ab8a4a4c01ea23e277e9f4d02ca4fac98bcf0addaad27ab19bd74170ba4ddbce2ccbce31cd07ff SHA512 589cdc28ce2158df8aa1c3269d6a1ae7d243ef35c15deb89ccc9bf025b01e81103cd20efacb7178cba223dc6217b4cf7d01b4970e9debfcd1f3286d69b1b87ad
MISC metadata.xml 757 BLAKE2B 059448fb46b35c9db53995d542d06432e182c022a584351fcd45961f23fca4549ef405eb39aec4fbb59f7e7ec7082428766d917f79fc84ef5ed2684c2030baaa SHA512 3fa373a13f9889d91d863ed3369abb76045447168bd10f62981d14315889d445b523cab315e83afa052baca5881576d398931ee2333a6ec4bf6863e23fb138b5
diff --git a/x11-misc/py3status/py3status-3.34.ebuild b/x11-misc/py3status/py3status-3.35.ebuild
index 249cd9474c6a..249cd9474c6a 100644
--- a/x11-misc/py3status/py3status-3.34.ebuild
+++ b/x11-misc/py3status/py3status-3.35.ebuild
diff --git a/x11-misc/qps/Manifest b/x11-misc/qps/Manifest
index 260a1985d23b..01e23855ead8 100644
--- a/x11-misc/qps/Manifest
+++ b/x11-misc/qps/Manifest
@@ -1,5 +1,3 @@
-DIST qps-2.1.0.tar.xz 197352 BLAKE2B c607fde920973c21e85b74e9408f7827ad4354d95b5b16cc95c22bc4143579f1dcddf68bcf9904f4df12236d49f786f457bdf3ce809f37549211f297bab18205 SHA512 e5601657be94d4c21e189fc1113f4678a4bad70ca3c9c3882492625b37339d079d1e8240120bdb467bc47ca95a1b26f8e2da022c271377cf0dbf98e390bc8ac2
DIST qps-2.2.0.tar.xz 205940 BLAKE2B c5454df5d7f8465687de8d59250db5f8e06edcbceead6f4ee316e02bc7596173d2319fc21e168968d9a155b0bb9aa98f074d0da3b9d618d051e2eba9159b5b13 SHA512 640c228dd9712d6becf7583cf2cf21bd35df638fcbe088650628d678a1f8f5abb055bdf95150dfe7b24687e043ebd805d1a98f331e329058b5db9dce01dd8f20
-EBUILD qps-2.1.0-r1.ebuild 736 BLAKE2B 282c784d62c5df1586702ddb2a509de2b28ad52282344212642925148da0f258b73bed5b7a893ff449dd7fb2c287bd1a9bf5bfa5b2f1f3813a5613f86019f554 SHA512 ef62a9d7080022a9abf89f36eb20a66e6a4dea0e681331a7a4849a1942486588ed42e85344b1b71b2fba80bb108898c39d579b20c92f756f4467bcb87a50d2e5
EBUILD qps-2.2.0.ebuild 736 BLAKE2B 487b8d36f923e0d7e88504f0bd5791ff27bf2b6d880b602186c22e976eb609c09a84d364a3837732fb5ad47c192e370dbded002c508f5c95d811927f71d075f7 SHA512 c6da011d9407a1a8635487e4abfc674395ec8e19417fc88b965c8a794eb6e2279ea0bba1f19f246ecd53d0924119aeba0f422134562a64117de8f09a825aed46
MISC metadata.xml 320 BLAKE2B 7a6824c87e5ee071bd4219df12554d6363050a126b5838af05dc627134e57d2452eab17569b3e144dcb476ec35dc41649da438b8eb7b45d9e695b2ad900581fa SHA512 b0c5950c5803e5bb765271787eab2bb755cd681f50ab183a2bb06b9f773d0dc8c959e7d9c3f15d23692b3c106d6a0bfd0db43f439225539a3a019b7dceb33292
diff --git a/x11-misc/qps/qps-2.1.0-r1.ebuild b/x11-misc/qps/qps-2.1.0-r1.ebuild
deleted file mode 100644
index 1b0b6adbf9e4..000000000000
--- a/x11-misc/qps/qps-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt GUI Process Manager"
-HOMEPAGE="https://lxqt.github.io/"
-SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.7.0
-"
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- >=lxqt-base/liblxqt-0.15.0
-"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index dee077dfa818..c6ab06c5a2bd 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,7 +1,9 @@
AUX rss-glx-0.9.1-asneeded.patch 263 BLAKE2B 281738a113dc81bd661f75982ef48d5b629a6074ba0fe6624b929ea74ff11385e347f7c56a598b53937ceefa32e2db86daa17e89c03c667b481a500be752ebfd SHA512 0e863458e14b97a1fcfb054cc0072ded458da4d9c9bf237fc91aa4937b41b207f024bdceca59dc1703c75405520afca8dd55ec9ef69259d52c9430bcdf3c045e
AUX rss-glx-0.9.1-c++11-narrowing.patch 1207 BLAKE2B 1b23dafe33b43f559859da3c4ad4395fab9bab556dd09261c5764257a7992b0cb29453646ae02c4791a378cb18671c3233fa1351bd60d7c5ae970309d3cfee3a SHA512 8c262ca79cd9bfd263576868b35dc0ad6444d15a10c6d550439d1dc87dd7eb7f8058291193479de45461b2610bc068be6b6a9e140c329383a3792ad15d73e060
+AUX rss-glx-0.9.1-hang.patch 299 BLAKE2B 2ce93ea94ee9d53d5eb5e9669799bd6423e0fe6de328e014403c9f315eddd7155e5fddd19145e380d0d163ebbcdb6c1509d265f528d150350d6487e951a04690 SHA512 9c8eb930360e39b53bd2d8878f5e9f35bf3015734164bb786f1d808bbcd4c0d0c91828daa154d545e7cc99fa51d1f12f15a0c6e06203e7793de37582ef76cfbf
AUX rss-glx-0.9.1-imagemagick-7.patch 5238 BLAKE2B fd3c02f9433d7d77dee0e4f6ec71afed34bcb09243ef0f8a60d46ea63fb2286e3b467e27165d2f7bbff7d2eb04849cbe10c889351f428b882b1e6d828fb45195 SHA512 706bc00bd5904c78bfc2858e7b6718b7288b401837ef9abf092ec7669eaf7f81def42e0684f28f3d9195abf00c5ec1ef0df617d2bcb0f55987f79e1914284b5d
+AUX rss-glx-0.9.1-matrixview-copy-font.patch 518 BLAKE2B 39ca9c83c71f88cf967731115fd8df28feca7d63cc1f462a8cacedcb332c1105445354f262f49a428a0f393b6217cfb3b1e5b9c35b61cfe29434f33b8649f554 SHA512 da60ea89d341a951f2880c86b0c624ea7f2e1f04350387db23229496a06b3bd6392ee1a4b723b69eeadcfd538eda01ca8dba6afe33e92ef4c88ecded05615fea
AUX rss-glx-0.9.1-quesoglc.patch 736 BLAKE2B 62ec14f17ee76b04f4589d71a646fc77d3521ba512d0888612cae701fedfbcb2d81fd1717210fb663c322b0088555fa0783faba91b68991f422e4962a3dd0b02 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a
DIST rss-glx_0.9.1.tar.bz2 5435799 BLAKE2B d8161f06469f1160a6e80bb47a333746fac82df4d92eb9d007c7d6fe3a32e1a54a30d4675f64b100fd5509977dfbda7e8821daa462f00cbf748cc7c4bb8afa72 SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961
-EBUILD rss-glx-0.9.1-r2.ebuild 3889 BLAKE2B 683b3438bac0a26d25624a9a5a25af79cac0664258ae3ae63c9864b2f2a7863ce19840d8a6005c43f2c33bdf8c1e68dac31a60a470b797015a05d0627a539650 SHA512 59e7144e04ac084e85288d7dfedbdb78f2a7d34ef49cc15354c9f3a0d26620edef94460732e841ab2466583d5d22eebc3270e402ed16c6bf78cb999ba5f0f67d
+EBUILD rss-glx-0.9.1-r3.ebuild 3967 BLAKE2B 12925b77afbf143476c29c1be4b2fa2ed1dd8fd787af5d0ee6202dae605dfe48cc3171c7cfd56f6221f4f04181d0f5e2055ce8a9ccb48657af07928bf4c5c030 SHA512 a771b6186448f774025861714d9c1a5bd94347e168b55d428e1f094dc6a78f0167186d2214fd243a93409d6ee425ec5e65b04d3ee07f4dbfba42d3aeeda5ba2b
MISC metadata.xml 565 BLAKE2B 12058c9f2b265ad0871edf45d3432ee605ccecbf7b9c0f3dab5752dbaa061100203653ac01cf2bf251e3698163d542d133d6ceca26d2c7ddb3c1b885a3876c3f SHA512 acae3bfe457c4c171b9cb8458cfd455ed6e9d8b253dc3db659aa5d843e01fdfb68645911d34f200fc140bf2fcb9f19228d2ad169ad75dce5e2f9bc8f21f2f33e
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-hang.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-hang.patch
new file mode 100644
index 000000000000..60f2b326ec43
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-hang.patch
@@ -0,0 +1,14 @@
+Ensure a signalled process exits even if the GL driver hangs.
+
+https://bugs.gentoo.org/478074
+
+--- a/src/driver.c
++++ b/src/driver.c
+@@ -397,6 +397,7 @@
+ void signalHandler (int sig)
+ {
+ signalled = 1;
++ alarm(3); /* Self-destruct if something goes wrong */
+ }
+
+ int main (int argc, char *argv[])
diff --git a/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch b/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch
new file mode 100644
index 000000000000..cb9f5e9a500c
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.9.1-matrixview-copy-font.patch
@@ -0,0 +1,27 @@
+--- a/src/matrixview.c
++++ b/src/matrixview.c
+@@ -537,7 +537,12 @@ void load_texture ()
+ {
+ long a;
+
++#ifdef HAVE_LIBBZ2
+ LOAD_TEXTURE (font, cfont, cfont_compressedsize, cfont_size)
++#else
++ font = (unsigned char*) malloc (cfont_size);
++ memcpy (font, cfont, cfont_size);
++#endif
+
+ for (a = 0; a < 131072; a++) {
+ if ((a >> 9) & 2)
+@@ -579,7 +584,11 @@ void ourBuildTextures ()
+ exit (-1);
+ }
+
++#ifdef HAVE_LIBBZ2
+ FREE_TEXTURE (font)
++#else
++ free (font);
++#endif
+
+ glBindTexture (GL_TEXTURE_2D, 3);
+
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
index 61300f4958c1..1af7c945fa98 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1-r2.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild
@@ -40,6 +40,8 @@ PATCHES=(
"${FILESDIR}"/${P}-asneeded.patch
"${FILESDIR}"/${P}-imagemagick-7.patch
"${FILESDIR}"/${P}-c++11-narrowing.patch
+ "${FILESDIR}"/${P}-hang.patch
+ "${FILESDIR}"/${P}-matrixview-copy-font.patch
)
src_prepare() {
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 03fd7c1765ec..ceedb8c37e62 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,18 +1,8 @@
-AUX synergy-1.12.0-dnssd-dep.patch 1512 BLAKE2B 1014b7624142e744cfa5be14cc6e282dea5e6059922f59040304c15b397c6b1368c8892e4f40cf68b74de9bda9d3a2769d8f81c473b0588a56e763c4e76b77a0 SHA512 88ffdea5d85279abfb66ad1a6edc9451ef82d87ca944282e6d6a586cd1ad4a1c13016c519ad515d906ae7d3468ef49365475a049e049ad610daa9b3fcfb48265
-AUX synergy-1.9.1-cmake-version.patch 2136 BLAKE2B e96bdfdc278e818be0f46eb2bef7dedb24f70d6fbab3b0ec36716811590f55a742f2d61b6976f6b3eb16490a2deedf6664ee556244065a97afbf2b603d151ec3 SHA512 80dd8adcfe58eff2d6ee74b5e2e408ded1b9b112e72d8bb1d86d33a12c778c5b8bb359501490dff0a896e21f23dc321bcf670fcb2d5cdf66a0ba5a8904f206cd
-AUX synergy-1.9.1-pthread.patch 391 BLAKE2B 8d1aabe8a8ddcd1494de5aa5d19428e4e2d248fbef5a372fa1102f36d2e8e7868afdafce0109293b517b81ba3104f7555a9d3e808f5f3752434068ef527626b2 SHA512 8ab56a98baa7f97034bfd2e9577d84edbf7fbd954bce76b2674fe90f0baf9d91bc5f2d5550f7c57cc214316a34fb2769b1c91c4bcfbe967f13fb64863941cb24
-AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44edecb88bb907e5e260f10aedd1978a9c7b56a90cf83a6d4df227ccb548c416196a9ad7c30053aa6b14bedf2a1862042 SHA512 7931de105c6dd7a0d673dacb4ed26ceea6e5ed78460a8c8c8e7104c662d884de37fbe2a8d497c1a3689fcd6316063e3cd3bdd1d7e1650add52153deee0669fc2
-AUX synergy-1.9.1-test.patch 1372 BLAKE2B 3a73c9d431d0fee62e701770ceeb01e3f652b677343104a0ee804c5ed3f6943ec62dced7c24f2f518930099db1ccfb32db08cdf4df72915501e37a89ebfcc2b4 SHA512 cd923dd998dccf31e267db87154288c420538f621e9d179c7e275697edded2c835f75d323b6a94b6b453729fbb7909334474fc7a0202fcdda535e6dce42a44e3
DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880
DIST googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab
-DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
-DIST synergy-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a
DIST synergy-core-1.13.0-stable.tar.gz 8657662 BLAKE2B b4da6abd1b396f71aa37531e1adf71ff06d4804b74659db362a8fe2701c44786108ecc8b52932038490dfad8b7ae617f13a365ebe1ecf559f50106772bda9102 SHA512 317f0aae7742a3ecaea2f3138364a5cd1a098d76a2decdb6558900112e5dd0b53c457b461201d25d3a33cc2d9189e1f7f4e777a80b98c87d693f51b636cbb564
DIST synergy-core-1.13.1.41-stable.tar.gz 8663717 BLAKE2B 13d0722b183080361492382d3dd489b911cfe2384390c7b614d17df7f681dfbd8be94fa79cc4088602ea3d431fee793aaebc07f1d976cdd9c22493fba2212392 SHA512 3743ea4ccf8734928d021d414c2f10839056cdac64768f2e3e89b73392969b392030a0d9250041a1c2c21db06659088c8ca66d952c07395baada154df0311b87
-DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.12.0.ebuild 2575 BLAKE2B 577b7b30f0319736860560ae50d89d717a2a55d29bd9afc49bdc44213477cbd24f8659486d84b3719d452a294d73904bd9f2751f1cf1ab3f1d91cd14ca76bcd5 SHA512 9accf85f2ceaef3b35879ad81471e57d4c699b3a0d81a94d756b7134fb51ae25f045614ca42ab0de545917f8590c5f91a57a4f4b6c3c7e17853cbca09195024b
-EBUILD synergy-1.13.0.ebuild 2409 BLAKE2B f8d4f0ddeeba670c03d5607514db85ff146c558ca3ef4c8cc4613ee65018183b9b211201a6071a8ec6c1fe046a29b72e09933adb360b171d1b44d91de224d1a5 SHA512 4924b2d5c07ba3b450113db193aa31bd29248b99477449047f135ec30d6618026b338b055e49cbf76e9ab55df1f5d822ed944be9b7092e2edb33238142372964
-EBUILD synergy-1.13.1.41.ebuild 2478 BLAKE2B 99d7561e57104353b8f380edbbc2807fbcb0fd351f8e744bbef79ccda6e94f330553c2ccb855a65e298921bcbad8c36b5f493f9e35b34c96f2a814c926521efb SHA512 b7ea8abf7321baf6128cd45421676f2c5fdc136a7e84d496a3720366df97dd44a045b79dc4414359c77c6d15976399f64e637b8b3ae29240d78bb7ec1871600a
-EBUILD synergy-1.9.1-r1.ebuild 2564 BLAKE2B 5c4ec4856bef497f2b91275f74cc10244eef9bf7ee8d840dfa718a7bea971b5564d82589483a2eb3b65dc7ea01a9e856fde11b224efe48f5eb803f66f2cfede6 SHA512 633e27d190523b7f1609631cd2c3eda2f0ca921286e78f8e9631fbb2053349b24601bbfed5f86632f5d8ec3a00910629e70d55a0a7fb26a6dfe784aa5da5a0ad
+EBUILD synergy-1.13.0.ebuild 2457 BLAKE2B 7e80aa1fa1092a93a53f9ab2324a4d2fe791adb79697bb45f704eb9408dd21aaabdf13437eb6d4ec9c1fa0c3dc4e965ca9e96125347adee03615945b477725f2 SHA512 b7d7df1beb565846951b9f228ac3c8c6107e3b505845b868ded9c88eb4b95e0ee75f415ea8704d266b77cd492f3afbd6388e218e37430b5dfe580581e71a23a2
+EBUILD synergy-1.13.1.41.ebuild 2526 BLAKE2B 61313f03656bd72fe5b4fa56cc55a9b200fa707ffa8dad5e08f2477f34261166ca0495ee699b5041356a94e02799783685606ee9bb96807b768f4a15eae0922b SHA512 28a287133563555c381f6e93d682606cf23267e94c1b5a3be6a78818dc78d86f8906fd0cbad252119887403be2804028b53101e93ca8b9d2c41fd2f7cda0f94f
MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0
diff --git a/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch
deleted file mode 100644
index 1905fc552ea1..000000000000
--- a/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 91e150889814ddf97a75b881bb979c975894f34f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 10 Dec 2020 22:40:40 +0100
-Subject: [PATCH] Check for dns_sd.h only when building GUI
-
-The <dns_sd.h> header is only used in the synergy GUI component. Update
-the CMake check to be done only if SYNERGY_BUILD_LEGACY_GUI is enabled.
-This fixes build failures when GUI is not being built and <dns_sd.h>
-is not installed.
-
-While at it, fix indentation around the added check to match the rest
-of the file and avoid being misleading.
----
- CMakeLists.txt | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 581fdf77..35d806d9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -235,11 +235,13 @@ if (UNIX)
- list (APPEND libs Xi)
- endif()
-
-- set (DnsSdlib "dns_sd.h")
-- set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
-- check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
-- if (NOT HAVE_DNS_SD)
-- message (FATAL_ERROR "Missing header: " ${DnsSdlib})
-+ if (SYNERGY_BUILD_LEGACY_GUI)
-+ set (DnsSdlib "dns_sd.h")
-+ set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}")
-+ check_include_files ("${DnsSdlib}" HAVE_DNS_SD)
-+ if (NOT HAVE_DNS_SD)
-+ message (FATAL_ERROR "Missing header: " ${DnsSdlib})
-+ endif()
- endif()
- endif()
-
---
-2.29.2
-
diff --git a/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch b/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch
deleted file mode 100644
index da7a603119d3..000000000000
--- a/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/cmake/Version.cmake 2018-04-10 12:18:42.000000000 +0200
-+++ b/cmake/Version.cmake 2018-05-11 23:29:24.499906356 +0200
-@@ -23,7 +23,7 @@
- if (DEFINED ENV{SYNERGY_VERSION_PATCH})
- set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH})
- else()
-- set (SYNERGY_VERSION_PATCH 0)
-+ set (SYNERGY_VERSION_PATCH 1)
- message (WARNING "Synergy version wasn't set. Set to ${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}")
- endif()
- endif()
-@@ -36,29 +36,6 @@
- endif()
- endif()
-
--if (NOT DEFINED SYNERGY_REVISION)
-- if (DEFINED ENV{GIT_COMMIT})
-- string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION)
-- elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
-- execute_process (
-- COMMAND git rev-parse --short=8 HEAD
-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-- OUTPUT_VARIABLE SYNERGY_REVISION
-- OUTPUT_STRIP_TRAILING_WHITESPACE
-- )
-- endif()
--endif()
--
--if (DEFINED SYNERGY_REVISION)
-- string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH)
-- if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8")))
-- message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash")
-- endif()
-- unset (SYNERGY_REVISION_LENGTH)
--else()
-- set (SYNERGY_REVISION "0badc0de")
--endif()
--
- if (DEFINED ENV{BUILD_NUMBER})
- set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER})
- else()
-@@ -66,7 +43,6 @@
- endif()
-
- string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC)
--set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}")
-
- if (SYNERGY_VERSION_STAGE STREQUAL "snapshot")
- set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}")
-@@ -80,7 +56,6 @@
-
- add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}")
- add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}")
--add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}")
- add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}")
- add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER})
-
diff --git a/x11-misc/synergy/files/synergy-1.9.1-pthread.patch b/x11-misc/synergy/files/synergy-1.9.1-pthread.patch
deleted file mode 100644
index 46ae6e1588b8..000000000000
--- a/x11-misc/synergy/files/synergy-1.9.1-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,6 +141,8 @@
- check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD)
- if (HAVE_PTHREAD)
- list (APPEND libs pthread)
-+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
-+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
- else()
- message (FATAL_ERROR "Missing library: pthread")
- endif()
diff --git a/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch b/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch
deleted file mode 100644
index 7a706a084d0b..000000000000
--- a/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/gui/CMakeLists.txt 2018-05-11 23:30:26.425509147 +0200
-+++ b/src/gui/CMakeLists.txt 2018-05-11 23:31:53.237354182 +0200
-@@ -39,7 +39,7 @@
- target_link_libraries (synergy dns_sd)
- endif()
-
--qt5_use_modules (synergy Core Widgets Network)
-+target_link_libraries (synergy Qt5::Core Qt5::Widgets Qt5::Network)
- target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}")
- target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}")
-
---- a/src/gui/src/ActionDialog.cpp 2018-04-10 12:18:42.000000000 +0200
-+++ b/src/gui/src/ActionDialog.cpp 2018-05-11 23:33:50.814498692 +0200
-@@ -25,6 +25,7 @@
-
- #include <QtCore>
- #include <QtGui>
-+#include <QButtonGroup>
-
- ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) :
- QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
---- a/src/gui/src/ScreenSetupView.cpp 2018-04-10 12:18:42.000000000 +0200
-+++ b/src/gui/src/ScreenSetupView.cpp 2018-05-11 23:35:33.304496343 +0200
-@@ -22,6 +22,7 @@
-
- #include <QtCore>
- #include <QtGui>
-+#include <QHeaderView>
-
- ScreenSetupView::ScreenSetupView(QWidget* parent) :
- QTableView(parent)
diff --git a/x11-misc/synergy/files/synergy-1.9.1-test.patch b/x11-misc/synergy/files/synergy-1.9.1-test.patch
deleted file mode 100644
index d0c44e9dd7ff..000000000000
--- a/x11-misc/synergy/files/synergy-1.9.1-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index ab63a06..ec7a3e0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -22,3 +22,8 @@ add_subdirectory(cmd)
- if (SYNERGY_BUILD_LEGACY_GUI)
- add_subdirectory(gui)
- endif (SYNERGY_BUILD_LEGACY_GUI)
-+
-+option(BUILD_TESTS "Build tests" OFF)
-+if (BUILD_TESTS)
-+ add_subdirectory(test)
-+endif()
-diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
-index f39968a..bfc886c 100644
---- a/src/test/integtests/CMakeLists.txt
-+++ b/src/test/integtests/CMakeLists.txt
-@@ -68,4 +68,4 @@ endif()
-
- add_executable(integtests ${sources})
- target_link_libraries(integtests
-- arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS})
-+ arch base client common io ipc mt net platform server gtest gmock ${libs} ${OPENSSL_LIBS})
-diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
-index 54131eb..ef84dba 100644
---- a/src/test/unittests/CMakeLists.txt
-+++ b/src/test/unittests/CMakeLists.txt
-@@ -68,4 +68,4 @@ endif()
-
- add_executable(unittests ${sources})
- target_link_libraries(unittests
-- arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})
-+ arch base client server common io net platform server mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})
diff --git a/x11-misc/synergy/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild
deleted file mode 100644
index 09888a621493..000000000000
--- a/x11-misc/synergy/synergy-1.12.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils virtualx
-
-MY_P=synergy-core-${PV}-stable
-GTEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core/"
-SRC_URI="
- https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz
- -> ${MY_P}.tar.gz
- https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png
- test? (
- https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz
- -> googletest-${GTEST_COMMIT}.tar.gz
- )
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libressl gui test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- x11-libs/libICE:=
- x11-libs/libSM:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXi:=
- x11-libs/libXinerama:=
- x11-libs/libXrandr:=
- x11-libs/libXtst:=
- gui? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- net-dns/avahi[mdnsresponder-compat]
- )
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
-
-PATCHES=(
- "${FILESDIR}"/synergy-1.12.0-dnssd-dep.patch
-)
-
-src_prepare() {
- # broken on Xvfb
- rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
-
- if use test; then
- rmdir ext/googletest || die
- mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die
- else
- [[ ${PV} == 1.12.0 ]] || die "Remove this hack on bump"
- > ext/googletest/CMakeLists.txt || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSYNERGY_BUILD_LEGACY_GUI=$(usex gui)
- -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
- -DBUILD_TESTS=$(usex test)
- )
-
- cmake_src_configure
-}
-
-my_test() {
- "${BUILD_DIR}"/bin/unittests &&
- "${BUILD_DIR}"/bin/integtests
-}
-
-src_test() {
- virtx my_test
-}
-
-src_install() {
- dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool}
-
- if use gui; then
- newbin "${BUILD_DIR}"/bin/synergy qsynergy
- newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png
- make_desktop_entry qsynergy Synergy qsynergy 'Utility;'
- fi
-
- insinto /etc
- newins doc/synergy.conf.example synergy.conf
-
- newman doc/synergyc.man synergyc.1
- newman doc/synergys.man synergys.1
-
- einstalldocs
-}
-
-pkg_postinst() {
- use gui && xdg_icon_cache_update
-}
-
-pkg_postrm() {
- use gui && xdg_icon_cache_update
-}
diff --git a/x11-misc/synergy/synergy-1.13.0.ebuild b/x11-misc/synergy/synergy-1.13.0.ebuild
index 016540c6c84e..bc5d23654028 100644
--- a/x11-misc/synergy/synergy-1.13.0.ebuild
+++ b/x11-misc/synergy/synergy-1.13.0.ebuild
@@ -50,6 +50,10 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
"
+BDEPEND="
+ gui? (
+ dev-qt/linguist-tools:5
+ )"
DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
diff --git a/x11-misc/synergy/synergy-1.13.1.41.ebuild b/x11-misc/synergy/synergy-1.13.1.41.ebuild
index 62beeda69bf5..d1e999131fd7 100644
--- a/x11-misc/synergy/synergy-1.13.1.41.ebuild
+++ b/x11-misc/synergy/synergy-1.13.1.41.ebuild
@@ -52,6 +52,10 @@ DEPEND="
${RDEPEND}
x11-base/xorg-proto
"
+BDEPEND="
+ gui? (
+ dev-qt/linguist-tools:5
+ )"
DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
diff --git a/x11-misc/synergy/synergy-1.9.1-r1.ebuild b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
deleted file mode 100644
index 7cabbef64d61..000000000000
--- a/x11-misc/synergy/synergy-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop gnome2-utils virtualx
-
-DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
-HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core"
-SRC_URI="
- https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~jer/${PN}.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libressl qt5 test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${PN}-core-${PV}-stable
-
-COMMON_DEPEND="
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- net-misc/curl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXtst
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- net-dns/avahi[mdnsresponder-compat]
- )
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-RDEPEND="
- ${COMMON_DEPEND}
- qt5? ( !x11-misc/qsynergy )
-"
-
-DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
-
-PATCHES=(
- "${FILESDIR}"/${P}-pthread.patch
- "${FILESDIR}"/${P}-cmake-version.patch
- "${FILESDIR}"/${P}-qt-5.11.patch
- "${FILESDIR}"/${P}-test.patch
-)
-
-src_prepare() {
- # requires Internet, and relies on old site anyway
- rm src/test/integtests/arch/ArchInternetTests.cpp || die
- # broken on Xvfb
- rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- # otherwise unit tests segfault
- local -x CFLAGS="${CFLAGS} -O0"
- local -x CXXFLAGS="${CXXFLAGS} -O0"
-
- local mycmakeargs=(
- -DSYNERGY_BUILD_LEGACY_GUI=$(usex qt5)
- -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF
- -DBUILD_TESTS=$(usex test)
- )
-
- cmake-utils_src_configure
-}
-
-my_test() {
- "${BUILD_DIR}"/bin/unittests &&
- "${BUILD_DIR}"/bin/integtests
-}
-
-src_test() {
- virtx my_test
-}
-
-src_install() {
- dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool}
-
- if use qt5 ; then
- newbin "${BUILD_DIR}"/bin/${PN} qsynergy
- newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
- make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
- fi
-
- insinto /etc
- newins doc/synergy.conf.example synergy.conf
-
- newman doc/${PN}c.man ${PN}c.1
- newman doc/${PN}s.man ${PN}s.1
-
- einstalldocs
-}
-
-pkg_preinst() {
- use qt5 && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use qt5 && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use qt5 && gnome2_icon_cache_update
-}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 22cad3249473..90f39a10af22 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,10 +1,12 @@
AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337f46c53c318afeb79c01cdcabc2f55dae4d7f4d6e883b18814caac46d8c153a5328170f3af10c55 SHA512 d3940abb0c52957e8ec4ea15829151876384703ee5cff7a4d306d6de28f839ff76a9090a3af2106e7e8442104f3e16c57a8430b36d718490cd2637ecb99d9c8e
AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
+AUX vgl.initd-r4 865 BLAKE2B 40e417f0dce3f2cf65c4154b40fdc4b8a1ded87e96f5c7ed047eb5a8870c547aceaed12b9a0324e3eacfe03e46194da61af179cc6dc2a77a6fdcf30d8d92a874 SHA512 42f79d94fb6e69cab90e1630168d9daf3a8062bb85515c46551960c22d6ed38b6e5ef40e4db310c377adb8d7c3ef09840a81cdb25a15032a977e15253315b2e7
AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
EBUILD virtualgl-2.6.4-r1.ebuild 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
-EBUILD virtualgl-2.6.5.ebuild 2929 BLAKE2B f1ff2337fecf6667c8d034801a69588c3ebf3265957192211470513c81667087a834f8507763f7348e93729644170de473fc807492625d1be099a6a79d65b4f0 SHA512 3307ede0fb1fbd75108e3533afcc129d02356f34532d33ac2a53acc7750214064508b045f498f997c7be222a154f63669613848b53a70cf9d448242819d1db0f
-EBUILD virtualgl-9999.ebuild 2711 BLAKE2B 6e80ffef02dbb840712e2d8767a3de5acde047a119e3550ad341174d7206ebb811b86a2fade4af739a66363d681106811c6b78a55d8e01160d59ee85a58e6cbd SHA512 53dc4e4e1bd74c0866d165e8e76cc36717081408046ebb798cf31abfcca27d0b93048ebb9a66c513a5914a8f455127d89b667ad210696eb849380f85457bcc10
-MISC metadata.xml 870 BLAKE2B 535c3227a42afcefcfab99a41737afff1fbd0b35c8980ebcea6103b52465c43a61064a81e48c92349de90e15d150fdae0d772daa63c8d6597f0e336448920a68 SHA512 72837c96523aa69cfbdaa4c5e464a46c8e37170e58ec7e283df09849fbbe27502befc594913ab8b195f1f1f657b2957eda184a6c68220cc302244b737c969282
+EBUILD virtualgl-2.6.5-r1.ebuild 2929 BLAKE2B f1ff2337fecf6667c8d034801a69588c3ebf3265957192211470513c81667087a834f8507763f7348e93729644170de473fc807492625d1be099a6a79d65b4f0 SHA512 3307ede0fb1fbd75108e3533afcc129d02356f34532d33ac2a53acc7750214064508b045f498f997c7be222a154f63669613848b53a70cf9d448242819d1db0f
+EBUILD virtualgl-2.6.5-r3.ebuild 2931 BLAKE2B e9a769d4716232887209d0cbd8cc0bbd13aa04f31eb53157297abb576b96af40a1510abc3453d0f828b8be1871f2446eddca0d102f6e6fa8f59f46e462224046 SHA512 c7dfcad24fcb99ba54bd91d5857ae14fd723b0a40c7a796aba58e6227620db2272ade528b1aeed5695345b9f4a3ca4c549d225de533b6748c7048c1a9c8f5664
+EBUILD virtualgl-9999.ebuild 2711 BLAKE2B bce5041ac76d32f7ecb088b99cfd95968499454174218ece577f40924667dd2a8eaadd25be775cfcb47b6375c0a09e1c3b75b62853d085cadaaac49b2d697f85 SHA512 0fd74021f9badc5d61691012377266ba271ecdf4588483a8f3a10697b779d37c220cf19857be695c7c222b2bc98acec20ab7a1db782c8c70357a54ed0ea5a8d7
+MISC metadata.xml 872 BLAKE2B d89ac0de99c9146812da5dfa0e6cb12d403e67f66fb5957ebe4bbeaf39e8512398d4e3fae7db92d5c896e8e72175066692efba1819233e40f676985fee2f713d SHA512 10d56438137d9398233e0e0b1ecc0b39c484d8154d40203990f2965c62b0f6a701228878b4e3241f040dd26301b2348842718271191167c03d18d6c44173fece
diff --git a/x11-misc/virtualgl/files/vgl.initd-r4 b/x11-misc/virtualgl/files/vgl.initd-r4
new file mode 100644
index 000000000000..d40686266e0c
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r4
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+ need display-manager
+ after sshd
+}
+
+start() {
+ ebegin "Starting VirtualGL"
+ truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+ set_xauth
+
+ if [ -z "$XAUTHORITY" ]; then
+
+ einfo "Waiting for xauthority..."
+
+ # wait for xauth file
+ while true; do
+ set_xauth
+
+ if [ -e "$XAUTHORITY" ]; then
+ break;
+ fi
+
+ sleep 1
+ done
+ fi
+
+
+ xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f $XAUTHORITY list | awk '{print $3;exit}') && \
+ chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping VirtualGL"
+ [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+ rm /var/lib/VirtualGL/vgl_xauth_key
+ eend $?
+}
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index f00a92b3f612..2bbb956d2001 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>NP-Hardass@gentoo.org</email>
- <name>NP-Hardass</name>
+ <email>np-hardass@gentoo.org</email>
+ <name>Adam Feldman</name>
</maintainer>
<maintainer type="person">
<email>pacho@gentoo.org</email>
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
index f537ef884323..f537ef884323 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
diff --git a/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
new file mode 100644
index 000000000000..62e7240015fe
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
+ inherit git-r3
+else
+ MY_PN="VirtualGL"
+ MY_P="${MY_PN}-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="https://www.virtualgl.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+IUSE="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/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libXv[${MULTILIB_USEDEP}]
+ x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opencl[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ amd64? ( abi_x86_32? (
+ >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+ >=x11-libs/libX11-1.6.2[abi_x86_32]
+ >=x11-libs/libXext-1.3.2[abi_x86_32]
+ >=x11-libs/libXtst-1.2.3[abi_x86_32]
+ >=x11-libs/libXv-1.0.10[abi_x86_32]
+ x11-libs/xcb-util-keysyms[abi_x86_32]
+ >=virtual/glu-9.0-r1[abi_x86_32]
+ virtual/opencl[abi_x86_32]
+ >=virtual/opengl-7.0-r1[abi_x86_32]
+ ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # Use /var/lib, bug #428122
+ sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+ server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ # Completely breaks steam/wine for discrete graphics otherwise
+ # see https://github.com/VirtualGL/virtualgl/issues/16
+ append-ldflags "-Wl,--no-as-needed"
+
+ abi_configure() {
+ local mycmakeargs=(
+ -DVGL_USESSL="$(usex ssl)"
+ -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
+ -DTJPEG_INCLUDE_DIR=/usr/include
+ -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL
+ -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+ -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+ )
+ cmake_src_configure
+ }
+ multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ # Make config dir
+ dodir /var/lib/VirtualGL
+ fowners root:video /var/lib/VirtualGL
+ fperms 0750 /var/lib/VirtualGL
+ newinitd "${FILESDIR}/vgl.initd-r4" vgl
+ newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/vgl-helper.sh"
+ systemd_dounit "${FILESDIR}/vgl.service"
+
+ # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+ mv "${D}"/usr/bin/{,v}glxinfo || die
+
+ # Remove license files, bug 536284
+ rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+
+ # Directory is created if needed at runtime
+ rm -r "${D}"/var/lib || die
+}
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
index b1f2ed56343a..c464597e5bcc 100644
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -82,7 +82,7 @@ src_install() {
dodir /var/lib/VirtualGL
fowners root:video /var/lib/VirtualGL
fperms 0750 /var/lib/VirtualGL
- newinitd "${FILESDIR}/vgl.initd-r3" vgl
+ newinitd "${FILESDIR}/vgl.initd-r4" vgl
newconfd "${FILESDIR}/vgl.confd-r2" vgl
exeinto /usr/libexec
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 440904a55296..2c33344f67cf 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -5,6 +5,8 @@ AUX x11vnc-0.9.16-fno-common.patch 1079 BLAKE2B eb1cbe8e959eeea0940b44d3804406d2
AUX x11vnc-0.9.16-libressl.patch 4083 BLAKE2B 0b95dad69a0f7180edfe71da6df2c9e6025ba57ac984a04dc118e642b1ee2a6757c11d400a2e3641e71b367e4ea42d7557d48ba932d55ef839f122ea9170aab2 SHA512 041f57dc654bbf18c9fc741d42d9cc6f0646f619b2d3a473898b2e5d20609e7f475a7abfbd1e0fb9ed01017474aab0241ce04c37cec2e8acbd813f8ee678ee53
AUX x11vnc.conf.d 1435 BLAKE2B 8403d61a4941c56127e869d6ac90d4f85237af9af786f864d32afbedf3e736528b74c8c83fcf3491794b9e62db6ef2a354dccd61f368c8e9251f915e2bd683f8 SHA512 dedc94fab89a06ca6025b99c2c944cabe77640487c8fc761a6420e5be7062ee4c1c383f3846c17bed434ad4f3ec3b994badb493919acb99da3f61caa40c60246
AUX x11vnc.init.d 1728 BLAKE2B 45680af6aad530a9b36f29adc61c1f90ad272bd7201c30f29b3d6c5b980012ddb299c878ae1bb20734496c4f2b8b1e1c507cadee875305167e3f298993947a9e SHA512 8de7966b79b5acc83c8cebc3c2ef0819196f5a33eabad619991d04c7c059a68afbf44d0ece6b0db33cea1f525402a601b25db220733f0ff69c0fff48d3c50ac2
+AUX x11vnc.init.d-r1 1737 BLAKE2B ac457d4acf27e3a2e26b6315530d326efae4e5583770623362eed65e45aad5a596a13da5325de8ad4155a2d335d3a8a62a41a1bc01facfdefacd5d5e42005df0 SHA512 b39efb164beeda4cf62c530aae4a3127358cc7ccea888df09e48f6a3a53affad0d3f3fce9cfbcfb17e9de131ec945a51e2680d7410e14b169d0295aa4cf85e91
DIST x11vnc-0.9.16.tar.gz 1708009 BLAKE2B a8789f95ef421a78a83703748e1d80fd45539dff24f80493fd75e357bc22378213915853f9d114248c172cd83977880e1e4e8a3f8df0771017e9988d83b7307d SHA512 69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
EBUILD x11vnc-0.9.16-r4.ebuild 2049 BLAKE2B 70251f73469627e347c411f9de285bb2691448251deac7029f7e6fa4f682d19ed8c07c17a8b51531a83e4baaeb5a2f93a7f63ec9ff8f83037ff53ef481af1a23 SHA512 0a95a6d066e96fddc25a5024ffdf1ff886d8e936dbac5e3924f15b3aa5921a76d347b7e5f9ffe06ab01fb397b1ae637049d85758e9db4a5c6ae496d4daf8fba2
+EBUILD x11vnc-0.9.16-r5.ebuild 2058 BLAKE2B 70d3637cb05e0c40b6d21d7247eef2e7a183c87a05756cbd19441e7ce7a12144faba4f82139f5b048bceb395cce1eba114ea8bc1e8e3330497e14a1c8e0d8524 SHA512 c6e753a3a8396ca773ec4090ede4fc94925bd46106ed042082601be185df1a4acf251f010a014cc13ea20abd5bc4f7c1f8fc96a2c8231ba8c968b7a7ffb08ddd
MISC metadata.xml 952 BLAKE2B 4ac05ec6aa72acea1a2eb3b8f5b6d2ae885d5dc9c53eceb352f9fdd24ef19d3f269acc438421a2d3b13a0b9e1dba92e05562b5017aee5f8409f1db4b9d424d7e SHA512 4860713eb293d1aa29342953129b92525fb0ef5b6cd5462f1e5a425c6d28bc70a5cb421f2755643ecb42921e574b6eefb932cef80a420458f25ed12211da1c8e
diff --git a/x11-misc/x11vnc/files/x11vnc.init.d-r1 b/x11-misc/x11vnc/files/x11vnc.init.d-r1
new file mode 100644
index 000000000000..04c36ea361db
--- /dev/null
+++ b/x11-misc/x11vnc/files/x11vnc.init.d-r1
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="The x11vnc daemon init script"
+
+depend() {
+ need net
+ need display-manager
+}
+
+checkconfig() {
+
+ # Set Defaults
+ X11VNC_RFBAUTH=${X11VNC_RFBAUTH:-/etc/x11vnc.pass}
+ X11VNC_RFBPORT=${X11VNC_RFBPORT:-5900}
+ X11VNC_DISPLAY=${X11VNC_DISPLAY:-:0}
+ X11VNC_LOG=${X11VNC_LOG:-/var/log/x11vnc}
+
+ X11VNC_AUTH="/var/run/x11vnc-${X11VNC_DISPLAY}"
+
+ if [ -n "${X11VNC_AUTOPORT}" ]; then
+ X11VNC_PORT=""
+ fi
+
+ if [ ! -f "${X11VNC_RFBAUTH}" -o ! -s "${X11VNC_RFBAUTH}" ]; then
+ eerror "VNC Password not set, please set one by running: \`x11vnc -storepasswd ${X11VNC_RFBAUTH}\`"
+ return 1
+ fi
+ checkpath -q -f -m 0600 -o root:root "${X11VNC_RFBAUTH}"
+
+ # Attempt to find X-Auth file
+ if ! type xauth > /dev/null 2>&1 ||
+ ! xauth -f /root/.Xauthority extract - "${X11VNC_DISPLAY}" > "${X11VNC_AUTH}" 2>/dev/null ||
+ [ ! -s "${X11VNC_AUTH}" ]; then
+ # Let x11vnc guess at auth
+ X11VNC_AUTH_OPTS="--env FD_XDM=1 -auth guess"
+ else
+ # We found the proper auth
+ X11VNC_AUTH_OPTS="-auth ${X11VNC_AUTH}"
+ fi
+
+ if [ ! -f "${X11VNC_AUTH}" ]; then
+ eerror "Specified X-Authority file '${X11VNC_AUTH}' not found!"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start \
+ --exec /usr/bin/x11vnc -- \
+ ${X11VNC_AUTH_OPTS} \
+ -rfbauth ${X11VNC_RFBAUTH} \
+ ${X11VNC_RFBPORT:+-rfbport} ${X11VNC_RFBPORT} \
+ ${X11VNC_AUTOPORT:+-autoport} ${X11VNC_AUTOPORT} \
+ -display ${X11VNC_DISPLAY} \
+ -o ${X11VNC_LOG} \
+ -bg -forever \
+ ${X11VNC_OPTS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop /usr/bin/x11vnc
+ eend $?
+}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
new file mode 100644
index 000000000000..e8292188e985
--- /dev/null
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 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+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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=]
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXext
+ >=x11-libs/libXtst-1.1.0
+ ssl? (
+ !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
+ "${FILESDIR}"/${P}-libressl.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-CVE-2020-29074.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # --without-v4l because of missing video4linux 2.x support wrt #389079
+ 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() {
+ default
+ newinitd "${FILESDIR}/x11vnc.init.d-r1" x11vnc
+ newconfd "${FILESDIR}/x11vnc.conf.d" x11vnc
+}
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 9a900e34e282..4e542fe2b2c8 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -3,5 +3,5 @@ AUX xaos-3.5-build-fix-i686.patch 708 BLAKE2B 9c857438f7272a173b6047a3050e57311a
AUX xaos-3.6-buildsystem.patch 2460 BLAKE2B 7f8c5fe68e1f7f626236ffd687bb1e33ce1a064cf5555748fc7680b19b041db054a06616391a25e7fd9f37b0ae5a34bcb7773676d15d9222b4e416bc0fb704cf SHA512 79d1a738c709510dd36d4cbe17eb4376c212a81af2e08c45d292a182e9862f2f3e1f5075f488789f490d857f2b7eb76409d558caca93eb14914522f36f78d5cf
DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1
DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262
-EBUILD xaos-3.6.ebuild 1875 BLAKE2B 0c2ab9399c4203dae8f744f117580b3fc81831fcccdf2c2e06c441c6572a99f59474f7e7001aaf6bb1006c0b208cda75c4692c745a3033d05ef91bbd09e915b4 SHA512 b013a5a86b3af90cb1065fa4dac2aaf8658d2a23098337d51b8bb04bb341253d00a01f8f0954b04966e533bb2cc1aa75b170a0516cddf5b01f6dec858a85ad8b
+EBUILD xaos-3.6.ebuild 1880 BLAKE2B 7f1b025b5372d9125cccb463f936a9ae6468c4dbaf030e495dcfdc5b7148c3aa3dcbb9ff2fac220cb5e5cd1f6d187ae8e7b86ecf2bf7df6afa02319826dd31ea SHA512 ca11ce2a5be825ed36317798f157b5ebed5682063ad0e56cb1eca857eb542ba77baa522f6940cc317d88297ddc2201f29fc737a00c6d82f8489ceecd8e389ae8
MISC metadata.xml 766 BLAKE2B ca6be3fc4134359d4c6ea3eb8498b5235c87694bb76981747651c78b1fe00fa2d7d1c736910d3144101762fad9b26819df46af0270a4db5b0b39e623bef5eca5 SHA512 8e3ff6323fadbb15a6144c80bbbe33056072758dabb6e96e8b331f3327ea7e99b2a2c9b87b3532e70a1bd331b9d0e59be8b22c2fcad262eacf317c5b33647519
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index b882b13e3fe1..e5f86137a933 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools desktop
+inherit autotools desktop l10n
DESCRIPTION="Very fast real-time fractal zoomer"
HOMEPAGE="http://matek.hu/xaos/doku.php"