Cleanup

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 9 insertions, 80 deletions

diff --git a/app-crypt/gpgme/ChangeLog b/app-crypt/gpgme/ChangeLog
index 90f0f20becff..4a0adc87a341 100644
--- a/app-crypt/gpgme/ChangeLog
+++ b/app-crypt/gpgme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gpgme
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.237 2015/07/30 18:53:07 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/ChangeLog,v 1.238 2015/07/30 19:05:12 alonbl Exp $
+
+  30 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/gpgme-1.3.2-CVE-2014-3564.patch, -gpgme-1.3.2-r1.ebuild:
+  Cleanup
 
   30 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> gpgme-1.5.5.ebuild:
   ia64 stable wrt bug #533350
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 17dd77c42b59..1e8e006e9b89 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -2,19 +2,14 @@
 Hash: SHA256
 
 AUX gpgme-1.1.8-et_EE.patch 356 SHA256 dcf67057447f1f6316ebad2b61340bc24086eb470a9cb68cababcb709b329e7b SHA512 c9e898be4d4a0f19fb41e10e8511820cb78051a06941ef8e5d870ccafb71ce5650a1d5289f95506ca7123b021e510f01c2ed8a3062ad967b0415142bfec87799 WHIRLPOOL 2883d82bb0bc9bf9dae493dcf1f027139190cf76eaa7fc8be45cdf67de471940a8958f2811dabad383d1e58d92f38418f3cfccc3b37c85e649cdccef0337fd31
-AUX gpgme-1.3.2-CVE-2014-3564.patch 713 SHA256 185bf050e119e12f76250b9ff0c312668447da27446167b3a208e879a0579bbe SHA512 9d9af55398593603539668f67d3732d90e130ae00f2bbb5c741b2544816e288f8c06d7076287c1ea96c13e7ef4b76c4c8272baf3644f6abd8f442b696fbb191a WHIRLPOOL 391f5838e15f71bb5d719158acc568f8b936a227b6ccb1a16798f58e2710b34bbb576d286143adc9d6061fc3994b31cfce00134aa78f68d34eacd0b8d8d60cbd
-DIST gpgme-1.3.2.tar.bz2 867738 SHA256 cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875 SHA512 5452aa663a85f7853f8194746ee3f7a70f46af719490df240401b0b9d97b0e2d3656d73dd469f136dc4ba0f878f5ef445f43e682a049a3a99c3ac22de29d79c5 WHIRLPOOL 19761dbc7430065d83884cb371bdfb39a114414447c8503e4ee77b72ee5dd007b373aaba4d8f6414250fcdf6eb6a219316135c73d2addb058fc09825ab943dc4
 DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
-EBUILD gpgme-1.3.2-r1.ebuild 1245 SHA256 ace4c79831e0ffabce7c806f27f6d73464cdb3284793711a7a014f9e9768f7a0 SHA512 d8617ec40c10fe2b5b8f2b586aaeb41f2ddd1163074506275d794d5b5700c775e81e87379ecec684a1d68edf38c6da00c6088d12d18bd2acf204d38b844073b3 WHIRLPOOL f366503d636a6c8aacd6027cc34e253ddc8d2fc42e0d7053ef425f13c2a77fd91c4ae1ce014fbbc9d4eb247d9a7ce78aa6d134dc13d444548eb506014b546586
 EBUILD gpgme-1.5.5.ebuild 1136 SHA256 eea98855df22151f52559168d6d3eaf28f14e495521bd555bda3bded8f7e94f9 SHA512 a0034fa4b8536daecc199b56458d16258e8b1d09afddd1347e4ff8a4dae61e47b162ed2d6432cf143cc96b73181893c4476e26d951e7a850a74440f7310d6e99 WHIRLPOOL 024e7dc7ebd5f9db5cf5a49f3ccfd06008d39757b857150267aa37398c144a699fc1c624fc3365a9833e09f60e926522423d9a7594a92a5ce99e3806faef894e
