Adjust vncserver script to work with mod X, thanks to Maxxer <lorenzo.milesi@gmail.com> and Martin von Gagern, adjust 1.2.9-r1 to have it use mod X deps

Package-Manager: portage-2.1_pre7-r4

9 files changed, 137 insertions, 24 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index e2d5b7965f8f..2973ed55e730 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,17 @@
 # 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.65 2006/02/14 00:34:18 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.66 2006/04/23 22:08:00 morfic Exp $
+
+*tightvnc-1.2.9-r2 (23 Apr 2006)
+
+  23 Apr 2006; Daniel Goller <morfic@gentoo.org> +files/vncserver-1.2.patch,
+  +files/vncserver-1.3.patch, metadata.xml, +tightvnc-1.2.9-r2.ebuild,
+  tightvnc-1.3_alpha7.ebuild:
+  Adjust vncserver script to work with mod X, thanks to Maxxer
+  <lorenzo.milesi@gmail.com> and Martin von Gagern, adjust 1.2.9-r1 to have it use mod X deps
+
+  30 Mar 2006; Daniel Goller <morfic@gentoo.org> metadata.xml:
+  Remove Aliz since he no longer maintains this
 
   14 Feb 2006; Daniel Goller <morfic@gentoo.org>
   -files/tightvnc-1.2.8-gentoo.diff,
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index a344c486e1d0..5217bdfcca89 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,28 +1,70 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6a21f3e5fe52f114ec7e5d2275aa9539 ChangeLog 9370
+MD5 33c78e67f2f52667c90e843559ddd706 ChangeLog 9852
+RMD160 eda79328127b3fa9436990648ffec4c6cb03b3bc ChangeLog 9852
+SHA256 777f42adbc4ff5ce99a0f0fee1c2d3398fa18a59e6a4c0a99d0ca30eda22620d ChangeLog 9852
 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
-MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
-MD5 e972798c3780581c31b4c0a4b35dfbb6 files/digest-tightvnc-1.3_alpha7 78
+RMD160 e40c2e27bd4c31d9d389a4a59a6ab7ef256bc962 files/README.JavaViewer 18585
+SHA256 44baa12f5ee918aacf762f0d32ae45bffab17eed77e7e3ed5b43d06e2876d150 files/README.JavaViewer 18585
+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 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
 MD5 7f0dcab7d01dfc820fabe9a79872085c files/tightvnc-1.2.9-amd64.patch 5874
+RMD160 1f946ae361db97afcfaf9303197cbe5fe2bc137b files/tightvnc-1.2.9-amd64.patch 5874
+SHA256 d0e8e0dd1b56f1dac28bc10a20f2af194027c2b3db06eded30efa472b50c1ddf files/tightvnc-1.2.9-amd64.patch 5874
 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
 MD5 31639d1ccaa2c2a4e9dd869fd32f4602 files/tightvnc-1.2.9-gentoo.diff 653
+RMD160 b9e37306b5513ac628360f0aa162c04c501ab67d files/tightvnc-1.2.9-gentoo.diff 653
+SHA256 0371c06c07246acc1310851578d63512b88f3df5e98ae2f21ccc96ad4c806d39 files/tightvnc-1.2.9-gentoo.diff 653
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
+RMD160 929662e5b89870fa138438c145cda5936ed6e1a3 files/tightvnc-1.2.9-gentoo.security.patch 771
+SHA256 1848e80e27dc2feae8d404fda99d5d609ecb0bc9b1262c6da40f6a2f6ab166ac files/tightvnc-1.2.9-gentoo.security.patch 771
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
+RMD160 efa2723e879f96a2176685252854905207516120 files/tightvnc-1.2.9-imake-tmpdir.patch 956
+SHA256 01c00a5ef8eed18633ed3b800ea23dc08602bdaa2c737e60ea13803243731aef files/tightvnc-1.2.9-imake-tmpdir.patch 956
 MD5 7f0dcab7d01dfc820fabe9a79872085c files/tightvnc-1.3_alpha7-amd64.patch 5874
+RMD160 1f946ae361db97afcfaf9303197cbe5fe2bc137b files/tightvnc-1.3_alpha7-amd64.patch 5874
+SHA256 d0e8e0dd1b56f1dac28bc10a20f2af194027c2b3db06eded30efa472b50c1ddf files/tightvnc-1.3_alpha7-amd64.patch 5874
 MD5 123eaef930daa068bd0b5366ca89f33c files/tightvnc-1.3_alpha7-darwin.patch 827
