gentoo resync : 31.12.2018

5 files changed, 30 insertions, 195 deletions

diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 827cfd2defab..e8b805c49c83 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,11 +1,8 @@
 AUX gutenprint-5.2.10-genppd.patch 1609 BLAKE2B 96770083d99c537d6b883a9e06a32219e2c94e4fdb88853825c3e2b38934807786c26423410dcc5a73fc38285b49f6bb01628e9ad48717a5cd18d7b2c66ddb45 SHA512 d582bafdf593a9e00d0f20aa5dd9043f52ca0c53bc713e979fd162c023acef937fd4a1706bcc808579ea97d122ede54f7a505537bb97b4fba5f68eeffced0a96
 AUX gutenprint-5.2.4-CFLAGS.patch 781 BLAKE2B a1b29ce970b66eb56d9429ba9116380cd80f9ba3cc332e43ab2e974b0978ae9c9537c32354f714940a43568ef4a8f6bd8119f02df0bf3e733f742960a23a7ec9 SHA512 2bdfbb024251f79d06b24a5fc72ec35c7c7f794df8eb4cb06983047e4339d77d3d9a7c1b2913e96ef4c28f82ba7970276e27e8fe7709aecfd20b27357995ea20
-DIST gutenprint-5.2.12.tar.bz2 6898738 BLAKE2B 753fee4b2fad6fdcb3ed5c6bfd8bebf4c1459c86a8e2e6bd5922b367b887b0100b9f3c8562283f7b850fd6b616353e2455c8ccdae3455c537e4ccce04222cf86 SHA512 38dd34ca1946a37d0bdaa7d69f65b11651097b6d7f2b451387afd72b32fc92c3670bf54b46df226ca7a64d78f50117a648e2d6194ebaf2e86627cb29fb0e958e
-DIST gutenprint-5.2.13-pre1.tar.bz2 6971542 BLAKE2B 50ea5051760ea5a03e2d72c1ae390803e16bd8ec18cd9884f3ef1ae9ddef66fce72823f4c0622f156f013a642acf3a5a60d7fa312b9e35fe198ef755a44ccf02 SHA512 86c04136fa783391abd47aeefe4ce405f2940728ffccf55196f683f1977843f96a0e6d66bc1fe4d7eef7d3fcac3860fa6125d74ae4be088e95450e05b7f855b2
+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.0-pre1.tar.bz2 6979423 BLAKE2B 39093c48b8212da7b1bf1e9fb4c9b8b79a0a5bb67b2846b2ba7c94bbb35e6d0cb03e951984ecaa2e3e8c785c70e5fdf52eadc553b18494edc229026b73974227 SHA512 0b72a76f48351f49eea35338e04a533d9419333339f5eb2c20bc0535a337ce2f77b7f1a1050d0de3e1b3220504fa1ce3b39fa6eee7013b7b3a45fc347b3ee83d
-EBUILD gutenprint-5.2.12.ebuild 2030 BLAKE2B f4b5a84f19bbcddd0e182635decd5ddce805879d4e25436a75da8e5db75a41dd81526034b24c6a2d54484f89284e48d1e239505425076c708b0a17010b7be9a5 SHA512 cf904aa171bdf0d37d22b0b9d3dd8d2d047d24c7844d2401dbae473abcbb41625775fa4d356f38af74511725e701f8d4c2bcdb9d88329ec13a37b3e64893ce4e
+DIST gutenprint-5.3.1.tar.xz 5153260 BLAKE2B 03465158944a77af93bfaf13878f821f13e63eac1bd92f9e33ba003b49a4cc1864e0ddf2bd3d72cec9fd2759401f90304f62ec068c3b62b0c210c53d1265c0d1 SHA512 214d07e6f78130e95c8c9d98f0862921d26f74a7c302afabdb138b35ef5f02f52fa143411983867fd7015477c16ca18cf8001e6552c27cd4a12c08ff77e92986
 EBUILD gutenprint-5.2.13.ebuild 2074 BLAKE2B a7f893ce22a51924689fea248bd1fdc6237201d737418f47b3e4ab9f3c91b4e4c232c4b452d3ab3a36ed41dff5bf0620947c212dfa9af21e7bdf5162b4d9ba2a SHA512 7e2cda6ea2de1215bb999a1ea373e16e29d314068a6d9833ff4b16b57b25db30bdae3cfb7a018c6a225042fbbd60627f65e857a19bc0f693fc1b4cd6c5efc9d0
