diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2009-10-11 12:04:46 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-10-11 12:04:46 +0000 |
commit | f9ba58925daeed0e4be05a2dc50e49af9f6a7b68 (patch) | |
tree | ccf2c40c7b8aee15a8c6e7f37d321d007768c3a1 /sys-libs | |
parent | Add blockers for collision with sys-libs/tdb and sys-libs/talloc. Fixes bug #... (diff) | |
download | historical-f9ba58925daeed0e4be05a2dc50e49af9f6a7b68.tar.gz historical-f9ba58925daeed0e4be05a2dc50e49af9f6a7b68.tar.bz2 historical-f9ba58925daeed0e4be05a2dc50e49af9f6a7b68.zip |
Block <net-fs/samba-libs-3.4 for bug #288545.
Package-Manager: portage-2.2_rc45/cvs/Linux i686
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/talloc/ChangeLog | 5 | ||||
-rw-r--r-- | sys-libs/talloc/talloc-2.0.0.ebuild | 7 | ||||
-rw-r--r-- | sys-libs/tdb/ChangeLog | 5 | ||||
-rw-r--r-- | sys-libs/tdb/tdb-1.1.5.ebuild | 7 |
4 files changed, 18 insertions, 6 deletions
diff --git a/sys-libs/talloc/ChangeLog b/sys-libs/talloc/ChangeLog index 1c9e6a4ed858..de8eeb30c4ee 100644 --- a/sys-libs/talloc/ChangeLog +++ b/sys-libs/talloc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/talloc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.2 2009/10/09 17:24:13 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.3 2009/10/11 12:03:00 betelgeuse Exp $ + + 11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> talloc-2.0.0.ebuild: + Block <net-fs/samba-libs-3.4 for bug #288545. 09 Oct 2009; Patrick Lauer <patrick@gentoo.org> talloc-1.3.0.ebuild, talloc-1.3.1.ebuild, talloc-2.0.0.ebuild: diff --git a/sys-libs/talloc/talloc-2.0.0.ebuild b/sys-libs/talloc/talloc-2.0.0.ebuild index 2804f2cf140e..cb2907a00ede 100644 --- a/sys-libs/talloc/talloc-2.0.0.ebuild +++ b/sys-libs/talloc/talloc-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.0.ebuild,v 1.2 2009/10/09 17:24:13 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.0.ebuild,v 1.3 2009/10/11 12:03:00 betelgeuse Exp $ EAPI="2" @@ -14,7 +14,10 @@ IUSE="compat" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" -DEPEND="!net-fs/samba-libs[talloc]" +DEPEND=" + !net-fs/samba-libs[talloc] + !<net-fs/samba-libs-3.4 + " RDEPEND="${DEPEND}" src_prepare() { diff --git a/sys-libs/tdb/ChangeLog b/sys-libs/tdb/ChangeLog index d13830f556e6..7f727bd70639 100644 --- a/sys-libs/tdb/ChangeLog +++ b/sys-libs/tdb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/tdb # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.2 2009/10/09 17:24:35 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.3 2009/10/11 12:04:46 betelgeuse Exp $ + + 11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> tdb-1.1.5.ebuild: + Block <net-fs/samba-libs-3.4 for bug #288545. 09 Oct 2009; Patrick Lauer <patrick@gentoo.org> tdb-1.1.5.ebuild: Improve description diff --git a/sys-libs/tdb/tdb-1.1.5.ebuild b/sys-libs/tdb/tdb-1.1.5.ebuild index 0e5aeab790e5..3f47869aacc5 100644 --- a/sys-libs/tdb/tdb-1.1.5.ebuild +++ b/sys-libs/tdb/tdb-1.1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.1.5.ebuild,v 1.2 2009/10/09 17:24:35 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.1.5.ebuild,v 1.3 2009/10/11 12:04:46 betelgeuse Exp $ EAPI="2" @@ -14,7 +14,10 @@ IUSE="python tools tdbtest" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" -DEPEND="!net-fs/samba-libs[tdb]" +DEPEND=" + !net-fs/samba-libs[tdb] + !<net-fs/samba-libs-3.4 + " RDEPEND="${DEPEND}" BINPROGS="bin/tdbdump bin/tdbtool bin/tdbbackup" |