[gentoo-commits] repo/gentoo:master commit in: net-print/gutenprint/files/, net-print/gutenprint/

2020-11-10 Thread Pacho Ramos 
commit: c311a98c641c766e363be4e8b2dc96e87154bb44
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Nov 10 10:34:31 2020 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Nov 10 10:34:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c311a98c

net-print/gutenprint: Fix ROOT detection and canon/epson bugs

Fix ROOT detection with eapi7 and backport upstream fixes for some Canon and
Epson printers

Closes: https://bugs.gentoo.org/753815
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Pacho Ramos  gentoo.org>

 .../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-r2.ebuild| 87 ++
 3 files changed, 163 insertions(+)

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 000..28906470c7f
--- /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 000..393fa718fd3
--- /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-r2.ebuild 
b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
new file mode 100644
index 000..2c2cceda92e
--- /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
+

[gentoo-commits] repo/gentoo:master commit in: net-print/gutenprint/files/, net-print/gutenprint/

2020-02-14 Thread Miroslav Šulc 
commit: da1f73f4950fef67c95ed2ae557e32cae5aee3fb
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Feb 14 09:07:58 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb 14 09:09:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da1f73f4

net-print/gutenprint: removed old 5.2.13

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 net-print/gutenprint/Manifest  |  1 -
 .../files/gutenprint-5.2.10-genppd.patch   | 23 --
 .../gutenprint/files/gutenprint-5.2.4-CFLAGS.patch | 24 --
 net-print/gutenprint/gutenprint-5.2.13.ebuild  | 94 --
 4 files changed, 142 deletions(-)

diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index a086990e608..633fabf6b1b 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,3 +1,2 @@
-DIST gutenprint-5.2.13.tar.bz2 6995005 BLAKE2B 
7f9fe4bfee907fa6fe6de9bde674368701a221ea12459438053c231cc0e181601eb4fc700a95531135aecff2de6b2f41c2c78d89ad4445773efe0c11a8f45a35
 SHA512 
6a60a5e462bfd754ac4389b7e926715c06847c660df17e40d48cd57ece99a7ea6098bfd16c067cb27d8aef7ef705a2fdca9f05209d1f3ebf168b0ab16af4e36e
 DIST gutenprint-5.3.1.tar.xz 5153260 BLAKE2B 
03465158944a77af93bfaf13878f821f13e63eac1bd92f9e33ba003b49a4cc1864e0ddf2bd3d72cec9fd2759401f90304f62ec068c3b62b0c210c53d1265c0d1
 SHA512 
214d07e6f78130e95c8c9d98f0862921d26f74a7c302afabdb138b35ef5f02f52fa143411983867fd7015477c16ca18cf8001e6552c27cd4a12c08ff77e92986
 DIST gutenprint-5.3.3.tar.xz 5050624 BLAKE2B 
dbcf74169d0756d991bbdad7338a6e6f995f8eeedc2610677b327abee6aecc787d1cc35949f73c1d93ad274de7d467542b72a5fe0abf58fbc4ec6f21667cbad7
 SHA512 
d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6

diff --git a/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch 
b/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch
deleted file mode 100644
index 46d8d78b9ea..000
--- a/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN gutenprint-5.2.8.old/src/cups/Makefile.am 
gutenprint-5.2.8/src/cups/Makefile.am
 gutenprint-5.2.8.old/src/cups/Makefile.am  2012-06-14 14:03:53.011828220 
+0200
-+++ gutenprint-5.2.8/src/cups/Makefile.am  2012-06-14 14:04:57.672829331 
+0200
-@@ -98,16 +98,16 @@
- 
- cups_genppd_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
- cups_genppd_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = 
-DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) 
$(GUTENPRINT_LIBS) @LIBICONV@
-+cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) 
$(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
- cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- gutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
- gutenprint_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE 
-DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) 
$(GUTENPRINT_LIBS) @LIBICONV@
-+gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) 
$(CUPS_LIBS) @LIBICONV@
- gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = rastertoprinter.c 
i18n.c i18n.h
--rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) 
$(GUTENPRINT_LIBS) @LIBICONV@
-+rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) 
$(CUPS_LIBS) @LIBICONV@
- rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- ## Data

diff --git a/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch 
b/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch
deleted file mode 100644
index e5d64e6042e..000
--- a/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gutenprint-5.2.3-orig/configure.ac gutenprint-5.2.3/configure.ac
 gutenprint-5.2.3-orig/configure.ac 2008-12-20 18:04:24.0 -0600
-+++ gutenprint-5.2.3/configure.ac  2009-02-13 18:52:19.0 -0600
-@@ -631,20 +631,6 @@
-   if test x${USE_MAINTAINER_MODE} = xyes ; then
- STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow 
-Wredundant-decls],, [GNUCFLAGS])
-   fi
--  if test x$ENABLE_DEBUG = xyes ; then
--STP_ADD_COMPILER_ARG([-g])
--  else
--STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
--  fi
--else
--  if test x$ENABLE_DEBUG = xyes ; then
--STP_ADD_COMPILER_ARG([-g])
--  else
--STP_ADD_FIRST_COMPILER_ARG([-O])
--  fi
--fi
--if test x$ENABLE_PROFILE = xyes ; then
--  STP_ADD_COMPILER_ARG([-pg])
- fi
- AC_SUBST(GNUCFLAGS)
- 

