summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2008-10-16 17:50:03 +0000
committerChristian Faulhammer <opfer@gentoo.org>2008-10-16 17:50:03 +0000
commit1c2e28d8285be35f52db29428b3424d3d1c1115f (patch)
tree6d58d0c9ae4865d09651a64e0ebb24b3e97713de /mail-client
parentVersion bump (diff)
downloadgentoo-2-1c2e28d8285be35f52db29428b3424d3d1c1115f.tar.gz
gentoo-2-1c2e28d8285be35f52db29428b3424d3d1c1115f.tar.bz2
gentoo-2-1c2e28d8285be35f52db29428b3424d3d1c1115f.zip
block mail-client/claws-mail >=3.6.0 as smime plugin is included there and will lead to file collisions
(Portage version: 2.1.4.5)
Diffstat (limited to 'mail-client')
-rw-r--r--mail-client/claws-mail-smime/ChangeLog7
-rw-r--r--mail-client/claws-mail-smime/claws-mail-smime-0.7.5.ebuild5
-rw-r--r--mail-client/claws-mail-smime/claws-mail-smime-0.7.6.ebuild5
3 files changed, 12 insertions, 5 deletions
diff --git a/mail-client/claws-mail-smime/ChangeLog b/mail-client/claws-mail-smime/ChangeLog
index e8ba63653b78..5d79369528b1 100644
--- a/mail-client/claws-mail-smime/ChangeLog
+++ b/mail-client/claws-mail-smime/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for mail-client/claws-mail-smime
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-smime/ChangeLog,v 1.28 2008/08/06 18:29:27 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-smime/ChangeLog,v 1.29 2008/10/16 17:50:03 opfer Exp $
+
+ 16 Oct 2008; Christian Faulhammer <opfer@gentoo.org>
+ claws-mail-smime-0.7.5.ebuild, claws-mail-smime-0.7.6.ebuild:
+ block mail-client/claws-mail >=3.6.0 as smime plugin is included there and
+ will lead to file collisions
06 Aug 2008; Ferris McCormick <fmccor@gentoo.org>
claws-mail-smime-0.7.6.ebuild:
diff --git a/mail-client/claws-mail-smime/claws-mail-smime-0.7.5.ebuild b/mail-client/claws-mail-smime/claws-mail-smime-0.7.5.ebuild
index 332de2791477..0a3faaa0c6f7 100644
--- a/mail-client/claws-mail-smime/claws-mail-smime-0.7.5.ebuild
+++ b/mail-client/claws-mail-smime/claws-mail-smime-0.7.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-smime/claws-mail-smime-0.7.5.ebuild,v 1.4 2008/06/14 19:27:52 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-smime/claws-mail-smime-0.7.5.ebuild,v 1.5 2008/10/16 17:50:03 opfer Exp $
MY_P="${P#claws-mail-}"
@@ -12,7 +12,8 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=mail-client/claws-mail-3.4.0
- >=app-crypt/gpgme-1.1.1"
+ !>=mail-client/claws-mail-3.6.0
+ >=app-crypt/gpgme-1.1.1"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
diff --git a/mail-client/claws-mail-smime/claws-mail-smime-0.7.6.ebuild b/mail-client/claws-mail-smime/claws-mail-smime-0.7.6.ebuild
index 082a86c12fec..74068e8a6a99 100644
--- a/mail-client/claws-mail-smime/claws-mail-smime-0.7.6.ebuild
+++ b/mail-client/claws-mail-smime/claws-mail-smime-0.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-smime/claws-mail-smime-0.7.6.ebuild,v 1.3 2008/08/06 18:29:27 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-smime/claws-mail-smime-0.7.6.ebuild,v 1.4 2008/10/16 17:50:03 opfer Exp $
MY_P="${P#claws-mail-}"
@@ -12,7 +12,8 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=mail-client/claws-mail-3.5.0
- >=app-crypt/gpgme-1.1.1"
+ !>=mail-client/claws-mail-3.6.0
+ >=app-crypt/gpgme-1.1.1"
DEPEND="${RDEPEND}
dev-util/pkgconfig"