Cups can handle both bsdlpr and cups. USE doc is useless, because the documentation has been prebuilt.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

3 files changed, 32 insertions, 29 deletions

diff --git a/net-print/xfprint/ChangeLog b/net-print/xfprint/ChangeLog
index 0d27e0954083..aef24c62f78b 100644
--- a/net-print/xfprint/ChangeLog
+++ b/net-print/xfprint/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/xfprint
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xfprint/ChangeLog,v 1.12 2009/04/21 04:27:22 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xfprint/ChangeLog,v 1.13 2009/04/28 10:27:54 ssuominen Exp $
+
+  28 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> xfprint-4.6.1.ebuild:
+  Cups can handle both bsdlpr and cups. USE doc is useless, because the
+  documentation has been prebuilt.
 
 *xfprint-4.6.1 (21 Apr 2009)
 
@@ -40,8 +44,8 @@
   30 Oct 2008; Christoph Mende <angelos@gentoo.org> +xfprint-4.4.3.ebuild:
   Xfce-4.4.3 bump
 
-  22 Jun 2008; Samuli Suominen <drac@gentoo.org>
-  +files/4.4.2/01_all_no_default_printer.patch, +metadata.xml,
+  22 Jun 2008; Samuli Suominen <ssuominen@gentoo.org>
+  +files/4.4.2/01_all_no_default_printer.patch,
   +xfprint-4.4.2-r1.ebuild:
   Move from xfce-base. Fix missing deps.
 
