Revision bump to support xorg-server-1.6

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

3 files changed, 189 insertions, 2 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 940f8c95c55a..b7781e3bf3df 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.20 2009/09/30 17:22:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.21 2009/10/04 16:54:49 armin76 Exp $
+
+*tigervnc-1.0.0-r1 (04 Oct 2009)
+
+  04 Oct 2009; Raúl Porcel <armin76@gentoo.org> +tigervnc-1.0.0-r1.ebuild:
+  Revision bump to support xorg-server-1.6
 
   30 Sep 2009; Raúl Porcel <armin76@gentoo.org> tigervnc-1.0.0.ebuild:
   Add glproto dep as non-optional
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 8283ac1ef40a..37c3988e50f6 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -5,7 +5,9 @@ DIST tigervnc-0.0.90-patches-0.3.tar.bz2 4404 RMD160 42470a3fbda448d5e65cc21b6a0
 DIST tigervnc-0.0.90.tar.bz2 2719178 RMD160 23b4d6f7a9698bb06d5067a274de76b2179c9e7c SHA1 a7463e86659503b8729b6a1adab797eac516cc50 SHA256 e0673407e6be4d1293fe847899338fb7a01ed7c3aca3254210220469216cd4de
 DIST tigervnc-1.0.0.tar.bz2 2720182 RMD160 759bff85653bf68a29c2a336553bbfadada12223 SHA1 9017f31fe75d0bc49cc9d9f9f6b9f336bf306bd6 SHA256 75c54bf1f976182dd64c2cab5051fcf392091d74636014c2b74ce5b712efbfda
 DIST xorg-server-1.5.3.tar.bz2 5622625 RMD160 dc0c552e031963070b7a315ea4499810021d0eed SHA1 177529b6d7191a73df6abf2990cd7708398a8d81 SHA256 a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+DIST xorg-server-1.6.3.901.tar.bz2 4678171 RMD160 45421fdb4524ffd1b247569a1c7dc728bd0cf965 SHA1 09e3d46178701ce76911553ee53309686822bb31 SHA256 1b8b9c40fc3da9268b03143cb4fc518baa9fcf88da73c7645c2d572bf23dbd50
 EBUILD tigervnc-0.0.90.ebuild 4548 RMD160 bcf9098552f805716617111c581662038c517b08 SHA1 93acca2af196f5895320453f5ed598bb425af7c3 SHA256 e957f7397a4d1596c3ac6822c15a265a0b288e5945e15f684c0458cf87d9c60e
+EBUILD tigervnc-1.0.0-r1.ebuild 4531 RMD160 628e8bd0b5be189e8a7cefcc95e612cb3dce565e SHA1 8c315fd1ef6b1bfa88c239fc3b04f103b18b3295 SHA256 6b22fac3568b276955f0eab73122743db813948b6802d00f895f7d38891faee9
 EBUILD tigervnc-1.0.0.ebuild 4573 RMD160 a0ecf8699d0340172d07edd7ee3b7257ac3b5882 SHA1 53d719bf89af4b897a6c60b7f66b9ac3e72d201b SHA256 e825109b9c5d4e0a8f6d3aca8d5bd3c1c3bce0d814e0cdce2d182ca86b7ad877
-MISC ChangeLog 2643 RMD160 d469ed6bb2e1e987a291fb65afba5c3a8b47b071 SHA1 e0c0ead85ff69fecdc4e4408c3db1667461f95d4 SHA256 f78936263a5e84892dee183fa1c612d1fdaeee85d14d275ca2c980feb89308c9
+MISC ChangeLog 2797 RMD160 d545cde074623e8c1c4c9fdca90782e0ab5fdce3 SHA1 0ef2b32d048580d04c9510e181de6b28fe91b388 SHA256 c5ae87e5aa9389952cbe02095b394988dcab8256af7e89e4a2ca733e9c653652
 MISC metadata.xml 358 RMD160 02e6829cd6be9fce91fefadf5e0c04a989f36615 SHA1 351fe95fb94b3892226413dccf261f1da0b68960 SHA256 1048c34a670204e65435b0fa3d5782658ad72d41aea92a694b2a22ebc3f61713
diff --git a/net-misc/tigervnc/tigervnc-1.0.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..496a0552931c
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.0.0-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.0.0-r1.ebuild,v 1.1 2009/10/04 16:54:49 armin76 Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.6.3.901"
+#kPATCH="${P/_p*/}-patches-0.3"
+PATCH="${PN}-0.0.90-patches-0.3"
+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	)"
+
+#	mirror://gentoo/${PATCH}.tar.bz2
+#	http://dev.gentoo.org/~armin76/dist/${PATCH}.tar.bz2
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="+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} )
+	)
+	x86? ( dev-lang/nasm )
+	!net-misc/vnc
+	!net-misc/tightvnc
+	!net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	server?	(
+		x11-proto/bigreqsproto
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		x11-proto/dri2proto
+		x11-proto/fixesproto
+		x11-proto/fontsproto
+		x11-proto/randrproto
+		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 )
+		>=media-libs/mesa-7.1
+		>=x11-proto/renderproto-0.9.3
+		x11-libs/libpciaccess
+	)"
+
+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 --impl-headers ${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
+#	else
+#		rm -f "${WORKDIR}"/patch/*tigervnc-server*
+	fi
+
+#	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+	cd unix
+	eautoreconf
+	if use server ; then
+		epatch xserver16.patch
+		cd xserver
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	cd unix
+	econf || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd 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 \
+			--enable-glx \
+			--disable-config-dbus \
+			--disable-config-hal \
+			$(use_enable opengl glx) \
+			|| 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
+}