-octXXX *.info clean up for variants that don't exist

Remove flags and dependencies that only were applied to variants that are no longer present. Remove variant-control logic for flags and dependencies that apply to all variants that are present.
fink · Mar 15, 2018 · 04b3c16c0440cdeabea7db544cf5f46d11cda99a · 04b3c16
1 parent 6e58c5e
commit 04b3c16c0440cdeabea7db544cf5f46d11cda99a
diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/bioinfo-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/bioinfo-oct.info
@@ -21,8 +21,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1) 
  <<
 Depends: octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/civil-engineering-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/civil-engineering-oct.info
@@ -21,8 +21,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1)
 <<
 Depends: octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/dicom-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/dicom-oct.info
@@ -30,8 +30,7 @@ BuildDepends: <<
 <<
 Depends: <<
   octave%type_pkg[oct]-interpreter, 
-  gdcm%type_pkg[gdcm]-shlibs,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  gdcm%type_pkg[gdcm]-shlibs
 <<
 Conflicts: octave-forge
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/econometrics-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/econometrics-oct.info
@@ -45,14 +45,12 @@ BuildDepends: <<
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
   fftw3,
   fink-octave-scripts (>= 0.3.0-1),
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink (>=0.32)
  <<
-RuntimeDepends:   optim-oct%type_pkg[oct] | ( %type_pkg[oct] >> 305 ) optim-atlas-oct%type_pkg[oct] | ( %type_pkg[oct] >> 305 ) optim-ref-oct%type_pkg[oct]
+RuntimeDepends:   optim-oct%type_pkg[oct] | optim-atlas-oct%type_pkg[oct] | optim-ref-oct%type_pkg[oct]
 Depends: <<
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 Conflicts: octave-forge
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/engine-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/engine-oct.info
@@ -12,8 +12,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1) 
  <<
 Depends: octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/fenv-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/fenv-oct.info
@@ -28,13 +28,11 @@ License: GPL3
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1)
  <<
 Depends: <<
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 Conflicts: octave-forge
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/financial-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/financial-oct.info
@@ -77,15 +77,12 @@ License: GPL3+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9, 
+  hdf5.9, 
   fink (>=0.32),
   fink-octave-scripts (>= 0.3.0-1)
 <<
 RuntimeDepends: <<
-  ( %type_pkg[oct] >= 360 ) io-oct%type_pkg[oct] ( >= 1.0.18 ),
-  ( %type_pkg[oct] <= 324 ) miscellaneous-oct%type_pkg[oct] (<< 1.1.0),
-  ( %type_pkg[oct] = 343 ) io-oct%type_pkg[oct] ( >= 1.0.18 ) | ( %type_pkg[oct] = 343 ) miscellaneous-oct%type_pkg[oct] (<< 1.1.0)
+  io-oct%type_pkg[oct] ( >= 1.0.18 ),
 <<
 Depends: <<
   octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/fits-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/fits-oct.info
@@ -22,14 +22,12 @@ License: GPL3+
 BuildDepends: <<
   cfitsio (>=3.37-1),
   liboctave%type_pkg[oct]-dev, 
-  (%type_pkg[oct] << 360) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
   fink-octave-scripts (>= 0.3.0-1),
   fftw3, 
   hdf5.9
  <<
 Depends: <<
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 Conflicts: octave-forge, octave-forge-%type_raw[forge] (<< 1.0.0-999)
 Replaces: octave-forge-%type_raw[forge] (<< 1.0.0-999)

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/fl-core-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/fl-core-oct.info
@@ -26,12 +26,10 @@ BuildDepends: <<
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
   fftw3,
   fink-octave-scripts (>= 0.3.0-1),
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9 
+  hdf5.9 
 <<
 Depends: <<
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 Conflicts: octave-forge
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/fuzzy-logic-toolkit-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/fuzzy-logic-toolkit-oct.info
@@ -79,8 +79,7 @@ BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
   fink-octave-scripts (>= 0.3.0-1),
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9 
+  hdf5.9
 <<
 Depends: octave%type_pkg[oct]-interpreter
 Conflicts: octave-forge

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/general-oct-1.3.2.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/general-oct-1.3.2.info
@@ -53,8 +53,7 @@ BuildDepends: <<
   hdf5.9
  <<
 Depends: << 
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 Conflicts: octave-forge
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/gnuplot-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/gnuplot-oct.info
@@ -43,8 +43,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev,
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink (>=0.32),
   fink-octave-scripts (>= 0.3.0-1)
 <<

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/gsl-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/gsl-oct.info
@@ -132,17 +132,14 @@ License: GPL2+
 
 BuildDepends: <<
   gsl,
