Been mucking around with the StylusColor-777 stuff. Still not sure

it's completely right, but it's closer now.

5 files changed, 110 insertions, 9 deletions

diff --git a/net-print/magicfilter/files/StylusColor-777@1440dpi-filter.x b/net-print/magicfilter/files/StylusColor-777@1440dpi-filter.x
index d51fd120bac3..20c6f1951a23 100644
--- a/net-print/magicfilter/files/StylusColor-777@1440dpi-filter.x
+++ b/net-print/magicfilter/files/StylusColor-777@1440dpi-filter.x
@@ -32,12 +32,12 @@
 # prefixed.  Then we pass the document to the printer, cross our
 # fingers and hope for the best.
 #
-# Note that we add a ff/reset on the end just for good measure...
-0	\033	cat \000\000\000\033\001@EJL\ 1284.4\n@EJL\ \ \ \ \ \n\033@ \014\033@
+# Note that we add a ff on the end to eject the paper.
+0	\033	cat \000\000\000\033\001@EJL\ 1284.4\n@EJL\ \ \ \ \ \n\033@ \014
 
 %ifdef HAVE_GHOSTSCRIPT
-%define HANDLE_PS	pipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="1440 x 1440 DPI Highest Quality" -r1440x1440 -sDither="Ordered" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -DImageType=2 -dNOPAUSE -dSAFER -q -sOutputFile=- - -c quit
-%define HANDLE_PDF	fpipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="1440 x 1440 DPI Highest Quality" -r1440x1440 -sDither="Ordered" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -DImageType=2 -dNOPAUSE -dSAFER -q -sOutputFile=- $FILE -c quit
+%define HANDLE_PS	pipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="1440 x 1440 D""PI Highest Quality" -r1440x1440 -sDither="Ordered" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -DImageType=2 -dNOPAUSE -dSAFER -q -sOutputFile=- - -c quit
+%define HANDLE_PDF	fpipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="1440 x 1440 D""PI Highest Quality" -r1440x1440 -sDither="Ordered" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -DImageType=2 -dNOPAUSE -dSAFER -q -sOutputFile=- $FILE -c quit
 %endif
 %define HANDLE_TEXT	/usr/share/magicfilter/stc777-text-helper
 
@@ -51,6 +51,7 @@
 # needed and are not documented in the GhostScript manual page since they are
 # specific to the GhostScript device drivers.
 %endif
+
 %include <stdconv.mh>
 
 # Default entry for normal (text) files.  This must be the last entry!
diff --git a/net-print/magicfilter/files/StylusColor-777@360dpi-filter.x b/net-print/magicfilter/files/StylusColor-777@360dpi-filter.x
index fe4314efcd44..2ac6b8fe4c17 100644
--- a/net-print/magicfilter/files/StylusColor-777@360dpi-filter.x
+++ b/net-print/magicfilter/files/StylusColor-777@360dpi-filter.x
@@ -36,8 +36,8 @@
 0	\033	cat \000\000\000\033\001@EJL\ 1284.4\n@EJL\ \ \ \ \ \n\033@ \014\033@
 
 %ifdef HAVE_GHOSTSCRIPT
-%define HANDLE_PS	pipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="360 DPI Softweave" -r360x360 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=0 -dNOPAUSE -dSAFER -q -sOutputFile=- - -c quit
-%define HANDLE_PDF	fpipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="360 DPI Softweave" -r360x360 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=0 -dNOPAUSE -dSAFER -q -sOutputFile=- $FILE -c quit
+%define HANDLE_PS	pipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="360 D""PI Softweave" -r360x360 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=0 -dNOPAUSE -dSAFER -q -sOutputFile=- - -c quit
+%define HANDLE_PDF	fpipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="360 D""PI Softweave" -r360x360 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=0 -dNOPAUSE -dSAFER -q -sOutputFile=- $FILE -c quit
 %endif
 %define HANDLE_TEXT	/usr/share/magicfilter/stc777-text-helper
 
@@ -51,6 +51,7 @@
 # needed and are not documented in the GhostScript manual page since they are
 # specific to the GhostScript device drivers.
 %endif
+
 %include <stdconv.mh>
 
 # Default entry for normal (text) files.  This must be the last entry!
diff --git a/net-print/magicfilter/files/StylusColor-777@720dpi-filter.x b/net-print/magicfilter/files/StylusColor-777@720dpi-filter.x
index b64b2e3c1b59..60c026922d07 100644
--- a/net-print/magicfilter/files/StylusColor-777@720dpi-filter.x
+++ b/net-print/magicfilter/files/StylusColor-777@720dpi-filter.x
@@ -36,8 +36,8 @@
 0	\033	cat \000\000\000\033\001@EJL\ 1284.4\n@EJL\ \ \ \ \ \n\033@ \014\033@
 
 %ifdef HAVE_GHOSTSCRIPT
-%define HANDLE_PS	pipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="720 DPI Softweave" -r720x720 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=1 -dNOPAUSE -dSAFER -q -sOutputFile=- - -c quit
-%define HANDLE_PDF	fpipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="720 DPI Softweave" -r720x720 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=1 -dNOPAUSE -dSAFER -q -sOutputFile=- $FILE -c quit
+%define HANDLE_PS	pipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="720 D""PI Softweave" -r720x720 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=1 -dNOPAUSE -dSAFER -q -sOutputFile=- - -c quit
+%define HANDLE_PDF	fpipe	PATH_GHOSTSCRIPT -sDEVICE=stp -sModel=escp2-777 -sQuality="720 D""PI Softweave" -r720x720 -sDither="Adaptive Hybrid" -sInkType="Four Color Standard" -sMediaType="Plain Paper" -dImageType=1 -dNOPAUSE -dSAFER -q -sOutputFile=- $FILE -c quit
 %endif
 %define HANDLE_TEXT	/usr/share/magicfilter/stc777-text-helper
 
