From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- net-print/cups/Manifest | 6 +- net-print/cups/cups-2.3.3-r2.ebuild | 2 +- net-print/cups/cups-2.3.3_p2.ebuild | 312 ++++++++++++++++++++++++++++++++++++ net-print/cups/cups-9999.ebuild | 88 ++++------ 4 files changed, 347 insertions(+), 61 deletions(-) create mode 100644 net-print/cups/cups-2.3.3_p2.ebuild (limited to 'net-print/cups') diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index c2e901261932..840c859eec4d 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -6,6 +6,8 @@ AUX cups-2.3.3-no-libtool.patch 912 BLAKE2B 14c19e8a215e2a56af387c6cf904a6a2a11d AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d -EBUILD cups-2.3.3-r2.ebuild 9670 BLAKE2B b9c176cbbd4f2a608a818112dc84be693941e84b454d1620fc430b6afc20799354a5b10df321c1bbb0c018378b5257db7f36fcb2003f2ef947416cd0710bc9c4 SHA512 46901ac1b2d5cb561ed99f2383d70dcfe8faadf674d08dfb54e0195e8f964210ae3533985407fb56153f9fa279b86273f141eb55468bff956de10d47e0380df8 -EBUILD cups-9999.ebuild 9594 BLAKE2B e7f43aeed561ba4eae3938b3739845286d3ff80ddd19140361d39a80992697eaaad2c5d845970a6d9c53124064ad986f3e5fe4d9a7e2f88ca949ebb46dc8719d SHA512 4f9a3bd84f529de97f25c3c400148ad28a17517cbed402aa1f1a1107c9321f9071eef04dd9c6e173d88f64b44e0c9a840b54667a43e214505ee9557de2c0762a +DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117 +EBUILD cups-2.3.3-r2.ebuild 9671 BLAKE2B 8dd97f894fa876cd2ca22162538bad495638cdf89d8eb3ee35698278c0a2be8e63f2e9db9d49b1fff102ebf75b6239f64d64382e735bb63b9479fdfff1a15bb6 SHA512 a2b510ea0f1dc4f59f175ac6103c07eb062e6a7691238086485d085b6ddd92d157149d5da3aed7dbd3beb3a14f49b2d5edddf188c9be01278201d5139259ca1f +EBUILD cups-2.3.3_p2.ebuild 9042 BLAKE2B 38fe9073bbd19e5969790fdb234e84bb0e1d244672ab11fdb5ef4afde8c0eda0e3e40fe6eff311d0555c5cb8e447ce09044ee1b62e8febd8d8153f05cf56282c SHA512 221f57ce9983a77682b5397fa93e2aa4641a85bfb1c8d146ae3303ffef2c7cc1e4bc6c3aa8235ebf23eeb0ecb4ee68972889dd2626c08d73275d06289216f35e +EBUILD cups-9999.ebuild 8975 BLAKE2B 29e80afc33d89883b8c8b2ec5a13bdb9207f687b63ff841128328db21c249e3921f45ec5d16958f680c5aaaad99d07fcf344ed989a95da6c1bc6f8b9536e2ca6 SHA512 44c0fe18abeeaa174c62aa505c4dbca776581edb52a1e017693b5ba35f56eaebc9139146afe91353b56a523c0ee83f5fe221edce828836c9316b26e2c2b61a21 MISC metadata.xml 527 BLAKE2B ec1e13892e9264410a238328b21d77c2aa686674e3427d4bf04afedcf3e9d14927060eca98e8cfa1e1557c707a50efec3c3d5532e83470cba59acd912116717d SHA512 8db4eeb1ce4597679bf88c5657b7bfde4f8f8a40814c81624103172c22b65e1fb3354c183e7de1b37ba72621e29397d3510458048f78f4a4c99e7ddb669e7adb diff --git a/net-print/cups/cups-2.3.3-r2.ebuild b/net-print/cups/cups-2.3.3-r2.ebuild index a367e9deed5b..6b09cae365af 100644 --- a/net-print/cups/cups-2.3.3-r2.ebuild +++ b/net-print/cups/cups-2.3.3-r2.ebuild @@ -19,7 +19,7 @@ else #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" fi fi diff --git a/net-print/cups/cups-2.3.3_p2.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild new file mode 100644 index 000000000000..f0415242e5aa --- /dev/null +++ b/net-print/cups/cups-2.3.3_p2.ebuild @@ -0,0 +1,312 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs + +MY_PV="${PV/_beta/b}" +MY_PV="${MY_PV/_rc/rc}" +MY_PV="${MY_PV/_p/op}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 +# EGIT_REPO_URI="https://github.com/apple/cups.git" + EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git" + [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} +else +# SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" + SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz" + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + fi +fi + +DESCRIPTION="The Common Unix Printing System" +HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" + +REQUIRED_USE="usb? ( threads )" +# upstream includes an interactive test which is a nono for gentoo +RESTRICT="test" + +BDEPEND=" + acct-group/lp + acct-group/lpadmin + virtual/pkgconfig +" +DEPEND=" + app-text/libpaper + sys-libs/zlib + acl? ( + kernel_linux? ( + sys-apps/acl + sys-apps/attr + ) + ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd ) + usb? ( virtual/libusb:1 ) + X? ( x11-misc/xdg-utils ) + xinetd? ( sys-apps/xinetd ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) +" +RDEPEND="${DEPEND} + acct-group/lp + acct-group/lpadmin + selinux? ( sec-policy/selinux-cups ) +" +PDEPEND=">=net-print/cups-filters-1.0.43" + +PATCHES=( + "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" + "${FILESDIR}/${PN}-1.4.4-nostrip.patch" + "${FILESDIR}/${PN}-2.3.3-user-AR.patch" +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/cups-config +) + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + #enewgroup lp -> acct-group/lp + # user lp already provided by baselayout + #enewuser lp -1 -1 -1 lp + #enewgroup lpadmin 106 + + 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; this should now work in most cases (bug 501122) + if use usb; then + if linux_chkconfig_present USB_PRINTER; then + elog "Your USB printers will be managed via libusb. In case you run into problems, " + elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" + elog "usblp kernel module." + elog "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() { + default + + # Remove ".SILENT" rule for verbose output (bug 524338). + sed 's#^.SILENT:##g' -i Makedefs.in || die + + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i install-sh || die + + # Do not add -Werror even for live ebuilds + sed '/WARNING_OPTIONS/s@-Werror@@' \ + -i config-scripts/cups-compiler.m4 || die + + AT_M4DIR=config-scripts eaclocal + eautoconf + + # custom Makefiles + multilib_copy_sources +} + +multilib_src_configure() { + export DSOFLAGS="${LDFLAGS}" + + einfo LINGUAS=\"${LINGUAS}\" + + # explicitly specify compiler wrt bug 524340 + # + # need to override KRB5CONFIG for proper flags + # https://github.com/apple/cups/issues/4423 + local myeconfargs=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config + --libdir="${EPREFIX}"/usr/$(get_libdir) + --localstatedir="${EPREFIX}"/var + --with-exe-file-perm=755 + --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 + --with-xinetd="${EPREFIX}"/etc/xinetd.d + $(multilib_native_use_enable acl) + $(use_enable dbus) + $(use_enable debug) + $(use_enable debug debug-guards) + $(use_enable debug debug-printfs) + $(use_enable kerberos gssapi) + $(multilib_native_use_enable pam) + $(use_enable static-libs static) + $(use_enable threads) + $(use_enable ssl gnutls) + $(use_enable systemd) + $(multilib_native_use_enable usb libusb) + $(use_enable zeroconf avahi) + --disable-dnssd + $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) + ) + + if tc-is-static-only; then + myeconfargs+=( + --disable-shared + ) + fi + + econf "${myeconfargs[@]}" + + # 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 + + # additional path corrections needed for prefix, see bug 597728 + sed \ + -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \ + -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \ + -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \ + -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \ + -i Makedefs || die +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + emake libs + fi +} + +multilib_src_test() { + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake BUILDROOT="${D}" install + else + emake BUILDROOT="${D}" install-libs install-headers + dobin cups-config + fi +} + +multilib_src_install_all() { + dodoc {CHANGES,CREDITS,README}.md + + # move the default config file to docs + dodoc "${ED}"/etc/cups/cupsd.conf.default + rm "${ED}"/etc/cups/cupsd.conf.default || die + + # clean out cups init scripts + rm -r "${ED}"/etc/{init.d/cups,rc*} || die + + # install our init script + local neededservices=( + $(usex zeroconf avahi-daemon '') + $(usex dbus dbus '') + ) + [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" + cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die + sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die + doinitd "${T}"/cupsd + + if use pam ; then + rm "${ED}"/etc/pam.d/${PN} || die + pamd_mimic_system cups auth account + fi + + 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 + else + # always configure with --with-xinetd= and clean up later, + # bug #525604 + rm -r "${ED}"/etc/xinetd.d || die + fi + + keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ + /var/cache/cups /var/log/cups /var/spool/cups/tmp + + keepdir /etc/cups/{interfaces,ppd,ssl} + + if ! use X ; then + rm -r "${ED}"/usr/share/applications || die + fi + + # create /etc/cups/client.conf, bug #196967 and #266678 + echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf + + # the following file is now provided by cups-filters: + rm -r "${ED}"/usr/share/cups/banners || die + + # the following are created by the init script + rm -r "${ED}"/var/cache/cups || die + rm -r "${ED}"/run || die +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + # Update desktop file database and gtk icon cache (bug 370059) + xdg_pkg_postinst + + local v + + for v in ${REPLACING_VERSIONS}; do + if ! ver_test ${v} -ge 2.2.2-r2 ; then + ewarn "The cupsd init script switched to using pidfiles. Shutting down" + ewarn "cupsd will fail the next time. To fix this, please run once as root" + ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" + break + fi + done + + for v in ${REPLACING_VERSIONS}; do + elog + elog "For information about installing a printer and general cups setup" + elog "take a look at: https://wiki.gentoo.org/wiki/Printing" + break + done +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug 370059) + xdg_pkg_postrm +} diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 7fecb1e8f2ee..22caf91ef2bf 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -5,32 +5,41 @@ EAPI=7 inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs -MY_PV="${PV/_rc/rc}" -MY_PV="${MY_PV/_beta/b}" +MY_PV="${PV/_beta/b}" +MY_PV="${MY_PV/_rc/rc}" +MY_PV="${MY_PV/_p/op}" MY_P="${PN}-${MY_PV}" if [[ ${PV} == *9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/apple/cups.git" - if [[ ${PV} != 9999 ]]; then - EGIT_BRANCH=branch-${PV/.9999} - fi +# EGIT_REPO_URI="https://github.com/apple/cups.git" + EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git" + [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} else - #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" +# SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" + SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz" if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" fi fi DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="https://www.cups.org/" +HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" LICENSE="Apache-2.0" SLOT="0" -IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" +IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" + +REQUIRED_USE="usb? ( threads )" +# upstream includes an interactive test which is a nono for gentoo +RESTRICT="test" -CDEPEND=" +BDEPEND=" + acct-group/lp + acct-group/lpadmin + virtual/pkgconfig +" +DEPEND=" app-text/libpaper sys-libs/zlib acl? ( @@ -41,7 +50,6 @@ CDEPEND=" ) dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - !lprng-compat? ( !net-print/lprng ) pam? ( sys-libs/pam ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) systemd? ( sys-apps/systemd ) @@ -50,35 +58,16 @@ CDEPEND=" xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) " - -DEPEND="${CDEPEND}" -BDEPEND=" - acct-group/lp - acct-group/lpadmin - virtual/pkgconfig -" - -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups ) " - PDEPEND=">=net-print/cups-filters-1.0.43" -REQUIRED_USE=" - usb? ( threads ) -" - -# upstream includes an interactive test which is a nono for gentoo -RESTRICT="test" - -# systemd-socket.patch from Fedora PATCHES=( "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" - "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" ) MULTILIB_CHOST_TOOLS=( @@ -129,10 +118,10 @@ src_prepare() { default # Remove ".SILENT" rule for verbose output (bug 524338). - sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed" + sed 's#^.SILENT:##g' -i Makedefs.in || die # Fix install-sh, posix sh does not have 'function'. - sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + sed 's#function gzipcp#gzipcp()#g' -i install-sh || die # Do not add -Werror even for live ebuilds sed '/WARNING_OPTIONS/s@-Werror@@' \ @@ -234,10 +223,10 @@ multilib_src_install_all() { # move the default config file to docs dodoc "${ED}"/etc/cups/cupsd.conf.default - rm -f "${ED}"/etc/cups/cupsd.conf.default + rm "${ED}"/etc/cups/cupsd.conf.default || die # clean out cups init scripts - rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} + rm -r "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} || die # install our init script local neededservices=( @@ -246,9 +235,7 @@ multilib_src_install_all() { ) [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die - sed -i \ - -e "s/@neededservices@/${neededservices}/" \ - "${T}"/cupsd || die + sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die doinitd "${T}"/cupsd if use pam; then @@ -257,8 +244,7 @@ multilib_src_install_all() { if use xinetd ; then # correct path - sed -i \ - -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ + 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 || \ @@ -268,11 +254,11 @@ multilib_src_install_all() { else # always configure with --with-xinetd= and clean up later, # bug #525604 - rm -rf "${ED}"/etc/xinetd.d + rm -r "${ED}"/etc/xinetd.d || die fi keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ - /var/log/cups /var/spool/cups/tmp + /var/cache/cups /var/log/cups /var/spool/cups/tmp keepdir /etc/cups/{interfaces,ppd,ssl} @@ -289,17 +275,6 @@ multilib_src_install_all() { # the following are created by the init script rm -r "${ED}"/var/cache/cups || die rm -r "${ED}"/run || 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() { @@ -314,20 +289,17 @@ pkg_postinst() { for v in ${REPLACING_VERSIONS}; do if ! ver_test ${v} -ge 2.2.2-r2 ; then - echo ewarn "The cupsd init script switched to using pidfiles. Shutting down" ewarn "cupsd will fail the next time. To fix this, please run once as root" ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" - echo break fi done for v in ${REPLACING_VERSIONS}; do - echo + elog elog "For information about installing a printer and general cups setup" elog "take a look at: https://wiki.gentoo.org/wiki/Printing" - echo break done } -- cgit v1.2.3