summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-09-02 04:23:56 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-09-02 04:23:56 +0000
commit822712e3759aa5b10a0737691dfd3c641701097b (patch)
tree3b361f9d6221cb4ce6fdb4d8054cbc776a5f8c24 /net-print
parentStable for HPPA (bug #138937). (diff)
downloadhistorical-822712e3759aa5b10a0737691dfd3c641701097b.tar.gz
historical-822712e3759aa5b10a0737691dfd3c641701097b.tar.bz2
historical-822712e3759aa5b10a0737691dfd3c641701097b.zip
resolve circular dep by moving the ppds dep to PDEPEND, thanks to Mart Raudsepp <leio@gentoo.org> in bug 145920
Package-Manager: portage-2.1.1_rc1-r2
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups/ChangeLog6
-rw-r--r--net-print/cups/Manifest16
-rw-r--r--net-print/cups/cups-1.2.2.ebuild6
3 files changed, 17 insertions, 11 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/Manifest b/net-print/cups/Manifest
index 3d7819f1570c..9e02cb07e176 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -76,14 +76,14 @@ EBUILD cups-1.1.23-r8.ebuild 4983 RMD160 4c36407a2cf0a9a124f766458fd7e465358a725
MD5 6cd1ab27ff5d14d5f42a5c6a21a3cf22 cups-1.1.23-r8.ebuild 4983
RMD160 4c36407a2cf0a9a124f766458fd7e465358a725e cups-1.1.23-r8.ebuild 4983
SHA256 c9de0ac2e9460305cc9209352ba251610d8998589caa77662be5487b2ade97db cups-1.1.23-r8.ebuild 4983
-EBUILD cups-1.2.2.ebuild 5832 RMD160 c74fb772e0d0b625d23b64f68a402834ffe1707c SHA1 85417f4a25e2deaeebdfe3216f1e65f74e8fc750 SHA256 47c18eb9fc386e5582667faca4e59b8407b017a1277cd52b7cb9a0622c2d5fa5
-MD5 77e77f062f164d17d8edb7fdda759bef cups-1.2.2.ebuild 5832
-RMD160 c74fb772e0d0b625d23b64f68a402834ffe1707c cups-1.2.2.ebuild 5832
-SHA256 47c18eb9fc386e5582667faca4e59b8407b017a1277cd52b7cb9a0622c2d5fa5 cups-1.2.2.ebuild 5832
-MISC ChangeLog 27696 RMD160 4dcf49ee435207cd57826d0595209301687f1587 SHA1 66c32fdfd6850f62490c4016f5507b06e86e6b24 SHA256 2579bc93e2d3531ae19bf7b07d27d0aeecce193aaa3a50756bf2b7d777fa384c
-MD5 721baa8fe375eaa9b739a993d20105c8 ChangeLog 27696
-RMD160 4dcf49ee435207cd57826d0595209301687f1587 ChangeLog 27696
-SHA256 2579bc93e2d3531ae19bf7b07d27d0aeecce193aaa3a50756bf2b7d777fa384c ChangeLog 27696
+EBUILD cups-1.2.2.ebuild 5845 RMD160 87ac51d5502ec78339c5771886dd63ebec201832 SHA1 e9d5799eaca587bd033b117c0da39ea313ecc113 SHA256 3776580402888de62cbefa39b05a436de247e862a23f8f7b1424e7bca2145120
+MD5 20f2e077f0539ba3620e714fb72b0459 cups-1.2.2.ebuild 5845
+RMD160 87ac51d5502ec78339c5771886dd63ebec201832 cups-1.2.2.ebuild 5845
+SHA256 3776580402888de62cbefa39b05a436de247e862a23f8f7b1424e7bca2145120 cups-1.2.2.ebuild 5845
+MISC ChangeLog 27885 RMD160 9cda8d45a3fee4daa43dc4cd889fb9b08b7d4bd2 SHA1 53f2f918d84d504752816a3ee9bb54406fd29c8c SHA256 0828131b3e0745d56f91c4d931c0316f65c38ae4370e696ab820167101b802e7
+MD5 2f5f148192204f44c91c4880cae5ce6e ChangeLog 27885
+RMD160 9cda8d45a3fee4daa43dc4cd889fb9b08b7d4bd2 ChangeLog 27885
+SHA256 0828131b3e0745d56f91c4d931c0316f65c38ae4370e696ab820167101b802e7 ChangeLog 27885
MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
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 )