commit: 944d80c615574d3b1e7a9e2e060640b1b3cc5ff4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 2 05:16:24 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 2 05:16:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944d80c6
net-print/cups: add 2.4.3 Bug: https://bugs.gentoo.org/907675 Signed-off-by: Sam James <sam <AT> gentoo.org> net-print/cups/Manifest | 1 + net-print/cups/{cups-9999.ebuild => cups-2.4.3.ebuild} | 12 ++++++------ net-print/cups/cups-9999.ebuild | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 1de361236b90..87da9833914f 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1 +1,2 @@ DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f +DIST cups-2.4.3-source.tar.gz 8134722 BLAKE2B 2512020a8f1a985b2e12025fdaddbb0e3595db7bc1586b1994501162cc418c07706f706be1441e8c21054e773f1e0ebc6e06aaff8f32a6637896df8cd4b60a5a SHA512 6136d3a7994963d1876684ab4fc59669061219b7d41391098dcc4622de5ee865c7829981fa5f59b31966e87c16914801fabdf58348fe013b553f0f1ff326706e diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-2.4.3.ebuild similarity index 98% copy from net-print/cups/cups-9999.ebuild copy to net-print/cups/cups-2.4.3.ebuild index 16da49335bcb..bd1cbc9533a8 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-2.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,11 +16,13 @@ if [[ ${PV} == *9999 ]] ; then [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} else SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"; - if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi fi +S="${WORKDIR}/${MY_P}" + DESCRIPTION="The Common Unix Printing System" HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"; @@ -60,7 +62,8 @@ DEPEND=" xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] ) " -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups ) @@ -70,15 +73,12 @@ PDEPEND=">=net-print/cups-filters-1.0.43" PATCHES=( "${FILESDIR}/${PN}-2.4.1-nostrip.patch" "${FILESDIR}/${PN}-2.4.1-user-AR.patch" - "${FILESDIR}/${PN}-2.4.2-no-fortify-override.patch" ) MULTILIB_CHOST_TOOLS=( /usr/bin/cups-config ) -S="${WORKDIR}/${MY_P}" - pkg_setup() { if use kernel_linux; then linux-info_pkg_setup diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 16da49335bcb..bd1cbc9533a8 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,11 +16,13 @@ if [[ ${PV} == *9999 ]] ; then [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} else SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"; - if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then + if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi fi +S="${WORKDIR}/${MY_P}" + DESCRIPTION="The Common Unix Printing System" HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"; @@ -60,7 +62,8 @@ DEPEND=" xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] ) " -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups ) @@ -70,15 +73,12 @@ PDEPEND=">=net-print/cups-filters-1.0.43" PATCHES=( "${FILESDIR}/${PN}-2.4.1-nostrip.patch" "${FILESDIR}/${PN}-2.4.1-user-AR.patch" - "${FILESDIR}/${PN}-2.4.2-no-fortify-override.patch" ) MULTILIB_CHOST_TOOLS=( /usr/bin/cups-config ) -S="${WORKDIR}/${MY_P}" - pkg_setup() { if use kernel_linux; then linux-info_pkg_setup
