New patchset

Package-Manager: portage-2.1.2-r2

4 files changed, 182 insertions, 5 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 4a0b54939e6f..59c40f5705aa 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vnc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.66 2007/01/10 16:50:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.67 2007/01/23 20:07:41 armin76 Exp $
+
+*vnc-4.1.2-r1 (23 Jan 2007)
+
+  23 Jan 2007; Raúl Porcel <armin76@gentoo.org> +vnc-4.1.2-r1.ebuild:
+  New patchset
 
   10 Jan 2007; Raúl Porcel <armin76@gentoo.org> vnc-4.1.2.ebuild:
   Add patch to fix bug 154644
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 24c9a3489007..2ac97684717d 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,14 +1,19 @@
+DIST vnc-4.1.2-patches-0.3.tar.bz2 17311 RMD160 c2b0b057e3cc3b4589e21f67e35a8f1b72ff5957 SHA1 73a9f243f19afe3a4710d2152fd2e9d1be765a95 SHA256 e3ad99ad0e9cb8496c4d14995fbd919e2f2bc278638fe411f53ec3d041607bbc
 DIST vnc-4.1.2-patches-2.tar.bz2 13150 RMD160 dc4c2962d965b54e1c3389f11c3c462e8271e30c SHA1 f1c7f0f8263718df644acce7c2f5703f408efe2a SHA256 fc2bb5a7090fbb779114d84a728a14f3ecbab86f37109581e34d742b78dd0710
 DIST vnc-4_1_2-unixsrc.tar.gz 537713 RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 SHA1 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7 SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
+EBUILD vnc-4.1.2-r1.ebuild 4037 RMD160 910dcb6a03815c09cacfbc35cfff3da3cff03cef SHA1 540fc8ad2d17eb0a851c9db23afd8e1a89e4680d SHA256 0cb03d4eaa43b1b02475920afdbc90d89e2ca039981e0a43e444aefce3760749
+MD5 7d31816806a1552bbc580cd31ca4e672 vnc-4.1.2-r1.ebuild 4037
+RMD160 910dcb6a03815c09cacfbc35cfff3da3cff03cef vnc-4.1.2-r1.ebuild 4037
+SHA256 0cb03d4eaa43b1b02475920afdbc90d89e2ca039981e0a43e444aefce3760749 vnc-4.1.2-r1.ebuild 4037
 EBUILD vnc-4.1.2.ebuild 4015 RMD160 5d664936c0280ba45f3099c369c2dc0227ee44a1 SHA1 01689d072592e565770a53a528916aa740d26acb SHA256 a04860c81e0bc2f84bf4bad4662ec9fb3b3e544cc42e784321570b29147e7968
 MD5 1599a99a2b0f6e274d1f70445ed674cb vnc-4.1.2.ebuild 4015
 RMD160 5d664936c0280ba45f3099c369c2dc0227ee44a1 vnc-4.1.2.ebuild 4015
 SHA256 a04860c81e0bc2f84bf4bad4662ec9fb3b3e544cc42e784321570b29147e7968 vnc-4.1.2.ebuild 4015
-MISC ChangeLog 10666 RMD160 353e5182f76efcd63bbc66332ee1136e6cd0f9a9 SHA1 dcc9814bbb3c20a55b9d83261e83c8ec27ef4ed8 SHA256 66c8dfd993a75ff3761d6fac2aefd9b06019af8fd64e24a1c190569a86435c1b
-MD5 0f90002fc86cc9aeedcf09889547653c ChangeLog 10666
-RMD160 353e5182f76efcd63bbc66332ee1136e6cd0f9a9 ChangeLog 10666
-SHA256 66c8dfd993a75ff3761d6fac2aefd9b06019af8fd64e24a1c190569a86435c1b ChangeLog 10666
+MISC ChangeLog 10782 RMD160 dba16be19579968e50e6b33cedddac2cc03e8f9a SHA1 48d136a0c438e850d6e23ecbdeb20711896ddb16 SHA256 1341252b7b0636f96f01fa4240b9b190b4b6684bdc9d786ccb2e77010b7e1df9
+MD5 9a3b5fd88134b8dfbe1ddfca4d052068 ChangeLog 10782
+RMD160 dba16be19579968e50e6b33cedddac2cc03e8f9a ChangeLog 10782
+SHA256 1341252b7b0636f96f01fa4240b9b190b4b6684bdc9d786ccb2e77010b7e1df9 ChangeLog 10782
 MISC metadata.xml 285 RMD160 2bdfdc81153ba4c9857b853668141216b8d33fb9 SHA1 2c95c236b44a86f17fe3ecc7fa7d775587443ba3 SHA256 78f00ad3b66ff4b0ec0bca5c771f4d4ba69dab3ea88c198a5d54fb83fe8fddff
 MD5 3ba05c3b9f15d67563d5699dad396690 metadata.xml 285
 RMD160 2bdfdc81153ba4c9857b853668141216b8d33fb9 metadata.xml 285
