Use gnutls instead of openssl when USE=gnutls

Package-Manager: portage-2.1.2_pre3-r2

3 files changed, 25 insertions, 21 deletions

diff --git a/dev-games/libggz/ChangeLog b/dev-games/libggz/ChangeLog
index 9ebd3a0c41ca..79bf70cad101 100644
--- a/dev-games/libggz/ChangeLog
+++ b/dev-games/libggz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-games/libggz
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.14 2006/07/18 21:43:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.15 2006/10/16 17:14:47 nyhm Exp $
+
+  16 Oct 2006; Tristan Heaven <nyhm@gentoo.org> libggz-0.0.13.ebuild:
+  Use gnutls instead of openssl when USE=gnutls
 
   18 Jul 2006; Michael Hanselmann <hansmi@gentoo.org> libggz-0.0.13.ebuild:
   Stable on ppc.
diff --git a/dev-games/libggz/Manifest b/dev-games/libggz/Manifest
index a16a81650614..a9ddf93428f8 100644
--- a/dev-games/libggz/Manifest
+++ b/dev-games/libggz/Manifest
@@ -6,13 +6,13 @@ AUX libggz-0.0.9-gcrypt.patch 316 RMD160 b4ef57ed42909276d2a61b7d2eef34d65d25fbd
 MD5 02e7f985d3a33bf715217b4e7cad7011 files/libggz-0.0.9-gcrypt.patch 316
 RMD160 b4ef57ed42909276d2a61b7d2eef34d65d25fbd6 files/libggz-0.0.9-gcrypt.patch 316
 SHA256 d9dd8dc02592f780876459e73dde4403112a84320e939b0dca52d1f42e24ddd1 files/libggz-0.0.9-gcrypt.patch 316
-DIST libggz-0.0.13.tar.gz 441386 RMD160 5dfdaef6d414e6f4114e91bf1254a3bb9a055d9d SHA256 3b57c20681893521c648b411c8d95d09f19b24059c40daac441abbbcf98b6758
+DIST libggz-0.0.13.tar.gz 441386 RMD160 5dfdaef6d414e6f4114e91bf1254a3bb9a055d9d SHA1 1a156aaab00f020dd281e0fd849ec2e799393ace SHA256 3b57c20681893521c648b411c8d95d09f19b24059c40daac441abbbcf98b6758
 DIST libggz-0.0.5.tar.gz 216328
 DIST libggz-0.0.9.tar.gz 434410 RMD160 c951d15cba468f61486673c07ed75e0a1b2f0208 SHA1 d3917e458f1000415a6fe16f566e918bbae2c386 SHA256 b9254e25e6ba8a4bba0ef7cba3b82d83d80c7ce04f1d7cc2f64b88d4f90b475a
-EBUILD libggz-0.0.13.ebuild 914 RMD160 634b0d57850ca34553351d9073c6cfc53f7c1599 SHA1 4c349444c5ab99b7d0603342bab4580622447b49 SHA256 a102ff62b668e51771b1aba668672d3a03378287cd2eb1ccc0ddd4ed200c235f
-MD5 b9bfb028ccd1f1ae8a31ee5ff12af0ca libggz-0.0.13.ebuild 914
-RMD160 634b0d57850ca34553351d9073c6cfc53f7c1599 libggz-0.0.13.ebuild 914
-SHA256 a102ff62b668e51771b1aba668672d3a03378287cd2eb1ccc0ddd4ed200c235f libggz-0.0.13.ebuild 914
+EBUILD libggz-0.0.13.ebuild 1053 RMD160 4f697355507d159ea1b82e98714760dff9ba5dfb SHA1 9468a258117c020c0acf0bb45e323fdfabec01df SHA256 e616fe1a116b00e3a1ac3dcf53a44ddb694a87acc4082a5a5d6fa4e3b2c01781
+MD5 84d78e7f9890b31e1d111234dbfa34ce libggz-0.0.13.ebuild 1053
+RMD160 4f697355507d159ea1b82e98714760dff9ba5dfb libggz-0.0.13.ebuild 1053
+SHA256 e616fe1a116b00e3a1ac3dcf53a44ddb694a87acc4082a5a5d6fa4e3b2c01781 libggz-0.0.13.ebuild 1053
 EBUILD libggz-0.0.5.ebuild 666 RMD160 70cdfdc48c80750877bc3eddf4ea885ba6bbbcf8 SHA1 b3445262b00931cdd8e67634bff301e3fefe724b SHA256 d8a23181dfd7acf19c5e6656e0f7ce815bdfdc1e296df4e4000ec046f59e3781
 MD5 e0fdb557cd17b2ad0e0317652f433ca7 libggz-0.0.5.ebuild 666
 RMD160 70cdfdc48c80750877bc3eddf4ea885ba6bbbcf8 libggz-0.0.5.ebuild 666
