[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (2e1ac160f1ac770e837a66b6ac10b94bd85bedb3)

Vlad Glagolev scm at sourcemage.org
Fri Sep 30 04:48:47 EDT 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ChangeLog                                                                   |   11 +
 audio-creation/audacity/BUILD                                               |    5 
 audio-creation/audacity/CONFIGURE                                           |   11 -
 audio-creation/audacity/DEPENDS                                             |   16 +-
 audio-creation/audacity/DETAILS                                             |   15 --
 audio-creation/audacity/HISTORY                                             |    3 
 audio-creation/audacity/PREPARE                                             |    7 
 audio-drivers/jack/DEPENDS                                                  |    2 
 audio-drivers/jack/DETAILS                                                  |    4 
 audio-drivers/jack/HISTORY                                                  |    3 
 audio-drivers/jack/PREPARE                                                  |    9 -
 audio-drivers/jack2/DEPENDS                                                 |    2 
 audio-drivers/jack2/DETAILS                                                 |    4 
 audio-drivers/jack2/HISTORY                                                 |    3 
 audio-drivers/jack2/PREPARE                                                 |    8 -
 audio-drivers/libffado/DETAILS                                              |    8 -
 audio-drivers/libffado/HISTORY                                              |    4 
 audio-drivers/libffado/PREPARE                                              |    7 
 audio-drivers/portaudio19/DEPENDS                                           |    3 
 audio-drivers/portaudio19/DETAILS                                           |    6 
 audio-drivers/portaudio19/DOWNLOAD                                          |   18 --
 audio-drivers/portaudio19/HISTORY                                           |    4 
 audio-drivers/portaudio19/PREPARE                                           |    6 
 audio-libs/faad2/DEPENDS                                                    |    2 
 audio-libs/faad2/DETAILS                                                    |    4 
 audio-libs/faad2/HISTORY                                                    |    3 
 audio-libs/faad2/PREPARE                                                    |    6 
 audio-soft/qjackctl/DEPENDS                                                 |    2 
 audio-soft/qjackctl/DETAILS                                                 |    4 
 audio-soft/qjackctl/HISTORY                                                 |    3 
 audio-soft/qjackctl/PREPARE                                                 |    9 -
 chat-irc/irssi/DETAILS                                                      |    2 
 chat-irc/irssi/HISTORY                                                      |    4 
 dev/null                                                                    |binary
 devel/gcl/DETAILS                                                           |    4 
 devel/gcl/HISTORY                                                           |    3 
 devel/gcl/PREPARE                                                           |    7 
 disk/libburn/DEPENDS                                                        |    2 
 disk/libburn/DETAILS                                                        |    4 
 disk/libburn/HISTORY                                                        |    6 
 disk/libburn/PREPARE                                                        |    8 -
 disk/libisoburn/DETAILS                                                     |    4 
 disk/libisoburn/HISTORY                                                     |    6 
 disk/libisoburn/PREPARE                                                     |    8 -
 disk/libisofs/DEPENDS                                                       |    2 
 disk/libisofs/DETAILS                                                       |    4 
 disk/libisofs/HISTORY                                                       |    6 
 disk/libisofs/PREPARE                                                       |    8 -
 editors/emacs/BUILD                                                         |    1 
 editors/emacs/HISTORY                                                       |    3 
 ftp/puregui/DEPENDS                                                         |    4 
 ftp/puregui/DETAILS                                                         |   17 --
 ftp/puregui/HISTORY                                                         |   24 ---
 gnome2-apps/gtkdialog/DEPENDS                                               |    3 
 gnome2-apps/gtkdialog/DETAILS                                               |    8 -
 gnome2-apps/gtkdialog/HISTORY                                               |    5 
 gnome2-libs/gdk-pixbuf2/DETAILS                                             |    2 
 gnome2-libs/gdk-pixbuf2/HISTORY                                             |    3 
 gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.22.1.tar.bz2.sig                       |    0 
 gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.24.0.tar.bz2.sig                       |binary
 gnome2-libs/librep2/DETAILS                                                 |    6 
 gnome2-libs/librep2/HISTORY                                                 |    5 
 gnome2-libs/librep2/librep-0.91.0.tar.bz2.sig                               |    0 
 gnome2-libs/librep2/librep-0.92.1b.tar.bz2.sig                              |binary
 gnome3-libs/cogl/DETAILS                                                    |   17 ++
 gnome3-libs/cogl/HISTORY                                                    |    2 
 gnome3-libs/cogl/cogl-1.8.0.tar.bz2.sig                                     |binary
 gnome3-libs/gnome-online-accounts/DEPENDS                                   |    1 
 gnome3-libs/gnome-online-accounts/DETAILS                                   |   15 ++
 gnome3-libs/gnome-online-accounts/HISTORY                                   |    2 
 gnome3-libs/gnome-online-accounts/gnome-online-accounts-3.2.0.1.tar.bz2.sig |binary
 gnome3-libs/rest/DETAILS                                                    |   14 +
 gnome3-libs/rest/HISTORY                                                    |    2 
 gnome3-libs/rest/rest-0.7.10.tar.bz2.sig                                    |binary
 graphics-libs/poppler/BUILD                                                 |    2 
 graphics-libs/poppler/DEPENDS                                               |   14 -
 graphics-libs/poppler/DETAILS                                               |    8 -
 graphics-libs/poppler/HISTORY                                               |    7 
 graphics-libs/poppler/PRE_BUILD                                             |    2 
 graphics-libs/pycairo/BUILD                                                 |    1 
 graphics-libs/pycairo/DETAILS                                               |    9 -
 graphics-libs/pycairo/HISTORY                                               |    4 
 graphics-libs/pycairo/INSTALL                                               |    1 
 graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig                            |    0 
 graphics/blender_cvs/DETAILS                                                |    2 
 graphics/blender_cvs/HISTORY                                                |    3 
 graphics/blender_cvs/PREPARE                                                |    3 
 http/dillo/BUILD                                                            |    2 
 http/dillo/CONFIGURE                                                        |   72 +---------
 http/dillo/DEPENDS                                                          |   52 ++-----
 http/dillo/DETAILS                                                          |   40 +++--
 http/dillo/HISTORY                                                          |    3 
 http/dillo/PREPARE                                                          |    9 -
 http/dillo/PRE_BUILD                                                        |   15 --
 http/elinks/BUILD                                                           |    2 
 http/elinks/DEPENDS                                                         |    2 
 http/elinks/DETAILS                                                         |    4 
 http/elinks/HISTORY                                                         |    3 
 http/elinks/PREPARE                                                         |    8 -
 http/firefox/DETAILS                                                        |    8 -
 http/firefox/HISTORY                                                        |    3 
 http/seamonkey/DETAILS                                                      |    6 
 http/seamonkey/HISTORY                                                      |    6 
 http/surf/DEPENDS                                                           |    2 
 http/surf/DETAILS                                                           |    4 
 http/surf/DOWNLOAD                                                          |    2 
 http/surf/HISTORY                                                           |    3 
 http/surf/PREPARE                                                           |    7 
 http/webkitgtk/BUILD                                                        |    1 
 http/webkitgtk/DETAILS                                                      |    8 -
 http/webkitgtk/HISTORY                                                      |    4 
 http/webkitgtk3/DETAILS                                                     |    4 
 http/webkitgtk3/HISTORY                                                     |    3 
 kde4-apps/tellico2/DEPENDS                                                  |    2 
 kde4-apps/tellico2/HISTORY                                                  |    3 
 libs/libnfc/DEPENDS                                                         |    2 
 libs/libnfc/DETAILS                                                         |    4 
 libs/libnfc/HISTORY                                                         |    3 
 libs/libnfc/PREPARE                                                         |    8 -
 libs/liboauth/DETAILS                                                       |   16 ++
 libs/liboauth/HISTORY                                                       |    2 
 net/conntrack/BUILD                                                         |    2 
 net/conntrack/DETAILS                                                       |    4 
 net/conntrack/HISTORY                                                       |    3 
 net/conntrack/PREPARE                                                       |    9 -
 net/libnet/DETAILS                                                          |    4 
 net/libnet/HISTORY                                                          |    3 
 python-pypi/calibre/DETAILS                                                 |    2 
 python-pypi/calibre/HISTORY                                                 |    3 
 python-pypi/calibre/calibre-0.8.19.tar.gz.sig                               |    0 
 python-pypi/calibre/calibre-0.8.20.tar.gz.sig                               |binary
 python-pypi/pypdf/DETAILS                                                   |    4 
 python-pypi/pypdf/HISTORY                                                   |    3 
 python-pypi/werkzeug/DETAILS                                                |    4 
 python-pypi/werkzeug/HISTORY                                                |    3 
 shell-term-fm/mc/DETAILS                                                    |    6 
 shell-term-fm/mc/HISTORY                                                    |    4 
 shell-term-fm/mc/PRE_BUILD                                                  |    3 
 shell-term-fm/mc/ctrl-x.patch                                               |   38 -----
 utils/openmoko-dfu-util/DETAILS                                             |    2 
 utils/openmoko-dfu-util/HISTORY                                             |    3 
 utils/openmoko-dfu-util/PREPARE                                             |    3 
 utils/vbtracetool/DETAILS                                                   |    2 
 utils/vbtracetool/HISTORY                                                   |    3 
 utils/vbtracetool/PREPARE                                                   |    4 
 video-libs/libebml/DETAILS                                                  |    2 
 video-libs/libebml/HISTORY                                                  |    3 
 video-libs/libebml/libebml-1.2.1.tar.bz2.sig                                |    0 
 video-libs/libebml/libebml-1.2.2.tar.bz2.sig                                |binary
 video-libs/libmatroska/DETAILS                                              |    4 
 video-libs/libmatroska/HISTORY                                              |    3 
 x11-toolkits/rep-gtk2/DETAILS                                               |    6 
 x11-toolkits/rep-gtk2/HISTORY                                               |    5 
 x11-toolkits/rep-gtk2/rep-gtk-0.90.4.tar.bz2.sig                            |    0 
 x11-toolkits/rep-gtk2/rep-gtk-0.90.7.tar.bz2.sig                            |binary
 x11/x2goclient-cli/DEPENDS                                                  |    2 
 x11/x2goclient-cli/HISTORY                                                  |    3 
 157 files changed, 459 insertions(+), 454 deletions(-)

New commits:
commit 8f81adec2692f07ee8946ae86a7ae36a00695764
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    werkzeug: => 0.8

commit cc95d3e2692013503840c1bfae858d98a90da0e8
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libisoburn: => 1.1.6

commit 2ca05340e042800b63a6652c4661d1ef2d7f6e53
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libisofs: => 1.1.6

commit b9193bf97b6d5d856a3d87817c0b3031364a8ace
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libburn: => 1.1.6

commit 194156c32c8db20e6e9e3ccf9228e260aa114466
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pycairo: => 1.10.0

commit b613cc13f856760be25bd56d8809227ead9d10cf
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    pypdf: => 1.13

commit 76ebd1dd48b16762f0484763682d4214e4839c3e
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    libnet: => 1.1.5

commit f83cf46afeef37275abecd8c36842d935bbedc9c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    seamonkey 2.4.1

commit 12b4996824c20413ed625425d09c367c579d2dd5
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    firefox: Updated to version 7.0

commit a3a8b54631d3fbf3022bdd19e0930c18b15a5247
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    dillo: Updated to version 3.0.1.  Trying to get away from creating a dillo3.

commit ff5c6b0441e191ba317d12e9db681fcdaceb8212
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libisofs: Use prepare_select_branch

commit 478d127bc50d3066108ed5c47f839818bb7d9e24
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libisoburn: Use prepare_select_branch

commit df095e12d0991c438084a5a17c695f6a3877b458
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libburn: Use prepare_select_branch

commit d8128dd2ab29ae77f6ae19a55a0001fcf71f3681
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libnfc: Use prepare_select_branch

commit d240000c6de1b3a7c56baace9e57ba8d5d8e3edf
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    surf: Use prepare_select_branch

commit eb85528cd7af6fb0d2f697fd9cf6609e45527e5c
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    openmoko-dfu-util: Use prepare_select_branch

commit 06ccc7e493fb3684f95eea77d4ab9820bc53df77
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    vbtracetool: Use prepare_select_branch

commit 138d4ebf6874af613e579afc51fff2cd839591bc
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    blender_cvs: Use prepare_select_branch

commit ed4f7d071eb01d5cb6c4ab0ea9aca5ddd2da1ca7
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    portaudio19: Use prepare_select_branch

commit 448f97c6a8c23807c1f31d4c4665efbf386e0027
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    portaudio19: Remove DOWNLOAD

commit c236f0453940d023d172a054a9e90a298126945d
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    elinks: Use prepare_select_branch

commit fb59f2bd585e191cda9e4d9a94006aa73de848ae
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    qjackctl: Use prepare_select_branch

commit 461c261e8804f1fe9cfe33347c9fdab24ad7badf
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    jack2: Use prepare_select_branch

commit a74cc4e80305436b288dd3cc6ff39efc5ebf675d
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    jack: Use prepare_select_branch

commit 35a75e569aa31f10560e0ccb4f60491e4e797bab
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libffado: Word-wrap long description to 80 characters

commit 36b67f3e4d005c81ad55ac349458961bc107abd8
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    libffado: Use prepare_select_branch

commit 53634020b4dabb17d85c095309e247f6cb8fec4f
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    conntrack: Use prepare_select_branch

commit b8f53c33952e730a0cfba327ae8e516030438ce5
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    faad2: Use prepare_select_branch

commit 5b78435e4bd580865d813885884acc32d8ce3a5e
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    audacity: Use prepare_select_branch

commit 3a3d8f81e55fda8a0f215890f9c7901e5d7f77d6
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    gcl: Use prepare_select_branch

commit 56035635f442f244d9b46e01d4bd3762ef1e653e
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    emacs: scm branch requires to run autogen.sh

commit 0cc05f3115efcbc712f5a7ed30e3f37b37b8381c
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    libs/liboauth: new spell, OAuth.net API implementation

commit 0264cd6677e13d1b5d15e3cf62a2046c984f8698
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome3-libs/gnome-online-accounts: ChangeLog entry and WEB_SITE fixed

commit 66c018ca10335249841b12b515a730cf249260a8
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome3-libs/gnome-online-accounts: new spell, interfaces to access the
    user's online accounts

commit bd4ba28848527d72ea5f4116fb989bc517f8fa6e
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    ChangeLog: rest mentioned

commit 0ba1e7a58699f43853c0f2a95b7852fcd6bf4960
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome3-libs/rest: new spell, RESTful web api query library

commit a87308701f036ee50a9b7ee727e0e5a360250b3b
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    webkitgtk 1.6.1

commit b4c06c9ae5ed18ffab736ddeb2845bfd32e5a9ef
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    webkitgtk3 1.6.1

commit 0b5ab2296a844ab0ad14cee4fbb1da039f98b1d6
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    calibre: updated to 0.8.20

commit ac816cbce0862ec6e9b04a6f8cba3f3ba0ee0e7a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    gnome3-libs/cogl: new spell, library for using 3D graphics hardware for
    rendering

commit ddb56cad0ae7b5ddae69f9b7ea6f8bbbf9f437cc
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    ftp/puregui: removed (no upstream support & unavailable dependency)
    
    fixes #257

commit 39233b09b22c6d4a911a94225fbe6a4cfe17e622
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    gtkdialog: updated spell to 0.8.0
    
    * DETAILS: Fixed SOURCE_URL[0] & WEB_SITE
    * DEPENDS: fixed, it needs libglade2 and gtk+2 (fixes #256)

commit c8524d8e6e50005eb07a169046eddbbd091d44dc
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    mc 4.7.5.5

commit ad83e3be69a7f491fe531ef03aadb7636f85f3e1
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    seamonkey: updated spell to 2.4

commit 50c7b1358e0dd5b8b26b20b87c6af8846eaa1a46
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    tellico2: added exempi as optional dependency

commit 02527bb17f98e324ac5cad5903dbc16f7b777e77
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    poppler: updated spell to 0.18.0

commit f968e277eed68f748275e53815f951786a61347f
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    graphics-libs/poppler: fixed scm check in PRE_BUILD

commit 886bf48622a2287a8b9b8bdc6aa9a2817aefa2d7
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    libmatroska: updated spell to 1.3.0

commit c3c0a4e710cdf69c34afe457fb02b36456cecfb0
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    libebml: updated spell to 1.2.2

commit 8de4522da45dc74c7760b2b71061346f12f9e782
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    irssi: fixed the ordering in DETAILS so SOURCE exists before SOURCE2
    uses it

commit 7b31d3500dcffc78707a2159d43c153af3153894
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    x2goclient-cli: nxproxy -> nx (fixes #258)

commit b5dae9fcc3ff55831338c53e8cb80a8d8dac74d1
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    rep-gtk2: updated to 0.90.7

commit f1b516981058365f5f24bc8647b833fc25702c94
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    gdk-pixbuf2: updated to 2.24.0

commit 0ce59b54febdd2b2183191ffaebc5d9d1e105350
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    librep2: updated to 0.92.1b

diff --git a/ChangeLog b/ChangeLog
index 8fc9e87..54abef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* gnome3-libs/cogl: new spell
+	  library for using 3D graphics hardware for rendering
+	* gnome3-libs/rest: new spell, RESTful web api query library
+	* gnome3-libs/gnome-online-accounts: new spell
+	  interfaces to access the user's online accounts
+	* libs/liboauth: new spell, OAuth.net API implementation
+
+2011-09-28 Bor Kraljič <pyrobor at ver.si>
+	* ftp/puregui: removed (no upstream support & unavailable dependency)
+
 2011-09-26 Treeve Jelbert <treeve at sourcemage.org>
 	* doc/ebook-tools: new spell - tools for converting ebook formats
 	  can be used by okular
diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index 25511c3..6ed6b89 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -2,10 +2,7 @@ if [ "$AUDACITY_UNI" == "y" ]; then
    OPTS="$OPTS --enable-unicode"
 fi &&
 
-if [ "$AUDACITY_REL" == "beta" ]; then
-   OPTS="$AUDACITY_SOUNDTOUCH $OPTS"
-fi &&
-
+OPTS="$AUDACITY_SOUNDTOUCH $OPTS" &&
 OPTS="$AUDACITY_LADSPA $OPTS"    &&
 OPTS="$AUDACITY_PORTMIXER $OPTS" &&
 OPTS="$AUDACITY_PORTAUDIO $OPTS" &&
diff --git a/audio-creation/audacity/CONFIGURE b/audio-creation/audacity/CONFIGURE
index 3599097..1d24841 100755
--- a/audio-creation/audacity/CONFIGURE
+++ b/audio-creation/audacity/CONFIGURE
@@ -1,10 +1,11 @@
-if [ "$AUDACITY_REL" == "beta" ]; then
-      config_query_option  AUDACITY_SOUNDTOUCH  "Compile with SoundTouch (for tempo, \
-pitch, and playback rate processing)?"  y   \
+case "$AUDACITY_BRANCH" in
+  beta|scm)
+    config_query_option  AUDACITY_SOUNDTOUCH \
+      "Compile with SoundTouch (tempo/pitch/rate processing)?"  y \
                      "--without-soundtouch"  "--without-soundtouch" &&
-config_query_option  AUDACITY_PORTAUDIO  "Compile with PortAudio v19?"  y \
+    config_query_option  AUDACITY_PORTAUDIO  "Compile with PortAudio v19?"  y \
                      "--with-portaudio=v19" "--with-portaudio=v18"
-fi &&
+esac &&
 
 config_query_option  AUDACITY_NYQUIST  "Compile with Nyquist plug-in support?"  y  \
                      "--enable-nyquist"  "--disable-nyquist"          &&
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index b608233..93407a8 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,11 +1,11 @@
 depends  zip    &&
-if [ "$AUDACITY_REL" == "current" ]; then
-  depends  wxgtk-no-unicode
+if [[ "$AUDACITY_BRANCH" == "current" ]]; then
+  depends wxgtk-no-unicode
 else
   depends wxgtk
 fi &&
 depends  lame   &&
-if [ "$AUDACITY_REL" == "beta" ]; then
+if [[ "$AUDACITY_BRANCH" != "current" ]]; then
    depends libsndfile
 else
    optional_depends  libsndfile                  \
@@ -13,7 +13,7 @@ else
                   "--with-libsndfile=local"   \
                   "to use system libsndfile"
 fi  &&
-if [ "$AUDACITY_REL" == "cvs" ]; then
+if [[ "$AUDACITY_BRANCH == "scm" ]; then
    depends CVS
 fi  &&
 
@@ -52,17 +52,17 @@ optional_depends  libsamplerate                   \
                   "--without-libsamplerate"       \
                   "to use external libsamplerate" &&
 
-if [ "$AUDACITY_REL" == "current" ]; then
+if [[ "$AUDACITY_BRANCH" == "current" ]]; then
 optional_depends soundtouch    \
                  "--with-soundtouch=system"  \
                  "--with-soundtouch=local"    \
                  "to use external soundtouch for editing"
 fi  &&
 
-if [ "$AUDACITY_REL" == "beta" ] || [ "$AUDACITY_REL" == "cvs" ]; then
-  optional_depends vamp-plugin-sdk "--enable-vamp"  "--disable-vamp" \
+case "$AUDACITY_BRANCH" in beta|scm)
+    optional_depends vamp-plugin-sdk "--enable-vamp"  "--disable-vamp" \
                             "Compile with vamp plug-in support?"
-fi  &&
+;; esac &&
 
 optional_depends  LIBAVCODEC                              \
                   "--with-ffmpeg"                         \
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 486c0c6..2980c83 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -1,6 +1,7 @@
            SPELL=audacity
-if [ "$AUDACITY_REL" == "cvs" ]; then
-    if [ "$AUD_CVS_AUTOUPDATE" == "y" ]; then
+case "$AUDACITY_BRANCH"
+in scm)
+    if [ "$AUDACITY_AUTOUPDATE" == "y" ]; then
          VERSION=$(date +%Y%m%d)
     else
          VERSION=cvs
@@ -10,23 +11,19 @@ if [ "$AUDACITY_REL" == "cvs" ]; then
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-else
-     if [ "$AUDACITY_REL" == "beta" ]; then
+;; beta)
          VERSION=1.3.12-beta
      SOURCE_HASH=sha512:9b343c7fa3d5d3e92cd2ebc0e1b4f6736dd8a21f14bb06c72def2aa9751b5d6b6a79d4028c09687231c7e02856fdcc78724017ee33ce9457b018c2143a83105b
           SOURCE=$SPELL-minsrc-$VERSION.tar.bz2
       SOURCE_URL=http://audacity.googlecode.com/files/${SOURCE}
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
-     else
+;; current)
          VERSION=1.2.6
           SOURCE=${SPELL}-src-${VERSION}.tar.gz  
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      SOURCE_HASH=sha512:710d030a3b6914a89092d3113c7b7087f018a658c47c2e72aa66518538dfcb4a5ebb99d90b1fedec8e591b9287d3cc62aea24e3a583e439a935f0990788835f1
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
-    
-fi
-     
-fi
+;; esac
         WEB_SITE=http://audacity.sourceforge.net/
          ENTERED=20011217
       LICENSE[0]=GPL
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 6f7f8f5..c0dc4d8 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, CONFIGURE, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2010-09-11 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.3.12
 
