diff options
| author |   Stefan Jones <cretin@gentoo.org> | 2003-10-28 17:28:17 +0000 |
|---|---|---|
| committer | Stefan Jones <cretin@gentoo.org> | 2003-10-28 17:28:17 +0000 |
| commit | 58f3c3bb645dcddfadac75cc4c4a3a5d109f5cfc (patch) | |
| tree | 33fc6ae41081d0f1deb880cbf76ea5a4c829db72 | |
| parent | version bump #31566 (diff) | |
| download | gentoo-2-58f3c3bb645dcddfadac75cc4c4a3a5d109f5cfc.tar.gz gentoo-2-58f3c3bb645dcddfadac75cc4c4a3a5d109f5cfc.tar.bz2 gentoo-2-58f3c3bb645dcddfadac75cc4c4a3a5d109f5cfc.zip | |
Fix conflicting libs
| -rw-r--r-- | dev-libs/beecrypt/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/beecrypt/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/beecrypt/beecrypt-3.1.0.ebuild | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog index 63e2e76c6ea2..033722572721 100644 --- a/dev-libs/beecrypt/ChangeLog +++ b/dev-libs/beecrypt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/beecrypt # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.3 2003/10/23 07:12:42 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.4 2003/10/28 17:28:16 cretin Exp $ + + 28 Oct 2003; Stefan Jones <cretin@gentoo.org> : + block <app-arch/rpm-4.2.1 as both provide beecrypt + Accident waiting to happen, see #32100 23 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> beecrypt-3.1.0.ebuild: tidy; use use_with; more error checking/messages diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest index fa58e943a8cf..b58da40d1df8 100644 --- a/dev-libs/beecrypt/Manifest +++ b/dev-libs/beecrypt/Manifest @@ -1,3 +1,3 @@ -MD5 c12e7fd59435fb195c2fd32493bc2acb ChangeLog 581 -MD5 2d301748fefd6b1c80033a2fd6b2bf9a beecrypt-3.1.0.ebuild 844 +MD5 458823a97baadaf8223440400ca98621 beecrypt-3.1.0.ebuild 865 +MD5 d36114d4cc75315093f7009bea84dada ChangeLog 723 MD5 1c56cad20612ef6cbb3d1b56fa3c0b2e files/digest-beecrypt-3.1.0 66 diff --git a/dev-libs/beecrypt/beecrypt-3.1.0.ebuild b/dev-libs/beecrypt/beecrypt-3.1.0.ebuild index 4627ffaed4f1..9dc593dfab9e 100644 --- a/dev-libs/beecrypt/beecrypt-3.1.0.ebuild +++ b/dev-libs/beecrypt/beecrypt-3.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0.ebuild,v 1.3 2003/10/23 07:12:42 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0.ebuild,v 1.4 2003/10/28 17:28:16 cretin Exp $ DESCRIPTION="Beecrypt is a general-purpose cryptography library." HOMEPAGE="http://sourceforge.net/projects/beecrypt" @@ -10,7 +10,8 @@ LICENSE="LGPL-2" KEYWORDS="~x86 ~ppc ~sparc ~alpha" SLOT="0" -DEPEND="python? ( =dev-lang/python-2.2* )" +DEPEND="python? ( =dev-lang/python-2.2* ) + ! <app-arch/rpm-4.2.1" IUSE="python" |