+RMD160 f1bb43e02807ad8424dabbc284a3a8b8437101f7 files/tightvnc-1.3_alpha7-darwin.patch 827
+SHA256 88308226944e5f15ec217ef25d75d25ce2a97cc00e8eb49f7f5597c85e29859e files/tightvnc-1.3_alpha7-darwin.patch 827
 MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha7-gentoo.diff 697
+RMD160 6e8f1b645fb9f54d5324775fa3923186798a2d77 files/tightvnc-1.3_alpha7-gentoo.diff 697
+SHA256 3e3e72b7e1584289b739c6a0136627866920a27463c6c2f615202262e06726a4 files/tightvnc-1.3_alpha7-gentoo.diff 697
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha7-gentoo.security.patch 771
+RMD160 929662e5b89870fa138438c145cda5936ed6e1a3 files/tightvnc-1.3_alpha7-gentoo.security.patch 771
+SHA256 1848e80e27dc2feae8d404fda99d5d609ecb0bc9b1262c6da40f6a2f6ab166ac files/tightvnc-1.3_alpha7-gentoo.security.patch 771
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956
+RMD160 efa2723e879f96a2176685252854905207516120 files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956
+SHA256 01c00a5ef8eed18633ed3b800ea23dc08602bdaa2c737e60ea13803243731aef files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956
+MD5 cd5476ec1b1d79d90e0462c92b9e0bec files/vncserver-1.2.patch 1014
+RMD160 3248f0cd4165085594953f47afc89bdc2a1c783e files/vncserver-1.2.patch 1014
+SHA256 0a13295dc1852a88d2fcc8114ef77172a760450a80b922be6e4d37015aabc671 files/vncserver-1.2.patch 1014
+MD5 f824dc5bfb30133fa706e7393400c2d2 files/vncserver-1.3.patch 581
+RMD160 b6687d96b4aae170914e0284aa4203b047f2a80f files/vncserver-1.3.patch 581
+SHA256 b8016c3200f75f5bcffa117d353d68e2cc8a292d658e934e5b1e4a41b99c0218 files/vncserver-1.3.patch 581
 MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
-MD5 59a8848188e5992cbe142be7d6285ee5 metadata.xml 309
-MD5 7c9be845bcfed030ce02af5ec744edd7 tightvnc-1.2.9-r1.ebuild 1882
-MD5 ed9c7feb1ba516c6dced31eae3b2b0bc tightvnc-1.3_alpha7.ebuild 2576
+RMD160 7ca1fddbfff3f197b0060164b0202308eb31feda files/x86.patch 1613
+SHA256 48cfb696ca4b55f9aa3c9bc647ce474c0dc18d27ce09c5dd1631d5aba78b3391 files/x86.patch 1613
+MD5 da0aff9536bf57ced326c3e66a1de5fd metadata.xml 249
+RMD160 a0945581494f87f9f00bcec0cd4794035e0fd3f4 metadata.xml 249
+SHA256 39ab7320c86633fd7638ab2b891b1d3bb8107325ee9884828ecbf8082b92dafb metadata.xml 249
+MD5 924ce87e9c632cc1a79e82bca6040405 tightvnc-1.2.9-r1.ebuild 2151
+RMD160 e80f81352585afa04666ef4209400dfffed6da1c tightvnc-1.2.9-r1.ebuild 2151
+SHA256 76a9c84074223c101f490c89f12a0c68742ba3b9acc0321d651a811ea0959c8c tightvnc-1.2.9-r1.ebuild 2151
+MD5 79cfb091699bec855f8e6b8a2783ed36 tightvnc-1.3_alpha7.ebuild 2628
+RMD160 a156f0572dd21957a44d04b7e52f86603b632f92 tightvnc-1.3_alpha7.ebuild 2628
+SHA256 693b54df12e2512241cf6e76c5936c7f18864abc50c6f1f38ebe289e4d251230 tightvnc-1.3_alpha7.ebuild 2628
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD8SVT/aM9DdBw91cRAnsZAJ96ukKjKh8/dMm0CBupBCrWihyM4gCgtlvV
-EPrry79ruXMRMK8uIesNx9g=
-=1V+a
+iD8DBQFES/rO/aM9DdBw91cRApHxAJ9vJ+sU2HwJio38BT2T04+xud/OxACfV6If
+m85y5CAYw3KkKQaYaYCRtJc=
+=doBM
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r1 b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r1
index 1900142fe09a..d72709d4f9b6 100644
--- a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r1
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r1
@@ -1 +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/digest-tightvnc-1.3_alpha7 b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7
index 068c11b37fa6..b4cae558830d 100644
--- a/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7
@@ -1 +1,3 @@
 MD5 8e9e63f19d8351a5359c0cc15d96c18c tightvnc-1.3dev7_unixsrc.tar.bz2 1764364
