aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Bissey <francois@vrooom.(none)>2009-05-11 23:28:50 +1200
committerFrançois Bissey <francois@vrooom.(none)>2009-05-11 23:31:44 +1200
commit47ae284d838d7ac5b63a8fbe4cc2324802044768 (patch)
treeb70848c0a2d163068362dacc19a43463ad17a088 /sci-visualization
parentfixed bug 266470 (diff)
downloadsci-47ae284d838d7ac5b63a8fbe4cc2324802044768.tar.gz
sci-47ae284d838d7ac5b63a8fbe4cc2324802044768.tar.bz2
sci-47ae284d838d7ac5b63a8fbe4cc2324802044768.zip
new revision of opendx and import of a new version of opendx-samples to cope with it.
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/opendx-samples/ChangeLog56
-rw-r--r--sci-visualization/opendx-samples/Manifest6
-rw-r--r--sci-visualization/opendx-samples/files/opendx-samples-4.4.0-install.patch515
-rw-r--r--sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch50
-rw-r--r--sci-visualization/opendx-samples/metadata.xml5
-rw-r--r--sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild46
-rw-r--r--sci-visualization/opendx/ChangeLog10
-rw-r--r--sci-visualization/opendx/Manifest7
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-install.patch330
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-xdg.patch26
-rw-r--r--sci-visualization/opendx/opendx-4.4.4-r1.ebuild3
-rw-r--r--sci-visualization/opendx/opendx-4.4.4-r2.ebuild100
12 files changed, 1150 insertions, 4 deletions
diff --git a/sci-visualization/opendx-samples/ChangeLog b/sci-visualization/opendx-samples/ChangeLog
new file mode 100644
index 000000000..f0cdfe6a2
--- /dev/null
+++ b/sci-visualization/opendx-samples/ChangeLog
@@ -0,0 +1,56 @@
+# ChangeLog for sci-visualization/opendx-samples
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx-samples/ChangeLog,v 1.8 2008/01/21 16:27:07 spock Exp $
+
+*opendx-samples-4.4.0-r1 (11 May 2009)
+
+ 11 May 2009; François Bissey <f.r.bissey@massey.ac.nz>
+ +opendx-samples-4.4.0-r1.ebuild,
+ +files/opendx-samples-4.4.0-install.patch,
+ +files/opendx-samples-4.4.0-nojava.patch, +metadata.xml:
+ initial import in the science overlay. Release needed to match the new
+ file location in opendx-4.4.4-r2. Got rid of the ugly installation hack
+ in favor of a (big) patch.
+
+*opendx-samples-4.4.0 (21 Jan 2008)
+
+ 21 Jan 2008; Michał Januszewski <spock@gentoo.org>
+ +opendx-samples-4.4.0.ebuild:
+ Version bump.
+
+ 22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
+ Redigest for Manifest2
+
+ 22 Apr 2006; Mark Loeser <halcy0n@gentoo.org> opendx-samples-4.3.2.ebuild:
+ Stable on x86; bug #129411
+
+ 10 Apr 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+ opendx-samples-4.3.2.ebuild:
+ stable on ppc (bug #129411)
+
+ 09 Apr 2006; Marcus D. Hanwell <cryos@gentoo.org>
+ opendx-samples-4.3.2.ebuild:
+ Stable on amd64.
+
+ 29 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org>
+ opendx-samples-4.3.2.ebuild:
+ Fix broken DEPEND from the move, bug 120870.
+
+ 29 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> +metadata.xml,
+ +opendx-samples-4.3.2.ebuild:
+ Moved from media-gfx/opendx-samples to sci-visualization/opendx-samples.
+
+ 15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org>
+ opendx-samples-4.3.2.ebuild:
+ Marked ~amd64, bug 118683.
+
+ 20 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+ opendx-samples-4.3.2.ebuild:
+ Added to ~ppc (#101951).
+
+*opendx-samples-4.3.2 (08 Aug 2005)
+
+ 08 Aug 2005; Patrick Kursawe <phosphan@gentoo.org>
+ +opendx-samples-4.3.2.ebuild:
+ Initial import, mainly provided in bug #22217 and demanded again in #54047.
+
diff --git a/sci-visualization/opendx-samples/Manifest b/sci-visualization/opendx-samples/Manifest
new file mode 100644
index 000000000..80f1f50bf
--- /dev/null
+++ b/sci-visualization/opendx-samples/Manifest
@@ -0,0 +1,6 @@
+AUX opendx-samples-4.4.0-install.patch 28807 RMD160 f46ede3e551d02738fcac8f027658a026409a251 SHA1 3e0b1ee5d8149f8a088a93a927197b58324ff1b0 SHA256 5a89c8eb378998b46dd1d1000bd2246d4802b95467a1472484ed805b7e7eda82
+AUX opendx-samples-4.4.0-nojava.patch 1744 RMD160 ee0b9eb8e24166c8012406f3dc6487eda6cf61b9 SHA1 83b67669460c4bf3f26f2902203b16e12e0b544d SHA256 c69345e77d3698719e315deeae68d3c033ed7f085c1785f573d4c66046a526ef
+DIST dxsamples-4.4.0.tar.gz 7791659 RMD160 3d5f09c48452374ec25099bd7a894859fe34fba9 SHA1 24a8981312c3a2564623acb85538d9935e5c2469 SHA256 ec2277facc8cf0f095a7fc4cb58391e053d5fd26c90d4711c927d2897dc455d9
+EBUILD opendx-samples-4.4.0-r1.ebuild 981 RMD160 5b9ad9ef5e84b228f484075b1952e84efe96e777 SHA1 05b77ca50130ee5d056ef32c6df7dee5529c53e3 SHA256 1144d2c0855c5e790f3361245dc8e2beba11bf77c3fa99978bea476140fcc973
+MISC ChangeLog 1942 RMD160 5983812639a0f202f882a58ab24ba67cf1d1f443 SHA1 4ba4319271134fe383b09bfa0510cd22e7414fc4 SHA256 de014562cc8e2458acceb9c86cd9094685685d096d18960f92140d29847df2fb
+MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-install.patch b/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-install.patch
new file mode 100644
index 000000000..833a6faf6
--- /dev/null
+++ b/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-install.patch
@@ -0,0 +1,515 @@
+--- dxsamples-4.4.0/supervise/simpledemo/Makefile.am.r 2003-06-19 16:55:12.000000000 +0200
++++ dxsamples-4.4.0/supervise/simpledemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -3,7 +3,7 @@
+
+ SUBDIRS = interactors
+
+-datadir = $(prefix)/dx/samples/supervise/simpledemo
++datadir = @libdir@/dx/samples/supervise/simpledemo
+
+ data_DATA = README demo demo.cfg demo.net
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/supervise/simpledemo/interactors/Makefile.am.r 2000-02-14 23:27:50.000000000 +0100
++++ dxsamples-4.4.0/supervise/simpledemo/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/supervise/simpledemo/interactors
++datadir = @libdir@/dx/samples/supervise/simpledemo/interactors
+
+ data_DATA = Makefile_alphax Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris interactors.c module_make Makefile
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/supervise/interactors/Makefile.am.r 2003-06-19 16:53:34.000000000 +0200
++++ dxsamples-4.4.0/supervise/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/supervise/interactors
++datadir = @libdir@/dx/samples/supervise/interactors
+
+ data_DATA = Makefile_alphax Makefile_aviion Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris Makefile_sun4 README myinteractors.c module_make Makefile
+
+--- dxsamples-4.4.0/supervise/mediumdemo/Makefile.am.r 2003-06-19 16:54:13.000000000 +0200
++++ dxsamples-4.4.0/supervise/mediumdemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -3,7 +3,7 @@
+
+ SUBDIRS = interactors
+
+-datadir = $(prefix)/dx/samples/supervise/mediumdemo
++datadir = @libdir@/dx/samples/supervise/mediumdemo
+
+ data_DATA = README demo
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/supervise/mediumdemo/interactors/Makefile.am.r 2000-02-01 21:33:38.000000000 +0100
++++ dxsamples-4.4.0/supervise/mediumdemo/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/supervise/mediumdemo/interactors
++datadir = @libdir@/dx/samples/supervise/mediumdemo/interactors
+
+ data_DATA = Makefile_alphax Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris interactors.c module_make Makefile
+
+--- dxsamples-4.4.0/supervise/imagedemo/Makefile.am.r 2003-06-19 16:51:48.000000000 +0200
++++ dxsamples-4.4.0/supervise/imagedemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/supervise/imagedemo
++datadir = @libdir@/dx/samples/supervise/imagedemo
+
+ data_DATA = README demo demo.cfg demo.net demo1 demo1.cfg demo1.net
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/supervise/complexdemo/Makefile.am.r 2003-06-19 16:50:04.000000000 +0200
++++ dxsamples-4.4.0/supervise/complexdemo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -3,7 +3,7 @@
+
+ SUBDIRS = data interactors nets
+
+-datadir = $(prefix)/dx/samples/supervise/complexdemo
++datadir = @libdir@/dx/samples/supervise/complexdemo
+
+ data_DATA = README demo
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/supervise/complexdemo/data/Makefile.am.r 1999-05-06 00:02:17.000000000 +0200
++++ dxsamples-4.4.0/supervise/complexdemo/data/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/supervise/complexdemo/data
++datadir = @libdir@/dx/samples/supervise/complexdemo/data
+
+ data_DATA = frags.dx
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/supervise/complexdemo/nets/Makefile.am.r 1999-05-06 00:02:17.000000000 +0200
++++ dxsamples-4.4.0/supervise/complexdemo/nets/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/supervise/complexdemo/nets
++datadir = @libdir@/dx/samples/supervise/complexdemo/nets
+
+ data_DATA = ShowSelected.net hiliteObject.net peruDX.cfg peruDX.net
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/supervise/complexdemo/interactors/Makefile.am.r 2000-02-01 21:33:35.000000000 +0100
++++ dxsamples-4.4.0/supervise/complexdemo/interactors/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/supervise/complexdemo/interactors
++datadir = @libdir@/dx/samples/supervise/complexdemo/interactors
+
+ data_DATA = Makefile_alphax Makefile_hp700 Makefile_ibm6000 Makefile_sgi Makefile_solaris interactors.c module_make Makefile
+
+--- dxsamples-4.4.0/data/Makefile.am.r 2003-06-19 07:09:12.000000000 +0200
++++ dxsamples-4.4.0/data/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/data
++datadir = @libdir@/dx/samples/data
+
+-data_DATA = 2D2ormorevarnotseries.data 2D2ormorevarnotseries.general 3D2ormorevarnotseries.data 3D2ormorevarnotseries.general CO2.general CO2.lis CO2fragment.lis FacesLoopsEdges.dx FacesLoopsEdges_hole.dx MOS_key.txt MOS_lookup.txt MOS_state_order.txt MOS_states.dx MOS_zips.dx MRI.data Polylines.dx ROM_ozone.dx README background.tiff block_example.data block_example.general blue_yellow.cm categorical.data categorical.data1 census.general census.spreadsheet census.tab census_normalized.dx cloudwater.dx colo_elev.general colorado.tiff colorado_elev.vit cyan_red.cm cylinder.rgb cylinder.size cylinder.tiff datadepconnections.dx datawithattribute.dx deformedregular.dx dx_logo.gif dx_logo2.tif dx_logo.tiff external.data externalfilter externalfilter.c externalfilter_alphax externalfilter_hp700 externalfilter_ibm6000 externalfilter_sgi externalfilter_solaris fontlayout.dx general.exampledata general.exampleheader griddeddata.data grocery.txt group.dx head_slice.dx heat.cm homeown.txt hyper.dx image.dx image.general imide.rgb imide.size imide_potential.dx invalid_field.bin invalid_field.dx irregirreg2.bin irregirreg2.dx irregular.dx labelled_series.dx labels.dx magnetism.dx majority.data mixed_freq.cm mri.general multigrid1.dx multigrid2.dx multigrid3.dx npp.dx oriented_labels.dx pos_conn.data product1.dx product2.dx rain.cm rainwater.dx record_datafile record_deformed record_deformed.general record_depconnections record_depconnections.general record_multiscalar record_multiscalar.general record_multiscalardepconn record_multiscalardepconn.general record_multiscalarmixed record_multiscalarmixed.general record_scalar record_scalar.general record_scalarvector1 record_scalarvector1.general record_scalarvector2 record_scalarvector2.general record_scattered.general record_series record_series.general record_vectordata1 record_vectordata1.general record_vectordata2 record_vectordata2.general record_withheader record_withheader.general regseries.dx regular.dx regularskewed.dx salesdata.data salesdata.txt sampletext.dx segmented_black-red.cm segmented_green-white.cm segmented_high-freq.cm segmented_hue.cm segmented_low-freq.cm series.dx seriesdata.dx solid.dx southeastern_topo.dx spreadsheet_2var spreadsheet_2var.general spreadsheet_deformed spreadsheet_deformed.general spreadsheet_layout.general spreadsheet_scattered.general spreadsheet_series.general storm_data.dx temp_wind.general temp_wind.lis temperature.dx test.hdf topo_one_deg.dx topography_km-gray.cm topography_km.cm topography_m-gray.cm topography_m.cm velocity.dx violet_to_white.cm watermolecule.dx wind.dx windbarbs.dx windbarbsdata.dx zipcode.data
++data_DATA = 2D2ormorevarnotseries.data 2D2ormorevarnotseries.general 3D2ormorevarnotseries.data 3D2ormorevarnotseries.general CO2.general CO2.lis CO2fragment.lis FacesLoopsEdges.dx FacesLoopsEdges_hole.dx MOS_key.txt MOS_lookup.txt MOS_state_order.txt MOS_states.dx MOS_zips.dx MRI.data Polylines.dx ROM_ozone.dx README background.tiff block_example.data block_example.general blue_yellow.cm categorical.data categorical.data1 census.general census.spreadsheet census.tab census_normalized.dx cloudwater.dx colo_elev.general colorado.tiff colorado_elev.vit cyan_red.cm cylinder.rgb cylinder.size cylinder.tiff datadepconnections.dx datawithattribute.dx deformedregular.dx dx_logo.gif dx_logo2.tif dx_logo.tiff external.data externalfilter.c fontlayout.dx general.exampledata general.exampleheader griddeddata.data grocery.txt group.dx head_slice.dx heat.cm homeown.txt hyper.dx image.dx image.general imide.rgb imide.size imide_potential.dx invalid_field.bin invalid_field.dx irregirreg2.bin irregirreg2.dx irregular.dx labelled_series.dx labels.dx magnetism.dx majority.data mixed_freq.cm mri.general multigrid1.dx multigrid2.dx multigrid3.dx npp.dx oriented_labels.dx pos_conn.data product1.dx product2.dx rain.cm rainwater.dx record_datafile record_deformed record_deformed.general record_depconnections record_depconnections.general record_multiscalar record_multiscalar.general record_multiscalardepconn record_multiscalardepconn.general record_multiscalarmixed record_multiscalarmixed.general record_scalar record_scalar.general record_scalarvector1 record_scalarvector1.general record_scalarvector2 record_scalarvector2.general record_scattered.general record_series record_series.general record_vectordata1 record_vectordata1.general record_vectordata2 record_vectordata2.general record_withheader record_withheader.general regseries.dx regular.dx regularskewed.dx salesdata.data salesdata.txt sampletext.dx segmented_black-red.cm segmented_green-white.cm segmented_high-freq.cm segmented_hue.cm segmented_low-freq.cm series.dx seriesdata.dx solid.dx southeastern_topo.dx spreadsheet_2var spreadsheet_2var.general spreadsheet_deformed spreadsheet_deformed.general spreadsheet_layout.general spreadsheet_scattered.general spreadsheet_series.general storm_data.dx temp_wind.general temp_wind.lis temperature.dx test.hdf topo_one_deg.dx topography_km-gray.cm topography_km.cm topography_m-gray.cm topography_m.cm velocity.dx violet_to_white.cm watermolecule.dx wind.dx windbarbs.dx windbarbsdata.dx zipcode.data
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/programs/SIMPLE/Makefile.am.r 2004-04-26 23:43:18.000000000 +0200
++++ dxsamples-4.4.0/programs/SIMPLE/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/SIMPLE
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/SIMPLE
+
+ LINKLIST = \
+ Arrange.cfg\
+--- dxsamples-4.4.0/programs/SCATTERED/Makefile.am.r 2002-04-30 20:53:08.000000000 +0200
++++ dxsamples-4.4.0/programs/SCATTERED/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/SCATTERED
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/SCATTERED
+
+ LINKLIST = \
+ AnnotationGlyphs.cfg\
+--- dxsamples-4.4.0/programs/Makefile.am.r 2004-04-26 23:42:18.000000000 +0200
++++ dxsamples-4.4.0/programs/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -6,7 +6,7 @@
+ IMAGE_PROCESSING IMPORTING INTERFACE_CONTROL LOOPING MISC PLOTTING \
+ PROBES RENDERING SCATTERED SEQUENCER SIMPLE SUPERVISE
+
+-datadir = $(prefix)/dx/samples/programs
++datadir = @libdir@/dx/samples/programs
+
+ data_DATA = $(DATA1) $(DATA2)
+
+--- dxsamples-4.4.0/programs/DATA_DRIVEN_INTERACTORS/Makefile.am.r 2002-04-30 20:53:22.000000000 +0200
++++ dxsamples-4.4.0/programs/DATA_DRIVEN_INTERACTORS/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/DATA_DRIVEN_INTERACTORS
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/DATA_DRIVEN_INTERACTORS
+
+ LINKLIST = \
+ DataDrivenInteractors.cfg\
+--- dxsamples-4.4.0/programs/LOOPING/Makefile.am.r 2002-04-30 20:53:17.000000000 +0200
++++ dxsamples-4.4.0/programs/LOOPING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/LOOPING
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/LOOPING
+
+ LINKLIST = \
+ Accumulate.cfg\
+--- dxsamples-4.4.0/programs/CATEGORICAL/Makefile.am.r 2002-04-30 20:53:24.000000000 +0200
++++ dxsamples-4.4.0/programs/CATEGORICAL/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/CATEGORICAL
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/CATEGORICAL
+
+ LINKLIST = \
+ Categorical.cfg\
+--- dxsamples-4.4.0/programs/SUPERVISE/Makefile.am.r 2002-04-30 20:53:01.000000000 +0200
++++ dxsamples-4.4.0/programs/SUPERVISE/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/SUPERVISE
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/SUPERVISE
+
+ LINKLIST = \
+ Image_wo_UI.cfg\
+--- dxsamples-4.4.0/programs/PROBES/Makefile.am.r 2002-04-30 20:53:11.000000000 +0200
++++ dxsamples-4.4.0/programs/PROBES/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/PROBES
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/PROBES
+
+ LINKLIST = \
+ PlotLine2.cfg\
+--- dxsamples-4.4.0/programs/ANNOTATION/Makefile.am.r 2002-04-30 20:53:25.000000000 +0200
++++ dxsamples-4.4.0/programs/ANNOTATION/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/ANNOTATION
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/ANNOTATION
+
+ LINKLIST = \
+ AnnotationGlyphs.cfg\
+--- dxsamples-4.4.0/programs/3D_DATA/Makefile.am.r 2002-04-30 20:53:26.000000000 +0200
++++ dxsamples-4.4.0/programs/3D_DATA/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/3D_DATA
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/3D_DATA
+
+ LINKLIST = \
+ AnnotationGlyphs.cfg\
+--- dxsamples-4.4.0/programs/IMAGE_PROCESSING/Makefile.am.r 2002-04-30 20:53:20.000000000 +0200
++++ dxsamples-4.4.0/programs/IMAGE_PROCESSING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/IMAGE_PROCESSING
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/IMAGE_PROCESSING
+
+ LINKLIST = \
+ FFT.cfg\
+--- dxsamples-4.4.0/programs/DEBUGGING/Makefile.am.r 2002-04-30 20:53:21.000000000 +0200
++++ dxsamples-4.4.0/programs/DEBUGGING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/DEBUGGING
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/DEBUGGING
+
+ LINKLIST = \
+ Verify.cfg\
+--- dxsamples-4.4.0/programs/COLORMAP_EDITOR/Makefile.am.r 2002-04-30 20:53:23.000000000 +0200
++++ dxsamples-4.4.0/programs/COLORMAP_EDITOR/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/COLORMAP_EDITOR
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/COLORMAP_EDITOR
+
+ LINKLIST = \
+ DataDrivenInteractors.cfg\
+--- dxsamples-4.4.0/programs/COMPUTE/Makefile.am.r 2002-04-30 20:53:23.000000000 +0200
++++ dxsamples-4.4.0/programs/COMPUTE/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/COMPUTE
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/COMPUTE
+
+ LINKLIST = \
+ Bounce.cfg\
+--- dxsamples-4.4.0/programs/RENDERING/Makefile.am.r 2002-04-30 20:53:10.000000000 +0200
++++ dxsamples-4.4.0/programs/RENDERING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/RENDERING
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/RENDERING
+
+ LINKLIST = \
+ FatLines.cfg\
+--- dxsamples-4.4.0/programs/2D_DATA/Makefile.am.r 2002-04-30 20:53:26.000000000 +0200
++++ dxsamples-4.4.0/programs/2D_DATA/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/2D_DATA
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/2D_DATA
+
+ LINKLIST = \
+ AlternateVisualizations.cfg\
+--- dxsamples-4.4.0/programs/MISC/Makefile.am.r 2002-04-30 20:53:13.000000000 +0200
++++ dxsamples-4.4.0/programs/MISC/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/MISC
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/MISC
+
+ LINKLIST = \
+ CensusData.cfg\
+--- dxsamples-4.4.0/programs/SEQUENCER/Makefile.am.r 2002-04-30 20:53:07.000000000 +0200
++++ dxsamples-4.4.0/programs/SEQUENCER/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/SEQUENCER
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/SEQUENCER
+
+ LINKLIST = \
+ ContoursAndCaption.cfg\
+--- dxsamples-4.4.0/programs/PLOTTING/Makefile.am.r 2002-04-30 20:53:12.000000000 +0200
++++ dxsamples-4.4.0/programs/PLOTTING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/PLOTTING
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/PLOTTING
+
+ LINKLIST = \
+ Categorical.cfg\
+--- dxsamples-4.4.0/programs/DISTRIBUTED_PROCESSING/Makefile.am.r 2002-04-30 20:53:20.000000000 +0200
++++ dxsamples-4.4.0/programs/DISTRIBUTED_PROCESSING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/DISTRIBUTED_PROCESSING
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/DISTRIBUTED_PROCESSING
+
+ LINKLIST = \
+ Distributed.cfg\
+--- dxsamples-4.4.0/programs/INTERFACE_CONTROL/Makefile.am.r 2002-04-30 20:53:18.000000000 +0200
++++ dxsamples-4.4.0/programs/INTERFACE_CONTROL/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/INTERFACE_CONTROL
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/INTERFACE_CONTROL
+
+ LINKLIST = \
+ DialogStyle.cfg\
+--- dxsamples-4.4.0/programs/IMPORTING/Makefile.am.r 2002-04-30 20:53:19.000000000 +0200
++++ dxsamples-4.4.0/programs/IMPORTING/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-sampleprogdir = $(prefix)/dx/samples/programs/IMPORTING
++sampleprogdir = $(DESTDIR)@libdir@/dx/samples/programs/IMPORTING
+
+ LINKLIST = \
+ Categorical.cfg\
+--- dxsamples-4.4.0/dxlink/Makefile.am.r 2003-10-20 05:28:44.000000000 +0200
++++ dxsamples-4.4.0/dxlink/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/dxlink
++datadir = @libdir@/dx/samples/dxlink
+
+ data_DATA = CensusData150.rgb CensusData150.size Imide_potential150.rgb \
+ Imide_potential150.size Makefile_alphax Makefile_aviion Makefile_hp700 \
+--- dxsamples-4.4.0/scripts/Makefile.am.r 2003-06-19 16:58:07.000000000 +0200
++++ dxsamples-4.4.0/scripts/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/scripts
++datadir = @libdir@/dx/samples/scripts
+
+ data_DATA = AmbientLight Append Arrange Attribute AutoAxes AutoCamera AutoColor \
+ AutoGlyph AutoGrayScale Band Camera Caption ClipBox ClipPlane Collect \
+--- dxsamples-4.4.0/stereo/src/Makefile.am.r 2005-02-01 07:20:27.000000000 +0100
++++ dxsamples-4.4.0/stereo/src/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-datadir = $(prefix)/dx/samples/stereo/src
++datadir = @libdir@/dx/samples/stereo/src
+
+ data_DATA = mymodes.c mycams.c
+
+--- dxsamples-4.4.0/stereo/Makefile.am.r 2001-06-21 23:30:41.000000000 +0200
++++ dxsamples-4.4.0/stereo/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ SUBDIRS = src
+
+-datadir = $(prefix)/dx/samples/stereo
++datadir = @libdir@/dx/samples/stereo
+
+ data_DATA = StereoMacro.net StereoState.net TestStereo.cfg TestStereo.net stereo.html
+
+--- dxsamples-4.4.0/user/Makefile.am.r 2003-06-19 07:09:14.000000000 +0200
++++ dxsamples-4.4.0/user/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/user
++datadir = @libdir@/dx/samples/user
+
+ data_DATA = Makefile_inboard_alphax Makefile_inboard_aviion Makefile_inboard_hp700 Makefile_inboard_ibm6000 Makefile_inboard_ibmpvs Makefile_inboard_intelnt Makefile_inboard_sgi Makefile_inboard_solaris Makefile_inboard_sun4 Makefile_intelnt Makefile_loadable_alphax Makefile_loadable_hp700 Makefile_loadable_ibm6000 Makefile_loadable_intelnt Makefile_loadable_sgi Makefile_loadable_solaris Makefile_os2 Makefile_outboard_alphax Makefile_outboard_aviion Makefile_outboard_hp700 Makefile_outboard_ibm6000 Makefile_outboard_ibmpvs Makefile_outboard_intelnt Makefile_outboard_sgi Makefile_outboard_solaris Makefile_outboard_sun4 README add.c hello.c hello_loadable.mdf makex.c user_inboard.mdf user_loadable.mdf user_outboard.mdf
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/program_guide/Makefile.am.r 2005-02-01 07:19:50.000000000 +0100
++++ dxsamples-4.4.0/program_guide/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-datadir = $(prefix)/dx/samples/program_guide
++datadir = @libdir@/dx/samples/program_guide
+
+ data_DATA = README add.c add.cfg add.mb add.mdf add.net add2.c add2.cfg \
+ add2.mb add2.mdf add2.net add2_invalid.cfg add2_invalid.net \
+--- dxsamples-4.4.0/macros/Makefile.am.r 1999-05-06 00:02:05.000000000 +0200
++++ dxsamples-4.4.0/macros/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/macros
++datadir = @libdir@/dx/samples/macros
+
+ data_DATA = ArrangeMemberMacro.net AutoScaleMacro.net BandColorsMacro.net BarChartMacro.net CappedIsoMacro.net ClipSurfaceMacro.net ClipVolumeMacro.net ConvertColorNameListMacro.net DrapeMacro.net ExportVRML.net FactorialMacro.net FormatListMacro.net GetCategoricalLabelsMacro.net GetEventsMacro.net Image2Macro.net InsetImageMacro.net InterpolateCameraMacro.net InterpolatePositionsMacro.net KeyFrameCameraMacro.net MOS_statesMacro.net Make3DFieldMacro.net MakeLineMacro.net MapOnStatesMacro.net MatteMacro.net PickPlotMacro.net UnsquishGlyphMacro.net WindBarbsMacro.net
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/tutorial/Makefile.am.r 1999-05-06 00:02:19.000000000 +0200
++++ dxsamples-4.4.0/tutorial/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/tutorial
++datadir = @libdir@/dx/samples/tutorial
+
+ data_DATA = Animate.cfg Animate.net AutoColor.cfg AutoColor.net AutoColor2D.cfg AutoColor2D.net AutoGlyph2DScalar.cfg AutoGlyph2DScalar.net AutoGlyph2DVector.cfg AutoGlyph2DVector.net AutoGlyph3DScalar.cfg AutoGlyph3DScalar.net AutoGlyph3DVector.cfg AutoGlyph3DVector.net Caption.cfg Caption.net Color2D.cfg Color2D.net Compute.cfg Compute.net Connect.cfg Connect.net DataDrivenColormap.cfg DataDrivenColormap.net DataDrivenScalar.cfg DataDrivenScalar.net DataDrivenSelector.cfg DataDrivenSelector.net DataDrivenSequencer.cfg DataDrivenSequencer.net ImageProcessing.cfg ImageProcessing.net Isosurface2D.cfg Isosurface2D.net Isosurface3D.cfg Isosurface3D.net Map.cfg Map.net MapToPlane.cfg MapToPlane.net Plot.cfg Plot.net Regrid.cfg Regrid.net RubberSheet.cfg RubberSheet.net SampleMacro.net Slab.cfg Slab.net Streamlines2D.cfg Streamlines2D.net Streamlines3D.cfg Streamlines3D.net Switch.cfg Switch.net UseSampleMacro.cfg UseSampleMacro.net VolumeRendering.cfg VolumeRendering.net WarpedGrid.cfg WarpedGrid.net batch_script example.general example1.cfg example1.net external.data spreadsheet.data view_isosurfaces.cfg view_isosurfaces.net
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/outboard/Makefile.am.r 2004-05-25 00:21:27.000000000 +0200
++++ dxsamples-4.4.0/outboard/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/outboard
++datadir = @libdir@/dx/samples/outboard
+
+ data_DATA = Makefile_alphax Makefile_aviion Makefile_hp700 Makefile_ibm6000 Makefile_ibmpvs Makefile_intelnt Makefile_linux Makefile_os2 Makefile_sgi Makefile_solaris Makefile_sun4 README async.c async.mdf dummy.c hello.c hello.mdf makedata my_simulation.c socket.c watchfile.c watchfile.mdf watchsocket.c watchsocket.cfg watchsocket.mdf watchsocket.net
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/callmodule/Makefile.am.r 2005-02-01 07:19:17.000000000 +0100
++++ dxsamples-4.4.0/callmodule/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-datadir = $(prefix)/dx/samples/callmodule
++datadir = @libdir@/dx/samples/callmodule
+
+ data_DATA = README Simple.c ThunderStreamlines.c renderimage.c xapp_supervise.c
+
+--- dxsamples-4.4.0/util/Makefile.am.r 2002-11-11 05:55:54.000000000 +0100
++++ dxsamples-4.4.0/util/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -3,7 +3,7 @@
+
+ SUBDIRS = dxf fluent mpeg plot3d biorad-pic
+
+-datadir = $(prefix)/dx/samples/util
++datadir = @libdir@/dx/samples/util
+
+ data_DATA = Makefile.sample
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/util/fluent/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
++++ dxsamples-4.4.0/util/fluent/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/util/fluent
++datadir = @libdir@/dx/samples/util/fluent
+
+ data_DATA = Fluent2DX.c README
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/util/dxf/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
++++ dxsamples-4.4.0/util/dxf/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/util/dxf
++datadir = @libdir@/dx/samples/util/dxf
+
+ data_DATA = MANIFEST Makefile.sample README balloon.dxf colors.c common.c dx.c dxf.c dxf.h dxf_r12.txt entity.c entity.h header.c ignored.c output_funcs.c read.c snag_funcs.c table.c tree.c x29.dxf
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/util/plot3d/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
++++ dxsamples-4.4.0/util/plot3d/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/util/plot3d
++datadir = @libdir@/dx/samples/util/plot3d
+
+ data_DATA = Plot3DtoDX.c README
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/util/biorad-pic/Makefile.am.r 2002-11-11 05:55:35.000000000 +0100
++++ dxsamples-4.4.0/util/biorad-pic/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-datadir = $(prefix)/dx/samples/util/biorad-pic
++datadir = @libdir@/dx/samples/util/biorad-pic
+
+ data_DATA = PIC2dx.c README
+ EXTRA_DIST = $(data_DATA)
+--- dxsamples-4.4.0/util/mpeg/Makefile.am.r 1999-05-06 00:02:21.000000000 +0200
++++ dxsamples-4.4.0/util/mpeg/Makefile.am 2006-09-03 01:38:54.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
+
+-datadir = $(prefix)/dx/samples/util/mpeg
++datadir = @libdir@/dx/samples/util/mpeg
+
+ data_DATA = README default.param write_yuv.cfg write_yuv.net
+ EXTRA_DIST = $(data_DATA)
diff --git a/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch b/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch
new file mode 100644
index 000000000..984f84a10
--- /dev/null
+++ b/sci-visualization/opendx-samples/files/opendx-samples-4.4.0-nojava.patch
@@ -0,0 +1,50 @@
+--- dxsamples-4.4.0/Makefile.am.nojava 2002-01-28 21:53:08.000000000 +0100
++++ dxsamples-4.4.0/Makefile.am 2006-09-03 01:40:26.000000000 +0200
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-SUBDIRS = callmodule data dxlink java macros \
++SUBDIRS = callmodule data dxlink macros \
+ outboard program_guide programs scripts \
+ supervise tutorial user util stereo
+
+--- dxsamples-4.4.0/configure.ac-orig 2009-05-03 14:30:59.000000000 +1200
++++ dxsamples-4.4.0/configure.ac 2009-05-03 14:31:44.000000000 +1200
+@@ -25,11 +25,6 @@ AC_SUBST(RTL_LIBS)
+
+ SHELL=/bin/sh
+
+-AC_ARG_WITH(javadx,
+- [ --with-javadx enable JAVADX (default is yes)],
+- [with_javadx=$withval],
+- [with_javadx='yes'])
+-
+ AC_PROG_INSTALL
+ if test -z "$LN_S" ; then
+ AC_PROG_LN_S
+@@ -40,25 +35,8 @@ DX_GET_PREFIX
+ DX_GET_ARCH
+ DX_ARCH_SPECIFIC
+
+-MAKE_JAVADX_SAMPLES=""
+-if test "with_javadx" != 'no' ; then
+- failed=0;
+- passed=0;
+- DX_PROG_JAVAC(passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+- DX_PROG_JAR(passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+-
+- if test $failed -eq 0 ; then
+- DX_JAVADX_SETUP(passed=`expr $passed + 1`,failed=`expr $failed + 1`)
+- if test $failed -eq 0 ; then
+- MAKE_JAVADX_SAMPLES=samples
+- fi
+- fi
+-fi
+-
+ AC_OUTPUT( Makefile callmodule/Makefile callmodule/localmk \
+ data/Makefile dxlink/Makefile dxlink/dxlink_make \
+- java/samples/Makefile java/Makefile java/userdata/Makefile \
+- java/usermacros/Makefile java/nets/Makefile java/makes/Makefile \
+ macros/Makefile outboard/Makefile \
+ program_guide/Makefile program_guide/localmk program_guide/guidemake \
+ programs/2D_DATA/Makefile programs/3D_DATA/Makefile \
diff --git a/sci-visualization/opendx-samples/metadata.xml b/sci-visualization/opendx-samples/metadata.xml
new file mode 100644
index 000000000..b229aec85
--- /dev/null
+++ b/sci-visualization/opendx-samples/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+</pkgmetadata>
diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild
new file mode 100644
index 000000000..ab905cdd0
--- /dev/null
+++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils multilib autotools
+
+MY_PN="dxsamples"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Samples for IBM Data Explorer"
+HOMEPAGE="http://www.opendx.org/"
+SRC_URI="http://opendx.sdsc.edu/source/${MY_P}.tar.gz"
+LICENSE="IPL-1"
+SLOT="0"
+
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=sci-visualization/opendx-4.4.4-r2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+
+ epatch "${FILESDIR}/${P}-nojava.patch"
+# absolutely no javadx for now
+ epatch "${FILESDIR}/${P}-install.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf "--libdir=/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+}
+
+pkg_postinst() {
+ elog "This version of the opendx-samples ebuild is still under development."
+ elog "suggestions, comments and offer of help welcome"
+ elog "post a message in gentoo-science or pop up on irc on #gentoo-science"
+}
diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index a08eb49f9..633536444 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -1,7 +1,15 @@
# ChangeLog for sci-visualization/opendx
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.15 2008/09/14 11:25:38 spock Exp $
+*opendx-4.4.4-r2 (11 May 2009)
+
+ 11 May 2009; François Bissey <f.r.bissey@massey.ac.nz>
+ opendx-4.4.4-r1.ebuild, +opendx-4.4.4-r2.ebuild,
+ +files/opendx-4.4.4-install.patch, +files/opendx-4.4.4-xdg.patch:
+ small clean up in opendx-4.4.4-r1, in r2 new layout for the installation
+ and replaced call to netscape/lynx etc... with xdg-open
+
19 Apr 2009; François Bissey <f.r.bissey@massey.ac.nz>
+files/opendx-4.4.4-dx-errno.patch,
+files/opendx-4.4.4-gcc43-fedora.patch, +files/opendx-4.4.4-open.patch,
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index aecc45562..c05715ad6 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -3,10 +3,13 @@ AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c
AUX opendx-4.4.4-concurrent-make-fix.patch 1191 RMD160 3baec5669230df96def294192eea372e59303537 SHA1 ec7b128b46bbf897ffbf0f08a12d36fb499f7241 SHA256 5c1cdc25105815a944cde02550aa7196155be6c07ac4fe697e7ff2ee7d4a6d14
AUX opendx-4.4.4-dx-errno.patch 340 RMD160 39928c8d031394cf59dd6dd06d25f26cd56482b7 SHA1 7be653fb8303a49a5788dee27323192c2127d199 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4
AUX opendx-4.4.4-gcc43-fedora.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf24fb7030a SHA1 513a64535c04da9ab65db6b89318002171ef2e4c SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d
+AUX opendx-4.4.4-install.patch 11982 RMD160 2136aca79e909dc28cc18c6fd821014e777c96ea SHA1 7a86aec33dc1d23ab9700dcd6f8cb9d7d08c512d SHA256 75f9ee934b19f9f67fdbfd16b9d52fb692bb4db3d1a1fc8cc666c7ac5c5e447f
AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
AUX opendx-4.4.4-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403
+AUX opendx-4.4.4-xdg.patch 785 RMD160 ee1a8bce4a352c7bf3335f5e13bd81664f3fd7c3 SHA1 001cb1ee444631926b43857aac137ce2d9336ba2 SHA256 93e50b0da16f3d28c016fa95ee49530322e83f8527b45abd7415bb14365600c1
AUX opendx-compressed-man.patch 496 RMD160 670de4ea728a3f9b5c02f7950ce88c58d1073a7b SHA1 56dd8a6d9710264ae3b45358ad2eb48ad00d6d98 SHA256 2877bd95b592548c1a0a532b49131b84f5ab1077714ef16d768f3e33f50d6aab
DIST dx-4.4.4.tar.gz 9676049 RMD160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b SHA1 c8e4d72d169675c66acd2135599b211d80810f76 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff
-EBUILD opendx-4.4.4-r1.ebuild 2402 RMD160 b54251d75954388868f635d6562297dcc526e990 SHA1 4da39d1cb036bb3318b04f15f69f8d2d053a02ac SHA256 b76fd099f6df17bb236f9cd03c4c23e1f153a6c46b386aa9f95bda68d36138c5
-MISC ChangeLog 5171 RMD160 9ca08ef1bf644b71b8bbccdfcb317f0b35decdb6 SHA1 5be25579b9dae5d6c12a0b09eaae81d520ee1759 SHA256 b6e5b68124f5dbc33151045fc55f4291008ce898305ae9f6a6ebacdd007b112a
+EBUILD opendx-4.4.4-r1.ebuild 2403 RMD160 b3949b577be1888d71ea220e111da11fe59fa4d2 SHA1 6392a006d33e9205fbed11408a458c97c1a37360 SHA256 788ab5b20cd81b19b4c34cce650dac91a4eff4ea12a31b750cae08d527716203
+EBUILD opendx-4.4.4-r2.ebuild 2351 RMD160 98132fc06af505010e4bd32e3b39d44f218bd4de SHA1 9ef227620e29582575209fb491332d173d14f75a SHA256 9fb59baa21606b308716795d3292e60cc73935f3ee2deee529f41df326b8a507
+MISC ChangeLog 5935 RMD160 fefaec754a60713a3e43dc6c1fe3a04e4dcb224f SHA1 a972c58478143cf010b712e6c7c0cb7d00632c31 SHA256 e1118594f66d2f4a0d7a15a98c02122a98bb34b79ed2c98b2fa3ad440ee68c44
MISC metadata.xml 361 RMD160 404d4eb0602277959498f65685d76eb4350a470d SHA1 f683e24f437dc6a5254d2d4c814c48cfd7d3740e SHA256 1be0f8158e35295c498714d8ad1b780a6fc749bee37bdbb13ad9eb163bbf38f0
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-install.patch b/sci-visualization/opendx/files/opendx-4.4.4-install.patch
new file mode 100644
index 000000000..342f6f88b
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-install.patch
@@ -0,0 +1,330 @@
+diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in
+--- dx-4.4.4/bin/dx.in.r 2004-05-31 18:12:05.000000000 +0200
++++ dx-4.4.4/bin/dx.in 2009-01-26 23:57:11.000000000 +0100
+@@ -60,14 +60,7 @@ exit 1
+ #
+ longhelp() {
+
+-if test -f "$dxroot/man/catl/dx.l" ; then
+- more "$dxroot/man/catl/dx.l"
+-else
+- echo "cannot find $dxroot/man/catl/dx.l"
+- echo "set the DXROOT environment variable to the root of the"
+- echo "dx installation tree and try again."
+-fi
+-exit 1
++man dx
+
+ cat << EOFlonghelp
+ command line parameters:
+@@ -286,7 +279,7 @@ fi
+
+
+ if [ -z "$DXROOT" ]; then
+- prefix=@prefix@
++ prefix=@libdir@
+ DXROOT=$prefix/dx
+ fi
+ export DXROOT
+@@ -507,7 +507,7 @@ export DXARCH
+
+ # default to running locally, from @prefix@/dx
+ exhost=$thishost
+-dxroot=@prefix@/dx
++dxroot=@libdir@/dx
+ startup=1 # run the startup window by default
+
+
+diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am
+--- dx-4.4.4/bin/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/bin/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-dxbindir = $(prefix)/dx/bin
++dxbindir = $(libdir)/dx/bin
+ bindir = $(prefix)/bin
+
+ EXTRA_SCRIPTS = mdf2c dx
+diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in
+--- dx-4.4.4/bin/mdf2c.in.r 1999-12-14 05:13:04.000000000 +0100
++++ dx-4.4.4/bin/mdf2c.in 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # Configure is looking for the following line
+-prefix=@prefix@
++prefix=@libdir@
+ DFLTROOT=$prefix/dx
+ root=${DXROOT=${DXEXECROOT=$DFLTROOT}}
+
+diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am
+--- dx-4.4.4/doc/Makefile.am.r 1999-04-05 13:57:03.000000000 +0200
++++ dx-4.4.4/doc/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-docdir = $(prefix)/dx/doc
++docdir = $(datadir)/dx/doc
+
+ doc_DATA = \
+ README README_SMP README_alphax README_aviion README_hp700 \
+diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am
+--- dx-4.4.4/fonts/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/fonts/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-fontdir = $(prefix)/dx/fonts
++fontdir = $(libdir)/dx/fonts
+
+ font_DATA = \
+ README area.dx cyril_d.dx \
+diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am
+--- dx-4.4.4/help/Makefile.am.r 2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/help/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-helpdir = $(prefix)/dx/help
++helpdir = $(libdir)/dx/help
+
+ EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \
+ $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \
+diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am
+--- dx-4.4.4/html/images/Makefile.am.r 2002-04-01 10:51:13.000000000 +0200
++++ dx-4.4.4/html/images/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,5 +1,5 @@
+
+-imagesdir = $(prefix)/dx/html/images
++imagesdir = $(libdir)/dx/html/images
+
+ images1 = \
+ 3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif \
+diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am
+--- dx-4.4.4/html/Makefile.am.r 2003-07-12 02:11:39.000000000 +0200
++++ dx-4.4.4/html/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-htmldir = $(prefix)/dx/html
++htmldir = $(libdir)/dx/html
+
+ SUBDIRS = pages images
+
+diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am
+--- dx-4.4.4/html/pages/Makefile.am.r 2002-06-20 06:38:03.000000000 +0200
++++ dx-4.4.4/html/pages/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-pagesdir = $(prefix)/dx/html/pages
++pagesdir = $(libdir)/dx/html/pages
+
+ pages1 = \
+ insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
+diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am
+--- dx-4.4.4/include/dx/Makefile.am.r 1999-05-26 01:35:16.000000000 +0200
++++ dx-4.4.4/include/dx/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-dxincdir = $(prefix)/dx/include/dx
++dxincdir = $(prefix)/include/dx
+
+ dxinc_HEADERS = \
+ UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
+diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am
+--- dx-4.4.4/include/Makefile.am.r 2006-04-09 05:44:49.000000000 +0200
++++ dx-4.4.4/include/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-dxincdir = $(prefix)/dx/include
++dxincdir = $(prefix)/include
+ SUBDIRS = dx
+ dxinc_HEADERS = dxl.h dxstereo.h
+ nodist_dxinc_HEADERS = dxconfig.h
+diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am
+--- dx-4.4.4/lib/Makefile.am.r 2003-08-22 01:22:13.000000000 +0200
++++ dx-4.4.4/lib/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-libsdir = $(prefix)/dx/lib
++libsdir = $(libdir)/dx/lib
+
+ libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \
+ dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c
+diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am
+--- dx-4.4.4/man/Makefile.am.r 1999-04-03 18:31:28.000000000 +0200
++++ dx-4.4.4/man/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+
+-SUBDIRS = manl catl
++SUBDIRS = manl
+
+diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am
+--- dx-4.4.4/man/manl/Makefile.am.r 2002-05-20 06:47:06.000000000 +0200
++++ dx-4.4.4/man/manl/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-mandir = $(prefix)/dx/man
++mandir = $(prefix)/man
+
+ man_MANS = dx.l
+ EXTRA_DIST = $(man_MANS)
+diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am
+--- dx-4.4.4/src/exec/dxexec/Makefile.am.r 2006-01-11 17:24:39.000000000 +0100
++++ dx-4.4.4/src/exec/dxexec/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la
+ libDXEXEC_la_SOURCES = main.c
+ libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
+
+-bindir = $(prefix)/dx/bin_@ARCH@
++bindir = $(libdir)/dx/bin_@ARCH@
+ bin_PROGRAMS = dxexec
+
+ dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
+diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefile.am
+--- dx-4.4.4/src/exec/dxmods/Makefile.am.r 2003-08-19 00:51:10.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,8 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
+
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@
+
+-dxmdfdir = $(prefix)/dx/lib
++dxmdfdir = $(libdir)/dx/lib
+ noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la
+ SUFFIXES = .c .y .c .s .h .o
+
+@@ -13,6 +14,8 @@ DISTCLEANFILES = dx.mdf dxcm.mdf user.c
+
+ dxmdf_DATA = dx.mdf
+
++user.c: dx.mdf
++
+ _complex.o: _compparse.h
+
+ HEADERS1 = \
+diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am
+--- dx-4.4.4/src/exec/libdx/Makefile.am.r 2006-03-27 20:56:53.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+ #INCLUDES = -I../../../include -D@ARCH@
+ INCLUDES = -I${top_srcdir}/include -D@ARCH@
+
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+
+ noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la
+ #dxlib_LIBRARIES = libDXlite.a
+diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am
+--- dx-4.4.4/src/exec/Makefile.am.r 2003-09-17 00:40:40.000000000 +0200
++++ dx-4.4.4/src/exec/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ SUBDIRS = libdx dxmods hwrender dpexec dxexec
+
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+
+ MAJOR_VERSION=@MAJOR_VERSION@
+ MINOR_VERSION=@MINOR_VERSION@
+diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am
+--- dx-4.4.4/src/misc/Makefile.am.r 2003-07-12 02:12:13.000000000 +0200
++++ dx-4.4.4/src/misc/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR
+
+ dxbindir = $(prefix)/bin
+ noinst_PROGRAMS = dxlocal
+-archmakdir = $(prefix)/dx/lib_$(ARCH)
++archmakdir = $(libdir)/dx/lib_$(ARCH)
+ archmak_DATA = arch.mak
+
+ dxlocal_SOURCES = dx.c utils.c
+@@ -15,5 +15,5 @@ install-exec-local:
+ if test ! -z "@INSTALL_BIN_PROGRAM@" ; then \
+ $(mkinstalldirs) $(prefix)/bin ; \
+ $(INSTALL) dxlocal@EXEEXT@ \
+- $(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
++ $(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
+ fi
+diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am
+--- dx-4.4.4/src/uipp/dxl/Makefile.am.r 2003-07-12 02:12:16.000000000 +0200
++++ dx-4.4.4/src/uipp/dxl/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+
+ INCLUDES = -I${top_srcdir}/include -D@ARCH@
+
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+
+ noinst_HEADERS = \
+ dxlP.h \
+diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am
+--- dx-4.4.4/src/uipp/dxui/Makefile.am.r 2003-07-12 02:12:17.000000000 +0200
++++ dx-4.4.4/src/uipp/dxui/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@
+
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ dxbin_PROGRAMS = dxui
+
+
+diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am
+--- dx-4.4.4/src/uipp/mb/Makefile.am.r 2003-08-20 16:21:33.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@
+
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+
+ dxbin_PROGRAMS = builder
+
+diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am
+--- dx-4.4.4/src/uipp/prompter/Makefile.am.r 2003-11-04 05:20:14.000000000 +0100
++++ dx-4.4.4/src/uipp/prompter/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@
+
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+
+ dxbin_PROGRAMS = prompter
+
+diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am
+--- dx-4.4.4/src/uipp/startup/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
+
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+
+ dxbin_PROGRAMS = startupui
+
+diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am
+--- dx-4.4.4/src/uipp/tutor/Makefile.am.r 2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
+
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+
+ dxbin_PROGRAMS = tutor
+
+diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am
+--- dx-4.4.4/src/uipp/ui/Makefile.am.r 2001-04-12 16:29:02.000000000 +0200
++++ dx-4.4.4/src/uipp/ui/Makefile.am 2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-uidatadir = $(prefix)/dx/ui
++uidatadir = $(libdir)/dx/ui
+
+ DATA1 = \
+ icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
new file mode 100644
index 000000000..c5b38f274
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
@@ -0,0 +1,26 @@
+diff -up bin/url_handler.sh.orig bin/url_handler.sh
+--- bin/url_handler.sh.orig 2009-05-02 23:21:08.000000000 +1200
++++ bin/url_handler.sh 2009-05-02 23:24:25.000000000 +1200
+@@ -27,21 +27,7 @@ case $method in
+ mailto) mutt `echo "$url" | sed 's;^[^:]*:\(.*\);\1;'`
+ ;;
+
+- *) use_xbrowser=n
+- case "$DISPLAY" in
+- :0) use_xbrowser=y
+- ;;
+- :0.*) use_xbrowser=y
+- ;;
+- unix:0.*) use_xbrowser=y
+- ;;
+- esac
+- if [ $use_xbrowser = n ]; then
+- lynx "$url"
+- else
+- netscape -remote "openURL($url)" 2> /dev/null || \
+- (netscape "$url" &)
+- fi
++ *) xdg-open "$url"
+ ;;
+ esac
+
diff --git a/sci-visualization/opendx/opendx-4.4.4-r1.ebuild b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
index 9f1bfaf80..c87e01a3b 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
@@ -6,9 +6,10 @@
# Set SMP="yes" to force enable of SMP compilation.
# Otherwise it will be autodetected from /usr/src/linux.
+EAPI=2
+
inherit eutils flag-o-matic autotools
-EAPI=2
DESCRIPTION="A 3D data visualization tool"
HOMEPAGE="http://www.opendx.org/"
SRC_URI="http://opendx.sdsc.edu/source/${P/open}.tar.gz"
diff --git a/sci-visualization/opendx/opendx-4.4.4-r2.ebuild b/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
new file mode 100644
index 000000000..cb992117a
--- /dev/null
+++ b/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils flag-o-matic autotools multilib
+
+DESCRIPTION="A 3D data visualization tool"
+HOMEPAGE="http://www.opendx.org/"
+SRC_URI="http://opendx.sdsc.edu/source/${P/open}.tar.gz"
+
+LICENSE="IPL-1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="hdf cdf netcdf tiff imagemagick szip smp"
+
+DEPEND="x11-libs/libXmu
+ x11-libs/libXi
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/openmotif
+ szip? ( sci-libs/szip )
+ hdf? ( sci-libs/hdf )
+ cdf? ( sci-libs/cdf )
+ netcdf? ( sci-libs/netcdf )
+ tiff? ( media-libs/tiff )
+ imagemagick? ( >=media-gfx/imagemagick-5.3.4[-hdri] )"
+
+RDEPEND="${DEPEND}"
+# waiting on bug #36349 for media-libs/jasper in imagemagick
+
+S="${WORKDIR}/${P/open}"
+
+src_prepare() {
+
+ epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
+ epatch "${FILESDIR}/${P}-install.patch"
+ epatch "${FILESDIR}/${P}-xdg.patch"
+ epatch "${FILESDIR}/${P}-gcc43-fedora.patch"
+ epatch "${FILESDIR}/${P}-dx-errno.patch"
+ epatch "${FILESDIR}/${P}-libtool.patch"
+ epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
+ epatch "${FILESDIR}/${P}-open.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ # check flag filtering
+ # with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
+ append-flags -fno-strength-reduce
+
+ # (#82672)
+ filter-flags -finline-functions
+ replace-flags -O3 -O2
+
+ # opendx uses this variable
+ local GENTOOARCH="${ARCH}"
+ unset ARCH
+
+ local morelibs=""
+ use szip && morelibs="-lsz"
+ econf LIBS="${morelibs}" \
+ "--libdir=/usr/$(get_libdir)" \
+ "--with-x" \
+ "--without-javadx" \
+ $(use_with cdf) \
+ $(use_with netcdf) \
+ $(use_with hdf) \
+ $(use_with tiff) \
+ $(use_with imagemagick magick) \
+ $(use_enable smp smp-linux)
+
+ ARCH="${GENTOOARCH}"
+# javadx is currently broken. we may try to fix it someday.
+}
+
+src_compile() {
+ local GENTOOARCH="${ARCH}"
+ unset ARCH
+
+ emake || die
+ ARCH="${GENTOOARCH}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ newicon "src/uipp/ui/icon50.xpm" "${PN}.xpm"
+ make_desktop_entry dx "openDX" "${PN}.xpm" "DataVisualization;Education;Science;"
+}
+
+pkg_postinst() {
+ elog "This version of the opendx ebuild is still under development."
+ elog "suggestions, comments and offer of help welcome"
+ elog "post a message in gentoo-science or pop up on irc on #gentoo-science"
+}