gentoo resync : 12.01.2019

19 files changed, 670 insertions, 12 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index f93127e6de7e..ef38ec2c4302 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 3bafac9f4264..a2497d869fed 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,3 +1,4 @@
 DIST nitrogen-1.6.1.tar.gz 314332 BLAKE2B 4e2ce39a770434e35250cc2ff2bff792f3943eef489a0dc9b897b47fb98c3791cf633974ded2481b6e29ceb00f26964115254cc047041e77954563e82c7cd44b SHA512 125bb62162da95c3aab8c146f93113162c171512ffd3e8e6011fff22f1a1b841d1ffc9b4df4fd1b0b62a3731c68cd30c8448dbc836e9861216f50068d8b08c9c
+EBUILD nitrogen-1.6.1-r1.ebuild 990 BLAKE2B 9112f03b3711858c11d82b5ef9b7a3affdc87c0bedcfcbc0bc00bdbc3660c419dbfb7e1fd8e748fe0ec54e3fac9b7f59280a54b6d1deddb18df5e2eefd457859 SHA512 a7429f2f9678801dd8af97761da0d248fadb39f71959db026bc834f5c58f510df6d8e3364d2fde5c146b09610a2a5afa7a49e61404be31a7339dadb5c083b77a
 EBUILD nitrogen-1.6.1.ebuild 930 BLAKE2B 79555c78a52cb219eb57879ea93c6bd42bf6ac3aa73c7b91e1c8170d0d7245bfbcf469ea0a482f0bf855a392a9378258800109d669d123a60e4f9add088b2e04 SHA512 8c27a5ff194a32869eff972bf3754add2f0b65d2b3b3c1aa07d960f0e55f1c6a1ca7207e03b574b3640b10605f60ee4dbce2980417d6f8446b64d270d31974dc
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..a43c24a1d2b3
--- /dev/null
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic gnome2-utils xdg-utils
+
+DESCRIPTION="A background browser and setter for X"
+HOMEPAGE="https://github.com/l3ib/nitrogen"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls xinerama"
+
+RDEPEND="
+	>=dev-cpp/gtkmm-2.10:2.4
+	>=gnome-base/librsvg-2.20:2
+	>=x11-libs/gtk+-2.10:2
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 0c62356ef2d8..3d09c5113e4a 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,5 +1,8 @@
 AUX rofi-0.15.12-Werror.patch 437 BLAKE2B 6f230755bb2bcf5c91c354d4d2afec1c9e78a39eb80a871f8c0e21268302dc7baf5bfa13c9d1fe0c832ce008649764896c9ddab6dff1cd66c2c6d933e08e227a SHA512 b26d190bdaccca3cf761599a6e3f938a8f9106c9ee395c5f0bf3e58f5c151674621e66ad61891ec4e764424e42f315caa352761923d5c3b45ca326850e369ad9
 AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9374fe412a97ff6b82b545ec4f050e087b8982b4e16ebf9553c71e5b6c145e8a3b8b469b1b107def04f443c01c57efe9e947 SHA512 75431eac4c6eac56716a6e2ec0ca4f5fd88aa38761b758b58c5f8c3f3fd6eb4a111af9c74b2d7c14fc3e66cbc7f361b2b3bc8658cfb31fb827e01cf19a58df67
 DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
+DIST rofi-1.5.2.tar.xz 377732 BLAKE2B 560c5a4d30d143cbb5ca9030086d614a8f56a5e17b75c1b3f3a2e57bbd16de304b733bc4fd6093e716c993051e238811e9e65ffbf165d2ae4723f0bde1b15b42 SHA512 8fbbcaa040148d204878380f7cb96fa31228f72b68a97a5bcf8d8cd69740f6b185f5e5d2bc2e1d35e267a84b21576eb356c33be827fd1b767460665493360c16
 EBUILD rofi-1.5.1.ebuild 1148 BLAKE2B b7c70e7170a4388c02744a063cfce35bc71298e9ec8afc6943e70f556402c9356f75243640ad8a1744a4c6354e693bf7138f97bf532b72a5feca75f754254c78 SHA512 018e51cba23418e771ac351709c7cc9d636e5f2f97afd7567dd5f8829e27fb0e77b37af7901261cf5856e13a6266d7c6b1f898a2be9a100ec982bc55d11ce556
