summaryrefslogtreecommitdiff
path: root/net-print
diff options
context:
space:
mode:
Diffstat (limited to 'net-print')
-rw-r--r--net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch33
-rw-r--r--net-print/cnijfilter2/Manifest5
-rw-r--r--net-print/cnijfilter2/cnijfilter2-5.20.ebuild61
-rw-r--r--net-print/cnijfilter2/cnijfilter2-5.40.ebuild64
-rw-r--r--net-print/cnijfilter2/cnijfilter2-5.50.ebuild77
-rw-r--r--net-print/cnijfilter2/cnijfilter2-5.70.ebuild64
-rw-r--r--net-print/cnijfilter2/cnijfilter2-5.80.ebuild77
-rw-r--r--net-print/cnijfilter2/cnijfilter2-5.90.ebuild2
-rw-r--r--net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch50
-rw-r--r--net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch8
-rw-r--r--net-print/cups-bjnp/Manifest1
-rw-r--r--net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild2
-rw-r--r--net-print/cups-bjnp/cups-bjnp-2.0.ebuild20
-rw-r--r--net-print/cups/cups-2.3.3-r2.ebuild (renamed from net-print/cups/cups-2.3.3-r1.ebuild)7
-rw-r--r--net-print/cups/cups-9999.ebuild7
-rw-r--r--net-print/hplip/Manifest1
-rw-r--r--net-print/hplip/hplip-3.20.11-r1.ebuild288
17 files changed, 299 insertions, 468 deletions
diff --git a/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch
deleted file mode 100644
index 1ea36482687d..000000000000
--- a/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile 2012-09-06 00:18:06.000000000 +0100
-+++ b/Makefile 2013-08-01 19:56:01.884969274 +0100
-@@ -234,16 +234,16 @@
- @echo
-
- c2esp: c2esp.o c2espcommon.o $(LIBJBG85)
-- $(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
-
- c2espC: c2espC.o c2espcommon.o
-- $(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
-
- command2esp: command2esp.o c2espcommon.o
-- $(CC) $(CFLAGS) -o $@ command2esp.o c2espcommon.o $(LIBCUPSDRIVER)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o c2espcommon.o $(LIBCUPSDRIVER)
-
- myopldecode: myopldecode.o $(LIBJBG)
-- $(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz
-
- #
- # Installation rules
-@@ -403,3 +403,8 @@
- command2esp.o: c2espcommon.h
- c2espcommon.o: c2espcommon.h
-
-+# Respect CPPFLAGS.
-+.SUFFIXES: .c .o
-+.c.o:
-+ $(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<'
-+
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 60237cbc5a4c..83806d362510 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,6 +1 @@
-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
DIST cnijfilter2-source-5.90-1.tar.gz 1707084 BLAKE2B 3df5786785b12c410f4ae72e1d20fcd7686e0b8de60e7a713392076c2cd9edc1bd3d7f7494712ec6a4f50197fdb79e4cb708fcbe5f3b9e38cb3353e74cc8291a SHA512 d31f5133b6f81114d46cb067779260d5d74b5616e6e1b3924ef9db0db233fbb2b16132f7a003342e2ed14742c3123c644619dc1d5c93bca5d16425a77d45c632
diff --git a/net-print/cnijfilter2/cnijfilter2-5.20.ebuild b/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
deleted file mode 100644
index a5ceae2028a2..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/0/0100006900/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}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
- default
- DIRS="cmdtocanonij2 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 || die
- eautoreconf
- cd ${LIBDIR}
- rm libcn*2.so || die
- ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
- ln -sf libcnnet2.so.1.2.3 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/cnijfilter2-5.40.ebuild b/net-print/cnijfilter2/cnijfilter2-5.40.ebuild
deleted file mode 100644
index 038cbf38f1bc..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.40.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/0100008393/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}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch )
-
-src_prepare() {
- default
- DIRS="cmdtocanonij2 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 || 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/cnijfilter2-5.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
deleted file mode 100644
index 99edb10a5be2..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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/0/0100009110/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/lib.*/libcnbpnet30.so.1.0.0"
- "/usr/lib.*/libcnbpcnclapicom2.so.5.0.0"
- "/usr/lib.*/libcnnet2.so.1.2.4"
- "/usr/lib.*/libcnbpnet20.so.1.0.0"
- /usr/bin/cnijlgmon3
-)
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.20-gentoo.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${PN}-5.80-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" \
- cnijbe2/src/Makefile.am \
- */configure.ac || 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} ${LDFLAGS}" 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/cnijfilter2-5.70.ebuild b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
deleted file mode 100644
index 3b5058bc8153..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 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/0/0100009930/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}"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.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 || 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/cnijfilter2-5.80.ebuild b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
deleted file mode 100644
index a631ce9abccc..000000000000
--- a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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
- "${FILESDIR}"/${P}-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-5.90.ebuild b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
index 870bdbc7e931..e687d7cce0cd 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.90.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${MY_P}.tar.gz"
LICENSE="Canon-IJ"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="virtual/libusb:1
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
deleted file mode 100644
index be941790b995..000000000000
--- a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/cmdtocanonij2/filter/Makefile.am.old 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/cnijbe2/src/Makefile.am.old 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.old 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.old 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.old 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-5.50-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
deleted file mode 100644
index a7322bbce860..000000000000
--- a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/cmdtocanonij3/filter/Makefile.am.old 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
-
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index 6c317cadee9c..12e3eea53a5b 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,2 +1 @@
DIST cups-bjnp-2.0.3.tar.gz 140764 BLAKE2B 4b8d3c823abd9057be91a246b463fd17a26362c7f11959989749e023d3bdb70a0cba444b86d5f2302f6da13324f7fb6f6c84970933919be67c023e03842b124a SHA512 57db45e85ca016b823563ed6a2aa07a32b9fb733fc01af0aa488bd2fc3cf02388ae1dfb63234ce80d64616dd97209153bb8c047ff549405e7bfdcca0c57fcd5c
-DIST cups-bjnp-2.0.tar.gz 140617 BLAKE2B 7d280346a6f29a3530b605d8e259007c004dc5c53386904db93e5302303a158b8a5a4ed86e8cf72692fb4d64f4b041625b224a1325d5c77e4ecc82cd59bfa0d2 SHA512 60b7c58828c736eab6986896730db7635d3364e94d6d7c4992eb7f49f22ced6a5643153c069d3823d4dc663ee7de8748b8e8ec527e04afc65389c521b791c8d0
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
index fd3217e0a0f5..613046076382 100644
--- a/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
DEPEND="net-print/cups"
RDEPEND="${DEPEND}"
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
deleted file mode 100644
index 794ea7b24fb9..000000000000
--- a/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
-HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf --disable-Werror
-}
diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r2.ebuild
index d6375da0adfe..a367e9deed5b 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -253,8 +253,9 @@ multilib_src_install_all() {
"${T}"/cupsd || die
doinitd "${T}"/cupsd
- # install our pam script
- pamd_mimic_system cups auth account
+ if use pam; then
+ pamd_mimic_system cups auth account
+ fi
if use xinetd ; then
# correct path
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index dd20b85bf923..7fecb1e8f2ee 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -251,8 +251,9 @@ multilib_src_install_all() {
"${T}"/cupsd || die
doinitd "${T}"/cupsd
- # install our pam script
- pamd_mimic_system cups auth account
+ if use pam; then
+ pamd_mimic_system cups auth account
+ fi
if use xinetd ; then
# correct path
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 3fe677e345ec..bbe4324220b0 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,5 @@
DIST hplip-3.20.11-patches-1.tar.xz 17876 BLAKE2B 39514399b4b43c668c38f7fe570fc53f50547598fc86ddf383b237a6992e9c24e3aab524bee0c7055003e766f8fea67cbe7c86ab4c23911d31ade0ad4766b181 SHA512 eabc26feca22e2d6dbafb9f40df5d61fde1fd08ac0cfb17751b0e179ecd6cc3ce6c4434746293aa372d9cca0bdc9b5d6bc96af9e199aeab5b3621e2c584fedc1
+DIST hplip-3.20.11-patches-2.tar.xz 18140 BLAKE2B a0271d0c6fcfaa53c68ab00c4c6cfc121e4eef0368b7eff04677ccbd8b897897352fe44a111693d0d45ee1b40bc3c783984f23a35faedfa2fa0da52018aade3c SHA512 8d00d48e295572df19b6edf0efce005f6bae6e051cce5d618575f5e226e2c32896111ddc1a193d4aacfadbe9d7f525761b0ea2564277f4c263b3df5bc86c1f40
DIST hplip-3.20.11.tar.gz 26301441 BLAKE2B 14667f33cc50b2887c8434ada7327a82e16b9acbcdc75d3a50c0261ec9aef3fada9be81e6c0cbdfb4d29914630799c6406893644386db99c0ce86245cca38cc2 SHA512 f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d
DIST hplip-3.20.9-patches-2.tar.xz 18040 BLAKE2B f218703f5e6f319306b6cd178eb9f91981eed0d0c06b14c6846ad8a79b1d92b66176856f7b8bb272d0fa20194d4150fecf066c11fff5996f32b6fd71e1d6237d SHA512 5aa16f9c4e829774ea9266f30f6cd9d78556ea4ed36abc57cb11975c097c8bfdc44f139f5b1236af79859355ef715ec27d47f187d330541b29361e779d972fff
DIST hplip-3.20.9.tar.gz 26141198 BLAKE2B 3aa353343ee79ae04dbe94cb9e135469586a50c2052a21ffcff6907be40522a1605f1174b0b8891dea25abb83a3b836350e1e6c9d12ab2798aa826f1d3ce4069 SHA512 d2981cf51f6d893a576c51808710ac9815aa6ac5fdc617d95cc372518731a48b0aca09af721c1792e1531df6cf8fc0ebf5ebd7e9c96950602a830ceed3d441ae
diff --git a/net-print/hplip/hplip-3.20.11-r1.ebuild b/net-print/hplip/hplip-3.20.11-r1.ebuild
new file mode 100644
index 000000000000..00ac9cd9c30e
--- /dev/null
+++ b/net-print/hplip/hplip-3.20.11-r1.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+ https://dev.gentoo.org/~billie/distfiles/${PN}-3.20.11-patches-2.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+ net-print/cups
+ sys-apps/dbus
+ virtual/jpeg:0
+ hpijs? ( net-print/cups-filters[foomatic] )
+ !libusb0? ( virtual/libusb:1 )
+ libusb0? ( virtual/libusb:0 )
+ ${PYTHON_DEPS}
+ !minimal? (
+ scanner? (
+ media-gfx/sane-backends
+ )
+ snmp? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ net-analyzer/net-snmp:=
+ $(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]')
+ )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ ${COMMON_DEPEND}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ app-text/ghostscript-gpl
+ !minimal? (
+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+ kernel_linux? ( virtual/udev )
+ $(python_gen_cond_dep '
+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+ dev-python/distro[${PYTHON_MULTI_USEDEP}]
+ fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+ qt5? (
+ >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+ libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+ )
+ scanner? (
+ >=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+ X? (
+ || (
+ kde? ( kde-misc/skanlite )
+ media-gfx/xsane
+ media-gfx/sane-frontends
+ )
+ )
+ )
+ ')
+ )
+ policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+ "${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+ use parport && linux-info_pkg_setup
+
+ if use minimal ; then
+ ewarn "Installing driver portions only, make sure you know what you are doing."
+ ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+ ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+ ewarn "This also disables fax, network, scanner and gui support!"
+ fi
+
+ if ! use hpcups && ! use hpijs ; then
+ ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+ ewarn "which is probably not what you want."
+ ewarn "You will almost certainly not be able to print."
+ fi
+}
+
+src_prepare() {
+ default
+
+ python_fix_shebang .
+
+ # Make desktop files follow the specification
+ # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+ sed -i -e '/^Categories=/s/Application;//' \
+ -e '/^Encoding=.*/d' hplip.desktop.in || die
+ sed -i -e '/^Categories=/s/Application;//' \
+ -e '/^Version=.*/d' \
+ -e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+ # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+ # https://bugs.launchpad.net/hplip/+bug/500086
+ local udevdir=$(get_udevdir)
+ sed -i -e "s|/etc/udev|${udevdir}|g" \
+ $(find . -type f -exec grep -l /etc/udev {} +) || die
+
+ # Force recognition of Gentoo distro by hp-check
+ sed -i \
+ -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+ installer/core_install.py || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local drv_build minimal_build
+
+ if use hpcups ; then
+ drv_build="$(use_enable hpcups hpcups-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-cups-ppd-install"
+ drv_build="${drv_build} --disable-cups-drv-install"
+ else
+ drv_build="${drv_build} --enable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+ else
+ drv_build="--disable-hpcups-install"
+ drv_build="${drv_build} --disable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+
+ if use hpijs ; then
+ drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-foomatic-ppd-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ else
+ drv_build="${drv_build} --enable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+ else
+ drv_build="${drv_build} --disable-hpijs-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+
+ if use minimal ; then
+ if use hpijs ; then
+ minimal_build="--enable-hpijs-only-build"
+ else
+ minimal_build="--disable-hpijs-only-build"
+ fi
+ if use hpcups ; then
+ minimal_build="${minimal_build} --enable-hpcups-only-build"
+ else
+ minimal_build="${minimal_build} --disable-hpcups-only-build"
+ fi
+ minimal_build="${minimal_build} --disable-fax-build"
+ minimal_build="${minimal_build} --disable-network-build"
+ minimal_build="${minimal_build} --disable-scan-build"
+ minimal_build="${minimal_build} --disable-gui-build"
+ else
+ if use fax ; then
+ minimal_build="${minimal_build} --enable-fax-build"
+ else
+ minimal_build="${minimal_build} --disable-fax-build"
+ fi
+ if use snmp ; then
+ minimal_build="${minimal_build} --enable-network-build"
+ else
+ minimal_build="${minimal_build} --disable-network-build"
+ fi
+ if use scanner ; then
+ minimal_build="${minimal_build} --enable-scan-build"
+ else
+ minimal_build="${minimal_build} --disable-scan-build"
+ fi
+ if use qt5 ; then
+ minimal_build="${minimal_build} --enable-qt5"
+ minimal_build="${minimal_build} --enable-gui-build"
+ else
+ minimal_build="${minimal_build} --disable-gui-build"
+ minimal_build="${minimal_build} --disable-qt5"
+ fi
+ fi
+
+ # disable class driver for now
+ econf \
+ --disable-class-driver \
+ --disable-foomatic-rip-hplip-install \
+ --disable-cups11-build \
+ --disable-lite-build \
+ --disable-shadow-build \
+ --disable-qt3 \
+ --disable-qt4 \
+ --disable-udev_sysfs_rules \
+ --with-cupsbackenddir=$(cups-config --serverbin)/backend \
+ --with-cupsfilterdir=$(cups-config --serverbin)/filter \
+ --with-docdir=/usr/share/doc/${PF} \
+ --with-htmldir=/usr/share/doc/${PF}/html \
+ --enable-hpps-install \
+ --enable-dbus-build \
+ ${drv_build} \
+ ${minimal_build} \
+ $(use_enable doc doc-build) \
+ $(use_enable libusb0 libusb01_build) \
+ $(use_enable parport pp-build) \
+ $(use_enable policykit)
+
+ # hpijs ppds are created at configure time but are not installed (3.17.11)
+
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ #local i
+ #for i in ppd/hpijs/*.ppd.gz ; do
+ # rm -f ${i}.temp || die
+ # gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ # gzip > ${i}.temp || die
+ # mv ${i}.temp ${i} || die
+ #done
+}
+
+src_install() {
+ # Disable parallel install
+ # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
+ # default
+
+ # Installed by sane-backends
+ # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+ rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+ # Remove desktop and autostart files
+ # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+ use qt5 || {
+ rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+ }
+
+ rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+ rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+ # Remove hal fdi files
+ rm -rf "${ED}"/usr/share/hal || die
+
+ find "${D}" -name '*.la' -delete || die
+
+ python_optimize "${ED}"/usr/share/hplip
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-01 16:31:06 +0000