1 |
flameeyes 09/12/01 11:18:46 |
2 |
|
3 |
Modified: ChangeLog hplip-3.9.10.ebuild hplip-3.9.8-r3.ebuild |
4 |
Log: |
5 |
Fix dependencies over cups to avoid downgrades to 1.3 for users with zeroconf USE flag enabled. |
6 |
(Portage version: 2.2_rc54/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.134 net-print/hplip/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.134&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.134&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?r1=1.133&r2=1.134 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v |
18 |
retrieving revision 1.133 |
19 |
retrieving revision 1.134 |
20 |
diff -u -r1.133 -r1.134 |
21 |
--- ChangeLog 30 Nov 2009 18:20:27 -0000 1.133 |
22 |
+++ ChangeLog 1 Dec 2009 11:18:46 -0000 1.134 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for net-print/hplip |
25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.133 2009/11/30 18:20:27 billie Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.134 2009/12/01 11:18:46 flameeyes Exp $ |
28 |
+ |
29 |
+ 01 Dec 2009; Diego E. Pettenò <flameeyes@g.o> |
30 |
+ hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild: |
31 |
+ Fix dependencies over cups to avoid downgrades to 1.3 for users with |
32 |
+ zeroconf USE flag enabled. |
33 |
|
34 |
30 Nov 2009; Daniel Pielmeier <billie@g.o> hplip-2.8.6b.ebuild, |
35 |
hplip-3.9.4b-r1.ebuild, hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.4 net-print/hplip/hplip-3.9.10.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.4&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.4&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?r1=1.3&r2=1.4 |
44 |
|
45 |
Index: hplip-3.9.10.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v |
48 |
retrieving revision 1.3 |
49 |
retrieving revision 1.4 |
50 |
diff -u -r1.3 -r1.4 |
51 |
--- hplip-3.9.10.ebuild 30 Nov 2009 18:20:27 -0000 1.3 |
52 |
+++ hplip-3.9.10.ebuild 1 Dec 2009 11:18:46 -0000 1.4 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2009 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.3 2009/11/30 18:20:27 billie Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.4 2009/12/01 11:18:46 flameeyes Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
@@ -22,10 +22,11 @@ |
62 |
virtual/ghostscript |
63 |
media-libs/jpeg |
64 |
hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) |
65 |
- !static-ppds? ( || ( >=net-print/cups-1.4.0[zeroconf?] net-print/cupsddk ) ) |
66 |
+ !static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) ) |
67 |
udev-acl? ( >=sys-fs/udev-145[extras] ) |
68 |
!minimal? ( |
69 |
- net-print/cups[zeroconf?] |
70 |
+ !zeroconf? ( net-print/cups ) |
71 |
+ zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) ) |
72 |
virtual/libusb:0 |
73 |
>=dev-lang/python-2.4.4[threads,xml] |
74 |
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) |
75 |
|
76 |
|
77 |
|
78 |
1.3 net-print/hplip/hplip-3.9.8-r3.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.3&view=markup |
81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.3&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?r1=1.2&r2=1.3 |
83 |
|
84 |
Index: hplip-3.9.8-r3.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v |
87 |
retrieving revision 1.2 |
88 |
retrieving revision 1.3 |
89 |
diff -u -r1.2 -r1.3 |
90 |
--- hplip-3.9.8-r3.ebuild 30 Nov 2009 18:20:27 -0000 1.2 |
91 |
+++ hplip-3.9.8-r3.ebuild 1 Dec 2009 11:18:46 -0000 1.3 |
92 |
@@ -1,6 +1,6 @@ |
93 |
# Copyright 1999-2009 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.2 2009/11/30 18:20:27 billie Exp $ |
96 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.3 2009/12/01 11:18:46 flameeyes Exp $ |
97 |
|
98 |
EAPI="2" |
99 |
|
100 |
@@ -22,10 +22,11 @@ |
101 |
virtual/ghostscript |
102 |
media-libs/jpeg |
103 |
hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) |
104 |
- !static-ppds? ( || ( >=net-print/cups-1.4.0[zeroconf?] net-print/cupsddk ) ) |
105 |
+ !static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) ) |
106 |
udev-acl? ( >=sys-fs/udev-145[extras] ) |
107 |
!minimal? ( |
108 |
- net-print/cups[zeroconf?] |
109 |
+ !zeroconf? ( net-print/cups ) |
110 |
+ zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) ) |
111 |
virtual/libusb:0 |
112 |
>=dev-lang/python-2.4.4[threads,xml] |
113 |
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) |