diff options
| -rw-r--r-- | net-libs/gnutls/ChangeLog | 5 | ||||
| -rw-r--r-- | net-libs/gnutls/Manifest | 16 | ||||
| -rw-r--r-- | net-libs/gnutls/gnutls-2.2.1.ebuild | 15 |
3 files changed, 21 insertions, 15 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog index cd25b3dae911..5620395c3b88 100644 --- a/net-libs/gnutls/ChangeLog +++ b/net-libs/gnutls/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/gnutls # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.138 2008/01/18 23:08:15 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.139 2008/01/20 15:30:05 alonbl Exp $ + + 20 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> gnutls-2.2.1.ebuild: + Don't fail build on bindist, bug#202381, thanks to jacub 18 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> gnutls-2.2.1.ebuild: Fix bug#202381, bug#203880 diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest index 0a8322891e1f..fc6dd7d61e18 100644 --- a/net-libs/gnutls/Manifest +++ b/net-libs/gnutls/Manifest @@ -13,14 +13,14 @@ EBUILD gnutls-2.0.4.ebuild 1436 RMD160 d42ecdcf9259e92457a89b237ed581c19a741494 MD5 46c41beaba723428962ec8ea309d882d gnutls-2.0.4.ebuild 1436 RMD160 d42ecdcf9259e92457a89b237ed581c19a741494 gnutls-2.0.4.ebuild 1436 SHA256 cf562ea795bbed27aa91f8c5cf9c6ef65a9b3beb7ceff91005ae49e63e30c70f gnutls-2.0.4.ebuild 1436 -EBUILD gnutls-2.2.1.ebuild 1844 RMD160 fff78d3f43e34bf41f61de9bf2599ba45a283755 SHA1 1f0119a0bbd6c94159c5a58ec4f675903c02d524 SHA256 17996f52779306d6927a19b4b4eab590f49524cf6a01fe2911b486315ddd2b41 -MD5 245efc3797e56c2408b561742e95a1ee gnutls-2.2.1.ebuild 1844 -RMD160 fff78d3f43e34bf41f61de9bf2599ba45a283755 gnutls-2.2.1.ebuild 1844 -SHA256 17996f52779306d6927a19b4b4eab590f49524cf6a01fe2911b486315ddd2b41 gnutls-2.2.1.ebuild 1844 -MISC ChangeLog 20437 RMD160 8ec778b1566a1610f02623323a0251adc5d1a168 SHA1 fe01135304ae73bcf7c7352d3565510d22a1bd6d SHA256 d4d815ac7427f0654c6d8c17844d455a5519bf8b630dad84424810c58977e272 -MD5 442c2b140fce1273e54e086dabff9af6 ChangeLog 20437 -RMD160 8ec778b1566a1610f02623323a0251adc5d1a168 ChangeLog 20437 -SHA256 d4d815ac7427f0654c6d8c17844d455a5519bf8b630dad84424810c58977e272 ChangeLog 20437 +EBUILD gnutls-2.2.1.ebuild 2025 RMD160 c1ac7be743477cbcbdb7b70496f5914ba5ad696c SHA1 5b111ce54eeb043443c3174667de6740567363e4 SHA256 06305c9e7f71e839e11649297cee8d2e8ec455688fe16ab4d1ca9ba312f384ab +MD5 a543327033080731666bfba13e580912 gnutls-2.2.1.ebuild 2025 +RMD160 c1ac7be743477cbcbdb7b70496f5914ba5ad696c gnutls-2.2.1.ebuild 2025 +SHA256 06305c9e7f71e839e11649297cee8d2e8ec455688fe16ab4d1ca9ba312f384ab gnutls-2.2.1.ebuild 2025 +MISC ChangeLog 20566 RMD160 50f743c13f77b3627c49cf0c55f37a390e23a41a SHA1 34d253144c0e00bf6afef94ed22e1f8a45c65b26 SHA256 ec0f930d808f53c70c62b01a8ff06eeb6335787b10e4135243eca93508de910f +MD5 6a09b6e51b9c1bf638260b4419682194 ChangeLog 20566 +RMD160 50f743c13f77b3627c49cf0c55f37a390e23a41a ChangeLog 20566 +SHA256 ec0f930d808f53c70c62b01a8ff06eeb6335787b10e4135243eca93508de910f ChangeLog 20566 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10 MD5 1c3665b87d1e39c6799909da58f41b26 metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf metadata.xml 160 diff --git a/net-libs/gnutls/gnutls-2.2.1.ebuild b/net-libs/gnutls/gnutls-2.2.1.ebuild index 0bce495a8f6d..230eb2f8f3e0 100644 --- a/net-libs/gnutls/gnutls-2.2.1.ebuild +++ b/net-libs/gnutls/gnutls-2.2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.2.1.ebuild,v 1.2 2008/01/18 23:08:15 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.2.1.ebuild,v 1.3 2008/01/20 15:30:05 alonbl Exp $ -inherit libtool autotools +inherit libtool autotools eutils DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project" HOMEPAGE="http://www.gnutls.org/" @@ -21,7 +21,7 @@ RDEPEND="dev-libs/libgpg-error nls? ( virtual/libintl ) guile? ( dev-scheme/guile ) zlib? ( >=sys-libs/zlib-1.1 ) - lzo? ( >=dev-libs/lzo-2 )" + !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )" DEPEND="${RDEPEND} sys-devel/libtool doc? ( dev-util/gtk-doc ) @@ -34,8 +34,9 @@ pkg_setup() { die fi if use lzo && use bindist; then - eerror "lzo is not allowed in binary distribution of gnutls" - die + ewarn "lzo support was disabled for binary distribution of gnutls" + ewarn "due to licensing issues. See Bug 202381 for details." + epause 5 fi } @@ -46,6 +47,8 @@ src_unpack() { } src_compile() { + local myconf + use bindist && myconf="--disable-lzo" || myconf="$(use_enable lzo)" econf \ --without-included-opencdk \ $(use_with zlib) \ @@ -53,7 +56,7 @@ src_compile() { $(use_enable nls) \ $(use_enable guile) \ $(use_enable doc gtk-doc) \ - || die + ${myconf} emake || die } |