version bump thanks to <sorry bugzilla is down> in bug 86520

Package-Manager: portage-2.1.1_pre5-r1

6 files changed, 206 insertions, 14 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 6b0b16c77ec7..3c9004f412de 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.46 2006/07/15 13:27:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.47 2006/08/17 08:33:46 genstef Exp $
+
+*vnc-4.1.2 (17 Aug 2006)
+
+  17 Aug 2006; Stefan Schweizer <genstef@gentoo.org> metadata.xml,
+  +vnc-4.1.2.ebuild:
+  version bump thanks to <sorry bugzilla is down> in bug 86520
 
   15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove aliz from metadata.xml as he's retired.
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index ff0c9961ff78..4a0740f0941f 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -57,19 +57,29 @@ SHA256 03a5f8d61b99379b631fbc22a3c2f344a315a5ce884ee9fd23542f4446dfb8f4 files/xc
 DIST X11R6.8.1-src1.tar.gz 30562401
 DIST X11R6.8.1-src2.tar.gz 5808949
 DIST X11R6.8.1-src3.tar.gz 10014808
-DIST vnc-4.0-unixsrc.tar.gz 482518
+DIST vnc-4.0-unixsrc.tar.gz 482518 RMD160 dc95a7de6b59f148dae99b7977572a88e8c52a2a SHA1 f3b7f3e67d4554d53c37b8805b357f84563428b7 SHA256 5d0842a3aa3af04e43790ce0e63b9758b636267eb13269927440123cf131b275
+DIST vnc-4.1.2-patches.tar.bz2 13013 RMD160 9955cb032dff33c2d711474fe6dafa5356f314c5 SHA1 fa22c44072cc9c8ef28f48cb3ed5a45d791be259 SHA256 ce2513d17d39125afdcb8257b3ce33a7e6615700e12d710e84b50f48acd5be64
+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.0-r1.ebuild 3033 RMD160 4460a3b0355206751d4835e61682c987c8413c2d SHA1 56a61f2c82620721376b11506f93c984c8cb9c45 SHA256 50cb37be0d6788a63e8a0fb2e3ab27ab244047528360ebe2c600059c58907186
 MD5 7659aa4bd1d3fbeafb3c414995936a41 vnc-4.0-r1.ebuild 3033
 RMD160 4460a3b0355206751d4835e61682c987c8413c2d vnc-4.0-r1.ebuild 3033
 SHA256 50cb37be0d6788a63e8a0fb2e3ab27ab244047528360ebe2c600059c58907186 vnc-4.0-r1.ebuild 3033
