13 files changed, 96 insertions, 6 deletions
diff --git a/config/simple-deprules.d/R b/config/simple-deprules.d/R
index c6fd193..ecb78fd 100644
--- a/config/simple-deprules.d/R
+++ b/config/simple-deprules.d/R
@@ -60,6 +60,7 @@ dev-lang/R[tk] {
 ! {
 	R must be compiled with --enable-R-shlib if the server is to be built
 	R must be compiled with --enable-R-shlib if theserver is to be built
+	R must be compiled with --enable-R-shlibif the server is to be built
 	Download regular shlib (420 KB) from externalsource ('xls.getshlib()' or manually)
 	R built as a shared object
 	R built as a shared object.
diff --git a/config/simple-deprules.d/app-text b/config/simple-deprules.d/app-text
index 3d1a579..3edb48f 100644
--- a/config/simple-deprules.d/app-text
+++ b/config/simple-deprules.d/app-text
@@ -16,5 +16,6 @@ app-text/poppler {
 # pdflatex?
 app-text/texlive {
 	(PDF)LaTeX (http://www.latex-project.org/) withpdfpages package for studentGrowthPlot option in visualizeSGPto bind together student growth plots into school catalogs.
+	(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()
 }
diff --git a/config/simple-deprules.d/compound_deps b/config/simple-deprules.d/compound_deps
index 2cc54cb..963ee0f 100644
--- a/config/simple-deprules.d/compound_deps
+++ b/config/simple-deprules.d/compound_deps
@@ -45,3 +45,7 @@
 || ( media-libs/tiff virtual/jpeg ) {
 	libtiff and/or libjpeg
 }
+
+( virtual/blas virtual/lapack ) {
+	BLAS/LAPACK libraries
+}
diff --git a/config/simple-deprules.d/dev b/config/simple-deprules.d/dev
index fe3f41c..b53100e 100644
--- a/config/simple-deprules.d/dev
+++ b/config/simple-deprules.d/dev
@@ -20,8 +20,22 @@ dev-db/unixODBC {
 dev-java/ant :: ant
 dev-java/jdbc-postgresql:: PostgreSQL JDBCdriver
 
+
+# try to slot-match dev-lang/python, but use known slots only
+~dev-lang/python:slotparts=2:restrict=2.5,2.6,2.7,3.1,3.2,3.3 {
+   python
+   python headers
+}
+# else fall back to fuzzy
+~dev-lang/python {
+   python
+}
 # lowest python version in portage: 2.5
-~dev-lang/python :: python
+>=dev-lang/python-2.5 {
+   Python (>= 2.4) to run Asciidoc(http://www.python.org/)
+}
+
+
 dev-lang/lua :: lua version>= 5.1.4
 ~dev-lang/lua :: lua
 
diff --git a/config/simple-deprules.d/dev-libs b/config/simple-deprules.d/dev-libs
index 0303be7..c475a6b 100644
--- a/config/simple-deprules.d/dev-libs
+++ b/config/simple-deprules.d/dev-libs
@@ -14,6 +14,7 @@ dev-libs/boost {
 	Boost libraryfrom http://www.boost.org
 	boost headers for smart pointers
 	The Boost 'program_options' library(http://boost.org) is required.
+	Boost (or the BoostHeaders package)
 }
 
 ~dev-libs/glib {
@@ -34,7 +35,10 @@ dev-libs/boost {
 
 ~dev-libs/libffi :: libffi
 
-~dev-libs/libpcre :: libpcre
+~dev-libs/libpcre {
+	libpcre
+	pcre
+}
 
 ~dev-libs/libxml2 {
 	xml
@@ -70,3 +74,11 @@ dev-libs/quantlib {
 	xerces-c
 	libxerces-c
 }
+
+~sys-devel/clang {
+	clang
+}
+
+dev-libs/geoip {
+	GeoIP from MaxMinds
+}
diff --git a/config/simple-deprules.d/ignored_text b/config/simple-deprules.d/ignored_text
index d6effd6..b46d7b6 100644
--- a/config/simple-deprules.d/ignored_text
+++ b/config/simple-deprules.d/ignored_text
@@ -35,11 +35,33 @@
 	playitbyr creates sound using the csound package
 	which requires the free and open source software synthesizerCsound
 	A valid copy of the Csound library must present.Csound can be downloaded Thelibrary is included in the Windows and Mac OS X binaries
+	A valid copy of the Csound library must present.Csound can be downloaded Thelibrary is included in the Windows
 	binary Linux distributions often package the library separatelyfrom the executible file
 	so for instance on Debian and Ubuntuyou would need the "libcsound64-dev" package.
 	For the MERLIN wrapper
+	Mac
+	Mac OS X
+	Mac OS X binaries
+	Mac.Parallel HDF5
+	Linux/64bit
+	sources are included for other OSes.
+	see readme.txt
+	so for instance on Debian
+	so for instance onDebian
+	Ubuntu you would need the "libcsound64-dev" package.See the package web site for more guidance on setup andconfiguration.
+	Ubuntuyou would need the "libcsound64-dev" package.
+	which is included with standard Mac
+	which requires the free
+	drivers.
+	License
+	its development files
 }
 
+% :: Linux
+
+# how to dependend on ARCHes? -- ignoring it
+! :: Little Endian
+
 ! :: None
 
 ! {
diff --git a/config/simple-deprules.d/media b/config/simple-deprules.d/media
index 86790ab..7e09871 100644
--- a/config/simple-deprules.d/media
+++ b/config/simple-deprules.d/media
@@ -1,6 +1,10 @@
 #deptype sys
 
 ~media-sound/csound :: csound
+media-sound/csound {
+	open source software synthesizerCsound
+	Windowsinstallations of Csound. Some Linux distributions package thelibrary file separately from the executible
+}
 
 ~media-gfx/imagemagick {
 	imagemagick
@@ -25,3 +29,7 @@ virtual/ffmpeg {
 }
 
 media-gfx/dcraw :: dcraw(for reading RAW images).
+
+media-libs/fontconfig {
+	fontconfig
+}
diff --git a/config/simple-deprules.d/net b/config/simple-deprules.d/net
index b739b80..54e8044 100644
--- a/config/simple-deprules.d/net
+++ b/config/simple-deprules.d/net
@@ -8,10 +8,12 @@ net-misc/curl {
 	curl (version 7.14.0 or higher) http://curl.haxx.se
 	you will often have toexplicitly install libcurl-devel to have the header files andthe libcurl library.
 	libcurl (version 7.14.0 or higher)http://curl.haxx.se. On Linux systems
+	you will oftenhave to explicitly install libcurl-devel to have theheader files
 }
 ~net-misc/curl {
 	curl
 	libcurl
+	the libcurl library.
 }
 
 # FIXME
diff --git a/config/simple-deprules.d/nvidia b/config/simple-deprules.d/nvidia
index 3ed7ed6..88db79e 100644
--- a/config/simple-deprules.d/nvidia
+++ b/config/simple-deprules.d/nvidia
@@ -27,6 +27,10 @@ dev-util/nvidia-cuda-toolkit {
 	Nvidia's CUDA toolkit (>= release 4.5)
 }
 
+~dev-util/nvidia-cuda-toolkit {
+	CUDA SDK
+}
+
 >=x11-drivers/nvidia-drivers-270 {
 	Nvidia CUDA driver (>= 270.xx.xx)
 }
diff --git a/config/simple-deprules.d/sci b/config/simple-deprules.d/sci
index 40db728..a7d4615 100644
--- a/config/simple-deprules.d/sci
+++ b/config/simple-deprules.d/sci
@@ -39,6 +39,16 @@ sci-mathematics/yacas {
 	yacas (>= 1.0.63) # instructions on home page
 }
 
+#deptype all
+
+# some packages have glpk in "pkg" deps
+# (FIXME: does glpk in that context refer to an R package?)
+~sci-mathematics/glpk {
+	glpk
+}
+
+#deptype sys
+
 # == misc ==
 
 # FIXME: correct?
@@ -56,3 +66,7 @@ sci-physics/root {
 ~sci-visualization/ggobi :: ggobi
 
 sci-biology/merlin :: MERLIN(www.sph.umich.edu/csg/abecasis/merlin) must be installed andpointed to in the PATH environment variable.
+
+sci-visualization/gnuplot {
+	gnuplot
+}
diff --git a/config/simple-deprules.d/sci-libs b/config/simple-deprules.d/sci-libs
index ea1f25f..abd31d7 100644
--- a/config/simple-deprules.d/sci-libs
+++ b/config/simple-deprules.d/sci-libs
@@ -17,8 +17,12 @@
 sci-libs/gdal {
 	GDAL library from http://www.gdal.org/download.html
 	GDAL library from http://www.remotesensing.org/gdal/download.html
+
+}
+~sci-libs/gdal {
+	gdal
+	for building from source: GDAL
 }
-~sci-libs/gdal :: gdal
 
 ~sci-libs/geos {
 	geos
@@ -64,6 +68,7 @@ sci-libs/netcdf :: netcdf library version 4.1 or later
 ~sci-libs/netcdf :: netcdf
 
 sci-libs/proj :: proj 4.4.6 or higher (http://proj.maptools.org/)
+>=sci-libs/proj-4.4.9 :: PROJ.4(proj >= 4.4.9)
 
 
 # FIXME, portage version is 2.1.21
diff --git a/config/simple-deprules.d/system.set b/config/simple-deprules.d/system.set
index 7ee9fdc..dc535b1 100644
--- a/config/simple-deprules.d/system.set
+++ b/config/simple-deprules.d/system.set
@@ -13,6 +13,9 @@
 <sys-devel/gcc-4.4 :: gcc/g++ version 4.4 is not yet compatible with nvcc).
 <=sys-devel/gcc-4.5 :: gcc (release <= 4.5).
 
+#sys-devel/gcc[cxx] :: g++ or Microsoft VC++
+! :: g++ or Microsoft VC++
+
 
 # always provided? (except for Gentoo/*BSD)
 ! {
@@ -26,5 +29,3 @@
 	POSIX-compliant OS (essentially anything butWindows)
 	Unix
 }
-
-
diff --git a/config/simple-deprules.d/x11 b/config/simple-deprules.d/x11
index bb78ed7..795052a 100644
--- a/config/simple-deprules.d/x11
+++ b/config/simple-deprules.d/x11
@@ -7,10 +7,12 @@ x11-libs/cairo :: cairo (>= 1.2 http://www.cairographics.org/)
 
 ~x11-libs/pango :: pango
 
-x11-libs/qt-core {
+# qt has its own category now
+dev-qt/qtcore {
 	qt
 	Qt4 libraries and headers (http://qt.nokia.com)
 }
+! :: headers (http://qt.nokia.com)
 
 x11-misc/xclip {
 	xclip (Linux)