Fix bug 293015, fix by Andreas K. Huettel (dilfridge)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 27 insertions, 8 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 910471c3fc42..be603167dd6d 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.203 2010/03/31 22:48:13 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.204 2010/04/14 18:42:56 reavertm Exp $
+
+  14 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org> kmail-4.3.3.ebuild,
+  kmail-4.3.5.ebuild, kmail-4.4.2.ebuild:
+  Fix bug 293015, fix by Andreas K. Huettel (dilfridge)
 
   31 Mar 2010; Dror Levin <spatz@gentoo.org> -kmail-4.3.4.ebuild,
   -kmail-4.4.0.ebuild:
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 22c7470bafc7..2ba4f3e892a6 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -3,9 +3,9 @@ DIST kdepim-4.3.3.tar.bz2 11250414 RMD160 a8809be1ff6d6ae3f22d0f29124566793ed97a
 DIST kdepim-4.3.5.tar.bz2 11254015 RMD160 4a35783ff949dda1e68af92a83482b92bd831110 SHA1 0c319929af1828f0ee15c47a957f0a3c95556742 SHA256 76f8efcdfde2b00c8c8a82dcd1363b50cf9c1a7217419dd495126f05a6528fd1
 DIST kdepim-4.4.1.tar.bz2 9357611 RMD160 afc104ed625957a789d05cc548054d8891122de9 SHA1 cd2e0fb48c1fe4a1b7840d098fd07ab8cc9751a4 SHA256 bfb1684dbc685c3c29691531e31772220c98d2f8981dc9fae37fa5d49a41b383
 DIST kdepim-4.4.2.tar.bz2 9356719 RMD160 c0f6f851c7bece45a884fadfca703f917f325f8a SHA1 80dfb58824e9b46f7ca1e203a3599dcc13098bc3 SHA256 841fc6d0731587ed5b088927ba57d8beed27c2f88907ff24389a123af603d336
-EBUILD kmail-4.3.3.ebuild 1606 RMD160 822eef6bf42ab0063212b1af162a33e66fd86773 SHA1 6f6358eccf9850d5b6df947f59aa5a079935d597 SHA256 8bb6dd852d1f978be4470fc639a654dd4151d1d1bf28175b368624159f8475b0
-EBUILD kmail-4.3.5.ebuild 1594 RMD160 58a128e14117699ef86ec123446cc5e69726b86e SHA1 2815add3fc44f44a6e78083c6182cd34022b96a9 SHA256 a5cce3443cdbbc17c60ba54ceebd04d19bac14e5c6ef7008c88868fe75d8915b
+EBUILD kmail-4.3.3.ebuild 1784 RMD160 c3534c5a833ac89a05262ec62d05b998e7ad6508 SHA1 8cc65fe84f13fe8c9aa35f19e789d262727b71d2 SHA256 4f78696f44e8aa7e6fe3aa3367b7fb22e606b8c9d2e83eb8c9aa519c18df5e7a
+EBUILD kmail-4.3.5.ebuild 1769 RMD160 0d888dd62adf05b3685209233fe6c48423e762e8 SHA1 aa3f6e09572a50f7cfdc6b1a4d7f2f09d93d8092 SHA256 cbc3115d8e51bd00d04c226615b9bb4c3b7194a4a6f974c7a383969e5fed1b91
 EBUILD kmail-4.4.1.ebuild 1722 RMD160 b296ae757ef3c085863d8b1edee7c1b5e9cd8694 SHA1 1eb25122c433bcdfdc3589056043ff7692942aef SHA256 1686cebc9e94171a89919527fcc7e79ce6a2306452cb48a0237d9637e0b458fa
-EBUILD kmail-4.4.2.ebuild 1718 RMD160 15513d8ad1107f5e9ba9d18961ffa9ea028ccbdd SHA1 faea4a6f740e8fd129e1df3403c35dbf6461334a SHA256 c94d120854c0cc36288e34631e99c1d8a27cf48b230281e747230dff3fadda65
-MISC ChangeLog 26833 RMD160 488b849bf898b477525581bafcf4ae5fe664323e SHA1 ed50808362b169c4e2a1383d58bd29c20ece8d07 SHA256 4a9b13cb13e7096c47d7949feac54660e701f9030f3f8065ffce84fe2c7efba5
+EBUILD kmail-4.4.2.ebuild 1894 RMD160 b3a50b03fe62dc6eb9596399ab90b042910d87a6 SHA1 8817794672e7bc9ddb943cc8b28df4e74b808e45 SHA256 076ea62e0715cf7b2a826873013613c5b0c36e5d49fc87eca89a583336db5822
+MISC ChangeLog 27009 RMD160 e806e288a8d4263b84465f4b28b33bb8b3e2f566 SHA1 b968a9a0435f8ffc8157b6ceb88e3106cc16b262 SHA256 a2aa2eba81fd2ca3df76a3c785db6fa02ce4dc082e53f2a1401ab8f79c03624d
 MISC metadata.xml 279 RMD160 8e4afc55339c16ac4ff11c986a73243696bd9940 SHA1 238511afd59478eb71e701ce58e30a7d8fde1784 SHA256 becb9880c6456e35b6099918612ce90460d9b7555c669f1a970d0e88f7dce28a
diff --git a/kde-base/kmail/kmail-4.3.3.ebuild b/kde-base/kmail/kmail-4.3.3.ebuild
index 98b579d7fe47..d099acf9bd8b 100644
--- a/kde-base/kmail/kmail-4.3.3.ebuild
+++ b/kde-base/kmail/kmail-4.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.3.ebuild,v 1.6 2010/01/19 02:41:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.3.ebuild,v 1.7 2010/04/14 18:42:56 reavertm Exp $
 
 EAPI="2"
 
@@ -63,4 +63,9 @@ pkg_postinst() {
 		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
 		echo
 	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
 }
diff --git a/kde-base/kmail/kmail-4.3.5.ebuild b/kde-base/kmail/kmail-4.3.5.ebuild
index 5697e8a415e5..d2a15fea8756 100644
--- a/kde-base/kmail/kmail-4.3.5.ebuild
+++ b/kde-base/kmail/kmail-4.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.5.ebuild,v 1.3 2010/03/11 18:34:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.3.5.ebuild,v 1.4 2010/04/14 18:42:56 reavertm Exp $
 
 EAPI="2"
 
@@ -64,4 +64,9 @@ pkg_postinst() {
 		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
 		echo
 	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
 }
diff --git a/kde-base/kmail/kmail-4.4.2.ebuild b/kde-base/kmail/kmail-4.4.2.ebuild
index 3ee536b93527..f7d5b11c850e 100644
--- a/kde-base/kmail/kmail-4.4.2.ebuild
+++ b/kde-base/kmail/kmail-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2.ebuild,v 1.1 2010/03/30 21:13:39 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2.ebuild,v 1.2 2010/04/14 18:42:56 reavertm Exp $
 
 EAPI="3"
 
@@ -72,4 +72,9 @@ pkg_postinst() {
 		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
 		echo
 	fi
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
 }