Revision bump, now it uses xorg-1.5.1, fixes bug #193047 and bug #147436

Package-Manager: portage-2.1.4.4

4 files changed, 205 insertions, 3 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index a6919253dd74..0d6611ac3a46 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vnc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.109 2008/10/05 20:55:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.110 2008/10/07 20:46:34 armin76 Exp $
+
+*vnc-4.1.2-r5 (07 Oct 2008)
+
+  07 Oct 2008; Raúl Porcel <armin76@gentoo.org> metadata.xml,
+  +vnc-4.1.2-r5.ebuild:
+  Revision bump, now it uses xorg-1.5.1, fixes bug #193047 and bug #147436
 
   05 Oct 2008; Raúl Porcel <armin76@gentoo.org> vnc-4.1.2-r4.ebuild:
   Add patch to fix libtool-2.2 failure, bug #237611
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 9762b6e4f635..cdde332ce6dd 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -3,8 +3,11 @@ AUX vnc.confd 341 RMD160 3ec4bdfd3fd2c5938c3969305f04020342e9263d SHA1 4b7f5f708
 AUX vnc.initd 1538 RMD160 935834931e769ddc58235917d4c891cd495c4d8b SHA1 42760322ae58b74ce0848a0962ef574ba624a9a3 SHA256 1b5c4c2cb3cfd45f712136a671d0450addb9c77aa992874027b05652afd6f438
 AUX vncviewer.png 1048 RMD160 ad99643d65a77044cac96a31dc46b16f8273b4c7 SHA1 e463d04d7fbbece2495ad424feec1fe009e20a16 SHA256 0780cf53e78b43849bdb9f31ad0103bb4dd98489ed59c76e5c50cf0a6ff3db41
 DIST vnc-4.1.2-r4-patches-0.5.tar.bz2 16721 RMD160 2f65ff144daca9af4f0fb3a20997d467ca1d677a SHA1 4985f1b16e3f19c680a809eab186200193156ffb SHA256 f9c0b0d77d2f266f0cac3aef95adb35ba8c9418f21bbb096bc1411a5ffb34ef2
+DIST vnc-4.1.2-r5-patches-0.1.tar.bz2 25955 RMD160 60fbcfff846fdd8762bbc0cf8cfeb1b449393906 SHA1 c8636bc2b7e019dd2ce8a4859f25f50704041f65 SHA256 9dbfe26b206c74d69984214f6048fcebea57b406ce6d72d0c1f0f805230a02b3
 DIST vnc-4_1_2-unixsrc.tar.gz 537713 RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 SHA1 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7 SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542
 DIST xorg-server-1.3.0.0.tar.bz2 5968263 RMD160 1a4fecd73aed0d5adabe84066c24ce69dc2c2dc1 SHA1 6f9645fe70da5b6a121f3e8fa6c2fc1e4307390c SHA256 93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
+DIST xorg-server-1.5.1.tar.bz2 5614990 RMD160 07ea0b352b4eead694a8730ea3bab1587a4f02b1 SHA1 a08fc6b9a46b13fa652209a87b91a005b638d018 SHA256 2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
 EBUILD vnc-4.1.2-r4.ebuild 4738 RMD160 8224b9a825cc21a502fc92ef327056db3c616d64 SHA1 d8ae28cc5e54cfb2c82410d817db34a1044630fa SHA256 335d4a8039f32e1411c8b3625da2080f56be055ff99267740303223350482206
-MISC ChangeLog 15769 RMD160 7d513155a01f799111a584846c26361a7dbaea2c SHA1 f97dd1f1f6b338b1e30e8d03dd8adc4da20dcce6 SHA256 99c57b3841964d7c57d9d3ec27074fe04fdf59c3c3f6a5df488069bd1ab2c513
-MISC metadata.xml 296 RMD160 ae486922a7d5d714482cdfa5d44f663185fef1c3 SHA1 8f21fe7b4db44f43f9f4263490882e3cc6d8c9ad SHA256 496a91966c895f25b2b4970f315b57eca9dd7073e81c6d5f29b86d37702e001b
+EBUILD vnc-4.1.2-r5.ebuild 4887 RMD160 e1d08500d144bca88447a9cf6c6a60230fe1b4cf SHA1 742d7253cb9c5985fa1d7941e6a325bfa136344c SHA256 65ad830e84f7ede682c7e7b31abb2fc5666ff906bf7ec449fe42741656b93555
+MISC ChangeLog 15961 RMD160 6af90b7539a62f6c88f5e8442968d0458f60db9c SHA1 983eeb9eab8e1387f97c65ef22e2e9dc8657c3d7 SHA256 7d49917c72e1f83a9b4176c4c3a9f0f18db40886af8baa7a59be1a2b36e61f65
+MISC metadata.xml 353 RMD160 9182601f0c747cc5b0ca5ef851d3badb9df4373b SHA1 446fcb655f047d6c01ed222ab1f22242596eb539 SHA256 1f140f4c66f228965291c2e2945c7ac573a0fb3630bf1c76d012c17240084740
diff --git a/net-misc/vnc/metadata.xml b/net-misc/vnc/metadata.xml
index 840a61c2c015..b6cd2611111b 100644
--- a/net-misc/vnc/metadata.xml
+++ b/net-misc/vnc/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="server">Build VNC server</flag>
+    <flag name="xorgmodule">Build the Xorg module</flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/vnc/vnc-4.1.2-r5.ebuild b/net-misc/vnc/vnc-4.1.2-r5.ebuild
new file mode 100644
index 000000000000..07b4e31b3566
--- /dev/null
+++ b/net-misc/vnc/vnc-4.1.2-r5.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2-r5.ebuild,v 1.1 2008/10/07 20:46:34 armin76 Exp $
+
+EAPI="1"
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.5.1"
+PATCH="${P}-r5-patches-0.1"
+
+MY_P="vnc-4_1_2-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 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="server +xorgmodule"
+
+RDEPEND="sys-libs/zlib
+	media-libs/freetype
+	x11-libs/libSM
+	x11-libs/libXtst
+	server? (
+		x11-libs/libXi
+		x11-libs/libXfont
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		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/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
+	)"
+
+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
+	fi
+}
+
+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}"/${P}-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 \
+			--enable-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}
+}