diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2007-09-06 02:48:40 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2007-09-06 02:48:40 +0000 |
| commit | 79f526ff58fc30b3d67ebb0d78017b1da619572a (patch) | |
| tree | de487531108ef4a9ca6762b0e0f6c8cbc944e585 /sci-libs | |
| parent | To ease stage building, move deps to PDEPEND and make them conditional on !bu... (diff) | |
| download | gentoo-2-79f526ff58fc30b3d67ebb0d78017b1da619572a.tar.gz gentoo-2-79f526ff58fc30b3d67ebb0d78017b1da619572a.tar.bz2 gentoo-2-79f526ff58fc30b3d67ebb0d78017b1da619572a.zip | |
Added app-misc/beagle as blocker to DEPEND since there are file collisions (see bug #141137).
(Portage version: 2.1.3.7)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/beagle/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/beagle/beagle-2.2.0.ebuild | 7 | ||||
| -rw-r--r-- | sci-libs/beagle/beagle-3.0.1.ebuild | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sci-libs/beagle/ChangeLog b/sci-libs/beagle/ChangeLog index daf11ba7bc55..09b3bd195fc0 100644 --- a/sci-libs/beagle/ChangeLog +++ b/sci-libs/beagle/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/beagle # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.6 2007/02/07 20:59:20 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.7 2007/09/06 02:48:40 markusle Exp $ + + 06 Sep 2007; Markus Dittrich <markusle@gentoo.org> beagle-2.2.0.ebuild, + beagle-3.0.1.ebuild: + Added app-misc/beagle as blocker to DEPEND since there are file + collisions (see bug #141137). *beagle-3.0.1 (07 Feb 2007) diff --git a/sci-libs/beagle/beagle-2.2.0.ebuild b/sci-libs/beagle/beagle-2.2.0.ebuild index 3cc08a7a87ac..e46fd9ea6f82 100644 --- a/sci-libs/beagle/beagle-2.2.0.ebuild +++ b/sci-libs/beagle/beagle-2.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-2.2.0.ebuild,v 1.3 2005/08/24 16:30:29 phosphan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-2.2.0.ebuild,v 1.4 2007/09/06 02:48:40 markusle Exp $ inherit libtool @@ -15,7 +15,8 @@ KEYWORDS="x86" DEPEND=">=sys-devel/gcc-2.96 sys-libs/zlib - doc? ( app-doc/doxygen )" + doc? ( app-doc/doxygen ) + !app-misc/beagle" src_compile() { elibtoolize diff --git a/sci-libs/beagle/beagle-3.0.1.ebuild b/sci-libs/beagle/beagle-3.0.1.ebuild index 88d5d97c0b73..a0f6f2718f9b 100644 --- a/sci-libs/beagle/beagle-3.0.1.ebuild +++ b/sci-libs/beagle/beagle-3.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-3.0.1.ebuild,v 1.1 2007/02/07 20:59:20 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-3.0.1.ebuild,v 1.2 2007/09/06 02:48:40 markusle Exp $ IUSE="doc" @@ -12,7 +12,8 @@ LICENSE="LGPL-2.1" KEYWORDS="~x86" DEPEND="sys-libs/zlib - doc? ( app-doc/doxygen )" + doc? ( app-doc/doxygen ) + !app-misc/beagle" src_unpack() { unpack ${A} |