Versions of rpm prior to 4.2.1 need to conflict with beecrypt, fixes bug 45577

4 files changed, 20 insertions, 14 deletions

diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 60a49795beed..2ec71f18357c 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/rpm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.35 2004/03/12 10:49:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.36 2004/04/07 22:51:10 agriffis Exp $
+
+  07 Apr 2004; Aron Griffis <agriffis@gentoo.org> rpm-4.0.4-r5.ebuild,
+  rpm-4.2_pre069.ebuild:
+  Versions of rpm prior to 4.2.1 need to conflict with beecrypt, fixes bug 45577
 
   12 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> rpm-4.2.1.ebuild,
   rpm-4.2_pre069.ebuild:
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 7cb5480404fd..443f44dc37b5 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,14 +1,14 @@
-MD5 5349894e82e090459a53786a10e51375 ChangeLog 5346
-MD5 8f34291ca6dacf8533ca87b51c645321 rpm-4.0.4-r5.ebuild 1623
-MD5 8163e766292a569aca655a28bb7abf2b rpm-4.2_pre069.ebuild 2169
 MD5 33f8782720fc349caf6817ff1dfd25a3 rpm-4.2.1.ebuild 2499
-MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
-MD5 576f625499d593cd3424798fe480090e files/digest-rpm-4.2_pre069 65
+MD5 c0e9fdc1eed59b14b58834defe56acbf rpm-4.2_pre069.ebuild 2188
+MD5 bdd93ea183ff8fa0e86d43b4bf936532 ChangeLog 5523
+MD5 cf60d136cb1308f2f6be68aad07df2d4 rpm-4.0.4-r5.ebuild 1643
 MD5 90a229eb084e54a880c72d83dffa31cb files/rpm-3.0.6-popt-popt.c-gentoo.diff 206
+MD5 e7ef0e369ef68d513461dd831eb1ef4f files/digest-rpm-4.0.4-r5 62
+MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62
 MD5 806f307798e39d580d5286d99c44b965 files/rpm-4.0.4-glibc2.3.diff 495
-MD5 90a229eb084e54a880c72d83dffa31cb files/rpm-4.0.4-popt-popt.c-gentoo.diff 206
-MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
 MD5 fe39156514725cf08be38b39fe3f6f3c files/rpm-4.1-system-popt.diff 21458
-MD5 3d46eae2efd769e423b004de176d9812 files/rpm-4.2-system-popt.diff 14435
-MD5 dd838f7f21d8a9eed6fdf9a18e7ba0e4 files/digest-rpm-4.2.1 62
+MD5 576f625499d593cd3424798fe480090e files/digest-rpm-4.2_pre069 65
 MD5 ec4886ca775cb1cb83aebcd42f20f59f files/rpm-4.2-python2.3.diff 1479
+MD5 90a229eb084e54a880c72d83dffa31cb files/rpm-4.0.4-popt-popt.c-gentoo.diff 206
+MD5 3d46eae2efd769e423b004de176d9812 files/rpm-4.2-system-popt.diff 14435
+MD5 6b639232d435829fd97b09e10f58de81 files/rpm-4.0.4-system-popt.diff 18639
diff --git a/app-arch/rpm/rpm-4.0.4-r5.ebuild b/app-arch/rpm/rpm-4.0.4-r5.ebuild
index c432de0e0f58..bf9f8291598c 100644
--- a/app-arch/rpm/rpm-4.0.4-r5.ebuild
+++ b/app-arch/rpm/rpm-4.0.4-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.10 2004/01/30 05:14:27 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.11 2004/04/07 22:51:10 agriffis Exp $
 
 inherit flag-o-matic eutils
 
@@ -20,7 +20,8 @@ RDEPEND="=sys-libs/db-3.2*
 	>=dev-libs/popt-1.6.3"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=sys-devel/autoconf-2.58"
+	>=sys-devel/autoconf-2.58
+	!dev-libs/beecrypt"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-arch/rpm/rpm-4.2_pre069.ebuild b/app-arch/rpm/rpm-4.2_pre069.ebuild
index 7dd442ce2469..ee00be0c744d 100644
--- a/app-arch/rpm/rpm-4.2_pre069.ebuild
+++ b/app-arch/rpm/rpm-4.2_pre069.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2_pre069.ebuild,v 1.8 2004/03/12 10:49:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2_pre069.ebuild,v 1.9 2004/04/07 22:51:10 agriffis Exp $
 
 inherit flag-o-matic libtool eutils
 
@@ -21,7 +21,8 @@ RDEPEND="=sys-libs/db-3.2*
 	dev-libs/elfutils
 	nls? ( sys-devel/gettext )
 	python? ( =dev-lang/python-2.2* )
-	!sparc? ( doc? ( app-doc/doxygen ) )"
+	!sparc? ( doc? ( app-doc/doxygen ) )
+	!dev-libs/beecrypt"
 S=${WORKDIR}/rpm-4.2
 
 strip-flags