Cleanup.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

7 files changed, 10 insertions, 310 deletions

diff --git a/x11-misc/x11vnc/ChangeLog b/x11-misc/x11vnc/ChangeLog
index d6777a1052ba..e5bcea6d65eb 100644
--- a/x11-misc/x11vnc/ChangeLog
+++ b/x11-misc/x11vnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/x11vnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.87 2010/08/28 10:31:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/ChangeLog,v 1.88 2010/08/28 10:33:35 swegener Exp $
+
+  28 Aug 2010; Sven Wegener <swegener@gentoo.org> -x11vnc-0.9.6.ebuild,
+  -x11vnc-0.9.7.ebuild, -x11vnc-0.9.8.ebuild, -x11vnc-0.9.8-r1.ebuild,
+  -files/x11vnc-0.9.8-xshm-header-fix.patch:
+  Cleanup.
 
 *x11vnc-0.9.11 (28 Aug 2010)
 
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index ee196ab276c7..11c466149249 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -2,26 +2,18 @@
 Hash: SHA1
 
 AUX x11vnc-0.9.11-rename-pointer.patch 9787 RMD160 4f029f172fe45b39d82aebdc50aaa49a797ffedc SHA1 139645d33fb7a926380a05e927ac390134c9a381 SHA256 061878de912b01c73dc597a5985b70cf95acdecfe679b0015f87f7e4d0f00f38
-AUX x11vnc-0.9.8-xshm-header-fix.patch 416 RMD160 9306882e7b7a37c15a631852e4e5b4e37892086d SHA1 60e4dc73d5c01415bc223b4ee1e9437686c7f669 SHA256 8bd28c5d43bb85c0e6e1c508d5c933333b9aef9c6dbd0029350669103a85db8a
 DIST x11vnc-0.9.10.tar.gz 2739576 RMD160 4c8864701703b04c4710100e95372786c414f9ed SHA1 ec7082ee48f1aca0597208bc29197d56a2ff3bff SHA256 935158155828b6a5990a8407ca73ea9cd428e0466a10bb39063c9247806ae011
 DIST x11vnc-0.9.11.tar.gz 2754816 RMD160 92a00aa0a4a529a42ba33f34db84ba05454e3d39 SHA1 f24d747f3fbffc9740cfedbab0b39ea6da0c817d SHA256 fbc7a9e6d38afcfbb832d48ea4084823fa6bb9c0e37a925898229ca73639e7f5
-DIST x11vnc-0.9.6.tar.gz 2461744 RMD160 5587d325fc9a3d735e653fefa2e4425c9e737477 SHA1 2cc67604a8a4bb0c40738f3bdf7295dee9637eb3 SHA256 35cf292b9f46142ddfb5ec5ae169d2ec33f2e4fa68cc7f49a0d98cac55727e1a
-DIST x11vnc-0.9.7.tar.gz 2528334 RMD160 e9eec21ca31b5ec215898624057edc6bd275edcb SHA1 0ce3a0dd83694fddd64d262320ab7d2edb5310cc SHA256 fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
-DIST x11vnc-0.9.8.tar.gz 2566632 RMD160 5f7b5ab835657c03b05b854720da5ad59b25a2b1 SHA1 0cdcd5ce05ea4c00bb7515a1949344c32a95dffc SHA256 235549a5dad84c20c6d4aba920d95e3b98999b91ca5347bdde22fa0326818342
 DIST x11vnc-0.9.9.tar.gz 2671958 RMD160 1b1335253c1f40f69ffbfdff5c4c5f28ed6315c3 SHA1 deb0c71cc0f7d6b99fb4b1484232aa935fe62c90 SHA256 6b960267b1f842efe5fb76b5d36fbee79ca8ea31528ee83877623e1cca0fbbe9
 EBUILD x11vnc-0.9.10.ebuild 1851 RMD160 718fbbc49eaa5dfdb82db5f0ac914a83965af225 SHA1 3ccb3ae198f6e8b195daced506ab4c5f0fa4673f SHA256 101c2b54d6310c743317d4b69c588f311e0efbd592dcd2747cf06204a9d609cc
 EBUILD x11vnc-0.9.11.ebuild 1908 RMD160 80bb9af705fee2f8e3b49a248d1a2b350b2f48e0 SHA1 0c25af501f240fe633fa9eaa6fb5b48672e01a4c SHA256 027c137ccaab6b92b8b4ddb674d7ddb8cac61dfc78e7ddd55974614297a7e47c
