gentoo resync : 15.12.2019

4 files changed, 13 insertions, 87 deletions

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 54e2384351aa..36d2819d76db 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,10 +1,9 @@
 AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
-AUX cups-filters-1.25.12-browsed_segfault.patch 2633 BLAKE2B cd87b9b700290fc31d75d759cc80be8c39831fd92c3b43a3d61a6dfce7709f6e9aa78a4f85c501fd978d4fb2a78d22a222106b23fb07debf01b8b60ec6a2fe13 SHA512 d5455c5368b63aa50fc1a77a4e9df566e736764ce8b99e8c1c19a4886c3e58990a6e4c341cf950f1186a8c06195b4cdaf5f973ea94bde4336fdb493aeed695b0
-DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
 DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
-DIST cups-filters-1.25.12.tar.xz 1484148 BLAKE2B 55f05d9c5bf8ae7eb3416de8b1bc2fe919a43875753ee0c02a1fae319d72e7d71a2e46ae8888e840972ba79bb39d515a54b276729648c872ac6c59bfbca02fa0 SHA512 587b8d550923fb5be9f71172e613af7b2bd0e70f780143574482c5efcc2cf869f7d715f63323e63a8f00acd3f08f7e0803cc5a723cdd903229389e7ce11b0c16
-EBUILD cups-filters-1.21.6.ebuild 3504 BLAKE2B 189ce8e693bcf5622ba85657e43806f3796070c51d1c2d1ef011a64026b1569af586ba4c2b588cdbbf46afc708af9068f82474bda30c47133458ae5b521e7510 SHA512 f3c50647657eb47924473d8a18e3af4dc01985156212cc93989ddbc6fe209eb76ac0d19e3271fc4433716174e5ffc46c89f5d73abb1e75801bf1b10fe49c9f85
+DIST cups-filters-1.25.13.tar.xz 1485860 BLAKE2B 03fbbbefdd36e8f619fabf17e6e13d051f48f68f87260747a181f6976ff88728d7d01b646227cd5f054e0321f6fe0e64e4c6b1bdba631d9d703304ad98a625eb SHA512 4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611
+DIST cups-filters-1.26.0.tar.xz 1489308 BLAKE2B 4a0c67f9dba60c409cd62c3f47e167b79be01fd53c51d08c368e62919020d9f1ebe72ebd570e773537053ae4cc42846f426c166675faa0a18392afdb1d66c284 SHA512 a6e0a1b8dfec2e46cb2475639b33f60da3a74090718334883564711530e13c7524952b9f145303c1063e1ae21eb585dce1fd9c87e4ce7884ec687fdef58f2124
 EBUILD cups-filters-1.25.11.ebuild 3447 BLAKE2B f270561ecee97afe4ad639fefad16e69d4ac16fd2054d1f96d87f7762402bbce2ed3255f403dbd97c6b770c4f51b0cdf34eb801c3a75cc41f519da3340c07be0 SHA512 08e18378d689e5c2ccaf531e033419a61654f780a4041c40845229f6ada602e8c8ecc4d322b5e4fb2389a73c51521e05c6ec06b13f9bb85d8d44a37d178b40b7
-EBUILD cups-filters-1.25.12-r1.ebuild 3522 BLAKE2B 962b74c64a6921633f8ece1606c70be6d8308dd90af8d031d79fcf30b05d4f4855ee3fac90b7cdbf661cda4e882c5b5975713884be82adcd52692a8f86424c27 SHA512 6476a362f73deb4a95150d247617e7fb88a4a5aa19e3194a7b36a3316a43153f32dbc042ec6815b4e4a6070b8f95eb01a0d3d5938d18adeb5ea4f05287bbfe67
+EBUILD cups-filters-1.25.13.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
+EBUILD cups-filters-1.26.0.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
 EBUILD cups-filters-9999.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild b/net-print/cups-filters/cups-filters-1.25.13.ebuild
index 1179f01061e1..cc938610ec4f 100644
--- a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.13.ebuild
@@ -53,10 +53,6 @@ BDEPEND="
 	test? ( media-fonts/dejavu )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-browsed_segfault.patch" #700024
