| 1 |
mgorny 14/05/23 22:43:05 |
| 2 |
|
| 3 |
Modified: wine-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Forward-port the emul-linux dependency changes to the live ebuild. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.167 app-emulation/wine/wine-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.167&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.167&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?r1=1.166&r2=1.167 |
| 15 |
|
| 16 |
Index: wine-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v |
| 19 |
retrieving revision 1.166 |
| 20 |
retrieving revision 1.167 |
| 21 |
diff -u -r1.166 -r1.167 |
| 22 |
--- wine-9999.ebuild 17 May 2014 15:31:17 -0000 1.166 |
| 23 |
+++ wine-9999.ebuild 23 May 2014 22:43:05 -0000 1.167 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.166 2014/05/17 15:31:17 tetromino Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.167 2014/05/23 22:43:05 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -116,9 +116,10 @@ |
| 33 |
app-emulation/emul-linux-x86-xlibs[development] |
| 34 |
media-libs/fontconfig[abi_x86_32] |
| 35 |
) ) |
| 36 |
- gphoto2? ( |
| 37 |
+ gphoto2? ( || ( |
| 38 |
app-emulation/emul-linux-x86-medialibs[development] |
| 39 |
- ) |
| 40 |
+ media-libs/libgphoto2[abi_x86_32] |
| 41 |
+ ) ) |
| 42 |
openal? ( || ( |
| 43 |
app-emulation/emul-linux-x86-sdl[development] |
| 44 |
media-libs/openal[abi_x86_32] |
| 45 |
@@ -145,7 +146,10 @@ |
| 46 |
app-emulation/emul-linux-x86-soundlibs[alsa,development] |
| 47 |
media-libs/alsa-lib[abi_x86_32] |
| 48 |
) ) |
| 49 |
- cups? ( app-emulation/emul-linux-x86-baselibs ) |
| 50 |
+ cups? ( || ( |
| 51 |
+ app-emulation/emul-linux-x86-baselibs |
| 52 |
+ net-print/cups[abi_x86_32] |
| 53 |
+ ) ) |
| 54 |
opencl? ( virtual/opencl[abi_x86_32] ) |
| 55 |
opengl? ( || ( |
| 56 |
app-emulation/emul-linux-x86-opengl[development] |
| 57 |
@@ -162,7 +166,10 @@ |
| 58 |
app-emulation/emul-linux-x86-baselibs[development] |
| 59 |
virtual/jpeg:0[abi_x86_32] |
| 60 |
) ) |
| 61 |
- ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) |
| 62 |
+ ldap? ( || ( |
| 63 |
+ app-emulation/emul-linux-x86-baselibs[development] |
| 64 |
+ net-nds/openldap:=[abi_x86_32] |
| 65 |
+ ) ) |
| 66 |
lcms? ( || ( |
| 67 |
app-emulation/emul-linux-x86-baselibs[development] |
| 68 |
media-libs/lcms:2[abi_x86_32] |
| 69 |
@@ -195,8 +202,14 @@ |
| 70 |
dev-libs/libxslt[abi_x86_32] |
| 71 |
) |
| 72 |
) ) |
| 73 |
- scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) |
| 74 |
- ssl? ( app-emulation/emul-linux-x86-baselibs[development] ) |
| 75 |
+ scanner? ( || ( |
| 76 |
+ app-emulation/emul-linux-x86-medialibs[development] |
| 77 |
+ media-gfx/sane-backends:=[abi_x86_32] |
| 78 |
+ ) ) |
| 79 |
+ ssl? ( || ( |
| 80 |
+ app-emulation/emul-linux-x86-baselibs[development] |
| 81 |
+ net-libs/gnutls:=[abi_x86_32] |
| 82 |
+ ) ) |
| 83 |
png? ( || ( |
| 84 |
app-emulation/emul-linux-x86-baselibs[development] |
| 85 |
media-libs/libpng:0[abi_x86_32] |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
1.510 app-emulation/wine/ChangeLog |
| 90 |
|
| 91 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.510&view=markup |
| 92 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.510&content-type=text/plain |
| 93 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.509&r2=1.510 |
| 94 |
|
| 95 |
Index: ChangeLog |
| 96 |
=================================================================== |
| 97 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v |
| 98 |
retrieving revision 1.509 |
| 99 |
retrieving revision 1.510 |
| 100 |
diff -u -r1.509 -r1.510 |
| 101 |
--- ChangeLog 21 May 2014 19:37:13 -0000 1.509 |
| 102 |
+++ ChangeLog 23 May 2014 22:43:05 -0000 1.510 |
| 103 |
@@ -1,6 +1,9 @@ |
| 104 |
# ChangeLog for app-emulation/wine |
| 105 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 106 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.509 2014/05/21 19:37:13 mgorny Exp $ |
| 107 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.510 2014/05/23 22:43:05 mgorny Exp $ |
| 108 |
+ |
| 109 |
+ 23 May 2014; Michał Górny <mgorny@g.o> wine-9999.ebuild: |
| 110 |
+ Forward-port the emul-linux dependency changes to the live ebuild. |
| 111 |
|
| 112 |
21 May 2014; Michał Górny <mgorny@g.o> wine-1.7.19-r1.ebuild: |
| 113 |
Support new multilib-enabled packages as dependencies. Partially bug #510646. |
Archives