gentoo resync : 29.08.2018

13 files changed, 78 insertions, 98 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index f64870059b36..ba681c3ef200 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
index 448c3f29fbc5..a4594a86ed3d 100644
--- a/net-print/c2esp/Manifest
+++ b/net-print/c2esp/Manifest
@@ -1,7 +1,7 @@
-AUX c2esp-25c-ldflags-cppflags.patch 1049 BLAKE2B 0b193f6ee26dbcd261bf7166d139d0eafb3d35a325bd49d2875ea412b1fd7f40feb040e76f3939cede3edccc2c2de197bf580f660094326b27614848e8ef4268 SHA512 315d30b7aea8b89a23edba3bc15a018de72287f0025611c4fa137dad1f868cac3fe06cd6713e348ffb63ea8633caa3873b51a44d534c77c6ff8805183afab341
+AUX 0001-Fix-various-missing-includes.patch 1107 BLAKE2B 36063d8bf6025e4c7df3151b3b3da868d0850bde7ed28e4c5c7c9ce604709e1acb8473cd54bce7643df710ed51ac1aad56c1a42ca24ebda791cbdfecbfb8bf9b SHA512 90dc8880864ec2aed498ebba2173c07697f8136bc95788f0e3e446fe16519857288c07c0a67c5a319c19837550e0b52e38a788419ffc85ebcbc0434edde2c0de
 AUX c2esp-26-ldflags-cppflags.patch 1152 BLAKE2B dc5463e1574c0f8852cbcb567fd24a0bc7f29a537d3073f4b6835cdf54deed2d3d3595816ae0ba84e4f026edf66daa3dbe4ad66765b47284b9862765656afd2e SHA512 c85abc2a3511ee7cf4ab4045c77ac257d85579354c98403a27209a21915fcd2180053db86fef09151d5e52e98684f46e14bd57bae9f0250597c451286fbe3da4
-DIST c2esp25c.tar.gz 338047 BLAKE2B 645127bdd61f478d519a7d17a1f621357e0c80ac6b313832ddcaba6744cb7f4a62a592c1140293e78a3a63447ad7295bd3fcda0f6f18f0d33b1cca0cca162803 SHA512 788da75c0049c1aa445890d67a7088bc4e7aa5c4e3e67689677fa5bee0e17e29fbb6e7ba9397aaec99f43ba79043aca7d147b6c510e3dd472d238ce6e2636b12
+DIST c2esp-27.tar.gz 143551 BLAKE2B 7cc80fd72eed24c24cb153d7395a692849c51249ca40a563f94bedbb82c6d976bce6b44d47dbe21c36ec40f26571178f562b175485f404d356724b4bc3f611bf SHA512 d3ff9dc6de7cf692e4be4f4b316f862d271bff06181f0000daf1ce2fb6921f1b24efe88ec24f7b811d78cb9dca18fcba3f17dd5273ac84ceb9f6bfcecedeecce
 DIST c2esp26.tar.gz 127593 BLAKE2B 84e6ff61fc5af225526a569861bf316a2b7b1aa8f2bf4d7af15a04042f9dd2da7726d34b66d12dea8748532a54d5ae3a1b0bbfafdccccbea192725751cf3416e SHA512 aa1ca61f895de4892e1058b349fcf1830da78455ffbd0d9989b7ac4e922076e184de91a2b79f285d946d29ece7a6d8159f62c900ed8d6c76859a4261c92da359
-EBUILD c2esp-25c.ebuild 1155 BLAKE2B f376e7480f30d0afae7900d12277e6cbf2c7d26b288bcaaac19df40ff019ce48612e8e45eb05edb3a6433ff9175481b3f196fe4148d05bdd3c9c5943673c0b35 SHA512 f902cad466f567e1c5fec97a5830e4a9303b697bc3877500aa4b4c4349485b094ad09eec8181032668f73f4cc249bb141212bbf59b2e071f4009cd47fbf0c97c
 EBUILD c2esp-26.ebuild 1159 BLAKE2B 81194a8775940beb806a456e1d013b7ab7d5b2373bae1c33fe373fcaddfd9a377630744b889a091e97d1a4f06cff91f4346705f2164f846a7d9a8b374e2aca8e SHA512 ef5855f0aae411da2ff6520e44cd0935ba33b524216bbab912c9474b1c1f2ea0b3acd05f5bc9f70bd3f1d16238fc022fe6d78f1cea4395da1ba5d56d803eface
