diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2010-08-17 16:10:27 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2010-08-17 16:10:27 +0000 |
| commit | 04b5c989d2c7f07db593c48333006c0036f393c8 (patch) | |
| tree | a23a082c0cac15444112e6bec930d55c53d2b7f1 /net-fs/samba | |
| parent | Remove two keepdir that will try to keep an empty path, closes bug #333163. (diff) | |
| download | gentoo-2-04b5c989d2c7f07db593c48333006c0036f393c8.tar.gz gentoo-2-04b5c989d2c7f07db593c48333006c0036f393c8.tar.bz2 gentoo-2-04b5c989d2c7f07db593c48333006c0036f393c8.zip | |
Adding blocker on sys-libs/tdb when <net-fs/samba-3.3 . Thanks to Tony Vroon <chainsaw@gentoo.org> for the heads up
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'net-fs/samba')
| -rw-r--r-- | net-fs/samba/ChangeLog | 6 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.0.37-r1.ebuild | 3 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.2.15-r1.ebuild | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 4daf11626fee..f84193968830 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/samba # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.437 2010/08/16 00:56:42 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.438 2010/08/17 16:10:27 vostorga Exp $ + + 17 Aug 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.0.37-r1.ebuild, + samba-3.2.15-r1.ebuild: + Adding blocker on sys-libs/tdb when <net-fs/samba-3.3 16 Aug 2010; Jeroen Roovers <jer@gentoo.org> samba-3.4.8.ebuild: Stable for HPPA (bug #332063). diff --git a/net-fs/samba/samba-3.0.37-r1.ebuild b/net-fs/samba/samba-3.0.37-r1.ebuild index ec1f56a69346..d086a5ac7fbe 100644 --- a/net-fs/samba/samba-3.0.37-r1.ebuild +++ b/net-fs/samba/samba-3.0.37-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.37-r1.ebuild,v 1.5 2010/08/10 18:08:00 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.37-r1.ebuild,v 1.6 2010/08/17 16:10:27 vostorga Exp $ inherit autotools eutils pam python multilib versionator confutils @@ -20,6 +20,7 @@ IUSE="acl ads async automount caps cups debug doc examples ipv6 kernel_linux lda RDEPEND="dev-libs/popt virtual/libiconv + !sys-libs/tdb acl? ( virtual/acl ) cups? ( net-print/cups ) ipv6? ( sys-apps/xinetd ) diff --git a/net-fs/samba/samba-3.2.15-r1.ebuild b/net-fs/samba/samba-3.2.15-r1.ebuild index 59324c3dbfc7..eed70dd96d90 100644 --- a/net-fs/samba/samba-3.2.15-r1.ebuild +++ b/net-fs/samba/samba-3.2.15-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.2.15-r1.ebuild,v 1.2 2010/08/07 16:02:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.2.15-r1.ebuild,v 1.3 2010/08/17 16:10:27 vostorga Exp $ -inherit eutils pam multilib versionator confutils autotools +inherit eutils pam multilib versionator confutils MY_P=${PN}-${PV/_/} @@ -34,7 +34,8 @@ RDEPEND="dev-libs/popt swat? ( sys-apps/xinetd ) syslog? ( virtual/logger ) fam? ( virtual/fam ) - caps? ( sys-libs/libcap )" + caps? ( sys-libs/libcap ) + !sys-libs/tdb" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" |