Fix cups dependencies - bug 429590.

Thanks to Vladimir for checking the correct version deps.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xBB0E6E98

3 files changed, 92 insertions, 16 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index adbde592a181..235b0fa75a6f 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/foomatic-filters
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.88 2012/11/16 14:27:35 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.89 2013/01/02 04:21:39 jmbsvicetto Exp $
+
+*foomatic-filters-4.0.17-r1 (02 Jan 2013)
+
+  02 Jan 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +foomatic-filters-4.0.17-r1.ebuild:
+  Fix cups dependencies - bug 429590. Thanks to Vladimir for checking the
+  correct version deps.
 
   16 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -foomatic-filters-4.0.16.ebuild, foomatic-filters-4.0.17.ebuild:
diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest
index d7d162290a62..0a9abdd8dfb1 100644
--- a/net-print/foomatic-filters/Manifest
+++ b/net-print/foomatic-filters/Manifest
@@ -3,23 +3,24 @@ Hash: SHA256
 
 AUX foomatic-filters-4.0.9-multilib.patch 1595 SHA256 549fecfbf3358d4d65a346fdd2ebbc13111cab32649104dbd468ca313e0fb4de SHA512 d388b97d57607b54a38e9bffe0a35c40b3bd9948f1c30251428e57ba944da0196901feb5639cb86a2c18822d56c4dec3e44ef02b376b3438976e2f86d9a68525 WHIRLPOOL 051ffcdcd261a6575af5c2ddbdb138763d8618c0fc82b9971c989476ad7b487613d4e211b27e8caf696b0d71ba3117606cd68a50296b1003e1de08cbeaff9045
 DIST foomatic-filters-4.0.17.tar.gz 266276 SHA256 a2e2e53e502571e88eeb9010c45a0d54671f15707ee104f5c9c22b59ea7a33e3 SHA512 f07d2ac64a28e9353418deb9dd2009f5ef7676ab268af211edfcd012c231c9081516dae450f2b7910b687f75f7e53c8198fda2508f3fd527120940b4905292dd WHIRLPOOL c9ea6456df64aa92f0b1dbbf74b03406d9f5487b1b0df11c3c354f813db32a3953371ffdd0fcfab5369ca46123280a5a68bab034c90c0d0c612001ff99242e40
+EBUILD foomatic-filters-4.0.17-r1.ebuild 1620 SHA256 316b4174ff912b392c61e3a3bfe121c4002e43b6cff0dba41b7e2ebb879ff188 SHA512 a6623b1dbf9f5876a15c7de22234e78c7172aa0edf371ce1f75fadf5c3c1eaea1c53680ef2e0be0154594c933d9f8d81b5aab5748008152907f65fc8af058496 WHIRLPOOL 730e9dedaa299565d9d6086d37760b7eb967c2eca588d5946e26b4d4b8ffb5f4a2e152629ba069854596e67ba3eb0d6454fdd31c35bf376c3beba7500bf6d270
 EBUILD foomatic-filters-4.0.17.ebuild 1534 SHA256 30da7d9e328cdd779de0f35bf50f4208ee07da39e067e3fea37d7b952b745d60 SHA512 1a6939c8c76597ec80b70af54501db4fa988fda66dffa94467b831f0c5bf9176f063bbd1c75567045b0e4067a9b9003eebd89be5e5c5426d7588176891b5e05b WHIRLPOOL 8e4b88102d317fe0e2d771dbccc1b8fb4677645625014f799cbf1bf6f30fe415d12244c22603bef35c453ce25c617c2e6926cae1d0f1c510b46212b1b23ddc03
