Cleanup.

Package-Manager: portage-2.1.3.12

7 files changed, 19 insertions, 175 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index d4b847545b76..daed647fa9f2 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.52 2007/10/02 15:28:52 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.53 2007/10/11 11:39:56 swegener Exp $
+
+  11 Oct 2007; Sven Wegener <swegener@gentoo.org>
+  -files/x11vnc-0.9.1-ssl.patch, -x11vnc-0.9.1.ebuild, -x11vnc-0.9.2.ebuild:
+  Cleanup.
 
   02 Oct 2007; Lars Weiler <pylon@gentoo.org> x11vnc-0.9.2-r1.ebuild:
   stable ppc, bug #194441
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 861cf5913c4f..b78b369f87ae 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,35 +1,26 @@
-AUX x11vnc-0.9.1-ssl.patch 896 RMD160 c466523a6bfa5d25b4715970ad1d9f31a9d3279c SHA1 9411d91464dc6e0c4f8f256e3453cc865d09b483 SHA256 0b8abc0f34369b5ca507447367ffb3d8819aa156d4396dd0e9c0ee1b48b135cc
-MD5 9e525617c995ae1dfb29bf4eb8ac26b6 files/x11vnc-0.9.1-ssl.patch 896
-RMD160 c466523a6bfa5d25b4715970ad1d9f31a9d3279c files/x11vnc-0.9.1-ssl.patch 896
-SHA256 0b8abc0f34369b5ca507447367ffb3d8819aa156d4396dd0e9c0ee1b48b135cc files/x11vnc-0.9.1-ssl.patch 896
-DIST x11vnc-0.9.1.tar.gz 2053007 RMD160 a3efbe0e3bab9386d23a49e32dbc56ccf57641bb SHA1 70a75f906705092004e96cc16fa00bbe46626f47 SHA256 0a47d1c93512d088178313c754f90fc277a53fbdeee1cb89ff303df9b3a467b9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST x11vnc-0.9.2.tar.gz 2068626 RMD160 c1931ec2fd1bda0ea78ddd93fa5aa155162247be SHA1 adc9f61e949c30890bf8617669bef6bfa6a37137 SHA256 6aa2b4c42add39098ef3e8ccbdf1e134f7b2a95f2fc80c2dea002151e0e71aac
-EBUILD x11vnc-0.9.1.ebuild 1433 RMD160 b5ebbf49a4d877f3f7539633f44267168ebff182 SHA1 e4ba82b394d81a8007ba4eee46ac7f9dff295619 SHA256 aeae10aa8ff2abbfa7a62088cf97131f82496316699fd554c3ecb4063d499279
-MD5 e29e9e9b0b72ecf2d1b7145c78f27cdd x11vnc-0.9.1.ebuild 1433
-RMD160 b5ebbf49a4d877f3f7539633f44267168ebff182 x11vnc-0.9.1.ebuild 1433
-SHA256 aeae10aa8ff2abbfa7a62088cf97131f82496316699fd554c3ecb4063d499279 x11vnc-0.9.1.ebuild 1433
 EBUILD x11vnc-0.9.2-r1.ebuild 1639 RMD160 7c6cb500de02177c70307c1ed8b267157682ef9d SHA1 489bbd7307bc4f37fe68d73c85cd20145dadefba SHA256 da26715227c95375613356b39deee4bf8f5482e685ebac8fd8ee54d860ab4c45
 MD5 543d461dd0a662616a26d6dafb8c4128 x11vnc-0.9.2-r1.ebuild 1639
 RMD160 7c6cb500de02177c70307c1ed8b267157682ef9d x11vnc-0.9.2-r1.ebuild 1639
 SHA256 da26715227c95375613356b39deee4bf8f5482e685ebac8fd8ee54d860ab4c45 x11vnc-0.9.2-r1.ebuild 1639
