sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (5f55a86a06acf5cb1b5a7eb981edf6f60baed9b3)

From: Vasil Yonkov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (5f55a86a06acf5cb1b5a7eb981edf6f60baed9b3)
Date: Sun, 20 Dec 2009 07:04:54 -0600

GIT changes to master grimoire by Vasil Yonkov <spirtbrat AT sourcemage.org>:

gnome2-apps/epiphany/DEPENDS | 42
++++++++++++-----------------------
gnome2-apps/epiphany/HISTORY | 8 ++++++
gnome2-apps/epiphany/PRE_SUB_DEPENDS | 4 ---
gnome2-apps/epiphany/SUB_DEPENDS | 4 ---
gnome2-libs/libsoup/HISTORY | 3 ++
gnome2-libs/libsoup/PRE_SUB_DEPENDS | 1
gnome2-libs/libsoup/SUB_DEPENDS | 4 ++-
7 files changed, 30 insertions(+), 36 deletions(-)

New commits:
commit 5f55a86a06acf5cb1b5a7eb981edf6f60baed9b3
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

epiphany: removed dependency on libgnomeui, gnome-desktop, gnome-python2,
enchant, libgnomeprintui
added dependency on startup-notification, gnome-keyring,
libsoup with gnome

diff --git a/gnome2-apps/epiphany/DEPENDS b/gnome2-apps/epiphany/DEPENDS
index 4179816..56cefb0 100755
--- a/gnome2-apps/epiphany/DEPENDS
+++ b/gnome2-apps/epiphany/DEPENDS
@@ -1,33 +1,21 @@
-depends libgnomeui &&
-depends gnome-desktop &&
-depends iso-codes &&
-depends dbus-glib &&
-
-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "Use gtk-doc to build documentation (say N if using
webkit)?" &&
-
-optional_depends gnome-python2 \
- "--enable-python" \
- "--disable-python" \
- "Enable Python support" &&
+depends iso-codes &&
+depends dbus-glib &&
+depends webkitgtk &&
+depends startup-notification &&
+depends gnome-keyring &&
+depends -sub SOUP_GNOME libsoup &&

optional_depends gnome-network \
"--enable-network-manager" \
"--disable-network-manager" \
- "Integrate with gnome network manager?" &&
-
-optional_depends enchant \
- "--enable-spell-checker" \
- "--disable-spell-checker" \
- "Enable spelling checker?" &&
-
-optional_depends rarian \
- "--enable-scrollkeeper" \
- "--disable-scrollkeeper" \
- "Register with rarian?" &&
+ "for gnome network manager integration" &&

-optional_depends libgnomeprintui '' '' 'Enable printing?' &&
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation" &&

-depends webkitgtk
+optional_depends rarian \
+ "--enable-scrollkeeper" \
+ "--disable-scrollkeeper" \
+ "Register with rarian?"
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index 8dc1604..1c5cf1d 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,11 @@
+2009-12-20 Vasil Yonov <spirtbrat AT sourcemage.org>
+ * PRE_SUB_DEPENDS: removed
+ * SUB_DEPENDS: removed
+ * DEPENDS: removed libgnomeui, gnome-desktop, gnome-python2,
+ enchant, libgnomeprintui
+ added startup-notification, gnome-keyring,
+ libsoup with gnome
+
2009-12-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
* CONFLICTS: added conflict galeon for deprecation

diff --git a/gnome2-apps/epiphany/PRE_SUB_DEPENDS
b/gnome2-apps/epiphany/PRE_SUB_DEPENDS
deleted file mode 100755
index b84d6af..0000000
--- a/gnome2-apps/epiphany/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-case $THIS_SUB_DEPENDS in
- gnome-python2|GNOME-PYTHON2) is_depends_enabled $SPELL gnome-python2 ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}" && return 1 ;;
-esac
diff --git a/gnome2-apps/epiphany/SUB_DEPENDS
b/gnome2-apps/epiphany/SUB_DEPENDS
deleted file mode 100755
index ca1b636..0000000
--- a/gnome2-apps/epiphany/SUB_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-case $THIS_SUB_DEPENDS in
-gnome-python2|GNOME-PYTHON2) echo "python bindings requested, forcing
them."; depends gnome-python2 '--enable-python';;
- *) echo "unknown sub-depends!"; return 1;;
-esac
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 2a1ec8b..22b86d9 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,6 @@
+2009-12-20 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS : added SOUP_GNOME
+
2009-12-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.2

diff --git a/gnome2-libs/libsoup/PRE_SUB_DEPENDS
b/gnome2-libs/libsoup/PRE_SUB_DEPENDS
index 6387b95..3c00517 100755
--- a/gnome2-libs/libsoup/PRE_SUB_DEPENDS
+++ b/gnome2-libs/libsoup/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
SOUP_DEVEL) if [[ "$LIBSOUP_DEVEL" == "y" ]]; then return 0; fi;;
+ SOUP_GNOME) if [[ "$LIBSOUP_GNOME" == "y" ]]; then return 0; fi;;
esac
return 1
diff --git a/gnome2-libs/libsoup/SUB_DEPENDS b/gnome2-libs/libsoup/SUB_DEPENDS
index dab3225..4656d06 100755
--- a/gnome2-libs/libsoup/SUB_DEPENDS
+++ b/gnome2-libs/libsoup/SUB_DEPENDS
@@ -1,5 +1,7 @@
case $THIS_SUB_DEPENDS in
SOUP_DEVEL) echo "Devel release needed, forcing it." &&
- LIBSOUP_DEVEL="y" ;;
+ LIBSOUP_DEVEL="y" ;;
+ SOUP_GNOME) message "GNOME support requested, forcing it." &&
+ LIBSOUP_GNOME="y" ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac

[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (5f55a86a06acf5cb1b5a7eb981edf6f60baed9b3), Vasil Yonkov, 12/20/2009