gentoo resync : 20.03.2022

5 files changed, 0 insertions, 259 deletions

diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index f3b89b187f8e..22797d4f0da3 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,9 +1,4 @@
 AUX gutenprint-5.3.1-cflags.patch 659 BLAKE2B 90beb435d0b9a036f31e25f78afedca178b2b6d7bba3cf294ae45699e139d136bbc996dfca86db65d64a61ef004c343ba55f7e097e7304b1d6392efe0ed9cc31 SHA512 f7bac5fd0cff9c1e5b47c965c0304ffda47478241f715de4ada829a295ec54adf198046699bab866166f974c692ac525207f0541e7ba6959e18d63765128327d
-AUX gutenprint-5.3.3-epson.patch 5637 BLAKE2B 7cb05d40e23ca30bd59b0863318d22c9115c4462b960b154a0da61f66f08c4abf31606c762f5b35e4a3a55218e9929c72980d4855f1cfa06b08fc392be81984a SHA512 0cccd8eb17eb66524d79a867624f0822c365268cba9b15d4f71b9d3b8720663e590c24f322f1731fd21bdb863ab15464a980a5e0c76313050941f36c92d9b66b
-AUX gutenprint-5.3.3-selphy-typo.patch 1077 BLAKE2B c8ad7ebb032ac8320b11d88df6cba79dffe68c910f293116d2f04333d53b17fef7baaba5a0d453c6c087ee9f0a6d1150484280c10ac6ae3a9f6d54905d7884ee SHA512 0376b689b3c6d7d630937f56f19efb0d8d9e7a9726af39794106205aeaca00621ec10a56a28fcc25dadf106e66c7956245ee53709cb1cd39f120716dbc6927d1
-DIST gutenprint-5.3.3.tar.xz 5050624 BLAKE2B dbcf74169d0756d991bbdad7338a6e6f995f8eeedc2610677b327abee6aecc787d1cc35949f73c1d93ad274de7d467542b72a5fe0abf58fbc4ec6f21667cbad7 SHA512 d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
 DIST gutenprint-5.3.4.tar.xz 5341824 BLAKE2B 134e59c7dbf9c0ba95b91c717f1e6841f35520b55105feb1ba40b82785c825b8e2a2429990e78186a1455e5c6de9880f911438d514c53c56d05575dd4e2d68a4 SHA512 63de0b62edbe255a7efaaeab1dcd22577b7b46d7e0e48441b79977f19e76bf3862e4e8e18c55dd1f2e7392d555f9e8ee875ea53b90c689852d2343491a8fbcc8
-EBUILD gutenprint-5.3.3-r1.ebuild 1910 BLAKE2B e5ddb8a60c036a007ebfa872d497515c317a07a3d3f75fe1f679d87b300b653ce9402e0b374da8f34f94f25cc4f7a9617e4847f1ac064db01ae8feceb1592f5c SHA512 9b2e86460a131a4ddf413626b6f2429e67284f3b9babaf5bcbff91f6bf94b187301c7de6d4b966dc33284f0e2f4c2d4e1eded2cbef7210abb6429b9fd0eedf8f
-EBUILD gutenprint-5.3.3-r3.ebuild 2087 BLAKE2B 8f70415b61e037151493ea368a35769e73e01840e1f587c065544e9e0e3861c710bb5d0426215bb28cacca6de13545e772ca9e351b6eb8e552309f45d4d4a181 SHA512 b12a22d351d7c8e3b0798920a7aeaff71639554ccdbc840e2e47f6069a0e197ca76fce3f51233ad420668f469bdcad9270ab12525844f0123b554f95541b1005
 EBUILD gutenprint-5.3.4-r2.ebuild 1903 BLAKE2B 1365bb8955c09d29a2adf9e57f6c8cd7bcb2fe9d2efb7bb10b9b8637f21a3e0b48a02f431bf63d7ead61df88b4e49e73b47bb562b9afcb6c8a55d701829bc509 SHA512 3aa6f2a9ba1b48680ff855319b2f43c5ad0b844218c641b8c23ccff8b7526eab521fcbb56ffa8ebac665949581e037e4a23ea00e6801d4f3290de261a67301a4
 MISC metadata.xml 340 BLAKE2B 91ab730b8ea24dd11ef59949916cda1cb2a0b2a8b77144ef2a9287eb4145e5c38f98a0572381eb6f75a14dd73ff4ac4d1aaf495432ca4402ab75c6f3b7519e99 SHA512 f8fbc6a3db9143f2bd4094ae5a0a6e7ec0bba5e06c90082faed08d5c76e89972422751c5217e1dc118cd10eaee99ffd02249eba4b5ec885fe9e669e75cfdd595