-EBUILD x11vnc-0.9.6.ebuild 1890 RMD160 d336ebbe60f013992d0d09cc9fbdf15e145b0778 SHA1 ecacd0261a3b082ca875b1b65fde5fa2c5a9bf74 SHA256 578020675f7cbb3da3e99d3f3b72af8aaf8f8b9060ebb46882c612038b61e8e5
-EBUILD x11vnc-0.9.7.ebuild 1884 RMD160 e17753d0377e41f12961b5f7331e3e3d5f5b7fd2 SHA1 7a20ebea61b5b232c4ad44987fe159e3195de10e SHA256 f2e9b2d186eac440445d5c437b0b05270a266bf5a1f40506d125b5b1d308b183
-EBUILD x11vnc-0.9.8-r1.ebuild 1849 RMD160 e719fc187466ed2af7d6668fbd9c175ec2474bf1 SHA1 af6f6b3bb1efc13fe0d035b570629fd7c2d60a88 SHA256 016d69e64cce0df527f78d5881276d2c173e9244e125a34717184ad224ff7f25
-EBUILD x11vnc-0.9.8.ebuild 1884 RMD160 8a0765ce57f845d79e56ab8ab0400e870a787783 SHA1 25681e358b7f55b9bf28efcd4afde0319ec20b81 SHA256 ba08683961efb1662f8d614fbb1eef174328bb7bb1ef6b0ce295e8acaa9ce649
 EBUILD x11vnc-0.9.9.ebuild 1840 RMD160 a197a7a739850f00997ce51491ba89de34d83b47 SHA1 b2f551132a18fafbc3f4254e31e63ab379070e12 SHA256 a061969e8ed0dfa2f4bb21f22faa87900e3f3633515b5a88e2e60e211cfdd806
-MISC ChangeLog 11491 RMD160 208439d58249b72744ce5305f9e712fab719c098 SHA1 52dc26189b0d1439c10b45d0fb8d539e83edd9b9 SHA256 777b5370e8a214c92fad4d683c0a40ca8eb9e61fd7f95fe940659a55d5a3614b
+MISC ChangeLog 11691 RMD160 47209b5e53136dacb232bb3fab969d9c3361c9cc SHA1 19857bc4db306bf762c0714182260934c4b4b9ad SHA256 90a1bb58a107dbbd65a2a84db03fb582ba22f176c6829d3caf23d675b07f7fcb
 MISC metadata.xml 599 RMD160 42954f89865c12c5fd4707bc784037f2231c6db6 SHA1 4ce649d4717b45387cdfd9b82984194deb8fcfad SHA256 ba34dcd7e24d8434345f6657e4c2d6b14b4e935590de308f23375e436c94556d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx45XkACgkQI1lqEGTUzyR3MQCeOw0CQZwPA9KIF2UcMTkh3vMk
