gentoo resync : 16.01.2018

5 files changed, 142 insertions, 3 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3ebf2a53499b..b09fc8d89e3c 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 dd00e915ee13..57e5654ef8c6 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,8 +2,10 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 DIST cups-filters-1.16.4.tar.xz 1440964 BLAKE2B d25525fe9db6e42b244f15550ddb3e9f58bd7048209f9d62b4896245945e11d5fa1658e5882faf0eb0aaa6a465153d222cd1d90cc94d25895522f5313b9089da SHA512 367c2c1d6755800b88f79808ef0c595aa80b080634299d015828bfb8f0e27085aa052c77e3f3f1645833340caca709bec8e00b46070ff4d13b9994fb1400da60
 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
 DIST cups-filters-1.18.0.tar.xz 1457748 BLAKE2B 6db45707d3c0bdd369407023423a02f8909936daeccdecf1be6007d782888352c15c5590f845e074ca8da271ce1d7262c8b98a0ec8df6e383622654c06730d29 SHA512 260f4d4c635b4ca0222a9a90a6675d7ecb1cf8b4f4428431c263f50f9152537331d2c7d77c4fa0f899a12beecd6500f6ca146f4e2d087cc6525919aa0b922647
+DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
 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-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 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.19.0.ebuild b/net-print/cups-filters/cups-filters-1.19.0.ebuild
new file mode 100644
index 000000000000..be4ec7dfe0fa
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.19.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+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 ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RDEPEND="
+	>=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 )
+	pclm? ( >=app-text/qpdf-7.0_beta1 )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	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
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable postscript ijs)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+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
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	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/kyocera-1x2x-mfp-driver/Manifest b/net-print/kyocera-1x2x-mfp-driver/Manifest
index 359d20cf6357..0d5ce0a4bdfb 100644
--- a/net-print/kyocera-1x2x-mfp-driver/Manifest
+++ b/net-print/kyocera-1x2x-mfp-driver/Manifest
@@ -1,4 +1,4 @@
 AUX rastertokpsl-fix.sh 399 BLAKE2B 14376b73ad961b4dba3064403c079be18492a2e0091f113ed127c3f18668a6abcd0cfdc587dc2991269ce3549049d5b367ed96da623ec851353c9a5b7a4dbdb5 SHA512 7d757297b737a4fcebfd91bde4457674b738bf227480d5bcbf5049eb332c215395bca7798cd1931592ada217b5d85806fe567bd1741d8fadc23b572642901d09
 DIST LinuxDrv_1.1203_FS-1x2xMFP.zip 5392941 BLAKE2B d39140d6bbf5d08d248739f2689ccd45d066b5568c3ba27bdcea34f2ed348e91d0b95d64c7e789dd08094ebda43a5fb6911efb9cdfcc43cf1fefd4af32fb18bb SHA512 afbe237d25d784a6202be01669ccb5e1f0f9a6349b6b74227723905529f23da6d7880b25420b289277020450286d02f579722add5c0d48c839ac44152a60d1ab
-EBUILD kyocera-1x2x-mfp-driver-1.1203-r1.ebuild 3430 BLAKE2B b7074fbc2332d37fca33748c09508837f1b881e11449b75b3430d1cadfa49d6d6d0c89cb970676f00f4e71f939db09ce88b6798260ff182a76d8ef1451f89b0d SHA512 6995f4bd77b97cfc0b33b73c3b574868ad4b2f8355213d42ae373c457668b2406b07efb338eef43789f152d5d7f51e82d9154bbccc02116b8c35ad3cff2322dd
+EBUILD kyocera-1x2x-mfp-driver-1.1203-r1.ebuild 3431 BLAKE2B f764815ab3b6f3a5e873016d183ae4b081e7de93fc9972f556caaf8342e4194d5bc740eb63701e690b86a0650b937dafe28c3ee9116a5f7fd4e83137acc19955 SHA512 4d1103d77579f41bded3ee5bd2c38c6aec04ed88e59cf3be31d80e30bb9510c3940a52ed8cb6dbf2e9b2fc183b9f4af6c5a550be6bf9ac8244567a5d96c836ea
 MISC metadata.xml 529 BLAKE2B ba4ec378b877456893586f9ebed9bf81643f650da1b1f13410514cc15ee4734ba07ee04ae1de56c9891b7a3d0278d7e34312de9dcc7f671909d66711e93fdfe9 SHA512 b0b99720ff90cee4eeaffe3639191500deacaef20283e5ef2bacbb4d1d10227d945beb12767bd46a39b98b9634debccebdede469d371315a1656c18fe4eb5400
diff --git a/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild b/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
index a235beae8bdc..a575ee6097e4 100644
--- a/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
+++ b/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 
 IUSE_L10N=(en ar cs de el es fr he hu it ko pl pt ro ru th tr vi zh-CN zh-TW)
-IUSE="+rastertokpsl-fix ${IUSE_L10N[@]/#/l10n_}"
+IUSE="+rastertokpsl-fix +${IUSE_L10N[@]/#/l10n_}"
 REQUIRED_USE="|| ( ${IUSE_L10N[@]/#/l10n_} )"
 
 RDEPEND="net-print/cups"