| 1 |
zmedico 09/10/31 21:42:04 |
| 2 |
|
| 3 |
Modified: ChangeLog libXext-1.1.1.ebuild |
| 4 |
Log: |
| 5 |
Add blocker for <xextproto-7.1.1, to avoid file collisions when merging binary packages. |
| 6 |
(Portage version: 2.2_rc48/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.66 x11-libs/libXext/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXext/ChangeLog?rev=1.66&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXext/ChangeLog?rev=1.66&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXext/ChangeLog?r1=1.65&r2=1.66 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v |
| 18 |
retrieving revision 1.65 |
| 19 |
retrieving revision 1.66 |
| 20 |
diff -u -r1.65 -r1.66 |
| 21 |
--- ChangeLog 26 Oct 2009 21:01:45 -0000 1.65 |
| 22 |
+++ ChangeLog 31 Oct 2009 21:42:03 -0000 1.66 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for x11-libs/libXext |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.65 2009/10/26 21:01:45 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/ChangeLog,v 1.66 2009/10/31 21:42:03 zmedico Exp $ |
| 28 |
+ |
| 29 |
+ 31 Oct 2009; Zac Medico <zmedico@g.o> libXext-1.1.1.ebuild: |
| 30 |
+ Add blocker for <xextproto-7.1.1, to avoid file collisions when merging |
| 31 |
+ binary packages. |
| 32 |
|
| 33 |
26 Oct 2009; Jeroen Roovers <jer@g.o> libXext-1.0.5.ebuild: |
| 34 |
Stable for HPPA (bug #282290). |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 x11-libs/libXext/libXext-1.1.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: libXext-1.1.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- libXext-1.1.1.ebuild 25 Oct 2009 20:32:42 -0000 1.1 |
| 51 |
+++ libXext-1.1.1.ebuild 31 Oct 2009 21:42:03 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild,v 1.1 2009/10/25 20:32:42 scarabeus Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.1.1.ebuild,v 1.2 2009/10/31 21:42:03 zmedico Exp $ |
| 57 |
|
| 58 |
inherit x-modular |
| 59 |
|
| 60 |
@@ -9,7 +9,9 @@ |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
| 62 |
IUSE="" |
| 63 |
|
| 64 |
-RDEPEND=">=x11-libs/libX11-1.1.99.1" |
| 65 |
-DEPEND="${RDEPEND} |
| 66 |
+COMMON_DEPEND=">=x11-libs/libX11-1.1.99.1" |
| 67 |
+RDEPEND="${COMMON_DEPEND} |
| 68 |
+ !<x11-proto/xextproto-7.1.1" |
| 69 |
+DEPEND="${COMMON_DEPEND} |
| 70 |
>=x11-proto/xextproto-7.0.99.2 |
| 71 |
>=x11-proto/xproto-7.0.13" |
Archives