Version bump, rewritten ebuild.

  - implement real DESTDIR support (bug #256137)
  - fix man installation (bug #248165)
  - fix prestripped files, use CC, CFLAGS, LDFLAGS (bug #252028)
  - fix wonky permissions
(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 197 insertions, 1 deletions

diff --git a/net-print/magicfilter/ChangeLog b/net-print/magicfilter/ChangeLog
index 43d9a896d9e8..3b7b05cc295f 100644
--- a/net-print/magicfilter/ChangeLog
+++ b/net-print/magicfilter/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-print/magicfilter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/ChangeLog,v 1.14 2009/08/08 21:00:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/ChangeLog,v 1.15 2009/10/17 23:44:57 dirtyepic Exp $
+
+*magicfilter-2.3h (17 Oct 2009)
+
+  17 Oct 2009; Ryan Hill <dirtyepic@gentoo.org> +magicfilter-2.3h.ebuild,
+  +files/magicfilter-2.3h-configure.patch,
+  +files/magicfilter-2.3h-makefile.patch:
+  Version bump, rewritten ebuild.
+    - implement real DESTDIR support (bug #256137)
+    - fix man installation (bug #248165)
+    - fix prestripped files, use CC, CFLAGS, LDFLAGS (bug #252028)
+    - fix wonky permissions
 
   08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
   magicfilter-2.3d.ebuild, +files/magicfilter-2.3d-glibc-2.10.patch:
diff --git a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
new file mode 100644
index 000000000000..735b0524a600
--- /dev/null
+++ b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
@@ -0,0 +1,61 @@
+diff --git a/configure.sh b/configure.sh
+index 54561a4..2e8ff4c 100755
+--- a/configure.sh
++++ b/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
new file mode 100644
index 000000000000..39aec8b5f953
--- /dev/null
+++ b/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
@@ -0,0 +1,77 @@
+diff --git a/Makefile.in b/Makefile.in
+index d00536b..177185f 100644
+--- a/Makefile.in
++++ b/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
new file mode 100644
index 000000000000..310347e85877
--- /dev/null
+++ b/net-print/magicfilter/magicfilter-2.3h.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/magicfilter-2.3h.ebuild,v 1.1 2009/10/17 23:44:57 dirtyepic Exp $
+
+EAPI=2
+
+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=""
+
+DEPEND="virtual/ghostscript"
+RDEPEND="${DEPEND}
+	virtual/lpr"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3d-glibc-2.10.patch
+	epatch "${FILESDIR}"/${PN}-2.3h-configure.patch
+	epatch "${FILESDIR}"/${PN}-2.3h-makefile.patch
+}
+
+src_configure() {
+	has_version "net-print/lprng" && myconf="--with-lprng"
+
+	export CC=$(tc-getCC)
+	export AC_CPP_PROG=$(tc-getCPP)
+
+	./configure.sh \
+		--prefix="/usr" \
+		--mandir="/usr/share/man" \
+		--filterdir="/usr/share/magicfilter/filters" \
+		${myconf} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+}