-  ( %type_pkg[oct] << 360 ) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
-  ( %type_pkg[oct] >= 360 ) liboctave%type_pkg[oct]-dev,
- fink-octave-scripts (>= 0.3.0-1),
+  liboctave%type_pkg[oct]-dev,
+  fink-octave-scripts (>= 0.3.0-1),
   fftw3, 
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9
+  hdf5.9
 <<
 Depends: << 
   gsl-shlibs,
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 Conflicts: octave-forge, octave-forge-%type_raw[forge] (<< 1.0.7-999)
 Replaces: octave-forge-%type_raw[forge] (<< 1.0.7-999)

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/informationtheory-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/informationtheory-oct.info
@@ -51,8 +51,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev,
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1) 
 <<
 Depends: octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/integration-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/integration-oct.info
@@ -42,8 +42,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev,
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1) 
 <<
 Depends: octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/io-oct-1.2.5.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/io-oct-1.2.5.info
@@ -56,16 +56,14 @@ Spreadsheet function test scripts:
 License: OSI-Approved
 
 BuildDepends: <<
-  ( %type_pkg[oct] << 360 ) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
-  ( %type_pkg[oct] >= 360 ) liboctave%type_pkg[oct]-dev,
+  liboctave%type_pkg[oct]-dev,
   fftw3,
   hdf5.9,
   fink (>=0.32.0),
   fink-octave-scripts (>=0.3.0-1)
 <<
 Depends: <<
-	octave%type_pkg[oct]-interpreter,
-	( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+	octave%type_pkg[oct]-interpreter
 <<
 RuntimeDepends: java-oct%type_pkg[oct]
 Conflicts: octave-forge
@@ -94,8 +92,6 @@ PreRmScript: %p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-prerm.
 
 DescPackaging: <<
 Listed license is GPL3+/simplified BSD, so call that "OSI-Approved"
-Octave <= 3.4.3 publishes more library information than does Octave >= 3.6.0, so
-the linked library content is different.
 
 Common for all octave-forge packages:
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/irsa-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/irsa-oct.info
@@ -32,8 +32,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev,
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1) 
 <<
 Depends: octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/linear-algebra-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/linear-algebra-oct.info
@@ -88,7 +88,6 @@ BuildDepends: <<
   (%type_raw[-blas] = -ref)		lapack%type_pkg[lapack],
   (%type_raw[-blas] = -ref)		liboctave%type_pkg[oct]-ref-dev, 
   (%type_raw[-blas] = .)		liboctave%type_pkg[oct]-accelerate-dev, 
-  ( %type_pkg[oct] << 360 ) 	liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
   fink-octave-scripts (>= 0.1.1),
   fftw3,
   hdf5.9,
@@ -99,8 +98,7 @@ Depends: <<
   (%type_raw[-blas] = -atlas)	octave%type_pkg[oct]-interpreter-newatlas, 
   (%type_raw[-blas] = -ref) 	lapack%type_pkg[lapack]-shlibs,
   (%type_raw[-blas] = -ref)		octave%type_pkg[oct]-interpreter-ref, 
-  (%type_raw[-blas] = .)		octave%type_pkg[oct]-interpreter-accelerate,
-  ( %type_pkg[oct] << 360 ) 	gcc%type_pkg[gcc]-shlibs
+  (%type_raw[-blas] = .)		octave%type_pkg[oct]-interpreter-accelerate
 <<
 RuntimeDepends: <<
 	general-oct%type_pkg[oct] (>=1.3.0)

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/mapping-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/mapping-oct.info
@@ -24,8 +24,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev,
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 3.0.1) 
 <<
 Depends: octave%type_pkg[oct]-interpreter

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/mechanics-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/mechanics-oct.info
@@ -51,15 +51,13 @@ General:
 <<
 
 BuildDepends: <<