@@ -61,12 +65,13 @@
   21 Mar 2008; Dawid Węgliński <cla@gentoo.org> xfprint-4.4.2-r1.ebuild:
   Stable on x86 (bug #214130)
 
-  20 Mar 2008; Samuli Suominen <drac@gentoo.org> xfprint-4.4.2-r1.ebuild:
+  20 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
+  xfprint-4.4.2-r1.ebuild:
   amd64 stable
 
 *xfprint-4.4.2-r1 (25 Jan 2008)
 
-  25 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  25 Jan 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/xfprint-4.4.2-no-default-printer.patch, +xfprint-4.4.2-r1.ebuild:
   Revision bump to include a upstream patch, fixing segfault when no default
   printer is selected. Upstream bug report #3816.
@@ -89,10 +94,10 @@
 
 *xfprint-4.4.2 (18 Nov 2007)
 
-  18 Nov 2007; Samuli Suominen <drac@gentoo.org> +xfprint-4.4.2.ebuild:
+  18 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> +xfprint-4.4.2.ebuild:
   Version bump.
 
-  07 Jun 2007; Samuli Suominen <drac@gentoo.org> xfprint-4.4.1.ebuild:
+  07 Jun 2007; Samuli Suominen <ssuominen@gentoo.org> xfprint-4.4.1.ebuild:
   Stable on arm.
 
   01 Jun 2007; Brent Baude <ranger@gentoo.org> xfprint-4.4.1.ebuild:
@@ -124,11 +129,9 @@
   15 Mar 2007; Markus Rothe <corsair@gentoo.org> xfprint-4.4.0.ebuild:
   Stable on ppc64; bug #169987
 
-  14 Mar 2007; Samuli Suominen <drac@gentoo.org> xfprint-4.4.0.ebuild:
-  Remove bogus deps; libgpg-error, gnutls, gcrypt.
-
-  14 Mar 2007; Samuli Suominen <drac@gentoo.org> xfprint-4.4.0.ebuild:
-  Add missing dep for xfce-mcs-manager as pointed out by Betelgeuse, thanks.
+  14 Mar 2007; Samuli Suominen <ssuominen@gentoo.org> xfprint-4.4.0.ebuild:
+  Remove bogus deps; libgpg-error, gnutls, gcrypt. Add missing dep
+  for xfce-mcs-manager as pointed out by Betelgeuse, thanks.
 
   12 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> xfprint-4.4.0.ebuild:
   Stable on Alpha + IA64.
@@ -151,10 +154,10 @@
   02 Mar 2007; Peter Weller <welp@gentoo.org> xfprint-4.4.0.ebuild:
   Keyworded on x86-fbsd
 
-  26 Feb 2007; Samuli Suominen <drac@gentoo.org> xfprint-4.4.0.ebuild:
+  26 Feb 2007; Samuli Suominen <ssuominen@gentoo.org> xfprint-4.4.0.ebuild:
   Change DESCRIPTION. Adjust HOMEPAGE for bug 165707.
 
-  18 Feb 2007; Samuli Suominen <drac@gentoo.org> xfprint-4.4.0.ebuild:
+  18 Feb 2007; Samuli Suominen <ssuominen@gentoo.org> xfprint-4.4.0.ebuild:
   Allow installation also with lprng wrt bug 160671.
 
   03 Feb 2007; Joshua Nichols <nichoj@gentoo.org> -xfprint-4.3.99.2.ebuild:
@@ -204,7 +207,7 @@
   20 Jul 2006; Daniel Ostrow <dostrow@gentoo.org> xfprint-4.3.90.1.ebuild,
   xfprint-4.3.90.2.ebuild:
   Shuffle around useflag behavior on beta ebuilds to prevent non-interactive
-  build failure. Thanks to drac on bug #140377 for the catch.
+  build failure. Thanks to ssuominen on bug #140377 for the catch.
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> xfprint-4.2.3.ebuild:
   Mark 4.2.3 stable on ia64
diff --git a/net-print/xfprint/Manifest b/net-print/xfprint/Manifest
index 48cd74b535d5..bf4b3af329c5 100644
--- a/net-print/xfprint/Manifest
+++ b/net-print/xfprint/Manifest
@@ -1,6 +1,6 @@
 DIST xfprint-4.4.3.tar.bz2 842716 RMD160 3acdb7442da91df9c715193b6ba83f10d1db4e64 SHA1 a1670dd247a04dcd3ba897cc32977f0828926900 SHA256 0d0b7cce76946c284c9586bdebe00afa6c65aaa6d289b9f81af843c571d7c350
 DIST xfprint-4.6.1.tar.bz2 842675 RMD160 8df81375cbc72eabd95911997210c8fa864bcf0b SHA1 4ce98c49d49b2d4c1a8fb5d76597b8e9ab9a51e8 SHA256 be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
 EBUILD xfprint-4.4.3.ebuild 1315 RMD160 89b7fb5db0ad506f2d63a1ff9eaad32b41024062 SHA1 0cad22858eab4d78acb872e93b386cacac286293 SHA256 2ee1cf8ec05ecdbad6637f757c11c9c5025b822e53239807cfeb8545a6796433
-EBUILD xfprint-4.6.1.ebuild 1053 RMD160 428a7f0e31eeed807ae87fffd185eccae6907f0b SHA1 878826eec6967e607438be75df8ecd77c83ad3a2 SHA256 c71774ba0b8c9e6c449dca5fd8c89ba599c39864496cf149e593b2fd7b1fce45
-MISC ChangeLog 15068 RMD160 0cbb27270020009bcebd1523ad2977ab01ede880 SHA1 e00f275c97e211a3f08a3f982cfd85f72e876717 SHA256 3dd6b80d11d56740c44c7d493afc9bb41a0db018be2038a9b89adee4890bff7a
+EBUILD xfprint-4.6.1.ebuild 1110 RMD160 ac15ab5db7966773b338348678f0db597cbaed7e SHA1 e61d7005fa1a1fa34e7aa629b4eb2f35db8c2a58 SHA256 852e522674dcd1b88b8fcdefd5f9db70841cff783f1f73f53ee8c0ae3668af0a
+MISC ChangeLog 15213 RMD160 e798c9e5e9fc511b5edcef5f9e04451dc082b05a SHA1 cdd560e123d439a5796b8ddff442f147e23d29c4 SHA256 2a7dbfe924f86c789f64b1592aef0892428c399ed3cda7fa2b4f444a472807f7
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/net-print/xfprint/xfprint-4.6.1.ebuild b/net-print/xfprint/xfprint-4.6.1.ebuild
index 2849ec21554f..a451a5c42574 100644
--- a/net-print/xfprint/xfprint-4.6.1.ebuild
+++ b/net-print/xfprint/xfprint-4.6.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xfprint/xfprint-4.6.1.ebuild,v 1.1 2009/04/21 04:27:23 darkside Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/net-print/xfprint/xfprint-4.6.1.ebuild,v 1.2 2009/04/28 10:27:54 ssuominen Exp $
 
+EAPI=1
 inherit xfce4
 
 xfce4_core
@@ -11,7 +10,7 @@ xfce4_core
 DESCRIPTION="Frontend for printing, management and job queue."
 HOMEPAGE="http://www.xfce.org/projects/xfprint"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cups doc debug"
+IUSE="+cups debug"
 
 RDEPEND="app-text/a2ps
 	>=dev-libs/glib-2.6:2
@@ -22,18 +21,19 @@ RDEPEND="app-text/a2ps
 	cups? ( net-print/cups )
 	!cups? ( net-print/lprng )"
 DEPEND="${RDEPEND}
-	dev-util/intltool
-	doc? ( dev-util/gtk-doc )"
+	dev-util/intltool"
 
 pkg_setup() {
-	use cups || XFCE_CONFIG+=" --enable-bsdlpr"
-	use cups && XFCE_CONFIG+=" --enable-cups"
-	XFCE_CONFIG+=" $(use_enable doc gtk-doc)"
+	# - Cups allows you to have both bsdlpr and cups.
+	# - Enabling gtk-doc is no use, the documentation
+	# has been prebuilt.
+	XFCE_CONFIG+=" --enable-bsdlpr
+		--disable-gtk-doc $(use_enable cups)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
 
 src_unpack() {
 	xfce4_src_unpack
-	sed -i -e "/24x24/d" "${S}"/icons/Makefile.in
+	sed -i -e "/24x24/d" "${S}"/icons/Makefile.in \
+		|| die "sed failed"
 }
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"