@@ -21,10 +21,10 @@ EBUILD libggz-0.0.9.ebuild 1031 RMD160 551377f1758fc09ea8e378d145e9ce9768703033
 MD5 4af2d595378b6bb79428e04287675cda libggz-0.0.9.ebuild 1031
 RMD160 551377f1758fc09ea8e378d145e9ce9768703033 libggz-0.0.9.ebuild 1031
 SHA256 5cf96152dcb507987d69d2a77472e8c3baf22e0277a949439759af4d6f1d4000 libggz-0.0.9.ebuild 1031
-MISC ChangeLog 2030 RMD160 1693547107beb6664486a74626ffe485edd8f837 SHA1 7fca8f00e8d1c2cd83a029e4b8703bb868f0a789 SHA256 6144d799eba2e328ee66013c4b54ededa7f33789433e0bfcce379028a0f684ee
-MD5 cea8fbe09050766d09ad16dec6e9f99e ChangeLog 2030
-RMD160 1693547107beb6664486a74626ffe485edd8f837 ChangeLog 2030
-SHA256 6144d799eba2e328ee66013c4b54ededa7f33789433e0bfcce379028a0f684ee ChangeLog 2030
+MISC ChangeLog 2147 RMD160 3d5344a7df57983240d1d8cd9e5e4bc1f084ac9d SHA1 da1862bed0a12589cbcdb873d3d2dd93620e1aa7 SHA256 e9590a0eb5efe6397df6c3dc1d62b30e1dd5830a262131f9ffda468b4597fe7d
+MD5 cae07fa116b36c4dc8dcad9b8ecca612 ChangeLog 2147
+RMD160 3d5344a7df57983240d1d8cd9e5e4bc1f084ac9d ChangeLog 2147
+SHA256 e9590a0eb5efe6397df6c3dc1d62b30e1dd5830a262131f9ffda468b4597fe7d ChangeLog 2147
 MISC metadata.xml 428 RMD160 742fed788e2947ca9ba85b5d9c234778fda310fc SHA1 c003bb872b0ba384f9e45d56431f149dd94c649b SHA256 ca242ceeaf7a146b8ce0ad3ce0a7f1761edaf7324b735a2e910619ad9c6d29af
 MD5 665c31fd905d36415b61c101784ff673 metadata.xml 428
 RMD160 742fed788e2947ca9ba85b5d9c234778fda310fc metadata.xml 428
diff --git a/dev-games/libggz/libggz-0.0.13.ebuild b/dev-games/libggz/libggz-0.0.13.ebuild
index 7234ea81010e..a959985a8453 100644
--- a/dev-games/libggz/libggz-0.0.13.ebuild
+++ b/dev-games/libggz/libggz-0.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/libggz-0.0.13.ebuild,v 1.3 2006/07/18 21:43:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/libggz-0.0.13.ebuild,v 1.4 2006/10/16 17:14:47 nyhm Exp $
 
 DESCRIPTION="The GGZ library, used by GGZ Gaming Zone"
 HOMEPAGE="http://www.ggzgamingzone.org/"
@@ -10,25 +10,26 @@ SRC_URI="http://ftp.belnet.be/packages/ggzgamingzone/ggz/${PV}/${P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="-amd64 ppc x86"
-IUSE="crypt ssl"
+IUSE="crypt gnutls"
+RESTRICT="test"
 
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/libgcrypt-1.1.8 )
-	ssl? ( dev-libs/openssl )"
+DEPEND="crypt? (
+	>=dev-libs/libgcrypt-1.1.8
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( dev-libs/openssl ) )"
 
 src_compile() {
-	local myconf=""
-	use ssl && myconf="--with-tls=OpenSSL"
+	local tls=--with-tls=$(use gnutls && echo GnuTLS || echo OpenSSL)
+	local myconf
+	use crypt && myconf="${tls} --with-gcrypt" || myconf=--with-tls=no
 	econf \
 		--disable-dependency-tracking \
-		`use_with crypt gcrypt` \
 		${myconf} \
 		|| die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS Quick* README*
 }
-