dependency rules #2

13 files changed, 89 insertions, 16 deletions

diff --git a/config/simple-deprules.d/app-text b/config/simple-deprules.d/app-text
index 3edb48f..d88fb1e 100644
--- a/config/simple-deprules.d/app-text
+++ b/config/simple-deprules.d/app-text
@@ -19,3 +19,7 @@ app-text/texlive {
 	(PDF)LaTeX (http://www.latex-project.org/) with'pdfpages' package for studentGrowthPlot option in visualizeSGPto bind together student growth plots into school catalogs.
 	(PDF)LaTeX for saveLatex()
 }
+
+app-text/poppler {
+	pdfinfo
+}
diff --git a/config/simple-deprules.d/dev b/config/simple-deprules.d/dev
index b53100e..01603a1 100644
--- a/config/simple-deprules.d/dev
+++ b/config/simple-deprules.d/dev
@@ -41,7 +41,11 @@ dev-lang/lua :: lua version>= 5.1.4
 
 ~dev-tex/pgf :: pgf
 
-dev-tcltk/bwidget :: bwidget
+~dev-tcltk/bwidget {
+	bwidget
+	Tcl/Tk extensions BWidget
+}
+
 ~dev-tcltk/tktable :: tktable
 
 dev-util/cmake {
diff --git a/config/simple-deprules.d/dev-libs b/config/simple-deprules.d/dev-libs
index c475a6b..b378a9b 100644
--- a/config/simple-deprules.d/dev-libs
+++ b/config/simple-deprules.d/dev-libs
@@ -70,6 +70,10 @@ dev-libs/quantlib {
 	QuantLib library from http://quantlib.org
 }
 
+~dev-libs/quantlib {
+	QuantLib library
+}
+
 ~dev-libs/xerces-c {
 	xerces-c
 	libxerces-c
diff --git a/config/simple-deprules.d/ignored_text b/config/simple-deprules.d/ignored_text
index b46d7b6..a2567e2 100644
--- a/config/simple-deprules.d/ignored_text
+++ b/config/simple-deprules.d/ignored_text
@@ -55,10 +55,21 @@
 	drivers.
 	License
 	its development files
+	library (version2.2.0 or later)
+	libraries(See README.REQ)
 }
 
 % :: Linux
 
+# ignore "Windows" in dependency fields:
+# (a) there's OS_Type for OS restrictions
+# (b) it's a filler word sometimes ("xyz on Solaris, Linux and Windows")
+# (c) windows-only packages usually have more specific windows-only deps
+#
+# That said, add windows-only packages to a "do-not-process" package rule
+#
+! :: Windows
+
 # how to dependend on ARCHes? -- ignoring it
 ! :: Little Endian
 
diff --git a/config/simple-deprules.d/media b/config/simple-deprules.d/media
index 7e09871..365455f 100644
--- a/config/simple-deprules.d/media
+++ b/config/simple-deprules.d/media
@@ -33,3 +33,7 @@ media-gfx/dcraw :: dcraw(for reading RAW images).
 media-libs/fontconfig {
 	fontconfig
 }
+
+media-fonts/corefonts {
+	msttcorefonts
+}
diff --git a/config/simple-deprules.d/media-libs b/config/simple-deprules.d/media-libs
index 6558f40..8b7ba10 100644
--- a/config/simple-deprules.d/media-libs
+++ b/config/simple-deprules.d/media-libs
@@ -29,7 +29,12 @@ media-libs/libpng {
 
 media-libs/raptor :: libraptor2 (>= 2.0.0 http://librdf.org/raptor/)
 
-media-libs/tiff :: linux: libtiff (and libtiff-devel)
+media-libs/tiff {
+	linux: libtiff (and libtiff-devel)
+	optional libtiff
+	optionally libtiff
+}
+
 ~media-libs/tiff {
 	tiff
 	libtiff
@@ -39,4 +44,5 @@ media-libs/tiff :: linux: libtiff (and libtiff-devel)
 virtual/jpeg {
 	libjpeg
 	jpeg
+	jpeg libraries
 }
diff --git a/config/simple-deprules.d/misc b/config/simple-deprules.d/misc
new file mode 100644
index 0000000..9a1bae1
--- /dev/null
+++ b/config/simple-deprules.d/misc
@@ -0,0 +1,7 @@
+dev-vcs/git {
+   git
+}
+
+>=app-emulation/wine-1.5.26 {
+   wine (>= wine-1.5.26)
+}
diff --git a/config/simple-deprules.d/missing b/config/simple-deprules.d/missing
index 9674bba..ad66be2 100644
--- a/config/simple-deprules.d/missing
+++ b/config/simple-deprules.d/missing
@@ -1,17 +1,6 @@
 #! NOPARSE
 
-# === Notes ===
-
-* BIOC experimental -> these packages could also be included in BIOC-2.10;
--> solution: try BIOC-2.10 (next test run)
-
-* some packages have multiple 'Depends' fields which results in
-  dep strings like 'R (>= 2.3.0)Depends: tcltk' - fix this
-
-* maybe add dev-lang/R with specific USE flags to deps like lapack
-
-* omegahat?
-
+# this file is out of date
 
 # === missing ===
 ALL
diff --git a/config/simple-deprules.d/nvidia b/config/simple-deprules.d/nvidia
index 88db79e..ed77098 100644
--- a/config/simple-deprules.d/nvidia
+++ b/config/simple-deprules.d/nvidia
@@ -1,12 +1,17 @@
 #deptype sys
 
-# lowest cuda version in portage is 3.2
+# lowest cuda version in portage is 4.2.9
 dev-util/nvidia-cuda-toolkit {
 	NVIDIA CUDA Toolkit (>= release 3.0)
 	Nvidia CUDAToolkit (>= release 3.0)
 	Nvidia's CUDA toolkit (>= release 2.3)
 	NVIDIA CUDA Toolkit 3.1 or above
 	NVIDIA CUDAtoolkit
+	NVIDIA CUDA Toolkit (>= release 4.0)
+}
+
+>=dev-util/nvidia-cuda-toolkit-5.0 {
+	Nvidia's CUDA toolkit (>= release 5.0)
 }
 
 # FIXME cuda-toolkit or sdk?
diff --git a/config/simple-deprules.d/sci b/config/simple-deprules.d/sci
index a7d4615..4e5363a 100644
--- a/config/simple-deprules.d/sci
+++ b/config/simple-deprules.d/sci
@@ -17,6 +17,10 @@
 ~sci-mathematics/jags :: jags
 sci-mathematics/jags :: jags (see http://mcmc-jags.sourceforge.net)
 
+sci-mathematics/jags {
+	JAGS (>= 3.2.0) (or WinBUGS (>= 1.4) or OpenBUGS(>= 3.2.2))
+}
+
 # lowest octave version in portage is 3.4
 sci-mathematics/octave {
 	Octave (>= 3.2.4) and its development files
@@ -39,6 +43,29 @@ sci-mathematics/yacas {
 	yacas (>= 1.0.63) # instructions on home page
 }
 
+sci-mathematics/octave {
+	Octave (>= 3.2.4)
+}
+
+sci-libs/netcdf {
+	NetCDF4 (4.1 or later) libraries.
+}
+
+# there's also sci-biology/clustalw-mpi
+#
+sci-biology/clustalw {
+	clustalw
+}
+
+sci-biology/ncbi-tools++ {
+	ncbi-blast+
+	ncbi-tools++
+}
+
+sci-mathematics/glpk {
+	libglpk-dev onDebian/Ubuntu)
+}
+
 #deptype all
 
 # some packages have glpk in "pkg" deps
diff --git a/config/simple-deprules.d/sys b/config/simple-deprules.d/sys
index 5b899db..b2fa9bd 100644
--- a/config/simple-deprules.d/sys
+++ b/config/simple-deprules.d/sys
@@ -10,9 +10,17 @@
 sys-libs/zlib :: zlib (optional)
 
 # => sys-cluster/
-~virtual/mpi {
+virtual/mpi {
 	LamMPI(>= 6.5.9) or MPICH2(>= 1.0.2) or OpenMPI ()
 	LamMpi(>= 6.5.9) or Mpich2(>= 1.0.2)
+	OpenMPI (>= 1.5.4) on Linux
+	OpenMPI or MPICH2
+}
+
+# the "... on Windows" line could probably be ignored
+virtual/mpi {
+	MPI2
+	MPICH2 (>=1.4.1p1) on Windows
 }
 
 ! {
diff --git a/config/simple-deprules.d/system.set b/config/simple-deprules.d/system.set
index dc535b1..828d995 100644
--- a/config/simple-deprules.d/system.set
+++ b/config/simple-deprules.d/system.set
@@ -29,3 +29,6 @@
 	POSIX-compliant OS (essentially anything butWindows)
 	Unix
 }
+
+# rpcgen is part of glibc
+! :: rpcgen
diff --git a/config/simple-deprules.d/x11 b/config/simple-deprules.d/x11
index 795052a..2858ddd 100644
--- a/config/simple-deprules.d/x11
+++ b/config/simple-deprules.d/x11
@@ -11,6 +11,7 @@ x11-libs/cairo :: cairo (>= 1.2 http://www.cairographics.org/)
 dev-qt/qtcore {
 	qt
 	Qt4 libraries and headers (http://qt.nokia.com)
+	Qt4 libraries
 }
 ! :: headers (http://qt.nokia.com)