reinit the tree, so we can have metadata

214 files changed, 8912 insertions, 0 deletions

diff --git a/net-print/adobeps/Manifest b/net-print/adobeps/Manifest
new file mode 100644
index 000000000000..d01ccce3c7d3
--- /dev/null
+++ b/net-print/adobeps/Manifest
@@ -0,0 +1,19 @@
+DIST Winstchs.exe 7763014 SHA256 4af84c26ad901cde09571930b7d228dfc88327711b5360f6441147443afcbcad SHA512 cf8041b9212adcabff6c3d5e547b9bb5d9c2d36ecec175cb7fff71185e8805909dc6ec7b42e68f794d66b5a4f3ce6d5b7f602c42926ffea57674f0f4597665e8 WHIRLPOOL 0d2c6613e27682fff5fc1528cc764eed67b165a4ca1cdeee6691b554859b754c858e88d453790c06bb6bbfb74e8af2f6ae6a15c28ff47901feab38d91ac1d911
+DIST winstDan.exe 7815273 SHA256 a95c420208cb90be6d741214c56d130793eaad415a6fcece120516c993f5340f SHA512 7981fe9655c798210de58a797227c7891c3355d29df8bd525bc99f8dacb7d235b1599e6b6a12136d78d63729827481edc2f8bb7eb60b728f0ae05861d925320a WHIRLPOOL 5cbef4a5c8724ea01241b0c4f05e2b0e5ad5e83250605434045ed004222fb49af9f89ba32a3d4258622de6bb7bc04fefd6e89624bd896c24fbae3b946710481f
+DIST winstbrz.exe 7820627 SHA256 4585b2749e1bc227cabcfebdd1729183deb769ba4c18f12df58defc59545559d SHA512 72f24812841945d49d0d1ccb99e2f906062f37ff9c0764b9ac58d999c85ce6e8c0348d09c638c01a82f68dc99dbb17abdbc11f0d1f712d2ee6b181d611d3b413 WHIRLPOOL 997bb2463f039cf58a732331c6c9b585e335d316bf485e21192ccac94fe62ab52ca2566507e93867ab02b4f29d18b8a79fcf879b1f5757a8df28153cd15bb0d2
+DIST winstcht.exe 7780767 SHA256 9142da863b63dda763bc850472133097f7312f2a500cbea2060314b80b30633b SHA512 61d7957560edbe19928be5a55709156e3c55dc671bb0bbe4ddad0b0529a483281a24d6b37d29d2d202d672457a705715c1b52bb6e2187de353666bd4e2649dbc WHIRLPOOL bc4a1c5d69bfc6ab77058a5f23fa8c914209fa7c2e4bb281d9b3e2923366f405914e78657bf34e2189e43059224ed0c8003bc92d22e035bf89a0eb980dab15c2
+DIST winstdut.exe 7835281 SHA256 bd82ad3616c3572262c03590832f19cd872afb07b8eea4e6540d33a6906ac815 SHA512 0a125d98fb12a2ac7eb47d5a2e8649f09c9e4bb50803b68b891b9403d5655debeb22cca35d29b7544494ad71a6b5eb28efa2d9b1a34856584afeac1ed86c600d WHIRLPOOL 29fa339cd635fa6edc3618c6f8346c501ce04ce4b0750ae2bc736b83a080152bdf20252b27c6c70ac42b6b7082aaeab6e9bd77a3449a624c5f9bbe3cdfef8c9f
+DIST winsteng.exe 7740765 SHA256 45a66f17f7c34e268fac4f40e829a3fb676c50d137e38fdee225ee1bcda189d0 SHA512 4da2460a85b9d86acdef20ed564ca1e19213f125487ec197eae9c88caf540fce123d2c2decf32978c2a3e55f52a5441cacd7826a7e916557087678532296f889 WHIRLPOOL 0206472a1ac133ddfa967f6c42e8c6399a428f5b01df65ff71e3b8b5d4cb761c09073ccf0779cf1c3ac1a9b1dbf8929d442e3bca89ba380982efd9b8fb41453d
+DIST winstfin.exe 7821985 SHA256 ecd28749632525287b562817580eea81e3cdef31c585d8a81a25bdca013e79d7 SHA512 6eaf6ae2ff0e476cee3b75d476bf56078dad2c04194eb17e780add94c1a667836e950737054e0efd7a274e46f966852f3b2dcdeb26742a5c8fbdaa404d686224 WHIRLPOOL 054f378f2da3faab47db74f1796c1fb2c24fd21bace350b01ba41225350fa5d9f04d3eaeed0d8b26019a8effbbe4dc3bee945a423d41368ce1f0cfb745a48cfb
+DIST winstfre.exe 7834972 SHA256 60a47b14c43c5da5b29a5af064f6fa1bccce8c19d574cfde49b538d9f58a8866 SHA512 4d42cea3539daac9f485d4381960503ec7bc5c32dfa9ec2969f232c45f5552355fe02c7cb6b4f952425dfa820b22274190dd9d8b46a760da2a6e868bf44e3536 WHIRLPOOL b5a17441eb9bf23be316d28d31a06a12b09766427add181ab28315fac0f6637b0a4b3cef0a069cfd9bfd130623ceaa1729b12c476fef4a2a869ca358d5134e9a
+DIST winstger.exe 7849748 SHA256 15990b737acd3c0b5eb7c7c1829c82c7cf061e7d86d9e9ac171c5a4adc06158e SHA512 99a7d9fc2dd2968b59a96700db7ebd8ca467eb5a4d2e0596829758090aad264ab9acdcf82cc4cf359b018b6f337b8b80a99c82ff393f885b96e7b28880f2a2cc WHIRLPOOL 8373f6437be45cc6879222d88bd398494c9e8da46fa1d9e410978643bb5f8b24a9835b32c27a0a0c8acc079e829cb0e6d57cb8cf900b52763a369fa0679ef320
+DIST winstita.exe 7839874 SHA256 9bb47ecb4918596668475ca716e417ca6e502df305c84a99ab6a4746ebea5d49 SHA512 9f082a1194509eb89a87c2fef32e16358710d3cf252fe63afa65fc66cc22fe9e3d5fc56e9df7fd2ec7bdf1607d45f084fcd2ad50d854c1d2aea756206ee9ad28 WHIRLPOOL fe4ad73e4d7a648c661c743123ee9a2880d15f5840f11b05e44acc07b4fcdf67c9cb6c0b93252f9eb5c808e8c0ca6c23fd5d326ba96b4e0832489938aa519ed2
+DIST winstjpn.exe 7852247 SHA256 c08e8ed2c7bf366932f95267e829f8aae1cf52b7193bd0f6877b80db357ec79a SHA512 91512223c7f4124e26c4b047460334beb6c1a62f4594c7f693e3fcc921ac5a2a8067535d28a1e7e7a3c69b06c72248b6b6d5b6336a330e2a4e69678a018f8940 WHIRLPOOL f28084b7ec06c6bb415fb7e37e1ce2a8adb989ecdd4a1a041235efe3750afc98400fa1e42be7d4ec8981b3b046130752bc0e7fbce296e7ac9e97016c9bc0b750
+DIST winstkor.exe 7794202 SHA256 4faef9c08136cd5658d8961786e7ad6494189401c028c369d88340638cd1fe8a SHA512 43d3374cf456ba7864ea9f5602126877f80fefabc2313d10ca9e9b7a037a2a59c6190184f847ca1643aa4e98fb84878832251ff0bd58830f610aa5f08f44f7ad WHIRLPOOL 62a55216ac02150fdb98b7bef8f90d9f294bf812e603786dcd471ddabeb6872052b04c24f2272e65e694e3deb0628f23a99dc7e5639bdeb093a357ba9929385f
+DIST winstnor.exe 7827002 SHA256 55171e86fff838bd056b1964c9e1f7ef07ced81e30dc7f41b464390852998c11 SHA512 eb0621ae8b168ed4a37b77fe2452eb2a4fd85eef109dfd2b53303a3668594300baa2c7a611418817ecf009ad79c77fbef7a95a6f1d1008af087228965cf2e7a1 WHIRLPOOL bb717dda62dd4d14f7718cad1db0aef3b1f30acf87fd0a5337ea05c1461aad2059ff0da727cb57bf14bfae0e657fa21297b5c2d22ad29a3cb38c5409c2481bee
+DIST winstspa.exe 7839771 SHA256 7930f5dd895e29670ec98f63155df09f55adb4b4a7b0cfe833a8cb3365cf3993 SHA512 9ae33f151693a06a0c67490385cc45fd0226031ffd2d9fae5fd2b9da0e54a047315617b81937cefa54932c0379e1403645bc8c037fb276dc070b8fd7424d7c35 WHIRLPOOL 3510d3ce2d5d96cff3d5bf56d73533553dee03f1e7f670a0686fd04f365fcb46c5afffe2033d6ae4c4d1b7d8220796f77736f23f93bc1f3afa6d7473ab25c609
+DIST winstswe.exe 7803620 SHA256 f2d7b2f15048e21a69b0d31e3fa19d275a6a132d7c95e03420be39c11828d103 SHA512 4b8cab11bd210e487fc38e8304696802cff75a769b6b70fcbe691e1f1324bcf291ef61b4aaa3c989454822b4374d9903404a362caadb49e2c3a97a2e69cd828d WHIRLPOOL 1a56cea1d5121d01fce254d54993ab7c5ba8d8a8f22e6c989d8fb228607f4c619eeaacfebfdf58f949e3fd27c77f70c3c48b1aef7c7cf633fc401e398c456af2
+EBUILD adobeps-1.0.6-r1.ebuild 2665 SHA256 c7a54db7d29e490fac0fe9c150c80bacea754b977fddc32cdce43d2d90e16185 SHA512 b5ef37ca24489d0d0b943292ef54c4d44686ee630b26e5adc33c9d0327a434e73a2656e0f028850446885bebca5e8cceccc24234c46ebb30a3ccdece4d48bfad WHIRLPOOL bf4725d3cf1b2a2d71af72efa227e0a1245c8bbe0f547f65ba5a69f54387c43ebd40f00fad2b04b639da0989d29727a60af5825ee26281ffad2d69ada31b9cad
+MISC ChangeLog 2839 SHA256 bb78b61f25943c55b8ba0dbe4d4f289048bf5d5761d9f47a7f21803a0b71aa7b SHA512 8f86b7fd3b37757a4c5a8716aa115f4771cbb97ef3500df92ece0ded0574ac9f50ebdd2fa76ed5629f78bb042cab5b35c95a76209a40ac2eb1e68e6ce3658580 WHIRLPOOL 8822c03b5210f8d756cf39b2aa8ab3f94defa667a098b61989c688d798d10f0b51726cfe5e11d55c7ded1bbddd8e47e60e0b658d289426e4bb5b281be5f19722
+MISC ChangeLog-2015 589 SHA256 d344c08477881c15fac2bac1440bf10923fdb7746d0c067b4b8a9279ac8d645a SHA512 27b13d6788330904df9b5dcc2b7e38e654fe80dff47ef41da8fe74656b16694ff1931e4ad535749f90788d08dbec205ef4df2fe02d0a7a42392a76082d3f392c WHIRLPOOL 20b15d9087020851509c9db2939a2ea470538bb145321392254657983e6ca2b99df0ffe59854376edb37e08f51c382ea186ee3f335d663d3c85cb42ab984717a
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-print/adobeps/adobeps-1.0.6-r1.ebuild b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..bcd8b1ef9332
--- /dev/null
+++ b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Adobe PostScript drivers for Windows for use with CUPS"
+HOMEPAGE="http://www.adobe.com/support/downloads/product.jsp?product=44&platform=Windows"
+SRC_URI_BASE="ftp://ftp.adobe.com/pub/adobe/printerdrivers/win/1.x"
+SRC_URI=""
+
+LICENSE="AdobePS"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups"
+
+DEPEND="app-arch/cabextract"
+RDEPEND="cups? ( >=net-print/cups-1.2 )"
+
+IUSE_L10N=( en da de es fi fr it ja ko nl no pt-BR sv zh-CN zh-TW )
+IUSE_FILES=( winsteng winstDan winstger winstspa winstfin winstfre winstita
+	winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs winstcht )
+
+IUSE_LANGS=""
+IUSE_CLOSE=""
+for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
+	IUSE+=" l10n_${IUSE_L10N[X]}"
+	SRC_URI+=" l10n_${IUSE_L10N[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"
+	IUSE_LANGS+=" !l10n_${IUSE_L10N[X]}? ("
+	IUSE_CLOSE+=" )"
+done
+SRC_URI="${SRC_URI} ${IUSE_LANGS} ${SRC_URI_BASE}/${IUSE_FILES[0]}.exe${IUSE_CLOSE}"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	local X L=""
+	ADOBEPS_LANG=""
+	for X in "${IUSE_L10N[@]}"; do
+		if use l10n_"${X}"; then
+			L+=" ${X}"
+			[[ -z ${ADOBEPS_LANG} ]] && ADOBEPS_LANG="${X}"
+		fi
+	done
+	# default to English if no L10N flags are set
+	if [[ -z ${ADOBEPS_LANG} ]]; then
+		L="en"
+		ADOBEPS_LANG="en"
+	fi
+	elog "Selected languages:" ${L}
+	use cups && elog "CUPS drivers language: ${ADOBEPS_LANG}"
+}
+
+src_unpack() {
+	local X L
+	for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
+		L="${IUSE_L10N[X]}"
+		if use l10n_"${L}" || [[ ${L} = "${ADOBEPS_LANG}" ]]; then
+			cabextract -Lq -d "${S}/${IUSE_L10N[X]}" \
+				"${DISTDIR}/${IUSE_FILES[X]}.exe" || die "unpack failed"
+		fi
+	done
+}
+
+src_install() {
+	local X
+	for X in "${IUSE_L10N[@]}"; do
+		if use l10n_"${X}" || [[ ${X} = "${ADOBEPS_LANG}" ]]; then
+			# files and filenames taken from cupsaddsmb man-page
+			insinto "/usr/share/${PN}/${X/-/_}"
+			# Windows 2000 and higher
+			doins ${X}/winxp/{ps5ui.dll,pscript.hlp,pscript.ntf,pscript5.dll}
+			# Windows 95, 98, and Me
+			newins ${X}/windows/adfonts.mfm  ADFONTS.MFM
+			newins ${X}/windows/adobeps4.drv ADOBEPS4.DRV
+			newins ${X}/windows/adobeps4.hlp ADOBEPS4.HLP
+			newins ${X}/windows/iconlib.dll  ICONLIB.DLL
+			newins ${X}/windows/psmon.dll    PSMON.DLL
+		fi
+	done
+	# symlink primary language to cups drivers
+	if use cups; then
+		dodir /usr/share/cups/drivers
+		for X in ps5ui.dll pscript.hlp pscript.ntf pscript5.dll \
+			ADFONTS.MFM ADOBEPS4.DRV ADOBEPS4.HLP ICONLIB.DLL PSMON.DLL; do
+			dosym "../../${PN}/${ADOBEPS_LANG/-/_}/${X}" \
+				"/usr/share/cups/drivers/${X}"
+		done
+	fi
+}
diff --git a/net-print/adobeps/metadata.xml b/net-print/adobeps/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-print/adobeps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-print/apsfilter/Manifest b/net-print/apsfilter/Manifest
new file mode 100644
index 000000000000..44229813fe7f
--- /dev/null
+++ b/net-print/apsfilter/Manifest
@@ -0,0 +1,7 @@
+DIST apsfilter-7.2.5.tar.bz2 309436 SHA256 06fcd09080122c42d8ae7435f4065ea104b81268703498446e8e49f176ce949a SHA512 a9f2060f1636d255a5ec2c9bd9d8c6a34452e7ad76724746acd45bfb2644a924036032013e7f29a753545a02a83fe099364685562a8e95634170df3277c8e943 WHIRLPOOL d984a5eb1ccf452e888ebe71a2e8d76101157e63e9ad9c33f90c64f1c6f34a8a751bcae694e9a69b1b2c6f06eed369520991a97091c3fbb1dbe8de5607cf1e40
+DIST apsfilter-7.2.8.tar.bz2 310587 SHA256 9fb814b1d08725e318f200b06ab722eb72b218b56beb17d7ad3ab7bae835e2e9 SHA512 ca07e7eb620a95b08fb912e899520d5ff85613eb3d1f712e1d38a66cf5b84516dbb35e3e40ef75ac10d1e717cfc2f49930a0f0873fee451d495c8ae572072012 WHIRLPOOL 89196b120338cf3665d95768ce11e8357675f9dd89fa8f34e589dbf083c2646b926d2082f1bca63eb5cefe6e84861d4ef9fc26f8952c9e3cbc21601941bf6297
+EBUILD apsfilter-7.2.5.ebuild 1071 SHA256 1299b15efcbb34174570031f3c818642897fb1b995aefb3ac96c89a1e42f97ad SHA512 25a94dfccc933518a842c07f91a42e7ed246bea1b98c1da002f60af3d6585f0d58cb6f30571312e5a883354e09405131c245b5741031271fb8205fd076e27e13 WHIRLPOOL 008d3af9b1e9e728583e99bf5a6a812a73c0f0596b7d75b97d23c9b27a28f7cfd2995fe67c228049b953ea6aa787f0548be2bb429eb8154fd54f262c985d9d21
+EBUILD apsfilter-7.2.8-r1.ebuild 1169 SHA256 0498d957d72858ceed69796161d1ef6882a1c25e95c9c9fb2ae3ea7228b7a902 SHA512 ba0acf1bc3f8d0b44853c2b415c8fb4335fc6705a65ce6fcbf3e283c9dd84f0a8e6f80a6977d723abca6f83d4eb0f6d7674cddce2eef9e163c346740a4af5ab1 WHIRLPOOL b4db160cd9a12d86d7613255fbede1351df51ab568c4cc60afda7b6abc012a639d237e9f9eec26e4af4c1eacbd4d1180deb678d7bc015c371823c64450d5be31
+MISC ChangeLog 2490 SHA256 ad82949a5c279991553f1f2fe1ae5df8370667b6a1d4bb809705072db42f8c97 SHA512 4adb36d01d598ca1570f335aaed02bac3faeb480e4671275d5bbe6a92be24dbb1b213b480cadb5c41e49238d22f4aff0e491a7a17ca1148641304579148f0354 WHIRLPOOL 837d183c8d469977e19a48dc59278b66263cba012fd36dd2588f2742c943fda13917d24817fd2c46a8c980430297191d3886b5225c166e34ff1571be318bd6fd
+MISC ChangeLog-2015 2383 SHA256 32d7813a07c13c28de113ec78bf47076be3b09f10e7142a9e149b9af908ad9b6 SHA512 f9b3032cb5fd69a52478abec5da1d07fab74c46c4d296d124e13f8bbf7660a971ac4d86e6b5dd9c49607ea7bb7a0b0e9d22add046524f86c723224576a4175c1 WHIRLPOOL 5e97bb7a2f4ccf0d814df1802bfc0b865210a7676ca1dcd6796bf2055f518b3fc7814c9b644d5213a6a7dfc0500d0b775cb1a58137f9fbbc64ab9560ed9ad588
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
diff --git a/net-print/apsfilter/apsfilter-7.2.5.ebuild b/net-print/apsfilter/apsfilter-7.2.5.ebuild
new file mode 100644
index 000000000000..eae57aad3158
--- /dev/null
+++ b/net-print/apsfilter/apsfilter-7.2.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
+HOMEPAGE="http://www.apsfilter.org"
+KEYWORDS="x86 ppc alpha sparc"
+IUSE="cups"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="|| ( net-print/cups net-print/lprng )
+	app-text/ghostscript-gpl
+	>=app-text/psutils-1.17
+	>=media-gfx/imagemagick-5.4.5
+	>=app-text/a2ps-4.13b-r4
+	virtual/awk
+	virtual/mta"
+DEPEND="${RDEPEND}"
+
+SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2"
+S=${WORKDIR}/apsfilter
+
+src_compile() {
+	# assume thet lprng is installed if cups isn't USEd
+	use cups && \
+	    myconf="--with-printcap=/etc/cups/printcap --with-spooldir=/var/spool/cups" || \
+	    myconf="--with-printcap=/etc/lprng/printcap"
+	./configure --prefix=/usr ${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dosym /usr/share/apsfilter/SETUP /usr/bin/apsfilter
+	use cups && \
+	    dosym /etc/cups/printcap /etc/printcap || \
+	    dosym /etc/lprng/printcap /etc/printcap
+}
diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
new file mode 100644
index 000000000000..ad57c2f64493
--- /dev/null
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
+HOMEPAGE="http://www.apsfilter.org"
+SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="cups"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="|| ( net-print/cups net-print/lprng )
+	app-text/ghostscript-gpl
+	>=app-text/psutils-1.17
+	>=app-text/a2ps-4.13b-r4
+	virtual/awk
+	virtual/imagemagick-tools
+	virtual/mta"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	# assume thet lprng is installed if cups isn't USEd
+	use cups && \
+	    myconf="--with-printcap=/etc/cups/printcap --with-spooldir=/var/spool/cups" || \
+	    myconf="--with-printcap=/etc/lprng/printcap"
+
+	# econf doesn't work here :(
+	./configure --prefix=/usr --mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} --sysconfdir=/etc ${myconf} || die
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dosym /usr/share/apsfilter/SETUP /usr/bin/apsfilter
+	use cups && \
+	    dosym /etc/cups/printcap /etc/printcap || \
+	    dosym /etc/lprng/printcap /etc/printcap
+}
diff --git a/net-print/apsfilter/metadata.xml b/net-print/apsfilter/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/net-print/apsfilter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/c2esp/Manifest b/net-print/c2esp/Manifest
new file mode 100644
index 000000000000..64ff915d296c
--- /dev/null
+++ b/net-print/c2esp/Manifest
@@ -0,0 +1,9 @@
+AUX c2esp-25c-ldflags-cppflags.patch 1049 SHA256 8e46d6d6cde053dae5790f6ad7a809630a59ee1828f3abc16efe80df9baf0215 SHA512 315d30b7aea8b89a23edba3bc15a018de72287f0025611c4fa137dad1f868cac3fe06cd6713e348ffb63ea8633caa3873b51a44d534c77c6ff8805183afab341 WHIRLPOOL 86825aa3118198611721a307c67b88c96247036fbbde294d9b56c77e16c1026a77624c36eac47e5d4c379ddbec3ecb86677e8becfde2a1f5e0f624800a99bb19
+AUX c2esp-26-ldflags-cppflags.patch 1152 SHA256 6cf971ca82d0d1306ee460c8d9033d8238bb19038b81d5b6eb42cf67a8d29b7d SHA512 c85abc2a3511ee7cf4ab4045c77ac257d85579354c98403a27209a21915fcd2180053db86fef09151d5e52e98684f46e14bd57bae9f0250597c451286fbe3da4 WHIRLPOOL 6e379fd15f5c61bfe804390b31f7790dd4dcd8bd8e068b3a8b8c85dc693e7c6ae804bfb9e5d8e93b5e61dcbe7c544a27a875bc4a2fb51b2d797672fe2a02e70e
+DIST c2esp25c.tar.gz 338047 SHA256 5627086e5579fad4bcb2eef42d388c3118c630db32f63e11b5016d046baef521 SHA512 788da75c0049c1aa445890d67a7088bc4e7aa5c4e3e67689677fa5bee0e17e29fbb6e7ba9397aaec99f43ba79043aca7d147b6c510e3dd472d238ce6e2636b12 WHIRLPOOL 5446a704e4116c152978864dd35a509df5f0bb30d6d0b6574a14522b2b92601b3623fe97b2f319c81fa86bc68635cfa9b12f9902961cd31936dc286eb9d6764b
+DIST c2esp26.tar.gz 127593 SHA256 9c1427ca9a7374b2dc052953084f5c1a3675ec6842ea77b8e2ae86fa3bfa5856 SHA512 aa1ca61f895de4892e1058b349fcf1830da78455ffbd0d9989b7ac4e922076e184de91a2b79f285d946d29ece7a6d8159f62c900ed8d6c76859a4261c92da359 WHIRLPOOL 32fea85eeeece5b0ea84ca6291fc1a0102c783ecfe6e8f1f4d059ed7f3a26031ccb70cb2d0bc6667a4914d1eac228241a4c949b7a1bc4a3e81d8f42baa6be874
+EBUILD c2esp-25c.ebuild 1155 SHA256 12341f16d9792d249b154ffe56e336f3361c1fa70cf05348bdb37a2c35d7a305 SHA512 f902cad466f567e1c5fec97a5830e4a9303b697bc3877500aa4b4c4349485b094ad09eec8181032668f73f4cc249bb141212bbf59b2e071f4009cd47fbf0c97c WHIRLPOOL 031ca2ef86d39070c22c40bc2407aefb287ec5d342b181d669a0e43c82bed6f5b671a95a6378910f6d8ea366a2b41ed8f29f929766977ae3bbf471661d649b0a
+EBUILD c2esp-26.ebuild 1159 SHA256 fcc3c8265279a421f139842a89e38a121a9c153ccbc3a9e29eaa0adc7eff2974 SHA512 ef5855f0aae411da2ff6520e44cd0935ba33b524216bbab912c9474b1c1f2ea0b3acd05f5bc9f70bd3f1d16238fc022fe6d78f1cea4395da1ba5d56d803eface WHIRLPOOL 07e75bc0c9561965b443b5dcefef0136db68b5c619542c93532fe7b90b9c4951c95be2c08bdcc2fe3a4f47177b0ccbdbfdc4681537762cc01468c8b6e0066e5e
+MISC ChangeLog 2706 SHA256 d48be09833030c38aafae554b49fc54011ebc8ba90feac5488b21f06e6a59aa3 SHA512 cfc25744044af387acef3a00c7bc761713bd6e73b567eec4ca4dc40ef1c4e708842d4db852ac5a86de39e6aae4c759e60e1aacdd917575488f837ea0f680c018 WHIRLPOOL 844c077f3941d270681ba2fa1f96b6fc1d9478606a68c7a41d17917d9e1b503fd1d02164d71e8070212fda95527fd3fa860668f25c6af0f44f6660ca8e13d9bb
+MISC ChangeLog-2015 1167 SHA256 c2a99485e237d6b95f081415307e03733e9d39fd6d154539e8658f0f62ecc5f5 SHA512 6a276a32e645629a30a1203ebd823eb99709eda037c174e9416f1deb1d97173e053d984a006c495844c2c6232e95e64c426024c080aef068a046b4a7dabd6b13 WHIRLPOOL 362c98dd1d0a506b897b101967b62a942976a4605e55fa2af6acf1adba4803eba62af6cc4cedba65183c7b36453f539b52ea2f5d4941458840c19d9fb7cd00ca
+MISC metadata.xml 354 SHA256 8d54b71715b852d0e38d9a9403f38379d06603f5e4c57da64f24350bac8c1989 SHA512 d392c1b2ed7e557c5f9ce293e4cb668e0c229ece25dfdb098f569c0cbf9f797d706a0f55a066a8c5649bbc2184866a92d169f32c1f2eaa97c6f073e6d77c57a7 WHIRLPOOL 72e9535a480f4ab21e7b301a6a3d26704921b9feb7edd024c2bee73ddef06d0ed703e257690b6d9d36fd89bb44cd59f0ea09438b160f75d2a45c4ff8df63ddeb
diff --git a/net-print/c2esp/c2esp-25c.ebuild b/net-print/c2esp/c2esp-25c.ebuild
new file mode 100644
index 000000000000..8b27ec8952cf
--- /dev/null
+++ b/net-print/c2esp/c2esp-25c.ebuild
@@ -0,0 +1,52 @@
+# 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-26.ebuild b/net-print/c2esp/c2esp-26.ebuild
new file mode 100644
index 000000000000..1619b47f90b3
--- /dev/null
+++ b/net-print/c2esp/c2esp-26.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 -j1 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/files/c2esp-25c-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch
new file mode 100644
index 000000000000..a551cc0f46ab
--- /dev/null
+++ b/net-print/c2esp/files/c2esp-25c-ldflags-cppflags.patch
@@ -0,0 +1,32 @@
+--- 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/c2esp/files/c2esp-26-ldflags-cppflags.patch b/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch
new file mode 100644
index 000000000000..1ea36482687d
--- /dev/null
+++ b/net-print/c2esp/files/c2esp-26-ldflags-cppflags.patch
@@ -0,0 +1,33 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2012-09-06 00:18:06.000000000 +0100
++++ b/Makefile	2013-08-01 19:56:01.884969274 +0100
+@@ -234,16 +234,16 @@
+ 	@echo 
+ 
+ c2esp: c2esp.o c2espcommon.o $(LIBJBG85)
+-	$(CC) $(CFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2esp.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) $(LIBJBG85)
+ 
+ c2espC: c2espC.o c2espcommon.o 
+-	$(CC) $(CFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ c2espC.o c2espcommon.o $(LIBCUPSDRIVER) $(LIBCUPSIMAGE) -lz
+ 
+ command2esp: command2esp.o c2espcommon.o
+-	$(CC) $(CFLAGS) -o $@ command2esp.o  c2espcommon.o $(LIBCUPSDRIVER)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ command2esp.o  c2espcommon.o $(LIBCUPSDRIVER)
+ 
+ myopldecode: myopldecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ $@.o $(LIBJBG) -lz
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(LIBJBG) -lz
+ 
+ #
+ # Installation rules
+@@ -403,3 +403,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/c2esp/metadata.xml b/net-print/c2esp/metadata.xml
new file mode 100644
index 000000000000..b57181121c2c
--- /dev/null
+++ b/net-print/c2esp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">cupsdriverkodak</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
new file mode 100644
index 000000000000..c0a993d1e7c6
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -0,0 +1,5 @@
+DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 SHA256 fb3701f564f987126a9a3d03a163951f3182d6f7d626530a6767cb1f996fa203 SHA512 05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494 WHIRLPOOL d17dacb98b6ea39d62822a4dd379fb6f8abc900243476893869e0d3a3d1ce1504cb5866d16f775bc006e94a3aeb726912a4c58faa50bf9f390e270482f20512e
+EBUILD cndrvcups-common-lb-3.40.ebuild 2875 SHA256 f6edfff93dfc85caef65190921f35bb124008d2665e92d311dad0f7f1d3cc796 SHA512 e2a95ded32ff1f4be31bdc92a5909e9e1131cc1cd3ec8fd3dedca7969e7bb0a43584a4f158859e01127129b0c9efe4929c4c607c532f78c40c880e7934e2492c WHIRLPOOL 6a90f6f0eba9c08bbf6ca661bffef6e0f80150b2b1033519d71ec2a5eec998727f04d95f8f50bc1bbbe3663b485cd6282a9b8dce86e147d603e491d6b904cb90
+MISC ChangeLog 3383 SHA256 b4ab3a9fc40e4984d6dbdce17a1d51fb52df8c9b3d51b237050258fec574e472 SHA512 0b84e01d23726f52229bc76bdaec454a68e7c205784bda11c4053ff0c99712006e181351f06c5af0a28b0d197129a8a7c887f0c7235a738dd0206e61c5aaabb2 WHIRLPOOL 7d2d3e2f703cfccf0a54e3a5f3b912b75958f194bf0200353fc18692952ff6f86fa5da3dc14a2a6cdb1afbb8add171be10e9df733dbe9927ad85b8780b677b00
+MISC ChangeLog-2015 1138 SHA256 4d47efc59abc4d2b7b762b8cba553b0269639b70bf0bef2932de5e9872bec806 SHA512 fe2aecd6cf5b2c8d2fa99049668a9687dc3c34424ea012a3c18b2dcc22953cb4686ae064583f2041980b57e35a57779c6095cdcbb7abd2c097537c12c515da00 WHIRLPOOL 3e733f878a571cd41b848477d20a3a10dffeeb9160cfc105be81387ac1fb88621c17099b5f0c1fd1ae1a7c3dede4cc5360c0f06342cb23722e9b26cbd3eb1f7c
+MISC metadata.xml 239 SHA256 a712e24a6753f11e79989f54afbe96fdd4f2992f1ee71e75622b3be915b4d78f SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 WHIRLPOOL c086ac59403178d68159ad470a7223dbc0ccfa028fc6f501b5827d4ea1194058dfbc7db08e770e9da9ef06039c31f80165e023c728a59c698aab375dccd85cce
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
new file mode 100644
index 000000000000..f8318f3d2fea
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX"
+SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/04/${SOURCES_NAME}.tar.gz"
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxml2
+	gnome-base/libglade
+	net-print/cups
+	x11-libs/gtk+:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.80}"
+
+pkg_setup() {
+	# Don't raise a fuss over pre-built binaries
+	QA_PREBUILT="
+		/usr/libexec/cups/filter/c3pldrv
+		/usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+		/usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+		/usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+		/usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+	"
+	QA_SONAME="
+		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+	"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+	unpack ./${P/-lb-${PV}/-3.80}-1.tar.gz
+}
+
+change_dir() {
+	for i in cngplp buftool backend; do
+		cd "${i}" || die
+		"${@}"
+		cd "${S}" || die
+	done
+}
+
+src_prepare() {
+	default
+	sed -i -e \
+		"s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \
+		backend/Makefile.am || die
+
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+	change_dir eautoreconf
+}
+
+src_configure() {
+	change_dir econf
+}
+
+src_compile() {
+	change_dir emake
+
+	# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+	( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+	MAKEOPTS+=" -j1" default
+
+	einstalldocs
+
+	cd "${S}/c3plmod_ipc" || die
+	dolib.so libcanonc3pl.so.1.0.0
+	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+	cd "${S}/data" || die
+	insinto /usr/share/caepcm
+	doins *
+
+	ABI=x86
+	cd "${S}/libs" || die
+	exeinto $(cups-config --serverbin)/filter
+	doexe c3pldrv
+	dolib.so libcaepcm.so.1.0
+	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+	for lib in *.so.?.?.?; do
+		dolib.so "${lib}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+	done
+
+	# c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(
+	if [[ "$(get_libdir)" != lib ]]; then
+		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
+	fi
+}
diff --git a/net-print/cndrvcups-common-lb/metadata.xml b/net-print/cndrvcups-common-lb/metadata.xml
new file mode 100644
index 000000000000..f61881680816
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>pacho@gentoo.org</email>
+	<name>Pacho Ramos</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
new file mode 100644
index 000000000000..dbe37d8b94ca
--- /dev/null
+++ b/net-print/cndrvcups-lb/Manifest
@@ -0,0 +1,5 @@
+DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 SHA256 fb3701f564f987126a9a3d03a163951f3182d6f7d626530a6767cb1f996fa203 SHA512 05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494 WHIRLPOOL d17dacb98b6ea39d62822a4dd379fb6f8abc900243476893869e0d3a3d1ce1504cb5866d16f775bc006e94a3aeb726912a4c58faa50bf9f390e270482f20512e
+EBUILD cndrvcups-lb-3.40.ebuild 2575 SHA256 15268475723f7f4a335f5f941b7a1bdfce2328fcb154713342377cf920e123d7 SHA512 1e7b061e8e1c3c65e8c359f3b064ee728c54129b4e1af6028f61aca3c8ca4828c1a2a0bafcf2db4a76891c2c9b9819988f7f933fd1f843816a115af4ee6234d5 WHIRLPOOL dcc248415fd2dd572ecb374dcb7918e0311d9208605df65bc7daffcdd938d032c518951de983c748e2f86d24e868399686bb0c163462adf25f0d52c275202872
+MISC ChangeLog 3263 SHA256 b010fe94b8f59131531f840f387516124a818a1a340bb730505d560059dd00c9 SHA512 1d363af6ebdcd240ebe4353456fb86ea8b7cb79a00ef4d66a8e9fb845f201866caf9689e5dcc19a518e60cc85748676e05369d32d11bcbc3238f5b67c4cb0446 WHIRLPOOL 839673c8690ec1a0dd07c21c92b499a7623005fb8075fddaa9fe001789ad05415a195f8e5ccf1b61dcc057aee3c2c48c43c26f7aa96a4a4d55047fb44ae38e0a
+MISC ChangeLog-2015 1321 SHA256 d5cfc327cc1c9192a4c38578d0e03736ee6043ac5cac5345e0348b6a54885ab1 SHA512 62a7d1f82133d8bd7cf4da4dc8e0ad4c932a399aa006cb654efac8d7606056daee04f53fdaf3355714878730779f97997900372611e23e1c215bf5116bf7b619 WHIRLPOOL 80857b210536bdfea43f873ad78d471263b4be244806d3b2f4df1302f9a0977ad03ceaf27a2a1ab80cfdddd2ad022dfda4cc32ecc04c5c7e9e9444556e75b406
+MISC metadata.xml 239 SHA256 a712e24a6753f11e79989f54afbe96fdd4f2992f1ee71e75622b3be915b4d78f SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623 WHIRLPOOL c086ac59403178d68159ad470a7223dbc0ccfa028fc6f501b5827d4ea1194058dfbc7db08e770e9da9ef06039c31f80165e023c728a59c698aab375dccd85cce
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
new file mode 100644
index 000000000000..5547321c0517
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX"
+SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/04/${SOURCES_NAME}.tar.gz"
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="
+	gnome-base/libglade
+	net-print/cups
+	~net-print/cndrvcups-common-lb-${PV}
+	x11-libs/gtk+:2
+	>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+	virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	# Don't raise a fuss over pre-built binaries
+	QA_PREBUILT="
+		/usr/bin/cnpkbidi
+		/usr/bin/cnpkmoduleufr2
+		/usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+		/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+	"
+	QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+	for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+		cd "${i}" || die
+		"${@}"
+		cd "${S}" || die
+	done
+}
+
+src_prepare() {
+	default
+	sed -i -e \
+		"s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \
+		pstoufr2cpca/filter/Makefile.am || die
+
+	export "LIBS=-lgmodule-2.0"
+	change_dir eautoreconf
+}
+
+src_configure() {
+	change_dir econf
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	prune_libtool_files
+
+	cd "${S}/data" || die
+	insinto /usr/share/caepcm
+	doins *
+
+	cd "${S}/libs" || die
+	insinto /usr/share/cnpkbidi
+	doins cnpkbidi_info*
+
+	insinto /usr/share/ufr2filter
+	doins ThLB*
+
+	ABI=x86
+	dobin cnpkbidi cnpkmoduleufr2
+	dolib.so libcnlbcm.so.1.0
+	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
+	for lib in *.so.?.?.?; do
+		dolib.so "${lib}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+	done
+
+	# c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(
+	if [[ "$(get_libdir)" != lib ]]; then
+		dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+	fi
+}
diff --git a/net-print/cndrvcups-lb/metadata.xml b/net-print/cndrvcups-lb/metadata.xml
new file mode 100644
index 000000000000..f61881680816
--- /dev/null
+++ b/net-print/cndrvcups-lb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>pacho@gentoo.org</email>
+	<name>Pacho Ramos</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
new file mode 100644
index 000000000000..168856f9e1d9
--- /dev/null
+++ b/net-print/cups-bjnp/Manifest
@@ -0,0 +1,9 @@
+DIST cups-bjnp-1.1.tar.gz 139838 SHA256 db6be8ae2e8db63fe70ca0e3c64b119fd7ba83687e1c314c5e7b61622cab6f83 SHA512 9a1558c7f2530e14ecab3143e0e03239d430d261486309cbf12f28a43b6358e704f60fdbcfeb0150b3ca80d31bf03b0c628179fbf37d313ca23d2f6e1d28265d WHIRLPOOL 173e1f81eeb39415845e66c4c7bac8de9a6f71f257ead546112500bf08f5d9ee37f975d66b408e449039bc3528b54c17fd8e593d0d36d7c9c2829e7329483267
+DIST cups-bjnp-1.2.1.tar.gz 140536 SHA256 bda4ff2a9e9f673018374b75b1cf6f67f5aef3025a3a08d2c9ccf15a2bb8573a SHA512 c14152592255f9092d543f00f67a8fdd71cc9b27bc12cc6e66d3d94e1112920feafba35b7f7a830b07666b9b2d8d070f52757a3e150195e71ec989985a74d489 WHIRLPOOL 35ab78c1c73987fdccc45421616046ff4987dbbf183c262e23fcbe373baa5244016e0cf8a1df0ab80919ada34d3adbd0f8bc2b4268a3d8ddf97ebe5341ff9f74
+DIST cups-bjnp-2.0.tar.gz 140617 SHA256 2acb716680d66f1378cf8dcd45fedf7f72ccc9b66fa80214d6dcb042b5e3c9ab SHA512 60b7c58828c736eab6986896730db7635d3364e94d6d7c4992eb7f49f22ced6a5643153c069d3823d4dc663ee7de8748b8e8ec527e04afc65389c521b791c8d0 WHIRLPOOL 217e8cce22cb8ea4390dfedbaa5d5f37e8c5cab79f3b25924fd05eeec3e39b29e85a4732182f508daa8a379ebd4d0ced8b59038c6a538b366ac156250127243c
+EBUILD cups-bjnp-1.1.ebuild 432 SHA256 648449fc1c073f409c2519e10588bdb9b3525d7534cd5c2a70d616d3ead7e38a SHA512 d5c1ab4d82b7602c844c14d83c84b773ab92757e1766f93e64fec0f2b37c57d3ed35b26cafb71a2171ee81c7cad715fb4ed185c1bca2cf9f338880a7c6c1a6e8 WHIRLPOOL 4b2d948103bf3d72e2cf05c1fcc0e5c4884ff5318f0ca0ccf8d0f5929110e54c08961b5135dc60062fe3506696c6c2b21d83933d2aae8406ce42c15ed2ea1c3b
+EBUILD cups-bjnp-1.2.1.ebuild 483 SHA256 fb9abe7a37a1fb87c4fe68a5edfbe3c85cc408e2d51f750580476fd66f42b8f7 SHA512 bc9b8d18009d951e7781463e0ea2150ee264beb23121f6acdecb0fcf43733b751df07bb978dfc2f0e27281e290bc4da78aa8b0e5a4b6b38a08ed0b19f1a10c0d WHIRLPOOL f4836726192b8efc335fbf27431708e2c7072116e7b4d8661a2848ec8cef41fcf2dc44595e4c38418c1b08d60975bca82e06c4769c34f416c91e872bdfae62ad
+EBUILD cups-bjnp-2.0.ebuild 483 SHA256 fb9abe7a37a1fb87c4fe68a5edfbe3c85cc408e2d51f750580476fd66f42b8f7 SHA512 bc9b8d18009d951e7781463e0ea2150ee264beb23121f6acdecb0fcf43733b751df07bb978dfc2f0e27281e290bc4da78aa8b0e5a4b6b38a08ed0b19f1a10c0d WHIRLPOOL f4836726192b8efc335fbf27431708e2c7072116e7b4d8661a2848ec8cef41fcf2dc44595e4c38418c1b08d60975bca82e06c4769c34f416c91e872bdfae62ad
+MISC ChangeLog 2698 SHA256 5c6ec2340ca6d21d7a030447cab3488827703975bd9ec7e0c6e949b68233d10c SHA512 85c9fba4c8c38161ce9a89cdc953a850d589c186ff009767f0ea43dea6cbcfff679d5b86343a73df20d73bd5ff5f6622b8c402bf8afeef49e3ebe20b6eb5e8e4 WHIRLPOOL 35b4fad9688828c7ae28f9c602b3cf4e20361d9cfbf43803844ff281571b7b4962648a5474b94940c9be16b7dc5cad17cd185fc18431613046a1af1fd3015ba0
+MISC ChangeLog-2015 1067 SHA256 e8e1061584c00bdb8af20f1faea1b34c606392e24cc2063e5f40e3e818c5564d SHA512 01b7d441e97503378d75369de8bd7f5536c5b04f8f6598a8a0ee4ea1b82bc0538048d43f8c9f69b725a8c1ee084f14de5e614e1732c3e711d99cd16b7264232c WHIRLPOOL 433fd1794f553ae83e303fbf1c71f363ec1e680275fd6c811528fefedad978d2c2b49fd02ba3f52a967d6d2a8c60ee6a3b2f629c373e72655ce6f30162dd9089
+MISC metadata.xml 338 SHA256 63c53b1c00590e870cd465213484d1119b74b848899b0393fd248dfd66f42235 SHA512 be2e9f37b6456136fedac3ee2bcf004d8bf5ac644dd5154714aba02fa3dbc026b5c8f0e0518e494d9bc5d22902339c97cd8df8955df814306337883a68a87a84 WHIRLPOOL 89c37f5ecc6daf8df674a89b886024a1ce970ce63e9c3740022fa6bffa9a6397e361e59854116c366cf40aa5afe136931cecfa077e054a3903cd81661fa94677
diff --git a/net-print/cups-bjnp/cups-bjnp-1.1.ebuild b/net-print/cups-bjnp/cups-bjnp-1.1.ebuild
new file mode 100644
index 000000000000..ad806f5cf6c4
--- /dev/null
+++ b/net-print/cups-bjnp/cups-bjnp-1.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
+HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
diff --git a/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild b/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild
new file mode 100644
index 000000000000..d720b507f029
--- /dev/null
+++ b/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
+HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-Werror
+}
diff --git a/net-print/cups-bjnp/cups-bjnp-2.0.ebuild b/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
new file mode 100644
index 000000000000..d720b507f029
--- /dev/null
+++ b/net-print/cups-bjnp/cups-bjnp-2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
+HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf --disable-Werror
+}
diff --git a/net-print/cups-bjnp/metadata.xml b/net-print/cups-bjnp/metadata.xml
new file mode 100644
index 000000000000..1995e3ca80f4
--- /dev/null
+++ b/net-print/cups-bjnp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cups-bjnp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
new file mode 100644
index 000000000000..7051ff36d111
--- /dev/null
+++ b/net-print/cups-filters/Manifest
@@ -0,0 +1,16 @@
+AUX cups-browsed.init.d 400 SHA256 37d1eb7c5001210002a7844db5c96c0131c23a095726867dafa08823bfe27f52 SHA512 b35e1556aac819265a8dcc0187cda3381f090f30e8aa9d1552f69333c9c193ed17075a955db96b2238b5fda06eb968e015e61b35ab4cd9e243a27b91481487c1 WHIRLPOOL a7b7770651eb0f223110d2b29c7f3b53b6836af7280b4add69494253a4d6eef6d6cce8ef401471264e82d49cf420457dd37387b4de72738885e25db41d3ae814
+AUX cups-browsed.init.d-r1 154 SHA256 36f4a71f7ac8c36fa818615827848b4b9a6cdafffe3d5fa5ab698e0a6b12abfa SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3 WHIRLPOOL 6acbec63cf5e654deae8c9df0accff39989e5e4b5af50a42b6a903b8ea13d35a29660da8890f470b602155e50a85f813670e4a9528f9c41ee9c01b78a574c640
+DIST cups-filters-1.13.5.tar.xz 1424764 SHA256 35db1c5821c9ff0e0fedcf87b3ae68a424ad951bd8af421a2a1aac5613e17b8d SHA512 1870b16ad64bc46068c8a74be7a112790a6ffc0be0e14cd858d83013b12e1c51efd905fbc4e189a42558814694348a9ef533b6fe504ef7bce3b4da149e0b3ea6 WHIRLPOOL bcf3cf952d531bce5d7092a74dd9db819a13374155bc306eb88fdc2a22e78fa4918c70159f447f8b2b48eda6da713ab85936474fca63f8eb7c2e4318bb2a5386
+DIST cups-filters-1.16.4.tar.xz 1440964 SHA256 2642c6a3cbf10a38d91f20b7b292583d19acb64e786eb6513b7b45738a2e5aed SHA512 367c2c1d6755800b88f79808ef0c595aa80b080634299d015828bfb8f0e27085aa052c77e3f3f1645833340caca709bec8e00b46070ff4d13b9994fb1400da60 WHIRLPOOL 30f4e70770c60a743ca845e294e1bf79f3efa83e10f01398a0432461d31e59eac6568e6a302425250bd0417963e63b1ef208e35e5ddcf1a1f4125bdd80480324
+DIST cups-filters-1.17.8.tar.xz 1455096 SHA256 9acefd72f8e6a6e5fb6e80d37aad8c712c326bf484afb735e8ff7d7b86975870 SHA512 01f4499fb1db456a1fb11b8e39b5de273229c7aa2f87d079e237501ccd70bf637ca5e15d19fb9f7930be700ab6958e1a597bda8d0970260b5e7577eb5447f797 WHIRLPOOL 2bfd485b053b33882cff8cff27b7db62a903be30f4597324326b8cf70d1e3ce75b1ee5c1712099ced498fb1267274032f20c85dddac0d4033dc98dfc34f435ff
+DIST cups-filters-1.17.9.tar.xz 1454068 SHA256 98ae3f8c8309ea950144e582d252e65f4636e8812832a982edd0ab83eddef544 SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4 WHIRLPOOL 0b838e546bc505353a7e6294b536ddd3a68b767fa63495f289faa96f9196b2b345a75e611cf082d3c45976658be8eaad60ea5a11d57f7bff9f826b6f3a1835d7
+DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
+EBUILD cups-filters-1.13.5.ebuild 3242 SHA256 abf3490575abae9dbe41956f3bb2bfd72596da62c1886e431a3eeeaf1074ce8e SHA512 de7a27e2c5789f7ee700beea4203bc739b00484d9c50b52b18420b2e0b460f648f4b38d66ea58f61458c3bc0e412fb1cce0b865f2bcdc64d29083d2569179000 WHIRLPOOL d712e5216cb859e4b6f432cf9a23ab9b1995ec568b54a97d02eaa19d8d8a495c37d5c1f7bb03fe662e24e7b20bf10d8f2bf296e3f885e07b1dc231b8e411a712
+EBUILD cups-filters-1.16.4.ebuild 3403 SHA256 0e11e6767f9ad28945e55142e4c359d0c979a832fa747abd674873281a535aa9 SHA512 c59a89afb33357b7cff83573d53ad9af0808a6ee29c725943e424148b3dcc826e7bc33afd503de90cdc181cd603e2e3b6fcd83b9182fe65433d0026183b5b868 WHIRLPOOL 251ecd2adec7f7736315d6b6ea31b1f886c3b7671d45e87359f5113d9b79ee8b44d227b5ec04c1f27e263882a4de4120f628d684238a805b675c70037c9cb4f6
+EBUILD cups-filters-1.17.8.ebuild 3469 SHA256 6372d07d70d24ed6951c3b37d14938fc4ff3cba3c55ab876ee62acc5ebb799b8 SHA512 69706fcdb1fd4d1949c87d743fab6f3584adce6efb284c89befc680f4a252823075cc931771658a043cc9dec45bf0dac5c35c3023cb8e443ee46ab4f0f5d642a WHIRLPOOL fc92aa6c3c4fe04f716163b15d22be208f7033da4590ce1e483eec451435c81efd3b9588a75a9dbda55ecbd4a1d5f9b105f83003ae62fb81802a2cc892363f55
+EBUILD cups-filters-1.17.9.ebuild 3469 SHA256 6372d07d70d24ed6951c3b37d14938fc4ff3cba3c55ab876ee62acc5ebb799b8 SHA512 69706fcdb1fd4d1949c87d743fab6f3584adce6efb284c89befc680f4a252823075cc931771658a043cc9dec45bf0dac5c35c3023cb8e443ee46ab4f0f5d642a WHIRLPOOL fc92aa6c3c4fe04f716163b15d22be208f7033da4590ce1e483eec451435c81efd3b9588a75a9dbda55ecbd4a1d5f9b105f83003ae62fb81802a2cc892363f55
+EBUILD cups-filters-1.5.0.ebuild 3150 SHA256 cb9c6930e39194e05f1a4b1a811b8be97772608c47ce141cff2f0233f7bc0050 SHA512 88b84a8aa467ef91686826387a7fd0d6a73d87cec3665e69825e47ebc35c8ddaae8b83b831cb0d4aaf368cb0b792954f27f52080b51b66c999e6f8e10877554a WHIRLPOOL 4bcbf3945b0b93730151d0c19f5019353c4090290c61c08dfc02ecfd9c3f0dc694c98499e3d867d9574e1b9b7c0ba07867827995de60ce23d6ba65266bc7a4d3
+EBUILD cups-filters-9999.ebuild 3469 SHA256 6372d07d70d24ed6951c3b37d14938fc4ff3cba3c55ab876ee62acc5ebb799b8 SHA512 69706fcdb1fd4d1949c87d743fab6f3584adce6efb284c89befc680f4a252823075cc931771658a043cc9dec45bf0dac5c35c3023cb8e443ee46ab4f0f5d642a WHIRLPOOL fc92aa6c3c4fe04f716163b15d22be208f7033da4590ce1e483eec451435c81efd3b9588a75a9dbda55ecbd4a1d5f9b105f83003ae62fb81802a2cc892363f55
+MISC ChangeLog 17385 SHA256 89aab436e84eea0653c8019f361cb5602a08800152be701d3b95e52b8a975260 SHA512 a92cd465002f2ebdd1d6b5ba00e4947c906b9452a6e8d2c90f790efc9c9f0727ad6779fce58a17a4e0f1f6af6245179c787797e2bd7df8f64a5f24384056b1ea WHIRLPOOL ceabb770a38720cfb1ad9f0f3bdefb2480ee6ff12d175249e30a6a5ec8334d08cb4e50bd9e0f4d58224f1fc4a6bdf5946cd12732207c2abc8f8ecc7217a86c8b
+MISC ChangeLog-2015 25680 SHA256 ade983aaedc1060187d9a69877b25e11cbff71a3a6d192c222f6cb02e466ad6b SHA512 b6a6cabc8476b5621c4dbb49c8d955d790c2a6492f15792630c7569ae4416cc9559e1b74124057d1a8db52095f9f68f72f0e339416187e0a6834f19164dcf66e WHIRLPOOL 2ce7bf2f30c94b71233e7c4fe90bd829b87642ab69f64b322083ab9e90c87e17ebbdf60bf27b2bc6006a4deec77970df59de5cef8cb47623d2cb5201cbdcb843
+MISC metadata.xml 560 SHA256 156e40d222778e331bd31b6897df3d11d57209fe347d184a582489e79a5c4a80 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a WHIRLPOOL 85941959ba69bb5853575b3291c88a41fbce13e03f9061ba62188620c2dbd30b6d9652f4d1c7903e8a0b2255d5b30cef604c0e972f8430ae850d53b8bf822caa
diff --git a/net-print/cups-filters/cups-filters-1.13.5.ebuild b/net-print/cups-filters/cups-filters-1.13.5.ebuild
new file mode 100644
index 000000000000..4d22acc134fe
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.13.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit eutils perl-module systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr autotools
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap pdf perl png +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--localstatedir="${EPREFIX}"/var \
+		--with-cups-rundir="${EPREFIX}"/run/cups \
+		$(use_enable dbus) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable static-libs static) \
+		$(use_enable foomatic) \
+		$(use_enable ldap) \
+		$(use_enable pdf mutool) \
+		$(use_enable postscript ghostscript) \
+		$(use_enable postscript ijs) \
+		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--with-rcdir=no \
+		--with-browseremoteprotocols=DNSSD,CUPS \
+		--without-php
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	prune_libtool_files --all
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-1.16.4.ebuild b/net-print/cups-filters/cups-filters-1.16.4.ebuild
new file mode 100644
index 000000000000..ee5a1df3de03
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.16.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr autotools
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pdf perl png +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable postscript ijs)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-1.17.8.ebuild b/net-print/cups-filters/cups-filters-1.17.8.ebuild
new file mode 100644
index 000000000000..76eabdc0a623
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.17.8.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr autotools
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pclm? ( >=app-text/qpdf-7.0_beta1 )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable postscript ijs)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
new file mode 100644
index 000000000000..76eabdc0a623
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.17.9.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr autotools
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pclm? ( >=app-text/qpdf-7.0_beta1 )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable postscript ijs)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-1.5.0.ebuild b/net-print/cups-filters/cups-filters-1.5.0.ebuild
new file mode 100644
index 000000000000..030ee6211254
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.5.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit eutils perl-module systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap perl png static-libs tiff zeroconf"
+
+RDEPEND="
+	>=app-text/ghostscript-gpl-9.09
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable dbus) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable static-libs static) \
+		$(use_enable ldap) \
+		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--with-rcdir=no \
+		--with-browseremoteprotocols=DNSSD,CUPS \
+		--without-php
+}
+
+src_compile() {
+	MAKEOPTS=-j1 default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
+	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
+
+	prune_libtool_files --all
+
+	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	if ! use foomatic ; then
+		# this needs an upstream solution / configure switch
+		rm -v "${ED}/usr/bin/foomatic-rip" || die
+		rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
+		rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
new file mode 100644
index 000000000000..76eabdc0a623
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr autotools
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pclm? ( >=app-text/qpdf-7.0_beta1 )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable postscript ijs)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/cups-filters/files/cups-browsed.init.d b/net-print/cups-filters/files/cups-browsed.init.d
new file mode 100644
index 000000000000..6f5b30a2ac61
--- /dev/null
+++ b/net-print/cups-filters/files/cups-browsed.init.d
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+
+PIDFILE=/var/run/cups-browsed.pid
+
+depend() {
+	need cupsd avahi-daemon
+}
+
+start() {
+	ebegin "Starting cups-browsed"
+	start-stop-daemon --start --make-pidfile --pidfile "${PIDFILE}" \
+		--background --quiet --exec /usr/sbin/cups-browsed
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cups-browsed"
+	start-stop-daemon --stop --pidfile "${PIDFILE}" --quiet --exec /usr/sbin/cupsd
+	eend $?
+}
diff --git a/net-print/cups-filters/files/cups-browsed.init.d-r1 b/net-print/cups-filters/files/cups-browsed.init.d-r1
new file mode 100644
index 000000000000..dddfe7bfb003
--- /dev/null
+++ b/net-print/cups-filters/files/cups-browsed.init.d-r1
@@ -0,0 +1,9 @@
+#!/sbin/openrc-run
+
+pidfile="/var/run/cups-browsed.pid"
+command="/usr/sbin/cups-browsed"
+command_background="true"
+
+depend() {
+	need cupsd avahi-daemon
+}
diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
new file mode 100644
index 000000000000..8c940c947b64
--- /dev/null
+++ b/net-print/cups-filters/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+  <email>printing@gentoo.org</email>
+  <name>Gentoo Printing Project</name>
+  </maintainer>
+  <use>
+  <flag name="foomatic">
+     Build the included foomatic-rip printer driver. Strongly recommended.
+  </flag>
+  <flag name="ipp_autosetup">
+     Let cups-browsed automatically set up IPP network printers by default.
+  </flag>
+  <flag name="pclm">
+     Enable PCLm support
+  </flag>
+  </use>
+</pkgmetadata>
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
new file mode 100644
index 000000000000..87bee18839bb
--- /dev/null
+++ b/net-print/cups-pdf/Manifest
@@ -0,0 +1,9 @@
+DIST cups-pdf_2.6.1.tar.gz 33315 SHA256 04e17eb563dceea048e1a435edcbcf52faa5288f85e8390cd64d702edb6745f1 SHA512 60702159907f95e005c93a38551b5aaa65b7e4b8e009b48becf4523d606c4bbb127e81e5acf8519ce4c9aed90b41deb01d80171f3145086351dbd022863a3816 WHIRLPOOL dec796386df1b13c6fa8cfaed71cf9442a0aa8fc8ba739f8aa8ac3f2fc1e0ec3a1cbd205835f6f10314b805b0744641f3788458863df63104373bbf11e64e886
+DIST cups-pdf_3.0.0.tar.gz 29654 SHA256 a0b94d09ccf92761a83e1af13fcdbfba737d7fcbbe2774ec24297ddbbf13aebe SHA512 14420e50b9ac93d12e75b98ba8c3456d35a3bcce0778eee8308ac7a3c3a987b4dca5a4f140353bd2060a5f0f4d3434c442b00ea309660b4e5a72fe11dba25276 WHIRLPOOL f95b21be0db15e2aa6af8d769a5d8efcf4447c3b69a2e7128f6ba51ce6e8c575aec78c69ef97ad8b6e7cc69c6a10635acf52b81ba0e415b553e99bef5675864e
+DIST cups-pdf_3.0.1.tar.gz 29754 SHA256 738669edff7f1469fe5e411202d87f93ba25b45f332a623fb607d49c59aa9531 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818 WHIRLPOOL e84ab73c79dffc84f88c9285ad8672cb745f6b1cbb1ca5c72566af259026393649776093229a7588b4d071248d8fc1401c7cfbaf3e26fd96d8aa50b7aed40c4e
+EBUILD cups-pdf-2.6.1.ebuild 1069 SHA256 4bcfb16f59835428ded208ec5fc668600ffc4ea753d5d3a94c2f9d5882591678 SHA512 12c9104f1acc59336a4ed7812bcdf6e2e143263c0227b10e1caa30ba23edab60e822b16ab58323887cea03e9445edd8a5890a50374abf4cabde0efc211c7b89b WHIRLPOOL 9a6998c0561db70a7eac8668c5bde6899e6b7803653fd3db163105f1e312587626829a891f4c2af67c35a03c1174ab8e868c9901ddf8557c78d89aac5f59b081
+EBUILD cups-pdf-3.0.0.ebuild 891 SHA256 f32e5fdbf824df5033a865e8b132957f36f5efb932344e9ca9149db4dd732613 SHA512 c3183d601b6c0e447a21bef891e200088e323fd5f688a7b9ff131a7e65fd7d7cd229033e86ed845bfda2c7f85385e272300b8e5c9e4a7352501250589925e0fd WHIRLPOOL 71c263c736505fb34acf94f533adc3d7f38ca836ad899a0fadcaeee5845f881f60d02cea7c459d2943de5a53ac65b193ed2e59e8778f863264517937e629f1d9
+EBUILD cups-pdf-3.0.1.ebuild 891 SHA256 f32e5fdbf824df5033a865e8b132957f36f5efb932344e9ca9149db4dd732613 SHA512 c3183d601b6c0e447a21bef891e200088e323fd5f688a7b9ff131a7e65fd7d7cd229033e86ed845bfda2c7f85385e272300b8e5c9e4a7352501250589925e0fd WHIRLPOOL 71c263c736505fb34acf94f533adc3d7f38ca836ad899a0fadcaeee5845f881f60d02cea7c459d2943de5a53ac65b193ed2e59e8778f863264517937e629f1d9
+MISC ChangeLog 2493 SHA256 75293a27e065f81520631cdabeb9923534a541f5997cc7912908161c0083517d SHA512 9c035354b40f37d55db3b089e44b504f2f3f690dccb06f3a03b582291d9ebea8ba6a1ff64f7f3c4c016f62299257c64b91f641d098c93ae249b2382f2fd9895c WHIRLPOOL 70ee2b0266560490b0a9f40d63a1311f5da3189c1a3425e324150b2a45aefac2cb4f7eed2343f069158c8e625d55306e0fb893100b8ac7c912ba4db75a8075ac
+MISC ChangeLog-2015 7692 SHA256 f7eb337751e9083defd1338431aab412aa00d6e119df094da384be6e874d6c57 SHA512 fb401ee4cc80f18a275b758984e390c295ec14ac742fe52597aed00a85d2490a1dfd59e2cdf78faee42b7f4917c48d1edcfd5636b1d6d8caec10a33e2d26edb9 WHIRLPOOL 3b9e8a0cf1c1805830ec95c9af288082eedde53a92db80b8de70d53a4e8f90cc8c0af5a880301ed0f8124cc3b8953b8ce15774aae963c08f01969c00ac0ac3e0
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
diff --git a/net-print/cups-pdf/cups-pdf-2.6.1.ebuild b/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
new file mode 100644
index 000000000000..edd5a5eba833
--- /dev/null
+++ b/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
+HOMEPAGE="http://www.cups-pdf.de/"
+SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="net-print/cups
+	app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	cd "${S}"/src
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "Compilation failed."
+}
+
+src_install () {
+	exeinto /usr/libexec/cups/backend
+	exeopts -m0700
+	doexe src/cups-pdf
+
+	insinto /usr/share/cups/model
+	doins extra/CUPS-PDF.ppd
+
+	insinto /etc/cups
+	doins extra/cups-pdf.conf
+
+	dodoc ChangeLog README
+	newdoc contrib/Contents contrib_Contents
+}
+
+pkg_postinst () {
+	elog "Please view both the README and contrib_Contents files"
+	elog "as you may want to adjust some settings and/or use"
+	elog "contributed software. In the latter case you may need"
+	elog "to extract some files from the ${P} distfile."
+}
diff --git a/net-print/cups-pdf/cups-pdf-3.0.0.ebuild b/net-print/cups-pdf/cups-pdf-3.0.0.ebuild
new file mode 100644
index 000000000000..4bc7323b0012
--- /dev/null
+++ b/net-print/cups-pdf/cups-pdf-3.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
+HOMEPAGE="http://www.cups-pdf.de/"
+SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+ppds"
+
+RDEPEND="
+	net-print/cups
+	app-text/ghostscript-gpl
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-${PV/_}
+
+src_compile() {
+	pushd src >/dev/null
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
+	popd >/dev/null
+}
+
+src_install() {
+	exeinto /usr/libexec/cups/backend
+	exeopts -m0700
+	doexe src/cups-pdf
+
+	insinto /etc/cups
+	doins extra/cups-pdf.conf
+
+	insinto /usr/share/cups/model
+	if use ppds; then
+		doins extra/CUPS-PDF_opt.ppd
+	else
+		doins extra/CUPS-PDF_noopt.ppd
+	fi
+
+	dodoc ChangeLog README
+}
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
new file mode 100644
index 000000000000..4bc7323b0012
--- /dev/null
+++ b/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
+HOMEPAGE="http://www.cups-pdf.de/"
+SRC_URI="http://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="+ppds"
+
+RDEPEND="
+	net-print/cups
+	app-text/ghostscript-gpl
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-${PV/_}
+
+src_compile() {
+	pushd src >/dev/null
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
+	popd >/dev/null
+}
+
+src_install() {
+	exeinto /usr/libexec/cups/backend
+	exeopts -m0700
+	doexe src/cups-pdf
+
+	insinto /etc/cups
+	doins extra/cups-pdf.conf
+
+	insinto /usr/share/cups/model
+	if use ppds; then
+		doins extra/CUPS-PDF_opt.ppd
+	else
+		doins extra/CUPS-PDF_noopt.ppd
+	fi
+
+	dodoc ChangeLog README
+}
diff --git a/net-print/cups-pdf/metadata.xml b/net-print/cups-pdf/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/net-print/cups-pdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest
new file mode 100644
index 000000000000..0924e4abca14
--- /dev/null
+++ b/net-print/cups-pk-helper/Manifest
@@ -0,0 +1,7 @@
+DIST cups-pk-helper-0.2.5.tar.xz 152620 SHA256 19221eed65a1e1498d396f3f99a783a95b21b4385e63b57a1f16e8728b8ca118 SHA512 9fc0af517755482dc3787ce87df389adee41b826c4ccca25df69474812523fa265c3dcf31fbc1a75c1b680b9b6490a9c358ac30aed7570fa98f5287f02a2be40 WHIRLPOOL b97000a948cdd82c46e83ab1e2be936068fc2eb28af13f672495c5827fe7ac7ddc4c5ac8df5fe146686aec386f513a2e36609727077254911a12162818003932
+DIST cups-pk-helper-0.2.6.tar.xz 162368 SHA256 959af8f2f5a2761e7e498b61c9caf25ae963335031eae9972d999e9a0d97a228 SHA512 33f1b6f58f4772148bd1cfb8163dacaffd3cc62f2d03731710c98b765ebb8b87541cb9cf43e886880134c32db91a43c7142b1556a0abdf1449068031b0d5fbd3 WHIRLPOOL eb1abb48ab5fb222a6f72ec049d44cc3fb8a8a32c2c1acbbc9a3d6cc5f2361634fa9825fd56b41db15cff7a102df5ff4b519e4fd463f244c5cf7c9b33eb7750a
+EBUILD cups-pk-helper-0.2.5.ebuild 1003 SHA256 2c7fd1735dd40769fc4f182025bbd85af4bfed8b52a4e725a4d7a2e09b17ab0c SHA512 ea16c7bc6c2759c4d63fc5842506dbcee879e796d5b3b488234ae8546531850ba9c5d23fbfa57ab28a531bca29a8cee5a57004f75a07bde5576fa9966d6fc4e4 WHIRLPOOL 73af4096d60f8f72f45179d30979ee93a9b61650c7d693d33da304b2e15b113775aa943382f49d5f1818534c523b53bfecbfc6f09c347c9460e9f61ec4bcfd4a
+EBUILD cups-pk-helper-0.2.6.ebuild 1010 SHA256 56ee2cbec628f555cb542ad30ca0aa5726954c487c1ad54a186ca8c007ca8fdd SHA512 ffaae80df552d328a648328ab8df57627e477d511d5368aab44a5f03cdbf10d1761acf8b1307c0a8b97db1c44e49671132f28a1eac5e3da88a62729c656633ba WHIRLPOOL 2a286d6fa9f2b3ee8e26bbe8d4802f44a07d7094cf9182ec3fb564b4a0926a364d56d8a9202111f07f266ce015fde1090ca54f8a3870e72acf16b32885adec36
+MISC ChangeLog 4070 SHA256 4b247224cda574a22818876897fa2f901ade7845c2f638f18f11607682cb0d4e SHA512 1bfb7bc1cabd6f2654dcf39c77db2fab9c0dc1c1dc7510d5ec9e1c742340e14b3329a09ed3f288d2b1bb3fe4c9a14d1e48817f3026dc8ea97aa0c4e262b71a48 WHIRLPOOL 26e3f79891fea98b3596dba44cd8ea05fd629c71c536c9c1511efd3d3b4000183f1adf34b46264400eb2648dc138ddc913ea5336042eeec297baa524ff173cda
+MISC ChangeLog-2015 4518 SHA256 6258742377e2bb437bf5429593e5e5d08ed83ad7d200eba70dc7c1bc8254c05e SHA512 784191f7252ae98ccedd340ff8af44b1b8f13901888975fbd462a661c4cf0acdfc3d350447cd21fe626ad8980028f5b58360cbd11b0fe12f093878e7b33e5414 WHIRLPOOL 7ee244130e573ecf7c6499a15be94e74e533d0fefadd59f8525d9bbb17284ea66a1d43a505e844b49c84731ed9e76350af3e2b0176f896b81d13d735bf3d46e9
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild
new file mode 100644
index 000000000000..9122aabc2190
--- /dev/null
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/cups-pk-helper"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30.0:2
+	net-print/cups
+	>=sys-auth/polkit-0.97
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/dbus
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	DOCS="AUTHORS HACKING NEWS README"
+
+	# Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
+	rm -v src/cph-iface-mechanism.{c,h} || die
+
+	gnome2_src_prepare
+}
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
new file mode 100644
index 000000000000..7cb5d901f866
--- /dev/null
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="PolicyKit helper to configure cups with fine-grained privileges"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/cups-pk-helper"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30.0:2
+	net-print/cups
+	>=sys-auth/polkit-0.97
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/dbus
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	DOCS="AUTHORS HACKING NEWS README"
+
+	# Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
+	rm -v src/cph-iface-mechanism.{c,h} || die
+
+	gnome2_src_prepare
+}
diff --git a/net-print/cups-pk-helper/metadata.xml b/net-print/cups-pk-helper/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-print/cups-pk-helper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-print/cups-windows/Manifest b/net-print/cups-windows/Manifest
new file mode 100644
index 000000000000..e80df7419cf1
--- /dev/null
+++ b/net-print/cups-windows/Manifest
@@ -0,0 +1,5 @@
+DIST cups-windows-6.0-source.tar.bz2 38284 SHA256 ce40c91357f121d16e468b99c134b404855bc77a34ee410588b8958777c28956 SHA512 03bd66d210ee191d25139d9e462543a01d30e8a0dc797a9ee62673e84cfa9d057cc6d327792c74941a17e5021a7ffe52c40bcb52a3f3f4186f59f04796c809df WHIRLPOOL 36d30f128a014307cefc4c992c94d1615acefd505894e404d6a3263c1f43c6fcc238e982ef09f3dbb130b84349d0652dbfdcb7c7e31d708d104d2717d331cad7
+EBUILD cups-windows-6.0-r1.ebuild 583 SHA256 4d7d06f3ccfb43d71ab619aa07dfa90ebffaf3c7a6b44005d50af28d012f3950 SHA512 292eae1c39066a39906e1ca79f93a7870eb6f6425533673dea468ca73888af9b7397a8a343755ad4267b7b7697b784f52c9b60b0445c844693d46e3904884a03 WHIRLPOOL 8dd6205ee97346ca860e957b975800b0067a92af34f904cd601d7518641ae1961ecbc2a5d263eaf7b37ec62d1404707df1f19ed8bc10ceec1e01af1dcec302c9
+MISC ChangeLog 2445 SHA256 a357f72907aa8472862beaac2b45929a0b28f92201f4d559199bb7e79c7262ed SHA512 d2d34ef280647538a438c26e5b7342094ed0d728ddab9ea6bf250f09389b61b070f4085ce2e12d2482e294202f8bd486cfb3dfe221fd14475b4635f2672cf74c WHIRLPOOL bb4fbe531ec699e0fc1d95fb3529021012c4e7c913a3c2e2d6546eeb07b02e5d0d78d4cef5471daf04d3a535f0347ec65814ae43e6a112632bf6af5a27b3c368
+MISC ChangeLog-2015 2068 SHA256 3797068dc155e597e436fc8f91fbe760618335b3a36927ad19f5edeca746a0af SHA512 cc08ac73c190c5d5730da608de21a141ef430440715d5c181bab0e5f4f709a63d0e501b2b28bafec2b275bb7b8c2622a42ffcc58530b64da704167bca4a1f389 WHIRLPOOL c60c5aa530edd4aa44b19b3ca5c4b66b5c5eeefddc85ab53f15da8f1b559de4f00bf5308f65152c491998ad0f41c70a0d51f7fe1ebe88e2582f1e48375598f7a
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
diff --git a/net-print/cups-windows/cups-windows-6.0-r1.ebuild b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
new file mode 100644
index 000000000000..abb0f1bf4758
--- /dev/null
+++ b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="CUPS PostScript Driver for Windows"
+HOMEPAGE="https://www.cups.org/"
+SRC_URI="mirror://gentoo/${P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=net-print/cups-1.2"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake install BUILDROOT="${D}"
+	dodoc README.txt
+	einfo "Copying missing cups6.ppd file"
+	cp "${S}/i386/cups6.ppd" "${ED}/usr/share/cups/drivers/"
+}
diff --git a/net-print/cups-windows/metadata.xml b/net-print/cups-windows/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/net-print/cups-windows/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
new file mode 100644
index 000000000000..896274c3e137
--- /dev/null
+++ b/net-print/cups/Manifest
@@ -0,0 +1,21 @@
+AUX cups-1.4.4-nostrip.patch 487 SHA256 b96448896f08c5f91d5afb0c093f2638a262d1c45e716c29d5164cefee18bc61 SHA512 10f46e841aa5646f40564e92b6c5b90a5d27702ea8a4dd8652cfd39834be54feec20a2c8d4fea663b90685865deae17851e57161aad7ff250916ce4accbb01fa WHIRLPOOL d55a6bf19e55e3cdb04510eb55b67c011ccdb8b3b73d8787b2da15a584f3e91437c0dc4b53bb62aac2b67c9985c18dddac85e06ca866722fa246a952eda16c0b
+AUX cups-1.6.0-dont-compress-manpages.patch 300 SHA256 613f2c94b6ab1e4d93fe81d8fc6e06b852bf4f82044121c33e76c33af0691737 SHA512 f61189be61f2be4963f3feeafe281fcf69ccf968cfddf262b30636e5a09584feadecbdf187bb9206c0cd7b5945053f602a9d715ec4d1a1b766323085407f58a6 WHIRLPOOL 28abb37bff6ef3f48b4591d2bad1b7514631e500d23ae871d06b8dd80a27fa790e8b3e193721205574bd2c60cddb6db6b03288a57b81ef7e3ca6e58d628a29f4
+AUX cups-1.6.0-fix-install-perms.patch 833 SHA256 3a2198f126eb4707ea0c594a3632ccbd287e072290b71e7dd06c3ec6fa909644 SHA512 b8ffec939651ef2114bb8cf53aad82262ada883cee90efa84f2f8fe73de6b0d3ea0997991e1d002b8c707f2b159cc52d9039282aa0894d73bd8122493c72683c WHIRLPOOL 8663726ddbfc0b81179f0f5fa13378c3f00c7ed9c72f61591ba9e84272adabdd310f2723bdf1ea240502f2bb4f829c115585cb1211f1964e1703f69ecdcc2a08
+AUX cups-2.0.1-xinetd-installation-fix.patch 332 SHA256 f533f03cac8f40bd0a1ca9eb91307781e7ae80be24fd1a48ead8133729c1b842 SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836 WHIRLPOOL 1b4360e7aab326f0992d69941b69f604297eaafa3eb284b498c08bafdc5e72d107988f48986e7fe09d568a69726147cbc1baee99caefbbc1fbc3054453be63ef
+AUX cups-2.0.2-rename-systemd-service-files.patch 2092 SHA256 f6ef6f3fcbf96d383e7207130393660630a3c159b19d2c6a5437106e52bee1d6 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb WHIRLPOOL 388300e7e95fee7e6b1ed49885ae13ef79ad743b335d60f44e2745c75d4b203ac84401a9bda1a5e5a6a67c2a599243d8f2a9fd714a58ab76b74ca97041ca9a62
+AUX cups-2.0.3-cross-compile.patch 773 SHA256 5d9b8d5b79c5c34e9a992cf530a6f03f78f262ef3685fcac984029ba08a11a9c SHA512 0a99089f5f6dd231c34a017cfba91182717926943c2865ab0857b2c1aec2efac4e6fc1b9eee9cd1a1f6a99b810f272e8e69bc6fe2275f3d7ff001be3a3bf8ccc WHIRLPOOL d51a871229d9a3746989622b88dfeb009701efca3c94f855b7fae8f39049c8861678f9ddd1a273ef38b90da5c427856917a6303948c6a3ec2092ab9810b08515
+AUX cups-2.1.2-systemd-socket.patch 1542 SHA256 d24e13eee72917882ed4143989046f143f720e0fe10d01b6dee08ef36834a3aa SHA512 56759eafbac1e9947bcc445c850acd0c176687ae6360bc925bbb62153d4a049143d1d41efb3fcc78bbdeba18b0f11ef9a0c5452ec20fae7ef689518781cac48e WHIRLPOOL 8d6e20d02cef902fd8e9491ee51256e02f3b17dd10c96fde6fdb20c798c1d33ed6544d2a180318c73455353f1b013fa997f2b08d2a1f1acb80a50c0945053fa6
+AUX cups-2.2.0-dont-compress-manpages.patch 319 SHA256 f0a2d485d97734c3a7d17483d366cd8f03619d7ceb7ebac1baf2e8c8221d9246 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5 WHIRLPOOL 9897c0fc34ed29937129db10c431704d99ce95d5d452bc6cb9fc5f7570eaa41c2fe9351e52f26872a26ab4bd25e025f42aee7ca3898b171e9d158d11839c485a
+AUX cups-2.2.4-fix-install-perms.patch 646 SHA256 c070e555cda7bb2745a48e55bc652b9ebed0053862c69a026f2a62fb62a3afb8 SHA512 8ead1792208d0190aff22ec1c648e215ab456435c3ecb135b0318585789009cb27b67de939164637f58563fbed809c25ba1a39e39232e17e9470133ead387a5d WHIRLPOOL 24921f7951aa48c73eda8ed9f790976a3470c9e570e47935d310f68eb2f0ffedfcf43bafbd36185225129f195e33c95fe5a61bc28ae4cb27734a6ca52db1b622
+AUX cupsd.init.d-r2 432 SHA256 54b86ec2d7086004cde4e8b69aa49b7334718cad42a4426382f56269bb0f5a78 SHA512 d14973383158dd78e4970dce3037b73e812788f9e61ad9348b580cc8891e7ad6c2214709cac4a43829f7010720a755855c8357d1ada11d048deccf59aa4e83d5 WHIRLPOOL 42b5e0107d1d2fe8399a2ebe8a7d559d56d8c96bca63a587e8a79fc6b04096d072f2dedbc9ae3551fa0238ac169de178f63ea32436790a84354e308baf566a80
+AUX cupsd.init.d-r3 584 SHA256 06ccf2b8166cbe0046da899e4800ceb879d97d10544c40788d1117d0c1e2591a SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3 WHIRLPOOL 50020193e046da70f9236bbe3d6ca68acb27d337eaf7d5804156492c7d46885ebe8a873ea32770abbf063f8d1ccf8ef87407e6f39d14b53d1f8c1fa9385a61fd
+DIST cups-2.1.4.tar.gz 9572653 SHA256 1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301 SHA512 5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae WHIRLPOOL 217b9024c34369c8839b0a1b2b3924eb00e9b8d87cfd8d50a59ad0c33c1044f53d479246d67dff4598049efd15259def90e4bcddc6c3c20dff38811e159d2c4b
+DIST cups-2.2.3.tar.gz 9496214 SHA256 7aa7e8d581f0eb204f75203082403bfa931f8c058bffae71b210800102e5feb5 SHA512 95d8f18fad5b3fd25fe88cc29d159723dcfa735248503d0285949fcd7451f0ccac286719077d0f8a8eda7ee9a053a3d30fa3fd28cb74b59336b6718552d9d2e8 WHIRLPOOL 3aa43f1b83ee62939939bd148c2ab13985143746f7acc3d9c82283e1b096524c7738ae5e1670e717c9329f8d3e917cfcc1c8a7e33af93baa74ea83837d92b5f9
+DIST cups-2.2.4.tar.gz 9984903 SHA256 339fb0c0a70a1edf1ef169f2afb21bab92cdd3074adf630352c427b795f20fa7 SHA512 765fe49d1a7a491d7d5db051f73d039d183d0f7a560e9fd89f6732b8a699d3246080e1aaed4ddfed3a9fbdb876b09aa22939d6ee5da2280b1246e4ba933c55f0 WHIRLPOOL 86557f6244b7aa7b19cc67caff7c845291d09699353bd337090111f92b6afb6b9e175ca68df8a15d8915a5a15fd72348805e4ecb7da532a994f46b2c2d4cdada
+EBUILD cups-2.1.4.ebuild 10392 SHA256 e864a9be631312db0bca0bd340affd29e8e23b7065f37e8fa18de142ee4b48f4 SHA512 bbf47ec4c8392a862ca8f559b6a80fb77f9b9997b8a42aabfd99d1b26b5dac53cc05518617af5313e172a4acd9d5a63e88aaf13836217ecbdaf2756c4897ae61 WHIRLPOOL e4bf4f9bb210ea40ee845d90d02d608e2a5eee18c6a1128d507b528874c42b52f1a262d51863bbf6362989e24bdd63111d5ead886b239fca7a6e002c2c1e3214
+EBUILD cups-2.2.3.ebuild 10140 SHA256 a8be1b257bbb8ad58f9d066579b65bff077a83f3e2bf8501f9cf7814ca9e8fa3 SHA512 85cbee64c1d1e6a876849081eef72c89962314e144a98426d6c98907939b94663c67245db8b40986c2bf17e75c5ee1ae4c8cde763cd28b98a259769a80226adb WHIRLPOOL a979d4f33391b1cbdbcd2c7003585275a0aa92a4c2ab8230f1764fb9283ba8b15a22be4b45e1d658b782d3e6575cfd38d792b7391215b3557189c3643eb01156
+EBUILD cups-2.2.4.ebuild 10088 SHA256 0a5c480875fda7bab575107e8f6fbf9e3560bcb5a3d615338e316cb94f927868 SHA512 4f2f9685c9c509e05e802221eca3263fc18f4c5cab1685f3d001834e04ef1749323f82ac4ad574b45649f7dfad73e0b9e5608dbf6a2f6e058fea5f82e6ff6c32 WHIRLPOOL f20547ee711d6757d593c68868aef375350235514d9b83baca2ab8fd582d4712ede8243a39565b40f794d7143c12559b697b562399570af740206dac96ff6a29
+EBUILD cups-9999.ebuild 10090 SHA256 45415cc15505918653a04186465c71ebacfc68acfd35b28b9381a6c5917a7d82 SHA512 a664a8b880bc7713dc0b2e933941d009ddbffda099573737723be296097070f1ba3ed455e59c83546ece9038e4a3983b7b247f9fdf9fbcc5510d73deae962200 WHIRLPOOL ea2def95369d12ae6ebe66cb247e966f7df51781716c8c5a38459eb35343a1e7f68fb6bc9cf6db0d2ae990258e0580274ffe431a508d98cc88105295cdf22c26
+MISC ChangeLog 10454 SHA256 aac7bd2c8e875aec6f463a11fcf12c4e9565cf0c679ea68bb84d243eafc5eab8 SHA512 bd76be7dfe667b8e18c66bf6bd6c17326c781394690150eb5d89908b1058866d78b0662ada5be3bdfdca30e7654f4324b4e74a30469eb6fe82692f6ce8fad7f6 WHIRLPOOL 620bd44336602b2542c30b37ae0955562ffbeb8308d2d8b37c6bae5c4ab37cc35eac769050519d615766e50127a7b32acbf979fd145587a9cef05ad85aed4486
+MISC ChangeLog-2015 103648 SHA256 adcf00fa34197ba3b90d67437030427fc35ac3451d485d2e9c9fa8801243deaa SHA512 745e845ddf34c1a961b7e7571a7a5b3008a356eaf21ea1bd0dc8b5010b6ff271b937a78f3dae215070854d266aa57204679662b3c855bb62e396205bdfc03a7a WHIRLPOOL 8a35e77792b4faa2310ce4ed46a2e528488eb488485c68248b2f67d137d2e016da618fafb3697230df841ed51a18269ab5895fb74433425445dd6da001af62c8
+MISC metadata.xml 677 SHA256 30911b798a3853b5f838878037fd188d98e986183b11cbc6c93e54ae92976865 SHA512 f7ed769c4f662ea52ed9e24702b91948a376e7d5a59b305f6d89950d0ea40130e6d471cc0bee373a63338f590bce3b6df5a09e56a166ba7fdd960f82e7648717 WHIRLPOOL 927f62af1c4c4066398c9f66fbef08ce598382081ff0016b5ce3eb16d51f2b0c9390b9595e631ab6b7dab467b22bcadef1e67747fc7e512cc56694c9e66e7a1b
diff --git a/net-print/cups/cups-2.1.4.ebuild b/net-print/cups/cups-2.1.4.ebuild
new file mode 100644
index 000000000000..775f7c2fb644
--- /dev/null
+++ b/net-print/cups/cups-2.1.4.ebuild
@@ -0,0 +1,354 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib multilib-minimal pam python-single-r1 user versionator \
+	java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	SRC_URI="https://github.com/apple/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca cs de es fr it ja ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+	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}] )
+	java? ( >=virtual/jre-1.6:* )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-release-${MY_PV}"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.1.2-systemd-socket.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+	"${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_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
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				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 "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf=()
+
+	if tc-is-static-only; then
+		myconf+=(
+			--disable-shared
+		)
+	fi
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	econf \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
+		--with-rundir="${EPREFIX}"/run/cups \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-system-groups=lpadmin \
+		--with-xinetd=/etc/xinetd.d \
+		$(multilib_native_use_enable acl) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable debug debug-printfs) \
+		$(multilib_native_use_with java) \
+		$(use_enable kerberos gssapi) \
+		$(multilib_native_use_enable pam) \
+		$(multilib_native_use_with python python "${PYTHON}") \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable ssl gnutls) \
+		$(use_enable systemd) \
+		$(multilib_native_use_enable usb libusb) \
+		$(use_enable zeroconf avahi) \
+		--disable-dnssd \
+		--without-perl \
+		--without-php \
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
+		"${myconf[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	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
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+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}.txt
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r2 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	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 || die "fperms failed"
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	# not slotted - at most one value
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+	fi
+
+	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+		echo
+		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+		elog "You will have to find printers using zeroconf/avahi instead, enter"
+		elog "the location manually, or run cups-browsed from net-print/cups-filters"
+		elog "which re-adds that functionality as a separate daemon."
+		echo
+	fi
+
+	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+		ewarn
+		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+		ewarn
+	fi
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/cups-2.2.3.ebuild b/net-print/cups/cups-2.2.3.ebuild
new file mode 100644
index 000000000000..8afa9e83e60c
--- /dev/null
+++ b/net-print/cups/cups-2.2.3.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib multilib-minimal pam python-single-r1 user versionator \
+	java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca cs de es fr it ja ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+	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}] )
+	java? ( >=virtual/jre-1.6:* )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		>=net-libs/gnutls-2.12.23-r6:0=[${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[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+	"${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_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
+				#here we should warn user that he should enable it so he can print
+				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 "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf=()
+
+	if tc-is-static-only; then
+		myconf+=(
+			--disable-shared
+		)
+	fi
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	econf \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
+		--with-rundir="${EPREFIX}"/run/cups \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-system-groups=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) \
+		$(multilib_native_use_with java) \
+		$(use_enable kerberos gssapi) \
+		$(multilib_native_use_enable pam) \
+		$(multilib_native_use_with python python "${PYTHON}") \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable ssl gnutls) \
+		$(use_enable systemd) \
+		$(multilib_native_use_enable usb libusb) \
+		$(use_enable zeroconf avahi) \
+		--disable-dnssd \
+		--without-perl \
+		--without-php \
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
+		"${myconf[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	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 -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die
+	sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die
+	sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die
+	sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+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}.txt
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	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 || die "fperms failed"
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.2.2-r2 ${v}; then
+			echo
+			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"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/cups-2.2.4.ebuild b/net-print/cups/cups-2.2.4.ebuild
new file mode 100644
index 000000000000..1022bea6f56a
--- /dev/null
+++ b/net-print/cups/cups-2.2.4.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib multilib-minimal pam python-single-r1 user versionator \
+	java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca cs de es fr it ja ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+	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}] )
+	java? ( >=virtual/jre-1.6:* )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		>=net-libs/gnutls-2.12.23-r6:0=[${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[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_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
+				#here we should warn user that he should enable it so he can print
+				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 "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myeconfargs=()
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	myeconfargs+=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-languages="${LINGUAS}"
+		--with-system-groups=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)
+		$(multilib_native_use_with java)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(multilib_native_use_with python python "${PYTHON}")
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_enable zeroconf avahi)
+		--disable-dnssd
+		--without-perl
+		--without-php
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	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 -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die
+	sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die
+	sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die
+	sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+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 -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	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 || die "fperms failed"
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.2.2-r2 ${v}; then
+			echo
+			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"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
new file mode 100644
index 000000000000..f32e1a41dda6
--- /dev/null
+++ b/net-print/cups/cups-9999.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib multilib-minimal pam python-single-r1 user versionator \
+	java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+else
+	SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca cs de es fr it ja ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+	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}] )
+	java? ( >=virtual/jre-1.6:* )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		>=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_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
+				#here we should warn user that he should enable it so he can print
+				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 "${S}"/Makedefs.in || die "sed failed"
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf=()
+
+	if tc-is-static-only; then
+		myconf+=(
+			--disable-shared
+		)
+	fi
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	econf \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
+		--with-rundir="${EPREFIX}"/run/cups \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-system-groups=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) \
+		$(multilib_native_use_with java) \
+		$(use_enable kerberos gssapi) \
+		$(multilib_native_use_enable pam) \
+		$(multilib_native_use_with python python "${PYTHON}") \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable ssl gnutls) \
+		$(use_enable systemd) \
+		$(multilib_native_use_enable usb libusb) \
+		$(use_enable zeroconf avahi) \
+		--disable-dnssd \
+		--without-perl \
+		--without-php \
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
+		"${myconf[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	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 -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die
+	sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die
+	sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die
+	sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+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}.txt
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	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 || die "fperms failed"
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.2.2-r2 ${v}; then
+			echo
+			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"
+			echo
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		echo
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		echo
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch b/net-print/cups/files/cups-1.4.4-nostrip.patch
new file mode 100644
index 000000000000..cd2b07042cec
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.4-nostrip.patch
@@ -0,0 +1,14 @@
+# Source: Gentoo
+
+diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4
+--- cups-1.4.4/config-scripts/cups-compiler.m4	2009-05-17 02:13:47.000000000 +0200
++++ cups-1.4.4.new/config-scripts/cups-compiler.m4	2010-08-12 19:19:45.937020635 +0200
+@@ -30,7 +30,7 @@
+ if test x$enable_debug = xyes; then
+ 	OPTIM="-g"
+ else
+-	INSTALL_STRIP="-s"
++	INSTALL_STRIP=""
+ fi
+ 
+ dnl Debug printfs can slow things down, so provide a separate option for that
diff --git a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
new file mode 100644
index 000000000000..a388b4d5e021
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
@@ -0,0 +1,17 @@
+--- a/config-scripts/cups-manpages.m4
++++ b/config-scripts/cups-manpages.m4
+@@ -69,10 +69,10 @@
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
diff --git a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
new file mode 100644
index 000000000000..e71934b7d49f
--- /dev/null
+++ b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
@@ -0,0 +1,23 @@
+--- a/Makedefs.in
++++ b/Makedefs.in
+@@ -40,14 +40,14 @@
+ # Installation programs...
+ #
+ 
+-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++INSTALL_DATA	=	$(INSTALL) -c -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_MAN	=	$(INSTALL) -c -m 444
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
++INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
++INSTALL_MAN	=	$(INSTALL) -c -m 644
++INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
+ 
+ #
+ # Default user, group, and system groups for the scheduler...
diff --git a/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch b/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch
new file mode 100644
index 000000000000..2e8419e7675a
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch
@@ -0,0 +1,9 @@
+--- a/scheduler/Makefile
++++ a/scheduler/Makefile
+@@ -211,4 +211,5 @@
+-	elif test "x$(XINETD)" != x; then \
++	fi
++	if test "x$(XINETD)" != x; then \
+ 		echo Installing xinetd configuration file for cups-lpd...; \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+ 		$(INSTALL_DATA) cups-lpd.xinetd $(BUILDROOT)$(XINETD)/cups-lpd; \
diff --git a/net-print/cups/files/cups-2.0.2-rename-systemd-service-files.patch b/net-print/cups/files/cups-2.0.2-rename-systemd-service-files.patch
new file mode 100644
index 000000000000..16f677ba7a37
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.2-rename-systemd-service-files.patch
@@ -0,0 +1,46 @@
+From 33e0d4c8e450fe69b195422c0880aaa96ca9478d Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@kyomu.43-1.org>
+Date: Wed, 19 Nov 2014 18:00:06 +0100
+Subject: [PATCH] change systemd service files to gentoo naming scheme
+
+---
+ scheduler/Makefile                  | 10 +++++-----
+ scheduler/org.cups.cupsd.path.in    |  2 +-
+ scheduler/org.cups.cupsd.service.in |  2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/scheduler/Makefile b/scheduler/Makefile
+index 3e0884a..b354420 100644
+--- a/scheduler/Makefile
++++ b/scheduler/Makefile
+@@ -203,11 +203,11 @@ install-data:
+ 	if test "x$(SYSTEMD_DIR)" != x; then \
+ 		echo Installing systemd configuration files...; \
+ 		$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+-		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
+-		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
++		$(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
++		$(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
++		$(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
++		$(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
++		$(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \
+ 	elif test "x$(XINETD)" != x; then \
+ 		echo Installing xinetd configuration file for cups-lpd...; \
+ 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 0a27c76..7a04248 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -7,5 +7,5 @@ ExecStart=@sbindir@/cupsd -l
+ Type=simple
+ 
+ [Install]
+-Also=org.cups.cupsd.socket org.cups.cupsd.path
++Also=cups.socket cups.path
+ WantedBy=printer.target
+-- 
+2.0.4
+
diff --git a/net-print/cups/files/cups-2.0.3-cross-compile.patch b/net-print/cups/files/cups-2.0.3-cross-compile.patch
new file mode 100644
index 000000000000..d0893c31fa7b
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.3-cross-compile.patch
@@ -0,0 +1,30 @@
+we don't actually install the generated html output, so no point in building
+them.  this also helps cross-compiling because the tool to create the html
+uses $CC and has no logic for $BUILD_CC.  simpler to disable than fix.
+
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -73,7 +73,7 @@ MAN8	=	cupsaccept.$(MAN8EXT) \
+ # Make everything...
+ #
+ 
+-all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8) html
++all:	$(MAN1) $(MAN5) $(MAN7) $(MAN8)
+ 
+ 
+ #
+
+similarly, the genstrings tool is used to gather all the translatable strings
+in the code base for passing to gettext.  in our builds, those strings already
+exist, so no point in running this tool.
+
+--- a/ppdc/Makefile
++++ b/ppdc/Makefile
+@@ -70,7 +70,6 @@ EXECTARGETS =	\
+ TARGETS	=	\
+ 		$(LIBTARGETS) \
+ 		$(EXECTARGETS) \
+-		genstrings
+ 
+ 
+ #
diff --git a/net-print/cups/files/cups-2.1.2-systemd-socket.patch b/net-print/cups/files/cups-2.1.2-systemd-socket.patch
new file mode 100644
index 000000000000..2f88924ee2d5
--- /dev/null
+++ b/net-print/cups/files/cups-2.1.2-systemd-socket.patch
@@ -0,0 +1,51 @@
+diff --git a/scheduler/main.c b/scheduler/main.c
+index b1aa503..2f0f5fe 100644
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -656,8 +656,15 @@ main(int  argc,				/* I - Number of command-line args */
+ 
+ #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+   if (OnDemand)
++  {
+     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
+-  else
++# ifdef HAVE_SYSTEMD
++    sd_notifyf(0, "READY=1\n"
++               "STATUS=Scheduler is running...\n"
++               "MAINPID=%lu",
++               (unsigned long) getpid());
++# endif /* HAVE_SYSTEMD */
++  } else
+ #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+   if (fg)
+     cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 1bccc6f..4564164 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -2,7 +2,7 @@
+ Description=CUPS Scheduler
+ 
+ [Path]
+-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
++PathExistsGlob=@CUPS_REQUESTS@/d*
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 0a27c76..0a841a2 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
++After=network.target
+ 
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+-Type=simple
++Type=notify
+ 
+ [Install]
+ Also=org.cups.cupsd.socket org.cups.cupsd.path
diff --git a/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch b/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
new file mode 100644
index 000000000000..7b61b39f16ad
--- /dev/null
+++ b/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
@@ -0,0 +1,17 @@
+--- cups-2.2.0/config-scripts/cups-manpages.m4
++++ cups-2.2.0/config-scripts/cups-manpages.m4
+@@ -53,10 +53,10 @@
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and macOS
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
diff --git a/net-print/cups/files/cups-2.2.4-fix-install-perms.patch b/net-print/cups/files/cups-2.2.4-fix-install-perms.patch
new file mode 100644
index 000000000000..b9fda922d2c6
--- /dev/null
+++ b/net-print/cups/files/cups-2.2.4-fix-install-perms.patch
@@ -0,0 +1,18 @@
+--- cups-2.2.4/Makedefs.in
++++ cups-2.2.4/Makedefs.in
+@@ -39,12 +39,12 @@
+ #
+ 
+ INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+-INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
++INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
+ INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+-INSTALL_DATA	=	$(INSTALL) -c -m 444
++INSTALL_DATA	=	$(INSTALL) -c -m 644
+ INSTALL_DIR	=	$(INSTALL) -d
+ INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+-INSTALL_MAN	=	$(INSTALL) -c -m 444
++INSTALL_MAN	=	$(INSTALL) -c -m 644
+ INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ 
+ #
diff --git a/net-print/cups/files/cupsd.init.d-r2 b/net-print/cups/files/cupsd.init.d-r2
new file mode 100644
index 000000000000..f89263077593
--- /dev/null
+++ b/net-print/cups/files/cupsd.init.d-r2
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+
+description="The Common Unix Printing System daemon"
+command="/usr/sbin/cupsd"
+
+depend() {
+	use net
+	@neededservices@
+	before nfs
+	after logger
+}
+
+start_pre() {
+	checkpath -q -d -m 0775 -o root:lp /var/cache/cups
+	checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss
+	checkpath -q -d -m 0755 -o root:lp /run/cups
+	checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
+}
diff --git a/net-print/cups/files/cupsd.init.d-r3 b/net-print/cups/files/cupsd.init.d-r3
new file mode 100644
index 000000000000..2f563e4c7698
--- /dev/null
+++ b/net-print/cups/files/cupsd.init.d-r3
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+
+description="The Common Unix Printing System daemon"
+command="/usr/sbin/cupsd"
+command_args="-f -c /etc/cups/cupsd.conf -s /etc/cups/cups-files.conf"
+pidfile="/var/run/cupsd.pid"
+start_stop_daemon_args="-b -m --pidfile ${pidfile}"
+
+depend() {
+	use net
+	@neededservices@
+	before nfs
+	after logger
+}
+
+start_pre() {
+	checkpath -q -d -m 0775 -o root:lp /var/cache/cups
+	checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss
+	checkpath -q -d -m 0755 -o root:lp /run/cups
+	checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
+}
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
new file mode 100644
index 000000000000..50dcb809dbb0
--- /dev/null
+++ b/net-print/cups/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <use>
+    <flag name="lprng-compat">
+      Do not install lp... binaries so cups and lprng can coexist.
+    </flag>
+    <flag name="python">
+      Add support for the Python interpeter in the web server CGIs.
+    </flag>
+    <flag name="java">
+      Add support for the Java interpeter in the web server CGIs.
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">apple/cups</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-print/dymo-cups-drivers/Manifest b/net-print/dymo-cups-drivers/Manifest
new file mode 100644
index 000000000000..f1cbf4d55448
--- /dev/null
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -0,0 +1,7 @@
+AUX dymo-cups-drivers-1.2.0-cxxflags.patch 601 SHA256 e1f8add52a825f1db9cddf2da9430ab432d2bc238966f016815c7fc87118456a SHA512 b0cee2a0bb4664a797b921f6b9bc41b16417ec693683fab548c549bd2681f97627f3b6c3734efc3d15f1843cc08ed43d73f50012e73006dc900937b0e7fbf979 WHIRLPOOL f5775b7969fbe44426750b750f58e72a326306c0a75884f4942a64705cd7e8f030d632eab85dfacb8ae8429080928b9cfd5f44caad6f196a3c22b40b94ce4595
+AUX port_to_newer_cups_headers.patch 2222 SHA256 dcee192880998b7c3ed21c8631477903253c427e3378e9a7680bea4e52eb6de8 SHA512 55398c498e41a5ce106756f51bbd6dbfc4d7602eeb001e4d1bd104b91c8607ae36a1719eba2a2c9e1124493d5b743370b379b05b093b88cbf9346b8931bf976a WHIRLPOOL 56e6973f1ed42f30d3f0938ba8c0345b9ac389ddb37bd19cf11d0dca839724b184f6d1ee8d23be9702f94a8b8105007d524b2a3cc2a8e87dba4386770f71f6b3
+DIST dymo-cups-drivers-1.4.0.tar.gz 420068 SHA256 c60797e7e986ca329f46e9a6ab1cb6382383952b15685ed69fd91f3c7ed64f71 SHA512 e8c375fa0bc87fa96b18db6213e308a1f32050004c0c8c7d516b548f9d369162431f5f56ebcbb1231be60f5d7a946dcca184c6ff4302952bf3744ba42521cd5c WHIRLPOOL 6f05c6717bb51a5dbfa8e0ed1581745787f0e2f26d24b36ab7c566160947f5baf3bff5db4e4e7c365ca1b82d526fcd3af3ec4607ec6804a6883fa6a70c146c4b
+EBUILD dymo-cups-drivers-1.4.0.ebuild 834 SHA256 1f33dd783921b53be6e12cc0bc54fce89db8ac30d9b327c0f113d50b7bee4550 SHA512 3421eeba6021798c3da43037e672f523b1382d91c28e5347adfea62c999ae80b47174f2ea2e3e9d770bc2f4f6c384dcdb91b71395d373fff5734198addd9acbd WHIRLPOOL 00de1b6b7532264b766bad748b76c0c5ea93d59ef8bcc6c626c4982c296d2fb48d53a9835b8b2f961330eee4893865e08dacf49c0866a439b8f3f0aecc96f4d2
+MISC ChangeLog 2829 SHA256 4360d72a487bff68ad878724f9cf9d17ec3ff4901d985f1acad880a18928d1b0 SHA512 87cdf7dd96060a065c3c228e9c508733364d1db424c70dc6c24feb3c2609e3a88ae0cbd8901e41f4cdd5ae7df510e3bc63a2c93fe88ae738e21219ace835f1bb WHIRLPOOL 5f7019da1337cde19911c34b42a5c1bb58f35bc762bcdfbea019e0cfb110df938feb289bedcab5cd1e744f89b83075301e96d14ee3d2b0b1cafbbaed3428c0d9
+MISC ChangeLog-2015 1344 SHA256 ad673d639095255b0adb4df94602a9306c30fd7921169bc991ad0a4a4ba8c6c1 SHA512 2fbbdc93fd2f59ed82764b62fcb57c07e4b42fb913cc4f2825779042c3ebf2a79214ea61752a66a54afb40ff76b38e4357875c219337e6be743fa5fec04aef4d WHIRLPOOL 9d8095d2b28c161952500236c6628f4c64e6f03850db1f19692f298793ed95e641afca1eef750de1f3a23709fd8911ca273ef4da7ff6d2333d26a3751f275122
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
new file mode 100644
index 000000000000..3e7e04d9b913
--- /dev/null
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
+HOMEPAGE="https://newellrubbermaid.secure.force.com/dymopkb"
+SRC_URI="http://download.dymo.com/Download%20Drivers/Linux/Download/${P}.tar.gz"
+
+S="${WORKDIR}/${P}.5"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="net-print/cups"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+# tests fail but needs to be investigated
+RESTRICT=test
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.0-cxxflags.patch
+	epatch "${FILESDIR}"/port_to_newer_cups_headers.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}
+	doins docs/*.{txt,rtf,ps,png}
+}
diff --git a/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch
new file mode 100644
index 000000000000..03d233acb1e2
--- /dev/null
+++ b/net-print/dymo-cups-drivers/files/dymo-cups-drivers-1.2.0-cxxflags.patch
@@ -0,0 +1,15 @@
+Index: dymo-cups-drivers-1.2.0/configure.ac
+===================================================================
+--- dymo-cups-drivers-1.2.0.orig/configure.ac
++++ dymo-cups-drivers-1.2.0/configure.ac
+@@ -87,9 +87,7 @@ AM_CONDITIONAL([SAMPLES], [test x$sample
+ AC_SUBST(cups_cflags)
+ 
+ warning_flags="-Wall -Wno-unknown-pragmas"
+-debug_flags=""
+-optimization_flags="-O2"
+-CXXFLAGS="${optimization_flags} ${warning_flags} ${debug_flags} ${cups_cflags}"
++CXXFLAGS="${CXXFLAGS} ${warning_flags} ${debug_flags} ${cups_cflags}"
+ 
+ 
+ AC_CHECK_LIB(cups, cupsMarkOptions, , AC_ERROR([Can't find cups library]))
diff --git a/net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch b/net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch
new file mode 100644
index 000000000000..867766479492
--- /dev/null
+++ b/net-print/dymo-cups-drivers/files/port_to_newer_cups_headers.patch
@@ -0,0 +1,78 @@
+Bug: https://bugs.gentoo.org/610468
+
+Description: Port to newer cups headers: ppd_file_t is only defined in ppd.h
+Author: Didier Raboud <odyx@debian.org>
+Origin: vendor
+Last-Update: 2016-09-24
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -94,7 +94,7 @@
+ 
+ AC_CHECK_LIB(cups, cupsMarkOptions, , AC_ERROR([Can't find cups library]))
+ AC_CHECK_LIB(cupsimage, cupsRasterReadHeader, , AC_ERROR([Can't find cupsimage library]))
+-AC_CHECK_HEADERS([cups/cups.h cups/raster.h],, AC_ERROR([Can't find cups headers]))
++AC_CHECK_HEADERS([cups/cups.h cups/raster.h cups/ppd.h],, AC_ERROR([Can't find cups headers]))
+ 
+ #CUPS_LIBS=`cups-config --image --libs`
+ #CUPS_LIBS="-lcups -lcupsimage"
+--- a/src/common/CupsFilter.h
++++ b/src/common/CupsFilter.h
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include <memory>
+ #include <string>
+ #include "CupsPrintEnvironment.h"
+--- a/src/lm/CupsFilterLabelManager.h
++++ b/src/lm/CupsFilterLabelManager.h
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelManagerDriver.h"
+ #include "LabelManagerLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
+--- a/src/lw/CupsFilterLabelWriter.h
++++ b/src/lw/CupsFilterLabelWriter.h
+@@ -23,6 +23,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include "LabelWriterDriver.h"
+ #include "LabelWriterLanguageMonitor.h"
+ #include "DummyLanguageMonitor.h"
+--- a/src/lw/raster2dymolw.cpp
++++ b/src/lw/raster2dymolw.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <cups/cups.h>
+ #include <cups/raster.h>
++#include <cups/ppd.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+--- a/src/lw/tests/TestLabelWriterFilter.h
++++ b/src/lw/tests/TestLabelWriterFilter.h
+@@ -27,6 +27,7 @@
+ #include "../DummyLanguageMonitor.h"
+ 
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ 
+ class LabelWriterFilterTest: public CPPUNIT_NS::TestFixture
+ {
+--- a/src/lm/tests/TestLabelManagerFilter.h
++++ b/src/lm/tests/TestLabelManagerFilter.h
+@@ -26,6 +26,7 @@
+ #include "../LabelManagerDriver.h"
+ #include "DummyLanguageMonitor.h"
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ 
+ class LabelManagerFilterTest: public CPPUNIT_NS::TestFixture
+ {
diff --git a/net-print/dymo-cups-drivers/metadata.xml b/net-print/dymo-cups-drivers/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/net-print/dymo-cups-drivers/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
new file mode 100644
index 000000000000..25cafd50879d
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -0,0 +1,10 @@
+AUX 1.6.5-warnings.patch 1115 SHA256 329134a8f53238d73cf93c2e0d5eff20f9f7e358f8f39f8cda51d25038998493 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027 WHIRLPOOL d473c25eb0e68de7c1bc637a4c19168e46c2b047a4cef4c9ce6d352f821475380636ad6bfcdf588b8689191a0a4a8af582e20f728b4b826c9f6ca405371541c0
+DIST epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz 3632456 SHA256 d73e4506f7d5dedd2445f54f677bc9369ec0dd2f5269f2f1e66c4b6a7df62569 SHA512 310664c6521ac15418d3f0ac1330c842871e357eff9f83be52a5942c58354b3717bdca7d04b848ef2e7a9be6140dcbd0c485c3a9845833325689686f39d7f743 WHIRLPOOL 7e1d62e58e2c9bca7a4aeef5fc3c3e4e1151ec1f436c2dd781720cd885a9d766c41c1ae85514e1accd5a1cbd3f074a60b51aa31ae9304eba8e8e73998af8d833
+DIST epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz 3740610 SHA256 a9ee2e682cdd854a269e55ddd962e553343618cfbd1f3a0bd03bb747d520b8dd SHA512 e78e1a0d9439fc8366d4ee9a001171a09077867f3b07feb5ac2f779ede19432ad232ab96413e6563f7d3c03154ba235cadfe61b354879245ded6d424d435fe24 WHIRLPOOL d8ca22a14f35dcae24e8ef9c0d5938c030968e2b9540e63608bb7cdf8539d103330b84f76159e9f6e711f9c34d99d05b704941bcce226f2d319af6dff873acea
+DIST epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz 3277627 SHA256 1cd9e0506bf181e1476bd8305f1c6b8dbc4354eab9415d0d5529850856129e4c SHA512 31c3e11f9a19de592727318d8714940c62a3ee7a443fe5b1e51e8f995e536b427d4054e47438645f333816a44accb7c880f8b6e74e9973c072a07016ee94b7da WHIRLPOOL 7a8ab154d4c52d0fab4a89938127a4d76c60fa4d0edbde35a0c7b1e7cdece7ca4ba9e8a8073adb64126e02adf9c024dc922af117013f35834019a37a1277a06e
+EBUILD epson-inkjet-printer-escpr-1.6.10.ebuild 874 SHA256 544f08fff85d83433d2730d9484ca6fad13e32769fc515dadcf6037b3dca49c6 SHA512 a101e2511b97d94a144d0084fbaf56dc38dd8d368645f9aa13909ceb7921e4c080f9bbce3c8643f25a24f6028374cefa64738c55fc7623d4d116c74598a6df35 WHIRLPOOL 989f6b12f14b97add6e0bfd83e0b05b22bbe3608619525ddfd4b2d468f087e27f4ea62ebed074db82f4d1b5e03ce6275b553f5de859e0d62f8c775fb1a6519ab
+EBUILD epson-inkjet-printer-escpr-1.6.15.ebuild 874 SHA256 d715b641887003e3292f2480295f7302071c9e8cd548f1157b0acb4054e463b1 SHA512 230518eaa845205c05c1224cb019481a733e0ebc542565bf44b39e640a8da5a04c87ef261f5758568c12cbddeba4a6326705d898e021dfcd3c3a5c71c3d43a01 WHIRLPOOL edd49a584f7be248ec497db735c60cb4fd2862b6f1e1bca5e549c17e4889ead3c7516d9317a809437dc823ab3271afacf094fb210accc6d128c40443d8e4b56d
+EBUILD epson-inkjet-printer-escpr-1.6.5.ebuild 873 SHA256 dd31140f7db559a52df70bfd8cf1a51760b5de58f87603d8108b88d2b2744f29 SHA512 451eb21acdcba8769b398b60ff9a49b5476d45a1c4d2d243f1ef8aed4c38311bb19ceaac256faad4a8a95dc9b2afdfbcd1a589d5e69fbbd750ea78da1c6673f5 WHIRLPOOL 895e68ea9509e28342d9fd83508c60a251368214382941cf8d20e7137f576c60022287478f9b03c258528edc1d9ce7b52ecbe2fbba25df7a26aec753adfd3f34
+MISC ChangeLog 4148 SHA256 d348bfa44d7740871d97bf62a4b0768a5e46e0d89971739e7dd45a9ab7067dae SHA512 716fd4fbfd4822bd219c75ac52408dc6d061e8d0e8f850ee250c60c98fe4e4ce1f9bfaa243aa0518bf61efa1807a99d8c3b5f793ab2d4ebb54589920661f6742 WHIRLPOOL 7c349e66c9cf8a29ae96a6b83bc7feec879e6e3e82ef9fb4c8c8bbf1a387f9179041d85a98bd2279a4a9b2bab9e32182ad8c328256d57bcefc12532f84624b8f
+MISC ChangeLog-2015 808 SHA256 e4fa232909785cc6463d40a7383803c0946ac10b3c6de09c09f6f5ab3bf68c3a SHA512 d7e1d922fd2c9ec06e2dfe514bc147ce12d40b609a80a83f00462fa42fdd3f9f80957894af1e38d9319e0f32b365ab28085fefb4367cdc183ea6a2bc1981ac97 WHIRLPOOL 44ef99450c1c7db12102c3f1f181b0fbce0da5314ef127d9676ac5aaccde3e758344c6cf5674a46fb30b15462c3bb8a39409fd3105b6e72b0b01187921b43dc9
+MISC metadata.xml 246 SHA256 87fa83ef14035e5fbb6dac93f3d4afd4085e971aab6d7401ac2b6bed9e5eb84d SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b WHIRLPOOL 1e17af59af785717b26fdd3df4e84788475fa23ad410fc7a9214c0b86c57b80b54cd66742f44ef0a29d9c96611842d57d833d41568a4859b3e2fe491d691d55a
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild
new file mode 100644
index 000000000000..9f8cb06fcff8
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/05/20/91/05b7c89713fa620593175010796eecfbfe73cb9a/epson-inkjet-printer-escpr-1.6.10-1lsb3.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/1.6.5-warnings.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/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild
new file mode 100644
index 000000000000..58c39a98d244
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/06/25/43/f63808b4062f7f527e09e75a8f0dd9db46c573fe/epson-inkjet-printer-escpr-1.6.15-1lsb3.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/1.6.5-warnings.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/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
new file mode 100644
index 000000000000..c978234a9e1a
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.6.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Epson Inkjet Printer Driver (ESC/P-R)"
+HOMEPAGE="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/04/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/1.6.5-warnings.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/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch b/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch
new file mode 100644
index 000000000000..afd88b99eedf
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/1.6.5-warnings.patch
@@ -0,0 +1,42 @@
+--- a/lib/epson-escpr-api.h
++++ b/lib/epson-escpr-api.h
+@@ -111,6 +111,9 @@
+     /*** -------------------------------------------------------------------------------*/

+ extern EPS_ERR_CODE epsMakeMainteCmd     (EPS_INT32, EPS_UINT8*, EPS_UINT32*            );

+ 

++extern EPS_ERR_CODE SetupJobAttrib          (const EPS_JOB_ATTRIB*                      );

++extern EPS_ERR_CODE SendStartJob            (EPS_BOOL                                   );

++extern EPS_ERR_CODE PrintBand               (const EPS_UINT8*, EPS_UINT32, EPS_UINT32*  );

+ #ifdef __cplusplus

+ }

+ #endif

+--- a/src/filter.c
++++ b/src/filter.c
+@@ -33,7 +33,9 @@
+ 
+ #include "epson-protocol.h"
+ #include "epson-escpr-api.h"
++#include "epson-escpr-services.h"
+ #include "epson-escpr-mem.h"
++#include "epson-escpage.h"
+ 
+ #include "err.h"
+ #include "mem.h"
+@@ -42,6 +44,7 @@
+ #include "libprtX.h"
+ #include "optBase.h"
+ #include "linux_cmn.h"
++#include "xfifo.h"
+ 
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+ 
+--- a/src/mem.c
++++ b/src/mem.c
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include "err.h"
+ #include "mem.h"
+ 
+ void *
diff --git a/net-print/epson-inkjet-printer-escpr/metadata.xml b/net-print/epson-inkjet-printer-escpr/metadata.xml
new file mode 100644
index 000000000000..de09ffd8b089
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-print/fax4cups/Manifest b/net-print/fax4cups/Manifest
new file mode 100644
index 000000000000..c28e210f8c51
--- /dev/null
+++ b/net-print/fax4cups/Manifest
@@ -0,0 +1,5 @@
+DIST fax4CUPS-1.29.tar.gz 15347 SHA256 4e9ff3ec04a356b24412db4226630cfef82b88142e1566c867f2832f3ee6cfb3 SHA512 b3548095c58bafa3e35a4ad26f7d9fc95538bd0a94f40b248e2ab10adf726a23ff2b6a274085278ef3e0379a4f67b43e31d604491cf1a45ca0fbc163fc4a774b WHIRLPOOL 5dfdff775963415170438f83e1a9df22beb59943d2104b711510c5d561896fa796f887b9a82d5f2f8973ac9f6e81643be451f28022c016c5b629e45bb8470685
+EBUILD fax4cups-1.29-r1.ebuild 944 SHA256 19c40a6027f8f869ceb8161e263eb521b16725869fc29e0401254c376c8514fe SHA512 99de32b11f3e50bbf304fb94a423b3d877cc1ad1fe4de7041ee33dd31f87409a015c91e1aa5e7bda72f0eb31f260f82c525d8e96490ec259e0ff46857fb88e57 WHIRLPOOL f67883c9b13a751ba1891a28d90b94dccc7d3779521a646dcba734fc6746debf074c58c62b8192dae6b0f05e34893f0e4b93d3da958836f2cb2bef1372a9a931
+MISC ChangeLog 2435 SHA256 5ea78453b569ac146121859692dde0e94275446b291fb2bb85c821780237dd83 SHA512 76de29bb39e04d323efd63ad7835ea952723ac0a44c1ba9ae7a7dd56830ef19bc043a3d1157d498201f9217a2bd3536b6aa3e26bbcb10c0636116b9113f7624a WHIRLPOOL 0a97c00e449acb6cee391cb4d8f5e9192742d58a2fda40fb7a3ec79ae0df5768e682b5074444f78ea932280af753a7e9157262b4d4deda0504c9c63894af112c
+MISC ChangeLog-2015 3520 SHA256 a3e477166c1af0a6a6f958c9635f15e6c35ad4bf9a537401f196541297cd9fc0 SHA512 3d161f02b43c4b8e7c3631be543cc9c32ea05b44df649ffc09d0677604521819e835ce31746c6f6e3ac0ec4d7c871b3868733494ff9251979fc973a5a8d98aaf WHIRLPOOL be5967648689c2c5336e728cf2c192e5706547d3bd1a3bd634e8bc7c6aa006bced2191c298afb6a61db655362ba3e2ceb6dd97480bcca85b410408ab344df4cb
+MISC metadata.xml 467 SHA256 e2b7f6c3dd559b694fcda62f98c2a7d378d929f3a0362e17d9dd7798f0535bd7 SHA512 1015d6196c43fa99085146783a030e5bb53bbc4fc271a2acf190f25bfe2635f3336bef7d9d605ef75194f1695dda1ec2358e218c8910a985b0eaa415711df0c4 WHIRLPOOL 61c9f204bf16a610d9f8d3f40f10b727febfdb99e67e3c07e3d69eaec7145a0cdba3361433a506a1459b90c6a4c35bcaee3b69dc1b7780bc59ab7e4aa976f259
diff --git a/net-print/fax4cups/fax4cups-1.29-r1.ebuild b/net-print/fax4cups/fax4cups-1.29-r1.ebuild
new file mode 100644
index 000000000000..fe10769ae330
--- /dev/null
+++ b/net-print/fax4cups/fax4cups-1.29-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Fax backend for CUPS"
+HOMEPAGE="http://vigna.dsi.unimi.it/fax4CUPS/"
+SRC_URI="http://vigna.dsi.unimi.it/fax4CUPS/fax4CUPS-${PV}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE="+hylafax mgetty-fax efax"
+REQUIRED_USE="|| ( hylafax mgetty-fax efax )"
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}
+	|| (
+		hylafax? ( net-misc/hylafaxplus )
+		efax? ( net-misc/efax )
+		mgetty-fax? ( net-dialup/mgetty )
+	)
+	app-admin/sudo
+"
+
+S=${WORKDIR}/fax4CUPS-${PV}
+
+src_install() {
+	doman fax4CUPS.1
+
+	exeinto $(cups-config --serverbin)/backend
+	insinto /usr/share/cups/model
+
+	for i in hylafax efax mgetty-fax; do
+		if use $i
+		then
+			# Backend
+			doexe $i
+			# PPD
+			doins $i.ppd
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "Please execute '/etc/init.d/cups restart'"
+	elog "to get the *.ppd files working properly"
+}
diff --git a/net-print/fax4cups/metadata.xml b/net-print/fax4cups/metadata.xml
new file mode 100644
index 000000000000..d1eaceb31e9c
--- /dev/null
+++ b/net-print/fax4cups/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+</maintainer>
+<use>
+    <flag name="hylafax">Install net-misc/hylafax backend</flag>
+    <flag name="efax">Install net-misc/efax backend</flag>
+    <flag name="mgetty-fax">Install net-dialup/mgetty backend</flag>
+</use>
+</pkgmetadata>
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
new file mode 100644
index 000000000000..f0464b41b5fc
--- /dev/null
+++ b/net-print/foo2zjs/Manifest
@@ -0,0 +1,6 @@
+AUX foo2zjs-udev.patch 379 SHA256 8961b787e37daaec84d90a9e65a20782177f4483b80669f86e427de967035dfb SHA512 91810416934e0d92ca7717262bfed26fbf275b6193bc236566f2b7b6f34a1a38ab98f0b1a3e074b16f8e3822d67e3d4bf8b8e4562f3e6155090ae1dc82abb8f9 WHIRLPOOL 821d64bbe78ca0de790db03066e84fccf4a659d68e439a984d9446276b56d28802054b23d9132b5cb9d289809af88814a1fcedf50a52a9e4d906f7abb08ee6e9
+AUX foo2zjs-usbbackend.patch 479 SHA256 8cea95f51d82d7dde5883081b37014565a749074ef87c61ed8a446b916ca1297 SHA512 a37b3bc193a619992a2a0c24f947d96185919cab6f2cb61c0dcc76d942274ea2eb7c325bc960e05cf9ee8969ef17361ab45053a6932d601fe0f68ee19808395c WHIRLPOOL b7413e63bca2041bc233d202563f3a152c6be37a078a0444f4eb23a1c9e57a8db70da153171121a91c9f769c30570863418934a8aab2a26f04945cf1bcddec4e
+EBUILD foo2zjs-99999999.ebuild 1787 SHA256 242fe28192a693b1a88b71bab470ba3c8d191b7571f9c2d457bc2c7b6df451c1 SHA512 fdc440397edd582b972b5d7c0ee86ae02dc4fc5dd3d77d9fdb74d3eb46631c207cf3be24d56f2851e92480062619d8be44afaad756b4e0d7827ea73c8375d831 WHIRLPOOL 923031b6e80b1a54c9bfb25581e1361138eab71a9fc9b3e95684509c2624d4722a15369de24872212f1819bd31082a7fa8d7b1a7de66be0cc6633da7061feb1e
+MISC ChangeLog 2644 SHA256 432e9b0b2416196e2ae15eada63cbeec155356c348cb82c40ccc222a7a916239 SHA512 fd223cd9d98215e3af7d1a9f9a7b39f95c9495bf87dbc33051fa68a7d3204f1b0ee01c529e6ed5887c95581f6132480355e0c5ca991e4410b46b2b2851eb1355 WHIRLPOOL 2e0d5be04f0172ade3c1191b2e27aa6418ebc60b44aa9d34a61b60391e2abbea681b38d5bf015c910181800ead5253ab52e0af4eaa4a797c655d13ceaf570179
+MISC ChangeLog-2015 11278 SHA256 1ebd0fb4e528773f915be8488bc8aa75da3bd8d15ddb3739ba04a54f27835821 SHA512 baa1d600dfcd38bf3d14353e95cfba0447e6cf2739f8b2835f85cb0e19390ff50512a043f54e8fa1e36dc6102d3f8450411bc791535a3b967b9ac1dd09d1a287 WHIRLPOOL 871bae5c3059f289e26b8c82955672cddc0c7ab2e7586121b84ee6fe5692c028c29fe29e2418e81c7c727d3d626689e8ca22c7ee4f3a5ee64296ba0f0c2b941b
+MISC metadata.xml 265 SHA256 5099fe6c23aa29f999abe0e1977dca1ae9bb00819d72a2604aa6186f057a63b3 SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4 WHIRLPOOL 8cff516a131dae795628c7f89d4c2555dc83eca6cb0a93a96af768b07f44c97d28e08ae35793db0a3c8db7159fefa8dfd306a9d6318e7e53c792c89a01300191
diff --git a/net-print/foo2zjs/files/foo2zjs-udev.patch b/net-print/foo2zjs/files/foo2zjs-udev.patch
new file mode 100644
index 000000000000..070383949a8d
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-udev.patch
@@ -0,0 +1,12 @@
+diff -ruN foo2zjs/Makefile foo2zjs.orig/Makefile
+--- foo2zjs/Makefile	2012-01-18 21:53:45.834944820 +0100
++++ foo2zjs.orig/Makefile	2012-01-18 21:51:18.872936603 +0100
+@@ -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/foo2zjs-usbbackend.patch b/net-print/foo2zjs/files/foo2zjs-usbbackend.patch
new file mode 100644
index 000000000000..b73c79be4e56
--- /dev/null
+++ b/net-print/foo2zjs/files/foo2zjs-usbbackend.patch
@@ -0,0 +1,12 @@
+diff -ruN foo2zjs.orig/hplj1000 foo2zjs/hplj1000
+--- foo2zjs.orig/hplj1000	2013-01-11 17:20:04.000000000 +0100
++++ foo2zjs/hplj1000	2013-03-24 20:49:16.150065578 +0100
+@@ -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-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
new file mode 100644
index 000000000000..d1309102958b
--- /dev/null
+++ b/net-print/foo2zjs/foo2zjs-99999999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Support for printing to ZjStream-based printers"
+HOMEPAGE="http://foo2zjs.rkkda.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RESTRICT="bindist"
+
+RDEPEND="net-print/cups
+	net-print/foomatic-db-engine
+	>=net-print/cups-filters-1.0.43-r1[foomatic]
+	virtual/udev"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-editors/vim
+	net-misc/wget
+	sys-apps/ed
+	sys-devel/bc
+	test? ( sys-process/time )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	einfo "Fetching ${PN} tarball"
+	wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" || die
+	tar zxf "${WORKDIR}/${PN}.tar.gz" || die
+
+	epatch "${FILESDIR}/${PN}-udev.patch"\
+		"${FILESDIR}/${PN}-usbbackend.patch"
+
+	cd "${S}" || die
+
+	einfo "Fetching additional files (firmware, etc)"
+	emake getweb
+
+	# Display wget output, downloading takes some time.
+	sed -e '/^WGETOPTS/s/-q//g' -i getweb || die
+
+	./getweb all || die
+}
+
+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
+}
+
+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
+
+	emake DESTDIR="${D}" -j1 install install-hotplug
+}
+
+src_test() {
+	# see bug 419787
+	: ;
+}
diff --git a/net-print/foo2zjs/metadata.xml b/net-print/foo2zjs/metadata.xml
new file mode 100644
index 000000000000..c213922d0b14
--- /dev/null
+++ b/net-print/foo2zjs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
new file mode 100644
index 000000000000..ab2bb835740a
--- /dev/null
+++ b/net-print/foomatic-db-engine/Manifest
@@ -0,0 +1,10 @@
+AUX 4.0.12-use-pkgconfig.patch 1010 SHA256 44b05e2560dc08799d140b5d7acc8e6bcf544640de3511b8fc54bc1f65867a94 SHA512 d0ea9514dbc7354d2d771af049de04455ccdf9145823174b99f963c82d1a4453f3198e31abc6a4953883f860df86b55452a2bfc0dd269112c029df6eddd3e1e6 WHIRLPOOL a9b31ac5907425092a473425280efdc7dbb669923d1e7317a04e095c26d0eebe4ba119bd19b6e25514396c6bc590035247a741b48ebab0b677b00d26f01b12d5
+AUX 4.0.7-perl-module.patch 392 SHA256 a26eca155b6fb1638645954d8329f47c8da201e603b20b38738091cae8b24aeb SHA512 7f26ac25325dffa706bef97915be06707c4953ee7c436a86a79d4edf764bbe4db9e6eeb37b889f6f4214b9b8d5ceb31091398c5ccce7607be941a74b3fe4ebf7 WHIRLPOOL 2cecd99c59358ea87e8775cf8e585e01fffe44a36ccf675bdac58a2cd72d837d961f592b03fb5d7bbf0a5d7a90faa8c42e1f9514c2ddc64a5576ffc5d0630fbb
+AUX 4.0.7-respect-ldflag.patch 719 SHA256 273fe46b4fe613021e43c0796b66014e53cf928e3c5f1817580197525359a13b SHA512 432c4b61c94d1b774fc909375217587f4d8336603db0b944ec9e98e3022c2b1355928445e2cc7fbbd06a1452927082ed0fb655bc955643cce6290fe8f2d5d6c9 WHIRLPOOL b263c5d91e477138b41d1ba4a4cccf1cb9edb5bee026a2a0899488762963861188717bc0512bdf8bb9749d2414560f88a5bbe73fc696cf60f441b16bfdbd32e5
+DIST foomatic-db-engine-4.0.11.tar.gz 360379 SHA256 aa90df28f6dd94d3b590a789009c6a1792696c5cebb1e0dd6037d7dcaa09ffdf SHA512 790d08a7ba69a397988695248de5f1dff2d8461b7da415b73daea133426cc39ea69b59d59a5d1651007388c99276e878dbc3388b54219338090a1a95e6a5ae0a WHIRLPOOL 9cf310d28a1dd13c20c765fcd112127dd20670d7df2db1f3dcab45b4f05d59d4ea255c19dba2528edc805fbb1c0b13afc3f4abe1f7d872b6df9e60f17366e9f9
+DIST foomatic-db-engine-4.0.12.tar.gz 360499 SHA256 66143b76ed5b325b7025e261ad917b543de534c6d0a6e495d5489a20cace7c21 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f WHIRLPOOL 69fc54c9a843da27470595d6518c08bd392a63704156075fb80738d00f397f6891fda2504820e3728f4714bf6cd9916be547a8d26bef6c4dc2c9bb153ad8ab43
+EBUILD foomatic-db-engine-4.0.11.ebuild 1155 SHA256 5c14b4ca3a2c8fa6856beda8c4443b1f0066947c70e6d47895bf50f62a4dc0bc SHA512 e23fd7a7326cdf41b6c4c8ad21f003a53cf8ce95cf054172a2a5d7b4a2478a133cd7caaf4315315a826516214f59e47dee1b03442a277677a00011d32c141d2b WHIRLPOOL c329ebf327561475e1d152f7ed4924a54139bc4512aadd7e828d8df5309ce8137f810501c6f458ccf551c8208b909a757eb42a6216d6f17f9590ce1c24471304
+EBUILD foomatic-db-engine-4.0.12.ebuild 1202 SHA256 3c497173b79a965015598cc4dbacefb87564ea0117ef1b9ca64b6d6e9ad023b9 SHA512 d2938629f214e8e8efd117990484df40ee81439a12da87871b56585ebcbf311e9537a9037ad453d5adfbe1eccd0d05cb0f84f26ddcdcb4e4b9b2874a79a0d15d WHIRLPOOL 1fcc4b960e474b18b1fb660c2539abc48b82b6561cedd6e4a17b244280e449c138db09172feea1dc78157150e0f4e4124ef3ad9e6498d2c689ce44cdb8610258
+MISC ChangeLog 3082 SHA256 9c9d87cee979796e8eb8ad89041870927854d165ad371aeb9bda1a6775e3c37d SHA512 1e6bb4406940a649606daf7e26a0fbf74a64aca8f29601bca6a91d862ba21bf02c686bca62b03fa1b7e6a0ee5d2eb022d7e94bb438c0b4a8213968c023fce432 WHIRLPOOL 997b0b15ae0df1f93d3726096d484ef767f454092bae5cba23f826dd37e3aafba5093ccf46defca8a008f52eb5a712d4787c9ce24b0d0f898087ae11bd08df1a
+MISC ChangeLog-2015 13192 SHA256 1ffa32e4603cba34390f3ece16971ba6ff795ea0d763e8273b3e21bdf2b5a2a4 SHA512 4526a1e7cfbd39dc44b4f4e6bf4b98c315b040270d347c48f7436277af13939233aa9d4a8007acfc74c76f744ecca36699864cfa3f8d93d94c8c69953e1c764d WHIRLPOOL b65f529b13ac0aaf724d2458ca3d8fedf03e7c8c416a9e95fbb6060c8213356252883ab4fa45770b19a3064dd11be7d6cb3d2b91f1889dde1b412f3a818f3491
+MISC metadata.xml 259 SHA256 039ee41f1e7dec384460589eddef8861df90fba7ad0a4b7f3bc4c693c2bec8aa SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c WHIRLPOOL c7536efcaae9edc94b026fd2a44ab939a09d795d2b66a532a26edaf23a1c051be75ba720268a4e84fc8cc6891e84e95e657a31a082b56def434549806044cfe4
diff --git a/net-print/foomatic-db-engine/files/4.0.12-use-pkgconfig.patch b/net-print/foomatic-db-engine/files/4.0.12-use-pkgconfig.patch
new file mode 100644
index 000000000000..146932200197
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/4.0.12-use-pkgconfig.patch
@@ -0,0 +1,35 @@
+https://bugs.linuxfoundation.org/show_bug.cgi?id=1339
+
+From: Brian Norris <computersforpeace@gmail.com>
+Date: Fri, 15 Jan 2016 11:12:03 -0800
+Subject: [PATCH] configure.ac: use pkg-config instead of xml2-config
+
+The former is much more standard, and libxml2 ships a .pc file.
+
+Leave libxml alone, since I haven't tested it, and it may not ship a .pc
+file.
+---
+ configure.ac | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1562ee61b9d5..0ed5323ff2e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,12 +22,7 @@ dnl LIBS="$LIBS"
+ # Test for libxml
+ #
+ xml_version=
+-AC_PATH_PROG(XML2_CONFIG, xml2-config)
+-if test ! -z "$XML2_CONFIG"; then
+-        xml_version=libxml2
+-        XML_CFLAGS=`$XML2_CONFIG --cflags`
+-        XML_LIBS=`$XML2_CONFIG --libs`
+-fi
++PKG_CHECK_MODULES(XML, libxml-2.0, [xml_version=libxml2])
+ if test -z "$xml_version"; then
+         AC_PATH_PROG(XML_CONFIG, xml-config)
+         if test ! -z "$XML_CONFIG"; then
+-- 
+2.1.2
+
diff --git a/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch b/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch
new file mode 100644
index 000000000000..dbb53feb2a87
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 3014185..81e090d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,7 +42,7 @@ LOCAL_LIBDIR=@LOCAL_LIBDIR@
+ FOOMATIC_RIP=@FOOMATIC_RIP@
+ 
+ # foomatic-rip path for a "make inplace" installation
+-LOCAL_FOOMATIC_RIP=@LOCAL_FOOMATIC_RIP@
++LOCAL_FOOMATIC_RIP=@FOOMATIC_RIP@
+ 
+ # Locations for installing the components of this package
+ BINDIR=$(bindir)
diff --git a/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch b/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch
new file mode 100644
index 000000000000..9e6071276a4e
--- /dev/null
+++ b/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch
@@ -0,0 +1,15 @@
+--- foomatic-db-engine-4.0.2/Makefile.in.orig	2009-07-23 11:45:28.487999828 +0200
++++ foomatic-db-engine-4.0.2/Makefile.in	2009-07-23 11:45:53.939525006 +0200
+@@ -231,10 +231,10 @@
+ 	( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) )
+ 
+ foomatic-combo-xml: foomatic-combo-xml.c
+-	$(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
+ 
+ foomatic-perl-data: foomatic-perl-data.c
+-	$(CC) $(CFLAGS) $(XML_CFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o foomatic-perl-data foomatic-perl-data.c $(XML_CFLAGS) $(XML_LIBS)
+ 
+ man: lib/Foomatic/Defaults.pm
+ 	chmod a+rx ./makeMan
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
new file mode 100644
index 000000000000..a4405f8fe805
--- /dev/null
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit eutils perl-app versionator
+
+DESCRIPTION="Generates ppds out of xml foomatic printer description files"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="
+	dev-libs/libxml2
+	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+"
+PDEPEND="net-print/foomatic-db"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/4.0.7-perl-module.patch \
+		"${FILESDIR}"/4.0.7-respect-ldflag.patch
+	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" Makefile.in || die
+}
+
+src_configure() {
+	default
+	emake defaults
+
+	cd lib
+	perl-app_src_configure
+}
+
+src_compile() {
+	emake
+
+	cd lib
+	perl-app_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README TODO USAGE
+
+	cd lib
+	perl-module_src_install
+}
+
+src_test() {
+	cd lib
+	perl-module_src_test
+}
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
new file mode 100644
index 000000000000..51fae9f2067e
--- /dev/null
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit eutils perl-app versionator autotools
+
+DESCRIPTION="Generates ppds out of xml foomatic printer description files"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="net-print/cups
+	virtual/pkgconfig"
+RDEPEND="
+	dev-libs/libxml2
+	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+"
+PDEPEND="net-print/foomatic-db"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/4.0.7-perl-module.patch \
+		"${FILESDIR}"/4.0.7-respect-ldflag.patch \
+		"${FILESDIR}"/4.0.12-use-pkgconfig.patch
+	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" Makefile.in || die
+	eautoreconf
+}
+
+src_configure() {
+	default
+	emake defaults
+
+	cd lib
+	perl-app_src_configure
+}
+
+src_compile() {
+	default
+
+	cd lib
+	perl-app_src_compile
+}
+
+src_install() {
+	default
+	dodoc USAGE
+
+	cd lib
+	perl-module_src_install
+}
+
+src_test() {
+	cd lib
+	perl-module_src_test
+}
diff --git a/net-print/foomatic-db-engine/metadata.xml b/net-print/foomatic-db-engine/metadata.xml
new file mode 100644
index 000000000000..8223018128a3
--- /dev/null
+++ b/net-print/foomatic-db-engine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
new file mode 100644
index 000000000000..608744d5eb5d
--- /dev/null
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -0,0 +1,12 @@
+AUX Makefile.in-4.0.20120117.patch 1161 SHA256 c3a14472d37879572fd9373fb1605812988231b13a61d90e4bf8fdc4301a4545 SHA512 75ab0f16ce0c187553fc7bdcdc9a23ae8fecd50942d3ba0282ec2d4001f141904e6f93c8a9b6496ab2b0205a31d46a082ea304e8dcbc25f5e38c86ff696d7935 WHIRLPOOL f026c75c606b579dcbfc565be3536419de8833bf5424d6e7bc2ed2ead650b0857eaa598fe6c372a2aade4f16b05354da995ab44cef5f3841bc4c086c2df7033e
+DIST foomatic-db-4.0-20140105.tar.gz 38845034 SHA256 8c94ca9316f0e7ebc9cd69818349d49058411120b5f5ab45d4246a30bf832292 SHA512 4d06d63fe79bcfb912875b8209d658e018f4486821e7bf9433cb181d68df58602a58e755202d8ce53e0a9b9d8b0f1b31a7847c4d1346164e88105b06a4003ee4 WHIRLPOOL 77ac1ee1b13857aa07e82da540cd5d11973d9a75437c12b5fba7c115ea27cfea3fe1c3500c3fc09a74333255e824aa9e2199653e5f873bebe9c1c7c7b85800bc
+DIST foomatic-db-4.0-20160504.tar.gz 45782654 SHA256 9f5a08e665925effea9377155902548a367f03a39beec3c65b8ad9a4f45d3022 SHA512 816a857b9529c8f71ba524c261812b83e30c660bd6f99a150e45950d212a54c62a8aad9ea9f7485f270972d42f5f333bcee8da55eb5c837b542187f25322f47f WHIRLPOOL 2cdadcefd7f4fdd478c8788d152f9d4066a7f44baa94d36fc43c67a625c6f28d9278c12eeb9aeeb2dab7aee3397f71650c51ceceaf3a57184e3e9e9b7d9ab2f6
+DIST foomatic-db-4.0-20161101.tar.gz 48879184 SHA256 d868d9f76b9d1b772c42bd651eeb308cae47ada02398d91d226dcbd63efb85fc SHA512 64bd45889b74ea376d432696541b7d7c03978ea126e9e08302761208b8e7d54399cdd7e218101ebccebc97d2f800cbe9f63c844bb3d943d4662ea2463c21653d WHIRLPOOL 6922b5af01f8a66dc267fdd992b592d166f37909b843bc3127cc7cf9d62c0ac73ae38ebb1c1c4d76137864bd674e1e97e47549cd6fe81a92e566df31e005f67f
+DIST foomatic-db-4.0-20170331.tar.gz 53321292 SHA256 d3f0b7d865067ac76b75b5a9d8eb9dc86094b367246201a45d5a8eb211da6174 SHA512 33037b087eccfe08fb5b2c0220992f4ad4762c7206325f6bc8073903aafa27a260382cfa8edb4500f0feeea4d0489a3a345fe3017790484fdfb53aa577f691c0 WHIRLPOOL 62814dd0f45ca296c01d28482d60d22d4fbfcea86bb0caee6022c8864e837e225014f5a6dbced1bc9614cf82bcf58cb64b20c47c25f2a7b96ddc3a7201410daf
+EBUILD foomatic-db-ppds-4.0.20140105.ebuild 869 SHA256 65688852c06f53611411f0fa8ef7908064b4b96ef9503a05c06bb86897fd76b9 SHA512 ca5b9be9064a8b88f899866c6af881b9d0b64ed683b7f1c1bfc8982f362724231bebd3bcf795017d67b2a31f7cfc72493a75afe9b5f750f9be0a14e342852159 WHIRLPOOL 7bb8dcf35b39422668fc090a21c48a9abc623a14854cb6a70bbbe66f21ce0bff7041a6b5a8514c6e7af5111ad8536322fad45f9ca8fdcf96c52f47c138d499c3
+EBUILD foomatic-db-ppds-4.0.20160504.ebuild 866 SHA256 fe1471318caf45a101d2825b6ca79d166efe93e782f065bd0906efcea90e0e55 SHA512 c598058bc3878a2cda44d6fd4f195d3b28ec16638f561587dd505925701b5790003d43cb770a82f2259d4b6714f96a334edc202b7fd15d1277bf6fe6925c114e WHIRLPOOL 48618bac2da96ac5601ea44530b68321a35611211cd3a7c8bc3b63ad439ab291f19537b1a4196bc4730e1f096569fa021c515ba051c6265ca27688b040b95124
+EBUILD foomatic-db-ppds-4.0.20161101.ebuild 866 SHA256 fe1471318caf45a101d2825b6ca79d166efe93e782f065bd0906efcea90e0e55 SHA512 c598058bc3878a2cda44d6fd4f195d3b28ec16638f561587dd505925701b5790003d43cb770a82f2259d4b6714f96a334edc202b7fd15d1277bf6fe6925c114e WHIRLPOOL 48618bac2da96ac5601ea44530b68321a35611211cd3a7c8bc3b63ad439ab291f19537b1a4196bc4730e1f096569fa021c515ba051c6265ca27688b040b95124
+EBUILD foomatic-db-ppds-4.0.20170331.ebuild 858 SHA256 f05efe6b84ffcd2c376665d8f1e40365cdd0663fc0b77358b6f556d3ad33529b SHA512 22c74ec0791953f48e8d16f40aec25b40267a4cfa9bc2b5fbc29cda6f8f777145b708d9f9fd3f1312be08ea8e058caf0ecaafb5840690c2606e4d16e2c32717a WHIRLPOOL 068f9537e47db96d437e9bf2c89f8f8f45bdb0d8880abfa03f6c0352b188e3cdb3fbf08d2f30dda606718af5b44f6ac828b70bb6b3535c699d98954ea2594ee3
+MISC ChangeLog 3683 SHA256 3f87dff2cb2ab9f8348adee4559065f06cf9717f6a21f5cc66daeeeebfb6c84d SHA512 7a56709ec58de7b6293b58715fd0fce1206ea493c0818245821fe8e1d0048db6e0224d51ac64375ecce260b809d7c858b763331c7be7d877e4489930c8ac17e4 WHIRLPOOL d4fe886255c7d0fcb785ed7cf1be08ab59c28032dd281d5597982bfbecfd334a7838c4f2b992d7131e95835bb356e5db116da05770888285a8a77cb75dd97390
+MISC ChangeLog-2015 8388 SHA256 b636974065e829d433c5615dd7474b7f9bb29b4389064738a59c87d9847f776c SHA512 0de18d6dbc14d3e36a1f1c0e67f68478e94138c592e4ec1770879cad4304eed861f969a5a401e431fbcab41a0e1b8fed8778b2d8b33bda26c40b0c8832161344 WHIRLPOOL 4c70bb42b32af25fe1ae7567fbc9a0520350e56fce9269d6a8e00b8eefe2dd8b6f0dc85e334a66a12980f71968dda892955453362a3340bcc2065aa92ae3846b
+MISC metadata.xml 259 SHA256 039ee41f1e7dec384460589eddef8861df90fba7ad0a4b7f3bc4c693c2bec8aa SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c WHIRLPOOL c7536efcaae9edc94b026fd2a44ab939a09d795d2b66a532a26edaf23a1c051be75ba720268a4e84fc8cc6891e84e95e657a31a082b56def434549806044cfe4
diff --git a/net-print/foomatic-db-ppds/files/Makefile.in-4.0.20120117.patch b/net-print/foomatic-db-ppds/files/Makefile.in-4.0.20120117.patch
new file mode 100644
index 000000000000..67928e3f46f9
--- /dev/null
+++ b/net-print/foomatic-db-ppds/files/Makefile.in-4.0.20120117.patch
@@ -0,0 +1,24 @@
+diff -urN foomatic-db-20070508.orig/Makefile.in foomatic-db-20070508/Makefile.in
+--- foomatic-db-20070508.orig/Makefile.in	2007-05-08 09:22:03.000000000 +0200
++++ foomatic-db-20070508/Makefile.in	2007-05-08 13:08:48.000000000 +0200
+@@ -66,13 +66,13 @@
+ 	install -d $(DESTDIR)$(LIBDIR)/db/source/opt
+ 	install -d $(DESTDIR)$(LIBDIR)/db/source/PPD
+ 	install -d $(DESTDIR)$(LIBDIR)/xmlschema
+-	cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db
+-	cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer
+-	( cd db/source/driver/; \
+-	  for d in $(DRIVERXMLS); do \
+-	    cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \
+-	  done )
+-	cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt
++#	cp db/oldprinterids $(DESTDIR)$(LIBDIR)/db
++#	cp db/source/printer/*.xml $(DESTDIR)$(LIBDIR)/db/source/printer
++#	( cd db/source/driver/; \
++#	  for d in $(DRIVERXMLS); do \
++#	    cp $$d $(DESTDIR)$(LIBDIR)/db/source/driver; \
++#	  done )
++#	cp db/source/opt/*.xml $(DESTDIR)$(LIBDIR)/db/source/opt
+ 	( cd db/source && tar cf - --exclude=.svn PPD ) | \
+ 	  ( cd $(DESTDIR)$(LIBDIR)/db/source && tar xf -)
+ 	if test $(GZIP) != GZIP_NOT_FOUND -a $(GZIP_PPDS) != no ; then \
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
new file mode 100644
index 000000000000..e3b9373bfdcf
--- /dev/null
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils versionator
+
+MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+
+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.gz"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
+}
+
+src_install() {
+	default
+	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
+}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild
new file mode 100644
index 000000000000..99af50ea5954
--- /dev/null
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils versionator
+
+MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
+	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
+}
+
+src_install() {
+	default
+	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
+}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild
new file mode 100644
index 000000000000..99af50ea5954
--- /dev/null
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils versionator
+
+MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
+	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
+}
+
+src_install() {
+	default
+	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
+}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
new file mode 100644
index 000000000000..831c507b34a3
--- /dev/null
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils versionator
+
+MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
+
+src_prepare() {
+	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
+	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
+}
+
+src_install() {
+	default
+	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
+}
diff --git a/net-print/foomatic-db-ppds/metadata.xml b/net-print/foomatic-db-ppds/metadata.xml
new file mode 100644
index 000000000000..8223018128a3
--- /dev/null
+++ b/net-print/foomatic-db-ppds/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
new file mode 100644
index 000000000000..4fe8bb0db578
--- /dev/null
+++ b/net-print/foomatic-db/Manifest
@@ -0,0 +1,11 @@
+DIST foomatic-db-4.0-20140105.tar.gz 38845034 SHA256 8c94ca9316f0e7ebc9cd69818349d49058411120b5f5ab45d4246a30bf832292 SHA512 4d06d63fe79bcfb912875b8209d658e018f4486821e7bf9433cb181d68df58602a58e755202d8ce53e0a9b9d8b0f1b31a7847c4d1346164e88105b06a4003ee4 WHIRLPOOL 77ac1ee1b13857aa07e82da540cd5d11973d9a75437c12b5fba7c115ea27cfea3fe1c3500c3fc09a74333255e824aa9e2199653e5f873bebe9c1c7c7b85800bc
+DIST foomatic-db-4.0-20160504.tar.xz 4074612 SHA256 7e4080285bdaabbe8b9c772b9b81fdc7d511fb3b60e31963dafe57cd10b90f2f SHA512 ade62d14773fc5c4c82ac5ebf791ab0e70b36d758493468307acde21730a146bdb198cfe7bc14041aa05ed5b29961ca2dde4ad29d3e555164020046a4f89e5eb WHIRLPOOL 8c23adf3ee1ab087ee6b8bab110b5cf5cab4cd176f9073366fd83b943a5b3700d0c846fcd391df586fb7428bb304a373037e3a609d0c1baf3badcba4d8f02078
+DIST foomatic-db-4.0-20161101.tar.xz 4474300 SHA256 08d6abfc9e7457dea14bcec6915fd4436d0cb18b3a3127077103de39aabd5c14 SHA512 8370632697846e1635d00c369125eebc83fd0363896ed3b29d684c8e6cacc4d8cc8c679e889f20e83458f07b254dcfab22b1faef2dcf3063fbe9d3f457ead623 WHIRLPOOL a5a41bbb6a4cfeca97a8918dc4b887613f735bb7903e37e427b6d8c7dfdfc6821a83891c9b9fb331f91ea72cc60d667e6f9ed80ef95946db219c37adec50f0eb
+DIST foomatic-db-4.0-20170331.tar.xz 5083832 SHA256 934f1245b22766290d34ad1c0ff020203cbe64bccbb01297b39db37a47114149 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc WHIRLPOOL 0cf7aa87dc517c211cccd2cbf8d4ff23270b3de61c7f5e875349ae1e2d9b7f4cec308ccff2a8809c90170be6c690e4d373f098345e408123f3b39d925f441a8e
+EBUILD foomatic-db-4.0.20140105.ebuild 1308 SHA256 159af8a6541e5f5fadeae341a9ccdb1ddd0990cea939e3ebda9091d1b498e889 SHA512 fedbc2040876bf5e25b81a492b16c9361a287725262d2d5b9506405934a83662c0e2b87f90aa76a1e2eebb9dcbc16b798388ba51b02fba26c7d717440d27a328 WHIRLPOOL 7a9c0c01b9f5051380552c58b2f96c6d0e9826a66dd7ec8d0556189781076b460b4ebbac7923d6726ef358caae22e278874299fd48b1b5faf9175f69d18469c2
+EBUILD foomatic-db-4.0.20160504.ebuild 1216 SHA256 b85669ae27cd8f394355a2f99b0e1c36603f0e870f903807a80ad4da28b1c2f0 SHA512 08e880232898c05ac71884fff0e1e367a41974d13bc3e0ade29c89d71378de497273ed322fbf7fbfe9add425a46cc4e91e38279424a7134aa26621759fc14bf1 WHIRLPOOL a3204ce6b653865e6172c5a3f3c5a777f3026d3c0ee38d340efca4d9e161ffa085a4fd910d7e042ae9af160146d81c683304cca5577c1b9e3c8ee374a1624bfd
+EBUILD foomatic-db-4.0.20161101.ebuild 1216 SHA256 b85669ae27cd8f394355a2f99b0e1c36603f0e870f903807a80ad4da28b1c2f0 SHA512 08e880232898c05ac71884fff0e1e367a41974d13bc3e0ade29c89d71378de497273ed322fbf7fbfe9add425a46cc4e91e38279424a7134aa26621759fc14bf1 WHIRLPOOL a3204ce6b653865e6172c5a3f3c5a777f3026d3c0ee38d340efca4d9e161ffa085a4fd910d7e042ae9af160146d81c683304cca5577c1b9e3c8ee374a1624bfd
+EBUILD foomatic-db-4.0.20170331.ebuild 1208 SHA256 64fc842bb27890f367a57288df46f75b41e7f8c71160689394fc150662f539d5 SHA512 37888056d1b73b483510c4a4a562f11a41c2ec391001f412139c3dab7cb37b414296ed82cb7674afac7137199d1dd01be3c4b916cf9c52885d57d489373c2437 WHIRLPOOL 9ac208614f441f06e0af059340942e0829ab401d5640c707efc6602a8900804fd35bb92161d1dcbe82a9c9210a9f59b359a0ac31413d17dd8969e28fce9ea8ac
+MISC ChangeLog 3276 SHA256 29dc1c76bf98f2b09b70a663eb79ef60f8a6b403352b16a9b9db28f0226fb3d4 SHA512 0c815e5c807e22e9038ca0fb059e210d1ec35512051669fca7728ce86ece88c68a254beddaad44605c1199ebd97a96ba24d0f58350f03324f3ffd9b0b51c01c5 WHIRLPOOL 651cb25b00ebaad152cadb7b87e931bed240d4784cb876985046fe50cd9dadef374705f7665c6ca23beeee57f174107e3d3bbdec4041e1b59ebbd60e4b6c0d3c
+MISC ChangeLog-2015 13736 SHA256 723fc4d9bbf772b1e509e82c66d3a553f2ec84fca1a9d74b0a8a17fd50a3bafa SHA512 70a5e1d67f9ef35437e6f2cb8716b442edf39388c67c9e3dfe9a1d86d304482fa2e80d8017f7d955b5e327aad25b562d340478117ebb3af63b4a67de1b58454e WHIRLPOOL fadfc9c509e21cd9b631e58736d3da3dfa17e322e8a79b033bcfe5d85de3650cee793e13aa464e8934263dd772c7324804a00ca4534c5bfd2674d99acec3653c
+MISC metadata.xml 259 SHA256 039ee41f1e7dec384460589eddef8861df90fba7ad0a4b7f3bc4c693c2bec8aa SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c WHIRLPOOL c7536efcaae9edc94b026fd2a44ab939a09d795d2b66a532a26edaf23a1c051be75ba720268a4e84fc8cc6891e84e95e657a31a082b56def434549806044cfe4
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
new file mode 100644
index 000000000000..8c7581fcb014
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20140105.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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.gz"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-$(replace_version_separator 2 -).tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+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
+}
+
+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/foomatic-db/foomatic-db-4.0.20160504.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20160504.ebuild
new file mode 100644
index 000000000000..eb237a0a62eb
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20160504.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+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
+}
+
+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/foomatic-db/foomatic-db-4.0.20161101.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild
new file mode 100644
index 000000000000..eb237a0a62eb
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20161101.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 ~sh ~sparc ~x86 ~x86-fbsd"
+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
+}
+
+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/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
new file mode 100644
index 000000000000..35042585b019
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 ~sh sparc x86 ~x86-fbsd"
+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
+}
+
+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/foomatic-db/metadata.xml b/net-print/foomatic-db/metadata.xml
new file mode 100644
index 000000000000..8223018128a3
--- /dev/null
+++ b/net-print/foomatic-db/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-print/gtklp/Manifest b/net-print/gtklp/Manifest
new file mode 100644
index 000000000000..c0e7006b1726
--- /dev/null
+++ b/net-print/gtklp/Manifest
@@ -0,0 +1,7 @@
+AUX gtklp-1.3.1-formatsec.patch 2063 SHA256 f2196e5c70c1db3389eeffb3e959f623103665b67c0f559971a6bb01a874499e SHA512 31a1bb8f81748a23d614adfb05e97816285707b92ca6077e588ba91687aca4785b74f765ae63ee13c7aec779c8011a78df69fc894f3a4a951b9cae98c43defc0 WHIRLPOOL 684c958ae5fa96ef7c8e8c8eb1a68503de1df3c39496c37e936a2fa1e883702e1a8294b91a7f0f1fa1530415c1b70f8066841d184b6a5d319e819e62a8226620
+DIST gtklp-1.3.1.src.tar.gz 641805 SHA256 734f9b0edb4f01ffce1288553150966231253a5bf4bd76db739ee180a1f39fdb SHA512 22d8e519d5d767add9d786bb9d4e288fffad929e8cac5b0125f654f520e1a466cf0d32bb2f6fbc0804085748403436adc5850b805531dbc971b91eb05627ae70 WHIRLPOOL b985adb5f88ad6ab1f526a3bdea14893690c81ff2bd1f1e557cf9fb3f6f2c84205adfdc2b5c8e29264c7c6e562e9f4961dae1a3d72354de7a462d6196a3d2cef
+DIST gtklp-logo.xpm.gz 2254 SHA256 cb5292aa0b866a39a1d0719c52e46b33241d640c237396b31037ad0aa1353886 SHA512 24fd320bb1fd533d5f539ad5aa22661a2c923c4d6012b7d908a7a8311dcd179f2c7f02a88d52289d659ad89ce63ab40956725051b7dbe14ed23eb3a62e6c9240 WHIRLPOOL a32acf396614bd22fe542ca59d7f8546afc5cdd8efdd5191befde3058376326efa591f4d8f0d88b686170d39ce647fedad5dca035fec87d32db211830be1e37a
+EBUILD gtklp-1.3.1.ebuild 1202 SHA256 6ef213ecbda7b0ed5ea312d1e4a6b775ce76f5faa7ff496c0d2f0f319a6f5a3c SHA512 ff4e4e21f3da28f3a2fcd55e0573707e23ef681e435b5ab93841fa1ced742705d070d8b281af4f89de4084175c35599a0f31c4e95a9a5ba2cb12f455e011ed38 WHIRLPOOL 32702c5beaaa67fa9703a8dace8706fd5cd9c7241f14df2170201b6cbceb01a9e0f29ef39d95dd5f0c592903023fec03b237e9a3312ee15b35103d29e08ffd7e
+MISC ChangeLog 2470 SHA256 616998733b5d7070b679c5bf93d3414d7d73bf479af5aa289a4c1cbd3e214dc4 SHA512 14b0de39702ec72e6be1c612ccd2c2f972de5db596d19221500af47d7c085acd24cfeacbd909f2cf97f868ff58a07be996d1c21586b00dad91d5b4c7501451f5 WHIRLPOOL 5ecc59cd243d066d28170001aee84f63f4533eb72f58e453c433b6a0e9933df2ba880e7a7499e6ead9fa177d44b93fe0e2ab67b6bad8721b07f08d25b3fc332a
+MISC ChangeLog-2015 8454 SHA256 6bda34c33bd68c94c59a94d82d97f2239c6c9826a18fdfa824a3f2eae4809d9b SHA512 58a1f27283efffeccd02ee8601de5cae9e98e59fce4f30928e68a62c1c3bf715a5d1c46c5072867bb9415b62a3f57c837a3f4210cb8bd83c7c6b8aeaeac3c2b2 WHIRLPOOL 8b92bd56c6c63dfef97a4a08b607f3809fa14d32729531d169bce5221916a6bc4f42842af1fbd28f77cc4df3e20a3821e5c2aaaf56720087d7fdda152ca96f98
+MISC metadata.xml 627 SHA256 e3f4c73a5e02c7b368b64bab9c6a60635b5e49beb0edca048c75b7968b7e69ee SHA512 e0167dc4f64a5dbbd305bff9e40aa7deff39495215fdc1b590f32ad28af2d64eacbbc6929d4803b91ebf1acec94b7cfb2b4d139114d6779714a6ab7931204319 WHIRLPOOL 29827f405dc1ceda746c467309a36bcab7bffe00fb3abd67137f971f66559fbeee894541c71eb2af7585744cbeebed059b7ed1cdd230febdee00bf4981081800
diff --git a/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch b/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch
new file mode 100644
index 000000000000..5c513bc14cd3
--- /dev/null
+++ b/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch
@@ -0,0 +1,56 @@
+Source:
+https://sources.debian.net/src/gtklp/1.3.1-0.1/debian/patches/bugs/644113.diff/
+
+--- gtklp.orig/libgtklp/libgtklp.c
++++ gtklp/libgtklp/libgtklp.c
+@@ -554,7 +554,7 @@ void passwin_response_ok(GtkEditable *ed
+ 
+ const char *getPass (const char *prompt)
+ {
+-  GtkWidget *vbox, *hbox, *hbox1, *vbox1, *vbox2, *labell, *labelp, *yes, *no;
++  GtkWidget *vbox, *hbox, *vbox1, *vbox2, *labell, *labelp;
+ 	gint gi1;
+ #if GTK_MAJOR_VERSION == 1
+ 	GtkWidget *sep,*passwin;
+@@ -780,9 +780,6 @@ void exitOnError(char *gerror1, char *ge
+ 	GtkWidget *exitErrorDialog;
+ 	GtkWidget *hbox,*label,*pixmapwid;
+ 	char tmplabel[MAXLINE+1];
+-	GtkStyle *style;
+-	GdkPixmap *pixmap;
+-	GdkBitmap *mask;
+ #if GTK_MAJOR_VERSION == 1
+ 	GtkWidget *button,*vbox,*sep,*bbox;
+ #endif
+@@ -826,9 +823,9 @@ void exitOnError(char *gerror1, char *ge
+ 		gtk_widget_show(pixmapwid);
+ 
+ 		if(strlen(gerror2) == 0)
+-			snprintf(tmplabel,(size_t)MAXLINE,gerror1);
++			snprintf(tmplabel,(size_t)MAXLINE,"%s",gerror1);
+ 		else
+-			snprintf(tmplabel,(size_t)MAXLINE,gerror1,gerror2);
++			snprintf(tmplabel,(size_t)MAXLINE,"%s\n%s",gerror1,gerror2);
+ 		label=gtk_label_new(tmplabel);
+ 		gtk_box_pack_end(GTK_BOX(hbox),label,FALSE, FALSE,FRAME_SPACING_V);
+ 		gtk_widget_show(label);
+@@ -856,7 +853,7 @@ void exitOnError(char *gerror1, char *ge
+ #endif
+ 	} else {
+ 		if(strlen(gerror2) == 0)
+-			g_warning(gerror1);
++			g_warning("%s",gerror1);
+ 		else
+ 			g_warning(gerror1,gerror2);
+ 	}
+--- gtklp.orig/gtklp/gtklp.c
++++ gtklp/gtklp/gtklp.c
+@@ -302,7 +302,7 @@ int main(int argc,char *argv[])
+ 			case '?':
+ 				if(calledGtkLP)
+ 				{
+-					g_print(str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n")));
++					g_print("%s", str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n")));
+ 				}
+ 				return(0);
+ 			break;
diff --git a/net-print/gtklp/gtklp-1.3.1.ebuild b/net-print/gtklp/gtklp-1.3.1.ebuild
new file mode 100644
index 000000000000..f497e6e58bc7
--- /dev/null
+++ b/net-print/gtklp/gtklp-1.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="A GUI for cupsd"
+HOMEPAGE="http://gtklp.sirtobi.com/"
+SRC_URI="mirror://sourceforge/gtklp/${P}.src.tar.gz
+	mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="nls ssl"
+
+RDEPEND="x11-libs/gtk+:2
+	net-print/cups
+	nls? ( sys-devel/gettext )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog README TODO USAGE"
+
+PATCHES=( "${FILESDIR}/${P}-formatsec.patch" )
+
+src_prepare() {
+	default
+	sed -e '/DEF_BROWSER_CMD/{s:netscape:firefox:}' \
+		-e '/DEF_HELP_HOME/{s:631/sum.html#STANDARD_OPTIONS:631/help/:}' \
+		-i include/defaults.h || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable ssl) \
+		--enable-forte #369003
+}
+
+src_install () {
+	default
+
+	doicon "${WORKDIR}"/gtklp-logo.xpm
+	make_desktop_entry 'gtklp -i' "Print files via CUPS" gtklp-logo 'System;HardwareSettings;Settings;Printing'
+	make_desktop_entry gtklpq "CUPS queue manager" gtklp-logo 'System;HardwareSettings;Settings;Printing'
+}
diff --git a/net-print/gtklp/metadata.xml b/net-print/gtklp/metadata.xml
new file mode 100644
index 000000000000..1292b2b35870
--- /dev/null
+++ b/net-print/gtklp/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<longdescription>
+	GtkLP is an graphical frontend for CUPS, the Common UNIX Printing System.
+	It is used to have an easy (and graphical) access to all of the many options
+	of cups-managed printers. Package also includes GtkLPQ - a graphical
+	frontend for CUPS-Printqueues.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gtklp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
new file mode 100644
index 000000000000..51aa4ff9e8aa
--- /dev/null
+++ b/net-print/gutenprint/Manifest
@@ -0,0 +1,9 @@
+AUX gutenprint-5.2.10-genppd.patch 1609 SHA256 a9d5e8a0dffba31e1e12801a21dbfc53ced030dd919aa1eb6f6a480cbc27e837 SHA512 d582bafdf593a9e00d0f20aa5dd9043f52ca0c53bc713e979fd162c023acef937fd4a1706bcc808579ea97d122ede54f7a505537bb97b4fba5f68eeffced0a96 WHIRLPOOL ca948b19b3af4cfba26174982a6a009bbc7ab92d513b6313010381a670f6b23231c72329750087586d5683de24ed8c2a5c5440b72866bb606e9e4dcd94db3049
+AUX gutenprint-5.2.4-CFLAGS.patch 781 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438 SHA512 2bdfbb024251f79d06b24a5fc72ec35c7c7f794df8eb4cb06983047e4339d77d3d9a7c1b2913e96ef4c28f82ba7970276e27e8fe7709aecfd20b27357995ea20 WHIRLPOOL b0b3de9a03251b23dfa6f3d092036bc5d0643812eec36b70814d26af4ca46173d9be39dc663e0c6d8133f83a5014b24f0f80346e87c8d82cf4c41b7a1fcbc2cb
+DIST gutenprint-5.2.12.tar.bz2 6898738 SHA256 a42489fd7d6f2e4320811754bb80b0cd845db6632b52f819fbc2b4b75057341b SHA512 38dd34ca1946a37d0bdaa7d69f65b11651097b6d7f2b451387afd72b32fc92c3670bf54b46df226ca7a64d78f50117a648e2d6194ebaf2e86627cb29fb0e958e WHIRLPOOL f69696ae56a27e87006f471a2e9404dad53bf800743f51ce0524735f61f92e4955eb81cf8d9cc8c7e398316d55f7bc6346e2e4a0330689fad790c9ffbd9f7050
+DIST gutenprint-5.2.13-pre1.tar.bz2 6971542 SHA256 52c6860189df75c403d0951e8467512e8992ff8c7ce226be77c11c5e9b09e392 SHA512 86c04136fa783391abd47aeefe4ce405f2940728ffccf55196f683f1977843f96a0e6d66bc1fe4d7eef7d3fcac3860fa6125d74ae4be088e95450e05b7f855b2 WHIRLPOOL 7670c554fa312066fced51014066973e3b4c04f0015dc2ecd99f45ad2a83c406636939655dbb641392826bdce942159f1dd5be11949c48d13bbb1b467f581087
+EBUILD gutenprint-5.2.12.ebuild 2030 SHA256 5bee68f593edd28bdf30fb4bbfdb0d17743fcead4624e28ba99ef4ea349067ac SHA512 cf904aa171bdf0d37d22b0b9d3dd8d2d047d24c7844d2401dbae473abcbb41625775fa4d356f38af74511725e701f8d4c2bcdb9d88329ec13a37b3e64893ce4e WHIRLPOOL 01f9dd4a1760b054fc3c65e25669699452fc74fb147d70e9a32aa1f6e53184e9bfc9d1bd00a6aad3312d49bec0758e5bfbf36240934802833b02055a50b58618
+EBUILD gutenprint-5.2.13_pre1.ebuild 2083 SHA256 d3cb49b288207fffbeeeb1ffca84875b19ecd112a12367bf2d68f79ad7aea0a0 SHA512 5e540ff6db6b6f2c731c82ccefbd5bfae854b44d5de12467df1f37af98d20ad0af4da3ec884f6d83249c2f1d8c548e11eb3073068738a231300c1ebf0428de70 WHIRLPOOL 22326e3866b9014e490116274fff3726447ad4781208edf63f99c6580b63db00416de1624457e020f5c89fd19ebc351d2c09c623ac2a9cb623ab8eb74f9f8ce8
+MISC ChangeLog 3677 SHA256 0c0f3741666aea27c5b5749b6e5a2bcdb210b306beb2c0d79cca4dd60a8e0413 SHA512 fb9e245471dd27e4076a52617724abaae4c6ad528366d819690ea5b444f259e68853ac08acab91a6dc28ca316bb74133a4535d2dcfc7499352615e9cd0568c76 WHIRLPOOL 3c55c29e595ecab6750431108a300eb47ff0bd62bfac75705597bb604baecdeda1cd2c96102b1c3f3a3476498fc317160c1a3c61face68db34cce59da2dc38c6
+MISC ChangeLog-2015 23076 SHA256 d69888b308f2b2f11052ea8b851e5f46291d46b698bb0e9783b57ae1a322eb68 SHA512 20411e024bb015f1789e3c1318b35d9c84a5f9cdeff2d8aaded6fea1549d251a5e4ebd3c704c6fc9485737eec61769c5c0c7c3d869d8aa40a6197d3bbf916972 WHIRLPOOL 0acd752f537e9a77845cb47d6d79e587f977d72881c93e871f4bfee1f7c7b428f310553017a2d2681d2a1f150e5d0b6c90e45a2cb324b2d5d783d75d522be4a0
+MISC metadata.xml 339 SHA256 409eb1226e19bd02ee50e36d2b2cbe8417a3386508ceaa02f7d2b02e017bea8d SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6 WHIRLPOOL 8ad1edc158617f796615c01f6079cd2bb1361cd07f1fe7af8a69bb6b8f21d094032ccb983cdb034e85acf151e799cab8eb508cc100a919d682f4d395556d3eb3
diff --git a/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch
new file mode 100644
index 000000000000..46d8d78b9ead
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch
@@ -0,0 +1,23 @@
+diff -urN gutenprint-5.2.8.old/src/cups/Makefile.am gutenprint-5.2.8/src/cups/Makefile.am
+--- gutenprint-5.2.8.old/src/cups/Makefile.am	2012-06-14 14:03:53.011828220 +0200
++++ gutenprint-5.2.8/src/cups/Makefile.am	2012-06-14 14:04:57.672829331 +0200
+@@ -98,16 +98,16 @@
+ 
+ cups_genppd_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ cups_genppd_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
+ cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ gutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ gutenprint_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+-rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ ## Data
diff --git a/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch b/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch
new file mode 100644
index 000000000000..e5d64e6042e0
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch
@@ -0,0 +1,24 @@
+diff -Naur gutenprint-5.2.3-orig/configure.ac gutenprint-5.2.3/configure.ac
+--- gutenprint-5.2.3-orig/configure.ac	2008-12-20 18:04:24.000000000 -0600
++++ gutenprint-5.2.3/configure.ac	2009-02-13 18:52:19.000000000 -0600
+@@ -631,20 +631,6 @@
+   if test x${USE_MAINTAINER_MODE} = xyes ; then
+     STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
+   fi
+-  if test x$ENABLE_DEBUG = xyes ; then
+-    STP_ADD_COMPILER_ARG([-g])
+-  else
+-    STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
+-  fi
+-else
+-  if test x$ENABLE_DEBUG = xyes ; then
+-    STP_ADD_COMPILER_ARG([-g])
+-  else
+-    STP_ADD_FIRST_COMPILER_ARG([-O])
+-  fi
+-fi
+-if test x$ENABLE_PROFILE = xyes ; then
+-  STP_ADD_COMPILER_ARG([-pg])
+ fi
+ AC_SUBST(GNUCFLAGS)
+ 
diff --git a/net-print/gutenprint/gutenprint-5.2.12.ebuild b/net-print/gutenprint/gutenprint-5.2.12.ebuild
new file mode 100644
index 000000000000..91ed40cc0864
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.2.12.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Ghostscript and cups printer drivers"
+HOMEPAGE="http://gutenprint.sourceforge.net"
+SRC_URI="mirror://sourceforge/gimp-print/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="cups gimp gtk nls readline ppds static-libs"
+REQUIRED_USE="gimp? ( gtk )"
+
+RDEPEND="
+	dev-lang/perl
+	readline? ( sys-libs/readline:0= )
+	cups? ( >=net-print/cups-1.1.14 )
+	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.4-CFLAGS.patch
+	"${FILESDIR}"/${PN}-5.2.10-genppd.patch # bug 382927
+)
+
+src_prepare() {
+	default
+
+	sed -i "s:m4local:m4extra:" Makefile.am || die
+
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+		-e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
+		-i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-test
+		--disable-translated-cups-ppds
+		$(use_enable gtk libgutenprintui2)
+		$(use_with gimp gimp2)
+		$(use_with gimp gimp2-as-gutenprint)
+		$(use_with cups)
+		$(use_enable nls)
+		$(use_with readline)
+		$(use_enable static-libs static)
+	)
+
+	if use cups && use ppds; then
+		myeconfargs+=( --enable-cups-ppds --enable-cups-level3-ppds )
+	else
+		myeconfargs+=( --disable-cups-ppds )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc doc/FAQ.html
+	dodoc -r doc/gutenprintui2/html
+	rm -r "${ED}"/usr/share/gutenprint/doc || die
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / ]] && [[ -x /usr/sbin/cups-genppdupdate ]]; then
+		elog "Updating installed printer ppd files"
+		elog $(/usr/sbin/cups-genppdupdate)
+	else
+		elog "You need to update installed ppds manually using cups-genppdupdate"
+	fi
+}
diff --git a/net-print/gutenprint/gutenprint-5.2.13_pre1.ebuild b/net-print/gutenprint/gutenprint-5.2.13_pre1.ebuild
new file mode 100644
index 000000000000..53882ab7a0f1
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.2.13_pre1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Ghostscript and cups printer drivers"
+HOMEPAGE="http://gutenprint.sourceforge.net"
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cups gimp gtk nls readline ppds static-libs"
+REQUIRED_USE="gimp? ( gtk )"
+
+RDEPEND="
+	dev-lang/perl
+	readline? ( sys-libs/readline:0= )
+	cups? ( >=net-print/cups-1.1.14 )
+	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.4-CFLAGS.patch
+	"${FILESDIR}"/${PN}-5.2.10-genppd.patch # bug 382927
+)
+
+src_prepare() {
+	default
+
+	sed -i "s:m4local:m4extra:" Makefile.am || die
+
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+		-e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
+		-i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-test
+		--disable-translated-cups-ppds
+		$(use_enable gtk libgutenprintui2)
+		$(use_with gimp gimp2)
+		$(use_with gimp gimp2-as-gutenprint)
+		$(use_with cups)
+		$(use_enable nls)
+		$(use_with readline)
+		$(use_enable static-libs static)
+	)
+
+	if use cups && use ppds; then
+		myeconfargs+=( --enable-cups-ppds --enable-cups-level3-ppds )
+	else
+		myeconfargs+=( --disable-cups-ppds )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc doc/FAQ.html
+	dodoc -r doc/gutenprintui2/html
+	rm -r "${ED}"/usr/share/gutenprint/doc || die
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / ]] && [[ -x /usr/sbin/cups-genppdupdate ]]; then
+		elog "Updating installed printer ppd files"
+		elog $(/usr/sbin/cups-genppdupdate)
+	else
+		elog "You need to update installed ppds manually using cups-genppdupdate"
+	fi
+}
diff --git a/net-print/gutenprint/metadata.xml b/net-print/gutenprint/metadata.xml
new file mode 100644
index 000000000000..763f98878c92
--- /dev/null
+++ b/net-print/gutenprint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gimp-print</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
new file mode 100644
index 000000000000..48592fab1b24
--- /dev/null
+++ b/net-print/hplip-plugin/Manifest
@@ -0,0 +1,6 @@
+DIST hplip-3.16.3-plugin.run 2084271 SHA256 b7edef2a1c5c0a5e001deb4a18c0ef7202e653596e97144b8908ae093818070f SHA512 2ae8aeb40c2604a2c6b9725700f9addf7a82e819d603631158a5d5feac931248e53e7533178100df1fc12b0dc2340cb3ae0d85f145cd023a311f77bbe67e7c7f WHIRLPOOL 928117f862030eca9c3e5813eb8c4db66570923695b0c7af17df1992f339d2478f42af67ca0e0eb8cfa1d7425b522082fde3b8c829c3f5167e1ec503c95a986b
+DIST hplip-3.17.9-plugin.run 2059585 SHA256 98f717266340baa15e0385dc4928cc9c127a9403b72749f4899657cef8dfe883 SHA512 a7a9ee8b7edda3641b5c3aa403570aad72ce9cd42cdd4c64904a0be409cefa838712390c7f535482028ac2d494c711baef77f2f601835b01591fa673272c01ba WHIRLPOOL e6615652382d11ddbe646b793d1f5aff61872ab4f30925855be66faa4d8ebace113a43e369e1b4d199bb65d3bd0315de32cd49d264c52f6d47e7f17990f0263f
+EBUILD hplip-plugin-3.16.3.ebuild 1503 SHA256 feda237c7ac2e7f46407495a4800fb73ab098573fbcff03ee46944ad1bcb2e0c SHA512 1680865ff9741ffa1ca1bb0e6b55ad3b8427c3c0766a717dad082dbceee5f39545b5f7d9bbe28121579c946a260eb49799f720ea0005510e3908593b8904a2c3 WHIRLPOOL d5a999891f1c29b131a95c007e465300efe6427d69548896393c9e4affb8aaf806605dafc9a19b7571e2a5e274226dc3cae8c667741dee39cd4767ea85b86d99
+EBUILD hplip-plugin-3.17.9.ebuild 1623 SHA256 9172560f387cdda70faee2aad869d14eb7d2bc2d9fbdacae628c18c92931efa0 SHA512 7f8a8b4fe9845ad9a43669aaf2d5332053335db6a17e9d0eda8f881dcd53cceed837d1ffd4da273db461cd06d690a58fb080a20c8a87ba6061cc1ad1bd5b9060 WHIRLPOOL 8a39b66de7735fea710e8ece9e93b55198caeec1cf02a2e81641cc226b5531086969e318483534754e62f79a1f48462fcce76b78c8476047d860ffa327d7b703
+MISC ChangeLog 4207 SHA256 dba1c3d48453b6f15d38c4967ee9b15ffe22850630e584cafa36ea12da4a5e71 SHA512 4be1d86940dea35e1c89cd2c3067ad0c9c03b35b6df0cc7df0a243b0f389ac24b120057a8b9723c2855e6b8049c17eb8c9eef3727c9a55b598a24aaa720a1564 WHIRLPOOL 50e03b23716cbc460dfb7740681c021579e03f74cbf8ff73ba51028573514e681e7a15ed75e4f01df11badd9e507683183869c53113702126b916361fcad65b1
+MISC metadata.xml 334 SHA256 082d9160d1818ef495b10b1a852139c7204a5b902b2a6eda23263084d158620a SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c WHIRLPOOL 4097a8bf70b145b21a6b6306895a5262a4e59443bebc93234114b171555756afe9e0cf53efc036c53b849426fdb2086759b50533219278034abc3e75f9f329c1
diff --git a/net-print/hplip-plugin/hplip-plugin-3.16.3.ebuild b/net-print/hplip-plugin/hplip-plugin-3.16.3.ebuild
new file mode 100644
index 000000000000..8970ac610fd1
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.16.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+	/usr/share/hplip/fax/plugins/fax_marvell.so
+	/usr/share/hplip/prnt/plugins/hbpl1.so
+	/usr/share/hplip/prnt/plugins/lj.so
+	/usr/share/hplip/scan/plugins/bb_marvell.so
+	/usr/share/hplip/scan/plugins/bb_soapht.so
+	/usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+	unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			fax_*) plugin_type=fax ;;
+			bb_*)  plugin_type=scan ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	mkdir -p "${ED}/var/lib/hp/"
+	cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-print/hplip-plugin/hplip-plugin-3.17.9.ebuild b/net-print/hplip-plugin/hplip-plugin-3.17.9.ebuild
new file mode 100644
index 000000000000..8617df53c8dc
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.17.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
+SRC_URI="http://hplipopensource.com/hplip-web/plugin/hplip-${PV}-plugin.run"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+	/usr/share/hplip/fax/plugins/fax_marvell.so
+	/usr/share/hplip/prnt/plugins/hbpl1.so
+	/usr/share/hplip/prnt/plugins/lj.so
+	/usr/share/hplip/scan/plugins/bb_escl.so
+	/usr/share/hplip/scan/plugins/bb_marvell.so
+	/usr/share/hplip/scan/plugins/bb_soapht.so
+	/usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+	unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			fax_*) plugin_type=fax ;;
+			bb_*)  plugin_type=scan ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	mkdir -p "${ED}/var/lib/hp/"
+	cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-print/hplip-plugin/metadata.xml b/net-print/hplip-plugin/metadata.xml
new file mode 100644
index 000000000000..aa914daf8cfb
--- /dev/null
+++ b/net-print/hplip-plugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">hplip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
new file mode 100644
index 000000000000..67eb7f29c4ae
--- /dev/null
+++ b/net-print/hplip/Manifest
@@ -0,0 +1,9 @@
+DIST hplip-3.16.2-patches-1.tar.xz 8188 SHA256 8a9a78e0caac1731eae79f047a6054b411c237c579fdfd07bc59d435db708705 SHA512 7eb03c093cfb9ef6b9a980ef5520575310d080c45ed13191933a5facaf9bbb04b38c8381762a3ecd33884ad582830e61e17b6c17f2ed7cdf910670e05eed2510 WHIRLPOOL 6721eac17977485eae0cb22b1702d0479003e3639e806ecd3c5888f1b5015a0bf904512104ebefee4b3d5f64abebd0608090e00310ec8d5b48f210c7e4a95e4e
+DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa432814ffd45b3e5c396dc30194 SHA512 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915 WHIRLPOOL b287ecf80c2e7b0da0de0afefcf60c507f9d42c74dbba1e745b4b43f253a5b0dedb6398a1f073e14d196296da47764e983138c0151e05bfc7a5dd416458662a0
+DIST hplip-3.17.9-patches-1.tar.xz 8484 SHA256 2ec368039a59e375bebf565bd679dd3bedb1e0c1ecfc103c5dcf9bb2701ba9d7 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a WHIRLPOOL 2354bd3b158733b668c731ea3fd605170dd4cc0df5ffebc327a69ad33995ec02166d34897567ed69d608a62e97b33bd12fc0066acb6c302677cc68830a2661cf
+DIST hplip-3.17.9.tar.gz 23862533 SHA256 b2aad842f51dae7da2dd08d09ce2c27bc5f73c82a560b9494dd33589b0948678 SHA512 25508b91723be9564b9a7e8093159507a1a01a9e50e9e801f452f71c28cce0bddee2f5bf796214fa5752de8d1799fc6fe102779dabae0dbcba1f4de6b207c095 WHIRLPOOL df3bd0a8c4af9e7bf2a4ee534b317e84d89707587f770ab0c6ae98ccd5bea50d8be704ed2f855c9f67af8cdd34afc2ab0b07bd150f8861fc4900aa471a85b6ee
+EBUILD hplip-3.16.3.ebuild 7462 SHA256 b878478540933b2f1c3b855d2dd88dccd02d8f45559c55c0661a53e1d52f7729 SHA512 d85473a09df3afada1a1a45aae2490adfa7853a426e8f05f3b86db381c15cde6db952e22535241505932a1ed9187646a1bb89ce7ce96db6f2e6e49ee819e5ca3 WHIRLPOOL 2121b7385aaaee2dde3a24fb098669f78575eb829dcffa96bd7f07ec8875da68a0d1da119dc922ba0dcd287ba964c3d5de1cb43cfadbad1f713887c30d02e84c
+EBUILD hplip-3.17.9-r1.ebuild 7400 SHA256 b18d117216f2fe51b0f8f3e22667835c001ad31d06019345637ced8d7aa80edc SHA512 237d4b6bb18c16a812d2fc100f71fc6a3848ff9e5077a5f7acd29cdb5e47f0f8bf5a175e045a10bfac0cf4e7fe4a59c0d7858dbe063740b1a308574a5404326e WHIRLPOOL b6fa6ae42f820ba8149205083e2ef18af471142d0adb3ffe4ad4df5f1ce8df4761f80f9bd68c52ee3c5fd354fb4c2fca9566b75a5195ac112e0dfad8a32d35a9
+MISC ChangeLog 10553 SHA256 478b5142e0cb6d90ed824076a36fc23072d79f259a51ee996c627ab5fe3db088 SHA512 d7dba727b6b20f1898f45d522825f2f0f290242c026380dfbd8f21c9fc13513325e5d068f8ea68966a2a2e5f177a72e356ce7b78f0d954988a72a4b1d45b4052 WHIRLPOOL 20517487b3fa070f441362ce9fce49adf6f747b5433f888b01dd5ff490f0ea9e6f54e389b4e85497cc70c2cb6f007be20326b73395a6a3ff1c6b11f3e89363e8
+MISC ChangeLog-2015 54819 SHA256 554474d3a1d6d3526536b50eb23527cd6747f93ac62bc41609172c7786106c25 SHA512 575bbc609adada123e29a9f311603d8e9c277ef2ad288ff2f85e97e12214eea3ad4c4e18e8d82a6493d12365f3af865a43e7b69da5bdfa2879a11d58b4c079de WHIRLPOOL 7bfc750377d8f3777a212398bee212671b72676588a5b3423212c7f95f061ff07d4330187a6f1a3530df7aedcb6c0ab1f1702e742c87979ec143daad9c348626
+MISC metadata.xml 1767 SHA256 bf65f35c2e3d4d64dbaaf0ec88b2ac9fdae734315948c0165e6827281253b585 SHA512 eab26de132a410104ad260bf09962702fdc0c554261511264d4d95375a7afa07fa5b902115e4a500d5371e54f483c6f655f6d0c1fbc387e46f10e98d20b842b3 WHIRLPOOL 4291d4991d4c78ddaff7fdbb96ad8fb7f0e3222ca427eeaca7546c95a98ef44865b050e0c7918655f95a95510552f295b3e9b5bf167dbaef58d0d29dd06bde1f
diff --git a/net-print/hplip/hplip-3.16.3.ebuild b/net-print/hplip/hplip-3.16.3.ebuild
new file mode 100644
index 000000000000..3aea93d95a2c
--- /dev/null
+++ b/net-print/hplip/hplip-3.16.3.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,xml"
+
+inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.16.2-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+
+COMMON_DEPEND="
+	virtual/jpeg:0
+	hpijs? ( >=net-print/cups-filters-1.0.43-r1[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		>=net-print/cups-1.4.0
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( >=sys-apps/dbus-1.6.8-r1 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl:0
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
+		kernel_linux? ( virtual/udev )
+		scanner? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=dev-python/pillow-1[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+		)
+		qt4? (
+			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
+			libnotify? (
+				>=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}]
+			)
+		)
+	)"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	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
+
+	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."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# 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
+
+	# 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
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-build"
+	fi
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	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
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--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 \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable qt4 gui-build) \
+		$(use_enable qt4) \
+		$(use_enable policykit)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+
+	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${D}"/usr/share/hal || die
+
+	prune_libtool_files --all
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${D}"/usr/share/hplip
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "For more information on setting up your printer please take"
+		elog "a look at the hplip section of the gentoo printing guide:"
+		elog "https://wiki.gentoo.org/wiki/Printing"
+		elog
+		elog "Any user who wants to print must be in the lp group."
+		elog
+		elog "Please note: Printers requiring a binary plugin are currently"
+		elog "not supported. All bugs regarding the plugin are most likely"
+		elog "closed. A bug about including the plugin package to gentoo is"
+		elog "available here: https://bugs.gentoo.org/352439"
+	fi
+}
diff --git a/net-print/hplip/hplip-3.17.9-r1.ebuild b/net-print/hplip/hplip-3.17.9-r1.ebuild
new file mode 100644
index 000000000000..12247e7fa678
--- /dev/null
+++ b/net-print/hplip/hplip-3.17.9-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.17.9-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+# dependency on dev-python/notify-python dropped due to python 3 incompatibility
+# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${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="!minimal? ( ${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
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	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
+
+	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."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# 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
+
+	# 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
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	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
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--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 \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+}
+
+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
+
+	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
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED%/}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
new file mode 100644
index 000000000000..243ad8e5b591
--- /dev/null
+++ b/net-print/hplip/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<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="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>
+		<flag name="scanner">Enable scanner on multifunction devices which support it</flag>
+		<flag name="snmp">Add support for <pkg>net-analyzer/net-snmp</pkg> which enables this driver to work over networks (both for server and client)</flag>
+		<flag name="static-ppds">Use statically-generated PPDs instead of Dynamic PPDs. Although this is deprecated some printers may still need it to work properly. Use this flag if hp-setup fails to find/create a valid PPD file</flag>
+		<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="sourceforge">hplip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/ink/Manifest b/net-print/ink/Manifest
new file mode 100644
index 000000000000..f5fa1818bc97
--- /dev/null
+++ b/net-print/ink/Manifest
@@ -0,0 +1,7 @@
+DIST ink-0.5.1.tar.gz 105174 SHA256 d1985d40baae5cb8bf2c7ea554d24530b1cd95cd93cd143134f19ca7e1e90298 SHA512 12a21279ca4f390c5748b8ab1c62770c82decec1f9bfa3e6c13d7a269a7cb28fb96f92506c532f52fb4e3f1b72012e2c2a08e654a91edb1c73d1f7b778dc5848 WHIRLPOOL 9a5d4ad75ef0ad4fd6879aa1104d55cfdbe333d7411c9265fbf3dccd2cff5ebd4fde5f588f4e1e68abdb4eb9f62695b26e5a91b3ef532c7b441e27734bf86c40
+DIST ink-0.5.2.tar.gz 120024 SHA256 65af1e7d886125889076cd52c0bb09101da1a8811cb8150af0a46afe90ccbbbb SHA512 3e04646141b4c3267cf6e29b28b84b2a879a8edbe3356e469b8195b8fb97787144d167ec2bab41b3365c3171638a31dd566cb690725711d942528e2b4c6d4195 WHIRLPOOL 02d3ae224ee952d9f76dd606ef7d044e44cd58f4ebf512c0bce2d063609cf51265bf3547eb4ee6f4b66338a600b16262f22ac9ade8efab4e0534ed074a13e260
+EBUILD ink-0.5.1.ebuild 505 SHA256 cd73442fdf7f41a89a3fc5281d5c6e64bfc305fe2688d1b34c1ebce53393ae60 SHA512 9c167ff20458772e81b4704a2dd6ed6ddea9229a7baad1f64783de84ce1dc52480f8e8ebcb8bfc32e56c463a0679fc6d9d8522221a41726b41babbab240443b7 WHIRLPOOL 5bc31a020337a9bff08cfe0394fe705406a887d6053b2e18acc07a927cf5df18b2f24a3614ef100eb80deb327bf0ed619c2688ede166743d2e01480587fd93f3
+EBUILD ink-0.5.2.ebuild 505 SHA256 724860fbe3d776d306be22211c839c17a5fa4239b137bbb1f181eca6fdbed2bf SHA512 76ad0d794dda25154196ef1f27ae98999ca5e755b4ff24dbdd772662cb3cda3641b2a4a343e3aac8e6a0d8aa406049f8a6fcdf71400b367a5a5d1c8afd7b6144 WHIRLPOOL 3b9ff5f3a2257a1659a61081c3ea803ddf84fbee03d81ed8771e7ff264da41c4181a0963a618b023be2c4209d63c7a9d980eee76006c6c5aefa16adf0e5b8319
+MISC ChangeLog 2460 SHA256 26a99f755d58f9b1caff97b98ab282a4fa2560a197cba7c050822dd4d75c8610 SHA512 9f2593c0db3d1fa4b2558ca40ea001547be3078ff70e3b99af73cc95cfafec11ebc632bf02038fed2524d1af39191dcddcbb0cd518808f1dab756a052d76ee2e WHIRLPOOL 5fdc74bb8237d4c94903d5b41a40ddba15716a6d533b9de8a98f6388d4f05377d2835cc64823740908a50baddaba27de772377d585db0e689d7e7a3002ba2539
+MISC ChangeLog-2015 2858 SHA256 9244425e49b6512354dd7439fc0a5473f1ed8d84de3df0859b30039f28a25af0 SHA512 b78d3d8d276821bab6475e4ef53698d8c6c4ee91fc39dcf6f16f2ce23377138ef30fc413aa17e26db60f3f73a02aaeffa79bbb9fec912ba00a366a8ceea56c9b WHIRLPOOL 32b545bc1ea127366b0e97fb8d6e19cf433cf7a122b462c9fa64025caabfe68994886d308350a52b61724b0223581bf0170ec5c1693e156d6742a0b50ac77c68
+MISC metadata.xml 332 SHA256 fc13155abdadd7d44c7d14f5df4b14f1ba9232f26a72e77e6ead8fca2ef3680d SHA512 62d43f4746d69f002005f99acb674b0b70387699cb84337f4d251b1e70810d269b2dedf3ed569ef212cc7904b7955fc279d0765dcce04d80b1f7c2c910ffd6d7 WHIRLPOOL 8f2a3e6ef6c8ab47e9b059d311c7a7ce8036362dcf84712a6f732a0273a9e23deb718c7844317c01f0d879f098bacfca50d14f362e8b1d0685ef3623f3d72181
diff --git a/net-print/ink/ink-0.5.1.ebuild b/net-print/ink/ink-0.5.1.ebuild
new file mode 100644
index 000000000000..f0776c35f68c
--- /dev/null
+++ b/net-print/ink/ink-0.5.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="A command line utility to display the ink level of your printer"
+SRC_URI="mirror://sourceforge/ink/${P/_}.tar.gz"
+HOMEPAGE="http://ink.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">net-print/libinklevel-0.8"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# always use /bin/bash as configure shell, bug #526548
+	CONFIG_SHELL=/bin/bash default
+}
diff --git a/net-print/ink/ink-0.5.2.ebuild b/net-print/ink/ink-0.5.2.ebuild
new file mode 100644
index 000000000000..c74f9fc83d85
--- /dev/null
+++ b/net-print/ink/ink-0.5.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A command line utility to display the ink level of your printer"
+SRC_URI="mirror://sourceforge/ink/${P/_}.tar.gz"
+HOMEPAGE="http://ink.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">net-print/libinklevel-0.8"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# always use /bin/bash as configure shell, bug #526548
+	CONFIG_SHELL=/bin/bash default
+}
diff --git a/net-print/ink/metadata.xml b/net-print/ink/metadata.xml
new file mode 100644
index 000000000000..4784540fe957
--- /dev/null
+++ b/net-print/ink/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ink</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/kyocera-1x2x-mfp-driver/Manifest b/net-print/kyocera-1x2x-mfp-driver/Manifest
new file mode 100644
index 000000000000..8a1e36086ba0
--- /dev/null
+++ b/net-print/kyocera-1x2x-mfp-driver/Manifest
@@ -0,0 +1,4 @@
+AUX rastertokpsl-fix.sh 399 SHA256 b9259f8dabf96b0a2d4e9d87ea1b55b9061a18b02269c9344c8e6049a7febb6a SHA512 7d757297b737a4fcebfd91bde4457674b738bf227480d5bcbf5049eb332c215395bca7798cd1931592ada217b5d85806fe567bd1741d8fadc23b572642901d09 WHIRLPOOL 5e7153632a79dc18ca77b64624a642060f1338e1985abe1eadf87dd39a21fcdb82835ea3483490a9b03a7a171613951c49fb2603ae9397d0549ece3d8f26f1d9
+DIST LinuxDrv_1.1203_FS-1x2xMFP.zip 5392941 SHA256 ee88eca053203d5ceec48f05ef7e99b45ca18afb72b91f0c94407ae5ee68f7c3 SHA512 afbe237d25d784a6202be01669ccb5e1f0f9a6349b6b74227723905529f23da6d7880b25420b289277020450286d02f579722add5c0d48c839ac44152a60d1ab WHIRLPOOL 5e87ca28c92e22840e0680c054d6f5d63f0905f5eed459a016ab42652a3e98a16ef390627ab8d2690f90bf9da98aef7d856571cc680567c6f81cc2d3ed76126a
+EBUILD kyocera-1x2x-mfp-driver-1.1203-r1.ebuild 3430 SHA256 a73301cd3d911dda855fcac67d93100b3f904dacbbddeea001a8a3438e439d7e SHA512 6995f4bd77b97cfc0b33b73c3b574868ad4b2f8355213d42ae373c457668b2406b07efb338eef43789f152d5d7f51e82d9154bbccc02116b8c35ad3cff2322dd WHIRLPOOL 9cb326b2c2442c73ef84e402222283a76da0bfc123253fdc6caa46cf428182fbcd6626f9e392cdd728fa83ea20ac793b1e8e1df8a36f54d8435101195044542e
+MISC metadata.xml 529 SHA256 2df39412cadf71da56dc0be4fd48e3aed2bb0220f0b940a5ad8c3826acd818a6 SHA512 b0b99720ff90cee4eeaffe3639191500deacaef20283e5ef2bacbb4d1d10227d945beb12767bd46a39b98b9634debccebdede469d371315a1656c18fe4eb5400 WHIRLPOOL a06c2545f6c3ad8ef775ac4946af1aea281255c1e3a24a9818094b21bae08f8412124e43d97d827b13ab8eead077483f126b1b1837f269f6fa98303cf5679ee2
diff --git a/net-print/kyocera-1x2x-mfp-driver/files/rastertokpsl-fix.sh b/net-print/kyocera-1x2x-mfp-driver/files/rastertokpsl-fix.sh
new file mode 100644
index 000000000000..af898459f65f
--- /dev/null
+++ b/net-print/kyocera-1x2x-mfp-driver/files/rastertokpsl-fix.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# This file is a slightly modified version of 'rastertokpsl_wrapper' script
+# by Maxim Norin. See https://github.com/mnorin/kyocera-ppd-installer for
+# the original version.
+# Distributed under the terms of the GNU General Public License v2.
+jobname="$(echo "$3" | grep -Eo "[[:alnum:]]" | tr -d "\n" | tail -c 20)"
+/usr/libexec/cups/filter/rastertokpsl "$1" "$2" "${jobname}" "$4" "$5"
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-r1.ebuild
new file mode 100644
index 000000000000..a235beae8bdc
--- /dev/null
+++ b/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Printer descriptions (PPDs) and filters for Kyocera 1x2x MFP"
+HOMEPAGE="http://www.kyoceradocumentsolutions.eu"
+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="+rastertokpsl-fix ${IUSE_L10N[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${IUSE_L10N[@]/#/l10n_} )"
+
+RDEPEND="net-print/cups"
+DEPEND="app-arch/unzip"
+RESTRICT="fetch mirror"
+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
+}
+
+pkg_nofetch() {
+	einfo "Please, navigate your browser to the following URL 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
+	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"
+	einfo "reason."
+}
+
+src_unpack() {
+	unpack ${A}
+	S="${WORKDIR}/Linux/$(usex amd64 64bit 32bit)/Global"
+
+	cd "${S}" || die
+	local l10n
+	for l10n in ${L10N}; do
+		local language="$(get_tarball_name "${l10n}")"
+		unpack "./${language}.tar.gz"
+	done
+}
+
+src_prepare() {
+	eapply_user
+
+	# Original PPD files need patching, since they expect their filter
+	# program to reside under /usr/lib, but Gentoo uses /usr/libexec.
+
+	local orig="/usr/lib/cups/filter/rastertokpsl"
+	local repl="/usr/libexec/cups/filter/rastertokpsl"
+	if use rastertokpsl-fix; then
+		repl+="-fix.sh"
+	fi
+
+	sed -i "s|${orig}|${repl}|g" ./*/Kyocera*.ppd || die
+}
+
+src_install() {
+	insinto /usr/share/cups/model/KyoceraMita
+
+	install_with_l10n_suffix() {
+		local l10n="$1"; shift
+		local file
+		for file; do
+			local bn="${file}"
+			bn="${bn##*/}"
+			bn="${bn%.ppd}"
+			newins "${file}" "${bn}_${l10n}.ppd"
+		done
+	}
+
+	local l10n
+	for l10n in ${L10N}; do
+		local language="$(get_tarball_name "${l10n}")"
+		install_with_l10n_suffix "${l10n}" "./${language}"/Kyocera*.ppd
+	done
+
+	exeinto /usr/libexec/cups/filter
+
+	# Each unpacked tarball contains an exact copy of 'rastertokpsl',
+	# just take any of them.
+	local rasterfile="$(find -name rastertokpsl -print -quit)"
+	[[ $? -eq 0 && -n "${rasterfile}" ]] || die
+	doexe "${rasterfile}"
+
+	if use rastertokpsl-fix; then
+		doexe "${FILESDIR}/rastertokpsl-fix.sh"
+	fi
+
+	dodoc ../../Readme.htm
+
+	elog "This packages installs Kyocera's 'Readme.htm' file (see package"
+	elog "documentation directory) which lists several common problems and"
+	elog "workarounds. You might want to have a look on it."
+	elog "(Merging the package with 'rastertokpsl-fix' USE flag can save you"
+	elog "from getting some of these problems.)"
+	elog
+	elog "Hint: try socket:// protocol when configuring network printing."
+}
diff --git a/net-print/kyocera-1x2x-mfp-driver/metadata.xml b/net-print/kyocera-1x2x-mfp-driver/metadata.xml
new file mode 100644
index 000000000000..ebe2cdf388d4
--- /dev/null
+++ b/net-print/kyocera-1x2x-mfp-driver/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>firegurafiku@gmail.com</email>
+		<name>Pavel Kretov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+
+	<use>
+		<flag name="rastertokpsl-fix">
+			Use custom wrapper script to sanitize arguments before passing
+			to 'rastertokpsl' filter program
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-print/kyocera-mita-ppds/Manifest b/net-print/kyocera-mita-ppds/Manifest
new file mode 100644
index 000000000000..f1d81fb17ef6
--- /dev/null
+++ b/net-print/kyocera-mita-ppds/Manifest
@@ -0,0 +1,5 @@
+DIST Linux_PPDs_KSL8_4.zip 6468249 SHA256 5e79034c9f92d5b656dcbf8967ebdf2007e28f3fefad97b9e8215aa7ef673c60 SHA512 4e98f9972f6158262878b4fe811165ab05de8582d608c60400568a1eaaa1721fbe13394ad6e9aa93e21ed2ff30265856b64ecd1f3ae69ba49c7f9d88a7911833 WHIRLPOOL 9bf2b879e73299867d4ccda378a7c5853f9eef800d8ef3c81fd6b6197f8187bf56f5a99570840aa3091fcad694953b0c20e5788ff86dd770d04c5fb637b9920b
+EBUILD kyocera-mita-ppds-8.4.ebuild 1386 SHA256 1d09cb459f9f80bf72fe4b2fc39f63dd7a7e948219bd8fbc052d6d0672e8e5c4 SHA512 663c9739ccc8e3082ae13c1cc6af5ecd92ea7d0de5cb3cf176e92d9819a0db1432da8544d747fbfa6cbbb808e24cc0483dcae119a5633e5bfd0451b55380a195 WHIRLPOOL 62ddaf8fa5fa88a59fad57720d1bb4b1957eff34510cc54965f4966692cca43269dc7c959792161d5e77b195766f6e08722698edd6d6a5cfa815d96596b53855
+MISC ChangeLog 2323 SHA256 9d97ae1d0f30dd8833176340b843852ab389bad8b9439eca89170d1f8dbd3c86 SHA512 ab33529e5bd7ed71c2d0fd2a0767742320eb0a1ef1234f8b01bb8d344d8e122a2713e45dac5ae3987f15963404b87177e0c15d8936f6d4f534dbb91734fd31ed WHIRLPOOL 0035d767da52135d40bfd360a9e2a86bd2de77c698961442deb090c239015de04100893d9e3de60ca01fb0ec17119c3891ef827e07e36fcc8b0d9efc12c6012b
+MISC ChangeLog-2015 459 SHA256 cfe71d427123c5751af951da5340cc3d868e4dc070c269804fa0280df9add95f SHA512 62c1ce1dbf34ae9816a7172aca5ef1b09ca4d5fb7b3d0a3d140bd8fbf768062e7c8a0f73d5e689234808a2206817155aaafdd81980de4368545b48b514364601 WHIRLPOOL abeaefb25279f2791b1aabaf148e0ecbd88a81fe1c9535be9e15b1828233679186bdb7c8c7d1cea84a8664a4cc8099bc386b4623f31b0a3856c1cd7ce05f7152
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild
new file mode 100644
index 000000000000..38dcd4472e55
--- /dev/null
+++ b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="PPD description files for (some) Kyocera Mita Printers"
+HOMEPAGE="http://www.kyoceramita.it/"
+SRC_URI="Linux_PPDs_KSL${PV/\./_}.zip"
+
+LICENSE="kyocera-mita-ppds"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_LINGUAS="en fr de it pt es"
+
+IUSE=""
+for lingua in $IUSE_LINGUAS; do
+	IUSE="${IUSE} linguas_$lingua"
+done
+
+RDEPEND="net-print/cups"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/PPD's_KSL_${PV}"
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+	einfo "Please download ${A} from the following URL:"
+	einfo "http://www.kyoceramita.it/index/Service_Departement__/Richiesta_di_Supporto_Tecnico/download_center.false.driver.FS1020D._.IT.html"
+	einfo ""
+	einfo "The FS-1020D driver from the Italian website provides PPDs for a"
+	einfo "number of printers in six languages."
+}
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/cups/model/KyoceraMita
+
+	local installall=yes
+	for lingua in $IUSE_LINGUAS; do
+		if use linguas_$lingua; then
+			installall=no
+			break;
+		fi
+	done
+
+	inslanguage() {
+		if [[ ${installall} == yes ]] || use linguas_$1; then
+			doins $2/*.ppd || die "failed to install $2 ppds"
+		fi
+	}
+
+	inslanguage en English
+	inslanguage fr French
+	inslanguage de German
+	inslanguage it Italian
+	inslanguage pt Portuguese
+	inslanguage es Spanish
+
+	dohtml ReadMe.htm || die
+}
diff --git a/net-print/kyocera-mita-ppds/metadata.xml b/net-print/kyocera-mita-ppds/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/net-print/kyocera-mita-ppds/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
new file mode 100644
index 000000000000..8f2d785c0f4a
--- /dev/null
+++ b/net-print/libgnomecups/Manifest
@@ -0,0 +1,14 @@
+AUX enablenet.patch 550 SHA256 14885c66f2367d6a9e21a2e542b844b5be4e52a8a7d0c400c4cc477cadcea3b1 SHA512 97558a34d8ad0d67e8521e35a6cdde5967ec08718c1a71f8c141f7caa535ca6b9def6a6804a50779cb3f1a4fb00d3e7abdc2bb24ebeb3636cce359247cdfc503 WHIRLPOOL 0309d537826948e088195209565a010a238179a1a30cb1b704b70f14a0e70eead62ef01207fa99e2788af3a7ebb58717f16983c7a72bb68ed94f1eb0a3723801
+AUX libgnomecups-0.2.3-cups-1.6.patch 10048 SHA256 edda0fcf15ac772a5553367221d2761d6867f7292bc6c6ad03c9772f56dede1e SHA512 23de02427a751df314384d7a8f8c56fb2e780ba897359e4deaa8dce0e1a7f4844613e40432f00aa066e501bf8154c61da8f8dcbe532a5b0216ec4e00d333a373 WHIRLPOOL 506b0ca4ba13845bc54d1e095bf8aaf1e899faeca300a1a45c70f8e09490a6c393ab873b9cb132193ca319217da4a65b83437a9bf7a8d46eca7da53cb9470517
+AUX libgnomecups-0.2.3-cups-config.patch 1087 SHA256 54269ade07136fdc24b92fd4e20073fffe5b9e2235bd8c53ba21f9b5494c6538 SHA512 5f20fd5618b503f79e8324c60e5bae543ddb736d0007bbf7e454e128efb61c420997523d14fe3585f696b4300318ebd4e5abf67a048a2d01e9a2f2fc72e2d05c WHIRLPOOL 3769be99f3252ac2105ad8a81db6bfc128b3f51a5b78092be0c954bc2ed51e07b4f2d3df4e6bb28eb085f7ad09b126d9ad5886cb2691e300316cdca2b26a17a8
+AUX libgnomecups-0.2.3-format-string.patch 1328 SHA256 2ff90eefe428569a4890c1557cf590f9e7653861f88a8c954e24d3b5c899f38d SHA512 08f826060d7c2ea224c3628a560d46972c3ece3303518ec92159133ddf4aee0a836e6db5fb5b326406b7110cbc10273e3fe4d620dd9eb587193cfaae190276d1 WHIRLPOOL 5e780d59e2a4e55718e7a98c83a3dcb3da5e706635f062530175633d0ddf4a689b5f397a06a5af30b5e03e13db07d5e5d1ca29dd02805bcfc7bd467b9f736d31
+AUX libgnomecups-0.2.3-g_list_find_custom.patch 3300 SHA256 8242cca424d91560dbc78e85501632a8649a4fa53f137853599f67f35b07f40f SHA512 6aab047fd99e528e2d326fa4dfafcb26e29a57c7a6ea9b4b01979fbc8b025952728b93e3671798159dced1ebe62b7adb0a82b8143432cdc23cb887190ff0db6c WHIRLPOOL 25f783a8169504a5c850f20461a9dc834a95737d2ff8b3527b7ccfce5a25fcf5ba8099f0490120c5f8d92c2ea970ef99b8ca2bc6aadaf2ea1b504df11e8b2f1e
+AUX libgnomecups-0.2.3-glib.h.patch 1017 SHA256 647f51deae54fbca376ad9febdb9047d4bc4f1f80be76abc671297e76176c3f5 SHA512 111082722396a40b7a249d088cf60bdd7c21a62aa89df6b84d0ae6d38e0175e7a5a07f701660964c1fac0b413f68398e023bf02eacc7b0b1e963f805390c579e WHIRLPOOL a7453c9187fdfc93ca8b1bef8d65fe0bd93903830c73bfeb59c108b7140ad58edea8087bd4d6cebfc6cc5fb5a89c3b847ca8889711ab548d63bcaa736772490c
+AUX libgnomecups-0.2.3-lpoptions.patch 408 SHA256 e14ba092fb426f4b64bb0b26d7f36562c8177d2eb824a7d30ce46ef0d156ead9 SHA512 6d64b0b14dcce03a36a1c0b257e19c37e93778552f306ee312b019690fc35b64b0f1f5c1dc54c72ee85dad755b1facb607d5ef7914c6af01c4bcb86ad4628c85 WHIRLPOOL 7e350551c71ea9347650f75eae87bdeda9a6fdef76c8b9c706ca9071ff368f6eb76fba97e61124905e4125e892fe0c50a559c3d13a37f7dda6feed04c6d339ca
+AUX libgnomecups-0.2.3-pkgconfig.patch 404 SHA256 ac43b6c676659605911437a30c31bd30af869798dddae8f22ac6e485344cdff3 SHA512 2a3ea4921c01c01a55266deaf36d9ff2b0511592be1e58add93af398b9d0d92b21d8c3fe62446b09a939b46569997381a8e56435797625758a22b7d52914c3f8 WHIRLPOOL 862adfead1ad09e2f6e30f7bb8500fdf5fc4c9871cdd56665e44b1984951c3e9950d813526fc8dbbd06699706e23ba3917ca9b459cc8c8c77e01d66e10595019
+DIST libgnomecups-0.2.3.tar.bz2 357129 SHA256 e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75 WHIRLPOOL 1bc4693d039d1e51853af74e6928f363ed0d9b29cf9260de162054d0ad84de645ff34d452b8865440d3a3eaf91ae0c3952363c4f4f405f1a023fe227bccd8f78
+EBUILD libgnomecups-0.2.3-r3.ebuild 1124 SHA256 bf13ef5d492439994e8efe1eafe678875f42e879ac739417216b225da099f06b SHA512 312242157d210f826f7aa5959e5f1eaea7838f554c999cc20bc78be55a44103b88c575713d00b138b9080ec1cee9c0f23cbb2c5e7ebd407b75a70c4fe5679e32 WHIRLPOOL 22c0642eb0ec740c924612656e10e3306094052f33c75d9e9b0a8f2eb62d66e210367e4a9c74d16570b97c1714cf2510bf13491c40f7ad0dd515f9c193c5c420
+EBUILD libgnomecups-0.2.3-r5.ebuild 1669 SHA256 190c0e429766436f3f998e7259ca3a3230b9757884599b6501f51bd49988cb57 SHA512 43c3ac9eba4b83fed2208349c865c37a1ddd8f620d1d38b70ceffc61d6466c559907dcfe575369f46e1d96153cc4de7f01e73870b64dc24eb4dd4897411ebacc WHIRLPOOL 35e71ad07fed4b66ae157fec1f3cca3ec211b0fac0bc682d986ce75819f03c16d3934cea7bc46fda429852593a3a7bda9717243e2396443054db8e6d8ff17e4c
+MISC ChangeLog 3077 SHA256 c04b10ec4d2444ffdd98f276dac3d9b4dd306f7125b4c1dea3daa08dde51e47a SHA512 8c2ec6e863f626a0c5e74a554d25b983024636b69c10645cd23124c7a980a845fbbac849f68f55344466483ef11d3d7e6b115037b5c916e0f91280da2a508022 WHIRLPOOL 1dc6b7d79d6cae017b68b27f113819adfb33910a4a9a9dba010bfc796332d39e9f7848a12eb3f085ec0d9d0bc553f071fde8e7f450883912dafe6058d95872e2
+MISC ChangeLog-2015 13931 SHA256 6c9a34ca338bcc300896fa589cb5388955aa772e2ee433d8d748cbc0d612a13e SHA512 f7243bd0243d1d7496086d8a90749bf882aa801cc6700a994a2df8532043eb187ebe68b6d76c041cbf43e1bc8b0ca8eb40aa07619ebb1806139626ba8baf192a WHIRLPOOL 0ff25e9f4eda31345a7b227397184157ea2c62a9c709c0612e3ebbd4a2202f4b88978765be434ccf355733b9c19d9f842f583ef8f8ab09444814794278ffdf7d
+MISC metadata.xml 365 SHA256 333811bdc412873d5121d06a23fa4717e4396f0e644675f613206fccd8d5eea8 SHA512 6696e110749820558c770f257f4f74d8d4a6fb617e9f74b7170e12a6c353a03a4fbfbc1c39f2247657f515079d541752da8f6f993d37464523ae5364f0e7c6e9 WHIRLPOOL 768b6ee23f48f7358a004c278279414950b10f2b0760c59ea9ec145a784cfcadc520f5fcbe4f57c45dc1a1e182f6fddd18637c32c3f2fccfb54eb631b4cda3c9
diff --git a/net-print/libgnomecups/files/enablenet.patch b/net-print/libgnomecups/files/enablenet.patch
new file mode 100644
index 000000000000..f2e113d1440f
--- /dev/null
+++ b/net-print/libgnomecups/files/enablenet.patch
@@ -0,0 +1,11 @@
+--- libgnomecups/gnome-cups-printer.c.orig	2005-08-04 18:21:32.221038336 +0000
++++ libgnomecups/gnome-cups-printer.c	2005-08-04 18:22:00.369759080 +0000
+@@ -282,7 +282,7 @@
+  * that will produce an infinite loop when presented with an invalid
+  * hostname.  This will also produce a hang if the remote printer is
+  * unavailable and we do a syncronous lookup. */
+-static gboolean go_directly_to_printer_when_possible = FALSE;
++static gboolean go_directly_to_printer_when_possible = TRUE;
+ 
+ static void
+ update_attributes (GnomeCupsPrinter *printer)
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch
new file mode 100644
index 000000000000..68f379c25109
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch
@@ -0,0 +1,285 @@
+From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 7 Aug 2012 06:53:09 -0400
+Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions
+
+CUPS 1.6 makes various structures private and introduces these ippGet
+and ippSet functions for all of the fields in these structures.
+http://www.cups.org/str.php?L3928
+
+We define our own accessors when building against CUPS < 1.6.
+
+Based on work by Jiri Popelka <jpopelka@redhat.com> at
+https://bugzilla.gnome.org/show_bug.cgi?id=679759
+---
+ libgnomecups/gnome-cups-printer.c |   48 +++++++++++++++++++++++++++++-------
+ libgnomecups/gnome-cups-queue.c   |   43 +++++++++++++++++++++++++++------
+ libgnomecups/gnome-cups-request.c |   44 ++++++++++++++++++++++++++++-----
+ 3 files changed, 110 insertions(+), 25 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c
+index c924af0..f5e1ef7 100644
+--- a/libgnomecups/gnome-cups-printer.c
++++ b/libgnomecups/gnome-cups-printer.c
+@@ -37,6 +37,34 @@
+ 
+ #define UPDATE_TIMEOUT 5000
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetName(attr)      attr->name
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ struct _GnomeCupsPPDFile {
+ 	char name[1];
+ };
+@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer,
+ 	printer->details->state_reasons = NULL;
+ 
+ 	/* cf. RFC2911 4.4.12 */
+-	for (i = 0; i < attr->num_values; i++) {
++	for (i = 0; i < ippGetCount (attr); i++) {
+ 		const char *p;
+-		const char *keyword = attr->values [i].string.text;
++		const char *keyword = ippGetString (attr, i, NULL);
+ 
+ 		reason = g_new (GnomeCupsPrinterReason, 1);
+ 
+@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer)
+ 	return printer->details->info;
+ }
+ 
+-#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }}
+-#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}}
++#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }}
++#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}}
+ 
+ static void
+ attributes_update_cb (guint id,
+@@ -243,14 +271,14 @@ attributes_update_cb (guint id,
+ 	changed = FALSE;
+ 
+ 	if (!error && response) {
+-		for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-			if (!attr->name) {
++		for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++			if (!ippGetName (attr)) {
+ 				continue;
+ 			} 
+-			if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) {
+ 				continue;
+ 			}
+-			if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) {
+ 				map_reasons (printer, attr);
+ 			}
+ 			MAP_INT (printer->details->state, "printer-state");
+@@ -570,7 +598,7 @@ get_default (void)
+ 	
+ 	attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
+ 	if (attr) {
+-		name = g_strdup (attr->values[0].string.text);
++		name = g_strdup (ippGetString (attr, 0, NULL));
+ 	} else {
+ 		name = NULL;
+ 	}
+@@ -698,7 +726,7 @@ get_printer_names (void)
+ 	attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME);
+ 	while (attr) {
+ 		ret = g_list_prepend (ret, 
+-				      g_strdup (attr->values[0].string.text));
++				      g_strdup (ippGetString (attr, 0, NULL)));
+ 		
+ 		attr = ippFindNextAttribute (response, 
+ 					     "printer-name", 
+diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c
+index 9f98ed9..298db42 100644
+--- a/libgnomecups/gnome-cups-queue.c
++++ b/libgnomecups/gnome-cups-queue.c
+@@ -15,6 +15,33 @@
+ 
+ #define UPDATE_TIMEOUT 3000
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetName(attr)      attr->name
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ struct _GnomeCupsQueueDetails {
+ 	char *queue_name;
+ 	GList *jobs;
+@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job)
+ 	job->size = job->size * 1024;
+ }
+ 
+-#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}}
+-#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } }
++#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}}
++#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } }
+ 
+ static void
+ get_jobs_cb (guint id,
+@@ -231,8 +258,8 @@ get_jobs_cb (guint id,
+ 	
+ 	if (response) {
+ 		job = g_new0 (GnomeCupsJob, 1);
+-		for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-			if (attr->name == NULL) {
++		for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++			if (ippGetName (attr) == NULL) {
+ 				if (job->name) {
+ 					finish_job (job);
+ 					jobs = g_list_prepend (jobs, job);	
+@@ -244,7 +271,7 @@ get_jobs_cb (guint id,
+ 				continue;
+ 			}
+ 			
+-			if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
+ 				continue;
+ 				
+ 			}
+@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
+ 
+ 	if (response) {
+ 		job = g_new0 (GnomeCupsJob, 1);
+-		for (attr = response->attrs; attr != NULL; attr = attr->next) {
+-			if (attr->name == NULL) {
++		for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) {
++			if (ippGetName (attr) == NULL) {
+ 				if (job->name) {
+ 					finish_job (job);
+ 				} else {
+@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue,
+ 				break;
+ 			}
+ 			
+-			if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) {
++			if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) {
+ 				continue;
+ 			}
+ 			
+diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c
+index c94f623..13f0948 100644
+--- a/libgnomecups/gnome-cups-request.c
++++ b/libgnomecups/gnome-cups-request.c
+@@ -19,6 +19,36 @@
+ #define STOP_UNUSED_THREADS_TIMEOUT 60
+ #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++#define ippGetCount(attr)     attr->num_values
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetName(attr)      attr->name
++#define ippGetBoolean(attr, element) attr->values[element].boolean
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++
++static ipp_attribute_t *
++ippFirstAttribute(ipp_t *ipp)
++{
++  if (!ipp)
++    return (NULL);
++  return (ipp->current = ipp->attrs);
++}
++
++static ipp_attribute_t *
++ippNextAttribute(ipp_t *ipp)
++{
++  if (!ipp || !ipp->current)
++    return (NULL);
++  return (ipp->current = ipp->current->next);
++}
++#endif
++
++
+ typedef struct
+ {
+ 	GMutex *mutex;
+@@ -276,14 +306,14 @@ dump_request (ipp_t const *req)
+ 	unsigned i;
+ 	ipp_attribute_t *attr;
+ 
+-	for (attr = req->attrs; attr != NULL; attr = attr->next) {
+-		g_print ("%s", attr->name);
+-		for (i = 0 ; i < attr->num_values ; i++) {
++	for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) {
++		g_print ("%s", ippGetName (attr));
++		for (i = 0 ; i < ippGetCount (attr) ; i++) {
+ 			g_print ("\t[%d] = ", i);
+-			switch (attr->value_tag & ~IPP_TAG_COPY) {
++			switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) {
+ 			case IPP_TAG_INTEGER:
+ 			case IPP_TAG_ENUM:
+-				g_print ("%d\n", attr->values[i].integer);
++				g_print ("%d\n", ippGetInteger (attr, i));
+ 				break;
+ 
+ 			case IPP_TAG_STRING:
+@@ -294,11 +324,11 @@ dump_request (ipp_t const *req)
+ 			case IPP_TAG_CHARSET:
+ 			case IPP_TAG_LANGUAGE:
+ 			case IPP_TAG_MIMETYPE:
+-				g_print ("'%s'\n", attr->values[i].string.text);
++				g_print ("'%s'\n", ippGetString (attr, i, NULL));
+ 				break;
+ 
+ 			case IPP_TAG_BOOLEAN:
+-				g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false");
++				g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false");
+ 				break;
+ 
+ 			default:
+-- 
+1.7.8.6
+
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch
new file mode 100644
index 000000000000..10eb75d1bc46
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch
@@ -0,0 +1,34 @@
+From 8f5e326dd89d98b2d34cf6f97583be4eb819b02b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 29 Jun 2014 10:36:14 +0200
+Subject: [PATCH] Use AC_PATH_TOOL to find cups-config. And actually use the
+ result.
+
+---
+ configure.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 3f0ccc5..0bd367e 100644
+--- a/configure.in
++++ b/configure.in
+@@ -22,13 +22,13 @@ AC_SUBST(GLIB_REQUIRED)
+ 
+ PKG_CHECK_MODULES(LIBGNOMECUPS, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED)
+ 
+-AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
++AC_PATH_TOOL(CUPS_CONFIG, cups-config, no)
+ if test "$CUPS_CONFIG" = "no"; then
+   AC_MSG_ERROR([Please install cups development packages])
+ fi
+ 
+-CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+-CUPS_LIBS=`cups-config --libs`
++CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
++CUPS_LIBS=`$CUPS_CONFIG --libs`
+ 
+ AC_SUBST(CUPS_CFLAGS)
+ AC_SUBST(CUPS_LIBS)
+-- 
+2.0.0
+
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch
new file mode 100644
index 000000000000..797231416b64
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch
@@ -0,0 +1,34 @@
+From afe4d5299e6f48ace0fbedbfba8159812afcdd1c Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Tue, 14 Jan 2014 15:23:59 +0100
+Subject: [PATCH] Fix build with -Werror=format-security
+
+---
+ libgnomecups/gnome-cups-request.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c
+index c94f623..fa1bd97 100644
+--- a/libgnomecups/gnome-cups-request.c
++++ b/libgnomecups/gnome-cups-request.c
+@@ -353,7 +353,7 @@ request_thread_main (GnomeCupsRequest *request,
+ 			g_warning ("IPP request failed with status %d", status);
+ 			if (request->error != NULL)
+ 				*(request->error) = g_error_new (GNOME_CUPS_ERROR, 
+-								 status, ippErrorString (status));
++								 status, "%s", ippErrorString (status));
+ 		} else if (request->response && _gnome_cups_debug) {
+ 			g_print ("response = \n");
+ 			dump_request (request->response);
+@@ -364,7 +364,7 @@ request_thread_main (GnomeCupsRequest *request,
+ 		request->response = NULL;
+ 		if (HTTP_OK != status && request->error != NULL)
+ 			*(request->error) = g_error_new (GNOME_CUPS_ERROR, 
+-							 status, httpStatus (status));
++							 status, "%s", httpStatus (status));
+ 	} else {
+ 		g_warning ("Neither request nor output_fd set");
+ 		if (request->error != NULL)
+-- 
+1.8.3.1
+
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch
new file mode 100644
index 000000000000..3383cde16786
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch
@@ -0,0 +1,94 @@
+From 14979a2356fd751d82d037db65ce92072097bbf3 Mon Sep 17 00:00:00 2001
+From: Kjartan Maraas <kmaraas@gnome.org>
+Date: Wed, 30 Jan 2008 17:30:43 +0000
+Subject: [PATCH] Fix some warnings. Fix wrong order of arguments to
+ g_list_find_custom.
+
+2008-01-30  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* libgnomecups/gnome-cups-printer.c: (set_timeout),
+	(gnome_cups_printer_get_state_name),
+	(_gnome_cups_printer_get_host): Fix some warnings.
+	* libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job):
+	Fix wrong order of arguments to g_list_find_custom.
+
+svn path=/trunk/; revision=237
+---
+ ChangeLog                         |    8 ++++++++
+ libgnomecups/gnome-cups-printer.c |    7 +++----
+ libgnomecups/gnome-cups-queue.c   |    4 ++--
+ 3 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index b41ac9e..166c87a 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,11 @@
++2008-01-30  Kjartan Maraas  <kmaraas@gnome.org>
++
++	* libgnomecups/gnome-cups-printer.c: (set_timeout),
++	(gnome_cups_printer_get_state_name),
++	(_gnome_cups_printer_get_host): Fix some warnings.
++	* libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job):
++	Fix wrong order of arguments to g_list_find_custom.
++
+ 2008-01-18  Gil Forcada  <gforcada@gnome.org>
+ 
+ 	* configure.in: Added mk, tr and zh_HK to ALL_LINGUAS.
+diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c
+index 9c5c7d3..704f205 100644
+--- a/libgnomecups/gnome-cups-printer.c
++++ b/libgnomecups/gnome-cups-printer.c
+@@ -791,7 +791,7 @@ set_timeout (void)
+ 
+ 	if (should_timeout && !update_timeout_id) {
+ 		update_timeout_id = g_timeout_add (UPDATE_TIMEOUT, 
+-						   update_printers_timeout,
++						   (GSourceFunc)update_printers_timeout,
+ 						   NULL);
+ 	} else if (!should_timeout && update_timeout_id) {
+ 		g_source_remove (update_timeout_id);
+@@ -1069,7 +1069,6 @@ gnome_cups_printer_get_state (GnomeCupsPrinter *printer)
+ const char *
+ gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer)
+ {
+-	const char *state_str;
+ 	ipp_pstate_t state;
+ 
+ 	g_return_val_if_fail (GNOME_CUPS_IS_PRINTER (printer), NULL);
+@@ -1079,7 +1078,7 @@ gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer)
+ 
+ 	state = printer->details->state;
+ 
+-	return state_str =  _(printer_state_strings[state - IPP_PRINTER_IDLE]);
++	return _(printer_state_strings[state - IPP_PRINTER_IDLE]);
+ }
+ 
+ const char *
+@@ -2001,7 +2000,7 @@ _gnome_cups_printer_get_host (GnomeCupsPrinter *printer)
+ {
+ 	gchar *host = NULL;
+ 
+-#warning this is broken for smb://user:pass@host/printer urls
++	/* warning this is broken for smb://user:pass@host/printer urls */
+ 	if (go_directly_to_printer_when_possible &&
+ 	    printer->details->printer_uri) {
+ 		gchar *x, *y;
+diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c
+index d9b9a92..9f98ed9 100644
+--- a/libgnomecups/gnome-cups-queue.c
++++ b/libgnomecups/gnome-cups-queue.c
+@@ -413,8 +413,8 @@ gnome_cups_queue_get_job (GnomeCupsQueue *queue,
+ {
+ 	if (cache_ok) {
+ 		GList *link = g_list_find_custom (queue->details->jobs,
+-						  (GCompareFunc) find_job_by_id,
+-						  GINT_TO_POINTER (job_id));
++						  GINT_TO_POINTER (job_id),
++						  (GCompareFunc) find_job_by_id);
+ 		if (link)
+ 			return gnome_cups_job_dup (link->data);
+ 	}
+-- 
+1.7.8.4
+
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
new file mode 100644
index 000000000000..3f73af861c04
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch
@@ -0,0 +1,38 @@
+From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Sun, 27 Nov 2011 21:36:41 +0100
+Subject: [PATCH] Fix: Only glib.h can be included
+
+---
+ libgnomecups/gnome-cups-i18n.c |    2 +-
+ libgnomecups/gnome-cups-init.h |    3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c
+index 8987c5c..127756d 100644
+--- a/libgnomecups/gnome-cups-i18n.c
++++ b/libgnomecups/gnome-cups-i18n.c
+@@ -1,5 +1,5 @@
+ #include <config.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gnome-cups-i18n.h"
+ 
+ #ifdef ENABLE_NLS
+diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h
+index 22b682a..c4600fc 100644
+--- a/libgnomecups/gnome-cups-init.h
++++ b/libgnomecups/gnome-cups-init.h
+@@ -1,8 +1,7 @@
+ #ifndef GNOME_CUPS_INIT
+ #define GNOME_CUPS_INIT
+ 
+-#include <glib/gtypes.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+-- 
+1.7.7
+
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch
new file mode 100644
index 000000000000..b682e450746a
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch
@@ -0,0 +1,13 @@
+--- libgnomecups-0.2.2.orig/libgnomecups/gnome-cups-printer.c
++++ libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c
+@@ -510,6 +510,10 @@
+ 	num_dests = cups_get_dests (filename, num_dests, dests);
+ 	g_free (filename);
+ 
++	filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions", NULL);
++	num_dests = cups_get_dests (filename, num_dests, dests);
++	g_free (filename);
++
+ 	return num_dests;
+ }
+ 
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch
new file mode 100644
index 000000000000..8fe6502a6f38
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- libgnomecups-1.0.pc.in~	2007-01-02 01:18:51.000000000 +0100
++++ libgnomecups-1.0.pc.in	2011-05-08 13:21:35.000000000 +0200
+@@ -7,5 +7,6 @@
+ Description: GNOME CUPS Library
+ Version: @VERSION@
+ Requires: glib-2.0 gobject-2.0
+-Libs: -L${libdir} -lgnomecups-1.0 @CUPS_LIBS@
++Libs: -L${libdir} -lgnomecups-1.0
++Libs.private: -L${libdir} -lgnomecups-1.0 @CUPS_LIBS@
+ Cflags: -I${includedir} @CUPS_CFLAGS@
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
new file mode 100644
index 000000000000..dcd57e766a8f
--- /dev/null
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME cups library"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2:2
+	>=net-print/cups-1.3.8
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.28
+	gnome-base/gnome-common
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/enablenet.patch
+
+	# Fix .pc file per bug #235013
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+
+	# Upstream fix for g_list_find_custom() argument order
+	epatch "${FILESDIR}/${P}-g_list_find_custom.patch"
+
+	# >=glib-2.31 compat, bug #400789, https://bugzilla.gnome.org/show_bug.cgi?id=664930
+	epatch "${FILESDIR}/${P}-glib.h.patch"
+
+	# cups-1.6 compat, bug #428812
+	epatch "${FILESDIR}/${P}-cups-1.6.patch"
+
+	eautoreconf # To fix intltool files making LINGUAS to be honored
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
new file mode 100644
index 000000000000..8e2ff2f77e14
--- /dev/null
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2 multilib-minimal
+
+DESCRIPTION="GNOME cups library"
+HOMEPAGE="https://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.28
+	gnome-base/gnome-common
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/enablenet.patch
+
+	# Fix .pc file per bug #235013
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+
+	# Upstream fix for g_list_find_custom() argument order
+	epatch "${FILESDIR}/${P}-g_list_find_custom.patch"
+
+	# >=glib-2.31 compat, bug #400789, https://bugzilla.gnome.org/show_bug.cgi?id=664930
+	epatch "${FILESDIR}/${P}-glib.h.patch"
+
+	# cups-1.6 compat, bug #428812
+	epatch "${FILESDIR}/${P}-cups-1.6.patch"
+
+	# so it looks for cups-config... how about using $CUPS_CONFIG then?
+	# and also use AC_PATH_TOOL to respect $CHOST
+	epatch "${FILESDIR}/${P}-cups-config.patch"
+
+	# Fix building with -Werror=format-security, bug #517612
+	epatch "${FILESDIR}/${P}-format-string.patch"
+
+	# Look for lpoptions in the right spot, upstream bug #520449
+	epatch "${FILESDIR}/${P}-lpoptions.patch"
+
+	eautoreconf # To fix intltool files making LINGUAS to be honored
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --disable-static
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/net-print/libgnomecups/metadata.xml b/net-print/libgnomecups/metadata.xml
new file mode 100644
index 000000000000..0d5df29788c2
--- /dev/null
+++ b/net-print/libgnomecups/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
new file mode 100644
index 000000000000..7b8f29fed7a7
--- /dev/null
+++ b/net-print/libinklevel/Manifest
@@ -0,0 +1,12 @@
+AUX libinklevel-0.8.0-automagicdebug.patch 671 SHA256 916a2f6f3bef57d62fbf0f9283ee8487ea4596f7f9eb009cd3749479cbfabd8c SHA512 1c3cc70e969dfa1cd574e27566a92f7dff82638256c5ac87f6eb6ba847666510f2616e54637a9cfd7a9a9c05ad9b4f279a0fd2c513e725d824f858cff1c298da WHIRLPOOL 005ee0fc25a69f95c7ec1afec7b725f24702c5d4fe55bd123e0dedcc6dc07db77b9fa54d1811409d01ef0761874b81ae545d5111e8ae1869aa63e7420cc89af4
+DIST libinklevel-0.8.0.tar.gz 326397 SHA256 1442cdb34c528b5c50d3cd8cb19eb07054a773de755aca0c4073346b8f1de3be SHA512 bc521a97eafe0b0b73a907e522ef3af6ce404c5b8f44ddb3765ee7c388a67f93392a623c7987053e31411d7d9e247065463c2eeaa77e5fcd70c13b915c36d30e WHIRLPOOL ab1a2d5a4bf95907749b6770d57dfe47bce8f18887ac01d9cedc4667a7428a30ffcd0203a6b6d72b17fef3019bf2004fd46c78e25d26b9150c3422d1496183db
+DIST libinklevel-0.9.0.tar.gz 367521 SHA256 380df78fb814add2e1c63bd5db0a169e8eea1d1378d9e1bef6a3879124384d61 SHA512 23ff9a0f959aff953006a51d1bced235be57dee7bf4046147cdec85525b8d8003d3d3d22bd116b7a3adf3620b10002f736e0156968c78224bccab63505bc5b49 WHIRLPOOL 8c5ce8219a763a0312c6fea33147c044a2559ed77de164cac1284e4ca391533211cad44ca13208afb122f369316deffdb305627713cec187f0b4921dd6fa8266
+DIST libinklevel-0.9.1.tar.gz 367651 SHA256 3916dca5af4b9719fca65d4ff74e25a59ae6516c303e7b832a934af1fedef395 SHA512 c21ac2ed2949777dcca0f2258de8e0bf565b429b579d6b2c6c7bdb218935b9b7c88e891b240996c4c5274bb7bc8f5796bd9bb1f90b89d9b09580ab8fb9dd067a WHIRLPOOL 22ea11a82786d70ff465a03e556238afe7b4c47bf24a787aa239cff99f566cfc4016a3b27d6d65ed859b5ebc39e3bae3d86c61b01749fc2ba6e5ad7c4b34baba
+DIST libinklevel-0.9.2.tar.gz 367928 SHA256 08178fb57cdab44ffa9135a76948604d7f5d1756f44ca9c190b3d3e693e3bc63 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59 WHIRLPOOL 62894ed4010c96e244ce09d6d666288b77b6d041ad612787167511f311db5e8a31ddfb1dce714c7f306d765119c64f5f251dd6116563bdd285b4c49cf6216ecc
+EBUILD libinklevel-0.8.0-r1.ebuild 870 SHA256 25ecb6510d5344c28d0b410a3c14a2fb714129d20a6756b4cf4cd523501983be SHA512 95b0a044f1fe928a03e3504baf365837b5cb845811680d62400b4a10be1abfa1cdc5c05905f708e81a5488777e83c40b6a355c998517171996693f970d1c6eac WHIRLPOOL a456deaeb05156260fda7d9dcb94ae4ebfaddef45b6f2a48f7d92ee9cbbfecf47f6bb7280f2b1458c584e4b16150b8e1e5415435de56480d1e30f739ac13cd63
+EBUILD libinklevel-0.9.0.ebuild 842 SHA256 db1ae30272cc7e57ba1f9ff9ecf62b65af6ae06e57f9b5490246ef8fad9058d6 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200 WHIRLPOOL 86d116f6270a875c104d7cbf6e20afdd1504d9e741be3cab32359f4612f28520a59683201461ea4a725ae29a5a9c6222a522cfca0319abad5fee208f2f05270a
+EBUILD libinklevel-0.9.1.ebuild 842 SHA256 db1ae30272cc7e57ba1f9ff9ecf62b65af6ae06e57f9b5490246ef8fad9058d6 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200 WHIRLPOOL 86d116f6270a875c104d7cbf6e20afdd1504d9e741be3cab32359f4612f28520a59683201461ea4a725ae29a5a9c6222a522cfca0319abad5fee208f2f05270a
+EBUILD libinklevel-0.9.2.ebuild 842 SHA256 db1ae30272cc7e57ba1f9ff9ecf62b65af6ae06e57f9b5490246ef8fad9058d6 SHA512 4ef23488bdd40f970e88ca717ddabb0771d9b46dc17dd0938d1ddab9b5364ae22ad7fee5bed58f3c70e779a9fea01d529b36de881597685a36962570f04ea200 WHIRLPOOL 86d116f6270a875c104d7cbf6e20afdd1504d9e741be3cab32359f4612f28520a59683201461ea4a725ae29a5a9c6222a522cfca0319abad5fee208f2f05270a
+MISC ChangeLog 2677 SHA256 98ea09552717146941e74b5b944f4e1495bfddde235b7c702758da05d7f72ddf SHA512 3ea2046b63d9906a50863597cd7925c3dde4211e783105788df551bb080107c84b45d4ce13136564f569eadf0e2ea5df4eabecb7c579339b19aced76c9636fb0 WHIRLPOOL 99dc0ac96e7136bdf8436e8f07f399e5a9033afe03a1611972197d9e40ba74e5eb472463266af03f5968843016b91010ca5630675831c4b7ae2dfd97489107cd
+MISC ChangeLog-2015 4231 SHA256 f9448f37f00e481ba74d304927b3e9ec89cdebea6141c1e8d9700725b168a33e SHA512 6129307ba09d99435228937d871b737fb84a6444d902b069f3d3d0a14f889a1f83ba82f4b7b55fbf01d35c7a9c7bb62f3beb70815dda0dc6f7b87b2251bddf06 WHIRLPOOL 64edfe26281ad8af7de61fb55c978773bfaf711f614770388bfddf5dcfa4e46dd3e67edbde32ec24304a8a77ad85a13e4c61a54917b2161cc66d6212a224a74b
+MISC metadata.xml 340 SHA256 ceadf01dff1b27a97c722feb805825a9b7324f9eb03d9d289b4523ac90ff2173 SHA512 d801f16f230f2e7bd5173ea283205cf0666928a447edbc68221dda7f221c220d453cd3500af6d3577b12e898af713ae2843718848a941802a9ce84ecc5127dc8 WHIRLPOOL 4c72081e0a5f4743b405dc4ecef850c96eb130afbccd28ff9bcc3659a3b3e9faa6517ee4a323773916c41e7c676b27cfb70675582cc146ec172c0eb5c75aba90
diff --git a/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch b/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch
new file mode 100644
index 000000000000..68af9e102f9d
--- /dev/null
+++ b/net-print/libinklevel/files/libinklevel-0.8.0-automagicdebug.patch
@@ -0,0 +1,20 @@
+--- configure.in	2010-03-28 22:11:26.000000000 +0300
++++ configure.in.fixed	2010-03-28 22:18:14.000000000 +0300
+@@ -16,9 +16,14 @@
+ 
+ ## Determine hostname & OS
+ ## AC_CANONICAL_HOST
+-
+-AC_ARG_ENABLE([debug], [  --enable-debug	  enable debugging output], 
+-	      AC_DEFINE(DEBUG, 1, [enable debugging output]))
++AC_ARG_ENABLE(debug,
++              [  --enable-debug         Enable debugging output if available (default=no)],
++              [ case "${enableval}" in
++             yes|"") enabled=yes; AC_DEFINE(DEBUG, 1, [enable debugging output]) ;;
++             no) ;;
++             *) ;;
++    esac],
++)
+ 
+ ## Check for programs
+ ## we want libtool to build our libs
diff --git a/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild b/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..d220441aa0ea
--- /dev/null
+++ b/net-print/libinklevel/libinklevel-0.8.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit autotools eutils
+
+MY_P="${P/_/}"
+DESCRIPTION="A library to get the ink level of your printer"
+HOMEPAGE="http://libinklevel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+LICENSE="GPL-2"
+IUSE="debug"
+
+DEPEND=">=sys-libs/libieee1284-0.2.11"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagicdebug.patch
+	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
+		|| die "Failed to disable installation of docs"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+	rm "${D}"/usr/lib/libinklevel.la
+}
diff --git a/net-print/libinklevel/libinklevel-0.9.0.ebuild b/net-print/libinklevel/libinklevel-0.9.0.ebuild
new file mode 100644
index 000000000000..4d84a588e9cf
--- /dev/null
+++ b/net-print/libinklevel/libinklevel-0.9.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib
+
+MY_P="${P/_/}"
+DESCRIPTION="A library to get the ink level of your printer"
+HOMEPAGE="http://libinklevel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+IUSE="debug static-libs"
+
+DEPEND=">=sys-libs/libieee1284-0.2.11
+	virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
+		|| die "Failed to disable installation of docs"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README
+	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
+}
diff --git a/net-print/libinklevel/libinklevel-0.9.1.ebuild b/net-print/libinklevel/libinklevel-0.9.1.ebuild
new file mode 100644
index 000000000000..4d84a588e9cf
--- /dev/null
+++ b/net-print/libinklevel/libinklevel-0.9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib
+
+MY_P="${P/_/}"
+DESCRIPTION="A library to get the ink level of your printer"
+HOMEPAGE="http://libinklevel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+IUSE="debug static-libs"
+
+DEPEND=">=sys-libs/libieee1284-0.2.11
+	virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
+		|| die "Failed to disable installation of docs"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README
+	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
+}
diff --git a/net-print/libinklevel/libinklevel-0.9.2.ebuild b/net-print/libinklevel/libinklevel-0.9.2.ebuild
new file mode 100644
index 000000000000..4d84a588e9cf
--- /dev/null
+++ b/net-print/libinklevel/libinklevel-0.9.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib
+
+MY_P="${P/_/}"
+DESCRIPTION="A library to get the ink level of your printer"
+HOMEPAGE="http://libinklevel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+IUSE="debug static-libs"
+
+DEPEND=">=sys-libs/libieee1284-0.2.11
+	virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
+		|| die "Failed to disable installation of docs"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README
+	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
+}
diff --git a/net-print/libinklevel/metadata.xml b/net-print/libinklevel/metadata.xml
new file mode 100644
index 000000000000..2ae8f556b809
--- /dev/null
+++ b/net-print/libinklevel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libinklevel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/lm1100/Manifest b/net-print/lm1100/Manifest
new file mode 100644
index 000000000000..8a1bbc711595
--- /dev/null
+++ b/net-print/lm1100/Manifest
@@ -0,0 +1,11 @@
+AUX lm1100-1.0.2a-class.patch 709 SHA256 5c1543a644e22c38fac3190bea7e344640c9fe335aafe2b3137df8d952d1aced SHA512 1e738e9f6ccf16d9e8afa07c488003b599282578452e793331c2aa9a7c96ba6c4e24044dde503051606d56efef3df8e540b62ccb78687d3b8188e0ecb1b16d58 WHIRLPOOL 22d1387339013c5b639eb462e1992b1e1eb1d3712bf10af9979dcdb705ed31c53118ddfca554304f2240303c97c5d8e5dc1834cdf5b4da1fa2e5134cf326dcb9
+AUX lm1100-1.0.2a-fix-compile-gcc-3.4.patch 866 SHA256 4a7ab49fe2157b1c53e9d7a81a9f929d570e8d255eb2f226aa44c334aa93e076 SHA512 56cfcdcf866bc2a3ea148ffafb574a811bc3ff2920c7b9155f54d6ea5c00b66383ef083cca5e12391c74ed189e59e0b959582ccc88aecb4b3dbe9c3596639467 WHIRLPOOL 6d70166d7e851eaa5a4a8304334731600b5aeacaecfa554be4990835ae732fd20a2bae190ff9637e69a28e86e79cbda5c3e2fd67c4215d947bc0d3300cab6e68
+AUX lm1100-1.0.2a-fix-compile-gcc-4.1.patch 2453 SHA256 6d733e754b5e4f8011c2d009fbac9bd6c102fc205adee8983a88341487d7ea6e SHA512 960f3fabf74c2ed65a5086d9bffc94c96f73a39b112c9f3c4f9e50ed3b8a0830589ef335c2b6a47cb5980269e29ecff21d2c4226af5c764318dac16ea95d2090 WHIRLPOOL 63212864b286ba5fe3549cf00058bbd460e2706c662f767004f8edd0eb86f3cd18c77137670f8550eb6481989e59894da10e64f8eca78035b2937a56b6a7f68a
+AUX lm1100-1.0.2a-makefile.patch 1021 SHA256 f56ed7c14cfc27fb2a26c480d51ee4bb2497c5c813bf502604bd22006fcafa65 SHA512 10b1b0bdda41793168c107f7e8ae388c5721fcfb0719d2abc80d2a90545d0a9fe91f0b8f5e27e322ce980281d5311c4635eb3147e32e13308d8d300336126067 WHIRLPOOL f3229c6e37d260e9123cf9c14260b68e0ab885e20aaba2941523853cd09920f659b6487cc76f066a28562b48637a4bd2b58e1dd48ac730f2dfe2b80ed13934a8
+AUX lm1100maint-firmware.patch 638 SHA256 15448ea5604cdd7ff1baa04a5831477432bdfdf4219916cc5fcd90e8342ceaf6 SHA512 7605373b4777a5b880944d38b318144d8dab18f337080bbba3e6e164ab0c8285a648fc57659fe1efa77053db9af748f96c3c4bf98d114ec70306cf65a027409f WHIRLPOOL 1ba67dc8483a4a97bd48fec716bff292ee26f188e9e9eedd1ff375666a51d93dc6acca993645bb0ab8b22961f29862f2f31c6c070b51cb2807d1f22229df1804
+DIST lm1100.1.0.2a.tar.gz 64316 SHA256 680da0b4a7decef197fa833a57b85e66aa2ec0d67fbcd4345c426fdaca6412fb SHA512 3dda80602af99d93a570e066ca2a121afd93b28b5d28b6f49b52c2c90e288de7b87cefdd5e00bf4edd73439fb6088433fabe884b841befd24183f27a12fcbcb1 WHIRLPOOL b57fc0191d43b66d5c7660c190098d0e09543bfdf86d2f1571ca90f1918dab568489eec437b44468ceeb6fe749b36377484a584a7ce67119177a88a321c630f6
+DIST lm1100maint.tar.gz 708 SHA256 832586bd028e2516f62651bb8e23ced87ea2714831156b1a069231a34971281d SHA512 fe81351705c36dd30e01d402461820ed583d2a8222af8dd81f4dff35c6629592e09fb6dbc0740b9ba0f555de65aeae41c0cb953fbedd0c8620db29b37d797b02 WHIRLPOOL 1d75b48678db43aad319031f6afdd77004a7ee7c9a53101bd4079c3e10255bf163b0776eaf94b076aff3149ea6306929dd65bafd6c2b27f8f174f0fe6980b96e
+EBUILD lm1100-1.0.2a-r1.ebuild 1132 SHA256 c8b4579780ccc41af6e5b5e83b2cfc9a915bd77f20d4c9463928763d59f241d1 SHA512 66faf7c1704f79a5dc9c03ddce75cf070e6a2ccbd35269b06f094904254f39a60fb053e85c5f432fe6423c272cb2f4b3397d7eaccbe5d4d4ecb9b4264d645999 WHIRLPOOL 4168ad112bcfbf562f4a456e656e1d801e61f291960a8f5390369d60f152d022b2600f19ecd926dae8aedb6e6c0760f211b21459a2826bca62e66378c927fd5b
+MISC ChangeLog 2738 SHA256 531445f71c7b5f4abe5ec5aa0f39901cb2f06625f5823608d0a891d208f6a5ce SHA512 100065451f4ab343f25a7f19990b7642ba90d49c4786bbd8a8fe022cb0e2edafc98a012b83ebd810adb089c9a9b586f0b3d65c3fe902bdedd91c2746813180cb WHIRLPOOL 50ef2c7478af396cae8cec9b151ef65cfaf4cb24b4122213b9be024fad10f103a6282dca46a6cc9c3563c3736d485af9d723878fec32b5bb0b44734e11f4ecaa
+MISC ChangeLog-2015 1187 SHA256 356712945e2b1063a1669294472bd625669aaef2f0306960f33c2195ce0c8c59 SHA512 b2999d6470a7d9d14153790776e5da9b32ca143addd3d189c7242857a6cb41eae2de0ba0fe2f990f73249c1b48bee6725597f0b96b256a19549907723c4cd321 WHIRLPOOL 299397ec4fc935a7af56bbcb3cc99f2482c9699dae5e22c64136c1a26eba06d9a7056ed12888463e1b04ea22774f5b8410edf1ca47201b74c0be0c8ac5c35159
+MISC metadata.xml 238 SHA256 0556ecc8da649a50d4d2b33d7f5ca5963b19f18e7088a0159eccd27fa2a0fbf0 SHA512 719a406392f802cb889fcd4b266bc1ecd571529c917b167273d04ad34c2d530ac4c7aa314a9fee7bbe12f497ad2bd0ae45778ac604584500a7e35a745da3749a WHIRLPOOL 868744adfbc9fb329824cc0b5ce353d5d1a3018e5016c6096a467bffc2eb83c1c6fc151d9bd9d7404299e21c34f0201b124a8c6a82ebabd6099bb299b6c689f6
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-class.patch b/net-print/lm1100/files/lm1100-1.0.2a-class.patch
new file mode 100644
index 000000000000..b771e1bf1449
--- /dev/null
+++ b/net-print/lm1100/files/lm1100-1.0.2a-class.patch
@@ -0,0 +1,24 @@
+diff -ur lm1100.1.0.2a~/PaintLine300c.h lm1100.1.0.2a/PaintLine300c.h
+--- lm1100.1.0.2a~/PaintLine300c.h	2006-06-22 15:14:36.000000000 +0200
++++ lm1100.1.0.2a/PaintLine300c.h	2006-06-22 15:14:55.000000000 +0200
+@@ -32,7 +32,7 @@
+ 	int size;
+ 	int x,y;
+ 
+-	friend LexmarkProtocol300c;
++	friend class LexmarkProtocol300c;
+ 
+  public:
+ 	void pad(int pad_amount);
+diff -ur lm1100.1.0.2a~/PaintLineBW.h lm1100.1.0.2a/PaintLineBW.h
+--- lm1100.1.0.2a~/PaintLineBW.h	2006-06-22 15:14:36.000000000 +0200
++++ lm1100.1.0.2a/PaintLineBW.h	2006-06-22 15:14:55.000000000 +0200
+@@ -33,7 +33,7 @@
+ 	int size;
+ 	int x,y;
+ 
+-	friend LexmarkProtocolBW;
++	friend class LexmarkProtocolBW;
+ 	
+  public:
+ 	void pad(int pad_amount);
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch
new file mode 100644
index 000000000000..60e1b5c2e7a3
--- /dev/null
+++ b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-3.4.patch
@@ -0,0 +1,22 @@
+--- LexmarkProtocol300c.cc.orig	2000-11-21 09:06:22.000000000 +0100
++++ LexmarkProtocol300c.cc	2004-06-16 13:28:04.397060286 +0200
+@@ -69,7 +69,7 @@
+ Jet **LexmarkProtocol300c::createJets(int *numJets, Map *imageMap)
+ {
+ 	*numJets = 6;
+-	class Jet **jets = new (Jet *)[6];
++	class Jet **jets = new Jet*[6];
+ 	jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,8);
+ 	jets[1] = new Jet(1,0,0,imageMap,RIGHT_JET,0,8);
+ 	jets[2] = new Jet(2,-9,20,imageMap,LEFT_JET,1,8);
+--- LexmarkProtocolBW.cc.orig	2000-11-21 09:06:22.000000000 +0100
++++ LexmarkProtocolBW.cc	2004-06-16 13:32:51.291509280 +0200
+@@ -68,7 +68,7 @@
+ Jet **LexmarkProtocolBW::createJets(int *numJets, Map *imageMap)
+ {
+ 	*numJets = 2;
+-	class Jet **jets = new (Jet *)[2];
++	class Jet **jets = new Jet*[2];
+ 	jets[0] = new Jet(0,9,0,imageMap,LEFT_JET,0,28);
+ 	jets[1] = new Jet(0,0,0,imageMap,RIGHT_JET,0,28);
+ 
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch
new file mode 100644
index 000000000000..bc797a09a44b
--- /dev/null
+++ b/net-print/lm1100/files/lm1100-1.0.2a-fix-compile-gcc-4.1.patch
@@ -0,0 +1,73 @@
+diff -ru lm1100.1.0.2a~/Jet.h lm1100.1.0.2a/Jet.h
+--- lm1100.1.0.2a~/Jet.h	2006-12-02 18:48:16.000000000 +0100
++++ lm1100.1.0.2a/Jet.h	2006-12-02 18:49:54.000000000 +0100
+@@ -45,7 +45,7 @@
+ 	Coord imageStart;  // start of image from edge of paper
+ 
+ 	bool insideImage(int x, int y);
+-	bool Jet::needsPainting(int ix, int iy, int bit);
++	bool needsPainting(int ix, int iy, int bit);
+ 	
+  public:
+ 	/* Range of paper jet covers when head is at 0,0 */
+@@ -54,7 +54,7 @@
+ 	/* Range of paper jet needs to cover to get the entire image */
+ 	void getImageRange(Rect *dest);
+ 	Coord *getPreferredImageStart(Coord *start);
+-	int Jet::getPreferredEnd();
++	int getPreferredEnd();
+ 	bool finished();
+ 	void setImageStart(Coord *imageStart);
+ 	void paint(int startX, int endX, int y, class LexmarkProtocol *protocol);
+diff -ru lm1100.1.0.2a~/LinkedList.h lm1100.1.0.2a/LinkedList.h
+--- lm1100.1.0.2a~/LinkedList.h	2006-12-02 18:48:16.000000000 +0100
++++ lm1100.1.0.2a/LinkedList.h	2006-12-02 18:49:54.000000000 +0100
+@@ -26,8 +26,8 @@
+ 	void *object;
+ 	LinkedList *next;
+ 
+-	LinkedList::LinkedList();
+-	LinkedList::LinkedList(void * object);
++	LinkedList();
++	LinkedList(void * object);
+ };
+ 
+ #endif
+diff -ru lm1100.1.0.2a~/Map.h lm1100.1.0.2a/Map.h
+--- lm1100.1.0.2a~/Map.h	2006-12-02 18:48:16.000000000 +0100
++++ lm1100.1.0.2a/Map.h	2006-12-02 18:49:54.000000000 +0100
+@@ -41,7 +41,7 @@
+ 	int height; /* height of map in cells */
+ 
+ 	Map(int width, int height, int cellSize);
+-	Map::~Map();
++	~Map();
+ 
+ 	void cacheLines(int start, int len);
+ 	void addAlgorithm(MapAlgorithm *algorithm);
+diff -ru lm1100.1.0.2a~/PPMRaw.h lm1100.1.0.2a/PPMRaw.h
+--- lm1100.1.0.2a~/PPMRaw.h	2006-12-02 18:48:16.000000000 +0100
++++ lm1100.1.0.2a/PPMRaw.h	2006-12-02 18:49:54.000000000 +0100
+@@ -32,7 +32,7 @@
+ 
+  public:
+ 	PPMRaw(Reader *reader,bool readMagic);
+-	static void PPMRaw::readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic);
++	static void readHeader(int *width, int *height, int *maxval, Reader *reader, bool readMagic);
+ 	
+ 	virtual void getRGB(RGB *rgb, int x, int y);
+ 
+diff -ru lm1100.1.0.2a~/Rect.h lm1100.1.0.2a/Rect.h
+--- lm1100.1.0.2a~/Rect.h	2006-12-02 18:48:16.000000000 +0100
++++ lm1100.1.0.2a/Rect.h	2006-12-02 18:49:54.000000000 +0100
+@@ -23,8 +23,8 @@
+ class Rect
+ {
+  public:
+-	Rect::Rect();
+-	Rect::Rect(int x, int y, int width, int height);
++	Rect();
++	Rect(int x, int y, int width, int height);
+ 	
+ 	int x,y,width,height;
+ 
diff --git a/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
new file mode 100644
index 000000000000..b1f0a2ac4913
--- /dev/null
+++ b/net-print/lm1100/files/lm1100-1.0.2a-makefile.patch
@@ -0,0 +1,35 @@
+--- lm1100.1.0.2a~/Makefile	2001-02-26 01:40:16.000000000 +0100
++++ lm1100.1.0.2a/Makefile	2006-10-23 19:01:57.000000000 +0200
+@@ -7,17 +7,19 @@
+ VERSION=lm1100.1.0.2a
+ TARFILES = $(FILES:%=$(VERSION)/%)
+ 
+-CC = g++ -O2
++CXX?=g++
++CXXFLAGS?= -O2
++#CC = g++ -O2
+ #CC = g++ -g
+ 
+ lm1100: $(OBJS)
+-	$(CC) -o lm1100 $(OBJS) $(LIBS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o lm1100 $(OBJS) $(LIBS)
+ 
+ bufcat: SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o
+-	$(CC) -o bufcat SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o -lpthread
++	$(CXX) $(CXXFLAGS) -o bufcat SpongeWriter.o ThreadSafeCircleBuffer.o bufcat.o -lpthread
+ 
+ leak: $(OBJS)
+-	$(CC) -o lm1100 $(OBJS) $(LIBS) /usr/local/LeakTracer/LeakTracer.o
++	$(CXX) $(CXXFLAGS) -o lm1100 $(OBJS) $(LIBS) /usr/local/LeakTracer/LeakTracer.o
+ 
+ tarball: $(FILES)
+ 	rm $(VERSION);ln -s . $(VERSION);tar -cf - $(TARFILES) | gzip > $(VERSION).tar.gz
+@@ -27,7 +29,7 @@
+ 	rm *.o
+ 
+ %.o:	%.cc
+-	$(CC) $(DEFINES) -c $<
++	$(CXX) $(CXXFLAGS) $(DEFINES) -c $<
+ 
+ TAGS: $(SRCS)
+ 	etag $(SRCS)
diff --git a/net-print/lm1100/files/lm1100maint-firmware.patch b/net-print/lm1100/files/lm1100maint-firmware.patch
new file mode 100644
index 000000000000..5c3f4c92ea86
--- /dev/null
+++ b/net-print/lm1100/files/lm1100maint-firmware.patch
@@ -0,0 +1,14 @@
+diff -ur lm1100maint~/lm1100back lm1100maint/lm1100back
+--- lm1100maint~/lm1100back	2006-06-26 19:48:51.000000000 +0200
++++ lm1100maint/lm1100back	2006-06-26 19:50:41.000000000 +0200
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-dd if=/usr/share/lm1100maint/lexmarkback of=/dev/lp0
++dd if=/usr/share/lm1100/lexmarkback of=/dev/lp0
+diff -ur lm1100maint~/lm1100change lm1100maint/lm1100change
+--- lm1100maint~/lm1100change	2006-06-26 19:48:51.000000000 +0200
++++ lm1100maint/lm1100change	2006-06-26 19:50:55.000000000 +0200
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-dd if=/usr/share/lm1100maint/lexmarkchange of=/dev/lp0
++dd if=/usr/share/lm1100/lexmarkchange of=/dev/lp0
diff --git a/net-print/lm1100/lm1100-1.0.2a-r1.ebuild b/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
new file mode 100644
index 000000000000..507c39e260d8
--- /dev/null
+++ b/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The Tim Engler's Lexmark 1100 driver"
+HOMEPAGE="http://www.linuxprinting.org/show_driver.cgi?driver=lm1100"
+MY_P=${P/lm1100-/lm1100.}
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz
+	mirror://gentoo/${PN}maint.tar.gz"
+#http://www.linuxprinting.org/download/printing/${PN}/${PN}maint.tar.gz
+#http://www.linuxprinting.org/download/printing/${PN}/${MY_P}.tar.gz
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND=""
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-compile-gcc-3.4.patch"\
+		"${FILESDIR}/${P}-fix-compile-gcc-4.1.patch"\
+		"${FILESDIR}/${P}-class.patch"\
+		"${FILESDIR}/${P}-makefile.patch"
+	cd "${WORKDIR}/${PN}maint" || die
+	epatch "${FILESDIR}/${PN}maint-firmware.patch"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	dobin lm1100
+	dodoc README RELEASE.txt
+
+	cd "${WORKDIR}/${PN}maint" || die
+	dobin lm1100back lm1100change
+	insinto "/usr/share/${PN}"
+	doins lexmarkback lexmarkchange
+	newdoc README README.maint
+}
diff --git a/net-print/lm1100/metadata.xml b/net-print/lm1100/metadata.xml
new file mode 100644
index 000000000000..8f24252f25d3
--- /dev/null
+++ b/net-print/lm1100/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>The Tim Engler's Lexmark 1100 driver</longdescription>
+</pkgmetadata>
diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
new file mode 100644
index 000000000000..06f44fe0b2b3
--- /dev/null
+++ b/net-print/lprng/Manifest
@@ -0,0 +1,10 @@
+AUX lprng-3.8.27-certs.diff 1120 SHA256 5e824162b235375337a421876ce543e28f53b4d25f790d6747af73807d060f68 SHA512 14d88ff3a78632f5f3ef69fd64a20adc745ca1169b3b7dc57d0374f279946b1be5c60e29370e1513222ebd1055d5840e8e3e843166e958be70119b42cbdfb4de WHIRLPOOL 56c91bc03a0f70a728fe1b86931a176dba73416ba685a771f4e081838d79a05dc0464e7e3b8408d5103d2d4429563528b05c6a0beb0d47b398282950949e9a72
+AUX lprng-3.8.28-krb.diff 428 SHA256 265955a2c521bab8c3f5a12da9b148a0558015fdcc299400361941f0e95b7a77 SHA512 70d7ea3d86d361d402063099e77aeb3d5dfc6e68823e2d00cfa1d3551d6a463a11ec736195d803faccf52dd82cc1965f4164d33536c794aab46b28bfd8f64788 WHIRLPOOL f118f064e29a93ae4b12be7ff134466e72d648a59f6f3544c232a8a60d2883dbc0342f12334d3fe319740c09275eebf44fe2883791ace84ffe814b0944eceeb3
+AUX lprng-3.8.28-make.diff 364 SHA256 0b52d36f0be51120489056be1064b8b44201c6d1f9f1412b51e55e7591a2dec7 SHA512 bddbcb12596daf86b9d4fdf270a57549626522081d46ae89eafa4eb4aee173a701732093646fb0f448653a94715e90eea379a7716839ec5769dea5e16c9b12f0 WHIRLPOOL 5b941c4f0e78c77080753f0c1f91ffc474c376ae9dfc5efeef9130f82b65ffe41696e4072062bcfec11206d5c83ef9a24f291dc08e5046f5a09d2a16d6a14682
+AUX lprng-init 944 SHA256 0d17c9f8db52283bae322c23ded57915c1286d27c405ab040f65f7f29a25d994 SHA512 10fbee633d27a8692f90af7f506e5144c3cbf614e9ecec6b910a590466a8c9aaf65d5778425504ac238e245d1c24e85953bb26b2a5df957f393683d2a9783cd5 WHIRLPOOL 2690bcf09a08bd689f6d0779e3376892a12b679d0c0becfcf139ea90d343d93959d26222fbe2cdf7a93a824da2fecc05ba79e587979d8716c1d5af900741efe7
+AUX printcap 551 SHA256 963014e115b4e97a95369bf0fb6022969aca0e00f1f7b0ddb777ff4d00d7aefb SHA512 f2536090359cca27c78c6f2bda89fef61dba9a0cf402364a685491c91c6ee1d7e4d693349b45a9ed576dbffcc64de0f09cb111e7cb89c844ccf68bcaa016bce9 WHIRLPOOL e933e90ae1b677215375e6882f8d028c401c3bb44a2d671bc405221217fff31ad2291f46eaa8b5fe237a819c70e2b42db4cbcdc32898e74c4ddc52bcf563c3b0
+DIST LPRng-3.8.35.tgz 12512453 SHA256 c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37 SHA512 ddebf23087b6c98c89369af26a2e46194c01243490ae47b025afde8ffcf0b1c05b9689702296c1a8aa38c2c38934df094d8cc7e922ab1ac27f51ce19f3676771 WHIRLPOOL f4806cfae0a1f08b7328fd15d4886303c678b6b20f903688cf6a11f3b245ede7ab8f2158fec01946919411858e8cd9405fcebb847b98acd78bea9effae91d415
+EBUILD lprng-3.8.35-r3.ebuild 1993 SHA256 89a6565851c4e0cc755b6d219cff885c8fbb7b361682b168c2f69f1d477c2a53 SHA512 f18b181140d20c37c0b30ba47baa7b74360d7376430ba5f6db3e02f94ca586035b86ad9aad39edb713fb797240d3fcf3710adbe3912a2b94b72016569c5043fb WHIRLPOOL 437e170154a8a11550a0cd5a72ba9985bb49915ef35c319f2ed4f32a1ec5231824992e98783072b2e8c2ed89134317eda4e98315e53c1c899c45b213df442b0f
+MISC ChangeLog 3026 SHA256 9c212b27ac1b24ff9ad3fcb8723e265750de771e31d72daca7e940c4bb55c718 SHA512 df5193fdefb8e18edde2aa76df4ff207998f1b2cc62bdaa52617a1f312098abc8e7cf44748e207069498f6518c068f7fca7301e5bc1a66d4ea5b3e51ea7ea236 WHIRLPOOL 0dbc21d6ff41b8e915596b145ab49c4788ea24748fa5a6a996a51c8b8488fb627dbced9e43d9589103b3009c790d2aa09dc2367bfe34c22961f88207ea30a1a5
+MISC ChangeLog-2015 9080 SHA256 f745c227b62cd29a66b1729ad6658d91c5f5cec778f134d7ba00ff9116f2f2cf SHA512 aa038daa34bd495c3cdb5f5d3675b72987f40f0105d876f53cfc78096d4e1872cc97196b08559dd654d15014d2e011ed0e927f211705dea5dfc59b13e2730fde WHIRLPOOL 2e2ba1a20975e5debfbce92157e86aef3f145db94537b11f3e21050e6a0f633657482f08ed52ee041fde86149610aca6ae8e9a0201af79a507432821d06ee5f3
+MISC metadata.xml 366 SHA256 637caeafdf7c66c86075f8cdff49030868960be28500c6ff142459961976a8b6 SHA512 6117e79cf777aa49a3212eea42384e1cfb8b54c3a759d8c98a89f516da2b4a503a01a0a4e785b1d030b2299bc6bf640e29cf7dfff0197605a75bf538e3dd1dd5 WHIRLPOOL eff7317aa6f05e46934ffb033d040e35caf35e9ca4f22aecda4ba8f1fc42d99a24344d0270cf22c46305ab1b50952f05117f54cccd701a83ad45d0d28e783de1
diff --git a/net-print/lprng/files/lprng-3.8.27-certs.diff b/net-print/lprng/files/lprng-3.8.27-certs.diff
new file mode 100644
index 000000000000..13b9051aea0c
--- /dev/null
+++ b/net-print/lprng/files/lprng-3.8.27-certs.diff
@@ -0,0 +1,38 @@
+--- LPRng-3.8.27/src/lprng_certs.orig	2004-12-20 00:29:21.000000000 +0100
++++ LPRng-3.8.27/src/lprng_certs.sh	2004-12-20 00:33:49.000000000 +0100
+@@ -320,7 +320,9 @@
+ # set default values
+ 
+ 
+-CFG=/tmp/$$.sslcfg
++TMPDIR=`mktemp -d -t lprng.XXXXXX` || { echo "$0: Cannot create temporary directory!" >&2 ; exit 1; }
++trap "/bin/rm -rf ${TMPDIR}" 0 1 2 3 13 15
++CFG=$TMPDIR/sslcfg
+ 
+ OPENSSL=/usr/bin/openssl
+ CA_KEY=//etc/lprng/ssl.ca/ca.key
+@@ -508,14 +510,14 @@
+ 	shift
+ 	if [ "$1" = "" ] ; then usage; fi;
+ 	if [ ! -f "$1" ] ; then useage; fi;
+-	sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >/tmp/$$.key
+-	sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >/tmp/$$.crt
+-	STEP="" encrypt /tmp/$$.key
++	sed -n -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/p' $1 >$TMPDIR/key
++	sed -e '/BEGIN.*PRIVATE KEY/,/END.*PRIVATE KEY/d' $1 >$TMPDIR/crt
++	STEP="" encrypt $TMPDIR/key 
+ 	status=$?
+ 	echo STATUS $status
+ 	if [ $status = 0 ] ; then
+ 		mv $1 $1.orig
+-		cat /tmp/$$.crt /tmp/$$.key >$1
++		cat $TMPDIR/crt $TMPDIR/key >$1
+ 	fi
+     ;;
+ 
+@@ -845,5 +847,4 @@
+     exit 1
+     ;;
+ esac
+-rm -f ${CFG}
+ exit $RET
diff --git a/net-print/lprng/files/lprng-3.8.28-krb.diff b/net-print/lprng/files/lprng-3.8.28-krb.diff
new file mode 100644
index 000000000000..76381e560d06
--- /dev/null
+++ b/net-print/lprng/files/lprng-3.8.28-krb.diff
@@ -0,0 +1,11 @@
+--- LPRng-3.8.28/src/common/krb5_auth.c.org	2004-09-24 22:19:57.000000000 +0200
++++ LPRng-3.8.28/src/common/krb5_auth.c	2006-10-13 09:19:44.000000000 +0200
+@@ -922,7 +922,7 @@
+ 		nstored = 0;
+ 	}
+ 	
+-	if ((cc = Read_fd_len_timeout(transfer_timeout, fd, len_buf, 4)) != 4) {
++	if ((cc = Read_fd_len_timeout(transfer_timeout, fd, (char*)len_buf, 4)) != 4) {
+ 		/* XXX can't read enough, pipe must have closed */
+ 		return(0);
+ 	}
diff --git a/net-print/lprng/files/lprng-3.8.28-make.diff b/net-print/lprng/files/lprng-3.8.28-make.diff
new file mode 100644
index 000000000000..66c742dd994f
--- /dev/null
+++ b/net-print/lprng/files/lprng-3.8.28-make.diff
@@ -0,0 +1,11 @@
+--- LPRng-3.8.28/Makefile.in.orig	2004-09-24 22:19:52.000000000 +0200
++++ LPRng-3.8.28/Makefile.in	2006-06-27 09:26:13.000000000 +0200
+@@ -42,7 +42,7 @@
+ LPD_CONF_PATH=\"@LPD_CONF_PATH@\"
+ PRINTCAP_PATH=\"@PRINTCAP_PATH@\"
+ LPD_PATH=\"@LPD_DIR@/lpd\"
+-SHELL="@SHELL@"
++SHELL=@SHELL@
+ LOCKFILE=\"@LOCKFILE@\"
+ CONFIG_SUBDIR="@CONFIG_SUBDIR@"
+ PSHOWALL="@PSHOWALL@"
diff --git a/net-print/lprng/files/lprng-init b/net-print/lprng/files/lprng-init
new file mode 100644
index 000000000000..115c8adf3ed7
--- /dev/null
+++ b/net-print/lprng/files/lprng-init
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/lprng/lpd.conf ] ; then
+		eerror "You need an /etc/lprng/lpd.conf file first"
+		eerror "There is a sample in  /usr/share/doc/LPRng"
+		return 1
+	fi
+	if [ ! -e /etc/lprng/printcap ] ; then
+		eerror "You need an /etc/lprng/printcap file first"
+		eerror "There is a sample in  /usr/share/doc/LPRng"
+		return 1
+	fi
+	if [ ! -e /etc/lprng/lpd.perms ] ; then
+		eerror "You need an /etc/lprng/lpd.perms file first"
+		eerror "There is  a sample in  /usr/share/doc/LPRng"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting lpd"
+	start-stop-daemon --start --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping lpd"
+	start-stop-daemon --stop --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
+	eend $?
+}
diff --git a/net-print/lprng/files/printcap b/net-print/lprng/files/printcap
new file mode 100644
index 000000000000..c851e8e2e826
--- /dev/null
+++ b/net-print/lprng/files/printcap
@@ -0,0 +1,23 @@
+# /etc/printcap: printer capability database.
+#
+# You can use the filter entries df, tf, cf, gf etc. for your
+# own filters. See the printcap(5) manpage for more details.
+
+lp|Generic dot-matrix printer entry
+        :lp=/dev/lp1
+        :sd=/var/spool/lpd/lp
+        :af=/var/log/lp-acct
+        :lf=/var/log/lp-errs
+        :pl#66
+        :pw#80
+        :pc#150
+        :mx#0
+        :sh
+
+# rlp|Remote printer entry
+#         :lp=
+#         :rm=remotehost
+#         :rp=remoteprinter
+#         :sd=/var/spool/lpd/remote
+#         :mx#0
+#         :sh
diff --git a/net-print/lprng/lprng-3.8.35-r3.ebuild b/net-print/lprng/lprng-3.8.35-r3.ebuild
new file mode 100644
index 000000000000..0848108f239f
--- /dev/null
+++ b/net-print/lprng/lprng-3.8.35-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils flag-o-matic
+
+MY_PN=LPRng
+DESCRIPTION="Extended implementation of the Berkeley LPR print spooler"
+HOMEPAGE="http://www.lprng.com/"
+SRC_URI="ftp://ftp.lprng.com/pub/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tgz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE="foomaticdb kerberos nls ssl"
+
+RDEPEND="sys-process/procps
+	ssl? ( dev-libs/openssl )
+	foomaticdb? ( || ( net-print/cups-filters[foomatic] net-print/foomatic-filters )
+		net-print/foomatic-db )
+	!>=net-print/cups-1.6.2-r4[-lprng-compat]
+	!<net-print/cups-1.6.2-r4"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	kerberos? ( app-crypt/mit-krb5 )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.8.27-certs.diff
+	epatch "${FILESDIR}"/${PN}-3.8.28-make.diff
+	epatch "${FILESDIR}"/${PN}-3.8.28-krb.diff
+}
+
+src_configure() {
+	# wont compile with -O3, needs -O2
+	replace-flags -O[3-9] -O2
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable kerberos) \
+		$(use_enable ssl) \
+		--disable-setuid \
+		--disable-werror \
+		--with-userid=lp \
+		--with-groupid=lp \
+		--with-lpd_conf_path=/etc/lprng/lpd.conf \
+		--with-lpd_perms_path=/etc/lprng/lpd.perms \
+		--libexecdir=/usr/libexec/lprng \
+		--sysconfdir=/etc/lprng \
+		--disable-strip
+}
+
+src_compile() {
+	# bash is necessary due to bashisms in libtool
+	emake -j1 SHELL=/bin/bash
+}
+
+src_install() {
+	dodir /var/spool/lpd
+	diropts -m 700 -o lp -g lp
+	dodir /var/spool/lpd/lp
+
+	emake install \
+		DESTDIR="${D}" \
+		POSTINSTALL="NO" \
+		gnulocaledir="${D}"/usr/share/locale
+
+	dodoc CHANGES README VERSION "${FILESDIR}"/printcap lpd.conf lpd.perms
+
+	insinto /etc/lprng
+	doins "${FILESDIR}"/printcap lpd.conf lpd.perms
+	dosym /etc/lprng/printcap /etc/printcap
+	newinitd "${FILESDIR}"/lprng-init lprng
+}
+
+pkg_postinst() {
+	einfo "If printing does not work, try 'checkpc'/'checkpc -f'"
+}
diff --git a/net-print/lprng/metadata.xml b/net-print/lprng/metadata.xml
new file mode 100644
index 000000000000..568181659c37
--- /dev/null
+++ b/net-print/lprng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-print/magicfilter/Manifest b/net-print/magicfilter/Manifest
new file mode 100644
index 000000000000..d8d6a8ad71af
--- /dev/null
+++ b/net-print/magicfilter/Manifest
@@ -0,0 +1,8 @@
+AUX magicfilter-2.3d-glibc-2.10.patch 2152 SHA256 bc594ac69cc36ec18125194ce803734ba794e01ac1d8fba0bc3a87edf7864546 SHA512 b51305590320ddf9da8aaf51f0e794920fcc45348e7ca0fbb9015c49ff5a88e1749ae514ca45e437cf61f9579b905f19cda0169b433c5f4fe57dab861469fba4 WHIRLPOOL 3b2616b1f1894a33b3017f782f6144cefa08b4de003318f04c96ca769832231fc705d745934d5920fc206bb91670d54ad7451e6712faad9a7223d3aaa54e6a79
+AUX magicfilter-2.3h-configure.patch 1596 SHA256 55ecfb9ba965526726734bf1204d6e280b249df88717784cfa23f26eb7fe84a1 SHA512 4b36282da58cb741f713ac7c29a472cd081f5e91873f684bc48cf5b76ce92ce460fdbae238e430bc9316a25a1bd5826ffa99c3a3f2fa3023047474071075ece1 WHIRLPOOL 4fdc7cafe7cb61593647a49f64a158beda78044aa6429836ed2666beb9a492e14a6e04930b4e2d55fe559efb2b5d8fe45ae2b9cc852bbfc5bb462e1452196ef9
+AUX magicfilter-2.3h-makefile.patch 3152 SHA256 ee62acad4909b4295af45ad1ae436c634dfc084acf6ed9da6e2f33294e42be9c SHA512 f0a11df975df9e8f41e4b4eb35fe14cf3d4b1c0fe169c3540137e1dc29af3c0b0799fea4e46c66f2649f6378f664ab9264684336ff56f383f6b03b2146f8b9f2 WHIRLPOOL 711378cbf634700d4acfcde589d72f376cc0d3f2d0e9d2b0c83db8ebe7b495dedbfd33664e90fe6e9f4db56d7ecaac86909382a941fee455fab3766e7e400e1b
+DIST magicfilter-2.3.h.tar.gz 161929 SHA256 8d6a3e3e68a16aa43682cdd77e8a9d28635eef4ea5e8dcf558e9a6fb88f8642c SHA512 7808cfe4944eb5a5a4ad457e3ce9b42556fb09b60223763d0808e5b7c502aafbfe4ff66ebbf73830839eda76d0fa1e840ac9013f61bdce9aa2265c11e8b103dc WHIRLPOOL fc550c7f56edf25c750fd49d2058b9df5a84a9ae9c548e8e5a1e03f25afec878663ca3517b2a92a1cb5eb9a2770e60d74de886f40a849edcfe728241753f54aa
+EBUILD magicfilter-2.3h.ebuild 982 SHA256 e74a4eb0a6526d001039acfec01d62625140f58b2f1f761058504221daa471ac SHA512 1fcc911efe3bd7663f89d7ffc543c6d52a6611f254bb10b9d5f022f137f1f799981292ef1494481e4d168f3849cd81516075600e9d12625b8df9212a7c28964a WHIRLPOOL 52b2ec53b085c137841351ada36ed1eda2d0f2d63725093e4db7ad0a56285b675be2dfc37aceba1ef75ad5424ca905d7d24716d31b9bcf802f365f0de67858ab
+MISC ChangeLog 2567 SHA256 7b9b94c0a40b3979877c588bab8ae10cb90207f7f4f288d8480287705e633973 SHA512 2ab697f06cf9d9a232b1b830cc7a58111ba7652164bd51aff991fdc3369a18b000de611950f36cee5af7476cf982222e8648ec07f0fe545194e1b69661905ac4 WHIRLPOOL 94e01dbb24dc3bf0d37abcce1b4a86a920642d4c8dbecac05dd00f992e8d72b7f35eaa88660e041daa7c8ebf8af232685a7cc0c017f5ecb55335484d72505a80
+MISC ChangeLog-2015 3289 SHA256 fd148a74e9c35cee8acc76d7f1874372f7ba9377027285a86acd9e5329545dc4 SHA512 b81d40cc566b3f0dc0cf49839a74cf42e0e82985425762cfa1b8d1f14011ed179a2e573e3b9d6d7740e387ff89450234b703d2d4e68b31d84343dc3cefe2762a WHIRLPOOL 6d3b6dcd80ca76d7764fe7673cf9cc8af7d9fb6ef9f614a9cab4b0b0047e155b6d2b98a1623b127208ba5338f62e0989d67785833df67b357e89d3210c404517
+MISC metadata.xml 381 SHA256 e29348712cf9fcec3c02b0b8cbb3c0299ea890f2be746c788ccc44797d8a1e53 SHA512 799b4e1f59fdbb05f865472a76bff92f43d39d698990b52f1bc29305d17452edda75e73678e9bd41d41448f57b4de4ea12d152ef8881d18a7ad5ca8cb02e9952 WHIRLPOOL 001bbfe1ad24f4d20f8e4e9d4233c053744c1dc730a8fc2cde6d1c99cd1c9d1a264b3091fa6c841e6d3c2f55760fcea803550b4199e9e1fc92ea44e9a460b90b
diff --git a/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch b/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
new file mode 100644
index 000000000000..eea064501cad
--- /dev/null
+++ b/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
@@ -0,0 +1,100 @@
+--- fe.c
++++ fe.c
+@@ -128,7 +128,7 @@
+ 
+     /* read rules
+      */
+-    while ( (r = getline(f)) != 0) {
++    while ( (r = get_line(f)) != 0) {
+ 	rulecount++;
+ 	if (tail) {
+ 	    tail->next = r;
+--- getline.c
++++ getline.c
+@@ -27,7 +27,7 @@
+  *  THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ /*
+- * getline() picks up a magicfilter rule line and passes it back to magicfilter
++ * get_line() picks up a magicfilter rule line and passes it back to magicfilter
+  *
+  * rules are:
+  *
+@@ -172,10 +172,10 @@
+ 
+ 
+ /*
+- * getline() gets a rule off the input stream
++ * get_line() gets a rule off the input stream
+  */
+ struct rule *
+-getline(FILE *input)
++get_line(FILE *input)
+ {
+     static char *bfr = 0;	/* a buffer for reading lines into */
+     static int buflen = 0;	/* size of that buffer */
+@@ -189,13 +189,13 @@
+ 	/* initialize the line buffer the first time in
+ 	 */
+ 	if ( (bfr = malloc(buflen=80)) == 0) {
+-	    perror("getline::malloc");
++	    perror("get_line::malloc");
+ 	    exit(1);
+ 	}
+     }
+ 
+     if ( (r = calloc(1, sizeof *r)) == 0) {
+-	perror("getline::calloc");
++	perror("get_line::calloc");
+ 	exit(1);
+     }
+ 
+@@ -240,7 +240,7 @@
+     }
+ 
+     if ( (r->pattern = strdup(q)) == 0) {
+-	perror("getline::strdup");
++	perror("get_line::strdup");
+ 	exit(1);
+     }
+ 
+@@ -289,7 +289,7 @@
+ 
+     if (hint)
+ 	if ( (r->hint = strdup(hint)) == 0) {
+-	    perror("getline::strdup");
++	    perror("get_line::strdup");
+ 	    exit(1);
+ 	}
+ 
+@@ -302,11 +302,11 @@
+     while ( (q = getarg(&p)) != 0) {
+ 	r->argv = realloc(r->argv, (3 + r->argc) * sizeof r->argv[0]);
+ 	if (r->argv == 0) {
+-	    perror("getline::realloc");
++	    perror("get_line::realloc");
+ 	    exit(1);
+ 	}
+ 	if ( (r->argv[r->argc++] = strdup(q)) == 0) {
+-	    perror("getline::strdup");
++	    perror("get_line::strdup");
+ 	    exit(1);
+ 	}
+     }
+@@ -330,4 +330,4 @@
+     }
+     ++ruleno;
+     return r;
+-} /* getline */
++} /* get_line */
+--- rule.h
++++ rule.h
+@@ -55,7 +55,7 @@
+     struct rule *next;		/* next rule in the chain */
+ } ;
+ 
+-extern struct rule *getline(FILE *);
++extern struct rule *get_line(FILE *);
+ extern struct rule *rules;
+ char * action_p(enum rule_action);
+ 
diff --git a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
new file mode 100644
index 000000000000..0d89b4d04eb5
--- /dev/null
+++ b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
@@ -0,0 +1,59 @@
+--- configure.sh
++++ configure.sh
+@@ -423,44 +423,12 @@ EOF
+     TLOGN " ($AC_CC)"
+     if [ $status -eq 0 ]; then
+ 	TLOG " ok"
+-
+-	# check that the CFLAGS and LDFLAGS aren't bogus
+-
+-	unset AC_CFLAGS AC_LDFLAGS
+-
+-	if [ "$CFLAGS" ]; then
+-	    test "$CFLAGS" && echo "validating CFLAGS=${CFLAGS}"
+-	    if $AC_CC $CFLAGS -o /tmp/ngc$$.o /tmp/ngc$$.c ; then
+-		AC_CFLAGS=${CFLAGS:-"-g"}
+-		test "$CFLAGS" && echo "CFLAGS=\"${CFLAGS}\" are okay"
+-	    elif [ "$CFLAGS" ]; then
+-		echo "ignoring bogus CFLAGS=\"${CFLAGS}\""
+-	    fi
+-	else
+-	    AC_CFLAGS=-g
+-	fi
+-	if [ "$LDFLAGS" ]; then
+-	    test "$LDFLAGS" && echo "validating LDFLAGS=${LDFLAGS}"
+-	    if $AC_CC $LDFLAGS -o /tmp/ngc$$ /tmp/ngc$$.o; then
+-		AC_LDFLAGS=${LDFLAGS:-"-g"}
+-		test "$LDFLAGS" && TLOG "LDFLAGS=\"${LDFLAGS}\" are okay"
+-	    elif [ "$LDFLAGS" ]; then
+-		TLOG "ignoring bogus LDFLAGS=\"${LDFLAGS}\""
+-	    fi
+-	else
+-	    AC_LDFLAGS=${CFLAGS:-"-g"}
+-	fi
+-	AC_SUB 'CFLAGS' "$AC_CFLAGS"
+-	AC_SUB 'LDFLAGS' "$AC_LDFLAGS"
+-    else
+-	AC_SUB 'CFLAGS' ''
+-	AC_SUB 'LDFLAGS' ''
+-	AC_FAIL " does not compile code properly"
+     fi
+ 
+-    AC_SUB 'CC' "$AC_CC"
++    AC_SUB 'CFLAGS' "$CFLAGS"
++    AC_SUB 'LDFLAGS' "$LDFLAGS"
+ 
+-    rm -f /tmp/ngc$$ /tmp/ngc$$.c /tmp/ngc$$.o
++    AC_SUB 'CC' "$AC_CC"
+ 
+     return $status
+ }
+@@ -896,7 +864,7 @@ AC_PROG_INSTALL () {
+     fi
+ 
+     AC_SUB 'INSTALL' "$PROG_INSTALL"
+-    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -s -m 755"
++    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -m 755"
+     AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
+ 
+     # finally build a little directory installer
diff --git a/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch b/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
new file mode 100644
index 000000000000..59c2cc15af91
--- /dev/null
+++ b/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
@@ -0,0 +1,75 @@
+--- Makefile.in
++++ Makefile.in
+@@ -17,7 +17,7 @@ libmagic @LIBMAGIC@:
+ 	@MAKE_MAGIC@ all
+ 
+ textonly: contrib/textonly.c
+-	$(CC) $(CFLAGS) -o textonly $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o textonly $<
+ 
+ mpp: magic.m4 mkmpp
+ 	@srcdir@/mkmpp magic.m4
+@@ -43,47 +43,46 @@ magic.c: magic.m4 mkmagic config.h
+ cfmagic: file/magic
+ 	@MAKE_MAGIC@ magic
+ 
+-commoninstall: textonly @CFMAGIC@
+-	@INSTALL_DIR@ $(prefix)/@exedir@
+-	@INSTALL_DIR@ $(prefix)/@mandir@/man8
+-	@INSTALL_DIR@ $(prefix)/@mandir@/man5
+-	@INSTALL_DIR@ $(prefix)/@filterdir@
+-	@INSTALL_MAGIC@ -m 444 file/magic $(prefix)/@MAGIC@
+-	@INSTALL_PROGRAM@ -m 511 textonly $(prefix)/@filterdir@
++commoninstall: textonly
++	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@exedir@
++	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man8
++	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man5
++	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@filterdir@
++	@INSTALL_PROGRAM@ textonly $(DESTDIR)$(prefix)/@filterdir@
+ 
+ install:  @DO_WHAT@
+ 
+ install-bin-t: traditional commoninstall
+-	@INSTALL_PROGRAM@ -m 511 traditional $(prefix)/@exedir@/magicfilter-t
++	@INSTALL_PROGRAM@ traditional $(DESTDIR)$(prefix)/@exedir@/magicfilter-t
+ 
+ install-bin: magicfilter commoninstall
+-	@INSTALL_PROGRAM@ -m 511 magicfilter $(prefix)/@exedir@
++	@INSTALL_PROGRAM@ magicfilter $(DESTDIR)$(prefix)/@exedir@
+ 
+ install-data-t: traditional commoninstall
+ 	@srcdir@/mkmpp
+ 	for x in @srcdir@/filters/*.def;do \
+-	    ./mpp @exedir@/magicfilter-t $$x > $(prefix)/@filterdir@/`basename $$x .def`-filter; \
+-	    chmod +x $(prefix)/@filterdir@/`basename $$x .def`-filter; \
++	    ./mpp @exedir@/magicfilter-t $$x > $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`-filter; \
++	    chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`-filter; \
+ 	done
+ 	@rm -f mpp
+ 
+ install-data: magicfilter commoninstall
+ 	for x in @srcdir@/filters/*.def;do \
+-	    sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x > $(prefix)/@filterdir@/`basename $$x .def`; \
+-	    chmod +x $(prefix)/@filterdir@/`basename $$x .def`; \
++	    sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x > $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
++	    chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
+ 	done
+ 
+ install-man: VERSION commoninstall
+ 	@SED@ -n -e 's/&PROGRAM&/magicfilter/g' -e 's/^MAN //p' -e @LPD_OPTS@ < magicfilter.8templ > $$$$; \
+-	@INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter.8; \
++	@INSTALL_DATA@ $$$$ $(DESTDIR)$(prefix)/@mandir@/man8/magicfilter.8; \
+ 	rm -f $$$$
+-	@INSTALL_DATA@ -m 444 magicfilter.5 $(prefix)/@mandir@/man5
++	@INSTALL_DATA@ magicfilter.5 $(DESTDIR)$(prefix)/@mandir@/man5
+ 
+ install-man-t: VERSION commoninstall
+ 	@SED@ -n -e 's/&PROGRAM&/magicfilter-t/g' -e 's/^MAN //p' -e 's/^TRAD//p' -e @LPD_OPTS@ < magicfilter.8templ > $$$$; \
+-	@INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter-t.8; \
++	@INSTALL_DATA@ $$$$ $(DESTDIR)$(prefix)/@mandir@/man8/magicfilter-t.8; \
+ 	rm -f $$$$
+-	@INSTALL_DATA@ -m 444 magicfilter-t.5 $(prefix)/@mandir@/man5
++	@INSTALL_DATA@ magicfilter-t.5 $(DESTDIR)$(prefix)/@mandir@/man5
+ 
+ install-traditional: install-man-t install-bin-t install-data-t
+ 
diff --git a/net-print/magicfilter/magicfilter-2.3h.ebuild b/net-print/magicfilter/magicfilter-2.3h.ebuild
new file mode 100644
index 000000000000..91663b6db45f
--- /dev/null
+++ b/net-print/magicfilter/magicfilter-2.3h.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-2.3.h
+
+DESCRIPTION="Customizable, extensible automatic printer filter"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/magicfilter/"
+SRC_URI="http://www.pell.portland.or.us/~orc/Code/magicfilter/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="lprng-failsafe"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}
+	lprng-failsafe? ( net-print/lprng )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.3d-glibc-2.10.patch \
+		"${FILESDIR}"/${PN}-2.3h-configure.patch \
+		"${FILESDIR}"/${PN}-2.3h-makefile.patch
+}
+
+src_configure() {
+	local myconf
+	use lprng-failsafe && myconf="--with-lprng"
+
+	tc-export CC
+	export AC_CPP_PROG="$(tc-getCPP)"
+
+	./configure.sh \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--filterdir=/usr/share/magicfilter/filters \
+		${myconf} || die
+}
diff --git a/net-print/magicfilter/metadata.xml b/net-print/magicfilter/metadata.xml
new file mode 100644
index 000000000000..3f641021f132
--- /dev/null
+++ b/net-print/magicfilter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <use>
+    <flag name="lprng-failsafe">Refuse options for compability with certain LPRng versions.</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-print/metadata.xml b/net-print/metadata.xml
new file mode 100644
index 000000000000..e4bb8b2933c1
--- /dev/null
+++ b/net-print/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The net-print category contains network printing packages.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-print enthält Software für das Drucken in Netzwerken.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-print contiene programas relacionadas con impresion.
+	</longdescription>
+	<longdescription lang="ja">
+		net-printカテゴリーにはネットワーク・プリンティングのパッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-print categorie bevat applicaties voor netwerkprinten.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-print chứa các phần mềm in ấn qua mạng.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-print contiene programmi per la stampa via rete.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria net-print contém pacotes relacionados com impressão
+		de rede.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria net-print zawiera programy do drukowania w sieci.
+	</longdescription>
+</catmetadata>
+
diff --git a/net-print/mtink/Manifest b/net-print/mtink/Manifest
new file mode 100644
index 000000000000..8e2df77176b0
--- /dev/null
+++ b/net-print/mtink/Manifest
@@ -0,0 +1,11 @@
+AUX mtink-1.0.16-flags.patch 10583 SHA256 24ab593fad7cadaf0579f407803568d470c5e7df4fe7d116197be0d97fce8d81 SHA512 a4a6767139e1bf0d0ab8efaf82a1cb7abfa084505a3ef6ecfe6ef43aa9fa813ebd8e81aeae5be0582ff1fb9938e8c3f72611c2b7a898c9290d6b98508a93201f WHIRLPOOL 9e7c25273380ba0ea60d373090a244d3b8255015fd4c4a5cf069077705757313c7a7336543956216872a2afcfdee66a71d625b247a8f3ef4bac326a8416abea5
+AUX mtink-1.0.16-options.patch 1424 SHA256 e5444b1ba75551b0e3db115b83bc099e7f96517e07695f27ba332d7c4cbd31ee SHA512 11fa05f2cb6e512a18a0d43a838197fa96f22fac74fd7565387351132c0a879fd9f90076fb88cc876d3ac81920b14dd9e6ab80c1325a89e8fa631cd6ce1279aa WHIRLPOOL 6324e818c7848225e89203abcf109a1d4362c5a7b699c75902fd366dc8aacaeb218d3ec743996cca62496d9c97fdbc5299c2c3128c096a95adf7f0022698f1ec
+AUX mtink-1.0.16-overflow.patch 421 SHA256 9a164ab79d2a21f0c85b9b6668d6f842366e24b6e7603ab8b28645deedd769af SHA512 801e7fa935b965398f2d2cb9b5384d5868485b09879636fb385c5d84be80a725b51a3fde8c94253749bc35e1dece4f879d1a292b4b557d592a26a3f7fc731159 WHIRLPOOL da4fccd28cced1a8091f6186e2935fbb30f95bf7048c4a551fd5a583b14328bc6e8a9d9eb6999e2bacc8cfbb215829447348befa18e4ee1eff23bc46a77dd0a6
+AUX mtinkd.confd 383 SHA256 0bd60747dae9fbcd45881823d0e2e2896131bd2df45d5ae2688fc11a93b25783 SHA512 83bdc7aa3947c0f4f2161288fe634d355205a9e097cac6e82c2bc7f55afd6ae8bbee15c1871089ddf1c718b587a0f6929ad4be0590c601b7e3428c0ef79ed331 WHIRLPOOL 1871a1249f2fd03e4161cd32d33f13b63bb6ff65e1ab74a25038727e51c7d7d0ca301a1d38fb185bba309f9af4a85e6e5d3ef0db73001e31fc7fbf29a963660a
+AUX mtinkd.rc 332 SHA256 c28a2eaf9789354de9f6d1440340d5c1e00a8a1d8ba58dc411ae123d995d7895 SHA512 764cf45bf56f2fa50b3b927422e2374e1142ac1b29022b0f44cd462618587fa568200b08f56d802d3754698928a6f65a39d05d3cfde51c32b57db3b85fbca034 WHIRLPOOL 964efc5f1966df5a6a763f92b69f3f2cb4684814b2491926294e43154d9d40426a26a6d2f857ae4ac49447c69ad2cb7d237de38a64957bf9ebd4054e23cf88fe
+DIST mtink-1.0.16.tar.gz 916315 SHA256 187e8d145e818b4b56be203403f5fe28c02f899d30d92c58e82bcef311555ba2 SHA512 e760b09643e55d4dfa6367cad2da3695db1af3e9b2f0ff1ad4a72eedfb0393b797af507b0e02d7f17300824959f4224ec8cbd745cfa1c45c55f7ab0fab34dec4 WHIRLPOOL 606b83c084a3700f9e2dace5d57be3f68d7b7a84982b996f1c7620c88704ac79deaea0e3ae25f64b64a533cc18d3573f8d14ea0153025f8dc8b219442b0cdd09
+EBUILD mtink-1.0.16-r1.ebuild 1574 SHA256 c796c7d5bd644c8086b4d97cdb5d8da738dffbdcc4a033b7b111e9a736322fd8 SHA512 27c234f35f53f76de5e2df8a853626759e391f7171bb170df51368cfc57f7f52cc760c035d2ed72376abff3183e33f880f5870fe1940e5ccdef287abf0c8a3c7 WHIRLPOOL df3f1b644de2d9fb2be24f2e4d37720ae0289334c466d053fd3d99024f0b169969e5e24c5d6a749108dde3c0712fb9f9d7796bf10021d333fb51461bfb46f684
+EBUILD mtink-1.0.16-r2.ebuild 1577 SHA256 80683acac7962d0aaa8322b9a672e0d6cb548f9e2bf708533bd0f90650621cf2 SHA512 8d59a5dab8e30b7554606f52425c2407ee9b95620b22865a9d582c47accbcb8bebeca3194265b997715e8e88555d59c9e9f4e1d202d45dca31c8fc12e7760b39 WHIRLPOOL 70ae111123fa9944f2cdd4a5de333e1607b41c8ff8b4a85fc4713e329e252d16f4748634fddd93acf0a9bab8b39ccb2a13684b9e8bfbbea484ec38d610fa8691
+MISC ChangeLog 2670 SHA256 f46cd54cb6234de12c36515a6db6dabcc6e8bc4bf918a07e6a06fb6d439afb4c SHA512 34cedb1a4863d0952e79aceef190a36f5101976dc6713788f66462d95e4f4bedd0f4692d6d04db04b83aa35cd3c4511a80ab2a0b035fedc62275bade3f1b6877 WHIRLPOOL b5afefd6550c9e928f0dd107703ce646da7762143745ddedf2ac9d029cf58340935b7bb67401ee6f12d3d8cb70e9aadcaa0f5cc5ca8fe663f8abedf0755c3f5b
+MISC ChangeLog-2015 5404 SHA256 76337278085edbaba5f536b0d089c0f0954091ff5c5caf65f0d81c963420d2e3 SHA512 29e938df352c4c1bff4037d22ec8d67bece304aab326a606cc4331443916747bc88311c3132573b77b4f70c40c6efd1fe7acf033b97d7782aa4186b339ee6d44 WHIRLPOOL a6791677b31f4326a1a74ef47b3ceaa3dd4820c8cdd5ca3574260ee50bbc369b36084027bfea5e20a65e6d56af80c705eda533fab6a0ca8d84c2e414c0aae3cc
+MISC metadata.xml 441 SHA256 78da9689e1e4298f8f42b7005d3ddd1e606a84778722c535f1dae53ea3ea33c7 SHA512 5b858166424a26b356924b05ad2a7d97cce8ccd4d76c78d182c5239960148034a4458076eeb728a42fff7c22e02af6d14e9baa822205356628aec09c98dbc926 WHIRLPOOL 9e1d314682039186dfb6a46c05a12fd2c1b7f68243d33db2ce863da9b17c4cee6e1e72a2dc33769b2b3cf19adc76808feafb0b693e1a336caa29c2471af0bde8
diff --git a/net-print/mtink/files/mtink-1.0.16-flags.patch b/net-print/mtink/files/mtink-1.0.16-flags.patch
new file mode 100644
index 000000000000..bee6c339e3f8
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-flags.patch
@@ -0,0 +1,183 @@
+diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG
+--- mtink-1.0.16.orig/Makefile.ORG	2007-08-28 12:52:30.000000000 +0200
++++ mtink-1.0.16/Makefile.ORG	2017-01-29 18:09:40.550182789 +0100
+@@ -4,7 +4,7 @@
+ setUid=1
+ gimpVersion=
+ 
+-DBG = -s -O
++DBG =
+ 
+ # comment this out for Solaris
+ 
+@@ -147,79 +147,79 @@
+ ############## COMMON AND frintends ##################
+ $(SRCDIR)/d4lib.o: $(SRCDIR)/d4lib.c $(SRCDIR)/d4lib.h Makefile
+ 	@echo Compile d4lib.c
+-	@$(CC) -c -o $(SRCDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSCFLG)
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSCFLG)
+ 
+ $(SRCDIR)/access.o: $(SRCDIR)/access.c  Makefile
+ 	@echo Compile access.c
+-	@$(CC) -c -o $(SRCDIR)/access.o $(SRCDIR)/access.c $(DEBUG) $(MACOSCFLG)
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/access.o $(SRCDIR)/access.c $(DEBUG) $(MACOSCFLG)
+ 
+ $(SRCDIR)/rw.o: $(SRCDIR)/rw.c  Makefile
+ 	@echo Compile rw.c
+-	@$(CC) -c -o $(SRCDIR)/rw.o $(SRCDIR)/rw.c $(DEBUG) $(MACOSCFLG)
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/rw.o $(SRCDIR)/rw.c $(DEBUG) $(MACOSCFLG)
+ 
+ $(SRCDIR)/rcfile.o: $(SRCDIR)/rcfile.c $(SRCDIR)/rcfile.h $(SRCDIR)/mtink.h  Makefile
+ 	@echo Compile rcfile.c
+-	@$(CC) -c -o $(SRCDIR)/rcfile.o $(SRCDIR)/rcfile.c $(CFLAGS) $(MTINK_CFLAGS)   -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/rcfile.o $(SRCDIR)/rcfile.c $(CFLAGS) $(MTINK_CFLAGS)   -DWITH_X=1
+ 
+ $(SRCDIR)/fsb.o: $(SRCDIR)/fsb.c $(SRCDIR)/fsb.h $(SRCDIR)/mtink.h $(SRCDIR)/wheelmouse.h Makefile
+ 	@echo Compile fsb.c
+-	@$(CC) -c -o $(SRCDIR)/fsb.o $(SRCDIR)/fsb.c $(CFLAGS) $(MTINK_CFLAGS)   -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/fsb.o $(SRCDIR)/fsb.c $(CFLAGS) $(MTINK_CFLAGS)   -DWITH_X=1
+ 
+ $(SRCDIR)/scrtxt.o: $(SRCDIR)/scrtxt.c $(SRCDIR)/scrtxt.h $(SRCDIR)/mtink.h $(SRCDIR)/wheelmouse.h Makefile
+ 	@echo Compile scrtxt.c
+-	@$(CC) -c -o $(SRCDIR)/scrtxt.o $(SRCDIR)/scrtxt.c $(CFLAGS) $(MTINK_CFLAGS)   -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/scrtxt.o $(SRCDIR)/scrtxt.c $(CFLAGS) $(MTINK_CFLAGS)   -DWITH_X=1
+ 
+ $(SRCDIR)/cfg1.o: $(SRCDIR)/cfg1.c $(SRCDIR)/cfg1.h $(SRCDIR)/mtink.h $(SRCDIR)/cmd.h $(SRCDIR)/wheelmouse.h $(SRCDIR)/model.h Makefile
+ 	@echo Compile cfg1.c
+-	@$(CC) -c -o $(SRCDIR)/cfg1.o $(SRCDIR)/cfg1.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/cfg1.o $(SRCDIR)/cfg1.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
+ 
+ $(SRCDIR)/micon.o: $(SRCDIR)/micon.c $(SRCDIR)/micon.h  Makefile
+ 	@echo Compile micon.c
+-	@$(CC) -c -o $(SRCDIR)/micon.o $(SRCDIR)/micon.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/micon.o $(SRCDIR)/micon.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
+ 
+ $(SRCDIR)/rdPrtDesc.o: $(SRCDIR)/rdPrtDesc.c $(SRCDIR)/model.c $(SRCDIR)/rdPrtDesc.h $(SRCDIR)/model.h Makefile
+ 	@echo Compile rdPrtDesc.c
+-	@$(CC) -c -o $(SRCDIR)/rdPrtDesc.o $(SRCDIR)/rdPrtDesc.c $(CFLAGS) $(MTINK_CFLAGS) -DBLD_UTIL=0
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/rdPrtDesc.o $(SRCDIR)/rdPrtDesc.c $(CFLAGS) $(MTINK_CFLAGS) -DBLD_UTIL=0
+ 
+ $(SRCDIR)/cfg2.o: $(SRCDIR)/cfg2.c $(SRCDIR)/cfg2.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/cmd.h  Makefile
+ 	@echo Compile cfg2.c
+-	@$(CC) -c -o $(SRCDIR)/cfg2.o $(SRCDIR)/cfg2.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/cfg2.o $(SRCDIR)/cfg2.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
+ 
+ $(SRCDIR)/alignbt.o: $(SRCDIR)/alignbt.c $(SRCDIR)/alignbt.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/cmd.h  Makefile
+ 	@echo Compile alignbt.c
+-	@$(CC) -c -o $(SRCDIR)/alignbt.o $(SRCDIR)/alignbt.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/alignbt.o $(SRCDIR)/alignbt.c $(CFLAGS) $(MTINK_CFLAGS)  -DWITH_X=1
+ 
+ $(SRCDIR)/checkenv.o: $(SRCDIR)/checkenv.c $(SRCDIR)/checkenv.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/cmd.h  Makefile
+ 	@echo Compile checkenv.c
+-	@$(CC) -c -o $(SRCDIR)/checkenv.o $(SRCDIR)/checkenv.c $(CFLAGS) $(MTINK_CFLAGS)
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/checkenv.o $(SRCDIR)/checkenv.c $(CFLAGS) $(MTINK_CFLAGS)
+ 
+ $(SRCDIR)/cmd.o: $(SRCDIR)/cmd.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/al820.c  $(SRCDIR)/align.c $(SRCDIR)/alC82.c $(SRCDIR)/bldpcode.c Makefile
+ 	@echo Compile cmd.c
+-	@$(CC) -c -o $(SRCDIR)/cmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=1 -DSERVER=0
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/cmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=1 -DSERVER=0
+ 
+ $(SRCDIR)/nXcmd.o: $(SRCDIR)/cmd.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h Makefile $(SRCDIR)/al820.c  $(SRCDIR)/align.c $(SRCDIR)/alC82.c $(SRCDIR)/bldpcode.c
+ 	@echo Compile cmd.c as nXcmd.o
+-	@$(CC) -c -o $(SRCDIR)/nXcmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=0 -DSERVER=0
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/nXcmd.o $(SRCDIR)/cmd.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG) $(RDTIMEOUT) $(WRTIMEOUT) -DWITH_X=0 -DSERVER=0
+ 
+ $(SRCDIR)/resource.o: $(SRCDIR)/resource.c $(SRCDIR)/version.h Makefile
+ 	@echo Compile resource.c
+-	@$(CC) -c -o $(SRCDIR)/resource.o $(SRCDIR)/resource.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/resource.o $(SRCDIR)/resource.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
+ 
+ $(SRCDIR)/mtink.o: $(SRCDIR)/mtink.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/model.h $(SRCDIR)/checkenv.h Makefile
+ 	@echo Compile mtink.c
+-	@$(CC) -c -o $(SRCDIR)/mtink.o $(SRCDIR)/mtink.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/mtink.o $(SRCDIR)/mtink.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
+ 
+ $(SRCDIR)/ttink.o: $(SRCDIR)/ttink.c $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h  $(SRCDIR)/model.h Makefile
+ 	@echo Compile ttink.c
+-	@$(CC) -c -o $(SRCDIR)/ttink.o $(SRCDIR)/ttink.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=0
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/ttink.o $(SRCDIR)/ttink.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=0
+ 
+ $(SRCDIR)/tooltip.o: $(SRCDIR)/tooltip.c $(SRCDIR)/tooltip.h Makefile
+ 	@echo Compile tooltip.c
+-	@$(CC) -c -o $(SRCDIR)/tooltip.o $(SRCDIR)/tooltip.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/tooltip.o $(SRCDIR)/tooltip.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
+ 
+ $(SRCDIR)/wheelmouse.o: $(SRCDIR)/wheelmouse.c Makefile
+ 	@echo Compile wheelmouse.c
+-	@$(CC) -c -o $(SRCDIR)/wheelmouse.o $(SRCDIR)/wheelmouse.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
++	@$(CC) $(CFLAGS) -c -o $(SRCDIR)/wheelmouse.o $(SRCDIR)/wheelmouse.c $(CFLAGS) $(MTINK_CFLAGS)  $(DEBUG)  -DWITH_X=1
+ 
+ $(SRCDIR)/rdRes.o: $(SRCDIR)/rdRes.c $(SRCDIR)/tres.c Makefile
+ 	@echo Compile rdRes.c
+@@ -231,59 +231,59 @@
+ 
+ mtink:  $(OBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/alignbt.h $(SRCDIR)/scrtxt.h $(SRCDIR)/cfg1.h $(SRCDIR)/cfg2.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/cfg1.h $(SRCDIR)/version.h
+ 	@echo Link mtink
+-	@$(CC) -o mtink $(OBJ)  $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) -DWITH_X=1
++	@$(CC) $(LDFLAGS) -o mtink $(OBJ)  $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) -DWITH_X=1
+ 
+ ttink: $(TTYOBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/version.h Makefile
+ 	@echo Link ttink
+-	@$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0
++	@$(CC) $(LDFLAGS) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0
+ 
+ ############# PLUG-IN #######################
+ gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile
+ 	@echo Compile and link gimp-mtink.c
+-	@-$(CC) -o gimp-mtink $(SRCDIR)/gimp-mtink.c $(GIMP_INC) $(GIMP_LIB)
++	@-$(CC) $(LDFLAGS) -o gimp-mtink $(SRCDIR)/gimp-mtink.c $(GIMP_INC) $(GIMP_LIB)
+ 
+ ############# SERVER ########################
+ $(SVRDIR)/mtinkd.o: $(SVRDIR)/mtinkd.c Makefile
+ 	@echo Compile mtinkd.c
+-	@$(CC) -c -o $(SVRDIR)/mtinkd.o $(SVRDIR)/mtinkd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS)
++	@$(CC) $(CFLAGS) -c -o $(SVRDIR)/mtinkd.o $(SVRDIR)/mtinkd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS)
+ 
+ $(SVRDIR)/d4lib.o: $(SRCDIR)/d4lib.c  Makefile
+ 	@echo Compile d4lib.c
+-	@$(CC) -c -o $(SVRDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(CFLAGS) $(MTINK_CFLAGS)
++	@$(CC) $(CFLAGS) -c -o $(SVRDIR)/d4lib.o $(SRCDIR)/d4lib.c $(RDTIMEOUT) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(CFLAGS) $(MTINK_CFLAGS)
+ 
+ $(SVRDIR)/cmd.o: $(SRCDIR)/cmd.c Makefile
+ 	@echo Compile cmd.c
+-	@$(CC) -c -o $(SVRDIR)/cmd.o $(SRCDIR)/cmd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS)
++	@$(CC) $(CFLAGS) -c -o $(SVRDIR)/cmd.o $(SRCDIR)/cmd.c -DSERVER=1 $(CFLAGS) $(MTINK_CFLAGS)
+ 
+ mtinkd: $(SVR_OBJ) Makefile
+ 	@echo Link mtinkd
+-	@$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
++	@$(CC) $(LDFLAGS) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
+ 
+ ########### Chooser ##############
+ 
+ mtinkc: $(CHODIR)/mtinkc.c Makefile
+ 	@echo Compile and link mtinkc.c
+-	@$(CC) -o mtinkc $(CHODIR)/mtinkc.c $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS)
++	@$(CC) $(LDFLAGS) -o mtinkc $(CHODIR)/mtinkc.c $(CFLAGS) $(MTINK_CFLAGS) $(LDFLAGS) $(LFLAGS)
+ 
+ ########### printer detection ##############
+ 
+ $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c
+ 	@echo Compile and link askPrinter.c
+-	@$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
++	@$(CC) $(CFLAGS) $(LDFLAGS) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
+ 
+ ########### utilities ######################
+ 
+ $(UTILS)/bldRes: $(UTILS)/bldRes.c
+ 	@echo Compile bldRes.c
+-	@$(CC) -o $(UTILS)/bldRes $(UTILS)/bldRes.c
++	@$(CC) $(LDFLAGS) -o $(UTILS)/bldRes $(UTILS)/bldRes.c
+ 
+ $(UTILS)/rdPrtDesc: $(SRCDIR)/rdPrtDesc.c
+ 	@echo Compile rdPrtDesc.c
+-	@$(CC) -o $(UTILS)/rdPrtDesc $(SRCDIR)/rdPrtDesc.c -I$(SRCDIR)
++	@$(CC) $(LDFLAGS) -o $(UTILS)/rdPrtDesc $(SRCDIR)/rdPrtDesc.c -I$(SRCDIR)
+ 
+ $(UTILS)/chckRes: $(SRCDIR)/rdRes.c
+ 	@echo Compile chckRes
+-	@$(CC) -o $(UTILS)/chckRes $(SRCDIR)/rdRes.c -I$(SRCDIR) -DRESCHECK=1
++	@$(CC) $(LDFLAGS) -o $(UTILS)/chckRes $(SRCDIR)/rdRes.c -I$(SRCDIR) -DRESCHECK=1
+ 
+ install: install-mtink install-ttink install-desc install-plugins install-askPrinter install-mtinkd install-start install-cups install-pyink
+ 
diff --git a/net-print/mtink/files/mtink-1.0.16-options.patch b/net-print/mtink/files/mtink-1.0.16-options.patch
new file mode 100644
index 000000000000..c173a4c762c1
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-options.patch
@@ -0,0 +1,39 @@
+diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG
+--- mtink-1.0.16.orig/Makefile.ORG	2007-08-28 12:52:30.000000000 +0200
++++ mtink-1.0.16/Makefile.ORG	2011-06-05 21:29:23.000000000 +0200
+@@ -4,7 +4,7 @@
+ setUid=1
+ gimpVersion=
+ 
+-DBG = -s -O
++DBG =
+ 
+ # comment this out for Solaris
+ 
+@@ -235,7 +235,7 @@
+ 
+ ttink: $(TTYOBJ) $(SRCDIR)/d4lib.h $(SRCDIR)/cmd.h $(SRCDIR)/mtink.h $(SRCDIR)/model.h $(SRCDIR)/version.h Makefile
+ 	@echo Link ttink
+-	@$(CC) -o ttink $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0
++	@$(CC) -o ttink $(LDFLAGS) $(TTYOBJ) $(CFLAGS) $(MTINK_CFLAGS) $(RDTIMEOUT) $(DEVICE) $(WRTIMEOUT) $(DEBUG) $(KERNEL_USB_BUG) $(MACOSLDFLG) -DWITH_X=0
+ 
+ ############# PLUG-IN #######################
+ gimp-mtink: $(SRCDIR)/gimp-mtink.c Makefile
+@@ -257,7 +257,7 @@
+ 
+ mtinkd: $(SVR_OBJ) Makefile
+ 	@echo Link mtinkd
+-	@$(CC) -o mtinkd $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
++	@$(CC) -o mtinkd $(LDFLAGS) $(SVR_OBJ) $(CFLAGS) $(MTINK_CFLAGS) $(MACOSLDFLG) 
+ 
+ ########### Chooser ##############
+ 
+@@ -269,7 +269,7 @@
+ 
+ $(DETDIR)/askPrinter: $(DETDIR)/askPrinter.c
+ 	@echo Compile and link askPrinter.c
+-	@$(CC) -o $(DETDIR)/askPrinter $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
++	@$(CC) -o $(DETDIR)/askPrinter $(LDFLAGS) $(DETDIR)/askPrinter.c -I. -I$(DETDIR)
+ 
+ ########### utilities ######################
+ 
diff --git a/net-print/mtink/files/mtink-1.0.16-overflow.patch b/net-print/mtink/files/mtink-1.0.16-overflow.patch
new file mode 100644
index 000000000000..d57e2cd0139e
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-overflow.patch
@@ -0,0 +1,11 @@
+--- a/server/mtinkd.c	2012-01-15 13:03:41.000000000 +0000
++++ b/server/mtinkd.c	2012-01-15 13:03:58.000000000 +0000
+@@ -244,7 +244,7 @@
+          /* look for pid into /var/run/mtink(<fifo> */
+          if ( (fp = fopen(runFile,"r")) )
+          {
+-            if ( fgets(ibuf, sizeof(buf), fp) )
++            if ( fgets(ibuf, sizeof(ibuf), fp) )
+             {
+                if ( (pid = atoi(ibuf)) )
+                {
diff --git a/net-print/mtink/files/mtinkd.confd b/net-print/mtink/files/mtinkd.confd
new file mode 100644
index 000000000000..2c5993521b4c
--- /dev/null
+++ b/net-print/mtink/files/mtinkd.confd
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# define the device file, adapt this
+#DEV_FILE=/dev/lp0
+DEV_FILE=/dev/usb/lp0
+
+# Special options, adapt this
+# add name of printer
+NAME=
+
+# use the first line for USB printers, the second for parallel port printers
+SPEC="-name $NAME -usbbase /dev/usb/lp"
+#SPEC="-name $NAME"
diff --git a/net-print/mtink/files/mtinkd.rc b/net-print/mtink/files/mtinkd.rc
new file mode 100644
index 000000000000..d57664700229
--- /dev/null
+++ b/net-print/mtink/files/mtinkd.rc
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use cups
+}
+
+start() {
+	ebegin "Starting mtinkd"
+	/usr/sbin/mtinkd start ${DEV_FILE} ${SPEC}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mtinkd"
+	/usr/sbin/mtinkd stop ${DEV_FILE} ${SPEC}
+	eend $?
+}
diff --git a/net-print/mtink/metadata.xml b/net-print/mtink/metadata.xml
new file mode 100644
index 000000000000..ed5cd7b65267
--- /dev/null
+++ b/net-print/mtink/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person"><email>SebastianLuther@gmx.de</email></maintainer>
+<maintainer type="project">
+<email>printing@gentoo.org</email>
+<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer type="project">
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/mtink/mtink-1.0.16-r1.ebuild b/net-print/mtink/mtink-1.0.16-r1.ebuild
new file mode 100644
index 000000000000..eabf2d90655e
--- /dev/null
+++ b/net-print/mtink/mtink-1.0.16-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils base
+
+DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers"
+HOMEPAGE="http://xwtools.automatix.de/"
+SRC_URI="http://xwtools.automatix.de/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="cups doc X"
+
+DEPEND="X? ( x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt
+		>=x11-libs/motif-2.3:0 )
+	cups? ( net-print/cups )
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-options.patch"
+	"${FILESDIR}/${P}-overflow.patch"
+)
+
+src_configure() {
+	if use X ; then
+		./Configure || die
+	else
+		./Configure -x || die
+	fi
+}
+
+src_compile() {
+	local mytargets
+	mytargets="ttink detect/askPrinter mtinkd"
+
+	if use X; then
+		mytargets="${mytargets} mtink mtinkc";
+	fi
+
+	emake ${mytargets}
+}
+
+src_install() {
+	dobin ttink detect/askPrinter
+
+	if use X; then
+		dobin mtinkc mtink
+	fi
+
+	dosbin mtinkd
+
+	newinitd "${FILESDIR}"/mtinkd.rc mtinkd
+	newconfd "${FILESDIR}"/mtinkd.confd mtinkd
+
+	if use cups; then
+		exeinto /usr/lib/cups/backend
+		doexe etc/mtink-cups
+	fi
+
+	dodoc README CHANGE.LOG
+	use doc && \
+		dohtml html/*.gif html/*.html
+}
+
+pkg_postinst() {
+	# see #70310
+	chmod 700 /var/mtink /var/run/mtink 2>/dev/null
+
+	elog
+	elog "mtink needs correct permissions to access printer device."
+	elog "To do this you either need to run the following chmod command:"
+	elog "chmod 666 /dev/<device>"
+	elog "or set the suid bit on mtink, mtinkc and ttink in /usr/bin"
+	elog
+}
diff --git a/net-print/mtink/mtink-1.0.16-r2.ebuild b/net-print/mtink/mtink-1.0.16-r2.ebuild
new file mode 100644
index 000000000000..7869cce7fcc6
--- /dev/null
+++ b/net-print/mtink/mtink-1.0.16-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers"
+HOMEPAGE="http://xwtools.automatix.de/"
+SRC_URI="http://xwtools.automatix.de/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cups doc X"
+
+DEPEND="X? ( x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt
+		>=x11-libs/motif-2.3:0 )
+	cups? ( net-print/cups )
+	virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-overflow.patch"
+	"${FILESDIR}/${P}-flags.patch"
+)
+
+src_configure() {
+	if use X ; then
+		./Configure || die
+	else
+		./Configure -x || die
+	fi
+}
+
+src_compile() {
+	local mytargets
+	mytargets="ttink detect/askPrinter mtinkd"
+
+	if use X; then
+		mytargets="${mytargets} mtink mtinkc";
+	fi
+
+	export CFLAGS LDFLAGS
+	emake ${mytargets}
+}
+
+src_install() {
+	dobin ttink detect/askPrinter
+
+	if use X; then
+		dobin mtinkc mtink
+	fi
+
+	dosbin mtinkd
+
+	newinitd "${FILESDIR}"/mtinkd.rc mtinkd
+	newconfd "${FILESDIR}"/mtinkd.confd mtinkd
+
+	if use cups; then
+		exeinto /usr/lib/cups/backend
+		doexe etc/mtink-cups
+	fi
+
+	dodoc README CHANGE.LOG
+	use doc && \
+		dohtml html/*.gif html/*.html
+}
+
+pkg_postinst() {
+	# see #70310
+	chmod 700 /var/mtink /var/run/mtink 2>/dev/null
+
+	elog
+	elog "mtink needs correct permissions to access printer device."
+	elog "To do this you either need to run the following chmod command:"
+	elog "chmod 666 /dev/<device>"
+	elog "or set the suid bit on mtink, mtinkc and ttink in /usr/bin"
+	elog
+}
diff --git a/net-print/npadmin/Manifest b/net-print/npadmin/Manifest
new file mode 100644
index 000000000000..e46c078804b1
--- /dev/null
+++ b/net-print/npadmin/Manifest
@@ -0,0 +1,7 @@
+AUX npadmin-0.8.7-gcc6.patch 7135 SHA256 954867454d694f83f286fc788dc6c21d0042753d8eda7bbdf357b6b575934dc3 SHA512 c3c79c5556b7d798323560b32326b09bc30d58aadb51c9dbbf28fca0d90f72a17d680f4696e7fbe94dd515cebb2f38158bf8e273064675ceeefad48f6d7c7bba WHIRLPOOL cf1193f229302e8927391e3ed6e2631c99dd59fce2a447648b2eb7f938e75de4c429cdbc552db2c4bf166d465ad8fb0e227e934658ae798d3cdeba6f7f7421f3
+AUX npadmin-0.8.7-stdlib.patch 258 SHA256 734384620481f6f90a857174036fbccbd79d7d23601b8cc32a4197623a41732a SHA512 36d4f8225e03f0d3ccde706414179a5489fbdf7ec5fa65e083c1de4a00db1626e40195e1e48b7213bc63241907716788c85cb10daea08c64aee6d8ac09094ecc WHIRLPOOL 1087dc7ca5ca658fa7d91eb12c157b5d831c13690299b561d1a1b05100c421999b5d69cbf04bfdd0d1ad191f4690f8896892646fb8f2cda3af616493504c254c
+DIST npadmin-0.8.7.tar.gz 104209 SHA256 829056157c5244e200af96d323fc2436bff53d353c671de8b1e7d7e0bca5ee1b SHA512 da405a897e3ec057b355ac1e8a6237e876d1ba0365f5bffdd71b212fb8a5b3a79f7186d4b90d4ec321a9ff45bc222f6444b3dff666c819eb5efafddcfcecb026 WHIRLPOOL f476f6bb8c93e0f3475ce515e9984d35975167cf96a78925e94652f4d50762e2fc10c14b9dae88b77c073c3a9310e5f737c1d89cae75527130ba722cfe9c9c98
+EBUILD npadmin-0.8.7-r1.ebuild 576 SHA256 5ceb7801ffac3b51fe864fb8203e554d90ee4a4ce216bddaf34130684d96f416 SHA512 81cf80b7a75bed997333e92c08cdd8e8709d18dd8948b106e7c14bd7702c1ebe3cd8e7cbfa084abe2a0deb74fd1cc73ac1a4d0a68301f6b36d17712cd0ab0c32 WHIRLPOOL d1050390f57d9d339390f63432a1a1222f137c2f457f8be2499118597554c6e05c4d8ed6c7bc4ca0d32c0d241cb333b36cecae5342a4dd431a8072f786c0739e
+MISC ChangeLog 2463 SHA256 853cc3af1d1cc500917b8f8158d98ef6c456af04b58c486fc863f619fdea9df9 SHA512 7485cb22bec4a3f52f4f9437c9a3c5640d677b6e499530fb7b7395f72a79ec065c286293f0a90ce4e154be7a769732a3900ed15c7f26ed62ff4ea4779da7c920 WHIRLPOOL f0b2b939396be7257e9849d375aae23e8e84268b4f54d80d171fe9dfb824e9d80d1c312528f818288f577ff223aae0e55449e654652b1c0705373e3c8462a826
+MISC ChangeLog-2015 1004 SHA256 b516ab1e66c8db00425f94db6e472be2d3c1161e47c23dcdef55198857ed0918 SHA512 0842490ec86b81827865470a18c6dc2408b047dcd3e6c59a5d018b54a43cb8f4c8ffa7620d8bb86bd92526e3d4642839a33d14acc8d57987c88b955b59135706 WHIRLPOOL 3ed8352972e205e9ad0bf36a9602f94ecf75782ff6f5c4e775012820055b17922fef3087973fc0c05919d7cc141c1abf42b03bac03e6f1f1ae36e8bb67cbfc2b
+MISC metadata.xml 336 SHA256 992637ccc23029a73a283c3cd4376034e9cc79c8964f1dbfaecdcda0abd85673 SHA512 8d4312ab8e426107a05e4f6a5cbc77970beb1ea46bbbd19882e8395a74ff791ffe2012ad7ae6d4656c3f0c33a7eb10e3d8d7515149213be4dfece650ad289101 WHIRLPOOL 9424b0d87065b5e0eee512e1b2a0601f4f7db22f0660484eae5ce0ceed1e7d22f40f3652fad2fa1aba405fec106c7a077fb651f9a8aba5476689bb4bf43464e0
diff --git a/net-print/npadmin/files/npadmin-0.8.7-gcc6.patch b/net-print/npadmin/files/npadmin-0.8.7-gcc6.patch
new file mode 100644
index 000000000000..7523bb23e333
--- /dev/null
+++ b/net-print/npadmin/files/npadmin-0.8.7-gcc6.patch
@@ -0,0 +1,138 @@
+--- npadmin-0.8.7/npadmin.C.old	2016-09-19 20:08:16.932034393 -0400
++++ npadmin-0.8.7/npadmin.C	2016-09-19 20:10:41.742717941 -0400
+@@ -72,74 +72,74 @@
+ 
+   // don't change the order of these without changing the order in npaconsts.h
+   static const struct option options[]= { 
+-    {"version",     no_argument,&retval,VERSION_FLAG},
+-    {"all",         no_argument,&retval,ALL_FLAG}, 
+-    {"debugsnmp",   no_argument,&retval,DEBUGSNMP_FLAG},
+-    {"name",        no_argument,&retval,NAME_FLAG},
+-
+-    {"vendor",      no_argument,&retval,VENDOR_FLAG},
+-    {"model",       no_argument,&retval,MODEL_FLAG},
+-    {"contact",     no_argument,&retval,CONTACT_FLAG},
+-    {"netconfig",   no_argument,&retval,NETCONFIG_FLAG},
+-    {"printmib",    no_argument,&retval,PRINTMIB_FLAG},
+-    {"hostmib",     no_argument,&retval,HOSTMIB_FLAG},
+-
+-    {"memory",      no_argument,&retval,MEMORY_FLAG},
+-    {"storage",     no_argument,&retval,STORAGE_FLAG},
+-    {"status",      no_argument,&retval,STATUS_FLAG},
+-
+-    {"mediapath",   no_argument,&retval,MEDIAPATH_FLAG},
+-    {"maxpapersize",no_argument,&retval,MAXPAPERSIZE_FLAG},
+-    {"enginespeed", no_argument,&retval,ENGINESPEED_FLAG},
+-    {"duplex",      no_argument,&retval,DUPLEX_FLAG},
+-    {"minpapersize",no_argument,&retval,MINPAPERSIZE_FLAG}, 
+-
+-    {"inputtray",   no_argument,&retval,INPUTTRAY_FLAG},
+-    {"tabloid",     no_argument,&retval,TABLOID_FLAG},
+-    {"a4",          no_argument,&retval,A4_FLAG},
+-    {"b4",          no_argument,&retval,B4_FLAG},
+-    {"executive",   no_argument,&retval,EXECUTIVE_FLAG}, 
+-    {"a3",          no_argument,&retval,A3_FLAG},
+-    {"b5",          no_argument,&retval,B5_FLAG},
+-    {"letter",      no_argument,&retval,LETTER_FLAG},
+-    {"legal",       no_argument,&retval,LEGAL_FLAG},
++    {"version",     no_argument,&retval,(int)VERSION_FLAG},
++    {"all",         no_argument,&retval,(int)ALL_FLAG}, 
++    {"debugsnmp",   no_argument,&retval,(int)DEBUGSNMP_FLAG},
++    {"name",        no_argument,&retval,(int)NAME_FLAG},
++
++    {"vendor",      no_argument,&retval,(int)VENDOR_FLAG},
++    {"model",       no_argument,&retval,(int)MODEL_FLAG},
++    {"contact",     no_argument,&retval,(int)CONTACT_FLAG},
++    {"netconfig",   no_argument,&retval,(int)NETCONFIG_FLAG},
++    {"printmib",    no_argument,&retval,(int)PRINTMIB_FLAG},
++    {"hostmib",     no_argument,&retval,(int)HOSTMIB_FLAG},
++
++    {"memory",      no_argument,&retval,(int)MEMORY_FLAG},
++    {"storage",     no_argument,&retval,(int)STORAGE_FLAG},
++    {"status",      no_argument,&retval,(int)STATUS_FLAG},
++
++    {"mediapath",   no_argument,&retval,(int)MEDIAPATH_FLAG},
++    {"maxpapersize",no_argument,&retval,(int)MAXPAPERSIZE_FLAG},
++    {"enginespeed", no_argument,&retval,(int)ENGINESPEED_FLAG},
++    {"duplex",      no_argument,&retval,(int)DUPLEX_FLAG},
++    {"minpapersize",no_argument,&retval,(int)MINPAPERSIZE_FLAG}, 
++
++    {"inputtray",   no_argument,&retval,(int)INPUTTRAY_FLAG},
++    {"tabloid",     no_argument,&retval,(int)TABLOID_FLAG},
++    {"a4",          no_argument,&retval,(int)A4_FLAG},
++    {"b4",          no_argument,&retval,(int)B4_FLAG},
++    {"executive",   no_argument,&retval,(int)EXECUTIVE_FLAG}, 
++    {"a3",          no_argument,&retval,(int)A3_FLAG},
++    {"b5",          no_argument,&retval,(int)B5_FLAG},
++    {"letter",      no_argument,&retval,(int)LETTER_FLAG},
++    {"legal",       no_argument,&retval,(int)LEGAL_FLAG},
+ 
+-    {"display",     no_argument,&retval,DISPLAY_FLAG}, 
+-    {"covers",      no_argument,&retval,COVER_FLAG},
++    {"display",     no_argument,&retval,(int)DISPLAY_FLAG}, 
++    {"covers",      no_argument,&retval,(int)COVER_FLAG},
+ 
+     // From here down These all get an extra bit to indicate that they belong
+     // to argval[1] rather than argval[0]
+-    {"languages",   no_argument,&retval,LANGUAGES_FLAG+1},
+-    {"pjl",         no_argument,&retval,PJL_FLAG+1},
+-    {"hpgl",        no_argument,&retval,HPGL_FLAG+1},
+-    {"psprinter",   no_argument,&retval,PSPRINTER_FLAG+1},
+-    {"autolang",    no_argument,&retval,AUTOLANG_FLAG+1},
+-    {"pcl",         no_argument,&retval,PCL_FLAG+1},
+-    {"postscript",  no_argument,&retval,POSTSCRIPT_FLAG+1},
+-
+-    {"marker",      no_argument,&retval,MARKER_FLAG+1},
+-    {"pagecount",   no_argument,&retval,PAGECOUNT_FLAG+1},
+-    {"colors",      no_argument,&retval,COLORS_FLAG+1},
+-    {"resolution",  no_argument,&retval,RESOLUTION_FLAG+1},
+-    {"minmargin",   no_argument,&retval,MINMARGIN_FLAG+1},
+-
+-    {"protocol",    no_argument,&retval,PROTOCOL_FLAG+1},
+-    {"appletalk",   no_argument,&retval,APPLETALK_FLAG+1}, 
+-    {"lpd",         no_argument,&retval,LPD_FLAG+1},
+-    {"netware",     no_argument,&retval,NETWARE_FLAG+1}, 
+-    {"port9100",    no_argument,&retval,PORT9100_FLAG+1},
+-
+-    {"supplies",    no_argument,&retval,SUPPLIES_FLAG+1},
+-    {"cfgsrc",      no_argument,&retval,CFGSRC_FLAG+1},
+-    {"alerts",      no_argument,&retval,ALERTS_FLAG+1},
+-    {"reboot",      no_argument,&retval,REBOOT_FLAG+1},
++    {"languages",   no_argument,&retval,(int)LANGUAGES_FLAG+1},
++    {"pjl",         no_argument,&retval,(int)PJL_FLAG+1},
++    {"hpgl",        no_argument,&retval,(int)HPGL_FLAG+1},
++    {"psprinter",   no_argument,&retval,(int)PSPRINTER_FLAG+1},
++    {"autolang",    no_argument,&retval,(int)AUTOLANG_FLAG+1},
++    {"pcl",         no_argument,&retval,(int)PCL_FLAG+1},
++    {"postscript",  no_argument,&retval,(int)POSTSCRIPT_FLAG+1},
++
++    {"marker",      no_argument,&retval,(int)MARKER_FLAG+1},
++    {"pagecount",   no_argument,&retval,(int)PAGECOUNT_FLAG+1},
++    {"colors",      no_argument,&retval,(int)COLORS_FLAG+1},
++    {"resolution",  no_argument,&retval,(int)RESOLUTION_FLAG+1},
++    {"minmargin",   no_argument,&retval,(int)MINMARGIN_FLAG+1},
++
++    {"protocol",    no_argument,&retval,(int)PROTOCOL_FLAG+1},
++    {"appletalk",   no_argument,&retval,(int)APPLETALK_FLAG+1}, 
++    {"lpd",         no_argument,&retval,(int)LPD_FLAG+1},
++    {"netware",     no_argument,&retval,(int)NETWARE_FLAG+1}, 
++    {"port9100",    no_argument,&retval,(int)PORT9100_FLAG+1},
++
++    {"supplies",    no_argument,&retval,(int)SUPPLIES_FLAG+1},
++    {"cfgsrc",      no_argument,&retval,(int)CFGSRC_FLAG+1},
++    {"alerts",      no_argument,&retval,(int)ALERTS_FLAG+1},
++    {"reboot",      no_argument,&retval,(int)REBOOT_FLAG+1},
+ 
+     // From here down These all get an extra bit 2 to indicate that they belong
+     // to argval[2] rather than argval[0] or argval[1]
+-    {"maxproc",required_argument,&retval,MAXPROC_FLAG+2},
+-    {"setcontact",required_argument,&retval,SETCONTACT_FLAG+2},
+-    {"setlocation",required_argument,&retval,SETLOCATION_FLAG+2},
+-    {"updatefirmware",required_argument,&retval,UPDATEFIRM_FLAG+2},
++    {"maxproc",required_argument,&retval,(int)MAXPROC_FLAG+2},
++    {"setcontact",required_argument,&retval,(int)SETCONTACT_FLAG+2},
++    {"setlocation",required_argument,&retval,(int)SETLOCATION_FLAG+2},
++    {"updatefirmware",required_argument,&retval,(int)UPDATEFIRM_FLAG+2},
+ 
+     {"community",required_argument,NULL,    'c'},
+     {"timeout",required_argument,NULL,      't'},
diff --git a/net-print/npadmin/files/npadmin-0.8.7-stdlib.patch b/net-print/npadmin/files/npadmin-0.8.7-stdlib.patch
new file mode 100644
index 000000000000..976cc9c191a2
--- /dev/null
+++ b/net-print/npadmin/files/npadmin-0.8.7-stdlib.patch
@@ -0,0 +1,10 @@
+--- npadmin-0.8.7/snmpsock.h	1998-12-31 04:04:42.000000000 +0100
++++ npadmin-0.8.7-patched/snmpsock.h	2005-02-23 15:37:41.082565000 +0100
+@@ -2,6 +2,7 @@
+ #define __SNMPSOCK_H_
+ 
+ #include <pthread.h>
++#include <stdlib.h>
+ 
+ class SNMP_socket {
+   int sock;
diff --git a/net-print/npadmin/metadata.xml b/net-print/npadmin/metadata.xml
new file mode 100644
index 000000000000..81b685a0b019
--- /dev/null
+++ b/net-print/npadmin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">npadmin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/npadmin/npadmin-0.8.7-r1.ebuild b/net-print/npadmin/npadmin-0.8.7-r1.ebuild
new file mode 100644
index 000000000000..d58da82c8b82
--- /dev/null
+++ b/net-print/npadmin/npadmin-0.8.7-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Network printer command-line adminstration tool"
+SRC_URI="mirror://sourceforge/${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/pkpgcounter/Manifest b/net-print/pkpgcounter/Manifest
new file mode 100644
index 000000000000..d83c443ccf93
--- /dev/null
+++ b/net-print/pkpgcounter/Manifest
@@ -0,0 +1,5 @@
+DIST pkpgcounter-3.50.tar.gz 195579 SHA256 cbeea2c571682d5fa6ac1ffeec36d3495dbe65665581f2f0ae6255dbd7d62118 SHA512 d0c597cacc6b315faf002677ff456bd3dcb4fe8337b407e027b0edb6b27fd0e23da69fed6d148d7f5e28c2b91f7207d63779307e5e284cc714954dcb7ebe6346 WHIRLPOOL 500a0521b766366cedca30cebf402da16bcc5fbc2c52f3d27a5a984a15d8e004d1e552dd7dde22723bc8b3d955686fe04ba0bf0418501cc35b2276c5d69f2df0
+EBUILD pkpgcounter-3.50-r2.ebuild 582 SHA256 0b61a59ecbcb28040ae7a2b8b3c5996ff690d73b41c1b37e338faf70b1818b2e SHA512 d7c0508ba39e902e84deb968057c2a118e2422e8def8dc52af0924d9a10efdfb7aded85e1b7d20cd3e63a9f9ab16c25af5f2dcd595e8af14f19f9cf80a0c02b2 WHIRLPOOL 0c7c0fdcee9a181b5805a4560abeba32af69a84ff321f73b0470ba7ec3e3aa2a13d10a7d5a09f73b5f50efd15a00aaf4eddf7971d9f2463c3224309da8cd3cf2
+MISC ChangeLog 2384 SHA256 cfb09af4f3d0af3b2713e27e0de8fb92e02cb13207998b1b3e34a3abe491917e SHA512 55c2c118238701e13304b2bd75afbba7a615c2e26b203049a4e9f20744561de86a16df404f3cf409ecb82d0d25ee484b84dacd9862bc100e2d35a641479810fe WHIRLPOOL 7e0fcb01b5ecc9460c05adc4d24d9326cb9ea4b6b02dfe2a9dbaecdc44a07dab96f6122c2204e365923fe908392b468ed1466a419791b07b49cb12ccf9dc8ad0
+MISC ChangeLog-2015 2984 SHA256 de44f2c5d4d89b9e3796fc4a9262639b19506f637023fc396fa6369d2c4e6c87 SHA512 066f499e72710352e62615393648325a76038c6b3ded0e9dbd70d7d24cb61a9d8e08e6449688490efcf2967a4e7618d4bcd4497173ad19e08bb1c713cde668ac WHIRLPOOL 304d2739c3af685e1d5ce9a6c1cc1d835b7f4c053804a124780ca6855ca40ece1fd5733ce29789e8a86fd19e84c463cfd80e7884e4599b890677e13ebff5c23a
+MISC metadata.xml 444 SHA256 10cd96e6742908e8dae93022906a1931210bb8d7ce3a7aeb929954886d17a377 SHA512 457d762c93c74c23308f9b30229b80d911fad33daf0d9c31162197a99136d2ea342ad3cee6cf7fb4e18775a549d51395c74a196ad43cfff60e9c58313ef18f1e WHIRLPOOL c4855c5da388e3521bc2ac9f6e9ec508e7a54d19703c602b36a7956de508cf74564836811a78581ce4a5f79eefa13725277e6402d33bd1ac0e1759c458dd3191
diff --git a/net-print/pkpgcounter/metadata.xml b/net-print/pkpgcounter/metadata.xml
new file mode 100644
index 000000000000..99680c0f44fc
--- /dev/null
+++ b/net-print/pkpgcounter/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		pkpgcounter is a python generic PDL (Page Description Language) parser
+		which main feature is to count the number of pages in printable files.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-print/pkpgcounter/pkpgcounter-3.50-r2.ebuild b/net-print/pkpgcounter/pkpgcounter-3.50-r2.ebuild
new file mode 100644
index 000000000000..8f349b12d39f
--- /dev/null
+++ b/net-print/pkpgcounter/pkpgcounter-3.50-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Generic PDL (Page Description Language) parser in Python"
+HOMEPAGE="http://www.pykota.com/software/pkpgcounter"
+SRC_URI="http://www.pykota.com/software/${PN}/download/tarballs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pillow[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -r "${ED%/}/usr/share/doc/${PN}" || die
+}
diff --git a/net-print/pnm2ppa/Manifest b/net-print/pnm2ppa/Manifest
new file mode 100644
index 000000000000..dae722b15715
--- /dev/null
+++ b/net-print/pnm2ppa/Manifest
@@ -0,0 +1,5 @@
+DIST pnm2ppa-1.13.tar.gz 291190 SHA256 1c50ea2c97b232f5bee6ac3fab408d64b6f1380f1e289ac278778a7e368e7379 SHA512 8f96792cf7f03fd024db9a8d338f06d7484fa4474c1cd73048c90f0e88ae5540df30e6894c0bbc82dfd87126fc72875b6d71b2031c0e24b343ef88f51d00bb7a WHIRLPOOL e3403313cd83fb1fea9a068b812e2124ff7f137b73c0d8909f0dad3f55b85b362bff1ef87df70ec6741f0359f760dba34293e5a2c07ec237b008792576cfc1f3
+EBUILD pnm2ppa-1.13-r1.ebuild 1566 SHA256 64d46967af496a44ed948d10df8c48def53f070f2f1217ff47c5655df437ea0c SHA512 0fd91ed5cfd9b98227532be31a147e767a8db4283214dcfc0641e312c51454f4ac4e4275e4a85c1dd2567cb53ed743fb4d5f44703348eaca38979dcc65184202 WHIRLPOOL eea9eed3c71d5df658a6938dab8b291e8004067b0f280451f0d08445407481a7406a8719fdafd74d85522cf2b753038881004c78d2b12f296aee2130e3e8f966
+MISC ChangeLog 2465 SHA256 e502a1ed962162fc919ac978f16afb29a5d0336b731924339426efe6234160b1 SHA512 06af8c33ee7f9aa157d5fd104bccce35ecaf6655bfbacd2b246a5e83225112bc01c4e88643b612618352ef30985b44e80012022e06172869ecc1c97925feb2f8 WHIRLPOOL 2d994ef550952c2ad34c3dc3a71b63e887eab73d7a295789a9b10c5652d5c926768fe4f690bfa158e0ecc79ebaf8a13408a03a761d6de27e55ac2474a050546b
+MISC ChangeLog-2015 4097 SHA256 1527e87211c513bef58b26713cca29d37749798412c1d2c2d7877fc4b0e50373 SHA512 d2e18d736c86463dae44b4625a66be4f18c27a5249ffbff88243fea3c2efcd1dfa790cfa81c37eac389016fcea23e92ae96c4ec2dad08a032c8be79260ef7725 WHIRLPOOL 6e7b2f55775ad40e315bf337dcff666242f270c4ab0e594628599934a687247bad3f2653a82501644117ecde46c746a3a1cf095ac02ff8a48f52f082ef72463f
+MISC metadata.xml 336 SHA256 74903778b696e885b8e00a7c640fdb555c0bc8e9b537f062ed0cbb6d5dcef494 SHA512 345cc7f244621dee98b191a5b9704783490eccf9b27cda4c8d052657ebb35dc441ab752014a34f171115b26a9a2d8650c9cb2afc788e9271be6d91d47de3a507 WHIRLPOOL 7e52bbe6265280652134330e261812dce0220d51545fa32409c2e9a1688b2bdd8e0ea96b2eb3c982957523c13bcf2e55604bfeeeb119b009e226294be7b700dc
diff --git a/net-print/pnm2ppa/metadata.xml b/net-print/pnm2ppa/metadata.xml
new file mode 100644
index 000000000000..694dbab7c8b5
--- /dev/null
+++ b/net-print/pnm2ppa/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pnm2ppa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
new file mode 100644
index 000000000000..0e30bb154713
--- /dev/null
+++ b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit base
+
+DESCRIPTION="Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series"
+HOMEPAGE="http://pnm2ppa.sourceforge.net"
+SRC_URI="mirror://sourceforge/pnm2ppa/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="syslog"
+
+# en on first place so others can override it
+LANGS="en cs es fr it nl"
+for lng in ${LANGS}; do
+	IUSE+=" linguas_${lng}"
+done
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	net-print/cups
+	|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters )
+	sys-libs/glibc
+	syslog? ( virtual/logger )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local lng i withval
+
+	for lng in ${LANGS}; do
+		if use linguas_${lng}; then
+			if [[ -n ${i} ]] ; then
+				ewarn "This package supports only one translation at a time."
+				ewarn "Overriding previous value: \"${withval}\" with \"${lng}\""
+			fi
+			withval="${lng}"
+			i=true
+		fi
+	done
+
+	econf \
+		--with-language="${lng}" \
+		--enable-vlink \
+		$(use_enable syslog)
+}
+
+src_install() {
+	default
+
+	dobin utils/Linux/detect_ppa utils/Linux/test_ppa
+
+	insinto /usr/share/pnm2ppa
+	doins -r lpd pdq
+
+	exeinto /usr/share/pnm2ppa/lpd
+	doexe lpd/lpdsetup
+
+	exeinto /usr/share/pnm2ppa/sample_scripts
+	doexe sample_scripts/*
+
+	exeinto /etc/pdq/drivers/ghostscript
+	doexe pdq/gs-pnm2ppa
+	exeinto /etc/pdq/interfaces
+	doexe pdq/dummy
+
+	# install docs
+	cd docs/en
+	dodoc CALIBRATION*txt COLOR*txt PPA*txt RELEASE* CREDITS README sgml/*.sgml
+
+	cd "${S}"
+	dohtml -r .
+}
diff --git a/net-print/poster/Manifest b/net-print/poster/Manifest
new file mode 100644
index 000000000000..4a20cdaab80b
--- /dev/null
+++ b/net-print/poster/Manifest
@@ -0,0 +1,10 @@
+AUX poster-20060221-fix_cutmarks.patch 454 SHA256 581307565b06f2b3df5c22ee593b2cf65096b7eac0b1ce0fb03ce75193b3b3b2 SHA512 d507c4e3b8206b6d039bcfcb2b2925ffc358a3061ec304b9f95d7321966fff464b6cec9b938ecd1df331f0b39e13f627bf76c19ea1c6876683aebd0353c1ce33 WHIRLPOOL cc25d68e311f782d5bda63c6637f84416bb5d4419562c47227c130022b41e96be1998902c59be9f10282d9cd71dde19727683eaee6d8b600350ce10e768134a2
+AUX poster-20060221-fix_duplicate_DocumentMedia.patch 513 SHA256 0a5be0ee9a4d7a90d2d926b714c6cc1fedc8410e468e626cbdecd3984e5dc3b9 SHA512 b13c4cf46075922a6933be7b6adbf6c4f58d63c79208c9b63f04c3d21de47416019fd4257a3c8b36237a271b499fa61e06aaa80283203e61cc980c82004d8e43 WHIRLPOOL a354994c57a04279037fd80b905839f26e195d9d11dcca39605f9f14e46154cb0ef7066aef861f220621d76d89519488ca314a69ea17d47a17c0b6c20578a2f6
+AUX poster-20060221-fix_gs_crash.patch 1370 SHA256 cbbb7820f3aedf0d6e3805ad26ce2403640c72cf30eccd9fdd99306dedb1b145 SHA512 3b2cf207c6ada9cf23a014f768b45a957b348b9ac9c2a151e951131cd845691dc91c40c8f77083066ffd2d97c21fe57f21f64b869c67458e0dcf29f6408e64ee WHIRLPOOL af7e9e20ec563db468471253c2efb7477642bf68cf18132ec71b1f42784c721922b3f83ee6a56aeb7fef5fd4ed6e7e960f7cdbbf8cde3510452ed2654ca47531
+DIST poster-20060221.tar.bz2 33770 SHA256 63bd6f01e40e68dda0ac11a4f416c70457bc6bbd254af720b7ea2874875fa4ba SHA512 530d846ace93a182a4c232d7e30df47af653f354c8138f52d385b62b677ac51e6ca777c93ff5b3d4e983d8c16f3efa43d122f48826c80a08be0232331232c471 WHIRLPOOL 1b6a54babc753a982308ca588d9a227e0e23af66a7661fb927aae310425bc2182a5594b9b5266caa9a0c3aff6eba2d1921a7429a0fe92ac8968f5fd359b16aa0
+EBUILD poster-20060221-r2.ebuild 642 SHA256 f752cbebf84d60fbbd0b9887d225efe852aa1bcdce48833cdda3b788a659df74 SHA512 1874471befc9c1f3bb6e27ce1d65c45b3e5299f47d85e97346ca93e9faad1741ada7791e3b8054edc42b7bc3df401cb3582e6fcb9b16520f6a4706c0fecc2d32 WHIRLPOOL 06788ba86d458fdab6dc57ed6787a74bdeb2fbf13d833442d2afcab77fd1386e114eb3720473429df2cb045d5f62a903eb49d426cc3d98520d65d5dd15ebf6b0
+EBUILD poster-20060221-r3.ebuild 681 SHA256 6a2fbf104a1b5671b032a75e6745c3f9f6b119cc1d4cabd2b7f4aa7fadc29b54 SHA512 ece2e2eae9cc957a8256fbb85c25be2c651c00a37fcf92ba8a3a0055467636a0a565bfb32c9c6dea0a7ba305825b907504bd5833f42ce5d1aae859ad4ac0772a WHIRLPOOL 4728bc6a0bdfa892a56b35e3dbdc6bade463e9454d0f8913b64d90818661d8d0ec51b224d6e5021033f0f9b6f4cc2670f2367a7b1fa793291101a69da2c859de
+EBUILD poster-20060221.ebuild 534 SHA256 28aa81dda7499b820669d384103075f5d7208ee9411f335f4dea9b57df88805f SHA512 083b1775365e0a650a29b8ed7f7fd0ee73ebde10b8001cbad78cf266ab73e4e66cba856458535b0f9efe39133836fa65344912e55482e136502fda769db5b364 WHIRLPOOL ca2e15832e2cf73e073e9e112b55a2f1e40e5f98900f04c0e54d8c3b081843c92c875952096225c503bba71153230652f2ab998209e07840f5516881ad101742
+MISC ChangeLog 2603 SHA256 c2b8b242c6d7ddb2dc0337b17c686df0d71f4fc36f8c04ce56015dd862b994c7 SHA512 3a61795f3b681132d5856b68fb7d13cbded817845b52ac8ac115ea9beb88cb413bd304ab8cdddf04b0607c7773dc1c9a773fe0a746885acf1c5e8369c32d31b0 WHIRLPOOL 68fc4bb98bfde9c5687ad9a0d52ad0d52a6f84826c3b5bf7d77bd056f5cb78e2c718d5ea2d54c1b0a1a3f0a0f4b68cbcdc4fb757dfa9c5f600efd853c3419270
+MISC ChangeLog-2015 1927 SHA256 df52c525ce0a44810091942559f42966756f308369630258720e60ac47f783f5 SHA512 43a75ba472616576c65038783f2ec9fb89631c473861d889d978bb10c3690eaf5daddd67d6abb60e8798a3be0ed48d4e611675fb36a49e40492e3286846d35a0 WHIRLPOOL e8c619090b246b506e4cd10694ffd1deef8ccf808f51c10170bb01864d9497e6703100a96ffe89f38dee6933d006965693ced0c1286d17eea0f1cf66a34136ec
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
diff --git a/net-print/poster/files/poster-20060221-fix_cutmarks.patch b/net-print/poster/files/poster-20060221-fix_cutmarks.patch
new file mode 100644
index 000000000000..0ae10f3bdfc8
--- /dev/null
+++ b/net-print/poster/files/poster-20060221-fix_cutmarks.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=580610
+
+Index: poster-20060221/poster.c
+===================================================================
+--- poster-20060221.orig/poster.c
++++ poster-20060221/poster.c
+@@ -113,7 +113,7 @@ char *whitemarginspec = NULL;
+ char *scalespec = NULL;
+ char *filespec = NULL;
+ char *pagespec = NULL;
+-char *clipfacil = "0xFF";
++char *clipfacil = "255";
+ char *overlap = "6";
+ 
+ /* media sizes in ps units (1/72 inch) */
diff --git a/net-print/poster/files/poster-20060221-fix_duplicate_DocumentMedia.patch b/net-print/poster/files/poster-20060221-fix_duplicate_DocumentMedia.patch
new file mode 100644
index 000000000000..52584a9507a3
--- /dev/null
+++ b/net-print/poster/files/poster-20060221-fix_duplicate_DocumentMedia.patch
@@ -0,0 +1,19 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=471270
+
+--- a/poster.c	2013-05-25 21:41:53.000000000 +0200
++++ b/poster.c	2013-05-25 21:43:41.000000000 +0200
+@@ -812,8 +812,12 @@
+ 			if (!strncmp( c, "(atend)", 7)) atend = 1;
+ 			else
+ 			{	/* pass this DSC to output */
+-				puts( buf);
+-				dsc_cont = 1;
++				/* if it is not another DocumentMedia comment */
++				if (strncmp( buf, "%%DocumentMedia", 15))
++				{
++					puts( buf);
++					dsc_cont = 1;
++				}
+ 			}
+ 		}
+ 		else if ( !strncmp( buf, "%%Pages:", 8 ) )
diff --git a/net-print/poster/files/poster-20060221-fix_gs_crash.patch b/net-print/poster/files/poster-20060221-fix_gs_crash.patch
new file mode 100644
index 000000000000..d2f3afd9328b
--- /dev/null
+++ b/net-print/poster/files/poster-20060221-fix_gs_crash.patch
@@ -0,0 +1,47 @@
+Source: http://pkgs.fedoraproject.org/cgit/rpms/poster.git/plain/poster.fixes_gs_crash.patch
+See also https://bugs.gentoo.org/show_bug.cgi?id=471238
+
+--- a/poster.c	2006-02-22 13:27:39.000000000 +0100
++++ b/poster.c	2012-11-17 01:30:45.303051611 +0100
+@@ -856,21 +856,13 @@
+ 	int row, col, page;
+ 
+ 	printprolog();
+-	for ( page = 0; page < number_pages; page++ )
+-	{
+-		printf( "/print_content_of_complete_page_%d\n", page);
+-		printf( "{\n");
+-		printfile (page);
+-		printf( "} bind def\n\n");
+-	
+ 		if ( pages == NULL )
+-		{
++		for ( page = 0; page < number_pages; page++ )
+ 			for (row = 1; row <= nrows; row++)
+ 				for (col = 1; col <= ncols; col++)
+ 					tile( row, col, page);
+-		}
+ 		else
+-		{
++		for ( page = 0; page < number_pages; page++ )
+ 			for ( row = 0; row < pages_length; row++ )
+ 			{
+ 				int p = pages[ row ]-1;
+@@ -878,8 +870,6 @@
+ 					fprintf( stderr, "Warning: page index out of range: %d\n", p+1 );
+ 				tile( p/ncols+1, p%ncols+1, page );
+ 			}
+-		}
+-	}
+ 	printf ("%%%%EOF\n");
+ 
+ 	if (tail_cntl_D)
+@@ -1027,7 +1017,7 @@
+ 	printf ("\n%%%%Page: (%d,%d) %d\n", pagetoprint+1, ((row-1)*ncols+col), page);
+ 	printf ("%d %d tileprolog\n", row, col);
+ 	printf ("%%%%BeginDocument: %s\n", infile);
+-	printf( "print_content_of_complete_page_%d\n", pagetoprint);
++	printfile (pagetoprint);	
+ 	printf ("%%%%EndDocument\n");
+ 	printf ("tileepilog\n");
+ 
diff --git a/net-print/poster/metadata.xml b/net-print/poster/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/net-print/poster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/poster/poster-20060221-r2.ebuild b/net-print/poster/poster-20060221-r2.ebuild
new file mode 100644
index 000000000000..a34548ed8c65
--- /dev/null
+++ b/net-print/poster/poster-20060221-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small utility for making a poster from an EPS file or a one-page PS document"
+SRC_URI="mirror://kde/printing/${P}.tar.bz2"
+HOMEPAGE="https://printing.kde.org/downloads"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix_gs_crash.patch"
+	"${FILESDIR}/${P}-fix_duplicate_DocumentMedia.patch"
+)
+
+src_compile(){
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README ChangeLog
+}
diff --git a/net-print/poster/poster-20060221-r3.ebuild b/net-print/poster/poster-20060221-r3.ebuild
new file mode 100644
index 000000000000..2ac9fde37759
--- /dev/null
+++ b/net-print/poster/poster-20060221-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Small utility for making a poster from an EPS file or a one-page PS document"
+SRC_URI="mirror://kde/printing/${P}.tar.bz2"
+HOMEPAGE="https://printing.kde.org/downloads"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix_gs_crash.patch"
+	"${FILESDIR}/${P}-fix_duplicate_DocumentMedia.patch"
+	"${FILESDIR}/${P}-fix_cutmarks.patch"
+)
+
+src_compile(){
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README ChangeLog
+}
diff --git a/net-print/poster/poster-20060221.ebuild b/net-print/poster/poster-20060221.ebuild
new file mode 100644
index 000000000000..942eeb94a92a
--- /dev/null
+++ b/net-print/poster/poster-20060221.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="small utility for making a poster from an EPS file or a one-page PS document"
+SRC_URI="mirror://kde/printing/${P}.tar.bz2"
+HOMEPAGE="https://printing.kde.org/downloads"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+src_compile(){
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -lm -o ${PN} || die
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README ChangeLog
+}
diff --git a/net-print/pykota/Manifest b/net-print/pykota/Manifest
new file mode 100644
index 000000000000..dd4815844739
--- /dev/null
+++ b/net-print/pykota/Manifest
@@ -0,0 +1,5 @@
+DIST pykota-1.26.tar.xz 1377656 SHA256 17318092f30fb80b13ea9dbe8348fcaf66ad4efe3256e0d81b4739123955156e SHA512 b6b0b274a52b031837ff3ad267dcfd84e0292bf0210b46f09ed84d19c83e586297b4e0667f3338aa50cf9db13e750723c5d12868f5bfeb2079c343208cd72c1c WHIRLPOOL 8701c3367b3f0d69f454e0999513310e229d0c73bcff341d72a5d1ae25a167f90d0f2a47c67bbc2bbdb303787531a75cdef3666030d0d7bf3c71165a33df9e11
+EBUILD pykota-1.26-r1.ebuild 1864 SHA256 470dcb84a538eff27e41ccd6a955d932607afa8ffda477880fc8ed2e5c890e20 SHA512 2eedc56266347a7657eb7e27e5c5f61a394eb4fcb63269777726a995108bc3407e96b5a7dfdbe5e5d4ba4c9588438724f76629b37d62bc0cc2fa80ea50ded381 WHIRLPOOL 67cbcbcc02dd4766f5a5832301b1f36092369afc7a4d2c2354426736226a744156b69d053bf8b364e97c6ec717cbf0ba1d16b51f9dac46c7adc1feed863bee2a
+MISC ChangeLog 2584 SHA256 242465fc4d65eb573ca7ea22c64fbb9ae80138a96b8a528dacfa3416e43b16b2 SHA512 bd9d4c1c342c982c9cded91baa4595f5732a9c6ef62cc853be05c2eaba00976e91d1edb69f0611e945c5856915411525dc372b56b9368ebdc5c231eb75c3945b WHIRLPOOL 4ab0b6e011800436919df939768a77e694182ac2160b9ccf557c019d6969635bd52bcc6c85790741924107c80604b0c297217bf1dc220b51ac8dfeb6d0683947
+MISC ChangeLog-2015 6053 SHA256 4aaaa6762b111e556f8b2253dee7a176662110984ba4caaead8600949df345a0 SHA512 b08dd3502d16f792cf09a3105f2cc07678845c1ffb72d76f16401df7841e0378d953a038c8e6b3ba7130b987721e61e6145faf7abe781f740117ff21ef4adb11 WHIRLPOOL ba3eff28a27de53070b63c24de93bc71ba5c26fa6daf0ade1d766d8a788b8b0fc135d745e3d1ee20d6e56baa1497d7dcf6e7ffda20d11e305c8982299f11503e
+MISC metadata.xml 538 SHA256 51575fa9d11d0e411b0874e91ec9bf22b12f66ebe484ff8443cce97995ae1489 SHA512 8bdf5ee52db9031b7d89bed73fd0f0ef0d8c95292f4182a7835acb80d847a5671f28421a9c9f81be2b4764c503624f555d0a2121e21568abe9e6179f92060207 WHIRLPOOL 0a5a3416f1cef5c06717b86d9af640f04bf843611b8f5a72760f2a22878799a5892ceeacfe26ce37376c04ac8c38e366cb80c1ed6c9462f2f078d98104a376ba
diff --git a/net-print/pykota/metadata.xml b/net-print/pykota/metadata.xml
new file mode 100644
index 000000000000..a6df06de99c5
--- /dev/null
+++ b/net-print/pykota/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		PyKota is a complete GPLed Print Quota and Accounting Software Solution
+		for the Common UNIX Printing System (CUPS).
+	</longdescription>
+</pkgmetadata>
diff --git a/net-print/pykota/pykota-1.26-r1.ebuild b/net-print/pykota/pykota-1.26-r1.ebuild
new file mode 100644
index 000000000000..f7181c518167
--- /dev/null
+++ b/net-print/pykota/pykota-1.26-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+inherit distutils-r1
+
+DESCRIPTION="Flexible print quota and accounting package for use with CUPS and lpd"
+HOMEPAGE="http://www.pykota.com"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap mysql postgres snmp sqlite xml"
+
+RDEPEND="
+	dev-python/egenix-mx-base[${PYTHON_USEDEP}]
+	net-print/pkpgcounter[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pkipplib[${PYTHON_USEDEP}]
+	ldap?     ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	mysql?    ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( dev-db/postgresql[server] dev-python/pygresql[${PYTHON_USEDEP}] )
+	snmp?     ( net-analyzer/net-snmp dev-python/pysnmp[${PYTHON_USEDEP}] )
+	xml?      ( dev-python/jaxml[${PYTHON_USEDEP}] )"
+# CUPS required because of cups-config call, #563402
+DEPEND="${RDEPEND}
+	net-print/cups"
+
+python_prepare_all() {
+	sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \
+		pykota/storages/sqlitestorage.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local DOCS=()
+
+	distutils-r1_python_install_all
+
+	dodir /etc/${PN}
+	# cups backend ----------------------------------------------
+
+	dodir "$(cups-config --serverbin)/backend"
+	dosym "${EPREFIX}"/usr/share/pykota/cupspykota \
+		"$(cups-config --serverbin)/backend/cupspykota"
+
+	# extra docs: inits -----------------------------------------
+
+	init_dir="/usr/share/doc/${PF}/initscripts"
+	insinto "${init_dir}"
+	doins -r initscripts/*
+
+	# Fixes permissions for bug 155865
+	fperms 0700 /usr/share/pykota/cupspykota || die
+
+	rm "${ED%/}"/usr/share/doc/${PN}/{LICENSE,COPYING} || die
+	mv "${ED%/}"/usr/share/doc/{${PN},${PF}} || die
+}
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
new file mode 100644
index 000000000000..c7cc59cd9b43
--- /dev/null
+++ b/net-print/splix/Manifest
@@ -0,0 +1,8 @@
+DIST samsung-cms-20120312.tar.xz 3354884 SHA256 66af6a617ff390a076a827e35e5a138467a67b024a8e1f16a99422b93334b5af SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db WHIRLPOOL 31d1b8af1b3568f3ba2b3375fb08986c68e80ee59470565cfa5e342b1846f65305edfff4fe785caa58f2ff0229836ff8389219725119b9e0e43e4f016a819f42
+DIST splix-2.0.0_p20111206.tar.bz2 122216 SHA256 3d4805e8dfb04305ac420dc297aebf36622e876ada40a08e997ec17f79755a3f SHA512 370840b646acb7d62814a7b8a123fb4e7b51360f83ea6c2ec4b7b1ecc15a42d7538bfa9bdb3bcc52c6f1e2cd46a0f72467ab8a8f9753341b823ac9986820d3b5 WHIRLPOOL 14157bfc54135038f99ac2010a64d939b8758b1089d3ee806be3f6da61d3aa3c1978928acf521b2136763aa4bf4e1babbed770bbdcc6cccce720c9a1422250c6
+DIST splix-2.0.0_p20130826.tar.bz2 127278 SHA256 ff7bca0f294b74c631804b56dd8c8de4909fa4c850a6ec78726b6ebcce581d30 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0 WHIRLPOOL 2b4656deb17ffc935c74c68a734cfdcecaf0387d30bc5660eacfdb8ea667fe064b76d006c7050eed280be1c215128067e1b11ec32df085692e972436acaad504
+EBUILD splix-2.0.0_p20111206.ebuild 2564 SHA256 bddcb166d1421375246344555ae458ed872c78691e13e7a94f502d5b8f9269cf SHA512 bedf4cd7730d313a9a7389edc239d5a8b5870f195a1a8adc9f637b8b2d253722b8560d2ed906c2008f6c5c98e98903bbad9cd5698bc087ae19855509a6306327 WHIRLPOOL bd7aaf6082a607489efae6a95ff86396e38273319dcde44a38dcb12f408f28f75f3e0bc97d50350168cb935a26cada193c7effdb272d5305248f87ea9a8f7383
+EBUILD splix-2.0.0_p20130826.ebuild 2224 SHA256 948cf33ff96aa8be6bbc406af47a1a30cf2f630640c0f8e210e07d10e6f58ed6 SHA512 60d44db4d9a6019238ca81351d33f4ba46acd7f7d155202ac29f3bf88ea1e16bffc10d1aed543611f98612d90f77d31d42f99835050b3c7c7bd16be97b49a4f5 WHIRLPOOL 5bd1a39ed9e969aadd608d43c5f20136fe5e6782909726f72f8a7dd03db01eb7a5d09ff79d10d41a66734a0107f4e6b32b6b2f0cc94e0579c4db070995c99f62
+MISC ChangeLog 3277 SHA256 fea31077145f64d05288c30b41db3dfaff147dec9a5161ab537fd582fd8d7aa8 SHA512 29d2fdf91f923330f565fb191363cffbc5e3a52ab2eef2c4ca2f874d3ae0e392f596a3f9037ef601ca9f4362988b62430769aad22893edaa0253533df5f3a206 WHIRLPOOL 2ea6d5d69bbc4933a0a57c55b2e5631e903ad1f092d093ffd62e5795c0bf225160e2dbfae3201196356975b142320fca00337e1002d56f3b32f8b3f7a4d4d13e
+MISC ChangeLog-2015 5729 SHA256 bb0057c83e2dece172f7b2d98e3b877f8984276a28de44e9f50120a3e1783f05 SHA512 97b8377835dcac6f05e27c7c5937261b2df9dfc9bbd81fb467ae7e3f13e5123fcfa5ffafad199bc5f06cd47cea11d7c4edafeda94443c29a4df3e6bd54039f75 WHIRLPOOL 87fd1682d96301081487374728aa0cab38928c13a27597122b2dd5da4ef89dd226dea88134f557deb02bd853b932490ee8fdf19682a3b52a9f09e1ecf89d6b01
+MISC metadata.xml 606 SHA256 5fae42b26dab5d4fcd321f242f54cbf2fb17203ca11eca0dc67b06171e685451 SHA512 bcae5483217e119928f51390ece67ae9dd6e27c9721a565707940986c7c8041e669c79ec55d76e4d6afafe4e8206c4883d38e3c9b85c17fa53615db6d8b05235 WHIRLPOOL c79958b5a207e6bd9f59a5131692f089fe190db3835830d705752946f5b5e3a12982d09e9e811945c61ce373c61e2bd628db4884fbd690f2e243bb13a37da735
diff --git a/net-print/splix/metadata.xml b/net-print/splix/metadata.xml
new file mode 100644
index 000000000000..9b64ff4d63bf
--- /dev/null
+++ b/net-print/splix/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">splix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-print/splix/splix-2.0.0_p20111206.ebuild b/net-print/splix/splix-2.0.0_p20111206.ebuild
new file mode 100644
index 000000000000..57df07148cd1
--- /dev/null
+++ b/net-print/splix/splix-2.0.0_p20111206.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
+HOMEPAGE="http://splix.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
+	http://dev.gentooexperimental.org/~scarabeus/samsung-cms-20120312.tar.xz"
+
+# If you can't find your printer cms open the new bug if you recheck the
+# cms home and it is contained there. Otherwise bummer.
+# The cms can be found here:
+#    http://www.bchemnet.com/suldr/smfpv3.html
+# It is stored int he unifieddriver tarball and repacked.
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+jbig"
+
+DEPEND=">=app-text/ghostscript-gpl-9.02
+	>=net-print/cups-1.4.0
+	jbig? ( media-libs/jbigkit )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Honor LDFLAGS
+	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
+		|| die "module.mk sed failed"
+	# Correct link comand, do not strip on install
+	sed -e "s/g++/$\{LINKER\}/" -e "/install/s/-s //" -i rules.mk \
+		|| die "rules.mk sed failed"
+}
+
+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 "ppd gzip failed"
+
+	# it is expected to be at:
+	#    /usr/share/cups/profiles/{samsung,xerox,dell}
+	# instead it is only at:
+	#    /usr/share/cups/profiles/samsung
+	emake DESTDIR="${D}" CMSDIR="${WORKDIR}"/cms MANUFACTURER=samsung installcms
+	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)'"
+}
diff --git a/net-print/splix/splix-2.0.0_p20130826.ebuild b/net-print/splix/splix-2.0.0_p20130826.ebuild
new file mode 100644
index 000000000000..812bf1acb8a1
--- /dev/null
+++ b/net-print/splix/splix-2.0.0_p20130826.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
+HOMEPAGE="http://splix.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2
+	https://dev.gentoo.org/~voyageur/distfiles/samsung-cms-20120312.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+jbig"
+
+DEPEND=">=app-text/ghostscript-gpl-9.02
+	>=net-print/cups-1.4.0
+	jbig? ( media-libs/jbigkit )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Move to correct place
+	mv *.ppd ppd/ || die "ppd files move failed"
+	# Honor LDFLAGS
+	sed -e "/[a-z]_LDFLAGS/s/:=.*/:= $\{LDFLAGS\}/" -i module.mk \
+		|| die "module.mk sed failed"
+	# Correct link comand
+	sed -e "s/g++/$\{LINKER\}/" -i rules.mk \
+		|| die "rules.mk sed failed"
+}
+
+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 "ppd gzip failed"
+
+	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)'"
+}
diff --git a/net-print/sshlpr/Manifest b/net-print/sshlpr/Manifest
new file mode 100644
index 000000000000..f9d5cb974106
--- /dev/null
+++ b/net-print/sshlpr/Manifest
@@ -0,0 +1,5 @@
+DIST sshlpr-1.tar.gz 1296 SHA256 0dba86c1a49ac85919eac0f5a2ec4e46bc34a4003192e48a506e52edf80b9af3 SHA512 abe017172ffcdca89797def774b2a3b6ba76272719e0349862a4611414b452b0ad5e7f12804942f20de2513666963503e0eddb8dfd14deabb4badc7efd0ea805 WHIRLPOOL ffa7d257e88f8940b3ea9c2d9e4f1a6a78f3319ab055ca499cf5ccfd4b7481a9dd3fbfabdf58839d159d882a9e6f49182c963cd26b3c3c7b1dc0cea572dfee3f
+EBUILD sshlpr-1.ebuild 569 SHA256 016063cb7fb8e8bdfc6585b24302ff8bd54d6ac6faf2ced019526b3b362d35e7 SHA512 a25818e397315668d8ed99588a78e6fc2ed06c70813befd57ed42655b80668ccf32fd84b6535ffab8e0f9e8823f9aea096f4750075f376938b19bbc6aadf7958 WHIRLPOOL a255a7632aa42ae0ed1e310d9f4edb7765da84c37e72345ce759b20148de24600e1c3c850d2378560e0b0028eac74f626c522cc7d633df08321af445e4127905
+MISC ChangeLog 2183 SHA256 981e0ed12f22b0489908090b310ad9c5bd08ee68919b99631276e3dae730132a SHA512 e6e1532c1eb62244c13da2324a8e2702482ef72d3e652d7e7e1ab7c43bbc0dd7e1830e77e1eb995356183e905638566f99849e815c6628888dbe304122cf81d8 WHIRLPOOL 94ed854d9e3043ea569c2859e0fd1cfc92e82ca99eedf114b60813e1327d363bf9b3192a79add0cc98c3e0d6a43d942246dc113338e6b7bf2eb491781a075743
+MISC ChangeLog-2015 450 SHA256 6f4c82038cf462641db981fb29a57a1d1d97677c9ae5ecf11f064ff66cb469d2 SHA512 04cccf8c79dc17575b66f3699cb9eda2d82db22fa5edc972f07f885fc54c6ea72d7c4b00eb3c42dfade4f5f2a7f29c02ae5027eecbaa31956c9769a8c008f8b5 WHIRLPOOL 7dbe622bbb8c994bec04071307ea04c1e4110d63090a15cbdce9143859d2a09d69903b52f24f39db3ef51a6949aab438a01bae398c46e876d11c4b7635172680
+MISC metadata.xml 242 SHA256 aff2cb73bbe13a0609631d2aec541275d796c2350ea173bbdc252cdceb79a5f5 SHA512 749de529be32cc7aeff924455c8602b0e6a078813dd0882da7d6b541aa665c120022dba06dea66dc0504021d9abea1237b6878ca35ef0dcd0b488235b36a4bd4 WHIRLPOOL 6e39ff630d156ef36bd5737de44585aec0ef355623170f068566e93bb5dfc5771965825941bf94506fb6a92bc54ea3a05d0eec127e5ef9c1b6fc7834530eaf88
diff --git a/net-print/sshlpr/metadata.xml b/net-print/sshlpr/metadata.xml
new file mode 100644
index 000000000000..0fb174c9c85c
--- /dev/null
+++ b/net-print/sshlpr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>radhermit@gentoo.org</email>
+	<name>Tim Harder</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-print/sshlpr/sshlpr-1.ebuild b/net-print/sshlpr/sshlpr-1.ebuild
new file mode 100644
index 000000000000..d1228ea0cede
--- /dev/null
+++ b/net-print/sshlpr/sshlpr-1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="ssh-lpr backend for cups -- print to remote systems over ssh"
+HOMEPAGE="http://www.masella.name/technical/sshlpr.html"
+SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-print/cups"
+RDEPEND="${DEPEND}
+	net-misc/openssh
+	sys-apps/shadow"
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto $(cups-config --serverbin)/backend
+	exeopts -m0700
+	doexe ${PN}
+}
diff --git a/net-print/xerox-drivers/Manifest b/net-print/xerox-drivers/Manifest
new file mode 100644
index 000000000000..d2f7861c6702
--- /dev/null
+++ b/net-print/xerox-drivers/Manifest
@@ -0,0 +1,5 @@
+DIST LinuxCupsPrinterPkg.tar.gz 1126966 SHA256 066fb371a5f774a789ba60bf3e7a3f0149a147240fe5a43d9494752ef20cc67c SHA512 863285933b182ae6c79fc039a4a23440638caf4f51c36fc8de78fdb4d269dcaf76383f73e523d993b8549e7cd889289bd2974311123fd0e3d3d1fce6a2c80756 WHIRLPOOL 66afd44be4c7f4b0aa180f38346c284596dd872e2aac3a48a6c49da35311f1cad221b75c50bf974d2ce5afcc9dd4ff85541139477c3ebb9ff7a2a82c8faaf676
+EBUILD xerox-drivers-0_p20080123.ebuild 798 SHA256 7ebc4d77ce60f90bcb517fb0656fceb7db1a1f5f0f3c0a64df3e017e45378a76 SHA512 b29b132d81c1037f3f30944f0b0a4795492354b84f270642479250281b7908cee7f321a4dab1ded6ec8af40d2704dec7ca4136c71456c283505cd0860a1c11b9 WHIRLPOOL 1e0bf1bc143deef64059ca3f92526fe3c1c6f1b34f2a4dcd6a761b8b5938ef6d94673a918f465c024dfc7389e6e0f993c0ae0e7d5cb618990e8d21f5cc011dcf
+MISC ChangeLog 2553 SHA256 0b62cabe44077a747d919afe498498f3fd10ff9a13a02e7c341bf0ee9be7aed1 SHA512 550b966080ff79fbc16d240be4f5a2bf4cc8d9f8affb216c833e1935238df0ec30b4796716e84dbb00366630c00ee82bd33983b34df40e751bb70d75d21acb88 WHIRLPOOL aac81dfcf31764d2bd12cdec61561a5b618e24877d4ddd4eac478016894872ed373e3974947c91c28e654f606eb482a8b9ea9712a9e8b758f4296b9b6326615d
+MISC ChangeLog-2015 1129 SHA256 f8de7856d4bdf640edb1e6bed8a56bb9b911f94948b62460502dcee79b671e9b SHA512 c3149236ef6f93ad2f556dc3943cbab9f0480b4a5c398d5f71188e018a5572bd131eca7736fd1e9afc74a80967d2dd377df4e787cd9121ac1878e4c67ffa40cd WHIRLPOOL e18dada5daa5e4f527abb33cb9785207de68ab8b054affe88104606f15f4a356176349e679f065299fdcfbcc408615f01c0635d49561c4d3324a04cb29e4f782
+MISC metadata.xml 300 SHA256 b40371b5fb8f2da451cb887b36c38e660113f9da8726965f4d027c6b0e297b4a SHA512 a3fa0925e2810e203a6188639113cf48ff8c49f99db00acb6902b07edec9be90af73959419e7917a9508ace833a9773adef27644938f6cd537e47c75057dac37 WHIRLPOOL 00da370ad9da7939a1d240e24945ce91c63114ffe17e852cc3b19cbc1f5fe2d244f2a52d66213ec2e3a549a393f2bcdb7af76c6035189282e11a639c70170607
diff --git a/net-print/xerox-drivers/metadata.xml b/net-print/xerox-drivers/metadata.xml
new file mode 100644
index 000000000000..3319e576bd11
--- /dev/null
+++ b/net-print/xerox-drivers/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>PPD files of XEROX printers (CopyCentre, DocuPrint, Phaser, WorkCentre) for CUPS printing
+system</longdescription>
+</pkgmetadata>
diff --git a/net-print/xerox-drivers/xerox-drivers-0_p20080123.ebuild b/net-print/xerox-drivers/xerox-drivers-0_p20080123.ebuild
new file mode 100644
index 000000000000..87692248ac0e
--- /dev/null
+++ b/net-print/xerox-drivers/xerox-drivers-0_p20080123.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+MY_PN="LinuxCupsPrinterPkg"
+
+DESCRIPTION="PPD files for XEROX CopyCentre, DocuPrint, Phaser, WorkCentre (for CUPS)"
+HOMEPAGE="http://www.support.xerox.com/go/getfile.asp?objid=61334&prodID=6180"
+SRC_URI="http://download.support.xerox.com/pub/drivers/DocuColor_2006/drivers/unix/en/${MY_PN}.tar.gz"
+
+LICENSE="Xerox"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RESTRICT="bindist fetch"
+
+DEPEND=""
+RDEPEND="net-print/cups"
+
+S="${WORKDIR}/${MY_PN}"
+
+# Suppressing warnings from the incorrect upstream tarball
+
+src_unpack() {
+	unpack ${A} 2> /dev/null
+}
+
+src_install() {
+	dodoc Readme.txt || die "missing Readme.txt"
+	insinto /usr/share/cups/model
+	doins *.ppd || die "missing ppd files"
+}