Bug #398441: IDEA patents have expired, remove bindist impact on USE=idea.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

2 files changed, 11 insertions, 34 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 969bf72c5b79..beae1e966846 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/gnupg
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.419 2011/11/30 04:14:30 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.420 2012/01/11 00:19:55 robbat2 Exp $
+
+  11 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> gnupg-1.4.11.ebuild:
+  Bug #398441: IDEA patents have expired, remove bindist impact on USE=idea.
 
   30 Nov 2011; Mike Frysinger <vapier@gentoo.org> gnupg-2.0.18.ebuild:
   Control readline dep with USE=readline.
diff --git a/app-crypt/gnupg/gnupg-1.4.11.ebuild b/app-crypt/gnupg/gnupg-1.4.11.ebuild
index 7b55367055be..e6c1d6a7ef8d 100644
--- a/app-crypt/gnupg/gnupg-1.4.11.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild,v 1.9 2011/01/06 17:18:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.11.ebuild,v 1.10 2012/01/11 00:19:55 robbat2 Exp $
 
 EAPI="3"
 
@@ -14,15 +14,13 @@ MY_P=${P/_/}
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2
-	!bindist? (
-		idea? ( mirror://gentoo/idea.c.gz )
-		)"
+		idea? ( mirror://gentoo/idea.c.gz )"
 #		ecc? ( http://www.calcurco.cat/eccGnuPG/src/${ECC_PATCH}.bz2 )
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 bindist curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru"
+IUSE="bzip2 curl idea ldap nls readline selinux smartcard static usb zlib linguas_ru"
 #IUSE="bzip2 bindist curl ecc idea ldap nls readline selinux smartcard static usb zlib linguas_ru"
 
 COMMON_DEPEND="
@@ -47,13 +45,8 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	if use idea; then
-		if use bindist; then
-			einfo "Skipping IDEA support to comply with binary distribution (bug #148907)."
-		else
-			ewarn "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html"
-			mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
-			ewarn "failed to insert IDEA module"
-		fi
+		mv "${WORKDIR}"/idea.c "${S}"/cipher/idea.c || \
+		ewarn "failed to insert IDEA module"
 	fi
 
 #	if use ecc; then
@@ -137,25 +130,6 @@ pkg_postinst() {
 	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
 	ewarn "you MUST make the gpg binary setuid."
 	echo
-	if use !bindist && use idea; then
-		elog
-		elog "IDEA"
-		elog "you have compiled ${PN} with support for the IDEA algorithm, this code"
-		elog "is distributed under the GPL in countries where it is permitted to do so"
-		elog "by law."
-		elog
-		elog "Please read http://www.gnupg.org/(en)/faq/why-not-idea.html for more information."
-		elog
-		ewarn "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		ewarn "to use it at no cost for 'non revenue generating data transfer between private"
-		ewarn "individuals'."
-		ewarn
-		ewarn "Countries where the patent applies are listed here"
-		ewarn "http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm#Security"
-		ewarn
-		ewarn "Further information and other licenses are availble from http://www.mediacrypt.com/"
-		ewarn
-	fi
 #	if use !bindist && use ecc; then
 #		ewarn
 #		ewarn "The elliptical curves patch is experimental"