Use xorg-server-1.8.2

(Portage version: 2.1.8.3/cvs/Linux ia64)

3 files changed, 7 insertions, 178 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 9e77f2a6c341..55e1072b175b 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.56 2010/07/06 15:53:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.57 2010/07/31 15:49:53 armin76 Exp $
+
+  31 Jul 2010; Raúl Porcel <armin76@gentoo.org>
+  -tigervnc-1.0.1_p20100529-r1.ebuild, tigervnc-1.0.1_p20100529-r2.ebuild:
+  Use xorg-server-1.8.2
 
   06 Jul 2010; Jeroen Roovers <jer@gentoo.org>
   tigervnc-1.0.1_pre20100306-r1.ebuild:
diff --git a/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r1.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r1.ebuild
deleted file mode 100644
index c9d04495e75c..000000000000
--- a/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r1.ebuild,v 1.2 2010/06/19 13:54:32 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.8.0"
-OPENGL_DIR="xorg-x11"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~armin76/dist/${P}.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 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="nptl +opengl server +xorgmodule"
-
-RDEPEND="sys-libs/zlib
-	media-libs/freetype
-	x11-libs/libSM
-	x11-libs/libXtst
-	app-admin/eselect-opengl
-	server? (
-		x11-libs/libXi
-		x11-libs/libXfont
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXrender
-		x11-libs/pixman
-		x11-apps/xauth
-		x11-apps/xsetroot
-		x11-misc/xkeyboard-config
-		media-fonts/font-adobe-100dpi
-		media-fonts/font-adobe-75dpi
-		media-fonts/font-alias
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-		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-1.5
-	>=x11-proto/xextproto-7.0.3
-	>=x11-proto/xproto-7.0.13
-	server?	(
-		x11-proto/bigreqsproto
-		x11-proto/compositeproto
-		x11-proto/damageproto
-		x11-proto/dri2proto
-		x11-proto/fixesproto
-		x11-proto/fontsproto
-		>=x11-proto/randrproto-1.2.99
-		x11-proto/resourceproto
-		x11-proto/scrnsaverproto
-		x11-proto/trapproto
-		x11-proto/videoproto
-		x11-proto/xcmiscproto
-		x11-proto/xineramaproto
-		x11-proto/xf86bigfontproto
-		x11-proto/xf86dgaproto
-		x11-proto/xf86driproto
-		x11-proto/xf86miscproto
-		x11-proto/xf86vidmodeproto
-		opengl? ( >=x11-proto/glproto-1.4.10 )
-		>=media-libs/mesa-7.1
-		>=x11-proto/renderproto-0.9.3
-		x11-libs/libpciaccess
-		>=x11-libs/xtrans-1.2.2
-	)"
-
-S="${WORKDIR}/${PN}"
-
-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"
-		ebeep
-		epause 5
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
-	fi
-
-	eautoreconf
-	cd unix
-
-	if use server ; then
-		epatch xserver18.patch
-		cd xserver
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	econf --without-included-zlib --with-system-jpeg || die "econf failed"
-	emake || die "emake failed"
-
-	if use server ; then
-		cd unix/xserver
-		econf \
-			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
-			--disable-static --disable-xinerama \
-			--disable-composite \
-			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
-			--enable-install-libxf86config \
-			--enable-dri2 \
-			--disable-config-dbus \
-			--disable-config-hal \
-			$(use_enable opengl glx) \
-			$(use_enable nptl glx-tls) \
-			|| die "econf server failed"
-		emake || die "emake server failed"
-	fi
-}
-
-src_install() {
-	cd unix
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newman vncviewer/vncviewer.man vncviewer.1
-	dodoc README
-
-	doicon "${FILESDIR}"/vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		cd xserver/hw/vnc
-		emake DESTDIR="${D}" install || die "emake install failed"
-		! 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.0.1_p20100529-r2.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r2.ebuild
index 5490e2551080..a351d8d15558 100644
--- a/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r2.ebuild,v 1.1 2010/06/19 13:54:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r2.ebuild,v 1.2 2010/07/31 15:49:53 armin76 Exp $
 
 EAPI="1"
 
 inherit eutils toolchain-funcs multilib autotools
 
-XSERVER_VERSION="1.8.1.901"
+XSERVER_VERSION="1.8.2"
 OPENGL_DIR="xorg-x11"
 
 DESCRIPTION="Remote desktop viewer display system"