-MISC ChangeLog 32464 SHA256 60172a90d63d1192ceacf6c52c1465637526afa528c15b9d856e1fcfe7abb90e SHA512 1e58c8d756e47e6f347d20c0931bcb1784b4ee69678b13efc34d78ec84f3d80894cfa23368e005e5efa77b3fad79c63b20de792aff5ac112f3cc0582c49930f1 WHIRLPOOL 2a94cc0a9b827479c3513c8d8f1671232157473515dbb67f8649a405404e78397d0cc9f853ccb4ab85bdc4d7a6a40dcdd58e57cac4349cc4e6795a7f95e576ee
+MISC ChangeLog 32588 SHA256 365de278987394de285f4976fb94e094cdfe3d1e48a838209497301f2b108610 SHA512 4e5621b504fa9f9477adf17db0c36c12c9f56de3283015dc4954c4634202641ae0eb738c2449851bf840edf9a1851261243460102a1ae3d9dbdf3a104586e264 WHIRLPOOL bcb8b98517bbc5a2be7732585375d9e079940f19478f6a09f0ca3c2ea43dd0992aa4f482bc3b8dd3d9d683eae9870334768fa1faf44da22b807f9f160db2859d
 MISC metadata.xml 235 SHA256 457ae31679e09fa587eb1ce494f8bed85d9057e2a1c2b72462b4c02186067e26 SHA512 49cfc0288e90fe1a8a71517d5964b727212b84603afc37faec0101ca947631e288aba3e1c84b7b33b4e24509d0e798fe9d2d6aba1a1209c16cadc8b7b18d9908 WHIRLPOOL de990675240b800437b9549239a7a2f4707bff47793a70a03828ff1af0b43d237f2284d426cf284f156fd15beab1ad59961d0033e2542d309878fe6f6864e423
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iJwEAQEIAAYFAlW6cggACgkQG9wOWsQutdY73wP8DDcgObdczmDmqNsl0WHydsof
-cdG7YxDZ7xuQr19wMLRUAscN0diHOL3le5c6/tiPwgJKiK5VhZQL+KcOPEk54erw
-XjYZLpPN+w/YKFwzkGUFUIgMTZVBtakcOtjJmbdloy/1dOsqvyJyE+HAa/j65Lpt
-AhQZCNMtpWyBiLRUI5w=
-=+lQH
+iF4EAREIAAYFAlW6dWsACgkQXYk9GL8g3FGPfgD9F06Vmpal6j2p/uAY7MO72iDF
+hqvclnRMxGyBT6rExp4A/1V08+V5lWUDNIhgxgTy2s30PzdBdbwAtm9T+pf0QhoK
+=9iOk
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gpgme/files/gpgme-1.3.2-CVE-2014-3564.patch b/app-crypt/gpgme/files/gpgme-1.3.2-CVE-2014-3564.patch
deleted file mode 100644
index 37e9eb1360a1..000000000000
--- a/app-crypt/gpgme/files/gpgme-1.3.2-CVE-2014-3564.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r 71644dea35c8 src/engine-gpgsm.c
---- a/src/engine-gpgsm.c	Thu Jul 31 14:06:58 2014 +0200
-+++ b/src/engine-gpgsm.c	Thu Jul 31 14:10:25 2014 +0200
-@@ -834,7 +834,7 @@
- 	      else
- 		{
- 		  *aline = newline;
--		  gpgsm->colon.attic.linesize += linelen + 1;
-+		  gpgsm->colon.attic.linesize = *alinelen + linelen + 1;
- 		}
- 	    }
- 	  if (!err)
-diff -r 71644dea35c8 src/engine-uiserver.c
---- a/src/engine-uiserver.c	Thu Jul 31 14:06:58 2014 +0200
-+++ b/src/engine-uiserver.c	Thu Jul 31 14:10:25 2014 +0200
-@@ -699,7 +699,7 @@
- 	      else
- 		{
- 		  *aline = newline;
--		  uiserver->colon.attic.linesize += linelen + 1;
-+		  uiserver->colon.attic.linesize = *alinelen + linelen + 1;
- 		}
- 	    }
- 	  if (!err)
diff --git a/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild b/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild
deleted file mode 100644
index 44665a487f65..000000000000
--- a/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.3.2-r1.ebuild,v 1.9 2014/08/09 09:35:06 ago Exp $
-
-EAPI="4"
-
-inherit eutils libtool autotools
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp static-libs"
-
-DEPEND="app-crypt/gnupg
-	>=dev-libs/libassuan-2.0.2
-	>=dev-libs/libgpg-error-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.1.8-et_EE.patch"
-	epatch "${FILESDIR}/${P}-CVE-2014-3564.patch"
-
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--includedir="${EPREFIX}/usr/include/gpgme" \
-		--with-gpg="${EPREFIX}/usr/bin/gpg" \
-		--with-gpgsm="${EPREFIX}/usr/bin/gpgsm" \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if ! use common-lisp; then
-		rm -fr "${ED}usr/share/common-lisp"
-	fi
-}