1 |
ssuominen 12/04/07 16:01:07 |
2 |
|
3 |
Modified: ChangeLog imagemagick-6.7.6.4.ebuild |
4 |
Log: |
5 |
Restore src_test() logic wrt #411155 by Jeroen Roovers |
6 |
|
7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.472 media-gfx/imagemagick/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.472&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.472&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.471&r2=1.472 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v |
19 |
retrieving revision 1.471 |
20 |
retrieving revision 1.472 |
21 |
diff -u -r1.471 -r1.472 |
22 |
--- ChangeLog 7 Apr 2012 15:03:51 -0000 1.471 |
23 |
+++ ChangeLog 7 Apr 2012 16:01:07 -0000 1.472 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-gfx/imagemagick |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.471 2012/04/07 15:03:51 maekke Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.472 2012/04/07 16:01:07 ssuominen Exp $ |
29 |
+ |
30 |
+ 07 Apr 2012; Samuli Suominen <ssuominen@g.o> |
31 |
+ imagemagick-6.7.6.4.ebuild: |
32 |
+ Restore src_test() logic wrt #411155 by Jeroen Roovers |
33 |
|
34 |
07 Apr 2012; Markus Meier <maekke@g.o> imagemagick-6.7.6.4.ebuild: |
35 |
arm stable, bug #410867 |
36 |
|
37 |
|
38 |
|
39 |
1.5 media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: imagemagick-6.7.6.4.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- imagemagick-6.7.6.4.ebuild 7 Apr 2012 15:03:51 -0000 1.4 |
52 |
+++ imagemagick-6.7.6.4.ebuild 7 Apr 2012 16:01:07 -0000 1.5 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2012 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild,v 1.4 2012/04/07 15:03:51 maekke Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild,v 1.5 2012/04/07 16:01:07 ssuominen Exp $ |
58 |
|
59 |
EAPI=4 |
60 |
inherit multilib toolchain-funcs versionator |
61 |
@@ -129,7 +129,11 @@ |
62 |
} |
63 |
|
64 |
src_test() { |
65 |
- has_version media-gfx/imagemagick || emake -j1 check |
66 |
+ if has_version ~${CATEGORY}/${P}; then |
67 |
+ emake -j1 check |
68 |
+ else |
69 |
+ ewarn "Skipping testsuite because installed version doesn't match." |
70 |
+ fi |
71 |
} |
72 |
|
73 |
src_install() { |