Drop versions which depend on vulnerable xorg-server, bug #532086.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

10 files changed, 8 insertions, 884 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 2182e3c144b6..3a8514b3c3fe 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.197 2015/01/25 11:24:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.198 2015/02/10 10:37:07 chithanh Exp $
+
+  10 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -files/1.1.0-export_missing_symbol.patch, -files/1.1.0-gethomedir.patch,
+  -files/1.1.0-xorg-1.12_fix.patch, -files/CVE-2014-0011.patch,
+  -tigervnc-1.2.0.ebuild, -tigervnc-1.2.80_p5065-r1.ebuild,
+  -tigervnc-1.2.80_p5065.ebuild, -tigervnc-1.3.1.ebuild, metadata.xml:
+  Drop versions which depend on vulnerable xorg-server, bug #532086.
 
   25 Jan 2015; Agostino Sarubbo <ago@gentoo.org> tigervnc-1.3.1-r1.ebuild:
   Stable for ppc64, wrt bug #500372
diff --git a/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch b/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch
deleted file mode 100644
index 542586edffc0..000000000000
--- a/net-misc/tigervnc/files/1.1.0-export_missing_symbol.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xorg-server-1.11.2.orig/include/input.h xorg-server-1.11.2/include/input.h
---- xorg-server-1.11.2.orig/include/input.h	2011-07-15 17:26:40.000000000 +0400
-+++ xorg-server-1.11.2/include/input.h	2011-12-22 10:38:53.581370977 +0400
-@@ -503,7 +503,7 @@
-                         DeviceIntPtr master);
- 
- extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
--extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
-+extern _X_EXPORT DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
- 
- extern _X_EXPORT int AllocDevicePair(ClientPtr client,
-                              char* name,
diff --git a/net-misc/tigervnc/files/1.1.0-gethomedir.patch b/net-misc/tigervnc/files/1.1.0-gethomedir.patch
deleted file mode 100644
index fd07be3bb5e2..000000000000
--- a/net-misc/tigervnc/files/1.1.0-gethomedir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am.gethomedir	2011-03-22 10:53:05.206429397 +0100
-+++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am	2011-03-22 10:53:30.550388457 +0100
-@@ -5,6 +5,7 @@ RFB_LIB=$(LIB_DIR)/rfb/librfb.la
- RDR_LIB=$(LIB_DIR)/rdr/librdr.la $(GNUTLS_LDFLAGS)
- NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la
- XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la
-+OS_LIB=$(LIB_DIR)/os/libos.la
- COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB)
- 
- noinst_LTLIBRARIES = libvnccommon.la
-@@ -52,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- 
- libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
--libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
-+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB)
- 
- EXTRA_DIST = Xvnc.man
- 
diff --git a/net-misc/tigervnc/files/1.1.0-xorg-1.12_fix.patch b/net-misc/tigervnc/files/1.1.0-xorg-1.12_fix.patch
deleted file mode 100644
index 82c8c83915d5..000000000000
--- a/net-misc/tigervnc/files/1.1.0-xorg-1.12_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# Fix building with xorg-1.12.1
-# From upstream: http://tigervnc.svn.sourceforge.net/viewvc/tigervnc?view=revision&revision=4899
-
---- trunk/unix/xserver/hw/vnc/Makefile.am	2011/10/31 08:14:40	4745
-+++ trunk/unix/xserver/hw/vnc/Makefile.am	2012/04/25 15:10:38	4899
-@@ -63,7 +63,7 @@
- BUILT_SOURCES = $(nodist_Xvnc_SOURCES)
- 
- fb.h: $(top_srcdir)/fb/fb.h
--	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h
-+	cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h
- 
- pixman.h:
- 	for i in ${XSERVERLIBS_CFLAGS}; do \
-@@ -78,4 +78,4 @@
- 	fi
- 
- fbrop.h: $(top_srcdir)/fb/fbrop.h
--	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h
-+	cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h
diff --git a/net-misc/tigervnc/files/CVE-2014-0011.patch b/net-misc/tigervnc/files/CVE-2014-0011.patch
deleted file mode 100644
index 0075720bd620..000000000000
--- a/net-misc/tigervnc/files/CVE-2014-0011.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up tigervnc-1.3.0/common/CMakeLists.txt.CVE-2014-0011 tigervnc-1.3.0/common/CMakeLists.txt
---- tigervnc-1.3.0/common/CMakeLists.txt.CVE-2014-0011	2013-07-01 13:42:01.000000000 +0100
-+++ tigervnc-1.3.0/common/CMakeLists.txt	2014-02-04 16:59:10.840037314 +0000
-@@ -23,3 +23,6 @@ if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_S
-     set_target_properties(zlib PROPERTIES COMPILE_FLAGS -fPIC)
-   endif()
- endif()
-+
-+# Turn asserts on.
-+set_target_properties(rdr rfb PROPERTIES COMPILE_FLAGS -UNDEBUG)
-diff -up tigervnc-1.3.0/common/rfb/zrleDecode.h.CVE-2014-0011 tigervnc-1.3.0/common/rfb/zrleDecode.h
---- tigervnc-1.3.0/common/rfb/zrleDecode.h.CVE-2014-0011	2013-07-01 13:41:59.000000000 +0100
-+++ tigervnc-1.3.0/common/rfb/zrleDecode.h	2014-02-04 16:17:00.881565540 +0000
-@@ -25,9 +25,10 @@
- // FILL_RECT          - fill a rectangle with a single colour
- // IMAGE_RECT         - draw a rectangle of pixel data from a buffer
- 
-+#include <stdio.h>
- #include <rdr/InStream.h>
- #include <rdr/ZlibInStream.h>
--#include <assert.h>
-+#include <rfb/Exception.h>
- 
- namespace rfb {
- 
-@@ -143,7 +144,10 @@ void ZRLE_DECODE (const Rect& r, rdr::In
-               len += b;
-             } while (b == 255);
- 
--            assert(len <= end - ptr);
-+	    if (end - ptr < len) {
-+	      fprintf (stderr, "ZRLE decode error\n");
-+	      throw Exception ("ZRLE decode error");
-+	    }
- 
- #ifdef FAVOUR_FILL_RECT
-             int i = ptr - buf;
-@@ -193,7 +197,10 @@ void ZRLE_DECODE (const Rect& r, rdr::In
-                 len += b;
-               } while (b == 255);
- 
--              assert(len <= end - ptr);
-+	      if (end - ptr < len) {
-+		fprintf (stderr, "ZRLE decode error\n");
-+		throw Exception ("ZRLE decode error");
-+	      }
-             }
- 
-             index &= 127;
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 01dbb9e631ea..2a0e1487ecd0 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -5,7 +5,6 @@
     <email>armin76@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name="internal-fltk">Build+link internal and enhanced fltk library</flag>
     <flag name="server">Build TigerVNC server</flag>
     <flag name="xorgmodule">Build the Xorg module</flag>
   </use>
