summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2008-01-18 23:08:15 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2008-01-18 23:08:15 +0000
commitc42a571838458d4d81aea7c33865e58701f9ffeb (patch)
tree3462fcebba4c470f219fa0b29f1ca5eff0f9a19b /net-libs
parentForgot to actually depend on gmp. (diff)
downloadgentoo-2-c42a571838458d4d81aea7c33865e58701f9ffeb.tar.gz
gentoo-2-c42a571838458d4d81aea7c33865e58701f9ffeb.tar.bz2
gentoo-2-c42a571838458d4d81aea7c33865e58701f9ffeb.zip
Fix bug#202381, bug#203880
(Portage version: 2.1.4)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/gnutls/ChangeLog5
-rw-r--r--net-libs/gnutls/gnutls-2.2.1.ebuild16
2 files changed, 18 insertions, 3 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index b44d0d247c15..cd25b3dae911 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.137 2008/01/18 18:17:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.138 2008/01/18 23:08:15 alonbl Exp $
+
+ 18 Jan 2008; Alon Bar-Lev <alonbl@gentoo.org> gnutls-2.2.1.ebuild:
+ Fix bug#202381, bug#203880
*gnutls-2.2.1 (18 Jan 2008)
diff --git a/net-libs/gnutls/gnutls-2.2.1.ebuild b/net-libs/gnutls/gnutls-2.2.1.ebuild
index 74276fbdab1e..0bce495a8f6d 100644
--- a/net-libs/gnutls/gnutls-2.2.1.ebuild
+++ b/net-libs/gnutls/gnutls-2.2.1.ebuild
@@ -1,6 +1,6 @@
# 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.1 2008/01/18 18:17:40 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.2.1.ebuild,v 1.2 2008/01/18 23:08:15 alonbl Exp $
inherit libtool autotools
@@ -12,7 +12,7 @@ SRC_URI="http://josefsson.org/gnutls/releases/${P}.tar.bz2"
LICENSE="LGPL-2.1 GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="zlib lzo doc nls guile"
+IUSE="zlib lzo doc nls guile bindist"
RDEPEND="dev-libs/libgpg-error
>=dev-libs/libgcrypt-1.2.4
@@ -27,6 +27,18 @@ DEPEND="${RDEPEND}
doc? ( dev-util/gtk-doc )
nls? ( sys-devel/gettext )"
+pkg_setup() {
+ if use guile && ! built_with_use dev-scheme/guile networking; then
+ eerror "You are trying to compile ${PN} package with USE=\"guile\""
+ eerror "while dev-scheme/guile does not have USE=\"networking\""
+ die
+ fi
+ if use lzo && use bindist; then
+ eerror "lzo is not allowed in binary distribution of gnutls"
+ die
+ fi
+}
+
src_unpack() {
unpack ${A}
cd "${S}"