Reverting incomplete dep fix for -r1 ebuild. Adding missing deps for USE=server. Adding opengl useflag for server and the deps that pulls in. Keep opengl enabled by default to mirror previous behaviour.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 226 insertions, 3 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 29f2eb3501bb..d4cc2619812b 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vnc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.122 2009/03/07 10:26:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.123 2009/03/07 11:32:55 patrick Exp $
+
+*vnc-4.1.3-r2 (07 Mar 2009)
+
+  07 Mar 2009; Patrick Lauer <patrick@gentoo.org> vnc-4.1.3-r1.ebuild,
+  +vnc-4.1.3-r2.ebuild:
+  Reverting incomplete dep fix for -r1 ebuild. Adding missing deps for
+  USE=server. Adding opengl useflag for server and the deps that pulls in.
+  Keep opengl enabled by default to mirror previous behaviour.
 
   07 Mar 2009; Patrick Lauer <patrick@gentoo.org> vnc-4.1.3-r1.ebuild:
   Adding x11-proto/glproto to deps for USE=server.
diff --git a/net-misc/vnc/vnc-4.1.3-r1.ebuild b/net-misc/vnc/vnc-4.1.3-r1.ebuild
index ee47114bf5a3..c2cf7c1502f5 100644
--- a/net-misc/vnc/vnc-4.1.3-r1.ebuild
+++ b/net-misc/vnc/vnc-4.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.3-r1.ebuild,v 1.3 2009/03/07 10:26:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.3-r1.ebuild,v 1.4 2009/03/07 11:32:55 patrick Exp $
 
 EAPI="1"
 
@@ -36,7 +36,6 @@ RDEPEND="sys-libs/zlib
 		x11-libs/libXrender
 		x11-apps/xauth
 		x11-apps/xsetroot
-		x11-proto/glproto
 		media-fonts/font-adobe-100dpi
 		media-fonts/font-adobe-75dpi
 		media-fonts/font-alias
diff --git a/net-misc/vnc/vnc-4.1.3-r2.ebuild b/net-misc/vnc/vnc-4.1.3-r2.ebuild
new file mode 100644
index 000000000000..47407a1de408
--- /dev/null
+++ b/net-misc/vnc/vnc-4.1.3-r2.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.3-r2.ebuild,v 1.1 2009/03/07 11:32:55 patrick Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+OPENGL_DIR="xorg-x11"
+XSERVER_VERSION="1.5.3"
+PATCH="${PN}-4.1.2-r5-patches-0.1"
+
+MY_P="vnc-4_1_3-unixsrc"
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.realvnc.com/"
+SRC_URI="http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/${MY_P}.tar.gz
+	http://ftp.plusline.de/FreeBSD/distfiles/xc/${MY_P}.tar.gz
+	mirror://gentoo/${PATCH}.tar.bz2
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+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-apps/xauth
+		x11-apps/xsetroot
+		x11-proto/dri2proto
+		x11-proto/xf86driproto
+		opengl? ( x11-proto/glproto )
+		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/tightvnc
+	!net-misc/xf4vnc"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xextproto
+	server?	(
+		x11-proto/bigreqsproto
+		x11-proto/compositeproto
+		x11-proto/damageproto
+		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/xf86miscproto
+		x11-proto/xf86vidmodeproto
+		>=media-libs/mesa-7.1
+		>=x11-proto/renderproto-0.9.3
+		x11-libs/libpciaccess
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if ! use server ; then
+		echo
+		einfo "The 'server' USE flag will build vnc'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
+		mv "${WORKDIR}"/xorg-server-${XSERVER_VERSION} unix/xorg-x11-server-source
+	else
+		rm -f "${WORKDIR}"/patch/*vnc-server*
+	fi
+
+	if use server ; then
+		cd unix
+		mkdir xorg-x11-server-source/hw/vnc
+		cp -RPp xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+			xc/programs/Xserver/Xvnc.man \
+			xc/programs/Xserver/vnc/*.{h,cc} \
+			xorg-x11-server-source/hw/vnc
+		cp -RPp xorg-x11-server-source/{cfb/cfb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fb.h,hw/vnc}
+		cp -RPp xorg-x11-server-source/{fb/fbrop.h,hw/vnc}
+		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
+			xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h
+	fi
+
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	epatch "${FILESDIR}"/${PN}-4.1.2-freebsd.patch
+
+	cd common
+	eautoreconf
+	cd ../unix
+	eautoreconf
+	if use server; then
+		cd xorg-x11-server-source
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	cd common
+	econf || die "econf failed"
+	emake || die "emake failed"
+	cd ../unix
+	econf || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd xorg-x11-server-source
+		econf \
+			--disable-xorg \
+			--disable-xnest --disable-xvfb --disable-dmx \
+			--disable-xwin --disable-xephyr --disable-kdrive \
+			--with-pic \
+			--disable-xorgcfg \
+			--disable-xprint \
+			--disable-static \
+			--disable-composite \
+			--disable-xtrap \
+			--enable-xcsecurity \
+			--with-xkb-output=/usr/share/X11/xkb \
+			--with-rgb-path=/usr/share/X11/rgb.txt \
+			--disable-xevie \
+			--disable-dri2 \
+			$(use_enable opengl glx) \
+			--disable-config-dbus \
+			--disable-config-hal \
+			--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 \
+			|| die "econf server failed"
+		emake || die "emake server failed"
+	fi
+}
+
+src_install() {
+	cd common
+	emake DESTDIR="${D}" install || die "emake install failed"
+	cd ../unix
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newman vncviewer/vncviewer.man vncviewer.1
+	cd ..
+	dodoc README
+
+	doicon "${FILESDIR}"/vncviewer.png
+	make_desktop_entry vncviewer vncviewer vncviewer Network
+
+	if use server ; then
+		cd unix
+		dobin vncserver || die "dobin failed"
+		for f in vncviewer/vncviewer vncpasswd/vncpasswd \
+			vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do
+			mv $f.man $f.1
+			doman $f.1
+		done
+
+		cd xorg-x11-server-source/hw/vnc
+		emake DESTDIR="${D}" install || die "emake install failed"
+		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
+
+		newman Xvnc.man Xvnc.1
+		newconfd "${FILESDIR}"/vnc.confd vnc
+		newinitd "${FILESDIR}"/vnc.initd vnc
+
+		rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
+	else
+		cd "${D}"
+		rm usr/bin/x0vncserver
+		rm usr/bin/vncpasswd
+		rm usr/bin/vncconfig
+	fi
+
+	rm "${D}"/usr/$(get_libdir)/librfb.{a,la,so}
+}
+
+pkg_postinst() {
+	use server && switch_opengl_implem
+}