From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- net-print/cups-filters/Manifest | 5 +- net-print/cups-filters/cups-filters-1.20.4.ebuild | 141 --------------------- net-print/cups-filters/cups-filters-1.21.6.ebuild | 2 +- .../files/cups-filters-1.20.4-poppler-0.67.0.patch | 28 ---- 4 files changed, 2 insertions(+), 174 deletions(-) delete mode 100644 net-print/cups-filters/cups-filters-1.20.4.ebuild delete mode 100644 net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch (limited to 'net-print/cups-filters') diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 8027d52e37f1..6ea0f963aa97 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,11 +1,8 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3 -AUX cups-filters-1.20.4-poppler-0.67.0.patch 826 BLAKE2B 0d85c9e27c588f2bd3c3535a6a7fc83ed8d5657e71fda0fb402da5f562b60c9810675251d70c12b8a2652038c5685e10efc1b9bb6b6a422ce0008ac1da40a829 SHA512 0c3e5857e90ed959df97b658cae43e17c5f943b88b6a86bdcd9a4d44f2a684810d8e317ad53d61dbca4802f2a45e2f783b527400d3c0f039ff2264d6f92df676 -DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07 DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a DIST cups-filters-1.22.0.tar.xz 1474616 BLAKE2B 045f403bcbae11bd6e0b523d741d1494e6328dfc9386393f974ff82ba816972688613e5c68739dcbf7733aa19c9c063be777cb017dbd041d9c2f23bd21c9182c SHA512 6129c948db2499a300c44ce88a287d5296af4771fb42e991121aaf4eb1258e17f1092afcbb90e5dd63572db410169fed65c6217d1ecd0ba834018acb4ef39bfa DIST cups-filters-1.22.1.tar.xz 1475456 BLAKE2B f5008cbcfc51f6a194dd5c50b3db288b2703b053d0f0e4ce525ccca255624efe43ec308b59310b24df5ab4f9f5afff54bfab5a102614a8d62209353245d66ed7 SHA512 5ed2f9fe6baecda8e5ed7c6c153e31ba3bc65a28608851141ae77dee5ddc31b3feaf22ab4798c1b47edb98af9f4cacd8437b880d693f5380febd24ef12c92b24 -EBUILD cups-filters-1.20.4.ebuild 3553 BLAKE2B 6703a6a8a65c1776b8ada4b49d752724a7d105c64bf0d29ea46b748daf9f6ea82f29e33706155adea3ffbee5ba919ec498fbdc4db5761657907a0edc749ac3eb SHA512 1d837c49b885fab57aa663866ed73ffda5a48d8bb945aa9df0b314ca6f8be3afa7b09adba3e44ac6859804d614a6a447093d77f17bf78be0ca3647b2c3d8b31f -EBUILD cups-filters-1.21.6.ebuild 3492 BLAKE2B 2673c8e068e5969902f08a05eedef7dabc5d4d1e047f2ab9aa8a0a6fd2668debdf8403bf9cbc8a2e149af63fbe738a3fd59e29adb0e0c1970fb86e3d66e6d0d3 SHA512 e9bcb82f75d8887ebd0e5ff4b5ca21450f66dad14f3e193ce7bcba1dc9583ad0c8f2d56a7a33402eccd58277ea0a8d9ea8c674a976ef9cfa0eb5c840b9311d95 +EBUILD cups-filters-1.21.6.ebuild 3490 BLAKE2B 330d8d06a13b6827b70fa8aaefff2e3372bbc3265fb14d0147214332e8762434adfe22a950fefb3f3bb810f04eb07f22000a3d6fa4540f2dc4a31d8eaec914c0 SHA512 13cb5fe419b68f205ac3703643f2ee721ec93cda7b7c53556198649474f35790f93dc8612b0a47f9362885a17e097b4332bf35748ca7764ed43608bcebd961ed EBUILD cups-filters-1.22.0.ebuild 3499 BLAKE2B 3ea73bbf734a1f283ee697ec17237a03eeebe616f7f1637a4f72bf0d016806041fa24bdb918729831f311f2a67516665d5a96f85d43fbf495eeca560b9d3a69c SHA512 0fedb0f04590ef6b3eccc3b9b1f5a4a3286b295d68f9bf641adc569d7fda412df187de34b69320153a835f259c2d5ee59fcdd08c6f38f1299b02ef98206d7cca EBUILD cups-filters-1.22.1.ebuild 3499 BLAKE2B 3ea73bbf734a1f283ee697ec17237a03eeebe616f7f1637a4f72bf0d016806041fa24bdb918729831f311f2a67516665d5a96f85d43fbf495eeca560b9d3a69c SHA512 0fedb0f04590ef6b3eccc3b9b1f5a4a3286b295d68f9bf641adc569d7fda412df187de34b69320153a835f259c2d5ee59fcdd08c6f38f1299b02ef98206d7cca EBUILD cups-filters-9999.ebuild 3593 BLAKE2B 3c0b740ca19190c0e788cc144c4c9ab85d1dfd7b7fd0fc19b4bc6bf0b837bfe56972ee512a1aa515a3885622d257ab2a63b1f2429fa85333a11846caab3c001b SHA512 325e825f45325b68b2a6a4ca6059d09f5f4899ef05063c8a0a79832f840f1141d9e0f7e4daa4205b573f067118d88e8ef31dab5d3a1c10700be44ba441f200e1 diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild deleted file mode 100644 index 42d6fce17e85..000000000000 --- a/net-print/cups-filters/cups-filters-1.20.4.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.20.4-poppler-0.67.0.patch" -) - -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/cups-filters/cups-filters-1.21.6.ebuild b/net-print/cups-filters/cups-filters-1.21.6.ebuild index 9fdf92bcda50..b0a9e639e8a0 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 ~amd64-fbsd ~m68k-mint" fi DESCRIPTION="Cups filters" HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" diff --git a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch deleted file mode 100644 index 69376e1c84d2..000000000000 --- a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Fri, 20 Jul 2018 15:20:11 +0200 -Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0 - -This only fails with >=poppler-0.67.0 but the change to const was done -in 0.64.0 ---- - filter/pdf.cxx | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/filter/pdf.cxx b/filter/pdf.cxx -index 206ccf88..665eab09 100644 ---- a/filter/pdf.cxx -+++ b/filter/pdf.cxx -@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt) - } - - FormField *ff = fm_text->getField(); -+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64 -+ const -+#endif - GooString *field_name; - field_name = ff->getFullyQualifiedName(); - if ( ! field_name ) --- -2.18.0 - -- cgit v1.2.3