Force gcrypt when gnutls is selected, bug 420803. Add openssl dependency. Rename crypt and no24bpp use flags to gcrypt and 24bpp.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 24 insertions, 63 deletions

diff --git a/net-libs/libvncserver/ChangeLog b/net-libs/libvncserver/ChangeLog
index 86917fc11e8e..b65ca36ae6ea 100644
--- a/net-libs/libvncserver/ChangeLog
+++ b/net-libs/libvncserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libvncserver
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.60 2012/06/14 15:26:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.61 2012/06/19 16:21:02 floppym Exp $
+
+  19 Jun 2012; Mike Gilbert <floppym@gentoo.org> -libvncserver-0.9.8.2.ebuild,
+  libvncserver-0.9.9.ebuild, metadata.xml:
+  Force gcrypt when gnutls is selected, bug 420803. Add openssl dependency.
+  Rename crypt and no24bpp use flags to gcrypt and 24bpp.
 
   14 Jun 2012; Jeroen Roovers <jer@gentoo.org> libvncserver-0.9.8.2-r2.ebuild:
   Stable for HPPA (bug #419275).
diff --git a/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild b/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild
deleted file mode 100644
index 15606a017d58..000000000000
--- a/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.8.2.ebuild,v 1.2 2011/11/16 02:17:31 xmw Exp $
-
-EAPI="4"
-
-inherit libtool
-
-DESCRIPTION="library for creating vnc servers"
-HOMEPAGE="http://libvncserver.sourceforge.net/"
-SRC_URI="http://libvncserver.sourceforge.net/LibVNCServer-${PV/_}.tar.gz
-	mirror://sourceforge/libvncserver/LibVNCServer-${PV/_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="no24bpp crypt gnutls ipv6 +jpeg test threads +zlib"
-
-DEPEND="crypt? ( dev-libs/libgcrypt )
-	gnutls? ( net-libs/gnutls )
-	jpeg? ( virtual/jpeg )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/LibVNCServer-${PV/_}
-
-src_prepare() {
-	sed -i -r \
-		-e '/^CFLAGS =/d' \
-		-e "/^SUBDIRS/s:\<($(use test || echo 'test|')client_examples|examples)\>::g" \
-		Makefile.in || die
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--without-x11vnc \
-		$(use_with !no24bpp 24bpp) \
-		$(use_with crypt gcrypt) \
-		$(use_with ipv6) \
-		$(use_with jpeg) \
-		$(use_with threads pthread) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	default
-	emake -C examples noinst_PROGRAMS=storepasswd
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-libs/libvncserver/libvncserver-0.9.9.ebuild b/net-libs/libvncserver/libvncserver-0.9.9.ebuild
index 4bf08183fd85..ecaf3a1c47cc 100644
--- a/net-libs/libvncserver/libvncserver-0.9.9.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.9.ebuild,v 1.2 2012/06/06 15:45:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.9.9.ebuild,v 1.3 2012/06/19 16:21:02 floppym Exp $
 
 EAPI="4"
 
@@ -14,12 +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 ~amd64-linux ~x86-linux"
-IUSE="no24bpp crypt gnutls ipv6 +jpeg test threads +zlib"
+IUSE="+24bpp gcrypt gnutls ipv6 +jpeg ssl test threads +zlib"
 
-DEPEND="crypt? ( dev-libs/libgcrypt )
-	gnutls? ( net-libs/gnutls )
+DEPEND="
+	gcrypt? ( dev-libs/libgcrypt )
+	gnutls? (
+		net-libs/gnutls
+		dev-libs/libgcrypt
+	)
+	!gnutls? (
+		ssl? ( dev-libs/openssl )
+	)
 	jpeg? ( virtual/jpeg )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( sys-libs/zlib )
+"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/LibVNCServer-${PV/_}
@@ -36,9 +44,10 @@ src_prepare() {
 src_configure() {
 	econf \
 		--without-x11vnc \
-		$(use_with !no24bpp 24bpp) \
-		$(use_with crypt gcrypt) \
+		$(use_with 24bpp) \
 		$(use_with gnutls) \
+		$(usex gnutls --with-gcrypt $(use_with gcrypt)) \
+		$(usex gnutls --without-ssl $(use_with ssl)) \
 		$(use_with ipv6) \
 		$(use_with jpeg) \
 		$(use_with threads pthread) \
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index e1c4646f8769..57495e5a5bd4 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -17,6 +17,8 @@ Now that you want to make a VNC server, that is, a server which speaks
 the RFB protocol, you can download this library from sourceforge.
 </longdescription>
 	<use>
+		<flag name="24bpp">enable 24bpp support</flag>
 		<flag name="no24bpp">disable 24bpp support</flag>
+		<flag name="gcrypt">enable support for gcrypt</flag>
 	</use>
 </pkgmetadata>