gentoo resync : 09.03.2018

6 files changed, 144 insertions, 5 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 68438b8d37c6..6821f078921a 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 1bbc44e28f33..bb9c0c445c75 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,9 +3,11 @@ DIST cups-filters-1.16.4.tar.xz 1440964 BLAKE2B d25525fe9db6e42b244f15550ddb3e9f
 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
 DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
 DIST cups-filters-1.20.0.tar.xz 1465820 BLAKE2B 3ddc0ca7017776a8b69266dc7c19484626f0f6f70a44cefc9c6e1137a7c90123beb1e4d98e75906f5dfe156af01a7725ae8f1ce668f7194f07d4595f6cbba300 SHA512 b71722cc14f81cf8cbed5b8e980c9689adc2daf6cfa72e4174b6842bd89574090831f0e986b5e32a0e9fc4e29836f04e74e72c48918d7f3a8f65faa3a6c077af
+DIST cups-filters-1.20.1.tar.xz 1467060 BLAKE2B 1d7e8537376fa1d8a574ff90aa6474cf567d67172b796b44d7d144ac9df19c7b080ca5559c09d2fc2c0200c6698438d90e873d91706d792bcc86ee5adb88b1c0 SHA512 9c0fc3c821a24db99a55b0d5e1750946b294e3b265edae4d4701b4bb3ff9d0f19cb282ff44ec8880a0f643a2703ea3419b03d3d32a5e045d86a2d37031cef108
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
-EBUILD cups-filters-1.17.9.ebuild 3498 BLAKE2B 418dd0605dfd41b9b914fb6bfb57adb4eb46f916d828c7aa232a6ba23913febd43f67463735a2019dab3f6ed0aa9169a095fdaa7ee585635c781ff7532ce13c4 SHA512 c58bd87d12fd7bb7d5b94d3cd7820424e0fb33800f87e10892ef26139bf88ffbdc42b27a805198a9877254a4ec84b338a59f1e555839763ebcafe0fd07297f24
+EBUILD cups-filters-1.17.9.ebuild 3497 BLAKE2B 6f00e3d0c3bda15c8749772a3343ebe3854efd327cb80dac01da9560b81b993060cb5bad73bb7993199740b5f0c4949818f2fe11205ba230c66aa08e8ebd066b SHA512 79e520453ffe52ecc5ba9b746ac2a61a456d755cf343f167eff2a5ddf42f3931ccbbc0b70b6075b6d02ee02a6b6bfc44aee0026524e9d6a33eb48cd5c3ce52ed
 EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-1.20.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
+EBUILD cups-filters-1.20.1.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.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index b99d4154a530..3a6a5e253b38 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	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"
+	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"
diff --git a/net-print/cups-filters/cups-filters-1.20.1.ebuild b/net-print/cups-filters/cups-filters-1.20.1.ebuild
new file mode 100644
index 000000000000..be4ec7dfe0fa
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.20.1.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/libinklevel/Manifest b/net-print/libinklevel/Manifest
index b2ba96ed15db..76b263e0dbe9 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -6,5 +6,5 @@ DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec143253
 EBUILD libinklevel-0.8.0-r1.ebuild 870 BLAKE2B 6ca9c307edaa44c6cba01cdd56dcf7e82de97f9c4e9e45a6f657081ab1c73a790417e35ebff6203dabbd3468f32c0cc9099847f023c27e03e3e3d601ad22a1aa SHA512 95b0a044f1fe928a03e3504baf365837b5cb845811680d62400b4a10be1abfa1cdc5c05905f708e81a5488777e83c40b6a355c998517171996693f970d1c6eac
 EBUILD libinklevel-0.9.0.ebuild 842 BLAKE2B bb16e701377e7414f0f2d53eb92d13fb6ffb9af67058899c87b379346dfcd6f069b3370cac55877a59a68b1747e5dbd7040af82e73d8e7286eca183a0ff12405 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200
 EBUILD libinklevel-0.9.1.ebuild 842 BLAKE2B bb16e701377e7414f0f2d53eb92d13fb6ffb9af67058899c87b379346dfcd6f069b3370cac55877a59a68b1747e5dbd7040af82e73d8e7286eca183a0ff12405 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200
-EBUILD libinklevel-0.9.2.ebuild 842 BLAKE2B bb16e701377e7414f0f2d53eb92d13fb6ffb9af67058899c87b379346dfcd6f069b3370cac55877a59a68b1747e5dbd7040af82e73d8e7286eca183a0ff12405 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200
+EBUILD libinklevel-0.9.2.ebuild 841 BLAKE2B 6e9146628fa3c735dfcb7dcd12ff0021838f6955cad50337ca745d504413aa27697356a3d5b7c93d4ca404c935bde1e0fecb48d4663e9112c56c69cc16c0d74d SHA512 ddffca3f9e617d0ff37e32f0977001febfdabadd3e31efa19f9ba8c2f99ad9ba7ea66eaf8145615d72fc7864b5992eaf979d0420f207600eeecbb246320a405b
 MISC metadata.xml 340 BLAKE2B 806c842e37b146f940771d5e121a9ea618fbafa287a6bee402cce2c99b7d1ba4d834d19153de7685166cc4efcc7f538ea0b1980fa374f18b0898c0d12683cf9e SHA512 d801f16f230f2e7bd5173ea283205cf0666928a447edbc68221dda7f221c220d453cd3500af6d3577b12e898af713ae2843718848a941802a9ce84ecc5127dc8
diff --git a/net-print/libinklevel/libinklevel-0.9.2.ebuild b/net-print/libinklevel/libinklevel-0.9.2.ebuild
index 4d84a588e9cf..e6fbf0aac6b2 100644
--- a/net-print/libinklevel/libinklevel-0.9.2.ebuild
+++ b/net-print/libinklevel/libinklevel-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="http://libinklevel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 LICENSE="GPL-2"
 IUSE="debug static-libs"