Remove USE="ssl" and always install net-libs/gnutls wrt #295347, thanks to Christian Schmitt for reporting.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 19 insertions, 13 deletions

diff --git a/sys-libs/gwenhywfar/ChangeLog b/sys-libs/gwenhywfar/ChangeLog
index 8704a70948f6..eb5b6aa5321d 100644
--- a/sys-libs/gwenhywfar/ChangeLog
+++ b/sys-libs/gwenhywfar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/gwenhywfar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/ChangeLog,v 1.77 2010/01/07 10:12:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/ChangeLog,v 1.78 2010/01/08 19:20:52 ssuominen Exp $
+
+  08 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gwenhywfar-3.10.1.ebuild, gwenhywfar-3.11.3.ebuild:
+  Remove USE="ssl" and always install net-libs/gnutls wrt #295347, thanks to
+  Christian Schmitt for reporting.
 
 *gwenhywfar-3.11.3 (07 Jan 2010)
 
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 0e1136890ad7..4fe62c1854a1 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,8 +1,8 @@
 DIST gwenhywfar-3.10.1.tar.gz 1480542 RMD160 b16b08b752cda53d4e8d708575988f614cdef84e SHA1 fda8e363bf4c69e50f8ba763a2d7bb2f319d1b45 SHA256 b76d5f0d4d96b74bdd61fb99f7974605205cd51817104c072bd2f80c60693b11
 DIST gwenhywfar-3.11.3.tar.gz 1504655 RMD160 a04e394ff0b316291c64c4cfa6630185194a2a4b SHA1 97c8f2232416c224f096ec9958e5d9d70291e012 SHA256 eeaa9671c589b2c756edc90c96c0d7d78da06e2421d71ed29b127b192e23d26d
 DIST gwenhywfar-3.8.2.tar.gz 1415997 RMD160 616f67f72eccafa61f7d0bfda66f3fc61f187b22 SHA1 573d80639cde613e1bb91b64307fc77047ccd6f5 SHA256 7482dcfb4e0fa1a702cacc450195c7e54a3c66fa1e9107aaae0316506a3e46ff
-EBUILD gwenhywfar-3.10.1.ebuild 1215 RMD160 545ae55f317abf8790a257bcb079622b24c692f1 SHA1 1f428a2bf3fa547aafe794150d34588d5c88b790 SHA256 035002efd97c688d4ad5bc712612e28a5b18af135181d6b1672c8e794e8be519
-EBUILD gwenhywfar-3.11.3.ebuild 1141 RMD160 7464a87bde96be402f23ee6c422d11582c65da86 SHA1 dbce5156e4e056293b7d518e3d48ede70ce69987 SHA256 79912977eb73ec4467e9d5173186dfc87e7bac108b1324417c066a7962c7c031
+EBUILD gwenhywfar-3.10.1.ebuild 1205 RMD160 790e55e85f27cd2545f32c8ce48f0a3d43dcb093 SHA1 b4d8786dac636230e3a32ed5c8678aa99db219e7 SHA256 6194db1c5d0b37bc33f0f8738b1bd599ba279e1145eb31d0bf6374c7417617d0
+EBUILD gwenhywfar-3.11.3.ebuild 1123 RMD160 5412eb47d2988887b21c0167b64e18af4d67d6c8 SHA1 90dfb78e220805701249a20655f50fe388c78d8e SHA256 fbd061ea4e4bc6e729242b7b020f1f096743110e1eb1c575758d3ee808eecd15
 EBUILD gwenhywfar-3.8.2.ebuild 1213 RMD160 36d1fbea92ed6f2ee2e6785a0108afad9b57f4b8 SHA1 ec1758a0ff34d103a5456e3d4aef70a7b442b6c9 SHA256 6f3b64b2daa56ed5c582730c5d4b7d2ffcd2dba96bd7b60985e02616887e481e
-MISC ChangeLog 9429 RMD160 311dda75ae24ede6dd7fb3890e2d8a2a1e17430b SHA1 0fc5b9c67b5a7a81c62fce0ee9d2a9740276846c SHA256 a0d0e57f3841bb1072a67d7a7076fa123696114f931a6dfa76bd07ca300f22bb
+MISC ChangeLog 9650 RMD160 529618195068ac02570040ad90859478929620b6 SHA1 c7d6024b985d0c42a2786133ed40408a318a17a8 SHA256 470db92747ae262347f65867050f1a99d8dba22915486bc568746edfb95866a2
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
diff --git a/sys-libs/gwenhywfar/gwenhywfar-3.10.1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-3.10.1.ebuild
index 51e1dadf6c7d..1fba951632f3 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-3.10.1.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-3.10.1.ebuild,v 1.3 2010/01/04 13:45:44 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-3.10.1.ebuild,v 1.4 2010/01/08 19:20:52 ssuominen Exp $
 
 EAPI="2"
 
@@ -11,15 +11,16 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
-IUSE="debug ssl doc"
+IUSE="debug doc"
 
-RDEPEND="ssl? ( net-libs/gnutls )"
+RDEPEND="net-libs/gnutls"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_configure() {
-	econf --enable-visibility \
-		$(use_enable ssl) \
+	econf \
+		--enable-visibility \
+		--enable-ssl \
 		$(use_enable debug) \
 		$(use_enable doc full-doc) \
 		--with-docpath="/usr/share/doc/${PF}/apidoc" || die "configure failed"
diff --git a/sys-libs/gwenhywfar/gwenhywfar-3.11.3.ebuild b/sys-libs/gwenhywfar/gwenhywfar-3.11.3.ebuild
index 96d6b5a43b49..e24a6f27e5c8 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-3.11.3.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-3.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-3.11.3.ebuild,v 1.1 2010/01/07 10:12:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gwenhywfar/gwenhywfar-3.11.3.ebuild,v 1.2 2010/01/08 19:20:52 ssuominen Exp $
 
 EAPI=2
 
@@ -11,16 +11,16 @@ SRC_URI="http://www.aquamaniac.de/sites/download/download.php?package=01&release
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ssl doc"
+IUSE="debug doc"
 
-RDEPEND="ssl? ( net-libs/gnutls )"
+RDEPEND="net-libs/gnutls"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
-		$(use_enable ssl) \
+		--enable-ssl \
 		--enable-visibility \
 		$(use_enable debug) \
 		$(use_enable doc full-doc) \