diff options
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 8 | ||||
| -rw-r--r-- | net-print/cups/cups-1.7.5-r2.ebuild | 11 | ||||
| -rw-r--r-- | net-print/cups/cups-1.7.5.ebuild | 10 | ||||
| -rw-r--r-- | net-print/cups/cups-1.7.9999.ebuild | 11 | ||||
| -rw-r--r-- | net-print/cups/cups-2.0.0-r2.ebuild | 11 | ||||
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 11 |
6 files changed, 41 insertions, 21 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 3be26d9cfd43..b5ecb78c35a2 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-print/cups # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.648 2014/10/17 08:30:50 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.649 2014/11/02 12:42:26 swift Exp $ + + 02 Nov 2014; Sven Vermeulen <swift@gentoo.org> cups-1.7.5-r2.ebuild, + cups-1.7.5.ebuild, cups-1.7.9999.ebuild, cups-2.0.0-r2.ebuild, + cups-9999.ebuild: + Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug + #527698) 17 Oct 2014; Matthias Maier <tamiko@gentoo.org> cups-2.0.0-r2.ebuild, cups-9999.ebuild: diff --git a/net-print/cups/cups-1.7.5-r2.ebuild b/net-print/cups/cups-1.7.5-r2.ebuild index 552cb07a1db0..6cc4bbebe199 100644 --- a/net-print/cups/cups-1.7.5-r2.ebuild +++ b/net-print/cups/cups-1.7.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5-r2.ebuild,v 1.2 2014/10/16 22:39:19 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5-r2.ebuild,v 1.3 2014/11/02 12:42:26 swift Exp $ EAPI=5 @@ -40,7 +40,7 @@ for X in ${LANGS} ; do IUSE="${IUSE} +linguas_${X}" done -RDEPEND=" +CDEPEND=" app-text/libpaper acl? ( kernel_linux? ( @@ -54,7 +54,6 @@ RDEPEND=" !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( ${PYTHON_DEPS} ) - selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] @@ -72,10 +71,14 @@ RDEPEND=" ) " -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-cups ) +" + PDEPEND=" app-text/ghostscript-gpl[cups] app-text/poppler[utils] diff --git a/net-print/cups/cups-1.7.5.ebuild b/net-print/cups/cups-1.7.5.ebuild index 52f084ab05ba..744c06536769 100644 --- a/net-print/cups/cups-1.7.5.ebuild +++ b/net-print/cups/cups-1.7.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5.ebuild,v 1.12 2014/09/21 20:11:36 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.5.ebuild,v 1.13 2014/11/02 12:42:26 swift Exp $ EAPI=5 @@ -40,7 +40,7 @@ for X in ${LANGS} ; do IUSE="${IUSE} +linguas_${X}" done -RDEPEND=" +CDEPEND=" app-text/libpaper acl? ( kernel_linux? ( @@ -54,7 +54,6 @@ RDEPEND=" !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( ${PYTHON_DEPS} ) - selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] @@ -72,9 +71,12 @@ RDEPEND=" ) " -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-cups ) +" PDEPEND=" app-text/ghostscript-gpl[cups] diff --git a/net-print/cups/cups-1.7.9999.ebuild b/net-print/cups/cups-1.7.9999.ebuild index 7cb82f4b6818..c0b6df06df9d 100644 --- a/net-print/cups/cups-1.7.9999.ebuild +++ b/net-print/cups/cups-1.7.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v 1.6 2014/10/16 19:31:03 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.9999.ebuild,v 1.7 2014/11/02 12:42:26 swift Exp $ EAPI=5 @@ -40,7 +40,7 @@ for X in ${LANGS} ; do IUSE="${IUSE} +linguas_${X}" done -RDEPEND=" +CDEPEND=" app-text/libpaper acl? ( kernel_linux? ( @@ -54,7 +54,6 @@ RDEPEND=" !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( ${PYTHON_DEPS} ) - selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] @@ -72,10 +71,14 @@ RDEPEND=" ) " -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-cups ) +" + PDEPEND=" app-text/ghostscript-gpl[cups] app-text/poppler[utils] diff --git a/net-print/cups/cups-2.0.0-r2.ebuild b/net-print/cups/cups-2.0.0-r2.ebuild index c121fe2f184d..f2a790c9e136 100644 --- a/net-print/cups/cups-2.0.0-r2.ebuild +++ b/net-print/cups/cups-2.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild,v 1.3 2014/10/17 08:30:50 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.0-r2.ebuild,v 1.4 2014/11/02 12:42:26 swift Exp $ EAPI=5 @@ -40,7 +40,7 @@ for X in ${LANGS} ; do IUSE="${IUSE} +linguas_${X}" done -RDEPEND=" +CDEPEND=" app-text/libpaper acl? ( kernel_linux? ( @@ -54,7 +54,6 @@ RDEPEND=" !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( ${PYTHON_DEPS} ) - selinux? ( sec-policy/selinux-cups ) ssl? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] @@ -70,10 +69,14 @@ RDEPEND=" ) " -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-cups ) +" + PDEPEND=" app-text/ghostscript-gpl[cups] app-text/poppler[utils] diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 67ffb5dd7b2b..101d86db72bb 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.67 2014/10/17 08:30:50 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.68 2014/11/02 12:42:26 swift Exp $ EAPI=5 @@ -40,7 +40,7 @@ for X in ${LANGS} ; do IUSE="${IUSE} +linguas_${X}" done -RDEPEND=" +CDEPEND=" app-text/libpaper acl? ( kernel_linux? ( @@ -54,7 +54,6 @@ RDEPEND=" !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) python? ( ${PYTHON_DEPS} ) - selinux? ( sec-policy/selinux-cups ) ssl? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] @@ -70,10 +69,14 @@ RDEPEND=" ) " -DEPEND="${RDEPEND} +DEPEND="${CDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-cups ) +" + PDEPEND=" app-text/ghostscript-gpl[cups] app-text/poppler[utils] |