From 162945d2a91899b637bbb9e163b406350de12906 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Oct 2021 19:43:03 +0100 Subject: gentoo resync : 30.10.2021 --- net-print/Manifest.gz | Bin 6072 -> 6074 bytes net-print/cups-filters/Manifest | 2 + .../cups-filters/cups-filters-1.28.10-r1.ebuild | 149 ++++++++++ .../cups-filters/files/cups-browsed.init.d-r2 | 9 + net-print/cups/Manifest | 6 + net-print/cups/cups-2.3.3_p2-r3.ebuild | 326 +++++++++++++++++++++ .../files/cups-2.3.3-enforcing-read-limits.patch | 29 ++ .../cups/files/cups-2.3.3-ipp-retry-validate.patch | 43 +++ net-print/cups/files/cups-2.3.3-manpage.patch | 23 ++ net-print/cups/files/cups-2.3.3-timeout.patch | 26 ++ net-print/cups/files/cupsd.init.d-r4 | 22 ++ net-print/foomatic-db-ppds/Manifest | 2 +- net-print/foomatic-db-ppds/metadata.xml | 1 + net-print/foomatic-db/Manifest | 8 +- .../foomatic-db/foomatic-db-4.0.20170331.ebuild | 40 --- .../foomatic-db/foomatic-db-4.0.20180126.ebuild | 41 --- .../foomatic-db/foomatic-db-4.0.20190226.ebuild | 2 +- net-print/foomatic-db/metadata.xml | 1 + net-print/mtink/files/mtinkd.rc | 0 19 files changed, 641 insertions(+), 89 deletions(-) create mode 100644 net-print/cups-filters/cups-filters-1.28.10-r1.ebuild create mode 100644 net-print/cups-filters/files/cups-browsed.init.d-r2 create mode 100644 net-print/cups/cups-2.3.3_p2-r3.ebuild create mode 100644 net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch create mode 100644 net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch create mode 100644 net-print/cups/files/cups-2.3.3-manpage.patch create mode 100644 net-print/cups/files/cups-2.3.3-timeout.patch create mode 100644 net-print/cups/files/cupsd.init.d-r4 delete mode 100644 net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild delete mode 100644 net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild mode change 100755 => 100644 net-print/mtink/files/mtinkd.rc (limited to 'net-print') diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index 7b31118c0c18..285621355445 100644 Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 3adec026ec66..f8726c5ae01f 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,10 +1,12 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3 +AUX cups-browsed.init.d-r2 150 BLAKE2B c2098766ae08b38dead0a5bab2e30e1728ab93aa98e74edb6e20f8a885b62189f1368a041c4430ad24a1b92f0ae9cb317ac3390767db0a54ca1532022d44b0bd SHA512 c8a74ad0e5cfd3b565c12eeca50a55b7a6aa3ac92c689fc6632e2a6df5033e6fa7f16ce6c9c2cbf607ad4bd09453ab7d47448cdd04ad8c7e35f0e584b6d96d38 AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd049fb4d16439405aa052134d828a5f9e5e3f79c02e6121d3c15c5374c62d370fe88ab4b761e849ab48ecc0bdde97d36c6fd98056d0dc195464c7648a2d SHA512 797e8530f5a44b4e4975399076e4e1c537da968a9ed8272baaf1e457a025bc22478045e780208b1607dbcd4eb31b91ac605781cf6eae47ffcdd748e34d126327 DIST cups-filters-1.28.10.tar.xz 1503924 BLAKE2B b745ad9d35e375411d43acc8936a7be3197deda26d64c3fcdf792abf751452a83ab4e77b25336509a4d15a7db3dd142c94f3fd108f514d4956ac62f00310b263 SHA512 d6079633e10c3cfdc744491df03adc73d98dab0d9c0c6d3bc426b751545ae3434ea875e0841cec9358c19336347903f2832b5f801700b371cc1959e031bfa659 DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727 DIST cups-filters-1.28.8.tar.xz 1502456 BLAKE2B 21dad6dc9a1d2f967f3938f2fc5e35eebadb67da8b526a9ea61599272bd3f87e8efff376661adc02b62b539798cbe46e0f7c5c25ba262da0561b53bbb3d08d5d SHA512 77b39ce2a30ad44d50aa58964b389fa5dd75b2b4307ccb25996050fd176e1e794ad0a66ddd4de76e95a671683c3bf448a4f471272c97a752f25ff6234f7d8511 DIST cups-filters-1.28.9.tar.xz 1502888 BLAKE2B ddfed7c0815673d8a372af96cd879fb159a10d5cdaf07839a0157b94c43cead9d32c62a204513274f2a90b48a09e07d20049b93370b24604f14efe0e782116af SHA512 fbdf01b0a3acd70e3bf036ca4944a8b85ab4ab95d945458e924692008a8a37bb0b1fb097c4d4b3cf6f5ad68ae06e8358659cdfc24974ee629be37b54f5c3dca1 +EBUILD cups-filters-1.28.10-r1.ebuild 3604 BLAKE2B f3505a0fd30acf9272a6c9518cd8fc8a18c365e54e7c62971dbe97eb9f352e1433c231c563f0ac122885b86f3632d1f6a5040232274a066d3846532a8287d0cf SHA512 bb6c54cb9997229884a835324820ebeebfd6efec6c090c2db3c6cc27123e61f4c8dfb09f690d8ad9939bdf855989178b1c39c1416f2e43fb6c8d8db547469bc0 EBUILD cups-filters-1.28.10.ebuild 3606 BLAKE2B 6078cdea39bbe969f74dbcc7df085d1253008f0a11643d984653a2a0a43de048f3096560313f3240c3f01c02fb457177ff2ffe927eeccf45335cc713e429928b SHA512 18fd7f914a278379a393cc209da189e535e4d625e00d6047a2a7bac30dded7a14a5bedf17021dbb47d0110944823a2ca890f4c6f004c46d2cb75296e79f5d159 EBUILD cups-filters-1.28.3.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4 EBUILD cups-filters-1.28.7.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4 diff --git a/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild new file mode 100644 index 000000000000..dafc22ff2b77 --- /dev/null +++ b/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +GENTOO_DEPEND_ON_PERL=no + +inherit autotools perl-module systemd flag-o-matic + +if [[ "${PV}" == "9999" ]] ; then + inherit 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 ~riscv ~s390 ~sparc ~x86" +fi +DESCRIPTION="Cups filters" +HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" + +LICENSE="MIT GPL-2" +SLOT="0" +IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf" + +RESTRICT="!test? ( test )" + +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}" +BDEPEND=" + dev-util/gdbus-codegen + >=sys-devel/gettext-0.18.3 + virtual/pkgconfig + test? ( media-fonts/dejavu ) +" + +src_prepare() { + local need_eautoreconf= + + default + + if ! use test ; then + eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch + need_eautoreconf=yes + elif [[ "${PV}" == "9999" ]] ; then + need_eautoreconf=yes + fi + + [[ -n ${need_eautoreconf} ]] && eautoreconf +} + +src_configure() { + # Bug #626800 + append-cxxflags -std=c++11 + + 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 + --disable-static + $(use_enable dbus) + $(use_enable foomatic) + $(use_enable ldap) + $(use_enable pclm) + $(use_enable pdf mutool) + $(use_enable postscript ghostscript) + $(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 || die + perl-module_src_configure + perl-module_src_compile + popd > /dev/null || die + fi +} + +src_test() { + emake check +} + +src_install() { + default + + if use perl; then + pushd "${S}/scripting/perl" > /dev/null || die + perl-module_src_install + perl_delete_localpod + popd > /dev/null || die + 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-r2 "${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 +} + +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 a replacement is deprecated and unmaintained." + fi +} diff --git a/net-print/cups-filters/files/cups-browsed.init.d-r2 b/net-print/cups-filters/files/cups-browsed.init.d-r2 new file mode 100644 index 000000000000..4fea546a05ca --- /dev/null +++ b/net-print/cups-filters/files/cups-browsed.init.d-r2 @@ -0,0 +1,9 @@ +#!/sbin/openrc-run + +pidfile="/run/cups-browsed.pid" +command="/usr/sbin/cups-browsed" +command_background="true" + +depend() { + need cupsd avahi-daemon +} diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 6f1aee7d2700..0a619b361e66 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -2,12 +2,18 @@ AUX cups-1.4.4-nostrip.patch 487 BLAKE2B efc4b3db44b65a1b0c67c472e467d80b4869693 AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e658f5cbbf6793138653df731c24c89149553994a2db423f85251385628de2f467597af98baa91ab954f63f77b5f7eec037d8db7af SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf +AUX cups-2.3.3-enforcing-read-limits.patch 1054 BLAKE2B c848a9f5168ccd208fa05f03711ddd4498c85313c35804b70053faf8880f8cb9ac65ed9b8f2027ffe78fea146fc436f763417cf7afff958c4814493748f88b1f SHA512 f5bcf5c23ebd86b478e74d3a7421414ea5afe0c5db5b7a81aa0c67921405fd1161efe9558fecc55ab815cd25bde7eee5d75e9ffbd1099c0aa219b0ef0ba69ebf +AUX cups-2.3.3-ipp-retry-validate.patch 1449 BLAKE2B 087e14aba890c012797a2a51eea22492329b63064452be28b6762d77db1c1d65be5cd2b71b960444ef2b10083439422eabb77cc1023d4bdb2d68c4e38a9bf78a SHA512 3880d9f1bf776f4c6d9569c34fc82a341be78ee237c6a77815b55a1b9c1ce4d6b913ec39276952ed02046ebaa1d578b000669b6f92279623888ff72ecc420316 +AUX cups-2.3.3-manpage.patch 620 BLAKE2B c22a6f3f03d6d1762b7bb847ab246cf03311383fb3d21feff9eb3fb111df3e9c208d34c71e7f2e6b108f96fa354b363fb1f80eccda9c40b826c5fe3ca11e1159 SHA512 8b65d879d260b7ed6c0dbe4d495f411ece8ab592f3b8d7ed5b0baef277d92a4f0cae1bf89e771fe083ae1d5bf52dbaaa5617e226596ad5435f0d66673b4efe81 AUX cups-2.3.3-no-libtool.patch 912 BLAKE2B 14c19e8a215e2a56af387c6cf904a6a2a11de41a730d4a272a30d37ec98ee031be5e24458ad9a82c221dc76c71a4550055fedd877455752a1b7e925eb684f4cb SHA512 a12be37b290e2e2d875d20d1aec426ce0bfec4980ffa321a4232a3c8ffe5c8c7360c2882915b370236133168b54abfcdb729acdfb5ef2d08f706f981bf7c1214 +AUX cups-2.3.3-timeout.patch 979 BLAKE2B d94473d42b6b7bf454d275b51835777f50d7fbf847a94c6c7a6078d93b5d07249d965217be146adc4f7b0703dbf3a16899535c4cb9486bdb42b16472b2fa76a1 SHA512 89db33ffd331beb42350c44474b648ef8f81d21c08a638a22de1cfedbf5d1d987d528f9e3492b66a6f91b1a0e6ca43b58b7d2ffe5c3dc5ddcb86137f32791ce4 AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 +AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46affb2007d4a5d007719a147f490e7c17a3e9a5211b82d9b89be7111921b1c9d991a6fc4c457f63eae0 SHA512 23ec5714764f2bac4105130efe6f79a508a352ecb45ab3f6e08042b156af05065330b2ac85615d0ce792a4dcd8f5230302dba9d1a96fca84c11d8bf2573ccc0e DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117 EBUILD cups-2.3.3-r4.ebuild 9701 BLAKE2B 4203eb7e427486594802694bc83124de8cdc2d1f116638b22669d4b38aa6132234b15d7551ba50eb0952933887128ce070b2ceb4c2ffd8dde5a7e1e7951079e5 SHA512 09c6f214213c13ceb7d2edaf979a378d2c2ac54040db3a1bcd44580b6dca3480ab75a575bc8338d9c0f167fcc8274cb16208c23419cffab5d5019cf0c9888b12 EBUILD cups-2.3.3_p2-r2.ebuild 9071 BLAKE2B 3942fb09f2010856b51a83f344fedefa0a2fd8a63e1e7613ba36f24aaca362c96ec9454f9acbf14b7dfd440616dc33514ec7e063884b801c8e491bf2f06a2a81 SHA512 8c08852a1729176b2ad826be11fde8f7e5b3bf2d1f887300d8881d4ee73e08f4baa05c891e42726e9c35cbbb920ce2c17495c7af26877c4c46b7c98da38de330 +EBUILD cups-2.3.3_p2-r3.ebuild 9697 BLAKE2B 992d12f982c9604130a107984bf509840baf9f3c88aa0a738801c1e687be3d059b0bcf94a0400fe15dbf14506a95534cc2f42a91e5babd0bd6ca26ad1038cb53 SHA512 9504124177d26eee6713c73cead5304279239b5a5684424fbccd7d8b15447c2671a2c759c4759eb503f096c9f833b083c4ca32f2f95eba751698f46dd8792e01 EBUILD cups-9999.ebuild 9005 BLAKE2B 2321c7ddf922a49e643962932888d7b99f1565328487a1f1cd3b631ee392d056aa7a509962c34d2373687edcd703bfbaadf8836efca698329b9ac526c4846f39 SHA512 2bf49d626434b7c1562386c71ac0d96f2f2f34eb57fa3f02d8dcfc3abfdfcf4f483850fd7e9342542c56a45a542c0ddd91a733648c6dc74db4e0dfd65ae861c8 MISC metadata.xml 528 BLAKE2B 5dedc19570fc6fa2c8ddf6578b30ec8fb1820fb5deb8e2b62cb0897b1f4805086b59cab33bc5e5a8992f4ce2995fba42ab441a77ccf8889b5c4b05da18fdd966 SHA512 c12285daaf0d3a141e7caead57525e8130fcf6859479ae275ed214a508934b15b4697a0cb3f0f5fb90c2931a1727b6919116f1651af6f5dd7eff2eaef7b41803 diff --git a/net-print/cups/cups-2.3.3_p2-r3.ebuild b/net-print/cups/cups-2.3.3_p2-r3.ebuild new file mode 100644 index 000000000000..2cf405ade5c8 --- /dev/null +++ b/net-print/cups/cups-2.3.3_p2-r3.ebuild @@ -0,0 +1,326 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic linux-info xdg multilib-minimal optfeature pam systemd toolchain-funcs + +MY_PV="${PV/_beta/b}" +MY_PV="${MY_PV/_rc/rc}" +MY_PV="${MY_PV/_p/op}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 +# EGIT_REPO_URI="https://github.com/apple/cups.git" + EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git" + [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} +else +# SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" + SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz" + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + fi +fi + +DESCRIPTION="The Common Unix Printing System" +HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" + +REQUIRED_USE="usb? ( threads )" +# upstream includes an interactive test which is a nono for gentoo +RESTRICT="test" + +BDEPEND=" + acct-group/lp + acct-group/lpadmin + virtual/pkgconfig +" +DEPEND=" + app-text/libpaper + sys-libs/zlib + acl? ( + kernel_linux? ( + sys-apps/acl + sys-apps/attr + ) + ) + dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= ) + ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) + systemd? ( sys-apps/systemd ) + usb? ( virtual/libusb:1 ) + X? ( x11-misc/xdg-utils ) + xinetd? ( sys-apps/xinetd ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] ) +" +RDEPEND="${DEPEND} + acct-group/lp + acct-group/lpadmin + selinux? ( sec-policy/selinux-cups ) +" +PDEPEND=">=net-print/cups-filters-1.0.43" + +PATCHES=( + "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" + "${FILESDIR}/${PN}-1.4.4-nostrip.patch" + "${FILESDIR}/${PN}-2.3.3-user-AR.patch" + # Upstream patches (from Debian and Fedora) + "${FILESDIR}/${PN}-2.3.3-timeout.patch" + "${FILESDIR}/${PN}-2.3.3-enforcing-read-limits.patch" + "${FILESDIR}/${PN}-2.3.3-manpage.patch" + "${FILESDIR}/${PN}-2.3.3-ipp-retry-validate.patch" +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/cups-config +) + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + #enewgroup lp -> acct-group/lp + # user lp already provided by baselayout + #enewuser lp -1 -1 -1 lp + #enewgroup lpadmin 106 + + if use kernel_linux; then + linux-info_pkg_setup + if ! linux_config_exists; then + ewarn "Can't check the linux kernel configuration." + ewarn "You might have some incompatible options enabled." + else + # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) + if use usb; then + if linux_chkconfig_present USB_PRINTER; then + elog "Your USB printers will be managed via libusb. In case you run into problems, " + elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" + elog "usblp kernel module." + elog "Alternatively, just disable the usb useflag for cups (your printer will still work)." + fi + else + #here we should warn user that he should enable it so he can print + if ! linux_chkconfig_present USB_PRINTER; then + ewarn "If you plan to use USB printers you should enable the USB_PRINTER" + ewarn "support in your kernel." + ewarn "Please enable it:" + ewarn " CONFIG_USB_PRINTER=y" + ewarn "in /usr/src/linux/.config or" + ewarn " Device Drivers --->" + ewarn " USB support --->" + ewarn " [*] USB Printer support" + ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." + fi + fi + fi + fi +} + +src_prepare() { + default + + # Remove ".SILENT" rule for verbose output (bug 524338). + sed 's#^.SILENT:##g' -i Makedefs.in || die + + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i install-sh || die + + # Do not add -Werror even for live ebuilds + sed '/WARNING_OPTIONS/s@-Werror@@' \ + -i config-scripts/cups-compiler.m4 || die + + AT_M4DIR=config-scripts eaclocal + eautoconf + + # custom Makefiles + multilib_copy_sources +} + +multilib_src_configure() { + export DSOFLAGS="${LDFLAGS}" + + # explicitly specify compiler wrt bug 524340 + # + # need to override KRB5CONFIG for proper flags + # https://github.com/apple/cups/issues/4423 + local myeconfargs=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config + --libdir="${EPREFIX}"/usr/$(get_libdir) + --localstatedir="${EPREFIX}"/var + --with-exe-file-perm=755 + --with-rundir="${EPREFIX}"/run/cups + --with-cups-user=lp + --with-cups-group=lp + --with-docdir="${EPREFIX}"/usr/share/cups/html + --with-system-groups=lpadmin + --with-xinetd="${EPREFIX}"/etc/xinetd.d + $(multilib_native_use_enable acl) + $(use_enable dbus) + $(use_enable debug) + $(use_enable debug debug-guards) + $(use_enable debug debug-printfs) + $(use_enable kerberos gssapi) + $(multilib_native_use_enable pam) + $(use_enable static-libs static) + $(use_enable threads) + $(use_enable ssl gnutls) + $(use_enable systemd) + $(multilib_native_use_enable usb libusb) + $(use_enable zeroconf avahi) + --disable-dnssd + $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) + ) + + # Handle empty LINGUAS properly, bug #771162 + if [ -n "${LINGUAS+x}" ] ; then + myeconfargs+=( + --with-languages="${LINGUAS}" + ) + fi + + if tc-is-static-only; then + myeconfargs+=( + --disable-shared + ) + fi + + # install in /usr/libexec always, instead of using /usr/lib/cups, as that + # makes more sense when facing multilib support. + sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die + + econf "${myeconfargs[@]}" + + sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die + sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die + sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die + + # additional path corrections needed for prefix, see bug 597728 + sed \ + -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \ + -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \ + -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \ + -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \ + -i Makedefs || die +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + emake libs + fi +} + +multilib_src_test() { + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + emake BUILDROOT="${D}" install + else + emake BUILDROOT="${D}" install-libs install-headers + dobin cups-config + fi +} + +multilib_src_install_all() { + dodoc {CHANGES,CREDITS,README}.md + + # move the default config file to docs + dodoc "${ED}"/etc/cups/cupsd.conf.default + rm "${ED}"/etc/cups/cupsd.conf.default || die + + # clean out cups init scripts + rm -r "${ED}"/etc/{init.d/cups,rc*} || die + + # install our init script + local neededservices=( + $(usex zeroconf avahi-daemon '') + $(usex dbus dbus '') + ) + [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" + cp "${FILESDIR}"/cupsd.init.d-r4 "${T}"/cupsd || die + sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die + doinitd "${T}"/cupsd + + if use pam ; then + rm "${ED}"/etc/pam.d/${PN} || die + pamd_mimic_system cups auth account + fi + + if use xinetd ; then + # correct path + sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ + "${ED}"/etc/xinetd.d/cups-lpd || die + # it is safer to disable this by default, bug #137130 + grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ + { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } + # write permission for file owner (root), bug #296221 + fperms u+w /etc/xinetd.d/cups-lpd + else + # always configure with --with-xinetd= and clean up later, + # bug #525604 + rm -r "${ED}"/etc/xinetd.d || die + fi + + keepdir /etc/cups/{interfaces,ppd,ssl} + + if ! use X ; then + rm -r "${ED}"/usr/share/applications || die + fi + + # create /etc/cups/client.conf, bug #196967 and #266678 + echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf + + # the following file is now provided by cups-filters: + rm -r "${ED}"/usr/share/cups/banners || die + + # the following are created by the init script + rm -r "${ED}"/var/cache || die + rm -r "${ED}"/run || die + + keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} /var/log/cups /var/spool/cups/tmp +} + +pkg_preinst() { + xdg_pkg_preinst +} + +pkg_postinst() { + # Update desktop file database and gtk icon cache (bug 370059) + xdg_pkg_postinst + + local v + + for v in ${REPLACING_VERSIONS}; do + if ! ver_test ${v} -ge 2.2.2-r2 ; then + ewarn "The cupsd init script switched to using pidfiles. Shutting down" + ewarn "cupsd will fail the next time. To fix this, please run once as root" + ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" + break + fi + done + + for v in ${REPLACING_VERSIONS}; do + elog + elog "For information about installing a printer and general cups setup" + elog "take a look at: https://wiki.gentoo.org/wiki/Printing" + break + done + + optfeature_header "CUPS may need installing the following for certain features to work:" + use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug 370059) + xdg_pkg_postrm +} diff --git a/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch b/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch new file mode 100644 index 000000000000..1782d122ae55 --- /dev/null +++ b/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch @@ -0,0 +1,29 @@ +From: Zdenek Dohnal +Date: Tue, 13 Apr 2021 15:47:37 +0200 +Subject: backend/usb-libusb.c: Revert enforcing read limits + +This commit reverts the change introduced by 2.2.12 [1] - its +implementation caused a regression with Lexmark filters. + +[1] https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35 + +Origin: upstream, https://github.com/OpenPrinting/cups/pull/174 +Bug: https://github.com/OpenPrinting/cups/issues/72 +--- + backend/usb-libusb.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c +index fbb0d9d..89b5182 100644 +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -1721,7 +1721,8 @@ static void *read_thread(void *reference) + * Make sure this loop executes no more than once every 250 miliseconds... + */ + +- if ((g.wait_eof || !g.read_thread_stop)) ++ if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) && ++ (g.wait_eof || !g.read_thread_stop)) + usleep(250000); + } + while (g.wait_eof || !g.read_thread_stop); diff --git a/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch b/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch new file mode 100644 index 000000000000..a677090cd91c --- /dev/null +++ b/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch @@ -0,0 +1,43 @@ +From 6e6999b1f74457b7fd6057a31f1d3606de19a05b Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Fri, 9 Apr 2021 10:20:04 -0400 +Subject: [PATCH] Retry Validate-Job once, if needed (Issue #132) + +--- + CHANGES.md | 1 + + backend/ipp.c | 14 +++++++++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/backend/ipp.c b/backend/ipp.c +index 63353a66d..020ab7fd4 100644 +--- a/backend/ipp.c ++++ b/backend/ipp.c +@@ -256,6 +257,7 @@ main(int argc, /* I - Number of command-line args */ + get_job_attrs = 0, /* Does printer support Get-Job-Attributes? */ + send_document = 0, /* Does printer support Send-Document? */ + validate_job = 0, /* Does printer support Validate-Job? */ ++ validate_retried = 0, /* Was Validate-Job request retried? */ + copies, /* Number of copies for job */ + copies_remaining; /* Number of copies remaining */ + const char *content_type, /* CONTENT_TYPE environment variable */ +@@ -1559,7 +1561,17 @@ main(int argc, /* I - Number of command-line args */ + ipp_status == IPP_STATUS_ERROR_BAD_REQUEST) + break; + else if (job_auth == NULL && ipp_status > IPP_STATUS_ERROR_BAD_REQUEST) ++ { ++ if (!validate_retried) ++ { ++ // Retry Validate-Job operation once, to work around known printer bug... ++ validate_retried = 1; ++ sleep(10); ++ continue; ++ } ++ + goto cleanup; ++ } + } + + /* +-- +2.26.3 + diff --git a/net-print/cups/files/cups-2.3.3-manpage.patch b/net-print/cups/files/cups-2.3.3-manpage.patch new file mode 100644 index 000000000000..db22adeeec4d --- /dev/null +++ b/net-print/cups/files/cups-2.3.3-manpage.patch @@ -0,0 +1,23 @@ +From: Didier Raboud +Date: Fri, 12 Feb 2021 13:47:22 +0100 +Subject: Let cups.1 point to client.conf.5, not client.conf.7 + +Bug: https://github.com/OpenPrinting/cups/pull/92 +Closes: #982303 +--- + man/cups.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/cups.1 b/man/cups.1 +index 706620d..751ad9a 100644 +--- a/man/cups.1 ++++ b/man/cups.1 +@@ -125,7 +125,7 @@ Printers that do not support IPP can be supported using applications such as + .BR ippeveprinter (1). + .SH SEE ALSO + .BR cancel (1), +-.BR client.conf (7), ++.BR client.conf (5), + .BR cupsctl (8), + .BR cupsd (8), + .BR lp (1), diff --git a/net-print/cups/files/cups-2.3.3-timeout.patch b/net-print/cups/files/cups-2.3.3-timeout.patch new file mode 100644 index 000000000000..280f71f2fad2 --- /dev/null +++ b/net-print/cups/files/cups-2.3.3-timeout.patch @@ -0,0 +1,26 @@ +From: Zdenek Dohnal +Date: Tue, 13 Apr 2021 15:44:14 +0200 +Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel + +Some older models malfunction if timeout is too short. + +Origin: upstream, https://github.com/OpenPrinting/cups/pull/174 +Bug: https://github.com/OpenPrinting/cups/issues/160 +Bug-Debian: https://bugs.debian.org/989073 +--- + backend/usb-libusb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c +index d6b0eb4..fbb0d9d 100644 +--- a/backend/usb-libusb.c ++++ b/backend/usb-libusb.c +@@ -1704,7 +1704,7 @@ static void *read_thread(void *reference) + readstatus = libusb_bulk_transfer(g.printer->handle, + g.printer->read_endp, + readbuffer, rbytes, +- &rbytes, 250); ++ &rbytes, 60000); + if (readstatus == LIBUSB_SUCCESS && rbytes > 0) + { + fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n", (int)rbytes); diff --git a/net-print/cups/files/cupsd.init.d-r4 b/net-print/cups/files/cupsd.init.d-r4 new file mode 100644 index 000000000000..3f65258fbe43 --- /dev/null +++ b/net-print/cups/files/cupsd.init.d-r4 @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors + +description="The Common Unix Printing System daemon" +command="/usr/sbin/cupsd" +command_args="-f -c /etc/cups/cupsd.conf -s /etc/cups/cups-files.conf" +pidfile="/run/cupsd.pid" +start_stop_daemon_args="-b -m --pidfile ${pidfile}" + +depend() { + use net + @neededservices@ + before nfs + after logger +} + +start_pre() { + checkpath -q -d -m 0775 -o root:lp /var/cache/cups + checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss + checkpath -q -d -m 0755 -o root:lp /run/cups + checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs +} diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest index b0b675f9b467..071c0135f972 100644 --- a/net-print/foomatic-db-ppds/Manifest +++ b/net-print/foomatic-db-ppds/Manifest @@ -1,4 +1,4 @@ AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04dd55acbae7fa648089ded8f10f3d61390c62e24ba5d491b3a4ac2fb7c9636db3c4895842da798c5a870972d334b71b31 SHA512 75ab0f16ce0c187553fc7bdcdc9a23ae8fecd50942d3ba0282ec2d4001f141904e6f93c8a9b6496ab2b0205a31d46a082ea304e8dcbc25f5e38c86ff696d7935 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe EBUILD foomatic-db-ppds-4.0.20190226.ebuild 833 BLAKE2B 881362cb462c4df160fd80398917761d08937dd10a24e6f5347bc2c2c9be8b4278fb687a13ea53a5e6028cfb1b6b1461a66275cb95677f7437060b0ab68afa5e SHA512 52c018e04d01dcf8d6c0c89afffcacdb1345098dce26657bf9a7b8a72e3b582e6026b090bb612cfbfcd8589e441e32eff8720d65b87c9f3d4de8f3fd2bd3fb49 -MISC metadata.xml 260 BLAKE2B ef27f93753b1b9b96d35941f8a39c7e3b1695a49bff8076cb92b718524ddf1449ffa97d26ae289ad493695a8bfbeadb6bee0030f649bef02e0ae155ca851713e SHA512 94c019f5d5e8bec9d817d4b192ae0b87effc9f73283800b6ee7b5fe50a85bf6e245eb9720c2d8f3b497b40c7e298969c5e23c5afe3af14384eee92e76afacc8c +MISC metadata.xml 284 BLAKE2B 36426f95cb354d191a324eb7a89eb8a6a18ba1c85403f6a7a39bd5f3872f7d48d7d4d59ace082d75e3c01227e02c87e846412044d5f478d3db505d70b60dada7 SHA512 fd6b64e299ddaf025ad25216c5c7010b6928ecd3f92b0d4fc72697a03551e17f6fbbf8478ab736483a4f219cb1d7da66075cd1b6b69850977ff836d562f63740 diff --git a/net-print/foomatic-db-ppds/metadata.xml b/net-print/foomatic-db-ppds/metadata.xml index 882504794e17..07456818fddc 100644 --- a/net-print/foomatic-db-ppds/metadata.xml +++ b/net-print/foomatic-db-ppds/metadata.xml @@ -5,4 +5,5 @@ printing@gentoo.org Gentoo Printing Project + diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest index 318ba40755f2..7a1891d022d6 100644 --- a/net-print/foomatic-db/Manifest +++ b/net-print/foomatic-db/Manifest @@ -1,7 +1,3 @@ -DIST foomatic-db-4.0-20170331.tar.xz 5083832 BLAKE2B 3c22869cc50f9e68e04bc9edaf6227764ede1566bf93311f1098d0022174911697a63685488be2c753205e40284ec22c31a64e672fee3851eeec920730b5a344 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc -DIST foomatic-db-4.0-20180126.tar.xz 5418608 BLAKE2B e11dbfc7e4cf121ba8b456820438b0418981c414c6a798dee463430dd8ccf65b424e1d597bc21b32929e858d0282b12df81fb419793bd34172b0c414619d2762 SHA512 1879e2601ad88262c99201bff5353ac40516985de72dd894eeeae2589ae2b82dd4dbfc972cb3ff43f209efb92753d4ed0ce584d89cd242fedc011511c45d8a87 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe -EBUILD foomatic-db-4.0.20170331.ebuild 1193 BLAKE2B 659143d2341385384f13f3a54a695e9427df7a44bd160fc5921a476ce79471436f5d53c3b89c34905c5cfa61d7476fe736f8b1d17c2e6d5139b52271ab867ac7 SHA512 70cfbf1e89e97a013623498287fee6730320a41704b315b4aec27f38a8fc71bf54faf073774217f9c81b3c290a35b9c6f0c25ad5f1dc242db8c5aad88529510b -EBUILD foomatic-db-4.0.20180126.ebuild 1208 BLAKE2B 9ea02390f164fb33a2b85b24fb02a9bcc2646074676ae4a90767354452e7c371ac01bab7f836c3bca5b3300df894bdfa9305c50a46d6a718b60c6f2d44df0bf8 SHA512 7a569304fd23ab104393f34bda347cea778d2e7ec2c9565d2b0df04bac1e757c98e9b9ca189c7e4a626b45efb40a54ca6fd223f0ff35e6a06ee36a59a402f257 -EBUILD foomatic-db-4.0.20190226.ebuild 1205 BLAKE2B a2b24f21d9c7092d8fa958a948b8cc17c2016ccc787af13340e45a6deace90dbf62df918792a83a4dcb304b6b6c7008700cb49efde32e26cea1dde612397e812 SHA512 18db4712e9273ec530f6ef57073734a1469e5085c251d758a594587f7855de029bf341afcbf3879a162bde7033d0e0806a2ca4dfb382082d8b31815a613497e8 -MISC metadata.xml 260 BLAKE2B ef27f93753b1b9b96d35941f8a39c7e3b1695a49bff8076cb92b718524ddf1449ffa97d26ae289ad493695a8bfbeadb6bee0030f649bef02e0ae155ca851713e SHA512 94c019f5d5e8bec9d817d4b192ae0b87effc9f73283800b6ee7b5fe50a85bf6e245eb9720c2d8f3b497b40c7e298969c5e23c5afe3af14384eee92e76afacc8c +EBUILD foomatic-db-4.0.20190226.ebuild 1202 BLAKE2B 141ce821655c6c75be3ee9962aee9215e2aae4e4fec37035f5385c24eb8b50ab9b6e8b21b1ab9de15f6bd835c9de3702a11063add807f8be441e273ce720f468 SHA512 e794015b64428aec28fdf7572bf38c4b34b7fb29a697ddbf17e9d79849741676a1bee79a2066bb6613e0a8bd6da5b081824a1bdd5755ab32b77860f40f7dafac +MISC metadata.xml 284 BLAKE2B 36426f95cb354d191a324eb7a89eb8a6a18ba1c85403f6a7a39bd5f3872f7d48d7d4d59ace082d75e3c01227e02c87e846412044d5f478d3db505d70b60dada7 SHA512 fd6b64e299ddaf025ad25216c5c7010b6928ecd3f92b0d4fc72697a03551e17f6fbbf8478ab736483a4f219cb1d7da66075cd1b6b69850977ff836d562f63740 diff --git a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild deleted file mode 100644 index 1d54962f0f7f..000000000000 --- a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator - -DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds" -HOMEPAGE="http://www.linuxprinting.org/foomatic.html" -SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="" - -DEPEND="" -RDEPEND=" - net-print/foomatic-db-engine - !net-print/foo2zjs[hp2600n]" - -S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})" - -src_prepare() { - # ppd files do not belong to this package - rm -r db/source/PPD || die -} - -src_configure() { - econf \ - --disable-gzip-ppds \ - --disable-ppds-to-cups -} - -src_install() { - default - rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die - # Avoid collision with foo2zjs, bug 185486 - rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml} || die -} diff --git a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild deleted file mode 100644 index dc60de17c674..000000000000 --- a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator - -DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds" -HOMEPAGE="http://www.linuxprinting.org/foomatic.html" -SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -DEPEND="" -RDEPEND=" - net-print/foomatic-db-engine - !net-print/foo2zjs[hp2600n]" - -S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})" - -src_prepare() { - # ppd files do not belong to this package - rm -r db/source/PPD || die - default -} - -src_configure() { - econf \ - --disable-gzip-ppds \ - --disable-ppds-to-cups -} - -src_install() { - default - rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die - # Avoid collision with foo2zjs, bug 185486 - rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml} || die -} diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild index e487f17abaf5..b559732c3d5b 100644 --- a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild +++ b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" diff --git a/net-print/foomatic-db/metadata.xml b/net-print/foomatic-db/metadata.xml index 882504794e17..07456818fddc 100644 --- a/net-print/foomatic-db/metadata.xml +++ b/net-print/foomatic-db/metadata.xml @@ -5,4 +5,5 @@ printing@gentoo.org Gentoo Printing Project + diff --git a/net-print/mtink/files/mtinkd.rc b/net-print/mtink/files/mtinkd.rc old mode 100755 new mode 100644 -- cgit v1.2.3