diff options
Diffstat (limited to 'net-print')
20 files changed, 481 insertions, 793 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz Binary files differindex ba13de4155be..7c2bd039a1dd 100644 --- a/net-print/Manifest.gz +++ b/net-print/Manifest.gz diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest index 2ebccbfa369e..a56a7ec092a8 100644 --- a/net-print/cnijfilter2/Manifest +++ b/net-print/cnijfilter2/Manifest @@ -1,8 +1,11 @@ AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d +AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657 DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495 DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859 DIST cnijfilter2-source-5.50-1.tar.gz 1129057 BLAKE2B 20208b1fa679a4303b5f47ae733224fa1346277d539e62688ecbfaa6a1a9f7b01cb4742c299ec188d59787e4175896dfe8d812f8aa936977f8168d823216b239 SHA512 9a99d0230fb9498d2b17648e58009efa5812fe5c076c11fdc6c2afeec453e355c1e3406053330e965e46be23651df6b887d0edb20eebd564554a7bf31b155186 +DIST cnijfilter2-source-5.70-1.tar.gz 1366033 BLAKE2B 0d03c4c4f4bc00ea91cc46db6554252997242dcc98ee65fe856528848843cdd6d2195e3839d8dad71f1fc722cfbb2e65730020665d9095d0a93900840659477d SHA512 3d9afe4ca6b042015898f4fc08d991a4af2c55010c9d98807a12dade01d2655f74b7e4896abeb933c93faeca954bcfdadfd6e359ee8efe5952623fc635500729 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 1510 BLAKE2B b4d914fa287c315528c6598821ff75a8b7f9b14d5fc605dba5b35794f19fa9573733ad3f1575fbc908c988a6547f27d4752161b3af93f5146f9d39cb9cc53052 SHA512 16189d363f5464c492b788dfc75c2f3b45f91489d3f93983d4c449f8e7df99263ba3ae7c3514ad71869c1f1de6a8373cbd10797ac1d0e08aa32f2484100e8b63 +EBUILD cnijfilter2-5.70.ebuild 1520 BLAKE2B 526de368e3ada4e675ab6bd8b3cfc84fa6314a233be92ca072de738945011a1a76f017c0da1d6516d8879d2abfcd9636f4999860984298d5f3135b81b242c978 SHA512 44f3775f11b07387448703a7102a7d498ece24f5750e141a6838b994e4a9050a19b990514fe9a17a138683349372e40cfb6f178f3ded7cc6e6d6266d6f1e0d45 MISC metadata.xml 339 BLAKE2B aa954d512a8d86489f00bcaf9f59d4427e95e095b42ef7946456db0c9037fcda08a9940e22df160871fcf1d19d8c06852b707934a904fa680ed06726fcd5c735 SHA512 a8976b24c12b154f9cdcd8a6f31d10f35a039a51141eda7aaea0fa6e9f7f9d405745f4910c6f56d44fac6ecde6bd927dc8a1e10f995279816f1bc551667dedd5 diff --git a/net-print/cnijfilter2/cnijfilter2-5.70.ebuild b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild new file mode 100644 index 000000000000..3b5058bc8153 --- /dev/null +++ b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_P="${PN}-source-${PV}-1" + +DESCRIPTION="IJ Printer Driver" +HOMEPAGE="https://www.canon.it/" +SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009930/01/${MY_P}.tar.gz" + +LICENSE="Canon-IJ" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="virtual/libusb:1 + dev-libs/libxml2 + net-print/cups" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MY_P} + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_prepare() { + default + DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" + LIBDIR=com/libs_bin$(usex amd64 64 32) + for d in ${DIRS}; do + mv "${d}"/configure.{in,ac} || die + done + echo "AC_INIT([${PN}], [${PV}])" >> configure.ac + echo "AM_INIT_AUTOMAKE" >> configure.ac + echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac + echo "AC_CONFIG_FILES([Makefile])" >> configure.ac + echo "AC_OUTPUT()" >> configure.ac + echo "SUBDIRS= ${DIRS}" >> Makefile.am + sed -i \ + -e "/^CFLAGS/d" \ + */configure.ac || die + eautoreconf + cd ${LIBDIR} + rm libcn*.so || die + ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die + ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die + ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die + ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die + + cd - +} + +src_configure() { + LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin" +} + +src_install() { + default + insinto /usr/share/ppd/cupsfilters + doins ppd/*ppd + dolib.so ${LIBDIR}/* +} diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch new file mode 100644 index 000000000000..fcb2d62ad7b5 --- /dev/null +++ b/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch @@ -0,0 +1,58 @@ +--- a/cmdtocanonij2/filter/Makefile.am 2018-01-14 18:14:20.645473030 +0100 ++++ b/cmdtocanonij2/filter/Makefile.am 2018-01-14 18:14:36.078219959 +0100 +@@ -1,4 +1,4 @@ +-filterdir=$(libdir)/cups/filter ++filterdir=$(libexecdir)/cups/filter + + filter_PROGRAMS= cmdtocanonij2 + +--- a/cmdtocanonij3/filter/Makefile.am 2018-01-14 18:14:20.645473030 +0100 ++++ b/cmdtocanonij3/filter/Makefile.am 2018-01-14 18:14:36.078219959 +0100 +@@ -1,4 +1,4 @@ +-filterdir=$(libdir)/cups/filter ++filterdir=$(libexecdir)/cups/filter + + filter_PROGRAMS= cmdtocanonij3 + +--- a/cnijbe2/src/Makefile.am 2018-01-14 19:25:48.823470121 +0100 ++++ b/cnijbe2/src/Makefile.am 2018-01-14 19:25:59.316275741 +0100 +@@ -1,6 +1,6 @@ + ## Process this file with automake to produce Makefile.in + +-backend_bindir = /usr/lib/cups/backend ++backend_bindir = $(libexecdir)/cups/backend + backend_bin_PROGRAMS = cnijbe2 + transform = + +--- a/rastertocanonij/src/Makefile.am 2018-01-14 21:31:33.053307218 +0100 ++++ b/rastertocanonij/src/Makefile.am 2018-01-14 21:31:41.106166479 +0100 +@@ -1,4 +1,4 @@ +-filterdir=$(libdir)/cups/filter ++filterdir=$(libexecdir)/cups/filter + + filter_PROGRAMS= rastertocanonij + +--- a/tocanonij/src/Makefile.am 2018-01-15 22:38:14.236460663 +0100 ++++ b/tocanonij/src/Makefile.am 2018-01-15 22:38:39.184018933 +0100 +@@ -1,7 +1,8 @@ + INCLUDES = \ + -I$(top_srcdir)/include/cncl + +-bin_PROGRAMS= tocanonij ++filterdir=$(libexecdir)/cups/filter ++filter_PROGRAMS= tocanonij + + tocanonij_SOURCES= \ + main.c +--- a/tocnpwg/src/Makefile.am 2018-01-15 22:42:43.759703863 +0100 ++++ b/tocnpwg/src/Makefile.am 2018-01-15 22:43:10.442232986 +0100 +@@ -2,7 +2,8 @@ + INCLUDES = \ + @XML_2_CFLAGS@ + +-bin_PROGRAMS= tocnpwg ++filterdir=$(libexecdir)/cups/filter ++filter_PROGRAMS= tocnpwg + + tocnpwg_SOURCES= \ + main.c mkpset.c diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index 83b2b426b46c..460700822ae5 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -1,15 +1,12 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3 +AUX cups-filters-1.25.4-missing_cstring.patch 540 BLAKE2B fdc22ccbc624cc6dc9fb6a30cf461d3142b5ab794708e7456663efce7a2ed207159bfad564dc790d77e8f4b6ab7f1e95768f889523c5c2a9c33d3a4408d46fc6 SHA512 0eaf6ec88a74890ae4045bf954895c48e843f346a2ac8114bd3adf9f6c49b511001e5d9cf22dc4c8215b09b58e9acbec80b1f3d20b1b3c2909694f65bbfe5b4b DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a DIST cups-filters-1.22.6.tar.xz 1477584 BLAKE2B 7d833c3e97c510eabcc906bbd01d4d1ef2bf3106d963bdec7f735942e96a830c53ec2c03a4ef580d9fc01f19bae3962c1bd2a98d2af7f03f71988ae374366fee SHA512 6c1c46bd74f700b3ab0a46cb4b5b7ecc93000122e9deb20b43878d876cbe2ceeeb4a3c16ef6de00497b10447d04f2689a5d939d0d49212e7274cc51b4617c296 -DIST cups-filters-1.23.0.tar.xz 1477900 BLAKE2B 00a67ace059c9c280dbd4019fbfec61ef1e46bc2b5c9e36019e860c32a8b4277abefb9cf290e7d8629450c7022099157910703bda2366a0700e3e973fd44a110 SHA512 466dc14155750f8868f29fe416c061813b661892aba7bf91446e1145da5c7eb23abf9935a19d2309bfcb521c44eab9d4404db7965c95b9578e10cccd26bbba8f -DIST cups-filters-1.25.0.tar.xz 1447496 BLAKE2B 297f16a5580787ccf1494ae99a90ed5912156e255394e3d3e921d8e29db9f94b0ed8409b641bec5231dfc0c802b773415beaf4103424cc2cb46d25d9f3804d8e SHA512 f1be31721fd8f6192868e7954d94038ff1382bb0194bb64014da3dd695cbbd2cd5d65373d809e1b541071374b7eabb44c68c6be29575251490d76a0a5336a5c5 -DIST cups-filters-1.25.1.tar.xz 1447208 BLAKE2B ccc9e02309b7a29ac79f91b1de92e11d78ee108777af0e07127f15ba64c6fece79482bf00011e2f82f50eb2bdea42f4a94f4d591402b35757b62876b04119fe5 SHA512 474045497237387dd16bde73253d9e4e9e0ca2f33f3f7ff70245b4c0f8b1dc71abe141f8ab6b467d941dd7153e11369951bc778ef677d6ea17101cd91886625c -DIST cups-filters-1.25.2.tar.xz 1449984 BLAKE2B a6f595ac2c1ef55302aa9063d88d77ff518d1b32cd74449a28e039caa119f894577ed79c312b96181b12ae5153859685ba3f95e250f87c9f2ab002279153fd15 SHA512 e616a3a356ea7ad7d61e50242c1c0fd899911a8a293e721a89b425fb6a5d6d98388bbd4c02df407d9b66219b99f7c41a457b1436af6b9d8e979f0fd4e392ef3e +DIST cups-filters-1.25.3.tar.xz 1448840 BLAKE2B d58d93995d1742ceea861896399687717b7791ef6208daaf50e6df715943ac7c5a8709ad93b5d0c66e412ae4832b1969b238f277bdefb1da61b00dd0cb984fc9 SHA512 df3c5fc9e4e0449943abbff19a537057f9def3a18504241581727ed6a39ecad30315d5593bdf31d04d51181dd402a418805185afa15c22dabf34e1e9eea90a81 +DIST cups-filters-1.25.4.tar.xz 1449676 BLAKE2B 1ba36c013d37d57ebf04a9395638bee8aa3935832ed5f0235f50fcfbc61e4002701dec15f7c45952975fc1e53e7f57fd93f86b9af153a732795745e21e38d329 SHA512 0386c4640249a0325257f9b10a0eee387bc6e8129bde734b6c35704719c0ad60624f9ad44c73cd199768373ffd331fc1b4b4c4c8641f5ec8792ddf8850da510a EBUILD cups-filters-1.21.6.ebuild 3488 BLAKE2B da4a24389073b98e8d081290baf781dca00fd9c78512f17c74c8e1962a2e54cbfcac5ae28fd4f2a7ad9c4d9e15b8588a88ddcabfbd33e333839e26d138bd9fc3 SHA512 48d0ab3b1f0361006e79426bff2ad563950ad90833f49aad9934c8cfc607c89fc8ab9ef74c18d832113ba35a76d0a46d5135b739619550790a751a20edf0cca0 EBUILD cups-filters-1.22.6.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177 -EBUILD cups-filters-1.23.0.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177 -EBUILD cups-filters-1.25.0.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf -EBUILD cups-filters-1.25.1.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf -EBUILD cups-filters-1.25.2.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9 +EBUILD cups-filters-1.25.3.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9 +EBUILD cups-filters-1.25.4.ebuild 3447 BLAKE2B 15b83730551c5bda0b8603dc22248810c299f04bf9f2a1586f5a9949daecc4b49c48e7aa75e62f899a041d023161017adc72a130dc9fbe4519ac57a4f68aa157 SHA512 17c640fb9703663e6ec43ff16ccaafbcda24222aba347d59cf1595988a92a405d44175911247e5011b22a14c119cfd194a027b4926d14a0bfc996c5d74f1ca16 EBUILD cups-filters-9999.ebuild 3384 BLAKE2B 0b3a0f627fc1422c27c37e67ce4c938849738afc29a705fb6f395b770eea20872885b43c14cc0fd90d75d8a49d89b86975fc5621444535f05e32e20cfc89dc13 SHA512 6b93a7820236f97c207ad877bd96383f7c671dfec809e7e92571a9c54152c8b21a0828614c3aa818a8ef9e542972460e693105dafb0ec55ea27748c0adf7a0f9 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a diff --git a/net-print/cups-filters/cups-filters-1.25.0.ebuild b/net-print/cups-filters/cups-filters-1.25.0.ebuild deleted file mode 100644 index 707a8fe57462..000000000000 --- a/net-print/cups-filters/cups-filters-1.25.0.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -inherit perl-module systemd flag-o-matic - -if [[ "${PV}" == "9999" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git" -else - SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint" -fi -DESCRIPTION="Cups filters" -HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" - -LICENSE="MIT GPL-2" -SLOT="0" -IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" - -RDEPEND=" - >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] - >=app-text/qpdf-8.3.0:= - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:2 - >=net-print/cups-1.7.3 - !<=net-print/cups-1.5.9999 - sys-devel/bc - sys-libs/zlib - dbus? ( sys-apps/dbus ) - foomatic? ( !net-print/foomatic-filters ) - jpeg? ( virtual/jpeg:0 ) - ldap? ( net-nds/openldap ) - pdf? ( app-text/mupdf ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - tiff? ( media-libs/tiff:0 ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - test? ( media-fonts/dejavu ) -" - -src_prepare() { - default - [[ "${PV}" == "9999" ]] && eautoreconf - - # Bug #626800 - append-cxxflags -std=c++11 -} - -src_configure() { - local myeconfargs=( - --enable-imagefilters - --localstatedir="${EPREFIX}"/var - --with-browseremoteprotocols=DNSSD,CUPS - --with-cups-rundir="${EPREFIX}"/run/cups - --with-fontdir="fonts/conf.avail" - --with-pdftops=pdftops - --with-rcdir=no - --without-php - $(use_enable dbus) - $(use_enable foomatic) - $(use_enable ipp_autosetup auto-setup-driverless) - $(use_enable ldap) - $(use_enable pclm) - $(use_enable pdf mutool) - $(use_enable postscript ghostscript) - $(use_enable 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.25.1.ebuild b/net-print/cups-filters/cups-filters-1.25.1.ebuild deleted file mode 100644 index 707a8fe57462..000000000000 --- a/net-print/cups-filters/cups-filters-1.25.1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no - -inherit perl-module systemd flag-o-matic - -if [[ "${PV}" == "9999" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git" -else - SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint" -fi -DESCRIPTION="Cups filters" -HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" - -LICENSE="MIT GPL-2" -SLOT="0" -IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf" - -RDEPEND=" - >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] - >=app-text/qpdf-8.3.0:= - dev-libs/glib:2 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:2 - >=net-print/cups-1.7.3 - !<=net-print/cups-1.5.9999 - sys-devel/bc - sys-libs/zlib - dbus? ( sys-apps/dbus ) - foomatic? ( !net-print/foomatic-filters ) - jpeg? ( virtual/jpeg:0 ) - ldap? ( net-nds/openldap ) - pdf? ( app-text/mupdf ) - perl? ( dev-lang/perl:= ) - png? ( media-libs/libpng:0= ) - postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) - tiff? ( media-libs/tiff:0 ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - test? ( media-fonts/dejavu ) -" - -src_prepare() { - default - [[ "${PV}" == "9999" ]] && eautoreconf - - # Bug #626800 - append-cxxflags -std=c++11 -} - -src_configure() { - local myeconfargs=( - --enable-imagefilters - --localstatedir="${EPREFIX}"/var - --with-browseremoteprotocols=DNSSD,CUPS - --with-cups-rundir="${EPREFIX}"/run/cups - --with-fontdir="fonts/conf.avail" - --with-pdftops=pdftops - --with-rcdir=no - --without-php - $(use_enable dbus) - $(use_enable foomatic) - $(use_enable ipp_autosetup auto-setup-driverless) - $(use_enable ldap) - $(use_enable pclm) - $(use_enable pdf mutool) - $(use_enable postscript ghostscript) - $(use_enable 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.25.2.ebuild b/net-print/cups-filters/cups-filters-1.25.3.ebuild index cdc922f82de3..cdc922f82de3 100644 --- a/net-print/cups-filters/cups-filters-1.25.2.ebuild +++ b/net-print/cups-filters/cups-filters-1.25.3.ebuild diff --git a/net-print/cups-filters/cups-filters-1.23.0.ebuild b/net-print/cups-filters/cups-filters-1.25.4.ebuild index 9549f96b1d5a..03ae82bd13c0 100644 --- a/net-print/cups-filters/cups-filters-1.23.0.ebuild +++ b/net-print/cups-filters/cups-filters-1.25.4.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no @@ -48,6 +48,10 @@ DEPEND="${RDEPEND} test? ( media-fonts/dejavu ) " +PATCHES=( + "${FILESDIR}/${P}-missing_cstring.patch" #693498 +) + src_prepare() { default [[ "${PV}" == "9999" ]] && eautoreconf @@ -73,7 +77,6 @@ src_configure() { $(use_enable pclm) $(use_enable pdf mutool) $(use_enable postscript ghostscript) - $(use_enable postscript ijs) $(use_enable static-libs static) $(use_enable zeroconf avahi) $(use_with jpeg) diff --git a/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch b/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch new file mode 100644 index 000000000000..1b051221b6e7 --- /dev/null +++ b/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch @@ -0,0 +1,17 @@ +From 1878ecd2ef533c3dbe6e6bc29018ce4bf8246e83 Mon Sep 17 00:00:00 2001 +From: Till Kamppeter <till.kamppeter@gmail.com> +Date: Wed, 4 Sep 2019 18:13:11 +0200 +Subject: [PATCH] bannertopdf: Added missing "#include <cstring>" to pdf.cxx. + +diff --git a/filter/pdf.cxx b/filter/pdf.cxx +index 5b212ca9..f12607f8 100644 +--- a/filter/pdf.cxx ++++ b/filter/pdf.cxx +@@ -20,6 +20,7 @@ + #include "pdf.h" + #include <vector> + #include <string> ++#include <cstring> + #include <qpdf/QPDF.hh> + #include <qpdf/QPDFObjectHandle.hh> + #include <qpdf/QPDFWriter.hh> diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 7ec9727b1d51..cb01e3e69549 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -3,13 +3,10 @@ AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb 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.3_rc1-no_pam.patch 4704 BLAKE2B 99d9726f43ebc6ebb7fcaa608b99f435dccdeaa53f8fd6b47b4735c084dec8852ab5b34d06f07293299f13a4d975cf9b5bfc44950910c58c409fdcb71dfec6ea SHA512 f5f0f850a954a970aa5129d518f7b84e1e5fbb57c4bf16d42eb09eac01ebb5280514a580938433525514d5cd57acfcb363aa972d783d7b6b23e8f30e01d5e1b1 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 -DIST cups-2.2.11-source.tar.gz 10405908 BLAKE2B 9b7ee4da9502e42fd1b4a2c57ab709b3127ee8aeb8481a52f37da19fe5578f406260f1551e3fcedcd3a828fbed69267e68fcfd7bfabadf65afce4c3af19b4a1f SHA512 21a6916041b50044d336871f10d1192635458a3d318f19a18ad21d27027dd3839400601019e758424c218225a34aba148ba3a57f0ce3fe14c4df03bd1fde3403 DIST cups-2.2.12-source.tar.gz 10409313 BLAKE2B 126ea81f7108b3b62f5e062ed522898dd48d4e5b4077c834e8fe89012445dd0a903bafa62f593551ed5f1c92cce4fbd22f56834e0615ed65ca4a6ae84dc2ca1c SHA512 b8e7be512938ad388d469d093ad0c882ab42ea1408c27a91340f8424aa0e79e588df3d59795624973b89074a2af650fa9b5b6ed5224138b17e4c6dbbcbf0a2e6 -DIST cups-2.3rc1-source.tar.gz 7926640 BLAKE2B c39bee2c4697eb540cfa02ee2ce0fa8a79d7efd0a7e65db19fada8473997841e5c341c209eba8eb242e57bb21b0dbded1ca340654874b9400318ed2d9332b890 SHA512 d2411c1da576bd7d561c5465fba0824af86d7b52792482d90876847d0869a5a092de12efc761fd403c74be072c6d6eb5bf407525f187051683dba694e5f7febd -EBUILD cups-2.2.11.ebuild 9743 BLAKE2B f3b1cd58c0774eb64fde8762dfe13834b38a6c70ace22655ec6103b3dcc277ee6562d7d16592f14e138f6fa3f08b166bb9eb7dea26b75ae464a0fa136ad9c1b6 SHA512 870e5c4f06e96b098a069019aa38ec76364f86677cda52d43e84c0e81cd990cddf1d852920ec9fa0de06efb09239726cec15898e9d07ec97826256d134c81229 -EBUILD cups-2.2.12.ebuild 9786 BLAKE2B 18f65da7d2ee4fea4beeead57add0a296a22dd2d66fa13260647672de892467d87136ab3c0f7473ce72e52049f284c0df1fc4d5fa27c25854a73186da824a3cd SHA512 c9ac430f63a3913de538c3098b56af492ce9709c8e34e6d4885a5a0b5e36816976ffbc7d31c62f2a03df4c1a5afa87cfed28d5577c5f8c0eacd6118f1fa69e28 -EBUILD cups-2.3_rc1.ebuild 9531 BLAKE2B c92b415be48dfe3209bbf8affb451374a1e76f6bcb75d4a74c32beaa7a6feb79a86a49546054655cf4b32bd208b157957719a7611beb1d4ecc18ee308d9da879 SHA512 70302e04dfc1acfa6b9f8ed6db5c974b63e2210cd94b870d45acfd58bb61beb80cb336a3a39f5fd4293625a527020a8754f546e2129ff27c118028a1734f19ab +DIST cups-2.3.0-source.tar.gz 8129049 BLAKE2B 738dbc7ee5ddcc9ffee44083cd93d8a0e75f4d3bf0b704dd643dc59db2cc2381dd65f676c0979bc65fee03438d160d9d650ceb93f8c702102eb1449d306a81a3 SHA512 c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae +EBUILD cups-2.2.12.ebuild 9775 BLAKE2B 37d41f1388d74dcad7e71aa401593bd6e46f57ef9c257c177b83159a95804e357d773ef108fb69ef6ce5effff8e5f60b1d1bd78cdb4792834ecb6006840b89e7 SHA512 f2be9a200c0faaf11b35c19945dc18ed35ce90918357e1b680e09bd760b1f48fc9ea0f187d71064226daf0c78955794e342ac560b9d51b9260ddac08cb4d4200 +EBUILD cups-2.3.0.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1 EBUILD cups-9999.ebuild 9633 BLAKE2B 2b62636ffa95594e5b3985c3649120fc5deaea937035225ed5f70a4a3f3ceecf21b7eb1ab90a8568c6de0711c169131117de03f8c9ceac32a4493c9eec4494cb SHA512 26221b3b0b98c65dbda3820ccd7a5b88318bacca52d79af37d7cdc35efa441de6696f7082206f716a29001853960ca3f4e6a8ce8e6ef031e4b6025068dea57e1 MISC metadata.xml 677 BLAKE2B ca19e7bd0d56a0a78771a30efcbd867cd0ab1eba7aaf3add8d384721ac70ed8809bc8a171df43887d772f81dcfd54f31bc13267a9a3a88da44b51322aff87c15 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717 diff --git a/net-print/cups/cups-2.2.11.ebuild b/net-print/cups/cups-2.2.11.ebuild deleted file mode 100644 index 1c078ac92c8b..000000000000 --- a/net-print/cups/cups-2.2.11.ebuild +++ /dev/null @@ -1,336 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools flag-o-matic linux-info xdg 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}" -BDEPEND=" - >=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() { - xdg_pkg_preinst -} - -pkg_postinst() { - # Update desktop file database and gtk icon cache (bug 370059) - xdg_pkg_postinst - - local v - - for v in ${REPLACING_VERSIONS}; do - if ! ver_test ${v} -ge 2.2.2-r2 ; then - 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) - xdg_pkg_postrm -} diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild index ac6565a2d4c1..fdabb541c491 100644 --- a/net-print/cups/cups-2.2.12.ebuild +++ b/net-print/cups/cups-2.2.12.ebuild @@ -21,7 +21,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_rc1.ebuild b/net-print/cups/cups-2.3.0.ebuild index 2252272dc810..b2da32a36b26 100644 --- a/net-print/cups/cups-2.3_rc1.ebuild +++ b/net-print/cups/cups-2.3.0.ebuild @@ -55,10 +55,12 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" + acct-group/lp >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " RDEPEND="${CDEPEND} + acct-group/lp selinux? ( sec-policy/selinux-cups ) " @@ -73,7 +75,6 @@ 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" @@ -87,7 +88,7 @@ MULTILIB_CHOST_TOOLS=( S="${WORKDIR}/${MY_P}" pkg_setup() { - enewgroup lp + #enewgroup lp -> acct-group/lp enewuser lp -1 -1 -1 lp enewgroup lpadmin 106 @@ -132,6 +133,10 @@ src_prepare() { # Fix install-sh, posix sh does not have 'function'. sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" + # Do not add -Werror even for live ebuilds + sed '/WARNING_OPTIONS/s@-Werror@@' \ + -i config-scripts/cups-compiler.m4 || die + AT_M4DIR=config-scripts eaclocal eautoconf @@ -234,10 +239,11 @@ multilib_src_install_all() { 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}" + local neededservices=( + $(usex zeroconf avahi-daemon '') + $(usex dbus dbus '') + ) + [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die sed -i \ -e "s/@neededservices@/${neededservices}/" \ diff --git a/net-print/cups/files/cups-2.3_rc1-no_pam.patch b/net-print/cups/files/cups-2.3_rc1-no_pam.patch deleted file mode 100644 index 17e69ab7b0ac..000000000000 --- a/net-print/cups/files/cups-2.3_rc1-no_pam.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 3cd7b5e053f8100da1ca8d8daf93976cca3516ef Mon Sep 17 00:00:00 2001 -From: Michael R Sweet <michael.r.sweet@gmail.com> -Date: Fri, 23 Feb 2018 13:21:56 -0500 -Subject: [PATCH] Fix builds without PAM (Issue #5253) - ---- a/scheduler/auth.c -+++ b/scheduler/auth.c -@@ -67,9 +68,6 @@ static int check_authref(cupsd_client_t *con, const char *right); - static int compare_locations(cupsd_location_t *a, - cupsd_location_t *b); - static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); --#if !HAVE_LIBPAM --static char *cups_crypt(const char *pw, const char *salt); --#endif /* !HAVE_LIBPAM */ - static void free_authmask(cupsd_authmask_t *am, void *data); - #if HAVE_LIBPAM - static int pam_func(int, const struct pam_message **, -@@ -690,14 +688,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ - * client... - */ - -- pass = cups_crypt(password, pw->pw_passwd); -+ pass = crypt(password, pw->pw_passwd); - - if (!pass || strcmp(pw->pw_passwd, pass)) - { - # ifdef HAVE_SHADOW_H - if (spw) - { -- pass = cups_crypt(password, spw->sp_pwdp); -+ pass = crypt(password, spw->sp_pwdp); - - if (pass == NULL || strcmp(spw->sp_pwdp, pass)) - { -@@ -1991,129 +1989,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */ - } - - --#if !HAVE_LIBPAM --/* -- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, -- * as needed. -- */ -- --static char * /* O - Encrypted password */ --cups_crypt(const char *pw, /* I - Password string */ -- const char *salt) /* I - Salt (key) string */ --{ -- if (!strncmp(salt, "$1$", 3)) -- { -- /* -- * Use MD5 passwords without the benefit of PAM; this is for -- * Slackware Linux, and the algorithm was taken from the -- * old shadow-19990827/lib/md5crypt.c source code... :( -- */ -- -- int i; /* Looping var */ -- unsigned long n; /* Output number */ -- int pwlen; /* Length of password string */ -- const char *salt_end; /* End of "salt" data for MD5 */ -- char *ptr; /* Pointer into result string */ -- _cups_md5_state_t state; /* Primary MD5 state info */ -- _cups_md5_state_t state2; /* Secondary MD5 state info */ -- unsigned char digest[16]; /* MD5 digest result */ -- static char result[120]; /* Final password string */ -- -- -- /* -- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. -- * Get a maximum of 8 characters of salt data after $1$... -- */ -- -- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) -- if (*salt_end == '$') -- break; -- -- /* -- * Compute the MD5 sum we need... -- */ -- -- pwlen = strlen(pw); -- -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); -- -- _cupsMD5Init(&state2); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Finish(&state2, digest); -- -- for (i = pwlen; i > 0; i -= 16) -- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); -- -- for (i = pwlen; i > 0; i >>= 1) -- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); -- -- _cupsMD5Finish(&state, digest); -- -- for (i = 0; i < 1000; i ++) -- { -- _cupsMD5Init(&state); -- -- if (i & 1) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- else -- _cupsMD5Append(&state, digest, 16); -- -- if (i % 3) -- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); -- -- if (i % 7) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- if (i & 1) -- _cupsMD5Append(&state, digest, 16); -- else -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- _cupsMD5Finish(&state, digest); -- } -- -- /* -- * Copy the final sum to the result string and return... -- */ -- -- memcpy(result, salt, (size_t)(salt_end - salt)); -- ptr = result + (salt_end - salt); -- *ptr++ = '$'; -- -- for (i = 0; i < 5; i ++, ptr += 4) -- { -- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); -- -- if (i < 4) -- n |= (unsigned)digest[i + 12]; -- else -- n |= (unsigned)digest[5]; -- -- to64(ptr, n, 4); -- } -- -- to64(ptr, (unsigned)digest[11], 2); -- ptr += 2; -- *ptr = '\0'; -- -- return (result); -- } -- else -- { -- /* -- * Use the standard crypt() function... -- */ -- -- return (crypt(pw, salt)); -- } --} --#endif /* !HAVE_LIBPAM */ -- -- - /* - * 'free_authmask()' - Free function for auth masks. - */ diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest index d90ffcd46c2f..8ddf5940f0dc 100644 --- a/net-print/epson-inkjet-printer-escpr/Manifest +++ b/net-print/epson-inkjet-printer-escpr/Manifest @@ -1,4 +1,6 @@ AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475aa29f82e2ff81568aa72e2a3c25018c481b9d56bfd321314fb931561bbaed5b0883597c6fb296465ac486f1 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027 DIST epson-inkjet-printer-escpr-1.6.33-1lsb3.2.tar.gz 4402012 BLAKE2B a200ebb94460ff5d6b8731d66ccaa8d7423d8f249871183d3e8e321e2fba84dfca3d72638901c7d81344de8713e765de59ff6e6d579599ec9c565b10bb9e4a0c SHA512 b7af8c69cff0869410a3dfad3204bb908f42070fc2721e1037631d5d5da972a800e195df27ef8e62418a9b927adcbedb2dfe77a6d189d34841f20789aa41eca1 -EBUILD epson-inkjet-printer-escpr-1.6.33.ebuild 877 BLAKE2B dc50bdde50fc24454116acfdc2a53c8f642c241ed8b695b198e040b03d9b119a6305cdce365b81f6904924b7e643f29bc95e18e9e327e7d9af13253e2624c4f9 SHA512 f44894b74f77cd96c79f3316fa623608ad6ac6cdecfe249598314b02894b9758cad44923df7f1d16654e37ba1614312f0efea1f0ecc168da5991645b2059cc73 +DIST epson-inkjet-printer-escpr-1.7.2-1lsb3.2.tar.gz 4667086 BLAKE2B f01790daca7b80e0d1258a6736f1b6edf0db1d5899941174b75b7ea40dd7e75bfa0504511403a1301018ca20273410d5afc28c3b2768e6e2af93c15c032d9b97 SHA512 ae8d965c3325e89b428c53a4037566f0b786e0109ac521623c6a6ada66717487c82eeb9147de01f6a14a6e0afc6ed60045ff8b9526f91bf2995b3c3cd66c548d +EBUILD epson-inkjet-printer-escpr-1.6.33.ebuild 878 BLAKE2B cb695d1ffaa33ba40e4778ac8f89bb2106a75bdd476618635d759dd6ce5b9dbfd866c7afcd0763c62094eb87a0c4fbaa15b361e0336f53c7cd78afb825afe444 SHA512 4ae106f537b37d635a1e85ffcd859e90576b804156964ed345196811a2f0d210ccde253723a35df430e29fcb8fb9b92dd49f56201447fc79d0dc84a39feff8ba +EBUILD epson-inkjet-printer-escpr-1.7.2.ebuild 877 BLAKE2B f18ec49c3f0294c382bfe8448f1490103dc5e5b6c1036e1869bd49fa426e7e39893813bca49f3d9ceff60e9fe30928231dc76be5dc1fdc7078093313b0a11974 SHA512 f6410e9206a3ad4334acccd74ed1602fdc1eabe83d4889b3d92b72affbc96f508e3c1f63ed8ddbfdded11c71a78c37df92de0869c7180788c17465435cd56c34 MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15 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 index a6862fc975ee..6b72b2b615de 100644 --- 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 @@ -4,7 +4,7 @@ EAPI=7 DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)" -HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +HOMEPAGE="https://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" diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild new file mode 100644 index 000000000000..dd6f26c67cf9 --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)" +HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX" +SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/09/76/14/6479eac30ef2e351bb6672ed63314953b9655d16/epson-inkjet-printer-escpr-1.7.2-1lsb3.2.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +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/Manifest b/net-print/hplip/Manifest index f6ef1a73aab5..45e76264e689 100644 --- a/net-print/hplip/Manifest +++ b/net-print/hplip/Manifest @@ -1,6 +1,8 @@ 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.19.6.tar.gz 25436373 BLAKE2B 9ce8fe6aec475ea6c2c5b25555d311ac498ef34e12e9f7c41900ae88d1ce30939470f8f9a1c29fffceb1f69dd205be25ce6aa381fe9ee3a2f01e86dcbd927c63 SHA512 c99448ad0cef9fc626a0a03147a0d582513cb838ecfbfe29f07c65bbf701dee5c7d02222469b118ccc4e8c230c7a4b4685a72a1e67595ee01150b0472692d654 +DIST hplip-3.19.8.tar.gz 25473983 BLAKE2B 8778b1b66164e38c1593c55b1a5b762679e82e1ab96249520d02af87e2a55584733ee3c047fad912838571be626f85d6a07335f95b37a28fd7b1015c993ec6b8 SHA512 99b7661c9b1d70f3c762658fcbff1ab0c170be8f8fd6cc8bbc80bb0860ccc6d69d38b662ff8be2bd38986a95385a5e5766f22003ee3e74b764dab3d46c6cb9ac EBUILD hplip-3.18.12.ebuild 7738 BLAKE2B 3a7f56fbf029ad197d8c3f5b20883cf387da98368564a0c76bc349440f9aee55a87c1a0ee71c07b8b6e5cab377432f2e13252aaea6d03c0252a1ad3b68490f43 SHA512 2904fd13f3b168a2c4dd8807a9f665e75cdbd9d2de36acc7bbbe49864764012e37ad1f47b1fc402d397c3e4bcd18d6946484aba1b4708e3f39396b5c4ffb47e1 EBUILD hplip-3.19.6.ebuild 7743 BLAKE2B afd1f59ad7c15e2801d2cdaaac099061606ca22e1a229c391c46c7ec35220b894512d75e611671f16657db5d8cecf8d8fabb195277cfe898b713d9eaa8c9f904 SHA512 d283fc0e5784e9f9d3e298ab186d97692bf071bc2c12c5bec53ebe0c26094252f036858186e395f0a9e1c346407c53d21c3ca5c49e231884293e1039346ec62f +EBUILD hplip-3.19.8.ebuild 7748 BLAKE2B 2bab14cdb4593b7cb0f5bd0eef84d098eb2c24db84e112941647c52e163eb375df884fc4c060e9385103c1d389f3cac857e9fb387f6bc843430464be5b57e691 SHA512 9ec707ecb7060d671f3b45e77d6870a37138ccffc820101af7966cf73d55def19748b5c2e89820dbe85e8b15522375e49824c603dba4aa1ddc120e8c872c103b MISC metadata.xml 1829 BLAKE2B 614757c5958bb24f223c75a252beb06014bfe7f47cfe58feb88be89918394224b7075e0d444d7bb898f9f478c2ae5cf572df3f905ff110ec1153cf1849cc8e46 SHA512 c6aae86cd5a200b7d42336f0884b87dc0b74d2b2216b8002929a56a53f42ec02447684eb8d0411e30ef707e01d930aac446866796c781f95a3463f84901666f6 diff --git a/net-print/hplip/hplip-3.19.8.ebuild b/net-print/hplip/hplip-3.19.8.ebuild new file mode 100644 index 000000000000..ac23a93aaa95 --- /dev/null +++ b/net-print/hplip/hplip-3.19.8.ebuild @@ -0,0 +1,274 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +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 ~ppc ~ppc64 ~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 +} |