diff --git a/net-misc/tigervnc/tigervnc-1.2.0.ebuild b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
deleted file mode 100644
index 6f458265ff7d..000000000000
--- a/net-misc/tigervnc/tigervnc-1.2.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.0.ebuild,v 1.19 2013/10/12 13:26:30 jer Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.13.0"
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.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 ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="gnutls +internal-fltk java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	pam? ( virtual/pam )
-	!internal-fltk? ( x11-libs/fltk:1 )
-	internal-fltk? (
-		x11-libs/libXft
-		x11-libs/libXinerama
-		x11-libs/libXcursor )
-	server? (
-		>=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.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	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.0.2
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=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.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_EXCLUDE="015_java7.patch" EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_use internal-fltk INCLUDED_FLTK)
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}
diff --git a/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild b/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild
deleted file mode 100644
index 817adc784745..000000000000
--- a/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.80_p5065-r1.ebuild,v 1.7 2014/03/24 14:30:30 ago Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.14.2"
-OPENGL_DIR="xorg-x11"
-MY_P="${PN}-1.2.80-20130314svn5065"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/tigervnc/tigervnc-1.2.80-20130314svn5065.tar.bz2/4522c6f107dbe778f197b2294c0eb867/tigervnc-1.2.80-20130314svn5065.tar.bz2
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.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="gnutls java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	pam? ( virtual/pam )
-	server? (
-		>=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.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	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.0.2
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=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.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	epatch "${FILESDIR}"/CVE-2014-0011.patch
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		epatch ../xserver114.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}
diff --git a/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild b/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild
deleted file mode 100644
index 848c7a85138e..000000000000
--- a/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.80_p5065.ebuild,v 1.10 2014/06/22 15:02:29 klausman Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.14.2"
-OPENGL_DIR="xorg-x11"
-MY_P="${PN}-1.2.80-20130314svn5065"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/tigervnc/tigervnc-1.2.80-20130314svn5065.tar.bz2/4522c6f107dbe778f197b2294c0eb867/tigervnc-1.2.80-20130314svn5065.tar.bz2
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}-patches-${PATCHVER}.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="gnutls java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	pam? ( virtual/pam )
-	server? (
-		>=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.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	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.0.2
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=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.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		epatch ../xserver114.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}
diff --git a/net-misc/tigervnc/tigervnc-1.3.1.ebuild b/net-misc/tigervnc/tigervnc-1.3.1.ebuild
deleted file mode 100644
index 8e18825b10f8..000000000000
--- a/net-misc/tigervnc/tigervnc-1.3.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.3.1.ebuild,v 1.10 2014/08/15 16:54:32 armin76 Exp $
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.14.3"
-OPENGL_DIR="xorg-x11"
-#MY_P="${PN}-1.2.80-20130314svn5065"
-#S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
-	mirror://gentoo/${PN}.png
-	mirror://gentoo/${PN}-1.3.0-patches-${PATCHVER}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${PN}-1.3.0-patches-${PATCHVER}.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="gnutls java nptl +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls )
-	java? ( >=virtual/jre-1.5 )
-	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.21.8
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-admin/eselect-opengl-1.0.8 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-	)
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-DEPEND="${RDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.1.99.3
-	>=x11-proto/xextproto-7.1.99
-	>=x11-proto/xproto-7.0.22
-	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.0.2
-		>=x11-proto/glproto-1.4.16
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.0.2
-		>=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.2.2
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
-	)"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
-	if ! use server ; then
-		echo
-		einfo "The 'server' USE flag will build tigervnc's server."
-		einfo "If '-server' is chosen only the client is built to save space."
-		einfo "Stop the build now if you need to add 'server' to USE flags.\n"
-	else
-		ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-		OLD_IMPLEM="$(eselect opengl show)"
-		eselect opengl set ${OPENGL_DIR}
-	fi
-}
-
-switch_opengl_implem() {
-	# Switch to the xorg implementation.
-	# Use new opengl-update that will not reset user selected
-	# OpenGL interface ...
-	echo
-	eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	else
-		rm "${WORKDIR}"/patches/*_server_*
-	fi
-
-	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" epatch
-
-	if use server ; then
-		cd unix/xserver
-		epatch ../xserver114.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-
-	use arm || use hppa && append-flags "-fPIC"
-
-	mycmakeargs=(
-		-G "Unix Makefiles"
-		$(cmake-utils_use_enable gnutls GNUTLS)
-		$(cmake-utils_use_enable pam PAM)
-		$(cmake-utils_use_build java JAVA)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver
-		econf \
-			$(use_enable nptl glx-tls) \
-			$(use_enable opengl glx) \
-			--disable-config-dbus \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-kdrive \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server ; then
-		cd unix/xserver
-		emake
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install
-		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
-	else
-		cd "${D}"
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f
-			rm usr/share/man/man1/$f.1
-		done
-	fi
-}
-
-pkg_postinst() {
-	use server && switch_opengl_implem
-}