gentoo resync : 09.07.2022

7 files changed, 335 insertions, 26 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 6f62f4ef974c..b5babad1adb2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,11 +1,14 @@
 AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a
+AUX tigervnc-1.12.0-disable-server-and-pam.patch 1430 BLAKE2B 9b079911be8f70239df32432d8c4d9b9e88329585ef4fe5c4f847697d9cecf7fa9c7dd9fa6251bb02794e3bfcbfaf7c3f963875b519a07e824e72bbfeb7a61ec SHA512 f0546476060673bd65138c4c95f0fd2b72e64175c461c0bbe07dfc03a1c1d343b8d628fd8f9bfa1329bd7585d8aa18b8b6a9d4d519d4f3faaf284f3a914f98ca
 AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573ed572b20e9ead1e4ded7d830c739dc172a016784902d447dbe8aa78bb5a2e69c4ef6a4357f446af53f7bc569d56108dac SHA512 533ff06e9619cd63ee83dcb3e6a5a35f02f092b32b194f89e2c06f2f17aaf59a3c2adab27d3e87c4a0773f3f82cfec82492d6b031b3a9050d5f0ad4fcf0a0da0
 AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
 AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
 AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
+AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
-EBUILD tigervnc-1.12.0-r6.ebuild 4869 BLAKE2B fcc19219cd2e0ee342688d559c8617ff5389175fea7207e644a4340edc0dcf513352a8d8bcace7337a826ae1903d16a7d5cbb647ef15340c95cf778beeee0036 SHA512 6e298bf5dd7753e9a7273a6fd9521d101db8dfe052d2c1c8c6812ce0be57e31f2eeea94cc11ad19d620e9deceab14e3c429de81127163232c8404ad7af9b7baa
-EBUILD tigervnc-9999.ebuild 4772 BLAKE2B 3178336b98683506997a61e608e808176ff1cda1146935f07036a8616a2bf9117a63cafb94155cb2389a79ce7a48a9139ffb18bc683d6aabe893d72ea6aa3b46 SHA512 0e7881455d578c887b5455c78786d0af3337ffdd149aeb837102a4ee7473ca127e0e6f92a676f6bdc2808f84102155ee3fe437c7a614763ea7cf8df15ccf830c
-MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845
+EBUILD tigervnc-1.12.0-r6.ebuild 4882 BLAKE2B fd5d58d7dd02d4b423dccf057d9e36e4292a441a9251b417305fac0a7d17d54fbac9d07a3ae0bc28ca889e59ad8cd8ebd31840da9075f4382744f444c9e1daa6 SHA512 c277bc658ae9c3449a81981c7265bab9926a36a4d9620de7da808800a7cfa840c97af6b8fe2370db38f8778b17f773fd09e9f4759b46bf95a7a01b746ddda285
+EBUILD tigervnc-1.12.0-r7.ebuild 4720 BLAKE2B 9a628baca4950ae89df4d82f83698b4d0bc40ae89bc4f62c78caf9ecde0f178c5e32e2b214e8b23ec5345f80665b0af38733546702d347345f0df5421d5eb962 SHA512 b9f1800320cd9c3a8cb36361b519518733cc30d8fdf6e9d1fe2052760d154c8168e589b4eb54382135ba303b1ada2aa1e0f46e88052da6ed42896e6fc7148632
+EBUILD tigervnc-9999.ebuild 4618 BLAKE2B 972a802c205587855cfe3e70a421ab83984a3175dc75cfb71dc9d3127508fe5261eb4ce284c7593ff8056fd5ab9574e9a60a5d969b9ffcb64ce15b04d11f52f1 SHA512 6db6240797c92bcd49d82c8217120406b90de1dc7fd3aa8a7f3bc94014fb32d75f1796e400873d3d58fdd33b8b6b004158ba1769bbca6edf052daf1b5996b8ef
+MISC metadata.xml 651 BLAKE2B a2729d5a950c4bcc38bdf9b80da2563b1f140c6f3311f8a8b817199d3efae7a4fe1f2b6ac8bba87d3b858e6c5d98176ab6873ae0273ea1d416dafcb7e9c7703b SHA512 e0a9a4f66f75df32532c1bb055db8e8ae9fe2aff5503a3f1806531806c596f812403a92d6a9c717872321ddac2043e41da7376048bf89bca52d8746acd5f1b15
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
new file mode 100644
index 000000000000..5ae07007d467
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+   add_subdirectory(java)
+ endif()
+ 
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+   # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+ 
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   check_include_files(security/pam_appl.h HAVE_PAM_H)
+   set(CMAKE_REQUIRED_LIBRARIES -lpam)
+   check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+   add_subdirectory(media)
+ endif()
+ 
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
++++ b/common/rfb/CMakeLists.txt
+@@ -75,7 +75,7 @@
+ 
+ set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
+ 
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
+     UnixPasswordValidator.h pam.c pam.h)
+   set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
+--- a/unix/CMakeLists.txt
++++ b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++	add_subdirectory(vncconfig)
++	add_subdirectory(vncpasswd)
++	add_subdirectory(vncserver)
++	add_subdirectory(x0vncserver)
++endif()
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
new file mode 100644
index 000000000000..e61f099d397a
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+   add_subdirectory(java)
+ endif()
+ 
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+   # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+ 
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   check_include_files(security/pam_appl.h HAVE_PAM_H)
+   set(CMAKE_REQUIRED_LIBRARIES -lpam)
+   check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+   add_subdirectory(media)
+ endif()
+ 
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
++++ b/common/rfb/CMakeLists.txt
+@@ -88,7 +88,7 @@
+   target_sources(rfb PRIVATE WinPasswdValidator.cxx)
+ endif(WIN32)
+ 
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   target_sources(rfb PRIVATE UnixPasswordValidator.cxx pam.c)
+   target_link_libraries(rfb ${PAM_LIBS})
+ endif()
+--- a/unix/CMakeLists.txt
++++ b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++	add_subdirectory(vncconfig)
++	add_subdirectory(vncpasswd)
++	add_subdirectory(vncserver)
++	add_subdirectory(x0vncserver)
++endif()
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 9717615f517c..68efa8f862da 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -12,7 +12,6 @@
 	<use>
 		<flag name="drm">Build with DRM support</flag>
 		<flag name="server">Build TigerVNC server</flag>
