diff options
| author | Matthias Maier <tamiko@gentoo.org> | 2016-01-12 16:46:20 +0100 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2016-01-12 16:50:48 +0100 |
| commit | 0ff400dd5ca0cf3ef8b1b6aa67d67937cbd90e32 (patch) | |
| tree | 1addd84e0362fab91020a5bc4dcac2c6b9c065cc /net-print/cups | |
| parent | d50613660ebada3bfc9f27799710d4c8d8ec3743 (diff) | |
| download | gentoo-0ff400dd5ca0cf3ef8b1b6aa67d67937cbd90e32.tar.gz gentoo-0ff400dd5ca0cf3ef8b1b6aa67d67937cbd90e32.tar.xz | |
net-print/cups: ebuild maintenance; update live version
Package-Manager: portage-2.2.26
Diffstat (limited to 'net-print/cups')
| -rw-r--r-- | net-print/cups/cups-9999.ebuild | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 6dd71f46129..e3c89fd794b 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \ +inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \ multilib multilib-minimal pam python-single-r1 user versionator \ java-pkg-opt-2 systemd toolchain-funcs @@ -48,7 +48,7 @@ CDEPEND=" ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - java? ( >=virtual/jre-1.6 ) + java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) @@ -96,7 +96,9 @@ PATCHES=( "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch" "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${PN}-2.0.1-rename-systemd-service-files.patch" + "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" + "${FILESDIR}/${P}-systemd-socket.patch" + "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" ) MULTILIB_CHOST_TOOLS=( @@ -292,9 +294,8 @@ multilib_src_install_all() { # create /etc/cups/client.conf, bug #196967 and #266678 echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf - # the following files are now provided by cups-filters: + # the following file iw now provided by cups-filters: rm -r "${ED}"/usr/share/cups/banners || die - rm -r "${ED}"/usr/share/cups/data/testprint || die # the following are created by the init script rm -r "${ED}"/var/cache/cups || die |