--- cnijfilter-3.40-r5.ebuild	2011-12-14 09:52:39.000000000 +0100
+++ cnijfilter-3.40-r7.ebuild	2011-12-14 10:02:51.000000000 +0100
@@ -19,6 +19,11 @@
 #				Added patch to force 32bit library on emul'd 64bit install
 #				Removed if for 64bit library copy -- copies 32bit either way
 #
+# 2011-12-14    Christian Mueller		3.40-r7
+#				Removed patch to force 32bit library on emul'd 64bit install
+#               Added png15 / cups15 patches
+#               Fixed amd64 issues
+#				
 
 inherit eutils rpm flag-o-matic multilib
 
@@ -44,12 +49,12 @@
 	mg6100
 	mg8100"
 DEPEND="app-text/ghostscript-gpl
-	>=net-print/cups-1.1.14
+	>=net-print/cups-1.3
 	!amd64? ( sys-libs/glibc
 		>=dev-libs/popt-1.6
 		>=media-libs/tiff-3.4
-		>=media-libs/libpng-1.0.9 )
-	amd64? ( >=app-emulation/emul-linux-x86-bjdeps-0.1
+		>=media-libs/libpng-1.2 )
+	amd64? (
 		app-emulation/emul-linux-x86-compat
 		app-emulation/emul-linux-x86-baselibs )
 	servicetools? ( !amd64? ( >=gnome-base/libglade-0.6
@@ -90,7 +95,8 @@
 
 	_prefix="/usr/local"
 	_bindir="/usr/local/bin"
-	_libdir="/usr/$(get_libdir)" # either lib or lib32
+	_libdir="/usr/lib$(use amd64 && echo 64 || echo 32)" # do not use get_libdir
+	_libdir_pkg=libs_bin$(use amd64 && echo 64 || echo 32)
 	_cupsdir1="/usr/lib/cups"
 	_cupsdir2="/usr/libexec/cups"
 	_ppddir="/usr/share/cups/model"
@@ -134,7 +140,8 @@
 	mv ${PN}-source-${PV}-1 ${P} || die # Correcting directory-structure
 
 	cd "${P}"
-	epatch "${FILESDIR}"/force-32bit-backendnet-libs.patch
+	sed -i -e 's/png_p->jmpbuf/png_jmpbuf(png_p)/' cnijfilter/src/bjfimage.c
+	sed -i -e '/cups.ipp.h/ s_$_\n#include <cups/ppd.h>_' backend/src/cnij_backend_common.c
 }
 
 src_compile() {
@@ -190,9 +197,9 @@
 		cd ../backendnet || die
 		make DESTDIR=${D} install || die "Couldn't make install backendnet"
 
-		cd ../com/libs_bin32 || die
-
-		dolib.so libcnnet.so.* || die "Couldn't install libcnnet.so"
+		cd ../com/${_libdir_pkg} || die
+		ln -sf libcnnet.so.* libcnnet.so
+		cp -a libcnnet.so* ${D}${_libdir} || die
 		cd .. || die
 	fi
 
@@ -281,7 +288,9 @@
 	fi
 
 	cd ../..
-	cp -a ${_prid}/libs_bin32/* ${D}${_libdir} || die
+	cp -a ${_prid}/${_libdir_pkg}/* ${D}${_libdir} || die
 	cp -a ${_prid}/database/* ${D}${_libdir}/cnijlib || die
 	cp -a ppd/canon${_pr}.ppd ${D}${_ppddir} || die
 }
+
+