gentoo auto-resync : 16:11:2023 - 22:53:04

6 files changed, 4 insertions, 77 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ca1295dcdf34..7a2435239633 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index ce43045b28fc..28fec33ea4b8 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST hplip-3.23.5-plugin.run 11491464 BLAKE2B 78f2f5cb60dc273d9d5c26909b277d36379bb345f12b2c4ddb2ba0542cd090872452f055b02d713f84b753f2418ee5a07a9a6852c256078747b30a15d7a0f352 SHA512 73389d295c21bc2c49b3aaa130f04784890eb72b3ca02fe1967b48ef1153205bd625c8efee103d96e1abbc7a4550f028153e94351f9437683d2579d910807dd4
 DIST hplip-3.23.8-plugin.run 11491257 BLAKE2B 1e87b741ebb28605c18954033e5b34ce2456671786e5472665e307253121635c23ecb920f974042ddbf8ebe76882d810f1fce2d39a46fadf774048f9a5673b33 SHA512 ba27bb609d2c17972bc7506ca6e9ef8c389c764c8276d0b1ddd711254f9bdb5c354ebe05026e392bfc261648fc57ccf199f60403c0bfbc3aceb78fcf890a39db
-EBUILD hplip-plugin-3.23.5.ebuild 1483 BLAKE2B c75f0e9c64e2f71916ec9b8a67b41faefffee00cce74e3ab2df526b271b90b26cd20ccbd0549cd43e0362f33650158b17334a063260a65734cf673ef8e9606d4 SHA512 166432f69b79f75c142db0febcb91cdccb9ecea2a98bf1a9afd6f10cc5ee52b357fd21772ededa54dcb6842400b34368659cfca51af33578c4cc292c58a5099c
-EBUILD hplip-plugin-3.23.8.ebuild 1484 BLAKE2B c3a71f9f9137cfeef4ed567607dcfd07e5cd1a533ffa295623c95d803443c1b37a34372a93f89d5677799655ffe51b4c0216256be6e2030774f03756e695698c SHA512 24b7a18fb700429c24852d55b198a9b582b8f8156037d668d75c979124ea08bfddeb862fde7c85ff3c6fdf49b20dcd76364a391a4a4973c429a0498e751b2784
+EBUILD hplip-plugin-3.23.8.ebuild 1483 BLAKE2B c75f0e9c64e2f71916ec9b8a67b41faefffee00cce74e3ab2df526b271b90b26cd20ccbd0549cd43e0362f33650158b17334a063260a65734cf673ef8e9606d4 SHA512 166432f69b79f75c142db0febcb91cdccb9ecea2a98bf1a9afd6f10cc5ee52b357fd21772ededa54dcb6842400b34368659cfca51af33578c4cc292c58a5099c
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.23.5.ebuild b/net-print/hplip-plugin/hplip-plugin-3.23.5.ebuild
deleted file mode 100644
index 2574deffcb94..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.23.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 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-plugin/hplip-plugin-3.23.8.ebuild b/net-print/hplip-plugin/hplip-plugin-3.23.8.ebuild
index 55e7e30fcef2..2574deffcb94 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.23.8.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.23.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"
 
 LICENSE="hplip-plugin"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="orblite"
 # License does not allow us to redistribute the "source" package
 RESTRICT="mirror"
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index f229dff1c7ed..de7e939ebb6a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,5 +2,5 @@ DIST hplip-3.23.5-patches-1.tar.xz 21444 BLAKE2B 500e06f34ad4fc607a587e2e897dbd8
 DIST hplip-3.23.5.tar.gz 30111293 BLAKE2B 658da7989678e6a27e50f4ef6ac6d99601246f515e06f15f6d148c10427848533f99ce87e85e45446bddd4dc6a7efae568e7c6d5d4398cdc9da45f5806af8b6f SHA512 f7e8c431dece035c3e8709baffad7de923ec16ec168f0c1ab64e7aa72e2b3452bf510e3f98b1d0a783bf444869affc452c7adf8fdc2075fed341c64b55ec7c3e
 DIST hplip-3.23.8.tar.gz 30121648 BLAKE2B 1bee02f2de4f14b7aa4d491550f82146e0e55a3297a8110ff7973992772089041578fed5560f98658ed9f6896d75481c89c22131501ca5048e709519db76eb77 SHA512 727b5a6c5b5c77571f1bc27efd493cf8177f543412fa70f0f1ff3439d6599c85985206ccb1c60dbc8bec1e23ef6b25f9030fd872c24799029ba8526b0061cc90
 EBUILD hplip-3.23.5.ebuild 8278 BLAKE2B 579c23dd7027f6a3334d3f3b0a1c8a630d53dd8b53d8a33fdef2fef61b04331d22c6aa2e6145d661443021ac7bb4d8fbf4abcf4a4eab5b09195d99fcbdc0a73f SHA512 680fe19b0e2f7a1b6d993bcc337e9a732bb53307e0c8fe21c6c59997b4e8eea4841c51ed13cab5c5b27e0e6c9fcfb9b27323fe7e2cf1decaf089688d380090f7
-EBUILD hplip-3.23.8.ebuild 8279 BLAKE2B b481e5a078b0ee526600b545c83e6d9b47f7cd7856165b21fffcfa119f6b542b6a2926c5d5b1cc575f9f68cb458639f6a856c4a21b91c740ac06a82639854b70 SHA512 d3cc055747016d978a31f79f481484a89174bc61fff0e20937036ddec3a046e05ad46572bd8ce5c3e1ebfe01f9cb118db9585efdb4d094386320edb6060def31
+EBUILD hplip-3.23.8.ebuild 8278 BLAKE2B 579c23dd7027f6a3334d3f3b0a1c8a630d53dd8b53d8a33fdef2fef61b04331d22c6aa2e6145d661443021ac7bb4d8fbf4abcf4a4eab5b09195d99fcbdc0a73f SHA512 680fe19b0e2f7a1b6d993bcc337e9a732bb53307e0c8fe21c6c59997b4e8eea4841c51ed13cab5c5b27e0e6c9fcfb9b27323fe7e2cf1decaf089688d380090f7
 MISC metadata.xml 1849 BLAKE2B 381cc0d0fe08d072487850a5f5ac6e264cb4ee5db8722b6f83ad9d4e6e78948a7768e80ea2a8a2313bdca1029b59a02d8c3ca309d9438d5e4d63585f7a6b2a83 SHA512 0f5f42b561099e943d99dc5e50cfd42577582b31590c0cd98f276e5acc364fb31f4a48cf91b33e923d24daa77b7b3a6bc54a0c24d9ebff9e3ec82c957a5671e3
diff --git a/net-print/hplip/hplip-3.23.8.ebuild b/net-print/hplip/hplip-3.23.8.ebuild
index c700a64a2f96..4c2b55259096 100644
--- a/net-print/hplip/hplip-3.23.8.ebuild
+++ b/net-print/hplip/hplip-3.23.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 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 qt5 scanner +snmp static-ppds X"