Allow installation also with lprng wrt bug 160671. Thanks to ia64 for making this...

Package-Manager: portage-2.1.2-r9

diff --git a/xfce-base/xfprint/ChangeLog b/xfce-base/xfprint/ChangeLog
index 3f43d7205cd41ebf09221dcc6e488a9be7fab482..29676915734bda6b2fd08ad6d778a4610b95566d 100644 (file)
--- a/xfce-base/xfprint/ChangeLog
+++ b/xfce-base/xfprint/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfprint
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.80 2007/02/03 01:34:23 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/ChangeLog,v 1.81 2007/02/18 13:46:59 drac Exp $
+
+  18 Feb 2007; Samuli Suominen <drac@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:
   Removing old version.

diff --git a/xfce-base/xfprint/Manifest b/xfce-base/xfprint/Manifest
index e4c5887697b5bdd318ec628f829d07719900726d..a6f67f2c36283409f32b31192a0baac358a2bf99 100644 (file)
--- a/xfce-base/xfprint/Manifest
+++ b/xfce-base/xfprint/Manifest
@@ -4,14 +4,14 @@ EBUILD xfprint-4.2.3.ebuild 595 RMD160 c93c62b38012ca24a3c94fa672dbd9ad55de19bb
 MD5 f6ff7b56dd1c9cf1cf96cb9d6062b2ff xfprint-4.2.3.ebuild 595
 RMD160 c93c62b38012ca24a3c94fa672dbd9ad55de19bb xfprint-4.2.3.ebuild 595
 SHA256 54c98b3163fc1dc9a7d755a4b5a3de5db62ceba530ee7dbd2c43fec01f05f0e8 xfprint-4.2.3.ebuild 595
-EBUILD xfprint-4.4.0.ebuild 891 RMD160 b229443f6e1bbe2fca0650126554fd7eec27cf4b SHA1 4aed89099f4496044d5bd010c18f2bc4a6ecb96c SHA256 efbc9031e3a85ea1d40157b0be9fc2c6c2c8a30e68021d0da1b0762e86b91790
-MD5 c6549d2b68031c64af60ed88be9eb081 xfprint-4.4.0.ebuild 891
-RMD160 b229443f6e1bbe2fca0650126554fd7eec27cf4b xfprint-4.4.0.ebuild 891
-SHA256 efbc9031e3a85ea1d40157b0be9fc2c6c2c8a30e68021d0da1b0762e86b91790 xfprint-4.4.0.ebuild 891
-MISC ChangeLog 9758 RMD160 1117d92eaeb0fdaac344717bf5757e4efde0bc2f SHA1 6beb1f1637e9b6d604cd8e5c0390569ff039567c SHA256 b10359ea5e5e0ed919b4042053039d3a164bf072877f07e3598d3e5f834b2e97
-MD5 d43007b63328405384a2941de98e0f0c ChangeLog 9758
-RMD160 1117d92eaeb0fdaac344717bf5757e4efde0bc2f ChangeLog 9758
-SHA256 b10359ea5e5e0ed919b4042053039d3a164bf072877f07e3598d3e5f834b2e97 ChangeLog 9758
+EBUILD xfprint-4.4.0.ebuild 996 RMD160 101cc8b5d2c55eac012d9a19c9395de0d00abce6 SHA1 8eae97ad5a60dc9be925112f9b344c0046cde088 SHA256 68e66488a9bd32a70aff6f66d34389919746fa8c9cbec4c0b39c4bb963315da6
+MD5 260300ecdc2731ccf3ed824a94477281 xfprint-4.4.0.ebuild 996
+RMD160 101cc8b5d2c55eac012d9a19c9395de0d00abce6 xfprint-4.4.0.ebuild 996
+SHA256 68e66488a9bd32a70aff6f66d34389919746fa8c9cbec4c0b39c4bb963315da6 xfprint-4.4.0.ebuild 996
+MISC ChangeLog 9881 RMD160 6f577364cd685e9af1c0cea4ce23be197a7040b6 SHA1 0835606845aebb9c5f1f22ddb1dea7ec1c73aecf SHA256 955467b75ea79510e95d19d6a0e236f2ceadb0fd646e6f758dc2228ff185766e
+MD5 55643695e755691b518d64be920e4726 ChangeLog 9881
+RMD160 6f577364cd685e9af1c0cea4ce23be197a7040b6 ChangeLog 9881
+SHA256 955467b75ea79510e95d19d6a0e236f2ceadb0fd646e6f758dc2228ff185766e ChangeLog 9881
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157

diff --git a/xfce-base/xfprint/xfprint-4.4.0.ebuild b/xfce-base/xfprint/xfprint-4.4.0.ebuild
index 0f77f683565aff287475ee08ac56a02bab0f6ec0..b77b2b9d082b05aed9be05637193d55aeba9a3eb 100644 (file)
--- a/xfce-base/xfprint/xfprint-4.4.0.ebuild
+++ b/xfce-base/xfprint/xfprint-4.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.4.0.ebuild,v 1.4 2007/01/28 15:33:25 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfprint/xfprint-4.4.0.ebuild,v 1.5 2007/02/18 13:46:59 drac Exp $
 
 inherit xfce44
 
@@ -8,9 +8,10 @@ xfce44
 
 DESCRIPTION="Printer manager"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc"
+IUSE="cups debug doc"
 
-RDEPEND="net-print/cups
+RDEPEND="cups? ( net-print/cups )
+       !cups? ( net-print/lprng )
        >=dev-libs/glib-2.6
        >=x11-libs/gtk+-2.6
        >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
@@ -25,8 +26,13 @@ DEPEND="${RDEPEND}
        dev-util/intltool
        doc? ( dev-util/gtk-doc )"
 
-# CUPS includes support for LPR
-XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr --enable-cups"
+pkg_setup() {
+       if use cups; then
+               XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr --enable-cups"
+       else
+               XFCE_CONFIG="${XFCE_CONFIG} --enable-bsdlpr"
+       fi
+}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"