Re-add support for the IDEA cipher, bug 159870.

Package-Manager: portage-2.1.10.47/cvs/Linux x86_64

3 files changed, 69 insertions, 6 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index 8f4fb6565338..00c3c76983ea 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgcrypt
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.152 2011/09/22 14:44:39 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.153 2012/02/18 20:55:36 ulm Exp $
+
+*libgcrypt-1.5.0-r2 (18 Feb 2012)
+
+  18 Feb 2012; Ulrich Müller <ulm@gentoo.org> +libgcrypt-1.5.0-r2.ebuild:
+  Re-add support for the IDEA cipher, bug 159870.
 
 *libgcrypt-1.5.0-r1 (22 Sep 2011)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 627168ed2f85..a4a3473ebfd9 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -4,17 +4,29 @@ Hash: SHA1
 AUX libgcrypt-1.5.0-uscore.patch 981 RMD160 5993a5da17db5c557a141490144027d3d6ffef3d SHA1 c0559284fcd8885c38c9b5c2bd71eac028dc9b02 SHA256 4cbb34cebce02531b9b940494b78b7186b2fd05b802866d9ecb42d478e88e845
 AUX libgcrypt-multilib-syspath.patch 588 RMD160 e59f8299b74ac2c1856c6eda96fdd4357f353ed6 SHA1 daf1d29be3647d37416f2a4d9f0c19083a2f719d SHA256 a3fc53f24b9cd0355a5267bc3ca8e88c397878473046536068c8ae4ae0b526eb
 DIST libgcrypt-1.4.6.tar.bz2 1151877 RMD160 d4d720c4bfe80f0799b2cbdbbb49d304e3195049 SHA1 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6 SHA256 3e4b30da6b357b565333d0222133b64a0414be99ba72733081165c8ea9bc6b85
+DIST libgcrypt-1.5.0-idea.patch.bz2 4291 RMD160 5e5119fb279521a26ca51550b03f8bdda604e772 SHA1 4c148aff818d2dfae383a1c2a27242d129ca30d1 SHA256 c6facb5733454cbd5ab0caf76b9ffe32a95973853a67cc422697f5f1cb354ad9
 DIST libgcrypt-1.5.0.tar.bz2 1433506 RMD160 f01e8198dcc379ff2fa5e8d3ac39e7b32fc41dad SHA1 3e776d44375dc1a710560b98ae8437d5da6e32cf SHA256 4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa
 EBUILD libgcrypt-1.4.6-r1.ebuild 1167 RMD160 add8b9922a69f0c631b4c7d08049c8d379cc5e18 SHA1 92a52594ebf4524af911ad7b3e75fbd50df924f8 SHA256 0d9c4e0a4a0a96304499a18706fd9860c7001417eec1cee064feaee95d0abf89
 EBUILD libgcrypt-1.4.6.ebuild 1126 RMD160 bf89e3914988bbfb3e917441cf9a32945b950d71 SHA1 f8445a80a7916f4038860d122afc031fbc84f952 SHA256 e2bf303262e08375c82d10c921c642bfe9383bf3c5c64a7fd20e1d4e704ecf02
 EBUILD libgcrypt-1.5.0-r1.ebuild 1166 RMD160 843457b6eb1a3dceda06fe77117dc90414341180 SHA1 b529383d38472bfec16c2450b95705dacc080d10 SHA256 5e9122ad1f5a4300eb9a67fcad806cfb8bb64b24e588a76cffb7c65b909e59e2
+EBUILD libgcrypt-1.5.0-r2.ebuild 1238 RMD160 349d4b1c52bfdf820b72e71dbd9e735c92c00e3c SHA1 8a717878b9ab65d24a5619244813518ef0a30784 SHA256 a020c25a75609a96378ec1e45f9e8a691db6f27ab12fedfd39b02d0317116a8a
 EBUILD libgcrypt-1.5.0.ebuild 1144 RMD160 c5323eaea9740c04a50bd1344187b030b9873b38 SHA1 e80154a6fac274bdf0c3247bcbddc5266dcdc076 SHA256 a82ce4bb1484fdb671e78fd8e1a24336442aebab447380e88656152955e51a0a
-MISC ChangeLog 22332 RMD160 104b6745231ba81a2aa54da71fb171a07459ed06 SHA1 89c8d81dcfa82a2b9e2227c014c624634641c4e5 SHA256 9e0d61fcdae84eeca7ca0de24206812e756dbe2cdbac5ca3885396d3eb81a24c
+MISC ChangeLog 22487 RMD160 6b9943da0e5a08accc517223b5047842c7d6aca0 SHA1 302ad8a1b68665e96dbdaa5801a007c68754b7c8 SHA256 35229fe36b2936a3cfb3c60925b601314151e2a6381f08c5440c08a0b1a91391
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk57SdoACgkQAiZjviIA2XgXFACfRi5zIEozBbi/RuGo5WR4aEqU
-1ucAoJ8fqHGmdP0FTkwuY67DpBJwpZyY
-=eP3V
+iQIcBAEBAgAGBQJPQBCsAAoJEDxpGckxwJCBZE8P/i3gAZ+4lVuLrV5Tl+Yj8bki
+AyB0Orhj+mdhJe0UC9iBX4OONGCjRBqP27rPQC5eaMcHOPywLIOjNYZTb1L8qFrY
+zKD70hBw3O2tfsp80w3cuM6xJngIPk2OLp1/NGuRAlLQSuLSFo7hM3up8GQXbIhz
+ASrYhMKmb6gspkbAaR54OZJmWbXOp3rmqZwjaq5VRxC+30ATmuSZIslH6c4k15y7
+FiBt3S7KUTx5QkQcrhOYIjkfZ2d3rW075UW8PXfyiq7LI86+lmKLyhvC8VDupMAw
+6+40s/W68z6Kwayt18uZXRkWZPhfv9Uk0ZjaVjofx1eqjP0NpyCjjVd4QYU3UGr7
+ojuNJtAiEYrVOJ7A1N77qSC18H5vIRPBbMtgtUPvfBR0QLUwTdAwmgQcp8jngRNv
+lrY7KaSN/G83m8ym8lzuPiWE4H8ljTMqx1S69vsZ7aHvI95Bt6D0bhSk4CYoVRZq
+mn1Fr0QW1syUaH9JOGOVllhxQDIp5v7Q/KPoyP/TPuHvNT3TV+u4UWkKHW7Bi4lg
+2r+gpNjOoyFMV8QZpfJlgJM/NA5CdQSIC0Hel9Bbyzmo2OJlMN14rHMW61BY0UOe
+EcDvL8z3vCIeBK53ks/L+bk+Viul2YUz7QbYKkDLKULhiqDbYkcOb/5wq7U/hYkQ
+TB5YpSquw7vckZfvDOvb
+=k+Yp
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..3648f8bbd674
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.5.0-r2.ebuild,v 1.1 2012/02/18 20:55:36 ulm Exp $
+
+EAPI="4"
+
+inherit autotools
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
+	ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2
+	mirror://gentoo/${P}-idea.patch.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-uscore.patch
+	epatch "${FILESDIR}"/${PN}-multilib-syspath.patch
+	epatch "${WORKDIR}"/${P}-idea.patch
+	eautoreconf
+}
+
+src_configure() {
+	# --disable-padlock-support for bug #201917
+	econf \
+		--disable-padlock-support \
+		--disable-dependency-tracking \
+		--enable-noexecstack \
+		--disable-O-flag-munging \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	use static-libs || find "${D}" -name '*.la' -delete
+}