-MISC ChangeLog 12273 SHA256 908c4884dfd5230ebf170e0a973122c736ba22b5cefb5cba8e4d1ad9783194d9 SHA512 c50a54a1808015d16e76241a0535b83b48ac88e82f4789af86608adcacc6175df5a8b6039e7a2d32fd11839dae731e16b8d9a752d653ac0e0d8da714700339b6 WHIRLPOOL ad0f4a2530edea0da72e7965d314164dfc492dbde9838f40e5bdf1bcd55686692165192529feca4f6e19b3057f6f22329d4b551fa74f3fe6653fb345b13d8fa4
+MISC ChangeLog 12522 SHA256 3048bce4449acc8cb7c22eeae8f54d4063d1a13ce7d030a20270b5ffcda0fa48 SHA512 4c61d416001cb7c0e0686c2efe6fa1a2fa9301893b98ef55714dc74076db9766a0527704220cad306aa6c36e33283fe541d5cf55e4aaa780fd40de98ff7e80cf WHIRLPOOL b95db39e63334bb4e4bf74a4535ac64201fd3b1fca9f133aacf5d3abf0f3ff42087b499a0640ea9524a3cdeb3919bddf2a440670c8a3ca99bd889978958710c0
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQpk13AAoJEOSiRoyO7jvoze8QAIoGP1sSvpILlWXm4lG5SYSA
-wHji7kodo34cS0VM/9EO3DyKAWJ0fgeyHB1sI9rzYLykJvMlrBclkuhSVi255/BQ
-3WxqGNoYb8HRmmt92CHX/2tz7UnV15dn+LGeVgpz3/oBZJ3k8cDOahVZVe+4/Kkc
-En7DOJDDsAx45LRNiGdBIBhTF7ZBMdn0JijzeJgS0O1UwAvGF50U0LY9PJwxwKDC
-mGjW/o86CbSaOVItWts94fEzIiTv8O3Rvbm6gu6rWIvKYXe6iwQR1bhVO7sa3oKV
-LhrnRooz7yRNFjhGtIdBBPB8Aui3gSN/ikitkBY/57goU5OVZ32VPGSjzlx9nEbL
-yFoZXzsmlWHwXMQFh3gM48u91IHfJmFc59xf43A0V6crk627xctYDJ2qq0vtbeae
-dMCNwSZaTRX/FMVWoHWYm6Fc+Pbih63JUsxcTExCtbMnp/Xtm3GYUqmK+MO3PSpw
-i33zLY+2mKIySlG7hjpvCsfq98oJXoh0HyuZ3xEcWXaCUKfNVWmoLuPPxmYdGeHZ
-YsMqhTNPD3W5EEnzPkAaXc2MAilFrXKfIcVCdaeGy8LWDb9741x4/vttlGCnE/WH
-XBucKM9+cuOTO+jSLltUqv73GJjMAPbJKzNEdeNyG2BZr279GdHe8A/Wi7Kz2vWF
-w8tzvneQnSKhtb7nRAxT
-=tqc0
+iQIcBAEBCAAGBQJQ47YmAAoJEC8ZTXQF1qEP9n8P/1hdDKmIIGkYUSIZRaaQaKpK
+kEAntsQm4H8n8BrWOQt7Y4qAp2blBKSAzJ43EqA51WbGf1vZ3j1WXakEPtrU7knR
+vdh78ycprAimRRB5xl4Wn22bYEjq+UozOhgXfDpaMD2NVfPLvZyD+iI8ufHl/IAp
+2c2UyXVYQr/STU1LbOsE2PoixJKG2wBgu1BEByzSdCG7C+YpUmOwPPt6lzFmzXlc
+U8dazCvSKCSzXc3u31jv7uftorSvGcXm+Y1jK40O/ZePONlsSCZZnnqtDdmVSJsE
+vlKJi7UN3ACqniwaTPcqm74hPt70pGPF7Mf0NHgKsRjeaMt5JY6KIooRKcwFc4XY
+nptIPYaVezcWg269caUVhU6nBUJ1QKUJ8ZFXy39lQD7quZFZruPH6Rrda/t9tvGS
+tjcmygFjULSJ8TkXjPWZ1XYX27jGKth8cIJlELBNAP90y3yHBBKCB28MCvNsYyx5
+YrSF8jQnI2PcHQB9cp8eKVT61ILkZ78XxMZ5Jw8PX0it9oYq7ic8mg1jbENvzg/C
+mGo7ePl2jPxX2j23Sta+I5dV3k4n7hMBj0ACiOUL5hIgJPsP22DoiaxWPl+zjuhL
+v+QuRb80x1IvOJWIEoTt0aApxoS14q8sgRpzzM3t4lq/B3hxVkmXiI78ZkqyMra4
+I342PjVStHhdTcYlH13n
+=8Oi3
 -----END PGP SIGNATURE-----
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild
new file mode 100644
index 000000000000..51e6f94301fc
--- /dev/null
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild,v 1.1 2013/01/02 04:21:39 jmbsvicetto Exp $
+
+EAPI=4
+
+inherit autotools eutils versionator
+
+DESCRIPTION="Foomatic wrapper scripts"
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cups dbus"
+
+RDEPEND="
+	dev-lang/perl
+	app-text/ghostscript-gpl
+	cups? (
+		|| (
+			( >=net-print/cups-1.6.0 net-print/cups-filters )
+			<net-print/cups-1.5.9999
+		)
+	)
+	!cups? (
+		|| (
+			app-text/enscript
+			app-text/a2ps
+			app-text/mpage
+		)
+	)
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	if use cups; then
+		CUPS_SERVERBIN="$(cups-config --serverbin)"
+	else
+		CUPS_SERVERBIN=""
+	fi
+
+	# Search for libs in ${libdir}, not just /usr/lib
+	epatch "${FILESDIR}"/${PN}-4.0.9-multilib.patch
+	eautoreconf
+
+	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
+		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
+}
+
+src_configure() {
+	econf $(use_enable dbus)
+}
+
+src_install() {
+	default
+
+	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
+
+	if use cups; then
+		dosym /usr/bin/foomatic-gswrapper "${CUPS_SERVERBIN}/filter/foomatic-gswrapper"
+		dosym /usr/bin/foomatic-rip "${CUPS_SERVERBIN}/filter/cupsomatic"
+	else
+		rm -r "${ED}"/${CUPS_SERVERBIN}/filter
+		rm -r "${ED}"/${CUPS_SERVERBIN}/backend
+	fi
+}