summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-08-21 07:41:52 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-08-21 07:41:52 +0000
commit44b2e0ba2ab4ecb60f69e9755d72d5790f52e1a4 (patch)
tree81e8c7c5326871b67a3a396354972d2ea8f45c4a /net-print/cups
parentVersion bump from upstream and fixed init-script. (diff)
downloadgentoo-2-44b2e0ba2ab4ecb60f69e9755d72d5790f52e1a4.tar.gz
gentoo-2-44b2e0ba2ab4ecb60f69e9755d72d5790f52e1a4.tar.bz2
gentoo-2-44b2e0ba2ab4ecb60f69e9755d72d5790f52e1a4.zip
Change to || dbus depend in order to solve bug 144527
(Portage version: 2.1.1_pre5-r2)
Diffstat (limited to 'net-print/cups')
-rw-r--r--net-print/cups/ChangeLog5
-rw-r--r--net-print/cups/cups-1.2.2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 3686081d799c..1afee623c028 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-print/cups
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.196 2006/08/19 00:07:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.197 2006/08/21 07:41:52 genstef Exp $
+
+ 21 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild:
+ Change to || dbus depend in order to solve bug 144527
19 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild:
make gnutls mandatory because it does not work with openssl, thanks to
diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild
index d757081d0179..ac755141216d 100644
--- a/net-print/cups/cups-1.2.2.ebuild
+++ b/net-print/cups/cups-1.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.5 2006/08/19 00:07:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.6 2006/08/21 07:41:52 genstef Exp $
inherit autotools eutils flag-o-matic multilib pam
@@ -19,7 +19,7 @@ IUSE="ssl slp pam samba nls dbus tiff png ppds jpeg X"
DEP="pam? ( virtual/pam )
ssl? ( net-libs/gnutls )
slp? ( >=net-libs/openslp-1.0.4 )
- dbus? ( sys-apps/dbus )
+ dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )
png? ( >=media-libs/libpng-1.2.1 )
tiff? ( >=media-libs/tiff-3.5.5 )
jpeg? ( >=media-libs/jpeg-6b )