Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/motif: ChangeLog motif-2.3.4-r1.ebuild
Date: Fri, 07 Feb 2014 19:50:59
Message-Id: 20140207195054.50B4F2004C@flycatcher.gentoo.org
1 ulm 14/02/07 19:50:54
2
3 Modified: ChangeLog motif-2.3.4-r1.ebuild
4 Log:
5 Remove alternative dependencies on emul-linux-x86-* packages.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
8
9 Revision Changes Path
10 1.44 x11-libs/motif/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.44&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?rev=1.44&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/ChangeLog?r1=1.43&r2=1.44
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v
19 retrieving revision 1.43
20 retrieving revision 1.44
21 diff -u -r1.43 -r1.44
22 --- ChangeLog 21 Oct 2013 13:56:09 -0000 1.43
23 +++ ChangeLog 7 Feb 2014 19:50:54 -0000 1.44
24 @@ -1,6 +1,9 @@
25 # ChangeLog for x11-libs/motif
26 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.43 2013/10/21 13:56:09 grobian Exp $
28 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/ChangeLog,v 1.44 2014/02/07 19:50:54 ulm Exp $
30 +
31 + 07 Feb 2014; Ulrich Müller <ulm@g.o> motif-2.3.4-r1.ebuild:
32 + Remove alternative dependencies on emul-linux-x86-* packages.
33
34 21 Oct 2013; Fabian Groffen <grobian@g.o> motif-2.3.4-r1.ebuild:
35 Marked ~x64-macos, bug #486818
36
37
38
39 1.31 x11-libs/motif/motif-2.3.4-r1.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.31&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?rev=1.31&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild?r1=1.30&r2=1.31
44
45 Index: motif-2.3.4-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v
48 retrieving revision 1.30
49 retrieving revision 1.31
50 diff -u -r1.30 -r1.31
51 --- motif-2.3.4-r1.ebuild 21 Oct 2013 13:56:09 -0000 1.30
52 +++ motif-2.3.4-r1.ebuild 7 Feb 2014 19:50:54 -0000 1.31
53 @@ -1,6 +1,6 @@
54 -# Copyright 1999-2013 Gentoo Foundation
55 +# Copyright 1999-2014 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.30 2013/10/21 13:56:09 grobian Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/motif/motif-2.3.4-r1.ebuild,v 1.31 2014/02/07 19:50:54 ulm Exp $
59
60 EAPI=5
61
62 @@ -23,24 +23,13 @@
63 x11-libs/libXmu[${MULTILIB_USEDEP}]
64 x11-libs/libXp[${MULTILIB_USEDEP}]
65 x11-libs/libXt[${MULTILIB_USEDEP}]
66 + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
67 + png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] )
68 + unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )
69 xft? (
70 media-libs/fontconfig[${MULTILIB_USEDEP}]
71 x11-libs/libXft[${MULTILIB_USEDEP}]
72 - )
73 - || ( (
74 - unicode? ( virtual/libiconv[${MULTILIB_USEDEP}] )
75 - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
76 - png? ( >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}] )
77 - )
78 - (
79 - unicode? ( virtual/libiconv )
80 - jpeg? ( virtual/jpeg:0= )
81 - png? ( >=media-libs/libpng-1.4:0= )
82 - abi_x86_32? ( amd64? (
83 - jpeg? ( app-emulation/emul-linux-x86-baselibs )
84 - png? ( app-emulation/emul-linux-x86-baselibs )
85 - ) )
86 - ) )"
87 + )"
88
89 DEPEND="${RDEPEND}
90 sys-devel/flex