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

1 files changed, 14 insertions, 14 deletions

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
 }