+EBUILD rofi-1.5.2.ebuild 1032 BLAKE2B 5b73a903902e3d3cb173a04a1c4b58bfbca8e0e071c66d9102114595cb434d9e4cc6aeae1997ffb5010b91632572983e7e6a0542d1c98c91534512c194875e75 SHA512 61ef9e26fe8568bf260b9a25b2e68f3607f1402ffc13caadfe861501ba016cd55ece71e914dc192d5e9e036210034954e4a22651cbfe916acef0db4411318882
+EBUILD rofi-99999.ebuild 991 BLAKE2B cdf6f969db35ce32aea26f08a3c33f1499550dc694bdc5da1f19bbc5f6ced81d4c97fa7b29cac1f0f11b356f8b31ceddac80ec1ce9ffa141cb4d9d1032815dca SHA512 b2e8fdfa76f7c42b44246861b15c10249f8b15795f3ad5f11a8bb8396fbf439751ee9103f462ff2c1107773106f18993e1e167c038b17d8f19893ba4361d426b
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.2.ebuild b/x11-misc/rofi/rofi-1.5.2.ebuild
new file mode 100644
index 000000000000..ffb4b7ff5d39
--- /dev/null
+++ b/x11-misc/rofi/rofi-1.5.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test windowmode"
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	x11-libs/cairo[xcb]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
new file mode 100644
index 000000000000..8533b2dbdb9c
--- /dev/null
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 toolchain-funcs
+
+DESCRIPTION="A window switcher, run dialog and dmenu replacement"
+HOMEPAGE="https://github.com/DaveDavenport/rofi/"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test windowmode"
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/librsvg:2
+	media-libs/freetype
+	x11-libs/cairo[xcb]
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libxcb
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-xrm
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	test? ( >=dev-libs/check-0.11 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+	"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_enable test check) \
+		$(use_enable windowmode)
+}
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 1258a30266b9..1887c71b3305 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -6,6 +6,6 @@ AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44ed
 DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe
 DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
-EBUILD synergy-1.9.1.ebuild 2133 BLAKE2B acccde0866c6a542c5169e2e2e8868960ab31e1b6330397fabbf51be14d39ed08a612bad8ab058f61d238500acbd3523e7458d3c0448f9ec567aee86fa6bf47b SHA512 59f325779128796cd9b51b85a254ebf72ab6344631501d07cc2f1ad88b2744ca208d40ce7b770c42317e17d9202f782ecea3ac8c5de695b4b6d3288afcf144bd
-EBUILD synergy-2.0.0.ebuild 1441 BLAKE2B 5afebfa5d2fd77f30c81d7b219db60c4b51707ca365b663d5a60fa363070697f9462dfd466798eab585ca9125df74ea49baa6531776a2f73d7bd088d8ed7c479 SHA512 da82c2b5b2f21b4d94be8c8ed57309a956636eef45722c97adee6e31e8d3b2c8999d0c3dfbd641bdd3993bfe7b1314f7f7be3b4a6cacb47d0286a652aff9310a
+EBUILD synergy-1.9.1.ebuild 2132 BLAKE2B 7f927c9685e55fe8f4c6bb86a408bae210798a1287c92c74923d2c8102dc3cba2dcefba103674ffb325cff77405dcc14cfd1db7a11e359f7a79028e6e6e8f34f SHA512 4b18a9c63af2318cfa519f908553b6e5e16e2a74c1f399e91194b4b47c0f34d306ae1ee0bfa05c7c0788e7f6e4133f9d5538fada98a4e41f21e8cce8968c1ccb
+EBUILD synergy-2.0.0.ebuild 1440 BLAKE2B cc1834ef9b4d29f9d7af6c3905628cbe9279c28462131a4538f1420347c5309e11dfa10b32a810d8cd8c8b110dfe040cc75415036b93bf57e22db21460634043 SHA512 4812a614433ece4c96afcda75360dc6f2b96554c01b21242f0e8ed5393d87fe7d8b85ba0d0b94fc4536f7b3a92a891bdf89ab96f088aebf22c0ac9e9ba2723cc
 MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7
diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild
index 0484cd37832e..63e9799f3bab 100644
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1.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
@@ -21,8 +21,8 @@ RESTRICT="test"
 S=${WORKDIR}/${PN}-core-${PV}-stable
 
 COMMON_DEPEND="
-	!libressl? ( dev-libs/openssl:* )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
 	net-misc/curl
 	x11-libs/libICE
 	x11-libs/libSM
diff --git a/x11-misc/synergy/synergy-2.0.0.ebuild b/x11-misc/synergy/synergy-2.0.0.ebuild
index c6741a4ca9d8..24579a8395f3 100644
--- a/x11-misc/synergy/synergy-2.0.0.ebuild
+++ b/x11-misc/synergy/synergy-2.0.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
@@ -27,8 +27,8 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXtst
-	!libressl? ( dev-libs/openssl:* )
-	libressl? ( dev-libs/libressl )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
 "
 DEPEND="
 	${COMMON_DEPEND}
diff --git a/x11-misc/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
new file mode 100644
index 000000000000..9c78cde9292a
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -0,0 +1,3 @@
+DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
+EBUILD unclutter-xfixes-1.5.ebuild 597 BLAKE2B 97c7064e69f13ca08d9d2aa1e968f42351ab659b4811aa1d32fde046cb673d0f91176842f6880d849a49d8476a78fd293be5f06fed968cca4c46a75cc1c7be3d SHA512 af7d89ce83b1f167d2a16322019d7e9739d2af8e945bb17230cd3b9a2e89fe1dc4b8cfbf8cf5df5e15e1a244e26b4f36d7764252f07e6ba80f05eaeaed21898f
+MISC metadata.xml 337 BLAKE2B 6d8b204b2317f4e6f7193d5d9403770e88ea31d6411e6f5b49fcf9a268a97537a03fe210850fb0bc6d63754f54811ac0a8f5f7f4abefda786dc661900b9e8d63 SHA512 94716543bc856a197bcdf2d7c6e14330c2ff68f18964e246c4a427d75238ff172a9b9073714a4fcb8853a438379c6d7e6892bac769f727a565315a18ffad2456
diff --git a/x11-misc/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml
new file mode 100644
index 000000000000..c140615696b0
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Airblader/unclutter-xfixes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild
new file mode 100644
index 000000000000..e965f5700ced
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A rewrite of unclutter using the x11-xfixes extension"
+HOMEPAGE="https://github.com/Airblader/unclutter-xfixes"
+SRC_URI="https://github.com/Airblader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libev
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	!x11-misc/unclutter
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index e4f49c3cc31a..cd182577921b 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,6 +2,11 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
+AUX virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch 5047 BLAKE2B 75dadf6d80456a702a3591b04b771410768e65c009da576502ada0fd192f480b20c6e0b12e470950be3306df7944f3b6bd890d0f4f97b778052eda63309cc0ea SHA512 a7d7dfc54f1fb00c00e8ae3011c7a28b4029f20049b9d792e2e8833fba79eb64f57c6ca6778d6d8bf4f383a2b08013e0d3b3db869ed8c08da549c89f095c4d3d
 DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
+DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
+EBUILD virtualgl-2.5.2-r1.ebuild 2616 BLAKE2B 36f0a927e0663913194c94c42d8e0f88f6cbae7bafe46dd5f7aa304377904c5b289743f62acb52660a36cce054885c552e6625c696b8f09c99bcab0dbc942380 SHA512 1dab9b93693e26a3cf3823237a377a72b177ef0ab9c038570d7bfb5ae2e7352f23d5e0cb0972b751f2457607839498022586adcec2ef98fece098fd5336dacd2
 EBUILD virtualgl-2.5.2.ebuild 2507 BLAKE2B 70374ee9d5ac16a917e3755d3fa2e6228a045e502d57d7060f2a63a7e457524422e588a693870a3ea3da15462925e1a4f761a8a7de868090436afbaccd9b9c17 SHA512 c30fa84d7876b8389a81d52f4f6981419ef3630acbd54ffe8263b5c9beec71c59e14a270a6138e7be10de668b2aaf9c6054e70eb57ac22d9f8b86de905c37f81