diff --git a/net-print/gutenprint/gutenprint-5.2.13.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-print/gutenprint/files/, net-print/gutenprint/

2017-02-11 Thread Andreas Hüttel 
commit: 212cc58cd2da78cadcd8a5365daaa0055fb06a2e
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 11 20:29:44 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat Feb 11 20:29:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212cc58c

net-print/gutenprint: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-print/gutenprint/Manifest  |  1 -
 .../gutenprint/files/gutenprint-5.2.8-genppd.patch | 23 -
 ...rint-switch-from-ijs-config-to-pkg-config.patch | 60 -
 net-print/gutenprint/gutenprint-5.2.11.ebuild  | 97 --
 4 files changed, 181 deletions(-)

diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 0e4da5be11..573e02a219 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,3 +1,2 @@
 DIST gutenprint-5.2.10.tar.bz2 6241585 SHA256 
431f352b412dfb9809d126a85a37a1fcd1c1826275ace8cdcd4fd9a6ee360e59 SHA512 
bb71fd5c127748730dde01471b09907d500b72c35401abaf92c631d04156bacafd4b1a9baef61f48db6c4a622fd612a1e2834ed30207b5b178767ea9d9d5e1ac
 WHIRLPOOL 
4d809f99df3515fc878d3be5df4f48b66fc764eea1f62db15e75d6ca7326c24c6c228bd975575c20f3e7bc8398c1e492e1025784e64a4534f82ad89c7ba92990
-DIST gutenprint-5.2.11.tar.bz2 6570118 SHA256 
c1a34cd2e02527de4d2a9bf6c14732cb9aa11b333f771eb6043fdc974de24df9 SHA512 
f4010e489dd6763b19113abf1d55e84cea8d36b920d03dbe204dba30ab0d3fb3e3391e739cd1a56e2f63581c8ce4a856a7f747deb6e7b18d7e1f7a3d87901c60
 WHIRLPOOL 
0c6a0495d59ef720da74b610f6c26515ea5d0748e78f1b8eb4bb12277dca874b428ef17f9cf668f0449362900580ecefe35c2d1ebf6f6025519c886fc8a83b9e
 DIST gutenprint-5.2.12.tar.bz2 6898738 SHA256 
a42489fd7d6f2e4320811754bb80b0cd845db6632b52f819fbc2b4b75057341b SHA512 
38dd34ca1946a37d0bdaa7d69f65b11651097b6d7f2b451387afd72b32fc92c3670bf54b46df226ca7a64d78f50117a648e2d6194ebaf2e86627cb29fb0e958e
 WHIRLPOOL 
f69696ae56a27e87006f471a2e9404dad53bf800743f51ce0524735f61f92e4955eb81cf8d9cc8c7e398316d55f7bc6346e2e4a0330689fad790c9ffbd9f7050

diff --git a/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch 
b/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
deleted file mode 100644
index f61fb69ccf..00
--- a/net-print/gutenprint/files/gutenprint-5.2.8-genppd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN gutenprint-5.2.8.old/src/cups/Makefile.am 
gutenprint-5.2.8/src/cups/Makefile.am
 gutenprint-5.2.8.old/src/cups/Makefile.am  2012-06-14 14:03:53.011828220 
+0200
-+++ gutenprint-5.2.8/src/cups/Makefile.am  2012-06-14 14:04:57.672829331 
+0200
-@@ -98,16 +98,16 @@
- 
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = 
genppd.c i18n.c i18n.h
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = 
-DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
- cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = 
$(STATIC_LDOPTS)
- 
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = 
genppd.c i18n.c i18n.h
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = 
-DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) 
$(TRANSLATE_PPDS)
--gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = 
$(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = 
$(STATIC_LDOPTS)
- 
- 
rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES
 = rastertoprinter.c i18n.c i18n.h
--rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD
 = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD
 = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- 
rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS
 = $(STATIC_LDOPTS)
- 
- ## Data

diff --git 
a/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
 
b/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
deleted file mode 100644
index 99ef9b74c6..00
--- 
a/net-print/gutenprint/files/gutenprint-switch-from-ijs-config-to-pkg-config.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 233a909a77dd4c18d359bf32cd8ef99ed1b7b459 Mon Sep 17 00:00:00 2001
-From: speachy <>
-Date: Fri, 29 Jan 2016 12:41:21 +
-Subject: [PATCH] Apply patch from Brian Norris to switch from 'ijs-config' to
- 'pkg-config' for IJS support, as the former does not work for
- cross-compilation.
-