gentoo auto-resync : 29:11:2024 - 02:06:03

5 files changed, 21 insertions, 6 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 0bfef3c23f2c..e99c64466695 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 03733b57bac0..337504c7c5aa 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -2,8 +2,9 @@ AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f
 AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf38af6cb65ee3a805e8af75a0c8c6bbf9e6951d2b5376c0204830c457a77d06d3f942a420496b98aafafe6df42f651b1da41 SHA512 fd5a21de395e93975b2118c06a6957de85157e4cac8b3c473f48f00cbd56e7178b59c03396ece47f21f49414eb7acdff53952469dca5498b875e0c488af80b53
 AUX cnijfilter2-6.50-gentoo.patch 1787 BLAKE2B cb7f12a37b46dfcbdfa54fcba8a7d7260b0427cf2af005e2a8ca979609936e0d07ba66ea963ddbbd670eda362316f19bd1513de18b9d4e024b63313cdb5a5b87 SHA512 2fc38bd1e67d9fd424d47290bac5cde6e342ff091bb2583c5ccdaddd7d15ab85d37fae16e7bd08fded33d7167cbc89950bf08aafb503383b35d7143f2c19e8a2
 AUX cnijfilter2-6.60-c99.patch 276 BLAKE2B 18a5dbbe818576ff6ce2418b3dabd41341cbb3680df2013447f719e355b815307c3b941bffc24873d0a1810a2dead792aeb710921ade1a64d9533a4f94052ebc SHA512 c6f23899e6ee2fc76c4182bdca26ce2f5102f6ce6250713a3703be56b5af0de1990e6164f581a247746b1770ec7fa76e22a5f34775cb20beed096551726a7123
+AUX cnijfilter2-6.70-c23.patch 329 BLAKE2B 20722c1a8e4b3ea6038d908075af8b18f97836305b50b822214a68ada8f9680384cfc899c5ab1b665088231f7533ca6e51cd57e86a4627877fdc9b53c6f0bc34 SHA512 60bbb672a2deb2208e90989beb91669e4a7df68b8df1ed77b2fd79963a6e227d8bc862b30ccf3488f6978d031244f4149e459fcebfa3c4feca544c2ae0e44383
 DIST cnijfilter2-source-6.60-1.tar.gz 2775344 BLAKE2B 0207784251e70c5850da74eb76a4de16d4dc5760e91ce17fc86ee9c61cfac27c041ea3f434ecad846ee3cc93649ac627d41eaaa55d3baf2e148ad36d8e142b87 SHA512 4a0560bcd4028dfbaed0c01a34c17eef492865bae97ebe0ec092442f49401295a160a4ac39ff3869f40d01f7cd085a97d114b9c5bf511a66664c2b74fbf41864
 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
+EBUILD cnijfilter2-6.60.ebuild 2015 BLAKE2B 7a709c63d8be85a74549b9d4abdf06c401c123a70ecd0a49159c308a44830ac3c6181b5c20f98ba3e519a454b2b85b5224e477bb7fe8f363009f31f56cf70e6e SHA512 96dfe0991a4f3e6a7be173f2107ceddab4c77ae7f271ff57a98807ebae1e863c2dfabd436b88a813f869091fc8404274b5bb052f7ce5d1eb6349eafc17be04e0
+EBUILD cnijfilter2-6.70.ebuild 2016 BLAKE2B 89735c66414a4feb109565f2267e2b3ebcbd522491f0b29d0f04d8fb1bff3ae57ee339391ff79a9cbfd2be754c3f72599370ee9d27df3ce09dff33972f97198e SHA512 c70b555b590a760b2d854f85e0aabdba14508f3ec672a278b9968d22e52e9312ffc0bbb442cf180a378e3ad90ebce3bcd167ce3253dfdeca191ea30ac555a392
 MISC metadata.xml 248 BLAKE2B a52f1b42e34917354d5d99824d47adca0f36afbe44b9f3398cc819976181e5b067ffc621d3d02f337cc080dbb8676864fd6ae0e5b48736a124687eeea01e11ba SHA512 7524a042ca62db175429683f3aee96e272e324d3e26f9d8c28d1737c5784b72962338d49dfeb28e172d171d55e46b9b889ac471eb3a26a0b58a0b3b20fb1d0b9
diff --git a/net-print/cnijfilter2/cnijfilter2-6.60.ebuild b/net-print/cnijfilter2/cnijfilter2-6.60.ebuild
index 81ab159fc828..e52da964bebe 100644
--- a/net-print/cnijfilter2/cnijfilter2-6.60.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-6.60.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="IJ Printer Driver"
 HOMEPAGE="https://www.usa.canon.com/support/p/pixma-g4270#idReference%3Dsoftware-drivers"
 SRC_URI="https://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAxMTc1MzAx -> cnijfilter2-source-${PV}-1.tar.gz"
 
+S="${WORKDIR}"/${MY_P}
+
 LICENSE="Canon-IJ"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -20,8 +22,6 @@ DEPEND="virtual/libusb:1
 	net-print/cups"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${MY_P}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.50-gentoo.patch
 	"${FILESDIR}"/${PN}-5.80-cflags.patch
diff --git a/net-print/cnijfilter2/cnijfilter2-6.70.ebuild b/net-print/cnijfilter2/cnijfilter2-6.70.ebuild
index b2f835c76756..bee7634c9ecb 100644
--- a/net-print/cnijfilter2/cnijfilter2-6.70.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-6.70.ebuild
@@ -11,6 +11,8 @@ 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"
 
+S="${WORKDIR}"/${MY_P}
+
 LICENSE="Canon-IJ"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -20,13 +22,12 @@ DEPEND="virtual/libusb:1
 	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
+	"${FILESDIR}"/${P}-c23.patch
 )
 
 pkg_setup()  {
diff --git a/net-print/cnijfilter2/files/cnijfilter2-6.70-c23.patch b/net-print/cnijfilter2/files/cnijfilter2-6.70-c23.patch
new file mode 100644
index 000000000000..5604c29a312b
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-6.70-c23.patch
@@ -0,0 +1,13 @@
+--- a/lgmon3/src/common/libcnnet2_type.h	2024-11-28 10:21:02.088649219 +0100
++++ b/lgmon3/src/common/libcnnet2_type.h	2024-11-28 10:22:01.171874307 +0100
+@@ -48,8 +48,10 @@
+ } CNNET2_SETTING_FLAGS;
+ 
+ #ifndef __cplusplus
++#if (__STD_VERSION__ <= 201710L)
+ typedef char bool;
+ #endif
++#endif
+ 
+ typedef struct {
+   int nicIndex_;