+EBUILD virtualgl-2.6.1.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
+EBUILD virtualgl-9999.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
new file mode 100644
index 000000000000..d5d923f89d1b
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
@@ -0,0 +1,168 @@
+Patch modified to apply to VirtualGL 2.5.2, before
+1b82bceb3723b24ea5dc32edffbe019a8a37ab39 reformatted whitespace
+
+
+From a974c22141d0ded9ff60a0b903f81e6b484d6ba4 Mon Sep 17 00:00:00 2001
+From: DRC <information@virtualgl.org>
+Date: Mon, 16 Apr 2018 15:06:07 -0500
+Subject: [PATCH] OpenSSL improvements
+
+- Fix build issues with OpenSSL 1.1 (OpenSSL 1.1 and later no longer
+  provides CRYPTO_set_locking_callback(), since locking is now performed
+  internally.)
+- Detect whether the platform has /dev/urandom at compile time, rather
+  than assuming that all Sun and SGI machines don't have it (Solaris 10
+  and later supports /dev/urandom.)
+---
+ ChangeLog.md        |  2 ++
+ include/Socket.h    |  8 ++++++--
+ util/CMakeLists.txt |  5 +++++
+ util/Socket.cpp     | 25 ++++++++++++++++---------
+ 4 files changed, 29 insertions(+), 11 deletions(-)
+
+diff --git a/ChangeLog.md b/ChangeLog.md
+index 3632c1d8..5c9bff84 100644
+--- a/ChangeLog.md
++++ b/ChangeLog.md
+@@ -52,6 +52,8 @@ a subsequent segfault when VTK tried to call `glBlendFuncSeparate()`.
+ VirtualGL's implementation of `glXGetVisualFromFBConfig()` now returns NULL
+ unless the FB config has a corresponding visual on the 3D X server.
+ 
++6. VirtualGL can now be built and run with OpenSSL 1.1.
++
+ 
+ 2.5.2
+ =====
+diff --git a/include/Socket.h b/include/Socket.h
+index dfe45e3a..f7409956 100644
+--- a/include/Socket.h
++++ b/include/Socket.h
+@@ -1,6 +1,6 @@
+ /* Copyright (C)2004 Landmark Graphics Corporation
+  * Copyright (C)2005 Sun Microsystems, Inc.
+- * Copyright (C)2014, 2016 D. R. Commander
++ * Copyright (C)2014, 2016, 2018 D. R. Commander
+  *
+  * This library is free software and may be redistributed and/or modified under
+  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -23,7 +23,7 @@
+ #endif
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+-#if defined(sun) || defined(sgi)
++#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
+ #include <openssl/rand.h>
+ #endif
+ #endif
+@@ -161,15 +161,19 @@ namespace vglutil
+ 
+ 			#ifdef USESSL
+ 
++			#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 			static void lockingCallback(int mode, int type, const char *file,
+ 				int line)
+ 			{
+ 				if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
+ 				else cryptoLock[type].unlock();
+ 			}
++			#endif
+ 
+ 			static bool sslInit;
++			#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 			static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
++			#endif
+ 			bool doSSL;  SSL_CTX *sslctx;  SSL *ssl;
+ 
+ 			#endif
+diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
+index 65ef59e7..ed1dfb39 100644
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -13,6 +13,11 @@ target_link_libraries(bmptest vglutil)
+ add_executable(pftest pftest.c)
+ target_link_libraries(pftest vglutil)
+ 
++if(EXISTS /dev/urandom)
++	message(STATUS "Using /dev/urandom for random number generation")
++	add_definitions(-DHAVE_DEVURANDOM)
++endif()
++
+ add_library(vglsocket STATIC Socket.cpp)
+ target_link_libraries(vglsocket vglutil)
+ if(WIN32)
+diff --git a/util/Socket.cpp b/util/Socket.cpp
+index 0d230841..b41c25e9 100644
+--- a/util/Socket.cpp
++++ b/util/Socket.cpp
+@@ -1,6 +1,6 @@
+ /* Copyright (C)2004 Landmark Graphics Corporation
+  * Copyright (C)2005 Sun Microsystems, Inc.
+- * Copyright (C)2014, 2016 D. R. Commander
++ * Copyright (C)2014, 2016, 2018 D. R. Commander
+  *
+  * This library is free software and may be redistributed and/or modified under
+  * the terms of the wxWindows Library License, Version 3.1 or (at your option)
+@@ -43,32 +43,37 @@ typedef socklen_t SOCKLEN_T;
+ 
+ #ifdef USESSL
+ bool Socket::sslInit=false;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS];
+ #endif
++#endif
+ CriticalSection Socket::mutex;
+ int Socket::instanceCount=0;
+ 
+ 
+ #ifdef USESSL
+ 
+-static void progressCallback(int p, int n, void *arg)
+-{
+-}
+-
+-
+ static EVP_PKEY *newPrivateKey(int bits)
+ {
++	BIGNUM *bn = NULL;
++	RSA *rsa = NULL;
+ 	EVP_PKEY *pk=NULL;
+ 
+ 	try
+ 	{
++		if(!(bn = BN_new())) _throwssl();
++		if(!BN_set_word(bn, RSA_F4)) _throwssl();
++		if(!(rsa = RSA_new())) _throwssl();
++		if(!RSA_generate_key_ex(rsa, bits, bn, NULL)) _throwssl();
+ 		if(!(pk=EVP_PKEY_new())) _throwssl();
+-		if(!EVP_PKEY_assign_RSA(pk, RSA_generate_key(bits, 0x10001,
+-			progressCallback, NULL))) _throwssl();
++		if(!EVP_PKEY_assign_RSA(pk, rsa)) _throwssl();
++		BN_free(bn);
+ 		return pk;
+ 	}
+ 	catch (...)
+ 	{
++		if(bn) BN_free(bn);
++		if(rsa) RSA_free(rsa);
+ 		if(pk) EVP_PKEY_free(pk);
+ 		throw;
+ 	}
+@@ -147,7 +152,7 @@ Socket::Socket(bool doSSL_)
+ 	#ifdef USESSL
+ 	if(!sslInit && doSSL)
+ 	{
+-		#if defined(sun) || defined(sgi)
++		#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
+ 		char buf[128];  int i;
+ 		srandom(getpid());
+ 		for(i = 0; i < 128; i++)
+@@ -158,7 +163,9 @@ Socket::Socket(bool doSSL_)
+ 		SSL_load_error_strings();
+ 		ERR_load_crypto_strings();
+ 		CRYPTO_set_id_callback(Thread::threadID);
++		#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		CRYPTO_set_locking_callback(lockingCallback);
++		#endif
+ 		SSL_library_init();
+ 		sslInit = true;
+ 		char *env = NULL;
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..aa35612ba1ba
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="https://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}"
+PATCHES=(
+	"${FILESDIR}/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch"
+)
+
+src_prepare() {
+	# Use /var/lib, bug #428122
+	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+		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/virtualgl/virtualgl-2.6.1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
new file mode 100644
index 000000000000..05ef6a703773
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib 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 ~arm64 ~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/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/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild
new file mode 100644
index 000000000000..05ef6a703773
--- /dev/null
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib flag-o-matic multilib 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 ~arm64 ~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/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/xpad/Manifest b/x11-misc/xpad/Manifest
index 3f97b7883b36..dc8cfba68a52 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,7 +1,7 @@
 DIST xpad-4.2.tar.bz2 244275 BLAKE2B e7552d4788c8182f696010faa1600c783999bd8b8d87e421f85ec9cc8e36a89b112e4f30d0d2205ba1f12915dc88d2aea98890aef8ab9ac0a6290b7d14837597 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7
-DIST xpad-5.2.0.tar.bz2 157906 BLAKE2B 9913809522573d12315744d6d0d156ef941be4c6db6d37f32807ce812a17c6c28a887aa110f277dc970b1ae86a3345511b242acd15d0ed245f49895c4bc89c62 SHA512 f3d0dc2d654613eec6316beca66c2250c4bb4060f144884c5280510f8e6d45799e13488a4d3c827135db697c1214fd8c7e997acfc8741b06ef0fb4cea1434f93
 DIST xpad-5.3.0.tar.bz2 158165 BLAKE2B d020a36b11d7e79af4375a89276d4763c5362b5bea5a1076fd0f6e6a726c10c78364f3ac05f948049fde956864f84d27c1b93606d5d473bdcd15f2a31527358d SHA512 a38f152192741c9c9d0742d1999ffa49e18a3e8652919ba6963101b776a51784b04beb90449abaf54ef35f964c3fbdc5b7ad0fe79cf795f39641776ef381e83d
+DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f
 EBUILD xpad-4.2.ebuild 574 BLAKE2B 16154fba76fb1d4db26feadc5cbaa0b1902e6bee8ee7d0cb23280bf574fdab4014905f89e70fa8c7d92df9485473905f23a82da79332f889be2382b366a2f3af SHA512 3c22e6a96effe2daa82ef879f9cbafd5ea1c37375e4c20b96f8ed333a980c53c9b568012f4afc4d69929ffba1001ce2a54aaaaf89c145266afb039134a1d126c
-EBUILD xpad-5.2.0.ebuild 735 BLAKE2B 2f90ea91117fe65a7033eca864e2ccfceba9f70d5848dbcd3f84b74de6119292a1819f7e6abed452d84ea64e2b77c078338dbeb8f675382a388cb56d7866e5dc SHA512 fee743fc98eeccbab4b00e063653ce04ac8371b4cf52dc99fc88513c90b52a3962ee20882772663249bf319f557f0159c713501c786561750f961171eddcf315
 EBUILD xpad-5.3.0.ebuild 735 BLAKE2B 795a03edb0efd9057d62fe2ce6fb9ea6a6c63fb48a1b856b785f8fed3e147b5ca87d503a15d9432125fa6073d5ff575a767959b49c69e20d6d530a1bbb661e2a SHA512 dc9093f8933db19bf9fba9375a5964cd0967e15b485d9634306b512c1856fbf21b7076a3a3c410eea21e0a7e5814dbda9109f273007481d4e777711f3ab725fa
+EBUILD xpad-5.4.0.ebuild 735 BLAKE2B 5a35bcda572709ffa72e770bc15f22ee4ee9dc82f9056b425f0d79c398a7dff3f3468630ebad7951d503c969e18a887b3ce90b93d745f5ebe5a28ddeced51603 SHA512 ac7aa607bca3cac63643ec4abe8c4c8422e4b59907f616032b8da68b3aaa9d19fc5461490d15791360855d550399c7b02c1c5ea8b017b5392471b482b7e4f7a2
 MISC metadata.xml 424 BLAKE2B fa08ddf7fe7b630108f7f6c67abb3bb80ee3530d24f20f92bf1d0232a445eaea1878d96731b076d29599ea329fd405e0afa56c284a98b76c60eaa9608f4e3cf5 SHA512 b9eab4ffef3b831a8c2fdaac0ffa5d4d32b7083d54746130c4cd0e38556238ae40574d9f759f411ba070ad967675944c090214ee66b9c300b9a459cca6927235
diff --git a/x11-misc/xpad/xpad-5.2.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
index 41d1ce652648..d71f4db47e6c 100644
--- a/x11-misc/xpad/xpad-5.2.0.ebuild
+++ b/x11-misc/xpad/xpad-5.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools
 
 DESCRIPTION="a sticky note application for jotting down things to remember"