| 1 |
markusle 08/03/26 13:17:08 |
| 2 |
|
| 3 |
Modified: opendx-4.3.2-r1.ebuild ChangeLog |
| 4 |
opendx-4.4.4.ebuild |
| 5 |
Log: |
| 6 |
Added check for imagemagick's hdri useflag which breaks compilation (see bug #214058). |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.7 sci-visualization/opendx/opendx-4.3.2-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/opendx-4.3.2-r1.ebuild?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/opendx-4.3.2-r1.ebuild?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/opendx-4.3.2-r1.ebuild?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: opendx-4.3.2-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.3.2-r1.ebuild,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- opendx-4.3.2-r1.ebuild 28 Feb 2008 15:53:25 -0000 1.6 |
| 23 |
+++ opendx-4.3.2-r1.ebuild 26 Mar 2008 13:17:07 -0000 1.7 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.3.2-r1.ebuild,v 1.6 2008/02/28 15:53:25 markusle Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.3.2-r1.ebuild,v 1.7 2008/03/26 13:17:07 markusle Exp $ |
| 29 |
|
| 30 |
# Set SMP="no" to force disable of SMP compilation. |
| 31 |
# Set SMP="yes" to force enable of SMP compilation. |
| 32 |
@@ -54,6 +54,14 @@ |
| 33 |
linux_chkconfig_present SMP |
| 34 |
} |
| 35 |
|
| 36 |
+pkg_setup() { |
| 37 |
+ if use imagemagick; then |
| 38 |
+ if built_with_use media-gfx/imagemagick hdri; then |
| 39 |
+ die "Please re-emerge imagemagick with USE=\"-hdri\" or compilation will fail" |
| 40 |
+ fi |
| 41 |
+ fi |
| 42 |
+} |
| 43 |
+ |
| 44 |
src_compile() { |
| 45 |
|
| 46 |
if has_version '>=sys-kernel/linux-headers-2.6.19' ; then |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.10 sci-visualization/opendx/ChangeLog |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/ChangeLog?rev=1.10&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/ChangeLog?rev=1.10&content-type=text/plain |
| 54 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/ChangeLog?r1=1.9&r2=1.10 |
| 55 |
|
| 56 |
Index: ChangeLog |
| 57 |
=================================================================== |
| 58 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v |
| 59 |
retrieving revision 1.9 |
| 60 |
retrieving revision 1.10 |
| 61 |
diff -u -r1.9 -r1.10 |
| 62 |
--- ChangeLog 28 Feb 2008 15:53:25 -0000 1.9 |
| 63 |
+++ ChangeLog 26 Mar 2008 13:17:07 -0000 1.10 |
| 64 |
@@ -1,6 +1,11 @@ |
| 65 |
# ChangeLog for sci-visualization/opendx |
| 66 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 67 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.9 2008/02/28 15:53:25 markusle Exp $ |
| 68 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.10 2008/03/26 13:17:07 markusle Exp $ |
| 69 |
+ |
| 70 |
+ 26 Mar 2008; Markus Dittrich <markusle@g.o> opendx-4.3.2-r1.ebuild, |
| 71 |
+ opendx-4.4.4.ebuild: |
| 72 |
+ Added check for imagemagick's hdri useflag which breaks compilation |
| 73 |
+ (see bug #214058). |
| 74 |
|
| 75 |
28 Feb 2008; Markus Dittrich <markusle@g.o> |
| 76 |
+files/20-opendx-revdep, opendx-4.3.2-r1.ebuild, opendx-4.4.4.ebuild: |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.3 sci-visualization/opendx/opendx-4.4.4.ebuild |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/opendx-4.4.4.ebuild?rev=1.3&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/opendx-4.4.4.ebuild?rev=1.3&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/opendx/opendx-4.4.4.ebuild?r1=1.2&r2=1.3 |
| 85 |
|
| 86 |
Index: opendx-4.4.4.ebuild |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4.ebuild,v |
| 89 |
retrieving revision 1.2 |
| 90 |
retrieving revision 1.3 |
| 91 |
diff -u -r1.2 -r1.3 |
| 92 |
--- opendx-4.4.4.ebuild 28 Feb 2008 15:53:25 -0000 1.2 |
| 93 |
+++ opendx-4.4.4.ebuild 26 Mar 2008 13:17:07 -0000 1.3 |
| 94 |
@@ -1,6 +1,6 @@ |
| 95 |
# Copyright 1999-2008 Gentoo Foundation |
| 96 |
# Distributed under the terms of the GNU General Public License v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4.ebuild,v 1.2 2008/02/28 15:53:25 markusle Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4.ebuild,v 1.3 2008/03/26 13:17:07 markusle Exp $ |
| 99 |
|
| 100 |
# Set SMP="no" to force disable of SMP compilation. |
| 101 |
# Set SMP="yes" to force enable of SMP compilation. |
| 102 |
@@ -55,6 +55,14 @@ |
| 103 |
linux_chkconfig_present SMP |
| 104 |
} |
| 105 |
|
| 106 |
+pkg_setup() { |
| 107 |
+ if use imagemagick; then |
| 108 |
+ if built_with_use media-gfx/imagemagick hdri; then |
| 109 |
+ die "Please re-emerge imagemagick with USE=\"-hdri\" or compilation will fail" |
| 110 |
+ fi |
| 111 |
+ fi |
| 112 |
+} |
| 113 |
+ |
| 114 |
src_unpack() { |
| 115 |
unpack ${A} |
| 116 |
cd "${S}" |
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
-- |
| 121 |
gentoo-commits@l.g.o mailing list |
Archives