1 |
pacho 11/07/04 10:51:44 |
2 |
|
3 |
Modified: ChangeLog glib-2.28.8.ebuild |
4 |
Log: |
5 |
Fix warning about skipped tests being shown even when tests are disabled by the user (bug #373963 by William Throwe). |
6 |
|
7 |
(Portage version: 2.1.10.3/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.474 dev-libs/glib/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.474&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.474&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.473&r2=1.474 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v |
19 |
retrieving revision 1.473 |
20 |
retrieving revision 1.474 |
21 |
diff -u -r1.473 -r1.474 |
22 |
--- ChangeLog 1 Jul 2011 21:07:09 -0000 1.473 |
23 |
+++ ChangeLog 4 Jul 2011 10:51:44 -0000 1.474 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for dev-libs/glib |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.473 2011/07/01 21:07:09 hwoarang Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.474 2011/07/04 10:51:44 pacho Exp $ |
29 |
+ |
30 |
+ 04 Jul 2011; Pacho Ramos <pacho@g.o> glib-2.28.8.ebuild: |
31 |
+ Fix warning about skipped tests being shown even when tests are disabled by |
32 |
+ the user (bug #373963 by William Throwe). |
33 |
|
34 |
01 Jul 2011; Markos Chandras <hwoarang@g.o> glib-2.28.8.ebuild: |
35 |
Stable on amd64 wrt bug #278255 |
36 |
|
37 |
|
38 |
|
39 |
1.6 dev-libs/glib/glib-2.28.8.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild?rev=1.6&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild?rev=1.6&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild?r1=1.5&r2=1.6 |
44 |
|
45 |
Index: glib-2.28.8.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v |
48 |
retrieving revision 1.5 |
49 |
retrieving revision 1.6 |
50 |
diff -u -r1.5 -r1.6 |
51 |
--- glib-2.28.8.ebuild 1 Jul 2011 21:07:09 -0000 1.5 |
52 |
+++ glib-2.28.8.ebuild 4 Jul 2011 10:51:44 -0000 1.6 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.5 2011/07/01 21:07:09 hwoarang Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.6 2011/07/04 10:51:44 pacho Exp $ |
58 |
|
59 |
EAPI="3" |
60 |
GNOME_TARBALL_SUFFIX="xz" |
61 |
@@ -75,32 +75,32 @@ |
62 |
epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch" |
63 |
epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch" |
64 |
|
65 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629 |
66 |
- if ! has_version dev-util/desktop-file-utils ; then |
67 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
68 |
- ewarn "think on installing it to get these tests run." |
69 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
70 |
- sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die |
71 |
- sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die |
72 |
- sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die |
73 |
- fi |
74 |
- |
75 |
- # Disable tests requiring dev-python/dbus-python, bug #349236 |
76 |
- if ! has_version dev-python/dbus-python ; then |
77 |
- ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system," |
78 |
- ewarn "think on installing it to get these tests run." |
79 |
- sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die |
80 |
- sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die |
81 |
- sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die |
82 |
- sed -i -e "/gdbus\/bus-watch-name/d" gio/tests/gdbus-names.c || die |
83 |
- sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die |
84 |
- sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die |
85 |
- sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die |
86 |
- fi |
87 |
- |
88 |
if ! use test; then |
89 |
# don't waste time building tests |
90 |
sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find -name Makefile.am -o -name Makefile.in) || die |
91 |
+ else |
92 |
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629 |
93 |
+ if ! has_version dev-util/desktop-file-utils ; then |
94 |
+ ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
95 |
+ ewarn "think on installing it to get these tests run." |
96 |
+ sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
97 |
+ sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die |
98 |
+ sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die |
99 |
+ sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die |
100 |
+ fi |
101 |
+ |
102 |
+ # Disable tests requiring dev-python/dbus-python, bug #349236 |
103 |
+ if ! has_version dev-python/dbus-python ; then |
104 |
+ ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system," |
105 |
+ ewarn "think on installing it to get these tests run." |
106 |
+ sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die |
107 |
+ sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die |
108 |
+ sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die |
109 |
+ sed -i -e "/gdbus\/bus-watch-name/d" gio/tests/gdbus-names.c || die |
110 |
+ sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die |
111 |
+ sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die |
112 |
+ sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die |
113 |
+ fi |
114 |
fi |
115 |
|
116 |
# Needed for the punt-python-check patch, disabling timeout test |