gentoo auto-resync : 03:09:2023 - 04:17:54

3 files changed, 81 insertions, 0 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 48fb8f58a4e7..1876df20c64c 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 809f5c5e5210..8e6542cfff4c 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -4,6 +4,8 @@ AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf3
 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
+DIST cnijfilter2-source-6.60-1.tar.gz 2775344 BLAKE2B 0207784251e70c5850da74eb76a4de16d4dc5760e91ce17fc86ee9c61cfac27c041ea3f434ecad846ee3cc93649ac627d41eaaa55d3baf2e148ad36d8e142b87 SHA512 4a0560bcd4028dfbaed0c01a34c17eef492865bae97ebe0ec092442f49401295a160a4ac39ff3869f40d01f7cd085a97d114b9c5bf511a66664c2b74fbf41864
 EBUILD cnijfilter2-5.90.ebuild 1823 BLAKE2B 75dd8111a2cd69e59819e82bdd8d1b597ce39a951fc11ccbff51bb9ff18cdcd29540f83d3611bb3a638e5d5e81d3ed7f626f4d77da15cfbeae5a123f5a439459 SHA512 4a33e1354daf5e7b1d4ac0a9c3e19ae7c26d6cef8a97436b29e2cbb5d54fa548776c945728c25498c884042084de03b09cd0d10d7c72ae975397692ee59f3f45
 EBUILD cnijfilter2-6.50.ebuild 1973 BLAKE2B b22f811f0e11d5287bff842a9ba30b2c44b57d04931a70c803a9dae9ce947340c6ba53c337c38c3e46936ee5c2cad21c9ad7ee2234eef5b0226a311e1c5ae52e SHA512 8ef43706ffa16fcb83717e57c58ff1ffaafa49b19f8a525334b53fcf22154488b773feeab985da1b3a36f113313eae9ac16cad989d1c77915c05df63ef9d7a98
+EBUILD cnijfilter2-6.60.ebuild 1995 BLAKE2B 21ee1128ccb1265db46b2be3ea28d1c1a21ef4514ff3b306290cb328803838539cf5840b8f3a68e94d1ee9ef8ec456e422440e0cd83ac6929ad0ec7ed5956dc3 SHA512 24044c122c2bfba2809ff9807af882fc62a79b7384d9bd02000468c4abe47ade206660d074704572abf08f6a8ca5f09d77d0ed444d777ee183542e06e982ace5
 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
new file mode 100644
index 000000000000..8429d31348b0
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-6.60.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 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://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAxMTc1MzAx -> cnijfilter2-source-${PV}-1.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}"/${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}/*
+}