Remove virtual/lpr RDEPEND and add USE="lprng-failsafe". cleanup, tidy

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

6 files changed, 38 insertions, 41 deletions

diff --git a/net-print/magicfilter/ChangeLog b/net-print/magicfilter/ChangeLog
index 79d42f1256f1..61c8f2572b5f 100644
--- a/net-print/magicfilter/ChangeLog
+++ b/net-print/magicfilter/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2009/12/26 17:44:05 pva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/ChangeLog,v 1.18 2011/04/16 10:15:25 ssuominen Exp $
+
+  16 Apr 2011; Samuli Suominen <ssuominen@gentoo.org>
+  magicfilter-2.3h.ebuild, metadata.xml:
+  Remove virtual/lpr RDEPEND and add USE="lprng-failsafe".
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> magicfilter-1.2-r4.ebuild,
   magicfilter-2.3a.ebuild, magicfilter-2.3d.ebuild, magicfilter-2.3h.ebuild:
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
index e47b721a10e2..eea064501cad 100644
--- a/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
+++ b/net-print/magicfilter/files/magicfilter-2.3d-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ur magicfilter-2.3.d.orig/fe.c magicfilter-2.3.d/fe.c
---- magicfilter-2.3.d.orig/fe.c	2003-05-09 21:27:15.000000000 +0300
-+++ magicfilter-2.3.d/fe.c	2009-08-08 23:59:09.000000000 +0300
+--- fe.c
++++ fe.c
 @@ -128,7 +128,7 @@
  
      /* read rules
@@ -10,9 +9,8 @@ diff -ur magicfilter-2.3.d.orig/fe.c magicfilter-2.3.d/fe.c
  	rulecount++;
  	if (tail) {
  	    tail->next = r;
-diff -ur magicfilter-2.3.d.orig/getline.c magicfilter-2.3.d/getline.c
---- magicfilter-2.3.d.orig/getline.c	2002-12-14 11:02:26.000000000 +0200
-+++ magicfilter-2.3.d/getline.c	2009-08-08 23:59:09.000000000 +0300
+--- getline.c
++++ getline.c
 @@ -27,7 +27,7 @@
   *  THE POSSIBILITY OF SUCH DAMAGE.
   */
@@ -89,9 +87,8 @@ diff -ur magicfilter-2.3.d.orig/getline.c magicfilter-2.3.d/getline.c
      return r;
 -} /* getline */
 +} /* get_line */
-diff -ur magicfilter-2.3.d.orig/rule.h magicfilter-2.3.d/rule.h
---- magicfilter-2.3.d.orig/rule.h	2002-07-12 02:23:43.000000000 +0300
-+++ magicfilter-2.3.d/rule.h	2009-08-08 23:59:09.000000000 +0300
+--- rule.h
++++ rule.h
 @@ -55,7 +55,7 @@
      struct rule *next;		/* next rule in the chain */
  } ;
diff --git a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
index 735b0524a600..0d89b4d04eb5 100644
--- a/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
+++ b/net-print/magicfilter/files/magicfilter-2.3h-configure.patch
@@ -1,7 +1,5 @@
-diff --git a/configure.sh b/configure.sh
-index 54561a4..2e8ff4c 100755
---- a/configure.sh
-+++ b/configure.sh
+--- configure.sh
++++ configure.sh
 @@ -423,44 +423,12 @@ EOF
      TLOGN " ($AC_CC)"
      if [ $status -eq 0 ]; then
diff --git a/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch b/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
index 39aec8b5f953..59c2cc15af91 100644
--- a/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
+++ b/net-print/magicfilter/files/magicfilter-2.3h-makefile.patch
@@ -1,7 +1,5 @@
-diff --git a/Makefile.in b/Makefile.in
-index d00536b..177185f 100644
---- a/Makefile.in
-+++ b/Makefile.in
+--- Makefile.in
++++ Makefile.in
 @@ -17,7 +17,7 @@ libmagic @LIBMAGIC@:
  	@MAKE_MAGIC@ all
  
diff --git a/net-print/magicfilter/magicfilter-2.3h.ebuild b/net-print/magicfilter/magicfilter-2.3h.ebuild
index 28e7afa01a19..d0dfdb5c7a99 100644
--- a/net-print/magicfilter/magicfilter-2.3h.ebuild
+++ b/net-print/magicfilter/magicfilter-2.3h.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.3 2009/12/26 17:44:05 pva Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/net-print/magicfilter/magicfilter-2.3h.ebuild,v 1.4 2011/04/16 10:15:25 ssuominen Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 MY_P=${PN}-2.3.h
@@ -15,33 +14,30 @@ 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=""
+IUSE="lprng-failsafe"
 
+RDEPEND="lprng-failsafe? ( net-print/lprng )"
 DEPEND="app-text/ghostscript-gpl"
-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
+	epatch \
+		"${FILESDIR}"/${PN}-2.3d-glibc-2.10.patch \
+		"${FILESDIR}"/${PN}-2.3h-configure.patch \
+		"${FILESDIR}"/${PN}-2.3h-makefile.patch
 }
 
 src_configure() {
-	has_version "net-print/lprng" && myconf="--with-lprng"
+	local myconf
+	use lprng-failsafe && myconf="--with-lprng"
 
-	export CC=$(tc-getCC)
-	export AC_CPP_PROG=$(tc-getCPP)
+	tc-export CC
+	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"
+		--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
index 1fa0ca569505..b9f9508e6f30 100644
--- a/net-print/magicfilter/metadata.xml
+++ b/net-print/magicfilter/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
+  <herd>printing</herd>
+  <use>
+    <flag name="lprng-failsafe">Build version that doesn't take options for
+    compability with certain LPRng releases.</flag>
+  </use>
 </pkgmetadata>