Adding metadata

7 files changed, 89 insertions, 152 deletions

diff --git a/net-print/brother-mfcl8690cdw-bin/Manifest b/net-print/brother-mfcl8690cdw-bin/Manifest
deleted file mode 100644
index 792e1caf142f..000000000000
--- a/net-print/brother-mfcl8690cdw-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST linux-brprinter-installer-2.2.3-1.gz 24519 BLAKE2B 4bb068ac444a24e94f0f49e1d290f8b3295780a53d23c91151242e59d265edae66b6ee032ab220efd9624655f095c47061dfcdfcb87763f13faec0c67496d663 SHA512 9fed0c747ec2cc9eb11862df93e4a75edbeddaa9fbf0a70139fcd3da58b372fbbeaca0821fbcb8d66b43c656eaf7392a97b021f260136496e1075d1014869c37
-DIST mfcl8690cdwcupswrapper-1.5.0-0.i386.rpm 16089 BLAKE2B c1dc7e9849d565a67235ced81996f763b0a7ea50ec9ce46eacfa321b79caeea7a3d3dd170bc2c65087701dd215561fa05edd776a2d0654ccf8708a072450e632 SHA512 fc4f6ee58b2216ae9a8e65cc5555eb939b3f71637972350450b7f7d79a0bef211213091368cad622d2e96728a7e7b87bc9405d9981b95b225cd3f3225976e01c
-DIST mfcl8690cdwlpr-1.5.0-0.i386.rpm 1424730 BLAKE2B fa6e2e5f9042a8e43d5696727d17a26d88637823b2c1e8397f746cc92b01284f20d835280f1a17642f9e00af5ecff952e75b6ccd7e1e4af96af763138aee66f6 SHA512 53bbea8d976a113cd9599c0000fc1f6fdffa329cd90f9b4481daa128e0f64b08e3d6a831039217612eb804d9b9e6b70af82bdaf499a157cf58b41504cdc50240
diff --git a/net-print/brother-mfcl8690cdw-bin/brother-mfcl8690cdw-bin-1.5.0.ebuild b/net-print/brother-mfcl8690cdw-bin/brother-mfcl8690cdw-bin-1.5.0.ebuild
deleted file mode 100644
index 992a70c36f9f..000000000000
--- a/net-print/brother-mfcl8690cdw-bin/brother-mfcl8690cdw-bin-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2023 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-inherit rpm multilib
-
-PRINTER_MODEL=${PN#*-}
-PRINTER_MODEL=${PRINTER_MODEL%-*}
-
-DESCRIPTION="Brother printer drive for ${PRINTER_MODEL}"
-HOMEPAGE="https://support.brother.com/g/b/downloadhowto.aspx?c=us&lang=en&prod=${PRINTER_MODEL}_us_eu_as"
-SRC_URI="
-	https://download.brother.com/welcome/dlf103224/${PRINTER_MODEL}cupswrapper-1.5.0-0.i386.rpm
-	https://download.brother.com/welcome/dlf103215/${PRINTER_MODEL}lpr-1.5.0-0.i386.rpm
-"
-
-RESTRICT="mirror strip"
-
-LICENSE="brother-eula"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scanner"
-
-DEPEND=">=net-print/cups-2.2.7"
-RDEPEND="
-	${DEPEND}
-	scanner? ( >=media-gfx/brother-mfcl8690cdw-bin-1.0 )
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto opt/brother/Printers/${PRINTER_MODEL}
-	doins -r "${S}"/opt/brother/Printers/${PRINTER_MODEL}/inf
-
-	exeinto opt/brother/Printers/${PRINTER_MODEL}/lpd
-	doexe "${S}"/opt/brother/Printers/${PRINTER_MODEL}/lpd/*/*
-
-	# Printer configuration utility
-#	dobin "${S}"/usr/bin/brprintconf_${PRINTER_MODEL}
-
-	# Install wrapping tools for CUPS
-	exeinto opt/brother/Printers/${PRINTER_MODEL}/cupswrapper
-	doexe "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/cupswrapper${PRINTER_MODEL}
-
-	exeinto opt/brother/Printers/${PRINTER_MODEL}/cupswrapper
-	doexe "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL}
-	dosym "${EPREFIX}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_lpdwrapper_${PRINTER_MODEL} "${EPREFIX}"/usr/libexec/cups/filter/brother_lpdwrapper_${PRINTER_MODEL}
-
-	insinto usr/share/ppd/Brother
-	doins "${S}"/opt/brother/Printers/${PRINTER_MODEL}/cupswrapper/brother_${PRINTER_MODEL}_printer_en.ppd
-}
diff --git a/net-print/brother-mfcl8690cdw-bin/metadata.xml b/net-print/brother-mfcl8690cdw-bin/metadata.xml
deleted file mode 100644
index c62b3a6b7954..000000000000
--- a/net-print/brother-mfcl8690cdw-bin/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
-  <longdescription>Brother printer driver for mfcl8690cdw</longdescription>
-  <origin>baldeagleos-repo</origin>
-</pkgmetadata>
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 7fec0f9ab633..1cabcaddc17f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,4 +1,4 @@
-DIST hplip-3.25.6-patches-2.tar.xz 22316 BLAKE2B 3644d06a530309490384b6c374a04c238e2ae844c836642be668c36159315be42b0693f153f3e3185593374bf36e70dc9d9760bd2e8a503a91be406e8674a910 SHA512 efd6338b31c33eb3318b6aa42391bb460bb6c65c3f1df4ebfdd50363252a7167a2eb43fe693a2e9b7f07ef939418a71117d69a0613d149277f73b39ab1ed7578
 DIST hplip-3.25.8-patches-1.tar.xz 22860 BLAKE2B e8ae156cb5a1f38dcdbdff70c9d315e4f7b63619c6de930f841e885adf0725c901929de03657312a24db29d0d83e5f072048e1f93de3a5bd1a47fa11b6970e6a SHA512 6e45150b4742aee715570610d554a9fb164e3343d18188d2cf54d9e238dd146b245058756434ba2b148ffa4b31873cb77c09e866b578f6c38b505378e739d3cd
 DIST hplip-3.25.8.tar.gz 30874051 BLAKE2B 1d4392966947f29c104671ae43c36ace5334120daf41b29cd1e344002e327f8491391d6cfaa2d82c72e3b4d7811d4f42ebd051bfe51bd2470d7f5111a4b0c656 SHA512 64ff2cc79088a874caa10d3e248a023461afb648e6363f542329cb70c537b594cace49b305c5c87c71daa82a7e03d4a6986497a50f73fc53714bb59336c3bc46
+DIST hplip-3.26.4-patches-1.tar.xz 22680 BLAKE2B fffa33fd96672f9a0a583039bd9af584ac1d4ff1048aefd5f665359f09cc4e09cccb85d11b93e52f569ccbe1198d17b95178ac54ad8b6f91a35ebdec2d553cc5 SHA512 3a8ef85f98bf8b4e35297320318b1a204de8d507a030cf6cd2628ded74f83f62039753193adb829bbf676cdd1f50b204268ab9cc715440f84c0cae5de2fe4307
 DIST hplip-3.26.4.tar.gz 30963728 BLAKE2B 9e03ba394cf5711a1baa645d25f5217db0bf442da6ce4169488d3817078e2f94cd1b2f14a85d7fd8c8c0e3fd1d89ece5cc9af5ba7a13f96efee26e1f94d4b555 SHA512 ea0f4890d6c643019fceb6d19946f53df7c7433f57c103e3475e95c970ed5fd7f814434a79355217e7609eb8498c7051858839cec76623e2deebefc311ee4e29
diff --git a/net-print/hplip/hplip-3.25.8-r1.ebuild b/net-print/hplip/hplip-3.25.8-r1.ebuild
index 0afcedbd4a7d..7cce3140dd5b 100644
--- a/net-print/hplip/hplip-3.25.8-r1.ebuild
+++ b/net-print/hplip/hplip-3.25.8-r1.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2021-2026 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
@@ -9,16 +10,14 @@ 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.25.6-patches-2.tar.xz
-"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~billie/distfiles/${PN}-3.25.8-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 qt6 scanner +snmp static-ppds X"
+IUSE="doc fax +hpcups hpijs kde libusb0 minimal parport policykit scanner +snmp static-ppds X"
 
 COMMON_DEPEND="
 	net-print/cups
@@ -34,7 +33,6 @@ COMMON_DEPEND="
 		)
 		snmp? (
 			dev-libs/openssl:0=
-
 			net-analyzer/net-snmp:=[${PYTHON_SINGLE_USEDEP}]
 			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
 		)
@@ -56,11 +54,6 @@ RDEPEND="
 			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
 			dev-python/distro[${PYTHON_USEDEP}]
 			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-			qt6? (
-				? ( dev-python/pyqt6[dbus,gui,-ssl,widgets,${PYTHON_USEDEP}] )
-				dev-python/pyqt6[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}]
@@ -77,7 +70,10 @@ RDEPEND="
 	policykit? ( sys-auth/polkit )
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	minimal? ( ^^ ( hpcups hpijs ) )
+"
 
 PATCHES=(
 	"${WORKDIR}/patches"
@@ -86,6 +82,7 @@ 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:
@@ -96,25 +93,22 @@ 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!"
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropriate driver"
+		ewarn "is installed. This also disables fax, network and scanner 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."
+	if has_version "<=net-print/hplip-3.25.8[qt5]" ; then
+		ewarn "Warning: User interface no longer available for hplip (Qt5 is dead)."
+		ewarn "Unfortunately there is no ETA when a Qt6-based GUI will be available."
 	fi
 }
 
 src_prepare() {
-	rm -f ${WORKDIR}/patches/022_hplip-3.23.5-C99-compatibility-fixes.patch
-	#rm -f ${WORKDIR}/patches/024_hplip-3.23.12-no-readfp.patch
 	default
 
 	python_fix_shebang .
@@ -149,6 +143,9 @@ src_configure() {
 	# https://bugs.launchpad.net/hplip/+bug/2055371
 	filter-lto
 
+	# https://bugs.gentoo.org/954891
+	append-cflags -std=gnu17
+
 	local drv_build minimal_build
 
 	if use hpcups ; then
@@ -196,7 +193,6 @@ src_configure() {
 		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
@@ -214,13 +210,6 @@ src_configure() {
 		else
 			minimal_build="${minimal_build} --disable-scan-build"
 		fi
-		if use qt6 ; then
-			minimal_build="${minimal_build} --enable-qt6"
-			minimal_build="${minimal_build} --enable-gui-build"
-		else
-			minimal_build="${minimal_build} --disable-gui-build"
-			minimal_build="${minimal_build} --disable-qt6"
-		fi
 	fi
 
 	# disable class driver for now
@@ -234,6 +223,7 @@ src_configure() {
 		--disable-qt3 \
 		--disable-qt4 \
 		--disable-qt5 \
+		--disable-gui-build \
 		--disable-udev_sysfs_rules \
 		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
 		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
@@ -246,6 +236,18 @@ src_configure() {
 		$(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 ${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() {
@@ -253,22 +255,23 @@ src_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 qt6 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
+	if ! use minimal ; then
+		if use scanner ; then
+			rm "${ED}"/etc/sane.d/dll.conf || die
+		fi
+	fi
 
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rm "${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
+	if ! use minimal ; then
+		rm -r "${ED}"/usr/share/hal || die
+	fi
 
 	find "${D}" -name '*.la' -delete || die
 
diff --git a/net-print/hplip/hplip-3.26.4.ebuild b/net-print/hplip/hplip-3.26.4.ebuild
index 3141b004085c..5f53e6baa6b0 100644
--- a/net-print/hplip/hplip-3.26.4.ebuild
+++ b/net-print/hplip/hplip-3.26.4.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2021-2026 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 PYTHON_COMPAT=( python3_{13..14} )
@@ -9,16 +10,14 @@ 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.25.8-patches-1.tar.xz
-"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~billie/distfiles/${PN}-3.26.4-patches-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt6 scanner +snmp static-ppds X"
+IUSE="doc fax +hpcups hpijs kde libusb0 minimal parport policykit scanner +snmp static-ppds X"
 
 COMMON_DEPEND="
 	net-print/cups
@@ -34,7 +33,6 @@ COMMON_DEPEND="
 		)
 		snmp? (
 			dev-libs/openssl:0=
-
 			net-analyzer/net-snmp:=[${PYTHON_SINGLE_USEDEP}]
 			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
 		)
@@ -56,11 +54,6 @@ RDEPEND="
 			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
 			dev-python/distro[${PYTHON_USEDEP}]
 			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-			qt6? (
-				? ( dev-python/pyqt6[dbus,gui,-ssl,widgets,${PYTHON_USEDEP}] )
-				dev-python/pyqt6[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}]
@@ -77,7 +70,10 @@ RDEPEND="
 	policykit? ( sys-auth/polkit )
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	minimal? ( ^^ ( hpcups hpijs ) )
+"
 
 PATCHES=(
 	"${WORKDIR}/patches"
@@ -86,6 +82,7 @@ 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:
@@ -96,24 +93,22 @@ 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!"
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropriate driver"
+		ewarn "is installed. This also disables fax, network and scanner 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."
+	if has_version "<=net-print/hplip-3.25.8[qt5]" ; then
+		ewarn "Warning: User interface no longer available for hplip (Qt5 is dead)."
+		ewarn "Unfortunately there is no ETA when a Qt6-based GUI will be available."
 	fi
 }
 
 src_prepare() {
-	rm -f ${WORKDIR}/patches/028_hplip-3.25.6-python-3.12-locale.format_string.patch
 	default
 
 	python_fix_shebang .
@@ -148,6 +143,9 @@ src_configure() {
 	# https://bugs.launchpad.net/hplip/+bug/2055371
 	filter-lto
 
+	# https://bugs.gentoo.org/954891
+	append-cflags -std=gnu17
+
 	local drv_build minimal_build
 
 	if use hpcups ; then
@@ -195,7 +193,6 @@ src_configure() {
 		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
@@ -213,13 +210,6 @@ src_configure() {
 		else
 			minimal_build="${minimal_build} --disable-scan-build"
 		fi
-		if use qt6 ; then
-			minimal_build="${minimal_build} --enable-qt6"
-			minimal_build="${minimal_build} --enable-gui-build"
-		else
-			minimal_build="${minimal_build} --disable-gui-build"
-			minimal_build="${minimal_build} --disable-qt6"
-		fi
 	fi
 
 	# disable class driver for now
@@ -233,6 +223,7 @@ src_configure() {
 		--disable-qt3 \
 		--disable-qt4 \
 		--disable-qt5 \
+		--disable-gui-build \
 		--disable-udev_sysfs_rules \
 		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
 		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
@@ -245,6 +236,18 @@ src_configure() {
 		$(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 ${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() {
@@ -252,22 +255,23 @@ src_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 qt6 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
+	if ! use minimal ; then
+		if use scanner ; then
+			rm "${ED}"/etc/sane.d/dll.conf || die
+		fi
+	fi
 
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rm "${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
+	if ! use minimal ; then
+		rm -r "${ED}"/usr/share/hal || die
+	fi
 
 	find "${D}" -name '*.la' -delete || die
 
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 265f235d4939..e17ab9e42bf7 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
   <maintainer type="person">
     <email>billie@gentoo.org</email>
     <name>Daniel Pielmeier</name>
@@ -13,15 +9,11 @@
     <email>printing@gentoo.org</email>
     <name>Gentoo Printing Project</name>
   </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:hp:linux_imaging_and_printing_project</remote-id>
-  </upstream>
   <use>
     <flag name="fax">Enable fax on multifunction devices which support it</flag>
     <flag name="hpcups">Build the hpcups driver for cups (by HP)</flag>
     <flag name="hpijs">Build the IJS driver for cups (Foomatic)</flag>
     <flag name="kde">Enables <pkg>kde-misc/skanlite</pkg> as scanner GUI with USE="scanner X"</flag>
-    <flag name="libnotify">Enables desktop notifications</flag>
     <flag name="libusb0">Depend on <pkg>virtual/libusb</pkg> SLOT 0. Some old printers do not work with <pkg>virtual/libusb</pkg> SLOT 1.</flag>
     <flag name="minimal">Only build internal hpijs/hpcups driver (not recommended at all, make sure you know what you are doing)</flag>
     <flag name="parport">Enable parallel port for devices which require it</flag>
@@ -31,5 +23,8 @@
     <flag name="X">Enables scanner GUI dependencies with USE="scanner" where <pkg>media-gfx/xsane</pkg> is preferred over <pkg>media-gfx/sane-frontends</pkg>
     </flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:hp:linux_imaging_and_printing_project</remote-id>
+  </upstream>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>