-		<flag name="xorgmodule">Build the Xorg module</flag>
 		<flag name="dri3">Build with DRI3 support</flag>
 	</use>
 	<upstream>
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 5bbb399656a0..f7f753594c8d 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
@@ -182,7 +182,7 @@ src_install() {
 		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
 
 		# install vncserver to /usr/bin too, see bug #836620
-		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
 	else
 		local f
 		for f in x0vncserver vncconfig; do
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
new file mode 100644
index 000000000000..93ca0f1495e4
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? (
+		ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
+		https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	opengl? ( server )
+"
+
+CDEPEND="
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/fltk:1
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
+	)
+	"
+
+RDEPEND="${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)"
+
+DEPEND="${CDEPEND}
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libxkbfile
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.0-disable-server-and-pam.patch
+)
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+		eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+		eapply "${DISTDIR}"/${P}-xserver-21.patch
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 903570b2dd06..d8ae0f70e5f1 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
@@ -16,7 +16,11 @@ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	opengl? ( server )
+"
 
 CDEPEND="
 	media-libs/libjpeg-turbo:=
@@ -48,7 +52,6 @@ CDEPEND="
 		x11-apps/xsetroot
 		x11-misc/xkeyboard-config
 		opengl? ( media-libs/libglvnd[X] )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
 	)
 	"
 
@@ -79,11 +82,12 @@ PATCHES=(
 	# Restore Java viewer
 	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
 	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
 
 src_unpack() {
 	git-r3_src_unpack
-	unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
 }
 
 src_prepare() {
@@ -99,8 +103,9 @@ src_prepare() {
 		eautoreconf
 		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
 		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
 	fi
-	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
 }
 
 src_configure() {
@@ -112,6 +117,7 @@ src_configure() {
 		-DENABLE_GNUTLS=$(usex gnutls)
 		-DENABLE_NLS=$(usex nls)
 		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
 	)
 
 	cmake_src_configure
@@ -168,11 +174,7 @@ src_install() {
 
 	if use server; then
 		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 
 		newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
 		newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
@@ -184,16 +186,7 @@ src_install() {
 		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
 
 		# install vncserver to /usr/bin too, see bug #836620
-		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
-	else
-		local f
-		for f in x0vncserver vncconfig; do
-			rm "${ED}"/usr/bin/${f} || die
-			rm "${ED}"/usr/share/man/man1/${f}.1 || die
-		done
-		rm -r "${ED}"/usr/{sbin,libexec} || die
-		rm -r "${ED}"/usr/share/man/man8 || die
-		rm -r "${ED}"/etc || die
+		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
 	fi
 }
 
@@ -202,6 +195,7 @@ pkg_postinst() {
 
 	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
 	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
 		optfeature_header "Install any additional display manager package:" && \
 		optfeature "proper session support" ${OPTIONAL_DM}
 }