make gnutls mandatory because it does not work with openssl, thanks to Jari-Matti Mäkelä <jmjmak@utu.fi> and Bret Towe <magnade@gmail.com> in bug 138275

Package-Manager: portage-2.1.1_pre5-r2

3 files changed, 18 insertions, 21 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 01c84b43fe62..3686081d799c 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.195 2006/08/18 22:27:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.196 2006/08/19 00:07:18 genstef Exp $
+
+  19 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild:
+  make gnutls mandatory because it does not work with openssl, thanks to
+  Jari-Matti Mäkelä <jmjmak@utu.fi> and Bret Towe <magnade@gmail.com> in bug
+  138275
 
   18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild,
   cups-1.2.2.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index f940d1d9f68c..a45faee4c367 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -76,14 +76,14 @@ EBUILD cups-1.1.23-r8.ebuild 4983 RMD160 4c36407a2cf0a9a124f766458fd7e465358a725
 MD5 6cd1ab27ff5d14d5f42a5c6a21a3cf22 cups-1.1.23-r8.ebuild 4983
 RMD160 4c36407a2cf0a9a124f766458fd7e465358a725e cups-1.1.23-r8.ebuild 4983
 SHA256 c9de0ac2e9460305cc9209352ba251610d8998589caa77662be5487b2ade97db cups-1.1.23-r8.ebuild 4983
-EBUILD cups-1.2.2.ebuild 5966 RMD160 6f1ce6684f01c947c2f12eac3e101e37e6e51904 SHA1 0a56a6d39c742b4a724595db41ffba8083340ba1 SHA256 71c65419c5b70f963bef118a9a9f09fe35e2284e9e6a0bbf0553487cacc4b363
-MD5 d9bad8f8f4b98ab8c3add503ee719659 cups-1.2.2.ebuild 5966
-RMD160 6f1ce6684f01c947c2f12eac3e101e37e6e51904 cups-1.2.2.ebuild 5966
-SHA256 71c65419c5b70f963bef118a9a9f09fe35e2284e9e6a0bbf0553487cacc4b363 cups-1.2.2.ebuild 5966
-MISC ChangeLog 27333 RMD160 726f6aaf5dde243850641d059233f768885252cb SHA1 37feb002d075265559b7f006b3e3fe42dcd37cc1 SHA256 339b9a66c5ff537c4cf58804d032fd985e01a454869c5b2af3bc7cb8894b5d3e
-MD5 97a34d7a5d5a612022bdb4e2b7bae3bb ChangeLog 27333
-RMD160 726f6aaf5dde243850641d059233f768885252cb ChangeLog 27333
-SHA256 339b9a66c5ff537c4cf58804d032fd985e01a454869c5b2af3bc7cb8894b5d3e ChangeLog 27333
+EBUILD cups-1.2.2.ebuild 5806 RMD160 61b18baa6396ea53b9029a0f8aeb2162ca42b240 SHA1 6e07a0d7c21d21c42a333d07aa68005e216684ee SHA256 98d1c06c777ccc606f25e701ba342227d6606a0e78ddabad5904799921b7d608
+MD5 1bb5b95e1940bcc7b936212c05ebefc3 cups-1.2.2.ebuild 5806
+RMD160 61b18baa6396ea53b9029a0f8aeb2162ca42b240 cups-1.2.2.ebuild 5806
+SHA256 98d1c06c777ccc606f25e701ba342227d6606a0e78ddabad5904799921b7d608 cups-1.2.2.ebuild 5806
+MISC ChangeLog 27567 RMD160 b894a19d140869a1e6829c7e58a20476831a9e3c SHA1 69732466ef2ffad11523a3c37f2282c8b1cd65f4 SHA256 37a3df48a6236a7623ff303b0fe215d50c35aad57d1f7e11042ad1c6b659c588
+MD5 7cb225a87edbd26f843c77bb171b90bb ChangeLog 27567
+RMD160 b894a19d140869a1e6829c7e58a20476831a9e3c ChangeLog 27567
+SHA256 37a3df48a6236a7623ff303b0fe215d50c35aad57d1f7e11042ad1c6b659c588 ChangeLog 27567
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild
index afa4361d2480..d757081d0179 100644
--- a/net-print/cups/cups-1.2.2.ebuild
+++ b/net-print/cups/cups-1.2.2.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/net-print/cups/cups-1.2.2.ebuild,v 1.4 2006/08/18 22:27:38 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.5 2006/08/19 00:07:18 genstef Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -14,13 +14,10 @@ SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg X"
+IUSE="ssl slp pam samba nls dbus tiff png ppds jpeg X"
 
 DEP="pam? ( virtual/pam )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.6b )
-		gnutls? ( net-libs/gnutls )
-		)
+	ssl? ( net-libs/gnutls )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	dbus? ( sys-apps/dbus )
 	png? ( >=media-libs/libpng-1.2.1 )
@@ -80,11 +77,6 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use ssl && \
-		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
-
 	export DSOFLAGS="${LDFLAGS}"
 	econf \
 		--with-cups-user=lp \
@@ -95,6 +87,7 @@ src_compile() {
 		--with-bindnow=$(bindnow-flags) \
 		$(use_enable pam) \
 		$(use_enable ssl) \
+		--enable-gnutls \
 		$(use_enable slp) \
 		$(use_enable nls) \
 		$(use_enable dbus) \
@@ -105,7 +98,6 @@ src_compile() {
 		--enable-threads \
 		--enable-static \
 		--disable-pdftops \
-		${myconf} \
 		|| die "econf failed"
 
 	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that