Revision bump using xorg-server-1.9.4

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

6 files changed, 15 insertions, 536 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index ebb9caf5bfda..b49d42883228 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.77 2010/12/31 21:04:23 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.78 2011/02/11 19:50:50 armin76 Exp $
+
+  11 Feb 2011; Raúl Porcel <armin76@gentoo.org>
+  -tigervnc-1.0.1_pre20100306-r1.ebuild, -tigervnc-1.0.1_p20100529.ebuild,
+  -tigervnc-1.0.1_p20100529-r2.ebuild, -tigervnc-1.0.1_p20100914-r2.ebuild,
+  +tigervnc-1.0.1_p20100914-r5.ebuild:
+  Revision bump using xorg-server-1.9.4
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org>
   tigervnc-1.0.1_p20100914-r4.ebuild:
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index f636f0673b03..6ef5824124aa 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,18 +1,12 @@
 AUX tigervnc.confd 346 RMD160 07a4541c0d9ef5611afafa8db75d2caf2e7ab051 SHA1 a3b00e99fc68844a7d0be29c4a8caae3a8b5a491 SHA256 48b6ae4f3e9e528b3cd4bc1349ceed3cd1a403ab0f3a2a8dd57a4769f88ceafc
 AUX tigervnc.initd 1585 RMD160 2fb536e85fa490df5450bf6e9f0296beb17921b1 SHA1 389d095ce1c18b323208ac059992cbd539d5a6b4 SHA256 a705a1aacdc3149a52b222fb990c654a5b5b5133d24be675ab327ec9a0c6f0e6
 AUX vncviewer.png 4958 RMD160 24ca257dac5de8d97672d943ee47f310af4fe837 SHA1 2f12a12a0f105c6f2ecc9aa306c63719f07b0062 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e
-DIST tigervnc-1.0.1_p20100529.tar.bz2 2455999 RMD160 e27b6b58ba408ff6d514fa651723c048061f3f07 SHA1 1cdf47a8073de7e039742527af895a3f40d45471 SHA256 65cd5bc091370615f6797a72c92f3d014c6e70220c59f314df1234c48c1768f4
 DIST tigervnc-1.0.1_p20100914.tar.bz2 2457011 RMD160 8fff3434d00e7a16f59ab9ebbe517a7c19d593db SHA1 588d7e2c499d89792c3b1bb4577c86faedd65f18 SHA256 68881454d3c6b54ef57fe0741b0e95065abe8f7e5cb5b9db5d92117e152b4cfe
-DIST tigervnc-1.0.1_pre20100306.tar.bz2 2475525 RMD160 13fbbd008fbb3b9570f6025f5dac5d1e1fc09341 SHA1 68b193fb76a9fd0e67a8894ad79074a4fd3facc5 SHA256 723e5642c8ab3b7fb321c256d2ad8632cae2680609d05a52dc35e393f493eb4e
-DIST xorg-server-1.7.6.tar.bz2 4927689 RMD160 811ca10c01da9b4bdeb743ee90b6845971dfd4c7 SHA1 77a8c3dec86960e1be818df3a75d69b5fad6a3c0 SHA256 da372e064aa5c2a0421830941372d4fea864e69c70290d56d6ffc042a6e80760
 DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
-DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
 DIST xorg-server-1.9.2.tar.bz2 5274463 RMD160 7abab5627a3a1b226f0348dbdead1728b3737ca9 SHA1 b04c88a8ec70cbc6ab7df3ce22be0388696d71cc SHA256 8b30800004c98fc7a8e6ff31a339f28451be5132e774443be22bf226e1791e34
-EBUILD tigervnc-1.0.1_p20100529-r2.ebuild 4460 RMD160 f24a5e0ccd9718a1e8b3d87f1d8c2a7a669a2a45 SHA1 8f2dac9488b9b353e5a6760629e5d93b233a5a7b SHA256 70807f008a070143c24babd7e24632765227153e0b11ab97b7cad3e192acd74b
-EBUILD tigervnc-1.0.1_p20100529.ebuild 4420 RMD160 5e95505ac5797572815d0656af45b7788c38d5da SHA1 c4672d014551cf96aef0a0142a474eccc7111949 SHA256 905bded4d760552c4cf6a91a710a87074efdad7840324178b39a0929f3471f41
-EBUILD tigervnc-1.0.1_p20100914-r2.ebuild 4460 RMD160 b9026c0c591a65a19a5cd765a5bf330271a151a0 SHA1 7e28adcf2de0ed32dc03501d3131b42c10f01c02 SHA256 839a1077a504da0ef7566a994a74b5b156f508606d51d752990d10bc014ba6a6
+DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
 EBUILD tigervnc-1.0.1_p20100914-r4.ebuild 4451 RMD160 ed5870d57ef12c2f806495b2f15e834228f07b0c SHA1 c66622654a7ffd1e49fe78881443157858394c8b SHA256 426ee68c10b19dab4c47190ba463019b08d5934d27b55f7cc6a130e1a047fe12
