From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-print/gutenprint/Manifest | 5 +- .../gutenprint/files/gutenprint-5.3.3-epson.patch | 54 ++++++++++++++ .../files/gutenprint-5.3.3-selphy-typo.patch | 22 ++++++ net-print/gutenprint/gutenprint-5.3.3-r1.ebuild | 84 +++++++++++++++++++++ net-print/gutenprint/gutenprint-5.3.3-r2.ebuild | 87 ++++++++++++++++++++++ net-print/gutenprint/gutenprint-5.3.3.ebuild | 84 --------------------- 6 files changed, 251 insertions(+), 85 deletions(-) create mode 100644 net-print/gutenprint/files/gutenprint-5.3.3-epson.patch create mode 100644 net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch create mode 100644 net-print/gutenprint/gutenprint-5.3.3-r1.ebuild create mode 100644 net-print/gutenprint/gutenprint-5.3.3-r2.ebuild delete mode 100644 net-print/gutenprint/gutenprint-5.3.3.ebuild (limited to 'net-print/gutenprint') diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest index 09b2a5e2de3b..29488c4ef0fe 100644 --- a/net-print/gutenprint/Manifest +++ b/net-print/gutenprint/Manifest @@ -1,4 +1,7 @@ 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 -EBUILD gutenprint-5.3.3.ebuild 1913 BLAKE2B 85d129bd65dfda9e1bcd982aeb153b2f96fe726d3e62cc1dc09ebc2d5004e63047f3fb51389afabbfc47bd5e7195ba661e5d162706b985e3e886a40eba5d19f4 SHA512 c0bc210b367f3c3db07100a2fdcdb909d670aeba595c1053b74af60f4e1146ee926a66bf833639395de3052f5ce0eee45eb1091441b7b915082719e39f14ddca +EBUILD gutenprint-5.3.3-r1.ebuild 1909 BLAKE2B b115e345785d59373c3cfc98c84c1fee3828cc6bc540c6e84b2941b0d35281c0d6e0174705fabf36cfaeac909d1598a2c8f0e784584f2dae707a1f7e19da4d5b SHA512 59cce5fa9265a04fdcf93856efbdc9193fc2611cc792c56782999e0609c99f218ef4081d516b37611c13cb53895e064aa21f7c21b3951e0bf0f0696210b41470 +EBUILD gutenprint-5.3.3-r2.ebuild 2024 BLAKE2B 830c4e05906a48e1fe389cc7c27214e61eb954e183f3296bd92d6345c7909d023fa221827625fbeba72310e2b02e6cce6ae8916aedc877019e2a5d40e496d6a1 SHA512 13401bc23d77b3c0c8569785c68aebfc41646c0c470683d3a6e9046f1417a09d35b0f06fcc8fd32ec6310cb93b712deb2749f753e9a0899967c8fe5bbf8ee330 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6 diff --git a/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch b/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch new file mode 100644 index 000000000000..28906470c7f6 --- /dev/null +++ b/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch @@ -0,0 +1,54 @@ +From: Robert Krawitz +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 @@ + + + +- ++ + + + +@@ -197,17 +197,18 @@ + + + +- +- ++ ++ ++ + +- ++ + +- ++ + + + + +- ++ + + + 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 new file mode 100644 index 000000000000..393fa718fd36 --- /dev/null +++ b/net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch @@ -0,0 +1,22 @@ +From: "Andreas B. Mundt" +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 new file mode 100644 index 000000000000..259480a4c3bc --- /dev/null +++ b/net-print/gutenprint/gutenprint-5.3.3-r1.ebuild @@ -0,0 +1,84 @@ +# 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-r2.ebuild b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild new file mode 100644 index 000000000000..2c2cceda92e9 --- /dev/null +++ b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild @@ -0,0 +1,87 @@ +# 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 + # From upstream, fixed in next version + "${FILESDIR}"/${P}-epson.patch + "${FILESDIR}"/${P}-selphy-typo.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 [[ -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 +} diff --git a/net-print/gutenprint/gutenprint-5.3.3.ebuild b/net-print/gutenprint/gutenprint-5.3.3.ebuild deleted file mode 100644 index 9c31813e9e53..000000000000 --- a/net-print/gutenprint/gutenprint-5.3.3.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? (