diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-09-02 04:23:56 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-09-02 04:23:56 +0000 |
| commit | e1256ad8d9699ec3db2953d16b2defb0f07e76d4 (patch) | |
| tree | 29a046b85fafc2c6a73220e65b30be64d7fd0ecc | |
| parent | Stable for HPPA (bug #138937). (diff) | |
| download | gentoo-2-e1256ad8d9699ec3db2953d16b2defb0f07e76d4.tar.gz gentoo-2-e1256ad8d9699ec3db2953d16b2defb0f07e76d4.tar.bz2 gentoo-2-e1256ad8d9699ec3db2953d16b2defb0f07e76d4.zip | |
resolve circular dep by moving the ppds dep to PDEPEND, thanks to Mart Raudsepp <leio@gentoo.org> in bug 145920
(Portage version: 2.1.1_rc1-r2)
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.2.ebuild | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 1afee623c028..a4438d404314 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.197 2006/08/21 07:41:52 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.198 2006/09/02 04:23:56 genstef Exp $ + + 02 Sep 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild: + resolve circular dep by moving the ppds dep to PDEPEND, thanks to Mart + Raudsepp <leio@gentoo.org> in bug 145920 21 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild: Change to || dbus depend in order to solve bug 144527 diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild index ac755141216d..74b5ef71c26d 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.6 2006/08/21 07:41:52 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.7 2006/09/02 04:23:56 genstef Exp $ inherit autotools eutils flag-o-matic multilib pam @@ -30,6 +30,9 @@ RDEPEND="${DEP} nls? ( virtual/libintl ) !virtual/lpr >=app-text/poppler-0.4.3-r1 + X? ( x86? ( x11-misc/xdg-utils ) ) + " +PDEPEND=" ppds? ( || ( ( net-print/foomatic-filters-ppds @@ -42,7 +45,6 @@ RDEPEND="${DEP} net-print/foo2zjs net-print/cups-pdf ) ) - X? ( x86? ( x11-misc/xdg-utils ) ) " # keywording xdg-utils in bug 144345 PDEPEND="samba? ( >=net-fs/samba-3.0.8 ) |