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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 13 insertions, 46 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/Manifest b/app-crypt/gnupg/Manifest
index 54897f20a0cb..372af6779817 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX gnupg-2.0.17-gpgsm-gencert.patch 1079 RMD160 58fdc7454cd23bd9731866f1350eee1d166487d0 SHA1 3f6710fb83de85c34c8edaf4c7aaddeb1ccc771d SHA256 aec0ea30d898f7f7369abac9a61a0713b6b9b89d231b9beff1ee82041983b7ed
 AUX gnupg-2.0.17-libgrcrypt150-bugfix.patch 1125 RMD160 529bd214cb1883e318fae40cfc582ec24d6ebfc2 SHA1 f4119372ae2dece42606eb266211ca7d4a8354a8 SHA256 a909e3d044292ec0869385a529dab5095ae788ea68a9cb70e63054266eb8cf0b
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
 DIST gnupg-2.0.17.tar.bz2 3997356 RMD160 f919947a1896ac20c455534d91a3e2d3e5b60c1f SHA1 41ef5460417ca0a1131fc730849fe3afd49ad2de SHA256 ea649d5ecb2f97cc8d81c5796c6ad8d7d8581f9554241c39d2b11ab12139eea6
 DIST gnupg-2.0.18.tar.bz2 4016606 RMD160 15e3de278285a3989563d9a8e2ad133113f1cd91 SHA1 5ec2f718760cc3121970a140aeea004b64545c46 SHA256 48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b
 DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4ec31b97b3b2dd22741880b67cfee40f84 SHA256 309928da34941dff1d6f6687542ff3d58306d85be9e1a9906bc4f9f8e6011844
-EBUILD gnupg-1.4.11.ebuild 5481 RMD160 f313bd6a39300f48681784d7b7be23917c098688 SHA1 d7cce6fd980f380ca5eca03bc6d8a826a5f257ea SHA256 19a816ee5e19d8c4b1062fb15bfaef1ad3b3d91659ac24915188732745fe71a7
+EBUILD gnupg-1.4.11.ebuild 4452 RMD160 e29a69e1362b2f11d5e9963e51cab60fa10fc574 SHA1 d1856f3c184e495ba7e1225bec8b7e85895a74ae SHA256 fbf3a9271584191220435cc82cec0f5b384c2b86cba46555b290c7c5ee55d991
 EBUILD gnupg-2.0.17-r2.ebuild 4311 RMD160 f6629b07034c3c136a55b31214138f9e69f0f889 SHA1 074cd021b43cbe967242347cb07f78af04c46914 SHA256 af83317377965f1ec5258219c379a233519fd101b534171ddb748c3fb3f95c05
 EBUILD gnupg-2.0.17-r3.ebuild 4366 RMD160 cdbb20daca939c31b065f6d5eb5a3bfea1ad3c9a SHA1 74371ca1b5390c17207cec10faf217c7d7855425 SHA256 79421b9013411d75d7eac959f21e6a187147825fb8dc0431c3d3cebd7f040daa
 EBUILD gnupg-2.0.17.ebuild 4530 RMD160 8e5e06a55c44cee6efe903edda4f0149c38b2044 SHA1 0037dee7d416beeff38cfb4230dad4fb60dd90e1 SHA256 95a2254b67d72ed528b84a7be40d284c4a1bc58d0ae274797eb0a52cf7a6090b
 EBUILD gnupg-2.0.18.ebuild 4381 RMD160 b739d6689ff385f7a5394e3e470f5376f965661a SHA1 a5ca4130c13bce5eddaa484295fd54b5f8e4bb7c SHA256 d2715c0d0907af0a111354065cc004eb1b2b95bfe7b9498047ac3c2ba646150c
-MISC ChangeLog 63870 RMD160 42238cb0c2af2410be48480150c57aba0b822211 SHA1 3a942733203572e1d35e76d39452473853df34d8 SHA256 f4277d1519f32d7f17e15e099495b309404aa6fa9c10438c317d7d461f6eb2a5
+MISC ChangeLog 64023 RMD160 4935e540767901268bec6c522e59ab2efaa4d89b SHA1 372b6ce0e9c043b978f7a84a7b2ee3372a81e45f SHA256 92856147480dd82406a17f568ecc50421a51ad45c32869504f569fce4bd21697
 MISC metadata.xml 1386 RMD160 9cdb52f5bfc316fe64af58338dc70fa4dcdb564e SHA1 3e4113636f8e1381acd8b57ee76c8fe33ac65456 SHA256 a3a9dee1b4732c0632705f66524a12563079fa130c5c17845d62325da49a151a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk7Vra4ACgkQaC/OocHi7JbmqQD+I/F5R4FbWexBlPPuIn/1wjmo
-Me1aYFlOapKWJ1u0Eo0A/2XJn2kbz5QXNI6UekmU9BmWpWKXEo5qKRmGBiGUdnz/
-=AUDQ
------END PGP SIGNATURE-----
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"