Use xorg-server-1.8.2

Package-Manager: portage-2.1.8.3/cvs/Linux ia64

4 files changed, 10 insertions, 183 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/Manifest b/net-misc/tigervnc/Manifest
index 3ad01cd6427a..e5832ee99488 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,12 +6,10 @@ DIST tigervnc-1.0.1_p20100529.tar.bz2 2455999 RMD160 e27b6b58ba408ff6d514fa65172
 DIST tigervnc-1.0.1_pre20100306.tar.bz2 2475525 RMD160 13fbbd008fbb3b9570f6025f5dac5d1e1fc09341 SHA1 68b193fb76a9fd0e67a8894ad79074a4fd3facc5 SHA256 723e5642c8ab3b7fb321c256d2ad8632cae2680609d05a52dc35e393f493eb4e
 DIST xorg-server-1.6.5.tar.bz2 4678406 RMD160 702970358a5643dbc9205f42e39c5b8ed2ff845a SHA1 c57c80dd15d3ca492e58ae993b9015d085ec6ea6 SHA256 f3c0e43cf73e7d438350016cabd9957dc000ded9c5fdeebf84a02df61963b2ce
 DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
-DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665d12018 SHA1 a5f4fc748fc9841b7c0be6ef7388d26551d0d75b SHA256 423a8092e28affb83aa736695408e01fd4641040727f34ed6bcfae9c06018b77
-DIST xorg-server-1.8.1.901.tar.bz2 5220082 RMD160 36c0a17c5b41ddb222117b35616630b093300e5c SHA1 e26228cbeb387ec37ee6c549a208534a2dd2ae43 SHA256 ca9ccea83eb9585f53182df0e984d1303a78b585e77651b2c407d7b500884863
+DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
 EBUILD tigervnc-1.0.0-r4.ebuild 4644 RMD160 6a6ba8b8a8e02ab34e2e171e5cb9ebd9b195e9c3 SHA1 d1688c0ea1513c839c972906ddc84c177e568084 SHA256 93b98b0229f83f56eb60de4c16fc28de5c5080f9c7f0f219f80e672dfb9ff906
-EBUILD tigervnc-1.0.1_p20100529-r1.ebuild 4460 RMD160 5e2330616be4ae0cc71e9257cdddf404a681a613 SHA1 3ac6c3167d42b4ad2776eaceccf9d7b3e47f9343 SHA256 3cd005c3faddbabd8de39f284a16789872ce381c24d3a5b760135b6c1fee721a
-EBUILD tigervnc-1.0.1_p20100529-r2.ebuild 4464 RMD160 a3830dfbb61dfd10101c48b92529412a49014145 SHA1 1e0c63126500a2a1db6d65e47064a58d9aa48783 SHA256 a7331352dde653789b0a449731d0ee195b1f182acb3d3e9a39c93a87a6b7ef1b
+EBUILD tigervnc-1.0.1_p20100529-r2.ebuild 4460 RMD160 f24a5e0ccd9718a1e8b3d87f1d8c2a7a669a2a45 SHA1 8f2dac9488b9b353e5a6760629e5d93b233a5a7b SHA256 70807f008a070143c24babd7e24632765227153e0b11ab97b7cad3e192acd74b
 EBUILD tigervnc-1.0.1_p20100529.ebuild 4428 RMD160 a3b44be8e195f287c2163871ded60abe881a6b0a SHA1 cba3e21fa24cd58e9d86be2b51c72768bdc1c7b7 SHA256 01e51ed81ec57f226744da8978b4077dd1a5baa26b1fb749e8295ac08e1d23f3
 EBUILD tigervnc-1.0.1_pre20100306-r1.ebuild 4424 RMD160 3cd9a7a27bc8364459273f1dbc12fd062ef630d3 SHA1 2f9090fe671a7191ba04e3707bb8a13da7c5a45c SHA256 24eb8e7dbeb869c795a2d7b2bf7a456b1ca7f1c7894b012f29e47b458f07ca57
-MISC ChangeLog 7327 RMD160 4d8f9eb3fbfd7a9ba03f7423ef3e40c28e05c396 SHA1 4740320a9897131e2fb72ebc8da740f08293e8d2 SHA256 a4c48fe995eb41e26f708369e549458182dbd90e1e06d9cc181bfce4d6ecc357
+MISC ChangeLog 7480 RMD160 50bbd2e528f0177b9e99033b3098240c7bbcfae6 SHA1 c895263e65205fcb33b5bea527815fe3cd0c0240 SHA256 b66b6d36fa146b9a7e69f5025b5d4eecd137a16eda08fe350206edce973dcd73
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
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"