[gentoo-commits] repo/gentoo:master commit in: net-print/magicfilter/, profiles/, net-print/magicfilter/files/

[Michał Górny]

commit:     6d60389261d0cd270b3ea52d7043394d49fba9dc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 08:23:01 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 08:28:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d603892

net-print/magicfilter: Remove last-rited pkg

Closes: https://bugs.gentoo.org/496922
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-print/magicfilter/Manifest                     |   1 -
 .../files/magicfilter-2.3d-glibc-2.10.patch        | 100 ---------------------
 .../files/magicfilter-2.3h-configure.patch         |  59 ------------
 .../files/magicfilter-2.3h-makefile.patch          |  75 ----------------
 net-print/magicfilter/magicfilter-2.3h.ebuild      |  43 ---------
 net-print/magicfilter/metadata.xml                 |  11 ---
 profiles/package.mask                              |   1 -
 7 files changed, 290 deletions(-)

diff --git a/net-print/magicfilter/Manifest b/net-print/magicfilter/Manifest
deleted file mode 100644
index a5235bed963..00000000000
--- a/net-print/magicfilter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST magicfilter-2.3.h.tar.gz 161929 BLAKE2B 4333c66962c2b9325635a997b438e9267a3ed1d439bdada9505f2288dbc68f960e8b93c47357929122f55a1f76d6d60a3ef9e4a919c85c0036d41cdf1ce833ed SHA512 7808cfe4944eb5a5a4ad457e3ce9b42556fb09b60223763d0808e5b7c502aafbfe4ff66ebbf73830839eda76d0fa1e840ac9013f61bdce9aa2265c11e8b103dc

diff --git a/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch b/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
deleted file mode 100644
index eea064501ca..00000000000
--- a/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- fe.c
-+++ fe.c
-@@ -128,7 +128,7 @@
- 
-     /* read rules
-      */
--    while ( (r = getline(f)) != 0) {
-+    while ( (r = get_line(f)) != 0) {
- 	rulecount++;
- 	if (tail) {
- 	    tail->next = r;
---- getline.c
-+++ getline.c
-@@ -27,7 +27,7 @@
-  *  THE POSSIBILITY OF SUCH DAMAGE.
-  */
- /*
-- * getline() picks up a magicfilter rule line and passes it back to magicfilter
-+ * get_line() picks up a magicfilter rule line and passes it back to magicfilter
-  *
-  * rules are:
-  *
-@@ -172,10 +172,10 @@
- 
- 
- /*
-- * getline() gets a rule off the input stream
-+ * get_line() gets a rule off the input stream
-  */
- struct rule *
--getline(FILE *input)
-+get_line(FILE *input)
- {
-     static char *bfr = 0;	/* a buffer for reading lines into */
-     static int buflen = 0;	/* size of that buffer */
-@@ -189,13 +189,13 @@
- 	/* initialize the line buffer the first time in
- 	 */
- 	if ( (bfr = malloc(buflen=80)) == 0) {
--	    perror("getline::malloc");
-+	    perror("get_line::malloc");
- 	    exit(1);
- 	}
-     }
- 
-     if ( (r = calloc(1, sizeof *r)) == 0) {
--	perror("getline::calloc");
-+	perror("get_line::calloc");
- 	exit(1);
-     }
- 
-@@ -240,7 +240,7 @@
-     }
- 
-     if ( (r->pattern = strdup(q)) == 0) {
--	perror("getline::strdup");
-+	perror("get_line::strdup");
- 	exit(1);
-     }
- 
-@@ -289,7 +289,7 @@
- 
-     if (hint)
- 	if ( (r->hint = strdup(hint)) == 0) {
--	    perror("getline::strdup");
-+	    perror("get_line::strdup");
- 	    exit(1);
- 	}
- 
-@@ -302,11 +302,11 @@
-     while ( (q = getarg(&p)) != 0) {
- 	r->argv = realloc(r->argv, (3 + r->argc) * sizeof r->argv[0]);
- 	if (r->argv == 0) {
--	    perror("getline::realloc");
-+	    perror("get_line::realloc");
- 	    exit(1);
- 	}
- 	if ( (r->argv[r->argc++] = strdup(q)) == 0) {
--	    perror("getline::strdup");
-+	    perror("get_line::strdup");
- 	    exit(1);
- 	}
-     }
-@@ -330,4 +330,4 @@
-     }
-     ++ruleno;
-     return r;
--} /* getline */
-+} /* get_line */
---- rule.h
-+++ rule.h
-@@ -55,7 +55,7 @@
-     struct rule *next;		/* next rule in the chain */
- } ;
- 
--extern struct rule *getline(FILE *);
-+extern struct rule *get_line(FILE *);
- extern struct rule *rules;
- char * action_p(enum rule_action);
- 