diff --git a/audio-creation/audacity/PREPARE b/audio-creation/audacity/PREPARE
index 8b96dd3..9b808a1 100755
--- a/audio-creation/audacity/PREPARE
+++ b/audio-creation/audacity/PREPARE
@@ -1,6 +1,3 @@
-config_query_list AUDACITY_REL "Which release?" current beta cvs
-if [ "$AUDACITY_REL" == "cvs" ]; then
-  config_query AUD_CVS_AUTOUPDATE  \
-               "Update to the latest CVS automatically on every cast?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch current beta scm &&
 config_query AUDACITY_UNI "Enable unicode support?" n
diff --git a/audio-drivers/jack/DEPENDS b/audio-drivers/jack/DEPENDS
index 88204f3..947dee1 100755
--- a/audio-drivers/jack/DEPENDS
+++ b/audio-drivers/jack/DEPENDS
@@ -1,4 +1,4 @@
-if [[ $JACK_VCS == y ]]
+if [[ $JACK_BRANCH == scm ]]
 then
   depends  subversion  &&
   depends  libtool     &&
diff --git a/audio-drivers/jack/DETAILS b/audio-drivers/jack/DETAILS
index 8b467d1..7a6714e 100755
--- a/audio-drivers/jack/DETAILS
+++ b/audio-drivers/jack/DETAILS
@@ -1,7 +1,7 @@
            SPELL=jack
-if [[ $JACK_VCS == y ]]
+if [[ $JACK_BRANCH == scm ]]
 then
-  if [[ $JACK_VCS_AUTOUPDATE == y ]]
+  if [[ $JACK_AUTOUPDATE == y ]]
   then
          VERSION=$(date +%Y%m%d)
   else
diff --git a/audio-drivers/jack/HISTORY b/audio-drivers/jack/HISTORY
index 7471282..d7d249c 100644
--- a/audio-drivers/jack/HISTORY
+++ b/audio-drivers/jack/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2008-12-06 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: Updated to 0.116.1.
 
diff --git a/audio-drivers/jack/PREPARE b/audio-drivers/jack/PREPARE
index e272094..98d27e4 100755
--- a/audio-drivers/jack/PREPARE
+++ b/audio-drivers/jack/PREPARE
@@ -1,7 +1,2 @@
-config_query  JACK_VCS  "Build latest version from development tree?"  n  &&
-
-if  [[ $JACK_VCS == y ]]
-then
-  config_query  JACK_VCS_AUTOUPDATE  \
-                "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
index f1eb6c0..6c4f58f 100755
--- a/audio-drivers/jack2/DEPENDS
+++ b/audio-drivers/jack2/DEPENDS
@@ -3,7 +3,7 @@ depends  expat      &&
 depends -sub CXX gcc        &&
 depends  python     &&
 
