1 |
compnerd 08/04/21 03:52:21 |
2 |
|
3 |
Modified: ChangeLog totem-2.22.1.ebuild |
4 |
Log: |
5 |
add built_with_use check for python threading support in the use python case |
6 |
(Portage version: 2.1.5_rc2) |
7 |
|
8 |
Revision Changes Path |
9 |
1.211 media-video/totem/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/ChangeLog?rev=1.211&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/ChangeLog?rev=1.211&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/ChangeLog?r1=1.210&r2=1.211 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v |
18 |
retrieving revision 1.210 |
19 |
retrieving revision 1.211 |
20 |
diff -u -r1.210 -r1.211 |
21 |
--- ChangeLog 14 Apr 2008 21:29:53 -0000 1.210 |
22 |
+++ ChangeLog 21 Apr 2008 03:52:20 -0000 1.211 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for media-video/totem |
25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.210 2008/04/14 21:29:53 eva Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.211 2008/04/21 03:52:20 compnerd Exp $ |
28 |
+ |
29 |
+ 21 Apr 2008; Saleem Abdulrasool <compnerd@g.o> totem-2.22.1.ebuild: |
30 |
+ Add built_with_use check for threading in python in the use=python case |
31 |
|
32 |
14 Apr 2008; Gilles Dartiguelongue <eva@g.o> metadata.xml: |
33 |
integrate USE flag documentation from bheekling's and Ford_Prefect's |
34 |
|
35 |
|
36 |
|
37 |
1.2 media-video/totem/totem-2.22.1.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/totem-2.22.1.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/totem-2.22.1.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/totem/totem-2.22.1.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: totem-2.22.1.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.22.1.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- totem-2.22.1.ebuild 10 Apr 2008 21:18:20 -0000 1.1 |
50 |
+++ totem-2.22.1.ebuild 21 Apr 2008 03:52:20 -0000 1.2 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2008 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.22.1.ebuild,v 1.1 2008/04/10 21:18:20 eva Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.22.1.ebuild,v 1.2 2008/04/21 03:52:20 compnerd Exp $ |
56 |
|
57 |
inherit autotools eutils gnome2 multilib |
58 |
|
59 |
@@ -19,57 +19,67 @@ |
60 |
# Youtube plugin as been far too unstable in my tests to be enabled for now |
61 |
|
62 |
RDEPEND=">=dev-libs/glib-2.15 |
63 |
- >=x11-libs/gtk+-2.12.6 |
64 |
- >=gnome-base/gconf-2.0 |
65 |
- >=gnome-base/gnome-vfs-2.16 |
66 |
- >=dev-libs/totem-pl-parser-2.21.90 |
67 |
- >=x11-themes/gnome-icon-theme-2.16 |
68 |
- app-text/iso-codes |
69 |
- dev-libs/libxml2 |
70 |
- >=dev-libs/dbus-glib-0.71 |
71 |
- >=media-libs/gstreamer-0.10.16 |
72 |
- >=media-libs/gst-plugins-good-0.10 |
73 |
- >=media-libs/gst-plugins-base-0.10.12 |
74 |
- >=media-plugins/gst-plugins-pango-0.10 |
75 |
- >=media-plugins/gst-plugins-gconf-0.10 |
76 |
- >=media-plugins/gst-plugins-gnomevfs-0.10 |
77 |
- |
78 |
- >=media-plugins/gst-plugins-x-0.10 |
79 |
- >=media-plugins/gst-plugins-meta-0.10-r2 |
80 |
- |
81 |
- x11-libs/libX11 |
82 |
- x11-libs/libXtst |
83 |
- >=x11-libs/libXrandr-1.1.1 |
84 |
- >=x11-libs/libXxf86vm-1.0.1 |
85 |
- |
86 |
- bluetooth? ( net-wireless/bluez-libs ) |
87 |
- galago? ( >=dev-libs/libgalago-0.5.2 ) |
88 |
- gnome? ( |
89 |
- >=gnome-base/libgnome-2.14 |
90 |
- >=gnome-base/libgnomeui-2.4 |
91 |
- ) |
92 |
- lirc? ( app-misc/lirc ) |
93 |
- nautilus? ( >=gnome-base/nautilus-2.10 ) |
94 |
- nsplugin? ( |
95 |
- xulrunner? ( =net-libs/xulrunner-1.8* ) |
96 |
- !xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) ) |
97 |
- !xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) ) |
98 |
- >=x11-misc/shared-mime-info-0.22 |
99 |
- >=x11-libs/startup-notification-0.8 |
100 |
- ) |
101 |
- nvtv? ( >=media-tv/nvtv-0.4.5 ) |
102 |
- python? ( >=dev-python/pygtk-2.12 >=dev-python/gdata-1 ) |
103 |
- tracker? ( >=app-misc/tracker-0.5.3 >=gnome-base/libgnomeui-2 )" |
104 |
+ >=x11-libs/gtk+-2.12.6 |
105 |
+ >=gnome-base/gconf-2.0 |
106 |
+ >=gnome-base/gnome-vfs-2.16 |
107 |
+ >=dev-libs/totem-pl-parser-2.21.90 |
108 |
+ >=x11-themes/gnome-icon-theme-2.16 |
109 |
+ app-text/iso-codes |
110 |
+ dev-libs/libxml2 |
111 |
+ >=dev-libs/dbus-glib-0.71 |
112 |
+ >=media-libs/gstreamer-0.10.16 |
113 |
+ >=media-libs/gst-plugins-good-0.10 |
114 |
+ >=media-libs/gst-plugins-base-0.10.12 |
115 |
+ >=media-plugins/gst-plugins-pango-0.10 |
116 |
+ >=media-plugins/gst-plugins-gconf-0.10 |
117 |
+ >=media-plugins/gst-plugins-gnomevfs-0.10 |
118 |
+ |
119 |
+ >=media-plugins/gst-plugins-x-0.10 |
120 |
+ >=media-plugins/gst-plugins-meta-0.10-r2 |
121 |
+ |
122 |
+ x11-libs/libX11 |
123 |
+ x11-libs/libXtst |
124 |
+ >=x11-libs/libXrandr-1.1.1 |
125 |
+ >=x11-libs/libXxf86vm-1.0.1 |
126 |
+ |
127 |
+ bluetooth? ( net-wireless/bluez-libs ) |
128 |
+ galago? ( >=dev-libs/libgalago-0.5.2 ) |
129 |
+ gnome? ( |
130 |
+ >=gnome-base/libgnome-2.14 |
131 |
+ >=gnome-base/libgnomeui-2.4 |
132 |
+ ) |
133 |
+ lirc? ( app-misc/lirc ) |
134 |
+ nautilus? ( >=gnome-base/nautilus-2.10 ) |
135 |
+ nsplugin? ( |
136 |
+ xulrunner? ( =net-libs/xulrunner-1.8* ) |
137 |
+ !xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) ) |
138 |
+ !xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) ) |
139 |
+ >=x11-misc/shared-mime-info-0.22 |
140 |
+ >=x11-libs/startup-notification-0.8 |
141 |
+ ) |
142 |
+ nvtv? ( >=media-tv/nvtv-0.4.5 ) |
143 |
+ python? ( >=dev-python/pygtk-2.12 >=dev-python/gdata-1 ) |
144 |
+ tracker? ( >=app-misc/tracker-0.5.3 >=gnome-base/libgnomeui-2 )" |
145 |
DEPEND="${RDEPEND} |
146 |
- app-text/scrollkeeper |
147 |
- gnome-base/gnome-common |
148 |
- app-text/gnome-doc-utils |
149 |
- >=dev-util/intltool-0.35 |
150 |
- >=dev-util/pkgconfig-0.20" |
151 |
+ app-text/scrollkeeper |
152 |
+ gnome-base/gnome-common |
153 |
+ app-text/gnome-doc-utils |
154 |
+ >=dev-util/intltool-0.35 |
155 |
+ >=dev-util/pkgconfig-0.20" |
156 |
|
157 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
158 |
|
159 |
pkg_setup() { |
160 |
+ if use python ; then |
161 |
+ if ! built_with_use --missing false dev-lang/python threads ; then |
162 |
+ if built_with_use --missing true dev-lang/python nothreads ; then |
163 |
+ elog "totem's python support requires that python be built with threading support" |
164 |
+ elog "Please rebuild python with threading support and then build totem again." |
165 |
+ eerror "python built without threading support" |
166 |
+ fi |
167 |
+ fi |
168 |
+ fi |
169 |
+ |
170 |
# use global mozilla plugin dir |
171 |
G2CONF="${G2CONF} MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins" |
172 |
|
173 |
@@ -88,7 +98,7 @@ |
174 |
G2CONF="${G2CONF} --with-gecko=firefox" |
175 |
fi |
176 |
else |
177 |
- G2CONF="${G2CONF} --disable-browser-plugins" |
178 |
+ G2CONF="${G2CONF} --disable-browser-plugins" |
179 |
fi |
180 |
|
181 |
# Plugin Configuration |
182 |
@@ -104,12 +114,12 @@ |
183 |
G2CONF="${G2CONF} --with-plugins=${plugins}" |
184 |
|
185 |
G2CONF="${G2CONF} |
186 |
- $(use_enable debug) |
187 |
- $(use_enable gnome) |
188 |
- $(use_enable lirc) |
189 |
- $(use_enable nautilus) |
190 |
- $(use_enable nvtv) |
191 |
- $(use_enable python)" |
192 |
+ $(use_enable debug) |
193 |
+ $(use_enable gnome) |
194 |
+ $(use_enable lirc) |
195 |
+ $(use_enable nautilus) |
196 |
+ $(use_enable nvtv) |
197 |
+ $(use_enable python)" |
198 |
} |
199 |
|
200 |
src_unpack() { |
201 |
|
202 |
|
203 |
|
204 |
-- |
205 |
gentoo-commits@l.g.o mailing list |