-)
-
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf
diff --git a/net-print/cups-filters/cups-filters-1.21.6.ebuild b/net-print/cups-filters/cups-filters-1.26.0.ebuild
index ba9153b902a4..cc938610ec4f 100644
--- a/net-print/cups-filters/cups-filters-1.21.6.ebuild
+++ b/net-print/cups-filters/cups-filters-1.26.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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"
+	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"
+	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"
@@ -25,7 +25,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.1.0:=
+	>=app-text/qpdf-8.3.0:=
 	dev-libs/glib:2
 	media-libs/fontconfig
 	media-libs/freetype:2
@@ -38,7 +38,6 @@ RDEPEND="
 	foomatic? ( !net-print/foomatic-filters )
 	jpeg? ( virtual/jpeg:0 )
 	ldap? ( net-nds/openldap )
-	pclm? ( >=app-text/qpdf-8.1.0:= )
 	pdf? ( app-text/mupdf )
 	perl? ( dev-lang/perl:= )
 	png? ( media-libs/libpng:0= )
@@ -46,8 +45,11 @@ RDEPEND="
 	tiff? ( media-libs/tiff:0 )
 	zeroconf? ( net-dns/avahi[dbus] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
 	test? ( media-fonts/dejavu )
 "
 
@@ -61,7 +63,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--enable-imagefilters
 		--localstatedir="${EPREFIX}"/var
 		--with-browseremoteprotocols=DNSSD,CUPS
@@ -77,7 +78,6 @@ src_configure() {
 		$(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)
diff --git a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
deleted file mode 100644
index 8ab644155c32..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9bf6937633b35cc92bbf30e9eec91ef3c4bb6aad Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Wed, 13 Nov 2019 18:49:01 +0100
-Subject: [PATCH] cups-browsed: Added missing memory allocations leading to a
- segfault.
-
----
- NEWS                 |  5 +++++
- utils/cups-browsed.c | 21 ++++++++++++---------
- 2 files changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 67d1c18f..2de5dab4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,6 +1,11 @@
- NEWS - OpenPrinting CUPS Filters v1.25.12 - 2019-11-12
- ------------------------------------------------------
- 
-+CHANGES IN V1.25.13
-+
-+	- cups-browsed: Added some missing memory allocations leading
-+	  to a segfault (Issue #175).
-+
- CHANGES IN V1.25.12
- 
- 	- libcupsfilters: Use the text names "Draft", "Normal", and
-diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
-index adbf5002..f0e05746 100644
---- a/utils/cups-browsed.c
-+++ b/utils/cups-browsed.c
-@@ -2837,6 +2837,15 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
-       debug_printf("Default MediaType: %s\n", media_type);
-     }
-       
-+    if (temp->media_type == NULL) {
-+      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
-+					   "media-type-supported")) {
-+        temp->media_type = (char*)malloc(sizeof(char)*32);
-+        strcpy(temp->media_type, AUTO_OPTION);
-+        debug_printf("Default MediaType: " AUTO_OPTION "\n");
-+      }
-+    }
-+
-     if ((media_attr = ippFindAttribute(media_col, "media-source",
- 				       IPP_TAG_KEYWORD)) != NULL) {
-       pwg_ppdize_name(ippGetString(media_attr, 0, NULL), media_source,
-@@ -2852,18 +2861,12 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
-     if (temp->media_source == NULL) {
-       if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
- 					   "media-source-supported")) {
--        strcpy(temp->media_source,AUTO_OPTION);
--        debug_printf("Default MediaSource: %s\n", media_source);
-+        temp->media_source = (char*)malloc(sizeof(char)*32);
-+        strcpy(temp->media_source, AUTO_OPTION);
-+        debug_printf("Default MediaSource: " AUTO_OPTION "\n");
-       }
-     }
- 
--    if (temp->media_type == NULL) {
--      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
--					   "media-type-supported")) {
--        strcpy(temp->media_type, AUTO_OPTION);
--        debug_printf("Default MediaType: %s\n", media_type);
--      }
--    }
-     media_col_default = ippAddCollection(*merged_attributes, IPP_TAG_PRINTER,
- 					 "media-col-default", NULL);
-     current_media = create_media_col(temp->x, temp->y, temp->left_margin,