gentoo resync : 16.04.2022

7 files changed, 6 insertions, 288 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 6852e65af8bd..b55ebbcfaf41 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index d13e1baaf504..ef626d60ac00 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,3 +1,3 @@
 DIST cups-bjnp-2.0.3.tar.gz 140764 BLAKE2B 4b8d3c823abd9057be91a246b463fd17a26362c7f11959989749e023d3bdb70a0cba444b86d5f2302f6da13324f7fb6f6c84970933919be67c023e03842b124a SHA512 57db45e85ca016b823563ed6a2aa07a32b9fb733fc01af0aa488bd2fc3cf02388ae1dfb63234ce80d64616dd97209153bb8c047ff549405e7bfdcca0c57fcd5c
-EBUILD cups-bjnp-2.0.3.ebuild 470 BLAKE2B a0f78204e4511f51e8b9079ca0f0817f961531e2c69ee35167129ac79ad96c538f6474bfba9982ad0f03906bf245d527fa4b9aee3ee3d0231ce249520eb4a23e SHA512 2e9e4f4d461d6d33d19545651358c9d7b681a70bf1dad2fd60198ada759e83c7b5134c4d4f5928e82fd75a09b3b3eeacc8762c2b3740abee1ee698426eddc19d
+EBUILD cups-bjnp-2.0.3.ebuild 462 BLAKE2B 7e1e3c96704ba9ecd7e092a926501fc423d9a4f9eb7eca1f1a46e2fd7e6a850a915b679ad5870fd28b33bbe3d37acd15c06255ab8c8bcf364d0201a162da11fd SHA512 0d1f3242b6eb32a45e7d104362874f6e2b32ebfe294d740dc83527a02933b0b56eed8385e4b5634fa14ce01fb587ca51972508ce0dab4a43e4fd02f76b04d0ce
 MISC metadata.xml 339 BLAKE2B d0942c8c3b9bb3615349d26240aa776927ed964e9c57c72416c433ef763b087bf14378c2b600d49999d142ad973712f20ee35b961f1610a46f29a7a418b977b3 SHA512 a37a0d7d0f2d04b542a8764231f7e8aab6b4251aa241e255ded335248a6442fd7b04ba253ac67924860dc8975f58d42ceae5b6daf6e0b40388c543e8c5208914
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
index 613046076382..3db19754eb94 100644
--- a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
+DESCRIPTION="CUPS backend for canon printers using proprietary USB over IP BJNP protocol"
 HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
 SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 8c12cdb0f4b6..b429bfec93fa 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,13 +2,9 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 AUX cups-browsed.init.d-r2 150 BLAKE2B c2098766ae08b38dead0a5bab2e30e1728ab93aa98e74edb6e20f8a885b62189f1368a041c4430ad24a1b92f0ae9cb317ac3390767db0a54ca1532022d44b0bd SHA512 c8a74ad0e5cfd3b565c12eeca50a55b7a6aa3ac92c689fc6632e2a6df5033e6fa7f16ce6c9c2cbf607ad4bd09453ab7d47448cdd04ad8c7e35f0e584b6d96d38
 AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd049fb4d16439405aa052134d828a5f9e5e3f79c02e6121d3c15c5374c62d370fe88ab4b761e849ab48ecc0bdde97d36c6fd98056d0dc195464c7648a2d SHA512 797e8530f5a44b4e4975399076e4e1c537da968a9ed8272baaf1e457a025bc22478045e780208b1607dbcd4eb31b91ac605781cf6eae47ffcdd748e34d126327
 DIST cups-filters-1.28.10.tar.xz 1503924 BLAKE2B b745ad9d35e375411d43acc8936a7be3197deda26d64c3fcdf792abf751452a83ab4e77b25336509a4d15a7db3dd142c94f3fd108f514d4956ac62f00310b263 SHA512 d6079633e10c3cfdc744491df03adc73d98dab0d9c0c6d3bc426b751545ae3434ea875e0841cec9358c19336347903f2832b5f801700b371cc1959e031bfa659
-DIST cups-filters-1.28.12.tar.xz 1505868 BLAKE2B a30f4772f89822dd110312ad2b2fb40ffcd093cee119df0660191938b374f4f99178c8e8801c8ff41bf01822a7e9c0e8aebd1d2f96159d377a40f7047da3177a SHA512 430e31815fe3b40b2d12c8db0a9e38060398d9ba3306af5562bc887dd99b06971765b98ba7227a0478d9f6616dd825149f138a2367b442ea0593708eb34140f6
-DIST cups-filters-1.28.13.tar.xz 1510932 BLAKE2B 20c3d07c59d37ddb7960967fd88ba6be5363dcf4cac6cbde03311507063c3da230ed2026ceedf35c731d6582ad845c4963455e5dad9233295785b4cde80f2278 SHA512 52d0f37cf80d9de09d73337e2e32dd4d23eb47f3f8470770e164dabe78220316a4d4b2aea5b466f21d1f504df73cf9eed21a518128ca3ce8048a40deedd9a765
 DIST cups-filters-1.28.14.tar.xz 1510944 BLAKE2B 653f68a39ed16d3a8298e5784aebebead224a0ee08071add702bb02fc987f3c4d454793531db262d9a44618f4fe29a7ce0144cfb8fe77634e9b7c222de21fe62 SHA512 a128858ac582da1322edad1cfca02bb6e5a077a4d3ca61d9e33e07b83e5015bb1a11571d30c66069f503031a6b55a82d7867cd171a7090fa729d894441f7abdd
-DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
+DIST cups-filters-1.28.15.tar.xz 1511452 BLAKE2B 2ed495f063197955456c07c6c06747093997afce53c15e19d081f2e53e6af9a76a41094d2356a1cd7533c3bb63bfb6257792b71ee14121a0daf5863b3b5cd76f SHA512 cc8d43bba6edb2b839f3be5fcbcdeb7633ed0f0f0c2737bcc6957cf95fb4ded8ee412358cc95fdbf289ae897dd0b7f32e689f02d191a8f15930eb4d2deefd74c
 EBUILD cups-filters-1.28.10-r3.ebuild 3598 BLAKE2B dc8badc2e658a945d2b966ec598aed3606400135166d4c29f78b003e9b30a33dcc34553b879edecd11432fc5e09b78e9c79c5b9639eccb9b15d76ab3be3e9822 SHA512 9c6dcfff16f688fe6ef9b0dfab9b58673feb6dfa14dee691c039c9d5d3179eb59be68d158845274eb16fe5949243067b7767825541b386b30b686a1d4248eb63
-EBUILD cups-filters-1.28.12-r1.ebuild 3186 BLAKE2B ad1e3a859b3cd9be508ad41631e15ddbeaff985a7065d88f2d32438a753a11f4dbec422a3637baeb32782c10ea612984da702b0cf326a2b5de2977fec71f4cff SHA512 6c5dd1e8d5e0493ed14c407c48413bcbf0c8d7d4c573f97e5a429b0a3eb7c92d0d6d2f83bd9b55eb4f7e30fb9c90a4fccd2ca3ff28152bd0b42e7ce45b23171a
-EBUILD cups-filters-1.28.13.ebuild 3186 BLAKE2B ad1e3a859b3cd9be508ad41631e15ddbeaff985a7065d88f2d32438a753a11f4dbec422a3637baeb32782c10ea612984da702b0cf326a2b5de2977fec71f4cff SHA512 6c5dd1e8d5e0493ed14c407c48413bcbf0c8d7d4c573f97e5a429b0a3eb7c92d0d6d2f83bd9b55eb4f7e30fb9c90a4fccd2ca3ff28152bd0b42e7ce45b23171a
 EBUILD cups-filters-1.28.14.ebuild 3186 BLAKE2B 8e44b6241b325916a5e93edacb24f0b27c58aeb46b3fadfefe0a9128710e908cb7c0fc39a06b7c2db29fa61f3f1a03fecac993117094d12bdb6d2090034d1ee4 SHA512 2094382142d6ff59369c2d6f1056d1871f31e0bf18819621d57d46009cc4a5479c7dd927dc032e28da1c96e478a63af80ae39b9a7783932a9c30a77c7b2febd8
-EBUILD cups-filters-1.28.7-r1.ebuild 3591 BLAKE2B f0c4077bef642d0d546493c6881813ac9f28a572bead335066d79f93f07dc432138158aa9fe6d6b470d1188facaae9e0d0c8dabd2864501f680d18540339b4fd SHA512 1fe087018344fc8e6fe55720edfbd8e1d6c2e70d9e55a3da80bdbe79b39a3bd789988bf58bcd70fea0e2381df893b5e1cb11cd5d06a1fc8c65e7d82a7286f1ec
+EBUILD cups-filters-1.28.15.ebuild 3186 BLAKE2B 8e44b6241b325916a5e93edacb24f0b27c58aeb46b3fadfefe0a9128710e908cb7c0fc39a06b7c2db29fa61f3f1a03fecac993117094d12bdb6d2090034d1ee4 SHA512 2094382142d6ff59369c2d6f1056d1871f31e0bf18819621d57d46009cc4a5479c7dd927dc032e28da1c96e478a63af80ae39b9a7783932a9c30a77c7b2febd8
 MISC metadata.xml 513 BLAKE2B b265a1645fe0da46a309086d9495564020ea15b7546237dc040589cba2e5d79540860301f8f72484081b726066414ad0414963b7c7c2ce3f08af898502c32521 SHA512 b9234992f05d59bffafb31f3d035e554389f250d8f3b951bb507e300f7cd3a6806406df60b1cae038ab330b3513934ec1250dcf0c9bfdba1bb033e6545727597
diff --git a/net-print/cups-filters/cups-filters-1.28.13.ebuild b/net-print/cups-filters/cups-filters-1.28.13.ebuild
deleted file mode 100644
index 23c8bbe49a7f..000000000000
--- a/net-print/cups-filters/cups-filters-1.28.13.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap:= )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_configure() {
-	# Bug #626800
-	append-cxxflags -std=c++11
-
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		--disable-static
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null || die
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}"/utils/cups-browsed.service
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely"
-		ewarn "necessary. net-print/foomatic-filters as a replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.28.12-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.15.ebuild
index 23c8bbe49a7f..58faa6fecaac 100644
--- a/net-print/cups-filters/cups-filters-1.28.12-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.15.ebuild
@@ -4,12 +4,11 @@
 EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
-
 inherit perl-module systemd flag-o-matic
 
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+SRC_URI="https://www.openprinting.org/download/${PN}/${P}.tar.xz"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 LICENSE="MIT GPL-2"
diff --git a/net-print/cups-filters/cups-filters-1.28.7-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.7-r1.ebuild
deleted file mode 100644
index cc91c4d8edeb..000000000000
--- a/net-print/cups-filters/cups-filters-1.28.7-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap:= )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		--disable-static
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null || die
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}