Fix installation path of ru man page - bug #112205 thanks to Sandro

Package-Manager: portage-2.0.53_rc7

5 files changed, 52 insertions, 16 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 829f2b172289..3475bc7cd70f 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.133 2005/09/29 01:59:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.134 2005/11/22 22:36:06 dragonheart Exp $
+
+  22 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/gnupg-1.4.2-badruman.patch, gnupg-1.4.2-r2.ebuild:
+  Fix installation path of ru man page - bug #112205 thanks to Sandro
 
   29 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> gnupg-1.2.6.ebuild,
   gnupg-1.4.1.ebuild, gnupg-1.4.1-r1.ebuild, gnupg-1.4.2-r1.ebuild,
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 607d66874e5b..83854e5145fa 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,21 +1,32 @@
-MD5 5d11c89cbf906031e564bb18f9a8c5f4 gnupg-1.4.2-r2.ebuild 6413
-MD5 3dedd2cc4e62aef96d919c74970e758b gnupg-1.2.6.ebuild 3795
-MD5 ffd1a6a73df273ee13e112dc428eb06c gnupg-1.4.2-r1.ebuild 6241
-MD5 81178f9c770262366fc26114d53efc13 gnupg-1.9.19.ebuild 3205
-MD5 c77b579997468bf58a6fc5a5e1a2fb00 gnupg-1.4.1-r1.ebuild 6272
-MD5 6f5e7ed6dfb1ae31f877486a9ff7e441 gnupg-1.4.1.ebuild 6186
-MD5 3fd02f30190d0919bf9a5972d40182c2 gnupg-1.9.18.ebuild 3205
-MD5 219ce843c43fdaf95178a10717195737 ChangeLog 22177
-MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74d0e4f5eef334e255c8fb4de9c518d5 ChangeLog 22362
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
-MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r2 190
-MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
-MD5 ee3a4487eadfb9858f32adde3554394c files/gnupg-1.4.2-keyserver.patch 389
+MD5 f972c88baf3f90f8ef0953df6f328e28 files/digest-gnupg-1.4.2-r2 190
 MD5 7247c8f0379977f0a3dd13568bf283c7 files/digest-gnupg-1.9.18 66
 MD5 28ad3af724b879fe86743d59ae4447dd files/digest-gnupg-1.9.19 66
-MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
+MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
+MD5 e893ac3e7a6b11ab9806e16d3a8582fd files/gnupg-1.4.2-badruman.patch 463
 MD5 c23d51ccf048f10b5e8b10b45570c13a files/gnupg-1.4.2-jari.patch 370
+MD5 ee3a4487eadfb9858f32adde3554394c files/gnupg-1.4.2-keyserver.patch 389
+MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
+MD5 3dedd2cc4e62aef96d919c74970e758b gnupg-1.2.6.ebuild 3795
+MD5 c77b579997468bf58a6fc5a5e1a2fb00 gnupg-1.4.1-r1.ebuild 6272
+MD5 6f5e7ed6dfb1ae31f877486a9ff7e441 gnupg-1.4.1.ebuild 6186
+MD5 ffd1a6a73df273ee13e112dc428eb06c gnupg-1.4.2-r1.ebuild 6241
+MD5 805d6c07da3e24608c3d4a4c07528832 gnupg-1.4.2-r2.ebuild 6628
+MD5 3fd02f30190d0919bf9a5972d40182c2 gnupg-1.9.18.ebuild 3205
+MD5 81178f9c770262366fc26114d53efc13 gnupg-1.9.19.ebuild 3205
+MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDg52JmdTrptrqvGERAsauAKCbSC7e2VaVa3X/wGNRjJui82l1AgCgjMPo
+I4txhAwBaf4CUectM6tNbW4=
+=zaC5
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2 b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2
index e9f46e0a9867..181255e43f2e 100644
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2
+++ b/app-crypt/gnupg/files/digest-gnupg-1.4.2-r2
@@ -1,3 +1,3 @@
+MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
 MD5 c7afd50c7d01fcfada229326b3958404 gnupg-1.4.2.tar.bz2 2891177
 MD5 9dc3bc086824a8c7a331f35e09a3e57f idea.c.gz 5216
-MD5 4e7e9d224879e5a3e01cb2ab4c719559 gnupg-1.4.0-ecc0.1.6.diff.bz2 16703
diff --git a/app-crypt/gnupg/files/gnupg-1.4.2-badruman.patch b/app-crypt/gnupg/files/gnupg-1.4.2-badruman.patch
new file mode 100644
index 000000000000..4dfd2456fafc
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.4.2-badruman.patch
@@ -0,0 +1,11 @@
+--- gnupg-1.4.2/doc/Makefile.in.orig	2005-11-23 07:00:19.000000000 +1100
++++ gnupg-1.4.2/doc/Makefile.in	2005-11-23 07:00:43.000000000 +1100
+@@ -280,7 +280,7 @@
+              HACKING OpenPGP README.W32 samplekeys.asc gnupg.7 \
+              TRANSLATE gpg.ru.sgml gpg.ru.1 highlights-1.4.txt
+ 
+-man_MANS = gpg.1 gpgv.1 gnupg.7 gpg.ru.1
++man_MANS = gpg.1 gpgv.1 gnupg.7
+ info_TEXINFOS = gpg.texi gpgv.texi
+ 
+ # Need this to avoid building of dvis with automake 1.4
diff --git a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
index 90c837bba365..f48ab7f2c1eb 100644
--- a/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.4 2005/09/29 01:59:06 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.5 2005/11/22 22:36:07 dragonheart Exp $
 
 inherit eutils flag-o-matic linux-info
 
@@ -65,6 +65,9 @@ src_unpack() {
 	# maketest fix
 	epatch ${FILESDIR}/${P}-selftest.patch
 
+	# install RU man page in right location
+	epatch ${FILESDIR}/${P}-badruman.patch
+
 	cd ${S}
 	# keyserver fix
 	epatch ${FILESDIR}/${P}-keyserver.patch
@@ -144,6 +147,13 @@ src_install() {
 
 	dohtml doc/faq.html
 
+	# install RU documentation in right location
+	if use lingas_ru
+	then
+		cp doc/gpg.ru.1 ${T}/gpg.1
+		doman -i18n=ru ${T}/gpg.1
+	fi
+
 	# Remove collissions
 	if use ppc-macos; then
 		rm ${D}/usr/lib/charset.alias ${D}/usr/share/locale/locale.alias