update to close #138779

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 125 insertions, 5 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index c287692d237f..f55e3b2fc1f7 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.67 2006/06/06 18:19:55 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.68 2006/07/22 18:30:09 humpback Exp $
+
+  22 Jul 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/tightvnc-1.2.9-gentoo-2.diff, +tightvnc-1.2.9-r2.ebuild:
+  Added -r2 that fixes issue with new X files location. Thanks to Coornaert
+  David in bug #138779.
 
   06 Jun 2006; Guy Martin <gmsoft@gentoo.org> tightvnc-1.3_alpha7.ebuild:
   Stable on hppa.
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index b1a05bf4ff1c..479251b75c21 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.JavaViewer 18585 RMD160 e40c2e27bd4c31d9d389a4a59a6ab7ef256bc962 SHA1 7c2b1ca4051ed2ad89e7f745736b985ea5c75ab0 SHA256 44baa12f5ee918aacf762f0d32ae45bffab17eed77e7e3ed5b43d06e2876d150
 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
 RMD160 e40c2e27bd4c31d9d389a4a59a6ab7ef256bc962 files/README.JavaViewer 18585
@@ -10,6 +13,10 @@ AUX tightvnc-1.2.9-gcc34.patch 1540 RMD160 e5a305684eae3c6be90769c9263259903b2c8
 MD5 70b94ceb3134edc412d70768b55661aa files/tightvnc-1.2.9-gcc34.patch 1540
 RMD160 e5a305684eae3c6be90769c9263259903b2c841b files/tightvnc-1.2.9-gcc34.patch 1540
 SHA256 fa766be66960bb1b399c36350afac98dcc81bba65f757b82ca86efe335e6d540 files/tightvnc-1.2.9-gcc34.patch 1540
+AUX tightvnc-1.2.9-gentoo-2.diff 670 RMD160 68eca1394efac98f2b92a56eee47376c6fd0f49f SHA1 889029adf1898c615d933500c57de7e94a85013e SHA256 3faa2af9513457a9481455181bf32815a2dde11bd204ac64e7fe079bacc9d358
+MD5 cdeb20cb8bf492b66a4da8f2f18915e3 files/tightvnc-1.2.9-gentoo-2.diff 670
+RMD160 68eca1394efac98f2b92a56eee47376c6fd0f49f files/tightvnc-1.2.9-gentoo-2.diff 670
+SHA256 3faa2af9513457a9481455181bf32815a2dde11bd204ac64e7fe079bacc9d358 files/tightvnc-1.2.9-gentoo-2.diff 670
 AUX tightvnc-1.2.9-gentoo.diff 653 RMD160 b9e37306b5513ac628360f0aa162c04c501ab67d SHA1 d5bf010a49aef01c43a1920b8a3c9ca336c673e4 SHA256 0371c06c07246acc1310851578d63512b88f3df5e98ae2f21ccc96ad4c806d39
 MD5 31639d1ccaa2c2a4e9dd869fd32f4602 files/tightvnc-1.2.9-gentoo.diff 653
 RMD160 b9e37306b5513ac628360f0aa162c04c501ab67d files/tightvnc-1.2.9-gentoo.diff 653
@@ -60,14 +67,18 @@ EBUILD tightvnc-1.2.9-r1.ebuild 2146 RMD160 ba4418e9662b7f52a9b08774572d451424cd
 MD5 7fa234e5d9c5ba8d40110c5a72e8730a tightvnc-1.2.9-r1.ebuild 2146
 RMD160 ba4418e9662b7f52a9b08774572d451424cd35f0 tightvnc-1.2.9-r1.ebuild 2146
 SHA256 ff9e3b6115b8b43f4adaee99904aff07fe1549e014b04e9a220901bae150fb94 tightvnc-1.2.9-r1.ebuild 2146
