summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2006-04-15 20:43:52 +0000
committerDaniel Goller <morfic@gentoo.org>2006-04-15 20:43:52 +0000
commit006f7aeff47df7fcd222da7d09d079c9a8e55eed (patch)
tree252f1fb20b724d79cc8710dfdb76f1c8a539779e /dev-libs/boost
parentVersion bump #111638 by Peter Hyman. (diff)
downloadhistorical-006f7aeff47df7fcd222da7d09d079c9a8e55eed.tar.gz
historical-006f7aeff47df7fcd222da7d09d079c9a8e55eed.tar.bz2
historical-006f7aeff47df7fcd222da7d09d079c9a8e55eed.zip
Add a blocker for boost-jam since they can not coexist, boost-jam is old too, maybe it should just die
Package-Manager: portage-2.1_pre7-r4
Diffstat (limited to 'dev-libs/boost')
-rw-r--r--dev-libs/boost/ChangeLog6
-rw-r--r--dev-libs/boost/Manifest18
-rw-r--r--dev-libs/boost/boost-1.33.1.ebuild5
3 files changed, 17 insertions, 12 deletions
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 9e1f32b8b715..1ec74717678b 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/boost
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.86 2006/03/06 23:45:54 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.87 2006/04/15 20:43:52 morfic Exp $
+
+ 15 Apr 2006; Daniel Goller <morfic@gentoo.org> boost-1.33.1.ebuild:
+ Add a blocker for boost-jam since they can not coexist, boost-jam is old too,
+ maybe it should just die
06 Mar 2006; Daniel Goller <morfic@gentoo.org> -boost-1.31.0.ebuild,
-boost-1.33.0.ebuild, -boost-1.33.0-r1.ebuild:
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index d816927ae7db..f9b403b30fde 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,12 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 a33f3cc9c881ccd611502110784701ee ChangeLog 11670
-RMD160 a56c9a26fecef227d32387b43bebd7398b7e6f4d ChangeLog 11670
-SHA256 9b9ed2dbd0c922d83f6606997fa513afb6b8d4eaca2dc3add47fc629c2fcb623 ChangeLog 11670
-MD5 5d7881ecb10d713e56c35a69d1f72842 boost-1.33.1.ebuild 5685
-RMD160 c937de3a35b61db917909474f4ed6618c94a0fa1 boost-1.33.1.ebuild 5685
-SHA256 c5e67aed76dbc9b5f87d14c52da81a1861190e115d89e6319fafaec975520a60 boost-1.33.1.ebuild 5685
+MD5 ee7c873631b691bc6fcaf1742e0191b8 ChangeLog 11848
+RMD160 53f08a4e8c99b0686604f829ef8eaa9d7d78b3f5 ChangeLog 11848
+SHA256 891eeb7365f4518a77f85dd6930e27bffb63e2d96de5045d963e8cb2f6dffd2c ChangeLog 11848
+MD5 02acc2cbed88fb925d0140d2f5759b41 boost-1.33.1.ebuild 5708
+RMD160 5cae0770e93ffb10f64ca6b5c0178a4e1f9abd94 boost-1.33.1.ebuild 5708
+SHA256 e8ad234e1a704b294821a757ca81776712ff8ee63cc712379847144164e118a6 boost-1.33.1.ebuild 5708
MD5 238bb8043f0cdc8bd91f81bd0b55f92a files/boost-alpha-threads.patch 1111
RMD160 49fe6128f6dd9277389d25a83706b401705cdb40 files/boost-alpha-threads.patch 1111
SHA256 e7d1cb78cc73763023edb80cdb66e2a9389d9ef40f448be60cf8cd4f827e7623 files/boost-alpha-threads.patch 1111
@@ -19,7 +19,7 @@ SHA256 d5cb482bec60c835ae9a28b14bc38038e6ad49e57ed887243d446c654f48076f metadata
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
-iD8DBQFEDMnj/aM9DdBw91cRApIxAKCFhYCS/EqL/wo0EsXAtECenIM4IACgujeR
-4Ji9mVOYZZ21QzIhBZjbshs=
-=OGs2
+iD8DBQFEQVsO/aM9DdBw91cRAgusAKDbh1ZcM9jhhsoms8SzxCZvJ0ykXgCbBChg
+qnv2tjZrJrxBYmgdO5fPtpQ=
+=4ylV
-----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.33.1.ebuild b/dev-libs/boost/boost-1.33.1.ebuild
index b09c3f948389..ce0578d44b93 100644
--- a/dev-libs/boost/boost-1.33.1.ebuild
+++ b/dev-libs/boost/boost-1.33.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.33.1.ebuild,v 1.9 2006/03/04 02:07:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.33.1.ebuild,v 1.10 2006/04/15 20:43:52 morfic Exp $
# This ebuild was generated by Ebuilder v0.4.
inherit python distutils multilib eutils
@@ -19,7 +19,8 @@ IUSE="bcp bjam debug doc pyste static threads threadsonly"
DEPEND=" sys-devel/gcc
dev-lang/python"
-RDEPEND="pyste? ( dev-cpp/gccxml dev-python/elementtree ) ${DEPEND}"
+RDEPEND="pyste? ( dev-cpp/gccxml dev-python/elementtree )
+ !dev-util/boost-jam ${DEPEND}"
S="${WORKDIR}/${PN}_${BOOST_PV}"