@@ -51,6 +51,7 @@
 # needed and are not documented in the GhostScript manual page since they are
 # specific to the GhostScript device drivers.
 %endif
+
 %include <stdconv.mh>
 
 # Default entry for normal (text) files.  This must be the last entry!
diff --git a/net-print/magicfilter/files/stc777-text-helper b/net-print/magicfilter/files/stc777-text-helper
index a93eb7b9f9ab..95ec528ec308 100644
--- a/net-print/magicfilter/files/stc777-text-helper
+++ b/net-print/magicfilter/files/stc777-text-helper
@@ -3,7 +3,10 @@
 # Magic command to take the printer out of the Epson packet mode
 # communication protocol (whatever that is) and enable normal data
 # transfer
-printf '\000\000\000\033\001@EJL 1284.4\n@EJL     \n\033@'
+printf '\000\000\000\033\001@EJL 1284.4\n@EJL     \n'
+
+# Sleep to let things settle in the printer
+sleep 1
 
 # Reset the printer
 printf '\033@'
diff --git a/net-print/magicfilter/magicfilter-1.2-r2.ebuild b/net-print/magicfilter/magicfilter-1.2-r2.ebuild
new file mode 100644
index 000000000000..dab2102e5cee
--- /dev/null
+++ b/net-print/magicfilter/magicfilter-1.2-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Aron Griffis <agriffis@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/magicfilter-1.2-r2.ebuild,v 1.1 2001/10/07 01:45:40 agriffis Exp $
+
+A=magicfilter-$PV.tar.gz
+S=$WORKDIR/$P
+DESCRIPTION="Customizable, extensible automatic printer filter"
+SRC_URI="ftp://metalab.unc.edu/pub/linux/system/printing/$A"
+HOMEPAGE="http://www.gnu.org/directory/magicfilter.html"
+
+# Others that perhaps should be added to this list as I figure out
+# what packages they belong to...
+#
+#    checking for recode... no
+#    checking for gs... /usr/bin/gs
+#    checking for grog... /usr/bin/grog
+#    checking for groff... /usr/bin/groff
+#    checking for gtroff... no
+#    checking for ditroff... no
+#    checking for troff... /usr/bin/troff
+#    checking for grops... /usr/bin/grops
+#    checking for grodvi... /usr/bin/grodvi
+#    checking for grotty... /usr/bin/grotty
+#    checking for grolj4... /usr/bin/grolj4
+#    checking for bzip2... /bin/bzip2
+#    checking for gzip... /bin/gzip
+#    checking for zcat... /bin/zcat
+#    checking for uncompress... no
+#    checking for dvips... no
+#    checking for pnmtops... no
+#    checking for pngtopnm... no
+#    checking for giftopnm... no
+#    checking for giftoppm... no
+#    checking for djpeg... /usr/bin/djpeg
+#    checking for sgitopnm... no
+#    checking for tops... no
+#    checking for sgitops... no
+#    checking for tiff2ps... /usr/bin/tiff2ps
+#    checking for tifftopnm... no
+#    checking for bmptopnm... no
+#    checking for bmptoppm... no
+#    checking for rasttopnm... no
+#    checking for nenscript... no
+#    checking for enscript... no
+#    checking for a2x... no
+#    checking for a2ps... no
+#    checking for fig2dev... no
+#    checking whether zcat is really gzip... yes
+#    checking whether ditroff works... yes
+#    checking for sendmail... /usr/sbin/sendmail
+DEPEND="virtual/glibc
+        >=app-text/ghostscript-6.50-r2
+	>=sys-apps/groff-1.16.1-r1
+	>=sys-apps/bzip2-1.0.1-r4
+	>=sys-apps/gzip-1.2.4a-r6"
+
+src_unpack() {
+    unpack $A
+    # This is the patch directly from the Debian package.  It's included
+    # here (instead of fetching from Debian) because their package
+    # revisions will change faster than this ebuild will keep up...
+    cd $S
+    patch -p1 < $FILESDIR/magicfilter_1.2-39.diff || die
+    patch -p1 < $FILESDIR/magicfilter-1.2-stc777.patch || die
+    cp $FILESDIR/*-filter.x filters || die
+}
+
+src_compile() {
+    ./configure --host="$CHOST" || die
+    emake || die
+    # Fixup the filters for /usr/sbin/magicfilter; eventually
+    # magicfilterconf should be fixed up for
+    # /usr/share/magicfilter/...  :-(
+    cd filters
+    for f in *-filter; do
+	mv $f $f.old
+	( read l; echo '#!/usr/sbin/magicfilter'; cat ) <$f.old >$f
+    done
+}
+
+src_install() {
+    dodir /usr/sbin /usr/share/man/man8 /usr/share/magicfilter
+    install -m 755 magicfilter $D/usr/sbin
+    install -m 755 magicfilter.man $D/usr/share/man/man8/magicfilter.8
+    install -m 755 magicfilterconfig $D/usr/sbin
+    install -m 644 magicfilterconfig.8 $D/usr/share/man
+    install -m 755 filters/*-filter $D/usr/share/magicfilter
+    install -m 755 $FILESDIR/stc777-text-helper $D/usr/share/magicfilter
+    gzip -9f $D/usr/share/man/*/*
+    gzip -9f filters/README*
+    dodoc README QuickInst TODO debian/copyright 
+    docinto filters
+    dodoc filters/README*
+}