From 373f062d01e2dee9d123fb5a056029c47b67800a Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sun, 12 Aug 2007 19:06:52 +0000
Subject: [PATCH] Merged r3456 from trunk.

---
 BLFS/libs/func_dependencies | 14 ++++++++++++++
 BLFS/libs/func_packages     |  6 ++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/BLFS/libs/func_dependencies b/BLFS/libs/func_dependencies
index 773e3dc..c92416e 100644
--- a/BLFS/libs/func_dependencies
+++ b/BLFS/libs/func_dependencies
@@ -187,6 +187,8 @@ inline_doc
       hal-requirements | hal-runtime-dependencies ) continue ;;
       perl-* | tk-perl )         DEP=perl-modules ;;
       dbus-* )                   DEP=dbus-bindings ;;
+      pyxml | pycairo | pygobject | pygtk | pyorbit | \
+      gnome-python | gnome-python-desktop ) DEP=python-modules ;;
 
         # Orphan links (proper link must be created when generating the book)
       arts )                     DEP=aRts ;;
@@ -309,6 +311,18 @@ inline_doc
         # cyrus-sasl-->postgresql-->$KBR5-->openldap-->cyrus-sasl
         [[ "$PKG" = "cyrus-sasl" ]] && continue
         ;;
+      python-modules )
+        # True circular dependecy
+        [[ "$PKG" = "python-modules" ]] && continue
+        # libgsf-->python-modules-->several combinations-->libgsf
+        [[ "$PKG" = "libgsf" ]] && continue
+        # gimp-->python-modules-->several combinations-->gimp
+        [[ "$PKG" = "gimp" ]] && continue
+        # Used to rebuild the documentation
+        [[ "$PKG" = "gstreamer" ]] && continue
+        [[ "$PKG" = "gst-plugins-base" ]] && continue
+        [[ "$PKG" = "gst-plugins-good" ]] && continue
+        ;;
       tk )
         # python-->tk-->xorg7-->several combinations-->libxslt-->python
         [[ "$PKG" = "python" ]] && continue
diff --git a/BLFS/libs/func_packages b/BLFS/libs/func_packages
index a26117b..eb797b6 100644
--- a/BLFS/libs/func_packages
+++ b/BLFS/libs/func_packages
@@ -75,8 +75,10 @@ generate_packages()  {  # Master packages file
   for file in `find $BLFS_XML -name "*.xml"` ; do
     pkg_id=$(grep "sect1 id" $file | sed -e 's/<sect1 id="//;s/".*//')
     case ${pkg_id} in
-      dbus-bindings | perl-modules ) pkg_ver=0.no_version ;;
-      * )                            pkg_ver=$(get_pkg_ver $pkg_id) ;;
+      dbus-bindings | \
+      perl-modules | \
+      python-modules ) pkg_ver=0.no_version ;;
+                   * ) pkg_ver=$(get_pkg_ver $pkg_id) ;;
     esac
     installed_ver=$(get_installed_ver $pkg_id)
     [[ ! -z "$pkg_id" ]] && echo -e "$pkg_id\t$file\t$pkg_ver\t$installed_ver" >> packages.tmp