fixes bug #18554

4 files changed, 77 insertions, 3 deletions

diff --git a/net-print/magicfilter/ChangeLog b/net-print/magicfilter/ChangeLog
index 25c1e4515736..e02f5f3c5bfd 100644
--- a/net-print/magicfilter/ChangeLog
+++ b/net-print/magicfilter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/magicfilter
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/ChangeLog,v 1.5 2003/02/12 08:43:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/ChangeLog,v 1.6 2003/07/15 13:03:39 lanius Exp $
+
+*magicfilter-1.2-r4 (15 Jul 2003)
+
+  15 Jul 2003; Heinrich Wendel <lanius@gentoo.org>
+  magicfilter-1.2-r4.ebuild:
+  corrected filters path (bug #18554)
 
 *magicfilter-1.2-r3 (26 Mar 2002)
 
diff --git a/net-print/magicfilter/Manifest b/net-print/magicfilter/Manifest
index 782f7037ef30..dc9f3017fca8 100644
--- a/net-print/magicfilter/Manifest
+++ b/net-print/magicfilter/Manifest
@@ -1,5 +1,5 @@
-MD5 c8c48f6b1158bf263bf491a70f180a11 ChangeLog 1299
+MD5 71b819e5c859fab9f442d8c3cdcf83a3 ChangeLog 1453
 MD5 da9fae63151712a868e622be81328a07 magicfilter-1.2-r3.ebuild 1770
-MD5 1c05f5bd2ec3ea8c98592b94ea09dccd magicfilter-1.2-r4.ebuild 1843
+MD5 48d9f624a27b12bc3525080a886c2fd1 magicfilter-1.2-r4.ebuild 1842
 MD5 26efbd8f84469a663084eb5e8936bcaa files/digest-magicfilter-1.2-r3 140
 MD5 26efbd8f84469a663084eb5e8936bcaa files/digest-magicfilter-1.2-r4 140
diff --git a/net-print/magicfilter/files/digest-magicfilter-1.2-r4 b/net-print/magicfilter/files/digest-magicfilter-1.2-r4
new file mode 100644
index 000000000000..163d807062ec
--- /dev/null
+++ b/net-print/magicfilter/files/digest-magicfilter-1.2-r4
@@ -0,0 +1,2 @@
+MD5 dcece221e363ca5dbc79bdd84713c04e magicfilter-1.2.tar.gz 53176
+MD5 edce15835d307936583e3741ecda835c magicfilter-1.2-gentoo.tar.bz2 33014
diff --git a/net-print/magicfilter/magicfilter-1.2-r4.ebuild b/net-print/magicfilter/magicfilter-1.2-r4.ebuild
new file mode 100644
index 000000000000..7ee27fd5a51e
--- /dev/null
+++ b/net-print/magicfilter/magicfilter-1.2-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/magicfilter-1.2-r4.ebuild,v 1.1 2003/07/15 13:03:39 lanius Exp $
+
+inherit eutils
+
+IUSE=""
+
+S=${WORKDIR}/${P}
+PATCHDIR=${WORKDIR}/${P}-gentoo
+DESCRIPTION="Customizable, extensible automatic printer filter"
+HOMEPAGE="http://www.gnu.org/directory/magicfilter.html"
+SRC_URI="ftp://metalab.unc.edu/pub/linux/system/printing/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.tar.bz2
+	http://cvs.gentoo.org/~seemant/${P}-gentoo.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=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}
+	epatch ${PATCHDIR}/magicfilter_1.2-39.diff
+	epatch ${PATCHDIR}/magicfilter-1.2-stc777.patch
+	cp ${PATCHDIR}/*-filter.x filters || die
+}
+
+src_compile() {
+	./configure --host="${CHOST}" || die
+	emake || die
+	# Fixup the filters for /usr/sbin/magicfilter;
+	cd filters
+	for f in *-filter; do
+		mv $f $f.old
+		( read l; echo '#!/usr/sbin/magicfilter'; cat ) <$f.old >$f
+	done
+	cd ..
+
+	cp magicfilterconfig magicfilterconfig.org
+	sed -e "s/\"\/etc\/magicfilter\"/\"\/usr\/share\/magicfilter\"/" magicfilterconfig.org > magicfilterconfig
+}
+
+src_install() {
+	into /usr
+	dosbin magicfilter magicfilterconfig
+
+	insinto /usr/share/magicfilter
+	doins filters/*-filter ${PATCHDIR}/stc777-text-helper
+
+	newman magicfilter.man magicfilter.8
+	doman magicfilterconfig.8
+
+	dodoc README QuickInst TODO debian/copyright 
+	docinto filters
+	dodoc filters/README*
+}