Fixing DEPEND on !<net-fs/samba-3.6_rc2 bug #364225

(Portage version: 2.1.9.42/cvs/Linux i686)

3 files changed, 7 insertions, 75 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index bf7e06b71eb0..b864ac73ccac 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.10 2011/06/02 22:36:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.11 2011/06/30 15:10:51 vostorga Exp $
+
+  30 Jun 2011; Víctor Ostorga <vostorga@gentoo.org> -cifs-utils-4.8.1.ebuild,
+  cifs-utils-5.0.ebuild:
+  Fixing DEPEND on !<net-fs/samba-3.6_rc2 bug #364225
 
   02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> cifs-utils-5.0.ebuild:
   Keyword ~arm, bug 358401
diff --git a/net-fs/cifs-utils/cifs-utils-4.8.1.ebuild b/net-fs/cifs-utils/cifs-utils-4.8.1.ebuild
deleted file mode 100644
index d718b88cf8cf..000000000000
--- a/net-fs/cifs-utils/cifs-utils-4.8.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-4.8.1.ebuild,v 1.8 2011/05/09 18:12:23 vostorga Exp $
-
-EAPI=2
-
-inherit eutils confutils linux-info
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://www.samba.org/linux-cifs/cifs-utils/"
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
-IUSE="ads +caps caps-ng creds setuid"
-
-DEPEND="!net-fs/mount-cifs
-	!<net-fs/samba-3.6
-	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
-	caps? ( sys-libs/libcap )
-	caps-ng? ( sys-libs/libcap-ng )
-	creds? ( sys-apps/keyutils )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	confutils_use_conflict caps caps-ng
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable ads cifsupcall) \
-		$(use_with caps libcap) \
-		$(use_enable creds cifscreds)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	# Set set-user-ID bit of mount.cifs
-	if use setuid ; then
-		chmod u+s "${D}"/sbin/mount.cifs
-	fi
-	dodoc doc/linux-cifs-client-guide.odt
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	if use setuid ; then
-		ewarn "Setting SETUID bit for mount.cifs."
-		ewarn "However, there may be severe security implications. Also see:"
-		ewarn "http://samba.org/samba/security/CVE-2009-2948.html"
-	fi
-
-	# Inform about upcall usage
-	if use ads ; then
-		ewarn "Using mount.cifs in combination with keyutils"
-		ewarn "in order to mount DFS shares, you need to add"
-		ewarn "the following line to /etc/request-key.conf:"
-		ewarn "  create dns_resolver * * /usr/sbin/cifs.upcall %k"
-		ewarn "Otherwise, your DFS shares will not work properly."
-	fi
-}
diff --git a/net-fs/cifs-utils/cifs-utils-5.0.ebuild b/net-fs/cifs-utils/cifs-utils-5.0.ebuild
index 621f1504dace..31b0864999eb 100644
--- a/net-fs/cifs-utils/cifs-utils-5.0.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.0.ebuild,v 1.3 2011/06/02 22:36:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.0.ebuild,v 1.4 2011/06/30 15:10:51 vostorga Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="ads +caps caps-ng creds setuid"
 
 DEPEND="!net-fs/mount-cifs
-	!<net-fs/samba-3.6
+	!<net-fs/samba-3.6_rc1
 	ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils )
 	caps? ( sys-libs/libcap )
 	caps-ng? ( sys-libs/libcap-ng )