Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall 
<esandall AT esandall25808.local.webex.com>:

 graphics-libs/poppler/HISTORY         |    3 +++
 graphics-libs/poppler/PRE_SUB_DEPENDS |    5 +++++
 graphics-libs/poppler/SUB_DEPENDS     |    6 ++++++
 kde4/kdegraphics4/DEPENDS             |    2 +-
 kde4/kdegraphics4/HISTORY             |    3 +++
 5 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 548e390abf6305317227c1d4cc8ec2339e1c6a31
Author: Eric Sandall <esandall AT esandall25808.local.webex.com>
Commit: Eric Sandall <esandall AT esandall25808.local.webex.com>

    kdegraphics4: Okular PDF support needs poppler built with qt4 support

commit ad15aa959f3ec8bda14ab5fd1fb411366a881a33
Author: Eric Sandall <esandall AT esandall25808.local.webex.com>
Commit: Eric Sandall <esandall AT esandall25808.local.webex.com>

    poppler: Allow forcing qt4 dependency

diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index f6b971c..f96bda5 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2009-04-16 Eric Sandall <sandalle AT sourcemage.org>
+       * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing qt4 dependency
+
 2009-03-12 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.10.5
 
diff --git a/graphics-libs/poppler/PRE_SUB_DEPENDS 
b/graphics-libs/poppler/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..a862351
--- /dev/null
+++ b/graphics-libs/poppler/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+  QT4) is_depends_enabled $SPELL qt4 && return 0;;
+  *) echo "Eek, unknown subdependency requested!"; return 1;;
+esac
+return 1
diff --git a/graphics-libs/poppler/SUB_DEPENDS 
b/graphics-libs/poppler/SUB_DEPENDS
new file mode 100755
index 0000000..ff749e6
--- /dev/null
+++ b/graphics-libs/poppler/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+  QT4) echo "QT4 support requested, forcing qt4 dependency." &&
+     depends -sub TOOLS qt4 '--enable-poppler-qt4'
+     ;;
+  *) echo unknown sub-depends!!! ; return 1 ;;
+esac
diff --git a/kde4/kdegraphics4/DEPENDS b/kde4/kdegraphics4/DEPENDS
index 38efadd..7db2fd9 100755
--- a/kde4/kdegraphics4/DEPENDS
+++ b/kde4/kdegraphics4/DEPENDS
@@ -12,7 +12,7 @@ optional_depends OPENGL        '' '' 'build kpovmodeler'    
&&
 optional_depends libspectre    '' '' 'render PS files'      &&
 optional_depends tiff          '' '' 'okular TIFF plugin'   &&
 optional_depends jpeg          '' '' 'okular djvu-plugin'   &&
-optional_depends poppler       '' '' 'okular PDF-plugin'    &&
+optional_depends -sub QT4 poppler '' '' 'okular PDF-plugin' &&
 optional_depends chmlib        '' '' 'okular CHM plugin'    &&
 optional_depends djvulibre     '' '' 'okular DejaVu plugin' &&
 optional_depends qca2          '-DWITH_QCA2=ON'  \
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index e49a88f..cd1d103 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,6 @@
+2009-04-16 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: Okular PDF support needs poppler built with qt4 support
+
 2009-04-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.2.70.svn954171 (unstable)