1 |
aballier 13/12/30 08:10:35 |
2 |
|
3 |
Modified: tsmuxer-1.10.6-r1.ebuild ChangeLog |
4 |
Log: |
5 |
update multilib deps to use multilib converted packages when available. bug #489058 by Michael Mair-Keimberger (iamnr3) |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
8 |
|
9 |
Revision Changes Path |
10 |
1.9 media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild?rev=1.9&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild?rev=1.9&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild?r1=1.8&r2=1.9 |
15 |
|
16 |
Index: tsmuxer-1.10.6-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v |
19 |
retrieving revision 1.8 |
20 |
retrieving revision 1.9 |
21 |
diff -u -r1.8 -r1.9 |
22 |
--- tsmuxer-1.10.6-r1.ebuild 2 Mar 2013 22:43:17 -0000 1.8 |
23 |
+++ tsmuxer-1.10.6-r1.ebuild 30 Dec 2013 08:10:35 -0000 1.9 |
24 |
@@ -1,8 +1,8 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.8 2013/03/02 22:43:17 hwoarang Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild,v 1.9 2013/12/30 08:10:35 aballier Exp $ |
29 |
|
30 |
-EAPI="4" |
31 |
+EAPI=5 |
32 |
|
33 |
inherit eutils base qt4-r2 |
34 |
|
35 |
@@ -24,17 +24,48 @@ |
36 |
)" |
37 |
RDEPEND=" |
38 |
x86? ( |
39 |
- sys-libs/glibc |
40 |
media-libs/freetype:2 |
41 |
qt4? ( |
42 |
+ dev-libs/glib:2 |
43 |
+ dev-qt/qtcore:4 |
44 |
dev-qt/qtgui:4 |
45 |
- media-libs/libpng:1.2 |
46 |
+ media-libs/fontconfig |
47 |
+ x11-libs/libICE |
48 |
+ x11-libs/libSM |
49 |
+ x11-libs/libX11 |
50 |
+ x11-libs/libXext |
51 |
+ x11-libs/libXrender |
52 |
) |
53 |
) |
54 |
amd64? ( |
55 |
- app-emulation/emul-linux-x86-xlibs |
56 |
- app-emulation/emul-linux-x86-baselibs |
57 |
- qt4? ( >=app-emulation/emul-linux-x86-qtlibs-20081109 ) |
58 |
+ || ( |
59 |
+ media-libs/freetype:2[abi_x86_32(-)] |
60 |
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
61 |
+ ) |
62 |
+ qt4? ( |
63 |
+ || ( |
64 |
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] |
65 |
+ ( |
66 |
+ media-libs/fontconfig[abi_x86_32(-)] |
67 |
+ x11-libs/libICE[abi_x86_32(-)] |
68 |
+ x11-libs/libSM[abi_x86_32(-)] |
69 |
+ x11-libs/libX11[abi_x86_32(-)] |
70 |
+ x11-libs/libXext[abi_x86_32(-)] |
71 |
+ x11-libs/libXrender[abi_x86_32(-)] |
72 |
+ ) |
73 |
+ ) |
74 |
+ || ( |
75 |
+ dev-libs/glib:2[abi_x86_32(-)] |
76 |
+ app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
77 |
+ ) |
78 |
+ || ( |
79 |
+ ( |
80 |
+ dev-qt/qtcore[abi_x86_32(-)] |
81 |
+ dev-qt/qtgui[abi_x86_32(-)] |
82 |
+ ) |
83 |
+ app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] |
84 |
+ ) |
85 |
+ ) |
86 |
)" |
87 |
|
88 |
# cli is linked to freetype, when it will be fixed, |
89 |
|
90 |
|
91 |
|
92 |
1.11 media-video/tsmuxer/ChangeLog |
93 |
|
94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/tsmuxer/ChangeLog?rev=1.11&view=markup |
95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/tsmuxer/ChangeLog?rev=1.11&content-type=text/plain |
96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/tsmuxer/ChangeLog?r1=1.10&r2=1.11 |
97 |
|
98 |
Index: ChangeLog |
99 |
=================================================================== |
100 |
RCS file: /var/cvsroot/gentoo-x86/media-video/tsmuxer/ChangeLog,v |
101 |
retrieving revision 1.10 |
102 |
retrieving revision 1.11 |
103 |
diff -u -r1.10 -r1.11 |
104 |
--- ChangeLog 21 Jul 2013 09:03:24 -0000 1.10 |
105 |
+++ ChangeLog 30 Dec 2013 08:10:35 -0000 1.11 |
106 |
@@ -1,6 +1,10 @@ |
107 |
# ChangeLog for media-video/tsmuxer |
108 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
109 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/ChangeLog,v 1.10 2013/07/21 09:03:24 pacho Exp $ |
110 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/tsmuxer/ChangeLog,v 1.11 2013/12/30 08:10:35 aballier Exp $ |
111 |
+ |
112 |
+ 30 Dec 2013; Alexis Ballier <aballier@g.o> tsmuxer-1.10.6-r1.ebuild: |
113 |
+ update multilib deps to use multilib converted packages when available. bug |
114 |
+ #489058 by Michael Mair-Keimberger (iamnr3) |
115 |
|
116 |
21 Jul 2013; Pacho Ramos <pacho@g.o> metadata.xml: |
117 |
Cleanup due #92799 |