From d6ecedbb65041ed35010095376e87dd7de4270c5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 20 Feb 2024 11:40:01 +0000 Subject: gentoo auto-resync : 20:02:2024 - 11:40:01 --- net-print/Manifest.gz | Bin 6412 -> 6413 bytes net-print/cnijfilter2/Manifest | 10 ++- net-print/cnijfilter2/cnijfilter2-5.90.ebuild | 76 -------------------- net-print/cnijfilter2/cnijfilter2-6.50.ebuild | 78 -------------------- net-print/cnijfilter2/cnijfilter2-6.60.ebuild | 1 + net-print/cnijfilter2/cnijfilter2-6.70.ebuild | 79 +++++++++++++++++++++ .../files/cnijfilter2-5.70-gentoo.patch | 58 --------------- .../cnijfilter2/files/cnijfilter2-6.60-c99.patch | 10 +++ 8 files changed, 94 insertions(+), 218 deletions(-) delete mode 100644 net-print/cnijfilter2/cnijfilter2-5.90.ebuild delete mode 100644 net-print/cnijfilter2/cnijfilter2-6.50.ebuild create mode 100644 net-print/cnijfilter2/cnijfilter2-6.70.ebuild delete mode 100644 net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch create mode 100644 net-print/cnijfilter2/files/cnijfilter2-6.60-c99.patch (limited to 'net-print') diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz index 5056330492b8..c02bcc9e7268 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 d789870e4591..03733b57bac0 100644 --- a/net-print/cnijfilter2/Manifest +++ b/net-print/cnijfilter2/Manifest @@ -1,11 +1,9 @@ -AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657 AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f3a149dce1d3e68a070739a08715d6093cb41e6db12bc8a3ade0d9e73ea18d9ed1b666c84f8364d263bf585a666c60f SHA512 ca36f72b0a4f5a1e9fa7c57722a55b3eb5f907fd86cdb92ec27cd1f8cd6bdba6f27b50612eb03c774d823a17598fcb475b1ea9fdba10b6de5d0acd575ddee07e AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf38af6cb65ee3a805e8af75a0c8c6bbf9e6951d2b5376c0204830c457a77d06d3f942a420496b98aafafe6df42f651b1da41 SHA512 fd5a21de395e93975b2118c06a6957de85157e4cac8b3c473f48f00cbd56e7178b59c03396ece47f21f49414eb7acdff53952469dca5498b875e0c488af80b53 AUX cnijfilter2-6.50-gentoo.patch 1787 BLAKE2B cb7f12a37b46dfcbdfa54fcba8a7d7260b0427cf2af005e2a8ca979609936e0d07ba66ea963ddbbd670eda362316f19bd1513de18b9d4e024b63313cdb5a5b87 SHA512 2fc38bd1e67d9fd424d47290bac5cde6e342ff091bb2583c5ccdaddd7d15ab85d37fae16e7bd08fded33d7167cbc89950bf08aafb503383b35d7143f2c19e8a2 -DIST cnijfilter2-source-5.90-1.tar.gz 1707084 BLAKE2B 3df5786785b12c410f4ae72e1d20fcd7686e0b8de60e7a713392076c2cd9edc1bd3d7f7494712ec6a4f50197fdb79e4cb708fcbe5f3b9e38cb3353e74cc8291a SHA512 d31f5133b6f81114d46cb067779260d5d74b5616e6e1b3924ef9db0db233fbb2b16132f7a003342e2ed14742c3123c644619dc1d5c93bca5d16425a77d45c632 -DIST cnijfilter2-source-6.50-1.tar.gz 2671420 BLAKE2B 2329388686b14430b84d928fb5197cbc58c2a44c25f0edc4c95d8be8d72d313a4c9a7daf09dba1f2bdc73d424a96a7aa3934d83235440bbe1e6edaf95bc5cf31 SHA512 98536a1f0677b1ead6d364b737d9873abf2140cf9646194937075c391929457d23bc792f9314badc27d1649cca6376bee20506e1922d6e16e857037bf7ce3508 +AUX cnijfilter2-6.60-c99.patch 276 BLAKE2B 18a5dbbe818576ff6ce2418b3dabd41341cbb3680df2013447f719e355b815307c3b941bffc24873d0a1810a2dead792aeb710921ade1a64d9533a4f94052ebc SHA512 c6f23899e6ee2fc76c4182bdca26ce2f5102f6ce6250713a3703be56b5af0de1990e6164f581a247746b1770ec7fa76e22a5f34775cb20beed096551726a7123 DIST cnijfilter2-source-6.60-1.tar.gz 2775344 BLAKE2B 0207784251e70c5850da74eb76a4de16d4dc5760e91ce17fc86ee9c61cfac27c041ea3f434ecad846ee3cc93649ac627d41eaaa55d3baf2e148ad36d8e142b87 SHA512 4a0560bcd4028dfbaed0c01a34c17eef492865bae97ebe0ec092442f49401295a160a4ac39ff3869f40d01f7cd085a97d114b9c5bf511a66664c2b74fbf41864 -EBUILD cnijfilter2-5.90.ebuild 1815 BLAKE2B ec1f485208bd920fd9f35a8f177ef8412eba65743455bc8788ddbf05c2ee86f8605c9b2dc5b131d537349bf5b18bde516b9536d98b565fcdf74580a1d149514b SHA512 25e53bb6398eb1cd1f17678ae3bfa8c015e3b9343c90e310ca441ba5c169509e4344ac17d6e57d8ed4f99069a30214100514e845123e38dda433b74d4f8fea8f -EBUILD cnijfilter2-6.50.ebuild 1965 BLAKE2B 5938ba21be77bb59e9cdd2c3753602c18d315d7a7cb37f7a6c9368f60322cd46552a535a1c854fb697cd26ca5d3c979ea7fbea1bb75ff421ea2b1741c2eda9a1 SHA512 f4bb922a5f29541e007cd624650fa9c35acf900ca1fda18802d60150f04a4fd6c02c77de9cea23e752917515957a10afd0de0319c2f12a77bbeab97f53efb99a -EBUILD cnijfilter2-6.60.ebuild 1985 BLAKE2B d2ea802aa252dce0bed62543226790f924f87af7009520596c281ace3c6f3cb8fe10f0c8e1327f3cbff37840783b1559056f7d27d7987b54f4814a61555ab1e3 SHA512 6ac6fccc4f0ce3a8aa77c38809511e4b3343dd87da0a4a77812d4d723b40c8db4738dc12cb62f2da24368c2ae3fb0f908cae11b70ae83c89087b095271d69f55 +DIST cnijfilter2-source-6.70-1.tar.gz 3014630 BLAKE2B f1a36c1e24406c5e67bf5a024997dec1788aec77eceaa237dc678a0d55de1434c7a5ad23cda7f44b978cf01f214435afb8588d1b04dc0ab60c37d4c2f56e5fac SHA512 a6e345082eb0c6d9f80011e8e9c6edc5db63ad719c2b4953bce7d0de05493dcb8443a8a4bb88925349a2ceab64645eec91a73fee796cc363947ebe40534af5e4 +EBUILD cnijfilter2-6.60.ebuild 2015 BLAKE2B 594afe1a445f60c8a06ee7e648fde796d0b0b0497a3d125a00ce0e97ae69a0e33ab56d0c8ea66cfb0e89792dc9de1d3373a8054c882da9d653ce8b3fc6ffe24f SHA512 94d601c7693d006050582e2ca8c3a1d147df92d8444787a0c962056570adf408499456ad25874f8bdea4bbb557b3084c87b9f26adda35e00d708917b7eaf96b0 +EBUILD cnijfilter2-6.70.ebuild 1986 BLAKE2B 29154328bbb31b461aa2548025ed9bceab3356994fa910ad8fe7ebe14480c409cbc8c28ef048b1defd9c9771db275a720067e239e2137ca9f0786405098ae9e9 SHA512 68bcf45782d13009d523445aaee9ab86b3d5c217663c92070253542ed0dd7c37ba1ba9d30f52f580f089af43283d7f90f8ec458ec9152ccee2ec5ced91fccf41 MISC metadata.xml 248 BLAKE2B a52f1b42e34917354d5d99824d47adca0f36afbe44b9f3398cc819976181e5b067ffc621d3d02f337cc080dbb8676864fd6ae0e5b48736a124687eeea01e11ba SHA512 7524a042ca62db175429683f3aee96e272e324d3e26f9d8c28d1737c5784b72962338d49dfeb28e172d171d55e46b9b889ac471eb3a26a0b58a0b3b20fb1d0b9 diff --git a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild deleted file mode 100644 index 4510e8dfa4a2..000000000000 --- a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 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="https://dev.gentoo.org/~tupone/distfiles/${MY_P}.tar.gz" - -LICENSE="Canon-IJ" -SLOT="0" -KEYWORDS="amd64 x86" - -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}"/${PN}-5.80-cflags.patch - "${FILESDIR}"/${PN}-5.80-fno-common.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() { - econf --enable-progpath="${EPREFIX}/usr/bin" LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" -} - -src_install() { - default - insinto /usr/share/ppd/cupsfilters - doins ppd/*ppd - dolib.so ${LIBDIR}/* -} diff --git a/net-print/cnijfilter2/cnijfilter2-6.50.ebuild b/net-print/cnijfilter2/cnijfilter2-6.50.ebuild deleted file mode 100644 index 661bd79c0373..000000000000 --- a/net-print/cnijfilter2/cnijfilter2-6.50.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 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://asia.canon/en/support/0101163901?model=5777C" -SRC_URI="https://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAxMTYzOTAx& -> cnijfilter2-source-${PV}-1.tar.gz" - -LICENSE="Canon-IJ" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="virtual/libusb:1 - dev-libs/libxml2 - net-print/cups" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-6.50-gentoo.patch - "${FILESDIR}"/${PN}-5.80-cflags.patch - "${FILESDIR}"/${PN}-5.80-fno-common.patch -) - -pkg_setup() { - QA_PREBUILT=" - /usr/$(get_libdir)/libcnbpnet30.so.1.0.0 - /usr/$(get_libdir)/libcnbpcnclapicom2.so.5.0.0 - /usr/$(get_libdir)/libcnnet2.so.1.2.5 - /usr/$(get_libdir)/libcnbpnet20.so.1.0.0 - /usr/bin/cnijlgmon3 - " -} - -src_prepare() { - default - DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" - LIBDIR=com/libs_bin$(usex amd64 _x86_64 _i686) - 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.5 libcnnet2.so || die - - cd - -} - -src_configure() { - econf --enable-progpath="${EPREFIX}/usr/bin" LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" -} - -src_install() { - default - insinto /usr/share/ppd/cupsfilters - doins ppd/*ppd - dolib.so ${LIBDIR}/* -} diff --git a/net-print/cnijfilter2/cnijfilter2-6.60.ebuild b/net-print/cnijfilter2/cnijfilter2-6.60.ebuild index 0852a735215d..81ab159fc828 100644 --- a/net-print/cnijfilter2/cnijfilter2-6.60.ebuild +++ b/net-print/cnijfilter2/cnijfilter2-6.60.ebuild @@ -26,6 +26,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.50-gentoo.patch "${FILESDIR}"/${PN}-5.80-cflags.patch "${FILESDIR}"/${PN}-5.80-fno-common.patch + "${FILESDIR}"/${P}-c99.patch ) pkg_setup() { diff --git a/net-print/cnijfilter2/cnijfilter2-6.70.ebuild b/net-print/cnijfilter2/cnijfilter2-6.70.ebuild new file mode 100644 index 000000000000..b2f835c76756 --- /dev/null +++ b/net-print/cnijfilter2/cnijfilter2-6.70.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 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.usa.canon.com/support/p/pixma-g4270#idReference%3Dsoftware-drivers" +SRC_URI="https://gdlp01.c-wss.com/gds/7/0100012137/01/${PN}-source-${PV}-1.tar.gz" + +LICENSE="Canon-IJ" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="virtual/libusb:1 + dev-libs/libxml2 + net-print/cups" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MY_P} + +PATCHES=( + "${FILESDIR}"/${PN}-6.50-gentoo.patch + "${FILESDIR}"/${PN}-5.80-cflags.patch + "${FILESDIR}"/${PN}-5.80-fno-common.patch + "${FILESDIR}"/${PN}-6.60-c99.patch +) + +pkg_setup() { + QA_PREBUILT=" + /usr/$(get_libdir)/libcnbpnet30.so.1.0.0 + /usr/$(get_libdir)/libcnbpcnclapicom2.so.5.0.0 + /usr/$(get_libdir)/libcnnet2.so.1.2.5 + /usr/$(get_libdir)/libcnbpnet20.so.1.0.0 + /usr/bin/cnijlgmon3 + " +} + +src_prepare() { + default + DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" + LIBDIR=com/libs_bin$(usex amd64 _x86_64 _i686) + 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.5 libcnnet2.so || die + + cd - +} + +src_configure() { + econf --enable-progpath="${EPREFIX}/usr/bin" LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" +} + +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 deleted file mode 100644 index fcb2d62ad7b5..000000000000 --- a/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- 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/cnijfilter2/files/cnijfilter2-6.60-c99.patch b/net-print/cnijfilter2/files/cnijfilter2-6.60-c99.patch new file mode 100644 index 000000000000..d328d1d1f63c --- /dev/null +++ b/net-print/cnijfilter2/files/cnijfilter2-6.60-c99.patch @@ -0,0 +1,10 @@ +--- a/lgmon3/src/keytext.c 2024-02-20 07:45:11.719827112 +0100 ++++ b/lgmon3/src/keytext.c 2024-02-20 07:46:15.504048256 +0100 +@@ -37,6 +37,7 @@ + #include + #include /* Ver.2.80 */ + #include ++#include + + #include "keytext.h" + -- cgit v1.2.3