Merge pull request #16 from Ratler/glib-2

glib-2: Removing docs option completely for now

libs/glib-2/BUILD

@@ -4,20 +4,19 @@
   # API functions if debug is entirely disabled
   export OPTS+=" --disable-static --enable-shared --enable-debug=minimum --disable-fam"  &&
 
-  if [ "$DOCS" = "n" ] || ! in_depends $MODULE Python; then
-    sedit "s;^\(.*\SUBDIRS .*\=.*\)docs\(.*\)$;\1\2;" Makefile.in
-    sedit "s;^\(.*\SUBDIRS .*\=.*\)docs\(.*\)$;\1\2;" Makefile.am
-  fi  &&
-
-  # Don't build tests if we don't have python
-  # Tests are required if docs are built
-  if ! in_depends $MODULE Python && [ "$DOCS" = "n" ]; then
-    for i in $(find . -name Makefile.in -o -name Makefile.am); do
-      sedit "s;^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$;\1\2;" $i
-    done
-  fi &&
+  # Disable docs (require Python and gdbus-codegen), we can enable
+  # this later if necessary by introducing a glib-2-docs module
+  sedit "s;^\(.*\SUBDIRS .*\=.*\)docs\(.*\)$;\1\2;" Makefile.in
+  sedit "s;^\(.*\SUBDIRS .*\=.*\)docs\(.*\)$;\1\2;" Makefile.am
 
+  # Don't build tests
+  for i in $(find . -name Makefile.in -o -name Makefile.am); do
+    sedit "s;^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$;\1\2;" $i
+  done
+
+  # This patch splits out gdbus-codegen which is a separate module now
   patch_it $SOURCE2 1 &&
+
   AT_M4DIR=. autoreconf && 
   default_build
 

libs/glib-2/DEPENDS

@@ -1,3 +1,2 @@
 depends zlib
 depends libffi
-optional_depends Python "" "" "build tests (for docs also say yes here)?"