add missing dep, clean up postinst messages

3 files changed, 20 insertions, 29 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 9b03fca8abac..8bd4f5b7ef44 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.75 2004/09/06 21:27:55 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.76 2004/09/17 13:30:08 taviso Exp $
+
+  17 Sep 2004; Tavis Ormandy <taviso@gentoo.org> gnupg-1.2.6.ebuild:
+  add back silently removed virtual/mta dep (it's not a mistake! 
+  it's required for using email based keyservers).
+  tidy up postinst messages.
 
   06 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> gnupg-1.9.10.ebuild,
   gnupg-1.9.8.ebuild:
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 22563cdb5068..faafe94338a5 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,14 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ff47ed97d51df4d1b7030dc173048956 gnupg-1.2.3-r5.ebuild 3628
 MD5 b6dca14848b7411efd8fb414b78fe65c gnupg-1.9.10.ebuild 2764
 MD5 5cf952300c6e6d393425894853e1b766 gnupg-1.2.4.ebuild 4173
 MD5 e67585ea4e6025b1918462ba737c8e2a gnupg-1.2.3-r2.ebuild 1659
 MD5 12d2a2a99d8604219a64b08c2969c41d gnupg-1.9.8.ebuild 2757
-MD5 f5ad505dc29c64c80051271ae1fb9b51 gnupg-1.2.6.ebuild 3816
+MD5 e7cb781a37279d94b7dc86b9a509de30 gnupg-1.2.6.ebuild 3571
 MD5 df041bf7bc487bd26079fc500e65925a gnupg-1.9.0.ebuild 2730
-MD5 7cfd46ab17c223e682864b2ddd52b747 ChangeLog 10946
+MD5 ec570541d773bd4dc7a073b9ae2446b6 ChangeLog 11161
 MD5 bf8f03fb22b2f44fd5f6a4395ab001dd metadata.xml 483
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r2 65
 MD5 eecb1b58574b61ddac7c3d12b0143b7d files/digest-gnupg-1.2.3-r5 65
@@ -21,11 +18,3 @@ MD5 db3c4c4fe234f87d269216f6e0be8817 files/gnupg-1.2.3-hkp-format-string.diff 92
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
 MD5 b12193638991111d4dc2c9864fa8e15a files/gnupg-1.2.3-disable-elgamal.diff 12554
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-Comment: .//Manifest 1094506081
-
-iD8DBQFBPN/aPpIsIjIzwiwRAt3LAJ4j2CnZNp9tsM9uJ+yEZVQEoduY0QCghOhf
-zPlqHNXG+haXJq4IxVdcNnQ=
-=6grt
------END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/gnupg-1.2.6.ebuild b/app-crypt/gnupg/gnupg-1.2.6.ebuild
index 124d5a4a587c..61d211b17bc8 100644
--- a/app-crypt/gnupg/gnupg-1.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.2 2004/09/04 13:43:56 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.6.ebuild,v 1.3 2004/09/17 13:30:08 taviso Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,12 +15,13 @@ KEYWORDS="~x86 ~amd64 ~sparc"
 IUSE="X ldap nls static idea"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
-		app-arch/bzip2
-		sys-libs/zlib )
+			app-arch/bzip2
+			sys-libs/zlib )
 		X? ( || ( media-gfx/xloadimage media-gfx/xli ) )
 		nls? ( sys-devel/gettext )
 		dev-lang/perl
-		virtual/libc"
+		virtual/libc
+		virtual/mta"
 
 DEPEND="ldap? ( net-nds/openldap )
 		nls? ( sys-devel/gettext )
@@ -40,7 +41,8 @@ src_unpack() {
 
 	# Please read http://www.gnupg.org/why-not-idea.html
 	if use idea; then
-		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || ewarn "failed to insert IDEA module"
+		mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
+			ewarn "failed to insert IDEA module"
 	fi
 
 	use ppc64 && epatch ${FILESDIR}/gnupg-1.2.4.ppc64.patch
@@ -116,19 +118,14 @@ pkg_postinst() {
 	einfo "passphrases, etc. at runtime but may make some sysadmins nervous."
 	echo
 	if use idea; then
-		einfo "you've compiled ${PN} with support for the IDEA algorithm, this code"
-		einfo "is distributed under the GPL in countries where it is permitted to do so"
-		einfo "by law."
+		einfo "Please read http://www.gnupg.org/why-not-idea.html for more"
+		einfo "information on IDEA support."
 		einfo
-		einfo "Please read http://www.gnupg.org/why-not-idea.html for more information."
-		einfo
-		einfo "If you are in a country where the IDEA algorithm is patented, you are permitted"
-		einfo "to use it at no cost for 'non revenue generating data transfer between private"
-		einfo "individuals'."
+		einfo "If you are in a country where the IDEA algorithm is patented,"
+		einfo "you are permitted to use it at no cost for 'non revenue"
+		einfo "generating data transfer between private individuals'."
 		einfo
 		einfo "Countries where the patent applies are listed here"
 		einfo "http://www.mediacrypt.com/engl/Content/patent_info.htm"
-		einfo
-		einfo "Further information and other licenses are availble from http://www.mediacrypt.com/"
 	fi
 }