New commits:
commit 9badc0361aef4deb77cb0a0a7bc90ab53ad2cc7b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
deskbar-applet: Depends on gnome-python-desktop built with gnome-panel
checking for DESKBAR... yes
checking for gnomeapplet module... no
configure: error: gnomeapplet Python module required to build deskbar
(cherry picked from commit f99872837a01a9e112fef2da2c565dbd5bab1a10)
commit 9765b308717320f143a18ce2372e337e02a321d3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
telepathy-glib: Depends on vala built with vapigen (Bug #15950)
(cherry picked from commit e9659c37b717260ec9ed0ef24f2c2a897f81b70d)
commit 712fd16267c8ef34978732bd610467ab81fceddf
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
vala: Allow forcing vapigen config
(cherry picked from commit ee54fa68ce92f44083d7f82e6ad4c66dca5ecbd2)
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index 9b6c5cd..ec6ed65 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2011-03-10 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing vapigen config
+
2011-01-23 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 0.10.3 and devel to 0.11.5. Added
devel version
diff --git a/devel/vala/PRE_SUB_DEPENDS b/devel/vala/PRE_SUB_DEPENDS
index 2465728..cf3e4b7 100755
--- a/devel/vala/PRE_SUB_DEPENDS
+++ b/devel/vala/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
DEVEL) if [[ "$VALA_DEVEL" == "y" ]]; then return 0; fi;;
+ VAPIGEN) if [[ "$VALA_VAPIGEN" == "--enable-vapigen" ]]; then return 0;
fi;;
esac
return 1
diff --git
a/devel/vala/REPAIR^2c5ac3fd0fa95e310bf07c5b91de7a63^PRE_SUB_DEPENDS
b/devel/vala/REPAIR^2c5ac3fd0fa95e310bf07c5b91de7a63^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..cf3e4b7
--- /dev/null
+++ b/devel/vala/REPAIR^2c5ac3fd0fa95e310bf07c5b91de7a63^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ DEVEL) if [[ "$VALA_DEVEL" == "y" ]]; then return 0; fi;;
+ VAPIGEN) if [[ "$VALA_VAPIGEN" == "--enable-vapigen" ]]; then return 0;
fi;;
+esac
+return 1
diff --git a/devel/vala/SUB_DEPENDS b/devel/vala/SUB_DEPENDS
index e9c73b4..f295b42 100755
--- a/devel/vala/SUB_DEPENDS
+++ b/devel/vala/SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
DEVEL) echo "Devel release needed, forcing it." &&
VALA_DEVEL="y" ;;
+ VAPIGEN) echo "Requiring vapigen, forcing it." &&
+ VALA_VAPIGEN="--enable-vapigen" ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac
diff --git a/gnome2-apps/deskbar-applet/DEPENDS
b/gnome2-apps/deskbar-applet/DEPENDS
index b844ac7..fda766e 100755
--- a/gnome2-apps/deskbar-applet/DEPENDS
+++ b/gnome2-apps/deskbar-applet/DEPENDS
@@ -4,7 +4,7 @@ depends pygobject &&
depends gnome-python2 &&
depends gnome-desktop &&
depends dbus-python &&
-depends gnome-python-desktop &&
+depends -sub "PANEL" gnome-python-desktop &&
optional_depends evolution-data-server \
"--enable-evolution" "--disable-evolution" \
diff --git a/gnome2-apps/deskbar-applet/HISTORY
b/gnome2-apps/deskbar-applet/HISTORY
index d4818d5..f0d824f 100644
--- a/gnome2-apps/deskbar-applet/HISTORY
+++ b/gnome2-apps/deskbar-applet/HISTORY
@@ -1,3 +1,6 @@
+2011-03-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on gnome-python-desktop built with gnome-panel
+
2010-09-29 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.32.0