gentoo resync : 17.02.2020

6 files changed, 9 insertions, 152 deletions

diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 66a58cc5e193..8750376c9859 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,10 +1,6 @@
-AUX gutenprint-5.2.10-genppd.patch 1609 BLAKE2B 96770083d99c537d6b883a9e06a32219e2c94e4fdb88853825c3e2b38934807786c26423410dcc5a73fc38285b49f6bb01628e9ad48717a5cd18d7b2c66ddb45 SHA512 d582bafdf593a9e00d0f20aa5dd9043f52ca0c53bc713e979fd162c023acef937fd4a1706bcc808579ea97d122ede54f7a505537bb97b4fba5f68eeffced0a96
-AUX gutenprint-5.2.4-CFLAGS.patch 781 BLAKE2B a1b29ce970b66eb56d9429ba9116380cd80f9ba3cc332e43ab2e974b0978ae9c9537c32354f714940a43568ef4a8f6bd8119f02df0bf3e733f742960a23a7ec9 SHA512 2bdfbb024251f79d06b24a5fc72ec35c7c7f794df8eb4cb06983047e4339d77d3d9a7c1b2913e96ef4c28f82ba7970276e27e8fe7709aecfd20b27357995ea20
 AUX gutenprint-5.3.1-cflags.patch 659 BLAKE2B 90beb435d0b9a036f31e25f78afedca178b2b6d7bba3cf294ae45699e139d136bbc996dfca86db65d64a61ef004c343ba55f7e097e7304b1d6392efe0ed9cc31 SHA512 f7bac5fd0cff9c1e5b47c965c0304ffda47478241f715de4ada829a295ec54adf198046699bab866166f974c692ac525207f0541e7ba6959e18d63765128327d
-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
-EBUILD gutenprint-5.2.13.ebuild 2075 BLAKE2B a49cdb87fea621a80ffb299243e54fc3069bfe8b1ac654767c4e86de8d6e182a8a6a7341b3685f5268bbfcc93c1267ab189aade26fef5b77e76b19ced15d722f SHA512 64047f3c3d24de721524ef7bf8d7583ac6fe3ad68818dd6d69988acfaf4b6922f465acae2b884dd4ae8bf9085fcaa3014dbf18192417f0dda7fbd82470ed52c6
-EBUILD gutenprint-5.3.1.ebuild 2017 BLAKE2B 5ef9be0a6cdf02f4900de1b5f673e9e2f8e73ceaf4c418deee6b7d1abbf92db912a01abbd1eb849dc18e3cca6db716c20bb64f858c3684bfa954a87d9724db53 SHA512 72c6ac7c9729249b69279cfbd047a827b32677f51833e1e6d1316b069516cff26c6bbbaf9d6279e49264caf8b38636860e91e98bc358c279fc4a83aca1ee588c
-EBUILD gutenprint-5.3.3.ebuild 1851 BLAKE2B aa3c708ea3091b0246f54bdff5ab4f7d51d9ef920eda8601fc1a9ce911183035c5678ca76ec2fc8a0860518ead5ee4c092de4b43594c7fcd2a9cefdec98cf495 SHA512 2ec2b61bdcafd1e427b01f9d9903b1b69975d6ec32f70baf7b1fde697d155cbd8facac534a19b90c5da0103909d36ea9a796c4e1f3160b83ca30a4f0d9a1e100
+EBUILD gutenprint-5.3.1.ebuild 2086 BLAKE2B 05e7befb8217ee66c653029af49eb1600989d945bbb2d3782fe86cb5e3eeb06b6cf486da6060079198e9ab8b4fbf2f0430ae7e83cefd5c6a72a09dabaeb718b8 SHA512 092e6de1393a05ed0a9fc1c8d53b0307e7214e40c91abfd7d5346148ff23e1cebd0d491014103d72b4a48bbf50fcf6347cd6ee4cc649f4faebdfc03a1ad7eea2
+EBUILD gutenprint-5.3.3.ebuild 1919 BLAKE2B e5fb460976941ebaeed206f6df191ef2ddaa20ce42f58186efa787bec30e3eb004561b993cf696c574a9f33aaf8a508f07523f8ef0d23935d5c941d9b15a016c SHA512 893bbb9be07a62b2becc13231b9aa14465fd55b6e01984110a9a2bb94223a8cc76abbb2eac8c9541da034c514775e16a146267d3219b85b643760024af509eb2
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
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 46d8d78b9ead..000000000000
--- 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 e5d64e6042e0..000000000000
--- 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.000000000 -0600
-+++ gutenprint-5.2.3/configure.ac	2009-02-13 18:52:19.000000000 -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 b/net-print/gutenprint/gutenprint-5.2.13.ebuild
deleted file mode 100644
index 9a8df361c826..000000000000
--- a/net-print/gutenprint/gutenprint-5.2.13.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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.bz2"
-
-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 )"
-
-RDEPEND="
-	dev-lang/perl
-	readline? ( sys-libs/readline:0= )
-	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.4-CFLAGS.patch
-	"${FILESDIR}"/${PN}-5.2.10-genppd.patch # bug 382927
-)
-
-src_prepare() {
-	default
-
-	sed -i "s:m4local:m4extra:" Makefile.am || die
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
-		-i configure.ac || die
-
-	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 [[ ${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.1.ebuild b/net-print/gutenprint/gutenprint-5.3.1.ebuild
index 9dc5d00a9770..fcbf7a181fed 100644
--- a/net-print/gutenprint/gutenprint-5.3.1.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,11 +18,12 @@ KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"
 
+# gimp restriction: https://sourceforge.net/p/gimp-print/bugs/725/
 RDEPEND="
 	dev-lang/perl
 	readline? ( sys-libs/readline:0= )
 	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
+	gimp? ( <media-gfx/gimp-9999:2 x11-libs/gtk+:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )
 "
diff --git a/net-print/gutenprint/gutenprint-5.3.3.ebuild b/net-print/gutenprint/gutenprint-5.3.3.ebuild
index e27ce396ee4c..0d95e226f709 100644
--- a/net-print/gutenprint/gutenprint-5.3.3.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"
@@ -22,11 +22,12 @@ 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-2.2 x11-libs/gtk+:2 )
+	gimp? ( <media-gfx/gimp-9999:2 x11-libs/gtk+:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )
 "