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

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 13 insertions, 93 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/Manifest b/net-fs/cifs-utils/Manifest
index 9ef0dbc57d1b..892f96f1a7c8 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,26 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST cifs-utils-4.8.1.tar.bz2 323893 RMD160 26023759f70bdf6280f369777cb24c5698294784 SHA1 fbbbdeb9370fb8ddfa1c192bd2df468f3b9eff3b SHA256 4b86a5fc52222793ef1c6fc9384096c9f1ba77516663f37465f13a3b36286e4f
 DIST cifs-utils-5.0.tar.bz2 355658 RMD160 cab81e167300291d17fe5c742016cc3cf1f2d3af SHA1 3b92df032dcef129c21a2f8f96658add2ec0cca4 SHA256 3ae57eb4edef2bb2e71616d80f010750a3da85d722ba5c651789d2398e1c814f
-EBUILD cifs-utils-4.8.1.ebuild 2114 RMD160 95842f072aef563b4447bcdcf889b12ca9bc6742 SHA1 9caa0d7f6ee9c11234f377ee6986b72ec301272e SHA256 e29c0d929a3b23fb915eab97c5df5d17646f96de3b4084b06029245859d02534
-EBUILD cifs-utils-5.0.ebuild 2152 RMD160 88b23282017c9192b795918e3771392310ac6d96 SHA1 d641af9d7b0e1c50b0a9d9da9babcb10fb462cff SHA256 eed637b178f56d1ae1fe3af91470b183d094ac4cb611e5559e895197b6562178
-MISC ChangeLog 1840 RMD160 e72f7ad1003f7f237c555e215c04788de1f56e61 SHA1 e4541bd26a58f9e7beb28d9141446022c774652d SHA256 23c5591e9abc9fed0d85312452c3cf608ca9c91e0acb84d5a172381f5f696c61
+EBUILD cifs-utils-5.0.ebuild 2155 RMD160 b982caa2e7be40c2cd6a4999a45069a45dbbcda7 SHA1 47bf45332ffa937c2c1de92e9b3dc42821d0242f SHA256 663e7dcfaabf817e5bd58cf23e63973c7da95b9a6b060d9ac4a3126d47e09565
+MISC ChangeLog 1998 RMD160 2035a9718e4e7da29fac11dece18abbacf351626 SHA1 6dc1455112faaf9dbe91bd3bf445049557a09e91 SHA256 67790be1a3c25b35c2f648abeb1cb9f1d13d7ee41962b25c7db3c59f3e509dca
 MISC metadata.xml 911 RMD160 5e81306d8b310d6419f3f71f9655408e48b7e42a SHA1 0706cd0798a3e821ed33f416d696ba217c56e12d SHA256 1ebd173f9ef7b7ed86b9fa19f537cc7edbb3656599467ab5a03054298d63711e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN6BB2AAoJENwGBM22xffeOSoP/0MCTGSPwtCs/43JqSNPsOEF
-rbrXuzjx2JAYfbSGNnL4Jb0SvbUWJBUTa+lSTn1xcHlhO3AItlqQdp2tHG/C/VlX
-ghSjeIn2DanqmMJN/Xomg8LhrFFkcgm9sFUXmsmi+Brzbaq9nZU9WagtYwnv3FQq
-GhLH91oTtOJfJzHtPfYHerRnlp86z1HhiNddNR8VuvKloFXDGvSZSAL3plZ0MlUS
-wG09MI5kSYLenA1UoxOoVNIzk5QpVaoAvAlDzgXH1OG+lziM+lIdSM8BpvtpTJHr
-SwOFHGMhW5IrCdSkID8nMQwBkhEkc5GmD5Zdmq/lWoHWNnS3//nLVOHEmc5mYxND
-ZZgcmkOFWQQCtttIMzSckd52pyT+37Qum59/Gp2pWsdE/U4is0058Lqzo3Mpl2YN
-F9UAtK7tGAHndhW4+IJMpxkcwGme86vd0Ak6lUZfTdnL1+MdntyLjxN8saWi+oyu
-AyHRW1Sbncj0tNxJ2uTRiJ2nb9pr6wdxMZX9k6lDHFg9cf95XOK2lrqOL0izx+Ba
-rIQgFsRVfovi+jcQE1fGYI09h8xJ3erjMEqFTjsQ0FXpghrCx3J4lOjGPMFJIHgr
-GD00s78WGDbJnVBAaO8TAWVG69h6f+NWflIOan+okSBC9wNHuum8DPOzoon9cRrp
-kC1LkSsJxoKbhTLVlvHc
-=LXZj
+iEYEARECAAYFAk4MkgIACgkQKQaZ7OJe4zYsuACdGrUW+DbCQIOLeWX8VgxT/v2o
+XfYAn1wpzsDdECKAR7HM8m6pWqlTZuKA
+=tKX4
 -----END PGP SIGNATURE-----
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 )