summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-02-18 13:46:59 +0000
committerSamuli Suominen <drac@gentoo.org>2007-02-18 13:46:59 +0000
commit66fec8d7e0ab1d7d7136ab7f7dfc19cfcd8e068c (patch)
tree330e4f6fb184055263f540b3ca16176228a87c3e /xfce-base/xfprint
parentStable on Alpha. (diff)
downloadgentoo-2-66fec8d7e0ab1d7d7136ab7f7dfc19cfcd8e068c.tar.gz
gentoo-2-66fec8d7e0ab1d7d7136ab7f7dfc19cfcd8e068c.tar.bz2
gentoo-2-66fec8d7e0ab1d7d7136ab7f7dfc19cfcd8e068c.zip
Allow installation also with lprng wrt bug 160671. Thanks to ia64 for making this possible!
(Portage version: 2.1.2-r9)
Diffstat (limited to 'xfce-base/xfprint')
-rw-r--r--xfce-base/xfprint/ChangeLog5
-rw-r--r--xfce-base/xfprint/xfprint-4.4.0.ebuild16
2 files changed, 15 insertions, 6 deletions
diff --git a/xfce-base/xfprint/ChangeLog b/xfce-base/xfprint/ChangeLog
index 3f43d7205cd4..29676915734b 100644
--- 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/xfprint-4.4.0.ebuild b/xfce-base/xfprint/xfprint-4.4.0.ebuild
index 0f77f683565a..b77b2b9d082b 100644
--- 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"