-EBUILD x11vnc-0.9.2.ebuild 1347 RMD160 417b891c535712bff4e890e7d9ca8a59b9c63e03 SHA1 14e07426c507462e70c0c152869c0884e64a2dcd SHA256 cb9c313ce551c39d44b8613cef3ebc001e8326e5ed3851ec8ac0b111c0bc1730
-MD5 a02e8d18451e2b50c6ef9fa31271fa42 x11vnc-0.9.2.ebuild 1347
-RMD160 417b891c535712bff4e890e7d9ca8a59b9c63e03 x11vnc-0.9.2.ebuild 1347
-SHA256 cb9c313ce551c39d44b8613cef3ebc001e8326e5ed3851ec8ac0b111c0bc1730 x11vnc-0.9.2.ebuild 1347
-MISC ChangeLog 6934 RMD160 5c87d272b92cfb66ef0aafab5bfd0b0edb0ba2b1 SHA1 402f45d8ed721a94b0eaf342b5c660553e9cbd2d SHA256 7901965ea25d1e9409757a1c8bfe8b5880ed3cc09ec73e2e6cbb6836d38121ec
-MD5 704c5c8a494ed501a8d1994cbd3c1f36 ChangeLog 6934
-RMD160 5c87d272b92cfb66ef0aafab5bfd0b0edb0ba2b1 ChangeLog 6934
-SHA256 7901965ea25d1e9409757a1c8bfe8b5880ed3cc09ec73e2e6cbb6836d38121ec ChangeLog 6934
+MISC ChangeLog 7076 RMD160 c520ac93d74adb33f8efa99ed85b0f8ecb16020e SHA1 14be0978dcbb4fdb6b97e04181a075352644d96c SHA256 4f4a2342c9da7c276c1f15d21818047d1937f12185b5dabf8bbb735c1ddcc458
+MD5 3c326fbc3e855bbb4c9999179d7e78c6 ChangeLog 7076
+RMD160 c520ac93d74adb33f8efa99ed85b0f8ecb16020e ChangeLog 7076
+SHA256 4f4a2342c9da7c276c1f15d21818047d1937f12185b5dabf8bbb735c1ddcc458 ChangeLog 7076
 MISC metadata.xml 470 RMD160 e28f318dea15e363ed346a16359632c5754a18ca SHA1 de92437c7fd69913fbf1fa7b2a17838daa6ae4d7 SHA256 c614534b55596a07d64afe7362630a15ec79b17102dead075415dccea9fde412
 MD5 8845b35c56be21370ef600f1b3eca775 metadata.xml 470
 RMD160 e28f318dea15e363ed346a16359632c5754a18ca metadata.xml 470
 SHA256 c614534b55596a07d64afe7362630a15ec79b17102dead075415dccea9fde412 metadata.xml 470
-MD5 4f78d2d37d2430f7b940b87c10fc50fe files/digest-x11vnc-0.9.1 241
-RMD160 cd97d5d4d91d1e98658a0a33d82773a79e0d585d files/digest-x11vnc-0.9.1 241
-SHA256 0c40ef5e108e4204f811a36fd06eaf924dbabac141b654952b541e716ff3c85c files/digest-x11vnc-0.9.1 241
-MD5 04b6a3d402c0eca4bb0854385c36d36d files/digest-x11vnc-0.9.2 241
-RMD160 00442aeab1ad097c239efa8b1eb92ac648bc1951 files/digest-x11vnc-0.9.2 241
-SHA256 d5c26f05c917d8b62cf37d30653b0f0927d96ba45a3fcbe9ada9baba1aa1d991 files/digest-x11vnc-0.9.2 241
 MD5 04b6a3d402c0eca4bb0854385c36d36d files/digest-x11vnc-0.9.2-r1 241
 RMD160 00442aeab1ad097c239efa8b1eb92ac648bc1951 files/digest-x11vnc-0.9.2-r1 241
 SHA256 d5c26f05c917d8b62cf37d30653b0f0927d96ba45a3fcbe9ada9baba1aa1d991 files/digest-x11vnc-0.9.2-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHDguXI1lqEGTUzyQRAvsfAKCsL3mIkd8V7hd5/0CFr7VDdfNmHQCfSHwT