+EBUILD tightvnc-1.2.9-r2.ebuild 2191 RMD160 e00814577a984239f06bac66e7c814d4e75a6fe9 SHA1 72464285354b2f968b677bac37736bb9199315ad SHA256 6acfbf97523da3c2d93ccd3dc1f2852f96e2145268949390c63856751c30ea66
+MD5 f4af8ce6eb02cc03189524dee4eb94e0 tightvnc-1.2.9-r2.ebuild 2191
+RMD160 e00814577a984239f06bac66e7c814d4e75a6fe9 tightvnc-1.2.9-r2.ebuild 2191
+SHA256 6acfbf97523da3c2d93ccd3dc1f2852f96e2145268949390c63856751c30ea66 tightvnc-1.2.9-r2.ebuild 2191
 EBUILD tightvnc-1.3_alpha7.ebuild 2633 RMD160 68c4415cdbf8f0e21975ec7882b62daab6660bd1 SHA1 06abf1d5c547eaef6e787fd501377c2dd1c50df3 SHA256 11b8ae99e0d080bca1e87e1fe3f0c708dc887d90c86091cfb64d3a724ca94993
 MD5 316d7d331a4aba48e2f3beb0900ca3de tightvnc-1.3_alpha7.ebuild 2633
 RMD160 68c4415cdbf8f0e21975ec7882b62daab6660bd1 tightvnc-1.3_alpha7.ebuild 2633
 SHA256 11b8ae99e0d080bca1e87e1fe3f0c708dc887d90c86091cfb64d3a724ca94993 tightvnc-1.3_alpha7.ebuild 2633
-MISC ChangeLog 9945 RMD160 abc2bf07264d41aa8d7fc742594e74ddf671c0a5 SHA1 a2fc583f5d675a4a5e1d766d9b23fe973351b77d SHA256 64f59515e441fef0c7710d2dfdfff5817d8a4625a08801c8fc50cd8ad366d786
-MD5 156b020342f60cc77ecb18e5e0e3aa70 ChangeLog 9945
-RMD160 abc2bf07264d41aa8d7fc742594e74ddf671c0a5 ChangeLog 9945
-SHA256 64f59515e441fef0c7710d2dfdfff5817d8a4625a08801c8fc50cd8ad366d786 ChangeLog 9945
+MISC ChangeLog 10171 RMD160 9513a9c049e5aab5a33b6752582bf0b2ff92ea9d SHA1 449e9e41396db979ddbeb5cd836fe994be2e30a6 SHA256 26ada6cd9a308d5ca60416d498c32cd53c6d690b47d59b84fb8e755df8df8214
+MD5 7b2b7b241df1c39e1f70a3567c345604 ChangeLog 10171
+RMD160 9513a9c049e5aab5a33b6752582bf0b2ff92ea9d ChangeLog 10171
+SHA256 26ada6cd9a308d5ca60416d498c32cd53c6d690b47d59b84fb8e755df8df8214 ChangeLog 10171
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -75,6 +86,16 @@ SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata
 MD5 31a483eed14190f8cd911b0d05521431 files/digest-tightvnc-1.2.9-r1 274
 RMD160 c998a7ff40fb44c186f7089d877a68b8e33a4a06 files/digest-tightvnc-1.2.9-r1 274
 SHA256 c7b13ad35c4b2e2bde6a2fcb01b6ad276384a265613a35ee739c2a3f0c2e3ea3 files/digest-tightvnc-1.2.9-r1 274
+MD5 31a483eed14190f8cd911b0d05521431 files/digest-tightvnc-1.2.9-r2 274
+RMD160 c998a7ff40fb44c186f7089d877a68b8e33a4a06 files/digest-tightvnc-1.2.9-r2 274
+SHA256 c7b13ad35c4b2e2bde6a2fcb01b6ad276384a265613a35ee739c2a3f0c2e3ea3 files/digest-tightvnc-1.2.9-r2 274
 MD5 afc732a9264f824104e222a2e1b8485d files/digest-tightvnc-1.3_alpha7 280
 RMD160 575d59cc1f7bfb4ac81263a70796ee78ecee2b34 files/digest-tightvnc-1.3_alpha7 280
 SHA256 8b5239e5d4fbf4ea657ae8e074987321f193c510d0200b6d107367c210fa4957 files/digest-tightvnc-1.3_alpha7 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEwm688zY1VwezZiERAspxAJwIxZMGZRZ53lx7ApC1Qbsrlt13KwCgq8Rh
