From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- net-print/Manifest.gz | Bin 6909 -> 6918 bytes net-print/cndrvcups-lb/Manifest | 2 +- net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild | 112 +++++++ net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild | 109 ------- net-print/cnijfilter2/Manifest | 2 +- net-print/cnijfilter2/cnijfilter2-5.50.ebuild | 4 +- net-print/cups-filters/Manifest | 8 +- net-print/cups-filters/cups-filters-1.21.2.ebuild | 137 --------- net-print/cups-filters/cups-filters-1.21.3.ebuild | 137 --------- net-print/cups-filters/cups-filters-1.21.5.ebuild | 137 +++++++++ net-print/cups-filters/cups-filters-1.21.6.ebuild | 137 +++++++++ net-print/cups-pk-helper/Manifest | 4 +- .../cups-pk-helper/cups-pk-helper-0.2.5.ebuild | 42 --- .../cups-pk-helper/cups-pk-helper-0.2.6.ebuild | 4 +- net-print/cups/Manifest | 10 +- net-print/cups/cups-2.2.10.ebuild | 337 +++++++++++++++++++++ net-print/cups/cups-2.2.7.ebuild | 4 +- net-print/cups/cups-2.3_beta5-r1.ebuild | 332 -------------------- net-print/cups/cups-2.3_beta6.ebuild | 332 ++++++++++++++++++++ .../files/cups-2.3_beta5-validation_fixes.patch | 69 ----- .../files/cups-2.3_beta6-usage_argument_fix.patch | 243 +++++++++++++++ net-print/epson-inkjet-printer-escpr/Manifest | 2 + .../epson-inkjet-printer-escpr-1.6.33.ebuild | 33 ++ net-print/hplip-plugin/Manifest | 2 + net-print/hplip-plugin/hplip-plugin-3.18.10.ebuild | 69 +++++ net-print/hplip/Manifest | 5 +- net-print/hplip/hplip-3.18.12.ebuild | 274 +++++++++++++++++ net-print/hplip/hplip-3.18.6-r2.ebuild | 274 ----------------- 28 files changed, 1700 insertions(+), 1121 deletions(-) create mode 100644 net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild delete mode 100644 net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild delete mode 100644 net-print/cups-filters/cups-filters-1.21.2.ebuild delete mode 100644 net-print/cups-filters/cups-filters-1.21.3.ebuild create mode 100644 net-print/cups-filters/cups-filters-1.21.5.ebuild create mode 100644 net-print/cups-filters/cups-filters-1.21.6.ebuild delete mode 100644 net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild create mode 100644 net-print/cups/cups-2.2.10.ebuild delete mode 100644 net-print/cups/cups-2.3_beta5-r1.ebuild create mode 100644 net-print/cups/cups-2.3_beta6.ebuild delete mode 100644 net-print/cups/files/cups-2.3_beta5-validation_fixes.patch create mode 100644 net-print/cups/files/cups-2.3_beta6-usage_argument_fix.patch create mode 100644 net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild create mode 100644 net-print/hplip-plugin/hplip-plugin-3.18.10.ebuild create mode 100644 net-print/hplip/hplip-3.18.12.ebuild delete mode 100644 net-print/hplip/hplip-3.18.6-r2.ebuild (limited to 'net-print') diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index 0891fe7134bf..4a0c7f440e7d 100644 Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest index a7108cd61074..c52f175bd0f1 100644 --- a/net-print/cndrvcups-lb/Manifest +++ b/net-print/cndrvcups-lb/Manifest @@ -2,5 +2,5 @@ DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B fa5f521f4eec375fa0d9efb7 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7 EBUILD cndrvcups-lb-3.50-r1.ebuild 2661 BLAKE2B 8d6efa1d90606289ca418beda23d0aeac3b7bed4ba39d5a5525d29bffda50ba826e798d9843fbf46ca952e26fa3f8149dfe8af1fb2a32f82bf05433caba951b2 SHA512 cc53d15407dd84597531b094b9365bd28d85eb4b52cabcd61bdb825b325a59b9261ad915f44ea1df279c7fe4d38846418a63da54864dff17ab05abb5f62a38d5 EBUILD cndrvcups-lb-3.50.ebuild 2612 BLAKE2B d96957081bcec6c14310fba0edb5e0106692548c9ada3e31432b9dbfd9a9602d2989a00dbbd7430d402ddfb2b69e371ecb6fa13a9b9883763280c2540ea315ff SHA512 428241bbc275f2ffdc4f82e43b75d9c065fad2531eac51e5037173431b6781cccbff1aae04aa384e162a611aa71e972cd93348db1197bc5e687dda93cda6a564 -EBUILD cndrvcups-lb-3.60.ebuild 2597 BLAKE2B 4a952bf9007e40454a86f7fcff984a564815ae932d65e7883b9e41f94176c86e3f766af059ca73ed5ea18e1314185e8f2df66c5c35107996d226f8154b318173 SHA512 a3e0ca1e78e0f4e4d889bcd13cdc4d8b0e971e4a02770d750e8ae391d9f685b41a3ca90fcf0ebb3a1e8f590afcc9eaab5521a9d81d2d69f54c26aca80ac2e236 +EBUILD cndrvcups-lb-3.60-r1.ebuild 2646 BLAKE2B 91764edf202e42838c643d090ba858edf37fe2b48ad2601a0a85f73340888c0641d4d32d614f4a69daf079622ce4d7cda469140b3f1614b9814468685638d9bc SHA512 7abff092725c0b915792cd31639da7f43147889c72157850449140bc82e87830f1808d3a40fc46412827b5748ea1e054186502b01f1cc28417205ea97e2c0d17 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild new file mode 100644 index 000000000000..8a3ad4427ce3 --- /dev/null +++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +MY_PV="$(ver_rs 1- '')" +SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken" + +DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux" +HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx" +SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/02/${SOURCES_NAME}.tar.gz" + +LICENSE="Canon-UFR-II" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=gnome-base/libglade-2.4:2.0 + >=net-print/cups-1.1.17 + ~net-print/cndrvcups-common-lb-${PV} + >=x11-libs/gtk+-2.4:2 + virtual/jpeg:62[abi_x86_32(-)] +" +DEPEND="${DEPEND}" + +S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}" + +MAKEOPTS+=" -j1" + +pkg_setup() { + # Don't raise a fuss over pre-built binaries + QA_PREBUILT=" + /usr/bin/cnpkbidi + /usr/bin/cnpkmoduleufr2 + /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0 + /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0 + /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0 + /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0 + /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0 + /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0 + " + QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0" +} + +src_unpack() { + unpack ${A} + cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die + unpack ./${P}-1.tar.gz +} + +change_dir() { + for i in pstoufr2cpca cngplp cngplp/files cpca ; do + cd "${i}" || die + "${@}" + cd "${S}" || die + done +} + +src_prepare() { + default + sed -i -e \ + "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \ + pstoufr2cpca/filter/Makefile.am || die + + export "LIBS=-lgmodule-2.0" + change_dir eautoreconf +} + +src_configure() { + change_dir econf +} + +src_install() { + default + einstalldocs + + find "${D}" -name '*.la' -delete || die + + insinto /usr/share/cups/model + doins ppd/*.ppd + + cd "${S}/data" || die + insinto /usr/share/caepcm + doins * + + cd "${S}/libs" || die + insinto /usr/share/cnpkbidi + doins cnpkbidi_info* + + insinto /usr/share/ufr2filter + doins ThLB* + + ABI=x86 + dobin cnpkbidi cnpkmoduleufr2 + dolib.so libcnlbcm.so.1.0 + dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1" + dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so" + for lib in *.so.?.?.?; do + dolib.so "${lib}" + dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" + dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" + done + + # c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(, bug #???? + # Skipped for now due to bug #642138 +# if [[ "$(get_libdir)" != lib ]]; then +# dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so +# fi +} diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild deleted file mode 100644 index bb09609625f5..000000000000 --- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_PV="$(ver_rs 1- '')" -SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken" - -DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux" -HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx" -SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/02/${SOURCES_NAME}.tar.gz" - -LICENSE="Canon-UFR-II" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] - >=gnome-base/libglade-2.4:2.0 - >=net-print/cups-1.1.17 - ~net-print/cndrvcups-common-lb-${PV} - >=x11-libs/gtk+-2.4:2 - virtual/jpeg:62[abi_x86_32(-)] -" -DEPEND="${DEPEND}" - -S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}" - -MAKEOPTS+=" -j1" - -pkg_setup() { - # Don't raise a fuss over pre-built binaries - QA_PREBUILT=" - /usr/bin/cnpkbidi - /usr/bin/cnpkmoduleufr2 - /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0 - /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0 - /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0 - " - QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0" -} - -src_unpack() { - unpack ${A} - cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die - unpack ./${P}-1.tar.gz -} - -change_dir() { - for i in pstoufr2cpca cngplp cngplp/files cpca ; do - cd "${i}" || die - "${@}" - cd "${S}" || die - done -} - -src_prepare() { - default - sed -i -e \ - "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \ - pstoufr2cpca/filter/Makefile.am || die - - export "LIBS=-lgmodule-2.0" - change_dir eautoreconf -} - -src_configure() { - change_dir econf -} - -src_install() { - default - einstalldocs - - find "${D}" -name '*.la' -delete || die - - cd "${S}/data" || die - insinto /usr/share/caepcm - doins * - - cd "${S}/libs" || die - insinto /usr/share/cnpkbidi - doins cnpkbidi_info* - - insinto /usr/share/ufr2filter - doins ThLB* - - ABI=x86 - dobin cnpkbidi cnpkmoduleufr2 - dolib.so libcnlbcm.so.1.0 - dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1" - dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so" - for lib in *.so.?.?.?; do - dolib.so "${lib}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}" - dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}" - done - - # c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(, bug #???? - # Skipped for now due to bug #642138 -# if [[ "$(get_libdir)" != lib ]]; then -# dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so -# fi -} diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest index cb3aabd38cf2..2ebccbfa369e 100644 --- a/net-print/cnijfilter2/Manifest +++ b/net-print/cnijfilter2/Manifest @@ -4,5 +4,5 @@ DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9 DIST cnijfilter2-source-5.50-1.tar.gz 1129057 BLAKE2B 20208b1fa679a4303b5f47ae733224fa1346277d539e62688ecbfaa6a1a9f7b01cb4742c299ec188d59787e4175896dfe8d812f8aa936977f8168d823216b239 SHA512 9a99d0230fb9498d2b17648e58009efa5812fe5c076c11fdc6c2afeec453e355c1e3406053330e965e46be23651df6b887d0edb20eebd564554a7bf31b155186 EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449baed0d9f845fb64852f0a3515694d6a24cb799f83d98074553808b6e3cadeb273a4b54c1a743d079658c5f093f1cadf SHA512 e316d08d3e04b5bdc2b3281c4e2d983b8bb4d4a46b7b32b088fa65c370f613ec3a4a6d48252f620125974212b4c235d42316ef73c7748fed940ab44442d09027 EBUILD cnijfilter2-5.40.ebuild 1515 BLAKE2B 5c7452ce92474cc403a1051b622e18ff257759bfd80b45c0e928ecf2a68e69a78eefa31ec60f29e1c4c9aa218dbab5141ccb1251a9fd46f171332dbf069975ae SHA512 0e75f8248fe1d14e2bede4e172e662492c7e2483c2dbebe66d1a8ba719df3b3c6da31f83dd2be7c71db98367a62f969a6a0ad1d7cf8ea68eb17bfdc4f6097171 -EBUILD cnijfilter2-5.50.ebuild 1515 BLAKE2B 2ef71b7fcf8ebd1183394d14cd93590f23f1a645e23d7b786be527a90dcc9d6fd4159bfa42a496edc494cc44e97e7f49f7b450398fa17f7997fad14d80995b3c SHA512 1da83c54d6c547e6f42ecde9dfce2a95a3603971315be556adf30ff234778fb19b19600e4df6d1ab071aa70c56bb8d3a6716be2f2a7bedbaa218369e436e4d6f +EBUILD cnijfilter2-5.50.ebuild 1510 BLAKE2B b4d914fa287c315528c6598821ff75a8b7f9b14d5fc605dba5b35794f19fa9573733ad3f1575fbc908c988a6547f27d4752161b3af93f5146f9d39cb9cc53052 SHA512 16189d363f5464c492b788dfc75c2f3b45f91489d3f93983d4c449f8e7df99263ba3ae7c3514ad71869c1f1de6a8373cbd10797ac1d0e08aa32f2484100e8b63 MISC metadata.xml 339 BLAKE2B aa954d512a8d86489f00bcaf9f59d4427e95e095b42ef7946456db0c9037fcda08a9940e22df160871fcf1d19d8c06852b707934a904fa680ed06726fcd5c735 SHA512 a8976b24c12b154f9cdcd8a6f31d10f35a039a51141eda7aaea0fa6e9f7f9d405745f4910c6f56d44fac6ecde6bd927dc8a1e10f995279816f1bc551667dedd5 diff --git a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild index eadbf778b1f9..b8e27bb386da 100644 --- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild +++ b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009110/01/${MY_P}.tar.gz" LICENSE="Canon-IJ" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND="virtual/libusb:1 diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 25db345fa076..e6916fea0de4 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -2,11 +2,11 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711 AUX cups-filters-1.20.4-poppler-0.67.0.patch 826 BLAKE2B 0d85c9e27c588f2bd3c3535a6a7fc83ed8d5657e71fda0fb402da5f562b60c9810675251d70c12b8a2652038c5685e10efc1b9bb6b6a422ce0008ac1da40a829 SHA512 0c3e5857e90ed959df97b658cae43e17c5f943b88b6a86bdcd9a4d44f2a684810d8e317ad53d61dbca4802f2a45e2f783b527400d3c0f039ff2264d6f92df676 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4 DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07 -DIST cups-filters-1.21.2.tar.xz 1473008 BLAKE2B fea7f0f92464f5e95f57f71b6f6bb5acc9cd6ccb8c97a6a54a40be4f462b76603879f85c9ae0a0c5f47d113e6de9642ee9707d7af1b5cf93f3c47a619db2be55 SHA512 07672737108e1593374fa95582e2c8ad7a3fec6202846ba85224c1c89f65b7b89de96ebf67841ec5d948fe556dddd06ae6a58ad6c5c0a25a82ce643c9384aaf0 -DIST cups-filters-1.21.3.tar.xz 1474152 BLAKE2B 7e5193b6d6989675fa9567cb76b7f29f411b28e251ff9c6fd8fafec9c9c3d914f21d7e51eb562820954b3cee70974c5a55351eb08a1f231fe820513a2ce92644 SHA512 2b00023ac4177046e3ab3c5b563b7bd92bb49e57e645e6e67e7b9358d00919e2d4ca43ef5d57684523d97f1f1df5d1014fc0a3a895476ce285ccb3ed2e3bc758 +DIST cups-filters-1.21.5.tar.xz 1474388 BLAKE2B 8e21302256c6da033e09b9b43da03edbe9f7345ec50497501522da773fc698494a674e66457570d8f43c081afc2787cdfc55d738ffe3397bf5fdd307bbb9952f SHA512 41ed3364cb0a87e8b2b2482f3c8de90eba63538682ad3fa1079908beadec5e975d9eda151d822e93f62dcc32fe2a6189cc02b6b7691640fb00434efec35c0f7a +DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e EBUILD cups-filters-1.20.4.ebuild 3558 BLAKE2B 3063fe64d43deea9c064553fb9da520a8c8d59fc113b1d26ce7e4a53d1b3a9d840b6cd0ad36bc22fac39ccc69ff85bbc7ece6aef98d6f5216c789bade6a8664f SHA512 d465bdd8dca34d128de311af00fe7b4787a854598c6ed976dc51527bfea7a3b433c3b2008afa42066c912c9c99194c66258351fbed8808f0991e149348ab64b7 -EBUILD cups-filters-1.21.2.ebuild 3502 BLAKE2B 17085b5c41c8e20f5c829a0a0ee3a19f646e056d5884be0d49bb1e53ca2b563b4d2d55aaba633d0aae9cb1d3f8a02495b2b539cfb7b5293ebfb05ee2c6544488 SHA512 1f49982ee5ce6d0a6c572d01abb3afb7744d8cab6b26284365c1716eb93f78926eec580bb0be5fc3951fa6aaf2abc96c7f9692a2c6da1a1ed9d5eb1cbece6ef6 -EBUILD cups-filters-1.21.3.ebuild 3499 BLAKE2B 3d905b568e5a6b0e35eedf4bf36d6e0cd8a4674ff5c9231f7060025042ce2bca9e57d7ae0e3eb17aa0a3ed3fdfdbf05867007374cb36bde15c2fdac3f7c6d4be SHA512 c05043f224c2b15b380057296fb263c5152677507b0a3ca5ddc87cdd68ac04083b996776328ea334a58cc458e4dbf08a0be3ea36b5f64798a86bd8d21a5827b4 +EBUILD cups-filters-1.21.5.ebuild 3499 BLAKE2B 3d905b568e5a6b0e35eedf4bf36d6e0cd8a4674ff5c9231f7060025042ce2bca9e57d7ae0e3eb17aa0a3ed3fdfdbf05867007374cb36bde15c2fdac3f7c6d4be SHA512 c05043f224c2b15b380057296fb263c5152677507b0a3ca5ddc87cdd68ac04083b996776328ea334a58cc458e4dbf08a0be3ea36b5f64798a86bd8d21a5827b4 +EBUILD cups-filters-1.21.6.ebuild 3499 BLAKE2B 3d905b568e5a6b0e35eedf4bf36d6e0cd8a4674ff5c9231f7060025042ce2bca9e57d7ae0e3eb17aa0a3ed3fdfdbf05867007374cb36bde15c2fdac3f7c6d4be SHA512 c05043f224c2b15b380057296fb263c5152677507b0a3ca5ddc87cdd68ac04083b996776328ea334a58cc458e4dbf08a0be3ea36b5f64798a86bd8d21a5827b4 EBUILD cups-filters-9999.ebuild 3593 BLAKE2B c5774a25045123e7ccc395470fc6df78bb8348f9738652c849bcab4b3287e11df23d171f54e6d53da1cb8a4e3838281a48ff63caa35732a824a00da9933075b0 SHA512 e7a2ecd21d0b1d225cb76365388bd67db61c38ff27065af1b2072f4f5f9b4fe49c5a7cc1801e8b03f5c3529f1d5ad2a896636827dc85558b28aaecf4bad2bda6 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a diff --git a/net-print/cups-filters/cups-filters-1.21.2.ebuild b/net-print/cups-filters/cups-filters-1.21.2.ebuild deleted file mode 100644 index 79068417916a..000000000000 --- a/net-print/cups-filters/cups-filters-1.21.2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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.1.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.21.3.ebuild b/net-print/cups-filters/cups-filters-1.21.3.ebuild deleted file mode 100644 index bf15e18628e9..000000000000 --- a/net-print/cups-filters/cups-filters-1.21.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2018 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.1.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.21.5.ebuild b/net-print/cups-filters/cups-filters-1.21.5.ebuild new file mode 100644 index 000000000000..bf15e18628e9 --- /dev/null +++ b/net-print/cups-filters/cups-filters-1.21.5.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2018 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.1.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.21.6.ebuild b/net-print/cups-filters/cups-filters-1.21.6.ebuild new file mode 100644 index 000000000000..bf15e18628e9 --- /dev/null +++ b/net-print/cups-filters/cups-filters-1.21.6.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2018 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.1.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-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest index dabaceb4c827..f643e370881c 100644 --- a/net-print/cups-pk-helper/Manifest +++ b/net-print/cups-pk-helper/Manifest @@ -1,5 +1,3 @@ -DIST cups-pk-helper-0.2.5.tar.xz 152620 BLAKE2B 341d3e6d961cbdf949105a55bc5734c81fe29c3cd855026ab4846bdb9f4bb191bbe2fe9720e3b8050d1350eea32809cb0395d3805ce2971e150c0f041a983097 SHA512 9fc0af517755482dc3787ce87df389adee41b826c4ccca25df69474812523fa265c3dcf31fbc1a75c1b680b9b6490a9c358ac30aed7570fa98f5287f02a2be40 DIST cups-pk-helper-0.2.6.tar.xz 162368 BLAKE2B 3dec9a32f577c35a426ec4bbf2f96b2e18e0cd7bbb8a43fd93a6104d8fbb01de15cc7a168ae67fe5f2dca34823c70ac5f61acc01d876130d6ae9f5b789491d23 SHA512 33f1b6f58f4772148bd1cfb8163dacaffd3cc62f2d03731710c98b765ebb8b87541cb9cf43e886880134c32db91a43c7142b1556a0abdf1449068031b0d5fbd3 -EBUILD cups-pk-helper-0.2.5.ebuild 1003 BLAKE2B 2b9c96bcd50c5d78edff22d93ed15f52163ef7676f3566762985e770feef4ee8252187f344d15043937c3a344f6269f30c07d8d048f4df1b11a5295dce770750 SHA512 ea16c7bc6c2759c4d63fc5842506dbcee879e796d5b3b488234ae8546531850ba9c5d23fbfa57ab28a531bca29a8cee5a57004f75a07bde5576fa9966d6fc4e4 -EBUILD cups-pk-helper-0.2.6.ebuild 1010 BLAKE2B c5a7acb8f2d74ed545d788816d073805867c6d32bac41084966e8978fb8c653b48b1a99f1f377cd524ad2f88c79fd6e22676a0ae4f4d3ae283c4658cdaa5d04d SHA512 ffaae80df552d328a648328ab8df57627e477d511d5368aab44a5f03cdbf10d1761acf8b1307c0a8b97db1c44e49671132f28a1eac5e3da88a62729c656633ba +EBUILD cups-pk-helper-0.2.6.ebuild 1005 BLAKE2B 34ec8168d585d81d07725183aa5e7156c5c50e21c6c7053fd11b49378151dae59f4514dedb7daee57043cf912bf2efb3d1e4ad25ed0417f5e562ac464836852e SHA512 583a938f83f850a78a485f08fc39837c17b0389acda75f5e3deee49f29a51c801392b7c7c1d43478c163e545f53741b61df41355ce88cb6fac5b6aa62530b6ec MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild deleted file mode 100644 index 9122aabc2190..000000000000 --- a/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/cups-pk-helper" -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="" - -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=" - >=dev-libs/glib-2.30.0:2 - net-print/cups - >=sys-auth/polkit-0.97 -" -RDEPEND="${COMMON_DEPEND} - sys-apps/dbus -" -DEPEND="${COMMON_DEPEND} - >=dev-util/gdbus-codegen-2.30.0 - >=dev-util/intltool-0.40.6 - virtual/pkgconfig - sys-devel/gettext -" - -src_prepare() { - DOCS="AUTHORS HACKING NEWS README" - - # Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773 - rm -v src/cph-iface-mechanism.{c,h} || die - - gnome2_src_prepare -} diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild index 7cb5d901f866..8d89524396c7 100644 --- a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild +++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" IUSE="" # Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92 diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 970d560bcc34..e6354877874c 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -4,16 +4,18 @@ AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6e AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d79475423242bbc407e934cdc00e4596ab05e3d7f87ca0feb7201f6696a8eef59fdb73630431364f12146f1d32743e272de054019acb8380 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf AUX cups-2.2.8-validation_fixes.patch 2606 BLAKE2B e585b0481db0f23f3a60453269c31e92f2fd27b2b9830d3ff93c726d62e9d0b12c3b7f3494daf89dc3c7533fba2ddb2709f9a43d42eff4ac0c5c3cb77c0e4d3b SHA512 58f633adacd380877c0241ceaacf8d13154245759d79f81912c93e5b2951b094653c58c3b01b6f76c10a910183f4064a713f43afe016d91e3cf6d5857f33f2f6 -AUX cups-2.3_beta5-validation_fixes.patch 2606 BLAKE2B e38c893e35eb6a4f6f334586e7b9b53c04561bcbd7e64ed9856bf19b75eb5f8550ea63c63dfb77394473a905ce2be3f2c3cd1200c26b67dca5350f898b5a63f7 SHA512 2c68ec2b0e41e798a0ce464dbd45cebd2554763f5f1e2b52b5b0b69f3067330fb994762f9c9db3b3b70e1c244f366cb628dea3c43984b60c1dc0282709883a54 +AUX cups-2.3_beta6-usage_argument_fix.patch 6888 BLAKE2B bdf5b245c02a5b1d078bf376e7801f818fda9aee019731a7c83a0c32c7a70625293cc824085e516bbfc33a0fe45f2ff0e645f112685daa62bba9a9bedccb5c95 SHA512 a4d9b27acfc795b365db0256540d6fbea61e9ebdeeafd9ecd386cc4d33fe0ce2b4eddfa227a66c8b3813f9ca3f7173f9ae013b93a9a80d84ae1341ef9632b028 AUX cups-2.3_rc1-no_pam.patch 4704 BLAKE2B 99d9726f43ebc6ebb7fcaa608b99f435dccdeaa53f8fd6b47b4735c084dec8852ab5b34d06f07293299f13a4d975cf9b5bfc44950910c58c409fdcb71dfec6ea SHA512 f5f0f850a954a970aa5129d518f7b84e1e5fbb57c4bf16d42eb09eac01ebb5280514a580938433525514d5cd57acfcb363aa972d783d7b6b23e8f30e01d5e1b1 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 +DIST cups-2.2.10-source.tar.gz 10403568 BLAKE2B 42937088758893772545fff7bbfbf4610ae34764b1e962110b7ea88940ddcba92376e55f4665b9815278de566daec07190ad78e5f2b1e37f905447a7fd17bf4e SHA512 1393987a263ebf20089dd3008ae4ed770a27a1f289032604eb9e18f2e863bd0e4215a70118f5a6d3940875625278b6798fbc9070e791ec559179c6cf7dc7b05f DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e DIST cups-2.2.8-source.tar.gz 10374921 BLAKE2B 3fc4d5cae3848cbb7fb1263b377210254dfa08d70a1218c7f20d5a277d0536791e071c50bac282ab2049e1cffddfe91438216ceb37ec279d7cb0ec7b57a315da SHA512 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261 DIST cups-2.2.9-source.tar.gz 10402885 BLAKE2B 6736a2f5efa6ee8eadeea6620b5750e16e3be2e1c46d6f5821146d21078d10cda8e993b111ae326863db93d0c36e55c26d1c91140f8a518759111bafc9c93996 SHA512 423d2a215a115d5f78ce73118e8a2e566662e5d7f8acbffea39e1bfefb2f48f94841c8b85d731b0786b682dc579df8dfb5508570225b5205a182fbb2cd6dd2a5 -DIST cups-2.3b5-source.tar.gz 10176856 BLAKE2B beda07a64ef463371e4e1f25b397caa9487f7acdc982fcfa7edee736a41f6a6875747c772e4c59e2d2746c8c508a0cc87f8608227592f5e1d9c8c48d956ab97c SHA512 48d45f090637bf32bdcc83106272efb8462ff609f74fbe4e82add7f851dcb9173126a1df186848c087d02e8c1441f31a70859faf2714b6ddb1f3738ef8dba60d -EBUILD cups-2.2.7.ebuild 9948 BLAKE2B 93f232963bb18833570171402bf98eb67a5dc4ab0a05fd224ce82dc71d12ec2698ea0d5e8ce5dd6030005d3392b053261bf22eee9943618146ba7bb3da8811fa SHA512 6bd4ff2b0c17db27ff65a93a5f3ecb61c2bc5c1e4a48621dbe14ba76dd7fb1fbdc9a4eb10a1f08aa9af57cf3afa0114217bbe84df9f5aca24b9cc47cb5625afd +DIST cups-2.3b6-source.tar.gz 10240934 BLAKE2B 16b7381617d97d5c68e7bdf971b2cbc81c8f33208e408e051fce9770cffebed3a9337296d3e9f95a9f0a4e76cffe3201b99207f83169b8397d11455964178f4f SHA512 f9f79bbc694e4bb4f37906f6dffad7c5067d86e07878ca73953ebf519d2637c23fded18646bd086cbd397e49de6b629fe9323f57ccfb2c9bf912c3bfd20b345e +EBUILD cups-2.2.10.ebuild 9894 BLAKE2B 4e70310a747b178a61bcaaaeb11422297876090c465bb3a94f18173a5dc82192fe4daf6b26fa891eb54203d7f8671f18942f43f8d25420551bde5ac7453f10e1 SHA512 7d2491a410d4904db8e4b3ac37b8caf9a01378c7ca0bc77d3f11d4c9c105dac14fe09c7165248de200aed4c784e8774155ca06eaa6bb47ff5b4c8bfe201f25a0 +EBUILD cups-2.2.7.ebuild 9944 BLAKE2B 8fd1425102b0ade58b8b70cbf3d9bb7df8910a8acaceff79cdc04a2b1f32a5d44272f819e74bd8459de371acf8e0356373c883eeac3e084447f21902e79a69f0 SHA512 51d41baeb24c3b84bde0b16a2f57b8822e4b460f4ab0f3ea19c075dbe871e9930924b4ce4772aaa04480bf2e1fe68f0ba223ace853455ca84acdd2cc5acb3e6c EBUILD cups-2.2.8-r1.ebuild 9948 BLAKE2B 7216a26222ee20e1839aa062a933755bf091c943a7e39f30d24d265ea3fcd5214291a02e8d531eb3b5b6c441e54e2cee4920c12b7b0d2ff97e76e2b09ba0b991 SHA512 f456adba3ce3b06e630999aa93cf77b47909e89391da6e1683aee5fcd7fc85797efef543ee6549ea9d1160b8178d745b688f220666b05384212aeb7619080de9 EBUILD cups-2.2.9.ebuild 9894 BLAKE2B 4e70310a747b178a61bcaaaeb11422297876090c465bb3a94f18173a5dc82192fe4daf6b26fa891eb54203d7f8671f18942f43f8d25420551bde5ac7453f10e1 SHA512 7d2491a410d4904db8e4b3ac37b8caf9a01378c7ca0bc77d3f11d4c9c105dac14fe09c7165248de200aed4c784e8774155ca06eaa6bb47ff5b4c8bfe201f25a0 -EBUILD cups-2.3_beta5-r1.ebuild 9724 BLAKE2B eb56666649dc74027e9212796ffbd854eac81c59006d64085e9ea56933c9567c6b6ba59209c32c759182f9368b0e6602da545afa297acb6985503340cb2ae39f SHA512 3c081372d84e805425ad67c117965a84b6ee921ffcd651877858c9a5f17cb7b118eda83d28706e41e8f908f86806eaf122cb4fb34a6ebe9008fb5502c57b2fde +EBUILD cups-2.3_beta6.ebuild 9715 BLAKE2B 71796fc8b417bdf7e4cef2699a95e4f4c36741c2feea5580a2ffe3874e58a7b03ffae28bcb088131fe576ec4ffcd4e0181df728a064a54580ae02b4bb35e8725 SHA512 2411ac3de4bde4ce49a1d4c32e79ca509f482ae0e661dddc87bc3061842098a58a2d98041afb70ea45ea06066efddc58dcaf6de177def817e904ae5382cbd128 EBUILD cups-9999.ebuild 9673 BLAKE2B a4b10549bb1e045347580400611de0dc637d23dbab783ff6a6524bfab05a44ea5dc1d9f7f14349028f0843a20ea04ff98fe563c610ad6f5fff00d90110e83029 SHA512 b5024f8e94d6f8e251f54a5c988b512d622ac454a49f84893a900ad63e65dcb565007f95a93b52301e1c0a16ba8cfca06f78edc476fa5c631222fcfed0153bf8 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717 diff --git a/net-print/cups/cups-2.2.10.ebuild b/net-print/cups/cups-2.2.10.ebuild new file mode 100644 index 000000000000..b5fcaa92de95 --- /dev/null +++ b/net-print/cups/cups-2.2.10.ebuild @@ -0,0 +1,337 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam python-single-r1 user java-pkg-opt-2 systemd toolchain-funcs + +MY_P="${P/_rc/rc}" +MY_P="${MY_P/_beta/b}" +MY_PV="${PV/_rc/rc}" +MY_PV="${MY_PV/_beta/b}" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/apple/cups.git" + if [[ ${PV} != 9999 ]]; then + EGIT_BRANCH=branch-${PV/.9999} + fi +else + #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" +fi + +DESCRIPTION="The Common Unix Printing System" +HOMEPAGE="https://www.cups.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" + +CDEPEND=" + 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}] ) + java? ( >=virtual/jre-1.6:* ) + kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) + !lprng-compat? ( !net-print/lprng ) + pam? ( virtual/pam ) + python? ( ${PYTHON_DEPS} ) + 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[${MULTILIB_USEDEP}] ) +" + +DEPEND="${CDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-cups ) +" + +PDEPEND=">=net-print/cups-filters-1.0.43" + +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + usb? ( threads ) +" + +# upstream includes an interactive test which is a nono for gentoo +RESTRICT="test" + +# systemd-socket.patch from Fedora +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" + "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" + "${FILESDIR}/${PN}-1.4.4-nostrip.patch" + "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" + "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/cups-config +) + +pkg_setup() { + enewgroup lp + enewuser lp -1 -1 -1 lp + enewgroup lpadmin 106 + + use python && python-single-r1_pkg_setup + + 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 "${S}"/Makedefs.in || die "sed failed" + + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + + AT_M4DIR=config-scripts eaclocal + eautoconf + + # custom Makefiles + multilib_copy_sources +} + +multilib_src_configure() { + export DSOFLAGS="${LDFLAGS}" + + einfo LINGUAS=\"${LINGUAS}\" + + # 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-languages="${LINGUAS}" + --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) + $(multilib_native_use_with java) + $(use_enable kerberos gssapi) + $(multilib_native_use_enable pam) + $(multilib_native_use_with python python "${PYTHON}") + $(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 + --without-perl + --without-php + $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) + ) + + if tc-is-static-only; then + myeconfargs+=( + --disable-shared + ) + fi + + econf "${myeconfargs[@]}" + + # install in /usr/libexec always, instead of using /usr/lib/cups, as that + # makes more sense when facing multilib support. + 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 -f "${ED%/}"/etc/cups/cupsd.conf.default + + # clean out cups init scripts + rm -rf "${ED%/}"/etc/{init.d/cups,rc*,pam.d/cups} + + # install our init script + local neededservices + use zeroconf && neededservices+=" avahi-daemon" + use dbus && neededservices+=" dbus" + [[ -n ${neededservices} ]] && neededservices="need${neededservices}" + cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die + sed -i \ + -e "s/@neededservices@/${neededservices}/" \ + "${T}"/cupsd || die + doinitd "${T}"/cupsd + + # install our pam script + pamd_mimic_system cups auth account + + 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 || die "fperms failed" + else + # always configure with --with-xinetd= and clean up later, + # bug #525604 + rm -rf "${ED%/}"/etc/xinetd.d + fi + + keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ + /var/log/cups /var/spool/cups/tmp + + 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/cups || die + rm -r "${ED%/}"/run || die + + # for the special case of running lprng and cups together, bug 467226 + if use lprng-compat ; then + rm -fv "${ED%/}"/usr/bin/{lp*,cancel} + rm -fv "${ED%/}"/usr/sbin/lp* + rm -fv "${ED%/}"/usr/share/man/man1/{lp*,cancel*} + rm -fv "${ED%/}"/usr/share/man/man8/lp* + ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." + ewarn "Unless you plan to install an exotic server setup, you most likely" + ewarn "do not want this. Disable the useflag then and all will be fine." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + # Update desktop file database and gtk icon cache (bug 370059) + gnome2_icon_cache_update + xdg_desktop_database_update + + local v + + for v in ${REPLACING_VERSIONS}; do + if ! ver_test ${v} -ge 2.2.2-r2 ; then + echo + 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" + echo + break + fi + done + + for v in ${REPLACING_VERSIONS}; do + echo + elog "For information about installing a printer and general cups setup" + elog "take a look at: https://wiki.gentoo.org/wiki/Printing" + echo + break + done +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug 370059) + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-print/cups/cups-2.2.7.ebuild b/net-print/cups/cups-2.2.7.ebuild index 600c940e5156..525aa68be5f6 100644 --- a/net-print/cups/cups-2.2.7.ebuild +++ b/net-print/cups/cups-2.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,7 +23,7 @@ if [[ ${PV} == *9999 ]]; then else #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" fi DESCRIPTION="The Common Unix Printing System" diff --git a/net-print/cups/cups-2.3_beta5-r1.ebuild b/net-print/cups/cups-2.3_beta5-r1.ebuild deleted file mode 100644 index f7c6d292faec..000000000000 --- a/net-print/cups/cups-2.3_beta5-r1.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam user systemd toolchain-funcs - -MY_PV="${PV/_rc/rc}" -MY_PV="${MY_PV/_beta/b}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/apple/cups.git" - if [[ ${PV} != 9999 ]]; then - EGIT_BRANCH=branch-${PV/.9999} - fi -else - #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" - if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" - fi -fi - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="https://www.cups.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" - -CDEPEND=" - 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}] ) - !lprng-compat? ( !net-print/lprng ) - pam? ( virtual/pam ) - 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[${MULTILIB_USEDEP}] ) -" - -DEPEND="${CDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] -" - -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-cups ) -" - -PDEPEND=">=net-print/cups-filters-1.0.43" - -REQUIRED_USE=" - usb? ( threads ) -" - -# upstream includes an interactive test which is a nono for gentoo -RESTRICT="test" - -# systemd-socket.patch from Fedora -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" - "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" - "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" - "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" - "${FILESDIR}/${P}-validation_fixes.patch" #657526 -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/cups-config -) - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup lp - 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 "${S}"/Makedefs.in || die "sed failed" - - # Fix install-sh, posix sh does not have 'function'. - sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" - - AT_M4DIR=config-scripts eaclocal - eautoconf - - # custom Makefiles - multilib_copy_sources -} - -multilib_src_configure() { - export DSOFLAGS="${LDFLAGS}" - - einfo LINGUAS=\"${LINGUAS}\" - - # 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-languages="${LINGUAS}" - --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) - ) - - if tc-is-static-only; then - myeconfargs+=( - --disable-shared - ) - fi - - econf "${myeconfargs[@]}" - - # install in /usr/libexec always, instead of using /usr/lib/cups, as that - # makes more sense when facing multilib support. - 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 -f "${ED%/}"/etc/cups/cupsd.conf.default - - # clean out cups init scripts - rm -rf "${ED%/}"/etc/{init.d/cups,rc*,pam.d/cups} - - # install our init script - local neededservices - use zeroconf && neededservices+=" avahi-daemon" - use dbus && neededservices+=" dbus" - [[ -n ${neededservices} ]] && neededservices="need${neededservices}" - cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die - sed -i \ - -e "s/@neededservices@/${neededservices}/" \ - "${T}"/cupsd || die - doinitd "${T}"/cupsd - - # install our pam script - pamd_mimic_system cups auth account - - 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 || die "fperms failed" - else - # always configure with --with-xinetd= and clean up later, - # bug #525604 - rm -rf "${ED%/}"/etc/xinetd.d - fi - - keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ - /var/log/cups /var/spool/cups/tmp - - 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/cups || die - rm -r "${ED%/}"/run || die - - # for the special case of running lprng and cups together, bug 467226 - if use lprng-compat ; then - rm -fv "${ED%/}"/usr/bin/{lp*,cancel} - rm -fv "${ED%/}"/usr/sbin/lp* - rm -fv "${ED%/}"/usr/share/man/man1/{lp*,cancel*} - rm -fv "${ED%/}"/usr/share/man/man8/lp* - ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." - ewarn "Unless you plan to install an exotic server setup, you most likely" - ewarn "do not want this. Disable the useflag then and all will be fine." - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - # Update desktop file database and gtk icon cache (bug 370059) - gnome2_icon_cache_update - xdg_desktop_database_update - - local v - - for v in ${REPLACING_VERSIONS}; do - if ! ver_test ${v} -ge 2.2.2-r2 ; then - echo - 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" - echo - break - fi - done - - for v in ${REPLACING_VERSIONS}; do - echo - elog "For information about installing a printer and general cups setup" - elog "take a look at: https://wiki.gentoo.org/wiki/Printing" - echo - break - done -} - -pkg_postrm() { - # Update desktop file database and gtk icon cache (bug 370059) - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/net-print/cups/cups-2.3_beta6.ebuild b/net-print/cups/cups-2.3_beta6.ebuild new file mode 100644 index 000000000000..4801eaf8b9a0 --- /dev/null +++ b/net-print/cups/cups-2.3_beta6.ebuild @@ -0,0 +1,332 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam user systemd toolchain-funcs + +MY_PV="${PV/_rc/rc}" +MY_PV="${MY_PV/_beta/b}" +MY_P="${PN}-${MY_PV}" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/apple/cups.git" + if [[ ${PV} != 9999 ]]; then + EGIT_BRANCH=branch-${PV/.9999} + fi +else + #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" + if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" + fi +fi + +DESCRIPTION="The Common Unix Printing System" +HOMEPAGE="https://www.cups.org/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" + +CDEPEND=" + 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}] ) + !lprng-compat? ( !net-print/lprng ) + pam? ( virtual/pam ) + 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[${MULTILIB_USEDEP}] ) +" + +DEPEND="${CDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-cups ) +" + +PDEPEND=">=net-print/cups-filters-1.0.43" + +REQUIRED_USE=" + usb? ( threads ) +" + +# upstream includes an interactive test which is a nono for gentoo +RESTRICT="test" + +# systemd-socket.patch from Fedora +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" + "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" + "${FILESDIR}/${PN}-1.4.4-nostrip.patch" + "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" + "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" + "${FILESDIR}/${P}-usage_argument_fix.patch" +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/cups-config +) + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup lp + 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 "${S}"/Makedefs.in || die "sed failed" + + # Fix install-sh, posix sh does not have 'function'. + sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + + AT_M4DIR=config-scripts eaclocal + eautoconf + + # custom Makefiles + multilib_copy_sources +} + +multilib_src_configure() { + export DSOFLAGS="${LDFLAGS}" + + einfo LINGUAS=\"${LINGUAS}\" + + # 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-languages="${LINGUAS}" + --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) + ) + + if tc-is-static-only; then + myeconfargs+=( + --disable-shared + ) + fi + + econf "${myeconfargs[@]}" + + # install in /usr/libexec always, instead of using /usr/lib/cups, as that + # makes more sense when facing multilib support. + 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 -f "${ED%/}"/etc/cups/cupsd.conf.default + + # clean out cups init scripts + rm -rf "${ED%/}"/etc/{init.d/cups,rc*,pam.d/cups} + + # install our init script + local neededservices + use zeroconf && neededservices+=" avahi-daemon" + use dbus && neededservices+=" dbus" + [[ -n ${neededservices} ]] && neededservices="need${neededservices}" + cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die + sed -i \ + -e "s/@neededservices@/${neededservices}/" \ + "${T}"/cupsd || die + doinitd "${T}"/cupsd + + # install our pam script + pamd_mimic_system cups auth account + + 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 || die "fperms failed" + else + # always configure with --with-xinetd= and clean up later, + # bug #525604 + rm -rf "${ED%/}"/etc/xinetd.d + fi + + keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ + /var/log/cups /var/spool/cups/tmp + + 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/cups || die + rm -r "${ED%/}"/run || die + + # for the special case of running lprng and cups together, bug 467226 + if use lprng-compat ; then + rm -fv "${ED%/}"/usr/bin/{lp*,cancel} + rm -fv "${ED%/}"/usr/sbin/lp* + rm -fv "${ED%/}"/usr/share/man/man1/{lp*,cancel*} + rm -fv "${ED%/}"/usr/share/man/man8/lp* + ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." + ewarn "Unless you plan to install an exotic server setup, you most likely" + ewarn "do not want this. Disable the useflag then and all will be fine." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + # Update desktop file database and gtk icon cache (bug 370059) + gnome2_icon_cache_update + xdg_desktop_database_update + + local v + + for v in ${REPLACING_VERSIONS}; do + if ! ver_test ${v} -ge 2.2.2-r2 ; then + echo + 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" + echo + break + fi + done + + for v in ${REPLACING_VERSIONS}; do + echo + elog "For information about installing a printer and general cups setup" + elog "take a look at: https://wiki.gentoo.org/wiki/Printing" + echo + break + done +} + +pkg_postrm() { + # Update desktop file database and gtk icon cache (bug 370059) + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/net-print/cups/files/cups-2.3_beta5-validation_fixes.patch b/net-print/cups/files/cups-2.3_beta5-validation_fixes.patch deleted file mode 100644 index 29e2533eeb16..000000000000 --- a/net-print/cups/files/cups-2.3_beta5-validation_fixes.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 1d677f11f1e3353524d46c2842188eccfcdcd5a2 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Mon, 11 Jun 2018 09:37:34 -0400 -Subject: [PATCH] Fix regressions in ippValidateAttribute (Issue #5322, Issue - #5330) - -diff --git a/cups/ipp.c b/cups/ipp.c -index 95d53cc44..325de02b9 100644 ---- a/cups/ipp.c -+++ b/cups/ipp.c -@@ -5033,16 +5033,19 @@ ippValidateAttribute( - break; - } - -- if (*ptr < ' ' || *ptr == 0x7f) -- { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text); -- return (0); -- } -- else if (*ptr) -- { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text); -- return (0); -- } -+ if (*ptr) -+ { -+ if (*ptr < ' ' || *ptr == 0x7f) -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ else -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ } - - if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1)) - { -@@ -5091,16 +5094,19 @@ ippValidateAttribute( - break; - } - -- if (*ptr < ' ' || *ptr == 0x7f) -- { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text); -- return (0); -- } -- else if (*ptr) -+ if (*ptr) - { -- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text); -- return (0); -- } -+ if (*ptr < ' ' || *ptr == 0x7f) -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ else -+ { -+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text); -+ return (0); -+ } -+ } - - if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1)) - { diff --git a/net-print/cups/files/cups-2.3_beta6-usage_argument_fix.patch b/net-print/cups/files/cups-2.3_beta6-usage_argument_fix.patch new file mode 100644 index 000000000000..d77a5bba28ea --- /dev/null +++ b/net-print/cups/files/cups-2.3_beta6-usage_argument_fix.patch @@ -0,0 +1,243 @@ +From 065632e2095bcb32f15a370633e60d6a6a3dd78e Mon Sep 17 00:00:00 2001 +From: Michael R Sweet +Date: Sat, 8 Dec 2018 08:12:52 -0500 +Subject: [PATCH] Fix compile errors - not sure why these didn't show up + before... + +--- + cups/adminutil.c | 197 ----------------------------------------------- + scheduler/main.c | 2 +- + 2 files changed, 1 insertion(+), 198 deletions(-) + +diff --git a/cups/adminutil.c b/cups/adminutil.c +index 5ecada44c..1a5067f1b 100644 +--- a/cups/adminutil.c ++++ b/cups/adminutil.c +@@ -32,12 +32,6 @@ static http_status_t get_cupsd_conf(http_t *http, _cups_globals_t *cg, + time_t last_update, char *name, + size_t namelen, int *remote); + static void invalidate_cupsd_cache(_cups_globals_t *cg); +-static void write_option(cups_file_t *dstfp, int order, +- const char *name, const char *text, +- const char *attrname, +- ipp_attribute_t *suppattr, +- ipp_attribute_t *defattr, int defval, +- int valcount); + + + /* +@@ -1330,88 +1324,6 @@ cupsAdminSetServerSettings( + } + + +-/* +- * 'do_samba_command()' - Do a SAMBA command. +- */ +- +-static int /* O - Status of command */ +-do_samba_command(const char *command, /* I - Command to run */ +- const char *address, /* I - Address for command */ +- const char *subcmd, /* I - Sub-command */ +- const char *authfile, /* I - Samba authentication file */ +- FILE *logfile) /* I - Optional log file */ +-{ +-#ifdef _WIN32 +- return (1); /* Always fail on Windows... */ +- +-#else +- int status; /* Status of command */ +- int pid; /* Process ID of child */ +- +- +- if (logfile) +- _cupsLangPrintf(logfile, +- _("Running command: %s %s -N -A %s -c \'%s\'"), +- command, address, authfile, subcmd); +- +- if ((pid = fork()) == 0) +- { +- /* +- * Child goes here, redirect stdin/out/err and execute the command... +- */ +- +- int fd = open("/dev/null", O_RDONLY); +- +- if (fd > 0) +- { +- dup2(fd, 0); +- close(fd); +- } +- +- if (logfile) +- dup2(fileno(logfile), 1); +- else if ((fd = open("/dev/null", O_WRONLY)) > 1) +- { +- dup2(fd, 1); +- close(fd); +- } +- +- dup2(1, 2); +- +- execlp(command, command, address, "-N", "-A", authfile, "-c", subcmd, +- (char *)0); +- exit(errno); +- } +- else if (pid < 0) +- { +- status = -1; +- +- if (logfile) +- _cupsLangPrintf(logfile, _("Unable to run \"%s\": %s"), +- command, strerror(errno)); +- } +- else +- { +- /* +- * Wait for the process to complete... +- */ +- +- while (wait(&status) != pid); +- } +- +- if (logfile) +- _cupsLangPuts(logfile, ""); +- +- DEBUG_printf(("9do_samba_command: status=%d", status)); +- +- if (WIFEXITED(status)) +- return (WEXITSTATUS(status)); +- else +- return (-WTERMSIG(status)); +-#endif /* _WIN32 */ +-} +- +- + /* + * 'get_cupsd_conf()' - Get the current cupsd.conf file. + */ +@@ -1527,112 +1439,3 @@ invalidate_cupsd_cache( + cg->cupsd_num_settings = 0; + cg->cupsd_settings = NULL; + } +- +- +-/* +- * 'write_option()' - Write a CUPS option to a PPD file. +- */ +- +-static void +-write_option(cups_file_t *dstfp, /* I - PPD file */ +- int order, /* I - Order dependency */ +- const char *name, /* I - Option name */ +- const char *text, /* I - Option text */ +- const char *attrname, /* I - Attribute name */ +- ipp_attribute_t *suppattr, /* I - IPP -supported attribute */ +- ipp_attribute_t *defattr, /* I - IPP -default attribute */ +- int defval, /* I - Default value number */ +- int valcount) /* I - Number of values */ +-{ +- int i; /* Looping var */ +- +- +- cupsFilePrintf(dstfp, "*JCLOpenUI *%s/%s: PickOne\n" +- "*OrderDependency: %d JCLSetup *%s\n", +- name, text, order, name); +- +- if (defattr->value_tag == IPP_TAG_INTEGER) +- { +- /* +- * Do numeric options with a range or list... +- */ +- +- cupsFilePrintf(dstfp, "*Default%s: %d\n", name, +- defattr->values[defval].integer); +- +- if (suppattr->value_tag == IPP_TAG_RANGE) +- { +- /* +- * List each number in the range... +- */ +- +- for (i = suppattr->values[0].range.lower; +- i <= suppattr->values[0].range.upper; +- i ++) +- { +- cupsFilePrintf(dstfp, "*%s %d: \"", name, i); +- +- if (valcount == 1) +- cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n", +- attrname, i); +- else if (defval == 0) +- cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname, i); +- else if (defval < (valcount - 1)) +- cupsFilePrintf(dstfp, ",%d\"\n", i); +- else +- cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", i); +- } +- } +- else +- { +- /* +- * List explicit numbers... +- */ +- +- for (i = 0; i < suppattr->num_values; i ++) +- { +- cupsFilePrintf(dstfp, "*%s %d: \"", name, suppattr->values[i].integer); +- +- if (valcount == 1) +- cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n", attrname, +- suppattr->values[i].integer); +- else if (defval == 0) +- cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname, +- suppattr->values[i].integer); +- else if (defval < (valcount - 1)) +- cupsFilePrintf(dstfp, ",%d\"\n", suppattr->values[i].integer); +- else +- cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", suppattr->values[i].integer); +- } +- } +- } +- else +- { +- /* +- * Do text options with a list... +- */ +- +- cupsFilePrintf(dstfp, "*Default%s: %s\n", name, +- defattr->values[defval].string.text); +- +- for (i = 0; i < suppattr->num_values; i ++) +- { +- cupsFilePrintf(dstfp, "*%s %s: \"", name, +- suppattr->values[i].string.text); +- +- if (valcount == 1) +- cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\n\"\n*End\n", attrname, +- suppattr->values[i].string.text); +- else if (defval == 0) +- cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\"\n", attrname, +- suppattr->values[i].string.text); +- else if (defval < (valcount - 1)) +- cupsFilePrintf(dstfp, ",%s\"\n", suppattr->values[i].string.text); +- else +- cupsFilePrintf(dstfp, ",%s\n\"\n*End\n", +- suppattr->values[i].string.text); +- } +- } +- +- cupsFilePrintf(dstfp, "*JCLCloseUI: *%s\n\n", name); +-} +diff --git a/scheduler/main.c b/scheduler/main.c +index ce7df89c0..5b00efae2 100644 +--- a/scheduler/main.c ++++ b/scheduler/main.c +@@ -155,7 +155,7 @@ main(int argc, /* I - Number of command-line args */ + for (i = 1; i < argc; i ++) + { + if (!strcmp(argv[i], "--help")) +- usage(); ++ usage(0); + else if (argv[i][0] == '-') + { + for (opt = argv[i] + 1; *opt != '\0'; opt ++) diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest index 7f155bd93389..b52a43b09f3b 100644 --- a/net-print/epson-inkjet-printer-escpr/Manifest +++ b/net-print/epson-inkjet-printer-escpr/Manifest @@ -2,9 +2,11 @@ AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475a DIST epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz 3632456 BLAKE2B d642c494b2a0cb5fa6921541a4d87e6f1110eb71a5e959758d8f29df0d675a5a2586d88cd48bb75cdda4684d67ec78e50da22d892ae4ef380bb960dcf3a7f1aa SHA512 310664c6521ac15418d3f0ac1330c842871e357eff9f83be52a5942c58354b3717bdca7d04b848ef2e7a9be6140dcbd0c485c3a9845833325689686f39d7f743 DIST epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz 3740610 BLAKE2B 848e4f44e9f86ea568660771f8620d7343293f2efa5e5eb06800b2b833356a65dae53041b8a7a6d8921b0795c42564699e9120405401d3974a5b67862a14d42a SHA512 e78e1a0d9439fc8366d4ee9a001171a09077867f3b07feb5ac2f779ede19432ad232ab96413e6563f7d3c03154ba235cadfe61b354879245ded6d424d435fe24 DIST epson-inkjet-printer-escpr-1.6.17-1lsb3.2.tar.gz 3866776 BLAKE2B 18affa25a78aad2be94b45ee5d81c347397a3c5ae8dbace7c1f34bdd0cdad61e8dcd68f80fc09b20fb347593535bb039083c67a8ea6d34400c96a581d2f236a4 SHA512 b9711dc75c87832b24a6dc2225cd15ca4d68224ce2eaca55312f73e0dcebd3d31af0da1a81672fef003dda1001753d21bc06c92cb70a609effcdc928d8702a1e +DIST epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz 4402012 BLAKE2B a200ebb94460ff5d6b8731d66ccaa8d7423d8f249871183d3e8e321e2fba84dfca3d72638901c7d81344de8713e765de59ff6e6d579599ec9c565b10bb9e4a0c SHA512 b7af8c69cff0869410a3dfad3204bb908f42070fc2721e1037631d5d5da972a800e195df27ef8e62418a9b927adcbedb2dfe77a6d189d34841f20789aa41eca1 DIST epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz 3277627 BLAKE2B c975d323707027aa36c61a6ec60c4985fee958b433941bf3246dfcd9d50c6fcc61768ee11bbf03fa22e11e295fb514898e898542e34be0876f3d6d84a2f53627 SHA512 31c3e11f9a19de592727318d8714940c62a3ee7a443fe5b1e51e8f995e536b427d4054e47438645f333816a44accb7c880f8b6e74e9973c072a07016ee94b7da EBUILD epson-inkjet-printer-escpr-1.6.10.ebuild 874 BLAKE2B 820e28779c7a403ac9a241c38864d3442f03daae85915a03611de33e0cd65cf6e1451ae3265d1903b9d6f80e174dd8c28c22feed60f52aa9ed7299ab9a1c9eb1 SHA512 a101e2511b97d94a144d0084fbaf56dc38dd8d368645f9aa13909ceb7921e4c080f9bbce3c8643f25a24f6028374cefa64738c55fc7623d4d116c74598a6df35 EBUILD epson-inkjet-printer-escpr-1.6.15.ebuild 874 BLAKE2B 8a964847e13359295e2d1e1f06434a2f928b3d0bf6729bc370dae536b5938612ca8d6ec0aa9aa0bdd821dc00fcb3d232633778d4a91ce70f7f0eaaac7a23d68c SHA512 230518eaa845205c05c1224cb019481a733e0ebc542565bf44b39e640a8da5a04c87ef261f5758568c12cbddeba4a6326705d898e021dfcd3c3a5c71c3d43a01 EBUILD epson-inkjet-printer-escpr-1.6.17.ebuild 874 BLAKE2B 9e678564ebfb2cd8d055e1ae3df5ba9b80c5026ac464bd357220e342c07feefa7e077efa55b99458adf3e537609ef04f2e37bff51a2fbd2823be4191d8fe8584 SHA512 b0ef22eda7b576f2e49db3586c2d05f9fc4632fee1d67778a5566d01fe704075de020ac876c6f33217c3467717798b683cbdd9728e5cf1a12ddc9a27a376175a +EBUILD epson-inkjet-printer-escpr-1.6.33.ebuild 870 BLAKE2B 78f09f3ad1f605bbf0ec092241669e2f306c32546820234cf9c1fa624f96e52e8d4a796882bae295ba6eeded4442a692abb19562acd9d7a4225877a5cb5abd78 SHA512 a17cfb20e8c3a948d81ee619983e6963c028a606e5d85171c9aae7845b2642b958b68741f4bacb97ed74a47460bb1dd47cd44438e9e094a9820d4df02fcf2fdd EBUILD epson-inkjet-printer-escpr-1.6.5.ebuild 873 BLAKE2B c0589229396d882b9203abcebba3400456e4f79cc828be8231218a3d64984809472b8877f4f76c9556b133dad75cd263ed1482df7dbaaec2822d08917046a64d SHA512 451eb21acdcba8769b398b60ff9a49b5476d45a1c4d2d243f1ef8aed4c38311bb19ceaac256faad4a8a95dc9b2afdfbcd1a589d5e69fbbd750ea78da1c6673f5 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild new file mode 100644 index 000000000000..ab755a3fed5b --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.33.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)" +HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/08/70/14/e33b7a89e843b3ac97dcab773f03fbac7769f147/epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="net-print/cups" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/1.6.5-warnings.patch" ) + +src_configure() { + econf --disable-shared + + # Makefile calls ls to generate a file list which is included in Makefile.am + # Set the collation to C to avoid automake being called automatically + unset LC_ALL + export LC_COLLATE=C +} + +src_install() { + emake -C ppd DESTDIR="${D}" install + emake -C src DESTDIR="${D}" install + einstalldocs +} diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest index 0057af6283da..d0b675d4ef22 100644 --- a/net-print/hplip-plugin/Manifest +++ b/net-print/hplip-plugin/Manifest @@ -1,3 +1,5 @@ +DIST hplip-3.18.10-plugin.run 7324725 BLAKE2B 62e7ba436a32c70a0ad0ae009f192035e1152689ce0e032ec45fae11e8ff0470a2c04a5b243e1857dceb6bd65de2381291f6b1bdcdf8fae5ca6ebb92da15823c SHA512 86f393689d1afbaa43ec049d7c1150acd210ce100adbae8ec6f354d215d8bf2f6cc26acefdab840f933b2f5e11f8a731b79b99b528b7a3e455f283b0f7438a07 DIST hplip-3.18.6-plugin.run 2065663 BLAKE2B 501a37dd504250225ddad9712259e0e1b564aa034e433f24d277c5609fa95580417da1a0ae040a4624ff48806a3b34ec56ff31aed843e9f0f0b68b304d2ebd9e SHA512 7b5eb2f43dd014df25ccd9e72dd7efc069db47921f2de650b2ff993dbee60056063edeee6593be7d35019212daf623fff9696b13508a808db92128f5c81bde76 +EBUILD hplip-plugin-3.18.10.ebuild 1635 BLAKE2B ae1570a85138b53a21ee01c9b6c2eed85b4f22f4040666289d2bf52bdc5df0ef063574e767109fec86d3f24765149774918e9aa39247df5d0b2af56b25dfffcc SHA512 e039e8f25c210638d6098e06e51861b5c35400554fba867abd533f2aa89584abc6c62546bdad04b5fb4ce6dc61bc9d33ef9b7a0ae9d3ed3a7b3b42c45c2888d2 EBUILD hplip-plugin-3.18.6.ebuild 1551 BLAKE2B d034eacc21cb423a79ccd668d322d40f23aed57392d75aa75b10f3f90f634d96510e5e87c485b04bca566cfdc7bb59056f75a13493e90e92ad4ea13ffe4198f8 SHA512 6ed4f208ec25a1805ed377749d9232ed59f890eaedcdbc1f58fa6c2b41eb77ea52d8dad9f7beec5ad8b156eac22384956faddf458562febf7e20ed1b88bff356 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.10.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.10.ebuild new file mode 100644 index 000000000000..d598946893c6 --- /dev/null +++ b/net-print/hplip-plugin/hplip-plugin-3.18.10.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit udev unpacker + +DESCRIPTION="Proprietary plugins and firmware for HPLIP" +HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins" +#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run" +SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run" +LICENSE="hplip-plugin" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + ~net-print/hplip-${PV} + virtual/udev +" +DEPEND="" + +S=${WORKDIR} + +HPLIP_HOME=/usr/share/hplip + +# Binary prebuilt package +QA_PRESTRIPPED=" + /usr/share/hplip/fax/plugins/fax_marvell.so + /usr/share/hplip/prnt/plugins/hbpl1.so + /usr/share/hplip/prnt/plugins/lj.so + /usr/share/hplip/scan/plugins/bb_escl.so + /usr/share/hplip/scan/plugins/bb_marvell.so + /usr/share/hplip/scan/plugins/bb_soapht.so + /usr/share/hplip/scan/plugins/bb_soap.so +" + +# License does not allow us to redistribute the "source" package +RESTRICT="mirror" + +src_unpack() { + unpack_makeself "hplip-${PV}-plugin.run" +} + +src_install() { + local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32') + + insinto "${HPLIP_HOME}"/data/firmware + doins *.fw.gz + + for plugin in *-${hplip_arch}.so; do + local plugin_type=prnt + case "${plugin}" in + fax_*) plugin_type=fax ;; + bb_*) plugin_type=scan ;; + esac + + exeinto "${HPLIP_HOME}"/${plugin_type}/plugins + newexe ${plugin} ${plugin/-${hplip_arch}} + done + + mkdir -p "${ED}/var/lib/hp/" + cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_ + [plugin] + installed = 1 + eula = 1 + version = ${PV} + _EOF_ +} diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest index df5e9ed9ff3f..a989f4339d02 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -1,9 +1,10 @@ DIST hplip-3.18.10-patches-1.tar.xz 12344 BLAKE2B e557798ae4b9b23c85cf7084233bb403f1f5ec03e36ee91bcf44c4be4f810db7119d997857c1e1ac27ab2e39e62fd148b85e93bdf2379fe62218fb86c9fc21cf SHA512 99a185ec87c8a75f302764a3f1e19dda601779bf002e08552a6fc8bb7a270e4348817c90b42ab7ae7d9e7a270dff1aa1596ca8051cbd831435ffc980b7fd3999 DIST hplip-3.18.10.tar.gz 24572132 BLAKE2B a0bfd40c61f3d08c5ef30fbe88bcc78a73081f806cec1c3456f44cc80156cb2470f9b9d97cd9bd43674e6c0ff6756033fe9427c6e67a7a626ad3f00741a39ae5 SHA512 8e744608f1da0e24afbeea814973363d95bbff15a7430c8471d5a53c4a9e772b141e5cd7e69ea03826d1b2e4544e9aabaedc148f2b6577339ef9b2a6d4431c96 +DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf +DIST hplip-3.18.12.tar.gz 24588202 BLAKE2B f2ffa6d0d54e467c03ccf9e74accb62ef69842001a00e8c4e6fd68b40c4daff5896fcdd69d37b5e50be2b837918058a5c9071615ab77c1ce83fffc546ff98c02 SHA512 7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed -DIST hplip-3.18.6-patches-2.tar.xz 10632 BLAKE2B 7f0732e082bf44bfd5818a86f35f95a61c5ec6d0218a2be448746a950081d6fb551aea8183763de20154ab40f77f430941d14fa537e367f59d05fc9f0f182f7c SHA512 94be17d18075ea702a1fedec7ae9cc8ac55dfe5d0b2f8f4004412ae3bb84140aac11bb7f45d0ef8f06cbd560daa37859f14aedce87dc39b8368dbd07c7b85733 DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f EBUILD hplip-3.18.10.ebuild 7733 BLAKE2B a6f9db14610255b99834c58ce94c328f7fbcca4488ea51505f375c0304112ee468fab19ee1323ace169a68acde6da3a83712e571f2ef8eed4de5715d01a8ab04 SHA512 b1e8d9db2e3f798de9e51dcd371225e5b8c8efa4bfe1b116e395c2748ad74d26bd9c38ff10eef4cd1de6e0194b9d4c5a7d67b374b0c751f0cf28be4c8e7d8818 -EBUILD hplip-3.18.6-r2.ebuild 7732 BLAKE2B 19746e3f88431c49a7e6cdcc69f321120e6bb6f2a52985b43aee4d3f4098c19173d3c3509a5b87cff19a900629c9ff8e49f4cb8418a2b2c85dc69d8d7c5b4af0 SHA512 5acd5ca51222b736adeb8fbd5628d27855ecbba8a228327d9f1b46266317df01ff125a234074b68041eaded9c036d3079ac6128094f96f586d147bbe7c74419a +EBUILD hplip-3.18.12.ebuild 7733 BLAKE2B 9c1161044d8e4b31a65faf9ca6bb8e8e53ba5adff5e84224e9f3f9ecf17f2f481564dfe4b0c548788e5aa0d549c7d92ac5478a670da3cd8f39b42d2a0d898a57 SHA512 070c5928290133832008863cd9f5c98cbc16d0a2dd9e77b92e49b169b2ccaa06e69f2d9d9b57b2b19a297167b087bc3d8fbfaaf8a2ea7fbaaa25ff8aa4b5cfcc EBUILD hplip-3.18.6.ebuild 7817 BLAKE2B 0a3ae6abfb6db06d51c13fae58cd90f17246bac765ba7e69d5632163ac8b2e521f5be379e2b6cf179b821fe1c3b4f215c710bce4c44a3628d611e3c8490023fa SHA512 f5793ed25258974257e4b8e6099b6d43ef52a18f37cac925e8af607e6f27f01e165549e490ed5c86f6f2d3655d1283dc1bc6c47dfce773f72d40faabce61928e MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6 diff --git a/net-print/hplip/hplip-3.18.12.ebuild b/net-print/hplip/hplip-3.18.12.ebuild new file mode 100644 index 000000000000..b652a5c8e62c --- /dev/null +++ b/net-print/hplip/hplip-3.18.12.ebuild @@ -0,0 +1,274 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE="threads,xml" + +# 14 and 15 spit out a lot of warnings about subdirs +WANT_AUTOMAKE="1.13" + +inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev + +DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools" +HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing" +SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz + https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" + +COMMON_DEPEND=" + net-print/cups + virtual/jpeg:0 + hpijs? ( net-print/cups-filters[foomatic] ) + !minimal? ( + ${PYTHON_DEPS} + sys-apps/dbus + !libusb0? ( virtual/libusb:1 ) + libusb0? ( virtual/libusb:0 ) + scanner? ( media-gfx/sane-backends ) + snmp? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + net-analyzer/net-snmp + ) + ) +" +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + ${COMMON_DEPEND} +" +RDEPEND=" + ${COMMON_DEPEND} + app-text/ghostscript-gpl + !minimal? ( + >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') + fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) + kernel_linux? ( virtual/udev ) + qt5? ( + >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] + libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] ) + ) + scanner? ( + >=dev-python/reportlab-3.2[${PYTHON_USEDEP}] + >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}] + X? ( + || ( + kde? ( kde-misc/skanlite ) + media-gfx/xsane + media-gfx/sane-frontends + ) + ) + ) + ) + policykit? ( sys-auth/polkit ) +" + +REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${WORKDIR}/patches" +) + +CONFIG_CHECK="~PARPORT ~PPDEV" +ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)." + +#DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +For more information on setting up your printer please take +a look at the hplip section of the gentoo printing guide: +https://wiki.gentoo.org/wiki/Printing + +Any user who wants to print must be in the lp group. +" + +pkg_setup() { + use !minimal && python-single-r1_pkg_setup + + use scanner && ! use X && ewarn "You need USE=X for the scanner GUI." + + if ! use hpcups && ! use hpijs ; then + ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver," + ewarn "which is probably not what you want." + ewarn "You will almost certainly not be able to print." + fi + + if use minimal ; then + ewarn "Installing driver portions only, make sure you know what you are doing." + ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver" + ewarn "is installed. If both USE flags are set hpijs overrides hpcups." + else + use parport && linux-info_pkg_setup + fi +} + +src_prepare() { + default + + if use !minimal ; then + python_export EPYTHON PYTHON + python_fix_shebang . + fi + + # Make desktop files follow the specification + # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680 + # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324 + sed -i -e '/^Categories=/s/Application;//' \ + -e '/^Encoding=.*/d' hplip.desktop.in || die + sed -i -e '/^Categories=/s/Application;//' \ + -e '/^Version=.*/d' \ + -e '/^Comment=.*/d' hplip-systray.desktop.in || die + + # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725 + # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847, + # https://bugs.launchpad.net/hplip/+bug/500086 + local udevdir=$(get_udevdir) + sed -i -e "s|/etc/udev|${udevdir}|g" \ + $(find . -type f -exec grep -l /etc/udev {} +) || die + + # Force recognition of Gentoo distro by hp-check + sed -i \ + -e "s:file('/etc/issue', 'r').read():'Gentoo':" \ + installer/core_install.py || die + + eautoreconf +} + +src_configure() { + local myconf drv_build minimal_build + + if use libusb0 ; then + myconf="${myconf} --enable-libusb01_build" + else + myconf="${myconf} --disable-libusb01_build" + fi + + if use hpcups ; then + drv_build="$(use_enable hpcups hpcups-install)" + if use static-ppds ; then + drv_build="${drv_build} --enable-cups-ppd-install" + drv_build="${drv_build} --disable-cups-drv-install" + else + drv_build="${drv_build} --enable-cups-drv-install" + drv_build="${drv_build} --disable-cups-ppd-install" + fi + else + drv_build="--disable-hpcups-install" + drv_build="${drv_build} --disable-cups-drv-install" + drv_build="${drv_build} --disable-cups-ppd-install" + fi + + if use hpijs ; then + drv_build="${drv_build} $(use_enable hpijs hpijs-install)" + if use static-ppds ; then + drv_build="${drv_build} --enable-foomatic-ppd-install" + drv_build="${drv_build} --disable-foomatic-drv-install" + else + drv_build="${drv_build} --enable-foomatic-drv-install" + drv_build="${drv_build} --disable-foomatic-ppd-install" + fi + else + drv_build="${drv_build} --disable-hpijs-install" + drv_build="${drv_build} --disable-foomatic-drv-install" + drv_build="${drv_build} --disable-foomatic-ppd-install" + fi + + if use minimal ; then + if use hpijs ; then + minimal_build="--enable-hpijs-only-build" + else + minimal_build="--disable-hpijs-only-build" + fi + if use hpcups ; then + minimal_build="${minimal_build} --enable-hpcups-only-build" + else + minimal_build="${minimal_build} --disable-hpcups-only-build" + fi + fi + + # disable class driver for now + econf \ + --disable-cups11-build \ + --disable-lite-build \ + --disable-foomatic-rip-hplip-install \ + --disable-shadow-build \ + --disable-qt3 \ + --disable-qt4 \ + --disable-udev_sysfs_rules \ + --with-cupsbackenddir=$(cups-config --serverbin)/backend \ + --with-cupsfilterdir=$(cups-config --serverbin)/filter \ + --with-docdir=/usr/share/doc/${PF} \ + --with-htmldir=/usr/share/doc/${PF}/html \ + ${myconf} \ + ${drv_build} \ + ${minimal_build} \ + --enable-hpps-install \ + --disable-class-driver \ + $(use_enable doc doc-build) \ + $(use_enable fax fax-build) \ + $(use_enable !minimal gui-build) \ + $(use_enable !minimal dbus-build) \ + $(use_enable parport pp-build) \ + $(use_enable policykit) \ + $(use_enable qt5) \ + $(use_enable scanner scan-build) \ + $(use_enable snmp network-build) + + # hpijs ppds are created at configure time but are not installed (3.17.11) + + # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip + # The hpcups driver does not use foomatic-rip + #local i + #for i in ppd/hpijs/*.ppd.gz ; do + # rm -f ${i}.temp || die + # gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + # gzip > ${i}.temp || die + # mv ${i}.temp ${i} || die + #done +} + +src_install() { + # Disable parallel install + # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018 + emake -j1 DESTDIR="${D}" install + einstalldocs + # default + + # Installed by sane-backends + # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023 + rm -f "${ED}"/etc/sane.d/dll.conf || die + + # Remove desktop and autostart files + # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770 + use qt5 || { + rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg + } + + rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die + rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die + + # Remove hal fdi files + rm -rf "${ED}"/usr/share/hal || die + + find "${D}" -name '*.la' -delete || die + + if use !minimal ; then + python_export EPYTHON PYTHON + python_optimize "${ED}"/usr/share/hplip + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-print/hplip/hplip-3.18.6-r2.ebuild b/net-print/hplip/hplip-3.18.6-r2.ebuild deleted file mode 100644 index a7c9aebea45e..000000000000 --- a/net-print/hplip/hplip-3.18.6-r2.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE="threads,xml" - -# 14 and 15 spit out a lot of warnings about subdirs -WANT_AUTOMAKE="1.13" - -inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev - -DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools" -HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing" -SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz - https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.6-patches-2.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X" - -COMMON_DEPEND=" - net-print/cups - virtual/jpeg:0 - hpijs? ( net-print/cups-filters[foomatic] ) - !minimal? ( - ${PYTHON_DEPS} - sys-apps/dbus - !libusb0? ( virtual/libusb:1 ) - libusb0? ( virtual/libusb:0 ) - scanner? ( media-gfx/sane-backends ) - snmp? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - net-analyzer/net-snmp - ) - ) -" -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - ${COMMON_DEPEND} -" -RDEPEND=" - ${COMMON_DEPEND} - app-text/ghostscript-gpl - !minimal? ( - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*') - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*') - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] ) - kernel_linux? ( virtual/udev ) - qt5? ( - >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] - libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] ) - ) - scanner? ( - >=dev-python/reportlab-3.2[${PYTHON_USEDEP}] - >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}] - X? ( - || ( - kde? ( kde-misc/skanlite ) - media-gfx/xsane - media-gfx/sane-frontends - ) - ) - ) - ) - policykit? ( sys-auth/polkit ) -" - -REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${WORKDIR}/patches" -) - -CONFIG_CHECK="~PARPORT ~PPDEV" -ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)." - -#DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -For more information on setting up your printer please take -a look at the hplip section of the gentoo printing guide: -https://wiki.gentoo.org/wiki/Printing - -Any user who wants to print must be in the lp group. -" - -pkg_setup() { - use !minimal && python-single-r1_pkg_setup - - use scanner && ! use X && ewarn "You need USE=X for the scanner GUI." - - if ! use hpcups && ! use hpijs ; then - ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver," - ewarn "which is probably not what you want." - ewarn "You will almost certainly not be able to print." - fi - - if use minimal ; then - ewarn "Installing driver portions only, make sure you know what you are doing." - ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver" - ewarn "is installed. If both USE flags are set hpijs overrides hpcups." - else - use parport && linux-info_pkg_setup - fi -} - -src_prepare() { - default - - if use !minimal ; then - python_export EPYTHON PYTHON - python_fix_shebang . - fi - - # Make desktop files follow the specification - # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324 - sed -i -e '/^Categories=/s/Application;//' \ - -e '/^Encoding=.*/d' hplip.desktop.in || die - sed -i -e '/^Categories=/s/Application;//' \ - -e '/^Version=.*/d' \ - -e '/^Comment=.*/d' hplip-systray.desktop.in || die - - # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847, - # https://bugs.launchpad.net/hplip/+bug/500086 - local udevdir=$(get_udevdir) - sed -i -e "s|/etc/udev|${udevdir}|g" \ - $(find . -type f -exec grep -l /etc/udev {} +) || die - - # Force recognition of Gentoo distro by hp-check - sed -i \ - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \ - installer/core_install.py || die - - eautoreconf -} - -src_configure() { - local myconf drv_build minimal_build - - if use libusb0 ; then - myconf="${myconf} --enable-libusb01_build" - else - myconf="${myconf} --disable-libusb01_build" - fi - - if use hpcups ; then - drv_build="$(use_enable hpcups hpcups-install)" - if use static-ppds ; then - drv_build="${drv_build} --enable-cups-ppd-install" - drv_build="${drv_build} --disable-cups-drv-install" - else - drv_build="${drv_build} --enable-cups-drv-install" - drv_build="${drv_build} --disable-cups-ppd-install" - fi - else - drv_build="--disable-hpcups-install" - drv_build="${drv_build} --disable-cups-drv-install" - drv_build="${drv_build} --disable-cups-ppd-install" - fi - - if use hpijs ; then - drv_build="${drv_build} $(use_enable hpijs hpijs-install)" - if use static-ppds ; then - drv_build="${drv_build} --enable-foomatic-ppd-install" - drv_build="${drv_build} --disable-foomatic-drv-install" - else - drv_build="${drv_build} --enable-foomatic-drv-install" - drv_build="${drv_build} --disable-foomatic-ppd-install" - fi - else - drv_build="${drv_build} --disable-hpijs-install" - drv_build="${drv_build} --disable-foomatic-drv-install" - drv_build="${drv_build} --disable-foomatic-ppd-install" - fi - - if use minimal ; then - if use hpijs ; then - minimal_build="--enable-hpijs-only-build" - else - minimal_build="--disable-hpijs-only-build" - fi - if use hpcups ; then - minimal_build="${minimal_build} --enable-hpcups-only-build" - else - minimal_build="${minimal_build} --disable-hpcups-only-build" - fi - fi - - # disable class driver for now - econf \ - --disable-cups11-build \ - --disable-lite-build \ - --disable-foomatic-rip-hplip-install \ - --disable-shadow-build \ - --disable-qt3 \ - --disable-qt4 \ - --disable-udev_sysfs_rules \ - --with-cupsbackenddir=$(cups-config --serverbin)/backend \ - --with-cupsfilterdir=$(cups-config --serverbin)/filter \ - --with-docdir=/usr/share/doc/${PF} \ - --with-htmldir=/usr/share/doc/${PF}/html \ - ${myconf} \ - ${drv_build} \ - ${minimal_build} \ - --enable-hpps-install \ - --disable-class-driver \ - $(use_enable doc doc-build) \ - $(use_enable fax fax-build) \ - $(use_enable !minimal gui-build) \ - $(use_enable !minimal dbus-build) \ - $(use_enable parport pp-build) \ - $(use_enable policykit) \ - $(use_enable qt5) \ - $(use_enable scanner scan-build) \ - $(use_enable snmp network-build) - - # hpijs ppds are created at configure time but are not installed (3.17.11) - - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip - # The hpcups driver does not use foomatic-rip - #local i - #for i in ppd/hpijs/*.ppd.gz ; do - # rm -f ${i}.temp || die - # gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - # gzip > ${i}.temp || die - # mv ${i}.temp ${i} || die - #done -} - -src_install() { - # Disable parallel install - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018 - emake -j1 DESTDIR="${D}" install - einstalldocs - # default - - # Installed by sane-backends - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023 - rm -f "${ED}"/etc/sane.d/dll.conf || die - - # Remove desktop and autostart files - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770 - use qt5 || { - rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg - } - - rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die - rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die - - # Remove hal fdi files - rm -rf "${ED}"/usr/share/hal || die - - find "${D}" -name '*.la' -delete || die - - if use !minimal ; then - python_export EPYTHON PYTHON - python_optimize "${ED}"/usr/share/hplip - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} -- cgit v1.2.3