-  ( %type_pkg[oct] << 360 ) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
-  ( %type_pkg[oct] >= 360 ) liboctave%type_pkg[oct]-dev,
+  liboctave%type_pkg[oct]-dev,
   fftw3,
   fink ( >= 0.32 ),
   hdf5.9 
 <<
 Depends: <<
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 RuntimeDepends: <<
 	linear-algebra-oct%type_pkg[oct] ( >= 2.0.0 ) | linear-algebra-ref-oct%type_pkg[oct] ( >= 2.0.0 ) | linear-algebra-atlas-oct%type_pkg[oct] ( >= 2.0.0 ),

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/missing-functions-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/missing-functions-oct.info
@@ -23,8 +23,7 @@ BuildDepends: <<
   fink-octave-scripts (>=0.3.0-1),
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9 
+  hdf5.9
 <<
 Depends: octave%type_pkg[oct]-interpreter
 Conflicts: octave-forge

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/msh-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/msh-oct.info
@@ -54,8 +54,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9, 
+  hdf5.9, 
   fink-octave-scripts (>=0.3.0-1),
   fink (>=0.32)
 <<

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/multicore-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/multicore-oct.info
@@ -34,8 +34,7 @@ License: GPL2+
 BuildDepends: <<
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1)
 <<
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/nan-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/nan-oct.info
@@ -143,14 +143,9 @@ BuildAsNobody: false
 CompileScript: <<
 #!/bin/sh -ev
 
-if [ %type_pkg[oct] -ge 343 ]
-	then pkgsrc=NaN
-	else pkgsrc=nan
-fi
+pkgsrc=NaN
 
-if [ %type_pkg[oct] -ge 380 ] ; then
-	export PATH="%b/bin:$PATH"
-fi
+export PATH="%b/bin:$PATH"
 
 %p/share/fink-octave-scripts/octave-forge-patch.sh %type_raw[forge] %v %type_raw[oct] %b %i $pkgsrc
 ./octave-forge-compile.sh

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/netcdf-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/netcdf-oct.info
@@ -81,18 +81,16 @@ Test function:
 License: GPL2+
 
 BuildDepends: <<
-  ( %type_pkg[oct] << 360 ) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
-  ( %type_pkg[oct] >= 360 ) liboctave%type_pkg[oct]-dev,
+  liboctave%type_pkg[oct]-dev,
   fftw3, 
   netcdf-c7 (>= 4.3.0-1), 
   hdf5.9,
   fink-octave-scripts (>= 0.2.0-2)
 <<
 Depends: << 
   octave%type_pkg[oct]-interpreter,
-  netcdf-c7-shlibs (>= 4.3.0-1),
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
-  <<
+  netcdf-c7-shlibs (>= 4.3.0-1)
+<<
 Conflicts: octave-forge
 
 Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
@@ -121,10 +119,6 @@ PostInstScript:  %p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-po
 PreRmScript: %p/share/octave/%type_raw[oct]/%type_raw[forge]/octave-forge-prerm.sh
 
 DescPackaging: <<
-This package:
-The -oct343 variant carries dependencies on gcc4N* due to Octave-3.4.3 broadcasting
-what it was built with.
-
 Common for all octave-forge packages:
 Preinst and postinst scripts are dynamically set up via
 %p/share/fink-octave-scripts/octave-forge-patch.sh because Octave's package manager can't 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/nlwing2-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/nlwing2-oct.info
@@ -34,16 +34,13 @@ It provides the following functions:
 License: GPL3+
 
 BuildDepends: <<
-  ( %type_pkg[oct] << 360 ) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
-  ( %type_pkg[oct] >= 360 ) liboctave%type_pkg[oct]-dev,
+  liboctave%type_pkg[oct]-dev,
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9,
+  hdf5.9,
   fink-octave-scripts (>= 0.3.0-1) 
 <<
 Depends: <<
-  octave%type_pkg[oct]-interpreter,
-  ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
+  octave%type_pkg[oct]-interpreter
 <<
 Conflicts: octave-forge
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/octmods/nnet-oct.info b/10.9-libcxx/stable/main/finkinfo/libs/octmods/nnet-oct.info
@@ -44,8 +44,7 @@ BuildDepends: <<
   fink-octave-scripts (>=0.3.0-1),
   liboctave%type_pkg[oct]-dev, 
   fftw3,
-  ( %type_pkg[oct] = 305 ) hdf5.9-oldapi,
-  ( %type_pkg[oct] != 305 ) hdf5.9 
+  hdf5.9
 <<
 Depends: octave%type_pkg[oct]-interpreter
 Conflicts: octave-forge