From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- net-print/Manifest.gz | Bin 6416 -> 6417 bytes net-print/cnijfilter2/Manifest | 3 + net-print/cnijfilter2/cnijfilter2-5.80.ebuild | 76 +++++ .../files/cnijfilter2-5.80-cflags.patch | 10 + net-print/cnrdrvcups-lb/Manifest | 2 +- net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild | 2 + net-print/cups-filters/Manifest | 2 +- net-print/cups-filters/cups-filters-1.27.4.ebuild | 2 +- net-print/cups/Manifest | 4 +- net-print/cups/cups-2.3.3-r1.ebuild | 339 +++++++++++++++++++++ net-print/cups/cups-9999.ebuild | 9 +- 11 files changed, 442 insertions(+), 7 deletions(-) create mode 100644 net-print/cnijfilter2/cnijfilter2-5.80.ebuild create mode 100644 net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch create mode 100644 net-print/cups/cups-2.3.3-r1.ebuild (limited to 'net-print') diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index 323a702bc3ac..60b48c2dce4e 100644 Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest index f8d072ac5fbc..779b2dc37940 100644 --- a/net-print/cnijfilter2/Manifest +++ b/net-print/cnijfilter2/Manifest @@ -1,11 +1,14 @@ AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657 +AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f3a149dce1d3e68a070739a08715d6093cb41e6db12bc8a3ade0d9e73ea18d9ed1b666c84f8364d263bf585a666c60f SHA512 ca36f72b0a4f5a1e9fa7c57722a55b3eb5f907fd86cdb92ec27cd1f8cd6bdba6f27b50612eb03c774d823a17598fcb475b1ea9fdba10b6de5d0acd575ddee07e 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 +DIST cnijfilter2-source-5.80-1.tar.gz 1422542 BLAKE2B 046fa72752c5645f307dbee3f2d5f01cd24484859a2d9002135cbcaa9dba0adb3b8d961c7adede8aedd816d4932c526474e7cd252c13e1cef56a427b3b58740d SHA512 060af4834472d21f50f3a431ff6a1bfb36e14348b58eaa777ae471d44062d76b7fd3f247da1818f893285a94ac0335f656e3d026fc613d338dc2ce4d8e242d21 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 +EBUILD cnijfilter2-5.80.ebuild 1770 BLAKE2B c496c271e33c95c2af7c5d8ee5277defa10156d7e890665967f703ec449c24cf9b2896dfa2f3fda072f819195dcd3fe41b616486d9f55d24589394d3a8bc8aea SHA512 62ff4e92043814160283ea3112f9ed5d4a8ce6618486c318e6a24a4961c1992fce6052583acbc6e75a48020ffc97de48c6d772194eae4788fb895ae4fd2c88b8 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca diff --git a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild new file mode 100644 index 000000000000..4efba8cd2e1c --- /dev/null +++ b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 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/3/0100010273/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}" + +QA_FLAGS_IGNORED=( + /usr/lib64/libcnbpnet30.so.1.0.0 + /usr/lib64/libcnbpcnclapicom2.so.5.0.0 + /usr/lib64/libcnnet2.so.1.2.4 + /usr/lib64/libcnbpnet20.so.1.0.0 + /usr/bin/cnijlgmon3 +) + +S="${WORKDIR}"/${MY_P} + +PATCHES=( + "${FILESDIR}"/${PN}-5.70-gentoo.patch + "${FILESDIR}"/${P}-cflags.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 \ + cnijbe2/src/Makefile.am || 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.80-cflags.patch b/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch new file mode 100644 index 000000000000..e76176e003b1 --- /dev/null +++ b/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch @@ -0,0 +1,10 @@ +--- a/lgmon3/src/Makefile.am 2020-05-13 23:18:47.936735159 +0200 ++++ b/lgmon3/src/Makefile.am 2020-05-13 23:19:12.239525072 +0200 +@@ -6,6 +6,6 @@ + + cnijlgmon3_SOURCES = cnijcomif.c cnijifusb.c cnijlgmon3.c cnijifnet.c keytext.c cnijifnet2.c cnijutil.c + +-CFLAGS = -O2 -Wall -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@ ++AM_CPPFLAGS = -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@ + + cnijlgmon3_LDADD = -ldl -lusb-1.0 -lcnnet2 -lxml2 -lcnbpcnclapicom2 -lcnbpnet30 diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest index 989b0b867395..8acefe0794eb 100644 --- a/net-print/cnrdrvcups-lb/Manifest +++ b/net-print/cnrdrvcups-lb/Manifest @@ -1,3 +1,3 @@ DIST linux-UFRII-drv-v510-uken-08.tar.gz 106569187 BLAKE2B 46017d4e82653314e1555b32c6e3a73ae8c9c7cef95e4f70d51d62e15f26831cf0ea8d1b180503cd63a880d637621427fe6c69971b40d9ee0119ecd493772515 SHA512 dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54 -EBUILD cnrdrvcups-lb-5.10.ebuild 5836 BLAKE2B e8c47eaf72467101a44e129e44b101c5cdc9716160c2a7ac07cd0675f09efcd88e092077115a64216f1f5fcfa199063ad9c5b88bf85d00655c590ef62e53a9e0 SHA512 a1c83fe52a04971dc9229043aa48e98b871f20fa11b7eb4152eedb08d343da74d24fa791a6543d796af29088990245ec4fe1819260f684f75ddc1471aac5d7ad +EBUILD cnrdrvcups-lb-5.10.ebuild 5861 BLAKE2B ef1239ec71304073bb62ce0c3462e8f91fcf878c3e635c07f4948434ebc733f904501f08a8c5192459d8c6248ddb27cee5d54697f9b5b32af9dc66c015f88dcd SHA512 5ca49ba0c375ebfeb0d51ec45c18312ca6c72c15ded1f55ee2e2d7e19daa2ee0fd59a2a1915d0a6849547764d6cab11be6c28d8e9b288dffd458147b2f06cdda MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild index 78e55a879950..aa8c33c74545 100644 --- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild +++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild @@ -98,6 +98,8 @@ src_prepare() { # Fix a QA issue with .desktop file, sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop || die "Failed to modify cnsetuputil2.desktop file." + + append-cflags -fcommon } src_configure() { diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest index d79711641cc1..4aeff778e452 100644 --- a/net-print/cups-filters/Manifest +++ b/net-print/cups-filters/Manifest @@ -9,6 +9,6 @@ EBUILD cups-filters-1.25.11.ebuild 3449 BLAKE2B 70f5e8ed635a76f439b479a9ea318c16 EBUILD cups-filters-1.25.13.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176 EBUILD cups-filters-1.26.2.ebuild 3458 BLAKE2B 422cc3d8c474df23b15b94116dff3cb5cfff4eddaef554743e695e2e58717151370cebaf0b1d600f4d4a185c74af7aa45489be9ebc33f664588d85ae9245b800 SHA512 b31915b570574a117b6ef9e20807990d04085b8850206cf12dc8a9c222571974fb98738a7b6d4d36dc6a186722c797c73da401f85537f897c15f418aacee14c4 EBUILD cups-filters-1.27.2.ebuild 3392 BLAKE2B 61ab3e8b8e4ff3739adaf77bf45ed5e1237fbd156a9eaf21819ee5d13cd64cb1aba977962c554c96c0a0430136554401e30d9e2f4e0b903e8420e2fc89352d03 SHA512 98b9e1ca9385871cb04c8ccb7b3d9bd5f37fcfc8e585cbb99d71b383b974cd5c5420a9f7b220d8aa8456dd1d395301ff7d781731e9ee97e9c0b1063358200638 -EBUILD cups-filters-1.27.4.ebuild 3608 BLAKE2B 52b38a7ff26bb0ae9e761e413a84edac3378fb24e0ae5a823f562ed06df45bca60a5f38f01feb3b72cba894d34668fb6428db052219c1392f681768b3fbe0929 SHA512 5a53ec01c203f44c531507480d04ce041016fa7afcab7b2e40f9f35657c5e9a15e2d0897c941bb3d3849679cb9898dd379d8ce74060406dfb920de388de5a8a6 +EBUILD cups-filters-1.27.4.ebuild 3599 BLAKE2B eb2b2f3dce938b6516342c4926f962f35b51fcc8eb6d1ff5c3d2311515c78c68febfd1fd59633d120cc3fee71b2ed6119d1503e1937e1084560b10b2b4527abe SHA512 78120456764f960f89ae41405286f7b1105be5db5c3cf6cd852bb620120bb56a96798d08a469580947616851d3d23d4f47e5d28830476c8833a8194c6d9e2f8e EBUILD cups-filters-9999.ebuild 3608 BLAKE2B 52b38a7ff26bb0ae9e761e413a84edac3378fb24e0ae5a823f562ed06df45bca60a5f38f01feb3b72cba894d34668fb6428db052219c1392f681768b3fbe0929 SHA512 5a53ec01c203f44c531507480d04ce041016fa7afcab7b2e40f9f35657c5e9a15e2d0897c941bb3d3849679cb9898dd379d8ce74060406dfb920de388de5a8a6 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a diff --git a/net-print/cups-filters/cups-filters-1.27.4.ebuild b/net-print/cups-filters/cups-filters-1.27.4.ebuild index 7abb7a7fcbf0..63cb4621bed4 100644 --- a/net-print/cups-filters/cups-filters-1.27.4.ebuild +++ b/net-print/cups-filters/cups-filters-1.27.4.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then 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 ~m68k-mint" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~m68k-mint" fi DESCRIPTION="Cups filters" HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index be59fd6f633a..9895a5a68591 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -6,7 +6,9 @@ AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 DIST cups-2.2.13-source.tar.gz 10410121 BLAKE2B 662ad7fe95a9cb82748a6035cf61bad8a823656522259fc8eafe4426cc57541beb29da9116174f9d6750ec207eacb83ab4e314021506d6a342577f03ff25b0cd SHA512 dc323bdcec86f11ec98e4881c540aa8be24f82d289c8a4f866e42bfd6f107b686346f1418b6347b3794dabac3c23d6e604e212aa8e169879c58b746fb1bc490d DIST cups-2.3.1-source.tar.gz 8135891 BLAKE2B fab46dfeb8a1846c4d8c8a1c166b465e72928ecc5b52dedd9d6a6328619f6eda822a85da9545c405b7bc7375acd2f2677497b94ab00735979487417537438831 SHA512 e3f3ad9e78c1c723d46cc2276957ac67495483882f639421203d9dad227eacbb1259717a92489e710995fdc89e2d575202e4b43117aff08ff1230dcf06674376 +DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d EBUILD cups-2.2.13.ebuild 9729 BLAKE2B 9c0b6e15bbdcff31c35fc709d4369f97bdff7f18d7f3359bf99936244eeb1056333df7e197c9140cc20e59080bf893f49941121950fba44b7313c7cec06acc56 SHA512 abef436477e2b0e34f63dad132981bf9b4313c7467168efb1221b31fbe4cc2d1e133b8e2308663f6ffeed1cf19ef0bee15e2ca33cdf6966f5f43b938f6f8dffd EBUILD cups-2.3.1.ebuild 9585 BLAKE2B eeccc3d3fc828c6ee3309ece3ddfe954918f86eb16d967b7c375bf36a49b3c5be91313d56bec685a5e6ac0e92085e5f2befd6eb5f03fc9b5ae5c23b7c918068a SHA512 be02a3f144dd90f98f490351b4a8eac0fc1ea674fce9d02b0e66a6aefdcce718b58dc21ec2094bc07e8370e6e9fda0e03b0fb2df75aa17e43928266417cdbec3 -EBUILD cups-9999.ebuild 9585 BLAKE2B eeccc3d3fc828c6ee3309ece3ddfe954918f86eb16d967b7c375bf36a49b3c5be91313d56bec685a5e6ac0e92085e5f2befd6eb5f03fc9b5ae5c23b7c918068a SHA512 be02a3f144dd90f98f490351b4a8eac0fc1ea674fce9d02b0e66a6aefdcce718b58dc21ec2094bc07e8370e6e9fda0e03b0fb2df75aa17e43928266417cdbec3 +EBUILD cups-2.3.3-r1.ebuild 9655 BLAKE2B 781570cf1150bcc493f86828c957be147d972ffcf33e57f28a776ef633477ee485264c8000a099cb7a01ab873934e85ec9f4959846086dea0e68d8155aae9275 SHA512 fda8380d075bff3d4d780529f450c9147f422b13cf0430c59fbe525599d5b0e9c08fd87900c2f2922d643f397c18b37608561cd7002216882f44f07eb78d1c06 +EBUILD cups-9999.ebuild 9664 BLAKE2B aa9f35685c07be11e4baa3cdc7157d6ce1a4799cea68d5d4bb9169001b31ec8f188ee18535354573080c03ee268ecadbe69f9176f5d174fdfbf4af9c1d5f125d SHA512 69e8888d217f1c9b17eb709ba7e0f6c4e2764c567d187d89c16ba1ab81a96921057cde1630612749d6889bb0d7fbfcd4ac855d93069444d8cee3f1505adacebe MISC metadata.xml 733 BLAKE2B 2014cd9267e3f7f1a4f73124ab6bb9f4ba80b95ef08c9a781a03a95bbb3f97dadeb9e1a239d8dea5a6f6678d99eb906a2835df0168c13ba5456baff8ab3c6e0f SHA512 e4e2342cb4b0598fc23486753d9296254da78eb7d448fbdc250a2ba181e5692002e1e671799971c9cfaf25d40e034e3e2752836067b1b24813cfb3ed1b682e22 diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r1.ebuild new file mode 100644 index 000000000000..4ff03c7a6d4a --- /dev/null +++ b/net-print/cups/cups-2.3.3-r1.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2020 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 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 sparc x86 ~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? ( sys-libs/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}" +BDEPEND=" + acct-group/lp + acct-group/lpadmin + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] +" + +RDEPEND="${CDEPEND} + acct-group/lp + acct-group/lpadmin + 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.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 +) + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + #enewgroup lp -> acct-group/lp + # user lp already provided by baselayout + #enewuser lp -1 -1 -1 lp + #enewgroup lpadmin 106 + + if use kernel_linux; then + linux-info_pkg_setup + if ! linux_config_exists; then + ewarn "Can't check the linux kernel configuration." + ewarn "You might have some incompatible options enabled." + else + # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) + if use usb; then + if linux_chkconfig_present USB_PRINTER; then + elog "Your USB printers will be managed via libusb. In case you run into problems, " + elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" + elog "usblp kernel module." + elog "Alternatively, just disable the usb useflag for cups (your printer will still work)." + fi + else + #here we should warn user that he should enable it so he can print + if ! linux_chkconfig_present USB_PRINTER; then + ewarn "If you plan to use USB printers you should enable the USB_PRINTER" + ewarn "support in your kernel." + ewarn "Please enable it:" + ewarn " CONFIG_USB_PRINTER=y" + ewarn "in /usr/src/linux/.config or" + ewarn " Device Drivers --->" + ewarn " USB support --->" + ewarn " [*] USB Printer support" + ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." + fi + fi + fi + fi +} + +src_prepare() { + default + + # Remove ".SILENT" rule for verbose output (bug 524338). + sed 's#^.SILENT:##g' -i "${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" + + # Do not add -Werror even for live ebuilds + sed '/WARNING_OPTIONS/s@-Werror@@' \ + -i config-scripts/cups-compiler.m4 || die + + AT_M4DIR=config-scripts eaclocal + eautoconf + + # custom Makefiles + multilib_copy_sources +} + +multilib_src_configure() { + export DSOFLAGS="${LDFLAGS}" + + 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=( + $(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}/" \ + "${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 + 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-9999.ebuild b/net-print/cups/cups-9999.ebuild index 241cb46e4268..69919acb60a3 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) -inherit autotools flag-o-matic linux-info xdg multilib-minimal pam user systemd toolchain-funcs +inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs MY_PV="${PV/_rc/rc}" MY_PV="${MY_PV/_beta/b}" @@ -56,11 +56,13 @@ CDEPEND=" DEPEND="${CDEPEND}" BDEPEND=" acct-group/lp + acct-group/lpadmin >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " RDEPEND="${CDEPEND} acct-group/lp + acct-group/lpadmin selinux? ( sec-policy/selinux-cups ) " @@ -89,8 +91,9 @@ S="${WORKDIR}/${MY_P}" pkg_setup() { #enewgroup lp -> acct-group/lp - enewuser lp -1 -1 -1 lp - enewgroup lpadmin 106 + # user lp already provided by baselayout + #enewuser lp -1 -1 -1 lp + #enewgroup lpadmin 106 if use kernel_linux; then linux-info_pkg_setup -- cgit v1.2.3