From 7eaf3b361c8be11648f9b7dba7844b2170e76b84 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Thu, 3 Dec 2009 20:13:52 +0000 Subject: Revision bump for the install paths according to bug #295395. Thanks Francois Bissey to follow-up (Portage version: 2.2_rc54/cvs/Linux x86_64) --- sci-visualization/opendx/ChangeLog | 10 +- .../opendx/files/opendx-4.4.4-installpaths.patch | 200 ++++----------------- sci-visualization/opendx/opendx-4.4.4-r3.ebuild | 81 --------- sci-visualization/opendx/opendx-4.4.4-r4.ebuild | 81 +++++++++ 4 files changed, 125 insertions(+), 247 deletions(-) delete mode 100644 sci-visualization/opendx/opendx-4.4.4-r3.ebuild create mode 100644 sci-visualization/opendx/opendx-4.4.4-r4.ebuild (limited to 'sci-visualization/opendx') diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog index 9563f9671f8d..ebc09b8f7326 100644 --- a/sci-visualization/opendx/ChangeLog +++ b/sci-visualization/opendx/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-visualization/opendx # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.17 2009/11/27 18:17:00 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.18 2009/12/03 20:13:51 bicatali Exp $ + +*opendx-4.4.4-r4 (03 Dec 2009) + + 03 Dec 2009; Sébastien Fabbro + -opendx-4.4.4-r3.ebuild, +opendx-4.4.4-r4.ebuild, + files/opendx-4.4.4-installpaths.patch: + Revision bump for the install paths according to bug #295395. Thanks + Francois Bissey to follow-up *opendx-4.4.4-r3 (27 Nov 2009) diff --git a/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch b/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch index a6b6d2ad38be..3c0b6d9a899c 100644 --- a/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch +++ b/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch @@ -1,6 +1,6 @@ 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-11-06 11:47:32.190944177 +0100 ++++ dx-4.4.4/bin/dx.in 2009-01-26 23:57:11.000000000 +0100 @@ -60,14 +60,7 @@ exit 1 # longhelp() { @@ -22,92 +22,22 @@ diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in if [ -z "$DXROOT" ]; then - prefix=@prefix@ -+ prefix=@datadir@ ++ prefix=@libdir@ DXROOT=$prefix/dx fi export DXROOT -@@ -298,6 +291,13 @@ if [ -z "$DXDATA" ]; then - fi - fi - -+if [ -z "$DXFONTS" ]; then -+ DXFONTS=$DXROOT/fonts -+ if [ -d "$DXFONTS" ]; then -+ export DXFONTS -+ fi -+fi -+ - # if DXMACROS not set, default it to the usual unless dir doesn't exist - if [ -z "$DXMACROS" ]; then - DXMACROS=$DXROOT/samples/macros @@ -507,7 +507,7 @@ export DXARCH # default to running locally, from @prefix@/dx exhost=$thishost -dxroot=@prefix@/dx -+dxroot=@datadir@/dx ++dxroot=@libdir@/dx startup=1 # run the startup window by default -@@ -1469,8 +1469,8 @@ done - - # Now set some needed results - --dxexroot=$dxroot --dxuiroot=$dxroot -+dxexroot=@libdir@/dx -+dxuiroot=@libdir@/dx - dxexecdef="$dxexroot/bin_${exarch}/dxexec" - if test -z "$dxexec" ; then - dxexec=$dxexecdef -@@ -1600,7 +1600,7 @@ fi - # - if test $tutor -eq 1 ; then - -- cmd="$DXROOT/bin_${uiarch}/tutor" -+ cmd="$DXEXECROOT/bin_${uiarch}/tutor" - if test $seecomline -eq 1 ; then - set - echo "$echoparms exec $cmd $xparms" -@@ -1619,7 +1619,7 @@ if test $prompter -eq 1 ; then - prompterflags="$prompterflags -file \"$FileName\"" - fi - -- cmd="$DXROOT/bin_${uiarch}/prompter" -+ cmd="$DXEXECROOT/bin_${uiarch}/prompter" - if test $seecomline -eq 1 ; then - set - echo "$echoparms exec $cmd $prompterflags $xparms" -@@ -1635,7 +1635,7 @@ fi - if test $startup -eq 1 ; then - - -- cmd="$DXROOT/bin_${uiarch}/startupui" -+ cmd="$DXEXECROOT/bin_${uiarch}/startupui" - if test $seecomline -eq 1 ; then - set - echo "$echoparms exec $cmd $xparms $*" -@@ -1649,7 +1649,7 @@ fi - # - if test $builder -eq 1 ; then - -- cmd="$DXROOT/bin_${uiarch}/builder" -+ cmd="$DXEXECROOT/bin_${uiarch}/builder" - if test $seecomline -eq 1 ; then - set - echo "exec $cmd $xparms $motifcmd $motifbind $FileName" -@@ -1674,7 +1674,7 @@ if test $encoder -eq 1 ; then - EncodedBase="${Base}-e" - - echo "Creating encoded version of $FileName in ${EncodedBase}.net " -- cmd1="$DXROOT/bin_${uiarch}/dxencode" -+ cmd1="$DXEXECROOT/bin_${uiarch}/dxencode" - if test -f $CfgName ; then - echo "Copying $CfgName to ${EncodedBase}.cfg" - cmd2="cp $CfgName ${EncodedBase}.cfg" 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-11-06 11:47:32.192943219 +0100 ++++ 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 @@ -118,18 +48,18 @@ diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am 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-11-06 11:47:32.194943239 +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=@datadir@ ++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-11-06 11:47:32.203697175 +0100 ++++ 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 @@ -140,76 +70,59 @@ diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am 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-11-06 11:47:32.204697430 +0100 ++++ 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 = $(datadir)/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-11-06 11:47:32.206696961 +0100 ++++ 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 = $(datadir)/dx/help ++helpdir = $(libdir)/dx/help EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5) \ $(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10) \ -@@ -257,7 +257,7 @@ install-data-hook: - $(LN_S) hlpalhtl svsmstrh ; \ - $(LN_S) hlpalhtl ugidx ; \ - $(LN_S) hlpalhtl usrefidx ; \ -- $(LN_S) HelpDir GarHelpDir ; \ -+ $(LN_S) HelpDir GARHelpDir ; \ - $(LN_S) HelpDir MBHelpDir ; \ - echo "cd $(DESTDIR)$(helpdir)" ; \ - echo "$(LN_S) hlpalhtl mbidx" ; \ -@@ -265,6 +265,6 @@ install-data-hook: - echo "$(LN_S) hlpalhtl svsmstrh" ; \ - echo "$(LN_S) hlpalhtl ugidx" ; \ - echo "$(LN_S) hlpalhtl usrefidx" ; \ -- echo "$(LN_S) HelpDir GarHelpDir" ; \ -+ echo "$(LN_S) HelpDir GARHelpDir" ; \ - echo "$(LN_S) HelpDir MBHelpDir" ) \ - ' 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-11-06 11:47:32.214944415 +0100 ++++ 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 = $(datadir)/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-11-06 11:47:32.216944434 +0100 ++++ 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 = $(datadir)/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-11-06 11:47:32.217945666 +0100 ++++ 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 = $(datadir)/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-11-06 11:47:32.222944494 +0100 ++++ 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 @@ -220,7 +133,7 @@ diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am 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-11-06 11:47:32.224942558 +0100 ++++ 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 @@ -229,16 +142,16 @@ diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am 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-11-06 11:47:32.225944279 +0100 ++++ dx-4.4.4/lib/Makefile.am 2009-01-26 23:57:11.000000000 +0100 @@ -1,4 +1,4 @@ -libsdir = $(prefix)/dx/lib -+libsdir = $(datadir)/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-11-06 11:47:32.227944298 +0100 ++++ 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 @@ -247,7 +160,7 @@ diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am 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-11-06 11:47:32.228944553 +0100 ++++ 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 @@ -258,7 +171,7 @@ diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am 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-11-06 11:47:32.229944807 +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) @@ -292,7 +205,7 @@ diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefil 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-11-06 11:47:32.234939235 +0100 ++++ 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@ @@ -304,7 +217,7 @@ diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile. #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-11-06 11:47:32.236940232 +0100 ++++ 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 @@ -315,7 +228,7 @@ diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am 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-11-06 11:47:32.236940232 +0100 ++++ 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 @@ -334,7 +247,7 @@ diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am 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-11-06 11:47:32.236940232 +0100 ++++ 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@ @@ -346,7 +259,7 @@ diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am 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-11-06 11:47:32.237940486 +0100 ++++ 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@ @@ -356,52 +269,9 @@ diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am dxbin_PROGRAMS = dxui -diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am ---- dx-4.4.4/src/uipp/java/Makefile.am.r 2006-03-27 20:06:09.000000000 +0200 -+++ dx-4.4.4/src/uipp/java/Makefile.am 2009-11-06 11:47:32.238939763 +0100 -@@ -27,12 +27,12 @@ - ## libtool and the -shrext flag to make this much more - ## portable. - --javadxdir = $(prefix)/dx/java/htmlpages -+javadxdir = $(libdir)/dx/java/htmlpages - javadx_DATA = dx.jar --javasrvdir = $(prefix)/dx/java/server/class -+javasrvdir = $(libdir)/dx/java/server/class - javasrv_DATA = server.jar - EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README --javalibdir = $(prefix)/dx/java/server/lib_@ARCH@ -+javalibdir = $(libdir)/dx/java/server/lib_@ARCH@ - - javalib_DATA = @ANYDX@ - SUBDIRS = server dx layout -diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/java/server/macros/Makefile.am ---- dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r 1999-07-09 21:25:13.000000000 +0200 -+++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am 2009-11-06 11:47:32.238939763 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --serverdatadir = $(prefix)/dx/java/server/dxmacros -+serverdatadir = $(libdir)/dx/java/server/dxmacros - - serverdata_DATA = $(MACRO_FILES) - -diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/server/Makefile.am ---- dx-4.4.4/src/uipp/java/server/Makefile.am.r 2001-05-21 16:47:39.000000000 +0200 -+++ dx-4.4.4/src/uipp/java/server/Makefile.am 2009-11-06 11:47:32.238939763 +0100 -@@ -1,6 +1,6 @@ --srvbindir = $(prefix)/dx/java/server/bin --srvoutputdir = $(prefix)/dx/java/output --userhtmldir = $(prefix)/dx/java/user -+srvbindir = $(libdir)/dx/java/server/bin -+srvoutputdir = $(libdir)/dx/java/output -+userhtmldir = $(libdir)/dx/java/user - # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes - # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files - srvrundir = $(srvbindir)/../class 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-11-06 11:47:32.239939528 +0100 ++++ 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@ @@ -413,7 +283,7 @@ diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am 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-11-06 11:47:32.239939528 +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@ @@ -425,7 +295,7 @@ diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Mak 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-11-06 11:47:32.240940272 +0100 ++++ 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@ @@ -437,7 +307,7 @@ diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makef 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-11-06 11:47:32.240940272 +0100 ++++ 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@ @@ -449,12 +319,12 @@ diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile. 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-11-06 11:47:32.240940272 +0100 ++++ 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 = $(datadir)/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/opendx-4.4.4-r3.ebuild b/sci-visualization/opendx/opendx-4.4.4-r3.ebuild deleted file mode 100644 index 0d38cb10ba81..000000000000 --- a/sci-visualization/opendx/opendx-4.4.4-r3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r3.ebuild,v 1.1 2009/11/27 18:17:00 bicatali Exp $ - -EAPI=2 - -inherit eutils flag-o-matic autotools - -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}-installpaths.patch" - epatch "${FILESDIR}/${P}-xdg.patch" - epatch "${FILESDIR}/${P}-gcc43.patch" - epatch "${FILESDIR}/${P}-dx-errno.patch" - epatch "${FILESDIR}/${P}-libtool.patch" - epatch "${FILESDIR}/${P}-concurrent-make-fix.patch" - epatch "${FILESDIR}/${P}-open.patch" - epatch "${FILESDIR}/${P}-szip.patch" - epatch "${FILESDIR}/${P}-null.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 - unset ARCH - - # javadx is currently broken. we may try to fix it someday. - econf \ - --libdir=/usr/$(get_libdir) \ - --with-x \ - --without-javadx \ - $(use_with szip szlib) \ - $(use_with cdf) \ - $(use_with netcdf) \ - $(use_with hdf) \ - $(use_with tiff) \ - $(use_with imagemagick magick) \ - $(use_enable smp smp-linux) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - newicon src/uipp/ui/icon50.xpm ${PN}.xpm - make_desktop_entry dx "Open Data Explorer" ${PN}.xpm -} diff --git a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild b/sci-visualization/opendx/opendx-4.4.4-r4.ebuild new file mode 100644 index 000000000000..f6caebf6864b --- /dev/null +++ b/sci-visualization/opendx/opendx-4.4.4-r4.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r4.ebuild,v 1.1 2009/12/03 20:13:51 bicatali Exp $ + +EAPI=2 + +inherit eutils flag-o-matic autotools + +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}-installpaths.patch" + epatch "${FILESDIR}/${P}-xdg.patch" + epatch "${FILESDIR}/${P}-gcc43.patch" + epatch "${FILESDIR}/${P}-dx-errno.patch" + epatch "${FILESDIR}/${P}-libtool.patch" + epatch "${FILESDIR}/${P}-concurrent-make-fix.patch" + epatch "${FILESDIR}/${P}-open.patch" + epatch "${FILESDIR}/${P}-szip.patch" + epatch "${FILESDIR}/${P}-null.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 + unset ARCH + + # javadx is currently broken. we may try to fix it someday. + econf \ + --libdir=/usr/$(get_libdir) \ + --with-x \ + --without-javadx \ + $(use_with szip szlib) \ + $(use_with cdf) \ + $(use_with netcdf) \ + $(use_with hdf) \ + $(use_with tiff) \ + $(use_with imagemagick magick) \ + $(use_enable smp smp-linux) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + newicon src/uipp/ui/icon50.xpm ${PN}.xpm + make_desktop_entry dx "Open Data Explorer" ${PN}.xpm +} -- cgit v1.2.3-65-gdbad