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

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

7 files changed, 54 insertions, 47 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/Manifest b/net-print/magicfilter/Manifest
index 02f9bb1cee21..9ace6c4fc792 100644
--- a/net-print/magicfilter/Manifest
+++ b/net-print/magicfilter/Manifest
@@ -1,7 +1,17 @@
-AUX magicfilter-2.3d-glibc-2.10.patch 2685 RMD160 57bc90988170edf8b39c0d23169b0b31eb759244 SHA1 c63e79f686d48ed2bac304358e3f53cad8e713be SHA256 a7a426b946ed804fdbfee89f2e41f03ccd20e278181061d9283542f00acb94a8
-AUX magicfilter-2.3h-configure.patch 1671 RMD160 53aa63490b385de3dcf5d35c53aa130cb85fde90 SHA1 308ab808eafeb2b1eff8b642265d057440ce6a94 SHA256 f506fcaca630f029cda5e9ec642525c983bd85bbece4247d7e604400d26be0a0
-AUX magicfilter-2.3h-makefile.patch 3225 RMD160 f3aef7394c9c7d1c63838106ca9cd19b99cdd63c SHA1 57505a11ac702115669376c01fdb3b1450faad38 SHA256 3abac7d37d6347381e7ce06548e58608319d13ae24d0f0bfc00b80d0b7fd5cce
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX magicfilter-2.3d-glibc-2.10.patch 2152 RMD160 9472e965b4baddfde8566d7ea76950269066e444 SHA1 7b06b3de5634246a3beb3d836f486d2984f6f83d SHA256 bc594ac69cc36ec18125194ce803734ba794e01ac1d8fba0bc3a87edf7864546
+AUX magicfilter-2.3h-configure.patch 1596 RMD160 bf7ed97b2491cdcc0cbba62d6c80a837d267fc45 SHA1 5dd29c115816242e8aa4bdaa7f416da5d56c24cb SHA256 55ecfb9ba965526726734bf1204d6e280b249df88717784cfa23f26eb7fe84a1
+AUX magicfilter-2.3h-makefile.patch 3152 RMD160 fac6ff26e8ec2fb897a9dd60826b382fa4ee540e SHA1 c4294186ee6c23212958301c26fc6eac237e7e8d SHA256 ee62acad4909b4295af45ad1ae436c634dfc084acf6ed9da6e2f33294e42be9c
 DIST magicfilter-2.3.h.tar.gz 161929 RMD160 af36ec7731d1431ed4ac1ff1b048b62a7e31a459 SHA1 94e2f5abbfa208f994b729d8cebc2a2a91c71186 SHA256 8d6a3e3e68a16aa43682cdd77e8a9d28635eef4ea5e8dcf558e9a6fb88f8642c
-EBUILD magicfilter-2.3h.ebuild 1168 RMD160 d3d2e147a18012c0a0ca73de0eae33f881ece9a1 SHA1 35d04f18ecb19bd0bef8818e934aacd6dc57ef05 SHA256 0d6005a6c03e465a649f17cf225c6123244b555dfeb2b486414d84f93ffdaaae
-MISC ChangeLog 3116 RMD160 b683ca0f56c48d618675fffd1dbb0d7ec1a625c3 SHA1 f2787caf6fe27a1baf03afe2aadafd23ed7136ff SHA256 1cb069644a952825a87ad51f5667d205c0aadfeb30dd93a6cc3ab54523c87a0e
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+EBUILD magicfilter-2.3h.ebuild 1094 RMD160 738ad9e39f78dae3c96bf0615c2c95c7e725cda3 SHA1 aec454ad26288021b606a2d3cc403163cbc9afd3 SHA256 90eaeac4ecf70154859c1021066b159c0bd4c397205a44d9e8257115e0253738
+MISC ChangeLog 3277 RMD160 e2a7e7764d5faabfe38bd5fb1da4a7d7cdfb0170 SHA1 09ee46bf457041b42030bda8990aaf564d84ec0e SHA256 2da240a100936f5981042b811972f29ab8daa8122243a9df55636a6f242dc3ca
+MISC metadata.xml 308 RMD160 0baf3ab791aefa5e1918432ce550e810ec2185ed SHA1 822dcccc7d4ab46aae4536622f1db7320c8fe0f9 SHA256 a15b6f8c6cd71ba8ffc39803592263ca43bfe11a63438ac21955385f04c0422b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2pbFkACgkQXkR9YqOcLPHBVQD/UCj1oWcTNv11Yh0JvMal4Jkl
+YMuc4SZctl2gLziusu0A/RmPLL2EVv/Jc9lCmjek2HY6L5kASi3Zjbk3RQECrX/W
+=uop1
+-----END PGP SIGNATURE-----
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>