1 |
ulm 13/08/01 19:47:33 |
2 |
|
3 |
Modified: ChangeLog motif-2.3.4-r1.ebuild |
4 |
motif-2.2.3-r12.ebuild |
5 |
Log: |
6 |
Update multilib dependencies for libiconv, jpeg, and libpng. Drop dependency on emul-linux-x86-baselibs unless it is needed. |
7 |
|
8 |
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.34 x11-libs/motif/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.34&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.34&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.33&r2=1.34 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v |
20 |
retrieving revision 1.33 |
21 |
retrieving revision 1.34 |
22 |
diff -u -r1.33 -r1.34 |
23 |
--- ChangeLog 31 Jul 2013 22:24:16 -0000 1.33 |
24 |
+++ ChangeLog 1 Aug 2013 19:47:33 -0000 1.34 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for x11-libs/motif |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.33 2013/07/31 22:24:16 ulm Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.34 2013/08/01 19:47:33 ulm Exp $ |
30 |
+ |
31 |
+ 01 Aug 2013; Ulrich Müller <ulm@g.o> motif-2.2.3-r12.ebuild, |
32 |
+ motif-2.3.4-r1.ebuild: |
33 |
+ Update multilib dependencies for libiconv, jpeg, and libpng. Drop dependency |
34 |
+ on emul-linux-x86-baselibs unless it is needed. |
35 |
|
36 |
31 Jul 2013; Ulrich Müller <ulm@g.o> motif-2.2.3-r12.ebuild, |
37 |
motif-2.3.4-r1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.21 x11-libs/motif/motif-2.3.4-r1.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.21&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.21&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.20&r2=1.21 |
46 |
|
47 |
Index: motif-2.3.4-r1.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v |
50 |
retrieving revision 1.20 |
51 |
retrieving revision 1.21 |
52 |
diff -u -r1.20 -r1.21 |
53 |
--- motif-2.3.4-r1.ebuild 31 Jul 2013 22:24:16 -0000 1.20 |
54 |
+++ motif-2.3.4-r1.ebuild 1 Aug 2013 19:47:33 -0000 1.21 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2013 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.20 2013/07/31 22:24:16 ulm Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.21 2013/08/01 19:47:33 ulm Exp $ |
60 |
|
61 |
EAPI=5 |
62 |
|
63 |
@@ -17,22 +17,41 @@ |
64 |
KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
65 |
IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft" |
66 |
|
67 |
-RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}] |
68 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
69 |
- x11-libs/libXmu[${MULTILIB_USEDEP}] |
70 |
- x11-libs/libXp[${MULTILIB_USEDEP}] |
71 |
- x11-libs/libXt[${MULTILIB_USEDEP}] |
72 |
- unicode? ( virtual/libiconv ) |
73 |
- xft? ( |
74 |
- media-libs/fontconfig[${MULTILIB_USEDEP}] |
75 |
- x11-libs/libXft[${MULTILIB_USEDEP}] |
76 |
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] ) |
77 |
+ || ( ( |
78 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
79 |
+ x11-libs/libXext[${MULTILIB_USEDEP}] |
80 |
+ x11-libs/libXmu[${MULTILIB_USEDEP}] |
81 |
+ x11-libs/libXp[${MULTILIB_USEDEP}] |
82 |
+ x11-libs/libXt[${MULTILIB_USEDEP}] |
83 |
+ xft? ( |
84 |
+ media-libs/fontconfig[${MULTILIB_USEDEP}] |
85 |
+ x11-libs/libXft[${MULTILIB_USEDEP}] |
86 |
+ ) |
87 |
) |
88 |
- jpeg? ( virtual/jpeg ) |
89 |
- png? ( >=media-libs/libpng-1.4:0= ) |
90 |
- abi_x86_32? ( |
91 |
- amd64? ( app-emulation/emul-linux-x86-baselibs ) |
92 |
- !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] |
93 |
- )" |
94 |
+ ( |
95 |
+ x11-libs/libX11 |
96 |
+ x11-libs/libXext |
97 |
+ x11-libs/libXmu |
98 |
+ x11-libs/libXp |
99 |
+ x11-libs/libXt |
100 |
+ xft? ( media-libs/fontconfig x11-libs/libXft ) |
101 |
+ abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-xlibs ) ) |
102 |
+ ) ) |
103 |
+ || ( ( |
104 |
+ unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
105 |
+ jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] ) |
106 |
+ png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] ) |
107 |
+ ) |
108 |
+ ( |
109 |
+ unicode? ( virtual/libiconv ) |
110 |
+ jpeg? ( virtual/jpeg ) |
111 |
+ png? ( >=media-libs/libpng-1.4:0= ) |
112 |
+ abi_x86_32? ( amd64? ( |
113 |
+ jpeg? ( app-emulation/emul-linux-x86-baselibs ) |
114 |
+ png? ( app-emulation/emul-linux-x86-baselibs ) |
115 |
+ ) ) |
116 |
+ ) )" |
117 |
|
118 |
DEPEND="${RDEPEND} |
119 |
sys-devel/flex |
120 |
|
121 |
|
122 |
|
123 |
1.8 x11-libs/motif/motif-2.2.3-r12.ebuild |
124 |
|
125 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild?rev=1.8&view=markup |
126 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild?rev=1.8&content-type=text/plain |
127 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild?r1=1.7&r2=1.8 |
128 |
|
129 |
Index: motif-2.2.3-r12.ebuild |
130 |
=================================================================== |
131 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v |
132 |
retrieving revision 1.7 |
133 |
retrieving revision 1.8 |
134 |
diff -u -r1.7 -r1.8 |
135 |
--- motif-2.2.3-r12.ebuild 31 Jul 2013 22:24:16 -0000 1.7 |
136 |
+++ motif-2.2.3-r12.ebuild 1 Aug 2013 19:47:33 -0000 1.8 |
137 |
@@ -1,6 +1,6 @@ |
138 |
# Copyright 1999-2013 Gentoo Foundation |
139 |
# Distributed under the terms of the GNU General Public License v2 |
140 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.7 2013/07/31 22:24:16 ulm Exp $ |
141 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.2.3-r12.ebuild,v 1.8 2013/08/01 19:47:33 ulm Exp $ |
142 |
|
143 |
EAPI=5 |
144 |
|
145 |
@@ -16,15 +16,22 @@ |
146 |
SLOT="2.2" |
147 |
KEYWORDS="~amd64 ~x86" |
148 |
|
149 |
-RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}] |
150 |
- x11-libs/libXext[${MULTILIB_USEDEP}] |
151 |
- x11-libs/libXmu[${MULTILIB_USEDEP}] |
152 |
- x11-libs/libXp[${MULTILIB_USEDEP}] |
153 |
- x11-libs/libXt[${MULTILIB_USEDEP}] |
154 |
- abi_x86_32? ( |
155 |
- amd64? ( app-emulation/emul-linux-x86-baselibs ) |
156 |
- !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] |
157 |
- )" |
158 |
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] ) |
159 |
+ || ( ( |
160 |
+ x11-libs/libX11[${MULTILIB_USEDEP}] |
161 |
+ x11-libs/libXext[${MULTILIB_USEDEP}] |
162 |
+ x11-libs/libXmu[${MULTILIB_USEDEP}] |
163 |
+ x11-libs/libXp[${MULTILIB_USEDEP}] |
164 |
+ x11-libs/libXt[${MULTILIB_USEDEP}] |
165 |
+ ) |
166 |
+ ( |
167 |
+ x11-libs/libX11 |
168 |
+ x11-libs/libXext |
169 |
+ x11-libs/libXmu |
170 |
+ x11-libs/libXp |
171 |
+ x11-libs/libXt |
172 |
+ abi_x86_32? ( amd64? ( app-emulation/emul-linux-x86-xlibs ) ) |
173 |
+ ) )" |
174 |
|
175 |
DEPEND="${RDEPEND} |
176 |
x11-libs/libXaw |