+EBUILD c2esp-27.ebuild 699 BLAKE2B 0d0be951c38fd455af0b511ed0f9b4c7949b41747240794700e31288ba1846d9c89717f012ed46f5c2fa4a16cceaee255d9de7be65f5dfa7df7add78dff09606 SHA512 c8062f8f6d66fc63b44361afd0544ee42ffe45b81dcb64e153e2b78ef69594f19527bd2e900c39e05e8d344d7b481a2e40a4d6adf106ea501d2007aed58d8819
 MISC metadata.xml 354 BLAKE2B 125545bf6e8dbd21bb674f494585d22d2e293738a9409613fa91eb7d888f4d6c10028aaf3b55beab10e5f94e4cbaee34eb9fb3d8f24c9f64056b6085edf6319c SHA512 d392c1b2ed7e557c5f9ce293e4cb668e0c229ece25dfdb098f569c0cbf9f797d706a0f55a066a8c5649bbc2184866a92d169f32c1f2eaa97c6f073e6d77c57a7
diff --git a/net-print/c2esp/c2esp-25c.ebuild b/net-print/c2esp/c2esp-25c.ebuild
deleted file mode 100644
index 8b27ec8952cf..000000000000
--- a/net-print/c2esp/c2esp-25c.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="A cups filter for Kodak ESP printers"
-HOMEPAGE="http://cupsdriverkodak.sf.net/"
-SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=media-libs/jbigkit-2.0-r1
-	>=net-print/cups-1.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags-cppflags.patch
-
-	# Remove embedded media-libs/jbigkit
-	rm -f *jbig* || die
-
-	# Remove the embedded jbig files from the Makefile's dependencies:
-	sed -i \
-		-e '/^[a-z0-9.]*:/s/\$(LIBJBG[[:digit:]]*)//g' \
-		-e '/^[a-z0-9.]*:/s/jbig[^ ]*\.h//g' \
-		-e '/\$(INSTALL).*COPYING/d' \
-		Makefile || die
-
-	# Use Gentoo-style cups paths
-	sed -i -e s,/usr/lib/cups/filter,/usr/libexec/cups/filter,g ppd/*.ppd || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBJBG=-ljbig LIBJBG85=-ljbig85
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		FILTERBIN="${D}"/usr/libexec/cups/filter \
-		DOCDIR="${ED}"/usr/share/doc/${PF} \
-		install
-}
diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild
new file mode 100644
index 000000000000..69e58fbb92f9
--- /dev/null
+++ b/net-print/c2esp/c2esp-27.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A CUPS filter for Kodak ESP printers"
+HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak"
+SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND=">=media-libs/jbigkit-2.0-r1:=
+	>=net-print/cups-1.6
+	sys-libs/zlib:="
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/0001-Fix-various-missing-includes.patch
+)
+
+src_configure() {
+	# Don't trust cups-config in case ROOT!=/.
+
+	econf \
+		--with-cupsfilterdir="${EPREFIX}"/usr/libexec/cups/filter \
+		--with-cupsdatadir="${EPREFIX}"/usr/share/cups
+}
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch
new file mode 100644
index 000000000000..bde86e666688
--- /dev/null
+++ b/net-print/c2esp/files/0001-Fix-various-missing-includes.patch
@@ -0,0 +1,35 @@
+From 4341f243a34dbb8140800337d189345c370dc499 Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Fri, 9 Feb 2018 17:23:25 +0100
+Subject: Fix various missing includes
+
+Last-Update: 2016-10-03
+---
+ src/c2espcommon.h | 1 +
+ src/command2esp.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/c2espcommon.h b/src/c2espcommon.h
+index 471f46a..088a2b8 100644
+--- a/src/c2espcommon.h
++++ b/src/c2espcommon.h
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants
++#include <stdio.h> // FILE
+ #include <fcntl.h> //files
+ #include <time.h> //time functions used for debugging
+ 
+diff --git a/src/command2esp.c b/src/command2esp.c
+index 529342c..e30357e 100644
+--- a/src/command2esp.c
++++ b/src/command2esp.c
+@@ -44,6 +44,7 @@ Maintenance=003?
+ #include <cups/cups.h>
+ #include <cups/sidechannel.h> //FlushBackChannel, and the side channel functions and constants
+ #include "string.h"
++#include "strings.h" // strncasecmp
+ #include <ctype.h> 
+ #include <fcntl.h> //files
+ #include <time.h> //time functions used for debugging
diff --git a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch
deleted file mode 100644
index a551cc0f46ab..000000000000
--- a/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -166,16 +166,16 @@
- 	@echo 
- 
- c2esp: c2esp.o c2espcommon.o $(LIBJBG85)
--	$(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o -lcupsimage -lcups -lcupsdriver $(LIBJBG85)
- 
- c2espC: c2espC.o c2espcommon.o 
--	$(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o -lcupsimage -lcups -lcupsdriver -lz
- 
- command2esp: command2esp.o c2espcommon.o
--	$(CC) $(CFLAGS) -o $@ command2esp.o  c2espcommon.o -lcups -lcupsdriver
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o  c2espcommon.o -lcups -lcupsdriver
- 
- myopldecode: myopldecode.o $(LIBJBG)
--	$(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz
- 
- #
- # Installation rules
-@@ -351,3 +326,8 @@
- command2esp.o: c2espcommon.h
- c2espcommon.o: c2espcommon.h
- 
-+
-+# Respect CPPFLAGS.
-+.SUFFIXES: .c .o
-+.c.o:
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o '$@' '$<'
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index 65db713b71dd..e29dbc24638e 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -3,6 +3,6 @@ AUX 4.0.7-perl-module.patch 392 BLAKE2B 48a1913833c637eaf80f0d9c8366e85750857356
 AUX 4.0.7-respect-ldflag.patch 719 BLAKE2B 534ac6b3b3333bd54c9abe8b7e658faed0759b95e0104d36e381ba178f8138b9b79fa38a35f66ef5c78ca54630d870da0fb1a12f949764e623247d10dcba61c6 SHA512 432c4b61c94d1b774fc909375217587f4d8336603db0b944ec9e98e3022c2b1355928445e2cc7fbbd06a1452927082ed0fb655bc955643cce6290fe8f2d5d6c9
 DIST foomatic-db-engine-4.0.11.tar.gz 360379 BLAKE2B efef3edd3780f5824c67f4724ec71115999fc159e9fb07bb50f87ad5cac291b57a44316105177acab1f7a95e9f490333925cbea0530ada1496170e8eb56a96f5 SHA512 790d08a7ba69a397988695248de5f1dff2d8461b7da415b73daea133426cc39ea69b59d59a5d1651007388c99276e878dbc3388b54219338090a1a95e6a5ae0a
 DIST foomatic-db-engine-4.0.12.tar.gz 360499 BLAKE2B b03ba0a0cddc2d1c59a64ffa33e577f991d36c478e3f7b43f66474c749b7fb546f0ad5b04fee056c69532a6f126b87c95a72e5561443ef79bf3bdfed650d6b07 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
-EBUILD foomatic-db-engine-4.0.11.ebuild 1155 BLAKE2B 70dc0f15c009095ce5f30fe2b6dcab2c6effe8fde501a5886e884726223a575683dffea763f48e48c558f70369f57dc773403b2923a2233cf6df80eb0eebc746 SHA512 e23fd7a7326cdf41b6c4c8ad21f003a53cf8ce95cf054172a2a5d7b4a2478a133cd7caaf4315315a826516214f59e47dee1b03442a277677a00011d32c141d2b
-EBUILD foomatic-db-engine-4.0.12.ebuild 1201 BLAKE2B a5be90dc7b382cba0d5ec57a2d75c1cd6e451058c685e6abbb93f88b202ed75ea9144651468bc9fce7afb0c4343c0a5bbf6585f09777245515674f23f46f2da5 SHA512 648350be4e28bc8a85dd782762ee112a00f9bbb11cd0842d2fb4947cd0502997d7f3e24fee2a0ebfdc6e2eb8e0bfc97c0d7611b1bb2a344c5fae070cfb91308a
+EBUILD foomatic-db-engine-4.0.11.ebuild 1121 BLAKE2B 2179a0eb5de0ce374e18fbea3516e14a0482101d731521a5a8b266a21221e7ae0affc70b2f98243123df739ae8174280be1cccd18120875e46fa30fb6e1a4530 SHA512 23bade875561c290c69800f6d0abf22d752c2d0f0ea5457f356339c7e2bf848e0095a57b421ce62bbc458e1655a19bb3c003f086511631d15a8981356860a9ba
+EBUILD foomatic-db-engine-4.0.12.ebuild 1167 BLAKE2B 472b1fcf3c28f446abf032d03366e6c78ad042d770ec6ccf8161e88349778feb4788741c3ff9b98b166ec38db31dca12d37112a934fd67f10bab4e5d7cac9461 SHA512 4c0eb8db152e7bd964e2e5e3eb6e08f395514299076581a39be1c092e6ef0413ddee48c68d2ba6ebb4cac96f741e2c4ed73a0e08a50f6db4e2b21281bdfc96a7
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
index a4405f8fe805..9dd5fdc3102c 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND="net-print/cups"
 RDEPEND="
 	dev-libs/libxml2
-	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+	>=net-print/cups-filters-1.0.43-r1[foomatic]
 "
 PDEPEND="net-print/foomatic-db"
 
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
index 1043eb1c1082..c714859db0b6 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ DEPEND="net-print/cups
 	virtual/pkgconfig"
 RDEPEND="
 	dev-libs/libxml2
-	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+	>=net-print/cups-filters-1.0.43-r1[foomatic]
 "
 PDEPEND="net-print/foomatic-db"
 
diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
index 1eff82c7c2f8..b75bf98aab2f 100644
--- a/net-print/lprng/Manifest
+++ b/net-print/lprng/Manifest
@@ -4,5 +4,5 @@ AUX lprng-3.8.28-make.diff 364 BLAKE2B eab9593ae6ff3dd7300fb094e3275e17ef131d652
 AUX lprng-init 944 BLAKE2B b1155af74d517a510460e266ddf0d45889e12591a9cab00dac4f51b893cb611979946976cdf477a36796069e6fcac3c298861e741c85ad01c80e4c540cdef462 SHA512 10fbee633d27a8692f90af7f506e5144c3cbf614e9ecec6b910a590466a8c9aaf65d5778425504ac238e245d1c24e85953bb26b2a5df957f393683d2a9783cd5
 AUX printcap 551 BLAKE2B 78f243f651c88dad445b048f3678e43ccd655be5b6e34eeacc025621f9a667ea4241b2876da3c71aaf278a4868588b6901a96f6971a3ec666acccfa3895e46a7 SHA512 f2536090359cca27c78c6f2bda89fef61dba9a0cf402364a685491c91c6ee1d7e4d693349b45a9ed576dbffcc64de0f09cb111e7cb89c844ccf68bcaa016bce9
 DIST LPRng-3.8.35.tgz 12512453 BLAKE2B 82c23aa092ef5d9d946bc363c406aeaa9ef9cd566cb7ce353d0e7734ceab5fdd6129e6e1f9617d5e56481d93b3e30331a7dd128c5daff3e3609c67a022394d65 SHA512 ddebf23087b6c98c89369af26a2e46194c01243490ae47b025afde8ffcf0b1c05b9689702296c1a8aa38c2c38934df094d8cc7e922ab1ac27f51ce19f3676771
-EBUILD lprng-3.8.35-r3.ebuild 1993 BLAKE2B 882956ef52ab7fe0c71fe622dd80b3b17b0cac1b82896ae2b33a3454a088f50ad2638e2451206b6eb476db46e6a0cf5f813d4c252c18c87cf5841f303b0a01ba SHA512 f18b181140d20c37c0b30ba47baa7b74360d7376430ba5f6db3e02f94ca586035b86ad9aad39edb713fb797240d3fcf3710adbe3912a2b94b72016569c5043fb
+EBUILD lprng-3.8.35-r3.ebuild 1959 BLAKE2B 02e5eca0a375aceaffb4d8fdfc8ee9a62ae63c736694fca8b019448d39c62e7aea377a5ea3c23ceccfb9866369c05a1feb406fcda46eca385b5495fcccf72d0d SHA512 4957e6bcfeadaf008e8693651d7d5cea607d197e6f9ff38be89184130ac8062d18627494287927e6a447e363ca59b6d964dc915abc425035a368d4cbb1268aee
 MISC metadata.xml 366 BLAKE2B cf7a0d75bb1c71439382f16ff03bbf76ad8eaf864de8dc02d03121fe0e9ebb347d14c6dc9c3385aff9487383f7be07532c5fb9f6513710f821b1bea986157f93 SHA512 6117e79cf777aa49a3212eea42384e1cfb8b54c3a759d8c98a89f516da2b4a503a01a0a4e785b1d030b2299bc6bf640e29cf7dfff0197605a75bf538e3dd1dd5
diff --git a/net-print/lprng/lprng-3.8.35-r3.ebuild b/net-print/lprng/lprng-3.8.35-r3.ebuild
index 0848108f239f..7867f643f4c9 100644
--- a/net-print/lprng/lprng-3.8.35-r3.ebuild
+++ b/net-print/lprng/lprng-3.8.35-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -17,7 +17,7 @@ IUSE="foomaticdb kerberos nls ssl"
 
 RDEPEND="sys-process/procps
 	ssl? ( dev-libs/openssl )
-	foomaticdb? ( || ( net-print/cups-filters[foomatic] net-print/foomatic-filters )
+	foomaticdb? ( net-print/cups-filters[foomatic]
 		net-print/foomatic-db )
 	!>=net-print/cups-1.6.2-r4[-lprng-compat]
 	!<net-print/cups-1.6.2-r4"
diff --git a/net-print/pnm2ppa/Manifest b/net-print/pnm2ppa/Manifest
index d9748218cefc..5ce39205ae92 100644
--- a/net-print/pnm2ppa/Manifest
+++ b/net-print/pnm2ppa/Manifest
@@ -1,3 +1,3 @@
 DIST pnm2ppa-1.13.tar.gz 291190 BLAKE2B c348f5582e8014a8dcc349a6254a302ce3e8272984b96828b3ce9f012654fb2520624aed6db2a97c3f0cbaf2be608a0d83da2b5b2b799e7500f89a6927c6d0d6 SHA512 8f96792cf7f03fd024db9a8d338f06d7484fa4474c1cd73048c90f0e88ae5540df30e6894c0bbc82dfd87126fc72875b6d71b2031c0e24b343ef88f51d00bb7a
-EBUILD pnm2ppa-1.13-r1.ebuild 1560 BLAKE2B a6c9f88262f935335f4d8643d7772c6b95c0115145df0c883e8a75c9d174a06e4f19974f7705dfd6993d33ed8ae1799ec47a4805c07bd78bf61c2b0156c7aad8 SHA512 235607e89c4e77f2c795786af0a90287156a6a690ba4dea81d260d24cb967ed3743573e4c070f740656f6e79bd7591bfffbf78708af8c50849fbba4cf1ec9b59
+EBUILD pnm2ppa-1.13-r1.ebuild 1526 BLAKE2B 7e71f75ca5aabbb855b8c2e6018cfe737cfe345c6e204651a35713744243aa1f5c22abab50b596a401be6710116c2b7b126df170190c84779cd85c096bee0fe4 SHA512 9c6ba563811eb5970e883ff913885d7d128a14c9ed3fa60b7d004600fcadc6788e7f20b9d5bdd5da072a8f151fec23f62b33c28795b7344b70b737434e962bdd
 MISC metadata.xml 336 BLAKE2B 82376654bf2d655189b054c7e2168a59019ab7a5513fc7e4e306a5e8f9bb3eba86adfcb5fa4f1e112550d0123fa130446cb943e34b77b434f9278063caf0466d SHA512 345cc7f244621dee98b191a5b9704783490eccf9b27cda4c8d052657ebb35dc441ab752014a34f171115b26a9a2d8650c9cb2afc788e9271be6d91d47de3a507
diff --git a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
index 8756c6c1059e..55c86714e946 100644
--- a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
+++ b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
@@ -23,7 +23,7 @@ done
 RDEPEND="
 	app-text/ghostscript-gpl
 	net-print/cups
-	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+	>=net-print/cups-filters-1.0.43-r1[foomatic]
 	sys-libs/glibc
 	syslog? ( virtual/logger )
 "