diff --git a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
deleted file mode 100644
index 0d89b4d04eb..00000000000
--- a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- configure.sh
-+++ configure.sh
-@@ -423,44 +423,12 @@ EOF
-     TLOGN " ($AC_CC)"
-     if [ $status -eq 0 ]; then
- 	TLOG " ok"
--
--	# check that the CFLAGS and LDFLAGS aren't bogus
--
--	unset AC_CFLAGS AC_LDFLAGS
--
--	if [ "$CFLAGS" ]; then
--	    test "$CFLAGS" && echo "validating CFLAGS=${CFLAGS}"
--	    if $AC_CC $CFLAGS -o /tmp/ngc$$.o /tmp/ngc$$.c ; then
--		AC_CFLAGS=${CFLAGS:-"-g"}
--		test "$CFLAGS" && echo "CFLAGS=\"${CFLAGS}\" are okay"
--	    elif [ "$CFLAGS" ]; then
--		echo "ignoring bogus CFLAGS=\"${CFLAGS}\""
--	    fi
--	else
--	    AC_CFLAGS=-g
--	fi
--	if [ "$LDFLAGS" ]; then
--	    test "$LDFLAGS" && echo "validating LDFLAGS=${LDFLAGS}"
--	    if $AC_CC $LDFLAGS -o /tmp/ngc$$ /tmp/ngc$$.o; then
--		AC_LDFLAGS=${LDFLAGS:-"-g"}
--		test "$LDFLAGS" && TLOG "LDFLAGS=\"${LDFLAGS}\" are okay"
--	    elif [ "$LDFLAGS" ]; then
--		TLOG "ignoring bogus LDFLAGS=\"${LDFLAGS}\""
--	    fi
--	else
--	    AC_LDFLAGS=${CFLAGS:-"-g"}
--	fi
--	AC_SUB 'CFLAGS' "$AC_CFLAGS"
--	AC_SUB 'LDFLAGS' "$AC_LDFLAGS"
--    else
--	AC_SUB 'CFLAGS' ''
--	AC_SUB 'LDFLAGS' ''
--	AC_FAIL " does not compile code properly"
-     fi
- 
--    AC_SUB 'CC' "$AC_CC"
-+    AC_SUB 'CFLAGS' "$CFLAGS"
-+    AC_SUB 'LDFLAGS' "$LDFLAGS"
- 
--    rm -f /tmp/ngc$$ /tmp/ngc$$.c /tmp/ngc$$.o
-+    AC_SUB 'CC' "$AC_CC"
- 
-     return $status
- }
-@@ -896,7 +864,7 @@ AC_PROG_INSTALL () {
-     fi
- 
-     AC_SUB 'INSTALL' "$PROG_INSTALL"
--    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -s -m 755"
-+    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -m 755"
-     AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
- 
-     # finally build a little directory installer

diff --git a/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch b/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
deleted file mode 100644
index 59c2cc15af9..00000000000
--- a/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -17,7 +17,7 @@ libmagic @LIBMAGIC@:
- 	@MAKE_MAGIC@ all
- 
- textonly: contrib/textonly.c
--	$(CC) $(CFLAGS) -o textonly $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o textonly $<
- 
- mpp: magic.m4 mkmpp
- 	@srcdir@/mkmpp magic.m4
-@@ -43,47 +43,46 @@ magic.c: magic.m4 mkmagic config.h
- cfmagic: file/magic
- 	@MAKE_MAGIC@ magic
- 
--commoninstall: textonly @CFMAGIC@
--	@INSTALL_DIR@ $(prefix)/@exedir@
--	@INSTALL_DIR@ $(prefix)/@mandir@/man8
--	@INSTALL_DIR@ $(prefix)/@mandir@/man5
--	@INSTALL_DIR@ $(prefix)/@filterdir@
--	@INSTALL_MAGIC@ -m 444 file/magic $(prefix)/@MAGIC@
--	@INSTALL_PROGRAM@ -m 511 textonly $(prefix)/@filterdir@
-+commoninstall: textonly
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@exedir@
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man8
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man5
-+	@INSTALL_DIR@ $(DESTDIR)$(prefix)/@filterdir@
-+	@INSTALL_PROGRAM@ textonly $(DESTDIR)$(prefix)/@filterdir@
- 
- install:  @DO_WHAT@
- 
- install-bin-t: traditional commoninstall
--	@INSTALL_PROGRAM@ -m 511 traditional $(prefix)/@exedir@/magicfilter-t
-+	@INSTALL_PROGRAM@ traditional $(DESTDIR)$(prefix)/@exedir@/magicfilter-t
- 
- install-bin: magicfilter commoninstall
--	@INSTALL_PROGRAM@ -m 511 magicfilter $(prefix)/@exedir@
-+	@INSTALL_PROGRAM@ magicfilter $(DESTDIR)$(prefix)/@exedir@
- 
- install-data-t: traditional commoninstall
- 	@srcdir@/mkmpp
- 	for x in @srcdir@/filters/*.def;do \
--	    ./mpp @exedir@/magicfilter-t $$x > $(prefix)/@filterdir@/`basename $$x .def`-filter; \
--	    chmod +x $(prefix)/@filterdir@/`basename $$x .def`-filter; \
-+	    ./mpp @exedir@/magicfilter-t $$x > $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`-filter; \
-+	    chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`-filter; \
- 	done
- 	@rm -f mpp
- 
- install-data: magicfilter commoninstall
- 	for x in @srcdir@/filters/*.def;do \
--	    sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x > $(prefix)/@filterdir@/`basename $$x .def`; \
--	    chmod +x $(prefix)/@filterdir@/`basename $$x .def`; \
-+	    sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x > $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
-+	    chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
- 	done
- 
- install-man: VERSION commoninstall
- 	@SED@ -n -e 's/&PROGRAM&/magicfilter/g' -e 's/^MAN //p' -e @LPD_OPTS@ < magicfilter.8templ > $$$$; \
--	@INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter.8; \
-+	@INSTALL_DATA@ $$$$ $(DESTDIR)$(prefix)/@mandir@/man8/magicfilter.8; \
- 	rm -f $$$$
--	@INSTALL_DATA@ -m 444 magicfilter.5 $(prefix)/@mandir@/man5
-+	@INSTALL_DATA@ magicfilter.5 $(DESTDIR)$(prefix)/@mandir@/man5
- 
- install-man-t: VERSION commoninstall
- 	@SED@ -n -e 's/&PROGRAM&/magicfilter-t/g' -e 's/^MAN //p' -e 's/^TRAD//p' -e @LPD_OPTS@ < magicfilter.8templ > $$$$; \
--	@INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter-t.8; \
-+	@INSTALL_DATA@ $$$$ $(DESTDIR)$(prefix)/@mandir@/man8/magicfilter-t.8; \
- 	rm -f $$$$
--	@INSTALL_DATA@ -m 444 magicfilter-t.5 $(prefix)/@mandir@/man5
-+	@INSTALL_DATA@ magicfilter-t.5 $(DESTDIR)$(prefix)/@mandir@/man5
- 
- install-traditional: install-man-t install-bin-t install-data-t
- 

diff --git a/net-print/magicfilter/magicfilter-2.3h.ebuild b/net-print/magicfilter/magicfilter-2.3h.ebuild
deleted file mode 100644
index 91663b6db45..00000000000
--- a/net-print/magicfilter/magicfilter-2.3h.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-MY_P=${PN}-2.3.h
-
-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"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lprng-failsafe"
-
-DEPEND="app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}
-	lprng-failsafe? ( net-print/lprng )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.3d-glibc-2.10.patch \
-		"${FILESDIR}"/${PN}-2.3h-configure.patch \
-		"${FILESDIR}"/${PN}-2.3h-makefile.patch
-}
-
-src_configure() {
-	local myconf
-	use lprng-failsafe && myconf="--with-lprng"
-
-	tc-export CC
-	export AC_CPP_PROG="$(tc-getCPP)"
-
-	./configure.sh \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--filterdir=/usr/share/magicfilter/filters \
-		${myconf} || die
-}

diff --git a/net-print/magicfilter/metadata.xml b/net-print/magicfilter/metadata.xml
deleted file mode 100644
index 3f641021f13..00000000000
--- a/net-print/magicfilter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>printing@g.o</email>
-    <name>Gentoo Printing Project</name>
-  </maintainer>
-  <use>
-    <flag name="lprng-failsafe">Refuse options for compability with certain LPRng versions.</flag>
-  </use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index f035fd2c196..53c4e516514 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -586,7 +586,6 @@ kde-apps/dolphin-plugins
 # net-print/magicfilter is the only reverse dependency (from 2011).
 # Removal in 30 days.  Bug #496922.
 net-print/lprng
-net-print/magicfilter
 
 # Miroslav Šulc <fordfrog@g.o> (19 Mar 2019)
 # Depends on >=virtual/{jdk,jre}-11 which is masked