-Z/AAnjIpMmaSZJmjN4IxhBnaIeKBt7DC
-=KVhx
+iEYEARECAAYFAkx45gQACgkQI1lqEGTUzyRDIACgoCm3LwsocMbH32//nEXYL3rr
+SmkAmgM7v/T66yPvPoaWe1+HxCAPIpfm
+=2OMe
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch b/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch
deleted file mode 100644
index 6796d55beb05..000000000000
--- a/x11-misc/x11vnc/files/x11vnc-0.9.8-xshm-header-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Looks like X_ShmAttach is considered private to the library and has been removed from its headers.
-Just hardcode the value, it's only usd to print some help in case of an shm attach error.
---- x11vnc-0.9.8/x11vnc/cleanup.c
-+++ x11vnc-0.9.8/x11vnc/cleanup.c
-@@ -276,6 +276,10 @@
- 	return 0;
- }
- 
-+#ifndef X_ShmAttach
-+#define X_ShmAttach 1
-+#endif
-+
- static int Xerror(Display *d, XErrorEvent *error) {
- 	X_UNLOCK;
- 
diff --git a/x11-misc/x11vnc/x11vnc-0.9.6.ebuild b/x11-misc/x11vnc/x11vnc-0.9.6.ebuild
deleted file mode 100644
index 665e055da5b7..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.6.ebuild,v 1.8 2009/11/06 22:06:57 swegener 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="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="jpeg zlib threads ssl crypt v4l xinerama avahi system-libvncserver"
-
-RDEPEND="system-libvncserver? ( <net-libs/libvncserver-0.9.7 )
-	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/inputproto
-	x11-proto/trapproto
-	x11-proto/recordproto
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-pkg_setup() {
-	if use avahi && ! use threads && ! use system-libvncserver
-	then
-		ewarn "Non-native avahi support has been enabled."
-		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
-	fi
-}
-
-src_compile() {
-	local myconf=""
-
-	# we need to force threads on, because our system libvncserver gets build with thread support
-	use system-libvncserver && myconf="--with-pthread"
-
-	econf \
-		$(use_with system-libvncserver) \
-		$(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) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc x11vnc/{ChangeLog,README}
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.7.ebuild b/x11-misc/x11vnc/x11vnc-0.9.7.ebuild
deleted file mode 100644
index 7fe6d80d2fe0..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.7.ebuild,v 1.3 2009/11/06 22:06:57 swegener Exp $
-
-EAPI="2"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+jpeg +zlib threads ssl crypt v4l xinerama avahi system-libvncserver"
-
-RDEPEND="system-libvncserver? ( <net-libs/libvncserver-0.9.7 )
-	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/inputproto
-	x11-proto/trapproto
-	x11-proto/recordproto
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-pkg_setup() {
-	if use avahi && ! use threads && ! use system-libvncserver
-	then
-		ewarn "Non-native avahi support has been enabled."
-		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	# we need to force threads on, because our system libvncserver gets build with thread support
-	use system-libvncserver && myconf="--with-pthread"
-
-	econf \
-		$(use_with system-libvncserver) \
-		$(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) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc x11vnc/{ChangeLog,README}
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild b/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild
deleted file mode 100644
index 39488e263487..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.8-r1.ebuild,v 1.3 2009/11/21 10:42:30 swegener Exp $
-
-EAPI="2"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="fbcon +jpeg +zlib threads ssl crypt v4l xinerama avahi system-libvncserver"
-
-RDEPEND="system-libvncserver? ( >=net-libs/libvncserver-0.9.7[threads=,jpeg=,zlib=] )
-	!system-libvncserver? (
-		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/inputproto
-	x11-proto/trapproto
-	x11-proto/recordproto
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-xshm-header-fix.patch"
-}
-
-pkg_setup() {
-	if use avahi && ! use threads
-	then
-		ewarn "Non-native avahi support has been enabled."
-		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_with system-libvncserver) \
-		$(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) \
-		$(use_with fbcon fbdev) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc x11vnc/{ChangeLog,README}
-}
diff --git a/x11-misc/x11vnc/x11vnc-0.9.8.ebuild b/x11-misc/x11vnc/x11vnc-0.9.8.ebuild
deleted file mode 100644
index dfdfa5bb6cc4..000000000000
--- a/x11-misc/x11vnc/x11vnc-0.9.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/x11vnc/x11vnc-0.9.8.ebuild,v 1.2 2009/11/06 22:06:57 swegener Exp $
-
-EAPI="2"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+jpeg +zlib threads ssl crypt v4l xinerama avahi system-libvncserver"
-
-RDEPEND="system-libvncserver? ( <net-libs/libvncserver-0.9.7 )
-	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/inputproto
-	x11-proto/trapproto
-	x11-proto/recordproto
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-pkg_setup() {
-	if use avahi && ! use threads && ! use system-libvncserver
-	then
-		ewarn "Non-native avahi support has been enabled."
-		ewarn "Native avahi support can be enabled by also enabling the threads USE flag."
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	# we need to force threads on, because our system libvncserver gets build with thread support
-	use system-libvncserver && myconf="--with-pthread"
-
-	econf \
-		$(use_with system-libvncserver) \
-		$(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) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc x11vnc/{ChangeLog,README}
-}