+1lFcsqhB6aDgcj6z7i0BbNM=
+=X1jB
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/files/digest-x11vnc-0.9.1 b/x11-misc/x11vnc/files/digest-x11vnc-0.9.1
deleted file mode 100644
index e774fc7708cc..000000000000
--- a/x11-misc/x11vnc/files/digest-x11vnc-0.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 efe3343f71bd3bfea40d7eff476bbfbb x11vnc-0.9.1.tar.gz 2053007
-RMD160 a3efbe0e3bab9386d23a49e32dbc56ccf57641bb x11vnc-0.9.1.tar.gz 2053007
-SHA256 0a47d1c93512d088178313c754f90fc277a53fbdeee1cb89ff303df9b3a467b9 x11vnc-0.9.1.tar.gz 2053007
diff --git a/x11-misc/x11vnc/files/digest-x11vnc-0.9.2 b/x11-misc/x11vnc/files/digest-x11vnc-0.9.2
deleted file mode 100644
index be7f1e0ea05c..000000000000
--- a/x11-misc/x11vnc/files/digest-x11vnc-0.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a1693e3a0ab67f8dd3593180804aa5b5 x11vnc-0.9.2.tar.gz 2068626
-RMD160 c1931ec2fd1bda0ea78ddd93fa5aa155162247be x11vnc-0.9.2.tar.gz 2068626
-SHA256 6aa2b4c42add39098ef3e8ccbdf1e134f7b2a95f2fc80c2dea002151e0e71aac x11vnc-0.9.2.tar.gz 2068626
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch
deleted file mode 100644
index fa5f6c0f2525..000000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.1-ssl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: x11vnc/sslhelper.c
-===================================================================
-RCS file: /cvsroot/libvncserver/libvncserver/x11vnc/sslhelper.c,v
-retrieving revision 1.31
-retrieving revision 1.32
-diff --unified -r1.31 -r1.32
---- x11vnc/sslhelper.c	16 May 2007 21:29:44 -0000	1.31
-+++ x11vnc/sslhelper.c	15 Jun 2007 03:19:06 -0000	1.32
-@@ -34,6 +34,11 @@
- pid_t openssl_last_helper_pid = 0;
- char *openssl_last_ip = NULL;
- 
-+static char *certret = NULL;
-+static int certret_fd = -1;
-+static mode_t omode;
-+char *certret_str = NULL;
-+
- void raw_xfer(int csock, int s_in, int s_out);
- 
- #if !LIBVNCSERVER_HAVE_LIBSSL
-@@ -1315,11 +1320,6 @@
- 	return 1;
- }
- 
--static char *certret = NULL;
--static int certret_fd = -1;
--static mode_t omode;
--char *certret_str = NULL;
--
- void accept_openssl(int mode, int presock) {
- 	int sock = -1, listen = -1, cport, csock, vsock;	
- 	int peerport = 0;
diff --git a/x11-misc/x11vnc/x11vnc-0.9.1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.1.ebuild
deleted file mode 100644
index c69a3ca5443a..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.1.ebuild,v 1.8 2007/08/25 14:01:01 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc sh ~sparc x86 ~x86-fbsd"
-IUSE="jpeg zlib threads ssl crypt v4l xinerama avahi"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	jpeg? (	media-libs/jpeg )
-	ssl? ( dev-libs/openssl )
-	avahi? ( >=net-dns/avahi-0.6.4 )
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXdamage
-	x11-libs/libXext"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/trapproto
-	x11-proto/recordproto
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-ssl.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with avahi) \
-		$(use_with xinerama) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with crypt) \
-		$(use_with v4l) \
-		$(use_with jpeg) \
-		$(use_with zlib) \
-		$(use_with threads pthread) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc x11vnc/{ChangeLog,README}
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.2.ebuild
deleted file mode 100644
index cf9946bb6b55..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.2.ebuild,v 1.2 2007/07/22 03:38:05 dberkholz Exp $
-
-DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-SRC_URI="mirror://sourceforge/libvncserver/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="jpeg zlib threads ssl crypt v4l xinerama avahi"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	jpeg? (	media-libs/jpeg )
-	ssl? ( dev-libs/openssl )
-	avahi? ( >=net-dns/avahi-0.6.4 )
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXdamage
-	x11-libs/libXext"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/trapproto
-	x11-proto/recordproto
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-src_compile() {
-	econf \
-		$(use_with avahi) \
-		$(use_with xinerama) \
-		$(use_with ssl) \
-		$(use_with ssl crypto) \
-		$(use_with crypt) \
-		$(use_with v4l) \
-		$(use_with jpeg) \
-		$(use_with zlib) \
-		$(use_with threads pthread) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc x11vnc/{ChangeLog,README}
-}