Version Bump

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 113 insertions, 3 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index 223aa5732171..32ab35d8dc24 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/foomatic-filters
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.67 2011/05/06 15:49:10 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.68 2012/01/17 13:28:43 jlec Exp $
+
+*foomatic-filters-4.0.9 (17 Jan 2012)
+
+  17 Jan 2012; Justin Lecher <jlec@gentoo.org> +foomatic-filters-4.0.9.ebuild,
+  +files/foomatic-filters-4.0.9-multilib.patch, metadata.xml:
+  Version Bump
 
 *foomatic-filters-4.0.7 (06 May 2011)
 
diff --git a/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch
new file mode 100644
index 000000000000..0659e0818055
--- /dev/null
+++ b/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch
@@ -0,0 +1,41 @@
+diff --git a/configure.ac b/configure.ac
+index acd2f0c..9b333b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,24 +81,24 @@ if test -n "$CUPS_SERVERBIN"; then
+ 	AC_SUBST(CUPS_FILTERS)
+ 	AC_SUBST(CUPS_BACKENDS)
+ else
+-	# Check for /usr/lib/cups
+-	FM_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
++	# Check for ${libdir}/cups
++	FM_PATH_DIR(CUPS,cups,${libdir}/cups,$SERVERBIB$LIBSEARCHPATH)
+ 
+-	# Check for /usr/lib/cups/filter
+-	FM_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
++	# Check for ${libdir}/cups/filter
++	FM_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$FILTERS$LIBSEARCHPATH)
+ 
+-	# Check for /usr/lib/cups/backend
+-	FM_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
++	# Check for ${libdir}/cups/backend
++	FM_PATH_DIR(CUPS_BACKENDS,cups/backend,${libdir}/cups/backend,$BACKENDS$LIBSEARCHPATH)
+ fi
+ 
+-# Check for /usr/lib/ppr
+-FM_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr
++FM_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
+ 
+-# Check for /usr/lib/ppr/interfaces
+-FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr/interfaces
++FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
+ 
+-# Check for /usr/lib/ppr/lib
+-FM_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr/lib
++FM_PATH_DIR(PPR_LIB,ppr/lib,${libdir}/ppr/lib,$LIBSEARCHPATH)
+ 
+ AC_CHECK_HEADERS([ghostscript/ierrors.h ghostscript/iapi.h])
+ AC_CHECK_LIB(gs, gsapi_new_instance)
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild
new file mode 100644
index 000000000000..b0d480111acc
--- /dev/null
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 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.9.ebuild,v 1.1 2012/01/17 13:28:43 jlec 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cups dbus"
+
+RDEPEND="
+		dev-lang/perl
+	app-text/ghostscript-gpl
+	cups? ( >=net-print/cups-1.1.19 )
+	!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}"/${P}-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 "${D}"/${CUPS_SERVERBIN}/filter
+		rm -r "${D}"/${CUPS_SERVERBIN}/backend
+	fi
+}
diff --git a/net-print/foomatic-filters/metadata.xml b/net-print/foomatic-filters/metadata.xml
index 1fa0ca569505..e450ba260ec9 100644
--- a/net-print/foomatic-filters/metadata.xml
+++ b/net-print/foomatic-filters/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+	<herd>printing</herd>
 </pkgmetadata>