From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- net-print/cups-filters/Manifest | 8 +- net-print/cups-filters/cups-filters-1.21.6.ebuild | 2 +- net-print/cups-filters/cups-filters-1.22.0.ebuild | 137 ---------------------- net-print/cups-filters/cups-filters-1.22.2.ebuild | 135 +++++++++++++++++++++ net-print/cups-filters/cups-filters-9999.ebuild | 4 - 5 files changed, 140 insertions(+), 146 deletions(-) delete mode 100644 net-print/cups-filters/cups-filters-1.22.0.ebuild create mode 100644 net-print/cups-filters/cups-filters-1.22.2.ebuild (limited to 'net-print/cups-filters') diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 6ea0f963aa97..e65eeaeda803 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,9 +1,9 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3 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.21.6.ebuild 3490 BLAKE2B 330d8d06a13b6827b70fa8aaefff2e3372bbc3265fb14d0147214332e8762434adfe22a950fefb3f3bb810f04eb07f22000a3d6fa4540f2dc4a31d8eaec914c0 SHA512 13cb5fe419b68f205ac3703643f2ee721ec93cda7b7c53556198649474f35790f93dc8612b0a47f9362885a17e097b4332bf35748ca7764ed43608bcebd961ed -EBUILD cups-filters-1.22.0.ebuild 3499 BLAKE2B 3ea73bbf734a1f283ee697ec17237a03eeebe616f7f1637a4f72bf0d016806041fa24bdb918729831f311f2a67516665d5a96f85d43fbf495eeca560b9d3a69c SHA512 0fedb0f04590ef6b3eccc3b9b1f5a4a3286b295d68f9bf641adc569d7fda412df187de34b69320153a835f259c2d5ee59fcdd08c6f38f1299b02ef98206d7cca +DIST cups-filters-1.22.2.tar.xz 1476812 BLAKE2B fa64a0cf3a0c62053914a603366cf6982ce703b44c40dcd1c4410e180f22cd929cc4f1fee4e00945fa9e73dfbc5bae8b664527c32060be42050882a861412ae0 SHA512 da9873f01baf9436c00009348ea8033df1c9e44c97839e16841241510fbb1f3d93fc57ee593d1286bdfeab0a89c15b0f7d74c932bd48f3a623c7c10d200bbd6a +EBUILD cups-filters-1.21.6.ebuild 3489 BLAKE2B 737c9c89d4db817c4d54caac560e942880b766f36ff175948c27b39656883862a9ec8b1b6a40c88a072069f2cb085ae706743e4a92b2669b7f550b25ef1b35b2 SHA512 0e6c5c5cd959e0d730b0c29ca7365673c575a09e3fc89eee507906c79f42345ac50d7a4e01230f1717e6c7fd3fd0205d68bb0afd63a7b02c50ef166083c77add EBUILD cups-filters-1.22.1.ebuild 3499 BLAKE2B 3ea73bbf734a1f283ee697ec17237a03eeebe616f7f1637a4f72bf0d016806041fa24bdb918729831f311f2a67516665d5a96f85d43fbf495eeca560b9d3a69c SHA512 0fedb0f04590ef6b3eccc3b9b1f5a4a3286b295d68f9bf641adc569d7fda412df187de34b69320153a835f259c2d5ee59fcdd08c6f38f1299b02ef98206d7cca -EBUILD cups-filters-9999.ebuild 3593 BLAKE2B 3c0b740ca19190c0e788cc144c4c9ab85d1dfd7b7fd0fc19b4bc6bf0b837bfe56972ee512a1aa515a3885622d257ab2a63b1f2429fa85333a11846caab3c001b SHA512 325e825f45325b68b2a6a4ca6059d09f5f4899ef05063c8a0a79832f840f1141d9e0f7e4daa4205b573f067118d88e8ef31dab5d3a1c10700be44ba441f200e1 +EBUILD cups-filters-1.22.2.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177 +EBUILD cups-filters-9999.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177 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 b0a9e639e8a0..3795d0285468 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/cups-filters-1.22.0.ebuild b/net-print/cups-filters/cups-filters-1.22.0.ebuild deleted file mode 100644 index 8709d00220ad..000000000000 --- a/net-print/cups-filters/cups-filters-1.22.0.ebuild +++ /dev/null @@ -1,137 +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-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 ) - pclm? ( >=app-text/qpdf-8.1.0:= ) - 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/cups-filters/cups-filters-1.22.2.ebuild b/net-print/cups-filters/cups-filters-1.22.2.ebuild new file mode 100644 index 000000000000..9549f96b1d5a --- /dev/null +++ b/net-print/cups-filters/cups-filters-1.22.2.ebuild @@ -0,0 +1,135 @@ +# 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 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 ~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-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 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-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild index c1a13becd89e..9549f96b1d5a 100644 --- a/net-print/cups-filters/cups-filters-9999.ebuild +++ b/net-print/cups-filters/cups-filters-9999.ebuild @@ -8,8 +8,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" inherit autotools git-r3 EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git" else @@ -38,7 +36,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= ) @@ -61,7 +58,6 @@ src_prepare() { src_configure() { local myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" --enable-imagefilters --localstatedir="${EPREFIX}"/var --with-browseremoteprotocols=DNSSD,CUPS -- cgit v1.2.3