diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2006-11-01 04:34:23 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2006-11-01 04:34:23 +0000 |
commit | 5a7bdfb33f107e9b012496968bcf511ff60337ce (patch) | |
tree | a014c3662a8318e0cd2c046319a2617063db5400 | |
parent | Added libke dependencies to configure.in (bug #150120). Pruning old ebuild. (diff) | |
download | gentoo-2-5a7bdfb33f107e9b012496968bcf511ff60337ce.tar.gz gentoo-2-5a7bdfb33f107e9b012496968bcf511ff60337ce.tar.bz2 gentoo-2-5a7bdfb33f107e9b012496968bcf511ff60337ce.zip |
Fixing dbus depend
(Portage version: 2.1.2_pre3-r8)
-rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
-rw-r--r-- | net-print/cups/cups-1.2.4.ebuild | 8 | ||||
-rw-r--r-- | net-print/cups/cups-1.2.5.ebuild | 8 |
3 files changed, 13 insertions, 9 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index c864863b35b2..d9fe36bd0f26 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # 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.208 2006/10/21 07:04:38 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.209 2006/11/01 04:34:23 cardoe Exp $ + + 01 Nov 2006; Doug Goldstein <cardoe@gentoo.org> cups-1.2.4.ebuild, + cups-1.2.5.ebuild: + Fixing dbus depend 21 Oct 2006; Stefan Schweizer <genstef@gentoo.org> files/cups-1.2.5.patch: fix patch, thanks to Kalidarn <dcecchin@gmail.com> in bug 152182 diff --git a/net-print/cups/cups-1.2.4.ebuild b/net-print/cups/cups-1.2.4.ebuild index 094e03d61800..017da015c732 100644 --- a/net-print/cups/cups-1.2.4.ebuild +++ b/net-print/cups/cups-1.2.4.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.4.ebuild,v 1.4 2006/10/19 16:23:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.4.ebuild,v 1.5 2006/11/01 04:34:23 cardoe Exp $ inherit autotools eutils flag-o-matic multilib pam @@ -19,7 +19,7 @@ IUSE="ssl slp pam php 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-core sys-apps/dbus ) ) + dbus? ( sys-apps/dbus ) png? ( >=media-libs/libpng-1.2.1 ) tiff? ( >=media-libs/tiff-3.5.5 ) jpeg? ( >=media-libs/jpeg-6b ) @@ -31,8 +31,8 @@ RDEPEND="${DEP} nls? ( virtual/libintl ) !virtual/lpr >=app-text/poppler-0.4.3-r1 - X? ( x11-misc/xdg-utils ) - " + X? ( x11-misc/xdg-utils )" + PDEPEND=" ppds? ( || ( ( diff --git a/net-print/cups/cups-1.2.5.ebuild b/net-print/cups/cups-1.2.5.ebuild index 1c65609e7e70..e64266e75112 100644 --- a/net-print/cups/cups-1.2.5.ebuild +++ b/net-print/cups/cups-1.2.5.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.5.ebuild,v 1.1 2006/10/21 00:45:55 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.5.ebuild,v 1.2 2006/11/01 04:34:23 cardoe Exp $ inherit autotools eutils flag-o-matic multilib pam @@ -19,7 +19,7 @@ IUSE="ssl slp pam php 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-core sys-apps/dbus ) ) + dbus? ( sys-apps/dbus ) png? ( >=media-libs/libpng-1.2.1 ) tiff? ( >=media-libs/tiff-3.5.5 ) jpeg? ( >=media-libs/jpeg-6b ) @@ -31,8 +31,8 @@ RDEPEND="${DEP} nls? ( virtual/libintl ) !virtual/lpr >=app-text/poppler-0.4.3-r1 - X? ( x11-misc/xdg-utils ) - " + X? ( x11-misc/xdg-utils )" + PDEPEND=" ppds? ( || ( ( |