From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4863138239 for ; Tue, 20 Apr 2021 12:59:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 042C0E0845; Tue, 20 Apr 2021 12:59:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE1CFE0845 for ; Tue, 20 Apr 2021 12:59:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6E46340E93 for ; Tue, 20 Apr 2021 12:59:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5678B64B for ; Tue, 20 Apr 2021 12:59:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1618923525.5cf2b984b09cbe3351230224c3ac6d51537a3e96.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/Manifest net-print/cups/cups-2.3.3_p2.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5cf2b984b09cbe3351230224c3ac6d51537a3e96 X-VCS-Branch: master Date: Tue, 20 Apr 2021 12:59:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81f36fd1-0303-4a64-be5b-62d354b6b991 X-Archives-Hash: e38c0702858a9a9ecaa6dbd758934cca commit: 5cf2b984b09cbe3351230224c3ac6d51537a3e96 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 12 14:55:05 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 20 12:58:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf2b984 net-print/cups: 2.3.3_p2 version bump Closes: https://bugs.gentoo.org/767778 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> net-print/cups/Manifest | 1 + .../{cups-9999.ebuild => cups-2.3.3_p2.ebuild} | 83 +++++++++------------- net-print/cups/cups-9999.ebuild | 80 +++++++++------------ 3 files changed, 67 insertions(+), 97 deletions(-) diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 9a7bb604d84..f26affcecc5 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1 +1,2 @@ DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d +DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117 diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild similarity index 87% copy from net-print/cups/cups-9999.ebuild copy to net-print/cups/cups-2.3.3_p2.ebuild index 7fecb1e8f2e..67f0a9dd314 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-2.3.3_p2.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" -CDEPEND=" +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? ( @@ -50,35 +59,17 @@ 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" + "${FILESDIR}/${PN}-2.3.3-user-AR.patch" ) MULTILIB_CHOST_TOOLS=( @@ -129,10 +120,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 +225,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 +237,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 +246,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 +256,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} @@ -292,10 +280,10 @@ multilib_src_install_all() { # 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* + rm -v "${ED}"/usr/bin/{lp*,cancel} || die + rm -v "${ED}"/usr/sbin/lp* || die + rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die + rm -v "${ED}"/usr/share/man/man8/lp* || die 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." @@ -314,20 +302,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 } diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 7fecb1e8f2e..c221987cdd5 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" -CDEPEND=" +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? ( @@ -50,35 +59,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 +119,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 +224,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 +236,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 +245,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,7 +255,7 @@ 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} \ @@ -292,10 +279,10 @@ multilib_src_install_all() { # 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* + rm -v "${ED}"/usr/bin/{lp*,cancel} || die + rm -v "${ED}"/usr/sbin/lp* || die + rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die + rm -v "${ED}"/usr/share/man/man8/lp* || die 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." @@ -314,20 +301,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 }