gentoo resync : 13.10.2019

7 files changed, 148 insertions, 16 deletions

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 1a5c77ce8f6f..df5ddb7b2dfa 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,11 +2,13 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 AUX cups-filters-1.25.4-missing_cstring.patch 540 BLAKE2B fdc22ccbc624cc6dc9fb6a30cf461d3142b5ab794708e7456663efce7a2ed207159bfad564dc790d77e8f4b6ab7f1e95768f889523c5c2a9c33d3a4408d46fc6 SHA512 0eaf6ec88a74890ae4045bf954895c48e843f346a2ac8114bd3adf9f6c49b511001e5d9cf22dc4c8215b09b58e9acbec80b1f3d20b1b3c2909694f65bbfe5b4b
 DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
 DIST cups-filters-1.22.6.tar.xz 1477584 BLAKE2B 7d833c3e97c510eabcc906bbd01d4d1ef2bf3106d963bdec7f735942e96a830c53ec2c03a4ef580d9fc01f19bae3962c1bd2a98d2af7f03f71988ae374366fee SHA512 6c1c46bd74f700b3ab0a46cb4b5b7ecc93000122e9deb20b43878d876cbe2ceeeb4a3c16ef6de00497b10447d04f2689a5d939d0d49212e7274cc51b4617c296
-DIST cups-filters-1.25.4.tar.xz 1449676 BLAKE2B 1ba36c013d37d57ebf04a9395638bee8aa3935832ed5f0235f50fcfbc61e4002701dec15f7c45952975fc1e53e7f57fd93f86b9af153a732795745e21e38d329 SHA512 0386c4640249a0325257f9b10a0eee387bc6e8129bde734b6c35704719c0ad60624f9ad44c73cd199768373ffd331fc1b4b4c4c8641f5ec8792ddf8850da510a
-DIST cups-filters-1.25.5.tar.xz 1450264 BLAKE2B 126f32604ff4b2599154406177f8aeaf061f9624255177de968f88706a9138ed9fc8f170987bc25bb4c3801b33432c51c304d2b4a1bdc7249b7472d9cbaadca6 SHA512 4e7126f4c439cb7392484dd3531023da5a1c885c7a6c7377260e7cccc2f3f51e3d0aa879965ecdb2625217d6f9ee1ca9c860c4fc05a7959697cd269696f10f59
-EBUILD cups-filters-1.21.6.ebuild 3488 BLAKE2B da4a24389073b98e8d081290baf781dca00fd9c78512f17c74c8e1962a2e54cbfcac5ae28fd4f2a7ad9c4d9e15b8588a88ddcabfbd33e333839e26d138bd9fc3 SHA512 48d0ab3b1f0361006e79426bff2ad563950ad90833f49aad9934c8cfc607c89fc8ab9ef74c18d832113ba35a76d0a46d5135b739619550790a751a20edf0cca0
-EBUILD cups-filters-1.22.6.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
-EBUILD cups-filters-1.25.4.ebuild 3447 BLAKE2B 15b83730551c5bda0b8603dc22248810c299f04bf9f2a1586f5a9949daecc4b49c48e7aa75e62f899a041d023161017adc72a130dc9fbe4519ac57a4f68aa157 SHA512 17c640fb9703663e6ec43ff16ccaafbcda24222aba347d59cf1595988a92a405d44175911247e5011b22a14c119cfd194a027b4926d14a0bfc996c5d74f1ca16
-EBUILD cups-filters-1.25.5.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9
-EBUILD cups-filters-9999.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9
+DIST cups-filters-1.25.10.tar.xz 1483276 BLAKE2B 34961ec157db992b4225413143566e9d74f8effc879848ff4a47cbd1b87d3fab7b41b75d3a48310c2b56cc834e7999d4268eaa5f30a7e20a3969c13cb4c98585 SHA512 1ac2e05e4a9c7ccc000f39d4a0cfa66e1328a049154cede71602bdef5ba5a19a13fa4e48d33adb7e19849bc4f659559ff73151f8b2b36c1eb6d1625396704abf
+DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
+DIST cups-filters-1.25.6.tar.xz 1482160 BLAKE2B 13587dc5153e7e0368b2d4edcfab0aec3864b1b17e403fc54bd1f0677ed8611934b55bfbd5ce2a474486a9e56e946530493afba3a7d7bc2731f08bb11dbe2bdb SHA512 14c958bcb98e4addde84c3c0d27e7056f1b4790b8502f5fb0c23c1e2cf80a6fd22fa39816a2f2e6c0501272a57cfcc84ce939a8614563e795e5d2ae035972f33
+EBUILD cups-filters-1.21.6.ebuild 3476 BLAKE2B 7c9acaa6d3990e169008c8538557535db6dcb43e5771f3914df0de3a60b4c78fa7d54920ce790753cc369921c7e1c9c470d6d49b918c6ad1bfb6f882ee0bf80e SHA512 4ab66b437984893ac38bec0d32b86d77b0bc05efcf09add70ff1df5bdb2628344eb4b2b5a4242c3df30074f0ed79e6dbfbb69c137fe94df3ccb995a09031198c
+EBUILD cups-filters-1.22.6.ebuild 3403 BLAKE2B 9549b2e0988f52962babe5bce222811d4dc8a66818da2bfcbe556b8d80c1ad3dfeb8be55c9f720da291c0e1ee854ca964fefd1132dfe4d0865655f301ffc69a6 SHA512 5a4911380b842abe3a1aada19fcd5194daae4d9d3866befe22df5d3ed570144f7ead77ce7055cf2f9450dd9fcc6f67646ea749a5af06d6fd941705bb195cbd71
+EBUILD cups-filters-1.25.10.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
+EBUILD cups-filters-1.25.11.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
+EBUILD cups-filters-1.25.6.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
+EBUILD cups-filters-9999.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.21.6.ebuild b/net-print/cups-filters/cups-filters-1.21.6.ebuild
index 3abe2224bf08..e6254b113709 100644
--- a/net-print/cups-filters/cups-filters-1.21.6.ebuild
+++ b/net-print/cups-filters/cups-filters-1.21.6.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 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-filters/cups-filters-1.22.6.ebuild b/net-print/cups-filters/cups-filters-1.22.6.ebuild
index 9549f96b1d5a..18623608c7dc 100644
--- a/net-print/cups-filters/cups-filters-1.22.6.ebuild
+++ b/net-print/cups-filters/cups-filters-1.22.6.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 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 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-filters/cups-filters-1.25.5.ebuild b/net-print/cups-filters/cups-filters-1.25.10.ebuild
index cdc922f82de3..e581c47e5e42 100644
--- a/net-print/cups-filters/cups-filters-1.25.5.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.10.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 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 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-print/cups-filters/cups-filters-1.25.4.ebuild b/net-print/cups-filters/cups-filters-1.25.11.ebuild
index 03ae82bd13c0..e581c47e5e42 100644
--- a/net-print/cups-filters/cups-filters-1.25.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.11.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 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 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
@@ -48,10 +48,6 @@ DEPEND="${RDEPEND}
 	test? ( media-fonts/dejavu )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-missing_cstring.patch" #693498
-)
-
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf
diff --git a/net-print/cups-filters/cups-filters-1.25.6.ebuild b/net-print/cups-filters/cups-filters-1.25.6.ebuild
new file mode 100644
index 000000000000..e581c47e5e42
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.25.6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+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 ~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-8.3.0:=
+	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= )
+	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=(
+		--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 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/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index cdc922f82de3..e581c47e5e42 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 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 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"