net-print/foo2zjs: Version bump. Use gentoo archive

Signed-off-by: Martin Väth <mvath@google.com>

8 files changed, 104 insertions, 346 deletions

diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index c0407764..0ced458e 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -94,7 +94,7 @@ net-libs/wvstreams 4.6.2_alpha20181025: A network programming library in C++
 net-misc/netctl 1.11: Profile based network connection tool from Arch Linux
 net-misc/openrdate 1.2: use TCP or UDP to retrieve the current time of another machine
 net-misc/sshstart 4.7: Start ssh-agent/ssh-add only if you really use ssh or friends
-net-print/foo2zjs 20160722: Support for printing to ZjStream-based printers
+net-print/foo2zjs 20200221: Support for printing to ZjStream-based printers
 sci-geosciences/googleearth 7.1.8.3036-r3 7.3.0.3832-r3 7.3.2-r2: A 3D interface to the planet
 sci-mathematics/genius 1.0.21: Genius Mathematics Tool and the GEL Language
 sci-mathematics/reduce 20141130-r2 20190413: A general-purpose computer algebra system
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index cbb6c687..efad93fa 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,25 +1 @@
-DIST dl2300-20130105.tar.gz 1205154 SHA512 1c523402ba49e4d70cd96e5e52db11ceeb67e7aca91de71c7a1cc5c15604eb47d70d1f82db8341136e9b276f95d24b727f4b1498f0cc0400530e1957e4708405
-DIST foo2zjs-20160722.tar.gz 1712774 SHA512 e8a491ec504cd177634f9bb5f1bd85c2cc2a58ec4194bb71a4da014a1bfeb334032b327410dc742f6f6a38586dc574a602ab99fc96a6527c4b24d5ebb3608c4d
-DIST hp-cp1025-20130105.tar.gz 122026 SHA512 1c41057dcf586bc5d741f9915d1c70840eb9a9624e82c0b9146fb93763a7a646734c4c1acbc03e5153c42d14b1a46467a8da3811c363087b879605cacd76e458
-DIST hp1215-20130105.tar.gz 112237 SHA512 012ae00b4b1678a3a7e84cd261f01be4acee47546220afbf2333643934261ed6eb4fba2bf184e19d62c5962dbbf8b504cd4a5c6b095d4e4ee40f18fc29f0a083
-DIST hpclj2500-20130105.tar.gz 52571 SHA512 0649ad225c3c8ea698380a8087375b0a56ad87ff5da96f711e409bd2edfb86d60be5b9f36d67dbcc1fee0a21bf4917afec99695b92f3d4c4b62b0a4898c7ff7a
-DIST hpclj2600n-20130105.tar.gz 573660 SHA512 fbb728d254beff15a1ae709b17af11d5699bba77e999483b774be016707d37feed6ceaae6f91d2860bcb14f8993fc7e9141c727e3caa6bcef37c2aae0b595d41
-DIST km-1600-20130105.tar.gz 121230 SHA512 ffe7eac71546258d043a36e819d593c35bb4e29176440334580b9a1fb7725fc39f9b3ea70736b2a21c8f06d4ae3f1e6b267444202865ddd0068045b14b9a876d
-DIST km2430-20130105.tar.gz 929112 SHA512 29bb1906ca0c38c0e71f902d0ba8548f650b272c44934578b9f1d86fd4ef6d0a2625ca4dc4d44c7113ccccdc48f78e8668cd5f3911d6d9929a60e93fc62c7820
-DIST km2530-20130105.tar.gz 2046286 SHA512 6aae51c5dc8f194471964b301d26143bab9f0d4eec3b89ca131856af05353e58b65097559917931b410cb000df4a7fa0f8e79a1670429077e70b564ccade07b9
-DIST lexc500-20130105.tar.gz 239577 SHA512 8c0f7fbae2155fa9ff3e8000bc7d33831a1c500f13ae3fafb4428011230c90465485be4121eab1904d1b07bf632f38c349b3a01ddb574a012cfb2c29b57fbde6
-DIST okic310-20130105.tar.gz 674661 SHA512 a28d1394981208ab5e05f73d58060879ad356243a0395caa0efbd361f9a38713f31fe64a9b78d1c5d256bdbec9874129271f716fa46edea003e56453a2405e06
-DIST okic3200-20130105.tar.gz 527532 SHA512 f31bade1fb66cb9c0764e33140c06d8a806ad13704e5462863efbc4b35537f9cf6eb3845bcbe09470a81b192e3717d81526a6804bdc644c3b6025210d56a3320
-DIST okic3400-20130105.tar.gz 453326 SHA512 c19c0fb545c80f0ab2d5b24dd3f3d2745f7e6326f877da3f3b86bcadab3b8ef36a507b0454934b76d1482493e99bef58987136805b354339fa32fad2f44d2800
-DIST okic511-20150212.tar.gz 674664 SHA512 ce8c0d937318e8f40c704a40b267d07be378838dc9259374d69b7d596b54e5238857151322153057d5d1ce3708c9a537351f7b422f0995c20362ff4ea6c6bc25
-DIST okic5600-20130105.tar.gz 674998 SHA512 a9d15b6a9f49eda9dad74793507a2486819a88eddba61b1fcf25c49ab43b10b2346a1f72adddb696c4797e6d9feded2994bafe9b6e021a9e23703817bf5d109a
-DIST okic810-20131118.tar.gz 674963 SHA512 605cd1e00071498ce3fee4785e367a9066e65f1ab911bb2fe7812813334d56b6549ac1264d9c0d0a4e70f1623834d65b70cd063f84e5bee6ac5d39cd3d5b38fd
-DIST samclp300-20130105.tar.gz 427584 SHA512 c662a350399dd218103aa3b89d3d292c26e2b5c7479be0bcecdcc71cd7b2f12b16fca81d8db2b08cde8ecbb712e40d4d25de0a4885c676d89e3b1335eff4efc5
-DIST samclp315-20130105.tar.gz 99680 SHA512 fcfc09e5290b529f49c15b2bc0364e37ae32d91511d992d0fa8ec4f231fc7a3d816b3e04d26370c8e05df7b72509fa7c1babb11fc72341cbca6115d429f87dda
-DIST sihp1000-20100501.tar.gz 50416 SHA512 a05be7cbc2068ed7c5c68261ab89cd8447f4e6453290212a4d94bc2f8dabf6edace21c76b17cac11414b21d02fa0985b0a5dbb426c29041d25ddd41537a1d8b3
-DIST sihp1005-20100501.tar.gz 52297 SHA512 da43ab89a861e6280968a1b2038d0557d9c71a12efe4f384869b8b3a21eedaf1d2c7888999f0a71b0590213c463ae0febbb39697b2d77c22f7d9fcd8ed89ff55
-DIST sihp1018-20100501.tar.gz 70544 SHA512 80eefa4b47b437da7f0fc7d5ce21fcafeb9d46ee0a1b3bfa7798aaaae6501d1a56c3371042c62bbeacc6c4bb01f66fb5831719bedbbf304faa056b177e6313f9
-DIST sihp1020-20100501.tar.gz 70139 SHA512 4437d94915db01ae2e397fda50d532aef03faed7b4fbcb5299302e1ed39fa7b8b8b20e25f4bd4c1ab3d7bec25e5b122f66c5674394b554ba8124f7794c42b4df
-DIST sihpP1005-20100501.tar.gz 153804 SHA512 248e7f8572b6202dbc02491e8819be748f418722bbc96e6c2aed97481de00fc866ff02e7d628d3901ac4b846df9dbda3dff428f44f0364a7fc48aeeb7b656052
-DIST sihpP1006-20100501.tar.gz 153940 SHA512 a3eae37e1d9e4c0e324f0ace6b560de26e80e520fb6f1b4a6cb77b2b4afd3b29fdabe9303818b59a7512939ecc686591fe2db26b5f8a0da0c803c1f431750340
-DIST sihpP1505-20100501.tar.gz 166199 SHA512 4f804be97c03606b8ab1f6b101b7dc4325bdc1ddbcea719aa50f0465ef2ba98ea346dd29a3d304e87ff18dd594a8c45f9853efedbc5a86bf36f3d52ce2846c8e
+DIST foo2zjs-20200221.tar.xz 6330264 SHA512 8d992b48157189b800a2ba2f8e528f0c3d59a532e6172f2979c4b3f6fa9a3ac7167e0e28195019b70e260d2459ebd17aba118735d5a2c8e5c7603c750ea8dfaf
diff --git a/net-print/foo2zjs/files/udev.patch b/net-print/foo2zjs/files/udev.patch
new file mode 100644
index 00000000..8f41ab2d
--- /dev/null
+++ b/net-print/foo2zjs/files/udev.patch
@@ -0,0 +1,11 @@
+--- 1/Makefile
+--- 1/Makefile
+@@ -933,7 +933,7 @@
+ 	    echo "      *** OR (generic linux)"; \
+ 	    echo "      ***	# rm -f $(LIBUDEVDIR)/*-printers.rules"; \
+ 	    echo "      ***"; \
+-	    exit 1; \
++	    # exit 1; \
+ 	fi
+ 	# ... OK!
+ 	#
diff --git a/net-print/foo2zjs/files/usbbackend.patch b/net-print/foo2zjs/files/usbbackend.patch
new file mode 100644
index 00000000..3fdc0d29
--- /dev/null
+++ b/net-print/foo2zjs/files/usbbackend.patch
@@ -0,0 +1,11 @@
+--- 1/hplj1000
++++ 1/hplj1000
+@@ -42,7 +42,7 @@
+ # Path to the USB CUPS backend. We use this backend to upload the firmware
+ # into the printer when we are on a CUPS/libusb-based system.
+ #
+-USB_BACKEND=/usr/lib/cups/backend/usb
++USB_BACKEND=/usr/libexec/cups/backend/usb
+ 
+ #
+ # Directory to find downloadable HP firmware files sihpMMMM.dl
diff --git a/net-print/foo2zjs/foo2zjs-20160722.ebuild b/net-print/foo2zjs/foo2zjs-20160722.ebuild
deleted file mode 100644
index ab9bd1c0..00000000
--- a/net-print/foo2zjs/foo2zjs-20160722.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Martin V\"ath and others
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Support for printing to ZjStream-based printers"
-HOMEPAGE="http://foo2zjs.rkkda.com/"
-SRC_URI="http://foo2zjs.rkkda.com/${PN}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-IUSE_LATER="foomaticdb test"
-# due to those firmwares/icms/etc...
-RESTRICT="mirror"
-
-PATCHES=("${FILESDIR}/foreground.patch")
-
-COMMON="foomaticdb? ( net-print/foomatic-db-engine )"
-RDEPEND="${COMMON}
-	net-print/cups
-	net-print/cups-filters
-	virtual/udev"
-DEPEND="${COMMON}"
-BDEPEND="app-arch/unzip
-	app-editors/vim
-	sys-apps/ed
-	sys-devel/bc
-	test? ( sys-process/time )"
-
-S="${WORKDIR}/${PN}"
-
-print_url() {
-	local i curr verdata usual
-	usual='20130105'
-	curr=
-	verdata=false
-	for i
-	do	if ${verdata}
-		then	verdata=false
-			print_url_sub "${curr}" "${i}"
-			curr=
-		elif [ "$i" = '->' ]
-		then	verdata=:
-		else	print_url_sub "${curr}" "${usual}"
-			curr=${i}
-		fi
-	done
-	print_url_sub "${curr}" "${usual}"
-}
-
-print_url_sub() {
-	local base ext
-	[ -z "${1:++}" ] && return
-	if [ -z "${2:++}" ]
-	then	printf '%s\n' "${1}"
-		return
-	fi
-	base=${1##*/}
-	ext=${base##*.}
-	base=${base%.*}
-	case ${base} in
-	*.[!.][!.][!.])
-		ext=${base##*.}.${ext}
-		base=${base%.*}
-	;;
-	esac
-	printf '%s %s %s\n' "${1}" '->' "${base}-${2}.${ext}"
-}
-
-init_data() {
-	local i flag url readflag sihp most
-	sihp='-> 20100501'
-	readflag=:
-	# see getweb or getweb.in
-	for i in \
-	'hp1000' "http://foo2zjs.rkkda.com/firmware/sihp1000.tar.gz ${sihp}" \
-	'hp1005' "http://foo2zjs.rkkda.com/firmware/sihp1005.tar.gz ${sihp}
-http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz ${sihp}" \
-	'hp1018' "http://foo2zjs.rkkda.com/firmware/sihp1018.tar.gz ${sihp}" \
-	'hp1020' "http://foo2zjs.rkkda.com/firmware/sihp1020.tar.gz ${sihp}" \
-	'hpp1005' "http://foo2zjs.rkkda.com/firmware/sihpP1005.tar.gz ${sihp}" \
-	'hpp1007' \" \
-	'hpp1006' "http://foo2zjs.rkkda.com/firmware/sihpP1006.tar.gz ${sihp}" \
-	'hpp1008' \" \
-	'hpp1505' "http://foo2zjs.rkkda.com/firmware/sihpP1505.tar.gz ${sihp}" \
-	'km2200' "http://foo2zjs.rkkda.com/icm/dl2300.tar.gz" \
-	'km2300' "http://foo2zjs.rkkda.com/icm/dl2300.tar.gz
-http://foo2zjs.rkkda.com/icm/km2430.tar.gz" \
-	'kmcpwl' "http://foo2zjs.rkkda.com/icm/dl2300.tar.gz" \
-	'km2430' "http://foo2zjs.rkkda.com/icm/km2430.tar.gz" \
-	'km2530' "http://foo2lava.rkkda.com/icm/km2530.tar.gz
-http://foo2lava.rkkda.com/icm/km-1600.tar.gz" \
-	'km2490' \" \
-	'km2480' \" \
-	'xp6115' \" \
-	'hp1500' "http://foo2hp.rkkda.com/icm/hpclj2500.tar.gz
-http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz" \
-	'hp1025' "http://foo2zjs.rkkda.com/icm/hp-cp1025.tar.gz" \
-	'hp1215' "http://foo2hp.rkkda.com/icm/hpclj2600n.tar.gz
-http://foo2zjs.rkkda.com/icm/km2430.tar.gz
-http://foo2hp.rkkda.com/icm/hp1215.tar.gz" \
-	'hp1600' \" \
-	'hp2600n' \" \
-	'sa300' "http://foo2qpdl.rkkda.com/icm/samclp300.tar.gz
-http://foo2qpdl.rkkda.com/icm/samclp315.tar.gz" \
-	'sa310' \" \
-	'sa315' \" \
-	'sa325' \" \
-	'sa360' \" \
-	'sa365' \" \
-	'sa2160' \" \
-	'sa3160' \" \
-	'sa3175' \" \
-	'sa3185' \" \
-	'xp6110' \" \
-	'sa600' '' \
-	'sa610' \" \
-	'lm500' "http://foo2slx.rkkda.com/icm/lexc500.tar.gz" \
-	'oki301' "http://foo2hiperc.rkkda.com/icm/okic310.tar.gz" \
-	'oki310' "http://foo2hiperc.rkkda.com/icm/okic310.tar.gz" \
-	'oki511' "http://foo2hiperc.rkkda.com/icm/okic511.tar.gz -> 20150212" \
-	'oki810' "http://foo2hiperc.rkkda.com/icm/okic810.tar.gz -> 20131118" \
-	'oki3100' "http://foo2hiperc.rkkda.com/icm/okic3200.tar.gz" \
-	'oki3200' \" \
-	'oki5100' \" \
-	'oki5150' \" \
-	'oki5200' \" \
-	'oki5250' \" \
-	'oki3300' "http://foo2hiperc.rkkda.com/icm/okic3400.tar.gz" \
-	'oki3400' \" \
-	'oki3530' \" \
-	'oki5500' "http://foo2hiperc.rkkda.com/icm/okic5600.tar.gz" \
-	'oki5600' \" \
-	'oki5800' \" \
-	'oli160' \"
-	do	if ${readflag}
-		then	readflag=false
-			flag=${i}
-			IUSE=${IUSE-}${IUSE:+\ }"+foo2zjs_devices_${flag}"
-		else	readflag=:
-			if [ -n "${i}" ]
-			then	[ "${i}" = \" ] || url='? ( '$(print_url ${i})' )'
-				SRC_URI="${SRC_URI}
-foo2zjs_devices_${flag}${url}"
-			fi
-		fi
-	done
-	${readlag} || \
-		die "internal ebuild error: odd number of args in init_data()"
-	[ -z "${IUSE_LATER:++}" ] || IUSE=${IUSE-}${IUSE:+\ }${IUSE_LATER-}
-}
-init_data
-
-src_unpack() {
-	local i
-	default
-	for i in *
-	do	case "${S}" in
-		*/"${i}") continue;;
-		esac
-		if test -d "${i}"
-		then	chmod 755 -- "${i}" || die "chmod dir ${i} failed"
-		else	chmod 644 -- "${i}" || die "chmod file ${i} failed"
-		fi
-		mv -- "${i}" "${S}" || die "Move failed"
-	done
-}
-
-src_prepare() {
-	sed \
-		-e 's/$(MAKE)/$(MAKE) CFLAGS="$(CFLAGS)"/' \
-		-e 's~-x /sbin/udevd~-z ""~' \
-		-e 's~/sbin/udevd --version~echo 200~' \
-		-e 's~^CFLAGS~#CFLAGS~' \
-		-e 's~/usr/local~/usr~' \
-		-i Makefile
-#		-e "s~/lib/udev~${ED%/}/lib/udev~g" \
-#		-e "s~/etc~${ED%/}/etc~g" \
-#		-e 's/ install-filter / /g' \
-	sed -e "s~/etc~${ED%/}/etc~g" \
-		-e "s~/lib/udev~${ED%/}/lib/udev~g" \
-		-i hplj1000
-	sed -e 's/chmod -w/sleep 2; chmod -w/' \
-		-i osx-hotplug/Makefile
-	default
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS-} ${LDFLAGS-}"
-	default
-}
-
-src_install() {
-	# ppd files are installed automagically. We have to create a directory
-	# for them.
-	dodir /usr/share/ppd
-
-	# Also for the udev rules we have to create a directory to install them.
-	dodir /lib/udev/rules.d
-
-	# directories we have to create if we want foomaticdb support
-	use foomaticdb && dodir /usr/share/foomatic/db/source
-
-	# Directories we have to create if we want cups filters (mandatory)
-	dodir /usr/libexec/cups/filter
-
-	emake DESTDIR="${ED%/}" \
-		USBDIR="${ED%/}/etc/hotplug/usb" \
-		UDEVDIR="${ED%/}/lib/udev/rules.d" \
-		LIBUDEVDIR="${ED%/}/lib/udev/rules.d" \
-		-j1 install install-hotplug
-}
diff --git a/net-print/foo2zjs/foo2zjs-20200221.ebuild b/net-print/foo2zjs/foo2zjs-20200221.ebuild
new file mode 100644
index 00000000..746abdbe
--- /dev/null
+++ b/net-print/foo2zjs/foo2zjs-20200221.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Support for printing to ZjStream-based printers"
+HOMEPAGE="http://foo2zjs.rkkda.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="foomaticdb test"
+
+PATCHES=(
+	"${FILESDIR}/foreground.patch"
+	"${FILESDIR}/usbbackend.patch"
+	"${FILESDIR}/udev.patch"
+)
+
+RESTRICT="bindist !test? ( test )"
+
+RDEPEND="net-print/cups
+	foomaticdb? ( net-print/foomatic-db-engine )
+	>=net-print/cups-filters-1.0.43-r1[foomatic]
+	virtual/udev"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-editors/vim
+	sys-apps/ed
+	sys-devel/bc
+	test? ( sys-process/time )"
+
+SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+
+src_prepare() {
+	# Prevent an access violation.
+	sed -e "s~/etc~${D}/etc~g" -i Makefile || die
+	sed -e "s~/etc~${D}/etc~g" -i hplj1000 || die
+
+	# Prevent an access violation, do not create symlinks on live file system
+	# during installation.
+	sed -e 's/ install-filter / /g' -i Makefile || die
+
+	# Prevent an access violation, do not remove files from live filesystem
+	# during make install
+	sed -e '/rm .*LIBUDEVDIR)\//d' -i Makefile || die
+	sed -e '/rm .*lib\/udev\/rules.d\//d' -i hplj1000 || die
+
+	default
+}
+
+src_compile() {
+	MAKEOPTS=-j1 CC="$(tc-getCC)" default
+}
+
+src_install() {
+	# ppd files are installed automagically. We have to create a directory
+	# for them.
+	dodir /usr/share/ppd
+
+	# Also for the udev rules we have to create a directory to install them.
+	dodir /lib/udev/rules.d
+
+	# directories we have to create if we want foomaticdb support
+	use foomaticdb && dodir /usr/share/foomatic/db/source
+
+	emake DESTDIR="${ED%/}" \
+		USBDIR="${ED%/}/etc/hotplug/usb" \
+		UDEVDIR="${ED%/}/lib/udev/rules.d" \
+		LIBUDEVDIR="${ED%/}/lib/udev/rules.d" \
+		DOCDIR="${ED%}/usr/share/doc/${PF}" \
+		-j1 install install-hotplug
+}
+
+src_test() {
+	# see bug 419787
+	: ;
+}
diff --git a/net-print/foo2zjs/metadata.xml b/net-print/foo2zjs/metadata.xml
index 55629f4e..25b253a6 100644
--- a/net-print/foo2zjs/metadata.xml
+++ b/net-print/foo2zjs/metadata.xml
@@ -11,59 +11,6 @@
 	<name>Gentoo Printing Project</name>
 </maintainer>
 <use>
-	<flag name="foo2zjs_devices_hp1000">HP LJ 1000 firmware</flag>
-	<flag name="foo2zjs_devices_hp1005">HP LJ 1005 firmware</flag>
-	<flag name="foo2zjs_devices_hp1018">HP LJ 1018 firmware</flag>
-	<flag name="foo2zjs_devices_hp1020">HP LJ 1020 firmware</flag>
-	<flag name="foo2zjs_devices_hpp1005">HP LJ P1005 firmware</flag>
-	<flag name="foo2zjs_devices_hpp1006">HP LJ P1006 firmware</flag>
-	<flag name="foo2zjs_devices_hpp1007">HP LJ P1007 firmware</flag>
-	<flag name="foo2zjs_devices_hpp1008">HP LJ P1008 firmware</flag>
-	<flag name="foo2zjs_devices_hpp1505">HP LJ P1505 firmware</flag>
-	<flag name="foo2zjs_devices_km2200">Minolta 2200 DL ICM</flag>
-	<flag name="foo2zjs_devices_km2300">Minolta 2300 DL ICM</flag>
-	<flag name="foo2zjs_devices_kmcpwl">Minolta Color PageWorks/Pro L ICM</flag>
-	<flag name="foo2zjs_devices_km2430">Konica Minolta 2430 DL ICM</flag>
-	<flag name="foo2zjs_devices_km2530">Konica Minolta 2530 DL ICM</flag>
-	<flag name="foo2zjs_devices_km2490">Konica Minolta 2490 DL ICM</flag>
-	<flag name="foo2zjs_devices_km2480">Konica Minolta 2480 DL ICM</flag>
-	<flag name="foo2zjs_devices_xp6115">Xerox Phaser 6115MFP ICM</flag>
-	<flag name="foo2zjs_devices_hp1500">HP Color LaserJet 1500 ICM</flag>
-	<flag name="foo2zjs_devices_hp1025">HP LaserJet Pro CP1025nw ICM</flag>
-	<flag name="foo2zjs_devices_hp1215">HP Color LaserJet CP1215 ICM</flag>
-	<flag name="foo2zjs_devices_hp1600">HP Color LaserJet 1600 ICM</flag>
-	<flag name="foo2zjs_devices_hp2600n">HP Color LaserJet 2600n ICM</flag>
-	<flag name="foo2zjs_devices_sa300">Samsung CLP-300 ICM</flag>
-	<flag name="foo2zjs_devices_sa310">Samsung CLP-310 ICM</flag>
-	<flag name="foo2zjs_devices_sa315">Samsung CLP-315 ICM</flag>
-	<flag name="foo2zjs_devices_sa325">Samsung CLP-325 ICM</flag>
-	<flag name="foo2zjs_devices_sa360">Samsung CLP-360 ICM</flag>
-	<flag name="foo2zjs_devices_sa365">Samsung CLP-365 ICM</flag>
-	<flag name="foo2zjs_devices_sa2160">Samsung CLX-2160 ICM</flag>
-	<flag name="foo2zjs_devices_sa3160">Samsung CLX-3160 ICM</flag>
-	<flag name="foo2zjs_devices_sa3175">Samsung CLX-3175 ICM</flag>
-	<flag name="foo2zjs_devices_sa3185">Samsung CLX-3185 ICM</flag>
-	<flag name="foo2zjs_devices_xp6110">Xerox Phaser 6110 and 6110MFP ICM</flag>
-	<flag name="foo2zjs_devices_sa600">Samsung CLP-600 ICM</flag>
-	<flag name="foo2zjs_devices_sa610">Samsung CLP-610 ICM</flag>
-	<flag name="foo2zjs_devices_lm500">Lexmark C500 ICM</flag>
-	<flag name="foo2zjs_devices_oki301">Oki C301dn ICM</flag>
-	<flag name="foo2zjs_devices_oki310">Oki C310dn ICM</flag>
-	<flag name="foo2zjs_devices_oki511">Oki C511dn ICM</flag>
-	<flag name="foo2zjs_devices_oki810">Oki C810 ICM</flag>
-	<flag name="foo2zjs_devices_oki3100">Oki C3100 ICM</flag>
-	<flag name="foo2zjs_devices_oki3200">Oki C3200 ICM</flag>
-	<flag name="foo2zjs_devices_oki5100">Oki C5100 ICM</flag>
-	<flag name="foo2zjs_devices_oki5150">Oki C5150n ICM</flag>
-	<flag name="foo2zjs_devices_oki5200">Oki C5200 ICM</flag>
-	<flag name="foo2zjs_devices_oki5250">Oki C5250n ICM</flag>
-	<flag name="foo2zjs_devices_oki3300">Oki C3300 ICM</flag>
-	<flag name="foo2zjs_devices_oki3400">Oki C3400 ICM</flag>
-	<flag name="foo2zjs_devices_oki3530">Oki C3530 MFP ICM</flag>
-	<flag name="foo2zjs_devices_oki5500">Oki C5500 ICM</flag>
-	<flag name="foo2zjs_devices_oki5600">Oki C5600 ICM</flag>
-	<flag name="foo2zjs_devices_oki5800">Oki C5800 ICM</flag>
-	<flag name="foo2zjs_devices_oli160">Olivetti d-Color P160W ICM</flag>
 	<flag name="foomaticdb">Add support for the foomatic printing driver database</flag>
 </use>
 </pkgmetadata>
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a1e83c9d..20a5e10c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -189,59 +189,6 @@ media-tv/w_scan:plp-id-zero - Apply experimental patch to force plp_id to 0 for
 media-video/avidemux:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.
 net-dns/noip-updater:ezipupd - Use user/group ezipupd instead of nobody: Useful if you restrict outgoing network traffic for user nobody
 net-libs/wvstreams:boost - Use dev-libs/boost to provide TR1-compatible functional interface. This USE flag is only needed with GCC earlier than version 4.1, or with other compilares not providing said interface.
-net-print/foo2zjs:foo2zjs_devices_hp1000 - HP LJ 1000 firmware
-net-print/foo2zjs:foo2zjs_devices_hp1005 - HP LJ 1005 firmware
-net-print/foo2zjs:foo2zjs_devices_hp1018 - HP LJ 1018 firmware
-net-print/foo2zjs:foo2zjs_devices_hp1020 - HP LJ 1020 firmware
-net-print/foo2zjs:foo2zjs_devices_hp1025 - HP LaserJet Pro CP1025nw ICM
-net-print/foo2zjs:foo2zjs_devices_hp1215 - HP Color LaserJet CP1215 ICM
-net-print/foo2zjs:foo2zjs_devices_hp1500 - HP Color LaserJet 1500 ICM
-net-print/foo2zjs:foo2zjs_devices_hp1600 - HP Color LaserJet 1600 ICM
-net-print/foo2zjs:foo2zjs_devices_hp2600n - HP Color LaserJet 2600n ICM
-net-print/foo2zjs:foo2zjs_devices_hpp1005 - HP LJ P1005 firmware
-net-print/foo2zjs:foo2zjs_devices_hpp1006 - HP LJ P1006 firmware
-net-print/foo2zjs:foo2zjs_devices_hpp1007 - HP LJ P1007 firmware
-net-print/foo2zjs:foo2zjs_devices_hpp1008 - HP LJ P1008 firmware
-net-print/foo2zjs:foo2zjs_devices_hpp1505 - HP LJ P1505 firmware
-net-print/foo2zjs:foo2zjs_devices_km2200 - Minolta 2200 DL ICM
-net-print/foo2zjs:foo2zjs_devices_km2300 - Minolta 2300 DL ICM
-net-print/foo2zjs:foo2zjs_devices_km2430 - Konica Minolta 2430 DL ICM
-net-print/foo2zjs:foo2zjs_devices_km2480 - Konica Minolta 2480 DL ICM
-net-print/foo2zjs:foo2zjs_devices_km2490 - Konica Minolta 2490 DL ICM
-net-print/foo2zjs:foo2zjs_devices_km2530 - Konica Minolta 2530 DL ICM
-net-print/foo2zjs:foo2zjs_devices_kmcpwl - Minolta Color PageWorks/Pro L ICM
-net-print/foo2zjs:foo2zjs_devices_lm500 - Lexmark C500 ICM
-net-print/foo2zjs:foo2zjs_devices_oki301 - Oki C301dn ICM
-net-print/foo2zjs:foo2zjs_devices_oki310 - Oki C310dn ICM
-net-print/foo2zjs:foo2zjs_devices_oki3100 - Oki C3100 ICM
-net-print/foo2zjs:foo2zjs_devices_oki3200 - Oki C3200 ICM
-net-print/foo2zjs:foo2zjs_devices_oki3300 - Oki C3300 ICM
-net-print/foo2zjs:foo2zjs_devices_oki3400 - Oki C3400 ICM
-net-print/foo2zjs:foo2zjs_devices_oki3530 - Oki C3530 MFP ICM
-net-print/foo2zjs:foo2zjs_devices_oki5100 - Oki C5100 ICM
-net-print/foo2zjs:foo2zjs_devices_oki511 - Oki C511dn ICM
-net-print/foo2zjs:foo2zjs_devices_oki5150 - Oki C5150n ICM
-net-print/foo2zjs:foo2zjs_devices_oki5200 - Oki C5200 ICM
-net-print/foo2zjs:foo2zjs_devices_oki5250 - Oki C5250n ICM
-net-print/foo2zjs:foo2zjs_devices_oki5500 - Oki C5500 ICM
-net-print/foo2zjs:foo2zjs_devices_oki5600 - Oki C5600 ICM
-net-print/foo2zjs:foo2zjs_devices_oki5800 - Oki C5800 ICM
-net-print/foo2zjs:foo2zjs_devices_oki810 - Oki C810 ICM
-net-print/foo2zjs:foo2zjs_devices_oli160 - Olivetti d-Color P160W ICM
-net-print/foo2zjs:foo2zjs_devices_sa2160 - Samsung CLX-2160 ICM
-net-print/foo2zjs:foo2zjs_devices_sa300 - Samsung CLP-300 ICM
-net-print/foo2zjs:foo2zjs_devices_sa310 - Samsung CLP-310 ICM
-net-print/foo2zjs:foo2zjs_devices_sa315 - Samsung CLP-315 ICM
-net-print/foo2zjs:foo2zjs_devices_sa3160 - Samsung CLX-3160 ICM
-net-print/foo2zjs:foo2zjs_devices_sa3175 - Samsung CLX-3175 ICM
-net-print/foo2zjs:foo2zjs_devices_sa3185 - Samsung CLX-3185 ICM
-net-print/foo2zjs:foo2zjs_devices_sa325 - Samsung CLP-325 ICM
-net-print/foo2zjs:foo2zjs_devices_sa360 - Samsung CLP-360 ICM
-net-print/foo2zjs:foo2zjs_devices_sa365 - Samsung CLP-365 ICM
-net-print/foo2zjs:foo2zjs_devices_sa600 - Samsung CLP-600 ICM
-net-print/foo2zjs:foo2zjs_devices_sa610 - Samsung CLP-610 ICM
-net-print/foo2zjs:foo2zjs_devices_xp6110 - Xerox Phaser 6110 and 6110MFP ICM
-net-print/foo2zjs:foo2zjs_devices_xp6115 - Xerox Phaser 6115MFP ICM
 net-print/foo2zjs:foomaticdb - Add support for the foomatic printing driver database
 sci-geosciences/googleearth:bundled-libs - Use bundled libraries.
 sci-geosciences/googleearth:bundled-qt - Use bundled qt.