Drop USE flags that only apply to x11vnc. This are the avahi, crypt, fbcon and

ssl USE flags. Also the backchannel flag is no longer supported.
Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

5 files changed, 38 insertions, 25 deletions

diff --git a/net-libs/libvncserver/ChangeLog b/net-libs/libvncserver/ChangeLog
index 84449c856cd9..c01a8188227f 100644
--- a/net-libs/libvncserver/ChangeLog
+++ b/net-libs/libvncserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libvncserver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.37 2009/03/02 16:06:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.38 2009/11/21 10:18:22 swegener Exp $
+
+  21 Nov 2009; Sven Wegener <swegener@gentoo.org> libvncserver-0.9.1.ebuild,
+  libvncserver-0.9.7.ebuild, metadata.xml:
+  Drop USE flags that only apply to x11vnc. This are the avahi, crypt, fbcon
+  and ssl USE flags. Also the backchannel flag is no longer supported.
 
   02 Mar 2009; Brent Baude <ranger@gentoo.org> libvncserver-0.9.1.ebuild:
   Marking libvncserver-0.9.1 ppc64 for bug 256029
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index c0f52391ebf7..ce12382c1f1f 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST LibVNCServer-0.9.1.tar.gz 1060476 RMD160 8a39b803701b301e14f9120d5ef6e4b0bebc775b SHA1 8044885868a973fe64a8b048b6f76074aec56488 SHA256 0fbda7fc37c1f360bdbeb586e48d6203a5ef56a8cfc3b78887d7d90db683f282
 DIST LibVNCServer-0.9.7.tar.gz 1105538 RMD160 50325d0827a0e65e9da91991011e2a1b05c491e2 SHA1 681b0f3d000ad8c18d3643e1148e1ae5052c8a9a SHA256 2adb60ebb64706df088418cfb01691d9c273040fc286618e021e51ac61a77571
-EBUILD libvncserver-0.9.1.ebuild 1225 RMD160 06957bd07d21b4c20e885ce49a9a849e98f6c518 SHA1 37e8370b8fbfcb12c2cf04da3efdaeacfee80795 SHA256 d8082e16666abc37ac57ba7ee4d4d87c2fcf881c41fe200f0e18f58802091621
-EBUILD libvncserver-0.9.7.ebuild 1569 RMD160 21bbd8b1acb6f6f6ac35b2e08668d28aa2d39a3e SHA1 df964e2be5f8b08485162ea262988ec47d4f4b2d SHA256 ca3394e79d045c3fb5f63604bbe430956ceb5ba637a795c8c12854a5aa46ca12
-MISC ChangeLog 4242 RMD160 93919f31504693cbe8f81502cf585347a71d3555 SHA1 e80d678463fb5096004e128c23cc2ad5d8a64e72 SHA256 c284628217a299296879622c726b9be20152699c6a7a2795454b42f542f64e5e
-MISC metadata.xml 837 RMD160 482fb57ccdc07060f79dc35eaf2472521a62daa1 SHA1 d16c55e1dbf2712e576f34be8019ec260ede0814 SHA256 af1c7e228c873c464c9e44e681665377788a8669ab04caae63b9fe63d26d4013
+EBUILD libvncserver-0.9.1.ebuild 1165 RMD160 5319018625639b4503f89092a8a44edcc6dc0612 SHA1 2b706b80f9b2ddafd6a880f28e72b736d127cd46 SHA256 22acc75c8157954c07ab1c95a1c44f96c7bfc2c65ddd735454b78605cf94f7af
+EBUILD libvncserver-0.9.7.ebuild 1382 RMD160 69efc4dd9a68fc52f849713a339f63ff02eb1988 SHA1 1e9562b9a834a2019eb99e8c51304d9927cbcb01 SHA256 432bd361f1c8cb2d1b7a5d64b7ef1d69e8f21ff799cbe4db5e7493e93b740840
+MISC ChangeLog 4513 RMD160 bf351a11df61fd9c7d05edd6c46aaf4ec8b3ce70 SHA1 7eadb48aa2bde08f458d977f1346a7ee2d1b0935 SHA256 5b1d6a66f0f069a57a2eb349b4f7860c3770fa5a0f2f3b971480f71957a0f687
+MISC metadata.xml 771 RMD160 d5e877842126f559a0cb50ef3ed0e68daf1e120c SHA1 db755dafbbd679827134d31d9827bff1f8941b3c SHA256 3a97eea2fb82364d18791629b71930142618b863475410a37390c52b9129bb75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksHvnUACgkQI1lqEGTUzyQ8DACfQv+gYu+bA/GrWt+lGMQXa+QG
+skQAmwYFYZT90KCqT7/yrXCYmbgSB+4l
+=3YPp
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libvncserver/libvncserver-0.9.1.ebuild b/net-libs/libvncserver/libvncserver-0.9.1.ebuild
index ec396ac00fad..5ba5f60b8e75 100644
--- a/net-libs/libvncserver/libvncserver-0.9.1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.1.ebuild,v 1.14 2009/03/02 16:06:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.1.ebuild,v 1.15 2009/11/21 10:18:22 swegener Exp $
 