diff --git a/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch b/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch
deleted file mode 100644
index 28906470c7f6..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Robert Krawitz <rlk@alum.mit.edu>
-Date: Sun, 16 Feb 2020 11:21:23 -0500
-Subject: Updates for Epson Stylus Office printers
-
-Add duplex support for the following printers:
-     Epson Stylus Office BX525WD
-     Epson Stylus Office BX535WD
-     Epson Stylus Office BX62F5WD
-     Epson Stylus Office BX635FWD
-     Epson Stylus Office TX620FWD
-
-Origin: upstream
-Closes: #951410
----
- src/xml/printers/escp2.xml | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/xml/printers/escp2.xml b/src/xml/printers/escp2.xml
-index 28716a4..79f5a70 100644
---- a/src/xml/printers/escp2.xml
-+++ b/src/xml/printers/escp2.xml
-@@ -189,7 +189,7 @@
-       <printer translate="name" name="Epson Stylus Office B30" driver="escp2-of-b30" manufacturer="Epson" model="85" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office B33" driver="escp2-of-b33" manufacturer="Epson" model="85" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office B40W" driver="escp2-of-b40w" manufacturer="Epson" model="92" parameters="standard_params" />
--      <printer translate="name" name="Epson Stylus Office B42WD" driver="escp2-of-b42wd" manufacturer="Epson" model="92" parameters="standard_params" />
-+      <printer translate="name" name="Epson Stylus Office B42WD" driver="escp2-of-b42wd" manufacturer="Epson" model="118" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office B1100" driver="escp2-of-b1100" manufacturer="Epson" model="99" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office T30" driver="escp2-of-t30" manufacturer="Epson" model="85" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office T33" driver="escp2-of-t33" manufacturer="Epson" model="85" parameters="standard_params" />
-@@ -197,17 +197,18 @@
-       <printer translate="name" name="Epson Stylus Office T1100" driver="escp2-of-t1100" manufacturer="Epson" model="99" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office T1110" driver="escp2-of-t1110" manufacturer="Epson" model="99" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" />
--      <printer translate="name" name="Epson Stylus Office BX525WD" driver="escp2-of-bx525wd" manufacturer="Epson" model="92" parameters="standard_params" />
--      <printer translate="name" name="Epson Stylus Office BX535WD" driver="escp2-of-bx535wd" manufacturer="Epson" model="92" parameters="standard_params" />
-+      <printer translate="name" name="Epson Stylus Office BX305F" driver="escp2-of-bx305f" manufacturer="Epson" model="94" parameters="standard_params" />
-+      <printer translate="name" name="Epson Stylus Office BX525WD" driver="escp2-of-bx525wd" manufacturer="Epson" model="118" parameters="standard_params" />
-+      <printer translate="name" name="Epson Stylus Office BX535WD" driver="escp2-of-bx535wd" manufacturer="Epson" model="118" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
--      <printer translate="name" name="Epson Stylus Office BX625FWD" driver="escp2-of-bx625fwd" manufacturer="Epson" model="92" parameters="standard_params" />
-+      <printer translate="name" name="Epson Stylus Office BX625FWD" driver="escp2-of-bx625fwd" manufacturer="Epson" model="118" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office BX630FW" driver="escp2-of-bx630fw" manufacturer="Epson" model="92" parameters="standard_params" />
--      <printer translate="name" name="Epson Stylus Office BX635FWD" driver="escp2-of-bx635fwd" manufacturer="Epson" model="92" parameters="standard_params" />
-+      <printer translate="name" name="Epson Stylus Office BX635FWD" driver="escp2-of-bx635fwd" manufacturer="Epson" model="118" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office SX620FW" driver="escp2-of-sx620fw" manufacturer="Epson" model="92" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
--      <printer translate="name" name="Epson Stylus Office TX620FWD" driver="escp2-of-tx620fwd" manufacturer="Epson" model="92" parameters="standard_params" />
-+      <printer translate="name" name="Epson Stylus Office TX620FWD" driver="escp2-of-tx620fwd" manufacturer="Epson" model="118" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Photo 700" deviceid="MFG:EPSON;MDL:Stylus Photo 700;DES:EPSON Stylus Photo 700;CMD:ESCPL2,BDC;" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
-       <printer translate="name" name="Epson Stylus Photo EX" deviceid="MFG:EPSON;MDL:Stylus Photo EX;CMD:ESCPL2,BDC;" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
diff --git a/net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch b/net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch
deleted file mode 100644
index 393fa718fd36..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: "Andreas B. Mundt" <andi@debian.org>
-Date: Mon, 4 Nov 2019 18:40:58 +0100
-Subject: Fix 'selpyh' for 'selphy' typo for Canon CP300
-
-Closes: #943964
----
- src/cups/backend_canonselphy.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cups/backend_canonselphy.c b/src/cups/backend_canonselphy.c
-index 978df0d..3ef0c31 100644
---- a/src/cups/backend_canonselphy.c
-+++ b/src/cups/backend_canonselphy.c
-@@ -1165,7 +1165,7 @@ struct dyesub_backend canonselphy_backend = {
- 		{ USB_VID_CANON, USB_PID_CANON_CP100, P_CP_XXX, NULL, "canon-cp100"},
- 		{ USB_VID_CANON, USB_PID_CANON_CP200, P_CP_XXX, NULL, "canon-cp200"},
- 		{ USB_VID_CANON, USB_PID_CANON_CP220, P_CP_XXX, NULL, "canon-cp220"},
--		{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "selpyhcp300"},
-+		{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "selphycp300"},
- 		{ USB_VID_CANON, USB_PID_CANON_CP330, P_CP_XXX, NULL, "canon-cp330"},
- 		{ USB_VID_CANON, USB_PID_CANON_CP400, P_CP_XXX, NULL, "canon-cp400"},
- 		{ USB_VID_CANON, USB_PID_CANON_CP500, P_CP_XXX, NULL, "canon-cp500"},
diff --git a/net-print/gutenprint/gutenprint-5.3.3-r1.ebuild b/net-print/gutenprint/gutenprint-5.3.3-r1.ebuild
deleted file mode 100644
index 25a045d2441d..000000000000
--- a/net-print/gutenprint/gutenprint-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Ghostscript and cups printer drivers"
-HOMEPAGE="http://gutenprint.sourceforge.net"
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-IUSE="cups gimp gtk nls readline ppds static-libs"
-REQUIRED_USE="gimp? ( gtk )"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# gimp restriction: https://sourceforge.net/p/gimp-print/bugs/725/
-CDEPEND="
-	dev-lang/perl
-	readline? ( sys-libs/readline:0= )
-	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.1-cflags.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		--enable-test
-		--disable-translated-cups-ppds
-		$(use_enable gtk libgutenprintui2)
-		$(use_with gimp gimp2)
-		$(use_with gimp gimp2-as-gutenprint)
-		$(use_with cups)
-		$(use_enable nls)
-		$(use_with readline)
-		$(use_enable static-libs static)
-	)
-
-	if use cups && use ppds; then
-		myeconfargs+=( --enable-cups-ppds --enable-cups-level3-ppds )
-	else
-		myeconfargs+=( --disable-cups-ppds )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	dodoc doc/FAQ.html
-	dodoc -r doc/gutenprintui2/html
-	rm -r "${ED}"/usr/share/gutenprint/doc || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / ]] && [[ -x /usr/sbin/cups-genppdupdate ]]; then
-		elog "Updating installed printer ppd files"
-		elog $(/usr/sbin/cups-genppdupdate)
-	else
-		elog "You need to update installed ppds manually using cups-genppdupdate"
-	fi
-}
diff --git a/net-print/gutenprint/gutenprint-5.3.3-r3.ebuild b/net-print/gutenprint/gutenprint-5.3.3-r3.ebuild
deleted file mode 100644
index 903144e2d4c4..000000000000
--- a/net-print/gutenprint/gutenprint-5.3.3-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Ghostscript and cups printer drivers"
-HOMEPAGE="http://gutenprint.sourceforge.net"
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-IUSE="cups gimp gtk nls readline ppds static-libs"
-REQUIRED_USE="gimp? ( gtk )"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-# gimp restriction: https://sourceforge.net/p/gimp-print/bugs/725/
-CDEPEND="
-	dev-lang/perl
-	readline? ( sys-libs/readline:0= )
-	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.1-cflags.patch
-	# From upstream, fixed in next version
-	"${FILESDIR}"/${P}-epson.patch
-	"${FILESDIR}"/${P}-selphy-typo.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for cflags patch
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-test
-		--disable-translated-cups-ppds
-		$(use_enable gtk libgutenprintui2)
-		$(use_with gimp gimp2)
-		$(use_with gimp gimp2-as-gutenprint)
-		$(use_with cups)
-		$(use_enable nls)
-		$(use_with readline)
-		$(use_enable static-libs static)
-	)
-
-	if use cups && use ppds; then
-		myeconfargs+=( --enable-cups-ppds --enable-cups-level3-ppds )
-	else
-		myeconfargs+=( --disable-cups-ppds )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	dodoc doc/FAQ.html
-	dodoc -r doc/gutenprintui2/html
-	rm -r "${ED}"/usr/share/gutenprint/doc || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] && [[ -x /usr/sbin/cups-genppdupdate ]]; then
-		elog "Updating installed printer ppd files"
-		elog $(/usr/sbin/cups-genppdupdate)
-	else
-		elog "You need to update installed ppds manually using cups-genppdupdate"
-	fi
-}