summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2014-01-18 20:09:17 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2014-01-18 20:09:17 +0000
commit426d97f9f24d96cf4f91b3f020e6dc57c4ff4af2 (patch)
treef550054cd2fc13aac70be512ba851e4387694da4 /net-print
parentStable for alpha, wrt bug #495648 (diff)
downloadgentoo-2-426d97f9f24d96cf4f91b3f020e6dc57c4ff4af2.tar.gz
gentoo-2-426d97f9f24d96cf4f91b3f020e6dc57c4ff4af2.tar.bz2
gentoo-2-426d97f9f24d96cf4f91b3f020e6dc57c4ff4af2.zip
Remove old
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog7
-rw-r--r--net-print/cups/cups-1.6.2-r5.ebuild305
-rw-r--r--net-print/cups/cups-1.7.0-r1.ebuild308
-rw-r--r--net-print/cups/files/cups-1.6.3-colord-profile.patch32
-rw-r--r--net-print/cups/files/cupsd.init.d22
-rw-r--r--net-print/cups/files/pdftops-1.20.gentoo340
6 files changed, 6 insertions, 1008 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ac4bf307a82d..fe2a58049d46 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
# 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.583 2014/01/18 19:55:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.584 2014/01/18 20:09:16 dilfridge Exp $
+
+ 18 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.6.2-r5.ebuild,
+ -files/cups-1.6.3-colord-profile.patch, -cups-1.7.0-r1.ebuild,
+ -files/pdftops-1.20.gentoo, -files/cupsd.init.d:
+ Remove old
18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.6.4.ebuild:
Stable for alpha, wrt bug #489914
diff --git a/net-print/cups/cups-1.6.2-r5.ebuild b/net-print/cups/cups-1.6.2-r5.ebuild
deleted file mode 100644
index ddac98187b27..000000000000
--- a/net-print/cups/cups-1.6.2-r5.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r5.ebuild,v 1.15 2013/12/26 00:37:12 dilfridge Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
-
-MY_P=${P/_beta/b}
-MY_PV=${PV/_beta/b}
-
-if [[ "${PV}" != "9999" ]]; then
- SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-else
- inherit subversion
- ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
- KEYWORDS=""
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug +filters gnutls java kerberos lprng-compat pam
- python selinux +ssl static-libs +threads usb X xinetd zeroconf"
-
-LANGS="ca es fr ja ru"
-for X in ${LANGS} ; do
- IUSE="${IUSE} +linguas_${X}"
-done
-
-RDEPEND="
- app-text/libpaper
- acl? (
- kernel_linux? (
- sys-apps/acl
- sys-apps/attr
- )
- )
- dbus? ( sys-apps/dbus )
- java? ( >=virtual/jre-1.6 )
- kerberos? ( virtual/krb5 )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- selinux? ( sec-policy/selinux-cups )
- ssl? (
- gnutls? (
- dev-libs/libgcrypt
- net-libs/gnutls
- )
- !gnutls? ( >=dev-libs/openssl-0.9.8g )
- )
- usb? ( virtual/libusb:1 )
- X? ( x11-misc/xdg-utils )
- xinetd? ( sys-apps/xinetd )
- zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PDEPEND="
- app-text/ghostscript-gpl[cups]
- app-text/poppler[utils]
- >=net-print/cups-filters-1.0.30
- filters? ( net-print/foomatic-filters )
-"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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}-1.5.0-systemd-socket-2.patch" # systemd support
- "${FILESDIR}/${PN}-1.6.2-statedir.patch"
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- # python 3 is no-go
- if use python; then
- python_set_active_version 2
- python_pkg_setup
- fi
-
- if use kernel_linux; then
- linux-info_pkg_setup
- if ! linux_config_exists; then
- ewarn "Can't check the linux kernel configuration."
- ewarn "You might have some incompatible options enabled."
- else
- # recheck that we don't have usblp to collide with libusb
- if use usb; then
- if linux_chkconfig_present USB_PRINTER; then
- eerror "Your usb printers will be managed via libusb. In this case, "
- eerror "${P} requires the USB_PRINTER support disabled."
- eerror "Please disable it:"
- eerror " CONFIG_USB_PRINTER=n"
- eerror "in /usr/src/linux/.config or"
- eerror " Device Drivers --->"
- eerror " USB support --->"
- eerror " [ ] USB Printer support"
- eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
- fi
- else
- #here we should warn user that he should enable it so he can print
- if ! linux_chkconfig_present USB_PRINTER; then
- ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
- ewarn "support in your kernel."
- ewarn "Please enable it:"
- ewarn " CONFIG_USB_PRINTER=y"
- ewarn "in /usr/src/linux/.config or"
- ewarn " Device Drivers --->"
- ewarn " USB support --->"
- ewarn " [*] USB Printer support"
- ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
- fi
- fi
- fi
- fi
-}
-
-src_prepare() {
- base_src_prepare
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-}
-
-src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LANGS=\"${LANGS}\"
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myconf
- if use ssl ; then
- myconf+="
- $(use_enable gnutls)
- $(use_enable !gnutls openssl)
- "
- else
- myconf+="
- --disable-gnutls
- --disable-openssl
- "
- fi
-
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --localstatedir="${EPREFIX}"/var \
- --with-cups-user=lp \
- --with-cups-group=lp \
- --with-docdir="${EPREFIX}"/usr/share/cups/html \
- --with-languages="${LINGUAS}" \
- --with-system-groups=lpadmin \
- $(use_enable acl) \
- $(use_enable zeroconf avahi) \
- $(use_enable dbus) \
- $(use_enable debug) \
- $(use_enable debug debug-guards) \
- $(use_enable kerberos gssapi) \
- $(use_enable pam) \
- $(use_enable static-libs static) \
- $(use_enable threads) \
- $(use_enable usb libusb) \
- --disable-dnssd \
- $(use_with java) \
- --without-perl \
- --without-php \
- $(use_with python) \
- $(use_with xinetd xinetd /etc/xinetd.d) \
- --enable-libpaper \
- --with-systemdsystemunitdir="$(systemd_get_unitdir)" \
- ${myconf}
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
- sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
- sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-}
-
-src_install() {
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- emake BUILDROOT="${D}" install
- dodoc {CHANGES,CREDITS,README}.txt
-
- # move the default config file to docs
- dodoc "${ED}"/etc/cups/cupsd.conf.default
- rm -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- if use xinetd ; then
- # correct path
- sed -i \
- -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
- "${ED}"/etc/xinetd.d/cups-lpd || die
- # it is safer to disable this by default, bug #137130
- grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
- { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
- # write permission for file owner (root), bug #296221
- fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
- else
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/cache/cups /var/cache/cups/rss /var/log/cups \
- /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # create /etc/cups/client.conf, bug #196967 and #266678
- echo "ServerName /run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
- # the following files are now provided by cups-filters:
- rm -r "${ED}"/usr/share/cups/banners || die
- rm -r "${ED}"/usr/share/cups/data/testprint || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- # not slotted - at most one value
- if ! [[ "${REPLACING_VERSIONS}" ]]; then
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
- echo
- elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
- elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
- elog "You will have to find printers using zeroconf/avahi instead, enter"
- elog "the location manually, or run cups-browsed from net-print/cups-filters"
- elog "which re-adds that functionality as a separate daemon."
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
- ewarn
- ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
- ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
- ewarn
- fi
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/cups-1.7.0-r1.ebuild b/net-print/cups/cups-1.7.0-r1.ebuild
deleted file mode 100644
index a200d56dd7d0..000000000000
--- a/net-print/cups/cups-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# 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.0-r1.ebuild,v 1.1 2014/01/01 19:15:40 dilfridge Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
- multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="http://www.cups.org/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
- KEYWORDS=""
-else
- SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
- python selinux +ssl static-libs +threads usb X xinetd zeroconf"
-
-LANGS="ca es fr it ja ru"
-for X in ${LANGS} ; do
- IUSE="${IUSE} +linguas_${X}"
-done
-
-RDEPEND="
- app-text/libpaper
- acl? (
- kernel_linux? (
- sys-apps/acl
- sys-apps/attr
- )
- )
- dbus? ( sys-apps/dbus )
- java? ( >=virtual/jre-1.6 )
- kerberos? ( virtual/krb5 )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- selinux? ( sec-policy/selinux-cups )
- ssl? (
- gnutls? (
- dev-libs/libgcrypt
- net-libs/gnutls
- )
- !gnutls? ( >=dev-libs/openssl-0.9.8g )
- )
- usb? ( virtual/libusb:1 )
- X? ( x11-misc/xdg-utils )
- xinetd? ( sys-apps/xinetd )
- zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PDEPEND="
- app-text/ghostscript-gpl[cups]
- app-text/poppler[utils]
- >=net-print/cups-filters-1.0.43
-"
-
-REQUIRED_USE="gnutls? ( ssl )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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}-1.5.0-systemd-socket-2.patch" # systemd support
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- use python && python-single-r1_pkg_setup
-
- if use kernel_linux; then
- linux-info_pkg_setup
- if ! linux_config_exists; then
- ewarn "Can't check the linux kernel configuration."
- ewarn "You might have some incompatible options enabled."
- else
- # recheck that we don't have usblp to collide with libusb
- if use usb; then
- if linux_chkconfig_present USB_PRINTER; then
- eerror "Your usb printers will be managed via libusb. In this case, "
- eerror "${P} requires the USB_PRINTER support disabled."
- eerror "Please disable it:"
- eerror " CONFIG_USB_PRINTER=n"
- eerror "in /usr/src/linux/.config or"
- eerror " Device Drivers --->"
- eerror " USB support --->"
- eerror " [ ] USB Printer support"
- eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
- fi
- else
- #here we should warn user that he should enable it so he can print
- if ! linux_chkconfig_present USB_PRINTER; then
- ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
- ewarn "support in your kernel."
- ewarn "Please enable it:"
- ewarn " CONFIG_USB_PRINTER=y"
- ewarn "in /usr/src/linux/.config or"
- ewarn " Device Drivers --->"
- ewarn " USB support --->"
- ewarn " [*] USB Printer support"
- ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
- fi
- fi
- fi
- fi
-}
-
-src_prepare() {
- base_src_prepare
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-}
-
-src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LANGS=\"${LANGS}\"
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myconf
- if use ssl ; then
- myconf+="
- $(use_enable gnutls)
- $(use_enable !gnutls openssl)
- "
- else
- myconf+="
- --disable-gnutls
- --disable-openssl
- "
- fi
-
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --localstatedir="${EPREFIX}"/var \
- --with-rundir="${EPREFIX}"/run/cups \
- --with-cups-user=lp \
- --with-cups-group=lp \
- --with-docdir="${EPREFIX}"/usr/share/cups/html \
- --with-languages="${LINGUAS}" \
- --with-system-groups=lpadmin \
- $(use_enable acl) \
- $(use_enable zeroconf avahi) \
- $(use_enable dbus) \
- $(use_enable debug) \
- $(use_enable debug debug-guards) \
- $(use_enable kerberos gssapi) \
- $(use_enable pam) \
- $(use_enable static-libs static) \
- $(use_enable threads) \
- $(use_enable usb libusb) \
- --disable-dnssd \
- $(use_with java) \
- --without-perl \
- --without-php \
- $(use_with python python "${PYTHON}") \
- $(use_with xinetd xinetd /etc/xinetd.d) \
- --enable-libpaper \
- --with-systemdsystemunitdir="$(systemd_get_unitdir)" \
- ${myconf}
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
- sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
- sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-}
-
-src_install() {
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- emake BUILDROOT="${D}" install
- dodoc {CHANGES,CREDITS,README}.txt
-
- # move the default config file to docs
- dodoc "${ED}"/etc/cups/cupsd.conf.default
- rm -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- if use xinetd ; then
- # correct path
- sed -i \
- -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
- "${ED}"/etc/xinetd.d/cups-lpd || die
- # it is safer to disable this by default, bug #137130
- grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
- { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
- # write permission for file owner (root), bug #296221
- fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
- else
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/cache/cups /var/cache/cups/rss /var/log/cups \
- /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # 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:
- rm -r "${ED}"/usr/share/cups/banners || die
- rm -r "${ED}"/usr/share/cups/data/testprint || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- # not slotted - at most one value
- if ! [[ "${REPLACING_VERSIONS}" ]]; then
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
- echo
- elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
- elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
- elog "You will have to find printers using zeroconf/avahi instead, enter"
- elog "the location manually, or run cups-browsed from net-print/cups-filters"
- elog "which re-adds that functionality as a separate daemon."
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
- ewarn
- ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
- ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
- ewarn
- fi
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/files/cups-1.6.3-colord-profile.patch b/net-print/cups/files/cups-1.6.3-colord-profile.patch
deleted file mode 100644
index c03968099446..000000000000
--- a/net-print/cups/files/cups-1.6.3-colord-profile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Add colord profile fix
-Author: Alexey Galakhov <agalakhov@gmail.com>
-Bug-Debian: http://bugs.debian.org/711868
-Last-Update: 2013-06-10
-
---- cups-1.6.2.orig/scheduler/colorman.c 2013-02-20 05:53:01.000000000 +0600
-+++ cups-1.6.2/scheduler/colorman.c 2013-06-10 18:50:49.000000000 +0600
-@@ -84,10 +84,13 @@
- # define COLORD_KIND_PRINTER "printer"
- /* printing output device */
-
--# define COLORD_DBUS_MSG(p,m) dbus_message_new_method_call(\
-+# define COLORD_DBUS_MSG_PARM(p,x,m) dbus_message_new_method_call(\
- "org.freedesktop.ColorManager", (p),\
-- "org.freedesktop.ColorManager", (m))
-+ "org.freedesktop.ColorManager" x, (m))
- /* Macro to make new colord messages */
-+# define COLORD_DBUS_MSG(p,m) COLORD_DBUS_MSG_PARM(p,"",m)
-+ /* Macro to make new colord messages */
-+
- # define COLORD_DBUS_PATH "/org/freedesktop/ColorManager"
- /* Path for color management system */
- # define COLORD_DBUS_TIMEOUT 5000 /* Timeout for connecting to colord in ms */
-@@ -1177,7 +1180,7 @@
- DBusError error; /* D-Bus error */
-
-
-- message = COLORD_DBUS_MSG(device_path, "AddProfile");
-+ message = COLORD_DBUS_MSG_PARM(device_path, ".Device", "AddProfile");
-
- dbus_message_iter_init_append(message, &args);
- dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &relation);
diff --git a/net-print/cups/files/cupsd.init.d b/net-print/cups/files/cupsd.init.d
deleted file mode 100644
index 1e9ccf8381c9..000000000000
--- a/net-print/cups/files/cupsd.init.d
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-
-depend() {
- use net
- @neededservices@
- before nfs
- after logger
-}
-
-start() {
- ebegin "Starting cupsd"
- checkpath -q -d -m 0755 -o root:lp /var/run/cups
- checkpath -q -d -m 0511 -o lp:lpadmin /var/run/cups/certs
- start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
- eend $?
-}
-
-stop() {
- ebegin "Stopping cupsd"
- start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
- eend $?
-}
diff --git a/net-print/cups/files/pdftops-1.20.gentoo b/net-print/cups/files/pdftops-1.20.gentoo
deleted file mode 100644
index 8fdafe34a674..000000000000
--- a/net-print/cups/files/pdftops-1.20.gentoo
+++ /dev/null
@@ -1,340 +0,0 @@
-#!/usr/bin/perl -w
-# pdftops.pl - wrapper script for xpdf's pdftops utility to act as a CUPS filter
-# ==============================================================================
-# 1.00 - 2004-10-05/Bl
-# Initial implementation
-# 1.10 - 2006-09-27/Bl
-# Alternatively, use Adobe Reader in place of Xpdf's pdftops
-# 1.20 - 2007-12-03/Bl
-# Safe temp file creation (fix gentoo bug # 201042)
-#
-# Copyright: Helge Blischke / SRZ Berlin 2004-2006
-# This program is free seoftware and governed by the GNU Public License Version 2.
-#
-# Description:
-# ------------
-# This program wraps the pdftops utility from the xpdf 3.00 (and higher) suite
-# to behave as a CUPS filter as a replacement for the original pdftops filter.
-# As an alternative the Adobe Reader may be used.
-#
-# The main purpose of this approach is to keep the properties of a PDF to be
-# printed as undesturbed as possible, especially with respect to page size,
-# scaling, and positioning.
-#
-# The pdftops utility reads a configuration file 'pdftops.conf' or 'acroread.conf',
-# respectively, in the CUPS_SERVERROOT directory, which must exist but may be empty.
-# The sample configuration file accompanying this program sets the defaults which
-# seem plausible to me with respect to high end production printers.
-#
-# To give the user highest possible flexibility, this program accepts and
-# evaluates a set of job attributes special to this filter, which are
-# described below:
-#
-# pdf-pages=<f>,<l>
-# expands to the -f and -l options of pdftops
-# or the -start and -end options of acroread, respectively
-# to select a page range to process. This is independent
-# of the page-ranges attribute and may significantly
-# increase throughput when printing page ranges.
-# Either of these numbers may be omitted.
-#
-# pdf-paper=<name>
-# For pdftops, <name> may be one of "letter", "legal",
-# "A4", "A3", or "match"; for acroread, the permetted values
-# are "letter", "legal", "tabloid", "ledger", "executive",
-# "a3", "a4", "a5", "b4", "b5", respectively (without the
-# quotes; the names are treated case independent).
-# In case of acroread, no paper specification is equivalent
-# to pdsftops's "match".
-# pdf-paper=<width>x<height>
-# <name> may be one of letter, legal , A4, A3, or match;
-# <width> and <height> are the paper width and height
-# in printers points (1/72 inch). This expands to
-# either the -paper or the -paperh and -paperw options
-# of pdftops or the -size option of acroread.
-#
-# pdf-opw=<password>
-# pdf-upw=<password>
-# expand to the -opw and -upw options of pdftops,
-# respectively and permit printing of password
-# protected PDFs.
-#
-# pdf-<option> where <option> is one of
-# level1, level1sep, level2, level2sep, level3, level3sep,
-# opi, nocrop, expand, noshrink, nocenter.
-# See the pdftops manpage for a detailed description of
-# the respective options.
-# In case of acroread, the options level1, level?sep, opi,
-# nocrop, noshrink, and nocenter are silently ignored.
-#
-# All other pdftops commandline options are refused.
-#
-# The return code of the pdftops utility or acroread, if nonzero, is used as the exit code
-# of this program; error messages of the pdftops utility are only visible
-# if 'debug' is specified as LogLevel in cupsd.conf.
-#
-# NOTE:
-# -----
-# This wrapper script has been initially designed to use the original pdftops utility
-# as a CUPS filter and now extended to alternately use acroread.
-# But there are situations where you need to be able to select either variant, thus it
-# is possible to configure the wrapper to both programs but select one of them by default;
-# the other one then may be selected by command line option:
-#
-# use-pdftops selects pdftops
-# use-acroread selects acroread
-#
-# if both are configured (by defining the appropriate configuration file).
-#
-
-#
-# Site specific parameters - modify as needed
-# ----------------------------------------------------------------------------------
-$pdftops_path = "/usr/bin/pdftops"; # path to the xpdf utility
-$acroread_path = "/opt/bin/acroread"; # path to Adobe Reader
-$default_app = 'use-pdftops'; # the default if both are configured
-$use_pdftops = 1; # default on gentoo and highly recommended
-$use_acroread = 0; # not supported/working on gentoo yet, use at your own risk
-# ----------------------------------------------------------------------------------
-
-use File::Temp qw( tempfile );
-
-#
-# Check which app to use - pdftops or acroread
-#
-$rootdir = $ENV{CUPS_SERVERROOT} || die ("ERROR: CUPS server root directory undefined\n");
-$use_both = $use_pdftops && $use_acroread;
-
-#
-# Check the arguments
-#
-die ("ERROR: wrong number of arguments\n") if (scalar @ARGV < 5);
-
-$jobid = $username = $title = $copies = undef;
-$jobid = shift; # Job ID
-$username = shift; # Job requesting user name
-$title = shift; # Job title
-$copies = shift; # Number of requested copies
-$options = shift; # Textual representation of job attributes
-$pdffile = shift; # Pathname of PDF file to process
-
-if (defined $use_both && $use_both)
-{
- my $optstr = " $options ";
- my $to_use = '';
- if ($optstr =~ /\s+(use-acroread|use-pdftops)\s+/)
- {
- $to_use = $1;
- }
- else
- {
- $to_use = $default_app;
- }
- if ($to_use eq 'use-acroread')
- {
- undef $use_pdftops;
- }
- elsif ($to_use eq 'use-pdftops')
- {
- undef $use_acroread;
- }
- else
- {
- die ("ERROR: cannot use both pdftops and acroread simultaneously\n");
- }
-}
-
-
-if (defined $use_pdftops)
-{
- # If we are reading from STDIN, we must copy the input to a temporary file
- # as the PDF consumer needs a seekable input.
- if (! defined $pdffile)
- {
- my $template = "pdfinXXXXXX";
- my $tmpdir = $ENV{TMPDIR};
- my ($bytes, $buffer);
- my ($tmpfh, $tmpfile) = tempfile ($template, OPEN => 1, DIR => $tmpdir, UNLINK => 0, SUFFIX => '.tmp');
- while (($bytes = read (STDIN, $buffer, 1024)) > 0)
- {
- print $tmpfh "$buffer";
- }
- if ($bytes < 0)
- {
- close ($tmpfh);
- unlink $tmpfile;
- die ("ERROR: pdftops wrapper: $tmpfile: $!\n");
- }
- close ($tmpfh);
- $pdffile = $tmpfile;
- $delete_input = 1; # for deleting the temp file after converting
- }
-}
-
-
-#
-# Check the options string for options to modify the bahaviour of the pdftops utility:
-#
-@optarr = split (/\s+/, $options);
-if (defined $use_pdftops)
-{
- $cmdopt = ""; # do not pass the -cfg argument to the poppler pdftops util
- # The following are the (parameterless) command line options that may be used to change the
- # defaults defiend by pdftops.conf
- $simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
- %papernames = (
- 'letter' => '-paper letter',
- 'tabloid' => '-paperw 792 -paperh 1224',
- 'ledger' => '-paperw 1224 -paperh 792',
- 'legal' => '-paper legal',
- 'executive' => '-paperw 756 -paperh 522',
- 'a3' => '-paper A3',
- 'a4' => '-paper A4',
- 'a5' => '-paperw 421 -paperh 595',
- 'b4' => '-paperw 709 -paperh 1002',
- 'b5' => '-paperw 501 -paperh 709',
- 'match' => '-paper match'
- );
-}
-else
-{
- open (CFG, "<$rootdir/acroread.conf") || die ("ERROR: acroread.conf: $!\n");
- $cmdopt = '-toPostScript';
- while (<CFG>)
- {
- chomp;
- next if (/^\s*#/); # skip comment lines
- next if (/^\s*$/); # skip blank lines
- s/^-\s*//; # discard leading '-' and white space, as it will be generated later
- s/\s+$//; # discard trailing white space
- $cmdopt .= " -$_";
- }
- close (CFG);
- $simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';
- %papernames = (
- 'letter' => '-size letter',
- 'tabloid' => '-size tabloid',
- 'ledger' => '-size ledger',
- 'legal' => '-size legal',
- 'executive' => '-size executive',
- 'a3' => '-size a3',
- 'a4' => '-size a4',
- 'a5' => '-size a5',
- 'b4' => '-size b4',
- 'b5' => '-size b5',
- 'match' => '' # this is the default with acroread
- );
-}
-
-foreach my $option (@optarr)
-{
- if ($option =~ /^pdf-(.+)$/)
- { # We assume this is an option to evaluate
- my $optkey = $1; # possible pdftops option
- if ($optkey =~ /^pages=(\d*),(\d*)$/)
- {
- # We do this hack here to avoid clashes with the page-ranges atrribute
- # which is handled by the pstops filter. And we allow one of the numbers
- # to be omitted.
- my $first = $1;
- my $lastp = $2;
- if (defined $use_pdftops)
- {
- $cmdopt .= " -f $1" if ($1); # first page
- $cmdopt .= " -l $2" if ($2); # last page
- }
- else
- {
- $cmdopt .= " -start $1" if ($1); # first page
- $cmdopt .= " -end $2" if ($2); # last page
- }
- }
- elsif ($optkey =~ /^paper=(letter|tabloid|ledger|legal|[Aa]3|[Aa]4|[Aa]5|[Bb]4|[Bb]5|match)$/)
- {
- # evaluate paper name
- my $paper = $1;
- $paper =~ tr/A-Z/a-z/;
- my $value = $papernames{$paper};
- $cmdopt .= " $value" if ($value);
- }
- elsif ($optkey =~ /^paper=(\d+)x(\d+)$/)
- {
- # evaluate paper dimensions
- if (defined $use_pdftops)
- {
- $cmdopt .= " -paperw $1 -paperh $2";
- }
- else
- {
- $cmdopt .= " -size $1" . 'x' . "$2";
- }
- }
- elsif ($optkey =~ /^(o|u)pw=(\S+)$/)
- {
- $cmdopt .= " $1" . 'pw ' . $2 if (defined $use_pdftops); # owner/user password
- }
- elsif ($optkey =~ /^($simple)$/)
- {
- my $thisopt = $1;
- if (defined $use_pdftops)
- {
- $cmdopt .= ' -' . $1; # allowed simple options
- }
- else
- {
- $thisopt =~ s/sep$//; # ignore the ...sep suffix
- if ($thisopt =~ /level1|opi|nocrop|nocenter/)
- {
- $thisopt = '';
- }
- elsif ($thisopt eq 'noshrink')
- {
- $thisopt = '';
- $cmdopt =~ s/ -shrink//;
- }
- $cmdopt .= " -" . $thisopt if ($thisopt);
- }
- }
- else
- {
- warn ("ERROR: pdftops wrapper: illegal attribute \"pdf-$optkey\"\n");
- }
- }
- # All other attributes are processed elsewhere
-}
-#
-# Complete the command
-#
-if (defined $use_pdftops)
-{
- warn ("ERROR: pdftops-options: $cmdopt\n");
-}
-else
-{
- warn ("ERROR: acroread-options: $cmdopt\n");
-}
-if (defined $use_pdftops)
-{
- $rc = system ("$pdftops_path $cmdopt $pdffile -");
-}
-else
-{
- if (defined $pdffile && $pdffile)
- {
- $rc = system ("$acroread_path $cmdopt < $pdffile")
- }
- else
- {
- $rc = system ("$acroread_path $cmdopt");
- }
-}
-if ($rc)
-{
- $ir = $rc & 127;
- $rc >>= 8;
- my $temp = (defined $use_pdftops) ? $pdftops_path : $acroread_path;
- warn ("ERROR: $temp exited with ", ($ir) ? "signal $ir, " : " exit code $rc", "\n");
- exit $rc;
-}
-unlink ($pdffile) if (defined $delete_input); # Delete the temp file if any
-exit 0;