Added ssl/gnutls and demo useflags, Bug #180319.

(Portage version: 2.1.2.7)

4 files changed, 58 insertions, 30 deletions

diff --git a/dev-libs/tntnet/ChangeLog b/dev-libs/tntnet/ChangeLog
index 8b19f07615ae..cf18774dee87 100644
--- a/dev-libs/tntnet/ChangeLog
+++ b/dev-libs/tntnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/tntnet
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.2 2007/05/29 17:16:07 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.3 2007/05/30 12:47:39 zzam Exp $
+
+*tntnet-1.6.0-r1 (30 May 2007)
+
+  30 May 2007; Matthias Schwarzott <zzam@gentoo.org> -tntnet-1.6.0.ebuild,
+  +tntnet-1.6.0-r1.ebuild:
+  Added ssl/gnutls and demo useflags, Bug #180319.
 
   29 May 2007; Matthias Schwarzott <zzam@gentoo.org> tntnet-1.6.0.ebuild:
   Added missing dependency to app-arch/zip.
diff --git a/dev-libs/tntnet/files/digest-tntnet-1.6.0 b/dev-libs/tntnet/files/digest-tntnet-1.6.0-r1
index dd8f42b1f9a5..dd8f42b1f9a5 100644
--- a/dev-libs/tntnet/files/digest-tntnet-1.6.0
+++ b/dev-libs/tntnet/files/digest-tntnet-1.6.0-r1
diff --git a/dev-libs/tntnet/tntnet-1.6.0-r1.ebuild b/dev-libs/tntnet/tntnet-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..c1efa59cd33e
--- /dev/null
+++ b/dev-libs/tntnet/tntnet-1.6.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-1.6.0-r1.ebuild,v 1.1 2007/05/30 12:47:39 zzam Exp $
+
+DESCRIPTION="A modular, multithreaded webapplicationserver extensible with C++."
+HOMEPAGE="http://www.tntnet.org/index.hms"
+SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ssl gnutls demo"
+
+RDEPEND="dev-libs/cxxtools
+	sys-libs/zlib
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-1.2.0 )
+		!gnutls? ( dev-libs/openssl )
+	)"
+DEPEND="${RDEPEND}
+	app-arch/zip"
+
+src_compile() {
+	local myconf=""
+	if use ssl; then
+		if use gnutls; then
+			einfo "Using gnutls for ssl support."
+			myconf="${myconf} --with-ssl=gnutls"
+		else
+			einfo "Using openssl for ssl support."
+			myconf="${myconf} --with-ssl=openssl"
+		fi
+	else
+		einfo "Disabled ssl"
+		myconf="${myconf} --with-ssl=no"
+	fi
+	if use demo; then
+		myconf="${myconf} --with-demos=yes"
+	else
+		myconf="${myconf} --with-demos=no"
+	fi
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog README TODO doc/*.pdf
+}
+
diff --git a/dev-libs/tntnet/tntnet-1.6.0.ebuild b/dev-libs/tntnet/tntnet-1.6.0.ebuild
deleted file mode 100644
index 5e7c36f22922..000000000000
--- a/dev-libs/tntnet/tntnet-1.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-1.6.0.ebuild,v 1.2 2007/05/29 17:16:07 zzam Exp $
-
-DESCRIPTION="A modular, multithreaded webapplicationserver written from scratch for C++."
-HOMEPAGE="http://www.tntnet.org/index.hms"
-SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="dev-libs/cxxtools
-	>=net-libs/gnutls-1.2.0"
-DEPEND="${RDEPEND}
-	app-arch/zip"
-
-src_compile() {
-	econf --with-ssl=gnutls \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog README TODO
-}
-