diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2004-04-07 22:51:10 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2004-04-07 22:51:10 +0000 |
| commit | d0e5b80a099425695b81874c5c942a5f2c300a50 (patch) | |
| tree | 78dbcb9cc4b7ce6cc44aef0d67275f91e54eaa18 /app-arch/rpm | |
| parent | ~amd64 (Manifest recommit) (diff) | |
| download | gentoo-2-d0e5b80a099425695b81874c5c942a5f2c300a50.tar.gz gentoo-2-d0e5b80a099425695b81874c5c942a5f2c300a50.tar.bz2 gentoo-2-d0e5b80a099425695b81874c5c942a5f2c300a50.zip | |
Versions of rpm prior to 4.2.1 need to conflict with beecrypt, fixes bug 45577
Diffstat (limited to 'app-arch/rpm')
| -rw-r--r-- | app-arch/rpm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.0.4-r5.ebuild | 5 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.2_pre069.ebuild | 5 |
3 files changed, 11 insertions, 5 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/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 |