Not worth another painful stabilization round for this revbump; fix dep. for 1.5.999

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 7887F787)

3 files changed, 14 insertions, 72 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index 235b0fa75a6f..73d387e3e65b 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/foomatic-filters
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.90 2013/01/02 10:36:20 dilfridge Exp $
+
+  02 Jan 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  foomatic-filters-4.0.17.ebuild, -foomatic-filters-4.0.17-r1.ebuild:
+  Not worth another painful stabilization round for this revbump; fix dep. for
+  1.5.999
 
 *foomatic-filters-4.0.17-r1 (02 Jan 2013)
 
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
deleted file mode 100644
index 51e6f94301fc..000000000000
--- a/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
-}
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.17.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.17.ebuild
index 2100d6f8ae8c..73c7c17e505d 100644
--- a/net-print/foomatic-filters/foomatic-filters-4.0.17.ebuild
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.ebuild,v 1.2 2012/11/16 14:27:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-4.0.17.ebuild,v 1.3 2013/01/02 10:36:20 dilfridge Exp $
 
 EAPI=4
 
@@ -18,7 +18,12 @@ IUSE="cups dbus"
 RDEPEND="
 	dev-lang/perl
 	app-text/ghostscript-gpl
-	cups? ( >=net-print/cups-1.1.19 )
+	cups? (
+		|| (
+			( >=net-print/cups-1.6.0 net-print/cups-filters )
+			<net-print/cups-1.6.0
+		)
+	)
 	!cups? (
 		|| (
 			app-text/enscript