1 |
robbat2 12/01/11 00:19:55 |
2 |
|
3 |
Modified: gnupg-1.4.11.ebuild ChangeLog |
4 |
Log: |
5 |
Bug #398441: IDEA patents have expired, remove bindist impact on USE=idea. |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.10 app-crypt/gnupg/gnupg-1.4.11.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild?rev=1.10&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild?rev=1.10&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild?r1=1.9&r2=1.10 |
15 |
|
16 |
Index: gnupg-1.4.11.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild,v |
19 |
retrieving revision 1.9 |
20 |
retrieving revision 1.10 |
21 |
diff -p -w -b -B -u -u -r1.9 -r1.10 |
22 |
--- gnupg-1.4.11.ebuild 6 Jan 2011 17:18:28 -0000 1.9 |
23 |
+++ gnupg-1.4.11.ebuild 11 Jan 2012 00:19:55 -0000 1.10 |
24 |
@@ -1,6 +1,6 @@ |
25 |
-# Copyright 1999-2011 Gentoo Foundation |
26 |
+# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild,v 1.9 2011/01/06 17:18:28 armin76 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild,v 1.10 2012/01/11 00:19:55 robbat2 Exp $ |
30 |
|
31 |
EAPI="3" |
32 |
|
33 |
@@ -14,15 +14,13 @@ MY_P=${P/_/} |
34 |
DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement" |
35 |
HOMEPAGE="http://www.gnupg.org/" |
36 |
SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2 |
37 |
- !bindist? ( |
38 |
- idea? ( mirror://gentoo/idea.c.gz ) |
39 |
- )" |
40 |
+ idea? ( mirror://gentoo/idea.c.gz )" |
41 |
# ecc? ( http://www.calcurco.cat/eccGnuPG/src/${ECC_PATCH}.bz2 ) |
42 |
|
43 |
LICENSE="GPL-2" |
44 |
SLOT="0" |
45 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos" |
46 |
-IUSE="bzip2 bindist curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru" |
47 |
+IUSE="bzip2 curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru" |
48 |
#IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib linguas_ru" |
49 |
|
50 |
COMMON_DEPEND=" |
51 |
@@ -47,14 +45,9 @@ S="${WORKDIR}/${MY_P}" |
52 |
|
53 |
src_prepare() { |
54 |
if use idea; then |
55 |
- if use bindist; then |
56 |
- einfo "Skipping IDEA support to comply with binary distribution (bug #148907)." |
57 |
- else |
58 |
- ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html" |
59 |
mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \ |
60 |
ewarn "failed to insert IDEA module" |
61 |
fi |
62 |
- fi |
63 |
|
64 |
# if use ecc; then |
65 |
# if use bindist; then |
66 |
@@ -137,25 +130,6 @@ pkg_postinst() { |
67 |
ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9," |
68 |
ewarn "you MUST make the gpg binary setuid." |
69 |
echo |
70 |
- if use !bindist && use idea; then |
71 |
- elog |
72 |
- elog "IDEA" |
73 |
- elog "you have compiled ${PN} with support for the IDEA algorithm, this code" |
74 |
- elog "is distributed under the GPL in countries where it is permitted to do so" |
75 |
- elog "by law." |
76 |
- elog |
77 |
- elog "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information." |
78 |
- elog |
79 |
- ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted" |
80 |
- ewarn "to use it at no cost for 'non revenue generating data transfer between private" |
81 |
- ewarn "individuals'." |
82 |
- ewarn |
83 |
- ewarn "Countries where the patent applies are listed here" |
84 |
- ewarn "http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm#Security" |
85 |
- ewarn |
86 |
- ewarn "Further information and other licenses are availble from http://www.mediacrypt.com/" |
87 |
- ewarn |
88 |
- fi |
89 |
# if use !bindist && use ecc; then |
90 |
# ewarn |
91 |
# ewarn "The elliptical curves patch is experimental" |
92 |
|
93 |
|
94 |
|
95 |
1.420 app-crypt/gnupg/ChangeLog |
96 |
|
97 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.420&view=markup |
98 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?rev=1.420&content-type=text/plain |
99 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/gnupg/ChangeLog?r1=1.419&r2=1.420 |
100 |
|
101 |
Index: ChangeLog |
102 |
=================================================================== |
103 |
RCS file: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v |
104 |
retrieving revision 1.419 |
105 |
retrieving revision 1.420 |
106 |
diff -p -w -b -B -u -u -r1.419 -r1.420 |
107 |
--- ChangeLog 30 Nov 2011 04:14:30 -0000 1.419 |
108 |
+++ ChangeLog 11 Jan 2012 00:19:55 -0000 1.420 |
109 |
@@ -1,6 +1,9 @@ |
110 |
# ChangeLog for app-crypt/gnupg |
111 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
112 |
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.419 2011/11/30 04:14:30 vapier Exp $ |
113 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
114 |
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.420 2012/01/11 00:19:55 robbat2 Exp $ |
115 |
+ |
116 |
+ 11 Jan 2012; Robin H. Johnson <robbat2@g.o> gnupg-1.4.11.ebuild: |
117 |
+ Bug #398441: IDEA patents have expired, remove bindist impact on USE=idea. |
118 |
|
119 |
30 Nov 2011; Mike Frysinger <vapier@g.o> gnupg-2.0.18.ebuild: |
120 |
Control readline dep with USE=readline. |