tigervnc-9999 for xorg-server-1.20

4 files changed, 68 insertions, 63 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 1379c41..7eb59a7 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,2 @@
-DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
-DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
-DIST xorg-server-1.19.1.tar.bz2 6041792 SHA256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7 WHIRLPOOL 9fab4118e866e11a7742ba63d7f681490d43718a329416fb742e268fdf56f348bc9f1f2b5229fbaac98ce78f41fc1e9e5aa7587ee120fcccaba752ff4bac1555
+DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
+DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd
index f1d3a40..06a1542 100644
--- a/net-misc/tigervnc/files/tigervnc.initd
+++ b/net-misc/tigervnc/files/tigervnc.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 8df2e3d..4dd3693 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer needed -->
+    <maintainer type="person">
+        <email>otakuto.gentoo@gmail.com</email>
+        <name>Takuto Yoshida</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
   <use>
-    <flag name="drm">build with DRM support</flag>
+    <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>
     <remote-id type="github">TigerVNC/tigervnc</remote-id>
-    <remote-id type="sourceforge">tigervnc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 50b72c4..7d6b4b6 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -1,40 +1,40 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit git-r3 unpacker autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd git-r3 unpacker
 
-XSERVER_VERSION="1.19.1"
+XSERVER_VERSION="1.20.0"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="
-	mirror://gentoo/${PN}.png
-	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
+SRC_URI="https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
 	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
 EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="+drm gnutls java +opengl pam server +xorgmodule"
+IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
 
 CDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
+	sys-libs/zlib:=
 	>=x11-libs/fltk-1.3.1
 	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
 	pam? ( virtual/pam )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
 	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
 		>=x11-libs/pixman-0.27.2
 		>=x11-apps/xauth-1.0.3
 		x11-apps/xsetroot
@@ -42,80 +42,82 @@ CDEPEND="virtual/jpeg:0
 		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
 		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
 		drm? ( x11-libs/libdrm )
-	)"
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
 
 RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5:* )
-	!net-misc/vnc
 	!net-misc/tightvnc
-	!net-misc/xf4vnc"
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( >=virtual/jre-1.5:* )"
 
 DEPEND="${CDEPEND}
 	amd64? ( dev-lang/nasm )
 	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xproto-7.0.26
+	nls? ( sys-devel/gettext )
 	java? ( >=virtual/jdk-1.5 )
-	server?	(
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-base/xorg-proto
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
 		virtual/pkgconfig
 		media-fonts/font-util
 		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.1.3
-		>=x11-proto/glproto-1.4.17
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.2.0
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
 		>=x11-libs/xtrans-1.3.3
-		>=x11-proto/dri2proto-2.8
 		opengl? ( >=media-libs/mesa-10.3.4-r1 )
 	)"
 
+PATCHES=(
+	"${WORKDIR}"/patches/055_xstartup.patch
+)
+
 src_unpack() {
 	git-r3_src_unpack
 	unpacker
 }
 
-PATCHES=(
-	"${WORKDIR}"/patches/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-)
 
 src_prepare() {
 	if use server ; then
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
 	fi
 
-	default
+	cmake-utils_src_prepare
 
 	if use server ; then
 		cd unix/xserver || die
-		PATCH_VERSION=${XSERVER_VERSION%.*}
-		eapply ../xserver${PATCH_VERSION/./}.patch
+		a=${XSERVER_VERSION%.*}
+		eapply ../xserver${a/./}.patch
 		eautoreconf
 	fi
+	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):drm/\1:' $(grep drm_fourcc.h -rl .) || die
 }
 
 src_configure() {
-	use arm || use hppa && append-flags "-fPIC"
+	if use arm || use hppa ; then
+		append-flags "-fPIC"
+	fi
 
 	local mycmakeargs=(
 		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
 		-DENABLE_PAM=$(usex pam)
 		-DBUILD_JAVA=$(usex java)
 	)
 
 	cmake-utils_src_configure
 
-	if use server; then
+	if use server ; then
 		cd unix/xserver || die
 		econf \
 			$(use_enable opengl glx) \
@@ -125,7 +127,7 @@ src_configure() {
 			--disable-devel-docs \
 			--disable-dmx \
 			--disable-dri \
-			--disable-dri3 \
+			$(use_enable dri3) \
 			--disable-glamor \
 			--disable-kdrive \
 			--disable-libunwind \
@@ -137,7 +139,7 @@ src_configure() {
 			--disable-tslib \
 			--disable-unit-tests \
 			--disable-xephyr \
-			--disable-xinerama \
+			$(use_enable xinerama) \
 			--disable-xnest \
 			--disable-xorg \
 			--disable-xvfb \
@@ -154,10 +156,10 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 
-	if use server; then
+	if use server ; then
 		# deps of the vnc module and the module itself
 		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+			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
@@ -169,24 +171,22 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
 	if use server ; then
 		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
 		if ! use xorgmodule; then
-			rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
+			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
 		else
-			rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 		fi
 
 		newconfd "${FILESDIR}"/${PN}.confd ${PN}
 		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
 		systemd_douserunit contrib/systemd/user/vncserver@.service
 	else
 		local f
 		cd "${ED}" || die
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
+		for f in vncserver x0vncserver vncconfig; do
 			rm usr/bin/$f || die
 			rm usr/share/man/man1/$f.1 || die
 		done