commit: 62b1c0ac6617add28481294cb1c99eee87e0869e
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 31 07:08:07 2025 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Oct 31 07:08:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b1c0ac
net-print/cnijfilter2: add 6.81 drop 6.60, 6.80
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
net-print/cnijfilter2/Manifest | 3 +-
net-print/cnijfilter2/cnijfilter2-6.60-r1.ebuild | 79 ----------------------
...filter2-6.80.ebuild => cnijfilter2-6.81.ebuild} | 2 +-
3 files changed, 2 insertions(+), 82 deletions(-)
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index b6e39862d5a6..f79a2ab096a0 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,3 +1,2 @@
-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
-DIST cnijfilter2-source-6.80-1.tar.gz 3157197 BLAKE2B
e4ba98ce63f20bff324a5f2bfee1aaf9c25183406fabe8c544b7aa8a14375c420778f5d1c438d818927948af97f9ba0c85b227c0631269447b3fd64ec41cf0ff
SHA512
72a622f863f93d7e63f5aeca23c4a96b8b860af7b11b3b362df73cf58904c90c3f1049ee93e50bf4be983ee431f2cf347301a0bdd5479756a804b1073a0f5912
+DIST cnijfilter2-source-6.81-1.tar.gz 3207300 BLAKE2B
25efd4dc6af05ccd897db96e0bbdb5515c727599a72ce3e9b8d1b5486ec5828131b292571f971a37b9eb3d2bb10fe0ea3f3c07be59943ff8a9475127ba8e8bcb
SHA512
30327725ebb87d2b100d0f4336bb6c21a1e8e443cae2af3c11c67c89c81ee1042bf8c33246ea33d168def3798bfc74f7d5c09ad99c91ac4d68b51984747d9ea5
diff --git a/net-print/cnijfilter2/cnijfilter2-6.60-r1.ebuild
b/net-print/cnijfilter2/cnijfilter2-6.60-r1.ebuild
deleted file mode 100644
index f501a4768c03..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-6.60-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2025 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"
-
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Canon-IJ"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="virtual/libusb:1
- dev-libs/libxml2:=
- net-print/cups"
-RDEPEND="${DEPEND}"
-
-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() {
- 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.80.ebuild
b/net-print/cnijfilter2/cnijfilter2-6.81.ebuild
similarity index 96%
rename from net-print/cnijfilter2/cnijfilter2-6.80.ebuild
rename to net-print/cnijfilter2/cnijfilter2-6.81.ebuild
index 8a520bc91522..7fb06518a472 100644
--- a/net-print/cnijfilter2/cnijfilter2-6.80.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-6.81.ebuild
@@ -9,7 +9,7 @@ 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/2/0100012302/02/${MY_P}.tar.gz";
+SRC_URI="https://gdlp01.c-wss.com/gds/4/0100012534/01/${MY_P}.tar.gz";
S="${WORKDIR}"/${MY_P}
