diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2012-09-04 09:32:30 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2012-09-04 09:32:30 +0000 |
| commit | c4d866074086122f131ae3707a9260e8407a5d01 (patch) | |
| tree | f0e3ca699581bba38c684ff77d42cf992ce23495 /net-fs/samba | |
| parent | Stabilise on amd64 and x86. Drop older. (diff) | |
| download | gentoo-2-c4d866074086122f131ae3707a9260e8407a5d01.tar.gz gentoo-2-c4d866074086122f131ae3707a9260e8407a5d01.tar.bz2 gentoo-2-c4d866074086122f131ae3707a9260e8407a5d01.zip | |
Restricting cups 1.6
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Diffstat (limited to 'net-fs/samba')
| -rw-r--r-- | net-fs/samba/ChangeLog | 5 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.5.17.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index a5e76934b337..26b33bba7d7b 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-fs/samba # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.522 2012/09/04 05:54:17 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.523 2012/09/04 09:32:30 patrick Exp $ + + 04 Sep 2012; Patrick Lauer <patrick@gentoo.org> samba-3.5.17.ebuild: + Restricting cups 1.6 *samba-3.5.17 (04 Sep 2012) diff --git a/net-fs/samba/samba-3.5.17.ebuild b/net-fs/samba/samba-3.5.17.ebuild index 865062d830f0..eb35464a974e 100644 --- a/net-fs/samba/samba-3.5.17.ebuild +++ b/net-fs/samba/samba-3.5.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.17.ebuild,v 1.1 2012/09/04 05:54:17 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.17.ebuild,v 1.2 2012/09/04 09:32:30 patrick Exp $ EAPI=4 @@ -20,6 +20,7 @@ IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes smbtav2 swat syslog winbind" +# upstream doesn't support cups 1.6 for samba 3.5 DEPEND="dev-libs/popt !net-fs/samba-client !net-fs/samba-libs @@ -35,7 +36,7 @@ DEPEND="dev-libs/popt client? ( !net-fs/mount-cifs dev-libs/iniparser ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) - cups? ( net-print/cups ) + cups? ( <net-print/cups-1.6 ) fam? ( virtual/fam ) ldap? ( net-nds/openldap ) pam? ( virtual/pam |