| 1 |
bicatali 12/08/01 23:21:41 |
| 2 |
|
| 3 |
Modified: opendx-4.4.4-r4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Build for newer imagemagick and add possibility for graphicsmagick as well, fixing bug #314375. Keyword for x86-linux, switch to EAPI 4 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.10 sci-visualization/opendx/opendx-4.4.4-r4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild?rev=1.10&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild?rev=1.10&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild?r1=1.9&r2=1.10 |
| 15 |
|
| 16 |
Index: opendx-4.4.4-r4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild,v |
| 19 |
retrieving revision 1.9 |
| 20 |
retrieving revision 1.10 |
| 21 |
diff -u -r1.9 -r1.10 |
| 22 |
--- opendx-4.4.4-r4.ebuild 15 Feb 2012 10:24:29 -0000 1.9 |
| 23 |
+++ opendx-4.4.4-r4.ebuild 1 Aug 2012 23:21:41 -0000 1.10 |
| 24 |
@@ -1,21 +1,22 @@ |
| 25 |
# Copyright 1999-2012 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.4.4-r4.ebuild,v 1.9 2012/02/15 10:24:29 xarthisius Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild,v 1.10 2012/08/01 23:21:41 bicatali Exp $ |
| 29 |
|
| 30 |
-EAPI=3 |
| 31 |
+EAPI=4 |
| 32 |
|
| 33 |
-inherit eutils flag-o-matic autotools |
| 34 |
+MYP=dx-${PV} |
| 35 |
+inherit eutils flag-o-matic autotools multilib |
| 36 |
|
| 37 |
-DESCRIPTION="A 3D data visualization tool" |
| 38 |
+DESCRIPTION="3D data visualization tool" |
| 39 |
HOMEPAGE="http://www.opendx.org/" |
| 40 |
-SRC_URI="http://opendx.sdsc.edu/source/${P/open}.tar.gz" |
| 41 |
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz" |
| 42 |
|
| 43 |
LICENSE="IBM" |
| 44 |
SLOT="0" |
| 45 |
-KEYWORDS="amd64 ppc x86 ~amd64-linux" |
| 46 |
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" |
| 47 |
IUSE="hdf cdf netcdf tiff imagemagick szip smp" |
| 48 |
|
| 49 |
-DEPEND="x11-libs/libXmu |
| 50 |
+RDEPEND="x11-libs/libXmu |
| 51 |
x11-libs/libXi |
| 52 |
x11-libs/libXp |
| 53 |
x11-libs/libXpm |
| 54 |
@@ -27,11 +28,12 @@ |
| 55 |
cdf? ( sci-libs/cdf ) |
| 56 |
netcdf? ( sci-libs/netcdf ) |
| 57 |
tiff? ( media-libs/tiff ) |
| 58 |
- imagemagick? ( >=media-gfx/imagemagick-5.3.4 )" |
| 59 |
-RDEPEND="${DEPEND}" |
| 60 |
-# waiting on bug #36349 for media-libs/jasper in imagemagick |
| 61 |
+ imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )" |
| 62 |
|
| 63 |
-S=${WORKDIR}/${P/open} |
| 64 |
+DEPEND="${RDEPEND} |
| 65 |
+ virtual/pkgconfig" |
| 66 |
+ |
| 67 |
+S="${WORKDIR}/${MYP}" |
| 68 |
|
| 69 |
src_prepare() { |
| 70 |
epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch" |
| 71 |
@@ -44,6 +46,7 @@ |
| 72 |
epatch "${FILESDIR}/${P}-open.patch" |
| 73 |
epatch "${FILESDIR}/${P}-szip.patch" |
| 74 |
epatch "${FILESDIR}/${P}-null.patch" |
| 75 |
+ epatch "${FILESDIR}/${P}-magick.patch" |
| 76 |
eautoreconf |
| 77 |
} |
| 78 |
|
| 79 |
@@ -74,7 +77,7 @@ |
| 80 |
} |
| 81 |
|
| 82 |
src_install() { |
| 83 |
- emake DESTDIR="${D}" install || die |
| 84 |
+ default |
| 85 |
newicon src/uipp/ui/icon50.xpm ${PN}.xpm |
| 86 |
make_desktop_entry dx "Open Data Explorer" |
| 87 |
} |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.27 sci-visualization/opendx/ChangeLog |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/opendx/ChangeLog?rev=1.27&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/opendx/ChangeLog?rev=1.27&content-type=text/plain |
| 95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/opendx/ChangeLog?r1=1.26&r2=1.27 |
| 96 |
|
| 97 |
Index: ChangeLog |
| 98 |
=================================================================== |
| 99 |
RCS file: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v |
| 100 |
retrieving revision 1.26 |
| 101 |
retrieving revision 1.27 |
| 102 |
diff -u -r1.26 -r1.27 |
| 103 |
--- ChangeLog 15 Feb 2012 10:24:29 -0000 1.26 |
| 104 |
+++ ChangeLog 1 Aug 2012 23:21:41 -0000 1.27 |
| 105 |
@@ -1,6 +1,12 @@ |
| 106 |
# ChangeLog for sci-visualization/opendx |
| 107 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 108 |
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.26 2012/02/15 10:24:29 xarthisius Exp $ |
| 109 |
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.27 2012/08/01 23:21:41 bicatali Exp $ |
| 110 |
+ |
| 111 |
+ 01 Aug 2012; Sébastien Fabbro <bicatali@g.o> |
| 112 |
+ +files/opendx-4.4.4-magick.patch, -files/20-opendx-revdep, |
| 113 |
+ opendx-4.4.4-r4.ebuild: |
| 114 |
+ Build for newer imagemagick and add possibility for graphicsmagick as well, |
| 115 |
+ fixing bug #314375. Keyword for x86-linux, switch to EAPI 4 |
| 116 |
|
| 117 |
15 Feb 2012; Kacper Kowalik <xarthisius@g.o> opendx-4.4.4-r4.ebuild: |
| 118 |
Add prefix love. Thanks to Richard Yao <ryao@×××××××××××××.edu> for the patch. |
| 119 |
@@ -217,4 +223,3 @@ |
| 120 |
opendx-4.3.2.ebuild: |
| 121 |
Initial commit to close #22217. Ebuild by myself and Patrick Kursawe |
| 122 |
<phosphan@g.o>. |
| 123 |
- |
Archives