summaryrefslogtreecommitdiff
path: root/net-print
diff options
context:
space:
mode:
Diffstat (limited to 'net-print')
-rw-r--r--net-print/Manifest.gzbin6415 -> 6421 bytes
-rw-r--r--net-print/cups-filters/Manifest2
-rw-r--r--net-print/cups-filters/cups-filters-2.0.0-r1.ebuild2
-rw-r--r--net-print/cups/Manifest6
-rw-r--r--net-print/cups/cups-2.4.10.ebuild320
-rw-r--r--net-print/cups/cups-2.4.7-r2.ebuild10
-rw-r--r--net-print/cups/cups-9999.ebuild34
-rw-r--r--net-print/epson-inkjet-printer-escpr/Manifest3
-rw-r--r--net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.9.ebuild32
-rw-r--r--net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild39
-rw-r--r--net-print/foomatic-db-ppds/Manifest2
-rw-r--r--net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226-r1.ebuild (renamed from net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild)17
-rw-r--r--net-print/foomatic-db/Manifest2
-rw-r--r--net-print/foomatic-db/foomatic-db-4.0.20190226-r1.ebuild47
-rw-r--r--net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild41
-rw-r--r--net-print/hplip-plugin/Manifest2
-rw-r--r--net-print/hplip-plugin/hplip-plugin-3.24.4.ebuild71
-rw-r--r--net-print/hplip/Manifest5
-rw-r--r--net-print/hplip/hplip-3.23.12-r3.ebuild296
-rw-r--r--net-print/hplip/hplip-3.24.4.ebuild296
-rw-r--r--net-print/kyocera-1x2x-mfp-driver/Manifest2
-rw-r--r--net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r2.ebuild (renamed from net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild)48
-rw-r--r--net-print/libcupsfilters/Manifest2
-rw-r--r--net-print/libcupsfilters/libcupsfilters-2.0.0-r5.ebuild (renamed from net-print/libcupsfilters/libcupsfilters-2.0.0-r4.ebuild)4
-rw-r--r--net-print/libppd/Manifest2
-rw-r--r--net-print/libppd/libppd-2.0.0.ebuild2
-rw-r--r--net-print/npadmin/Manifest3
-rw-r--r--net-print/npadmin/npadmin-0.8.7-r1.ebuild27
-rw-r--r--net-print/npadmin/npadmin-0.8.7-r2.ebuild2
-rw-r--r--net-print/splix/Manifest4
-rw-r--r--net-print/splix/metadata.xml1
-rw-r--r--net-print/splix/splix-2.0.1.ebuild63
32 files changed, 1169 insertions, 218 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 790f9bc89a34..ce4024ca8b29 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
Binary files differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 97e0ec3db94e..a0b995ac8b2b 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,6 +4,6 @@ AUX cups-filters-1.28.17-c++17.patch 1066 BLAKE2B 149001a37c5799210a7cbc6c79ab1b
DIST cups-filters-1.28.17.tar.xz 1516052 BLAKE2B 87258391901d55d9e59b06d54603d014e54d224a373529bd70fcd38cded9dc96c88ca73bcea63d7633c065caea3f9e3274cd450aec5f1bd90130d9a88c0d3421 SHA512 320544a48206165581adafb28dbef58f39c66bebd3641be3d180a692605349d9e6af6d464044db9f7bda17a67f4a079370d8cc880cd7873d684b2209882deb35
DIST cups-filters-2.0.0.tar.xz 447648 BLAKE2B be5e2aab4eb921aa67bfcc93aa5f95a9f1fe1a269ed73d18273a0e9a3e816187e9e32750ba6521c3ab083c3c7b7a60bb1fa679e16d4a5917f911a4ba8d4b7207 SHA512 fc8ba3bbf92d5ede295884023d1c42422c4c250dbbf21c948f160a04ded3259784df4bd17eea64492f9417f866e566be1a9fcde47d29655cd4204ef4cc7af134
EBUILD cups-filters-1.28.17-r2.ebuild 3679 BLAKE2B 6f49716b9a904f063cf4356d856a87af14ce1d8536ff87aa92fe025f2df53d863373b8268524143500a17993b6dc98ede742c85a8ea931d279402e4dc70d5c36 SHA512 0e5d1a2d6c63ae020cab8f598d9b06e72712b95af8f3daf0b8a6eccbce311d89596e57ebcfa19dc9fcbc55c20714f22792ae84d29d1decdc07d20f1e7a03d1a3
-EBUILD cups-filters-2.0.0-r1.ebuild 1572 BLAKE2B 554eeca88be668f81a632527fe7b7913d48bdb5b0958a4b5541b9495b5a301f2c62a143eb01d3e7ae701fcaa542e293783be626ed57d09dfdb9f6dada1f43485 SHA512 5151eb4505f7c6d014c013a048620cfe1aa67a304bb66971aced03a267d11c0649f598815197313d0abf18c526146b282011afed6750e356268a99162f1cad88
+EBUILD cups-filters-2.0.0-r1.ebuild 1564 BLAKE2B 1fb79205df28eaf9c0143c5445177e1adc06f7497914aa9e8f1cde310e39d444b7d5e18bb57826edf9ab852aab65c3e2d54f6b82c38689629c0f37433894252e SHA512 95790f607f4c2a25972eec786de21d0eae74af7259319206e150d140100e1a8df5a83d9f222579b16ef2c561a8a4e68f627fd2b097573c92c66141ed701cd022
EBUILD cups-filters-2.0.0.ebuild 1422 BLAKE2B c85fcc33008f41ad75c2b8c25e5ed6671d18a3e6049afe410becf97c0f2821f8984fb78dbe301552b2972534af92cf6de1dddf381d3a241d5cd8f1edc6e5c8d8 SHA512 e997a777141dd75987c9f5b6a405076bb791d8e581471668a6a7719cc739d38388866bde5299f728174047fe4ee00c32e371b3094ed829f8599e73b2650a347f
MISC metadata.xml 585 BLAKE2B c3ae887bff09343b882156b9020c185a9bd0d7bfabee240c71d714b8811761ef23176e4ee71f731022103a3da2255e1683b7ac4aca0f677afd994de5bedc96ca SHA512 313722d8912f26c1a7754a837b1d64dd122ac005cd9bb644ae65cac7b7a442845b25befa7891669abbf43011e9958988a6ad084dfa6ed393decbd198e852b196
diff --git a/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild b/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild
index 462a52f62558..f078ad85f487 100644
--- a/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-2.0.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenPrinting/cups-filters/releases/download/${PV}/${
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
IUSE="+foomatic"
RDEPEND="
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 068e185207d4..4a38097a24a2 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,10 +1,12 @@
AUX cups-2.4.1-nostrip.patch 411 BLAKE2B 67b7ebe76e3586ef819a0dfee5729781ee6d5ece9ea3ff2e6805ed5bffd7cdaac039e62bbb0c47ef663fae46ae42041e025ada586f978301077124ff0ce85712 SHA512 6e792b90dbba541142f505563d37f5a567ef8469e298e2b373a9ac1900b31ffde3050b995d16fcbbeed792252b933e75c7517419a5907f9ce69e22e9c5656ff0
AUX cups-2.4.1-user-AR.patch 567 BLAKE2B 06e91a7601ebbe534808b310e80d482b0dc0b3df0d2c738979fc0917a6c497341dbb0c5f12eedc19b58a149546bab26c13324bc4d1916966d9628413a18d065f SHA512 136871e48c19be011e368dc004c39d104405a2f6729b7612c3c6355d6e1bb8dc112909c850cb58bffcbcf1efe0d4b1c3cfa3083bb63dbfc512dc93a2d0379a9e
AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46affb2007d4a5d007719a147f490e7c17a3e9a5211b82d9b89be7111921b1c9d991a6fc4c457f63eae0 SHA512 23ec5714764f2bac4105130efe6f79a508a352ecb45ab3f6e08042b156af05065330b2ac85615d0ce792a4dcd8f5230302dba9d1a96fca84c11d8bf2573ccc0e
+DIST cups-2.4.10-source.tar.gz 8145236 BLAKE2B 842a713d606c1e68d5113c0fc2f063cb58519891bb8f442fd64caeebf6b14fbf38b59d1fe4277cf8f9a01238c4c040fc7919234afa56dc86fcebb623a0058322 SHA512 6442207615f79c91de134ff5f438aa5060cbdf764113f7a338a53f7e12ad87bab147ea61302e84c94f259d31950f1a164c4574d11942ca838eb924827375748e
DIST cups-2.4.6-source.tar.gz 8135135 BLAKE2B 4e61112ddaa46f20b1cfcb8f523dd07ba7d82604b9857754b288a2a9c5bc50ce242cfa119867347e4696818dc2eb505cf7fff1f9a0634e314edb2500395b83e4 SHA512 eb748680a748f599e4826c17054a24259d190e6c8e8339f6a7a37ee2a3f4c3fd1829e856b25a854cfdbee1b51279c70a0e847f6142225b8b68f1cd10c4ce4ce4
DIST cups-2.4.7-source.tar.gz 8134809 BLAKE2B d81de62cff37c576ef8fb125b97568c2d86602cec6151d7030552fad421d7bc77a5df1e860d5ac5a241e739cc0d1fe5fcac44b8451ad2fc4dc675cf74fd41382 SHA512 914b574ff6d85de9f3471528b52d4a436c484c441f47651846e1bdfa00aec26774efd416ff466216d2bccf468f8a797b1e0d666b5c82abc87e77550ce8b00d39
+EBUILD cups-2.4.10.ebuild 9645 BLAKE2B fafb22d0a346293ecb2fc3be493ef4dd5f2259eac977458b92cf355fc98670284fac0e3bfe5bddd4810901e37cda46964c3e4538fc0c4a8cfd341b2191997ad0 SHA512 8fad49ff09dec34200bbac25865f8b2a8a2c57c2e774ac898bd8c2675f26a4f3690f8f3191723bdfcf2a69faa7117b21f5bb51d032a020f5629bc124d4f9981f
EBUILD cups-2.4.6.ebuild 9552 BLAKE2B 04227d32d232dabbf378d9dd4c254b04bf582e41c569295c50db2990b23f14824287c5158f792da2b9a64d146883b5c8b096f7fc55f88ffdc3b1288293def759 SHA512 4d8e8028a98f338d6775ee3ca07490efdfcd5f9ac9ca4a6fa59405045e25e2280598bab302b6d2cbc6c69878253cba035dbcee8a6f09c6c989ffc62d78408406
EBUILD cups-2.4.7-r1.ebuild 9467 BLAKE2B f4d2c631a5c5af07ea5cbf525cf80353d60f46b37273f9b4a58def9a26cd3de5f733a87f4108b513be5a20cb1a33add83d428e9c35fd5a5c175e15e45052bfa6 SHA512 d0ddd06b8d121533025e5c74124fab77240e820e79ed189200e20f3faa60c1cf8ca3b29453cf74e733da673206fb5855a926e0bcb50f27269395a349a0f906dd
-EBUILD cups-2.4.7-r2.ebuild 9635 BLAKE2B 6d97f4be0b14bdacaa5641ed2e49a9e8cb62424bfbeb3c9d652a5bc6c16bb40123a7b96614d66eb4fe543e17592418e2d9170c68539953213f06c520c2039b40 SHA512 4964b5ede6bb79a53493540c31b85458ae35db2991fe22040c917459c6feffb78d721b2d8d66c27a43ce5403c9634a8b11fe26e29510cf207ac9e53e91f46045
-EBUILD cups-9999.ebuild 9475 BLAKE2B 6a86ce8658096636175e5f324e4d19b6ab2023f002495e6bff79f18122ea1bb7332bfdc9c642d26022a50ec72e9dd3d1d0f7329b92fc49e3da7abf038835fc92 SHA512 e0ece558491f66bcbd78fa4c10a84ef58b58a17fac7ce1f6a5fd6c6a6e7c2163b671b178da22fe92883c90a79a391f2f0735cd1f920fcac0e6e12f4c9b6b6077
+EBUILD cups-2.4.7-r2.ebuild 9638 BLAKE2B 6f1ba280050a738e9c7505bb9b03281100fe2aadfd59509977d9f7437f013613781d8f1a2fe4da5387c1bb228d341c187ee08aa6a8c9fe04f6b45ec15122a36d SHA512 5406ebc558a59f978d33f28fc9ad59d564fb66d9b2e43f651fb19058a71e5801a738f0390d2061fe6c29bd452f9348f43bd9d35cb11239209c2ddd13538bb920
+EBUILD cups-9999.ebuild 9645 BLAKE2B fafb22d0a346293ecb2fc3be493ef4dd5f2259eac977458b92cf355fc98670284fac0e3bfe5bddd4810901e37cda46964c3e4538fc0c4a8cfd341b2191997ad0 SHA512 8fad49ff09dec34200bbac25865f8b2a8a2c57c2e774ac898bd8c2675f26a4f3690f8f3191723bdfcf2a69faa7117b21f5bb51d032a020f5629bc124d4f9981f
MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.10.ebuild b/net-print/cups/cups-2.4.10.ebuild
new file mode 100644
index 000000000000..561c0c7527d4
--- /dev/null
+++ b/net-print/cups/cups-2.4.10.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_PV="${MY_PV/_p/op}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
+ [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
+else
+ SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
+ if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ fi
+fi
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ acct-group/lp
+ acct-group/lpadmin
+ virtual/pkgconfig
+"
+COMMON_DEPEND="
+ app-text/libpaper:=
+ sys-libs/zlib
+ acl? (
+ kernel_linux? (
+ sys-apps/acl
+ sys-apps/attr
+ )
+ )
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ pam? ( sys-libs/pam )
+ !pam? ( virtual/libcrypt:= )
+ !openssl? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
+ openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd )
+ usb? ( virtual/libusb:1 )
+ X? ( x11-misc/xdg-utils )
+ xinetd? ( sys-apps/xinetd )
+ zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
+"
+# if libcupsfilters is installed, more tests are run. They fail without at least one of the two formats enabled.
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( || ( net-print/libcupsfilters[jpeg] net-print/libcupsfilters[png] ) )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ acct-group/lp
+ acct-group/lpadmin
+ selinux? ( sec-policy/selinux-cups )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.4.1-nostrip.patch"
+ "${FILESDIR}/${PN}-2.4.1-user-AR.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/cups-config
+)
+
+pkg_setup() {
+ if use kernel_linux; then
+ linux-info_pkg_setup
+ if ! linux_config_exists; then
+ ewarn "Can't check the linux kernel configuration."
+ ewarn "You might have some incompatible options enabled."
+ else
+ # Recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug #501122)
+ if use usb; then
+ if linux_chkconfig_present USB_PRINTER; then
+ elog "Your USB printers will be managed via libusb. In case you run into problems, "
+ elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+ elog "usblp kernel module."
+ elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+ fi
+ else
+ if ! linux_chkconfig_present USB_PRINTER; then
+ ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+ ewarn "support in your kernel."
+ ewarn "Please enable it:"
+ ewarn " CONFIG_USB_PRINTER=y"
+ ewarn "in /usr/src/linux/.config or"
+ ewarn " Device Drivers --->"
+ ewarn " USB support --->"
+ ewarn " [*] USB Printer support"
+ ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+ fi
+ fi
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Remove ".SILENT" rule for verbose output (bug #524338).
+ sed 's#^.SILENT:##g' -i Makedefs.in || die
+
+ # Remove redefinition of _FORTIFY_SOURCE (bug #907683)
+ sed 's#-D_FORTIFY_SOURCE=3##g' -i config-scripts/cups-compiler.m4 || die
+
+ AT_M4DIR="config-scripts" eautoreconf
+
+ # Custom Makefiles
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ export DSOFLAGS="${LDFLAGS}"
+
+ # Explicitly specify compiler wrt bug #524340
+ #
+ # Need to override KRB5CONFIG for proper flags
+ # https://github.com/apple/cups/issues/4423
+ local myeconfargs=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+ --localstatedir="${EPREFIX}"/var
+ # Follow Fedora permission setting
+ --with-cupsd-file-perm=0755
+ --with-exe-file-perm=755
+ --with-log-file-perm=0640
+ # Used by Debian, also prevents printers from getting
+ # disabled and users not knowing how to re-enable them
+ --with-error-policy=retry-job
+ # Used in Debian and Fedora
+ --enable-sync-on-close
+ #
+ --with-rundir="${EPREFIX}"/run/cups
+ --with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig
+ --with-cups-user=lp
+ --with-cups-group=lp
+ --with-docdir="${EPREFIX}"/usr/share/cups/html
+ # See bug #863221 for adding root
+ --with-system-groups="root lpadmin"
+ --with-xinetd="${EPREFIX}"/etc/xinetd.d
+ $(multilib_native_use_enable acl)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable debug debug-guards)
+ $(use_enable debug debug-printfs)
+ $(use_enable kerberos gssapi)
+ $(multilib_native_use_enable pam)
+ $(use_enable static-libs static)
+ --with-tls=$(usex openssl openssl gnutls)
+ $(use_with systemd ondemand systemd)
+ $(multilib_native_use_enable usb libusb)
+ $(use_with zeroconf dnssd avahi)
+ $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+ )
+
+ # Handle empty LINGUAS properly, bug #771162
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ myeconfargs+=(
+ --with-languages="${LINGUAS}"
+ )
+ fi
+
+ if tc-is-static-only; then
+ myeconfargs+=(
+ --disable-shared
+ )
+ fi
+
+ # Install in /usr/libexec always, instead of using /usr/lib/cups, as that
+ # makes more sense when facing multilib support.
+ sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die
+
+ econf "${myeconfargs[@]}"
+
+ sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+ sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+ sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+ # Additional path corrections needed for prefix, see bug #597728
+ sed \
+ -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+ -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+ -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+ -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+ -i Makedefs || die
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+ else
+ emake libs
+ fi
+}
+
+multilib_src_test() {
+ # We only build some of CUPS for multilib, so can't run the tests.
+ if multilib_is_native_abi; then
+ # Avoid using /tmp
+ export CUPS_TESTBASE="${T}"/cups-tests
+
+ mkdir "${T}"/cups-tests || die
+
+ # avoid building *and running* test binaries in src_compile
+ # https://github.com/OpenPrinting/cups/commit/b1d42061e9286f50eefc851ed906d17c6e80c4b0
+ emake UNITTESTS=unittests
+ default
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake BUILDROOT="${D}" install
+ else
+ emake BUILDROOT="${D}" install-libs install-headers
+ dobin cups-config
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc {CHANGES,CREDITS,README}.md
+
+ # Move the default config file to docs
+ dodoc "${ED}"/etc/cups/cupsd.conf.default
+ rm "${ED}"/etc/cups/cupsd.conf.default || die
+
+ # Clean out cups init scripts
+ rm -r "${ED}"/etc/{init.d/cups,rc*} || die
+
+ # Install our init script
+ local neededservices=(
+ $(usex zeroconf avahi-daemon '')
+ $(usex dbus dbus '')
+ )
+ [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
+ cp "${FILESDIR}"/cupsd.init.d-r4 "${T}"/cupsd || die
+ sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
+ doinitd "${T}"/cupsd
+
+ if use pam ; then
+ rm "${ED}"/etc/pam.d/${PN} || die
+ pamd_mimic_system cups auth account
+ fi
+
+ if use xinetd ; then
+ # Correct path
+ sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+ "${ED}"/etc/xinetd.d/cups-lpd || die
+ # It is safer to disable this by default, bug #137130
+ grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+ # Write permission for file owner (root), bug #296221
+ fperms u+w /etc/xinetd.d/cups-lpd
+ else
+ # Always configure with --with-xinetd= and clean up later,
+ # bug #525604
+ rm -r "${ED}"/etc/xinetd.d || die
+ fi
+
+ keepdir /etc/cups/{interfaces,ppd,ssl}
+
+ if ! use X ; then
+ rm -r "${ED}"/usr/share/applications || die
+ fi
+
+ # Create /etc/cups/client.conf, bug #196967 and bug #266678
+ echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+ # The following file is now provided by cups-filter:
+ rm -r "${ED}"/usr/share/cups/banners || die
+
+ # The following are created by the init script
+ rm -r "${ED}"/var/cache || die
+ rm -r "${ED}"/run || die
+
+ keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} /var/log/cups /var/spool/cups/tmp
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ local v
+
+ for v in ${REPLACING_VERSIONS}; do
+ if ! ver_test ${v} -ge 2.2.2-r2 ; then
+ ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+ ewarn "cupsd will fail the next time. To fix this, please run once as root"
+ ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+ break
+ fi
+ done
+
+ for v in ${REPLACING_VERSIONS}; do
+ elog
+ elog "For information about installing a printer and general cups setup"
+ elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+ break
+ done
+
+ optfeature_header "CUPS may need installing the following for certain features to work:"
+ use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns
+}
diff --git a/net-print/cups/cups-2.4.7-r2.ebuild b/net-print/cups/cups-2.4.7-r2.ebuild
index 51ce84608e2e..0da25c8b8850 100644
--- a/net-print/cups/cups-2.4.7-r2.ebuild
+++ b/net-print/cups/cups-2.4.7-r2.ebuild
@@ -213,13 +213,13 @@ multilib_src_compile() {
}
multilib_src_test() {
- # Avoid using /tmp
- export CUPS_TESTBASE="${T}"/cups-tests
-
- mkdir "${T}"/cups-tests || die
-
# We only build some of CUPS for multilib, so can't run the tests.
if multilib_is_native_abi; then
+ # Avoid using /tmp
+ export CUPS_TESTBASE="${T}"/cups-tests
+
+ mkdir "${T}"/cups-tests || die
+
# avoid building *and running* test binaries in src_compile
# https://github.com/OpenPrinting/cups/commit/b1d42061e9286f50eefc851ed906d17c6e80c4b0
emake UNITTESTS=unittests
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 3d6b8b8cac30..561c0c7527d4 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
else
SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
fi
@@ -30,16 +30,14 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="acl dbus debug kerberos openssl pam selinux static-libs systemd test usb X xinetd zeroconf"
-# As of 2.4.2, they don't actually seem to be interactive (they pass some flags
-# by default to input for us), but they fail on some greyscale issue w/ poppler?
-RESTRICT="!test? ( test ) test"
+RESTRICT="!test? ( test )"
BDEPEND="
acct-group/lp
acct-group/lpadmin
virtual/pkgconfig
"
-DEPEND="
+COMMON_DEPEND="
app-text/libpaper:=
sys-libs/zlib
acl? (
@@ -60,13 +58,17 @@ DEPEND="
xinetd? ( sys-apps/xinetd )
zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
"
+# if libcupsfilters is installed, more tests are run. They fail without at least one of the two formats enabled.
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( || ( net-print/libcupsfilters[jpeg] net-print/libcupsfilters[png] ) )
+"
RDEPEND="
- ${DEPEND}
+ ${COMMON_DEPEND}
acct-group/lp
acct-group/lpadmin
selinux? ( sec-policy/selinux-cups )
"
-PDEPEND=">=net-print/cups-filters-1.0.43"
PATCHES=(
"${FILESDIR}/${PN}-2.4.1-nostrip.patch"
@@ -163,7 +165,6 @@ multilib_src_configure() {
$(use_enable kerberos gssapi)
$(multilib_native_use_enable pam)
$(use_enable static-libs static)
- $(use_enable test unit-tests)
--with-tls=$(usex openssl openssl gnutls)
$(use_with systemd ondemand systemd)
$(multilib_native_use_enable usb libusb)
@@ -212,13 +213,18 @@ multilib_src_compile() {
}
multilib_src_test() {
- # Avoid using /tmp
- export CUPS_TESTBASE="${T}"/cups-tests
+ # We only build some of CUPS for multilib, so can't run the tests.
+ if multilib_is_native_abi; then
+ # Avoid using /tmp
+ export CUPS_TESTBASE="${T}"/cups-tests
- mkdir "${T}"/cups-tests || die
+ mkdir "${T}"/cups-tests || die
- # We only build some of CUPS for multilib, so can't run the tests.
- multilib_is_native_abi && default
+ # avoid building *and running* test binaries in src_compile
+ # https://github.com/OpenPrinting/cups/commit/b1d42061e9286f50eefc851ed906d17c6e80c4b0
+ emake UNITTESTS=unittests
+ default
+ fi
}
multilib_src_install() {
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 8793f2eb52dc..0b23214a3a27 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -2,11 +2,8 @@ AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475a
AUX epson-inkjet-printer-escpr-1.7.7-fnocommon.patch 309 BLAKE2B 70e10c99dcf8b5d06acd38722f419c09f994253538d88cc9621051ee58b8a9cbe203c35c279c9ef8b5f0f7cd091118a0b2ccf802e09e2996f4e6346e7927f695 SHA512 5cff64797453868d1d0540a22fd72b53d7214d2e9c574cdf635206baf71fc227147babcfe97c73193ca356ad40afa5bb7ea80107576efee138b936e052b9fb2d
AUX epson-inkjet-printer-escpr-1.8-missing-include.patch 6575 BLAKE2B 24e0d0e2674fb74b4cfabe27a695c08f4b1a87a26ddb82956157449c09c4f0e71ca9585db3507b92902ec7deb02a41a3aa9df770820379bcd851b47f4865b8e1 SHA512 392b4713ca94fd8656d39205f61db3f5491c09a15f5dc1f1239a07928d62d243d24941893c197bc227195129e7e346c8479de234aaafbf91d64716dba395068a
AUX epson-inkjet-printer-escpr-2-gcc14.patch 11552 BLAKE2B 2ca31fa995937129cedd93945d1f8603e76f5239ac1aec802a4c58f889d78d4b514fe42ef16608f946c7f2895650ff8a89dace11b64a1cbfef78172ed92dc966 SHA512 c40741c96b462c938d54b646dcbf04ae69c7f9b227f0dbb5cc587e46730359c717e5cf0272c729c7343b18612110153cef454d85e19d76ca7b3e94f36ca0a498
-DIST epson-inkjet-printer-escpr-1.8.4-1.tar.gz 5595766 BLAKE2B 9baba92331d0f55a6831d23a7b9b2824b5f33392d41f6ef0e2c45a4df7b54503d16b14dccc5dcc0d9b163f2677ba473b502e605f2f9509a1fc8c6c3095bbe858 SHA512 548b0cc27ab91c19b1d4fad79e3c3cacfb821b7c3156d8f1f3aafd31b94405794a86ff8b6abf5e56fb6692a471d96b5665a006cdc748d8de83c2ebadb0f634bc
DIST epson-inkjet-printer-escpr-1.8.5-1.tar.gz 5666905 BLAKE2B 549c948709993779b5615b501038fdceb6c3d6f173709b8cf99459346fff89923bdbe1babe34ee98eed4e1ebbd7a4b5962ddbc9cec9711aa15ff2056fec3d436 SHA512 4117b1efe903e4f506bbc67c45079f1d467ff6527691308734e55d32feeda3ec44b2dd85361e0243114f924eef04a91b0a5e86b5008f0a32ef323989b3d2896f
DIST epson-inkjet-printer-escpr2-1.2.9-1.tar.gz 5367737 BLAKE2B 6868569a6bed622e2f50619a36ffb0a0f7e834fd8a794ae3bc906d971db26b0c86386c9545190ec384027d0b8e8f62ddda6cb24f1e3f60b9c535a1eeddff4332 SHA512 70ff744d42fac4c79d2994648763b0b3970ee5463a7a310a0721a63735d536cb9a0499c894289d946b30e6f564f9bf60aa61801580ab6635af211d50867921a1
EBUILD epson-inkjet-printer-escpr-1.2.9-r1.ebuild 881 BLAKE2B 4b4f4632e1e47c8bcf311950e35f9e400e397cb25f0ace2ef89b6c45163cdc86a81c67497e065ed95a643a1266c6796dedf16841ca21fbc078100f81cb4b9829 SHA512 0577511cedd44fd04ef6ef681e3d5cd0430a0a6626834fe19df60ac677052b5c64c4779e7e3eca9a5c2a074fcf634804d3e45f7f839a288d8a3e45da6bc1e376
-EBUILD epson-inkjet-printer-escpr-1.2.9.ebuild 827 BLAKE2B 6cdacdf01493044268b2781cc67fa2f9803843abd6f72a343c75a7b4940e5de60830ff63829a1bfd8a4bf38febc6ec634cecd3b988f7b28fd06f2fa554cd5bdb SHA512 2de6f038100d2ecd99875afebfdb7b4dc961317ae34e44d32bf16cd74d07142e236738a74e1b4c6e56f42fa2b6514dbaef157b0e154e207d5fc578b0d63c6f97
-EBUILD epson-inkjet-printer-escpr-1.8.4.ebuild 1079 BLAKE2B 780e56405007f19d5dc0462f74f2a7a2bd970c7e664e37f3dd33f1c66a95b7815a12f5c963be23dc6d46482d9d8643833f2749ad4161eaeb552f5f9a2b7b181c SHA512 0a18263a6531e5f2ee318044ca54f5d4789d33cdf3620b2c60a416f7328dcc78ffbaed8c114666063a60b787c33f887971b72657c038d8d5cf93aee7a7d57f56
EBUILD epson-inkjet-printer-escpr-1.8.5.ebuild 1079 BLAKE2B e718ecb13d39a8bfe03f65f8adad42895b853f686ad3f3166bfe3f0735b80aa7e5c7db34c7906a1dbc2bc1f8dff61b09d304dd118d90646cec39ab96a0a55753 SHA512 6ee84e32bd3701f8aa2bd1a6bff6b49044a1b3ebbe78599e04bf9355ffee8493013fe5bc78d04cc922053c9337266b9e66250e48b83dab8f42c1e75506fd8106
MISC metadata.xml 1890 BLAKE2B b90489bd80a2957d1a6287a727d847c1fdbdfb576f7e816b60196b7d82ac13c72fd19322202f651cdfd11b56fe09fe962230f0d2eb4f1a9565ff9ad9b9ab0c24 SHA512 8cb73e282d607a5699d4c3e4f6f6f4663153ea9a0240a5b6b73317ab7ffb8ba1d54ed00c7b6ed53045059b246f62ee841cf27cc83a56a7ed72d9b2131463bc24
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.9.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.9.ebuild
deleted file mode 100644
index d66c18c52378..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux"
-HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/15/33/96/607198a4f064daa9e7931913eaf27f3a58125f2b/${MY_P}-1.tar.gz"
-S="${WORKDIR}/${MY_P}"
-LICENSE="EPSON LGPL-2.1+"
-SLOT="2"
-KEYWORDS="amd64"
-
-QA_FLAGS_IGNORED="/usr/lib64/libescpr2.so.1.0.0"
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf \
- --with-cupsfilterdir="${EPREFIX}/usr/libexec/cups/filter"
- --with-cupsppddir="${EPREFIX}/usr/share/ppd"
-}
-
-src_install() {
- default
-
- find "${ED}/usr/lib64" -name "*.la" -delete \
- || die "Removal of libtool files (.la) has failed."
-}
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
deleted file mode 100644
index 64af8c42cefc..000000000000
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.8.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
-HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-
-# https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr.php
-# Use the "source package for arm CPU" to get a tarball instead of an srpm.
-SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/15/57/25/a928e7d08c825ef1cdb892e70318d986720cef8a/${P}-1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/1.6.5-warnings.patch"
- "${FILESDIR}/${PN}-1.7.7-fnocommon.patch"
- "${FILESDIR}/${PN}-1.8-missing-include.patch"
-)
-
-src_configure() {
- econf --disable-shared
-
- # Makefile calls ls to generate a file list which is included in Makefile.am
- # Set the collation to C to avoid automake being called automatically
- unset LC_ALL
- export LC_COLLATE=C
-}
-
-src_install() {
- emake -C ppd DESTDIR="${D}" install
- emake -C src DESTDIR="${D}" install
- einstalldocs
-}
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 071c0135f972..ec66844cca14 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -1,4 +1,4 @@
AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04dd55acbae7fa648089ded8f10f3d61390c62e24ba5d491b3a4ac2fb7c9636db3c4895842da798c5a870972d334b71b31 SHA512 75ab0f16ce0c187553fc7bdcdc9a23ae8fecd50942d3ba0282ec2d4001f141904e6f93c8a9b6496ab2b0205a31d46a082ea304e8dcbc25f5e38c86ff696d7935
DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-ppds-4.0.20190226.ebuild 833 BLAKE2B 881362cb462c4df160fd80398917761d08937dd10a24e6f5347bc2c2c9be8b4278fb687a13ea53a5e6028cfb1b6b1461a66275cb95677f7437060b0ab68afa5e SHA512 52c018e04d01dcf8d6c0c89afffcacdb1345098dce26657bf9a7b8a72e3b582e6026b090bb612cfbfcd8589e441e32eff8720d65b87c9f3d4de8f3fd2bd3fb49
+EBUILD foomatic-db-ppds-4.0.20190226-r1.ebuild 746 BLAKE2B 784aa6bfc8bb9b28ec80d8a0ddce6b336f5aa22f75c3e50f88bbd1fba870baef98c5006305337632b0c080444862a39bba9b233b98f56d41c2090a0c30fbd932 SHA512 4f98056553de0148c72229bc3061fceaef4d6d6095cc13dfbcb506a6ffb19cf24b9f9a791a8604f99321e8d756d25788ae695c4e99750d777d07a4e2544393ed
MISC metadata.xml 284 BLAKE2B 36426f95cb354d191a324eb7a89eb8a6a18ba1c85403f6a7a39bd5f3872f7d48d7d4d59ace082d75e3c01227e02c87e846412044d5f478d3db505d70b60dada7 SHA512 fd6b64e299ddaf025ad25216c5c7010b6928ecd3f92b0d4fc72697a03551e17f6fbbf8478ab736483a4f219cb1d7da66075cd1b6b69850977ff836d562f63740
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226-r1.ebuild
index aafc2714c037..0d96755a90e8 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226-r1.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+EAPI=8
DESCRIPTION="linuxprinting.org PPD files for postscript printers"
HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.xz"
+SRC_URI="http://linuxprinting.org/download/foomatic/${PN/-ppds}-$(ver_rs 2 -).tar.xz"
+S=${WORKDIR}/${PN/-ppds}-$(ver_cut 3)
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
+PATCHES=(
+ "${FILESDIR}/Makefile.in-4.0.20120117.patch"
+)
src_prepare() {
- eapply "${FILESDIR}/Makefile.in-4.0.20120117.patch"
rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
default
}
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 7a1891d022d6..894cb1cc6806 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,3 +1,3 @@
DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-4.0.20190226.ebuild 1202 BLAKE2B 141ce821655c6c75be3ee9962aee9215e2aae4e4fec37035f5385c24eb8b50ab9b6e8b21b1ab9de15f6bd835c9de3702a11063add807f8be441e273ce720f468 SHA512 e794015b64428aec28fdf7572bf38c4b34b7fb29a697ddbf17e9d79849741676a1bee79a2066bb6613e0a8bd6da5b081824a1bdd5755ab32b77860f40f7dafac
+EBUILD foomatic-db-4.0.20190226-r1.ebuild 1223 BLAKE2B 4bbba98509f14c700dedfaa210db7a01cc7a95247264b4f1491109c8e9ca9ad22ed1eb4bd967f56d92d85a22f0268a6e1dbcf7dc30ae6b2c75c760e0690e5f98 SHA512 2fc50cacbcdee69b542d815dd233f17ebef6e3e59703ee86e0dc7d87ba047f6e53ad76b735c4c5509e232e9905883585f7d365664045c1985668b04d1c511f87
MISC metadata.xml 284 BLAKE2B 36426f95cb354d191a324eb7a89eb8a6a18ba1c85403f6a7a39bd5f3872f7d48d7d4d59ace082d75e3c01227e02c87e846412044d5f478d3db505d70b60dada7 SHA512 fd6b64e299ddaf025ad25216c5c7010b6928ecd3f92b0d4fc72697a03551e17f6fbbf8478ab736483a4f219cb1d7da66075cd1b6b69850977ff836d562f63740
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226-r1.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226-r1.ebuild
new file mode 100644
index 000000000000..89e2462b4179
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20190226-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(ver_rs 2 -).tar.xz"
+S=${WORKDIR}/${PN}-$(ver_cut 3)
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+
+RDEPEND="
+ net-print/foomatic-db-engine
+ !net-print/foo2zjs[hp2600n]
+"
+
+src_prepare() {
+ # ppd files do not belong to this package
+ rm -r db/source/PPD || die
+ default
+}
+
+src_configure() {
+ econf \
+ --disable-gzip-ppds \
+ --disable-ppds-to-cups
+}
+
+src_install() {
+ default
+
+ cd "${ED}"/usr/share/foomatic/db/source/ || die
+ rm -r PPD || die
+ # Avoid collision with foo2zjs, bug 185486
+ local FILES=(
+ driver/foo2{hp,lava,xqx,zjs}.xml
+ printer/Generic-ZjStream_Printer.xml
+ printer/HP-Color_LaserJet_{1500,1600,2600n}.xml
+ printer/HP-LaserJet_10{00,05,18,20,22}.xml printer/HP-LaserJet_M1005_MFP.xml
+ printer/Minolta-Color_PageWorks_Pro_L.xml printer/Minolta-magicolor_2{20,30,43}0_DL.xml
+ printer/Samsung-CLP-{3,6}00.xml
+ )
+ rm -v "${FILES[@]}" || die
+}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
deleted file mode 100644
index b559732c3d5b..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- net-print/foomatic-db-engine
- !net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
- # ppd files do not belong to this package
- rm -r db/source/PPD || die
- default
-}
-
-src_configure() {
- econf \
- --disable-gzip-ppds \
- --disable-ppds-to-cups
-}
-
-src_install() {
- default
- rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
- # Avoid collision with foo2zjs, bug 185486
- rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml} || die
-}
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 13d1e2d88373..5f28d1cd4eca 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,3 +1,5 @@
DIST hplip-3.23.12-plugin.run 11491524 BLAKE2B 9b87522a78588d65815992a170451888b4c6ac83809498fae01cfa4d2c333657a7cf49f2358e12ebfd0ae0f4169e29729e9ef8ba6716f74de0a83b11552275e3 SHA512 933c27040443584e0cfda71b50b8a251ebd34fdf4a2c90f40e36d1c155b3ae87c1474835356f685de2997469b4b7a3f000e216fd427118eea2542fa142783ab9
+DIST hplip-3.24.4-plugin.run 11490921 BLAKE2B 8eeb0a292b1a132841c2d69808441b281de04950be2b906a5906b36b634f30ed42484cc14ac232ef4c50ae5e660c5e48e2afc407e64b12f1b8deb7cf38425bf2 SHA512 21b1636d4d4f7f1673f1a88abc13f4f81c225d6a36a4d45f4f0579ec5ca9bb4a3885ffd413ab6888290c3e2aa62eef45a27cd5eb84c8f20ef3e6c09e24c854b9
EBUILD hplip-plugin-3.23.12.ebuild 1483 BLAKE2B c75f0e9c64e2f71916ec9b8a67b41faefffee00cce74e3ab2df526b271b90b26cd20ccbd0549cd43e0362f33650158b17334a063260a65734cf673ef8e9606d4 SHA512 166432f69b79f75c142db0febcb91cdccb9ecea2a98bf1a9afd6f10cc5ee52b357fd21772ededa54dcb6842400b34368659cfca51af33578c4cc292c58a5099c
+EBUILD hplip-plugin-3.24.4.ebuild 1487 BLAKE2B d84b9416e2d8f29a3aef8c0d96e89116e4f6cdb282e6d8a4eac5ff7e6a26256dda52062945ada8ac6182186a049ab875665af0c0b645cde5f14916a2847f166c SHA512 31c6702526a7ef33ec665a4a89dc84d43e75485283d5ffa36083f6496d450d5b0694b97fc1496df64a905898a41f2fe23b5ef4bc18f45b4b4fe817d20feb3c73
MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.24.4.ebuild b/net-print/hplip-plugin/hplip-plugin-3.24.4.ebuild
new file mode 100644
index 000000000000..2325efad4421
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.24.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
+SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
+S="${WORKDIR}"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="orblite"
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+RDEPEND="
+ ~net-print/hplip-${PV}
+ virtual/udev
+ orblite? (
+ media-gfx/sane-backends
+ >=sys-libs/glibc-2.26
+ virtual/libusb:0
+ )
+"
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PREBUILT="${HPLIP_HOME}/*.so"
+
+src_install() {
+ local hplip_arch plugin
+ case "${ARCH}" in
+ amd64) hplip_arch="x86_64" ;;
+ arm) hplip_arch="arm32" ;;
+ arm64) hplip_arch="arm64" ;;
+ x86) hplip_arch="x86_32" ;;
+ *) die "Unsupported architecture." ;;
+ esac
+
+ insinto "${HPLIP_HOME}"/data/firmware
+ doins *.fw.gz
+
+ for plugin in *-${hplip_arch}.so; do
+ local plugin_type=prnt
+ case "${plugin}" in
+ bb_orblite-*)
+ use orblite || continue
+ plugin_type=scan ;;
+ bb_*)
+ plugin_type=scan ;;
+ fax_*)
+ plugin_type=fax ;;
+ esac
+
+ exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+ newexe ${plugin} ${plugin/-${hplip_arch}}
+ done
+
+ insinto /var/lib/hp
+ newins - hplip.state <<-_EOF_
+ [plugin]
+ installed = 1
+ eula = 1
+ version = ${PV}
+ _EOF_
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index a1ea84cd2057..d022465e7d18 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,9 @@
DIST hplip-3.23.12-patches-1.tar.xz 21132 BLAKE2B 83cee13ef988618cf6537b3954649c733b3de99f4d1c2ffefe9aeaba8f21e61a92dfa2e4cdb87af3d4b56df244e7de1b1d6bf73d878aa8ccabe60c537e05916f SHA512 89a0139660b013c11ba1dfa6adf1840b8ccc5b49bc31580481967c85e75ca79aba537bc4b65834ee464013b7aa0544267235d14dc877cb5276cb6e89c6a3fafa
+DIST hplip-3.23.12-patches-2.tar.xz 22484 BLAKE2B 919be82d0639bc30fdbe6a5651ec08c8b6951fc31284e52f09ea2aed254bb34024c7f757ec3eccec6c0fd5d261a625c2e77d6aa33d298287f26313811280e3b7 SHA512 bc9746fb748819ca06a0a3d5b2a66ab15ef499ed01177fd936f754d743a282253897db7f813ba8165e8336a9a3540c2f9b99e10908930b3842ef7452957afc13
DIST hplip-3.23.12.tar.gz 30162044 BLAKE2B 752a5b75855677e4f8b5b8738181d40c426268be4e393e5df7565c78efca68389e86d92f21002a733c0b2d5d62913bef3986e4bedd36a9f35f205c11e6027e7a SHA512 7461ffec38be68421e4204021f53d2b1641e7a67c14f205390d45f487a1af90956fd221f7e1561635508103ae944f19e04d6052d3f8928f2c9685fdcdcf515df
+DIST hplip-3.24.4-patches-1.tar.xz 22068 BLAKE2B 9b388033b17315c407014b0b344e2994c456c84dd856f3f522e202b431a03fb315060d74ead98696af62934fa5e5d44185cae20cd3171252f33049a9832b15f5 SHA512 292c5717627ecbb5f50b2ecad82fdf43bb80c3128f1e4c3cc806167dd34ac9c7c5c2a988103ec18fc82483ba95221261c7935271a0b213523f00a4e9de23731c
+DIST hplip-3.24.4.tar.gz 30217933 BLAKE2B 0b5c93465f6d9e30916bf57fd7f2d490d2f04ef80ed1654a7d2c6adc57a5293e358720a71bbb76757a1496d9f7ca05f077f6e9ea62cfa243319fe9d551440710 SHA512 6162ec58289433659ed4c3a254b2a50863c01acb87a8c0e1a1f935fed2b1916c5ae211c2d84130f40963368ff53e0c8da1878a1fce4dd08bd517f65bbcf6a2d2
EBUILD hplip-3.23.12-r1.ebuild 8535 BLAKE2B 5a5a723b5fc8461b683119b6be9d573d0670941498b3c979193cba7c12d3fa40d1296822293004700c7f8ebf4e2ea3b2d566f6c0d9d2344618a3af76ba5f7c17 SHA512 10c05f98b99667c8987c4b06f96e63a8981b31b5df38a849f952aa834b1ba077a8e2d9c1178b8448c8d35f07a72a3d285ecdb60855c60212ead57db10b3cf280
+EBUILD hplip-3.23.12-r3.ebuild 8538 BLAKE2B a1b3bae13e7e833274f959d7ef42f457338c92df5977cfbeb51e4e04947964bfd028d1e9940e8aefae910f0f9ff7d52013540d90542004fdbc9bc4b47d5cee2b SHA512 0244c4c5f75e6fef7020ad6818beb5064eff601ba0677b4d4911018a9f744b4522cf658f88aa63fc533ecbb9fbd9f6050e160675bd83e0465b2091ca24223517
+EBUILD hplip-3.24.4.ebuild 8543 BLAKE2B 26b4844790b289a7da111ae6605e793729e3799d4635bec5d68ed03d7cc83642ce526b018d1208b02d0e77629041565a84c57b4071ba5372b336cceed1cc39ab SHA512 2318246fb34cd9e84aea0b8e32b362408a84e4ebb5a6cf875a317594335a8927568c09277b3b512d6d8c469f8f262923d2e87be4b26256cbd51328a89c6fff47
MISC metadata.xml 1849 BLAKE2B 381cc0d0fe08d072487850a5f5ac6e264cb4ee5db8722b6f83ad9d4e6e78948a7768e80ea2a8a2313bdca1029b59a02d8c3ca309d9438d5e4d63585f7a6b2a83 SHA512 0f5f42b561099e943d99dc5e50cfd42577582b31590c0cd98f276e5acc364fb31f4a48cf91b33e923d24daa77b7b3a6bc54a0c24d9ebff9e3ec82c957a5671e3
diff --git a/net-print/hplip/hplip-3.23.12-r3.ebuild b/net-print/hplip/hplip-3.23.12-r3.ebuild
new file mode 100644
index 000000000000..cb892efbc01e
--- /dev/null
+++ b/net-print/hplip/hplip-3.23.12-r3.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+inherit autotools flag-o-matic 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="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~billie/distfiles/${PN}-3.23.12-patches-2.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+ net-print/cups
+ media-libs/libjpeg-turbo:0
+ hpijs? ( net-print/cups-filters[foomatic] )
+ !libusb0? ( virtual/libusb:1 )
+ libusb0? ( virtual/libusb:0 )
+ ${PYTHON_DEPS}
+ !minimal? (
+ sys-apps/dbus
+ scanner? (
+ media-gfx/sane-backends
+ )
+ snmp? (
+ dev-libs/openssl:0=
+ net-analyzer/net-snmp:=[${PYTHON_SINGLE_USEDEP}]
+ net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
+ )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ ${COMMON_DEPEND}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ app-text/ghostscript-gpl
+ !minimal? (
+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+ kernel_linux? ( virtual/udev )
+ $(python_gen_cond_dep '
+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+ qt5? (
+ >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+ libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+ )
+ scanner? (
+ >=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.1.1[${PYTHON_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() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/861851
+ # https://bugs.launchpad.net/hplip/+bug/2055371
+ filter-lto
+
+ 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-dbus-build"
+ 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
+ minimal_build="${minimal_build} --enable-dbus-build"
+ 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-cups11-build \
+ --disable-foomatic-rip-hplip-install \
+ --disable-imageProcessor-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 \
+ ${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() {
+ udev_reload
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/net-print/hplip/hplip-3.24.4.ebuild b/net-print/hplip/hplip-3.24.4.ebuild
new file mode 100644
index 000000000000..684d9692524b
--- /dev/null
+++ b/net-print/hplip/hplip-3.24.4.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+inherit autotools flag-o-matic 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="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~billie/distfiles/${PN}-3.24.4-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+ net-print/cups
+ media-libs/libjpeg-turbo:0
+ hpijs? ( net-print/cups-filters[foomatic] )
+ !libusb0? ( virtual/libusb:1 )
+ libusb0? ( virtual/libusb:0 )
+ ${PYTHON_DEPS}
+ !minimal? (
+ sys-apps/dbus
+ scanner? (
+ media-gfx/sane-backends
+ )
+ snmp? (
+ dev-libs/openssl:0=
+ net-analyzer/net-snmp:=[${PYTHON_SINGLE_USEDEP}]
+ net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
+ )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ ${COMMON_DEPEND}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ app-text/ghostscript-gpl
+ !minimal? (
+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+ kernel_linux? ( virtual/udev )
+ $(python_gen_cond_dep '
+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+ qt5? (
+ >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
+ libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
+ )
+ scanner? (
+ >=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.1.1[${PYTHON_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() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/861851
+ # https://bugs.launchpad.net/hplip/+bug/2055371
+ filter-lto
+
+ 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-dbus-build"
+ 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
+ minimal_build="${minimal_build} --enable-dbus-build"
+ 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-cups11-build \
+ --disable-foomatic-rip-hplip-install \
+ --disable-imageProcessor-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 \
+ ${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() {
+ udev_reload
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ udev_reload
+}
diff --git a/net-print/kyocera-1x2x-mfp-driver/Manifest b/net-print/kyocera-1x2x-mfp-driver/Manifest
index f3e3fc0490fb..58aa4b8f3d10 100644
--- a/net-print/kyocera-1x2x-mfp-driver/Manifest
+++ b/net-print/kyocera-1x2x-mfp-driver/Manifest
@@ -1,4 +1,4 @@
AUX rastertokpsl-fix.sh 399 BLAKE2B 14376b73ad961b4dba3064403c079be18492a2e0091f113ed127c3f18668a6abcd0cfdc587dc2991269ce3549049d5b367ed96da623ec851353c9a5b7a4dbdb5 SHA512 7d757297b737a4fcebfd91bde4457674b738bf227480d5bcbf5049eb332c215395bca7798cd1931592ada217b5d85806fe567bd1741d8fadc23b572642901d09
DIST LinuxDrv_1.1203_FS-1x2xMFP.zip 5392941 BLAKE2B d39140d6bbf5d08d248739f2689ccd45d066b5568c3ba27bdcea34f2ed348e91d0b95d64c7e789dd08094ebda43a5fb6911efb9cdfcc43cf1fefd4af32fb18bb SHA512 afbe237d25d784a6202be01669ccb5e1f0f9a6349b6b74227723905529f23da6d7880b25420b289277020450286d02f579722add5c0d48c839ac44152a60d1ab
-EBUILD kyocera-1x2x-mfp-driver-1.1203-r1.ebuild 3431 BLAKE2B f764815ab3b6f3a5e873016d183ae4b081e7de93fc9972f556caaf8342e4194d5bc740eb63701e690b86a0650b937dafe28c3ee9116a5f7fd4e83137acc19955 SHA512 4d1103d77579f41bded3ee5bd2c38c6aec04ed88e59cf3be31d80e30bb9510c3940a52ed8cb6dbf2e9b2fc183b9f4af6c5a550be6bf9ac8244567a5d96c836ea
+EBUILD kyocera-1x2x-mfp-driver-1.1203-r2.ebuild 3416 BLAKE2B 1692a4596af184c99d532c849e56917e2aeae7aef938142a8328c76fb79ce003e89d2a0223b9bf3daed45ca3fc60db33016cc1524610712d46e2d4c156a22c3f SHA512 11a5f90fdf9d87bf8fb554e9c756a0001f01644a754e2821ba03cbac9b2ca8a2c7e0602d76617ed0c6b92740d41799f925b1a14c60ae1ccdf4dde954db9b485b
MISC metadata.xml 559 BLAKE2B 3fbb9d675d4ebcf59e1925cb0aae03019151418fa91bc8e2612a3b5d1be935462a3b6558a32398940bf2b6e1aa0517bbe7c38985349c4cf03b0ed73aa28921d9 SHA512 46fddd98531b0bbc20ff39dee43cdf926c60609e1684f92fceb5ac57b199e0d86372731663e6609717ee16d58ddbbe48bcce3530f28d893486d78e9461cf572b
diff --git a/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild b/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r2.ebuild
index a575ee6097e4..ee73cd5036fb 100644
--- a/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
+++ b/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
DESCRIPTION="Printer descriptions (PPDs) and filters for Kyocera 1x2x MFP"
HOMEPAGE="http://www.kyoceradocumentsolutions.eu"
@@ -9,49 +9,35 @@ SRC_URI="LinuxDrv_${PV}_FS-1x2xMFP.zip"
LICENSE="GPL-2 kyocera-mita-ppds"
SLOT="0"
-
KEYWORDS="-* ~amd64"
-IUSE_L10N=(en ar cs de el es fr he hu it ko pl pt ro ru th tr vi zh-CN zh-TW)
+IUSE_L10N=( en ar cs de el es fr he hu it ko pl pt ro ru th tr vi zh-CN zh-TW )
IUSE="+rastertokpsl-fix +${IUSE_L10N[@]/#/l10n_}"
REQUIRED_USE="|| ( ${IUSE_L10N[@]/#/l10n_} )"
+RESTRICT="fetch mirror"
RDEPEND="net-print/cups"
-DEPEND="app-arch/unzip"
-RESTRICT="fetch mirror"
+BDEPEND="app-arch/unzip"
+
QA_PREBUILT="/usr/libexec/cups/filter/rastertokpsl"
get_tarball_name() {
# Note the capitalization inconsistency. Don't "fix" that.
- case "$1" in
- ar) echo arabic ;;
- cs) echo czech ;;
- de) echo German ;;
- el) echo greek ;;
- en) echo English ;;
- es) echo Spanish ;;
- fr) echo French ;;
- he) echo hebrew ;;
- hu) echo hungarian ;;
- it) echo Italian ;;
- ko) echo Korean ;;
- pl) echo polish ;;
- pt) echo Portuguese ;;
- ro) echo romanian ;;
- ru) echo russian ;;
- th) echo thai ;;
- tr) echo turkish ;;
- vi) echo vietnamese ;;
- zh-CN) echo simplified ;;
- zh-TW) echo traditional ;;
- *) die ;;
- esac
+ declare -A animals=(
+ [ar]=arabic [cs]=czech [de]=German [el]=greek [en]=English
+ [es]=Spanish [fr]=French [he]=hebrew [hu]=hungarian [it]=Italian
+ [ko]=Korean [pl]=polish [pt]=Portuguese [ro]=romanian [ru]=russian
+ [th]=thai [tr]=turkish [vi]=vietnamese [zh-CN]=simplified [zh-TW]=traditional
+ )
+ echo "${animals[$1]}"
}
pkg_nofetch() {
- einfo "Please, navigate your browser to the following URL and manually"
+ einfo "Please, navigate your browser to the following URL, select"
+ einfo "'Support - Downloads' in the menu, select 'FS-1025MFP',"
+ einfo "select 'Linux print driver (${PV})', accept EULA, and manually"
einfo "download the file named '${A}', then put it into your DISTDIR."
- einfo "https://www.kyoceradocumentsolutions.eu/index/service/dlc.false.driver.FS1025MFP._.EN.html"
+ einfo "https://www.kyoceradocumentsolutions.eu/en/support/downloads.name-L2V1L2VuL21mcC9GUzExMjVNRlA=.html"
einfo
einfo "Consider keeping a local copy of the file since there're chances"
einfo "the company is going to eventually stop hosting it for whatever"
diff --git a/net-print/libcupsfilters/Manifest b/net-print/libcupsfilters/Manifest
index 519e2f81bcc0..61eb1b54dbdb 100644
--- a/net-print/libcupsfilters/Manifest
+++ b/net-print/libcupsfilters/Manifest
@@ -4,5 +4,5 @@ AUX libcupsfilters-2.0.0-raster-build-fix.patch 842 BLAKE2B 37abde9acc45311a62ed
AUX libcupsfilters-2.0.0-raster-gray.patch 1889 BLAKE2B 515b29df1141389262458205d1104f430f986f2ef5eefb9e2624c34715c4afd1f07b01deb57267fc322707f0799f8b31f17408c96af9f39c38d5eabbdc5eb678 SHA512 b63d639ac5472848a54f23bf0562dff58704b31864d753ce2f3502f56bd427feef4d2439f79e6fa20ab3bfcb61a4d0ac9f783c98716e09e1ed289c01ee570da2
DIST libcupsfilters-2.0.0.tar.xz 1279856 BLAKE2B ce9d839bb700017c303c1301c7a97fd02e3657a908e685377be49557d995574a7fc5a31d4fcbda5eeb9ba2d3cd07858224540dbf0bc9fa078cfd25a58ee15a41 SHA512 279bff6dcfa76312b10dae97480914345defd90eab79c4716d4553870f73e0f9db404786fd7e2948a86ae5aedb10dca0c2984ccb4222acbd4e835cd572030d6a
EBUILD libcupsfilters-2.0.0-r3.ebuild 1613 BLAKE2B 40d181809f6dab64c2318ca6036e1649443c8e6a2193ac563dfb422c953c50ec9e7c00b75216125c3497459c3b4834b09311d1e4aff64ea7f26deba48c27dde2 SHA512 280951268cd099fe5e69efab93fee02df42cff893b6b4a4f48d25b67ef2aacd926166af95c764a31f37064c9e16bd0f9c025c63ad378589aefc0df52f24c7b3f
-EBUILD libcupsfilters-2.0.0-r4.ebuild 1731 BLAKE2B 94823ca97d1e2687d7c7828c84b022f734693f7f009e33596662c493bc42e8aabd3da62df5d4404fb7ab25785907adaa0e0198348b79b5c57ad544373c3daa99 SHA512 cf46c653b298194e32579b0af94a2dae9b08494ccb727fb570ef4ebe3a0de364d2781343f69b7eebd9860021b4ffce26cb5cc86b1602bee45dca28a9ae6f15af
+EBUILD libcupsfilters-2.0.0-r5.ebuild 1732 BLAKE2B 71f40a7eaac7d6c40f8a1cf072ed836a69ca958a28458dd73c5d0dec05fea51af64f8d574b8378ae21876776df67c937f166914f3a503cd1d7488e1afa1620d5 SHA512 39f7dbdde7a8d2845ee4dad0f398f72f452cf7a18e5879f6d7214368672a801c179bac22f553b62b241467e284b5e5e0d1618de348ee8427be1777f2b5381fb9
MISC metadata.xml 426 BLAKE2B 60d605203c938ba35e60bc4dfa121d6fb0223d70fdd1bdea4ed02693034a46ff039a580f5c0a5925aa3c4c33220243503096b8de233f6031447a6425a974182a SHA512 04811e0d82ce0365308b4391a33e03da423dc924cc7ff16a2eeedbdb51705b9a62cffe67d7e25b9221a0b511caaa3b19c184301fbecc59056a282a811ad9df7e
diff --git a/net-print/libcupsfilters/libcupsfilters-2.0.0-r4.ebuild b/net-print/libcupsfilters/libcupsfilters-2.0.0-r5.ebuild
index 555c55040cd5..aee0c3bce0ec 100644
--- a/net-print/libcupsfilters/libcupsfilters-2.0.0-r4.ebuild
+++ b/net-print/libcupsfilters/libcupsfilters-2.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenPrinting/libcupsfilters/releases/download/${PV}/
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
IUSE="dbus exif jpeg pdf +poppler +postscript png test tiff"
RESTRICT="!test? ( test )"
@@ -27,7 +27,7 @@ RDEPEND="
jpeg? ( media-libs/libjpeg-turbo:= )
pdf? ( app-text/mupdf )
postscript? ( app-text/ghostscript-gpl[cups] )
- poppler? ( >=app-text/poppler-0.32[cxx] )
+ poppler? ( >=app-text/poppler-0.32:=[cxx] )
png? ( media-libs/libpng:= )
tiff? ( media-libs/tiff:= )
"
diff --git a/net-print/libppd/Manifest b/net-print/libppd/Manifest
index 60b4740f2d00..049d2ca5deb7 100644
--- a/net-print/libppd/Manifest
+++ b/net-print/libppd/Manifest
@@ -1,4 +1,4 @@
AUX libppd-2.0.0-slibtool.patch 2191 BLAKE2B 2a88a48542355d5f4189685979cd1cc24a992c4ad6c803e28d2420e7f974b962050d186d5cd7ec1642d22ac200137fe74e143df2270259d30ee6e30ee05e28b5 SHA512 d169bfaf4dd40917b197aa6d00b4ad9b1ad5d010781d492205c2656621bcadc1792ca5f589be97f8b9e15f431820c8af1c40cae5bf7fbf9fd14df8377cb1484a
DIST libppd-2.0.0.tar.xz 580716 BLAKE2B 8505c5ab5b515104308624a8f78505343b894df08ab8ac2727d7bd82d0d65d256d22ecaf384b212d9a5c45d2a619a6311722a8c5ed954b7a8a9780477aedb458 SHA512 8be9e67552528606fd804ba13b05710938ed7d02316c1c902ee657bc0e5fade663ffacb5b032609a1c1fdc80d976e7e54d2ca2f71db83cb8fdcee6a371e6bad4
-EBUILD libppd-2.0.0.ebuild 1546 BLAKE2B 89f53229a0196c3e7f26d805c1e368c9b9781d528f4c86b238551ad5ddc7fc45a896daa8e09eb129113ff832c68e0fa91058c9e73acd9d819a0083019922a670 SHA512 6e7a3ae3116bda0bc778db28602b042ad1ae9e0710fd856dcb050fd7a2fe45734f99daf0d29de121b61def0ebc983af9e8ad04d5937d6873a7ee2acbac565500
+EBUILD libppd-2.0.0.ebuild 1545 BLAKE2B e1cc087f4eb46fd1c489e5c9fe58c09d56369f9537232e48934f29c566b01c4bb164b699c89d4fb3658bdf6b16feba93726f03fd43c5d2acb01582524fb27f8a SHA512 f13b2ad4281893a929a6a228c0a67f1af9f281a8a6ab863c00e40a06b6c737b7bf1f1ed330da14be234525a88b63b40d2aa60976d972cc39a6d195d111f3bb6c
MISC metadata.xml 440 BLAKE2B 8cc1e3fa25d2c12efb0253a37a0dedb484fcac5930deacd37bc09534e9210e72e58669a07efc0d40612a428d190b852064f6175083c852a8b3a4153101483905 SHA512 79801ac1a34f4e5fc46bd8c45c638dccde3168c701dfaffb51d626405e77fe0e8fa190b32c0b76150e51197223363dea0163086f172b0dccccd0c94fc5cb2d0b
diff --git a/net-print/libppd/libppd-2.0.0.ebuild b/net-print/libppd/libppd-2.0.0.ebuild
index 763f0c6558a3..431deb11dbfc 100644
--- a/net-print/libppd/libppd-2.0.0.ebuild
+++ b/net-print/libppd/libppd-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV}/${P}.tar
LICENSE="Apache-2.0"
SLOT="0"
IUSE="+postscript +poppler"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
# pdftops has various possible implementations, but the default
# really needs to be decent
diff --git a/net-print/npadmin/Manifest b/net-print/npadmin/Manifest
index dda88bb1f79c..63b11d435046 100644
--- a/net-print/npadmin/Manifest
+++ b/net-print/npadmin/Manifest
@@ -2,6 +2,5 @@ AUX npadmin-0.8.7-gcc6.patch 7135 BLAKE2B 31a446879e4f98b1eee543d3f54aa768d9b367
AUX npadmin-0.8.7-makefile.patch 1668 BLAKE2B 874922aa9db49245e2b8dc926ddde1977b9a9cd8709213e7a53ceec16b9be0cab1cbaabd915604dfec20874e91cabc166b5a17e781d551e9ca398398402ca0da SHA512 7de72987b41e314be34ab65d73e034345d1911a2bcb59eaafbb44efca523c505f0aae2f874bb5c21fee41fb5ba7b64815ef5ae558383465802506475e5948e87
AUX npadmin-0.8.7-stdlib.patch 258 BLAKE2B fe0cb1ce54563591e4bd2c7bdac5cb880ca52a7444d80b30ea81da7801ec26c986b1a920c1c16c48412a797e54205900679c2a9d32ecf3e175d98deaa09efca3 SHA512 36d4f8225e03f0d3ccde706414179a5489fbdf7ec5fa65e083c1de4a00db1626e40195e1e48b7213bc63241907716788c85cb10daea08c64aee6d8ac09094ecc
DIST npadmin-0.8.7.tar.gz 104209 BLAKE2B 0badff83c3387d5e7b72803c5f42272a696ffb2e9bccffe8f004c9030aee604e6025781f30ff9944c63d3b54afe538ad898b0b9670a95cbf4f0ff1356e056f04 SHA512 da405a897e3ec057b355ac1e8a6237e876d1ba0365f5bffdd71b212fb8a5b3a79f7186d4b90d4ec321a9ff45bc222f6444b3dff666c819eb5efafddcfcecb026
-EBUILD npadmin-0.8.7-r1.ebuild 570 BLAKE2B aaad3a4382b6b176a72e603edb6071d64fa6bbb014b0d0aa6b3a7f4f02f69e6d4e185f9beb25fa3865bd58e169db4114104772846940ada2348aeddbe6a5d31f SHA512 45d54b2741a0dcedf627d06bd87f473c2c11bf56433b513c67cc8566a4d39794bdc4829bcc1cd0a907970bcd906e853c7c744f7215d81878513d734cc7ee9c52
-EBUILD npadmin-0.8.7-r2.ebuild 663 BLAKE2B 1e13cec00eb8130b639e600747b930c5d0824ec0ae9c7e0c07365870681ba2b3d9404e46550d6899ec5273f5e163aa530004e1f64fa62d0bcc89aee0abda98f8 SHA512 bdd84b66715d80558a1053f2410246d3771f177b9431c6ac9e9f2db068a62cedd070d383a57dc5ee87a64cdaad40da98cde726e3407dbef7620f4437bf7866bc
+EBUILD npadmin-0.8.7-r2.ebuild 661 BLAKE2B 78f75a7573b952a043730123eec6e017aff2a199f34ceedd471a7865c4594740731f0a19144ba75748d3c36b32a70d6f852e5c1f500c9a4ebfb3b7834dd910d7 SHA512 70db65b6594c197adfa16e8ad3a09c2724fbb5bc9d2e5dd4ea2ad3e685bc2a95656727aff8f51ea25352291ef2d7ba0861cdce778209f1fc2a92d7efc785191b
MISC metadata.xml 337 BLAKE2B fe4d2954a8c9c8335647e56c6f0813df679c00522df274bd267dff45add74d26dfc352a5c1fb525d072b8748d4ca59fe013c70002c7493e8ed38b3f0b4104e36 SHA512 801c34a85af29b9853a5ca592c1f63df249a7ca283b0bffa528503eb6a067dd3f74ea725e5cd844f142623696477284bdabb5ae165938f087135e3dd94932a6a
diff --git a/net-print/npadmin/npadmin-0.8.7-r1.ebuild b/net-print/npadmin/npadmin-0.8.7-r1.ebuild
deleted file mode 100644
index d07f1e1a6c63..000000000000
--- a/net-print/npadmin/npadmin-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Network printer command-line adminstration tool"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
-HOMEPAGE="http://npadmin.sourceforge.net/"
-
-# this does NOT link against SNMP
-DEPEND=""
-
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-PATCHES=(
- "${FILESDIR}"/${P}-stdlib.patch
- "${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_install() {
- dobin npadmin
- doman npadmin.1
- dodoc README AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-print/npadmin/npadmin-0.8.7-r2.ebuild b/net-print/npadmin/npadmin-0.8.7-r2.ebuild
index 4751943a3468..97584d2906c8 100644
--- a/net-print/npadmin/npadmin-0.8.7-r2.ebuild
+++ b/net-print/npadmin/npadmin-0.8.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
# this does NOT link against SNMP
# DEPEND=""
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index 55c5ea34762c..c529c9f086b1 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,5 +1,7 @@
AUX splix-2.0.0_p20130826-algo0x11_le.patch 1231 BLAKE2B 8fe043f615bae54bf24635817696d2c38bf5250c77a4f52061b3cd7a82cc6c46a705ceed9ae4d46e47d5e8af64f8932a83acc718dabc614f6b03156274a34119 SHA512 9c96805deedc819cf4e663de63d35c4016b36a04ab56f5d3cee503e64dcd7a25d6ede2cd2ae3facf51d4e673476295a551e5659e9b91de6c30d1c21dc294be4a
DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
+DIST splix-2.0.1.tar.xz 93032 BLAKE2B 82de9e591bda902cee9423e3f626a5b8b13b8ec0e2fd842142b10549d87094316d59c57a005615bf37601ecedf9d5defc59beb5312b4e1269ff1db207c3722bc SHA512 45708d65576e87c9f0c9cc7d4919ea19b1418bb932854b14a80bbcf890e28f7ee11ac64a5b9ccca1b8f4aec803822392ab738329d3e9894ad60b5393bffeef74
EBUILD splix-2.0.0_p20130826-r1.ebuild 2186 BLAKE2B 6c5c313dc508ae46ace942d41f7421cc4ec02f21d9f79b7652110d55a638629495e6370a7853a736910dd0600a82e9d08c11f939c45d933fde4f545b0b95db60 SHA512 88e08aefbcc51ffe3ad4d2dcac7afc0fc3a3e3303cadc4617033c5914ebf70ae663604869647e89879b748ba074c252c0f7a3eb94f7b122debd66bac9f092380
-MISC metadata.xml 448 BLAKE2B 776388702cca7e4728d4fa8a4b3881ef8e3fb9374fc7681600e92a9ca608ee6756ca905d10eff1c213fd4d22daf733ccdc4ec6f6b799febdf6fa9930836dddab SHA512 015bc78f9020f7c59030a536238fb0ef46952c2d62c216555f1f1713174451df9e43ee6b4f2deaaba5c4a8cd1fa8ffe5f8cf2f58bb7e0e0a8418a587e6bb54aa
+EBUILD splix-2.0.1.ebuild 2148 BLAKE2B 34dfa422a1ef8be080c653ad002cf69f3983cb96558ecabdc71eb5184f7853486cef820eb7c615dc3ee6e0f5e08a08c3ffbea5824e9b603cdadd77defba47014 SHA512 b5bd0a3de9ee8c15b5f0b13d3261f7f58d79930f7eb7ba835b5bcb21cfe786c88e40409ae54d908e973d66a472e4af1b7efe3d4122f79a04f6b415c77af0dfc5
+MISC metadata.xml 506 BLAKE2B 0f4943153d3cc32fd8f9d1937a842243a00172ca5d03b46edb042328e175645f05cfe9865926c60194d0dfe8376b10115473beb0c628add0d0bd3f480ea1df88 SHA512 fa9986a74a749d9bca426a5967844eb490a58719881ff8b02c37ac13c5de2519eb5c1511bcddb75e81eea0a88c7d88df8b5652f6254b4d474e973e9976889dd9
diff --git a/net-print/splix/metadata.xml b/net-print/splix/metadata.xml
index 2ea580a8d8e2..3ddb1879ca37 100644
--- a/net-print/splix/metadata.xml
+++ b/net-print/splix/metadata.xml
@@ -11,5 +11,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">splix</remote-id>
+ <remote-id type="github">OpenPrinting/splix</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-print/splix/splix-2.0.1.ebuild b/net-print/splix/splix-2.0.1.ebuild
new file mode 100644
index 000000000000..365ce4c1ab21
--- /dev/null
+++ b/net-print/splix/splix-2.0.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit toolchain-funcs
+
+DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
+HOMEPAGE="https://splix.sourceforge.net/"
+SRC_URI="https://github.com/OpenPrinting/splix/releases/download/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+jbig"
+
+DEPEND=">=app-text/ghostscript-gpl-9.02
+ >=net-print/cups-1.4.0
+ jbig? ( media-libs/jbigkit )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.0_p20130826-algo0x11_le.patch )
+
+src_prepare() {
+ default
+
+ # Move to correct place
+ mv *.ppd ppd/
+ # Honor LDFLAGS
+ sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
+ || die
+}
+
+src_compile() {
+ local options="MODE=optimized"
+ use jbig || options="${options} DISABLE_JBIG=1"
+ emake ${options} PSTORASTER=gstoraster CXX="$(tc-getCXX)" \
+ OPTIM_CFLAGS="${CFLAGS}" OPTIM_CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ gzip "${ED}"/$(cups-config --datadir)/model/*/*.ppd || die
+
+ emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms MANUFACTURER=samsung installcms
+ # Add symlinks for xerox and dell models (installed in samsung)
+ dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/xerox
+ dosym $(cups-config --datadir)/profiles/samsung $(cups-config --datadir)/profiles/dell
+}
+
+pkg_postinst() {
+ ewarn "You *MUST* make sure that the PPD files that CUPS is using"
+ ewarn "for actually installed printers are updated if you upgraded"
+ ewarn "from a previous version of splix!"
+ ewarn "Otherwise you will be unable to print (your printer might"
+ ewarn "spit out blank pages etc.)."
+ ewarn "To do that, simply delete the corresponding PPD file in"
+ ewarn "/etc/cups/ppd/, click on 'Modify Printer' belonging to the"
+ ewarn "corresponding printer in the CUPS webinterface (usually"
+ ewarn "reachable via http://localhost:631/) and choose the correct"
+ ewarn "printer make and model, for example:"
+ ewarn "'Samsung' -> 'Samsung ML-1610, 1.0 (en)'"
+}