diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-10-11 12:01:23 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-10-11 12:01:23 +0000 |
| commit | 2e65bff3f4c74b43845cdd8f07b82a267a9ad7fe (patch) | |
| tree | 985a8ea98be609ec1a2d64b122120182f2978c2c /net-fs | |
| parent | whitespace (diff) | |
| download | gentoo-2-2e65bff3f4c74b43845cdd8f07b82a267a9ad7fe.tar.gz gentoo-2-2e65bff3f4c74b43845cdd8f07b82a267a9ad7fe.tar.bz2 gentoo-2-2e65bff3f4c74b43845cdd8f07b82a267a9ad7fe.zip | |
Add blockers for collision with sys-libs/tdb and sys-libs/talloc. Fixes bug #288545.
(Portage version: 2.2_rc45/cvs/Linux i686)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/samba-libs/ChangeLog | 7 | ||||
| -rw-r--r-- | net-fs/samba-libs/samba-libs-3.3.8.ebuild | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net-fs/samba-libs/ChangeLog b/net-fs/samba-libs/ChangeLog index ff54a7defdde..f0bc71ed4108 100644 --- a/net-fs/samba-libs/ChangeLog +++ b/net-fs/samba-libs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/samba-libs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.12 2009/10/11 11:11:06 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/ChangeLog,v 1.13 2009/10/11 12:01:23 betelgeuse Exp $ + + 11 Oct 2009; Petteri Räty <betelgeuse@gentoo.org> + samba-libs-3.3.8.ebuild: + Add blockers for collision with sys-libs/tdb and sys-libs/talloc. Fixes + bug #288545. 11 Oct 2009; Patrick Lauer <patrick@gentoo.org> samba-libs-3.4.2.ebuild: Enable smbclient by default, used by most dependencies diff --git a/net-fs/samba-libs/samba-libs-3.3.8.ebuild b/net-fs/samba-libs/samba-libs-3.3.8.ebuild index fdf4eed86843..bcda54778d06 100644 --- a/net-fs/samba-libs/samba-libs-3.3.8.ebuild +++ b/net-fs/samba-libs/samba-libs-3.3.8.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/net-fs/samba-libs/samba-libs-3.3.8.ebuild,v 1.2 2009/10/09 17:21:09 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba-libs/samba-libs-3.3.8.ebuild,v 1.3 2009/10/11 12:01:23 betelgeuse Exp $ EAPI="2" @@ -27,7 +27,9 @@ DEPEND="dev-libs/popt pam? ( virtual/pam winbind? ( dev-libs/iniparser ) ) syslog? ( virtual/logger ) - !<net-fs/samba-3.3" + !<net-fs/samba-3.3 + !sys-libs/tdb + !sys-libs/talloc" RDEPEND="${DEPEND}" # Disable tests since we don't want to build that much here |