diff options
| -rw-r--r-- | net-fs/cifs-utils/ChangeLog | 8 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild | 8 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-6.0.ebuild | 8 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild | 18 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-6.2.ebuild | 18 | ||||
| -rw-r--r-- | net-fs/cifs-utils/metadata.xml | 3 |
6 files changed, 26 insertions, 37 deletions
diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog index 23d9b4853152..6fc01b037664 100644 --- a/net-fs/cifs-utils/ChangeLog +++ b/net-fs/cifs-utils/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-fs/cifs-utils # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.69 2013/10/20 20:22:03 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.70 2013/10/22 10:46:10 polynomial-c Exp $ + + 22 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> cifs-utils-5.9-r1.ebuild, + cifs-utils-6.0.ebuild, cifs-utils-6.1-r1.ebuild, cifs-utils-6.2.ebuild, + metadata.xml: + Removed "upcall" USE flag as it provides the same features like "ads" USE + flag. 20 Oct 2013; Markus Meier <maekke@gentoo.org> cifs-utils-6.1-r1.ebuild: arm stable, bug #486312 diff --git a/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild index 4307e094a5d0..26b1694355ab 100644 --- a/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild +++ b/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.9-r1.ebuild,v 1.12 2013/04/14 11:43:06 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild,v 1.13 2013/10/22 10:46:10 polynomial-c Exp $ EAPI=4 @@ -13,15 +13,14 @@ SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux" -IUSE="ads +caps caps-ng creds upcall" +IUSE="ads +caps caps-ng creds" DEPEND="!net-fs/mount-cifs !<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 ) - creds? ( sys-apps/keyutils ) - upcall? ( sys-apps/keyutils sys-libs/talloc virtual/krb5 )" + creds? ( sys-apps/keyutils )" RDEPEND="${DEPEND}" REQUIRED_USE="^^ ( caps caps-ng )" @@ -56,7 +55,6 @@ src_configure() { $(use_with caps libcap) \ $(use_with caps-ng libcap-ng) \ $(use_enable creds cifscreds) \ - $(use_enable upcall cifsupcall) \ --with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \ --disable-cifsidmap \ --disable-cifsacl diff --git a/net-fs/cifs-utils/cifs-utils-6.0.ebuild b/net-fs/cifs-utils/cifs-utils-6.0.ebuild index 7371ba4b3b79..f4542896aba0 100644 --- a/net-fs/cifs-utils/cifs-utils-6.0.ebuild +++ b/net-fs/cifs-utils/cifs-utils-6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.0.ebuild,v 1.1 2013/04/03 13:44:00 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.0.ebuild,v 1.2 2013/10/22 10:46:10 polynomial-c Exp $ EAPI=4 @@ -13,15 +13,14 @@ SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux" -IUSE="ads +caps caps-ng creds upcall" +IUSE="ads +caps caps-ng creds" DEPEND="!net-fs/mount-cifs !<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 ) - creds? ( sys-apps/keyutils ) - upcall? ( sys-apps/keyutils sys-libs/talloc virtual/krb5 )" + creds? ( sys-apps/keyutils )" RDEPEND="${DEPEND}" REQUIRED_USE="^^ ( caps caps-ng )" @@ -51,7 +50,6 @@ src_configure() { $(use_with caps libcap) \ $(use_with caps-ng libcap-ng) \ $(use_enable creds cifscreds) \ - $(use_enable upcall cifsupcall) \ --with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \ --disable-cifsidmap \ --disable-cifsacl diff --git a/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild index 9ac92cf32333..90f74bdd4bdc 100644 --- a/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild +++ b/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild,v 1.4 2013/10/20 20:22:03 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild,v 1.5 2013/10/22 10:46:10 polynomial-c Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~arm-linux ~x86-linux" -IUSE="acl ads +caps +caps-ng creds upcall" +IUSE="acl ads +caps +caps-ng creds" DEPEND="!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 @@ -22,21 +22,16 @@ DEPEND="!net-fs/mount-cifs >=net-fs/samba-4.0.0_alpha1 ) ) ads? ( + sys-apps/keyutils sys-libs/talloc virtual/krb5 - sys-apps/keyutils ) caps? ( !caps-ng? ( sys-libs/libcap ) ) caps? ( caps-ng? ( sys-libs/libcap-ng ) ) - creds? ( sys-apps/keyutils ) - upcall? ( - sys-apps/keyutils - sys-libs/talloc - virtual/krb5 - )" + creds? ( sys-apps/keyutils )" RDEPEND="${DEPEND}" -REQUIRED_USE="acl? ( upcall )" +REQUIRED_USE="acl? ( ads )" DOCS="doc/linux-cifs-client-guide.odt" @@ -67,8 +62,7 @@ src_configure() { $(use_enable ads cifsupcall) \ $(use caps && use_with !caps-ng libcap || echo --without-libcap) \ $(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \ - $(use_enable creds cifscreds) \ - $(use_enable upcall cifsupcall) + $(use_enable creds cifscreds) } src_install() { diff --git a/net-fs/cifs-utils/cifs-utils-6.2.ebuild b/net-fs/cifs-utils/cifs-utils-6.2.ebuild index 3853bedbbd54..c9810aae4c8b 100644 --- a/net-fs/cifs-utils/cifs-utils-6.2.ebuild +++ b/net-fs/cifs-utils/cifs-utils-6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.2.ebuild,v 1.1 2013/10/07 07:59:09 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.2.ebuild,v 1.2 2013/10/22 10:46:10 polynomial-c Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~arm-linux ~x86-linux" -IUSE="acl ads +caps +caps-ng creds upcall" +IUSE="acl ads +caps +caps-ng creds" DEPEND="!net-fs/mount-cifs !<net-fs/samba-3.6_rc1 @@ -22,21 +22,16 @@ DEPEND="!net-fs/mount-cifs >=net-fs/samba-4.0.0_alpha1 ) ) ads? ( + sys-apps/keyutils sys-libs/talloc virtual/krb5 - sys-apps/keyutils ) caps? ( !caps-ng? ( sys-libs/libcap ) ) caps? ( caps-ng? ( sys-libs/libcap-ng ) ) - creds? ( sys-apps/keyutils ) - upcall? ( - sys-apps/keyutils - sys-libs/talloc - virtual/krb5 - )" + creds? ( sys-apps/keyutils )" RDEPEND="${DEPEND}" -REQUIRED_USE="acl? ( upcall )" +REQUIRED_USE="acl? ( ads )" DOCS="doc/linux-cifs-client-guide.odt" @@ -62,8 +57,7 @@ src_configure() { $(use_enable ads cifsupcall) \ $(use caps && use_with !caps-ng libcap || echo --without-libcap) \ $(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \ - $(use_enable creds cifscreds) \ - $(use_enable upcall cifsupcall) + $(use_enable creds cifscreds) } src_install() { diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml index 28e792f3ce63..a31a339fc794 100644 --- a/net-fs/cifs-utils/metadata.xml +++ b/net-fs/cifs-utils/metadata.xml @@ -8,10 +8,9 @@ </maintainer> <longdescription>The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package</longdescription> <use> - <flag name="ads">Enable Active Directory support</flag> + <flag name="ads">Enable Active Directory support and create cifs.idmap binary - idmap support</flag> <flag name="caps">libcap support</flag> <flag name="caps-ng">libcap-ng support</flag> <flag name="creds">cifs credentials support</flag> - <flag name="upcall">Create cifs.idmap binary; idmap support</flag> </use> </pkgmetadata> |