-inherit eutils libtool
+inherit libtool
 
 DESCRIPTION="library for creating vnc servers"
 HOMEPAGE="http://libvncserver.sourceforge.net/"
@@ -12,12 +12,12 @@ SRC_URI="http://libvncserver.sourceforge.net/LibVNCServer-${PV/_}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="nobackchannel no24bpp zlib jpeg"
+IUSE="no24bpp zlib jpeg"
 
 DEPEND="zlib? ( sys-libs/zlib )
 	jpeg? ( media-libs/jpeg )"
 
-S=${WORKDIR}/LibVNCServer-${PV/_}
+S="${WORKDIR}"/LibVNCServer-${PV/_}
 
 src_unpack() {
 	unpack ${A}
@@ -35,7 +35,6 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_with !nobackchannel backchannel) \
 		$(use_with !no24bpp 24bpp) \
 		$(use_with zlib) \
 		$(use_with jpeg) \
diff --git a/net-libs/libvncserver/libvncserver-0.9.7.ebuild b/net-libs/libvncserver/libvncserver-0.9.7.ebuild
index 407447638c7c..d42aeb61e7a9 100644
--- a/net-libs/libvncserver/libvncserver-0.9.7.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.7.ebuild,v 1.1 2009/01/31 07:37:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.7.ebuild,v 1.2 2009/11/21 10:18:22 swegener Exp $
+
+EAPI="2"
 
 inherit libtool
 
@@ -12,23 +14,20 @@ SRC_URI="http://libvncserver.sourceforge.net/LibVNCServer-${PV/_}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nobackchannel no24bpp avahi crypt fbcon jpeg ssl test threads zlib"
+IUSE="no24bpp +jpeg test threads +zlib"
 
-DEPEND="avahi? ( net-dns/avahi )
-	jpeg? ( media-libs/jpeg )
-	ssl? ( dev-libs/openssl )
+DEPEND="jpeg? ( media-libs/jpeg )
 	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/LibVNCServer-${PV/_}
+S="${WORKDIR}"/LibVNCServer-${PV/_}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i -r \
 		-e '/^CFLAGS =/d' \
 		-e "/^SUBDIRS/s:\<($(use test || echo 'test|')client_examples|contrib|examples)\>::g" \
 		Makefile.in || die "sed foo"
-	use test || sed -i '/^SUBDIRS/s:\<test\>::' Makefile.in
+
 	sed -i \
 		-e '/^AM_CFLAGS/s: -g : :' \
 		*/Makefile.in || die
@@ -36,17 +35,18 @@ src_unpack() {
 	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--without-x11vnc \
-		$(use_with !nobackchannel backchannel) \
 		$(use_with !no24bpp 24bpp) \
-		$(use_with fbcon fbdev) \
 		$(use_with jpeg) \
 		$(use_with threads pthread) \
 		$(use_with zlib) \
 		|| die
-	emake || die
+}
+
+src_compile() {
+	default
 	emake -C examples noinst_PROGRAMS=storepasswd || die
 }
 
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index a22a2551f5c9..a37a59282e6c 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -18,6 +18,5 @@ the RFB protocol, you can download this library from sourceforge.
 </longdescription>
   <use>
     <flag name="no24bpp">disable 24bpp support</flag>
-    <flag name="nobackchannel">disable backchannel support</flag>
   </use>
 </pkgmetadata>