Remove ecompressdir from app-crypt/gnupg-2.0.17 wrt bug 356501.

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

3 files changed, 24 insertions, 16 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index d2f9eec41883..9247d8b9a6fd 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.409 2011/03/12 13:28:06 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.410 2011/03/18 18:30:37 c1pher Exp $
+
+  18 Mar 2011; Dane Smith <c1pher@gentoo.org> gnupg-2.0.17.ebuild:
+  Remove the use of ecompressdir wrt bug 356501. Other small QA fixes. No
+  revbump as installed files don't change (Save for the removal of a couple
+  examples files that were once doc.)
 
   12 Mar 2011; Tobias Klausmann <klausman@gentoo.org> gnupg-2.0.17.ebuild:
   Stable on alpha, bug #355265
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index b65b6741340b..d4072c20a711 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -7,6 +7,6 @@ DIST idea.c.gz 5216 RMD160 e35be5a031d10d52341ac5f029d28f811edd908d SHA1 82fded4
 EBUILD gnupg-1.4.11.ebuild 5481 RMD160 f313bd6a39300f48681784d7b7be23917c098688 SHA1 d7cce6fd980f380ca5eca03bc6d8a826a5f257ea SHA256 19a816ee5e19d8c4b1062fb15bfaef1ad3b3d91659ac24915188732745fe71a7
 EBUILD gnupg-2.0.16-r1.ebuild 3495 RMD160 a9ba552f10b1728440e361d2f00e56f95c663c90 SHA1 f4e22310ee4dd607eb220aa74cfcfd22363902a1 SHA256 71ffb3b17afacd1c13aaedb3621f0f9696be680ee8cb118536d0c4f50bacac8c
 EBUILD gnupg-2.0.16-r2.ebuild 4381 RMD160 72252838891d5cd784505415793c5851323528a8 SHA1 ca13301ab7ae8e022768441d07e9d325180d5b49 SHA256 3a02d9dd2f14ddaaa2d28bdd3da8a790929d42fed8c78ce60362a47a5e7fcfd5
-EBUILD gnupg-2.0.17.ebuild 4370 RMD160 05920657bc15ed94ec88fc1d9b480667fc4499a9 SHA1 49e1d2b513a0712026dd91d34df6fb1479eec032 SHA256 064894e06ce3d88744ff7f3274a38d5b76f3405054241423f8238dd17ff70e4f
-MISC ChangeLog 61892 RMD160 81e726a1883aab1422fef6bfc186535ced77d469 SHA1 f1e91e2e5ad94e99231150d227f294f3082809d4 SHA256 a5a731e3c40189fdc583eba0a001454ee37c15a5c670405ed6c25cca39d8cdf0
+EBUILD gnupg-2.0.17.ebuild 4535 RMD160 b2da6df6bbec1e79c473c21d5bd87a6b00b6a96d SHA1 2bb92af9d891d3f94bacc80c9e5a53c0db3e8954 SHA256 b123c2dadce3b0adbbb71a69125eb60ad2162c405ef6e7abd69bf1dcb10dffc9
+MISC ChangeLog 62146 RMD160 e8e605376052fa8d8130b141809bbecf30b2f710 SHA1 ffcd4069fe267ebe11266d79d1b36974d0109007 SHA256 e0e37085508d901a4b1376c6863379594cd7ec8c7d7de550ccd86f96c750a5e4
 MISC metadata.xml 698 RMD160 8c3577ffbf64da24c47d181ef24f8f7e9e09a224 SHA1 92579ce4870e7bbee4bf596bb466b3f9ce587157 SHA256 8f18f677d1d437d3033b367e8a7514b745a762d518af7a3afdc44e1ddbf2b31e
diff --git a/app-crypt/gnupg/gnupg-2.0.17.ebuild b/app-crypt/gnupg/gnupg-2.0.17.ebuild
index 42c0aadaf22e..ee1894bb5531 100644
--- a/app-crypt/gnupg/gnupg-2.0.17.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17.ebuild,v 1.7 2011/03/12 13:28:06 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.17.ebuild,v 1.8 2011/03/18 18:30:37 c1pher Exp $
 
 EAPI="3"
 
@@ -104,21 +104,24 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog NEWS README THANKS TODO VERSION || die "dodoc failed"
-
-	mv "${ED}usr/share/gnupg/help"* "${ED}usr/share/doc/${PF}"
-	ecompressdir "/usr/share/doc/${PF}"
-
-	dosym gpg2 /usr/bin/gpg
-	dosym gpgv2 /usr/bin/gpgv
-	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
-	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
-	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
-	use ldap && dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
+	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA || die
+	rm -r "${ED}usr/share/gnupg/help"* || die
+
+	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+	doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* || die "dodoc failed"
+
+	dosym gpg2 /usr/bin/gpg || die
+	dosym gpgv2 /usr/bin/gpgv || die
+	dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp || die
+	dosym gpg2keys_finger /usr/libexec/gpgkeys_finger || die
+	dosym gpg2keys_curl /usr/libexec/gpgkeys_curl || die
+	if use ldap; then
+		dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap || die
+	fi
 	echo ".so man1/gpg2.1" > "${ED}usr/share/man/man1/gpg.1"
 	echo ".so man1/gpgv2.1" > "${ED}usr/share/man/man1/gpgv.1"
 
-	dodir /etc/env.d
+	dodir /etc/env.d || die
 	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >>"${ED}etc/env.d/30gnupg"
 
 	if use doc; then