Version bump

(Portage version: 2.2_rc62/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 116 insertions, 2 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index b7f62c53908f..03ab44793e40 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.63 2009/12/26 17:43:09 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.64 2010/02/05 23:05:07 jlec Exp $
+
+*foomatic-filters-4.0.3 (05 Feb 2010)
+
+  05 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +foomatic-filters-4.0.3.ebuild,
+  +files/foomatic-filters-4.0.3-multilib.patch:
+  Version Bump
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org>
   foomatic-filters-3.0.20060720.ebuild,
diff --git a/net-print/foomatic-filters/files/foomatic-filters-4.0.3-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-4.0.3-multilib.patch
new file mode 100644
index 000000000000..ca8fa2b22219
--- /dev/null
+++ b/net-print/foomatic-filters/files/foomatic-filters-4.0.3-multilib.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index acd2f0c..9b333b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ AC_CHECK_FUNCS([dup2 getcwd gethostname regcomp setenv strcasecmp strchr strcspn
+ 
+ 
+ ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
+-LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:/usr/lib:/usr/lib64:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
++LIBSEARCHPATH=${prefix}/lib:${prefix}/lib64:${libdir}:${libdir}64:/usr/local/lib:${prefix}/libexec:${libdir}exec:/usr/local/libexec
+ 
+ uname=`uname`
+ uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
+@@ -81,24 +81,24 @@ if test -n "$CUPS_SERVERBIN"; then
+ 	AC_SUBST(CUPS_FILTERS)
+ 	AC_SUBST(CUPS_BACKENDS)
+ else
+-	# Check for /usr/lib/cups
+-	AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
++	# Check for ${libdir}/cups
++	AC_PATH_DIR(CUPS,cups,${libdir}/cups,$SERVERBIB$LIBSEARCHPATH)
+ 
+-	# Check for /usr/lib/cups/filter
+-	AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
++	# Check for ${libdir}/cups/filter
++	AC_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$FILTERS$LIBSEARCHPATH)
+ 
+-	# Check for /usr/lib/cups/backend
+-	AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
++	# Check for ${libdir}/cups/backend
++	AC_PATH_DIR(CUPS_BACKENDS,cups/backend,${libdir}/cups/backend,$BACKENDS$LIBSEARCHPATH)
+ fi
+ 
+-# Check for /usr/lib/ppr
+-AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr
++AC_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
+ 
+-# Check for /usr/lib/ppr/interfaces
+-AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr/interfaces
++AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
+ 
+-# Check for /usr/lib/ppr/lib
+-AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
++# Check for ${libdir}/ppr/lib
++AC_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.3.ebuild b/net-print/foomatic-filters/foomatic-filters-4.0.3.ebuild
new file mode 100644
index 000000000000..edbb4805aa1a
--- /dev/null
+++ b/net-print/foomatic-filters/foomatic-filters-4.0.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 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.3.ebuild,v 1.1 2010/02/05 23:05:07 jlec Exp $
+
+EAPI="2"
+
+inherit autotools eutils versionator
+
+DESCRIPTION="Foomatic wrapper scripts"
+HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
+SRC_URI="http://www.linuxprinting.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"
+
+RDEPEND="cups? ( >=net-print/cups-1.1.19 )
+	!cups? (
+		|| (
+			app-text/enscript
+			app-text/a2ps
+			app-text/mpage
+		)
+	)
+	dev-lang/perl
+	app-text/ghostscript-gpl"
+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 || die "eautoreconf failed"
+
+	export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
+		CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic || die
+
+	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
+}