gentoo resync : 08.05.2018

3 files changed, 22 insertions, 218 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 45b8bb0451c6..a4dbc24083ea 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,7 +6,6 @@ DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11
 DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-EBUILD tigervnc-1.8.0-r1.ebuild 4579 BLAKE2B 2100ceaed621bf414fa0a906ce425a30be56a8f946f82b8dd10b94b314a575670c88fa95902d5182cb7fb253b6399cd8e26441526b31b13f5fe34a9c08ce712a SHA512 57e1233a4e19d556bd86886dd62fcfc53b966a3fa45cfbc311618db3d31ca01d3216cd6af03c52293c277856e271a09a337a68207ec2d5b5e0e25b800453995b
-EBUILD tigervnc-1.8.0-r2.ebuild 4665 BLAKE2B 60d2397a6c90a09c58a92af26f92ba4c81b0d01cac9c64506d85b0c2fcaf5ad9d294795508c5e4dcc76920c4357228a5f87cdb8ff11ae9918034c21da5c6f1ae SHA512 57ab001805e332b202bbfcba8aa7466d405ea62273eed49ef3d00b2e2e5b547c471426989a39e8f74c14080d8b72ed2edd4d509f575aa15dc0c74fd219993220
+EBUILD tigervnc-1.8.0-r3.ebuild 4320 BLAKE2B f20dd6c1c9e408e1f3d72c86f5075c360cb2f026222b21337734587d0ff3c2bccecbf34964fcd9308b998cf6f44cbc7b2a9b8e0416cf80aeaae83aad6501946e SHA512 6e46a65f89214ed204f96e674ac7a12eb20fd2a9f3f76c601cd4f9e998d9aa36e3d10cd5dce1cef46fee068bf6fa0fdca449fb7635331aca0e5f9f1c8fce0276
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 725 BLAKE2B 9ea0092828f41c3ef3617f10918436795dd5af0397288f0b0c20debc5aded651c5fa6d2afc5c7b011b5480ea820d42c567cd6b22c822dd16895ce9445310981d SHA512 65f32dbbc20c53f154f87a01bf88bc0e73493921ff73c2b3b482e1c9fc7a3159cf6a94d1d7cb830bb60fd8da2b8ef77cbdd2a3cad329634ea82dd4f288f69deb
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
deleted file mode 100644
index 745ac50ae663..000000000000
--- a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.19.5"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	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	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
-
-CDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( virtual/pam )
-	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/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!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.31
-	x11-libs/libXfont2
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		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/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-	"${FILESDIR}"/java-utf8.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}/xserver119.patch"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use arm || use hppa && append-flags "-fPIC"
-
-	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
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-dri3 \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-tslib \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--disable-unit-tests
-	fi
-}
-
-src_compile() {
-	cmake-utils_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 "") 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-utils_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
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		if use systemd; then
-			systemd_douserunit contrib/systemd/user/vncserver@.service
-		else
-			newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		fi
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
index 7c2bb8fa5d0b..8455670a3d6b 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
@@ -22,17 +22,19 @@ 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
 	>=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,7 +44,6 @@ CDEPEND="virtual/jpeg:0
 		drm? ( x11-libs/libdrm )
 	)
 	xinerama? ( x11-libs/libXinerama )
-	dri3? ( x11-proto/dri3proto )
 	"
 
 RDEPEND="${CDEPEND}
@@ -54,31 +55,25 @@ RDEPEND="${CDEPEND}
 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.31
-	x11-libs/libXfont2
 	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 )
 	)"