Version bump

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 130 insertions, 3 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/Manifest b/net-print/foomatic-filters/Manifest
index 69ea3e294fb7..c715819ef5f3 100644
--- a/net-print/foomatic-filters/Manifest
+++ b/net-print/foomatic-filters/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX foomatic-filters-3.0.20060601-multilib.patch 2001 RMD160 c1b98f966465fd8f7562ad87c6d172e598262023 SHA1 46dfbd0e8be92c871b311828b99ce9a9a23a4fbd SHA256 6f8241bf46a5fff13bf06b066a8c84f6f2245c40094d75d67953430c4fbd89c9
+AUX foomatic-filters-4.0.3-multilib.patch 2080 RMD160 6a72c78ab1490ca90b8990b5197b178cd2464109 SHA1 81fab7a82b1e781efcf19c9b79aed901d160e4a3 SHA256 2ebdb795f3b1d0415a9e84b244b3538a14f7d380998ac8ca51e4034693026914
 DIST foomatic-filters-3.0-20060720.tar.gz 165214 RMD160 709d1c6717d84620faa129a15c3a791ae9454d45 SHA1 0f4e5e45b78f0867c57c7f034a4feb117f2646d1 SHA256 56e268077c8ec5cd48fe15bd1af8f87a19536782e8e5a3d2d06d39badcaa3fff
 DIST foomatic-filters-3.0-20070501.tar.gz 166478 RMD160 c6dda3bf23582d96a24a81accd2b0ff127736780 SHA1 d60e9c68628a862e37d71cff40798aea0361433e SHA256 ce8c9a6202fa8b407b74d69fde493ff0687659f9bc4b829321ce60c73e5ab012
 DIST foomatic-filters-3.0-20080507.tar.gz 170572 RMD160 7d594d4553a971777ab2da908e7e88d5cc962a61 SHA1 e72b22f5ea7ff4804778b5d9b279581bdb71c577 SHA256 18e0c7f105fef12f15a2c4fb7fa722809e25e08911cbb64acecd4e946f487e92
+DIST foomatic-filters-4.0.3.tar.gz 239548 RMD160 6d4f09847d1c977ef15cc71026364b9a04af1f8d SHA1 870b904c9390a6632e540a458479c34290a8f960 SHA256 1ef67c0dc7a33a80a4fb6b5b6816a4a8309462b29068e0a9ba649539c186f443
 EBUILD foomatic-filters-3.0.20060720.ebuild 1772 RMD160 3189cd61485f43fa14328e95809521e260966f11 SHA1 c657dd7288b9e49227f09cecd84a22d9022ec501 SHA256 fa3a75e006e2f8c9a1ba361ddada2bac83ed5d7f9909f6f53c64fac8d564feee
 EBUILD foomatic-filters-3.0.20070501.ebuild 1788 RMD160 27abb48891d2d53531cebcefbc2d03075ab7f16e SHA1 ddcf91a1d50ebf6579df11e01c7700d7726a361d SHA256 aac3baf0c5853e43bf2403a9e1e78ec2753b1329a4879a025524ef787a1f88dd
 EBUILD foomatic-filters-3.0.20080507.ebuild 1777 RMD160 4878d91a98c1503afabf5b193af5a6ca063ae926 SHA1 4762652d55d92ebceb95d5d92b1e189be506f170 SHA256 3a541d4fccf04a905e8d9fdda36bde6cf5c98a67e64fc40ec0856964efa044f0
-MISC ChangeLog 8469 RMD160 94c39f527328bccd4c59f11f7c7568260abe5565 SHA1 cfd59189a32f576be67ff4bdd3031266d18d2f25 SHA256 6149f6577307848f16c2e276912273e1843b32bddd3309059a59bad460044bdc
+EBUILD foomatic-filters-4.0.3.ebuild 1500 RMD160 075086786f0151b6cf23b4cdec847ec2b249ddf0 SHA1 db6cf9af36f0e06e108b8f9f4437a2f2cc20fd5c SHA256 ca8d3f0fd58d6a5b6c3a3857b2541a1f86e47d5eefab6acaf575f76c860e53d9
+MISC ChangeLog 8661 RMD160 8c949fcd7ae54af7fd972a989e19a5f039c21c14 SHA1 0abd274bbc1684cf5e7292cc712ee8a55b8df77c SHA256 0032ac7bf9eb2ddb33787f5d0df4388fddef6ef189b5b0304fc0bf49ddf42014
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktspCkACgkQgAnW8HDreRYxYACgpi+9ZlmFso1xnVAxHN9mH8Pc
+dXoAnidIfhN9VE7Sw0YL8PPNF4ZzYbt9
+=1JgM
+-----END PGP SIGNATURE-----
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
+}