+XYzp9br3zIv97menIdUcZA0=
+=f2gS
+-----END PGP SIGNATURE-----
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r2 b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r2
new file mode 100644
index 000000000000..d72709d4f9b6
--- /dev/null
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r2
@@ -0,0 +1,3 @@
+MD5 f804b26c098625e3a2675a0aa7709e31 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
+RMD160 57c4d24bbc008b7188ae4bb177fbb409bc1d26d3 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
+SHA256 c1ba77f832d6c81349f05219802c48b3435cfb6db88f496c9bb08b52b8405548 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo-2.diff b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo-2.diff
new file mode 100644
index 000000000000..c19b1611b89a
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.2.9-gentoo-2.diff
@@ -0,0 +1,15 @@
+--- vncserver.ori	2006-07-22 19:21:09.000000000 +0100
++++ vncserver	2006-07-22 19:25:56.000000000 +0100
+@@ -41,10 +41,10 @@
+ $fontPath = "unix/:-1";
+ 
+ # Here is another example of setting the font path:
+-$fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
++$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/corefonts/";
+ 
+ # X colors database path is optional, uncomment and edit to use:
+-# $colorPath = "/usr/lib/X11/rgb";
++$colorPath = "/usr/share/X11/rgb";
+ 
+ # You might wish to make your vnc directory under /tmp, to make sure
+ # passwords are always kept on the local filesystem. To do that, just
diff --git a/net-misc/tightvnc/tightvnc-1.2.9-r2.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r2.ebuild
new file mode 100644
index 000000000000..4dbb1019edc7
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r2.ebuild,v 1.1 2006/07/22 18:30:09 humpback Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE="java tcpd"
+
+S="${WORKDIR}/vnc_unixsrc"
+DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
+SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
+HOMEPAGE="http://www.tightvnc.com/"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="|| ( ( x11-libs/libXaw
+						x11-proto/xextproto
+						>=x11-misc/imake-1
+						x11-misc/gccmakedep
+						app-text/rman
+						x11-libs/libXp
+						x11-proto/inputproto
+						x11-proto/kbproto
+						x11-proto/printproto
+						x11-proto/scrnsaverproto
+				)
+				virtual/x11
+		)
+	~media-libs/jpeg-6b
+	sys-libs/zlib
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	!net-misc/vnc"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.security.patch
+	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+	[[ "$(gcc-version)" == "3.4" ]] || [[ "$(gcc-major-version)" == "4" ]] && epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/x86.patch
+	epatch ${FILESDIR}/${P}-amd64.patch
+	epatch ${FILESDIR}/${P}-gentoo-2.diff
+}
+
+src_compile() {
+	local CDEBUGFLAGS="${CFLAGS}"
+
+	xmkmf -a || die "xmkmf failed"
+
+	make CDEBUGFLAGS="${CDEBUGFLAGS}" World || die "make World failed"
+	cd Xvnc && ./configure || die "Configure failed."
+
+	if use tcpd; then
+		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="${CDEBUGFLAGS}" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
+	else
+		make CDEBUGFLAGS="${CDEBUGFLAGS}"
+	fi
+}
+
+src_install() {
+	# the web based interface and the java viewer need the java class files
+	insinto /usr/share/tightvnc/classes ; doins classes/*
+
+	dodir /usr/share/man/man1 /usr/bin
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
+
+	dodoc ChangeLog README WhatsNew
+	use java && dodoc ${FILESDIR}/README.JavaViewer
+	newdoc vncviewer/README README.vncviewer
+}