+EBUILD tigervnc-1.0.1_p20100914-r5.ebuild 4460 RMD160 27178b1380b518c42ce55f4c03313e9cdc414e60 SHA1 14c9d6efd084ce97df6cfa7f995817479414d95a SHA256 5a92764fadadeb1b79f7dab040e080b5379e06d620e6f8fecc44b99a7f78f5e2
 EBUILD tigervnc-1.0.1_p20100914.ebuild 4418 RMD160 015fb54a8389aa5918180a6873f5aec5cb677ffc SHA1 3bf776d0e62c594810e430ed008140e0e3a92cec SHA256 b82e4747a5e334e37b15a72d4c9a0e8c0191fd261bfe98e9d59ca8a4057a9855
-EBUILD tigervnc-1.0.1_pre20100306-r1.ebuild 4422 RMD160 782af9d40fb41da3d03b1cad1f8062e60c450de7 SHA1 134998a35701112002b4a0d85ba4d97bb2377b0f SHA256 572288fa551974f72c5cc1b12e1cecc938de73a21931b9f61fd1c11198f40e96
-MISC ChangeLog 10081 RMD160 6af13c66bacc98fe28ab4d37b97996a5386dd82b SHA1 23c425f0e076436f4041afabd730e4d343335769 SHA256 56f8520a8d9f0934e607e5e62bf26b52a13628c13775a97ea557903535353d9a
+MISC ChangeLog 10365 RMD160 297e2e27d7f1424c2c8073c6b0fbbf7e7d28479a SHA1 3ec0944636c3dd5c2eea9e89af689ee85007233d SHA256 2764ad489ed793a0a57e872084a408d22a07198b23c25b27e93125d2cfde4f07
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
diff --git a/net-misc/tigervnc/tigervnc-1.0.1_p20100529.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_p20100529.ebuild
deleted file mode 100644
index e8f9c7242804..000000000000
--- a/net-misc/tigervnc/tigervnc-1.0.1_p20100529.ebuild
+++ /dev/null
@@ -1,173 +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.ebuild,v 1.6 2010/10/21 19:45:48 ranger Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.7.7"
-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
-		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 xserver17.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_p20100914-r2.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_p20100914-r2.ebuild
deleted file mode 100644
index be709bd0bf70..000000000000
--- a/net-misc/tigervnc/tigervnc-1.0.1_p20100914-r2.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_p20100914-r2.ebuild,v 1.1 2010/09/14 20:14:23 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.8.2"
-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_p20100914-r5.ebuild
index a351d8d15558..c821960cb321 100644
--- a/net-misc/tigervnc/tigervnc-1.0.1_p20100529-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.0.1_p20100914-r5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/07/31 15:49:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.1_p20100914-r5.ebuild,v 1.1 2011/02/11 19:50:50 armin76 Exp $
 
 EAPI="1"
 
 inherit eutils toolchain-funcs multilib autotools
 
-XSERVER_VERSION="1.8.2"
+XSERVER_VERSION="1.9.4"
 OPENGL_DIR="xorg-x11"
 
 DESCRIPTION="Remote desktop viewer display system"
@@ -114,7 +114,7 @@ src_unpack() {
 	cd unix
 
 	if use server ; then
-		epatch xserver18.patch
+		epatch xserver19.patch
 		cd xserver
 		eautoreconf
 	fi
diff --git a/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild b/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild
deleted file mode 100644
index 1b60ef6d1217..000000000000
--- a/net-misc/tigervnc/tigervnc-1.0.1_pre20100306-r1.ebuild
+++ /dev/null
@@ -1,173 +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_pre20100306-r1.ebuild,v 1.9 2010/08/09 02:24:25 josejx Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs multilib autotools
-
-XSERVER_VERSION="1.7.6"
-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
-		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 xserver17.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
-}