gentoo resync : 21.12.2017

6 files changed, 4 insertions, 135 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index fdc764fd9251..8aa5cfc1cd32 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index e099abdf71ac..dd00e915ee13 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,11 +1,9 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
-DIST cups-filters-1.13.5.tar.xz 1424764 BLAKE2B 448012e8e618c9df63925b750c455e9692e52507670efb9f76169d6f0e47e33b3c1158dcd7a2afb7a0ed0dcf6ef9369731df689baa8aa186c600160b29fba87d SHA512 1870b16ad64bc46068c8a74be7a112790a6ffc0be0e14cd858d83013b12e1c51efd905fbc4e189a42558814694348a9ef533b6fe504ef7bce3b4da149e0b3ea6
 DIST cups-filters-1.16.4.tar.xz 1440964 BLAKE2B d25525fe9db6e42b244f15550ddb3e9f58bd7048209f9d62b4896245945e11d5fa1658e5882faf0eb0aaa6a465153d222cd1d90cc94d25895522f5313b9089da SHA512 367c2c1d6755800b88f79808ef0c595aa80b080634299d015828bfb8f0e27085aa052c77e3f3f1645833340caca709bec8e00b46070ff4d13b9994fb1400da60
-DIST cups-filters-1.17.8.tar.xz 1455096 BLAKE2B 2484b4e2ae756f3b81f3516f6b187b3e0ad68f267d630532091b20287369f46c763430e21393aa92e2161686ed762e45499d0fcf4ce098bbe0193771d13ffa7b SHA512 01f4499fb1db456a1fb11b8e39b5de273229c7aa2f87d079e237501ccd70bf637ca5e15d19fb9f7930be700ab6958e1a597bda8d0970260b5e7577eb5447f797
 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
-EBUILD cups-filters-1.13.5.ebuild 3277 BLAKE2B 4bc9a362cabb5cfd0cff6ceefc25b014932437402ad521738af6059366e44867f289bf1f0748f0de4dd3e9969f5910e3b1c6e6c14dc5a346aab2dc8391381d1b SHA512 0a09a543209e460550b2fce7de17453c63c84a3b7e314a0ae82c85760f0b0dbe12b5768381466a5be4fa45af0f5fcaf3723b0d13a818d9ad96473d2e7a20b87b
+DIST cups-filters-1.18.0.tar.xz 1457748 BLAKE2B 6db45707d3c0bdd369407023423a02f8909936daeccdecf1be6007d782888352c15c5590f845e074ca8da271ce1d7262c8b98a0ec8df6e383622654c06730d29 SHA512 260f4d4c635b4ca0222a9a90a6675d7ecb1cf8b4f4428431c263f50f9152537331d2c7d77c4fa0f899a12beecd6500f6ca146f4e2d087cc6525919aa0b922647
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
-EBUILD cups-filters-1.17.8.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
 EBUILD cups-filters-1.17.9.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
+EBUILD cups-filters-1.18.0.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
 EBUILD cups-filters-9999.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.13.5.ebuild b/net-print/cups-filters/cups-filters-1.13.5.ebuild
deleted file mode 100644
index e15aedee2a20..000000000000
--- a/net-print/cups-filters/cups-filters-1.13.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr autotools
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-3.0.2:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--localstatedir="${EPREFIX}"/var \
-		--with-cups-rundir="${EPREFIX}"/run/cups \
-		$(use_enable dbus) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		$(use_enable foomatic) \
-		$(use_enable ldap) \
-		$(use_enable pdf mutool) \
-		$(use_enable postscript ghostscript) \
-		$(use_enable postscript ijs) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--with-rcdir=no \
-		--with-browseremoteprotocols=DNSSD,CUPS \
-		--without-php
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	prune_libtool_files --all
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.17.8.ebuild b/net-print/cups-filters/cups-filters-1.18.0.ebuild
index bfed0b638e91..bfed0b638e91 100644
--- a/net-print/cups-filters/cups-filters-1.17.8.ebuild
+++ b/net-print/cups-filters/cups-filters-1.18.0.ebuild
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index ecc809a2f923..85e135925d1a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -4,5 +4,5 @@ DIST hplip-3.17.10.tar.gz 23878364 BLAKE2B 0165bcb00159572a16277624db0de4b2ca842
 DIST hplip-3.17.9-patches-1.tar.xz 8484 BLAKE2B 3a1f25d0554af5597266eb5ed3ff9f594560671784a89ade6246e9287661bf17fa16c555391c3f685e59aec8c548560911065a9c4188906c2f00c755f503fe49 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a
 EBUILD hplip-3.16.3.ebuild 7462 BLAKE2B 4aafe8318d89bbb56c3aa8e641005b101d612a8de07d86d7f40d9a3f29825d31ac399efc17fce33ae9903c83f76e7734dd4ccb45896924dffa5ac7c54d8e65c7 SHA512 d85473a09df3afada1a1a45aae2490adfa7853a426e8f05f3b86db381c15cde6db952e22535241505932a1ed9187646a1bb89ce7ce96db6f2e6e49ee819e5ca3
 EBUILD hplip-3.17.10-r1.ebuild 7600 BLAKE2B f0d7271fb88916af700a9ab29eba97e79dbc15f4d1880f32aebaa45793f9c89f87f6f3fd85553f39418d282ab85873cd310df2a8adcf83f7c8f33a08caba9bf0 SHA512 c2843ca389afc1c7a4b89a70eb7512f53a4114b4bf4a51c3d25ee7a0653d9e17b5477c0061b67e40baf807bfea5f967b2647e58b9fc0350e64f3deaa394d7ad9
-EBUILD hplip-3.17.10.ebuild 7422 BLAKE2B 47e86d782c168a72e4e4a8acc36cb5b1c38ad7892478d5fe5edd3cee87161f3f2c3d6772b19c2f5226306c1c1cbadffcbed22dec35e8cd4d87fcc8e3f23ec266 SHA512 bd53e98fcdea496ea2c7e262976f6768fd44c7b85bff15573d7a435461ce24bc6f4115fbb78670c247a1467eb95e0d343f053228688224ec2a37e0b79087f3d6
+EBUILD hplip-3.17.10.ebuild 7421 BLAKE2B c708481459926b833aa3d414c3470f0fd3ae58bdb7b844e54c737152ca2c32d10cf7cb33e6bfc6387be52b8d3a0ee37fb5100a5f8bd6d784a88fe45685b061be SHA512 9ab8ffba42b528f8a85d0c10bd97bc867f9e8364c1646dad9346d1a8aa68f2c35bd1a18a35960bc9982d9ef7030393962d17b4faeec335de5253cdaf846f4214
 MISC metadata.xml 1767 BLAKE2B 67ab6b778637b42f5849699aa506c48844ea510a6528c2e62e54164a1d4502def06f0461bb79e9ea525b09026b502039719dfb42d9168738822e4fd588989196 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3
diff --git a/net-print/hplip/hplip-3.17.10.ebuild b/net-print/hplip/hplip-3.17.10.ebuild
index 1e6c9282efd9..ad761f8e3012 100644
--- a/net-print/hplip/hplip-3.17.10.ebuild
+++ b/net-print/hplip/hplip-3.17.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 
 IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"