summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2003-12-26 18:17:12 +0000
committerTavis Ormandy <taviso@gentoo.org>2003-12-26 18:17:12 +0000
commit339274714dabb9d4955a53c9c0f8f0a4e7597454 (patch)
tree19a4e7e5c471d7cfe36f144148613ce9170cca5c /app-crypt
parentversion bump (diff)
downloadgentoo-2-339274714dabb9d4955a53c9c0f8f0a4e7597454.tar.gz
gentoo-2-339274714dabb9d4955a53c9c0f8f0a4e7597454.tar.bz2
gentoo-2-339274714dabb9d4955a53c9c0f8f0a4e7597454.zip
fix license for conditional IDEA support
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/gnupg/ChangeLog5
-rw-r--r--app-crypt/gnupg/Manifest4
-rw-r--r--app-crypt/gnupg/gnupg-1.2.4.ebuild10
3 files changed, 14 insertions, 5 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 3e42cadf685b..f4a9a6549021 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-crypt/gnupg
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.42 2003/12/26 18:03:13 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.43 2003/12/26 18:17:03 taviso Exp $
+
+ 26 Dec 2003; Tavis Ormandy <taviso@gentoo.org> gnupg-1.2.4.ebuild:
+ updating LICENSE
*gnupg-1.2.4 (26 Dec 2003)
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 353952115d9f..029144cff484 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,7 +1,7 @@
MD5 214e363428f355b0d3e2179faafab0d5 gnupg-1.2.3-r5.ebuild 3305
-MD5 5ed2e3f7f7ee5a514fd7312323b4cc96 gnupg-1.2.4.ebuild 3680
+MD5 2d2486272d3e82597ad9012dde7d013a gnupg-1.2.4.ebuild 3867
MD5 b1b8b51a3ba07896162db22ca158d07d gnupg-1.2.3-r2.ebuild 1638
-MD5 d54d03d7a93ab4e9905b0cee19a54a32 ChangeLog 6885
+MD5 3092295daefda263ff468f2f327e285e ChangeLog 6974
MD5 ad53378ee0bb633bb019209272913196 metadata.xml 484
MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65
MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r5 65
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index 2bab5eb10f46..3f8f375dcdbe 100644
--- a/app-crypt/gnupg/gnupg-1.2.4.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.1 2003/12/26 18:03:13 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.2 2003/12/26 18:17:03 taviso Exp $
inherit eutils
@@ -9,7 +9,13 @@ HOMEPAGE="http://www.gnupg.org/"
SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
SLOT="0"
-LICENSE="GPL-2 IDEA"
+LICENSE="GPL-2"
+
+# IDEA license is rather restrictive if you're unlucky enough to
+# live in a country where its patented, however it is FAIB for
+# non-commercial use.
+use idea && LICENCE="${LICENCE} | IDEA"
+
KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64"
IUSE="X ldap nls static caps idea"