summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2007-06-10 19:41:15 +0000
committerRyan Hill <dirtyepic@gentoo.org>2007-06-10 19:41:15 +0000
commit2397e1e33d6c0939acaff49b07fbe5984f9416c3 (patch)
treed14124a93a60848d068f5d866ff81932a752a322 /dev-util/jam
parentBoost building boost-build with GCC 4.2, bug #181139. (diff)
downloadgentoo-2-2397e1e33d6c0939acaff49b07fbe5984f9416c3.tar.gz
gentoo-2-2397e1e33d6c0939acaff49b07fbe5984f9416c3.tar.bz2
gentoo-2-2397e1e33d6c0939acaff49b07fbe5984f9416c3.zip
Added ftjam blocker.
(Portage version: 2.1.2.9)
Diffstat (limited to 'dev-util/jam')
-rw-r--r--dev-util/jam/ChangeLog6
-rw-r--r--dev-util/jam/jam-2.5-r3.ebuild5
-rw-r--r--dev-util/jam/jam-2.5.ebuild7
3 files changed, 12 insertions, 6 deletions
diff --git a/dev-util/jam/ChangeLog b/dev-util/jam/ChangeLog
index 8560b500c346..38e644fe2d28 100644
--- a/dev-util/jam/ChangeLog
+++ b/dev-util/jam/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/jam
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.24 2007/06/10 16:55:59 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.25 2007/06/10 19:41:15 dirtyepic Exp $
+
+ 10 Jun 2007; Ryan Hill <dirtyepic@gentoo.org> jam-2.5.ebuild,
+ jam-2.5-r3.ebuild:
+ Added ftjam blocker.
10 Jun 2007; Ryan Hill <dirtyepic@gentoo.org> metadata.xml:
Take over as maintainer.
diff --git a/dev-util/jam/jam-2.5-r3.ebuild b/dev-util/jam/jam-2.5-r3.ebuild
index 9a10ea4f4e70..b854e8053c34 100644
--- a/dev-util/jam/jam-2.5-r3.ebuild
+++ b/dev-util/jam/jam-2.5-r3.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/dev-util/jam/jam-2.5-r3.ebuild,v 1.8 2007/05/16 20:44:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5-r3.ebuild,v 1.9 2007/06/10 19:41:15 dirtyepic Exp $
inherit eutils flag-o-matic
@@ -13,7 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc-macos ppc64 sparc x86"
IUSE=""
-DEPEND="sys-devel/bison"
+DEPEND="sys-devel/bison
+ !dev-util/ftjam"
src_unpack() {
unpack ${A}
diff --git a/dev-util/jam/jam-2.5.ebuild b/dev-util/jam/jam-2.5.ebuild
index 3252acb4e2c3..c044e6889f20 100644
--- a/dev-util/jam/jam-2.5.ebuild
+++ b/dev-util/jam/jam-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5.ebuild,v 1.10 2006/10/29 20:20:14 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5.ebuild,v 1.11 2007/06/10 19:41:15 dirtyepic Exp $
DESCRIPTION="Just Another Make - advanced make replacement"
HOMEPAGE="http://www.perforce.com/jam/jam.html"
@@ -11,7 +11,8 @@ SLOT="0"
KEYWORDS="amd64 ppc ~ppc-macos x86"
IUSE=""
-DEPEND="sys-devel/bison"
+DEPEND="sys-devel/bison
+ !dev-util/ftjam"
src_compile() {
# The bootstrap makefile assumes ${S} is in the path