+RMD160 348edffc87254392f8ebcd1e3cc14fffda8b33ba tightvnc-1.3dev7_unixsrc.tar.bz2 1764364
+SHA256 ed1eed5127e4d04f2cf81ee1d7aaf7cbf5201d80dcd0cf91a8a4ef77de4c6bdb tightvnc-1.3dev7_unixsrc.tar.bz2 1764364
diff --git a/net-misc/tightvnc/files/vncserver-1.2.patch b/net-misc/tightvnc/files/vncserver-1.2.patch
new file mode 100644
index 000000000000..ca3d413f7640
--- /dev/null
+++ b/net-misc/tightvnc/files/vncserver-1.2.patch
@@ -0,0 +1,31 @@
+--- vncserver	2006-04-01 19:31:45.000000000 +0200
++++ vncserver	2006-04-01 19:36:09.000000000 +0200
+@@ -36,14 +36,26 @@
+ $geometry = "1024x768";
+ $depth = 24;
+ $desktopName = "X";
+-$vncClasses = "/usr/local/vnc/classes";
++$vncClasses = "/usr/share/tightvnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++$fontPath = "unix/:-1";
+ $authType = "-rfbauth $vncUserDir/passwd";
+ 
+ # Here is another example of setting the font path:
+ # $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
+ 
++# This Gentoo extension here grabs the font path configuration from x.org
++# See also http://bugs.gentoo.org/127001
++if (-r "/etc/X11/xorg.conf") {
++  open XCONF, "/etc/X11/xorg.conf" or die "error opening xorg.conf";
++  @fontPath=();
++  while (<XCONF>) {
++    push @fontPath, /^\s+FontPath\s+"([^"]+)"/;
++  }
++  $fontPath = join (",", grep { ! /TTF/ } @fontPath);
++  close XCONF;
++}
++
+ # X colors database path is optional, uncomment and edit to use:
+ # $colorPath = "/usr/lib/X11/rgb";
+ 
diff --git a/net-misc/tightvnc/files/vncserver-1.3.patch b/net-misc/tightvnc/files/vncserver-1.3.patch
new file mode 100644
index 000000000000..945e297130b4
--- /dev/null
+++ b/net-misc/tightvnc/files/vncserver-1.3.patch
@@ -0,0 +1,15 @@
+--- vncserver		2006-04-05 10:01:29.000000000 +0200
++++ vncserver		2006-04-09 19:05:11.000000000 +0200
+@@ -38,11 +38,10 @@
+ $desktopName = "X";
+ $vncClasses = "/usr/share/tightvnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:-1";
+ $authType = "-rfbauth $vncUserDir/passwd";
+ 
+ # 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/Type1/";
+ 
+ # X colors database path is optional, uncomment and edit to use:
+ # $colorPath = "/usr/lib/X11/rgb";
diff --git a/net-misc/tightvnc/metadata.xml b/net-misc/tightvnc/metadata.xml
index 9c6cec7f156b..fe780c402f90 100644
--- a/net-misc/tightvnc/metadata.xml
+++ b/net-misc/tightvnc/metadata.xml
@@ -6,7 +6,4 @@
  <email>morfic@gentoo.org</email>
  <name>Daniel Goller</name>
 </maintainer>
-<maintainer>
-  <email>aliz@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
index 0a4a403a3a31..b3312adb45b9 100644
--- a/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.16 2006/02/14 00:34:18 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.17 2006/04/23 22:08:00 morfic Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,11 +11,23 @@ DESCRIPTION="A great client/server software package allowing remote network acce
 SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
 HOMEPAGE="http://www.tightvnc.com/"
 
-KEYWORDS="x86 ppc sparc alpha amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/x11
+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 )
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
index 3455603142fe..65ff8a3d0fb2 100644
--- a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
@@ -1,6 +1,6 @@
 # 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.3_alpha7.ebuild,v 1.7 2006/02/11 22:01:23 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild,v 1.8 2006/04/23 22:08:00 morfic Exp $
 
 inherit eutils toolchain-funcs
 
@@ -51,12 +51,13 @@ src_unpack() {
 	fi
 
 	unpack ${A} && cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/${P}-gentoo.security.patch
-	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
-	epatch ${FILESDIR}/x86.patch
-	epatch "${FILESDIR}/${P}"-darwin.patch
-	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-gentoo.security.patch"
+	epatch "${FILESDIR}/${P}-imake-tmpdir.patch"
+	epatch "${FILESDIR}/x86.patch"
+	epatch "${FILESDIR}/${P}-darwin.patch"
+	epatch "${FILESDIR}/vncserver-1.3.patch"
+	use amd64 && epatch "${FILESDIR}/${P}-amd64.patch"
 }
 
 src_compile() {