-MISC ChangeLog 7996 RMD160 6f0dfb9ad9898960ec0233b6c8956362b873eff7 SHA1 8f4bb7c39f6ac76c8d1bf45ba5c65bbdc6294a65 SHA256 c26fc025e14dae6278d4e6e326939e841e2dd15bbe0b18fc3b5612e109754999
-MD5 301db3a41b6bb5947871d81d8541bd94 ChangeLog 7996
-RMD160 6f0dfb9ad9898960ec0233b6c8956362b873eff7 ChangeLog 7996
-SHA256 c26fc025e14dae6278d4e6e326939e841e2dd15bbe0b18fc3b5612e109754999 ChangeLog 7996
-MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
-MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
-SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
-MD5 dd22cba6dc210f48cc6236d1d4566e9a files/digest-vnc-4.0-r1 270
-RMD160 45091cfec09e08868625ee538837e40edf1477da files/digest-vnc-4.0-r1 270
-SHA256 7326cc6f56b489775ee3420c080e18f72bd366f04f1563350bb75e861316ee9c files/digest-vnc-4.0-r1 270
+EBUILD vnc-4.1.2.ebuild 4591 RMD160 e4a7fb95d9a0336ffe5433a615d29c770c61b797 SHA1 033c68aa8e657af5f7a0eb23eae9a40bf555cd50 SHA256 5035f462230847bbece8a8a8f66f4441606857927fd2d380520c43114c3438d3
+MD5 1ad3d2736cf644f17ad919f1aa14f8cb vnc-4.1.2.ebuild 4591
+RMD160 e4a7fb95d9a0336ffe5433a615d29c770c61b797 vnc-4.1.2.ebuild 4591
+SHA256 5035f462230847bbece8a8a8f66f4441606857927fd2d380520c43114c3438d3 vnc-4.1.2.ebuild 4591
+MISC ChangeLog 8175 RMD160 090c1b908382cf1d9d7bbe00b0b83e9f725b060b SHA1 268a8148524e174758ee916142d2e6bccb89d3f5 SHA256 9dd006647133f57806be854ac58e3e26796091f4ead28321b1da0d815495c5ca
+MD5 6551ef9fa7a4c7c622a98d4ee50dce0e ChangeLog 8175
+RMD160 090c1b908382cf1d9d7bbe00b0b83e9f725b060b ChangeLog 8175
+SHA256 9dd006647133f57806be854ac58e3e26796091f4ead28321b1da0d815495c5ca ChangeLog 8175
+MISC metadata.xml 170 RMD160 0c6b102787098d03cbf0bdbed37dabbd0de6654e SHA1 ba2300f5740c3b005419388cec650037e927799f SHA256 53b07ee8fc55e6e45232b2d798d00da0d1056ef3f963816e46b410bbdb676623
+MD5 a62858e8c9d87aaaaa3356a1c94ef18d metadata.xml 170
+RMD160 0c6b102787098d03cbf0bdbed37dabbd0de6654e metadata.xml 170
+SHA256 53b07ee8fc55e6e45232b2d798d00da0d1056ef3f963816e46b410bbdb676623 metadata.xml 170
+MD5 3905c8c5dfcf1a61e7414ff4896a21b7 files/digest-vnc-4.0-r1 450
+RMD160 a8cdc2ff6c5f0d5d7e24d4cd18e7fcdefe8fc53c files/digest-vnc-4.0-r1 450
+SHA256 4cb116e6e37a5ef5653f494fb57c8f3aa334accb80377428553c1227e2eeee28 files/digest-vnc-4.0-r1 450
+MD5 ea722f9a27864acf92cc49a65bda8065 files/digest-vnc-4.1.2 765
+RMD160 eebc91dfc511f81add65472c4e945726b410d966 files/digest-vnc-4.1.2 765
+SHA256 b77bef8261288d9fe399ed2cb9ef731c3004049bf4502e23b7640a920481dfef files/digest-vnc-4.1.2 765
diff --git a/net-misc/vnc/files/digest-vnc-4.0-r1 b/net-misc/vnc/files/digest-vnc-4.0-r1
index af701b219493..8bcfb74a6f09 100644
--- a/net-misc/vnc/files/digest-vnc-4.0-r1
+++ b/net-misc/vnc/files/digest-vnc-4.0-r1
@@ -2,3 +2,5 @@ MD5 e352319d423391ff2c03bb7f81fe8d2b X11R6.8.1-src1.tar.gz 30562401
 MD5 6ba36becf1133c61a88c92e1d60c19ed X11R6.8.1-src2.tar.gz 5808949
 MD5 8578e566e909e7c40300f44b6f0e88d3 X11R6.8.1-src3.tar.gz 10014808
 MD5 e8e79964b76e09e3a19c35cceb9e24b3 vnc-4.0-unixsrc.tar.gz 482518
+RMD160 dc95a7de6b59f148dae99b7977572a88e8c52a2a vnc-4.0-unixsrc.tar.gz 482518
+SHA256 5d0842a3aa3af04e43790ce0e63b9758b636267eb13269927440123cf131b275 vnc-4.0-unixsrc.tar.gz 482518
diff --git a/net-misc/vnc/files/digest-vnc-4.1.2 b/net-misc/vnc/files/digest-vnc-4.1.2
new file mode 100644
index 000000000000..86e693975d16
--- /dev/null
+++ b/net-misc/vnc/files/digest-vnc-4.1.2
@@ -0,0 +1,9 @@
+MD5 11830ad3f636ce9e92cf7f1fc746ce48 vnc-4.1.2-patches.tar.bz2 13013
+RMD160 9955cb032dff33c2d711474fe6dafa5356f314c5 vnc-4.1.2-patches.tar.bz2 13013
+SHA256 ce2513d17d39125afdcb8257b3ce33a7e6615700e12d710e84b50f48acd5be64 vnc-4.1.2-patches.tar.bz2 13013
+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/metadata.xml b/net-misc/vnc/metadata.xml
index 20ce219711a2..d52c9e243149 100644
--- a/net-misc/vnc/metadata.xml
+++ b/net-misc/vnc/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>maintainer-needed</herd>
 </pkgmetadata>