@@ -16,3 +21,6 @@ SHA256 78f00ad3b66ff4b0ec0bca5c771f4d4ba69dab3ea88c198a5d54fb83fe8fddff metadata
 MD5 bc8aaf7e3d66e6a1f7e7357684629034 files/digest-vnc-4.1.2 771
 RMD160 7a2860c90da1517ae6c7f07f50a30fdb0bb81fca files/digest-vnc-4.1.2 771
 SHA256 f71dbe40196d3d0a03c557fdf88c66cf633734a6964c95d53e9dc61ad25ab84d files/digest-vnc-4.1.2 771
+MD5 77a5ed74e80f83bfd6ea7b93df9194c3 files/digest-vnc-4.1.2-r1 777
+RMD160 6ec71ca86914b1ef1810ea0876003d57e91cd32f files/digest-vnc-4.1.2-r1 777
+SHA256 dc279077b7809ae251d7d213cfd1c7d39e63e421067f3bf42bae0128ff42f0d1 files/digest-vnc-4.1.2-r1 777
diff --git a/net-misc/vnc/files/digest-vnc-4.1.2-r1 b/net-misc/vnc/files/digest-vnc-4.1.2-r1
new file mode 100644
index 000000000000..13b44a10459a
--- /dev/null
+++ b/net-misc/vnc/files/digest-vnc-4.1.2-r1
@@ -0,0 +1,9 @@
+MD5 f7585e280bee54af8ac3feb467b2e35a vnc-4.1.2-patches-0.3.tar.bz2 17311
+RMD160 c2b0b057e3cc3b4589e21f67e35a8f1b72ff5957 vnc-4.1.2-patches-0.3.tar.bz2 17311
+SHA256 e3ad99ad0e9cb8496c4d14995fbd919e2f2bc278638fe411f53ec3d041607bbc vnc-4.1.2-patches-0.3.tar.bz2 17311
+MD5 cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz 537713
+RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 vnc-4_1_2-unixsrc.tar.gz 537713
+SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542 vnc-4_1_2-unixsrc.tar.gz 537713
+MD5 a8ed678677af8ebb2fba5624602f6b2e xorg-server-1.1.1.tar.bz2 6252103
+RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 xorg-server-1.1.1.tar.bz2 6252103
+SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c xorg-server-1.1.1.tar.bz2 6252103
diff --git a/net-misc/vnc/vnc-4.1.2-r1.ebuild b/net-misc/vnc/vnc-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..adb229b7cb0e
--- /dev/null
+++ b/net-misc/vnc/vnc-4.1.2-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/01/23 20:07:41 armin76 Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.1.1"
+PATCH_VER=0.3
+
+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/${P}-patches-${PATCH_VER}.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 hppa ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE="server"
+
+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
+		>=x11-base/xorg-server-1.1
+	)
+	!net-misc/tightvnc"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	server?	(
+		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/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/
+	else
+		rm -f "${WORKDIR}"/patch/*vnc-server*
+	fi
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	cd unix
+	eautoreconf
+	cd ../common
+	eautoreconf
+
+	if use server ; then
+		cd "${S}"
+		cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+			unix/xc/programs/Xserver/Xvnc.man \
+			unix/xc/programs/Xserver/vnc/*.{h,cc} \
+			unix/xorg-server-*/hw/vnc
+		cp -a unix/xorg-server-*/{cfb/cfb.h,hw/vnc}
+		cp -a unix/xorg-server-*/{fb/fb.h,hw/vnc}
+		cp -a unix/xorg-server-*/{fb/fbrop.h,hw/vnc}
+		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
+			unix/xorg-server*/hw/vnc/{cfb,fb,fbrop}.h
+		cd unix/xorg-server-*
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	cd unix
+	econf --with-installed-zlib --with-fb || die "econf failed"
+	emake || die "emake failed"
+
+	if use server ; then
+		cd xorg-server-*
+		econf \
+			--enable-xorg \
+			--disable-dependency-tracking \
+			--disable-xprint \
+			--disable-static \
+			--enable-composite \
+			--with-xkb-output=/usr/share/X11/xkb \
+			--with-rgb-path=/usr/share/X11/rgb.txt \
+			--disable-xorgcfg \
+			--disable-dmx \
+			--disable-lbx \
+			--enable-xdmcp \
+			--disable-xevie \
+			--disable-dri \
+			--enable-glx \
+			--with-int10=stub \
+			--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 CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" || die "emake server failed"
+	fi
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	use server && dodir /usr/$(get_libdir)/xorg/modules/extensions
+
+	cd unix
+	./vncinstall "${D}"/usr/bin "${D}"/usr/share/man "${D}"/usr/$(get_libdir)/xorg/modules/extensions || die "failed to run vncinstall"
+	cd ..
+	dodoc README
+
+	if ! use server ; then
+		cd "${D}"
+		rm usr/bin/vncserver
+		rm usr/bin/x0vncserver
+		rm usr/share/man/man1/vnc{passwd,config,server}.1
+		rm usr/share/man/man1/x0vncserver.1
+		rm usr/bin/vncpasswd
+		rm usr/bin/vncconfig
+	fi
+}