-if [[ $JACK2_VCS == y ]]; then
+if [[ $JACK2_BRANCH == scm ]]; then
   depends  subversion
 fi &&
 
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index adad650..4a0265c 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=jack2
-if [[ $JACK2_VCS == y ]]; then
-  if [[ $JACK2_VCS_AUTOUPDATE == y ]]; then
+if [[ $JACK2_BRANCH == scm ]]; then
+  if [[ $JACK2_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=svn
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 9ce243a..5632568 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-09-10 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: updated spell to 1.9.7
 	* DEPENDS: enable firewire and ALSA support explicitly
diff --git a/audio-drivers/jack2/PREPARE b/audio-drivers/jack2/PREPARE
index 40c9f28..98d27e4 100755
--- a/audio-drivers/jack2/PREPARE
+++ b/audio-drivers/jack2/PREPARE
@@ -1,6 +1,2 @@
-config_query JACK2_VCS "Build latest version from development tree?" n &&
-
-if [[ $JACK2_VCS == y ]]; then
-  config_query JACK2_VCS_AUTOUPDATE \
-               "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/libffado/DETAILS b/audio-drivers/libffado/DETAILS
index 25fd629..b6be679 100755
--- a/audio-drivers/libffado/DETAILS
+++ b/audio-drivers/libffado/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libffado
-if [[ "$FFADO_VCS" == y ]]; then
-  if [[ "$FFADO_VCS_AUTOUPDATE" == y ]]; then
+if [[ "$LIBFFADO_BRANCH" == scm ]]; then
+  if [[ "$LIBFFADO_AUTOUPDATE" == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=svn
@@ -22,5 +22,7 @@ fi
       LICENSE[0]=GPL
            SHORT="FireWire audio driver"
 cat << EOF
-The FFADO project aims to provide a generic, open-source solution for the support of FireWire based audio devices for the Linux platform. It is the successor of the FreeBoB project.
+The FFADO project aims to provide a generic, open-source solution for the
+support of FireWire based audio devices for the Linux platform. It is the
+successor of the FreeBoB project.
 EOF
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index c3d63c2..4873ac4 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,7 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+	* DETAILS: Word-wrap long description to 80 characters
+
 2011-09-10 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: Update to release version 2.0.1 (works with juju stack).
 
diff --git a/audio-drivers/libffado/PREPARE b/audio-drivers/libffado/PREPARE
index aee38b2..98d27e4 100755
--- a/audio-drivers/libffado/PREPARE
+++ b/audio-drivers/libffado/PREPARE
@@ -1,5 +1,2 @@
-config_query  FFADO_VCS  "Build development version?" n
-if  [[ $FFADO_VCS = y ]]; then
-config_query  FFADO_VCS_AUTOUPDATE  \
-              "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/portaudio19/DEPENDS b/audio-drivers/portaudio19/DEPENDS
index 70763c6..09f217a 100755
--- a/audio-drivers/portaudio19/DEPENDS
+++ b/audio-drivers/portaudio19/DEPENDS
@@ -1,6 +1,5 @@
-if [[ $PORTAUDIO19_VERSION  == svn ]]; then
+if [[ $PORTAUDIO19_BRANCH  == scm ]]; then
   depends  subversion
 fi                     &&
 optional_depends alsa-lib "--with-alsa" "--without-alsa" "for alsa sound support"
 optional_depends JACK-DRIVER "--with-jack" "--without-jack" "for jack support"
-
diff --git a/audio-drivers/portaudio19/DETAILS b/audio-drivers/portaudio19/DETAILS
index 54c7b15..839cec0 100755
--- a/audio-drivers/portaudio19/DETAILS
+++ b/audio-drivers/portaudio19/DETAILS
@@ -1,7 +1,7 @@
            SPELL=portaudio19
-case ${PORTAUDIO19_VERSION} in
-    svn)
-if  [[  "$PORTAUDIO19_CVS_AUTOUPDATE"  ==  "y"  ]];  then
+case ${PORTAUDIO19_BRANCH} in
+    scm)
+if  [[  "$PORTAUDIO19_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=cvs
diff --git a/audio-drivers/portaudio19/DOWNLOAD b/audio-drivers/portaudio19/DOWNLOAD
deleted file mode 100755
index 39bb73c..0000000
--- a/audio-drivers/portaudio19/DOWNLOAD
+++ /dev/null
@@ -1,18 +0,0 @@
-if [[ $PORTAUDIO19_VERSION == svn ]] ; then
-if [ -f  $SOURCE_CACHE/$SOURCE ] ; then
-        rm  $SOURCE_CACHE/$SOURCE
-fi
-
-message "${MESSAGE_COLOR}Starting SVN checkout of ${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
-
-svn co https://www.portaudio.com/repos/portaudio/branches/v19-devel . &&
-mv v19-devel $SPELL-$VERSION &&
-
-tar -jcf $SOURCE $SPELL-$VERSION &&
-
-mv $SOURCE $SOURCE_CACHE/$SOURCE &&
-
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-else
-default_download
-fi
diff --git a/audio-drivers/portaudio19/HISTORY b/audio-drivers/portaudio19/HISTORY
index 2a4182e..da654e7 100644
--- a/audio-drivers/portaudio19/HISTORY
+++ b/audio-drivers/portaudio19/HISTORY
@@ -1,3 +1,7 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DOWNLOAD: Removed, now sorcery supports Subversion URLs
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2009-01-30 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: stable_v19_20071207
 
diff --git a/audio-drivers/portaudio19/PREPARE b/audio-drivers/portaudio19/PREPARE
index d57fc5c..6c4e533 100755
--- a/audio-drivers/portaudio19/PREPARE
+++ b/audio-drivers/portaudio19/PREPARE
@@ -1,4 +1,2 @@
-config_query_list PORTAUDIO19_VERSION "Which v19 version ?" stable snapshot
-if [[ $PORTAUDIO19_VERSION == svn ]]; then
-config_query  PORTAUDIO19_CVS_AUTOUPDATE  "Automatically update $SPELL on system-update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable snapshot scm
diff --git a/audio-libs/faad2/DEPENDS b/audio-libs/faad2/DEPENDS
index 6d95a99..f5c35ab 100755
--- a/audio-libs/faad2/DEPENDS
+++ b/audio-libs/faad2/DEPENDS
@@ -8,7 +8,7 @@ if [ "$XMMS" = "y" ]; then
   depends  id3lib
 fi
 
-if [ "$FAAD_CVS" = "y" ]; then
+if [ "$FAAD2_BRANCH" = "scm" ]; then
   depends  CVS
 fi
 
diff --git a/audio-libs/faad2/DETAILS b/audio-libs/faad2/DETAILS
index 2b0c5c0..f0b6864 100755
--- a/audio-libs/faad2/DETAILS
+++ b/audio-libs/faad2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=faad2
-if [ "$FAAD_CVS" = "y" ]; then
-  if [ "$FAAD_CVS_AUTOUPDATE" = "y" ]; then
+if [ "$FAAD2_BRANCH" = "scm" ]; then
+  if [ "$FAAD2_AUTOUPDATE" = "y" ]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=cvs
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index e7dd003..e80a965 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/audio-libs/faad2/PREPARE b/audio-libs/faad2/PREPARE
index 433d8ff..98d27e4 100755
--- a/audio-libs/faad2/PREPARE
+++ b/audio-libs/faad2/PREPARE
@@ -1,4 +1,2 @@
-config_query FAAD_CVS "Build CVS version?" n
-if [ "$FAAD_CVS" == "y" ]; then
-  config_query FAAD_CVS_AUTOUPDATE "Update to the latest CVS on every cast?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index 5902cc6..8b51f51 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -4,7 +4,7 @@ depends  libxext   &&
 depends -sub CXX gcc       &&
 depends  qt4       &&
 
-if [[ $QJCTL_VCS == y ]]
+if [[ $QJACKCTL_BRANCH == scm ]]
 then
   depends  autoconf  &&
   depends  CVS
diff --git a/audio-soft/qjackctl/DETAILS b/audio-soft/qjackctl/DETAILS
index 5fcd51e..137c595 100755
--- a/audio-soft/qjackctl/DETAILS
+++ b/audio-soft/qjackctl/DETAILS
@@ -1,7 +1,7 @@
            SPELL=qjackctl
-if [[ $QJCTL_VCS == y ]]
+if [[ $QJACKCTL_BRANCH == scm ]]
 then
-  if [[ $QJCTL_VCS_AUTOUPDATE == y ]]
+  if [[ $QJACKCTL_AUTOUPDATE == y ]]
   then
          VERSION=$(date +%Y%m%d)
   else
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index d5af4d8..b390281 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/audio-soft/qjackctl/PREPARE b/audio-soft/qjackctl/PREPARE
index d008945..98d27e4 100755
--- a/audio-soft/qjackctl/PREPARE
+++ b/audio-soft/qjackctl/PREPARE
@@ -1,7 +1,2 @@
-config_query  QJCTL_VCS  "Build latest version from development tree?"  n  &&
-
-if  [[ $QJCTL_VCS == y ]]
-then
-  config_query  QJCTL_VCS_AUTOUPDATE  \
-                "Update automatically on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 8f6e7a0..40db363 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -14,11 +14,11 @@ else
          VERSION=0.8.15
   SECURITY_PATCH=1
    SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
+          SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
   SOURCE2_URL[0]=http://www.irssi.org/files/$SOURCE2
   SOURCE2_IGNORE=signature
       SOURCE_GPG=irssi.gpg:$SOURCE.sig:VERIFIED_UPSTREAM_KEY
-          SOURCE=$SPELL-$VERSION.tar.bz2
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.irssi.org
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 37f0c77..187baca 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,7 @@
+2011-09-27 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: fixed the fix ;) SOURCE has to exist before
+	  SOURCE2=$SOURCE.sig can be used.
+
 2011-09-20 Ismael Luceno <ismael at sourcemage.org>
 	* DETAILS: Fixed SOURCE for scm branch
 
diff --git a/devel/gcl/DETAILS b/devel/gcl/DETAILS
index 25a8b40..b247906 100755
--- a/devel/gcl/DETAILS
+++ b/devel/gcl/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gcl
-if  [ "$CVS"  ==  "y" ];  then
-    if [ "$CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$GCL_BRANCH" == "scm" ]]; then
+    if [[ "$GCL_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
     else
 	 VERSION=cvs
diff --git a/devel/gcl/HISTORY b/devel/gcl/HISTORY
index 5a82780..67c88b1 100644
--- a/devel/gcl/HISTORY
+++ b/devel/gcl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-09-27 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS: fix dependency on emacsen
 
diff --git a/devel/gcl/PREPARE b/devel/gcl/PREPARE
index 5aadf26..91a5ee1 100755
--- a/devel/gcl/PREPARE
+++ b/devel/gcl/PREPARE
@@ -1,5 +1,4 @@
 echo  "If you can build the stable version, please let us know!"
-config_query  CVS  "Use the CVS version?" y
-if [ "$CVS" == "y" ]; then
-  config_query CVS_AUTOUPDATE "Update to the latest CVS automatically on every cast?" n
-fi
+
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/libburn/DEPENDS b/disk/libburn/DEPENDS
index 4cd348f..096d8a8 100755
--- a/disk/libburn/DEPENDS
+++ b/disk/libburn/DEPENDS
@@ -1,6 +1,6 @@
 depends pkgconfig &&
 
-if [[ $LIBBURN_SVN == y ]]; then
+if [[ $LIBBURN_BRANCH == scm ]]; then
   depends libtool &&
   depends automake &&
   depends autoconf &&
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 18151bc..1292eca 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libburn
-if [[ $LIBBURN_SVN == y ]]; then
+if [[ $LIBBURN_BRANCH == scm ]]; then
   if [[ $LIBBURN_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
@@ -12,7 +12,7 @@ if [[ $LIBBURN_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=1.1.4
+         VERSION=1.1.6
   SOURCE2_IGNORE=signature
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index 65c5360..5146931 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,9 @@
+2011-09-30 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.1.6
+
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-09-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: converted to upstream signature checking
 	* ABC0A854.gpg: added gpg keyring
diff --git a/disk/libburn/PREPARE b/disk/libburn/PREPARE
index 3e2fb9d..98d27e4 100755
--- a/disk/libburn/PREPARE
+++ b/disk/libburn/PREPARE
@@ -1,6 +1,2 @@
-config_query LIBBURN_SVN "Download latest code?" n &&
-
-if [[ $LIBBURN_SVN == y ]]; then
-  config_query LIBBURN_AUTOUPDATE \
-          "Automaticaly update the spell on sorcery queue/system-update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/libisoburn/DETAILS b/disk/libisoburn/DETAILS
index 9b001c6..88e5627 100755
--- a/disk/libisoburn/DETAILS
+++ b/disk/libisoburn/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libisoburn
-if [[ $LIBISOBURN_SVN == y ]]; then
+if [[ $LIBISOBURN_BRANCH == scm ]]; then
   if [[ $LIBISOBURN_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
@@ -12,7 +12,7 @@ if [[ $LIBISOBURN_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=1.1.4
+         VERSION=1.1.6
   SOURCE2_IGNORE=signature
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/disk/libisoburn/HISTORY b/disk/libisoburn/HISTORY
index 05e2f7b..f38f50c 100644
--- a/disk/libisoburn/HISTORY
+++ b/disk/libisoburn/HISTORY
@@ -1,3 +1,9 @@
+2011-09-30 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.1.6
+
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2011-09-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: converted to upstream signature checking
 	* ABC0A854.gpg: added gpg keyring
diff --git a/disk/libisoburn/PREPARE b/disk/libisoburn/PREPARE
index 2541830..98d27e4 100755
--- a/disk/libisoburn/PREPARE
+++ b/disk/libisoburn/PREPARE
@@ -1,6 +1,2 @@
-config_query LIBISOBURN_SVN "Download latest code?" n &&
-
-if [[ $LIBISOBURN_SVN == y ]]; then
-  config_query LIBISOBURN_AUTOUPDATE \
-          "Automaticaly update the spell on sorcery queue/system-update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/libisofs/DEPENDS b/disk/libisofs/DEPENDS
index ae41d9d..41072ec 100755
--- a/disk/libisofs/DEPENDS
+++ b/disk/libisofs/DEPENDS
@@ -1,7 +1,7 @@
 depends libburn &&
 depends pkgconfig &&
 
-if [[ $LIBISOFS_SVN == y ]]; then
+if [[ $LIBISOFS_BRANCH == scm ]]; then
   depends libtool &&
   depends automake &&
   depends autoconf &&
diff --git a/disk/libisofs/DETAILS b/disk/libisofs/DETAILS
index 5fdac2e..bad4839 100755
--- a/disk/libisofs/DETAILS
+++ b/disk/libisofs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libisofs
-if [[ $LIBISOFS_SVN == y ]]; then
+if [[ $LIBISOFS_BRANCH == scm ]]; then
   if [[ $LIBISOFS_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
@@ -12,7 +12,7 @@ if [[ $LIBISOFS_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=1.1.4
+         VERSION=1.1.6
   SOURCE2_IGNORE=signature
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/disk/libisofs/HISTORY b/disk/libisofs/HISTORY
index 0ca4d6c..24d24a1 100644
--- a/disk/libisofs/HISTORY
+++ b/disk/libisofs/HISTORY
@@ -1,3 +1,9 @@
+2011-09-30 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.1.6
+
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-09-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: converted to upstream signature checking
 	* ABC0A854.gpg: added gpg keyring
diff --git a/disk/libisofs/PREPARE b/disk/libisofs/PREPARE
index f79bb82..98d27e4 100755
--- a/disk/libisofs/PREPARE
+++ b/disk/libisofs/PREPARE
@@ -1,6 +1,2 @@
-config_query LIBISOFS_SVN "Download latest code?" n &&
-
-if [[ $LIBISOFS_SVN == y ]]; then
-  config_query LIBISOFS_AUTOUPDATE \
-          "Automaticaly update the spell on sorcery queue/system-update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/editors/emacs/BUILD b/editors/emacs/BUILD
index eca6106..6cc5d4d 100755
--- a/editors/emacs/BUILD
+++ b/editors/emacs/BUILD
@@ -17,6 +17,7 @@ if [[ "$EMACS_BRANCH" == "scm" ]]; then
 
   [[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
 
+  ./autogen.sh &&
   ./configure --prefix=${INSTALL_ROOT}/usr  \
               --sysconfdir=${INSTALL_ROOT}/etc  \
               --localstatedir=${INSTALL_ROOT}/var  \
diff --git a/editors/emacs/HISTORY b/editors/emacs/HISTORY
index 397ad26..62a724c 100644
--- a/editors/emacs/HISTORY
+++ b/editors/emacs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-28 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD: scm branch requires to run autogen.sh
+
 2011-09-22 Ismael Luceno <ismael at sourcemage.org>
 	* BUILD, DEPENDS, DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch
 
diff --git a/ftp/puregui/DEPENDS b/ftp/puregui/DEPENDS
deleted file mode 100755
index 3675c71..0000000
--- a/ftp/puregui/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends  gtk+      &&
-depends  glade     &&
-depends  pure-ftpd &&
-depends  automake
diff --git a/ftp/puregui/DETAILS b/ftp/puregui/DETAILS
deleted file mode 100755
index ce0def1..0000000
--- a/ftp/puregui/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-           SPELL=puregui
-         VERSION=0.3.5
-          SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:f875cab8fd37e788231a0d50d87eacc16fc7943c1e3118dd8a8bf3310e0f6a76e509a77f147edf2978447447a757c54e847b132ea45fa64edfb370619ee47322
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-   SOURCE_URL[0]=$SOURCEFORGE_URL/pureftpd/$SOURCE
-        WEB_SITE=http://pureftpd.sourceforge.net
-         ENTERED=20020209
-        KEYWORDS="ftp"
-           SHORT="Puregui is a GUI for configuring pure-ftpd FTP server."
-
-cat << EOF
-Puregui is a gui for configuring pure-ftpd FTP server.
-The goal is to have medium users to configure their
-server securely and conveniently, without the burden 
-of knowing tons of command line switches. 
-EOF
diff --git a/ftp/puregui/HISTORY b/ftp/puregui/HISTORY
deleted file mode 100644
index b89bdf6..0000000
--- a/ftp/puregui/HISTORY
+++ /dev/null
@@ -1,24 +0,0 @@
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed MAINTAINER.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2002-03-28 Eric Schabell <eric at schabell.com>
-	* Added MAINTAINER line.
-
-2002-03-18 M.L. <m.l at compaqnet.fr>
-	* Fixed broken install.sh
-
-2002-03-16 M.L. <m.l at compaqnet.fr>
-	* Added "depends automake" in DEPENDS
-
-2002-03-13 Eric Schabell <eric at schabell.com>
-	* Added this History file.
-
diff --git a/gnome2-apps/gtkdialog/DEPENDS b/gnome2-apps/gtkdialog/DEPENDS
index 1c1666d..db2c108 100755
--- a/gnome2-apps/gtkdialog/DEPENDS
+++ b/gnome2-apps/gtkdialog/DEPENDS
@@ -1 +1,2 @@
-depends glade 
+depends gtk+2 &&
+depends libglade2
diff --git a/gnome2-apps/gtkdialog/DETAILS b/gnome2-apps/gtkdialog/DETAILS
index 21d8ad1..22169e1 100755
--- a/gnome2-apps/gtkdialog/DETAILS
+++ b/gnome2-apps/gtkdialog/DETAILS
@@ -1,10 +1,10 @@
            SPELL=gtkdialog
-         VERSION=0.7.20
+         VERSION=0.8.0
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=ftp://linux.pte.hu/pub/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:af765dc9c24eeeba56efdc3418ffd4c5482586c717947483626f929810c25aed98e3247945a52de0c8b9f51777a6fd38797e248d157963dc54e25270ac551c15
+   SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
+     SOURCE_HASH=sha512:b098b63e5255c721258f6206aee361ff204875178b013c8873880ab81dd8a59469a2d211603d97e497b0f18d32663ef0e7ee1a99946511bdd8ce413a3d834cf7
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://linux.pte.hu/~pipas/gtkdialog/ "
+        WEB_SITE=http://code.google.com/p/gtkdialog/
       LICENSE[0]=GPL
          ENTERED=20080314
            SHORT="A GUI creation system for any language interpreter."
diff --git a/gnome2-apps/gtkdialog/HISTORY b/gnome2-apps/gtkdialog/HISTORY
index 217e4ff..4691d5b 100644
--- a/gnome2-apps/gtkdialog/HISTORY
+++ b/gnome2-apps/gtkdialog/HISTORY
@@ -1,3 +1,8 @@
+2011-09-28 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.8.0
+	  Fixed SOURCE_URL[0] & WEB_SITE
+	* DEPENDS: fixed, it needs libglade2 and gtk+2 (fixes #256)
+
 2008-03-14 Justin Boffemmyer <flux at sourcemage.org>
 	* DEPENDS, DETAILS, HISTORY: spell created
 
diff --git a/gnome2-libs/gdk-pixbuf2/DETAILS b/gnome2-libs/gdk-pixbuf2/DETAILS
index 153a89d..77fdfef 100755
--- a/gnome2-libs/gdk-pixbuf2/DETAILS
+++ b/gnome2-libs/gdk-pixbuf2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gdk-pixbuf2
-         VERSION=2.22.1
+         VERSION=2.24.0
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=gdk-pixbuf-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdk-pixbuf-$VERSION
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
index aedd333..88e78b0 100644
--- a/gnome2-libs/gdk-pixbuf2/HISTORY
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -1,3 +1,6 @@
+2011-09-25 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 2.24.0
+
 2010-11-06 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.22.1
 
diff --git a/gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.22.1.tar.bz2.sig b/gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.22.1.tar.bz2.sig
deleted file mode 100644
index 8164f66..0000000
Binary files a/gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.22.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.24.0.tar.bz2.sig b/gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.24.0.tar.bz2.sig
new file mode 100644
index 0000000..d270230
Binary files /dev/null and b/gnome2-libs/gdk-pixbuf2/gdk-pixbuf-2.24.0.tar.bz2.sig differ
diff --git a/gnome2-libs/librep2/DETAILS b/gnome2-libs/librep2/DETAILS
index 6e812f7..edc6d2f 100755
--- a/gnome2-libs/librep2/DETAILS
+++ b/gnome2-libs/librep2/DETAILS
@@ -11,11 +11,11 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.91.0
+         VERSION=0.92.1b
           SOURCE=librep-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/librep-${VERSION}
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/librep/${SOURCE}
-   SOURCE_URL[1]=http://download.tuxfamily.org/sawfish/librep/${SOURCE}
+   SOURCE_URL[0]=http://download.tuxfamily.org/librep/${SOURCE}
+   SOURCE_URL[1]=${SOURCEFORGE_URL}/librep/${SOURCE}
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 fi
       LICENSE[0]=GPL
diff --git a/gnome2-libs/librep2/HISTORY b/gnome2-libs/librep2/HISTORY
index e7b176b..f03ecc8 100644
--- a/gnome2-libs/librep2/HISTORY
+++ b/gnome2-libs/librep2/HISTORY
@@ -1,3 +1,8 @@
+2011-09-25 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated to 0.92.1b
+	  changed SOURCE_URL[1] 
+	  swapped SOURCE_URL[0] and SOURCE_URL[1]
+
 2010-11-20 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: added SOURCE_URL[1]
 
diff --git a/gnome2-libs/librep2/librep-0.91.0.tar.bz2.sig b/gnome2-libs/librep2/librep-0.91.0.tar.bz2.sig
deleted file mode 100644
index e827084..0000000
Binary files a/gnome2-libs/librep2/librep-0.91.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/librep2/librep-0.92.1b.tar.bz2.sig b/gnome2-libs/librep2/librep-0.92.1b.tar.bz2.sig
new file mode 100644
index 0000000..53e94a6
Binary files /dev/null and b/gnome2-libs/librep2/librep-0.92.1b.tar.bz2.sig differ
diff --git a/gnome3-libs/cogl/DETAILS b/gnome3-libs/cogl/DETAILS
new file mode 100755
index 0000000..62e162e
--- /dev/null
+++ b/gnome3-libs/cogl/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=cogl
+         VERSION=1.8.0
+          BRANCH=$(echo $VERSION|cut -d . -f 1,2)
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      LICENSE[0]=GPL
+        WEB_SITE=http://developer.gnome.org/cogl/
+         ENTERED=20110929
+           SHORT="library for using 3D graphics hardware for rendering"
+cat << EOF
+Cogl is a small open source library for using 3D graphics hardware for
+rendering. The API departs from the flat state machine style of OpenGL and is
+designed to make it easy to write orthogonal components that can render without
+stepping on each others toes.
+EOF
diff --git a/gnome3-libs/cogl/HISTORY b/gnome3-libs/cogl/HISTORY
new file mode 100644
index 0000000..a0cac18
--- /dev/null
+++ b/gnome3-libs/cogl/HISTORY
@@ -0,0 +1,2 @@
+2011-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: spell created, version 1.8.0
diff --git a/gnome3-libs/cogl/cogl-1.8.0.tar.bz2.sig b/gnome3-libs/cogl/cogl-1.8.0.tar.bz2.sig
new file mode 100644
index 0000000..65b4eed
Binary files /dev/null and b/gnome3-libs/cogl/cogl-1.8.0.tar.bz2.sig differ
diff --git a/gnome3-libs/gnome-online-accounts/DEPENDS b/gnome3-libs/gnome-online-accounts/DEPENDS
new file mode 100755
index 0000000..39549bd
--- /dev/null
+++ b/gnome3-libs/gnome-online-accounts/DEPENDS
@@ -0,0 +1 @@
+depends rest
diff --git a/gnome3-libs/gnome-online-accounts/DETAILS b/gnome3-libs/gnome-online-accounts/DETAILS
new file mode 100755
index 0000000..4caac5d
--- /dev/null
+++ b/gnome3-libs/gnome-online-accounts/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=gnome-online-accounts
+         VERSION=3.2.0.1
+          BRANCH=$(echo $VERSION|cut -d . -f 1,2)
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      LICENSE[0]=GPL
+        WEB_SITE=http://developer.gnome.org/goa/
+         ENTERED=20110929
+           SHORT="interfaces to access the user's online accounts"
+cat << EOF
+gnome-online-accounts provides interfaces so applications and
+libraries in GNOME can access the user's online accounts.
+EOF
diff --git a/gnome3-libs/gnome-online-accounts/HISTORY b/gnome3-libs/gnome-online-accounts/HISTORY
new file mode 100644
index 0000000..de1ae53
--- /dev/null
+++ b/gnome3-libs/gnome-online-accounts/HISTORY
@@ -0,0 +1,2 @@
+2011-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, DEPENDS: spell created, version 3.2.0.1
diff --git a/gnome3-libs/gnome-online-accounts/gnome-online-accounts-3.2.0.1.tar.bz2.sig b/gnome3-libs/gnome-online-accounts/gnome-online-accounts-3.2.0.1.tar.bz2.sig
new file mode 100644
index 0000000..b77354d
Binary files /dev/null and b/gnome3-libs/gnome-online-accounts/gnome-online-accounts-3.2.0.1.tar.bz2.sig differ
diff --git a/gnome3-libs/rest/DETAILS b/gnome3-libs/rest/DETAILS
new file mode 100755
index 0000000..31165d8
--- /dev/null
+++ b/gnome3-libs/rest/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=rest
+         VERSION=0.7.10
+          BRANCH=$(echo $VERSION|cut -d . -f 1,2)
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      LICENSE[0]=GPL
+        WEB_SITE=http://developer.gnome.org/rest/
+         ENTERED=20110929
+           SHORT="RESTful web api query library"
+cat << EOF
+RESTful web api query library.
+EOF
diff --git a/gnome3-libs/rest/HISTORY b/gnome3-libs/rest/HISTORY
new file mode 100644
index 0000000..98ff819
--- /dev/null
+++ b/gnome3-libs/rest/HISTORY
@@ -0,0 +1,2 @@
+2011-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: spell created, version 0.7.10
diff --git a/gnome3-libs/rest/rest-0.7.10.tar.bz2.sig b/gnome3-libs/rest/rest-0.7.10.tar.bz2.sig
new file mode 100644
index 0000000..fbd22ec
Binary files /dev/null and b/gnome3-libs/rest/rest-0.7.10.tar.bz2.sig differ
diff --git a/graphics-libs/poppler/BUILD b/graphics-libs/poppler/BUILD
index d38dcc2..eceb7a1 100755
--- a/graphics-libs/poppler/BUILD
+++ b/graphics-libs/poppler/BUILD
@@ -1,4 +1,4 @@
-OPTS="$POPPLER_OPTS $OPTS --disable-poppler-qt" &&
+OPTS="$POPPLER_OPTS $OPTS" &&
 
 # -lm fixes the ./configure problem (http://www.sourcemage.org/issues/15)
 LDFLAGS="-lm $LDFLAGS" &&
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index c148a1c..5730864 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -37,8 +37,8 @@ optional_depends gtk+2 \
                  "for glib wrapper" &&
 
 optional_depends gobject-introspection \
-                 "--enable-introspection=yes" \
-                 "--enable-introspection=no" \
+                 "--enable-introspection" \
+                 "--disable-introspection" \
                  "for introspection support" &&
 
 
@@ -47,11 +47,6 @@ optional_depends -sub "TOOLS" qt4 \
                  "--disable-poppler-qt4" \
                  "for QT4 wrapper" &&
 
-optional_depends qt-x11 \
-                 "--enable-poppler-qt" \
-                 "--disable-poppler-qt" \
-                 "for QT3 wrapper" &&
-
 if spell_ok cairo; then
 optional_depends cairo \
                  "--enable-cairo-output" \
@@ -64,11 +59,6 @@ optional_depends curl \
                  "--disable-libcurl" \
                  "for libcurl based HTTP support" &&
 
-optional_depends abiword \
-                 "--enable-abiword-output" \
-                 "--disable-abiword-output" \
-                 "generate gtk-docs" &&
-
 optional_depends gtk-doc \
                  "--enable-gtk-doc" \
                  "--disable-gtk-doc" \
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index 7ecea4f..1490acc 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
 else
  if [[ $POPPLER_BRANCH == devel ]]; then
-         VERSION=0.16.7
-     SOURCE_HASH=sha512:a0f16f392f9f5703eef00b6c11e78e8cf21bf596c27d621fe824efe75cc0cf0637c4175469cb9214d5ba7de666c3131a5ef6040ba8ea9185e6120f92a59aaccc
+         VERSION=0.18.0
+     SOURCE_HASH=sha512:6c57645c9fc3512a09c48443cd7218b437984e33291313fc652b59162a120d7234c43910c0f1c56f4dde19cb367eb6e9dbad3d4744d41c67c3bca9f52459453b
  else
-         VERSION=0.16.7
-     SOURCE_HASH=sha512:a0f16f392f9f5703eef00b6c11e78e8cf21bf596c27d621fe824efe75cc0cf0637c4175469cb9214d5ba7de666c3131a5ef6040ba8ea9185e6120f92a59aaccc
+         VERSION=0.18.0
+     SOURCE_HASH=sha512:6c57645c9fc3512a09c48443cd7218b437984e33291313fc652b59162a120d7234c43910c0f1c56f4dde19cb367eb6e9dbad3d4744d41c67c3bca9f52459453b
  fi
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 3fdbdd8..a2a9196 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,10 @@
+2011-09-28 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.18.0
+	* DEPENDS, BUILD: support for abiword and qt4 was removed
+
+2011-09-27 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD: fixed scm branch check
+
 2011-09-22 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
 
diff --git a/graphics-libs/poppler/PRE_BUILD b/graphics-libs/poppler/PRE_BUILD
index f79b835..c851ff7 100755
--- a/graphics-libs/poppler/PRE_BUILD
+++ b/graphics-libs/poppler/PRE_BUILD
@@ -1,6 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-if [[ $POPPLER_VER == vcs ]]; then
+if [[ $POPPLER_BRANCH == scm ]]; then
   NOCONFIGURE=ON ./autogen.sh
 fi
diff --git a/graphics-libs/pycairo/BUILD b/graphics-libs/pycairo/BUILD
new file mode 100755
index 0000000..1d8ce04
--- /dev/null
+++ b/graphics-libs/pycairo/BUILD
@@ -0,0 +1 @@
+waf_build
diff --git a/graphics-libs/pycairo/DETAILS b/graphics-libs/pycairo/DETAILS
index 3afff4d..8ddc8a4 100755
--- a/graphics-libs/pycairo/DETAILS
+++ b/graphics-libs/pycairo/DETAILS
@@ -1,9 +1,10 @@
            SPELL=pycairo
           SPELLX=py2cairo
-         VERSION=1.8.10
-          SOURCE=$SPELLX-$VERSION.tar.gz
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+         VERSION=1.10.0
+          SOURCE=$SPELLX-$VERSION.tar.bz2
+     SOURCE_HASH=sha512:cb3d54de9af4134460ce731da8166a3127a642c8a2e6184109437ddec115cd55b8dd2413a5c81700277bfe2f22fcfe268db4f3ba0f7649751e85bb34295f79fc
+#      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
    SOURCE_URL[1]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
       LICENSE[0]=GPL
diff --git a/graphics-libs/pycairo/HISTORY b/graphics-libs/pycairo/HISTORY
index 507dcba..5515b14 100644
--- a/graphics-libs/pycairo/HISTORY
+++ b/graphics-libs/pycairo/HISTORY
@@ -1,3 +1,7 @@
+2011-09-30 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.10.0
+	* BUILD, INSTALL: added - use waf_build
+
 2010-09-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.8.10, source tarball pycairo -> py2cairo
 
diff --git a/graphics-libs/pycairo/INSTALL b/graphics-libs/pycairo/INSTALL
new file mode 100755
index 0000000..0ea15cc
--- /dev/null
+++ b/graphics-libs/pycairo/INSTALL
@@ -0,0 +1 @@
+waf_install
diff --git a/graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig b/graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig
deleted file mode 100644
index 9cc6ed1..0000000
Binary files a/graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig and /dev/null differ
diff --git a/graphics/blender_cvs/DETAILS b/graphics/blender_cvs/DETAILS
index 7147395..5be6856 100755
--- a/graphics/blender_cvs/DETAILS
+++ b/graphics/blender_cvs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=blender_cvs
-if  [[  "$BLENDER_CVS_CVS_AUTOUPDATE"  ==  "y"  ]];  then
+if  [[  "$BLENDER_CVS_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=svn
diff --git a/graphics/blender_cvs/HISTORY b/graphics/blender_cvs/HISTORY
index eb1d66f..7a4cbab 100644
--- a/graphics/blender_cvs/HISTORY
+++ b/graphics/blender_cvs/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/blender_cvs/PREPARE b/graphics/blender_cvs/PREPARE
index 91e94f0..f8b7d7e 100755
--- a/graphics/blender_cvs/PREPARE
+++ b/graphics/blender_cvs/PREPARE
@@ -1 +1,2 @@
-config_query  BLENDER_CVS_CVS_AUTOUPDATE  "Auto-update $SPELL on every system-update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/http/dillo/BUILD b/http/dillo/BUILD
index 778c21f..4e14560 100755
--- a/http/dillo/BUILD
+++ b/http/dillo/BUILD
@@ -1,2 +1,2 @@
-OPTS="$DILLO_OPTS $OPTS" &&
+OPTS="$OPTS $DILLO_OPTS"
 default_build
diff --git a/http/dillo/CONFIGURE b/http/dillo/CONFIGURE
index 1d1fb6a..958f95c 100755
--- a/http/dillo/CONFIGURE
+++ b/http/dillo/CONFIGURE
@@ -1,61 +1,11 @@
-list_remove DILLO_OPTS "--enable-anti-alias" "--disable-anti-alias" &&
-if [[ $DILLO_TABS ]] ||
-   [[ $DILLO_AA ]] ||
-   [[ $DILLO_IPV6 ]] ||
-   [[ $DILLO_RTFL ]] ||
-   [[ $DILLO_COOKIES ]] ||
-   [[ $DILLO_METAREF ]] ||
-   [[ $DILLO_NLS ]]
-then
-   #Save old vars
-   DILLO_OPTS="$DILLO_TABS $DILLO_IPV6 $DILLO_RTFL \
-               $DILLO_COOKIES $DILLO_METAREF $DILLO_NLS"
-   #remove old vars
-   persistent_remove DILLO_TABS DILLO_AA DILLO_IPV6 DILLO_RTFL     \
-   DILLO_COOKIES DILLO_METAREF DILLO_NLS
-fi                                                                 &&
-config_query_option DILLO_OPTS                                     \
-                    "Threaded DNS support?"                        \
-                    y                                              \
-                    "--enable-threaded-dns"                        \
-                    "--disable-threaded-dns"                       &&
-if [[ "$I18NPATCH" == "y" ]]
-then
-  config_query_option DILLO_OPTS                                   \
-                      "Tab support"                                \
-                      y                                            \
-                      "--enable-tabs"                              \
-                      "--disable-tabs"
-fi                                                                 &&
-config_query_option DILLO_OPTS                                     \
-                    "IPV6 support"                                 \
-                    n                                              \
-                    "--enable-ipv6"                                \
-                    "--disable-ipv6"                               &&
-#This is broken so forced on, 0.8.6 still broken,also dlgui
-DILLO_OPTS="$DILLO_OPTS --enable-cookies --disable-dlgui"          &&
-#config_query_option DILLO_OPTS                                     \
-#                    "Cookie support"                               \
-#                    y                                              \
-#                    "--enable-cookies"                             \
-#                    "--disable-cookies"                            &&
-config_query_option DILLO_OPTS                                     \
-                    "Allow meta refresh"                           \
-                    n                                              \
-                    "--enable-meta-refresh"                        \
-                    "--disable-meta-refresh"                       &&
-config_query_option DILLO_OPTS                                     \
-                    "Use native language support"                  \
-                    y                                              \
-                    "--enable-nls"                                 \
-                    "--disable-nls"                                &&
-config_query_option DILLO_OPTS                                     \
-                    "Enable GIF support"                           \
-                    y                                              \
-                    "--enable-gif"                                 \
-                    "--disable-gif"                                &&
-config_query DILLO_HTTPS                                           \
-                    "Enable experimental https support"            \
-                    n                                              \
-                    ""                                             \
-                    ""
+config_query_option DILLO_OPTS                \
+                    "Threaded DNS support?"   \
+                    y                         \
+                    "--enable-threaded-dns"   \
+                    "--disable-threaded-dns"  &&
+
+config_query_option DILLO_OPTS                \
+                    "Threaded IPv6 support?"  \
+                    y                         \
+                    "--enable-ipv6"           \
+                    "--disable-ipv6"
diff --git a/http/dillo/DEPENDS b/http/dillo/DEPENDS
index c76e42d..a00ee92 100755
--- a/http/dillo/DEPENDS
+++ b/http/dillo/DEPENDS
@@ -1,39 +1,29 @@
-depends  gtk+    &&
-depends  glib    &&
-depends  zlib    &&
-optional_depends "wget"                     \
-                 ""                         \
-                 ""                         \
-                 "for ftp tranfer support"  &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+depends  libtool   &&
+depends  automake  &&
+depends  autoconf  &&
+depends  CVS
+fi &&
 
-optional_depends "electricfence"            \
-                 "--enable-efence"          \
-                 "--disable-efence"         \
-                 "with Electric Fence"      &&
-
-optional_depends "openssl"                  \
-                 "--enable-ssl"             \
-                 "--disable-ssl"            \
-                 "ssl support (eg. https)"  &&
-
-optional_depends "krb5"                     \
-                 ""                         \
-                 ""                         \
-                 "kerberos5 support"        &&
+depends  fltk      &&
+depends  wget      &&
+optional_depends  "openssl"                 \
+                  "--enable-ssl"            \
+                  "--disable-ssl"           \
+                  "for SSL support"  &&
 
 optional_depends  "JPEG"                    \
                   "--enable-jpeg"           \
                   "--disable-jpeg"          \
                   "for jpeg image support"  &&
 
-optional_depends  "libpng"                  \
-                  "--enable-png"            \
-                  "--disable-png"           \
-                  "for png image support"   &&
+optional_depends  "giflib"                  \
+                  "--enable-gif"            \
+                  "--disable-gif"           \
+                  "for gif image support"   &&
+
+optional_depends  "libpng"                    \
+                  "--enable-png"           \
+                  "--disable-png"          \
+                  "for png image support"
 
-if [[ $I18NPATCH = y ]]; then
-  optional_depends  "libxft" \
-                    "--enable-anti-alias" \
-                    "--disable-anti-alias" \
-                    "for font anti-aliasing"
-fi
diff --git a/http/dillo/DETAILS b/http/dillo/DETAILS
index 92ae3ab..b627cbc 100755
--- a/http/dillo/DETAILS
+++ b/http/dillo/DETAILS
@@ -1,24 +1,30 @@
            SPELL=dillo
-      PATCHLEVEL=3
-         VERSION=0.8.6
-   PATCH_VERSION=20060516
-          SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-   SOURCE_URL[0]=http://www.dillo.org/download/${SOURCE}
-     SOURCE_HASH=sha512:63c1306dc7d38716b4ee2459363bdda436f56edf1581271b3c17da189b8a96dc9f013b96d8b50126a5238d7333b0a82d48627eba5f72010ea5c660ab0c3b3995
-if [[ "$I18NPATCH" == "y" ]]
-then
-         SOURCE2=${SPELL}-${VERSION}-i18n-misc-${PATCH_VERSION}.diff.bz2
-  SOURCE2_URL[0]=http://teki.jpn.ph/pc/software/${SOURCE2}
-    SOURCE2_HASH=sha512:34775d70d49d7c87f1f2da19d264843c0b8c9bc5a714add2151ea586ed454816e1480fe0a93bfb4773280545941273946ad2bb2fbe9b93129cef53956833872a
+if [[ "$DILLO_CVS" == "y" ]]; then
+  if  [  "$DILLO_AUTOUPDATE"  ==  "y"  ];  then
+         VERSION=$(date +%Y%m%d)
+  else
+         VERSION=cvs
+  fi
+          SOURCE=$SPELL-cvs.tar.bz2
+  FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+   SOURCE_URL[0]=cvs://:pserver:anonymous@auriga.wearlab.de:/sfhome/cvs/dillo:$SPELL
+   SOURCE_IGNORE=volatile
+else
+         VERSION=3.0.1
+          SOURCE=dillo-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://www.dillo.org/download/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/dillo-$VERSION
+     SOURCE_HASH=sha512:5342193ead9bfc807b900431131a82383298461568e87cc806781162844e52cb71562de31000d98af67174151eb4169284aba8bba562a2b5c44fba40c12fbf3e
 fi
-        WEB_SITE=http://www.dillo.org
-         ENTERED=20010922
-        KEYWORDS="web http"
-           SHORT='Dillo is a very fast, extremely small web browser'
+      LICENSE[0]=GPL
+        WEB_SITE=http://dillo.org
+         ENTERED=20080826
+        KEYWORDS="http"
+           SHORT="dillo2 is the experimental fltk2 port of dillo"
 cat << EOF
 Dillo is a very fast, extremely small Web browser that's completely
 written in C. The source and binary are less than 300 kilobytes each. It
-is a graphical browser built upon GTK+, and it renders a good subset of
+is a graphical browser built upon FLTK, and it renders a good subset of
 HTML, excluding frames, JavaScript, and JVM support.
 EOF
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index bdef95b..d6391df 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 George Sherwood <gsherwood at sourcemage.org>
+	* ALL: Updated to latest current.  Verison 3.0.1
+
 2011-01-02 Ismael Luceno <ismael at sourcemage.org>
 	* dillo.desktop: added generic name
 
diff --git a/http/dillo/PREPARE b/http/dillo/PREPARE
index 054b47f..cbdecf2 100755
--- a/http/dillo/PREPARE
+++ b/http/dillo/PREPARE
@@ -1,5 +1,4 @@
-config_query I18NPATCH \
- "Apply i18n patch, contains many other things \
-(see http://teki.jpn.ph/pc/software/index-e.shtml)" \
-             n
-
+config_query DILLO_CVS "Build CVS version?" n &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+config_query DILLO_AUTOUPDATE "Automatically update on every system update?" n
+fi
diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
index b849094..273f2ff 100755
--- a/http/dillo/PRE_BUILD
+++ b/http/dillo/PRE_BUILD
@@ -1,12 +1,5 @@
-default_pre_build &&
-
-if [ "$I18NPATCH" = "y" ] ; then
-  cd $SOURCE_DIRECTORY &&
-  unpack_file "2" &&
-  bzcat $SOURCE_CACHE/$SOURCE2 | patch -p1
-fi  &&
-
-if [ "$DILLO_HTTPS" = "y" ] ; then
-  cd $SOURCE_DIRECTORY &&
-  sedit '/#undef ENABLE_SSL/d' dpi/https.c
+default_pre_build    &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+   cd $SOURCE_DIRECTORY &&
+   ./autogen.sh
 fi
diff --git a/http/elinks/BUILD b/http/elinks/BUILD
index 3575780..4954d41 100755
--- a/http/elinks/BUILD
+++ b/http/elinks/BUILD
@@ -1,4 +1,4 @@
-if [[ $ELINKS_VCS == y ]]; then
+if [[ $ELINKS_BRANCH == scm ]]; then
   ./autogen.sh
 fi &&
 
diff --git a/http/elinks/DEPENDS b/http/elinks/DEPENDS
index 518058d..0493921 100755
--- a/http/elinks/DEPENDS
+++ b/http/elinks/DEPENDS
@@ -74,6 +74,6 @@ optional_depends expat \
 #                 "--disable-smb" \
 #                 "for SMB protocol support" &&
 
-if [[ $ELINKS_VCS == y ]]; then
+if [[ $ELINKS_BRANCH == scm ]]; then
   depends git
 fi
diff --git a/http/elinks/DETAILS b/http/elinks/DETAILS
index 146bc98..7da45cc 100755
--- a/http/elinks/DETAILS
+++ b/http/elinks/DETAILS
@@ -1,7 +1,7 @@
            SPELL=elinks
   SECURITY_PATCH=2
-if [[ $ELINKS_VCS == y ]]; then
-  if [[ $ELINKS_VCS_AUTOUPDATE == y ]]; then
+if [[ $ELINKS_BRANCH == scm ]]; then
+  if [[ $ELINKS_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=git
diff --git a/http/elinks/HISTORY b/http/elinks/HISTORY
index aa36cea..5f6c050 100644
--- a/http/elinks/HISTORY
+++ b/http/elinks/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2010-11-12 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DEPENDS: doesn't support ruby-1.9, tried with patch on their bugtracker
 	  with no luck, bug #15669 considered fixed for now
diff --git a/http/elinks/PREPARE b/http/elinks/PREPARE
index 9fd6945..98d27e4 100755
--- a/http/elinks/PREPARE
+++ b/http/elinks/PREPARE
@@ -1,6 +1,2 @@
-config_query ELINKS_VCS "Build latest version from development tree?" n &&
-
-if [[ $ELINKS_VCS == y ]]; then
-  config_query ELINKS_VCS_AUTOUPDATE \
-               "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 69eafad..9e27e9d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,16 +1,16 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=6.0.2
+         VERSION=7.0
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:e30fc7b0ded82835d8a4bfd02798db7cb842083592683f8f12bf747558161f1eeff571c4c275b223bebce3577c037d75c373f08692660b4931206d7bc52f2c5e
+     SOURCE_HASH=sha512:ba00c3205677c109b75ec5696cddc68c1df5e18e3c179e2e62fda72f15e6f7b457bb6dfcdd1abc856d292688ecf87db50f063a49afa3799799b50060ddc00284
 #         SOURCE2=$SOURCE.asc
 #      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=6.0.2
+         VERSION=7.0
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:e30fc7b0ded82835d8a4bfd02798db7cb842083592683f8f12bf747558161f1eeff571c4c275b223bebce3577c037d75c373f08692660b4931206d7bc52f2c5e
+     SOURCE_HASH=sha512:ba00c3205677c109b75ec5696cddc68c1df5e18e3c179e2e62fda72f15e6f7b457bb6dfcdd1abc856d292688ecf87db50f063a49afa3799799b50060ddc00284
 #         SOURCE2=$SOURCE.asc
 #      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 504d370..40fdc5d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 7.0
+
 2011-09-07 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 6.0.2, SECURITY_PATCH=41 (MFSA 2011-35)
 
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index e20e0c7..49a9005 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,13 +1,13 @@
            SPELL=seamonkey
-         VERSION=2.3.3
+         VERSION=2.4.1
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:3eada4ee4d3adbe81455b87a1c48391b3a6b234681ecc9df1f6e1d7ccbf9ac2a7e6394e2ecc42b6f3c1370668628c8bd1a3307240c20d28085d43711aaf77567
+     SOURCE_HASH=sha512:49be011bf106e0b27c29f5efea6b0d813ec837d709820d0f066cba6e4ea42e2171d99b2b535957b5257a4a7ae84870b2290c7192e64e4166017a0f3fb5f5908d
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
    SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
    SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
         WEB_SITE=http://www.seamonkey-project.org/
-  SECURITY_PATCH=35
+  SECURITY_PATCH=36
            TMPFS=off
          ENTERED=20010922
       LICENSE[0]=MPL
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index d6daaa5..20b9df9 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,9 @@
+2011-09-30 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4.1, SECURITY_PATCH=36
+
+2011-09-28 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 2.4
+
 2011-09-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.3.3, SECURITY_PATCH=35
 	* PRE_BUILD: sed removed, fixed upstream
diff --git a/http/surf/DEPENDS b/http/surf/DEPENDS
index 81b9bce..b6f5945 100755
--- a/http/surf/DEPENDS
+++ b/http/surf/DEPENDS
@@ -1,4 +1,4 @@
-if [[ ${SURF_SCM} == "y" ]]
+if [[ ${SURF_BRANCH} == "scm" ]]
 then
   depends mercurial
 fi &&
diff --git a/http/surf/DETAILS b/http/surf/DETAILS
index d22d0e7..c2e397f 100755
--- a/http/surf/DETAILS
+++ b/http/surf/DETAILS
@@ -1,7 +1,7 @@
            SPELL=surf
-if [[ ${SURF_SCM} == "y" ]]
+if [[ ${SURF_BRANCH} == "scm" ]]
 then
-  if [[ ${SURF_SCM_AUTOUPDATE} == "y" ]]
+  if [[ ${SURF_AUTOUPDATE} == "y" ]]
   then
          VERSION=$(date +%Y%m%d)
   else
diff --git a/http/surf/DOWNLOAD b/http/surf/DOWNLOAD
index 7c6f856..fc1ea31 100755
--- a/http/surf/DOWNLOAD
+++ b/http/surf/DOWNLOAD
@@ -1,7 +1,7 @@
 #once the hg download handler hits stable sorcery this DOWNLOAD script would
 #only need to be removed, SOURCE_URL is compatible with the planned hg handler
 
-if [[ "${VERSION}" != "scm" && "${VERSION}" != "$(date +%Y%m%d)" ]]; then
+if [[ "${SURF_BRANCH}" != "scm" ]]; then
   default_download
 else
   . $GRIMOIRE/hg_download.function
diff --git a/http/surf/HISTORY b/http/surf/HISTORY
index e07ecb0..fce6752 100644
--- a/http/surf/HISTORY
+++ b/http/surf/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, DOWNLOAD, PREPARE: Use prepare_select_branch
+
 2011-07-25 Bor Kraljič <pyrobor at ver.si>
 	* DOWNLOAD: source $GRIMOIRE/hg_download.function before using hg_download
 
diff --git a/http/surf/PREPARE b/http/surf/PREPARE
index 8444535..98d27e4 100755
--- a/http/surf/PREPARE
+++ b/http/surf/PREPARE
@@ -1,5 +1,2 @@
-config_query SURF_SCM "Build SCM version ?" n &&
-if [[ ${SURF_SCM} == "y" ]]
-then
-  config_query SURF_SCM_AUTOUPDATE "Update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/http/webkitgtk/BUILD b/http/webkitgtk/BUILD
index d9e499e..c94729b 100755
--- a/http/webkitgtk/BUILD
+++ b/http/webkitgtk/BUILD
@@ -1,4 +1,5 @@
 OPTS="$WEBKIT_SVG $OPTS" &&
+OPTS="--with-gtk=2.0 $OPTS" &&
 
 make_single &&
 default_build &&
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 215249c..e1d2d1e 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,16 +1,16 @@
            SPELL=webkitgtk
 if [[ $WEBKITGTK_NIGHT == "y" ]]; then
-         VERSION=1.4.3
+         VERSION=1.6.1
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:7f5300f5b9629748dad210f9a022242a2c810dbcfcef3d3d5080dd9ba7d398bca942bc944c282f900b0f4f1d3dfc2147d0d1cf6888dd28d6e59c27a0134788b4
+     SOURCE_HASH=sha512:27ba555f3f5dfa01ebae0a2a313822b12252c98fef1256b81ad8eae30a01a72acea2cff92304a60337fba18e88c13568ed0093d7f7abab7d128062626a3f6ed7
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 else
-         VERSION=1.4.3
+         VERSION=1.6.1
   SECURITY_PATCH=4
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:7f5300f5b9629748dad210f9a022242a2c810dbcfcef3d3d5080dd9ba7d398bca942bc944c282f900b0f4f1d3dfc2147d0d1cf6888dd28d6e59c27a0134788b4
+     SOURCE_HASH=sha512:27ba555f3f5dfa01ebae0a2a313822b12252c98fef1256b81ad8eae30a01a72acea2cff92304a60337fba18e88c13568ed0093d7f7abab7d128062626a3f6ed7
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 fi
         WEB_SITE=http://webkitgtk.org/
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 3f5f8d5..eef4e0a 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2011-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.1
+	* BUILD: --with-gtk=2.0 added
+
 2011-08-31 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.3
 
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index a897df1..6caa186 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,8 +1,8 @@
            SPELL=webkitgtk3
-         VERSION=1.4.3
+         VERSION=1.6.1
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:7f5300f5b9629748dad210f9a022242a2c810dbcfcef3d3d5080dd9ba7d398bca942bc944c282f900b0f4f1d3dfc2147d0d1cf6888dd28d6e59c27a0134788b4
+     SOURCE_HASH=sha512:27ba555f3f5dfa01ebae0a2a313822b12252c98fef1256b81ad8eae30a01a72acea2cff92304a60337fba18e88c13568ed0093d7f7abab7d128062626a3f6ed7
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
         WEB_SITE=http://webkitgtk.org/
      GATHER_DOCS=off
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index d934b13..b436395 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.6.1
+
 2011-08-31 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.4.3
 
diff --git a/kde4-apps/tellico2/DEPENDS b/kde4-apps/tellico2/DEPENDS
index 433152c..0c8327f 100755
--- a/kde4-apps/tellico2/DEPENDS
+++ b/kde4-apps/tellico2/DEPENDS
@@ -6,6 +6,6 @@ optional_depends  kdepimlibs4     '' '' 'address book & calendar support' &&
 optional_depends  libksane        '' '' 'scanning images'  &&
 optional_depends  libv4l          '' '' 'barcode scanning' &&
 optional_depends  poppler         '' '' 'reading PDF files' &&
+optional_depends  exempi '' '' 'for reading PDF/XMP metadata' &&
 optional_depends  taglib          '' '' 'for reading audio files'
 #libyaz" "Support for searching z39.50 databases" "http://www.indexdata.dk/yaz/
-#libexempi" "Support for reading PDF/XMP metadata" "http://libopenraw.freedesktop.org/wiki/Exempi"
diff --git a/kde4-apps/tellico2/HISTORY b/kde4-apps/tellico2/HISTORY
index 867b8e6..8b07cd0 100644
--- a/kde4-apps/tellico2/HISTORY
+++ b/kde4-apps/tellico2/HISTORY
@@ -1,3 +1,6 @@
+2011-09-28 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: added exempi as optional dependency
+
 2011-09-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2.3.4
 
diff --git a/libs/libnfc/DEPENDS b/libs/libnfc/DEPENDS
index 4793d5f..7e4c67c 100755
--- a/libs/libnfc/DEPENDS
+++ b/libs/libnfc/DEPENDS
@@ -7,7 +7,7 @@ optional_depends pcsc-lite \
                  "--enable-pcsc-lite" \
                  "--disable-pcsc-lite" \
                  "for ACR122 support"                &&
-if  [[  "$LIBNFC_SVN"  ==  "y" ]];  then
+if  [[  "$LIBNFC_BRANCH"  ==  "scm" ]];  then
     depends automake &&
     depends autoconf &&
     depends libtool
diff --git a/libs/libnfc/DETAILS b/libs/libnfc/DETAILS
index 8b46385..9344fca 100755
--- a/libs/libnfc/DETAILS
+++ b/libs/libnfc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libnfc
-if  [[  "$LIBNFC_SVN"  ==  "y"  ]];  then
-  if  [[  "$LIBNFC_SVN_AUTOUPDATE"  ==  "y"  ]];  then
+if  [[  "$LIBNFC_BRANCH"  ==  "scm"  ]];  then
+  if  [[  "$LIBNFC_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=svn
diff --git a/libs/libnfc/HISTORY b/libs/libnfc/HISTORY
index edf6e05..8c323d7 100644
--- a/libs/libnfc/HISTORY
+++ b/libs/libnfc/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
 2010-04-25 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD: use autoreconf instead of autogen.sh
 
diff --git a/libs/libnfc/PREPARE b/libs/libnfc/PREPARE
index 87cc771..98d27e4 100755
--- a/libs/libnfc/PREPARE
+++ b/libs/libnfc/PREPARE
@@ -1,6 +1,2 @@
-config_query  LIBNFC_SVN  "Build SCM (subversion) version?"  y  &&
-
-if  [  "$LIBNFC_SVN"  ==  "y"  ];  then
-  config_query  LIBNFC_SVN_AUTOUPDATE                           \
-                "Automatically update on every system update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/libs/liboauth/DETAILS b/libs/liboauth/DETAILS
new file mode 100755
index 0000000..41a0eab
--- /dev/null
+++ b/libs/liboauth/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=liboauth
+         VERSION=0.9.4
+     SOURCE_HASH=sha512:42c7d57b85c6b31356a8dd38d14192335c09e5e4a1cfb301ece3b6ee122978f4cc4149e7e0d12802e88881c3fc57bc0431892e22950a42f6aeee1bee314ae712
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+      LICENSE[0]=MIT
+        WEB_SITE=http://liboauth.sourceforge.net/
+         ENTERED=20110929
+           SHORT="OAuth.net API implementation"
+cat << EOF
+liboauth provides functions to escape and encode stings according to
+OAuth specifications and offers high-level functionality built on top to sign
+requests or verify signatures using either NSS or OpenSSL for calculating
+the hash/signatures.
+EOF
diff --git a/libs/liboauth/HISTORY b/libs/liboauth/HISTORY
new file mode 100644
index 0000000..64f9e23
--- /dev/null
+++ b/libs/liboauth/HISTORY
@@ -0,0 +1,2 @@
+2011-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: spell created, version 0.9.4
diff --git a/net/conntrack/BUILD b/net/conntrack/BUILD
index 04cd127..5431e3d 100755
--- a/net/conntrack/BUILD
+++ b/net/conntrack/BUILD
@@ -1,4 +1,4 @@
-if [[ "$CONNTRACK_GIT" == "y" ]]; then
+if [[ "$CONNTRACK_BRANCH" == "scm" ]]; then
 ./autogen.sh
 fi &&
 default_build
diff --git a/net/conntrack/DETAILS b/net/conntrack/DETAILS
index 35b4c85..d14244e 100755
--- a/net/conntrack/DETAILS
+++ b/net/conntrack/DETAILS
@@ -1,7 +1,7 @@
            SPELL=conntrack
           SPELLX=conntrack-tools
-if [[ "$CONNTRACK_GIT" == "y" ]]; then
-if  [[  "$CONNTRACK_GIT_AUTOUPDATE"  ==  "y"  ]];  then
+if [[ "$CONNTRACK_BRANCH" == "scm" ]]; then
+if  [[  "$CONNTRACK_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=git
diff --git a/net/conntrack/HISTORY b/net/conntrack/HISTORY
index 0e93f5a..e04b539 100644
--- a/net/conntrack/HISTORY
+++ b/net/conntrack/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* BUILD, DETAILS, PREPARE: Use prepare_select_branch
+
 2011-05-27 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.0.0
 	* DEPENDS: added missing dep
diff --git a/net/conntrack/PREPARE b/net/conntrack/PREPARE
index 92cb046..98d27e4 100755
--- a/net/conntrack/PREPARE
+++ b/net/conntrack/PREPARE
@@ -1,7 +1,2 @@
-config_query CONNTRACK_GIT "Build the git version?" n
-
-if [[ "$CONNTRACK_GIT" == "y" ]]
-then
-  config_query  CONNTRACK_GIT_AUTOUPDATE        \
-                "Automatically update $SPELL on system-update?"  n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/net/libnet/DETAILS b/net/libnet/DETAILS
index eeaef6e..21f8ba2 100755
--- a/net/libnet/DETAILS
+++ b/net/libnet/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libnet
-         VERSION=1.1.4
+         VERSION=1.1.5
+     SOURCE_HASH=sha512:6f3c1b92f84028b667c414c37710f8853a21a752300f4fbd3e6d6e1e7bddfa70c0d0027f995ccd10b02b900c6733e47d4eea88ae2489070e644a7c95320b4b07
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/libnet-dev/$SOURCE
-     SOURCE_HASH=sha512:c40fc215d2fd22b1eaa31fbd9405cfa41cdb193e27027ca3cd10e5dbe379a25e13266b299126f1b3d6a8e8a2e314356ab15600892480deb21fada771e2d29de3
         WEB_SITE=http://libnet-dev.sourceforge.net
          ENTERED=20020820
       LICENSE[0]=BSD
diff --git a/net/libnet/HISTORY b/net/libnet/HISTORY
index f6e8401..2ca7818 100644
--- a/net/libnet/HISTORY
+++ b/net/libnet/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.1.5
+
 2009-09-28 Justin Boffemmyer <flux at sourcemage.org>
 	* DETAILS: new website (old one is dead), version bump
 
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index c0de87c..4bea68c 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,5 +1,5 @@
            SPELL=calibre
-         VERSION=0.8.19
+         VERSION=0.8.20
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://status.calibre-ebook.com/dist/src/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 809fbd3..0fbed27 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,6 @@
+2011-09-28 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 0.8.20
+
 2011-09-20 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.8.19
 	* DEPENDS: added libwmf and sqlite
diff --git a/python-pypi/calibre/calibre-0.8.19.tar.gz.sig b/python-pypi/calibre/calibre-0.8.19.tar.gz.sig
deleted file mode 100644
index f8e512a..0000000
Binary files a/python-pypi/calibre/calibre-0.8.19.tar.gz.sig and /dev/null differ
diff --git a/python-pypi/calibre/calibre-0.8.20.tar.gz.sig b/python-pypi/calibre/calibre-0.8.20.tar.gz.sig
new file mode 100644
index 0000000..65f8fcc
Binary files /dev/null and b/python-pypi/calibre/calibre-0.8.20.tar.gz.sig differ
diff --git a/python-pypi/pypdf/DETAILS b/python-pypi/pypdf/DETAILS
index f720983..3fd1a6f 100755
--- a/python-pypi/pypdf/DETAILS
+++ b/python-pypi/pypdf/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pypdf
           SPELLX=pyPdf
-         VERSION=1.12
-     SOURCE_HASH=sha512:0e7ffcd4b97e2dded7523631899ff22bae8bab0f97d74d93c092884e3c2f289f2beb346836b705de24f34d9a75559cac419ed9b977546a2b706299e4d1cbc85b
+         VERSION=1.13
+     SOURCE_HASH=sha512:1c00a5a6658054671a396e7b334cbeb9e26dc1e3ad9668e212d05a9483f164931d8bd14fb9ab4d083d7ca3999fee7a2e9eea55b604a06c7d5d0632f0791b7598
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://pybrary.net/pyPdf
diff --git a/python-pypi/pypdf/HISTORY b/python-pypi/pypdf/HISTORY
index 1e2c42b..e5718b5 100644
--- a/python-pypi/pypdf/HISTORY
+++ b/python-pypi/pypdf/HISTORY
@@ -1,3 +1,6 @@
+2011-09-30 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.13
+
 2008-12-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.12
 	  spell created
diff --git a/python-pypi/werkzeug/DETAILS b/python-pypi/werkzeug/DETAILS
index 5f52bd3..45ed85b 100755
--- a/python-pypi/werkzeug/DETAILS
+++ b/python-pypi/werkzeug/DETAILS
@@ -1,8 +1,8 @@
            SPELL=werkzeug
-         VERSION=0.7.1
+         VERSION=0.8
           SOURCE=Werkzeug-${VERSION}.tar.gz
    SOURCE_URL[0]=http://pypi.python.org/packages/source/W/Werkzeug/${SOURCE}
-     SOURCE_HASH=sha512:fb831ae7d1fc8a750534bd596975eb08bfdd3ae6310660cb1976e82cd107e29c3a05fbcb6e5df1bf9c741d4c9af8c522bab1efb916cfa6bd7dcdfa77b13a1aeb
+     SOURCE_HASH=sha512:88bf4db8983b664336627147c735dce5dc20801a05b8d6ee365d72835964c658cfda546db53b89b117bf74e98c07aeecfb717912c5738cee0bbc60cabaf3781e
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Werkzeug-${VERSION}"
         WEB_SITE=http://werkzeug.pocoo.org/
       LICENSE[0]=BSD
diff --git a/python-pypi/werkzeug/HISTORY b/python-pypi/werkzeug/HISTORY
index 5b25245..888b8e2 100644
--- a/python-pypi/werkzeug/HISTORY
+++ b/python-pypi/werkzeug/HISTORY
@@ -1,3 +1,6 @@
+2011-09-30 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.8
+
 2011-08-06 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.7.1
 
diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index da00452..64675f9 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,12 +1,12 @@
            SPELL=mc
-         VERSION=4.7.5.4
-      PATCHLEVEL=1
+         VERSION=4.7.5.5
+      PATCHLEVEL=0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=https://www.midnight-commander.org/downloads/$SOURCE
         WEB_SITE=http://www.midnight-commander.org/
          ENTERED=20010922
-     SOURCE_HASH=sha512:b5391e1cd7de31c978c46b4582e66dbdfc4b4d590773cf129b4895535d7163a116fa01f4e9313323f921016d2f0275560717108cc8947eed5b014931f709e627
+     SOURCE_HASH=sha512:8f07e4641a89418e6b8c83b9cb5d6efe05b1f6338d2d5f8110e73e5f365def8e7514adb39a7f866578168dbf8b7a349ca04635641d68b4c0641fc1481402c54a
     SOURCE_HINTS=no-check-certificate
       LICENSE[0]=GPL
         KEYWORDS="console"
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index fde0477..c99071e 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,7 @@
+2011-09-28 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 4.7.5.5
+	* PRE_BUILD, ctrl-x.patch: removed, fixed upstream
+
 2011-09-14 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD, ctrl-x.patch: official patch added
diff --git a/shell-term-fm/mc/PRE_BUILD b/shell-term-fm/mc/PRE_BUILD
deleted file mode 100755
index 43d3a48..0000000
--- a/shell-term-fm/mc/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/ctrl-x.patch
diff --git a/shell-term-fm/mc/ctrl-x.patch b/shell-term-fm/mc/ctrl-x.patch
deleted file mode 100644
index 87c1aa2..0000000
--- a/shell-term-fm/mc/ctrl-x.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: misc/mc.keymap.default
-===================================================================
---- misc/mc.keymap.default	(revision 5f0cef1e6e8982cd0503d025d7c08a36f2fece74)
-+++ misc/mc.keymap.default	(revision be145b595b23932570dd79d393fc3b68306f74b9)
-@@ -162,4 +162,8 @@
- SelectCodepage = alt-e
- 
-+EditExtMode =
-+
-+[edit:xmap]
-+
- [viewer]
- ViewHelp = f1
-@@ -251,5 +255,5 @@
- CmdReverseSelection = kpasterisk
- CmdDialogList = alt-prime
--ExtMap1 =
-+ExtMap1 = ctrl-x
- 
- [main:xmap]
---- misc/mc.keymap	(revision 5f0cef1e6e8982cd0503d025d7c08a36f2fece74)
-+++ misc/mc.keymap	(revision be145b595b23932570dd79d393fc3b68306f74b9)
-@@ -162,4 +162,8 @@
- SelectCodepage = alt-e
- 
-+EditExtMode =
-+
-+[edit:xmap]
-+
- [viewer]
- ViewHelp = f1
-@@ -251,5 +255,5 @@
- CmdReverseSelection = kpasterisk
- CmdDialogList = alt-prime
--ExtMap1 =
-+ExtMap1 = ctrl-x
- 
- [main:xmap]
diff --git a/utils/openmoko-dfu-util/DETAILS b/utils/openmoko-dfu-util/DETAILS
index ad58c7d..bcbef39 100755
--- a/utils/openmoko-dfu-util/DETAILS
+++ b/utils/openmoko-dfu-util/DETAILS
@@ -1,5 +1,5 @@
            SPELL=openmoko-dfu-util
-if [[ "$DFU_UTIL_GIT_AUTOUPDATE" == "y" ]]; then
+if [[ "$OPENMOKO_DFU_UTIL_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=git
diff --git a/utils/openmoko-dfu-util/HISTORY b/utils/openmoko-dfu-util/HISTORY
index 1cd31af..dc2a4c9 100644
--- a/utils/openmoko-dfu-util/HISTORY
+++ b/utils/openmoko-dfu-util/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2010-08-12 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS, PREPARE: corrected SOURCE_URL and WEB_SITE
 
diff --git a/utils/openmoko-dfu-util/PREPARE b/utils/openmoko-dfu-util/PREPARE
index 06e0270..f8b7d7e 100755
--- a/utils/openmoko-dfu-util/PREPARE
+++ b/utils/openmoko-dfu-util/PREPARE
@@ -1 +1,2 @@
-config_query DFU_UTIL_GIT_AUTOUPDATE "Update to the latest git automatically on every cast?" ${DFU_UTIL_GIT_AUTOUPDATE:-n}
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/utils/vbtracetool/DETAILS b/utils/vbtracetool/DETAILS
index 7ba818b..00fba08 100755
--- a/utils/vbtracetool/DETAILS
+++ b/utils/vbtracetool/DETAILS
@@ -1,5 +1,5 @@
            SPELL=vbtracetool
-  if  [[  "$VBTRACETOOL_SCM_AUTOUPDATE"  ==  "y"  ]];  then
+  if  [[  "$VBTRACETOOL_AUTOUPDATE"  ==  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=git
diff --git a/utils/vbtracetool/HISTORY b/utils/vbtracetool/HISTORY
index f7f9ad0..5c1ac27 100644
--- a/utils/vbtracetool/HISTORY
+++ b/utils/vbtracetool/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS, PREPARE: Use prepare_select_branch
+
 2008-10-21 Eric Sandall <sandalle at sourcemage.org>
 	* PREPARE, DETAILS, CONFIGURE, DEPENDS, BUILD, INSTALL: Created
 
diff --git a/utils/vbtracetool/PREPARE b/utils/vbtracetool/PREPARE
index 5ea876b..f8b7d7e 100755
--- a/utils/vbtracetool/PREPARE
+++ b/utils/vbtracetool/PREPARE
@@ -1,2 +1,2 @@
-config_query  VBTRACETOOL_SCM_AUTOUPDATE                       \
-              "Automatically update $SPELL on system-update?"  n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/video-libs/libebml/DETAILS b/video-libs/libebml/DETAILS
index 0d88dde..6a10b80 100755
--- a/video-libs/libebml/DETAILS
+++ b/video-libs/libebml/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libebml
-         VERSION=1.2.1
+         VERSION=1.2.2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://dl.matroska.org/downloads/$SPELL/$SOURCE
diff --git a/video-libs/libebml/HISTORY b/video-libs/libebml/HISTORY
index f778514..933677b 100644
--- a/video-libs/libebml/HISTORY
+++ b/video-libs/libebml/HISTORY
@@ -1,3 +1,6 @@
+2011-09-27 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.2.2
+
 2011-09-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.1
 
diff --git a/video-libs/libebml/libebml-1.2.1.tar.bz2.sig b/video-libs/libebml/libebml-1.2.1.tar.bz2.sig
deleted file mode 100644
index aa204ec..0000000
Binary files a/video-libs/libebml/libebml-1.2.1.tar.bz2.sig and /dev/null differ
diff --git a/video-libs/libebml/libebml-1.2.2.tar.bz2.sig b/video-libs/libebml/libebml-1.2.2.tar.bz2.sig
new file mode 100644
index 0000000..7ef1bad
Binary files /dev/null and b/video-libs/libebml/libebml-1.2.2.tar.bz2.sig differ
diff --git a/video-libs/libmatroska/DETAILS b/video-libs/libmatroska/DETAILS
index 9ccf9c4..60523d6 100755
--- a/video-libs/libmatroska/DETAILS
+++ b/video-libs/libmatroska/DETAILS
@@ -1,10 +1,10 @@
            SPELL=libmatroska
-         VERSION=1.2.0
+         VERSION=1.3.0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://dl.matroska.org/downloads/$SPELL/$SOURCE
         WEB_SITE=http://www.matroska.org
-     SOURCE_HASH=sha512:59fe80146dbd287f435fb477f2e589b8e5659fe5abb1a0869b1f6ca4b85e281431b7a18f1e3728d2b406b141039ab1b5e6a1a247a2bc23a7e64e7b5e67e29374
+     SOURCE_HASH=sha512:adbb5f85b0e55e39b6a5f629bac82041fc8d1ac0cdf8aecc6ea9966320c35aee4fe9437ca620229b7e15d3d8f7c2d4cf1beb71280789e1e6700087b4d2ec0c8a
       #SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
       LICENSE[0]=LGPL
       LICENSE[1]=QPL
diff --git a/video-libs/libmatroska/HISTORY b/video-libs/libmatroska/HISTORY
index fdf4073..a5ec5cd 100644
--- a/video-libs/libmatroska/HISTORY
+++ b/video-libs/libmatroska/HISTORY
@@ -1,3 +1,6 @@
+2011-09-27 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.3.0
+
 2011-09-25 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.0
 
diff --git a/x11-toolkits/rep-gtk2/DETAILS b/x11-toolkits/rep-gtk2/DETAILS
index b969da2..c4d0014 100755
--- a/x11-toolkits/rep-gtk2/DETAILS
+++ b/x11-toolkits/rep-gtk2/DETAILS
@@ -1,10 +1,10 @@
            SPELL=rep-gtk2
-         VERSION=0.90.4
+         VERSION=0.90.7
 	  BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
           SOURCE=rep-gtk-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/rep-gtk-${VERSION}
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/rep-gtk/${SOURCE}
-   SOURCE_URL[1]=http://download.tuxfamily.org/sawfish/rep-gtk/${SOURCE}
+   SOURCE_URL[0]=http://download.tuxfamily.org/librep/rep-gtk/${SOURCE}
+   SOURCE_URL[1]=${SOURCEFORGE_URL}/rep-gtk/${SOURCE}
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://sawfish.wikia.com/wiki/Rep-GTK
       LICENSE[0]=GPL
diff --git a/x11-toolkits/rep-gtk2/HISTORY b/x11-toolkits/rep-gtk2/HISTORY
index 2a471ec..7c00309 100644
--- a/x11-toolkits/rep-gtk2/HISTORY
+++ b/x11-toolkits/rep-gtk2/HISTORY
@@ -1,3 +1,8 @@
+2011-09-25 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 0.90.7
+	  changed SOURCE_URL[1]
+	  swapped SOURCE_URL[0] and SOURCE_URL[1]
+
 2010-11-20 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: added SOURCE_URL[1]
 
diff --git a/x11-toolkits/rep-gtk2/rep-gtk-0.90.4.tar.bz2.sig b/x11-toolkits/rep-gtk2/rep-gtk-0.90.4.tar.bz2.sig
deleted file mode 100644
index 0ece6a0..0000000
Binary files a/x11-toolkits/rep-gtk2/rep-gtk-0.90.4.tar.bz2.sig and /dev/null differ
diff --git a/x11-toolkits/rep-gtk2/rep-gtk-0.90.7.tar.bz2.sig b/x11-toolkits/rep-gtk2/rep-gtk-0.90.7.tar.bz2.sig
new file mode 100644
index 0000000..a77a9df
Binary files /dev/null and b/x11-toolkits/rep-gtk2/rep-gtk-0.90.7.tar.bz2.sig differ
diff --git a/x11/x2goclient-cli/DEPENDS b/x11/x2goclient-cli/DEPENDS
index 7bbe48b..4a42b49 100755
--- a/x11/x2goclient-cli/DEPENDS
+++ b/x11/x2goclient-cli/DEPENDS
@@ -1,3 +1,3 @@
-depends nxproxy     &&
+depends nx          &&
 depends proc-simple &&
 depends term-readpassword
diff --git a/x11/x2goclient-cli/HISTORY b/x11/x2goclient-cli/HISTORY
index e110d99..106c241 100644
--- a/x11/x2goclient-cli/HISTORY
+++ b/x11/x2goclient-cli/HISTORY
@@ -1,3 +1,6 @@
+2011-09-27 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: nxproxy -> nx (fixes #258)
+
 2011-03-18 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* BUILD, DEPENDS, DETAILS, INSTALL: spell created
 


More information about the SM-Commit mailing list