diff --git a/net-misc/vnc/vnc-4.1.2.ebuild b/net-misc/vnc/vnc-4.1.2.ebuild
new file mode 100644
index 000000000000..d93d87af4f3f
--- /dev/null
+++ b/net-misc/vnc/vnc-4.1.2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/08/17 08:33:46 genstef Exp $
+
+inherit eutils toolchain-funcs multilib autotools
+
+XSERVER_VERSION="1.1.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
+	http://www.gentooexperimental.org/~genstef/dist/${P}-patches.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 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="server"
+
+RDEPEND="sys-libs/zlib
+	media-libs/freetype
+	|| ( ( x11-libs/libSM
+			x11-libs/libXtst
+		)
+		virtual/x11
+	)
+	server? ( || ( ( x11-libs/libXi
+			x11-libs/libXfont
+			x11-libs/libXmu
+			x11-libs/libxkbfile
+			x11-libs/libXrender
+			x11-apps/xauth
+			x11-apps/xsetroot
+			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
+			media-fonts/font-adobe-100dpi
+			media-fonts/font-adobe-75dpi
+			media-fonts/font-alias
+			media-fonts/font-cursor-misc
+			media-fonts/font-misc-misc
+			)
+			virtual/x11
+		)
+	)
+	!net-misc/tightvnc"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+		)
+		virtual/x11
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+
+	# patches from Fedora
+	epatch ${WORKDIR}/${P}/vnc-viewer-reparent.patch
+	epatch ${WORKDIR}/${P}/vnc-newfbsize.patch
+
+	if use server; then
+		mv ${WORKDIR}/xorg-server-${XSERVER_VERSION} unix/
+
+		# patches from Fedora
+		epatch ${WORKDIR}/${P}/vnc-cookie.patch
+		epatch ${WORKDIR}/${P}/vnc-gcc4.patch
+		epatch ${WORKDIR}/${P}/vnc-use-fb.patch
+		epatch ${WORKDIR}/${P}/vnc-xclients.patch
+		epatch ${WORKDIR}/${P}/vnc-idle.patch
+		epatch ${WORKDIR}/${P}/vnc-via.patch
+		epatch ${WORKDIR}/${P}/vnc-build.patch
+		epatch ${WORKDIR}/${P}/vnc-fPIC.patch
+		epatch ${WORKDIR}/${P}/vnc-restart.patch
+		epatch ${WORKDIR}/${P}/vnc-vncpasswd.patch
+		epatch ${WORKDIR}/${P}/vnc-def.patch
+		epatch ${WORKDIR}/${P}/vnc-modular-xorg.patch
+		epatch ${WORKDIR}/${P}/vnc-nohttpd.patch
+
+		cd unix/xorg-server-*
+		epatch ${WORKDIR}/${P}/vnc-fontpath.patch
+		epatch ${WORKDIR}/${P}/vnc-s390.patch
+
+		cd ../../
+
+		epatch ${WORKDIR}/${P}/vnc-64bit.patch
+		epatch ${WORKDIR}/${P}/vnc-select.patch
+		epatch ${WORKDIR}/${P}/vnc-opengl.patch
+
+		cp -a ${S}/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
+			${S}/unix/xc/programs/Xserver/Xvnc.man \
+			${S}/unix/xc/programs/Xserver/vnc/*.{h,cc} \
+			${S}/unix/xorg-server-*/hw/vnc
+		cp -a ${S}/unix/xorg-server-*/{cfb/cfb.h,hw/vnc}
+		cp -a ${S}/unix/xorg-server-*/{fb/fb.h,hw/vnc}
+		cp -a ${S}/unix/xorg-server-*/{fb/fbrop.h,hw/vnc}
+		sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
+			${S}/unix/xorg-server*/hw/vnc/{cfb,fb,fbrop}.h
+	fi
+}
+
+src_compile() {
+	cd unix
+	eautoreconf
+	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 \
+			--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)/modules/extensions
+
+	cd unix
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/$(get_libdir)/modules/extensions || die
+	cd ..
+	dodoc README
+
+	use server || (
+		rm ${D}/usr/bin/vncserver
+		rm ${D}/usr/bin/x0vncserver
+		rm ${D}/usr/share/man/man1/vnc{passwd,config,server}.1
+		rm ${D}/usr/share/man/man1/x0vncserver.1
+		rm ${D}/usr/bin/vncpasswd
+		rm ${D}/usr/bin/vncconfig
+	)
+
+	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
+}