summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTavis Ormandy <taviso@gentoo.org>2004-03-13 16:34:27 +0000
committerTavis Ormandy <taviso@gentoo.org>2004-03-13 16:34:27 +0000
commitc33846aa10d68e965870c5b50b3df70d2594fc1d (patch)
tree1674249602e93b9136647b54200400f6b407288a /app-crypt
parentFixing alsa DEPEND for bug #27746. (Manifest recommit) (diff)
downloadgentoo-2-c33846aa10d68e965870c5b50b3df70d2594fc1d.tar.gz
gentoo-2-c33846aa10d68e965870c5b50b3df70d2594fc1d.tar.bz2
gentoo-2-c33846aa10d68e965870c5b50b3df70d2594fc1d.zip
fixing LICENSE
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/gnupg/ChangeLog5
-rw-r--r--app-crypt/gnupg/gnupg-1.2.4.ebuild8
-rw-r--r--app-crypt/gnupg/gnupg-1.9.0.ebuild9
3 files changed, 8 insertions, 14 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 0804501d5257..a5500b41d4e7 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,12 +1,15 @@
# ChangeLog for app-crypt/gnupg
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.53 2004/03/13 12:37:48 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.54 2004/03/13 16:34:27 taviso Exp $
13 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> gnupg-1.2.3-r2.ebuild,
gnupg-1.2.3-r5.ebuild, gnupg-1.2.4.ebuild, gnupg-1.9.0.ebuild:
Updated x11-misc/xloadimage to media-gfx/xloadimage and added
media-gfx/xli as second candidate. See bug #26751
+ 13 Mar 2004; Tavis Ormandy <taviso@gentoo.org> gnupg-1.2.4.ebuild:
+ fixing LICENSE.
+
09 Mar 2004; <agriffis@gentoo.org> gnupg-1.2.4.ebuild:
stable on alpha and ia64
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index 1bc68da7c5e3..07810f701995 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-2004 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.12 2004/03/13 12:37:49 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.13 2004/03/13 16:34:27 taviso Exp $
inherit eutils flag-o-matic
@@ -9,12 +9,8 @@ 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 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"
+LICENSE="GPL-2 | IDEA GPL-2"
KEYWORDS="x86 ~ppc sparc alpha hppa ~amd64 ia64"
IUSE="X ldap nls static caps idea"
diff --git a/app-crypt/gnupg/gnupg-1.9.0.ebuild b/app-crypt/gnupg/gnupg-1.9.0.ebuild
index a98be2792cdb..e96e6f553726 100644
--- a/app-crypt/gnupg/gnupg-1.9.0.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.0.ebuild,v 1.2 2004/03/13 12:37:49 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.0.ebuild,v 1.3 2004/03/13 16:34:27 taviso Exp $
inherit eutils
@@ -8,12 +8,7 @@ DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
HOMEPAGE="http://www.gnupg.org/"
SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
SLOT="0"
-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"
+LICENSE="GPL-2 | GPL-2 IDEA"
KEYWORDS="~x86 ~alpha"
IUSE="X ldap nls caps"