Multilib fixes.

(Portage version: 2.0.51.22-r1)

4 files changed, 58 insertions, 16 deletions

diff --git a/net-print/foomatic-filters/ChangeLog b/net-print/foomatic-filters/ChangeLog
index 9ef23954de98..56ee4cc379ae 100644
--- a/net-print/foomatic-filters/ChangeLog
+++ b/net-print/foomatic-filters/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/foomatic-filters
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.29 2005/06/06 22:34:17 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/ChangeLog,v 1.30 2005/07/18 17:40:12 herbs Exp $
+
+  18 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/foomatic-filters-3.0.2-multilib.patch,
+  foomatic-filters-3.0.2.ebuild:
+  Multilib fixes.
 
   06 Jun 2005; Sven Wegener <swegener@gentoo.org>
   foomatic-filters-3.0.2.ebuild:
diff --git a/net-print/foomatic-filters/Manifest b/net-print/foomatic-filters/Manifest
index b4ed6627000e..311e941b2ad9 100644
--- a/net-print/foomatic-filters/Manifest
+++ b/net-print/foomatic-filters/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 424195e375957e5546541f54a13ab8dd foomatic-filters-3.0.2.ebuild 960
-MD5 71f4d16348b13ab788dc1189ace0c4ea ChangeLog 3723
+MD5 e202efec16c8bfd175a7f55ea32f7e99 foomatic-filters-3.0.2.ebuild 1162
+MD5 855d62a65c90b3d98ab8d6b42531d8f6 ChangeLog 3872
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 15989d79c05dd0a31c3c93e4a8d41a30 files/digest-foomatic-filters-3.0.2 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCpsISevY57Fted3ERArFxAJ9UJbHeBH0Gj68K5GVdzdw6rgRRhgCeM5IL
-uhxe50NNEDL/q5/0d59UK4k=
-=CNyM
------END PGP SIGNATURE-----
+MD5 c58e4d6d5d27ae3024c05a6e6b27fc21 files/foomatic-filters-3.0.2-multilib.patch 1569
diff --git a/net-print/foomatic-filters/files/foomatic-filters-3.0.2-multilib.patch b/net-print/foomatic-filters/files/foomatic-filters-3.0.2-multilib.patch
new file mode 100644
index 000000000000..d02bca2b5bd0
--- /dev/null
+++ b/net-print/foomatic-filters/files/foomatic-filters-3.0.2-multilib.patch
@@ -0,0 +1,36 @@
+--- configure.in.orig	2005-07-18 18:01:26.000000000 +0100
++++ configure.in	2005-07-18 18:03:31.000000000 +0100
+@@ -13,7 +13,7 @@
+ AC_PROG_MAKE_SET
+ 
+ ETCSEARCHPATH=${prefix}/etc:/usr/etc:/usr/local/etc
+-LIBSEARCHPATH=${prefix}/lib:/usr/lib:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
++LIBSEARCHPATH=${libdir}:${prefix}/lib:/usr/lib:/usr/local/lib:${prefix}/libexec:/usr/libexec:/usr/local/libexec
+ 
+ dnl Get the operating system and version number...
+ uname=`uname`
+@@ -38,19 +38,19 @@
+ AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH)
+ 
+ dnl Check for /usr/lib/cups
+-AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH)
++AC_PATH_DIR(CUPS,cups,${libdir}/cups,$LIBSEARCHPATH)
+ 
+ dnl Check for /usr/lib/cups/filter
+-AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$LIBSEARCHPATH)
++AC_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$LIBSEARCHPATH)
+ 
+ dnl Check for /usr/lib/ppr
+-AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
++AC_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
+ 
+ dnl Check for /usr/lib/ppr/interfaces
+-AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
++AC_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
+ 
+ dnl Check for /usr/lib/ppr/lib
+-AC_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
++AC_PATH_DIR(PPR_LIB,ppr/lib,${libdir}/ppr/lib,$LIBSEARCHPATH)
+ 
+ AC_ARG_ENABLE(file-converter-check, [  --enable-file-converter-check  check whether a file converter is installed [default=yes]],
+ [if eval "test x${enableval} = xno"; then
diff --git a/net-print/foomatic-filters/foomatic-filters-3.0.2.ebuild b/net-print/foomatic-filters/foomatic-filters-3.0.2.ebuild
index 8217f4d25721..113f26225148 100644
--- a/net-print/foomatic-filters/foomatic-filters-3.0.2.ebuild
+++ b/net-print/foomatic-filters/foomatic-filters-3.0.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.2.ebuild,v 1.11 2005/06/08 10:01:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters/foomatic-filters-3.0.2.ebuild,v 1.12 2005/07/18 17:40:12 herbs Exp $
+
+inherit eutils
 
 DESCRIPTION="Foomatic wrapper scripts"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
@@ -21,12 +23,20 @@ DEPEND="samba? ( net-fs/samba )
 	)
 	virtual/ghostscript"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Search for libs in ${libdir}, not just /usr/lib
+	epatch ${FILESDIR}/${P}-multilib.patch
+	autoconf || die "autoconf failed"
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
 	if use cups; then
-		dosym /usr/bin/foomatic-gswrapper /usr/lib/cups/filter/foomatic-gswrapper
-		dosym /usr/bin/foomatic-rip /usr/lib/cups/filter/cupsomatic
+		dosym /usr/bin/foomatic-gswrapper /usr/$(get_libdir)/cups/filter/foomatic-gswrapper
+		dosym /usr/bin/foomatic-rip /usr/$(get_libdir)/cups/filter/cupsomatic
 	fi
 	dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
 }