From 3c03b6041c99848fba6ac86526b6e2a7827e4b31 Mon Sep 17 00:00:00 2001 From: Tavis Ormandy Date: Sat, 13 Mar 2004 16:34:27 +0000 Subject: fixing LICENSE --- app-crypt/gnupg/ChangeLog | 5 ++++- app-crypt/gnupg/Manifest | 12 ++++++------ app-crypt/gnupg/gnupg-1.2.4.ebuild | 8 ++------ app-crypt/gnupg/gnupg-1.9.0.ebuild | 9 ++------- 4 files changed, 14 insertions(+), 20 deletions(-) (limited to 'app-crypt/gnupg') 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 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 gnupg-1.2.4.ebuild: + fixing LICENSE. + 09 Mar 2004; gnupg-1.2.4.ebuild: stable on alpha and ia64 diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index 1e8546c84797..679e250a9260 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -1,12 +1,12 @@ -MD5 f87545872e379995cdccf6fe7e144c66 gnupg-1.2.3-r2.ebuild 1653 -MD5 b1ea12e4f45be6b44b4b704f394d5985 ChangeLog 8502 MD5 2b8240836f86729adb0c218f9bb7df37 gnupg-1.2.3-r5.ebuild 3649 -MD5 dd3ebd73274ade440300f5f85758a3b8 gnupg-1.2.4.ebuild 4210 +MD5 588218bd3dcd3a8a36f8da66f5dcbc41 gnupg-1.2.4.ebuild 4034 +MD5 f87545872e379995cdccf6fe7e144c66 gnupg-1.2.3-r2.ebuild 1653 +MD5 13edeea261e12c3dbbd4141e79bad7fd gnupg-1.9.0.ebuild 2744 +MD5 62787013e27a8f1bf31375a22a942058 ChangeLog 8591 MD5 ad53378ee0bb633bb019209272913196 metadata.xml 484 -MD5 4b330ca7675fe5ac0f2278819ba1eb08 gnupg-1.9.0.ebuild 2921 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r5 65 MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117 -MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554 -MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 922 MD5 df557d150f1c32564de9c0f66b47997a files/digest-gnupg-1.9.0 116 +MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 922 +MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554 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" -- cgit v1.2.3-65-gdbad