-EBUILD gutenprint-5.2.13_pre1.ebuild 2083 BLAKE2B 634183c6ce24ef198f9157fc268914ba2283e361295b13dff2cfed2a308d43f562858844c855dc4173c2e913f8f2ae64214065816143210c9e896514a8f13a52 SHA512 5e540ff6db6b6f2c731c82ccefbd5bfae854b44d5de12467df1f37af98d20ad0af4da3ec884f6d83249c2f1d8c548e11eb3073068738a231300c1ebf0428de70
-EBUILD gutenprint-5.3.0_pre1.ebuild 2084 BLAKE2B 921781cb1468aac2b1e88c60589885a5dd71d4b97d901389490ead11aaa6f2a44a65a6a7bc0e2adc14b75f63a795e9035a66a7bcf15c97bc4c0d4d7fe728fee9 SHA512 28eeace987d40f049c6e73146d8ab332dd220ff8cf4dde69a438a1857d45891aafdbdf941e774390f23b3a5d6f49056a15c9ab3a4aa0f9730d0105710d6262bf
+EBUILD gutenprint-5.3.1.ebuild 2025 BLAKE2B 83bb16cc89d27360d620986e1d3471c0a0fae4e9fd99c127cf80e0e13050254a484dd86cb4b0e04df136c83a085bd9143e8a46a33f3fcbf52d94b32d363fd9c5 SHA512 e41aa69faa8f14015315b59e7012602e72acab3398f607df29bee6ed7bd044ea3d5a77dea5d008f081719d3606c2eafd56191ecb70da81f26e0e2c544687a54a
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/files/gutenprint-5.3.1-cflags.patch b/net-print/gutenprint/files/gutenprint-5.3.1-cflags.patch
new file mode 100644
index 000000000000..2f539333f792
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.3.1-cflags.patch
@@ -0,0 +1,23 @@
+--- gutenprint-5.3.1/configure.ac
++++ gutenprint-5.3.1/configure.ac
+@@ -714,20 +714,6 @@
+   if test x${USE_MAINTAINER_MODE} = xyes ; then
+     STP_ADD_COMPILER_ARGS([-D_POSIX_C_SOURCE=200809L -std=c99 -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([-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.12.ebuild b/net-print/gutenprint/gutenprint-5.2.12.ebuild
deleted file mode 100644
index 91ed40cc0864..000000000000
--- a/net-print/gutenprint/gutenprint-5.2.12.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 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"
-SRC_URI="mirror://sourceforge/gimp-print/${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.0_pre1.ebuild b/net-print/gutenprint/gutenprint-5.3.0_pre1.ebuild
deleted file mode 100644
index 46cbfb56c28e..000000000000
--- a/net-print/gutenprint/gutenprint-5.3.0_pre1.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.2.13_pre1.ebuild b/net-print/gutenprint/gutenprint-5.3.1.ebuild
index 53882ab7a0f1..ee683257f387 100644
--- a/net-print/gutenprint/gutenprint-5.2.13_pre1.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools
 
 DESCRIPTION="Ghostscript and cups printer drivers"
@@ -9,7 +9,7 @@ HOMEPAGE="http://gutenprint.sourceforge.net"
 
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,8 +36,7 @@ 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
+	"${FILESDIR}"/${PN}-5.3.1-cflags.patch
 )
 
 src_prepare() {