bump

5 files changed, 48 insertions, 70 deletions

diff --git a/net-print/magicfilter/Manifest b/net-print/magicfilter/Manifest
index 43748374395e..0311876fc809 100644
--- a/net-print/magicfilter/Manifest
+++ b/net-print/magicfilter/Manifest
@@ -1,8 +1,6 @@
-MD5 a942b9cad70a6a6ebf1f64fd8e5567b6 ChangeLog 1529
-MD5 a1f0e0fe1fcb7e5e6b1adec9873950e6 magicfilter-1.2-r3.ebuild 1769
+MD5 8e61bfad2e29131df410be194bd04c6b ChangeLog 1682
 MD5 6d85986fe9d6f1f66b65b7192f4b3ca4 magicfilter-1.2-r4.ebuild 1841
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 483b10facf3bed0581f18fcf9973911a magicfilter-2.3a.ebuild 750
-MD5 26efbd8f84469a663084eb5e8936bcaa files/digest-magicfilter-1.2-r3 140
+MD5 e2d5f1e1741ef0680a3d2267a5990e1c magicfilter-2.3a.ebuild 1068
 MD5 26efbd8f84469a663084eb5e8936bcaa files/digest-magicfilter-1.2-r4 140
 MD5 ac79bc23460701eeae5aa35d42802ca8 files/digest-magicfilter-2.3a 69
diff --git a/net-print/magicfilter/files/digest-magicfilter-1.2-r3 b/net-print/magicfilter/files/digest-magicfilter-1.2-r3
deleted file mode 100644
index 163d807062ec..000000000000
--- a/net-print/magicfilter/files/digest-magicfilter-1.2-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dcece221e363ca5dbc79bdd84713c04e magicfilter-1.2.tar.gz 53176
-MD5 edce15835d307936583e3741ecda835c magicfilter-1.2-gentoo.tar.bz2 33014
diff --git a/net-print/magicfilter/files/digest-magicfilter-2.3a b/net-print/magicfilter/files/digest-magicfilter-2.3a
new file mode 100644
index 000000000000..bfd49b7bb22f
--- /dev/null
+++ b/net-print/magicfilter/files/digest-magicfilter-2.3a
@@ -0,0 +1 @@
+MD5 18f341f5772d18ea2cd7905b650c58a7 magicfilter-2.3.a.tar.gz 162951
diff --git a/net-print/magicfilter/magicfilter-1.2-r3.ebuild b/net-print/magicfilter/magicfilter-1.2-r3.ebuild
deleted file mode 100644
index 22bec3e222cb..000000000000
--- a/net-print/magicfilter/magicfilter-1.2-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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-r3.ebuild,v 1.7 2003/09/07 00:18:10 msterret 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; 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() {
-	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*
-}
diff --git a/net-print/magicfilter/magicfilter-2.3a.ebuild b/net-print/magicfilter/magicfilter-2.3a.ebuild
new file mode 100644
index 000000000000..ac931be17023
--- /dev/null
+++ b/net-print/magicfilter/magicfilter-2.3a.ebuild
@@ -0,0 +1,45 @@
+# 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-2.3a.ebuild,v 1.1 2003/10/11 20:00:32 lanius Exp $
+
+inherit eutils
+
+IUSE=""
+
+MY_P="${PN}-2.3.a"
+
+DESCRIPTION="Customizable, extensible automatic printer filter"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/magicfilter/"
+SRC_URI="http://www.pell.portland.or.us/~orc/Code/magicfilter/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=app-text/ghostscript-6.50-r2
+	>=sys-apps/bzip2-1.0.1-r4
+	>=sys-apps/gzip-1.2.4a-r6
+	sys-apps/file"
+
+RDEPEND="${DEPEND}
+	virtual/lpr"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	has_version 'net-print/lprng' \
+		&& myconf="--with-lprng"
+
+	./configure.sh \
+		--prefix=${D}/usr \
+		--filterdir=${D}/usr/share/magicfilter/filters \
+		${myconf}
+
+	sed -i -e "s/commoninstall: textonly cfmagic/commoninstall: textonly/" Makefile
+
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+}