Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
path: root/sci-visualization/opendx
diff options
context:
space:
mode:
Diffstat (limited to 'sci-visualization/opendx')
-rw-r--r--sci-visualization/opendx/ChangeLog140
-rw-r--r--sci-visualization/opendx/Manifest12
-rw-r--r--sci-visualization/opendx/files/20-opendx-revdep1
-rw-r--r--sci-visualization/opendx/files/dx-errno.patch11
-rw-r--r--sci-visualization/opendx/files/dx-gcc43-fedora.patch315
-rw-r--r--sci-visualization/opendx/files/dx-open.patch34
-rw-r--r--sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch23
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch33
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-libtool.patch11
-rw-r--r--sci-visualization/opendx/files/opendx-compressed-man.patch14
-rw-r--r--sci-visualization/opendx/metadata.xml11
-rw-r--r--sci-visualization/opendx/opendx-4.4.4-r1.ebuild137
12 files changed, 742 insertions, 0 deletions
diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
new file mode 100644
index 000000000..600558d2f
--- /dev/null
+++ b/sci-visualization/opendx/ChangeLog
@@ -0,0 +1,140 @@
+# ChangeLog for sci-visualization/opendx
+# Copyright 2000-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-r1 (17 Apr 2009)
+
+ 17 Apr 2009; François Bissey <f.r.bissey@massey.ac.nz>
+ +files/20-opendx-revdep, +files/opendx-4.3.2-sys.h.patch,
+ +files/opendx-4.4.4-concurrent-make-fix.patch,
+ +files/opendx-4.4.4-libtool.patch, +files/dx-errno.patch,
+ +files/dx-gcc43-fedora.patch, +files/dx-open.patch,
+ +files/opendx-compressed-man.patch, +metadata.xml,
+ +opendx-4.4.4-r1.ebuild:
+ Initial import in the overlay from the main tree. *port to EAPI2 *updated
+ gcc43 patch to upstream/fedora level *added an upstream patch to fix bug
+ #261438 *added a fedora patch to solve a problem dx use all CPU after
+ exiting *updated the source url to a working one
+
+ 14 Sep 2008; Michał Januszewski <spock@gentoo.org>
+ +files/opendx-4.4.4-concurrent-make-fix.patch, opendx-4.4.4.ebuild:
+ Fix concurrent make (bug #230535).
+
+ 06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+ Add USE flag description to metadata wrt GLEP 56.
+
+ 29 Jun 2008; Markus Dittrich <markusle@gentoo.org>
+ +files/opendx-4.4.4-libtool.patch, opendx-4.4.4.ebuild:
+ Added libtool-2.2* compatibility patch (fixes bug #229901).
+
+ 18 May 2008; Michał Januszewski <spock@gentoo.org>
+ +files/opendx-4.4.4-gcc43.patch, opendx-4.4.4.ebuild:
+ Add a patch to allow compilation with GCC 4.3.
+
+ 05 Apr 2008; Markus Dittrich <markusle@gentoo.org> opendx-4.3.2-r1.ebuild,
+ opendx-4.4.4.ebuild:
+ Need to call linux-info_pkg_setup to pick up the correct environment
+ variables (fixed bug #216243).
+
+ 26 Mar 2008; Markus Dittrich <markusle@gentoo.org> opendx-4.3.2-r1.ebuild,
+ opendx-4.4.4.ebuild:
+ Added check for imagemagick's hdri useflag which breaks compilation
+ (see bug #214058).
+
+ 28 Feb 2008; Markus Dittrich <markusle@gentoo.org>
+ +files/20-opendx-revdep, opendx-4.3.2-r1.ebuild, opendx-4.4.4.ebuild:
+ Added file to make revdep-rebuild aware of opendx binary paths
+ (see bug #211553).
+
+*opendx-4.4.4 (21 Jan 2008)
+
+ 21 Jan 2008; Michał Januszewski <spock@gentoo.org>
+ +files/opendx-compressed-man.patch, +opendx-4.4.4.ebuild:
+ Version bump.
+
+ 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+ opendx-4.3.2-r1.ebuild:
+ Drop virtual/x11 references.
+
+ 19 Jul 2007; Jeff Gardner <je_fro@gentoo.org>
+ +files/opendx-4.3.2-sys.h.patch, -files/opendx-sys.h.patch,
+ opendx-4.3.2-r1.ebuild:
+ Fix patch name.
+
+ 19 Jul 2007; Jeff Gardner <je_fro@gentoo.org> +files/opendx-sys.h.patch,
+ opendx-4.3.2-r1.ebuild:
+ Add patch to fix compilation with >=linux headers-2.6.19. See bug 185828.
+
+ 22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
+ Redigest for Manifest2
+
+ 09 Apr 2006; Marcus D. Hanwell <cryos@gentoo.org> -opendx-4.3.2.ebuild:
+ Prune old version.
+
+ 29 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> +metadata.xml,
+ +opendx-4.3.2.ebuild, +opendx-4.3.2-r1.ebuild:
+ Moved from media-gfx/opendx to sci-visualization/opendx.
+
+ 26 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+ opendx-4.3.2-r1.ebuild:
+ Stable on amd64, bug #118683
+
+ 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ opendx-4.3.2-r1.ebuild:
+ Add modular X dependencies.
+
+ 28 Aug 2005; Simon Stelling <blubb@gentoo.org> ChangeLog:
+ added ~amd64 keyword
+
+ 20 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+ opendx-4.3.2-r1.ebuild:
+ Stable on ppc (bug #101923).
+
+ 25 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ opendx-4.3.2-r1.ebuild:
+ Stable on x86.
+
+ 25 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ opendx-4.3.2-r1.ebuild:
+ Update to use linux-info.eclass and to check for SMP properly.
+
+ 24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ opendx-4.3.2-r1.ebuild:
+ (#82672) Filter -finline-functions and -O3.
+
+ 28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+ Dependency update: dev-libs/szip -> sci-libs/szip.
+
+ 28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+ Dependency update: dev-libs/szip -> sci-libs/szip.
+
+ 28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2-r1.ebuild:
+ Dependency update: dev-libs/szip -> sci-libs/szip.
+
+ 28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2.ebuild:
+ Dependency update: dev-libs/szip -> sci-libs/szip.
+
+ 28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2-r1.ebuild:
+ Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+ 28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> opendx-4.3.2.ebuild:
+ Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+*opendx-4.3.2-r1 (24 May 2004)
+
+ 24 May 2004; Patrick Kursawe <phosphan@gentoo.org> opendx-4.3.2-r1.ebuild:
+ Making szip dependency optional
+
+ 16 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> opendx-4.3.2.ebuild:
+ Fixing bug #44727 by adding szip as dependency.
+
+ 15 Mar 2004; David Holm <dholm@gentoo.org> opendx-4.3.2.ebuild:
+ Added to ~ppc.
+
+*opendx-4.3.2 (14 Mar 2004)
+
+ 14 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml,
+ opendx-4.3.2.ebuild:
+ Initial commit to close #22217. Ebuild by myself and Patrick Kursawe
+ <phosphan@gentoo.org>.
+
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
new file mode 100644
index 000000000..770014629
--- /dev/null
+++ b/sci-visualization/opendx/Manifest
@@ -0,0 +1,12 @@
+AUX 20-opendx-revdep 44 RMD160 9b68b96b8f513a78a51249c7705d93d665bb3d2b SHA1 9389ea70249fe8149a33944a07466dddc9c1ae8d SHA256 fa96c22f9e7870a60c27c02cceb6bb3782d40c07ac53f19d7be7941a12347a01
+AUX dx-errno.patch 340 RMD160 39928c8d031394cf59dd6dd06d25f26cd56482b7 SHA1 7be653fb8303a49a5788dee27323192c2127d199 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4
+AUX dx-gcc43-fedora.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf24fb7030a SHA1 513a64535c04da9ab65db6b89318002171ef2e4c SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d
+AUX dx-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403
+AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 SHA1 b4eed91d8ad2df57241a74d4ef8452ad0d171296 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b
+AUX opendx-4.4.4-concurrent-make-fix.patch 1191 RMD160 3baec5669230df96def294192eea372e59303537 SHA1 ec7b128b46bbf897ffbf0f08a12d36fb499f7241 SHA256 5c1cdc25105815a944cde02550aa7196155be6c07ac4fe697e7ff2ee7d4a6d14
+AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
+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 3415 RMD160 3896de2740bf726cd6234c3dfae79ba82460afe5 SHA1 b6630bd26ca841e41cd3d649db01e592e79555f0 SHA256 9e0883cdd2d840aebd00d0dfa20c721692c5df3f2db4b5a4b80c9781a4a645b0
+MISC ChangeLog 4503 RMD160 a5936dedee47edec43a4c906bfeef5e45ed78321 SHA1 5ef4938b5ec0cb2583783a057d62144c8365f8f9 SHA256 78390e2c9e9e72dab493e7686355eef72cf03e65dafcf7d59e8b3f0c83464fa1
+MISC metadata.xml 361 RMD160 404d4eb0602277959498f65685d76eb4350a470d SHA1 f683e24f437dc6a5254d2d4c814c48cfd7d3740e SHA256 1be0f8158e35295c498714d8ad1b780a6fc749bee37bdbb13ad9eb163bbf38f0
diff --git a/sci-visualization/opendx/files/20-opendx-revdep b/sci-visualization/opendx/files/20-opendx-revdep
new file mode 100644
index 000000000..f1d735116
--- /dev/null
+++ b/sci-visualization/opendx/files/20-opendx-revdep
@@ -0,0 +1 @@
+SEARCH_DIRS="/usr/dx/bin /usr/dx/bin_linux"
diff --git a/sci-visualization/opendx/files/dx-errno.patch b/sci-visualization/opendx/files/dx-errno.patch
new file mode 100644
index 000000000..70c1b28f0
--- /dev/null
+++ b/sci-visualization/opendx/files/dx-errno.patch
@@ -0,0 +1,11 @@
+diff -up dx-4.4.4/src/exec/dpexec/lex.c.errno dx-4.4.4/src/exec/dpexec/lex.c
+--- dx-4.4.4/src/exec/dpexec/lex.c.errno 2006-01-09 23:57:34.000000000 +0100
++++ dx-4.4.4/src/exec/dpexec/lex.c 2009-01-26 19:16:20.000000000 +0100
+@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp)
+ for (;;)
+ {
+ yyleng = 0;
++ errno = 0;
+
+ c = input();
+
diff --git a/sci-visualization/opendx/files/dx-gcc43-fedora.patch b/sci-visualization/opendx/files/dx-gcc43-fedora.patch
new file mode 100644
index 000000000..64a3d91fe
--- /dev/null
+++ b/sci-visualization/opendx/files/dx-gcc43-fedora.patch
@@ -0,0 +1,315 @@
+diff -up dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.C
+--- dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 2005-11-10 20:48:22.000000000 +0100
++++ dx-4.4.4/src/uipp/startup/StartupApplication.C 2008-01-07 21:55:03.000000000 +0100
+@@ -117,7 +117,7 @@ InitializeSignals(void)
+ #endif
+ }
+
+-boolean StartupApplication::initialize(unsigned int* argcp,
++boolean StartupApplication::initialize(int* argcp,
+ char** argv)
+ {
+ ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.h
+--- dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 2003-09-20 07:33:56.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/StartupApplication.h 2008-01-07 21:50:47.000000000 +0100
+@@ -84,7 +84,7 @@ class StartupApplication : public IBMApp
+ // Overrides the Application class version:
+ // Initializes Xt Intrinsics with option list (switches).
+ //
+- virtual boolean initialize(unsigned int* argcp, char**argv);
++ virtual boolean initialize(int* argcp, char**argv);
+
+ CommandScope *commandScope; // command scope
+
+diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C
+--- dx-4.4.4/src/uipp/startup/Main.C.gcc43 2000-05-16 20:53:07.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Main.C 2008-01-07 19:57:58.000000000 +0100
+@@ -14,7 +14,7 @@
+ extern "C" void HCLXmInit();
+ #endif
+
+-int main(unsigned int argc,
++int main( int argc,
+ char** argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C
+--- dx-4.4.4/src/uipp/base/Application.C.gcc43 2005-11-09 19:56:17.000000000 +0100
++++ dx-4.4.4/src/uipp/base/Application.C 2008-01-07 22:39:15.000000000 +0100
+@@ -136,7 +136,7 @@ void Application::installDefaultResource
+ //this->setDefaultResources(baseWidget, Application::DefaultResources);
+ }
+
+-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv)
++boolean Application::initializeWindowSystem(int *argcp, char **argv)
+ {
+
+ //
+@@ -149,7 +149,7 @@ boolean Application::initializeWindowSys
+ NULL, // command line options table
+ 0, // number of entries in options table
+ #if XtSpecificationRelease > 4
+- (int*)argcp,
++ argcp,
+ #else
+ argcp,
+ #endif
+@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys
+ return TRUE;
+ }
+
+-void Application::parseCommand(unsigned int* argcp, char** argv,
++void Application::parseCommand(int* argcp, char** argv,
+ XrmOptionDescList optlist, int optlistsize)
+ {
+ char res_file[256];
+@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned
+ //
+ }
+
+-boolean Application::initialize(unsigned int* argcp, char** argv)
++boolean Application::initialize(int* argcp, char** argv)
+ {
+ //
+ // Initialize the window system if not done already.
+diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h
+--- dx-4.4.4/src/uipp/base/Application.h.gcc43 2005-11-09 19:26:29.000000000 +0100
++++ dx-4.4.4/src/uipp/base/Application.h 2008-01-07 21:49:49.000000000 +0100
+@@ -49,7 +49,7 @@ class Application : public UIComponent,
+ //
+ // The main program needs to access protected member functions.
+ //
+- friend int main(unsigned int argc,
++ friend int main( int argc,
+ char** argv);
+
+
+@@ -71,9 +71,9 @@ class Application : public UIComponent,
+ //
+ // Initialize the window system.
+ //
+- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++ virtual boolean initializeWindowSystem(int *argcp, char **argv);
+
+- virtual void parseCommand(unsigned int* argcp, char** argv,
++ virtual void parseCommand(int* argcp, char** argv,
+ XrmOptionDescList optlist, int optlistsize);
+
+ //
+@@ -145,7 +145,7 @@ class Application : public UIComponent,
+ // Initializes any Application specfic state. This routine should
+ // be called by main() or subclasses only.
+ //
+- virtual boolean initialize(unsigned int* argcp, char** argv);
++ virtual boolean initialize(int* argcp, char** argv);
+
+ //
+ // Allow others to access our event processing mechanism
+diff -up dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.C
+--- dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 2004-04-02 22:32:43.000000000 +0200
++++ dx-4.4.4/src/uipp/base/IBMApplication.C 2008-01-07 21:53:29.000000000 +0100
+@@ -349,7 +349,7 @@ int status;
+ }
+
+
+-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
++boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
+ {
+
+ if (!this->Application::initializeWindowSystem(argcp, argv))
+@@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow
+ return TRUE;
+ }
+
+-boolean IBMApplication::initialize(unsigned int* argcp,
++boolean IBMApplication::initialize(int* argcp,
+ char** argv)
+ {
+ if (!this->Application::initialize(argcp,argv))
+diff -up dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.h
+--- dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 2003-09-20 07:35:22.000000000 +0200
++++ dx-4.4.4/src/uipp/base/IBMApplication.h 2008-01-07 21:50:19.000000000 +0100
+@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio
+ //
+ // Initialize the window system.
+ //
+- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++ virtual boolean initializeWindowSystem(int *argcp, char **argv);
+
+ //
+ // Protected member data:
+@@ -88,7 +88,7 @@ class IBMApplication : public Applicatio
+
+ HelpWin *helpWindow;
+
+- boolean initialize(unsigned int* argcp, char** argv);
++ boolean initialize(int* argcp, char** argv);
+
+ //
+ // Load application specific action routines
+diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.h
+--- dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 1999-05-10 17:46:30.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/TutorApplication.h 2008-01-07 21:49:29.000000000 +0100
+@@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli
+ // Overrides the Application class version:
+ // Initializes Xt Intrinsics with option list (switches).
+ //
+- virtual boolean initialize(unsigned int* argcp,
++ virtual boolean initialize(int* argcp,
+ char** argv);
+
+ //
+diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C
+--- dx-4.4.4/src/uipp/tutor/Main.C.gcc43 2000-05-16 20:53:15.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Main.C 2008-01-07 19:57:39.000000000 +0100
+@@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+
+-int main(unsigned int argc,
++int main( int argc,
+ char** argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.C
+--- dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 2006-05-08 18:20:14.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/TutorApplication.C 2008-01-07 21:56:09.000000000 +0100
+@@ -196,7 +196,7 @@ InitializeSignals(void)
+ #endif
+ }
+
+-boolean TutorApplication::initialize(unsigned int* argcp,
++boolean TutorApplication::initialize(int* argcp,
+ char** argv)
+ {
+ ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h
+--- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 2006-01-03 01:12:34.000000000 +0100
++++ dx-4.4.4/src/uipp/widgets/MultiText.h 2008-01-07 19:06:27.000000000 +0100
+@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM
+ #define XmNsmoothScroll "smoothScroll"
+ #define XmNwaitCursorCount "waitCursorCount"
+
+-#if !(defined(_Xm_h) || defined(XM_H))
++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
+ #define XmNmarginHeight "marginHeight"
+ #define XmNmarginWidth "marginWidth"
+ #define XmNwordWrap "wordWrap"
+@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM
+ #define XmCSmoothScroll "SmoothScroll"
+ #define XmCWaitCursorCount "WaitCursorCount"
+
+-#if !(defined(_Xm_h) || defined(XM_H))
++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
+ #define XmCMarginHeight "MarginHeight"
+ #define XmCMarginWidth "MarginWidth"
+ #define XmCWordWrap "WordWrap"
+diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C
+--- dx-4.4.4/src/uipp/dxui/Main.C.gcc43 2005-12-07 18:50:53.000000000 +0100
++++ dx-4.4.4/src/uipp/dxui/Main.C 2008-01-07 19:57:21.000000000 +0100
+@@ -48,7 +48,7 @@ extern unsigned long _etext;
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+
+-int main(unsigned int argc,
++int main( int argc,
+ char** argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.h
+--- dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 2003-09-20 07:33:21.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/GARApplication.h 2008-01-07 21:49:05.000000000 +0100
+@@ -129,7 +129,7 @@ class GARApplication : public IBMApplica
+ // Overrides the Application class version:
+ // Initializes Xt Intrinsics with option list (switches).
+ //
+- virtual boolean initialize(unsigned int* argcp,
++ virtual boolean initialize(int* argcp,
+ char** argv);
+
+ CommandScope *commandScope; // command scope
+diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C
+--- dx-4.4.4/src/uipp/prompter/Main.C.gcc43 2000-05-16 20:52:59.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/Main.C 2008-01-07 19:57:01.000000000 +0100
+@@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
+ #endif
+
+
+-int main(unsigned int argc,
++int main( int argc,
+ char** argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.C
+--- dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/GARApplication.C 2008-01-07 21:54:28.000000000 +0100
+@@ -198,7 +198,7 @@ InitializeSignals(void)
+ }
+ }
+
+-boolean GARApplication::initialize(unsigned int* argcp,
++boolean GARApplication::initialize(int* argcp,
+ char** argv)
+ {
+ ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.h
+--- dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 2006-05-08 18:20:10.000000000 +0200
++++ dx-4.4.4/src/uipp/dxuilib/DXApplication.h 2008-01-07 21:14:12.000000000 +0100
+@@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat
+ // Overrides the Application class version:
+ // Initializes Xt Intrinsics with option list (switches).
+ //
+- virtual boolean initialize(unsigned int* argcp,
++ virtual boolean initialize(int* argcp,
+ char** argv);
+
+ //
+diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.C
+--- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 2006-06-22 21:45:34.000000000 +0200
++++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C 2008-01-07 21:32:56.000000000 +0100
+@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour
+ this->setDefaultResources(baseWidget, _defaultDXResources);
+ this->IBMApplication::installDefaultResources(baseWidget);
+ }
+-boolean DXApplication::initialize(unsigned int* argcp,
++boolean DXApplication::initialize(int* argcp,
+ char** argv)
+ {
+ boolean wasSetBusy = FALSE;
+diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C
+--- dx-4.4.4/src/uipp/mb/Main.C.gcc43 2000-05-20 19:49:40.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Main.C 2008-01-07 19:56:41.000000000 +0100
+@@ -22,7 +22,7 @@ extern "C" void HCLXmInit();
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+
+-int main(unsigned int argc,
++int main( int argc,
+ char** argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.C
+--- dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/MBApplication.C 2008-01-07 21:51:15.000000000 +0100
+@@ -117,7 +117,7 @@ InitializeSignals(void)
+ #endif
+ }
+
+-boolean MBApplication::initialize(unsigned int* argcp,
++boolean MBApplication::initialize(int* argcp,
+ char** argv)
+ {
+ ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.h
+--- dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 1999-05-10 17:46:25.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/MBApplication.h 2008-01-07 21:48:38.000000000 +0100
+@@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat
+ // Overrides the Application class version:
+ // Initializes Xt Intrinsics with option list (switches).
+ //
+- virtual boolean initialize(unsigned int* argcp,
++ virtual boolean initialize(int* argcp,
+ char** argv);
+
+ static MBResource resource;
diff --git a/sci-visualization/opendx/files/dx-open.patch b/sci-visualization/opendx/files/dx-open.patch
new file mode 100644
index 000000000..b62ebd094
--- /dev/null
+++ b/sci-visualization/opendx/files/dx-open.patch
@@ -0,0 +1,34 @@
+diff -up dx-4.4.4/src/exec/libdx/fileio.c.open dx-4.4.4/src/exec/libdx/fileio.c
+--- dx-4.4.4/src/exec/libdx/fileio.c.open 2006-01-05 23:55:47.000000000 +0100
++++ dx-4.4.4/src/exec/libdx/fileio.c 2008-09-24 19:16:30.000000000 +0200
+@@ -263,7 +263,7 @@ Error _dxffile_open(char *name, int rw)
+ case 2:/* read/write */
+ fd = open(name, O_RDWR);
+ if (fd < 0) {
+- fd = open(name, O_WRONLY | O_CREAT);
++ fd = open(name, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+ if (fd < 0) {
+ DXSetError(ERROR_DATA_INVALID,
+ "can't open/create file '%s'", name);
+diff -up dx-4.4.4/src/exec/libdx/plock.c.open dx-4.4.4/src/exec/libdx/plock.c
+--- dx-4.4.4/src/exec/libdx/plock.c.open 2002-07-17 06:48:18.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/plock.c 2008-09-24 19:16:30.000000000 +0200
+@@ -37,7 +37,8 @@ struct seminfo *__buf; /* buffer fo
+
+ #define SEM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+ #define SHM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+-#define OPEN_FLAGS (O_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
++#define OPEN_FLAGS (O_CREAT)
++#define OPEN_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+ #define IS_MINE(a) (locks->_owner[a] == getpid())
+ #define SET_OWNER(a) (locks->_owner[a] = getpid())
+ #define CLEAR_OWNER(a) (locks->_owner[a] = 0)
+@@ -268,7 +269,7 @@ PLockInit()
+
+ if (stat(LOCKFILE, &statbuf))
+ {
+- int fd = open(LOCKFILE, OPEN_FLAGS);
++ int fd = open(LOCKFILE, OPEN_FLAGS, OPEN_MODE);
+ if (fd < 0)
+ {
+ fprintf(stderr, "initLocks: error accessing locks shared block: open\n");
diff --git a/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch b/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch
new file mode 100644
index 000000000..93bf18efb
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch
@@ -0,0 +1,23 @@
+diff -aurN dx-4.3.2-orig/configure.ac dx-4.3.2/configure.ac
+--- dx-4.3.2-orig/configure.ac 2007-07-19 00:59:55.000000000 -0500
++++ dx-4.3.2/configure.ac 2007-07-19 01:02:34.000000000 -0500
+@@ -1004,7 +1004,7 @@
+ Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \
+ Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \
+ gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \
+- linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
++ linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \
+ os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \
+ sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \
+ sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \
+diff -aurN dx-4.3.2-orig/src/exec/libdx/memory.c dx-4.3.2/src/exec/libdx/memory.c
+--- dx-4.3.2-orig/src/exec/libdx/memory.c 2007-07-19 00:59:54.000000000 -0500
++++ dx-4.3.2/src/exec/libdx/memory.c 2007-07-19 01:01:57.000000000 -0500
+@@ -66,7 +66,6 @@
+
+ #if linux
+ #include <linux/kernel.h>
+-#include <linux/sys.h>
+ #include <sys/sysinfo.h>
+ #endif
+
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
new file mode 100644
index 000000000..816b72c10
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
@@ -0,0 +1,33 @@
+diff -Nuarp dx-4.4.4-orig/src/exec/dxmods/local.mk dx-4.4.4/src/exec/dxmods/local.mk
+--- dx-4.4.4-orig/src/exec/dxmods/local.mk 2008-09-11 22:31:38.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/local.mk 2008-09-11 22:33:44.000000000 +0200
+@@ -14,15 +14,15 @@ user.c: dx.mdf
+
+ dxcm.mdf: ${srcdir}/dxmdf.src
+ -rm -f dxcm.mdf
+- cp ${srcdir}/dxmdf.src tmp.c
+- $(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
+- -rm -f tmp.c
++ cp ${srcdir}/dxmdf.src tmp-dxcm.c
++ $(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp-dxcm.c > dxcm.mdf
++ -rm -f tmp-dxcm.c
+
+ dx.mdf: ${srcdir}/dxmdf.src
+ echo MYINC: $(MYINC)
+ -rm -f dx.mdf
+- cp ${srcdir}/dxmdf.src tmp.c
+- $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
++ cp ${srcdir}/dxmdf.src tmp-dx.c
++ $(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp-dx.c > dx.mdf
+ @echo '/^ *$$/{' > stripl.sed
+ @echo 'N' >> stripl.sed
+ @echo '/^ *\\n *$$/D' >> stripl.sed
+@@ -30,7 +30,7 @@ dx.mdf: ${srcdir}/dxmdf.src
+ cat dx.mdf |sed '/^#/d' > tmp.mdf
+ cat tmp.mdf |sed -f stripl.sed > dx.mdf
+ @rm -f stripl.sed tmp.mdf
+- -rm -f tmp.c
++ -rm -f tmp-dx.c
+
+ .y.h:
+ $(YACC) $(YFLAGS) -d ${srcdir}/$*.y
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch b/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch
new file mode 100644
index 000000000..2a5aad6d4
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch
@@ -0,0 +1,11 @@
+diff -Naur dx-4.4.4/configure.ac dx-4.4.4.new/configure.ac
+--- dx-4.4.4/configure.ac 2006-08-21 17:56:08.000000000 -0400
++++ dx-4.4.4.new/configure.ac 2008-06-29 07:31:08.000000000 -0400
+@@ -10,6 +10,7 @@
+ AM_INIT_AUTOMAKE
+ AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
++AC_PROG_CXX
+
+ VERSION_STRING="04.4.4000"
+ MAJOR_VERSION=4
diff --git a/sci-visualization/opendx/files/opendx-compressed-man.patch b/sci-visualization/opendx/files/opendx-compressed-man.patch
new file mode 100644
index 000000000..c7535ccb5
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-compressed-man.patch
@@ -0,0 +1,14 @@
+diff -Naurp dx-4.4.4-orig/bin/dx.in dx-4.4.4/bin/dx.in
+--- dx-4.4.4-orig/bin/dx.in 2008-01-21 17:04:51.000000000 +0100
++++ dx-4.4.4/bin/dx.in 2008-01-21 17:05:14.000000000 +0100
+@@ -60,8 +60,8 @@ exit 1
+ #
+ longhelp() {
+
+-if test -f "$dxroot/man/catl/dx.l" ; then
+- more "$dxroot/man/catl/dx.l"
++if test -f "$dxroot"/man/catl/dx.l* ; then
++ man "$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"
diff --git a/sci-visualization/opendx/metadata.xml b/sci-visualization/opendx/metadata.xml
new file mode 100644
index 000000000..016c1159b
--- /dev/null
+++ b/sci-visualization/opendx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<use>
+ <flag name='cdf'>Add support for <pkg>sci-libs/cdf</pkg> data exchange
+ format</flag>
+ <flag name='hdf'>Add support for the Hierarchical Data Format
+ (<pkg>sci-libs/hdf</pkg>)</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-visualization/opendx/opendx-4.4.4-r1.ebuild b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
new file mode 100644
index 000000000..95e6fd4ac
--- /dev/null
+++ b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Set SMP="no" to force disable of SMP compilation.
+# Set SMP="yes" to force enable of SMP compilation.
+# Otherwise it will be autodetected from /usr/src/linux.
+
+inherit eutils flag-o-matic linux-info 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"
+
+# There are a few jar files that can be added to enhance JX.
+# These are java40.jar from the Netscape libraries
+# (we've provided them in the OpenDX.org lib area) nscosmop211.jar
+# from the Cosmo Player libs.
+# http://opendx.npaci.edu/libs/
+#SRC_URI="${SRC_URI}
+# http://opendx.npaci.edu/libs/netscape-java40.tar.gz
+# http://opendx.npaci.edu/libs/cosmoplayer-jar.tar.gz"
+
+LICENSE="IPL-1"
+SLOT="0"
+# Should work on x86, ppc, alpha at least
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="hdf cdf netcdf tiff imagemagick szip" # java doc"
+
+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
+# java support gives some trouble - deprecated api and other unresolved symbols
+# java? ( virtual/jdk
+# dev-java/java-config )"
+
+S="${WORKDIR}/${P/open}"
+
+smp() {
+ has "$1" "${SMP}"
+}
+
+smp_check() {
+ linux_chkconfig_present SMP
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+
+ epatch "${FILESDIR}"/${PN}-4.3.2-sys.h.patch || die "Failed to apply sys.h patch."
+ epatch "${FILESDIR}/${PN}-compressed-man.patch"
+ epatch "${FILESDIR}/dx-gcc43-fedora.patch"
+ epatch "${FILESDIR}/dx-errno.patch"
+ epatch "${FILESDIR}/${P}-libtool.patch"
+ epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
+ epatch "${FILESDIR}/dx-open.patch"
+
+ eautoreconf || die "Failed running eautoreconf."
+}
+
+src_compile() {
+
+ local myconf="--with-x \
+ --host=${CHOST}"
+
+ # Check for SMP
+ # This needs to be done for /usr/src/linux, NOT the running kernel
+ # Allow override using smp().
+ if smp no
+ then
+ myconf="${myconf} --disable-smp-linux"
+ einfo "Disabling SMP capabilities"
+ elif smp yes || smp_check
+ then
+ myconf="${myconf} --enable-smp-linux"
+ einfo "Enabling SMP capabilities"
+ else
+ myconf="${myconf} --disable-smp-linux"
+ einfo "Disabling SMP capabilities"
+ fi
+
+ # 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"
+ # use java && myconf="${myconf} JNIPATH=$(java-config -O)/include:$(java-config -O)/include/linux"
+ econf LIBS="${morelibs}" \
+ `use_with cdf` \
+ `use_with netcdf` \
+ `use_with hdf` \
+ `use_with tiff` \
+ `use_with imagemagick magick` \
+ ${myconf} || die
+
+ # `use_with java javadx`
+ # This is broken
+ # `use_enable doc installhtml`
+
+ emake || die
+ ARCH="${GENTOOARCH}"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die
+
+ echo "MANPATH=/usr/dx/man" > 50opendx
+ doenvd 50opendx
+
+ # inform revdep-rebuild about binary locations
+ insinto /etc/revdep-rebuild
+ doins "${FILESDIR}"/20-${PN}-revdep
+}