[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (4e439bc5392ae6142637a530ffe2f8456f77b036)

Eric Sandall scm at sourcemage.org
Tue Oct 5 15:28:11 EDT 2010


GIT changes to devel-xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:

 ChangeLog                                                                    |  141 +++
 VERSION                                                                      |    2 
 accounts                                                                     |    1 
 antivirus/clamav/DETAILS                                                     |    2 
 antivirus/clamav/HISTORY                                                     |    3 
 archive/bzip2/DETAILS                                                        |    6 
 archive/bzip2/HISTORY                                                        |    4 
 audio-creation/audacity/DETAILS                                              |    8 
 audio-creation/audacity/HISTORY                                              |    3 
 audio-creation/csound/BUILD                                                  |    1 
 audio-creation/csound/DEPENDS                                                |    1 
 audio-creation/csound/DETAILS                                                |   23 
 audio-creation/csound/HISTORY                                                |   60 -
 audio-creation/csound/INSTALL                                                |    1 
 audio-creation/csound/PRE_BUILD                                              |    1 
 audio-creation/csound/TRIGGERS                                               |    1 
 audio-creation/espeak/DETAILS                                                |    4 
 audio-creation/espeak/HISTORY                                                |    3 
 audio-drivers/jack-cvs/BUILD                                                 |    1 
 audio-drivers/jack-cvs/DEPENDS                                               |    3 
 audio-drivers/jack-cvs/DETAILS                                               |   15 
 audio-drivers/jack-cvs/HISTORY                                               |   43 -
 audio-drivers/jack-cvs/INSTALL                                               |    1 
 audio-drivers/jack-cvs/PRE_BUILD                                             |    1 
 audio-drivers/jack-cvs/TRIGGERS                                              |    1 
 audio-drivers/jackmidi_alsaseq/BUILD                                         |    1 
 audio-drivers/jackmidi_alsaseq/DEPENDS                                       |    1 
 audio-drivers/jackmidi_alsaseq/DETAILS                                       |   15 
 audio-drivers/jackmidi_alsaseq/HISTORY                                       |    5 
 audio-drivers/jackmidi_alsaseq/INSTALL                                       |    1 
 audio-drivers/jackmidi_alsaseq/PRE_BUILD                                     |    1 
 audio-drivers/jackmidi_alsaseq/TRIGGERS                                      |    1 
 audio-drivers/pulseaudio/BUILD                                               |    1 
 audio-drivers/pulseaudio/DEPENDS                                             |   19 
 audio-drivers/pulseaudio/HISTORY                                             |    9 
 audio-libs/libao-pulse/BUILD                                                 |    1 
 audio-libs/libao-pulse/DEPENDS                                               |    1 
 audio-libs/libao-pulse/DETAILS                                               |   14 
 audio-libs/libao-pulse/HISTORY                                               |    5 
 audio-libs/libao-pulse/INSTALL                                               |    1 
 audio-libs/libao-pulse/PRE_BUILD                                             |    1 
 audio-libs/libao-pulse/UP_TRIGGERS                                           |    1 
 audio-libs/libmp4v2/BUILD                                                    |    1 
 audio-libs/libmp4v2/DETAILS                                                  |   12 
 audio-libs/libmp4v2/HISTORY                                                  |   14 
 audio-libs/libmp4v2/INSTALL                                                  |    1 
 audio-libs/libmp4v2/PRE_BUILD                                                |    1 
 audio-libs/libmp4v2/UP_TRIGGERS                                              |    6 
 audio-libs/libmusicbrainz3/DETAILS                                           |    4 
 audio-libs/libmusicbrainz3/HISTORY                                           |    3 
 audio-libs/soundtouch/DETAILS                                                |    4 
 audio-libs/soundtouch/HISTORY                                                |    4 
 audio-players/mpg123/DETAILS                                                 |    2 
 audio-players/mpg123/HISTORY                                                 |    3 
 audio-players/tunesbrowser/BUILD                                             |    1 
 audio-players/tunesbrowser/DETAILS                                           |   15 
 audio-players/tunesbrowser/HISTORY                                           |   31 
 audio-players/tunesbrowser/INSTALL                                           |    1 
 audio-players/tunesbrowser/PRE_BUILD                                         |    1 
 audio-players/tunesbrowser/TRIGGERS                                          |    1 
 audio-plugins/tap/BUILD                                                      |    1 
 audio-plugins/tap/DEPENDS                                                    |    1 
 audio-plugins/tap/DETAILS                                                    |   28 
 audio-plugins/tap/HISTORY                                                    |   36 
 audio-plugins/tap/INSTALL                                                    |    1 
 audio-plugins/tap/PRE_BUILD                                                  |    1 
 audio-plugins/tap/TRIGGERS                                                   |    1 
 audio-soft/cdrtoaster/BUILD                                                  |    1 
 audio-soft/cdrtoaster/DEPENDS                                                |    1 
 audio-soft/cdrtoaster/DETAILS                                                |   13 
 audio-soft/cdrtoaster/HISTORY                                                |   22 
 audio-soft/cdrtoaster/INSTALL                                                |    1 
 audio-soft/cdrtoaster/PRE_BUILD                                              |    1 
 audio-soft/cdrtoaster/TRIGGERS                                               |    1 
 chat-im/centericq/BUILD                                                      |    1 
 chat-im/centericq/DEPENDS                                                    |    1 
 chat-im/centericq/DETAILS                                                    |    7 
 chat-im/centericq/DOWNLOAD                                                   |    1 
 chat-im/centericq/HISTORY                                                    |  119 --
 chat-im/centericq/INSTALL                                                    |    1 
 chat-im/centericq/PRE_BUILD                                                  |    1 
 chat-im/centericq/TRIGGERS                                                   |    1 
 chat-im/gaim-encryption/BUILD                                                |    1 
 chat-im/gaim-encryption/CONFLICTS                                            |    1 
 chat-im/gaim-encryption/DEPENDS                                              |    1 
 chat-im/gaim-encryption/DETAILS                                              |   34 
 chat-im/gaim-encryption/HISTORY                                              |   98 --
 chat-im/gaim-encryption/PREPARE                                              |    1 
 chat-im/gaim-encryption/PRE_BUILD                                            |    1 
 chat-im/gaim-encryption/TRIGGERS                                             |    1 
 chat-im/gaim-encryption/gaim-encryption-3.0beta8.tar.gz.sig                  |    0 
 chat-im/gaim/BUILD                                                           |    1 
 chat-im/gaim/DEPENDS                                                         |    1 
 chat-im/gaim/DETAILS                                                         |   30 
 chat-im/gaim/HISTORY                                                         |  364 --------
 chat-im/gaim/INSTALL                                                         |    1 
 chat-im/gaim/PREPARE                                                         |    1 
 chat-im/gaim/PRE_BUILD                                                       |    1 
 chat-im/gaim/PROVIDES                                                        |    1 
 chat-im/gaim/TRIGGERS                                                        |    1 
 chat-im/gaim/gaim.gpg                                                        |    0 
 chat-im/micq/BUILD                                                           |    1 
 chat-im/micq/DEPENDS                                                         |    1 
 chat-im/micq/DETAILS                                                         |   15 
 chat-im/micq/HISTORY                                                         |   55 -
 chat-im/micq/INSTALL                                                         |    1 
 chat-im/micq/PRE_BUILD                                                       |    1 
 chat-im/micq/TRIGGERS                                                        |    1 
 chat-im/pidgin/DEPENDS                                                       |    5 
 chat-im/pidgin/HISTORY                                                       |    3 
 chat-im/prosody/DETAILS                                                      |    5 
 chat-im/prosody/HISTORY                                                      |    3 
 chat-libs/silc-toolkit/DETAILS                                               |   19 
 chat-libs/silc-toolkit/HISTORY                                               |    3 
 collab/subversion/DETAILS                                                    |    4 
 collab/subversion/HISTORY                                                    |    3 
 crypto/aircrack/BUILD                                                        |    1 
 crypto/aircrack/DEPENDS                                                      |    1 
 crypto/aircrack/DETAILS                                                      |   18 
 crypto/aircrack/HISTORY                                                      |   30 
 crypto/aircrack/INSTALL                                                      |    1 
 crypto/aircrack/PRE_BUILD                                                    |    1 
 crypto/aircrack/TRIGGERS                                                     |    1 
 crypto/beecrypt/DETAILS                                                      |   10 
 crypto/nss/DETAILS                                                           |    8 
 crypto/nss/HISTORY                                                           |    4 
 database/firebird25/DETAILS                                                  |    4 
 database/firebird25/HISTORY                                                  |    3 
 database/libdbi/DETAILS                                                      |    4 
 database/libdbi/HISTORY                                                      |    3 
 database/mysql/DETAILS                                                       |    2 
 database/mysql/HISTORY                                                       |    3 
 database/odk-ng/BUILD                                                        |    1 
 database/odk-ng/DEPENDS                                                      |    1 
 database/odk-ng/DETAILS                                                      |    8 
 database/odk-ng/DOWNLOAD                                                     |    1 
 database/odk-ng/HISTORY                                                      |    4 
 database/odk-ng/INSTALL                                                      |    1 
 database/odk-ng/PRE_BUILD                                                    |    1 
 database/odk-ng/TRIGGERS                                                     |    1 
 database/odkutils/BUILD                                                      |    1 
 database/odkutils/DEPENDS                                                    |    1 
 database/odkutils/DETAILS                                                    |    8 
 database/odkutils/DOWNLOAD                                                   |    1 
 database/odkutils/HISTORY                                                    |    4 
 database/odkutils/INSTALL                                                    |    1 
 database/odkutils/PRE_BUILD                                                  |    1 
 database/odkutils/TRIGGERS                                                   |    1 
 database/pgadmin3/DETAILS                                                    |    2 
 database/pgadmin3/HISTORY                                                    |    3 
 database/picosql/BUILD                                                       |    1 
 database/picosql/DETAILS                                                     |    8 
 database/picosql/DOWNLOAD                                                    |    1 
 database/picosql/HISTORY                                                     |    4 
 database/picosql/INSTALL                                                     |    1 
 database/picosql/PRE_BUILD                                                   |    1 
 database/picosql/TRIGGERS                                                    |    1 
 database/sqlite/HISTORY                                                      |    4 
 database/sqlite/PRE_SUB_DEPENDS                                              |    4 
 database/sqlite/REPAIR^all^PRE_SUB_DEPENDS                                   |    4 
 dev/null                                                                     |binary
 devel/apiextractor/DETAILS                                                   |    4 
 devel/apiextractor/HISTORY                                                   |    3 
 devel/autoconf/DETAILS                                                       |    2 
 devel/autoconf/HISTORY                                                       |    3 
 devel/bazaar/BUILD                                                           |    1 
 devel/bazaar/DEPENDS                                                         |    1 
 devel/bazaar/DETAILS                                                         |    8 
 devel/bazaar/DOWNLOAD                                                        |    1 
 devel/bazaar/HISTORY                                                         |    4 
 devel/bazaar/INSTALL                                                         |    1 
 devel/bazaar/PRE_BUILD                                                       |    1 
 devel/bazaar/TRIGGERS                                                        |    1 
 devel/bluefish/DETAILS                                                       |    2 
 devel/bluefish/HISTORY                                                       |    3 
 devel/boostpythongenerator/BUILD                                             |    1 
 devel/boostpythongenerator/DEPENDS                                           |    1 
 devel/boostpythongenerator/DETAILS                                           |    8 
 devel/boostpythongenerator/DOWNLOAD                                          |    1 
 devel/boostpythongenerator/HISTORY                                           |    4 
 devel/boostpythongenerator/INSTALL                                           |    1 
 devel/boostpythongenerator/PRE_BUILD                                         |    1 
 devel/boostpythongenerator/TRIGGERS                                          |    1 
 devel/ccache/DETAILS                                                         |    2 
 devel/ccache/HISTORY                                                         |    3 
 devel/codeblocks/BUILD                                                       |    5 
 devel/codeblocks/HISTORY                                                     |    5 
 devel/codeblocks/PRE_BUILD                                                   |    5 
 devel/eclipse-cdt-sdk/BUILD                                                  |    1 
 devel/eclipse-cdt-sdk/DEPENDS                                                |    1 
 devel/eclipse-cdt-sdk/DETAILS                                                |   34 
 devel/eclipse-cdt-sdk/HISTORY                                                |   28 
 devel/eclipse-cdt-sdk/INSTALL                                                |    1 
 devel/eclipse-cdt-sdk/PRE_BUILD                                              |    1 
 devel/eclipse-cdt-sdk/PROVIDES                                               |    1 
 devel/eclipse-cdt-sdk/TRIGGERS                                               |    1 
 devel/eclipse-cdt-testing/BUILD                                              |    1 
 devel/eclipse-cdt-testing/DETAILS                                            |   11 
 devel/eclipse-cdt-testing/HISTORY                                            |   18 
 devel/eclipse-cdt-testing/INSTALL                                            |    1 
 devel/eclipse-cdt-testing/PRE_BUILD                                          |    1 
 devel/eclipse-cdt/BUILD                                                      |    1 
 devel/eclipse-cdt/CONFLICTS                                                  |    1 
 devel/eclipse-cdt/DEPENDS                                                    |    1 
 devel/eclipse-cdt/DETAILS                                                    |   35 
 devel/eclipse-cdt/HISTORY                                                    |   29 
 devel/eclipse-cdt/INSTALL                                                    |    2 
 devel/eclipse-cdt/PRE_BUILD                                                  |    3 
 devel/eclipse-cdt/PROVIDES                                                   |    1 
 devel/eclipse-cdt/cdt-master-4.0.0.zip.sig                                   |    0 
 devel/generatorrunner/DETAILS                                                |    4 
 devel/generatorrunner/HISTORY                                                |    3 
 devel/git/DETAILS                                                            |    2 
 devel/git/HISTORY                                                            |    6 
 devel/gitslave/BUILD                                                         |    4 
 devel/gitslave/DEPENDS                                                       |    3 
 devel/gitslave/DETAILS                                                       |   17 
 devel/gitslave/HISTORY                                                       |    4 
 devel/gitslave/INSTALL                                                       |    3 
 devel/libtool/DETAILS                                                        |    2 
 devel/libtool/HISTORY                                                        |    3 
 devel/mcvs/BUILD                                                             |    1 
 devel/mcvs/DEPENDS                                                           |    1 
 devel/mcvs/DETAILS                                                           |   28 
 devel/mcvs/HISTORY                                                           |   28 
 devel/mcvs/INSTALL                                                           |    2 
 devel/mozart-base/DETAILS                                                    |   22 
 devel/mozart-base/HISTORY                                                    |    3 
 devel/perl/CONFLICTS                                                         |    4 
 devel/perl/HISTORY                                                           |    4 
 devel/phpmyadmin/DETAILS                                                     |    4 
 devel/phpmyadmin/HISTORY                                                     |    3 
 devel/pyside/DETAILS                                                         |    4 
 devel/pyside/HISTORY                                                         |    3 
 devel/qtscriptgenerator/HISTORY                                              |    4 
 devel/qtscriptgenerator/PRE_BUILD                                            |    3 
 devel/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch                      |   11 
 devel/shiboken/DETAILS                                                       |    4 
 devel/shiboken/HISTORY                                                       |    3 
 devel/tcl/DETAILS                                                            |    4 
 devel/tcl/HISTORY                                                            |    3 
 devel/tig/DETAILS                                                            |    4 
 devel/tig/HISTORY                                                            |    3 
 devel/tk/DETAILS                                                             |    5 
 devel/tk/HISTORY                                                             |    3 
 disk/brasero/DETAILS                                                         |    2 
 disk/brasero/HISTORY                                                         |    3 
 disk/brasero/brasero-2.30.2.tar.bz2.sig                                      |    0 
 disk/brasero/brasero-2.30.3.tar.bz2.sig                                      |binary
 disk/gparted/DETAILS                                                         |    4 
 disk/gparted/HISTORY                                                         |    6 
 disk/hdparm/DETAILS                                                          |    4 
 disk/hdparm/HISTORY                                                          |    3 
 disk/libburn/DETAILS                                                         |    4 
 disk/libburn/HISTORY                                                         |    3 
 disk/libisoburn/DETAILS                                                      |    4 
 disk/libisoburn/HISTORY                                                      |    3 
 disk/libisofs/DETAILS                                                        |    4 
 disk/libisofs/HISTORY                                                        |    3 
 disk/lvm/DETAILS                                                             |    4 
 disk/lvm/HISTORY                                                             |    3 
 disk/mkisofs/BUILD                                                           |    1 
 disk/mkisofs/CONFLICTS                                                       |    3 
 disk/mkisofs/DEPENDS                                                         |    1 
 disk/mkisofs/DETAILS                                                         |   20 
 disk/mkisofs/HISTORY                                                         |    6 
 disk/mkisofs/INSTALL                                                         |    1 
 disk/mkisofs/PRE_BUILD                                                       |    1 
 disk/mkisofs/TRIGGERS                                                        |    1 
 disk/ntfs-3g/DETAILS                                                         |    4 
 disk/ntfs-3g/HISTORY                                                         |    3 
 doc/asciidoc/DETAILS                                                         |    4 
 doc/asciidoc/HISTORY                                                         |    3 
 doc/docbook-xsl/DETAILS                                                      |    4 
 doc/docbook-xsl/HISTORY                                                      |    3 
 doc/man-pages/DETAILS                                                        |    2 
 doc/man-pages/HISTORY                                                        |    6 
 e-16/e16/DETAILS                                                             |    4 
 e-16/e16/HISTORY                                                             |    3 
 e-17/e_module-mixer/BUILD                                                    |    1 
 e-17/e_module-mixer/DEPENDS                                                  |    1 
 e-17/e_module-mixer/DETAILS                                                  |   12 
 e-17/e_module-mixer/HISTORY                                                  |   18 
 e-17/e_module-mixer/INSTALL                                                  |    1 
 e-17/e_module-mixer/PRE_BUILD                                                |    1 
 e-17/e_module-mixer/TRIGGERS                                                 |    1 
 e-17/entrance/BUILD                                                          |   13 
 e-17/entrance/CONFIGURE                                                      |    2 
 e-17/entrance/CONFLICTS                                                      |    7 
 e-17/entrance/DEPENDS                                                        |   10 
 e-17/entrance/DETAILS                                                        |   23 
 e-17/entrance/HISTORY                                                        |   89 --
 e-17/entrance/PREPARE                                                        |    2 
 e-17/entrance/PRE_BUILD                                                      |    3 
 e-17/entrance/init.d/entrance                                                |    8 
 e-17/evoak/BUILD                                                             |    1 
 e-17/evoak/DEPENDS                                                           |    1 
 e-17/evoak/DETAILS                                                           |   23 
 e-17/evoak/HISTORY                                                           |   48 -
 e-17/evoak/INSTALL                                                           |    1 
 e-17/evoak/PRE_BUILD                                                         |    1 
 e-17/evoak/TRIGGERS                                                          |    1 
 editors/poedit/DETAILS                                                       |    7 
 editors/poedit/HISTORY                                                       |    4 
 editors/poedit/poedit-1.3.9.tar.gz.sig                                       |    0 
 ftp-libs/rb-libtorrent/DETAILS                                               |    4 
 ftp-libs/rb-libtorrent/HISTORY                                               |    3 
 ftp/aria2/DETAILS                                                            |    4 
 ftp/aria2/HISTORY                                                            |    3 
 ftp/proftpd/DETAILS                                                          |    4 
 ftp/proftpd/HISTORY                                                          |    3 
 ftp/qbittorrent/DETAILS                                                      |    4 
 ftp/qbittorrent/HISTORY                                                      |    3 
 ftp/valknut/BUILD                                                            |    6 
 ftp/valknut/DEPENDS                                                          |    6 
 ftp/valknut/DETAILS                                                          |   10 
 ftp/valknut/HISTORY                                                          |    6 
 gnome1-apps/glade/BUILD                                                      |    1 
 gnome1-apps/glade/DEPENDS                                                    |    1 
 gnome1-apps/glade/DETAILS                                                    |   23 
 gnome1-apps/glade/HISTORY                                                    |   28 
 gnome1-apps/glade/INSTALL                                                    |    1 
 gnome1-apps/glade/PRE_BUILD                                                  |    1 
 gnome1-apps/glade/TRIGGERS                                                   |    1 
 gnome1-apps/gnome-admin/BUILD                                                |    1 
 gnome1-apps/gnome-admin/DEPENDS                                              |    2 
 gnome1-apps/gnome-admin/DETAILS                                              |   21 
 gnome1-apps/gnome-admin/HISTORY                                              |   36 
 gnome1-apps/gnome-admin/INSTALL                                              |    1 
 gnome1-apps/gnome-admin/PRE_BUILD                                            |    1 
 gnome1-apps/gnome-admin/TRIGGERS                                             |    1 
 gnome1-apps/gnome-chess/BUILD                                                |    1 
 gnome1-apps/gnome-chess/DEPENDS                                              |    1 
 gnome1-apps/gnome-chess/DETAILS                                              |   18 
 gnome1-apps/gnome-chess/HISTORY                                              |   41 
 gnome1-apps/gnome-chess/INSTALL                                              |    1 
 gnome1-apps/gnome-chess/PRE_BUILD                                            |    1 
 gnome1-apps/gnome-chess/TRIGGERS                                             |    1 
 gnome1-libs/gnome-games/BUILD                                                |    1 
 gnome1-libs/gnome-games/DEPENDS                                              |    1 
 gnome1-libs/gnome-games/DETAILS                                              |   19 
 gnome1-libs/gnome-games/HISTORY                                              |   46 -
 gnome1-libs/gnome-games/INSTALL                                              |    1 
 gnome1-libs/gnome-games/PRE_BUILD                                            |    1 
 gnome1-libs/gnome-games/TRIGGERS                                             |    1 
 gnome1-libs/gnome-karubik-profile/BUILD                                      |    1 
 gnome1-libs/gnome-karubik-profile/DEPENDS                                    |    1 
 gnome1-libs/gnome-karubik-profile/DETAILS                                    |   80 -
 gnome1-libs/gnome-karubik-profile/HISTORY                                    |   35 
 gnome1-libs/gnome-karubik-profile/INSTALL                                    |    1 
 gnome1-libs/gnome-karubik-profile/PRE_BUILD                                  |    1 
 gnome1-libs/gnome-karubik-profile/TRIGGERS                                   |    1 
 gnome1-libs/gnome-utils/BUILD                                                |    1 
 gnome1-libs/gnome-utils/DEPENDS                                              |    1 
 gnome1-libs/gnome-utils/DETAILS                                              |   60 -
 gnome1-libs/gnome-utils/HISTORY                                              |   45 -
 gnome1-libs/gnome-utils/INSTALL                                              |    1 
 gnome1-libs/gnome-utils/PRE_BUILD                                            |    1 
 gnome1-libs/gnome-utils/TRIGGERS                                             |    1 
 gnome1-libs/guppi/BUILD                                                      |    1 
 gnome1-libs/guppi/DETAILS                                                    |   24 
 gnome1-libs/guppi/HISTORY                                                    |   54 -
 gnome1-libs/guppi/INSTALL                                                    |    1 
 gnome1-libs/guppi/PRE_BUILD                                                  |    1 
 gnome1-libs/guppi/TRIGGERS                                                   |    1 
 gnome2-apps/epiphany/DETAILS                                                 |    2 
 gnome2-apps/epiphany/HISTORY                                                 |    3 
 gnome2-apps/epiphany/epiphany-2.30.5.tar.bz2.sig                             |    0 
 gnome2-apps/epiphany/epiphany-2.30.6.tar.bz2.sig                             |binary
 gnome2-apps/file-roller2/BUILD                                               |    2 
 gnome2-apps/file-roller2/CONFLICTS                                           |    1 
 gnome2-apps/file-roller2/DEPENDS                                             |    1 
 gnome2-apps/file-roller2/DETAILS                                             |   16 
 gnome2-apps/file-roller2/G_SCHEMAS                                           |    1 
 gnome2-apps/file-roller2/HISTORY                                             |  250 -----
 gnome2-apps/file-roller2/INSTALL                                             |    1 
 gnome2-apps/file-roller2/PRE_BUILD                                           |    1 
 gnome2-apps/file-roller2/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS   |   15 
 gnome2-apps/file-roller2/TRIGGERS                                            |    1 
 gnome2-apps/gftp2/BUILD                                                      |    1 
 gnome2-apps/gftp2/CONFLICTS                                                  |    1 
 gnome2-apps/gftp2/DEPENDS                                                    |    1 
 gnome2-apps/gftp2/DETAILS                                                    |   21 
 gnome2-apps/gftp2/HISTORY                                                    |   67 -
 gnome2-apps/gftp2/INSTALL                                                    |    1 
 gnome2-apps/gftp2/PRE_BUILD                                                  |    1 
 gnome2-apps/gftp2/TRIGGERS                                                   |    1 
 gnome2-apps/ggv2/BUILD                                                       |    1 
 gnome2-apps/ggv2/DEPENDS                                                     |    1 
 gnome2-apps/ggv2/DETAILS                                                     |   17 
 gnome2-apps/ggv2/HISTORY                                                     |  152 ---
 gnome2-apps/ggv2/INSTALL                                                     |    1 
 gnome2-apps/ggv2/PRE_BUILD                                                   |    1 
 gnome2-apps/ggv2/TRIGGERS                                                    |    1 
 gnome2-apps/glabels2/BUILD                                                   |    1 
 gnome2-apps/glabels2/DEPENDS                                                 |    1 
 gnome2-apps/glabels2/DETAILS                                                 |    8 
 gnome2-apps/glabels2/DOWNLOAD                                                |    1 
 gnome2-apps/glabels2/HISTORY                                                 |    4 
 gnome2-apps/glabels2/INSTALL                                                 |    1 
 gnome2-apps/glabels2/PRE_BUILD                                               |    1 
 gnome2-apps/glabels2/TRIGGERS                                                |    1 
 gnome2-apps/gnumeric/DEPENDS                                                 |   13 
 gnome2-apps/gnumeric/DETAILS                                                 |    4 
 gnome2-apps/gnumeric/HISTORY                                                 |    4 
 gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sig                            |    0 
 gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sig                            |binary
 gnome2-apps/gswitchit/BUILD                                                  |    1 
 gnome2-apps/gswitchit/DEPENDS                                                |    1 
 gnome2-apps/gswitchit/DETAILS                                                |   31 
 gnome2-apps/gswitchit/HISTORY                                                |   21 
 gnome2-apps/gswitchit/PRE_BUILD                                              |    1 
 gnome2-apps/memprof2/BUILD                                                   |    1 
 gnome2-apps/memprof2/DEPENDS                                                 |    1 
 gnome2-apps/memprof2/DETAILS                                                 |   16 
 gnome2-apps/memprof2/HISTORY                                                 |   38 
 gnome2-apps/memprof2/INSTALL                                                 |    1 
 gnome2-apps/memprof2/PRE_BUILD                                               |    1 
 gnome2-apps/memprof2/TRIGGERS                                                |    1 
 gnome2-apps/metatheme/BUILD                                                  |    1 
 gnome2-apps/metatheme/DEPENDS                                                |    1 
 gnome2-apps/metatheme/DETAILS                                                |   25 
 gnome2-apps/metatheme/HISTORY                                                |   18 
 gnome2-apps/metatheme/PRE_BUILD                                              |    1 
 gnome2-libs/clutter-gtk/DETAILS                                              |    2 
 gnome2-libs/clutter-gtk/HISTORY                                              |    3 
 gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig                       |    0 
 gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig                       |binary
 gnome2-libs/eel2/BUILD                                                       |    1 
 gnome2-libs/eel2/DETAILS                                                     |   20 
 gnome2-libs/eel2/HISTORY                                                     |  283 ------
 gnome2-libs/eel2/INSTALL                                                     |    1 
 gnome2-libs/eel2/PRE_BUILD                                                   |    1 
 gnome2-libs/eel2/UP_TRIGGERS                                                 |    1 
 gnome2-libs/gail/BUILD                                                       |    1 
 gnome2-libs/gail/DEPENDS                                                     |    1 
 gnome2-libs/gail/DETAILS                                                     |   14 
 gnome2-libs/gail/HISTORY                                                     |  195 ----
 gnome2-libs/gail/INSTALL                                                     |    1 
 gnome2-libs/gail/PRE_BUILD                                                   |    1 
 gnome2-libs/gail/TRIGGERS                                                    |    1 
 gnome2-libs/gail/gail-1.22.3.tar.bz2.sig                                     |    0 
 gnome2-libs/gal2/BUILD                                                       |    1 
 gnome2-libs/gal2/DETAILS                                                     |   28 
 gnome2-libs/gal2/HISTORY                                                     |  196 ----
 gnome2-libs/gal2/INSTALL                                                     |    1 
 gnome2-libs/gal2/PRE_BUILD                                                   |    1 
 gnome2-libs/gal2/UP_TRIGGERS                                                 |    1 
 gnome2-libs/gconfmm/BUILD                                                    |    2 
 gnome2-libs/gconfmm/HISTORY                                                  |    3 
 gnome2-libs/gdk-pixbuf2/DEPENDS                                              |    6 
 gnome2-libs/gdk-pixbuf2/DETAILS                                              |    4 
 gnome2-libs/gdk-pixbuf2/HISTORY                                              |    6 
 gnome2-libs/glib2/DETAILS                                                    |    2 
 gnome2-libs/glib2/HISTORY                                                    |    3 
 gnome2-libs/glib2/glib-2.25.15.tar.bz2.sig                                   |    0 
 gnome2-libs/glib2/glib-2.25.17.tar.bz2.sig                                   |binary
 gnome2-libs/gobject-introspection/DETAILS                                    |    2 
 gnome2-libs/gobject-introspection/HISTORY                                    |    6 
 gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig    |    0 
 gnome2-libs/gobject-introspection/gobject-introspection-0.9.9.tar.bz2.sig    |binary
 gnome2-libs/goffice/DETAILS                                                  |    2 
 gnome2-libs/goffice/HISTORY                                                  |    3 
 gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sig                               |    0 
 gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sig                               |binary
 gnome2-libs/gtksourceview/DETAILS                                            |    2 
 gnome2-libs/gtksourceview/HISTORY                                            |    3 
 gnome2-libs/gvfs/DETAILS                                                     |    1 
 gnome2-libs/gvfs/HISTORY                                                     |    5 
 gnome2-libs/gvfs/PRE_BUILD                                                   |    4 
 gnome2-libs/gvfs/openssh56.patch                                             |   56 +
 gnome2-libs/libgee/DETAILS                                                   |    4 
 gnome2-libs/libgee/HISTORY                                                   |    6 
 gnome2-libs/libgnomedb-dev/BUILD                                             |    1 
 gnome2-libs/libgnomedb-dev/CONFLICTS                                         |    2 
 gnome2-libs/libgnomedb-dev/DEPENDS                                           |    1 
 gnome2-libs/libgnomedb-dev/DETAILS                                           |   20 
 gnome2-libs/libgnomedb-dev/G_SCHEMAS                                         |    1 
 gnome2-libs/libgnomedb-dev/HISTORY                                           |   27 
 gnome2-libs/libgnomedb-dev/INSTALL                                           |    1 
 gnome2-libs/libgnomedb-dev/PRE_BUILD                                         |    1 
 gnome2-libs/libgnomedb-dev/PROVIDES                                          |    1 
 gnome2-libs/libgnomedb-dev/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS |   15 
 gnome2-libs/libgnomedb-dev/TRIGGERS                                          |    1 
 gnome2-libs/libgnomedb-dev/libgnomedb-3.0.0.tar.bz2.sig                      |    0 
 gnome2-libs/libgsf/DETAILS                                                   |    2 
 gnome2-libs/libgsf/HISTORY                                                   |    3 
 gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig                                |    0 
 gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sig                                |binary
 gnome2-libs/liboobs/DETAILS                                                  |    8 
 gnome2-libs/libwnck/DETAILS                                                  |    2 
 gnome2-libs/libwnck/HISTORY                                                  |    3 
 gnome2-libs/libwnck/libwnck-2.30.3.tar.bz2.sig                               |    0 
 gnome2-libs/libwnck/libwnck-2.30.4.tar.bz2.sig                               |binary
 gnome2-libs/metacity/DETAILS                                                 |    2 
 gnome2-libs/metacity/HISTORY                                                 |    3 
 gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig                              |    0 
 gnome2-libs/metacity/metacity-2.30.2.tar.gz.sig                              |binary
 gnome2-libs/nautilus-cd-burner/BUILD                                         |    1 
 gnome2-libs/nautilus-cd-burner/DEPENDS                                       |    1 
 gnome2-libs/nautilus-cd-burner/DETAILS                                       |   18 
 gnome2-libs/nautilus-cd-burner/HISTORY                                       |  248 -----
 gnome2-libs/nautilus-cd-burner/INSTALL                                       |    1 
 gnome2-libs/nautilus-cd-burner/PRE_BUILD                                     |    1 
 gnome2-libs/nautilus-cd-burner/UP_TRIGGERS                                   |    1 
 gnome2-libs/nautilus-media/BUILD                                             |    1 
 gnome2-libs/nautilus-media/DETAILS                                           |   61 -
 gnome2-libs/nautilus-media/HISTORY                                           |   72 -
 gnome2-libs/nautilus-media/INSTALL                                           |    1 
 gnome2-libs/nautilus-media/PRE_BUILD                                         |    1 
 gnome2-libs/nautilus-media/TRIGGERS                                          |    1 
 gnome2-libs/pango/DETAILS                                                    |    2 
 gnome2-libs/pango/HISTORY                                                    |    3 
 gnome2-libs/pango/pango-1.28.1.tar.bz2.sig                                   |    0 
 gnome2-libs/pango/pango-1.28.2.tar.bz2.sig                                   |binary
 gnome2-libs/profile-gnome2-desktop/BUILD                                     |    1 
 gnome2-libs/profile-gnome2-desktop/DETAILS                                   |   18 
 gnome2-libs/profile-gnome2-desktop/HISTORY                                   |   36 
 gnome2-libs/profile-gnome2-desktop/INSTALL                                   |    1 
 gnome2-libs/profile-gnome2-desktop/PRE_BUILD                                 |    1 
 gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS                               |    1 
 gnome2-libs/pygtksourceview/DEPENDS                                          |    1 
 gnome2-libs/pygtksourceview/HISTORY                                          |    3 
 gnome2-libs/sawfish2/BUILD                                                   |    1 
 gnome2-libs/sawfish2/DEPENDS                                                 |    1 
 gnome2-libs/sawfish2/DETAILS                                                 |   21 
 gnome2-libs/sawfish2/HISTORY                                                 |   76 -
 gnome2-libs/sawfish2/INSTALL                                                 |    1 
 gnome2-libs/sawfish2/PRE_BUILD                                               |    1 
 gnome2-libs/sawfish2/TRIGGERS                                                |    1 
 gnome2-libs/scrollkeeper/BUILD                                               |    1 
 gnome2-libs/scrollkeeper/DEPENDS                                             |    1 
 gnome2-libs/scrollkeeper/DETAILS                                             |   23 
 gnome2-libs/scrollkeeper/HISTORY                                             |   91 --
 gnome2-libs/scrollkeeper/INSTALL                                             |    1 
 gnome2-libs/scrollkeeper/PRE_BUILD                                           |    1 
 gnome2-libs/scrollkeeper/TRIGGER                                             |    1 
 gnome2-libs/scrollkeeper/scrollkeeper-0.3.14.tar.gz.sig                      |    0 
 gnome2-libs/ximian-connector/BUILD                                           |    1 
 gnome2-libs/ximian-connector/DEPENDS                                         |    1 
 gnome2-libs/ximian-connector/DETAILS                                         |   18 
 gnome2-libs/ximian-connector/HISTORY                                         |   58 -
 gnome2-libs/ximian-connector/INSTALL                                         |    1 
 gnome2-libs/ximian-connector/PRE_BUILD                                       |    1 
 gnome2-libs/ximian-connector/TRIGGERS                                        |    1 
 gnustep-libs/gnustep-back-art/BUILD                                          |    1 
 gnustep-libs/gnustep-back-art/DEPENDS                                        |    1 
 gnustep-libs/gnustep-back-art/DETAILS                                        |   28 
 gnustep-libs/gnustep-back-art/HISTORY                                        |   53 -
 gnustep-libs/gnustep-back-art/INSTALL                                        |    1 
 gnustep-libs/gnustep-back-art/PRE_BUILD                                      |    1 
 gnustep-libs/gnustep-back-art/TRIGGERS                                       |    1 
 gnustep-libs/gnustep-back-xlib/BUILD                                         |    1 
 gnustep-libs/gnustep-back-xlib/DEPENDS                                       |    1 
 gnustep-libs/gnustep-back-xlib/DETAILS                                       |   25 
 gnustep-libs/gnustep-back-xlib/HISTORY                                       |   56 -
 gnustep-libs/gnustep-back-xlib/INSTALL                                       |    1 
 gnustep-libs/gnustep-back-xlib/PRE_BUILD                                     |    1 
 gnustep-libs/gnustep-back-xlib/TRIGGERS                                      |    1 
 graphics-libs/freetype2/DETAILS                                              |    2 
 graphics-libs/freetype2/HISTORY                                              |    3 
 graphics-libs/glew/DETAILS                                                   |    4 
 graphics-libs/glew/HISTORY                                                   |    3 
 graphics-libs/libraw/DETAILS                                                 |    4 
 graphics-libs/libraw/HISTORY                                                 |    3 
 graphics-libs/libspectre/DETAILS                                             |    4 
 graphics-libs/libspectre/HISTORY                                             |    3 
 graphics-libs/mesalib/BUILD                                                  |   15 
 graphics-libs/mesalib/CONFIGURE                                              |   75 +
 graphics-libs/mesalib/DEPENDS                                                |   19 
 graphics-libs/mesalib/DETAILS                                                |    4 
 graphics-libs/mesalib/HISTORY                                                |   12 
 graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig                              |binary
 graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig                              |    0 
 graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig                              |    0 
 graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig                                |binary
 graphics-libs/mesalib/PRE_BUILD                                              |    3 
 graphics-libs/poppler/CONFIGURE                                              |    1 
 graphics-libs/poppler/DEPENDS                                                |    5 
 graphics-libs/poppler/DETAILS                                                |    8 
 graphics-libs/poppler/HISTORY                                                |    4 
 graphics-libs/pycairo/DETAILS                                                |    5 
 graphics-libs/pycairo/HISTORY                                                |    3 
 graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig                             |binary
 graphics-libs/pycairo/pycairo-1.8.8.tar.gz.sig                               |    0 
 graphics-libs/pythonmagick/BUILD                                             |    3 
 graphics-libs/pythonmagick/DEPENDS                                           |    3 
 graphics-libs/pythonmagick/DETAILS                                           |   14 
 graphics-libs/pythonmagick/HISTORY                                           |    3 
 graphics-libs/sane-backends/DEPENDS                                          |    6 
 graphics-libs/sane-backends/HISTORY                                          |    4 
 graphics/djview4/DETAILS                                                     |    4 
 graphics/djview4/HISTORY                                                     |    3 
 graphics/djvulibre/BUILD                                                     |    3 
 graphics/djvulibre/DETAILS                                                   |    6 
 graphics/djvulibre/HISTORY                                                   |    5 
 graphics/fotox/BUILD                                                         |    1 
 graphics/fotox/DEPENDS                                                       |    1 
 graphics/fotox/DETAILS                                                       |   17 
 graphics/fotox/HISTORY                                                       |    7 
 graphics/fotox/INSTALL                                                       |    1 
 graphics/fotox/PRE_BUILD                                                     |    1 
 graphics/fotox/TRIGGERS                                                      |    1 
 graphics/fotoxx/BUILD                                                        |    3 
 graphics/fotoxx/DEPENDS                                                      |    3 
 graphics/fotoxx/DETAILS                                                      |    8 
 graphics/fotoxx/HISTORY                                                      |    8 
 graphics/fotoxx/INSTALL                                                      |    7 
 graphics/fotoxx/PRE_BUILD                                                    |    5 
 graphics/gexiv2/DETAILS                                                      |    4 
 graphics/gexiv2/HISTORY                                                      |    3 
 graphics/gimp/DETAILS                                                        |    8 
 graphics/gimp/HISTORY                                                        |    3 
 graphics/imagemagick/DETAILS                                                 |    4 
 graphics/imagemagick/HISTORY                                                 |    9 
 graphics/shotwell/DEPENDS                                                    |    1 
 graphics/shotwell/DETAILS                                                    |    4 
 graphics/shotwell/HISTORY                                                    |    6 
 graphics/tesseract/DETAILS                                                   |    4 
 graphics/tesseract/HISTORY                                                   |    5 
 graphics/tesseract/PRE_BUILD                                                 |    2 
 graphics/tesseract/gcc-4.4.diff                                              |   11 
 graphics/ufraw/BUILD                                                         |    2 
 graphics/ufraw/CONFIGURE                                                     |   23 
 graphics/ufraw/DEPENDS                                                       |   67 -
 graphics/ufraw/DETAILS                                                       |    4 
 graphics/ufraw/HISTORY                                                       |    8 
 graphics/ufraw/PREPARE                                                       |    4 
 graphics/ufraw/PRE_BUILD                                                     |    2 
 groups                                                                       |    1 
 http/apache/BUILD                                                            |    1 
 http/apache/DEPENDS                                                          |    1 
 http/apache/DETAILS                                                          |    7 
 http/apache/DOWNLOAD                                                         |    1 
 http/apache/HISTORY                                                          |  158 ---
 http/apache/INSTALL                                                          |    1 
 http/apache/PRE_BUILD                                                        |    1 
 http/apache/TRIGGERS                                                         |    1 
 http/arora/DEPENDS                                                           |    2 
 http/arora/HISTORY                                                           |    3 
 http/firefox/DETAILS                                                         |    4 
 http/firefox/HISTORY                                                         |   11 
 http/firefox/INSTALL                                                         |    2 
 http/galeon/BUILD                                                            |    1 
 http/galeon/DEPENDS                                                          |    1 
 http/galeon/DETAILS                                                          |   28 
 http/galeon/HISTORY                                                          |  223 -----
 http/galeon/INSTALL                                                          |    1 
 http/galeon/PRE_BUILD                                                        |    1 
 http/galeon/UP_TRIGGERS                                                      |    1 
 http/ijb-waldhoff/BUILD                                                      |    1 
 http/ijb-waldhoff/CONFLICTS                                                  |    1 
 http/ijb-waldhoff/DEPENDS                                                    |    1 
 http/ijb-waldhoff/DETAILS                                                    |   23 
 http/ijb-waldhoff/HISTORY                                                    |   43 -
 http/ijb-waldhoff/INSTALL                                                    |    1 
 http/ijb-waldhoff/PREPARE                                                    |    5 
 http/ijb-waldhoff/PRE_BUILD                                                  |    1 
 http/ijb-waldhoff/TRIGGERS                                                   |    1 
 http/ijb-waldhoff/init.d/junkbuster                                          |    8 
 http/ijb/BUILD                                                               |    1 
 http/ijb/CONFLICTS                                                           |    1 
 http/ijb/DEPENDS                                                             |    1 
 http/ijb/DETAILS                                                             |   21 
 http/ijb/HISTORY                                                             |   42 -
 http/ijb/INSTALL                                                             |    1 
 http/ijb/PREPARE                                                             |    5 
 http/ijb/PRE_BUILD                                                           |    1 
 http/ijb/TRIGGERS                                                            |    1 
 http/ijb/init.d/junkbuster                                                   |    8 
 http/live-f1/2AD09CBA.gpg                                                    |binary
 http/live-f1/DETAILS                                                         |   14 
 http/live-f1/HISTORY                                                         |    6 
 http/midori/DETAILS                                                          |    4 
 http/midori/HISTORY                                                          |    3 
 http/mozilla/BUILD                                                           |    1 
 http/mozilla/DEPENDS                                                         |    1 
 http/mozilla/DETAILS                                                         |    7 
 http/mozilla/DOWNLOAD                                                        |    1 
 http/mozilla/HISTORY                                                         |  419 ----------
 http/mozilla/INSTALL                                                         |    1 
 http/mozilla/PRE_BUILD                                                       |    1 
 http/mozilla/TRIGGERS                                                        |    1 
 http/nvu/BUILD                                                               |    1 
 http/nvu/CONFLICTS                                                           |    1 
 http/nvu/DEPENDS                                                             |    1 
 http/nvu/DETAILS                                                             |   25 
 http/nvu/HISTORY                                                             |   26 
 http/nvu/INSTALL                                                             |    1 
 http/nvu/PRE_BUILD                                                           |    1 
 http/nvu/TRIGGERS                                                            |    1 
 http/nvu/gfxshared_s.patch                                                   |   28 
 http/nvu/nvu                                                                 |   18 
 http/nvu/nvu-1.0-gcc4-1.patch                                                |  135 ---
 http/nvu/nvu-1.0-glibc-2.4.patch                                             |   53 -
 http/nvu/nvu-1.0-sources.tar.bz2.sig                                         |    0 
 http/nvu/security_manager_makefile.diff                                      |  142 ---
 http/nvu/xprintutil.patch                                                    |   14 
 http/pywebkitgtk/DETAILS                                                     |    4 
 http/pywebkitgtk/HISTORY                                                     |    3 
 http/seamonkey/CONFIGURE                                                     |    6 
 http/seamonkey/DEPENDS                                                       |    4 
 http/seamonkey/DETAILS                                                       |    4 
 http/seamonkey/HISTORY                                                       |    9 
 http/seamonkey/PRE_BUILD                                                     |    6 
 http/seamonkey/blfs-mozconfig                                                |    2 
 http/squid/DETAILS                                                           |    4 
 http/squid/HISTORY                                                           |    3 
 http/webkitgtk/DETAILS                                                       |    4 
 http/webkitgtk/HISTORY                                                       |    3 
 http/xulrunner/DETAILS                                                       |    4 
 http/xulrunner/HISTORY                                                       |    3 
 kde-apps/kxneur/BUILD                                                        |    1 
 kde-apps/kxneur/DEPENDS                                                      |    1 
 kde-apps/kxneur/DETAILS                                                      |    7 
 kde-apps/kxneur/DOWNLOAD                                                     |    1 
 kde-apps/kxneur/HISTORY                                                      |   16 
 kde-apps/kxneur/INSTALL                                                      |    1 
 kde-apps/kxneur/PRE_BUILD                                                    |    1 
 kde-apps/kxneur/UP_TRIGGERS                                                  |    1 
 kde-look/qtcurve-gtk2/DETAILS                                                |    4 
 kde-look/qtcurve-gtk2/HISTORY                                                |    6 
 kde4-apps/amarok2/DETAILS                                                    |    4 
 kde4-apps/amarok2/HISTORY                                                    |    3 
 kde4-apps/digikam4/DETAILS                                                   |    4 
 kde4-apps/digikam4/HISTORY                                                   |    4 
 kde4-apps/digikam4/PRE_BUILD                                                 |    3 
 kde4-apps/dragonplayer/BUILD                                                 |    1 
 kde4-apps/dragonplayer/DEPENDS                                               |    1 
 kde4-apps/dragonplayer/DETAILS                                               |    8 
 kde4-apps/dragonplayer/DOWNLOAD                                              |    1 
 kde4-apps/dragonplayer/HISTORY                                               |    4 
 kde4-apps/dragonplayer/INSTALL                                               |    1 
 kde4-apps/dragonplayer/PRE_BUILD                                             |    1 
 kde4-apps/dragonplayer/TRIGGERS                                              |    1 
 kde4-apps/k3b4/HISTORY                                                       |    3 
 kde4-apps/k3b4/PRE_BUILD                                                     |    3 
 kde4-apps/kdenlive4/DETAILS                                                  |    4 
 kde4-apps/kdenlive4/HISTORY                                                  |    3 
 kde4-apps/kdiamond/BUILD                                                     |    1 
 kde4-apps/kdiamond/DEPENDS                                                   |    1 
 kde4-apps/kdiamond/DETAILS                                                   |    8 
 kde4-apps/kdiamond/DOWNLOAD                                                  |    1 
 kde4-apps/kdiamond/HISTORY                                                   |    4 
 kde4-apps/kdiamond/INSTALL                                                   |    1 
 kde4-apps/kdiamond/PRE_BUILD                                                 |    1 
 kde4-apps/kdiamond/TRIGGERS                                                  |    1 
 kde4-apps/kid3-kde4/DETAILS                                                  |    4 
 kde4-apps/kid3-kde4/HISTORY                                                  |    3 
 kde4-apps/kipi-plugins4/DETAILS                                              |    6 
 kde4-apps/kipi-plugins4/HISTORY                                              |    4 
 kde4-apps/kipi-plugins4/PRE_BUILD                                            |    3 
 kde4-apps/krename4/DETAILS                                                   |    4 
 kde4-apps/krename4/HISTORY                                                   |    3 
 kde4-apps/quassel/DETAILS                                                    |    4 
 kde4-apps/quassel/HISTORY                                                    |    3 
 kde4-look/qtcurve-kde4/DETAILS                                               |    4 
 kde4-look/qtcurve-kde4/HISTORY                                               |    6 
 kde4-support/grantlee/DETAILS                                                |    5 
 kde4-support/grantlee/HISTORY                                                |    4 
 kde4-support/phonon/DEPENDS                                                  |    2 
 kde4-support/phonon/HISTORY                                                  |    4 
 kde4-support/phonon/INSTALL                                                  |    2 
 kde4/kdebase4-runtime/HISTORY                                                |    3 
 kde4/kdebase4-runtime/PRE_BUILD                                              |    3 
 kde4/kdegames4/HISTORY                                                       |    3 
 kde4/kdegames4/PRE_BUILD                                                     |    3 
 kde4/kdegraphics4/HISTORY                                                    |    3 
 kde4/kdegraphics4/INSTALL                                                    |    4 
 kde4/kdelibs4-experimental/BUILD                                             |    1 
 kde4/kdelibs4-experimental/DEPENDS                                           |    1 
 kde4/kdelibs4-experimental/DETAILS                                           |    8 
 kde4/kdelibs4-experimental/DOWNLOAD                                          |    1 
 kde4/kdelibs4-experimental/HISTORY                                           |    4 
 kde4/kdelibs4-experimental/INSTALL                                           |    1 
 kde4/kdelibs4-experimental/PRE_BUILD                                         |    1 
 kde4/kdelibs4-experimental/TRIGGERS                                          |    1 
 kde4/kdelibs4/DEPENDS                                                        |    2 
 kde4/kdelibs4/HISTORY                                                        |    4 
 kde4/kdelibs4/PRE_BUILD                                                      |    4 
 kde4/kdesdk4/HISTORY                                                         |    3 
 kde4/kdesdk4/PRE_BUILD                                                       |    1 
 kde4/kdeutils4/HISTORY                                                       |    3 
 kde4/kdeutils4/PRE_BUILD                                                     |    3 
 kde4/kdevelop4/HISTORY                                                       |    3 
 kde4/kdevelop4/PRE_BUILD                                                     |    3 
 kernels/cdemu/BUILD                                                          |    1 
 kernels/cdemu/DEPENDS                                                        |    4 
 kernels/cdemu/DETAILS                                                        |   12 
 kernels/cdemu/HISTORY                                                        |   15 
 kernels/cdemu/INSTALL                                                        |    1 
 kernels/cdemu/PRE_BUILD                                                      |    1 
 kernels/cdemu/TRIGGERS                                                       |    1 
 kernels/cdemu/volatiles                                                      |    1 
 kernels/device-mapper/BUILD                                                  |    1 
 kernels/device-mapper/DETAILS                                                |   19 
 kernels/device-mapper/HISTORY                                                |  107 --
 kernels/device-mapper/INSTALL                                                |    1 
 kernels/device-mapper/PRE_BUILD                                              |    1 
 kernels/device-mapper/UP_TRIGGERS                                            |    2 
 kernels/linux/HISTORY                                                        |   25 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.27.54               |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.32.22               |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.32.23               |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.32.24               |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.34.7                |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.35.5                |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.35.6                |    6 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.35.7                |    6 
 kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch       |    2 
 kernels/linux/latest.defaults                                                |    2 
 kernels/suspend2-userui/BUILD                                                |    1 
 kernels/suspend2-userui/DEPENDS                                              |    1 
 kernels/suspend2-userui/DETAILS                                              |    6 
 kernels/suspend2-userui/HISTORY                                              |    6 
 kernels/suspend2-userui/INSTALL                                              |    1 
 kernels/suspend2-userui/PRE_BUILD                                            |    1 
 kernels/suspend2-userui/TRIGGERS                                             |    1 
 libs/commonc++/BUILD                                                         |    1 
 libs/commonc++/DEPENDS                                                       |    1 
 libs/commonc++/DETAILS                                                       |    8 
 libs/commonc++/DOWNLOAD                                                      |    1 
 libs/commonc++/HISTORY                                                       |    4 
 libs/commonc++/INSTALL                                                       |    1 
 libs/commonc++/PRE_BUILD                                                     |    1 
 libs/commonc++/TRIGGERS                                                      |    1 
 libs/elfutils/DETAILS                                                        |    2 
 libs/elfutils/HISTORY                                                        |    3 
 libs/glibc/HISTORY                                                           |    3 
 libs/glibc/PRE_BUILD                                                         |    4 
 libs/icu/DETAILS                                                             |    8 
 libs/icu/HISTORY                                                             |    3 
 libs/libdrm/DETAILS                                                          |    2 
 libs/libdrm/HISTORY                                                          |    3 
 libs/libdrm/libdrm-2.4.21.tar.bz2.sig                                        |    0 
 libs/libdrm/libdrm-2.4.22.tar.bz2.sig                                        |binary
 libs/libvirt/DETAILS                                                         |    2 
 libs/libvirt/HISTORY                                                         |    3 
 libs/libvirt/libvirt-0.8.3.tar.gz.sig                                        |    0 
 libs/libvirt/libvirt-0.8.4.tar.gz.sig                                        |binary
 libs/mxml/BUILD                                                              |    3 
 libs/mxml/DETAILS                                                            |   15 
 libs/mxml/HISTORY                                                            |    4 
 libs/ncurses/HISTORY                                                         |    4 
 libs/ncurses/SUB_DEPENDS                                                     |    6 
 libs/neon/DETAILS                                                            |    2 
 libs/neon/HISTORY                                                            |    3 
 libs/orc/DETAILS                                                             |    4 
 libs/orc/HISTORY                                                             |    3 
 libs/pcre/HISTORY                                                            |    3 
 libs/pcre/INSTALL                                                            |    2 
 libs/pyqt4/DETAILS                                                           |    4 
 libs/pyqt4/HISTORY                                                           |    4 
 libs/rasqal/DETAILS                                                          |    2 
 libs/rasqal/HISTORY                                                          |    3 
 libs/redland-bindings/DETAILS                                                |    2 
 libs/redland-bindings/HISTORY                                                |    3 
 libs/redland/DETAILS                                                         |    3 
 libs/redland/HISTORY                                                         |    4 
 libs/redland/PRE_BUILD                                                       |    9 
 libs/redland/librdf_storage_register_factory.patch                           |   21 
 libs/redland/virt.diff.bz2                                                   |    0 
 libs/serveez/BUILD                                                           |    1 
 libs/serveez/DETAILS                                                         |   23 
 libs/serveez/HISTORY                                                         |   19 
 libs/serveez/INSTALL                                                         |    1 
 libs/serveez/PRE_BUILD                                                       |    1 
 libs/serveez/TRIGGERS                                                        |    1 
 lxde/lxsession/BUILD                                                         |    1 
 lxde/lxsession/DEPENDS                                                       |    1 
 lxde/lxsession/DETAILS                                                       |   39 
 lxde/lxsession/HISTORY                                                       |    5 
 lxde/lxsession/INSTALL                                                       |    1 
 lxde/lxsession/PRE_BUILD                                                     |    1 
 lxde/lxsession/TRIGGERS                                                      |    1 
 mail/alpine/DETAILS                                                          |    2 
 mail/alpine/HISTORY                                                          |    3 
 mail/dovecot/BUILD                                                           |   31 
 mail/dovecot/CONFIGURE                                                       |   35 
 mail/dovecot/DEPENDS                                                         |   14 
 mail/dovecot/DETAILS                                                         |   30 
 mail/dovecot/FINAL                                                           |   19 
 mail/dovecot/HISTORY                                                         |   16 
 mail/dovecot/INSTALL                                                         |   17 
 mail/dovecot/PREPARE                                                         |    9 
 mail/dovecot/PRE_BUILD                                                       |   16 
 mail/dspam/BUILD                                                             |   28 
 mail/dspam/CONFIGURE                                                         |   28 
 mail/dspam/DEPENDS                                                           |   37 
 mail/dspam/DETAILS                                                           |   27 
 mail/dspam/HISTORY                                                           |   11 
 mail/dspam/INSTALL                                                           |   21 
 mail/dspam/PREPARE                                                           |   10 
 mail/dspam/PRE_BUILD                                                         |    2 
 mail/exim/HISTORY                                                            |    6 
 mail/exim/PRE_BUILD                                                          |    2 
 mail/exim/exim-dovecot-1.1.diff                                              |   52 +
 mail/libgmail/DETAILS                                                        |    2 
 mail/libgmail/HISTORY                                                        |    3 
 mail/offlineimap/DETAILS                                                     |   10 
 mail/offlineimap/HISTORY                                                     |    3 
 mail/qwikmail/DETAILS                                                        |    2 
 mail/qwikmail/HISTORY                                                        |    3 
 mail/sylpheed-claws-extra-plugins/BUILD                                      |    1 
 mail/sylpheed-claws-extra-plugins/CONFIGURE                                  |   16 
 mail/sylpheed-claws-extra-plugins/DEPENDS                                    |    1 
 mail/sylpheed-claws-extra-plugins/DETAILS                                    |   18 
 mail/sylpheed-claws-extra-plugins/EXPORTS                                    |    1 
 mail/sylpheed-claws-extra-plugins/HISTORY                                    |   17 
 mail/sylpheed-claws-extra-plugins/INSTALL                                    |    1 
 mail/sylpheed-claws-extra-plugins/PRE_BUILD                                  |    1 
 mail/sylpheed-claws-extra-plugins/REPAIR^none^EXPORTS                        |    1 
 mail/sylpheed-claws-extra-plugins/TRIGGERS                                   |    1 
 mail/sylpheed-claws/BUILD                                                    |    1 
 mail/sylpheed-claws/CONFIGURE                                                |   11 
 mail/sylpheed-claws/CONFLICTS                                                |    2 
 mail/sylpheed-claws/DEPENDS                                                  |    1 
 mail/sylpheed-claws/DETAILS                                                  |   21 
 mail/sylpheed-claws/EXPORTS                                                  |    1 
 mail/sylpheed-claws/HISTORY                                                  |  198 ----
 mail/sylpheed-claws/INSTALL                                                  |    1 
 mail/sylpheed-claws/PRE_BUILD                                                |    1 
 mail/sylpheed-claws/PROVIDES                                                 |    1 
 mail/sylpheed-claws/REPAIR^none^EXPORTS                                      |    1 
 mail/sylpheed-claws/TRIGGERS                                                 |    1 
 mail/thunderbird/DETAILS                                                     |    6 
 mail/thunderbird/HISTORY                                                     |    6 
 mail/thunderbird/thunderbird.gpg                                             |binary
 mobile/wbxml2/BUILD                                                          |    1 
 mobile/wbxml2/DEPENDS                                                        |    1 
 mobile/wbxml2/DETAILS                                                        |    8 
 mobile/wbxml2/DOWNLOAD                                                       |    1 
 mobile/wbxml2/HISTORY                                                        |    4 
 mobile/wbxml2/INSTALL                                                        |    1 
 mobile/wbxml2/PRE_BUILD                                                      |    1 
 mobile/wbxml2/TRIGGERS                                                       |    1 
 net/gridentd/BUILD                                                           |    1 
 net/gridentd/CONFLICTS                                                       |    3 
 net/gridentd/DEPENDS                                                         |    1 
 net/gridentd/DETAILS                                                         |   26 
 net/gridentd/HISTORY                                                         |   43 -
 net/gridentd/INSTALL                                                         |    1 
 net/gridentd/PREPARE                                                         |    8 
 net/gridentd/PRE_BUILD                                                       |    1 
 net/gridentd/TRIGGERS                                                        |    1 
 net/gridentd/services                                                        |    1 
 net/gridentd/xinetd.d/gridentd                                               |   13 
 net/libnetfilter_log/BUILD                                                   |    2 
 net/libnetfilter_log/DEPENDS                                                 |    2 
 net/libnetfilter_log/DETAILS                                                 |   19 
 net/libnetfilter_log/DOWNLOAD                                                |   16 
 net/libnetfilter_log/HISTORY                                                 |   13 
 net/libnetfilter_log/PREPARE                                                 |    1 
 net/libnetfilter_queue/BUILD                                                 |    2 
 net/libnetfilter_queue/DEPENDS                                               |    2 
 net/libnetfilter_queue/DETAILS                                               |   19 
 net/libnetfilter_queue/DOWNLOAD                                              |   16 
 net/libnetfilter_queue/HISTORY                                               |   13 
 net/libnetfilter_queue/PREPARE                                               |    1 
 net/nsd/DETAILS                                                              |    4 
 net/nsd/HISTORY                                                              |    3 
 net/openwbem/DEPENDS                                                         |   31 
 net/openwbem/DETAILS                                                         |   17 
 net/openwbem/HISTORY                                                         |    4 
 net/openwbem/PRE_BUILD                                                       |    4 
 net/openwbem/gcc4.4.patch                                                    |  261 ++++++
 net/openwbem/init.d/owcimomd                                                 |    7 
 net/samba/DETAILS                                                            |    6 
 net/samba/HISTORY                                                            |    4 
 net/samba/libcap.patch                                                       |   52 -
 net/samba/valgrind-include.patch                                             |   20 
 net/samba/wrong_python_ldflags.patch                                         |   25 
 net/shorewall-perl/BUILD                                                     |    1 
 net/shorewall-perl/DEPENDS                                                   |    1 
 net/shorewall-perl/DETAILS                                                   |   22 
 net/shorewall-perl/HISTORY                                                   |   35 
 net/shorewall-perl/INSTALL                                                   |    1 
 net/shorewall-perl/PREPARE                                                   |    2 
 net/shorewall-perl/PRE_BUILD                                                 |    1 
 net/shorewall-perl/PROVIDES                                                  |    1 
 net/shorewall-perl/TRIGGERS                                                  |    1 
 net/shorewall-shell/BUILD                                                    |    1 
 net/shorewall-shell/DEPENDS                                                  |    1 
 net/shorewall-shell/DETAILS                                                  |   22 
 net/shorewall-shell/HISTORY                                                  |   35 
 net/shorewall-shell/INSTALL                                                  |    1 
 net/shorewall-shell/PREPARE                                                  |   21 
 net/shorewall-shell/PRE_BUILD                                                |    1 
 net/shorewall-shell/PROVIDES                                                 |    1 
 net/shorewall-shell/TRIGGERS                                                 |    1 
 net/traceroute/DETAILS                                                       |    4 
 net/traceroute/HISTORY                                                       |    3 
 news/liferea/DETAILS                                                         |    2 
 news/liferea/HISTORY                                                         |    3 
 news/liferea/liferea-1.6.4.tar.gz.sig                                        |    0 
 news/liferea/liferea-1.6.5.tar.gz.sig                                        |binary
 perl-cpan/class-methodmaker/DETAILS                                          |    4 
 perl-cpan/class-methodmaker/HISTORY                                          |    3 
 perl-cpan/mime-parser/BUILD                                                  |    1 
 perl-cpan/mime-parser/DEPENDS                                                |    3 
 perl-cpan/mime-parser/DETAILS                                                |   12 
 perl-cpan/mime-parser/HISTORY                                                |    7 
 perl-cpan/mime-parser/INSTALL                                                |    1 
 perl-cpan/mime-parser/PRE_BUILD                                              |    1 
 perl-cpan/mime-parser/TRIGGERS                                               |    1 
 perl-cpan/module-build/BUILD                                                 |    1 
 perl-cpan/module-build/DEPENDS                                               |    1 
 perl-cpan/module-build/DETAILS                                               |    7 
 perl-cpan/module-build/DOWNLOAD                                              |    1 
 perl-cpan/module-build/HISTORY                                               |   55 -
 perl-cpan/module-build/INSTALL                                               |    1 
 perl-cpan/module-build/PRE_BUILD                                             |    1 
 perl-cpan/module-build/TRIGGERS                                              |    1 
 perl-cpan/template-plugin-gd-image/BUILD                                     |    1 
 perl-cpan/template-plugin-gd-image/DEPENDS                                   |    1 
 perl-cpan/template-plugin-gd-image/DETAILS                                   |   11 
 perl-cpan/template-plugin-gd-image/HISTORY                                   |    8 
 perl-cpan/template-plugin-gd-image/INSTALL                                   |    1 
 perl-cpan/template-plugin-gd-image/PRE_BUILD                                 |    1 
 perl-cpan/template-plugin-gd-image/TRIGGERS                                  |    1 
 perl-cpan/xml-parser-expat/DETAILS                                           |    6 
 perl-cpan/xml-parser-expat/HISTORY                                           |    4 
 printer/ghostscript/DEPENDS                                                  |   15 
 printer/ghostscript/DETAILS                                                  |   13 
 printer/ghostscript/HISTORY                                                  |   18 
 printer/ghostscript/PRE_BUILD                                                |    3 
 printer/ghostscript/ghostscript.patch                                        |   78 -
 printer/hplip/DETAILS                                                        |    2 
 printer/hplip/HISTORY                                                        |    3 
 printer/zint/DETAILS                                                         |   26 
 printer/zint/HISTORY                                                         |    4 
 python-pypi/bzr/DETAILS                                                      |    3 
 python-pypi/bzr/HISTORY                                                      |    9 
 python-pypi/bzr/PRE_BUILD                                                    |    1 
 python-pypi/bzr/xmlrpclib.diff                                               |   40 
 python-pypi/calibre/DEPENDS                                                  |    8 
 python-pypi/calibre/DETAILS                                                  |    8 
 python-pypi/calibre/HISTORY                                                  |    5 
 python-pypi/cssutils/DEPENDS                                                 |    1 
 python-pypi/cssutils/DETAILS                                                 |   14 
 python-pypi/cssutils/HISTORY                                                 |    3 
 python-pypi/dabo/DETAILS                                                     |    4 
 python-pypi/dabo/HISTORY                                                     |    3 
 python-pypi/decorator/DETAILS                                                |    4 
 python-pypi/decorator/HISTORY                                                |    3 
 python-pypi/django/DETAILS                                                   |    4 
 python-pypi/django/HISTORY                                                   |    3 
 python-pypi/elixir/DEPENDS                                                   |    1 
 python-pypi/elixir/DETAILS                                                   |    4 
 python-pypi/elixir/HISTORY                                                   |    4 
 python-pypi/feedparser/DETAILS                                               |    2 
 python-pypi/feedparser/HISTORY                                               |    3 
 python-pypi/formalchemy/DEPENDS                                              |    6 
 python-pypi/formalchemy/DETAILS                                              |   21 
 python-pypi/formalchemy/HISTORY                                              |    7 
 python-pypi/markupsafe/DEPENDS                                               |    2 
 python-pypi/markupsafe/DETAILS                                               |   15 
 python-pypi/markupsafe/HISTORY                                               |    3 
 python-pypi/mercurial/DETAILS                                                |    4 
 python-pypi/mercurial/HISTORY                                                |    3 
 python-pypi/python-gammu/BUILD                                               |    1 
 python-pypi/python-gammu/DEPENDS                                             |    1 
 python-pypi/python-gammu/DETAILS                                             |    7 
 python-pypi/python-gammu/DOWNLOAD                                            |    1 
 python-pypi/python-gammu/HISTORY                                             |    8 
 python-pypi/python-gammu/INSTALL                                             |    1 
 python-pypi/python-gammu/PRE_BUILD                                           |    1 
 python-pypi/reportlab/DEPENDS                                                |    1 
 python-pypi/reportlab/DETAILS                                                |    9 
 python-pypi/reportlab/HISTORY                                                |    8 
 python-pypi/reportlab/INSTALL                                                |    4 
 python-pypi/sqlkit/DETAILS                                                   |    6 
 python-pypi/sqlkit/HISTORY                                                   |    3 
 python-pypi/webhelpers/DEPENDS                                               |    3 
 python-pypi/webhelpers/DETAILS                                               |    6 
 python-pypi/webhelpers/HISTORY                                               |    5 
 ruby-raa/passenger/DETAILS                                                   |    6 
 ruby-raa/passenger/HISTORY                                                   |    3 
 ruby-raa/ruby-1.8/DETAILS                                                    |    6 
 ruby-raa/ruby-1.8/HISTORY                                                    |    3 
 ruby-raa/ruby-gstreamer/BUILD                                                |    1 
 ruby-raa/ruby-gstreamer/DETAILS                                              |   17 
 ruby-raa/ruby-gstreamer/HISTORY                                              |   48 -
 ruby-raa/ruby-gstreamer/INSTALL                                              |    1 
 ruby-raa/ruby-gstreamer/PRE_BUILD                                            |    1 
 ruby-raa/ruby-gstreamer/TRIGGERS                                             |    1 
 ruby-raa/rubygems/DETAILS                                                    |    8 
 ruby-raa/rubygems/HISTORY                                                    |    3 
 science/geda/BUILD                                                           |    1 
 science/geda/DEPENDS                                                         |    1 
 science/geda/DETAILS                                                         |   14 
 science/geda/HISTORY                                                         |   28 
 science/geda/INSTALL                                                         |    1 
 science/geda/PRE_BUILD                                                       |    1 
 science/geda/TRIGGERS                                                        |    1 
 science/geda/geda-20060123.tar.gz.sig                                        |    0 
 science/maxima/DETAILS                                                       |    4 
 science/maxima/HISTORY                                                       |    3 
 science/qtoctave/HISTORY                                                     |    3 
 science/qtoctave/PRE_BUILD                                                   |    3 
 science/qtoctave/gcc-4.5.patch                                               |   18 
 security-libs/cracklib/DEPENDS                                               |    3 
 security-libs/cracklib/DETAILS                                               |    4 
 security-libs/cracklib/HISTORY                                               |    6 
 security/hashkill/DEPENDS                                                    |    2 
 security/hashkill/DETAILS                                                    |   20 
 security/hashkill/HISTORY                                                    |    3 
 security/hashkill/hashkill-0.2.3b.tar.gz.sig                                 |binary
 shell-term-fm/shared-mime-info/DETAILS                                       |    4 
 shell-term-fm/shared-mime-info/HISTORY                                       |    3 
 shell-term-fm/termit/DETAILS                                                 |    4 
 shell-term-fm/termit/HISTORY                                                 |    3 
 shell-term-fm/xfe/DETAILS                                                    |    4 
 shell-term-fm/xfe/HISTORY                                                    |    3 
 smgl/init.d/DETAILS                                                          |    2 
 smgl/init.d/HISTORY                                                          |    5 
 smgl/init.d/init.d/mountall.sh                                               |    2 
 smgl/init.d/init.d/mountroot.sh                                              |    2 
 utils/avahi/DEPENDS                                                          |    3 
 utils/avahi/HISTORY                                                          |    3 
 utils/bluez/DETAILS                                                          |    2 
 utils/bluez/HISTORY                                                          |    3 
 utils/cloc/DETAILS                                                           |    4 
 utils/cloc/HISTORY                                                           |    3 
 utils/dbus/DETAILS                                                           |    4 
 utils/dbus/HISTORY                                                           |    3 
 utils/dmidecode/HISTORY                                                      |    3 
 utils/dmidecode/Makefile.patch                                               |   11 
 utils/dmidecode/PRE_BUILD                                                    |    3 
 utils/findwild/BUILD                                                         |    2 
 utils/findwild/DEPENDS                                                       |    3 
 utils/findwild/DETAILS                                                       |   28 
 utils/findwild/HISTORY                                                       |    3 
 utils/findwild/INSTALL                                                       |    3 
 utils/gamin/DEPENDS                                                          |    4 
 utils/gamin/HISTORY                                                          |    4 
 utils/iso-codes/DETAILS                                                      |    2 
 utils/iso-codes/HISTORY                                                      |    6 
 utils/isoquery/DETAILS                                                       |    2 
 utils/isoquery/HISTORY                                                       |    3 
 utils/kexec-tools/DETAILS                                                    |   11 
 utils/kexec-tools/HISTORY                                                    |    4 
 utils/kexec-tools/kexec-tools-2.0.1.tar.bz2.sig                              |    0 
 utils/mktemp/BUILD                                                           |    1 
 utils/mktemp/DETAILS                                                         |   32 
 utils/mktemp/HISTORY                                                         |   30 
 utils/mktemp/INSTALL                                                         |    1 
 utils/mktemp/PRE_BUILD                                                       |    1 
 utils/mktemp/TRIGGERS                                                        |    1 
 utils/moreutils/DETAILS                                                      |    4 
 utils/moreutils/HISTORY                                                      |    3 
 utils/nss-pam-ldapd/DETAILS                                                  |    2 
 utils/nss-pam-ldapd/HISTORY                                                  |    3 
 utils/procps/BUILD                                                           |    7 
 utils/procps/HISTORY                                                         |    3 
 utils/procps/PRE_BUILD                                                       |    6 
 utils/schedutils/BUILD                                                       |    1 
 utils/schedutils/DEPENDS                                                     |    1 
 utils/schedutils/DETAILS                                                     |   22 
 utils/schedutils/HISTORY                                                     |    5 
 utils/schedutils/INSTALL                                                     |    1 
 utils/schedutils/PRE_BUILD                                                   |    1 
 utils/schedutils/TRIGGERS                                                    |    1 
 utils/schroot/HISTORY                                                        |    3 
 utils/schroot/TRIGGERS                                                       |    1 
 utils/sysstat/DETAILS                                                        |   10 
 utils/sysstat/HISTORY                                                        |    3 
 utils/unison/DEPENDS                                                         |   11 
 utils/unison/HISTORY                                                         |    4 
 utils/unison/PRE_BUILD                                                       |    3 
 utils/unison/ocaml-3.12.patch                                                |   11 
 utils/virt-manager/HISTORY                                                   |    4 
 utils/virt-manager/PRE_BUILD                                                 |    4 
 utils/virt-manager/py27.patch                                                |   13 
 video-libs/gst-ffmpeg-0.8/BUILD                                              |    1 
 video-libs/gst-ffmpeg-0.8/DEPENDS                                            |    1 
 video-libs/gst-ffmpeg-0.8/DETAILS                                            |   15 
 video-libs/gst-ffmpeg-0.8/HISTORY                                            |   66 -
 video-libs/gst-ffmpeg-0.8/INSTALL                                            |    1 
 video-libs/gst-ffmpeg-0.8/PRE_BUILD                                          |    1 
 video-libs/gst-ffmpeg-0.8/TRIGGERS                                           |    1 
 video-libs/gst-plugins/BUILD                                                 |    1 
 video-libs/gst-plugins/DEPENDS                                               |    1 
 video-libs/gst-plugins/DETAILS                                               |   17 
 video-libs/gst-plugins/HISTORY                                               |  226 -----
 video-libs/gst-plugins/INSTALL                                               |    1 
 video-libs/gst-plugins/PRE_BUILD                                             |    1 
 video-libs/gst-plugins/TRIGGERS                                              |    1 
 video-libs/gstreamer-0.8/BUILD                                               |    1 
 video-libs/gstreamer-0.8/DEPENDS                                             |    1 
 video-libs/gstreamer-0.8/DETAILS                                             |   24 
 video-libs/gstreamer-0.8/HISTORY                                             |  139 ---
 video-libs/gstreamer-0.8/INSTALL                                             |    1 
 video-libs/gstreamer-0.8/PRE_BUILD                                           |    1 
 video-libs/gstreamer-0.8/TRIGGERS                                            |    1 
 video-libs/libvpx/DEPENDS                                                    |    3 
 video-libs/libvpx/HISTORY                                                    |    3 
 video-libs/live/DETAILS                                                      |    4 
 video-libs/live/HISTORY                                                      |    6 
 video-libs/live/live.2010.07.13.tar.gz.sig                                   |    0 
 video-libs/pitfdll/BUILD                                                     |    1 
 video-libs/pitfdll/DETAILS                                                   |   18 
 video-libs/pitfdll/HISTORY                                                   |   32 
 video-libs/pitfdll/INSTALL                                                   |    1 
 video-libs/pitfdll/PRE_BUILD                                                 |    1 
 video-libs/pitfdll/TRIGGERS                                                  |    1 
 video-libs/unicap/BUILD                                                      |    1 
 video-libs/unicap/DEPENDS                                                    |    1 
 video-libs/unicap/DETAILS                                                    |   19 
 video-libs/unicap/HISTORY                                                    |   70 -
 video-libs/unicap/INSTALL                                                    |    1 
 video-libs/unicap/PRE_BUILD                                                  |    1 
 video-libs/unicap/UP_TRIGGERS                                                |    1 
 video/gst-editor/BUILD                                                       |    1 
 video/gst-editor/DETAILS                                                     |   19 
 video/gst-editor/HISTORY                                                     |   35 
 video/gst-editor/INSTALL                                                     |    1 
 video/gst-editor/PRE_BUILD                                                   |    1 
 video/gst-editor/TRIGGERS                                                    |    1 
 video/gst-player/BUILD                                                       |    1 
 video/gst-player/DEPENDS                                                     |    1 
 video/gst-player/DETAILS                                                     |   21 
 video/gst-player/HISTORY                                                     |   48 -
 video/gst-player/INSTALL                                                     |    1 
 video/gst-player/PRE_BUILD                                                   |    1 
 video/gst-player/TRIGGERS                                                    |    1 
 video/mlt++/BUILD                                                            |    1 
 video/mlt++/DEPENDS                                                          |    1 
 video/mlt++/DETAILS                                                          |    8 
 video/mlt++/DOWNLOAD                                                         |    1 
 video/mlt++/HISTORY                                                          |    4 
 video/mlt++/INSTALL                                                          |    1 
 video/mlt++/PRE_BUILD                                                        |    1 
 video/mlt++/TRIGGERS                                                         |    1 
 video/mlt/DETAILS                                                            |    4 
 video/mlt/HISTORY                                                            |    3 
 video/mpeg2dec/BUILD                                                         |    1 
 video/mpeg2dec/DEPENDS                                                       |    1 
 video/mpeg2dec/DETAILS                                                       |   18 
 video/mpeg2dec/HISTORY                                                       |   39 
 video/mpeg2dec/INSTALL                                                       |    1 
 video/mpeg2dec/PRE_BUILD                                                     |    1 
 video/mpeg2dec/UP_TRIGGERS                                                   |    1 
 video/mpeg2dec/mpeg2dec-0.4.1.tar.gz.sig                                     |    0 
 video/mythbrowser/BUILD                                                      |    1 
 video/mythbrowser/DEPENDS                                                    |    1 
 video/mythbrowser/DETAILS                                                    |   10 
 video/mythbrowser/HISTORY                                                    |   43 -
 video/mythbrowser/INSTALL                                                    |    1 
 video/mythbrowser/PRE_BUILD                                                  |    1 
 video/mythbrowser/TRIGGERS                                                   |    1 
 video/mythdvd/BUILD                                                          |    1 
 video/mythdvd/DEPENDS                                                        |    1 
 video/mythdvd/DETAILS                                                        |   15 
 video/mythdvd/HISTORY                                                        |   46 -
 video/mythdvd/INSTALL                                                        |    1 
 video/mythdvd/PRE_BUILD                                                      |    1 
 video/mythdvd/TRIGGERS                                                       |    1 
 video/mythflix/BUILD                                                         |    1 
 video/mythflix/DEPENDS                                                       |    1 
 video/mythflix/DETAILS                                                       |   10 
 video/mythflix/HISTORY                                                       |   15 
 video/mythflix/INSTALL                                                       |    1 
 video/mythflix/PRE_BUILD                                                     |    1 
 video/mythflix/TRIGGERS                                                      |    1 
 video/mythgallery/BUILD                                                      |    1 
 video/mythgallery/DEPENDS                                                    |    1 
 video/mythgallery/DETAILS                                                    |   10 
 video/mythgallery/HISTORY                                                    |   46 -
 video/mythgallery/INSTALL                                                    |    1 
 video/mythgallery/PRE_BUILD                                                  |    1 
 video/mythgallery/TRIGGERS                                                   |    1 
 video/mythgame/BUILD                                                         |    1 
 video/mythgame/DEPENDS                                                       |    1 
 video/mythgame/DETAILS                                                       |   10 
 video/mythgame/HISTORY                                                       |   43 -
 video/mythgame/INSTALL                                                       |    1 
 video/mythgame/PRE_BUILD                                                     |    1 
 video/mythgame/TRIGGERS                                                      |    1 
 video/mythmusic/BUILD                                                        |    1 
 video/mythmusic/DEPENDS                                                      |    1 
 video/mythmusic/DETAILS                                                      |   10 
 video/mythmusic/HISTORY                                                      |   52 -
 video/mythmusic/INSTALL                                                      |    1 
 video/mythmusic/PRE_BUILD                                                    |    1 
 video/mythmusic/TRIGGERS                                                     |    1 
 video/mythnews/BUILD                                                         |    1 
 video/mythnews/DEPENDS                                                       |    1 
 video/mythnews/DETAILS                                                       |   10 
 video/mythnews/HISTORY                                                       |   45 -
 video/mythnews/INSTALL                                                       |    1 
 video/mythnews/PRE_BUILD                                                     |    1 
 video/mythnews/TRIGGERS                                                      |    1 
 video/myththemes/BUILD                                                       |    1 
 video/myththemes/DEPENDS                                                     |    2 
 video/myththemes/DETAILS                                                     |    9 
 video/myththemes/HISTORY                                                     |    6 
 video/myththemes/INSTALL                                                     |    1 
 video/myththemes/PRE_BUILD                                                   |    1 
 video/myththemes/TRIGGERS                                                    |    1 
 video/mythvideo/BUILD                                                        |    1 
 video/mythvideo/DEPENDS                                                      |    1 
 video/mythvideo/DETAILS                                                      |   11 
 video/mythvideo/HISTORY                                                      |   45 -
 video/mythvideo/INSTALL                                                      |    1 
 video/mythvideo/PRE_BUILD                                                    |    1 
 video/mythvideo/TRIGGERS                                                     |    1 
 video/mythweather/BUILD                                                      |    1 
 video/mythweather/DEPENDS                                                    |    1 
 video/mythweather/DETAILS                                                    |   10 
 video/mythweather/HISTORY                                                    |   42 -
 video/mythweather/INSTALL                                                    |    1 
 video/mythweather/PRE_BUILD                                                  |    1 
 video/mythweather/TRIGGERS                                                   |    1 
 video/mythweb/BUILD                                                          |    1 
 video/mythweb/DEPENDS                                                        |    1 
 video/mythweb/DETAILS                                                        |   18 
 video/mythweb/HISTORY                                                        |   47 -
 video/mythweb/INSTALL                                                        |    1 
 video/mythweb/PRE_BUILD                                                      |    1 
 video/mythweb/TRIGGERS                                                       |    1 
 video/totem-pl-parser/DETAILS                                                |    2 
 video/totem-pl-parser/HISTORY                                                |    3 
 video/totem-pl-parser/totem-pl-parser-2.30.2.tar.bz2.sig                     |    0 
 video/totem-pl-parser/totem-pl-parser-2.30.3.tar.bz2.sig                     |binary
 video/vlc/DETAILS                                                            |    4 
 video/vlc/HISTORY                                                            |    3 
 windowmanagers/lxp-icewm/BUILD                                               |    1 
 windowmanagers/lxp-icewm/DEPENDS                                             |    1 
 windowmanagers/lxp-icewm/DETAILS                                             |   11 
 windowmanagers/lxp-icewm/HISTORY                                             |   23 
 windowmanagers/lxp-icewm/INSTALL                                             |    1 
 windowmanagers/lxp-icewm/PRE_BUILD                                           |    1 
 windowmanagers/lxp-icewm/TRIGGERS                                            |    1 
 x11-libs/cairo/DETAILS                                                       |   12 
 x11-libs/cairo/HISTORY                                                       |   10 
 x11-libs/cairo/PRE_BUILD                                                     |    7 
 x11-libs/cairo/cairo-1.10.0-buggy_gradients.patch                            |   14 
 x11-libs/cairo/libpng14.patch                                                |   12 
 x11-libs/libpixman/BUILD                                                     |    1 
 x11-libs/libpixman/DEPENDS                                                   |    1 
 x11-libs/libpixman/DETAILS                                                   |   23 
 x11-libs/libpixman/HISTORY                                                   |   25 
 x11-libs/libpixman/INSTALL                                                   |    1 
 x11-libs/libpixman/PRE_BUILD                                                 |    1 
 x11-libs/libpixman/TRIGGERS                                                  |    1 
 x11-libs/libpixman/libpixman-0.1.6.tar.gz.sig                                |    0 
 x11-libs/wine/DETAILS                                                        |    2 
 x11-libs/wine/HISTORY                                                        |    3 
 x11-toolkits/fox/DETAILS                                                     |    2 
 x11-toolkits/fox/HISTORY                                                     |    3 
 x11-toolkits/fox/fox-1.6.33.tar.gz.sig                                       |    0 
 x11-toolkits/fox/fox-1.6.40.tar.gz.sig                                       |binary
 x11-toolkits/gtk+2/DETAILS                                                   |    2 
 x11-toolkits/gtk+2/HISTORY                                                   |    3 
 x11-toolkits/gtk+2/gtk+-2.21.6.tar.bz2.sig                                   |    0 
 x11-toolkits/gtk+2/gtk+-2.22.0.tar.bz2.sig                                   |binary
 x11-toolkits/gtk+3/DETAILS                                                   |    4 
 x11-toolkits/gtk+3/HISTORY                                                   |    3 
 x11-toolkits/gtk+3/gtk+-2.90.6.tar.bz2.sig                                   |    0 
 x11-toolkits/gtk+3/gtk+-2.90.7.tar.bz2.sig                                   |binary
 x11-toolkits/qt4/BUILD                                                       |    1 
 x11-toolkits/qt4/CONFIGURE                                                   |    5 
 x11-toolkits/qt4/DEPENDS                                                     |    5 
 x11-toolkits/qt4/HISTORY                                                     |   10 
 x11-toolkits/qt4/PRE_SUB_DEPENDS                                             |    3 
 x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS                                  |   21 
 x11-toolkits/qt4/SUB_DEPENDS                                                 |   15 
 x11-toolkits/sptk/DETAILS                                                    |    4 
 x11-toolkits/sptk/HISTORY                                                    |    6 
 x11-toolkits/wxpython/DETAILS                                                |    4 
 x11-toolkits/wxpython/HISTORY                                                |    3 
 x11/x11vnc/DETAILS                                                           |    4 
 x11/x11vnc/HISTORY                                                           |    3 
 x11/xscreensaver/DETAILS                                                     |    4 
 x11/xscreensaver/HISTORY                                                     |    3 
 xorg-data/xkbdata/BUILD                                                      |    1 
 xorg-data/xkbdata/DEPENDS                                                    |    1 
 xorg-data/xkbdata/DETAILS                                                    |   23 
 xorg-data/xkbdata/HISTORY                                                    |   47 -
 xorg-data/xkbdata/INSTALL                                                    |    1 
 xorg-data/xkbdata/PRE_BUILD                                                  |    1 
 xorg-data/xkbdata/TRIGGERS                                                   |    1 
 xorg-data/xkbdata/xkbdata-X11R7.0-1.0.1.tar.bz2.sig                          |    0 
 xorg-driver/xf86-video-ati/DETAILS                                           |    6 
 xorg-driver/xf86-video-ati/HISTORY                                           |    3 
 xorg-driver/xf86-video-ati/xf86-video-ati-6.13.1.tar.bz2.sig                 |    0 
 xorg-driver/xf86-video-i810/DEPENDS                                          |    1 
 xorg-driver/xf86-video-i810/DETAILS                                          |   26 
 xorg-driver/xf86-video-i810/HISTORY                                          |   91 --
 xorg-lib/libx11/DETAILS                                                      |    4 
 xorg-lib/libx11/HISTORY                                                      |    5 
 xorg-proto/xf86miscproto/HISTORY                                             |    3 
 xorg-proto/xf86miscproto/INSTALL                                             |    2 
 xorg-util/util-macros/DETAILS                                                |    6 
 xorg-util/util-macros/HISTORY                                                |    3 
 1396 files changed, 2716 insertions(+), 10472 deletions(-)

New commits:
commit 50c32d317c5f2df8482ef5619b44d3490428048c
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    pulseaudio:  Depends on libxtst when building X11 support
    Fixes Bug #15741

commit fba063c8ac2c21da655bba175623c7ddfe6d8649
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    pulseaudio:  Fails to compile with -Wl,--as-needed in LDFLAGS
    Fixes Bug #15307

commit 9138f1563c877b4a181be67c4c2e81f8b3e8d1b8
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mesalib: feature => 7.6.2, developement => 7.9;
             updated gallium options, added MESALIB_OPTS;
             updated gallium and dri drivers options; added missing options;
             made libxt dependency optional; optionaly depends on talloc;
             added conditional sub_depends on libdrm

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

    reportlab: => 2.5

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

    libmusicbrainz3: => 3.0.3

commit 7f7a86d1d13804cef529f408ebc8fd7ac585d5b0
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    Revert "Revert "avahi: libdaemon is not optional""
    
    This reverts commit 2514fc8170ce04f6395c51b4ade203205dc68fde.

commit 9f6ce4f09eb1530cd8ae48cc9b6fd41fba2e1423
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    Revert "mesalib: stable => 7.7.1, feature => 7.8.2, developement => 7.9;"
    
    This reverts commit 5d61a4e070be6b8ce3f0ae9eeeb37cdf72666c3f.

commit 2514fc8170ce04f6395c51b4ade203205dc68fde
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    Revert "avahi: libdaemon is not optional"
    
    This reverts commit 96981f54e1f536844ac1c1733a40ed52bdd0cd74.

commit 5d61a4e070be6b8ce3f0ae9eeeb37cdf72666c3f
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mesalib: stable => 7.7.1, feature => 7.8.2, developement => 7.9;
             updated gallium and dri drivers options; added missing options;
             made libxt dependency optional; optionaly depends on talloc;
             added conditional sub_depends on libdrm;
             now using only gl_select-scm.patch;
             mv gl_select-scm gl_select

commit 96981f54e1f536844ac1c1733a40ed52bdd0cd74
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    avahi: libdaemon is not optional
    
    Even with every option disabled:
    checking for LIBDAEMON... no
    configure: error: Package requirements ( libdaemon >= 0.11 ) were not
    met:
    
    No package 'libdaemon' found

commit 25606a436a4f2be0b0fff14126a39fff2ae5d53c
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    pulseaudio: Clarify what some optional depends are for

commit 90eda342b1b10b8526da40d5b3ad074437b050be
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    xf86miscproto: Fails to install with multiple make jobs

commit 826a9c0795a251884058373a2ceaa7713b0dd9f1
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gamin: Force glib2 to be cast if not already
    Avoids circular gamin -> glib2 ?-> gamin cast order

commit 29596d5f6914dcebac1ecd41ed5f5757aabb137e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    pcre: Use make_single, fails with multiple jobs (actually fails)

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

    neon 0.29.4

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

    libdrm 2.4.22

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

    isoquery 1.4

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

    iso-codes 3.21

commit 02185e9aad83bcc13eca1411896460102a58f4ec
Author: Philippe Caseiro <puppetmaster at sourcemage.org>
Commit: Puppet_Master <puppetmaster at sourcemage.org>

       e-17/entrance: Removing depreciated spell (removed from e SVN)

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

    tesseract: => 3.00

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

    ntfs-3g: => 2010.10.2

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

    hdparm: => 9.32

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

    hplip: updated spell to 3.10.9

commit 7e384a60180d6033ffb30179e406f8c48ba4474c
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    mail/offlineimap: version 6.2.0.2

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

    freetype2 2.4.3

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

    gimp 2.6.11

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

    man-pages 3.28

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

    liferea: Updated stable to version 1.6.5

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

    subversion: Updated to version 1.6.13

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

    imagemagick: Updated to version 6.6.4-8

commit 2433cde5494f41aa2fbf671c1bb75a8971e10a5d
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    findwild: new spell, a GUI find utility very similar to what some IDEs have

commit 5c035194452b38517a410801184484ff9b39c0e9
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mxml: => 2.6

commit cf90a4195b6722f81ac14c44a77ceb73e60e770b
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    fotoxx: updated to 10.10.1

commit fcc72024c92b71f4dce803012441871414851011
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    ufraw: various cleanups, dependency reorg, new config opts, old config opts

commit fe993c042d5f1e8de1eaad13bfc411f041fe3b3d
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.32.24

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

    VERSION: 0.50-test

commit 3b8ad39b7545b0a2d26ebbea66c7ca5179dba4ae
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    dovecot: update to 2.0.5

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

    icu: => 4.4.2

commit 5828e4973b812526d397a4fe19f083f5932dba43
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    kexec-tools: => 2.0.2

commit 23849d36b4853379aaba88d6f6ff34362ae333cc
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gnumeric: => 1.10.11

commit c639292a0ef0bcae9243162c2ce7d7d95cb8b429
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    goffice: => 0.8.11

commit bfb3e6739e808e50c8ce73eeb55483e4ada47c0a
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libgsf: => 1.14.19

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

    mercurial: => 1.6.4

commit 7ea0a48bdbe339a7e0671e8f86a6011fb2140524
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    alpine: v2.02 released

commit c5d575290031c93628553d54a8b3f85dee9a6d81
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    manually reverted ChangeLog entry for giflib

commit 24a00b1e30b17f9ead50e8d13bac20001e698285
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    Revert "giflib: removed due to deprecation"
    
    This reverts commit f2991d0b41e61504d3aeb5ade43368ef1bb67187.

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

    cracklib 2.8.18

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

    shared-mime-info 0.80

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

    gparted 0.6.4

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

    formalchemy - fix typo in DETAILS

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

    sqlkit: => 0.9.1

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

    gobject-introspection: Updated devel to version 0.9.9

commit 88991882151118845fd624614587e822b1cbd16c
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    dspam: update to 3.9.0, added devel version, cleaning up

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

    git 1.7.3.1

commit 2e1ba527bbe97a7ab684cc28308a41c69499d2a3
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    init.d: => 2.2.7; allow mdadm to start even when /var is located on a separate partition

commit 3e8de4911d14d2872c073b50be24c9b7752316af
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.35.7

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

    feedparser: changed WEBSITE -> WEB_SITE

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

    gtksourceview: changed WEBSITE -> WEB_SITE

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

    qwikmail: changed URL -> WEB_SITE

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

    libgmail: changed URL -> WEB_SITE

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

    live-f1: updated spell to 0.2.10 & some spell fixes (fixes bug #15855)

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

    bluez: updated spell to 4.72

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

    qtcurve-kde4: updated spell to 1.6.3

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

    qtcurve-gtk2: updated spell to 1.6.3

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

    qbittorrent: updated spell to 2.4.2

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

    rb-libtorrent: updated spell to 0.15.3

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

    nss: updated NSS_BRANCH=3.12 to 3.12.8

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

    krename4: updated spell to 4.0.5

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

    amarok2: updated spell to 2.3.2

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

    qtscriptgenerator: to compile with gcc 4.4

commit b465d4a10f2748cf19fcd13e2202c3af4f1856d4
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    soundtouch: bump to 1.5, thereby also fixing build on x86-64.

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

    pango 1.28.2

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

    vlc SECURITY_PATCH++
    
    no idea if this is really needed
    
    http://www.videolan.org/news.html mentions:
    This is a security update, so we recommend all users to update to this new version (CVE-2010-2937 / VideoLAN-SA-1004).
    
    But VideoLAN-SA-1004 has been already fixed in 1.1.3.
    Probably another security improvements.

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

    vlc 1.1.4.1

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

    xf86-video-ati: => 6.13.2

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

    sptk: => 4.07

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

    pyqt4: => 4.7.7

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

    redland-bindings: => 1.0.11.1

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

    gitslave-1.0.0 - new spell

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

    class-methodmaker: => 2.16

commit 46694ab98fc3942aab1e1ff0ab60512d99f4158a
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.32.23

commit 01b7c1d26b4245d26b9f380e0bad2dfeaf31abe8
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.35.6

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

    util-macros: => 1.10.1

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

    libx11: => 1.3.6

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

    grantlee: => 0.1.6

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

    mozart-base: fix description's word wrap

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

    e16 1.0.6

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

    lvm 2.02.74

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

    fox 1.6.40

commit 52623a004046fd056eab0c9401a3ee52b88d48f8
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    cssutils: new spell, python CSS handling classes

commit d35291412f318022a13b9a363631dc0b11536bf4
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    pythonmagick: new spell, imagemagick python bindings

commit a5ea87294e6386acab64a55eb486c6b850d2d912
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    calibre: update do 0.7.20

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

    webkitgtk: Updated devel to version 1.3.4

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

    redland: => 1.0.11

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

    rasqal: => 0.9.20

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

    mysql: Updated stable to version 5.1.51

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

    imagemagick: Updated to version 6.6.4-6

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

    kid3-kde4: => 1.5

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

    gtk+2: Updated devel to version 2.22.0.  This is the new stable version
    of gtk+2.  We will need to decide whether to update before next gnome
    version.

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

    gdk-pixbuf2: Updated to version 2.22.0

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

    gobject-introspection: Updated devel to version 0.9.6.  This is going
    to require an UP_TRIGGERS when devel goes to stable.

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

    glib2: Updated devel to version 2.25.17

commit c87d3e902e226f2f6931dbcdc5f94396f6e77f97
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    nss-pam-ldapd: => 0.7.10

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

    dbus: => 1.4.0

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

    gparted 0.6.3

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

    pywebkitgtk 1.1.8

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

    djview4: => 4.6

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

    djvulibre: => 3.5.23

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

    firebird25: => 2.5.0.26074-0

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

    libtool 2.4

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

    man-pages 3.27

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

    autoconf 2.68

commit c6c720a1b502d2e03a29df9b2eb983e6a14a5f8e
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    unicap: removed due to deprecation

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

    libisoburn: => 0.6.2.pl00

commit 1ccbd9b24ca16c043dac5fc9316f040f75faff9d
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    ChangeLog entry for the deprecations

commit 3dbaf249e173e467c3d3d0a629139440c8b577c1
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mlt++: removed due to deprecation

commit 73dfb96823748ec9c0091d0afd8664b7d842a192
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    pitfdll: removed due to deprecation

commit 2878fb9b25751e8b45d5187b804d2524d03b5f0d
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gstreamer-0.8: removed due to deprecation

commit ac97fda1cca6b9ca2cd159cecfa80d97e703ac0c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gst-plugins: removed due to deprecation

commit 970a732ba2cd86ad86fa40efe387d478ef38608c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gst-ffmpeg-0.8: removed due to deprecation

commit 35336566f0e3fdd4c344adeceb82c8922de09624
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gst-player: removed due to deprecation

commit 9dca07b12f13a7ba07c705bc0f32e7a616a08c28
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gst-editor: removed due to deprecation

commit 1aca32e4e65c64748987060ede75178646fe1afe
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    schedutils: removed due to deprecation

commit 240a8f0fe7c24c3d1922b0a452709022c6767c3f
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mktemp: removed due to deprecation

commit d015d846ad513a516fe633bb633891b57cd4095e
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    geda: removed due to deprecation

commit fd125b46afc3d8bb6e2d566d214bab30b4ef3282
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    ruby-gstreamer: removed due to deprecation

commit 2721bbdf5007f3ddc4d4a0ee66b7bbf7e8adf495
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    template-plugin-gd-image: removed due to deprecation

commit e6e47c2743efc1e7c33decc5b4c25c8ba6f124e3
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mime-parser: removed due to deprecation

commit 4d9e6abbacdc5afa39ce733fc55c3aca21687532
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    libnetfilter_queue: removed due to deprecation

commit bb7e3315a37eda7f4954910429713ecdb71a4e93
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    libnetfilter_log: removed due to deprecation

commit e6db2d79181bfc7b1bb246a37d3df2def4f9974c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gridentd: removed due to deprecation

commit cbbd4ec251cff46e8333d03e131a11ec1275ba3a
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    wbxml2: removed due to deprecation

commit 817df32b2a10943a9d1db5b8ec1fed7424ea1988
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    sylpheed-claws-extra-plugins: removed due to deprecation

commit cf6602aace9fe35e7a4e081fd5949bc4537518db
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    sylpheed-claws: removed due to deprecation

commit d2255bda70dd6b42955557ea3fe96434789e1dcf
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    serveez: removed due to deprecation

commit 725d3b1bd574742caedd4874f0e2b731194378ec
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    commonc++: removed due to deprecation

commit 6c582777d3c3b4bf53ebbfa78832346505d62d78
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    cdemu: removed due to deprecation

commit 864f0e3f9ea8745e4902aea93323fc83dab2e3f9
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    kdelibs4-experimental: removed due to deprecation

commit 8c46d0169148b292f9d6c6848f19cada5fe727e3
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    kdiamond: removed due to deprecation

commit 0746205bbd220579913fc687f14714f2ff2cd8fe
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    dragonplayer: removed due to deprecation

commit c216d095886300508e106b6b2a66b9c87736ac46
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    nvu: removed due to deprecation

commit 31163a2f858fc62a030bccfb01f174f3d63cfa78
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    ijb-waldhoff: removed due to deprecation

commit d177b7877128e6f61b55145342e946172cf3388b
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    ijb: removed due to deprecation

commit 93f8bd1ea259742191d74fcee6b459e34abd132e
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    galeon: removed due to deprecation

commit f2991d0b41e61504d3aeb5ade43368ef1bb67187
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    giflib: removed due to deprecation

commit 4b6d8f299d7ff9759cf066028bf3fd95b11ce82b
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gnustep-back-xlib: removed due to deprecation

commit bcbb3b3389abffb60c5128f50e329eff02937d9c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gnustep-back-art: removed due to deprecation

commit 707f2a06eec473832eda493551d009860f8c2f63
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    xf86-video-i810: removed due to deprecation

commit f3244eded8ca231be8ac1a945acb8435bac82760
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    xkbdata: removed due to deprecation

commit a4d66c5832da6048b65a0064822f14109f17e090
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    libpixman: removed due to deprecation

commit e3eb7ee793a1e2dbef05813d1992be51457e9832
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    lxp-icewm: removed due to deprecation

commit a48cf705d0e4b91077d51ba608df4c61d18709a9
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    myththemes: removed due to deprecation

commit fe1ee162a69ba5420862a39c2a9e745ef7aed1df
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    ximian-connector: removed due to deprecation

commit 1c5fd9cfc122b6a1dba5449fee62a20385126bec
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    scrollkeeper: removed due to deprecation

commit 7022fc4ab614dd4448352773be5bb26d9a167bf3
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    sawfish2: removed due to deprecation

commit 33dadf6cc1574ba1891aad8fbd8e75e53763758b
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    profile-gnome2-desktop: removed due to deprecation

commit a50733644d92bdf95e86e9b50f176390bb70ff18
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    nautilus-media: removed due to deprecation

commit e4c2b2433190fc1142250d33d2c5091efe6aa004
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    nautilus-cd-burner: removed due to deprecation

commit 01d17556c620040dafaef03ea6dff47ef09877eb
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    libgnomedb-dev: removed due to deprecation

commit a1958acafecbdc80c78f3cdf3259d245b22e49e8
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gal2: removed due to deprecation

commit 3809f76c734b856aaab0d65865db313fe0af6465
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gail: removed due to deprecation

commit 4b394bcc677642fff38bfd68b4a7ae0c35abfac5
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    eel2: removed due to deprecation

commit 507aeac09993e1359af6281da18a8f3653565489
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    metatheme: removed due to deprecation

commit ae4c361f8a86b557f3aec5fc7100c5ab0acb4919
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    memprof2: removed due to deprecation

commit 977ec47a938868cc89412972dddd6803a9ffffae
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gswitchit: removed due to deprecation

commit a80603fbde638e1fd6224f419627790ede89c55c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    glabels2: removed due to deprecation

commit 04add2773cd34b1d97da38dfd2f81856b82336fa
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    ggv2: removed due to deprecation

commit e13310c6da05b9f26bfe779738dfbd5d0d7178d0
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gftp2: removed due to deprecation

commit a983f55e8d3be32d9642518784c3f75125e635bc
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    file-roller2: removed due to deprecation

commit 6af0c248e3f76b3ac8b24015a5bd21eae59d860c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    guppi: removed due to deprecation

commit 2e5bfbc8fed76aa75963c72090bdbb3c85a3a86e
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gnome-utils: removed due to deprecation

commit 86732033f3130f9ad34080c4257cdaaef070786e
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gnome-karubik-profile: removed due to deprecation

commit d11b59193416b39931231dac21fdd36c515cf5c0
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gnome-games: removed due to deprecation

commit cce0f614d8d1ea394b5a5e83e70451b210b3ed65
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gnome-chess: removed due to deprecation

commit 948da23779a8d5853bbca08b8c41831a7188829a
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    gnome-admin: removed due to deprecation

commit 26d457449ef117453b59c4d96048ee8c09f1da35
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    glade: removed due to deprecation

commit 3fe5791c47052b6fae7f5f5766d1ff53bd73b3d1
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    evoak: removed due to deprecation

commit 2b14e0bfc5562d13071bf6d30004616bb3988f32
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    e_module-mixer: removed due to deprecation

commit 0909a5c1db246703779583053e6a34416f3c481c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mkisofs: removed due to deprecation

commit 6009a7343513c209bcb411700673756679775c85
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mcvs: removed due to deprecation

commit 505118f18eb35c1166b33a4fc5d51ea8ad362798
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    eclipse-cdt-testing: removed due to deprecation

commit e77bad3c23822650690f6814706424a0489038a2
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    eclipse-cdt-sdk: removed due to deprecation

commit cfb8c16d3c1f46a8d2ee18669e5401b4059af223
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    eclipse-cdt: removed due to deprecation

commit 1b0bd0742d2d09049c3150e2b5966424726a2e34
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    boostpythongenerator: removed due to deprecation

commit 8ffbf762ab0c628649ca67104ce979e68b728e7d
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    bazaar: removed due to deprecation

commit 11af14b0f139aed7ece93c4bc033af67923b2497
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    picosql: removed due to deprecation

commit 1710be86dd689eaf56bae40d43685cda4f9773af
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythweb: removed due to deprecation

commit 48751e377a64a48550e908e6a48d80247c1d0703
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythweather: removed due to deprecation

commit 70523361089a458ae1f6e88ba2e31173ab01ac12
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythvideo: removed due to deprecation

commit 79061b220421cd6d90b864121298859900d61e64
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythnews: removed due to deprecation

commit 743d76c5047ba24a117c0e35b8da0704b986c00a
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythmusic: removed due to deprecation

commit 0942c5695e6a59a6b2c3327fafe60c5555e402bf
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythgame: removed due to deprecation

commit 29745068f2ba6fae3f67b29c35fd45050c451adf
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythgallery: removed due to deprecation

commit ccd38eeb4e26e0c6ee3f368570f9bde2c172f73c
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythflix: removed due to deprecation

commit 6d447afe75ba32313e2582279bfa73e73d67fda0
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythdvd: removed due to deprecation

commit 30e1a61194fab3274890d00476aa4a76001afbeb
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mythbrowser: removed due to deprecation

commit 5a885df3b3878b803a8ce74b8e76215ec8cc137a
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mpeg2dec: removed due to deprecation

commit c69a1013fecde2fc9a2f1dc8abd824e884703fbe
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    fotox: removed due to deprecation

commit b0152d001a9b820b9e9da62304387934dde63a30
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    mozilla: removed due to deprecation

commit 5e68b6ad654cbf8f0b6963dde1d9e2e8b5aef55a
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    device-mapper: removed due to deprecation

commit d8c58b25a9ac6b3e0808af3d5753a29528feb858
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    python-gammu: removed due to deprecation

commit 2bea760f90218abc5cb7215f0cc7ed59cd8b5c2f
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    suspend2-userui: removed due to deprecation

commit 24b72bddf1cf4a99e71e3939f4852434180aaecb
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    lxsession: removed due to deprecation

commit b64fcc3b7f1a56ca14061091c91d328940b7f1e2
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    module-build: : removed due to deprecation

commit 7b3219fe25a58f765b5faa55ebe389bea966515a
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    shorewall-shell: removed due to deprecation

commit 3f24387827e76f07aa361feb8d0532b5cdd8aafc
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    shorewall-perl: removed due to deprecation

commit e6ded5f8243356d0596ca1cbca6faa18c36f3442
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    kxneur: removed due to deprecation

commit 33ae2f07607468041b62f8bb4fb7ee00c3ff45af
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    apache: removed due to deprecation

commit d9e6b8f0dfab998c54eda56da33f34c5158927e3
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    odkutils: removed due to deprecation

commit e0ecdc0f1e54d82c707e36e5ae0e5741ff172c3f
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    odk-ng: removed due to deprecation

commit bbd3343b95a38b8f41a4d32a6ca53270e9a0a876
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    aircrack: removed due to deprecation

commit 64ef7db195b4cd0d410f3f412d6f07ff8a50f671
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    micq: removed due to deprecation

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

    quassel: updated spell to 0.7.1

commit 241954882528dbaba1f49bc0e17b5d371976c1ba
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit cf5efd804ff8c12c68be00243c3625d8f20827d8
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit 546b7c6f54b599519ee5c0416aef6debb35d3e00
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit b1b6515842406c9f76d28b9f9a60c21b76c5ba0d
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit 749db81665825cc9c3865496cb4df68c0b0b0884
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit 97fb2417af0972a69ccc2355669b72bb72f1549e
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit bb4da33d05ccda79413b6f9089412b818baca98a
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit 8c79b182088ccf18c688cc54737c6d04f793c122
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit 9fc6b02486be00970cc8f2236ccb6b6cee71beab
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit 1a77e129e6f2a4dde4a61bb4867aec8c7c1960f7
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

commit c4c300ffec586e549bfdba82b823a2372a0c70e2
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    removed due to deprecation

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

    xscreensaver 5.12

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

    libspectre: updated spell to 0.2.6

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

    Revert "grep 2.7"
    
    This reverts commit e91a63553c675e7a956d09730cf9b7e2983ac288.
    
    Sorcery has problems with this version,
    http://bugs.sourcemage.org/show_bug.cgi?id=15852
    it doesn't install init scripts.

commit 108da8292880555f6dc45eb79eb4c5fb7ce9c2b5
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    mpg123: bump to 1.12.4

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

    libvpx needs yasm
    
        [AS] vp8/common/x86/idctllm_mmx.asm.o
    /bin/sh: yasm: command not found
    make[1]: *** [vp8/common/x86/idctllm_mmx.asm.o] Error 127
    make: *** [.DEFAULT] Error 2
     ! Problem Detected !
    Creating compile log /var/log/sorcery/compile/libvpx-git.bz2

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

    live: updated spell to 2010.09.22

commit d3204ebae1e86731f4375c7dc74cb07694bf4d95
Author: Vasil Yonkov <spirtbrat at sourcemage.org>
Commit: Vasil Yonkov <spirtbrat at sourcemage.org>

    hashkill: new spell, hashkill is an open-source password cracker

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

    pgadmin3 1.12.0

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

    net/openwbem: fixed LICENSE, rewrote DEPENDS and added init script

commit 30798347e3387d145e115a8db54a712ba1586e8c
Author: Philippe Caseiro <puppetmaster at sourcemage.org>
Commit: Puppet_Master <puppetmaster at sourcemage.org>

       graphics/shotwell : Adding libgphoto2 as dep

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

    xfe 1.32.2

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

    grep 2.7
    
    added grep.gpg with key 000BEEEE (Jim Meyering)
    http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&search=0x7FD9FCCB000BEEEE
    signed for example with 2527436A, we have already had in grimoire

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

    net/openwbem: new spell, open implementation of Web Based Enterprise Management

commit 5a6349426b37c260a59556c73b0062d9609d9f69
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.27.54

commit 690561de2240bb6ac2841ba752b091d1dd0aeb31
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.32.22

commit 5a838ff9af2ef0cfc7a7cb40688de6665daad02e
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.35.5

commit c2819fe8b38cf40c63cf3f01a1cf428a12c30a94
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/iso-codes: version 3.20

commit cfec1d637b9f65f08a35b74fbe9de5c67f8bc52a
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    dovecot: update to 2.0.3

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

    clamav: => 0.96.3

commit 93dfd2e2a54b08f3cc8374a7c9a7c7536f82dd19
Author: Peng Chang (Charles) <chp at sourcemage.org>
Commit: Peng Chang (Charles) <chp at sourcemage.org>

    maxima: => 5.22.1

commit 03b5181d97b3b39ed5dd5e9d724710e03ff178ef
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    archive/bzip2: version 1.0.6, fixes CVE-2010-0405

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

    ghostscript - upstream modified the tarball to include the autocnf stuff

commit fff9a97c6c1dd235afee39279ab23647c3a4d570
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    exim: fixes for dovecot sasl, upstream applied already

commit 15a4599275507926903bbfc9c181e2cbb5293dae
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    sysstat: => 9.0.6.1

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

    ftp/valknut: updated to 0.4.9

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

    midori: Updated to version 0.2.8

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

    tig 0.16.1

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

    git: Updated to version 1.7.3

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

    elfutils 0.149

commit ded471328ce224c7e03b72736985c6169951bca8
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    xml-parser-expat/HISTORY: fixed typo

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

    libdbi: => 0.8.4

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

    xml-parser-expat: => 2.40

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

    bzr - Fix traceback with python-2.7 xmlrpclib

commit 704cbba45f4e5ff941fdd76d11b5fc70d3029add
Author: David Haley <khoralin at gmail.com>
Commit: David Haley <khoralin at gmail.com>

    New Spell: silc-toolkit.
    
    Amount other things this allows for PidginIM to be build with SILC
    protocol support. This spell requires no dependencies, and there
    are no steps within pidgin make process (no addition --options)
    for SILC support to be included.
    
    However, Pidgin had its DEPENDS file updated with an optional depends
    in case the person casting pidgin wanted SILC support included.

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

    pycairo 1.8.10

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

    termit 2.5.0

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

    orc 0.4.9

commit 706ad5dceb725fadd961de6e3cd38fc4fce84c5f
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/procps: moved sediting to PRE_BUILD

commit b272cf27d2a76ad6519adb57f2d08b20902b4be6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    wine: Updated to 1.3.3

commit 5e8740efce9ff32f373f99139e2d05d65923e0fc
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "Revert "sip: updated spell to 4.11.1""
    
    This reverts commit a5f96e87e9104d83ea54ed09f7d432089133416b.
    
    pyqt4 4.7.4 works fine with sip 4.11.x, I had pyqt4 built against the
    wrong version when testing.
    
    pyqt4 4.7.6 still breaks pylotro.

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

    metacity 2.30.2

commit 7f2a8902f62e89ed48a3f7d60b1de0ac05c9e2b6
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "pyqt4: updated spell to 4.7.6"
    
    This reverts commit 23c7a53b1a981d5a2aeed00dcbfe09dc0cf4e9b5.
    
    Broken API (see Bug #15843)

commit a5f96e87e9104d83ea54ed09f7d432089133416b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "sip: updated spell to 4.11.1"
    
    This reverts commit c098b36a673b9b043bddf286e2fda563edbcf209.
    
    Breaks pyqt4 4.6.4 (pyqt4 4.6.6 breaks other applications).
    Bug #15843

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

    imagemagick: Updated to version 6.6.4-3

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

    firefox: Updated devel to version 4.0b6

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

    squid: Updated to version 3.1.8

commit 8583894a6097915869a68dc895f8d902630b1c70
Author: Finn Haedicke <finn at sourcemage.org>
Commit: Finn Haedicke <finn at sourcemage.org>

    utils/schroot: added trigger check_self on boost.
    
    schroot: error while loading shared libraries:
    libboost_program_options.so.1.43.0: cannot open shared object file:
    No such file or directory

commit aa815f3215a5443cf319ef526029e05beacf9ae1
Author: Finn Haedicke <finn at sourcemage.org>
Commit: Finn Haedicke <finn at sourcemage.org>

    sane-backends: use flag --en/disable-latex to completly disable texlive

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

    kdelibs4: xz-utils -> LZMA

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

    ghostscript: => 9.00

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

    libburn: => 0.8.6

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

    sptk: => 4.04

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

    dabo: => 0.9.3

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

    kdevelop4: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

    kdeutils4: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

    kdesdk4: changed, prevent update_xdg_mimetypes (fixes bug #14918)

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

    kdegames4: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

    kdebase4-runtime: added, prevent update_xdg_mimetypes (fixes bug #14918)

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

    k3b4: added, prevent update_xdg_mimetypes (fixes bug #14918)

commit c5cbb54dd1bf2129c4cf41097f48d2badfd10e80
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gvfs: fixed work with openssh 5.6

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

    kdelibs4: removed hack to search for phonon in /opt/kde4
    
    Now phonon install pc file in right place so that hack is not needed anymore.

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

    kdegraphics4: added, create symlink to pc files in /usr/lib/pkgconfig

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

    phonon: added, create link to pc file in /usr/lib/pkgconfig

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

    qt4: only ask about GStreamer support if phonon is build too

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

    qt4: added $QT_PHONON to $OPTS

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

    phonon: depends on qt4 without phonon

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

    qt4: added option PHONON and NO_PHONON

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

    qt4: added query to build phonon or not

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

    digikam4 1.4.0

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

    kipi-plugins4 1.4.0

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

    pygtksourceview - add explicit depends python

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

    cracklib - optional depneds python

commit 2213edd4dd8f07e75492fd70d7566ca70e7e1baa
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    gnome2-libs/gconfmm: disabled building of documentation to fix build
    error

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

    pyside: => qt4.6+0.4.1

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

    shiboken: => 0.5.0

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

    generatorrunner: => 0.6.1

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

    apiextractor: => 0.8.0

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

    libgee 0.5.3

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

    prosody: add proper description

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

    docbook-xsl 1.76.0

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

    ccache: => 3.1

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

    formalchemy - new spell

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

    markupsafe - new spell

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

    webhelpers: => 1.2

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

    thunderbird 3.1.4

commit 4a5dee33ccb9ca03c6ae8bdc3bea80c975ad92b9
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "iptables: Allow for CHECKSUM used with kernel vhost-net"
    
    This reverts commit 3664227e494eddf03c6d7a7b9998a4bc2af834d5.
    
    Also requires kernel patches, reverting.
    See http://www.gossamer-threads.com/lists/linux/kernel/1248426

commit 1ae0d3c18d57445b6e129de1450f6a0f7085a75e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "libvirt: Depends on iptables with CHECKSUM support"
    
    This reverts commit 66e79efbecd3b4141579911e4ac5ad95a1161d71.
    
    Also requires kernel patches, reverting.
    See http://www.gossamer-threads.com/lists/linux/kernel/1248426

commit 66e79efbecd3b4141579911e4ac5ad95a1161d71
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libvirt: Depends on iptables with CHECKSUM support
    	See https://partner-bugzilla.redhat.com/show_bug.cgi?id=612588

commit 3664227e494eddf03c6d7a7b9998a4bc2af834d5
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    iptables: Allow for CHECKSUM used with kernel vhost-net
    See https://partner-bugzilla.redhat.com/show_bug.cgi?id=612588
    See http://www.spinics.net/lists/netfilter/msg48556.html for xt_CHECKSUM.h
    
    The libvirt patch has already been applied in 0.8.3, see
    	https://www.redhat.com/archives/libvir-list/2010-July/msg00256.html

commit 4f3d1b80cf445c132b92b003accc45267a32b994
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libvirt: Updated to 0.8.4

commit d7344f93a5df0aae8daf7fceae0f040df36f2be8
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    virt-manager: Fix segfault with Python 2.7
    
    Based on gajim's Python 2.7 patch (thanks Vlad!)

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

    clutter-gtk 0.10.8

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

    bluefish 2.0.2

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

    zint 2.4.0

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

    zint: fix description

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

    beecrypt: tidy up the description

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

    liboobs: tidy up the description

commit 86d6413ad1a94e67cab61049b882217b14e37a26
Author: David Haley <khoralin at gmail.com>
Commit: David Haley <khoralin at gmail.com>

    init.d/mountall.sh: checkfs() updated to removed /forcefsck
    
    As opposed to taking out only the '/fastboot' out of the line
    'rm -r /fastboot /forcefsck' during the previous commit,
    I removed the whole line. I have added the correct line back in.

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

    firefox 3.6.10

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

    xulrunner 1.9.2.10, FFVERSION=3.6.10

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

    epiphany 2.30.6

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

    seamonkey 2.0.8

commit d6ef7152e2e3fc8017635d7f8162fe3fa33c06b9
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/dmidecode: added patch to fix broken Makefile

commit cb150ae40bc1e82bab1c6e1644397ef5baee203a
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    net/traceroute: version 2.0.16

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

    aria2: updated spell to 1.10.3

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

    libisofs: => 0.6.36

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

    poedit: => 1.4.6.1

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

    cairo: patch for gentoo bug #336696

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

    qtcurve-kde4: updated spell to 1.6.1

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

    qtcurve-gtk2: updated spell to 1.6.1

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

    kdenlive4 0.7.8

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

    mlt 0.5.10

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

    brasero 2.30.3

commit a9d50c60fc0bda7cec70eb2a524c6ab16f69e3ca
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    nsd: => 3.2.6

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

    espeak 1.44.05

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

    libwnck 2.30.4

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

    glew 1.5.6

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

    totem-pl-parser 2.30.3

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

    live 2010.09.10

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

    graphics-libs/mesalib: removed link creation for git branch

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

    samba 3.5.5, SECURITY_PATCH=13

commit da646c4899b55a188364ed8d904e341d9a2c7e70
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    linux 2.6.34.7

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

    qt4: added option EXCEPT to *SUB_DEPENDS

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

    arora: depend on qt4 with exceptions (fixes bug #15551)

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

    decorator: => 3.2.0

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

    reportlab: => 2_4

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

    wxpython: => 2.6.4.0

commit 7ebe14a8f18ace7825d42e82a9c8269a99fdcc1d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    perl: Auto-conflict with archive-{zip,tar}
    as they are now included in perl 5.12+

commit aba4ca31c0b576f447223f2546a8c98551d7d764
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    ncurses: Remove incorrect check on UL_VERSION from util-linux
    Thanks Ladislav :)

commit 015e5def4d2162d4b3defa8dc0fff3e9aad98a8c
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    linux: smgl-logo-0.2-for-2.6.31.patch applies to 2.6.34/35

commit 528e0008422329e00fc88ea09a20d2c41260835c
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    libs/glibc: fixed build with make 3.82

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

    sqlite: Hopefully have it right this time.  I think many of these
    PRE_SUB_DEPENDS need to be looked at.

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

    sqlite: Fix logic in PRE_SUB_DEPENDS.  This is why sqlite was
    not getting queued when casting xulrunner

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

    tk: Updated stable to version 8.5.9

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

    tcl: Updated stable to version 8.5.9

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

    moreutils: updated spell to 0.41

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

    seamonkey: default to not use system cairo.  Newer version of cairo
    are causing crashes.  Need to consider for all mozilla products.

commit 604fa1159b15ebbc7577c410624f4f070b9cdd24
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    passenger: => 2.2.15

commit e15af7cb6ad33eff3024e7e518d45898c2cb66fb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    rubygems: => 1.3.7

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

    bzr: => 2.2.0

commit ade28fcc6ed88d7f3e7859828e499b5227e34b7b
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ruby-1.8: => 1.8.7-p302

commit db5bc842b45e140f31018dfb193e475df351c228
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/unison: fixed build error with ocaml 3.12

commit 1d935686ae00d0f720e0dba2ff44790625cfca0f
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    utils/unison: added missing dependencies

commit 03b1eb6657ab7276525946571687e1d03e518fb9
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    science/qtoctave: fixed missing includes

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

    asciidoc: updated spell to 8.6.1

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

    cloc: updated spell to 1.52

commit 832cab039c247def819acf67645f2e71de16d7f7
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    ghostscript: => 8.71.1

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

    Revert "gdk-pixbuf2: Updated to version 2.21.7"
    A little too cutting edge
    This reverts commit b034f961b0d6dae9d3a5f7e46d9b8f699844026d.
    
    Conflicts:
    
    	gnome2-libs/gdk-pixbuf2/HISTORY

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

    Revert "gobject-introspection: Updated devel to version 0.9.5"
    A little too cutting edge
    
    This reverts commit ed713157c4fa0de2982a30ea7800b4fe5604c44d.

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

    libraw 0.10.0

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

    gdk-pixbuf2: Added optional depends gobject-introspection

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

    gobject-introspection: Updated devel to version 0.9.5

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

    libgee 0.5.2

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

    gdk-pixbuf2: Updated to version 2.21.7

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

    gtk+3: Updated to version 2.90.7

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

    gexiv2 0.2.1

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

    shotwell 0.7.2

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

    elixir: => 0.7.1

commit 7c111afacf7c67008b29049c07fd12b67e6141bb
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    devel/codeblocks: call autotools only when building from svn

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

    cairo: Updated to version 1.10.0.  I haven't seen any issues with
    this update.

commit 44e18521217729b2fc177db5b4566b9ec4c6c5ce
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    audio-creation/audacity: version 1.3.12

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

    django: updated spell to 1.2.3

commit 67e0684eea3ed8d3ad2206dfd20a7678f2cb296e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    x11vnc: => 0.9.12

commit 621ceb65dfe3dbdcb3cf2aecf68527807f8afa9f
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    poppler: => 0.14.3

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

    thunderbird: Added new thunderbird upstream key.  Only could verify
    using 2 of 3.

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

    thunderbird: Updated to version 3.1.3. SECURITY_PATCH++.  Changed from
    upstream key to source hash due to change in who is signing tarball.

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

    proftpd: Updated to version 1.3.3b

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

    phpmyadmin: Updated to version 3.3.7

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

    firefox: Updated devel to version 4.0b5. Updated INSTALL to use
    make -f client.mk install vice make install

diff --git a/ChangeLog b/ChangeLog
index 5d1a206..6ceb927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,144 @@
+2010-10-04 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
+	* e-17/entrance: removed deprecated spell
+
+2010-10-03 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* utils/findwild: new spell, a GUI find utility - very similar to what some
+	  IDEs have
+
+2010-09-28 Treeve Jelbert <treeve at sourcemage.org>
+	* devel/gitslave: new spell
+
+2010-09-26 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* graphics-libs/pythonmagick: new spell, ImageMagick python bindings
+	* python-pypi/cssutils: new spell, CSS python classes
+
+2010-09-23 Vasil Yonkov <spirtbrat at sourcemage.org>
+	* audio-creation/csound: removed deprecated spell
+	* audio-drivers/jack-cvs: removed deprecated spell
+	* audio-drivers/jackmidi_alsaseq: removed deprecated spell
+	* audio-libs/libao-pulse: removed deprecated spell
+	* audio-libs/libmp4v2: removed deprecated spell
+	* audio-players/tunesbrowser: removed deprecated spell
+	* audio-plugins/tap: removed deprecated spell
+	* audio-soft/cdrtoaster: removed deprecated spell
+	* chat-im/centericq: removed deprecated spell
+	* chat-im/gaim: removed deprecated spell
+	* chat-im/gaim-encryption: removed deprecated spell
+	* chat-im/micq: removed deprecated spell
+	* crypto/aircrack: removed deprecated spell
+	* database/odk-ng: removed deprecated spell
+	* database/odkutils: removed deprecated spell
+	* database/picosql: removed deprecated spell
+	* devel/bazaar: removed deprecated spell
+	* devel/boostpythongenerator: removed deprecated spell
+	* devel/eclipse-cdt: removed deprecated spell
+	* devel/eclipse-cdt-sdk: removed deprecated spell
+	* devel/eclipse-cdt-testing: removed deprecated spell
+	* devel/mcvs: removed deprecated spell
+	* disk/mkisofs: removed deprecated spell
+	* e-17/e_module-mixer: removed deprecated spell
+	* e-17/evoak: removed deprecated spell
+	* gnome1-apps/glade: removed deprecated spell
+	* gnome1-apps/gnome-admin: removed deprecated spell
+	* gnome1-apps/gnome-chess: removed deprecated spell
+	* gnome1-libs/gnome-games: removed deprecated spell
+	* gnome1-libs/gnome-karubik-profile: removed deprecated spell
+	* gnome1-libs/gnome-utils: removed deprecated spell
+	* gnome1-libs/guppi: removed deprecated spell
+	* gnome2-apps/file-roller2: removed deprecated spell
+	* gnome2-apps/gftp2: removed deprecated spell
+	* gnome2-apps/ggv2: removed deprecated spell
+	* gnome2-apps/glabels2: removed deprecated spell
+	* gnome2-apps/gswitchit: removed deprecated spell
+	* gnome2-apps/memprof2: removed deprecated spell
+	* gnome2-apps/metatheme: removed deprecated spell
+	* gnome2-libs/eel2: removed deprecated spell
+	* gnome2-libs/gail: removed deprecated spell
+	* gnome2-libs/gal2: removed deprecated spell
+	* gnome2-libs/libgnomedb-dev: removed deprecated spell
+	* gnome2-libs/nautilus-cd-burner: removed deprecated spell
+	* gnome2-libs/nautilus-media: removed deprecated spell
+	* gnome2-libs/profile-gnome2-desktop: removed deprecated spell
+	* gnome2-libs/sawfish2: removed deprecated spell
+	* gnome2-libs/scrollkeeper: removed deprecated spell
+	* gnome2-libs/ximian-connector: removed deprecated spell
+	* gnustep-libs/gnustep-back-art: removed deprecated spell
+	* gnustep-libs/gnustep-back-xlib: removed deprecated spell
+	* graphics/fotox: removed deprecated spell
+	* http/apache: removed deprecated spell
+	* http/galeon: removed deprecated spell
+	* http/ijb: removed deprecated spell
+	* http/ijb-waldhoff: removed deprecated spell
+	* http/mozilla: removed deprecated spell
+	* http/nvu: removed deprecated spell
+	* kde4-apps/dragonplayer: removed deprecated spell
+	* kde4-apps/kdiamond: removed deprecated spell
+	* kde4/kdelibs4-experimental: removed deprecated spell
+	* kde-apps/kxneur: removed deprecated spell
+	* kernels/cdemu: removed deprecated spell
+	* kernels/device-mapper: removed deprecated spell
+	* kernels/suspend2-userui: removed deprecated spell
+	* libs/commonc++: removed deprecated spell
+	* libs/serveez: removed deprecated spell
+	* lxde/lxsession: removed deprecated spell
+	* mail/sylpheed-claws: removed deprecated spell
+	* mail/sylpheed-claws-extra-plugins: removed deprecated spell
+	* mobile/wbxml2: removed deprecated spell
+	* net/gridentd: removed deprecated spell
+	* net/libnetfilter_log: removed deprecated spell
+	* net/libnetfilter_queue: removed deprecated spell
+	* net/shorewall-perl: removed deprecated spell
+	* net/shorewall-shell: removed deprecated spell
+	* perl-cpan/mime-parser: removed deprecated spell
+	* perl-cpan/module-build: removed deprecated spell
+	* perl-cpan/template-plugin-gd-image: removed deprecated spell
+	* python-pypi/python-gammu: removed deprecated spell
+	* ruby-raa/ruby-gstreamer: removed deprecated spell
+	* science/geda: removed deprecated spell
+	* utils/mktemp: removed deprecated spell
+	* utils/schedutils: removed deprecated spell
+	* video/gst-editor: removed deprecated spell
+	* video/gst-player: removed deprecated spell
+	* video-libs/gst-ffmpeg-0.8: removed deprecated spell
+	* video-libs/gst-plugins: removed deprecated spell
+	* video-libs/gstreamer-0.8: removed deprecated spell
+	* video-libs/pitfdll: removed deprecated spell
+	* video/mlt++: removed deprecated spell
+	* video/mpeg2dec: removed deprecated spell
+	* video/mythbrowser: removed deprecated spell
+	* video/mythdvd: removed deprecated spell
+	* video/mythflix: removed deprecated spell
+	* video/mythgallery: removed deprecated spell
+	* video/mythgame: removed deprecated spell
+	* video/mythmusic: removed deprecated spell
+	* video/mythnews: removed deprecated spell
+	* video/myththemes: removed deprecated spell
+	* video/mythvideo: removed deprecated spell
+	* video/mythweather: removed deprecated spell
+	* video/mythweb: removed deprecated spell
+	* windowmanagers/lxp-icewm: removed deprecated spell
+	* x11-libs/libpixman: removed deprecated spell
+	* xorg-data/xkbdata: removed deprecated spell
+	* xorg-driver/xf86-video-i810: removed deprecated spell
+	* video-libs/unicap: removed deprecated spell
+
+2010-09-22 Vasil Yonkov <spirtbrat at sourcemage.org>
+	* security/hashkill: new spell, hashkill is an open-source password cracker
+
+2010-09-21 Pol Vinogradov <vin.public at gmail.com>
+	* net/openwbem: new spell, open implementation of Web Based Enterprise Management
+
+2010-09-19 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* accounts: added dovenull
+	* groups: added dovenull
+
+2010-09-18 David C. Haley <khoralin at gmail.com>
+	* chat-libs/silc-toolkit: new spell - permits PidginIM to build with SILC.
+
+2010-09-16 Treeve Jelbert <treeve at sourcemage.org>
+	* python-pypi/markupsafe: new spell, XML/HTML/XHTML Markup safe string for Python
+	* python-pypi/formalchemy: new spell - create forms for sqlalchemy classes
+
 2010-09-08 Ladislav Hagara <hgr at vabo.cz>
 	* video-libs/gst-plugins-gl: new spell, GStreamer OpenGL Plugins
 
diff --git a/VERSION b/VERSION
index b7705f4..d3dd0ce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.49-test
+0.50-test
diff --git a/accounts b/accounts
index fff1f3f..14d922f 100755
--- a/accounts
+++ b/accounts
@@ -88,4 +88,5 @@ mariadb:178:180
 avahi-autoipd:180:180
 puppet:181:181
 prosody:182:182
+dovenull:183:183
 nobody:65534:65534
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index 7cf7483..f7a3e24 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
             SPELL=clamav
-          VERSION=0.96.2
+          VERSION=0.96.3
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SPELL-$VERSION.tar.gz.sig
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-/}
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index 3dbd1b6..fe8827c 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,6 @@
+2010-09-21 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.96.3
+
 2010-08-13 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.96.2
 
diff --git a/archive/bzip2/DETAILS b/archive/bzip2/DETAILS
index fabb037..a1feba9 100755
--- a/archive/bzip2/DETAILS
+++ b/archive/bzip2/DETAILS
@@ -1,13 +1,13 @@
            SPELL=bzip2
-         VERSION=1.0.5
+         VERSION=1.0.6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.bzip.org/$VERSION/$SOURCE
-     SOURCE_HASH=sha512:c017d3d59dd324ac91af0edc178c76b60a5f90fbb775cf843e39062f95bd846238f2c53705f8890ed3f34bc0e6e75671a73d13875eb0287d6201cb45f0a2d338
+     SOURCE_HASH=sha512:00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
         WEB_SITE=http://www.bzip.org/
          ENTERED=20010922
       PATCHLEVEL=3
-  SECURITY_PATCH=1
+  SECURITY_PATCH=2
       LICENSE[0]=BSD
         KEYWORDS="archive"
            SHORT="Free, patent free, high-quality data compressor"
diff --git a/archive/bzip2/HISTORY b/archive/bzip2/HISTORY
index 199a5a2..d8d9494 100644
--- a/archive/bzip2/HISTORY
+++ b/archive/bzip2/HISTORY
@@ -1,3 +1,7 @@
+2010-09-20 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: updated to 1.0.6, SECURITY_PATCH=2,
+	  fixes CVE-2010-0405
+
 2008-03-20 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, DETAILS: updated to 1.0.5, SECURITY_PATCH=1
 
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index f506bfb..486c0c6 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -12,11 +12,11 @@ if [ "$AUDACITY_REL" == "cvs" ]; then
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
 else
      if [ "$AUDACITY_REL" == "beta" ]; then
-         VERSION=1.3.11
-     SOURCE_HASH=sha512:ef8f32b7bdbb27f841815cae2e157610cdc1ef572594e559f6803159b2e1d862462f20bd719155fbf44d722a88a0890e3942f3723931de5eb1acb3363626581d
+         VERSION=1.3.12-beta
+     SOURCE_HASH=sha512:9b343c7fa3d5d3e92cd2ebc0e1b4f6736dd8a21f14bb06c72def2aa9751b5d6b6a79d4028c09687231c7e02856fdcc78724017ee33ce9457b018c2143a83105b
           SOURCE=$SPELL-minsrc-$VERSION.tar.bz2
-      SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION-beta
+      SOURCE_URL=http://audacity.googlecode.com/files/${SOURCE}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-src-$VERSION
      else
          VERSION=1.2.6
           SOURCE=${SPELL}-src-${VERSION}.tar.gz  
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 62017fb..6f7f8f5 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,6 @@
+2010-09-11 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.3.12
+
 2010-02-25 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.3.11 (beta)
 	* PRE_BUILD, audacity-1.3.8-gsocket-conflict.patch: removed
diff --git a/audio-creation/csound/BUILD b/audio-creation/csound/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-creation/csound/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-creation/csound/DEPENDS b/audio-creation/csound/DEPENDS
deleted file mode 100755
index 8c42340..0000000
--- a/audio-creation/csound/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends csound5
diff --git a/audio-creation/csound/DETAILS b/audio-creation/csound/DETAILS
deleted file mode 100755
index 3e3574c..0000000
--- a/audio-creation/csound/DETAILS
+++ /dev/null
@@ -1,23 +0,0 @@
-           SPELL=csound
-         VERSION=4.23f13
-#          SOURCE=${SPELL}-${VERSION}gbs.0.tar.gz
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}gbs.0
-#   SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-#   SOURCE_URL[1]=ftp://earth.cs.bath.ac.uk/pub/dream/newest/$SOURCE
-#SOURCE_HASH=sha512:09545ee95a6746dabf5c4f978d654902b5f057148c936b970910757396a127972a43b9215c78626e500bc80c81d1d76a835b1c504b70f9f13906b4be700b8791
-	PATCHLEVEL=1
-        WEB_SITE=http://www.csounds.com
-         ENTERED=20020513
-         UPDATED=20021016
-      LICENSE[0]=LGPL
-        KEYWORDS="editors audio"
-           SHORT="Top of sound synthesis language."
-cat << EOF
-Csound is an incredibly powerful and versatile software synthesis program. Drawing from a toolkit of over 450 signal processing modules, one can use
-Csound to model virtually any commercial synthesizer or multi-effects processor. Csound literally transforms a personal computer into a high-end digital
-audio workstation - an environment in which the worlds of sound-design, acoustic research, digital audio production and computer music composition all
-join together in the ultimate expressive instrument. However, as with every musical instrument, true virtuosity is literally the product of both talent
-and dedication. You will soon discover that Csound is the ultimate musical instrument. But you must practice! In return, it will reward your commitment
-by producing some of the richest textures and uniquely beautiful timbres you have ever heard. In the audio world of Csound, knowledge and experience are
-the key... and your imagination the only limitation.
-EOF
diff --git a/audio-creation/csound/HISTORY b/audio-creation/csound/HISTORY
deleted file mode 100644
index b129fd3..0000000
--- a/audio-creation/csound/HISTORY
+++ /dev/null
@@ -1,60 +0,0 @@
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-07-26 Unet <unet at sourcemage.org>
-	* Deprecated in favour of csound5
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-12-17 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 4.23f13 gnu build system version
-	* BUILD, INSTALL, WIP: Deleted
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-02-28 Eric Sandall <sandalle at sourcemage.org>
-	* CONFLICTS: Removed conflicting spell
-
-2004-07-05 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.23f12
-	  Removed MAINTAINER
-	  Shortened SHORT
-	  Renamed to csound
-	  BUILD_API=2
-	  Use SOURCEFORGE_URL (more up-to-date)
-	  SOURCE is .zip file and renamed
-	* BUILD: Converted to BUILD_API 2
-	* INSTALL: Added
-	* CONFLICTS: Conflicts with Csound
-	* PRE_BUILD: Clean up
-	* DEPENDS: Removed dependency on tcl, tk depends on it
-	  Cleaned up
-	* Makefile: Updated to 4.23f12
-	* WIP: Still needs work
-
-2004-02-22 Unet <audio at sourcemage.org>
-	* Makefile: tcl8.4 [bug #6061]
-
-2004-01-22 Unet <audio at sourcemage.org>
-	* DEPENDS: alsa-driver -> alsa-lib
-
-2004-01-08 Eric Sandall <sandalle at sourcemage.org>
-	* Makefile~: Removed
-	* HISTORY: Formatted to Guru Handbook
-
-2003-05-10 Unet <unet at sourcemage.org>
-	* DETAILS: Csound is now LGPL! Yippeeeeeeeeee :)
-
-2003-04-04 M.L. <mlubrano at sourcemage.org>
-	* PRE_BUILD: Added missing MD5
-
-2002-10-16 Unet <unet at sourcemage.org>
-	* DETAILS: New spell version! Thus fixing bug #1297.
-	  Version bumps to latest 4.21
-	* Now uses the sorcery optimizations in the makefile.
-
-2002-06-12 Unet <unet at sourcemage.org>
-	* Created this.
-
diff --git a/audio-creation/csound/INSTALL b/audio-creation/csound/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-creation/csound/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-creation/csound/PRE_BUILD b/audio-creation/csound/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-creation/csound/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-creation/csound/TRIGGERS b/audio-creation/csound/TRIGGERS
deleted file mode 100755
index c98833f..0000000
--- a/audio-creation/csound/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast dispel csound dispel_self
diff --git a/audio-creation/espeak/DETAILS b/audio-creation/espeak/DETAILS
index d3e88fd..963f0c8 100755
--- a/audio-creation/espeak/DETAILS
+++ b/audio-creation/espeak/DETAILS
@@ -1,8 +1,8 @@
            SPELL=espeak
-         VERSION=1.43.03
+         VERSION=1.44.05
           SOURCE=espeak-${VERSION}-source.zip
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:04251b5b2dd2976adb42f6dce8061a6a3f32b8048ad4afb8284b7c25ae42d7f0973ae50d2713390664c2444a72dcb9ea345e208b604c31989ac4cc0b15b5330f
+     SOURCE_HASH=sha512:f96af210996229a64ed1896e3de4248f31d5d5391197589c20a55e4885b484007c1015e61eee8b3f5d074d047e275119614e23b82aa41c674100b666bc2e695f
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/espeak-${VERSION}-source
         WEB_SITE=http://espeak.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/audio-creation/espeak/HISTORY b/audio-creation/espeak/HISTORY
index d5a1ffa..efbb9c9 100644
--- a/audio-creation/espeak/HISTORY
+++ b/audio-creation/espeak/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.44.05
+
 2010-04-14 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.43.03
 
diff --git a/audio-drivers/jack-cvs/BUILD b/audio-drivers/jack-cvs/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-drivers/jack-cvs/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-drivers/jack-cvs/DEPENDS b/audio-drivers/jack-cvs/DEPENDS
deleted file mode 100755
index e50d74e..0000000
--- a/audio-drivers/jack-cvs/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends  jack  &&
-
-sub_depends  jack  VCS
diff --git a/audio-drivers/jack-cvs/DETAILS b/audio-drivers/jack-cvs/DETAILS
deleted file mode 100755
index 436d075..0000000
--- a/audio-drivers/jack-cvs/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=jack-cvs
-         VERSION=head
-        WEB_SITE=http://jackit.sf.net
-         ENTERED=20031207
-      PATCHLEVEL=1
-      LICENSE[0]=GPL
-        KEYWORDS="jack drivers audio"
-           SHORT="Jack is a low latency audio server."
-cat << EOF
-JACK is a low-latency audio server, written primarily for the GNU/Linux operating system. 
-It can connect a number of different applications to an audio device, as well as allowing them to share audio between themselves. 
-Its clients can run in their own processes (ie. as normal applications), or can they can run within the JACK server (ie. as a "plugin"). 
-JACK is different from other audio server efforts in that it has been designed from the ground up to be suitable for professional audio work. 
-This means that it focuses on two key areas: synchronous execution of all clients, and low latency operation. 
-EOF
diff --git a/audio-drivers/jack-cvs/HISTORY b/audio-drivers/jack-cvs/HISTORY
deleted file mode 100644
index c6ef233..0000000
--- a/audio-drivers/jack-cvs/HISTORY
+++ /dev/null
@@ -1,43 +0,0 @@
-2007-09-15 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: Deleted, not healthy to have in a deprecated spell.
-
-2007-04-11 Juuso Alasuutari <iuso at sourcemage.org>
-	* Deprecated, SVN support now in main jack spell.
-
-2007-03-19 Juuso Alasuutari <iuso at sourcemage.org>
-	* CONFLICTS: Added conflicts jackdmp.
-
-2006-10-11 David Kowis <dkowis at shlrm.org>
-	* DEPENDS: added dep for cvs "quick" fix bug 11338
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-30 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
-
-2005-01-31 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* DETAILS, BUILD, PRE_BUILD: BUILD_API2 conversion and autogen.sh fix
-
-2004-02-22 Unet <audio at sourcemage.org>
-	* DEPENDS: added libtool (hopefully will fix #5865)
-
-2004-01-22 Unet <audio at sourcemage.org>
-	* DEPENDS: alsa-driver -> alsa-lib
-
-2003-12-08 Unet <audio at sourcemage.org>
-	* PROVIDES: Created a provides jack-driver
-	* BUILD: Added ./autogen.sh otherwish won't build *grin*
-
-2003-12-07 Unet <audio at sourcemage.org>
-	* CONFLICTS, DEPENDS, DETAILS, HISTORY: Created
-
diff --git a/audio-drivers/jack-cvs/INSTALL b/audio-drivers/jack-cvs/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-drivers/jack-cvs/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-drivers/jack-cvs/PRE_BUILD b/audio-drivers/jack-cvs/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-drivers/jack-cvs/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-drivers/jack-cvs/TRIGGERS b/audio-drivers/jack-cvs/TRIGGERS
deleted file mode 100755
index ca8bbb1..0000000
--- a/audio-drivers/jack-cvs/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast  jack-cvs  dispel_self
diff --git a/audio-drivers/jackmidi_alsaseq/BUILD b/audio-drivers/jackmidi_alsaseq/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-drivers/jackmidi_alsaseq/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-drivers/jackmidi_alsaseq/DEPENDS b/audio-drivers/jackmidi_alsaseq/DEPENDS
deleted file mode 100755
index b7e7582..0000000
--- a/audio-drivers/jackmidi_alsaseq/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  jack
diff --git a/audio-drivers/jackmidi_alsaseq/DETAILS b/audio-drivers/jackmidi_alsaseq/DETAILS
deleted file mode 100755
index d83ee12..0000000
--- a/audio-drivers/jackmidi_alsaseq/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=jackmidi_alsaseq
-         VERSION=0.4
-#          SOURCE=$SPELL-$VERSION.tar.bz2
-#SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-#   SOURCE_URL[0]=http://www.mail-archive.com/linux-audio-dev%40music.columbia.edu/msg23175/$SOURCE
-#     SOURCE_HASH=sha512:4fb695c5980acbab48ead0143b1b2747bafc5ad12a33f8133703844b687b5bcb10c2e36c22d54774d479c9e0603f5eda5174162d9a946692fa83248049641bc8
-        WEB_SITE=http://www.mail-archive.com/linux-audio-dev%40music.columbia.edu/msg23175.html
-         ENTERED=20070325
-      PATCHLEVEL=1
-      LICENSE[0]=GPL
-        KEYWORDS="drivers audio"
-           SHORT="ALSA Seq < - > JACK MIDI bridge."
-cat << EOF
-jackmidi_alsaseq acts as a bridge between JACK MIDI and ALSA sequencer.
-EOF
diff --git a/audio-drivers/jackmidi_alsaseq/HISTORY b/audio-drivers/jackmidi_alsaseq/HISTORY
deleted file mode 100644
index 8df5e7d..0000000
--- a/audio-drivers/jackmidi_alsaseq/HISTORY
+++ /dev/null
@@ -1,5 +0,0 @@
-2008-01-22 Juuso Alasuutari <iuso at sourcemage.org>
-	* Deprecated because JACK now has native ALSA Sequencer support.
-
-2007-03-25 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS, DEPENDS, BUILD, INSTALL: Created spell.
diff --git a/audio-drivers/jackmidi_alsaseq/INSTALL b/audio-drivers/jackmidi_alsaseq/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-drivers/jackmidi_alsaseq/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-drivers/jackmidi_alsaseq/PRE_BUILD b/audio-drivers/jackmidi_alsaseq/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-drivers/jackmidi_alsaseq/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-drivers/jackmidi_alsaseq/TRIGGERS b/audio-drivers/jackmidi_alsaseq/TRIGGERS
deleted file mode 100755
index 6088004..0000000
--- a/audio-drivers/jackmidi_alsaseq/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast  jackmidi_alsaseq  dispel_self
diff --git a/audio-drivers/pulseaudio/BUILD b/audio-drivers/pulseaudio/BUILD
index e656c67..ffdce6d 100755
--- a/audio-drivers/pulseaudio/BUILD
+++ b/audio-drivers/pulseaudio/BUILD
@@ -1,2 +1,3 @@
 OPTS="$PULSE_OSS $OPTS" &&
+LDFLAGS="${LDFLAGS/-Wl,--as-needed}" &&
 default_build
diff --git a/audio-drivers/pulseaudio/DEPENDS b/audio-drivers/pulseaudio/DEPENDS
index 8be64bb..91d7044 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -15,19 +15,19 @@ optional_depends dbus                          \
 optional_depends hal                              \
                  "--enable-hal"                   \
                  "--disable-hal"                  \
-                 "Enable hal support?"            &&
+                 "Enable Hardware Abstraction Layer support?"  &&
 optional_depends tcp_wrappers                     \
                  "--enable-tcpwrap"               \
                  "--disable-tcpwrap"              \
-                 "Enable tcp_wrappers support?"   &&
+                 "Enable TCP network filtering?"  &&
 optional_depends alsa-lib                         \
                  "--enable-alsa"                  \
                  "--disable-alsa"                 \
-                 "Enable alsa support?"           &&
+                 "Enable Advanced Linux Sound Architecture support? (RECOMMENDED)"  &&
 optional_depends JACK-DRIVER                      \
                  "--enable-jack"                  \
                  "--disable-jack"                 \
-                 "Enable jack support?"           &&
+                 "for low-latency sound server support?"  &&
 optional_depends glib2                            \
                  "--enable-glib2"                 \
                  "--disable-glib2"                \
@@ -35,19 +35,24 @@ optional_depends glib2                            \
 optional_depends lirc                             \
                  "--enable-lirc"                  \
                  "--disable-lirc"                 \
-                 "Enable lirc support?"           &&
+                 "Enable infra-red remote control support?"  &&
 optional_depends libasyncns                       \
                  "--enable-asyncns"               \
                  "--disable-asyncns"              \
-                 "Enable libasyncns support?"     &&
+                 "for asynchronous service queries?"  &&
 optional_depends libcap                           \
                  "--with-caps"                    \
                  "--without-caps"                 \
-                 "Enable libcap support?"         &&
+                 "Enable POSIX support?"          &&
 optional_depends xorg-libs                        \
                  "--enable-x11"                   \
                  "--disable-x11"                  \
                  "Enable X11 support?"            &&
+
+if is_depends_enabled $SPELL xorg-libs; then
+  depends libxtst
+fi &&
+
 optional_depends policykit                        \
                  "--enable-polkit"                \
                  "--disable-polkit"               \
diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY
index 95e2093..89b0789 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,12 @@
+2010-10-05 Eric Sandall <sandalle at sourcemage.org>
+	* BUILD: Fails to compile with -Wl,--as-needed in LDFLAGS
+	  Fixes Bug #15307
+	* DEPENDS: Depends on libxtst when building X11 support
+	  Fixes Bug #15741
+
+2010-10-04 Eric Sandall <sandalle at sourcemage.org>
+	* DEPENDS: Clarify what some optional depends are for
+
 2010-01-07 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: PATCHLEVEL++ to guarantee udev is built correctly for it
 
diff --git a/audio-libs/libao-pulse/BUILD b/audio-libs/libao-pulse/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-libs/libao-pulse/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-libs/libao-pulse/DEPENDS b/audio-libs/libao-pulse/DEPENDS
deleted file mode 100755
index 80d40d1..0000000
--- a/audio-libs/libao-pulse/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends libao
diff --git a/audio-libs/libao-pulse/DETAILS b/audio-libs/libao-pulse/DETAILS
deleted file mode 100755
index e370a43..0000000
--- a/audio-libs/libao-pulse/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-           SPELL=libao-pulse
-         VERSION=0.9.3
-#          SOURCE=${SPELL}-${VERSION}.tar.gz
-#SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-#      SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
-#      SOURCE_GPG=gurus.gpg:${SOURCE}.sig
-PATCHLEVEL=1
-        WEB_SITE=http://0pointer.de/lennart/projects/libao-pulse/
-         ENTERED=20070504
-      LICENSE[0]=GPL
-           SHORT="libao driver for PulseAudio"
-cat << EOF
-libao-pulse is a libao driver for the PulseAudio sound server.
-EOF
diff --git a/audio-libs/libao-pulse/HISTORY b/audio-libs/libao-pulse/HISTORY
deleted file mode 100644
index e114b55..0000000
--- a/audio-libs/libao-pulse/HISTORY
+++ /dev/null
@@ -1,5 +0,0 @@
-2010-04-04 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated, now part of libao
-
-2007-05-04 Pieter Lenaerts <e-type at sourcemage.org>
-	* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/audio-libs/libao-pulse/INSTALL b/audio-libs/libao-pulse/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-libs/libao-pulse/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-libs/libao-pulse/PRE_BUILD b/audio-libs/libao-pulse/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-libs/libao-pulse/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-libs/libao-pulse/UP_TRIGGERS b/audio-libs/libao-pulse/UP_TRIGGERS
deleted file mode 100755
index 48787b7..0000000
--- a/audio-libs/libao-pulse/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger libao-pulse dispel_self
diff --git a/audio-libs/libmp4v2/BUILD b/audio-libs/libmp4v2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-libs/libmp4v2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-libs/libmp4v2/DETAILS b/audio-libs/libmp4v2/DETAILS
deleted file mode 100755
index cd8017a..0000000
--- a/audio-libs/libmp4v2/DETAILS
+++ /dev/null
@@ -1,12 +0,0 @@
-           SPELL=libmp4v2
-         VERSION=1.5.0.1
-      PATCHLEVEL=1
-        WEB_SITE=http://http://resare.com/libmp4v2/
-         ENTERED=20070709
-        KEYWORDS="library audio"
-         ARCHIVE="off"
-           SHORT="Library to read and manipulate the mp4 container format"
-cat << EOF
-Library to read and manipulate the mp4 container format.
-This library is derived from the http://mpeg4ip.net/ project, which opposed to libmp4v2 probably isn't totally patent save.
-EOF
diff --git a/audio-libs/libmp4v2/HISTORY b/audio-libs/libmp4v2/HISTORY
deleted file mode 100644
index 2ea3652..0000000
--- a/audio-libs/libmp4v2/HISTORY
+++ /dev/null
@@ -1,14 +0,0 @@
-2010-05-19 Eric Sandall <sandalle at sourcemage.org>
-	* Deprecate in favour of mp4v2
-	* UP_TRIGGERS: Also trigger recast of dependees for API change
-
-2010-04-20 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Corrected WEB_SITE
-	* PROVIDES: Provides MP4V2
-
-2008-09-28 Arjan Bouter <abouter at sourcemage.org>
-	* DEPENDS: depends on g++
-
-2007-07-09 Martin Klein <martin at makl.de>
-	* DETAILS, HISTORY: created spell
-
diff --git a/audio-libs/libmp4v2/INSTALL b/audio-libs/libmp4v2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-libs/libmp4v2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-libs/libmp4v2/PRE_BUILD b/audio-libs/libmp4v2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-libs/libmp4v2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-libs/libmp4v2/UP_TRIGGERS b/audio-libs/libmp4v2/UP_TRIGGERS
deleted file mode 100755
index b3b456f..0000000
--- a/audio-libs/libmp4v2/UP_TRIGGERS
+++ /dev/null
@@ -1,6 +0,0 @@
-up_trigger libmp4v2 dispel_self
-up_trigger mp4v2 cast_self
-
-for each in $(show_up_depends $SPELL 1); do
-  up_trigger $each cast_self
-done
diff --git a/audio-libs/libmusicbrainz3/DETAILS b/audio-libs/libmusicbrainz3/DETAILS
index d00e730..82fe4bb 100755
--- a/audio-libs/libmusicbrainz3/DETAILS
+++ b/audio-libs/libmusicbrainz3/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libmusicbrainz3
-         VERSION=3.0.2
-     SOURCE_HASH=sha512:28f84b93f322dfdce05413e98c2b8885c03a782b16a90ea504836c452e624cab9a134debca5c16ed1de9d240fa645dd347ae3c9f17c3b8872923d82b918bde90
+         VERSION=3.0.3
+     SOURCE_HASH=sha512:b4c76a0c056480c74eec36c4419f7f696f945b5a4b29dd0a5c61ab3a8b076f48b803ca7af60fb9cfa5eb5344f9ae5d566aaafea6e8eae498ed6aed2169f70480
           SOURCE=${SPELL//3}-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//3}-$VERSION
    SOURCE_URL[0]=http://ftp.musicbrainz.org/pub/musicbrainz/$SOURCE
diff --git a/audio-libs/libmusicbrainz3/HISTORY b/audio-libs/libmusicbrainz3/HISTORY
index ca4d823..a4d46a4 100644
--- a/audio-libs/libmusicbrainz3/HISTORY
+++ b/audio-libs/libmusicbrainz3/HISTORY
@@ -1,3 +1,6 @@
+2010-10-05 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version  3.0.3
+
 2008-11-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version  3.0.2
 	* PRE_BUILD, gcc43.diff: deleted, not needed
diff --git a/audio-libs/soundtouch/DETAILS b/audio-libs/soundtouch/DETAILS
index de81987..b51ebab 100755
--- a/audio-libs/soundtouch/DETAILS
+++ b/audio-libs/soundtouch/DETAILS
@@ -1,8 +1,8 @@
            SPELL=soundtouch
-         VERSION=1.4.0
+         VERSION=1.5.0
       PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+     SOURCE_HASH=sha512:22725c62fd977657392dc9984b064a6d9d027bb3b9a32f3e149a276a08bf27210856ec3d1de13f5795cdf96f80da93b09416082e414ebdd5edc836a440bd1f32
    SOURCE_URL[0]=http://www.surina.net/soundtouch/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
         WEB_SITE=http://www.surina.net/soundtouch/
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index 68402cd..8431dd0 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: bump to 1.5.0 (needed to make it work on x86-64)
+	* soundtouch-1.4.0.tar.gz.sig: removed, switch to hash sum
+
 2009-01-28 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 1.4.0
 
diff --git a/audio-players/mpg123/DETAILS b/audio-players/mpg123/DETAILS
index 81840fe..f3dc1eb 100755
--- a/audio-players/mpg123/DETAILS
+++ b/audio-players/mpg123/DETAILS
@@ -1,5 +1,5 @@
            SPELL=mpg123
-         VERSION=1.12.3
+         VERSION=1.12.4
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
       SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/audio-players/mpg123/HISTORY b/audio-players/mpg123/HISTORY
index b091d18..cb76007 100644
--- a/audio-players/mpg123/HISTORY
+++ b/audio-players/mpg123/HISTORY
@@ -1,3 +1,6 @@
+2010-09-22 Thomas Orgis <sobukus at sourcemage.org>
+	* DETAILS: Update to 1.12.4
+
 2010-07-11 Thomas Orgis <sobukus at sourcemage.org>
 	* DETAILS: Update to 1.12.3
 
diff --git a/audio-players/tunesbrowser/BUILD b/audio-players/tunesbrowser/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-players/tunesbrowser/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-players/tunesbrowser/DETAILS b/audio-players/tunesbrowser/DETAILS
deleted file mode 100755
index c8bd80b..0000000
--- a/audio-players/tunesbrowser/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=tunesbrowser
-         VERSION=0.3.0
-#          SOURCE=$SPELL-$VERSION.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=http://crazney.net/programs/itunes/files/$SOURCE
-#     SOURCE_HASH=sha512:3d6f5eac710f380abc481965f5f47dad3cb128e1c7852084cbd732d6a72637c20d2be1eba3a9e1bdd0d886f06c03f83a4159219a2b3a8fd8ab8b6fc16b3fee0e
-PATCHLEVEL=1
-        WEB_SITE=http://crazney.net/programs/itunes/tunesbrowser.html
-         ENTERED=20050107
-      LICENSE[0]="GPL / Apple Public Licence"
-        KEYWORDS="music players player audio"
-           SHORT="Simple music player for iTunes music shares"
-cat << EOF
-TunesBrowser is a simple music player
-EOF
diff --git a/audio-players/tunesbrowser/HISTORY b/audio-players/tunesbrowser/HISTORY
deleted file mode 100644
index ab46718..0000000
--- a/audio-players/tunesbrowser/HISTORY
+++ /dev/null
@@ -1,31 +0,0 @@
-2009-01-22 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated due to gstreamer 0.8 removal
-
-2007-03-13 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-    * DETAILS: cosmetic fix, bad characters
-
-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 BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-12-03 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: gstreamer -> gstreamer-0.8
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-06-11 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 0.3.0
-	  Shortened SHORT
-
-2005-06-10 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Depends on libopendaap (thanks to papabean)
-
-2005-01-07 Unet <audio at sourcemage.org>
-	* DETAILS, DEPENDS: Added spell
-
diff --git a/audio-players/tunesbrowser/INSTALL b/audio-players/tunesbrowser/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-players/tunesbrowser/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-players/tunesbrowser/PRE_BUILD b/audio-players/tunesbrowser/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-players/tunesbrowser/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-players/tunesbrowser/TRIGGERS b/audio-players/tunesbrowser/TRIGGERS
deleted file mode 100755
index bdbb667..0000000
--- a/audio-players/tunesbrowser/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast tunesbrowser dispel_self
diff --git a/audio-plugins/tap/BUILD b/audio-plugins/tap/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-plugins/tap/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-plugins/tap/DEPENDS b/audio-plugins/tap/DEPENDS
deleted file mode 100755
index f5dc38a..0000000
--- a/audio-plugins/tap/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  tap-plugins
diff --git a/audio-plugins/tap/DETAILS b/audio-plugins/tap/DETAILS
deleted file mode 100755
index d06bb95..0000000
--- a/audio-plugins/tap/DETAILS
+++ /dev/null
@@ -1,28 +0,0 @@
-           SPELL=tap
-         VERSION=0.7.0
-#          SOURCE=$SPELL-plugins-$VERSION.tar.gz
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-plugins-$VERSION
-#   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL-plugins/$SOURCE
-#     SOURCE_HASH=sha512:2ea9d80e115d0ffca1e91ceb7ea872acf1207cc5b6f40d204752808f8e984c07ae493cb9432f2541003b34fd4354c2a65c8473abcd0113e1b540aa500ab28b11
-        WEB_SITE=http://tap-plugins.sf.net
-         ENTERED=20040126
-      PATCHLEVEL=1
-      LICENSE[0]=GPL
-        KEYWORDS="plugins audio"
-           SHORT="TAP stands for Tom's Audio Plugins. It is a bunch of 
-LADSPA plugins for digital audio processing, intended for use in a 
-professional DAW environment such as Ardour."
-cat << EOF
-The plugins have been developed with Ardour as a primary host in 
-mind, but they should be usable within any LADSPA-capable host. The 
-main issue here is that LADSPA plugins don't generate their own GUIs, 
-but the GUIs are generated by the host. Therefore the arrangement and 
-appearance of the controls may vary using another host. When longer 
-texts are required to be displayed to the user (see the list of 
-presets in the TAP Reverberator plugin for an example), the strings 
-have been optimized to be good-looking in Ardour. On other hosts, 
-these strings may look crappy because the amount of padding spaces 
-will be incorrect using another font (to mention one possible 
-defect). However, no audio processing ability is involved, so the 
-plugins should perform the same way even with a somewhat crappy GUI.
-EOF
diff --git a/audio-plugins/tap/HISTORY b/audio-plugins/tap/HISTORY
deleted file mode 100644
index 24055f7..0000000
--- a/audio-plugins/tap/HISTORY
+++ /dev/null
@@ -1,36 +0,0 @@
-2007-02-16 Juuso Alasuutari <iuso at sourcemage.org>
-	* all: Deprecated, renamed to tap-plugins.
-
-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-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-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
-
-2005-01-19 Unet <audio at sourcemage.org>
-	* DETAILS: Updated to 0.7.0
-
-2004-07-06 Unet <audio at sourcemage.org>
-	* DETAILS: Bump to 0.6.0
-
-2004-02-23 Unet <audio at sourcemage.org>
-	* DETAILS: Updated to 0.4.0
-
-2004-02-04 Unet <audio at sourcemage.org>
-	* DETAILS: Updated to 0.3.0 & new location (sourceforge)
-
-2004-01-28 Unet <audio at sourcemage.org>
-	* DETAILS: Updated to 0.2.0
-
-2004-01-26 Unet <audio at sourcemage.org>
-	* DEPENDS, DETAILS, HISTORY: Created
-
diff --git a/audio-plugins/tap/INSTALL b/audio-plugins/tap/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-plugins/tap/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-plugins/tap/PRE_BUILD b/audio-plugins/tap/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-plugins/tap/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-plugins/tap/TRIGGERS b/audio-plugins/tap/TRIGGERS
deleted file mode 100755
index d7601ef..0000000
--- a/audio-plugins/tap/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast  tap  dispel_self
diff --git a/audio-soft/cdrtoaster/BUILD b/audio-soft/cdrtoaster/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-soft/cdrtoaster/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-soft/cdrtoaster/DEPENDS b/audio-soft/cdrtoaster/DEPENDS
deleted file mode 100755
index 57096c3..0000000
--- a/audio-soft/cdrtoaster/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends cdrbq
diff --git a/audio-soft/cdrtoaster/DETAILS b/audio-soft/cdrtoaster/DETAILS
deleted file mode 100755
index 24bf0f0..0000000
--- a/audio-soft/cdrtoaster/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
-            SPELL=cdrtoaster
-          VERSION=deprecated
-         WEB_SITE=http://cdrtoaster.sourceforge.net
-          ENTERED=20020901
-	LICENSE[0]=GPL
-         KEYWORDS="burning tools audio"
-            SHORT="graphical front end for cd burning"
-cat << EOF
-A shell for mkisofs, cdrecord, cdrdao and cdparanoia.
-It will burn audio, data, bootable, and combo CDs.
-It can burn iso, xcd or cue/bin files.
-It can rip audio and data tracks, and burn MP3 -> audio.
-EOF
diff --git a/audio-soft/cdrtoaster/HISTORY b/audio-soft/cdrtoaster/HISTORY
deleted file mode 100644
index e5ce1c2..0000000
--- a/audio-soft/cdrtoaster/HISTORY
+++ /dev/null
@@ -1,22 +0,0 @@
-2008-10-08 Arjan Bouter <abouter at sourcemage.org>
-	* deprecated: project changed name to cdrbq
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed MAINTAINER.
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-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
-
-2003-04-04 M.L. <mlubrano at sourcemage.org>
-	* Removed empty PRE_BUILD file.
-	  Fixed DEPENDS file (depends cdrutils ?)
-
-2002-10-06 Unet <unet at sourcemage.org>
-	* Created this and fixed various omitions in DETAILS
-
diff --git a/audio-soft/cdrtoaster/INSTALL b/audio-soft/cdrtoaster/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-soft/cdrtoaster/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-soft/cdrtoaster/PRE_BUILD b/audio-soft/cdrtoaster/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/audio-soft/cdrtoaster/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/audio-soft/cdrtoaster/TRIGGERS b/audio-soft/cdrtoaster/TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/audio-soft/cdrtoaster/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/chat-im/centericq/BUILD b/chat-im/centericq/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/centericq/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/centericq/DEPENDS b/chat-im/centericq/DEPENDS
deleted file mode 100755
index ccc1138..0000000
--- a/chat-im/centericq/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends centerim
diff --git a/chat-im/centericq/DETAILS b/chat-im/centericq/DETAILS
deleted file mode 100755
index 4da7a82..0000000
--- a/chat-im/centericq/DETAILS
+++ /dev/null
@@ -1,7 +0,0 @@
-          SPELL=centericq
-        VERSION=0
-     PATCHLEVEL=9999
-          SHORT="deprecated"
-  cat << EOF
-    deprecated spell [replaced by centerim]
-  EOF
diff --git a/chat-im/centericq/DOWNLOAD b/chat-im/centericq/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/centericq/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/centericq/HISTORY b/chat-im/centericq/HISTORY
deleted file mode 100644
index 4282fb6..0000000
--- a/chat-im/centericq/HISTORY
+++ /dev/null
@@ -1,119 +0,0 @@
-2009-01-23 George Sherwood <gsherwood at sourcemage.org>
-	* spell deprecated [Broke build. No updates.]
-	* PATCHLEVEL=9999
-	* DETAILS: version 0
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-06-03 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated SECURITY_PATCH
-	* PRE_BUILD: Added to patch
-	* ktools.patch: patch from gentoo to fix SMGLSA-2006-28
-
-2006-04-22 George Sherwood <george at beernabeer.com>
-	* DEPENDS: Added optional_depends curl. Bug #11315
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-09-10 George Sherwood <george at beernabeer.com>
-	* BUILD: Cleaned up fix code
-
-2005-09-09 George Sherwood <george at beernabeer.com>
-	* BUILD: Add fix for broke configure scripts
-	* DEPENDS: added autoconf for fix
-
-2005-09-03 George Sherwood <george at beernabeer.com>
-	* BUILD: Add $OPTS
-
-2005-09-03 George Sherwood <george at beernabeer.com>
-	* DETAILS: Update to 4.21.0
-	* BUILD:  Added file.  Had to unset compile flags
-
-2005-02-02 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 4.20.0
-	* DEPENDS: Added optional depends on curl
-
-2005-01-19 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 4.14.0
-
-2004-12-20 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 4.13.0
-
-2004-11-25 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to BUILD_API=2
-
-2004-09-28 George Sherwood <george at beernabeer.com>
-	* DETAILS: Update to 4.12
-	* DETAILS: fixed download URL
-
-2004-08-07 George Sherwood <george at beernabeer.com>
-	* DETAILS: update to 4.11.0
-
-2004-07-24 George Sherwood <george at beernabeer.com>
-	* DETAILS: update to 4.10.0
-
-2004-05-02 George Sherwood <george at beernabeer.com>
-	* DETAILS: update to 4.9.12
-
-2004-02-25 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: new SOURCE_URL
-	  fixes bugs #6250 & 6251
-
-2004-02-02 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 4.9.10
-
-2003-11-22 hgg <hgreig at bigpond.net.au>
-	* DETAILS: update to 4.9.8
-
-2003-11-13 Geoffrey Derber <gderber at sourcemage.org>
-	* DETAILS: version bump to 4.9.7
-
-2003-05-30 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (4.9.4). bug #3330.
-
-2003-01-22 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 4.9.2
-
-2002-12-20 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 4.9.0
-
-2002-10-22 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Removed sourcemage mirror URL - redundant (Bug 1332)
-
-2002-10-09 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 4.8.5
-
-2002-09-12 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 4.8.4
-
-2002-08-19 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 4.8.2
-
-2002-08-13 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 4.8.0
-
-2002-07-23 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 4.7.8
-	  Corrected MD5 and LICENSE fields
-
-2002-07-08 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 4.7.7
-	  Added in MD5 and LICENSE fields to DETAILS file
-	* USEGCC2: removed,Now compiles with GCC3
-
-2002-05-20 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 4.7.2
-
-2002-04-25 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 4.7.1
-
-2002-04-02 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 4.6.9
-
-2002-03-11 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: added MAINTAINTER tag to DETAILS file
-	  updated version to 4.6.5
-	* HISTORY: added this file
-
diff --git a/chat-im/centericq/INSTALL b/chat-im/centericq/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/centericq/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/centericq/PRE_BUILD b/chat-im/centericq/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/centericq/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/centericq/TRIGGERS b/chat-im/centericq/TRIGGERS
deleted file mode 100755
index 1574c05..0000000
--- a/chat-im/centericq/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast centericq dispel_self
diff --git a/chat-im/gaim-encryption/BUILD b/chat-im/gaim-encryption/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/gaim-encryption/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/gaim-encryption/CONFLICTS b/chat-im/gaim-encryption/CONFLICTS
deleted file mode 100755
index 709edd3..0000000
--- a/chat-im/gaim-encryption/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gaim-encryption-1.5
diff --git a/chat-im/gaim-encryption/DEPENDS b/chat-im/gaim-encryption/DEPENDS
deleted file mode 100755
index c83e63f..0000000
--- a/chat-im/gaim-encryption/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends pidgin-encryption
diff --git a/chat-im/gaim-encryption/DETAILS b/chat-im/gaim-encryption/DETAILS
deleted file mode 100755
index 4944f6a..0000000
--- a/chat-im/gaim-encryption/DETAILS
+++ /dev/null
@@ -1,34 +0,0 @@
-           SPELL=gaim-encryption
-if  [  "$CVS"  ==  "y"  ];  then
-         VERSION=cvs
-#          SOURCE=$SPELL-$VERSION.tar.gz
-#   SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.sourceforge.net:/cvsroot/gaim-encryption:encrypt
-  FORCE_DOWNLOAD=1
-#   SOURCE_IGNORE=volatile
-else
-         VERSION=3.0beta8 
-#          SOURCE=$SPELL-$VERSION.tar.gz
-#   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://gaim-encryption.sourceforge.net/
-      LICENSE[0]=GPL
-          CCACHE=off
-         ENTERED=20040627
-      PATCHLEVEL=1
-        KEYWORDS="im chat gaim encryption"
-           SHORT="uses NSS to provide RSA encryption as a Gaim plugin."
-cat << EOF
-Gaim-Encryption uses NSS to provide transparent RSA encryption as a Gaim plugin.
-Features include
-    * Automatically creates a public/private key pair for you upon 
-loading the plugin
-    * Automatically transmits your public key to other users.
-    * Supports 512 - 4096 bit keys.
-    * Saves keys of known users, and warns you if their public key has changed.
-    * Embeds all encryption and keys inside HTML.
-    * Stores keys in human readable files in your .gaim directory.
-    * Automatically recognizes if you are chatting with someone who has 
-the plugin- see the Preferences dialog.
-EOF
diff --git a/chat-im/gaim-encryption/HISTORY b/chat-im/gaim-encryption/HISTORY
deleted file mode 100644
index 79a4b45..0000000
--- a/chat-im/gaim-encryption/HISTORY
+++ /dev/null
@@ -1,98 +0,0 @@
-2007-05-07 George Sherwood <george at beernabeer.com>
-	* ALL: Deprecated in favor of pidgin-encryption due to name change
-
-2007-02-03 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 3.0beta8.
-
-2006-11-12 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 3.0beta7
-	* PRE_BUILD: Removed patch
-	* gaim-beta5.patch: Removed.  Fixed upstream.
-
-2006-11-11 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 3.0beta6 for gaim 2.0
-	* CONFLICTS: Conflicts with gaim1.5
-	* PRE_BUILD: Added patch to build with gaim2.0.0beta5 vice beta4
-	* gaim-beta5.patch: Added file to build with gaim2.0.0beta5
-
-2006-09-17 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 2.3.9. Removed UPDATED & BUILD_API
-	  Added Keywords.  Cleaned up alignment.
-
-2005-11-30 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-07-23 George Sherwood <george at beeranbeer.com>
-	* BUILD: Wasn't finding nss/nspr libs. Added to configure.
-	* DETAILS: Small cleanup
-
-2005-06-11 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 2.38
-	* TRIGGERS: deleted file.  Not required anymore.
-
-2005-05-17 Sergey Lipnevich <sergey at sourcemage.org>
-	* DEPENDS: uses NSS spell now.
-
-2005-05-13 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 2.37
-
-2005-03-18 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 2.36
-
-2005-03-17 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Removed MAKE_NJOBS=1
-	* BUILD: Run make_single before default_build
-	  Run make_normal after default_build
-
-2005-02-27 George Sherwood <george at beernabeer.com>
-	* DETAILS: Update to version 2.35
-
-2005-02-01 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* BUILD, PRE_BUILD: autogen.sh fix, made it INSTALL_ROOT compatible
-
-2005-01-26 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to version 2.34
-	* DEPENDS: Added depends MOZILLA-NSS
-
-2005-01-23 Eric Sandall <sandalle at sourcemage.org>
-	* BUILD: Use spell_ok instead of spell_installed
-
-2005-01-23 George Sherwood <george @beernabeer.com>
-	* DETAILS: Updated to version 2.33
-
-2004-10-16 George Sherwood <george at beernaber.com>
-	* DETAILS: Updated to version 2.32
-	* DEPENDS: Added depends on nss
-
-2004-10-12 George Sherwood <george at beernabeer.com>
-	* DETAILS: Changed Updated date
-	* TRIGGERS: Added file to re-build after new gaim
-
-2003-09-18 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 2.31
-
-2004-08-26 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 2.30
-
-2004-08-16 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 2.29
-
-2004-07-18 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 2.28
-	  BUILD_API=2
-	  Only need one LICENSE entry
-	  Fixed spacing
-	* BUILD: Converted to BUILD_API 2
-	* PREPARE: Use config_query
-	* BUILD: Converted to BUILD_API 2
-	  Use response from config_query
-	* DEPENDS: Formatted to Guru Handbook
-	  Use response from config_query
-
-2004-06-27 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 2.27
-	* ALL: Split out from gaim spell
-
diff --git a/chat-im/gaim-encryption/PREPARE b/chat-im/gaim-encryption/PREPARE
deleted file mode 100755
index e9df43a..0000000
--- a/chat-im/gaim-encryption/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query  CVS  "Would you like to build the latest cvs version?"  n
diff --git a/chat-im/gaim-encryption/PRE_BUILD b/chat-im/gaim-encryption/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/gaim-encryption/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/gaim-encryption/TRIGGERS b/chat-im/gaim-encryption/TRIGGERS
deleted file mode 100755
index 2fa35fc..0000000
--- a/chat-im/gaim-encryption/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gaim-encryption dispel_self
diff --git a/chat-im/gaim-encryption/gaim-encryption-3.0beta8.tar.gz.sig b/chat-im/gaim-encryption/gaim-encryption-3.0beta8.tar.gz.sig
deleted file mode 100644
index 9e57694..0000000
Binary files a/chat-im/gaim-encryption/gaim-encryption-3.0beta8.tar.gz.sig and /dev/null differ
diff --git a/chat-im/gaim/BUILD b/chat-im/gaim/BUILD
deleted file mode 100755
index c98e705..0000000
--- a/chat-im/gaim/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true                           
diff --git a/chat-im/gaim/DEPENDS b/chat-im/gaim/DEPENDS
deleted file mode 100755
index 8227d56..0000000
--- a/chat-im/gaim/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends pidgin
diff --git a/chat-im/gaim/DETAILS b/chat-im/gaim/DETAILS
deleted file mode 100755
index dc6eb5d..0000000
--- a/chat-im/gaim/DETAILS
+++ /dev/null
@@ -1,30 +0,0 @@
-           SPELL=gaim
-if  [  "$GAIM_CVS"  ==  "y"  ]; then
-         VERSION=svn
-#         SOURCE=$SPELL-$VERSION.tar.bz2
-#  SOURCE_URL[0]=svn_http://gaim.svn.sourceforge.net/svnroot/gaim/trunk:gaim
-  FORCE_DOWNLOAD=1
-#  SOURCE_IGNORE=volatile          
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-else
-         VERSION=2.0.0
-#         SOURCE=$SPELL-$VERSION.tar.bz2
-#        SOURCE2=${SOURCE}.asc
-#  SOURCE_URL[0]=$SOURCEFORGE_URL/pidgin/$SOURCE
-# SOURCE2_URL[0]=${SOURCE_URL}.asc
-# SOURCE2_IGNORE=signature
-#     SOURCE_GPG="gaim.gpg:${SOURCE}.asc"
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-fi
-        WEB_SITE=http://gaim.sourceforge.net/
-      LICENSE[0]=GPL
-    DISTCC_HOSTS=
-          CCACHE=off
-         ENTERED=20011024
-      PATCHLEVEL=1 
-           SHORT="Instant messanger client for several protocols"
-cat << EOF
-gaim is an instant messanger client used primarly for the AIM protocol
-but has plugin support for icq, irc, yahoo, and jabber all at once
-in one interface.
-EOF
diff --git a/chat-im/gaim/HISTORY b/chat-im/gaim/HISTORY
deleted file mode 100644
index d40107f..0000000
--- a/chat-im/gaim/HISTORY
+++ /dev/null
@@ -1,364 +0,0 @@
-2007-05-05 George Sherwood <george at beernabeer.com>
-	* ALL: Deprecated because of upstream rename to pidgin
-
-2007-04-21 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Bonjour plugin can link against howl
-
-2007-03-03 George Sherwood <george at beernabeer.com>
-	* DETAILS: Fixed svn to work with http vice https. Bug 12617.
-
-2007-02-10 George Sherwood <george at beernabeer.com>
-	* DEPENDS: Added depends xml-parser-exapt. Bug 13515.
-
-2007-01-20 Pol Vinogradov <vin.public at gmail.com>
-	* DETAILS: Updated to 2.0beta6
-	* BUILD: track_rootifying paths, removed make_single
-	* DEPENDS: libxml2 now is required, made gtk+2 optional, added ncurses
-	  as optional_depends
-
-2006-11-11 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 2.0beta5. Removed UPDATED. Updated svn version
-	* DEPENDS: Added optional_depends mono & dbus
-	* INSTALL: Removed
-	* PROVIDES: Added to provide GAIMIM
-
-2006-10-07 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated svn to 20061007
-	* INSTALL: For svn don't copy *.pl
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-08-12 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated svn to 20060812
-
-2006-08-06 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated svn to include a date.  Until svn_https works
-	  with stable sorcery, will keep an svn tarball on my website 
-	  update on a regular basis.
-
-2006-06-30 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated svn to get bz tarball vice svn check-out
-	  Sourceforge usings only https for svn.  Not supported in
-	  stable sorcery yet.  Bug #12616.
-
-2006-05-28 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated version to svn versus cvs
-
-2006-04-23 George Sherwood <george at beernabeer.com>
-	* DEPENDS: svn version requires intltool for autogen
-
-2006-04-22 George Sherwood <george at beernabeer.com>
-	* DETAILS: No longer using cvs.  Using subversion.
-	* DEPENDS: Added depends subversion for subversion version
-	* PREPARE: Changed working from cvs to subversion
-
-2005-11-12 George Sherwood <george at beernabeer.com>
-	* BUILD: Added -I/usr/X11R6/include to CFLAGS. Bug 10076
-
-2005-08-26 George Sherwood <george at beernabeer.com>
-	* DETAILS: Added vendor gpg signing
-	* gaim.gpg:  Added vendor key
-
-2005-08-26 George Sherwood <george at beernabeer.com>
-	* DETAILS: Added gpg guru signing
-
-2005-08-22 George Sherwood <george at beernabeer.com>
-	* DETAILS: Added hash checking
-
-2005-08-12 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.5.0
-
-2005-07-08 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.4.0
-
-2005-06-10 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.3.1
-
-2005-05-13 Sergey Lipnevich <sergey at sourcemage.org>
-	* DEPENDS: use nss spell instead of MOZILLA-NSS tag;
-	  add Perl option;
-	* BUILD: always add NSS and NSPR includes.
-
-2005-05-11 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.3.0
-
-2005-04-04 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.2.1
-
-2005-03-18 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.2.0
-
-2005-03-17 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Removed MAKE_NJOBS=1
-	* BUILD: Run make_single before make
-	* INSTALL: Run make_normal before install
-
-2005-02-25 Seth Woolley <seth at tautology.org>
-	* DETAILS: Updated to 1.1.4 SECURITY FIX
-
-2005-02-18 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.1.3
-
-2005-02-11 George Sherwood <george at beernabeer.com>
-	* BUILD, PRE_BUILD, DETAILS, PREPARE: change to GAIM_CVS
-
-2005-02-01 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* BUILD, PRE_BUILD, INSTALL: autogen.sh fix and INSTALL_ROOT compatible
-
-2005-01-23 Eric Sandall <sandalle at sourcemage.org>
-	* BUILD: Use spell_ok instead of spell_installed
-
-2005-01-21 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.1.2
-
-2004-12-28 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.1.1
-
-2004-12-05 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.1.0
-
-2004-11-15 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.0.3
-
-2004-10-21 David C. Haley <dhaley at hot.rr.com>
-	* DEPENDS: added missing "--"
-	  Closes Bug #7554
-
-2004-10-20 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.0.2
-
-2004-10-16 George Sherwood <george at beernabeer.com>
-	* DEPENDS: Changed to allow either nss or gnutls
-	* FINAL: Removed file, not needed
-
-2004-10-10 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.0.1
-
-2004-09-18 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.0.0
-
-2004-08-27 George sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.82.1
-
-2004-08-26 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.82
-
-2004-08-07 Robin Cook <rcook at wyrms.net>
-	* BUILD: removed the && from the last line
-
-2004-08-06 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 0.81
-	  Removed gaim-encryption comments
-	  BUILD_API=2
-	  Shortened SHORT
-	  Use config_query response
-	* PREPARE: Converted to config_query
-	* POST_INSTALL, FINAL: POST_INSTALL renamed to FINAL
-	* BUILD: Converted to BUILD_API 2
-	  Use config_query response
-	* INSTALL: Added
-	* DEPENDS: Formatted to Guru Handbook
-	  Use config_query response
-	* HISTORY: Formatted to Guru Handbook
-	* WIP: Removed
-
-2004-07-17 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.80
-
-2004-06-27 George Sherwood <george at beernabeer.com>
-	* DETAILS: Removed gaim-encryption
-	* BUILD: Removed gaim-encryption
-	* CONFIGURE: Removed
-	* PRE_BUILD: Removed
-
-2004-06-26 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 0.79 and 2.27.
-
-2004-05-31 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.78
-	  Updated gaim-encryption to 2.26
-
-2004-05-14 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Depends on any provider of CVS (Bug #6396)
-
-2004-04-24 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated gaim-encryption to 2.25
-	  Updated UPDATED (as gaim-encryption updates won't get noticed otherwise)
-
-2004-04-23 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 0.77
-
-2004-04-16 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated gaim-encryption to 2.24
-	  Updated UPDATED (as gaim-encryption updates won't get noticed otherwise)
-
-2004-04-09 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated gaim-encryption to 2.23
-
-2004-04-02 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated gaim to 0.76
-	* BUILD: Removed security patch
-	  Re-formatted
-
-2004-03-16 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated gaim-encryption to 2.22
-	  Updated UPDATED
-
-2004-02-27 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Rearrange if statement so 0.75 is default when PREPARE hasn't
-	  been run
-
-2004-01-27 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS,BUILD: Download and apply security patch
-	  for http://security.e-matters.de/advisories/012004.html
-	  Updated UPDATED
-
-2004-01-13 hgg <hgreig at bigpond.net.au>
-	* DETAILS: duplicate SOURCE andd SOURCE2 lines or SOURCE_URL won't work
-
-2004-01-13 hgg <hgreig at bigpond.net.au>
-	* DETAILS: update to 0.7.5 and 2.2.0
-	* DETAILS,PREPARE,BUILD: add optional CVS version
-	* DEPENDS: add cvs if cvs version is being cast; uncomment tcl and tk stuff
-	  as it now supports current versions of them
-	* ALL: completely remove the gaim-e stuff, it doesn't work.
-
-2003-11-26 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 0.74
-	* DEPENDS: Commented out optional dependency on gnutls
-	  as gaim needs gnutls >= 0.9.91 to work
-
-2003-11-24 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated gaim to 0.73 and gaim-encryption to 2.18
-	* DEPENDS: Added optional support for tcl/tk scripts, but commented
-	  them out as gaim requires v8.3 of those libraries
-	  Added optional support for nas
-
-2003-11-04 hgg <hgreig at bigopond.net.au>
-	* DETAILS: update to 0.72 and gaim-encryption 2.16
-	* CONFIGURE,DEPENDS: Bug 4567 can't have both optional_depends and full
-	  depends at the same time, the full gets listed in
-	  /var/state/sorcery/depends not the optional
-	* DEPENDS: add gtkspell for the unwashed illiterate masses
-
-2003-10-23 David Braaten <xiticix47 at hotmail.com>
-	* DEPENDS: make some nss options explicit. optional_depends is slightly
-	  broken atm, though. (see bug 4567)
-
-2003-10-21 hgg <hgreig at bigpond.net.au>
-	* DEPENDS: modify so either nss or Firebird can provide MOZILLA-NSS
-
-2003-10-16 hgg <hgreig at bigpond.net.au>
-	* CONFIGURE,DEPENDS: add news that MSN needs either gnutls or nss
-	* DEPENDS: add gnutls
-
-2003-10-11 hgg <hgreig at bigpond.net.au>
-	* DETAILS: Update to 0.71 and gaim-encryption 2.15
-	* HISTORY: convert to new format
-
-2003-10-01 hgg <hgreib at bigpond.net.au>
-	* DEPENDS: Update DEPENDS to --enable-nss=no if nss spell isn't installed
-
-2003-09-30 hgg <hgreig at bigpond.net.au>
-	* DETAILS: Update to 0.70 and gaim-encryption2.13
-	* DEPENDS: Needed a rewrite of nss spell so cast nss first!
-
-2003-09-26 hgg <hgreig at bigpond.net.au>
-	* DETAILS,PRE_BUILD,BUILD: Update to 0.69 for yahoo protocol fix, every
-	  "add-on" now broken
-
-2003-09-19 hgg <hgreig at bigpond.net.au>
-	* DEPENDS,BUILD,PRE_BUILD: Fixed gaim-encryption
-
-2003-09-18 Geoffrey Derber <gderber at sourcemage.org>
-	* CONFIGURE,PRE_BUILD,BUILD: commented out encryption stuff
-
-2003-08-18 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Bumped version to 0.67
-	  Added myself as maintainer, removed Adam
-
-2003-08-08 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Bumped version to 0.66
-
-2003-06-20 Geoffrey Derber <gderber at sourcemage.org>
-	* DETAILS,DEPENDS,BUILD: Gaim-e works again readded
-	* POST_INSTALL: POST_INSTALL not needed, warning no longer applies
-
-2003-05-30 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Teach me to not check for updates when playing with spells....
-	  version bump to 0.64
-
-2003-05-29 Justin Rocha <jrocha at sourcemage.org>
-	* CONFIGURE,BUILD,PRE_BUILD,DETAILS: Added gaim-encryption plugin
-
-2003-05-19 Justin Rocha <jrocha at sourcemage.org>
-	* DETAILS: Version bump to 0.63
-
-2003-04-15 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.61
-	  Removed gaim-e plugin for now, as it doesn't seem to like 0.61
-
-2003-03-19 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.59.9
-
-2003-01-08 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.59.8
-
-2003-01-05 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS:: Updated to 0.59.7
-
-2002-11-10 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.59.6 to fix annoying bug.
-
-2002-10-22 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Removed sourcemage mirror URL - redundant (Bug 1332)
-
-2002-10-13 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS,BUILD,CONFIGURE,PRE_BUILD: Added gpgme as optional_depends, though
-	  this should be made more specific, for it's only dependant if using gaim-e.
-	  Modified BUILD,DEPENDS,CONFIGURE, and PRE_BUILD to configure gaim-e
-	  support correctly. Modified BUILD to patch gaim-e plugin to install into
-	  /usr/lib/gaim instead of /usr/local/lib/gaim.
-
-2002-10-09 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.59.4
-	* BUILD: Added in gaim-e support submitted by Seth Wooley
-
-2002-09-15 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.59.3
-
-2002-09-10 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.59.2
-	  Fixed to use $SOURCEFORGE_URL
-
-2002-08-26 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Updated to 0.59.1
-	* BUILD: Fixes a compile issue with Perl 5.8.0 - Yay!
-
-2002-07-23 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: Corrected MD5 & LICENSE fields
-
-2002-07-11 Adam Clark <adamsgl at dhbit.ca>
-	* ALL: Enhanced spell with gnome panel support
-
-2002-06-25 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 0.59
-	  added MD5 and LICENSE fields to DETAILS
-
-2002-05-15 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 0.58
-
-2002-05-06 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: fixed sourceforge download URL
-
-2002-04-14 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 0.56
-
-2002-04-02 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: updated to 0.55
-
-2002-03-11 Adam Clark <adamsgl at dhbit.ca>
-	* DETAILS: added MAINTAINTER tag to DETAILS file
-	* HISTORY: added this HISTORY file
-
diff --git a/chat-im/gaim/INSTALL b/chat-im/gaim/INSTALL
deleted file mode 100755
index c98e705..0000000
--- a/chat-im/gaim/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true                           
diff --git a/chat-im/gaim/PREPARE b/chat-im/gaim/PREPARE
deleted file mode 100755
index b18bfff..0000000
--- a/chat-im/gaim/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query  GAIM_CVS  "Build the subversion version?"  n
diff --git a/chat-im/gaim/PRE_BUILD b/chat-im/gaim/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/gaim/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/gaim/PROVIDES b/chat-im/gaim/PROVIDES
deleted file mode 100755
index e2d2be2..0000000
--- a/chat-im/gaim/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-GAIMIM
diff --git a/chat-im/gaim/TRIGGERS b/chat-im/gaim/TRIGGERS
deleted file mode 100755
index 5129a72..0000000
--- a/chat-im/gaim/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gaim dispel_self                           
diff --git a/chat-im/gaim/gaim.gpg b/chat-im/gaim/gaim.gpg
deleted file mode 100644
index 4d6383f..0000000
Binary files a/chat-im/gaim/gaim.gpg and /dev/null differ
diff --git a/chat-im/micq/BUILD b/chat-im/micq/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/micq/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/micq/DEPENDS b/chat-im/micq/DEPENDS
deleted file mode 100755
index 841949c..0000000
--- a/chat-im/micq/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends climm
diff --git a/chat-im/micq/DETAILS b/chat-im/micq/DETAILS
deleted file mode 100755
index 090986b..0000000
--- a/chat-im/micq/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=micq
-         VERSION=0.5.4.2
-#          SOURCE=$SPELL-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=http://www.micq.org/source/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-        WEB_SITE=http://www.micq.org/
-      PATCHLEVEL=1
-         ENTERED=20040207
-      LICENSE[0]=GPL
-        KEYWORDS="icq messaging chat"
-           SHORT="micq is a small, text mode ICQ client"
-cat << EOF
-mICQ is a small, text mode ICQ client
-EOF
diff --git a/chat-im/micq/HISTORY b/chat-im/micq/HISTORY
deleted file mode 100644
index d9d308d..0000000
--- a/chat-im/micq/HISTORY
+++ /dev/null
@@ -1,55 +0,0 @@
-2007-10-20 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
-	* deprecated in favour of climm. project has been renamed.
-
-2007-07-22 George Sherwood <george at beernabeer.com>
-	* DETAILS: updated spell to 0.5.4.2
-
-2007-06-23 George Sherwood <george at beernabeer.com>
-	* DETAILS: updated spell to 0.5.4.1
-
-2007-06-09 George Sherwood <george at beernabeer.com>
-	* DETAILS: updated spell to 0.5.4
-	* DEPENDS: Added optional_depends libotr
-
-2007-04-27 George Sherwood <george at beernabeer.com>
-	* DETAILS: updated spell to 0.5.3
-
-2006-11-12 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.5.2.
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-01-19 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.5.1. Removed BUILD_API=2
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-06-06 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.5.0.4
-
-2005-04-28 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.5.0.3
-
-2005-04-26 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.5.0.2
-
-2005-02-28 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.5.0.1
-
-2005-02-16 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 0.5
-
-2004-11-25 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to BUILD_API=2
-
-2004-11-15 George Sherwood <george at beernabeer.com>
-	* DETAILS: Update to version 0.4.12
-
-2004-02-07 Ladislav Hagara <hgr at vabo.cz>
-	* created this spell, version 0.4.11
-
diff --git a/chat-im/micq/INSTALL b/chat-im/micq/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/micq/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/micq/PRE_BUILD b/chat-im/micq/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/chat-im/micq/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/chat-im/micq/TRIGGERS b/chat-im/micq/TRIGGERS
deleted file mode 100755
index d40582c..0000000
--- a/chat-im/micq/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast micq dispel_self
diff --git a/chat-im/pidgin/DEPENDS b/chat-im/pidgin/DEPENDS
index fafbc95..9f23f47 100755
--- a/chat-im/pidgin/DEPENDS
+++ b/chat-im/pidgin/DEPENDS
@@ -7,6 +7,11 @@ then
   depends  intltool
 fi  &&
 
+optional_depends  silc-toolkit                 \
+                  ""                           \
+                  ""                           \
+                  "for SILC protocol support"  &&
+
 optional_depends  evolution                \
                   "--enable-gevolution"    \
                   "--disable-gevolution"   \
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 5180b4d..7b352b3 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 David C. Haley <khoralin at gmail.com>
+	* DEPENDS: optional depends on silc-toolkit for SILC protocol
+
 2010-08-16 Finn Haedicke <finn at sourcemage.org>
 	* BUILD,DEPENDS: optionally depends on network-manager
 
diff --git a/chat-im/prosody/DETAILS b/chat-im/prosody/DETAILS
index 02d0c56..720b2d3 100755
--- a/chat-im/prosody/DETAILS
+++ b/chat-im/prosody/DETAILS
@@ -9,5 +9,8 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
          ENTERED=20100630
            SHORT="flexible communications server for Jabber/XMPP"
 cat << EOF
-ddPlease enter a description of the spell here
+Prosody is a modern flexible communications server for Jabber/XMPP written in
+Lua. It aims to be easy to set up and configure, and light on resources. For
+developers it aims to be easy to extend and give a flexible system on which
+to rapidly develop added functionality, or prototype new protocols.
 EOF
diff --git a/chat-im/prosody/HISTORY b/chat-im/prosody/HISTORY
index 8af8daa..290ed01 100644
--- a/chat-im/prosody/HISTORY
+++ b/chat-im/prosody/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: add proper description
+
 2010-08-31 Arjan Bouter <abouter at sourcemage.org>
 	* init.d/smgl-prosody: fixed init script
 
diff --git a/chat-libs/silc-toolkit/DETAILS b/chat-libs/silc-toolkit/DETAILS
new file mode 100755
index 0000000..5ffbda6
--- /dev/null
+++ b/chat-libs/silc-toolkit/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=silc-toolkit
+         VERSION=1.1.10
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://silcnet.org/download/toolkit/sources/${SOURCE}
+     SOURCE_HASH=sha512:b23b956a79cff6b0471d0fe3b7b57a473272416deaf8546b66987247bef2ee1fc3a8d3db03165a8c3d7f012549f02834d70e3473704e5b39f647a025f4e6befc
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://silcnet.org"
+      LICENSE[0]="GPL"
+         ENTERED=20100918
+        KEYWORDS=""
+           SHORT="SILC Toolkit is full implementation of the SILC protocol and is intended for software and application developers who want to integrate SILC support in their products."
+cat << EOF
+SILC Toolkit is a software development toolkit which provides full SILC
+protocol implementation for application developers. The SILC Toolkit provides
+SILC Client Library, SILC Protocol Core Library, SILC Key Exchange Library,
+SILC Crypto Library, SILC Math Library, SILC Utility Library, and other
+libraries. The SILC Toolkit also includes full reference manual and developer
+guide with examples and tutorials.
+EOF
diff --git a/chat-libs/silc-toolkit/HISTORY b/chat-libs/silc-toolkit/HISTORY
new file mode 100644
index 0000000..5daeb50
--- /dev/null
+++ b/chat-libs/silc-toolkit/HISTORY
@@ -0,0 +1,3 @@
+2010-09-18 David C. Haley <khoralin at gmail.com>
+	* DETAILS: spell created
+
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 58fbe07..c80fb19 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
            SPELL=subversion
-         VERSION=1.6.12
+         VERSION=1.6.13
 if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
           SOURCE=$SPELL-$VERSION.tar.bz2
 if [[ "$SVN_HEAD" == y ]]; then
@@ -9,7 +9,7 @@ if [[ "$SVN_HEAD" == y ]]; then
 else
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
-     SOURCE_HASH=sha512:d89d9c12dd59c7a3c4d18ca84ad02dbb646b2fcea9c0798cf513b374a84b24c39aa385472634756600391f2c0676e66f9ad198126bdda7b32e40c1e49438a29c
+     SOURCE_HASH=sha512:796dd8f312c4bd33b88ddacac672b506f82bd5a8bbbc26d305e1d28d406f3cb8fd2d6ae77d500d26d196f4c6f7e13a7f0320d724395ef23e4d635965f3379d91
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://subversion.tigris.org/
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 95fdd74..72f05b3 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,6 @@
+2010-10-03 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.6.13
+
 2010-06-22 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6.12
 
diff --git a/crypto/aircrack/BUILD b/crypto/aircrack/BUILD
deleted file mode 100755
index 397db75..0000000
--- a/crypto/aircrack/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-:
diff --git a/crypto/aircrack/DEPENDS b/crypto/aircrack/DEPENDS
deleted file mode 100755
index 02e88ff..0000000
--- a/crypto/aircrack/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends aircrack-ng
diff --git a/crypto/aircrack/DETAILS b/crypto/aircrack/DETAILS
deleted file mode 100755
index 8b437d4..0000000
--- a/crypto/aircrack/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-           SPELL=aircrack
-         VERSION=2.4
-#     SOURCE_HASH=sha512:0e2eaa175df3d88f9b93b6c6237ca18c737082df82fc5e6339b76e4527f606c1df484b4e24fe3619bfe6fbb6a0505753d7484aed1255ad753b5d5c6419186290
-#          SOURCE=$SPELL-$VERSION.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=http://www.cr0.net:8040/code/network/$SOURCE
-        WEB_SITE=http://www.cr0.net:8040/code/network/aircrack/
-         ENTERED=20050726
-PATCHLEVEL=1
-        KEYWORDS="wireless crypto"
-           SHORT="aircrack is a set of tools for auditing wireless networks"
-cat << EOF
-aircrack is a set of tools for auditing wireless networks:
-airodump: 802.11 packet capture program
-aireplay: 802.11 packet injection program
-aircrack: static WEP and WPA-PSK key cracker
-airdecap: decrypts WEP/WPA capture files
-EOF
diff --git a/crypto/aircrack/HISTORY b/crypto/aircrack/HISTORY
deleted file mode 100644
index 30bc5c2..0000000
--- a/crypto/aircrack/HISTORY
+++ /dev/null
@@ -1,30 +0,0 @@
-2007-03-01 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* deprecated in favour of aircrack-ng #12249
-
-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 BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-14 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.4
-
-2005-09-06 anoxia <anoxia at hush.com>
-        * DETAILS: updated to 2.3
-
-2005-08-16 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.22
-
-2005-08-10 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.21
-
-2005-08-03 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.2
-
-2005-07-26 Ladislav Hagara <hgr at vabo.cz>
-	* *: refined, tested and added to grimoire [Bug 9313]
-
diff --git a/crypto/aircrack/INSTALL b/crypto/aircrack/INSTALL
deleted file mode 100755
index 397db75..0000000
--- a/crypto/aircrack/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-:
diff --git a/crypto/aircrack/PRE_BUILD b/crypto/aircrack/PRE_BUILD
deleted file mode 100755
index 397db75..0000000
--- a/crypto/aircrack/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-:
diff --git a/crypto/aircrack/TRIGGERS b/crypto/aircrack/TRIGGERS
deleted file mode 100755
index f4dcaf4..0000000
--- a/crypto/aircrack/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast aircrack dispel_self
diff --git a/crypto/beecrypt/DETAILS b/crypto/beecrypt/DETAILS
index fff1824..1f9c679 100755
--- a/crypto/beecrypt/DETAILS
+++ b/crypto/beecrypt/DETAILS
@@ -10,5 +10,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         KEYWORDS="crypto"
            SHORT="beecrypt is a cryptography library"
 cat << EOF
-BeeCrypt is a cryptography library that contains highly optimized C and assembler implementations of many well-known algorithms including Blowfish, MD5, SHA-1, Diffie-Hellman, and ElGamal. Unlike some other crypto libraries, BeeCrypt is not designed to solve one specific problem, like file encryption, but to be a general purpose toolkit which can be used in a variety of applications. There are also no patent or royalty issues associated with BeeCrypt.
+BeeCrypt is a cryptography library that contains highly optimized C and
+assembler implementations of many well-known algorithms including Blowfish,
+MD5, SHA-1, Diffie-Hellman, and ElGamal.
+
+Unlike some other crypto libraries, BeeCrypt is not designed to solve one
+specific problem, like file encryption, but to be a general purpose toolkit
+which can be used in a variety of applications.
+
+Also, there are no known patent or royalty issues associated with BeeCrypt.
 EOF
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 611631d..829f02a 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -8,16 +8,16 @@ case $NSS_BRANCH in
   3.11)
           VERSION=3.11.9
            SOURCE=$SPELL-$VERSION.tar.gz
-    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_9_RTM/src/$SOURCE
+    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
       SOURCE_HASH=sha512:2fe9eafe99c64c57503739cabcd58f8aac29c1f353379c4072c183c0bf0dee3fc7147120ad0fc8fef4dc6fdae542e5068ffca0a7e7d0bcf99d23500d49e9dc35
        PATCHLEVEL=1
   ;;
   3.12)
-          VERSION=3.12.7
+          VERSION=3.12.8
 #        FFVERSION=3.6.2
            SOURCE=$SPELL-$VERSION.tar.gz
-    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_7_RTM/src/$SOURCE
-      SOURCE_HASH=sha512:e0090c3ea33c1d67834e36e0125aa976abb3c0311ca8ca5c61ae12028dba48152e78e50ef4706635853dfdb34dfb1fe394b5aebc94629863c8d7ad43d91136ed
+    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
+      SOURCE_HASH=sha512:6e2181a5ddea3244b12fe83d7e3c7ff773214563fbaa086202b5384fc37bc760cdf3ac95dbb59b82ec4a8f0446f7273f46efc396e90eae08befc8e5cc23cc80a
 #          SOURCE=firefox-$FFVERSION.source.tar.bz2
 #         SOURCE2=$SOURCE.asc
 #  SOURCE2_IGNORE=signature
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 437ec18..7fc5b16 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated NSS_BRANCH=3.12 to 3.12.8
+	  fixed SOURCE_URL to be more generic
+
 2010-08-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.12.7
 
diff --git a/database/firebird25/DETAILS b/database/firebird25/DETAILS
index 3ac94bc..b43b4e5 100755
--- a/database/firebird25/DETAILS
+++ b/database/firebird25/DETAILS
@@ -1,7 +1,7 @@
            SPELL=firebird25
           SPELLX=Firebird
-         VERSION=2.5.0.26054-ReleaseCandidate3
-     SOURCE_HASH=sha512:26ba37c5edbfbffb22f9f68c0c9d8340f2e27bb527d476f580800772af890e54e6cfb00d661cfad5004f14c2e07d344d3afcf47268fb29de94612dd5886c65c2
+         VERSION=2.5.0.26074-0
+     SOURCE_HASH=sha512:0894b998ddfc6daaea9df25c4b912e27797284ed39cefee20f72e994196587655a76267fceaed24437e24cab04db797fcf50e7505c8ef9e87b3c45b57a155cd8
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION/-0\.RC?/}
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
diff --git a/database/firebird25/HISTORY b/database/firebird25/HISTORY
index aa8cb14..b54b33c 100644
--- a/database/firebird25/HISTORY
+++ b/database/firebird25/HISTORY
@@ -1,3 +1,6 @@
+2010-09-23 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.5.0.26074-0
+
 2010-07-26 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.5.0.26054-ReleaseCandidate3
 
diff --git a/database/libdbi/DETAILS b/database/libdbi/DETAILS
index 87df112..71ae81a 100755
--- a/database/libdbi/DETAILS
+++ b/database/libdbi/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libdbi
-         VERSION=0.8.3
-     SOURCE_HASH=sha512:408b13deb46e03af9b05bbb258236f06942a5732b58732cd85b0867e01407474a37164703c51c0d48e44d97b7622a7106f8db66a2adf15d056bc92f96a9454a0
+         VERSION=0.8.4
+     SOURCE_HASH=sha512:7e28945a96483785840511df23fd8177383a1f9ee3929df863a3e458550b6eb943f8f86f49ede167125ce64daf718b14c40ac09b99e2e8eea474eecf7ee6a530
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://libdbi.sourceforge.net
diff --git a/database/libdbi/HISTORY b/database/libdbi/HISTORY
index 24ff85f..7f5eed9 100755
--- a/database/libdbi/HISTORY
+++ b/database/libdbi/HISTORY
@@ -1,3 +1,6 @@
+2010-09-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.4
+
 2008-02-06 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.8.3
 	* DEPENDS: add optional openjade
diff --git a/database/mysql/DETAILS b/database/mysql/DETAILS
index b700979..b1c7a80 100755
--- a/database/mysql/DETAILS
+++ b/database/mysql/DETAILS
@@ -4,7 +4,7 @@ if [[ $OLD == y ]]; then
 
   SECURITY_PATCH=4
 else
-         VERSION=5.1.50
+         VERSION=5.1.51
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index e031042..85dbfd5 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2010-09-26 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to version 5.1.51
+
 2010-08-19 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated stable to 5.1.50; renewed source urls
 
diff --git a/database/odk-ng/BUILD b/database/odk-ng/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odk-ng/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odk-ng/DEPENDS b/database/odk-ng/DEPENDS
deleted file mode 100755
index ae7ebee..0000000
--- a/database/odk-ng/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends sqlkit
diff --git a/database/odk-ng/DETAILS b/database/odk-ng/DETAILS
deleted file mode 100755
index df45b48..0000000
--- a/database/odk-ng/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=odk-ng
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by sqlkit]
-EOF
-
diff --git a/database/odk-ng/DOWNLOAD b/database/odk-ng/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odk-ng/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odk-ng/HISTORY b/database/odk-ng/HISTORY
deleted file mode 100644
index f555631..0000000
--- a/database/odk-ng/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-09-05  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by sqlkit]
diff --git a/database/odk-ng/INSTALL b/database/odk-ng/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odk-ng/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odk-ng/PRE_BUILD b/database/odk-ng/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odk-ng/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odk-ng/TRIGGERS b/database/odk-ng/TRIGGERS
deleted file mode 100755
index 54c7ca8..0000000
--- a/database/odk-ng/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast odk-ng dispel_self
diff --git a/database/odkutils/BUILD b/database/odkutils/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odkutils/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odkutils/DEPENDS b/database/odkutils/DEPENDS
deleted file mode 100755
index ae7ebee..0000000
--- a/database/odkutils/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends sqlkit
diff --git a/database/odkutils/DETAILS b/database/odkutils/DETAILS
deleted file mode 100755
index 49f1d50..0000000
--- a/database/odkutils/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=odkutils
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by sqlkit]
-EOF
-
diff --git a/database/odkutils/DOWNLOAD b/database/odkutils/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odkutils/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odkutils/HISTORY b/database/odkutils/HISTORY
deleted file mode 100644
index f555631..0000000
--- a/database/odkutils/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-09-05  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by sqlkit]
diff --git a/database/odkutils/INSTALL b/database/odkutils/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odkutils/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odkutils/PRE_BUILD b/database/odkutils/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/odkutils/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/odkutils/TRIGGERS b/database/odkutils/TRIGGERS
deleted file mode 100755
index f3512bd..0000000
--- a/database/odkutils/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast odkutils dispel_self
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index 8f9bb5e..42dca29 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pgadmin3
-         VERSION=1.10.5
+         VERSION=1.12.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index b1bc293..ab5212a 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2010-09-22 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.12.0
+
 2010-09-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.10.5
 
diff --git a/database/picosql/BUILD b/database/picosql/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/picosql/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/picosql/DETAILS b/database/picosql/DETAILS
deleted file mode 100755
index 402579c..0000000
--- a/database/picosql/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=picosql
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by ]
-EOF
-
diff --git a/database/picosql/DOWNLOAD b/database/picosql/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/picosql/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/picosql/HISTORY b/database/picosql/HISTORY
deleted file mode 100644
index 5a5112c..0000000
--- a/database/picosql/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-09-05  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by ]
diff --git a/database/picosql/INSTALL b/database/picosql/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/database/picosql/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/picosql/PRE_BUILD b/database/picosql/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/database/picosql/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/database/picosql/TRIGGERS b/database/picosql/TRIGGERS
deleted file mode 100755
index b2b31ac..0000000
--- a/database/picosql/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast picosql dispel_self
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 3875b86..ac4185c 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 George Sherwood <gsherwood at sourcemage.org>
+	PRE_SUB_DEPENDS: Fixed logic
+	REPAIR^all^PRE_SUB_DEPENDS: Fixed logic
+
 2010-09-08 Ladislav Hagara <hgr at vabo.cz>
 	* CONFIGURE, BUILD: added option SQLITE_SECURE_DELETE
 	* {,PRE_,REPAIR^all^PRE_}SUB_DEPENDS: added option SECURE_DELETE
diff --git a/database/sqlite/PRE_SUB_DEPENDS b/database/sqlite/PRE_SUB_DEPENDS
index c39acda..637246f 100755
--- a/database/sqlite/PRE_SUB_DEPENDS
+++ b/database/sqlite/PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
 case $THIS_SUB_DEPENDS in
        TCL) is_depends_enabled $SPELL tcl  ;;
-     TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0; fi ;;
-SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE == "y" ]]; then return 0; fi ;;
+     TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1; fi ;;
+SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
index c39acda..637246f 100755
--- a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
+++ b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,7 +1,7 @@
 case $THIS_SUB_DEPENDS in
        TCL) is_depends_enabled $SPELL tcl  ;;
-     TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0; fi ;;
-SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE == "y" ]]; then return 0; fi ;;
+     TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1; fi ;;
+SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
          *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
    return 1;;
 esac
diff --git a/devel/apiextractor/DETAILS b/devel/apiextractor/DETAILS
index 58dc728..660ed04 100755
--- a/devel/apiextractor/DETAILS
+++ b/devel/apiextractor/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.7.0
-     SOURCE_HASH=sha512:92c7f57386bcc4da36990d8efbdf40b5b2c89ce308bc5830ad7e5fef9c653286d70967e145cac7f6ae8d74cbec05f93a584b4761cce20e2c1b79a3bc081378be
+         VERSION=0.8.0
+     SOURCE_HASH=sha512:dfb189341083613b01fb5abc2b4983188979a4557a9e5b7e5cc2ff738d20f9a08409a2287d5387ab1d0a9ad80578bbdca81c8432375cd79f7f0ef708a94efa42
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/apiextractor/HISTORY b/devel/apiextractor/HISTORY
index 29918b3..14c0063 100644
--- a/devel/apiextractor/HISTORY
+++ b/devel/apiextractor/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.7.0
+
 2010-09-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.7.0
 
diff --git a/devel/autoconf/DETAILS b/devel/autoconf/DETAILS
index f4d7e26..09aeb0d 100755
--- a/devel/autoconf/DETAILS
+++ b/devel/autoconf/DETAILS
@@ -1,5 +1,5 @@
            SPELL=autoconf
-         VERSION=2.67
+         VERSION=2.68
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/autoconf/HISTORY b/devel/autoconf/HISTORY
index 207aefb..0b3e577 100644
--- a/devel/autoconf/HISTORY
+++ b/devel/autoconf/HISTORY
@@ -1,3 +1,6 @@
+2010-09-23 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.68
+
 2010-09-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: 2.67
 
diff --git a/devel/bazaar/BUILD b/devel/bazaar/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/bazaar/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/bazaar/DEPENDS b/devel/bazaar/DEPENDS
deleted file mode 100755
index 55b7e68..0000000
--- a/devel/bazaar/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends bzr
diff --git a/devel/bazaar/DETAILS b/devel/bazaar/DETAILS
deleted file mode 100755
index b1fdbb4..0000000
--- a/devel/bazaar/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=bazaar
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by bzr]
-EOF
-
diff --git a/devel/bazaar/DOWNLOAD b/devel/bazaar/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/bazaar/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/bazaar/HISTORY b/devel/bazaar/HISTORY
deleted file mode 100644
index 4dc3670..0000000
--- a/devel/bazaar/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-07-05  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by bzr]
diff --git a/devel/bazaar/INSTALL b/devel/bazaar/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/bazaar/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/bazaar/PRE_BUILD b/devel/bazaar/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/bazaar/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/bazaar/TRIGGERS b/devel/bazaar/TRIGGERS
deleted file mode 100755
index e07c15d..0000000
--- a/devel/bazaar/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast bazaar dispel_self
diff --git a/devel/bluefish/DETAILS b/devel/bluefish/DETAILS
index d231402..aceacf8 100755
--- a/devel/bluefish/DETAILS
+++ b/devel/bluefish/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-unstable-$VERSION"
    SOURCE_URL[2]=$SOURCEFORGE_URL/$SPELL/$SOURCE
      SOURCE_HASH=sha512:fd1e6fdd50f1d0d29944e1d5564861cb5ed6dacb6a1255f48053dad203c905314161d39041a62d4a6847bba4e3afb46a9e53e848d6dcde73ae11afe40223fbc9
 else
-         VERSION=2.0.1
+         VERSION=2.0.2
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/bluefish/HISTORY b/devel/bluefish/HISTORY
index 2c9e1a4..a6e07aa 100644
--- a/devel/bluefish/HISTORY
+++ b/devel/bluefish/HISTORY
@@ -1,3 +1,6 @@
+2010-09-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.2
+
 2010-06-18 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.0.1 [stable]
 
diff --git a/devel/boostpythongenerator/BUILD b/devel/boostpythongenerator/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/boostpythongenerator/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/boostpythongenerator/DEPENDS b/devel/boostpythongenerator/DEPENDS
deleted file mode 100755
index c695439..0000000
--- a/devel/boostpythongenerator/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends apiextractor
diff --git a/devel/boostpythongenerator/DETAILS b/devel/boostpythongenerator/DETAILS
deleted file mode 100755
index 4b0fbbb..0000000
--- a/devel/boostpythongenerator/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=boostpythongenerator
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by apiextractor]
-EOF
-
diff --git a/devel/boostpythongenerator/DOWNLOAD b/devel/boostpythongenerator/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/boostpythongenerator/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/boostpythongenerator/HISTORY b/devel/boostpythongenerator/HISTORY
deleted file mode 100644
index ccb8337..0000000
--- a/devel/boostpythongenerator/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-04-01  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by apiextractor]
diff --git a/devel/boostpythongenerator/INSTALL b/devel/boostpythongenerator/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/boostpythongenerator/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/boostpythongenerator/PRE_BUILD b/devel/boostpythongenerator/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/boostpythongenerator/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/boostpythongenerator/TRIGGERS b/devel/boostpythongenerator/TRIGGERS
deleted file mode 100755
index 61ee7bf..0000000
--- a/devel/boostpythongenerator/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast boostpythongenerator dispel_self
diff --git a/devel/ccache/DETAILS b/devel/ccache/DETAILS
index 3abd53b..5817d4f 100755
--- a/devel/ccache/DETAILS
+++ b/devel/ccache/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ccache
-         VERSION=3.0.1
+         VERSION=3.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/ccache/HISTORY b/devel/ccache/HISTORY
index c3bc087..3f1e57c 100644
--- a/devel/ccache/HISTORY
+++ b/devel/ccache/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.1
+
 2010-07-16 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.0.1
 
diff --git a/devel/codeblocks/BUILD b/devel/codeblocks/BUILD
index d5b2b7d..e912c5f 100755
--- a/devel/codeblocks/BUILD
+++ b/devel/codeblocks/BUILD
@@ -1,3 +1,2 @@
-./bootstrap                                      &&
-./configure --prefix=/usr --enable-contrib $OPTS &&
-make
+OPTS="--enable-contrib $OPTS" &&
+default_build
diff --git a/devel/codeblocks/HISTORY b/devel/codeblocks/HISTORY
index c6fb710..da0182b 100644
--- a/devel/codeblocks/HISTORY
+++ b/devel/codeblocks/HISTORY
@@ -1,3 +1,8 @@
+2010-09-11 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* PRE_BUILD: moved execution of autotools there
+	* BUILD: use default_build
+	* PRE_BUILD: call bootstrap only of building from svn
+
 2010-07-08 Ismael Luceno <ismael at sourcemage.org>
 	* DETAILS: Fixed SOURCE_DIRECTORY for release
 	* PRE_BUILD, 02_ftbfs_gcc44.dpatch, automake.patch,
diff --git a/devel/codeblocks/PRE_BUILD b/devel/codeblocks/PRE_BUILD
new file mode 100755
index 0000000..54e95e0
--- /dev/null
+++ b/devel/codeblocks/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build      &&
+if [[ $CODEBLOCKS_SVN == "y" ]]; then
+  cd ${SOURCE_DIRECTORY} &&
+  ./bootstrap || return 1
+fi
diff --git a/devel/eclipse-cdt-sdk/BUILD b/devel/eclipse-cdt-sdk/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/eclipse-cdt-sdk/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/eclipse-cdt-sdk/DEPENDS b/devel/eclipse-cdt-sdk/DEPENDS
deleted file mode 100755
index a39a97a..0000000
--- a/devel/eclipse-cdt-sdk/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  eclipse-cdt
diff --git a/devel/eclipse-cdt-sdk/DETAILS b/devel/eclipse-cdt-sdk/DETAILS
deleted file mode 100755
index 48e7388..0000000
--- a/devel/eclipse-cdt-sdk/DETAILS
+++ /dev/null
@@ -1,34 +0,0 @@
-           SPELL=eclipse-cdt-sdk
-         VERSION=3.1.2
-      PATCHLEVEL=1
-      LICENSE[0]=CPL
-        KEYWORDS="ide devel"
-        WEB_SITE=http://www.eclipse.org/cdt/
-         ENTERED=20050924
-           SHORT='C/C++ development tools for the Eclipse IDE SDK'
-cat << EOF
-The CDT (C/C++ Development Tools) Project is working towards providing a fully
-functional C and C++ Integrated Development Environment (IDE) for the Eclipse
-platform. 
-
-There are a number of groups contributing to the CDT; We strongly encourage
-interested parties to extend our work, thereby making the Eclipse CDT project
-a richer set of freely available resources. We are looking for contributions
-from the open source community in the areas of test, development,
-documentation, and general users who can help us ensure that the C/C++ tools
-work well on all the Eclipse platforms.   
-
-Our current release function includes:
-  * C/C++ Editor (basic functionality, syntax highlighting, code completion
-    etc.)
-  * C/C++ Debugger (APIs & Default implementation, using GDB)
-  * C/C++ Launcher (APIs & Default implementation, launches and external
-    application)
-  * Parser
-  * Search Engine
-  * Content Assist Provider
-  * Makefile generator
-
-The SDK also adds a superset of runtime that adds source and extension point
-schemas on top of the normal CDT.
-EOF
diff --git a/devel/eclipse-cdt-sdk/HISTORY b/devel/eclipse-cdt-sdk/HISTORY
deleted file mode 100644
index 9979863..0000000
--- a/devel/eclipse-cdt-sdk/HISTORY
+++ /dev/null
@@ -1,28 +0,0 @@
-2007-08-08 Eric Sandall <sandalle at sourcemage.org>
-	* Deprecated, now included in eclipse-cdt
-
-2007-03-01 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 3.1.2 for eclipse 3.2.x
-	  Updated SOURCE_URLs
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-06-01 Ingo Arndt <scachi at gmx.de>
-	* INSTALL: Create the destination directory before cp (BUG #11040)
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-10-13 Eric Sandall <sandalle at sourcemage.org>
-	* org.eclipse.cdt.sdk-3.0.0-linux.x86.tar.gz.sig: Updated to sha512 hash
-
-2005-09-24 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS,DEPENDS,CONFLICTS,BUILD,INSTALL,PROVIDES,HISTORY: Created
-
diff --git a/devel/eclipse-cdt-sdk/INSTALL b/devel/eclipse-cdt-sdk/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/eclipse-cdt-sdk/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/eclipse-cdt-sdk/PRE_BUILD b/devel/eclipse-cdt-sdk/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/eclipse-cdt-sdk/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/eclipse-cdt-sdk/PROVIDES b/devel/eclipse-cdt-sdk/PROVIDES
deleted file mode 100755
index a722a4c..0000000
--- a/devel/eclipse-cdt-sdk/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-ECLIPSE-CDT
diff --git a/devel/eclipse-cdt-sdk/TRIGGERS b/devel/eclipse-cdt-sdk/TRIGGERS
deleted file mode 100755
index 317297b..0000000
--- a/devel/eclipse-cdt-sdk/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast  eclipse-cdt-sdk  dispel_self
diff --git a/devel/eclipse-cdt-testing/BUILD b/devel/eclipse-cdt-testing/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/eclipse-cdt-testing/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/eclipse-cdt-testing/DETAILS b/devel/eclipse-cdt-testing/DETAILS
deleted file mode 100755
index 9f9b5af..0000000
--- a/devel/eclipse-cdt-testing/DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-           SPELL=eclipse-cdt-testing
-         VERSION=3.0.0
-      PATCHLEVEL=1
-      LICENSE[0]=CPL
-        WEB_SITE=http://www.eclipse.org/cdt/
-        KEYWORDS="ide devel"
-         ENTERED=20050924
-           SHORT='C/C++ JUnit testing for the Eclipse IDE'
-cat << EOF
-Includes all test plugins required for running automated JUnit tests
-EOF
diff --git a/devel/eclipse-cdt-testing/HISTORY b/devel/eclipse-cdt-testing/HISTORY
deleted file mode 100644
index 1cfde29..0000000
--- a/devel/eclipse-cdt-testing/HISTORY
+++ /dev/null
@@ -1,18 +0,0 @@
-2007-03-01 Eric Sandall <sandalle at sourcemage.org>
-	* Deprecated, no longer valid
-
-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 BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-10-13 Eric Sandall <sandalle at sourcemage.org>
-	* org.eclipse.cdt.testing-3.0.0.zip.sig: Updated to sha512 hash
-
-2005-09-24 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS, DEPENDS, BUILD, INSTALL, HISTORY: Created
-
diff --git a/devel/eclipse-cdt-testing/INSTALL b/devel/eclipse-cdt-testing/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/eclipse-cdt-testing/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/eclipse-cdt-testing/PRE_BUILD b/devel/eclipse-cdt-testing/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/eclipse-cdt-testing/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/eclipse-cdt/BUILD b/devel/eclipse-cdt/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/eclipse-cdt/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/eclipse-cdt/CONFLICTS b/devel/eclipse-cdt/CONFLICTS
deleted file mode 100755
index c97253b..0000000
--- a/devel/eclipse-cdt/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts  eclipse-cdt-sdk  y
diff --git a/devel/eclipse-cdt/DEPENDS b/devel/eclipse-cdt/DEPENDS
deleted file mode 100755
index 04c407c..0000000
--- a/devel/eclipse-cdt/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  eclipse
diff --git a/devel/eclipse-cdt/DETAILS b/devel/eclipse-cdt/DETAILS
deleted file mode 100755
index f9863f6..0000000
--- a/devel/eclipse-cdt/DETAILS
+++ /dev/null
@@ -1,35 +0,0 @@
-           SPELL=eclipse-cdt
-         VERSION=4.0.0
-          SOURCE=cdt-master-$VERSION.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/eclipse
-   SOURCE_URL[0]=http://ftp.ussg.iu.edu/eclipse/tools/cdt/releases/europa/dist/$SOURCE
-   SOURCE_URL[1]=http://mirrors.ibiblio.org/pub/mirrors/eclipse/tools/cdt/releases/europa/dist/$SOURCE
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      LICENSE[0]=CPL
-        KEYWORDS="ide devel"
-        WEB_SITE=http://www.eclipse.org/cdt/
-         ENTERED=20050924
-           SHORT='C/C++ development tools for the Eclipse IDE'
-cat << EOF
-The CDT (C/C++ Development Tools) Project is working towards providing a fully
-functional C and C++ Integrated Development Environment (IDE) for the Eclipse
-platform. 
-
-There are a number of groups contributing to the CDT; We strongly encourage
-interested parties to extend our work, thereby making the Eclipse CDT project
-a richer set of freely available resources. We are looking for contributions
-from the open source community in the areas of test, development,
-documentation, and general users who can help us ensure that the C/C++ tools
-work well on all the Eclipse platforms.   
-
-Our current release function includes:
-  * C/C++ Editor (basic functionality, syntax highlighting, code completion
-    etc.)
-  * C/C++ Debugger (APIs & Default implementation, using GDB)
-  * C/C++ Launcher (APIs & Default implementation, launches and external
-    application)
-  * Parser
-  * Search Engine
-  * Content Assist Provider
-  * Makefile generator
-EOF
diff --git a/devel/eclipse-cdt/HISTORY b/devel/eclipse-cdt/HISTORY
deleted file mode 100644
index 326c44f..0000000
--- a/devel/eclipse-cdt/HISTORY
+++ /dev/null
@@ -1,29 +0,0 @@
-2007-08-08 Eric Sandall <sandalle at sourcemage.org>
-	* eclipse-cdt-sdk is now included in this eclipse-cdt, deprecating it
-	* DETAILS: Updated to 4.0.0 for eclipse 3.3
-	  SOURCE is now cdt-master-$VERSION.zip
-	  Release tag changed from callisto to europa (for SOURCE_URL)
-	* PRE_BUILD: No longer unzips to a proper SOURCE_DIRECTORY, do so
-
-2007-03-01 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 3.1.2. for eclipse 3.2.x
-	  Updated SOURCE_URLs
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-10-13 Eric Sandall <sandalle at sourcemage.org>
-	* org.eclipse.cdt-3.0.0-linux.x86.tar.gz.sig: Updated to sha512 hash
-
-2005-09-24 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS,DEPENDS,CONFLICTS,BUILD,INSTALL,PROVIDES,HISTORY: Created
-
diff --git a/devel/eclipse-cdt/INSTALL b/devel/eclipse-cdt/INSTALL
deleted file mode 100755
index 6ccac0d..0000000
--- a/devel/eclipse-cdt/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cp  -r  $SOURCE_DIRECTORY/*              \
-        $INSTALL_ROOT/usr/share/eclipse
diff --git a/devel/eclipse-cdt/PRE_BUILD b/devel/eclipse-cdt/PRE_BUILD
deleted file mode 100755
index 777f6c3..0000000
--- a/devel/eclipse-cdt/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-mk_source_dir  $SOURCE_DIRECTORY  &&
-cd             $SOURCE_DIRECTORY  &&
-unpack_file    ''
diff --git a/devel/eclipse-cdt/PROVIDES b/devel/eclipse-cdt/PROVIDES
deleted file mode 100755
index a722a4c..0000000
--- a/devel/eclipse-cdt/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-ECLIPSE-CDT
diff --git a/devel/eclipse-cdt/cdt-master-4.0.0.zip.sig b/devel/eclipse-cdt/cdt-master-4.0.0.zip.sig
deleted file mode 100644
index 02a0c4a..0000000
Binary files a/devel/eclipse-cdt/cdt-master-4.0.0.zip.sig and /dev/null differ
diff --git a/devel/generatorrunner/DETAILS b/devel/generatorrunner/DETAILS
index db0a825..f0059d1 100755
--- a/devel/generatorrunner/DETAILS
+++ b/devel/generatorrunner/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.6.0
-     SOURCE_HASH=sha512:1a1d2619f204bbf7a47af026bbea25b607b209f64a6f01ac3c7a504a5080bc16d583e67d8e7692fe73f324b94b418683e5f0b52c986b71d554ee158a26354999
+         VERSION=0.6.1
+     SOURCE_HASH=sha512:52e3e431da192c373da7a115935868a41da5b9762baa0ca3112f5d070a895f967d7c1a20ac8c2df6c050c184fcdb4e8ada410e58c19e796e8c4c6c377146ef0f
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/generatorrunner/HISTORY b/devel/generatorrunner/HISTORY
index 9db7edb..1acbb73 100644
--- a/devel/generatorrunner/HISTORY
+++ b/devel/generatorrunner/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.1
+
 2010-09-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.6.0
 
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index caa8a2a..766c0c5 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,5 +1,5 @@
            SPELL=git
-         VERSION=1.7.2.3
+         VERSION=1.7.3.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 2c5f283..5c8287e 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,9 @@
+2010-09-30 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.7.3.1
+
+2010-09-19 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.7.3
+
 2010-09-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.7.2.3
 
diff --git a/devel/gitslave/BUILD b/devel/gitslave/BUILD
new file mode 100755
index 0000000..f58293d
--- /dev/null
+++ b/devel/gitslave/BUILD
@@ -0,0 +1,4 @@
+make prefix=$INSTALL_ROOT/usr &&
+cd contrib &&
+make prefix=$INSTALL_ROOT/usr &&
+cd ..
diff --git a/devel/gitslave/DEPENDS b/devel/gitslave/DEPENDS
new file mode 100755
index 0000000..e339a1e
--- /dev/null
+++ b/devel/gitslave/DEPENDS
@@ -0,0 +1,3 @@
+depends git  &&
+depends perl &&
+optional_depends term-progressbar '' '' 'progress feedback'
diff --git a/devel/gitslave/DETAILS b/devel/gitslave/DETAILS
new file mode 100755
index 0000000..796ef19
--- /dev/null
+++ b/devel/gitslave/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=gitslave
+         VERSION=1.0.0
+     SOURCE_HASH=sha512:4f1fb763051820d4e64e1d464dac628a1a5f4ef62833d5eb5e9027f440efaccb3605b25a17e7b7d2c5bdfb3ee06da4a34371fbcb8aea81998902ca13c95c0093
+          SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+        WEB_SITE=http://$SPELL.SourceForge.net
+      LICENSE[0]=LGPL
+         ENTERED=20100928
+        KEYWORDS="devel git"
+           SHORT="manage multiple git repositories"
+cat << EOF
+Creates a group of related repositories all of which are concurrently developed on and on which all 
+git operations should operate, so when you, for example, branch, each repository in the project is 
+branched in turn.
+EOF
+EOF
diff --git a/devel/gitslave/HISTORY b/devel/gitslave/HISTORY
new file mode 100644
index 0000000..0376db5
--- /dev/null
+++ b/devel/gitslave/HISTORY
@@ -0,0 +1,4 @@
+2010-09-28 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.0
+	  spell created
+
diff --git a/devel/gitslave/INSTALL b/devel/gitslave/INSTALL
new file mode 100755
index 0000000..bf5f173
--- /dev/null
+++ b/devel/gitslave/INSTALL
@@ -0,0 +1,3 @@
+make prefix=$INSTALL_ROOT/usr install &&
+cd contrib &&
+make prefix=$INSTALL_ROOT/usr install
diff --git a/devel/libtool/DETAILS b/devel/libtool/DETAILS
index 76cf179..d48f480 100755
--- a/devel/libtool/DETAILS
+++ b/devel/libtool/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libtool
-         VERSION=2.2.10
+         VERSION=2.4
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/libtool/HISTORY b/devel/libtool/HISTORY
index a957ff7..9303004 100644
--- a/devel/libtool/HISTORY
+++ b/devel/libtool/HISTORY
@@ -1,3 +1,6 @@
+2010-09-23 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4
+
 2010-06-10 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.2.10
 
diff --git a/devel/mcvs/BUILD b/devel/mcvs/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/devel/mcvs/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/devel/mcvs/DEPENDS b/devel/mcvs/DEPENDS
deleted file mode 100755
index 6723c77..0000000
--- a/devel/mcvs/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends clisp
diff --git a/devel/mcvs/DETAILS b/devel/mcvs/DETAILS
deleted file mode 100755
index 9f43fa6..0000000
--- a/devel/mcvs/DETAILS
+++ /dev/null
@@ -1,28 +0,0 @@
-           SPELL=mcvs
-         VERSION=1.1.0
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://users.footprints.net/~kaz/$SOURCE
-     SOURCE_HASH=sha512:c3e99516de792a0efdfe9f7068a6d4fc3225133327102552bfc5a1e7949944137a23e44de9ca8d79b787cc18c3b23b95852d1ebb93d8124b3fea039550cc0c27
-      LICENSE[0]=GPL
-        WEB_SITE=http://users.footprints.net/~kaz/mcvs.html
-         ENTERED=20040117
-        KEYWORDS="cvs devel"
-           SHORT='Meta-CVS is a version control system built around CVS'
-cat << EOF
-Meta-CVS is a version control system built around CVS. Although it retains most of the features of CVS, including all of the networking support, it is more capable than CVS, and easier to use. Its main features are:
-
-#  Directory structure versioning. Under Meta-CVS, the directory structure of a project is versioned in the same way as the contents of its files. Concurrent changes to the directory structure are permitted. It can be branched, and merged. The program dynamically rearranges the structure of the sandbox as you obtain updates from the repository, switch branches or retrieve old revisions.
-
-# User-friendly file type handling. Meta-CVS interactively handles file types when files are imported or added. It remembers, for instance, that .png files are considered binary so that when new instances of them are added, they are automatically treated as binary.
-
-# Sane corner cases. Meta-CVS handles the use case when two or more developers add a file of the same name to the same location. It handles the case when someone removes a file that someone else is modifying. It handles the case of files being removed and later added with a different keyword expansion mode. It handles names containing spaces. All of these cause problems in CVS, but not in Meta-CVS, because Meta-CVS simply avoids feeding CVS the patterns of use and troublesome inputs that tickle the CVS bugs.
-
-# Simple branching and merging. Creating a branch, switching among branches and merging are simple commands that take one argument. The software keeps track of what has been merged where from what branch. Thus Meta-CVS makes it easy to manage multiple lines of development.
-
-# Support for symbolic links and meta-data. Symbolic links are versioned objects in Meta-CVS. Files and symbolic links can have attached property lists, which are versioned. One standard property determines whether or not a file is executable, so in this way Meta-CVS versions the execute permission.
-
-# Tracking of third party code containing moves and renames. Meta-CVS has an importing feature called ``grab'' similar in concept to CVS vendor branches, but with significant differences. When a snapshot of code is grabbed onto a branch, the program analyzes the contents of apparently added and removed files to determine which of them are actually moves. An ordinary branch is used, not CVS vendor branches, which are deprecated in Meta-CVS. Ordinary branches can shoot from anywhere, not just version 1.1 of every file, so third party ``grab branches'' representing multiple sources are possible. The grab feature can be used to reconstruct the restructuring history of old projects, provided that a sequence of snapshots is available. Then it's possible to apply standard version control tricks, like fix a bug in an old version, and merge it to the latest, despite renamed or moved files.
-
-# Ease of deployment. The software doesn't require any repository-side installation; it uses the CVS client interface only. If you have write access to a remote CVS repository, you can install it on your client system and create a Meta-CVS module stored on the remote repository.
-EOF
diff --git a/devel/mcvs/HISTORY b/devel/mcvs/HISTORY
deleted file mode 100644
index 6d09a69..0000000
--- a/devel/mcvs/HISTORY
+++ /dev/null
@@ -1,28 +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 BUILD_API=2.
-
-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
-
-2005-10-07 George Sherwood <george at beernabeer.com>
-	* DETAILS, BUILD: Updated for BUILD_API=2
-	* INSTALL: Added for BUILD_API=2
-
-2004-04-03 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.1.0.
-
-2004-02-23 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.0.12.
-
-2004-02-01 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.0.11.
-
-2004-01-17 Sergey Lipnevich <sergey at sourcemage.org>
-	* ALL: spell created.
-
diff --git a/devel/mcvs/INSTALL b/devel/mcvs/INSTALL
deleted file mode 100755
index 6a1404a..0000000
--- a/devel/mcvs/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-  cd code &&
-  ./install.sh /usr
diff --git a/devel/mozart-base/DETAILS b/devel/mozart-base/DETAILS
index f1a977f..75f5d2a 100755
--- a/devel/mozart-base/DETAILS
+++ b/devel/mozart-base/DETAILS
@@ -13,6 +13,24 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE_BASE
         KEYWORDS="devel"
            SHORT="The Mozart Programming System based on the Oz language"
 cat << EOF
-The Mozart Programming System is an advanced development platform for intelligent, distributed applications. The system is the result of a decade of research in programming language design and implementation, constraint-based inference, distributed computing, and human-computer interfaces. As a result, Mozart is unequaled in expressive power and functionality. Mozart has an interactive incremental development environment and a production-quality implementation for Unix and Windows platforms. Mozart is the fruit of an ongoing research collaboration by the Mozart Consortium.
-Mozart is based on the Oz language, which supports declarative programming, object-oriented programming, constraint programming, and concurrency as part of a coherent whole. For distribution, Mozart provides a true network transparent implementation with support for network awareness, openness, and fault tolerance. Security is upcoming. Mozart is an ideal platform for both general-purpose distributed applications as well as for hard problems requiring sophisticated optimization and inferencing abilities. We have developed many applications including sophisticated collaborative tools, multi-agent systems, and digital assistants, as well as applications in natural language understanding and knowledge representation, in scheduling and time-tabling, and in placement and configuration.
+The Mozart Programming System is an advanced development platform for
+intelligent, distributed applications. The system is the result of a decade of
+research in programming language design and implementation, constraint-based
+inference, distributed computing, and human-computer interfaces. As a result,
+Mozart is unequaled in expressive power and functionality. Mozart has an
+interactive incremental development environment and a production-quality
+implementation for Unix and Windows platforms. Mozart is the fruit of an
+ongoing research collaboration by the Mozart Consortium.
+
+Mozart is based on the Oz language, which supports declarative programming,
+object-oriented programming, constraint programming, and concurrency as
+part of a coherent whole. For distribution, Mozart provides a true network
+transparent implementation with support for network awareness, openness,
+and fault tolerance. Security is upcoming. Mozart is an ideal platform for
+both general-purpose distributed applications as well as for hard problems
+requiring sophisticated optimization and inferencing abilities. We have
+developed many applications including sophisticated collaborative tools,
+multi-agent systems, and digital assistants, as well as applications in
+natural language understanding and knowledge representation, in scheduling
+and time-tabling, and in placement and configuration.
 EOF
diff --git a/devel/mozart-base/HISTORY b/devel/mozart-base/HISTORY
index e1abb94..88b5da4 100644
--- a/devel/mozart-base/HISTORY
+++ b/devel/mozart-base/HISTORY
@@ -1,3 +1,6 @@
+2010-09-27 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: fix description's word wrap
+
 2007-03-24 Jeremy Blosser <jblosser-smgl at firinn.org>
 	* DEPENDS: Add gdbm, bug 11456.
 
diff --git a/devel/perl/CONFLICTS b/devel/perl/CONFLICTS
index ded792b..6563d71 100755
--- a/devel/perl/CONFLICTS
+++ b/devel/perl/CONFLICTS
@@ -1,3 +1,3 @@
 conflicts module-build y &&
-conflicts archive-tar    &&
-conflicts archive-zip
+conflicts archive-tar y  &&
+conflicts archive-zip y
diff --git a/devel/perl/HISTORY b/devel/perl/HISTORY
index a6e3f84..258482a 100644
--- a/devel/perl/HISTORY
+++ b/devel/perl/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 Eric Sandall <sandalle at sourcemage.org>
+	* CONFLICTS: Auto-conflict with archive-{zip,tar} as they are now
+	  included in perl 5.12+
+
 2010-09-08 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 5.12.2
 
diff --git a/devel/phpmyadmin/DETAILS b/devel/phpmyadmin/DETAILS
index 803be53..c399315 100755
--- a/devel/phpmyadmin/DETAILS
+++ b/devel/phpmyadmin/DETAILS
@@ -1,7 +1,7 @@
            SPELL=phpmyadmin
-         VERSION=3.3.6
+         VERSION=3.3.7
   SECURITY_PATCH=17
-     SOURCE_HASH=sha512:0e6585d902794f66ab3bae9cf4f3b1b1748bdba98bbb5edeb87f52878109ce75eb66cec41afc6365dfde1c80290463c5b8e6e4adbee2c24737f949d5e44cb203
+     SOURCE_HASH=sha512:c6a2360e4f772a59cf934635a8d48a77d4ead49729e38555a162739c1f4a2c8dff7bc51fcd512987996c6f4c70b680e129fd2baafb08e33e564741e093841fee
           SOURCE=phpMyAdmin-$VERSION-all-languages.tar.bz2
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/phpMyAdmin-$VERSION-all-languages
diff --git a/devel/phpmyadmin/HISTORY b/devel/phpmyadmin/HISTORY
index 6d9fc6c..acd7251 100644
--- a/devel/phpmyadmin/HISTORY
+++ b/devel/phpmyadmin/HISTORY
@@ -1,3 +1,6 @@
+2010-09-10 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.3.7
+
 2010-08-28 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.3.6
 
diff --git a/devel/pyside/DETAILS b/devel/pyside/DETAILS
index d83a625..9651027 100755
--- a/devel/pyside/DETAILS
+++ b/devel/pyside/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=qt4.6+0.4.0
-     SOURCE_HASH=sha512:072473250861614a2eb3d80353a13d856ed93637754f16a84becc0e6babe606ca3fad02ddf5d205be57fd2c0527fc993f0ddfa1a45507a1fcce9af630f553c47
+         VERSION=qt4.6+0.4.1
+     SOURCE_HASH=sha512:25b4ab948281d86eaf56b703a817d66e964e66488762e377c6370e5674bdada9a32afce7b2e037a6d9638b6014c96038ed61d949a8fa0e20cdafa200401ccbf8
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/pyside/HISTORY b/devel/pyside/HISTORY
index f1c6d57..8100015 100644
--- a/devel/pyside/HISTORY
+++ b/devel/pyside/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version qt4.6+0.4.1
+
 2010-09-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version qt4.6+0.4.0
 
diff --git a/devel/qtscriptgenerator/HISTORY b/devel/qtscriptgenerator/HISTORY
index 41820b4..765e818 100644
--- a/devel/qtscriptgenerator/HISTORY
+++ b/devel/qtscriptgenerator/HISTORY
@@ -1,3 +1,7 @@
+2010-09-22 Bor Kraljič <pyrobor at ver.si>
+	* qtscriptgenerator.gcc-4.4.patch: to compile with gcc 4.4
+	  http://code.google.com/p/qtscriptgenerator/issues/detail?id=37
+
 2009-06-05 Julien _kaze_ ROZO <julien at rozo.org>
 	* BUILD, DEPENDS, DETAILS, HISTORY, INSTALL, PRE_BUILD, disable-phonon.patch:
 	  created this spell
diff --git a/devel/qtscriptgenerator/PRE_BUILD b/devel/qtscriptgenerator/PRE_BUILD
index 8ea43f4..d9aaee3 100755
--- a/devel/qtscriptgenerator/PRE_BUILD
+++ b/devel/qtscriptgenerator/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build  &&
 cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/disable-phonon.patch
+patch -p1 < $SCRIPT_DIRECTORY/disable-phonon.patch &&
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/qtscriptgenerator.gcc-4.4.patch
diff --git a/devel/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch b/devel/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
new file mode 100644
index 0000000..01193d7
--- /dev/null
+++ b/devel/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
@@ -0,0 +1,11 @@
+diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
+--- generator.orig/parser/rpp/pp.h	2008-12-05 11:01:44.000000000 +0100
++++ generator/parser/rpp/pp.h	2008-12-13 10:42:22.000000000 +0100
+@@ -30,6 +30,7 @@
+ #include <cctype>
+ 
+ #include <fcntl.h>
++#include <cstdio>
+ 
+ #ifdef HAVE_MMAP
+ #  include <sys/mman.h>
\ No newline at end of file
diff --git a/devel/shiboken/DETAILS b/devel/shiboken/DETAILS
index f3c067c..042c430 100755
--- a/devel/shiboken/DETAILS
+++ b/devel/shiboken/DETAILS
@@ -7,8 +7,8 @@ if [[ $PYSIDE == git ]];then
   FORCE_DOWNLOAD=on
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.4.0
-     SOURCE_HASH=sha512:d1efcc86648df39980d207b9ac37c499f5cbf58477d626e6f613e644e202737dead14175f86fd6d493f8a08993bdbca90964ffb030394ff1ceeeeeab48eeaaeb
+         VERSION=0.5.0
+     SOURCE_HASH=sha512:6a58d8a9d5232c5ca291ec421f44d494d7c073d50c3066f6eeef2daab0d0d468bcad78d470670170e6e1bbffb893e669988df49d99d79a37fe4344e8650c8105
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
 fi
diff --git a/devel/shiboken/HISTORY b/devel/shiboken/HISTORY
index 29c0652..34db7ba 100644
--- a/devel/shiboken/HISTORY
+++ b/devel/shiboken/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.5.0
+
 2010-09-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.4.0
 
diff --git a/devel/tcl/DETAILS b/devel/tcl/DETAILS
index 5c1ac87..547cafa 100755
--- a/devel/tcl/DETAILS
+++ b/devel/tcl/DETAILS
@@ -4,9 +4,9 @@ if [ "$DEVEL" = "y" ]; then
           SOURCE=tcl$VERSION-src.tar.gz
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 else
-         VERSION=8.5.8
+         VERSION=8.5.9
           SOURCE=tcl$VERSION-src.tar.gz
-     SOURCE_HASH=sha512:b84869dea1b4f6e78dd4b066cc38f9a2b87211f02ffed4751976998aa55d768efdb733f3ed9a6736f718a046210616b6d384b7288193ee81c2b0b955abe501aa
+     SOURCE_HASH=sha512:ee79ad6e4e2c87b1749e71b2e5f8b5ce2020e056433dfec73e8f16d6427d938fbde3f3f3330ba8268ba2c0d02518b2b8d79646d6996a465d5c0ffd8967204a4a
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/tcl$VERSION
diff --git a/devel/tcl/HISTORY b/devel/tcl/HISTORY
index 10a3001..13a7aa0 100644
--- a/devel/tcl/HISTORY
+++ b/devel/tcl/HISTORY
@@ -1,3 +1,6 @@
+2010-09-12 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to 8.5.9
+
 2009-11-22 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to 8.5.8
 
diff --git a/devel/tig/DETAILS b/devel/tig/DETAILS
index acba5c6..8a160b0 100755
--- a/devel/tig/DETAILS
+++ b/devel/tig/DETAILS
@@ -1,8 +1,8 @@
            SPELL=tig
-         VERSION=0.15
+         VERSION=0.16.1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://jonas.nitro.dk/${SPELL}/releases/${SOURCE}
-     SOURCE_HASH=sha512:7d4389c5daddeb302cacefc4cb73c0a069c72eb388e7aca3240958c4a7e299a9214d8f22f2e15d6f9e585d378d16bc734262e5dad13dc5645897eddb68f378fd
+     SOURCE_HASH=sha512:9dd283179d22cef6a30b759078b0e7e0384258b5fa350cbe4c073260f923ecdd763d8106f5378a9ca145c45c79da7412a9c4d2a128bc0a88f202d62fdb3f5626
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://jonas.nitro.dk/tig/"
       LICENSE[0]=GPL
diff --git a/devel/tig/HISTORY b/devel/tig/HISTORY
index 163e59a..f36ab6c 100644
--- a/devel/tig/HISTORY
+++ b/devel/tig/HISTORY
@@ -1,3 +1,6 @@
+2010-09-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.16.1
+
 2010-05-22 Ismael Luceno <ismael at sourcemage.org>
 	* DEPENDS, DETAILS: spell created
 
diff --git a/devel/tk/DETAILS b/devel/tk/DETAILS
index eef6aad..39ef7cd 100755
--- a/devel/tk/DETAILS
+++ b/devel/tk/DETAILS
@@ -4,15 +4,14 @@ if [ "$DEVEL" = "y" ]; then
            SOURCE=tk$VERSION-src.tar.gz
        SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 else
-          VERSION=8.5.8
+          VERSION=8.5.9
            SOURCE=tk$VERSION-src.tar.gz
-      SOURCE_HASH=sha512:b2ed480bf7f402c8c36e706b4b1179160f207f2a5db340d3a75ac4718c8699f5ed9a71c1b26a0f8b4c5fd51afccddb1104642cf50e2855de4f2140cd21cc8e06
+      SOURCE_HASH=sha512:0b8f4bc091950b6e7182c7e4a5a0120e5ffca6e173b9165cd9a9715122ac033215930b6f7e4f3f4c032efa379815466e4c07754801494bdbab7fca010b21b549
 fi
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/tk$VERSION
     SOURCE_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE
          WEB_SITE=http://www.scriptics.com/
           ENTERED=20020507
-       PATCHLEVEL=1
        LICENSE[0]=UNKNOWN
              DOCS="ChangeLog README"
          KEYWORDS="devel"
diff --git a/devel/tk/HISTORY b/devel/tk/HISTORY
index 471a2df..c8087d3 100644
--- a/devel/tk/HISTORY
+++ b/devel/tk/HISTORY
@@ -1,3 +1,6 @@
+2010-09-12 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to version 8.5.9
+
 2010-05-02 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: PATCHLEVEL++
 	* BUILD: enable-xft is now in the stable version.
diff --git a/disk/brasero/DETAILS b/disk/brasero/DETAILS
index 9d56692..899eaea 100755
--- a/disk/brasero/DETAILS
+++ b/disk/brasero/DETAILS
@@ -1,5 +1,5 @@
            SPELL=brasero
-         VERSION=2.30.2
+         VERSION=2.30.3
           BRANCH=${VERSION:0:4}
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index cf1b05f..f23888f 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.30.3
+
 2010-08-10 Philippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
 	* DEPENDS: added gnome-doc-utils to fix configure issue
           added hicolor-icon-theme for nice look
diff --git a/disk/brasero/brasero-2.30.2.tar.bz2.sig b/disk/brasero/brasero-2.30.2.tar.bz2.sig
deleted file mode 100644
index ea9fac8..0000000
Binary files a/disk/brasero/brasero-2.30.2.tar.bz2.sig and /dev/null differ
diff --git a/disk/brasero/brasero-2.30.3.tar.bz2.sig b/disk/brasero/brasero-2.30.3.tar.bz2.sig
new file mode 100644
index 0000000..fe88405
Binary files /dev/null and b/disk/brasero/brasero-2.30.3.tar.bz2.sig differ
diff --git a/disk/gparted/DETAILS b/disk/gparted/DETAILS
index dac0927..3ed3e73 100755
--- a/disk/gparted/DETAILS
+++ b/disk/gparted/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gparted
-         VERSION=0.6.2
-     SOURCE_HASH=sha512:4a277a227e9c1f96941699787d4dddf03cf8ecd90c55049234654b2b951b67f511fceac9cd85ba30f9b7ab6791f964963e4ff389ffdf001afa4e4a977322de37
+         VERSION=0.6.4
+     SOURCE_HASH=sha512:c368630da952fb3ca23ccde049055a8d57e6278112a519a0d3d2a0ef2d49fd8ddbd93f188850a2b01686e6ed99200a59e5c53c53d6654fe7cf654e037c56f7c7
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index 605ff3f..fcdbd81 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,9 @@
+2010-10-01 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.6.4
+
+2010-09-24 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.6.3
+
 2010-08-02 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.6.2
 
diff --git a/disk/hdparm/DETAILS b/disk/hdparm/DETAILS
index 5490927..f58f755 100755
--- a/disk/hdparm/DETAILS
+++ b/disk/hdparm/DETAILS
@@ -1,6 +1,6 @@
            SPELL=hdparm
-         VERSION=9.30
-     SOURCE_HASH=sha512:cf64fd89b53efd123bfcd0fb92d179e6cf74256e46a68b5c3dde0b0ecca6434d2ed23cca904d554185caf47c4659e975a9a8314063b53e6e118959c79a30ac75
+         VERSION=9.32
+     SOURCE_HASH=sha512:6d46ad285ca70fa156a530ec15bba1d890021d292a15f6e531c0111f524838c14fb79a6e41217ba41b3e94ea887b903f20a95e11104b9dc36ad28ca675e538cd
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/hdparm/HISTORY b/disk/hdparm/HISTORY
index e9fc7d3..d24306b 100644
--- a/disk/hdparm/HISTORY
+++ b/disk/hdparm/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 9.32
+
 2010-09-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 9.30
 
diff --git a/disk/libburn/DETAILS b/disk/libburn/DETAILS
index 9f2de52..2d6e06d 100755
--- a/disk/libburn/DETAILS
+++ b/disk/libburn/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBBURN_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.8.4
-      SOURCE_HASH=sha512:f1fd5da8bee3203427fb6235ec5a987ff9a7b96626b3592dd0d3d7ecd971a8aa94826e9255892eb7ab3cc24418d00f15b9ca8e9e4811541a7d449f4ff801de36
+         VERSION=0.8.6
+      SOURCE_HASH=sha512:2dd7abbc4efb4737fd5a758ab8b0c3b20431b4e6da9937714d09e8edae3bd389519b3588268f4902c1cdd4c424377589118046336a73d25362b1e69d9ca9ed46
           SOURCE=$SPELL-$VERSION.pl00.tar.gz
    SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/libburn/HISTORY b/disk/libburn/HISTORY
index d0b41a1..1720fa5 100644
--- a/disk/libburn/HISTORY
+++ b/disk/libburn/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.8.6
+
 2010-07-01 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.8.4
 
diff --git a/disk/libisoburn/DETAILS b/disk/libisoburn/DETAILS
index 6c235b0..1eccd74 100755
--- a/disk/libisoburn/DETAILS
+++ b/disk/libisoburn/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBISOBURN_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.6.0.pl00
-     SOURCE_HASH=sha512:aa9c183b60678a5a6726986d5a1b37d87e2b3b5096dfa219fdaa0f971b028137b3a4ca54c083e21389bd3b7414dbaee30a4e21270093749eb92b5dec2273e462
+         VERSION=0.6.2.pl00
+     SOURCE_HASH=sha512:90af11de6dfec4bfcfc911db7a744f0f0590dba5f4f45a37fc8590119ba23bf74d1f04126d09040228627cd31ad54e80aaff527f1a9af48675e8ea4f4df75027
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//.pl??}"
diff --git a/disk/libisoburn/HISTORY b/disk/libisoburn/HISTORY
index 9ef9580..7bdd12a 100644
--- a/disk/libisoburn/HISTORY
+++ b/disk/libisoburn/HISTORY
@@ -1,3 +1,6 @@
+2010-09-23 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.2.pl00
+
 2010-07-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.6.0.pl00
 
diff --git a/disk/libisofs/DETAILS b/disk/libisofs/DETAILS
index 6c6be37..434bdf7 100755
--- a/disk/libisofs/DETAILS
+++ b/disk/libisofs/DETAILS
@@ -12,8 +12,8 @@ if [[ $LIBISOFS_SVN == y ]]; then
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
    SOURCE_IGNORE=volatile
 else
-         VERSION=0.6.34
-     SOURCE_HASH=sha512:00b7bbd3e99e15cc14d7777a5709d80e07386ea2a14d429ca223d5d4bf4ee81b86d90bb4680dd495802fafada9233509d33a95254609e19c6343b3cbb13e782d
+         VERSION=0.6.36
+     SOURCE_HASH=sha512:2722d29e6e582e2f119ec294d52b4ca5af3b13a350ee0bc4b1f81b55f81b1f4aaf5f0e900df8ba4a309310092068580e18f2dcc7b6f79cd93ef9c12b0579678a
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://files.libburnia-project.org/releases/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/libisofs/HISTORY b/disk/libisofs/HISTORY
index dab9a9c..3e3ea5c 100644
--- a/disk/libisofs/HISTORY
+++ b/disk/libisofs/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.6.36
+
 2010-06-29 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.6.34
 
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 0ccaa86..3b6661a 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,10 +1,10 @@
            SPELL=lvm
-         VERSION=2.02.73
+         VERSION=2.02.74
           SOURCE=LVM2.$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
    SOURCE_URL[0]=ftp://sources.redhat.com/pub/lvm2/$SOURCE
    SOURCE_URL[1]=ftp://sources.redhat.com/pub/lvm2/old/$SOURCE
-     SOURCE_HASH=sha512:238ea145e5cd37c39cedb19a2e4d0d8488a6724e366aabefea931dffe14465b55aef96e241f25a7c95d2bc7d08c5853a6d29eaaa1574af65b84454bf1b114f23
+     SOURCE_HASH=sha512:c41701fb9e5d52da06a770e93346631e078cdae639ae707dee59dd4d51e8a0eb7ec56f0a685fac014106972833eea98d1f0a100009eac5cf332a4b8463b26dba
         WEB_SITE=http://sources.redhat.com/lvm2/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 8bbb552..0becf5a 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,6 @@
+2010-09-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.02.74
+
 2010-08-19 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.02.73
 
diff --git a/disk/mkisofs/BUILD b/disk/mkisofs/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/disk/mkisofs/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/disk/mkisofs/CONFLICTS b/disk/mkisofs/CONFLICTS
deleted file mode 100755
index fdf8d25..0000000
--- a/disk/mkisofs/CONFLICTS
+++ /dev/null
@@ -1,3 +0,0 @@
-conflicts  cdrkit     &&
-conflicts  dvdrtools  &&
-conflicts  cdrtools
diff --git a/disk/mkisofs/DEPENDS b/disk/mkisofs/DEPENDS
deleted file mode 100755
index 156300a..0000000
--- a/disk/mkisofs/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  genisoimage 
diff --git a/disk/mkisofs/DETAILS b/disk/mkisofs/DETAILS
deleted file mode 100755
index a7085a5..0000000
--- a/disk/mkisofs/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-           SPELL=mkisofs
-             PKG=cdrkit
-         VERSION=1.0pre4
-#          SOURCE=${PKG}-${VERSION}.tar.gz
-#SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
-   SOURCE_URL[0]=http://debburn.alioth.debian.org/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-        WEB_SITE=http://debburn.alioth.debian.org/
-         ENTERED=20060913
-      PATCHLEVEL=1
-      LICENSE[0]=GPL
-        KEYWORDS="disk"
-           SHORT="Only install mkisofs"
-cat << EOF
-Only install mkisofs from cdrkit.
-cdrkit is CD Recording Kit, a collection of applications related to creation of
-optical disk media on Unix platforms. It is heavily based on the cdrtools
-package (partially developed and maintained by Joerg Schilling before), but is
-maintained independently.
-EOF
diff --git a/disk/mkisofs/HISTORY b/disk/mkisofs/HISTORY
deleted file mode 100644
index b8deff4..0000000
--- a/disk/mkisofs/HISTORY
+++ /dev/null
@@ -1,6 +0,0 @@
-2006-12-06 Flavien Bridault <vlaaad at sourcemage.org>
-	* Deprecated in favour of genisoimage, binary name has changed 
-
-2006-09-19 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* DETAILS, DEPENDS: forked from cdrkit
-	* BUILD, CONFLICTS, HISTORY: forked from cdrkit
diff --git a/disk/mkisofs/INSTALL b/disk/mkisofs/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/disk/mkisofs/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/disk/mkisofs/PRE_BUILD b/disk/mkisofs/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/disk/mkisofs/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/disk/mkisofs/TRIGGERS b/disk/mkisofs/TRIGGERS
deleted file mode 100755
index f1811c6..0000000
--- a/disk/mkisofs/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast mkisofs dispel_self
diff --git a/disk/ntfs-3g/DETAILS b/disk/ntfs-3g/DETAILS
index 772af99..8194762 100755
--- a/disk/ntfs-3g/DETAILS
+++ b/disk/ntfs-3g/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ntfs-3g
-         VERSION=2010.8.8
-     SOURCE_HASH=sha512:e29e9ed0d0512f2a6c487b8f426a32498d1b238601ec1949c212a567175a0f1614886ab4759e54cc4c0592ef81e332e3f285e014e390abad805a80e125e9725f
+         VERSION=2010.10.2
+     SOURCE_HASH=sha512:cbc960aca8d3905ebe76d3627ebad86230322e1fdb814e33bc7b39c4d126f5475054f0435a82d8d9661f222503b6023891cdf0ab47d820d4a66a0c3e33ca493c
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.tuxera.com
diff --git a/disk/ntfs-3g/HISTORY b/disk/ntfs-3g/HISTORY
index ebf9fb9..363c50f 100644
--- a/disk/ntfs-3g/HISTORY
+++ b/disk/ntfs-3g/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2010.10.2
+
 2010-08-11 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2010.8.8
 
diff --git a/doc/asciidoc/DETAILS b/doc/asciidoc/DETAILS
index 8b0aaac..7ef0da0 100755
--- a/doc/asciidoc/DETAILS
+++ b/doc/asciidoc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=asciidoc
-         VERSION=8.5.3
-     SOURCE_HASH=sha512:91dfef200ff97956ddeafbd96a77f4b2435accee03c29b39a46169a381bf0cb472f6cf501418edab2bbe00dc55f47a56ab0427fa9a748cb1e1d8d0efc5cdb73d
+         VERSION=8.6.1
+     SOURCE_HASH=sha512:18bf6b1a1e4c216fefd76d143fba3ed84b919737726cdf7bb6ebcdff75ef53630aef29f342b9650d4ecff9d6b32cb427d85704f0d2f06b4f32e08a656bbaec8a
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
       SOURCE_URL=$SOURCEFORGE_URL/$SPELL/${SOURCE}
diff --git a/doc/asciidoc/HISTORY b/doc/asciidoc/HISTORY
index 75af82b..55bc457 100644
--- a/doc/asciidoc/HISTORY
+++ b/doc/asciidoc/HISTORY
@@ -1,3 +1,6 @@
+2010-09-12 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 8.6.1
+
 2010-06-11 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 8.5.3; quoting paths
 
diff --git a/doc/docbook-xsl/DETAILS b/doc/docbook-xsl/DETAILS
index 8973bcb..3e1e053 100755
--- a/doc/docbook-xsl/DETAILS
+++ b/doc/docbook-xsl/DETAILS
@@ -1,6 +1,6 @@
            SPELL=docbook-xsl
-         VERSION=1.75.2
-     SOURCE_HASH=sha512:992977c23cb61ff14aad7bec904babc992b177c3420a3a71367e77ad01ebfe6e137fea89c5e7a12d8da6e22861311b13e7e26f50bd4ba69e19bbf71c79fbd446
+         VERSION=1.76.0
+     SOURCE_HASH=sha512:0d73be21aadf1157d577c0674782b86a172d5072d30060380ed75429414c2828c19e171a72e510fdab768a9717fee68c5d0157d518d882f0bafc1eabb330b964
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/docbook/$SOURCE
diff --git a/doc/docbook-xsl/HISTORY b/doc/docbook-xsl/HISTORY
index bb59186..714a65d 100644
--- a/doc/docbook-xsl/HISTORY
+++ b/doc/docbook-xsl/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.76.0
+
 2009-09-21 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.75.2
 
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS
index 6e9a735..203005e 100755
--- a/doc/man-pages/DETAILS
+++ b/doc/man-pages/DETAILS
@@ -1,5 +1,5 @@
            SPELL=man-pages
-         VERSION=3.26
+         VERSION=3.28
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY
index a824d0c..129ddb6 100644
--- a/doc/man-pages/HISTORY
+++ b/doc/man-pages/HISTORY
@@ -1,3 +1,9 @@
+2010-10-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.28
+
+2010-09-23 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.27
+
 2010-09-05 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.26
 
diff --git a/e-16/e16/DETAILS b/e-16/e16/DETAILS
index ee915eb..f47a701 100755
--- a/e-16/e16/DETAILS
+++ b/e-16/e16/DETAILS
@@ -11,12 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-0.16-cvs
    SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.enlightenment.org:/var/cvs/e:$SPELL/e
    SOURCE_IGNORE=volatile
 else
-         VERSION=1.0.5
+         VERSION=1.0.6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
    SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
 
-     SOURCE_HASH=sha512:af1a5bac4c469c75bcdc8eb2f3a3db7dba2baa32a4c85c1517641037518065b97984c39099c08763df445773531d8da2c65acd46fe17f778443c9db83f00dc89
+     SOURCE_HASH=sha512:4f5b0cecd34f69a0908b78277e5222036afee27e9ef73a1bd58c46ae6a3aaf529dc25557a2dc96ee76c8c06da97639c888919f198c47e93c96f4f30d37aae65c
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 
 fi
diff --git a/e-16/e16/HISTORY b/e-16/e16/HISTORY
index b9254a6..36b351f 100644
--- a/e-16/e16/HISTORY
+++ b/e-16/e16/HISTORY
@@ -1,3 +1,6 @@
+2010-09-26 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.6
+
 2010-09-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.0.5
 
diff --git a/e-17/e_module-mixer/BUILD b/e-17/e_module-mixer/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/e-17/e_module-mixer/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/e-17/e_module-mixer/DEPENDS b/e-17/e_module-mixer/DEPENDS
deleted file mode 100755
index 0144d4b..0000000
--- a/e-17/e_module-mixer/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  e17
diff --git a/e-17/e_module-mixer/DETAILS b/e-17/e_module-mixer/DETAILS
deleted file mode 100755
index 2733d0d..0000000
--- a/e-17/e_module-mixer/DETAILS
+++ /dev/null
@@ -1,12 +0,0 @@
-           SPELL=e_module-mixer
-         VERSION=cvs
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-      PATCHLEVEL=1
-      LICENSE[0]=BSD
-        WEB_SITE=http://paq.osdn.org.ua/~davinchi/
-        KEYWORDS="enlightenment"
-         ENTERED=20060911
-           SHORT='Enlightenment e17 audio mixer module'
-cat << EOF
-Enlightenment e17 audio mixer manager plugin.
-EOF
diff --git a/e-17/e_module-mixer/HISTORY b/e-17/e_module-mixer/HISTORY
deleted file mode 100644
index 38764a6..0000000
--- a/e-17/e_module-mixer/HISTORY
+++ /dev/null
@@ -1,18 +0,0 @@
-2008-09-18 Eric Sandall <sandalle at sourcemage.org>
-	* Deprecate in favour of e17 as mixer is now integrated
-
-2008-02-27 Eric Sandall <sandalle at sourcemage.org>
-	* BUILD: E17 modules should not use --prefix in default_build, use
-	  default_build_e17_module instead
-
-2006-11-16 Eric Sandall <sandalle at sourcemage.org>
-	* PRE_BUILD: Create config.rpath so ./autogen.sh stops complaining about
-	  missing this useless (for most packages) file
-
-2006-09-20 David Brown <dmlb2000 at gmail.com
-	* DETAILS: swapped out VERSION for cvs cause this doesn't
-	  work with update daily
-
-2006-09-11 Eric Sandall <sandalle at sourcemage.org>
-	* PREPARE, DETAILS, DEPENDS, PRE_BUILD: Created
-
diff --git a/e-17/e_module-mixer/INSTALL b/e-17/e_module-mixer/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/e-17/e_module-mixer/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/e-17/e_module-mixer/PRE_BUILD b/e-17/e_module-mixer/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/e-17/e_module-mixer/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/e-17/e_module-mixer/TRIGGERS b/e-17/e_module-mixer/TRIGGERS
deleted file mode 100755
index d44cfe0..0000000
--- a/e-17/e_module-mixer/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast  e17  dispel_self
diff --git a/e-17/entrance/BUILD b/e-17/entrance/BUILD
deleted file mode 100755
index 3b482a9..0000000
--- a/e-17/entrance/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# We can't do this with DEPENDS as we can only
-# enable one at a time
-#
-if  [  "$ENTRANCE_AUTH"  ==  "pam"  ];  then
-  OPTS="--with-auth-mode=pam  \
-        $OPTS"
-else
-  OPTS="--with-auth-mode=shadow  \
-        $OPTS"
-fi  &&
-
-default_build
diff --git a/e-17/entrance/CONFIGURE b/e-17/entrance/CONFIGURE
deleted file mode 100755
index b5e0e46..0000000
--- a/e-17/entrance/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_list  ENTRANCE_AUTH  "Which authentication method to use by default?"  \
-                                  'shadow'  'pam'
diff --git a/e-17/entrance/CONFLICTS b/e-17/entrance/CONFLICTS
deleted file mode 100755
index fd681d1..0000000
--- a/e-17/entrance/CONFLICTS
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# With linux-pam-headers entrance tries to build pam support, but pam support
-# needs the full linux-pam anyways
-#
-if  [  "$ENTRANCE_PAM"  ==  "n"  ];  then
-  conflicts  linux-pam-headers
-fi
diff --git a/e-17/entrance/DEPENDS b/e-17/entrance/DEPENDS
deleted file mode 100755
index 579c63f..0000000
--- a/e-17/entrance/DEPENDS
+++ /dev/null
@@ -1,10 +0,0 @@
-depends  edb     &&
-depends  edje    &&
-
-if  [  "$ENTRANCE_AUTH"  ==  "shadow"  ];  then
-  depends  shadow &&
-depends  subversion
-else
-  depends  linux-pam &&
-depends  subversion
-fi
diff --git a/e-17/entrance/DETAILS b/e-17/entrance/DETAILS
deleted file mode 100755
index 1debe3b..0000000
--- a/e-17/entrance/DETAILS
+++ /dev/null
@@ -1,23 +0,0 @@
-           SPELL=entrance
-if  [  "$ENTRANCE_CVS_AUTOUPDATE"  ==  "y"  ];  then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=svn
-fi
-          SOURCE=$SPELL-svn.tar.bz2
-  FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
-   SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
-   SOURCE_IGNORE=volatile
-      LICENSE[0]=BSD
-        WEB_SITE=http://xcomputerman.com/pages/entrance.html
-         ENTERED=20040311
-         UPDATED=20050922
-        KEYWORDS="enlightenment"
-           SHORT="Login/display manager for Linux XFree86"
-cat << EOF
-Entrance is the next generation of Elogin, a login/display manager for
-Linux XFree86 systems. It is designed to be extremely customizable and
-aesthetically attractive -- a refreshing relief from the traditional
-dull and boring interfaces of XDM and its descendants.
-EOF
diff --git a/e-17/entrance/HISTORY b/e-17/entrance/HISTORY
deleted file mode 100644
index bd27c4b..0000000
--- a/e-17/entrance/HISTORY
+++ /dev/null
@@ -1,89 +0,0 @@
-2010-08-17 Ladislav Hagara <hgr at vabo.cz>
-	* DEPENDS: esmart removed
-
-2009-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
-	* init.d/entrance: made it non-sh, bug #13702
-
-2008-09-19 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: CVS -> SVN
-	  Remove unneeded modification of SPELL for SOURCE_URL
-	* DEPENDS: Depends on subversion
-	  Removed dependency on CVS
-
-2006-03-28 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: new SOURCE_URL, CVS is no longer hosted on SF
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-02-10 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Removed broken thinktux mirror
-
-2005-11-01 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Added CVS mirror (faster than SourceForge, but 30 minutes behind)
-	  SOURCE_URL now uses $SPELL
-	  Changed MD5[0]=IGNORE to SOURCE_IGNORE=volatile
-
-2005-10-29 Eric Sandall <sandalle at sourcemage.org>
-	* PREPARE: Re-worded auto-update query
-
-2005-09-21 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to proper multi-version support
-	  See http://www.sourcemage.org/grimoire/spell_multi_version
-	  Removed BUILD_API=2, section-wide now
-	  Shortened SHORT
-	  Updated UPDATED to force new dependency information
-	* PREPARE: Updated to proper multi-version support
-	  See http://www.sourcemage.org/grimoire/spell_multi_version
-	* DEPENDS: Added missing dependency on CVS if needed
-	  Removed confusing optional depends based on our CONFIGURE questions
-	* PRE_BUILD: Use NOCONFIGURE=ON ./autogen.sh
-
-2005-09-03 Eric Sandall <sandalle at sourcemage.org>
-	* PRE_BUILD: Run ./autogen.sh here
-	  Removed patching with init.d.patch
-	* BUILD: Removed ./autogen.sh run
-	  Add a little explanation for the BUILD
-	* init.d.patch: Removed, no longer needed
-
-2005-07-03 Eric Sandall <sandalle at sourcemage.org>
-	* BUILD: Tell ./autogen.sh to not run its own configure
-	  Pass default authentication method to OPTS
-	* CONFIGURE: Query for PAM or shadow support as default authentication
-	* DEPENDS: Optionally depends on linux-pam and shadow for authentication
-	* CONFLICTS: Conflicts with linux-pam-headers if using shadow
-
-2005-05-09 Ladislav Hagara <hgr at vabo.cz>
-	* DEPENDS: added edb [Bug 8815]
-
-2005-02-23 Eric Sandall <sandalle at sourcemage.org>
-	* init.d.patch: Updated to latest CVS checkouts
-	* PRE_BUILD: Now applies with -p1
-
-2005-01-17 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: VERSION=$(date +%Y%m%d), FORCE_DOWNLOAD=on
-	* var.patch: removed, daemon/Makefile.am is fixed in cvs
-
-2005-01-03 Eric Sandall <sandalle at sourcemage.org>
-	* init.d.patch: Updated to 2005-01-04 CVS checkout
-
-2004-09-09 Eric Sandall <sandalle at sourcemage.org>
-	* PRE_BUILD: Apply init.d.patch and var.patch
-	* init.d.patch: Don't install /etc/init.d/entrance
-	* var.patch: Don't `chmod 700 /var`
-
-2004-09-04 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Added dependency on esmart
-
-2004-08-05 Ladislav Hagara <hgr at vabo.cz>
-	* init.d/entrance: PROGRAM=/usr/sbin/entraced
-	* DETAILS, BUILD: BUILD_API=2
-	* WIP: removed
-
-2004-07-16 Eric Sandall <sandalle at sourcemage.org>
-	* init.d/entrace: Added
-	* WIP: Still needs work
-
-2004-03-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS, DEPENDS, BUILD, HISTORY: created this spell
-
diff --git a/e-17/entrance/PREPARE b/e-17/entrance/PREPARE
deleted file mode 100755
index 53f5402..0000000
--- a/e-17/entrance/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query  ENTRANCE_CVS_AUTOUPDATE                            \
-              "Automatically update on every system update?"  n
diff --git a/e-17/entrance/PRE_BUILD b/e-17/entrance/PRE_BUILD
deleted file mode 100755
index 534a7d3..0000000
--- a/e-17/entrance/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build             &&
-cd  $SOURCE_DIRECTORY         &&
-NOCONFIGURE=ON  ./autogen.sh
diff --git a/e-17/entrance/init.d/entrance b/e-17/entrance/init.d/entrance
deleted file mode 100755
index 154cb66..0000000
--- a/e-17/entrance/init.d/entrance
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#
-
-PROGRAM=/usr/sbin/entranced
-RUNLEVEL=5
-PROVIDES=display_manager
-
-.  /etc/init.d/smgl_init
diff --git a/e-17/evoak/BUILD b/e-17/evoak/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/e-17/evoak/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/e-17/evoak/DEPENDS b/e-17/evoak/DEPENDS
deleted file mode 100755
index 24a5436..0000000
--- a/e-17/evoak/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  subversion
diff --git a/e-17/evoak/DETAILS b/e-17/evoak/DETAILS
deleted file mode 100755
index e8a9fc9..0000000
--- a/e-17/evoak/DETAILS
+++ /dev/null
@@ -1,23 +0,0 @@
-           SPELL=evoak
-if  [  "$EVOAK_CVS_AUTOUPDATE"  ==  "y"  ];  then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=svn
-fi
-#          SOURCE=$SPELL-svn.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
-#   SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/OLD/$SPELL:$SPELL
-  FORCE_DOWNLOAD=on
-   SOURCE_IGNORE=volatile
-        WEB_SITE=http://enlightenment.org/
-         ENTERED=20040608
-      PATCHLEVEL=1
-      LICENSE[0]=BSD
-        KEYWORDS="enlightenment"
-           SHORT="a canvas server"
-cat << EOF
-Evoak is a canvas server. This is similar to an X server that serves out a
-display and graphics operations. Evoak servers out a single canvas to be
-shared by multiple applications (clients) allowing each client to manipulate
-its set of objects.
-EOF
diff --git a/e-17/evoak/HISTORY b/e-17/evoak/HISTORY
deleted file mode 100644
index dcb76f4..0000000
--- a/e-17/evoak/HISTORY
+++ /dev/null
@@ -1,48 +0,0 @@
-2008-09-19 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Remove unneeded modification of SPELL for SOURCE_URL
-
-2008-09-18 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: CVS -> SVN
-	* DEPENDS: Depends on subversion
-
-2008-04-02 Martin Spitzbarth <m.spitzbarth at gmx.de>
-	* deprecated spell, upstream has declared this software "dead"
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-03-28 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: new SOURCE_URL, CVS is no longer hosted on SF
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-02-10 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Removed broken thinktux mirror
-
-2005-11-01 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Added CVS mirror (faster than SourceForge, but 30 minutes behind)
-	  SOURCE_URL now uses $SPELL
-	  Changed MD5[0]=IGNORE to SOURCE_IGNORE=volatile
-
-2005-10-29 Eric Sandall <sandalle at sourcemage.org>
-	* PREPARE: Re-worded auto-update query
-
-2005-10-16 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: fixed SOURCE and SOURCE_DIRECTORY, added FORCE_DOWNLOAD=on
-
-2005-09-21 Eric Sandall <sandalle at sourcemage.org>
-	* PREPARE,DETAILS: Updated to proper multi-version support
-	  See http://www.sourcemage.org/grimoire/spell_multi_version
-	  Removed BUILD_API=2, section-wide now
-	* DEPENDS: Added missing dependency on CVS if needed
-	* BUILD,PRE_BUILD: BUILD renamed to PRE_BUILD
-	  Use NOCONFIGURE=ON ./autogen.sh
-
-2005-01-03 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Added BUILD_API=2
-	* BUILD: Converted to build_api 2
-
-2004-06-08 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS, BUILD, HISTORY: created this spell
-
diff --git a/e-17/evoak/INSTALL b/e-17/evoak/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/e-17/evoak/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/e-17/evoak/PRE_BUILD b/e-17/evoak/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/e-17/evoak/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/e-17/evoak/TRIGGERS b/e-17/evoak/TRIGGERS
deleted file mode 100755
index 25196f9..0000000
--- a/e-17/evoak/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast evoak dispel_self
diff --git a/editors/poedit/DETAILS b/editors/poedit/DETAILS
index 3e51a44..1b2cd52 100755
--- a/editors/poedit/DETAILS
+++ b/editors/poedit/DETAILS
@@ -1,10 +1,11 @@
            SPELL=poedit
-         VERSION=1.3.9
+         VERSION=1.4.6.1
+     SOURCE_HASH=sha512:c8084c80a75cc8499615d736ee6d1a1fcf5753ab610f2931c151167c5c5b2fccff5892e971a90bc53eae815074d209c9e3b5854cc05bed8d72e8f0c2f00b96ed
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig
+#      SOURCE_GPG=gurus.gpg:$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://www.poedit.org/
+        WEB_SITE=http://www.poedit.net/
       LICENSE[0]=MIT
          ENTERED=20060824
            SHORT="gettext translation catalog editor"
diff --git a/editors/poedit/HISTORY b/editors/poedit/HISTORY
index 25704b4..d43057d 100644
--- a/editors/poedit/HISTORY
+++ b/editors/poedit/HISTORY
@@ -1,3 +1,7 @@
+2010-09-15 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.4.6.1
+	  fix WEB_SITE
+
 2007-12-12 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.3.9, cleaned up
 
diff --git a/editors/poedit/poedit-1.3.9.tar.gz.sig b/editors/poedit/poedit-1.3.9.tar.gz.sig
deleted file mode 100644
index 3c47a22..0000000
Binary files a/editors/poedit/poedit-1.3.9.tar.gz.sig and /dev/null differ
diff --git a/ftp-libs/rb-libtorrent/DETAILS b/ftp-libs/rb-libtorrent/DETAILS
index c825269..ccf42be 100755
--- a/ftp-libs/rb-libtorrent/DETAILS
+++ b/ftp-libs/rb-libtorrent/DETAILS
@@ -1,8 +1,8 @@
            SPELL=rb-libtorrent
-         VERSION=0.15.1
+         VERSION=0.15.3
           SOURCE=libtorrent-rasterbar-$VERSION.tar.gz
    SOURCE_URL[0]=http://libtorrent.googlecode.com/files/$SOURCE
-     SOURCE_HASH=sha512:d905e338550d93aa900920d5295b7fe3d96a5803944811ff1abf020eb5e6b14b80af6f163ec0edf5ca6476ef750f40878fbda629b701fbf4aeb92786b2b74faf
+     SOURCE_HASH=sha512:23888cd9526c11849ba6f3777551ede731c2ec108e2176190f5b6bcc3920e9803d4558419d1c79acf9fc51384d1d6a88d7069c89839429d0596aa366de61f3e9
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/libtorrent-rasterbar-$VERSION"
         WEB_SITE=http://www.rasterbar.com/products/libtorrent/
          LICENSE=BSD
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index c5ad2b6..cdcce67 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.15.3
+
 2010-08-06 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.15.1
 
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index cd37f9d..a3cfe24 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=aria2
-         VERSION=1.10.2
-     SOURCE_HASH=sha512:da8955cdb0f5c9b20d3779ffa45ab3b59ef5bab079a540ef3cb023daee8722b5339256283a3329a92d25d66f2f4c940f64f4f43e417b6952d4d4c16d9dc367c1
+         VERSION=1.10.3
+     SOURCE_HASH=sha512:7c66e0c2476eb67913e80764110152a5ae7ee878b3fb7d821dda4d3ca52ff408a98f8e04b37113f4c2182d8fc88df578c1c58476675a9f34c1a9ff6d68d3ad4a
           SOURCE=${SPELL}-$VERSION.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index a624921..e6e8bfe 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.10.3
+
 2010-09-01 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.10.2
 
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index d689162..86914cc 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,6 +1,6 @@
            SPELL=proftpd
-         VERSION=1.3.3a
-     SOURCE_HASH=sha512:1eb790e2b980c641443bf39c6126af4af4e0319d9e2a376b3948785d8aa40db03c7e1ee525851fc935b51a44d6feb8d88703b357eb4b6bbc69e39efedb42d48c
+         VERSION=1.3.3b
+     SOURCE_HASH=sha512:b29b2af90a1fe55118710083c8c09b509a0fea90a746cf72302e5327e21e16a8a5a79400fc915d54dddf7e78ebe557d1d4786c129a9c20d27ebdd7680624b510
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.proftpd.org/distrib/source/$SOURCE
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index ba482c6..93daf47 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2010-09-10 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.3.3b
+
 2010-07-11 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 1.3.3a
 
diff --git a/ftp/qbittorrent/DETAILS b/ftp/qbittorrent/DETAILS
index 170cb5d..2f5ff86 100755
--- a/ftp/qbittorrent/DETAILS
+++ b/ftp/qbittorrent/DETAILS
@@ -1,8 +1,8 @@
            SPELL=qbittorrent
-         VERSION=2.2.10
+         VERSION=2.4.2
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:33a2db67943ce657d35460755e8011176f8808ece4deba66c8c63c57d14d5a5fb43bc4e02bfb0ca2d202aa151d528fb5bef9a61b9cd3339bd160344ef013486f
+     SOURCE_HASH=sha512:e04af06f27a526bb2201f4d57024628225119fb1f2a08fdb4d69506def16685ae3a26448dfda8da3cd14c6b6a5e98a91eb585dd1f45361dd366257b5cb2052d1
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE="http://www.qbittorrent.org/"
          LICENSE=GPL
diff --git a/ftp/qbittorrent/HISTORY b/ftp/qbittorrent/HISTORY
index b9aa29d..cefdc8c 100644
--- a/ftp/qbittorrent/HISTORY
+++ b/ftp/qbittorrent/HISTORY
@@ -1,3 +1,6 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 2.4.2
+
 2010-06-29 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2.2.10
 
diff --git a/ftp/valknut/BUILD b/ftp/valknut/BUILD
new file mode 100755
index 0000000..30370ac
--- /dev/null
+++ b/ftp/valknut/BUILD
@@ -0,0 +1,6 @@
+if check_if_qt4_provider
+then
+  QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+  PATH="$QTDIR/bin/qt4:$PATH"
+fi  &&
+default_build
diff --git a/ftp/valknut/DEPENDS b/ftp/valknut/DEPENDS
index 6ced806..1d03b16 100755
--- a/ftp/valknut/DEPENDS
+++ b/ftp/valknut/DEPENDS
@@ -1,3 +1,7 @@
 depends  libxml2   &&
-depends  qt-x11    &&
+depends  QT        &&
+if  [[  "$(get_spell_provider  ${SPELL}  QT)"  ==  "qt4"  ]]
+then
+  depends -sub QT3 qt4
+fi  &&
 depends  dclib
diff --git a/ftp/valknut/DETAILS b/ftp/valknut/DETAILS
index cf541b7..7274f59 100755
--- a/ftp/valknut/DETAILS
+++ b/ftp/valknut/DETAILS
@@ -1,14 +1,12 @@
            SPELL=valknut
-         VERSION=0.3.7
+         VERSION=0.4.9
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://download.berlios.de/dcgui/$SOURCE
-        WEB_SITE=http://dcgui.berlios.de
+   SOURCE_URL[0]=$SOURCEFORGE_URL/wxdcgui/$SOURCE
+        WEB_SITE=http://wxdcgui.sourceforge.net
          ENTERED=20020522
-         UPDATED=20030217
       LICENSE[0]=GPL
-	   BUILD_API=2
-     SOURCE_HASH=sha512:8315404452bbe6dbb507a23433ecde0494770c402719db88ed1b609a54df4c81d5be8f73e3b0bfdb4d24b003511c7f96465271e05c099fec721871dc42b7fa65
+     SOURCE_HASH=sha512:f3e1f3da45b6f6e2bd2bd2f822ca95eaea0c235e18abbf42da54524b73c20072d64341169ad58c34f070e1038afb28d650485d3c1e2625efb05bd2aa370c1bb9
         KEYWORDS="ftp"
            SHORT='Direct Connect Filesharing Client for Linux.'
 cat << EOF
diff --git a/ftp/valknut/HISTORY b/ftp/valknut/HISTORY
index d41e54e..f007665 100644
--- a/ftp/valknut/HISTORY
+++ b/ftp/valknut/HISTORY
@@ -1,3 +1,9 @@
+2010-09-19 Pol Vinogradov <vin.public at gmail.com>
+	* DETAILS: updated to 0.4.9, fixed SOURCE_URL and WEB_SITE
+	  removed UPDATED and BUILD_API=2
+	* BUILD: added fix for building with QT4
+	* DEPENDS: qt-x11 -> QT
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/gnome1-apps/glade/BUILD b/gnome1-apps/glade/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/glade/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/glade/DEPENDS b/gnome1-apps/glade/DEPENDS
deleted file mode 100755
index b8ebdaa..0000000
--- a/gnome1-apps/glade/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends glade3
diff --git a/gnome1-apps/glade/DETAILS b/gnome1-apps/glade/DETAILS
deleted file mode 100755
index 1013a49..0000000
--- a/gnome1-apps/glade/DETAILS
+++ /dev/null
@@ -1,23 +0,0 @@
-           SPELL=glade
-       # Version 0.6.3 & 0.6.4 are considered unstable
-       # Version 0.6.2 doesn't compile, argh.
-         VERSION=0.6.4
-	  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_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-#     SOURCE_HASH=sha512:45f0450933e444015cc3630fcc36e460975ccf417307eb08e58ebe490264f735a302d7a5d334b8671864df4aaed8ba92bf59c275af3ee364f6377b8301b85ea6
-PATCHLEVEL=1
-        WEB_SITE=http://glade.gnome.org
-      LICENSE[0]=GPL
-         ENTERED=20010922
-         UPDATED=20020203
-        KEYWORDS="gnome1"
-           SHORT="Glade is a GUI builder for GTK+ and GNOME."
-cat << EOF
-Glade is a GUI builder for GTK+ and GNOME. It stores projects in an XML
-format and can generate C code from this meta-format. Additionally, the
-meta-format can be converted to other languages via modules. For
-example, glade-- can generate C++ code.
-EOF
diff --git a/gnome1-apps/glade/HISTORY b/gnome1-apps/glade/HISTORY
deleted file mode 100644
index 2841c94..0000000
--- a/gnome1-apps/glade/HISTORY
+++ /dev/null
@@ -1,28 +0,0 @@
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of glade3
-
-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-10-23 Robin Cook <rcook at wyrms.net>
-	* Add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* URLs now match new ftp.gnome.org layout
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* Added licensing information
-
-2002-03-12 Jon Svendsen <jon-sven at frisurf.no>
-	* Added HISTORY
-	* Added MAINTAINER=aaaaaaaargh
-	* fixed backup url
-	* cleaned up dependencies
-	* removed unnecessary BUILD
-
diff --git a/gnome1-apps/glade/INSTALL b/gnome1-apps/glade/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/glade/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/glade/PRE_BUILD b/gnome1-apps/glade/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/glade/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/glade/TRIGGERS b/gnome1-apps/glade/TRIGGERS
deleted file mode 100755
index bfbf12e..0000000
--- a/gnome1-apps/glade/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast glade dispel_self
diff --git a/gnome1-apps/gnome-admin/BUILD b/gnome1-apps/gnome-admin/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/gnome-admin/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/gnome-admin/DEPENDS b/gnome1-apps/gnome-admin/DEPENDS
deleted file mode 100755
index b221056..0000000
--- a/gnome1-apps/gnome-admin/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends gnome-utils2  &&
-depends gnome-cups-manager
diff --git a/gnome1-apps/gnome-admin/DETAILS b/gnome1-apps/gnome-admin/DETAILS
deleted file mode 100755
index 755157e..0000000
--- a/gnome1-apps/gnome-admin/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-           SPELL=gnome-admin
-         VERSION=1.0.3
-	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-#          SOURCE=$SPELL-$VERSION.tar.gz
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-#   SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-#     SOURCE_HASH=sha512:4c1ae64edfb844edbe3636f63bf3ff9387a55419c212f81c4eb63d40e04da92b4e92f3a80f9c7f2db5ffd02af205f126f20dbb6800cc6bddd91738e803e18c1d
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org
-      LICENSE[0]=GPL
-         ENTERED=20010922
-        KEYWORDS="printer gnome1"
-       
-           SHORT="gnome-admin contains gulp a printer controller and logview."
-cat << EOF
-gnome-admin contains:
-gulp
-printer controller
-logview
-EOF
diff --git a/gnome1-apps/gnome-admin/HISTORY b/gnome1-apps/gnome-admin/HISTORY
deleted file mode 100644
index 359b665..0000000
--- a/gnome1-apps/gnome-admin/HISTORY
+++ /dev/null
@@ -1,36 +0,0 @@
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of gnome-utils2 and gnome-cups-manager
-
-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-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-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
-
-2003-05-27 Robin Cook <rcook at wyrms.net>
-	* Added ${INSTALL_ROOT} to BUILD
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* Add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* URLs now match new ftp.gnome.org layout
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf-no>
-	* Added licensing information
-
-2002-03-13 Jon Svendsen <jon-sven at frisurf.no>
-	* Added HISTORY
-	* Added MAINTAINER=me
-	* fixed backup url
-	* FIXME: /var/log/messages is sysklogd-biased
-
diff --git a/gnome1-apps/gnome-admin/INSTALL b/gnome1-apps/gnome-admin/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/gnome-admin/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/gnome-admin/PRE_BUILD b/gnome1-apps/gnome-admin/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/gnome-admin/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/gnome-admin/TRIGGERS b/gnome1-apps/gnome-admin/TRIGGERS
deleted file mode 100755
index e045d50..0000000
--- a/gnome1-apps/gnome-admin/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnome-admin dispel_self
diff --git a/gnome1-apps/gnome-chess/BUILD b/gnome1-apps/gnome-chess/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/gnome-chess/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/gnome-chess/DEPENDS b/gnome1-apps/gnome-chess/DEPENDS
deleted file mode 100755
index 233b007..0000000
--- a/gnome1-apps/gnome-chess/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gnome-games2
diff --git a/gnome1-apps/gnome-chess/DETAILS b/gnome1-apps/gnome-chess/DETAILS
deleted file mode 100755
index c420649..0000000
--- a/gnome1-apps/gnome-chess/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-           SPELL=gnome-chess
-         VERSION=0.3.3
-	  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_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-#     SOURCE_HASH=sha512:feb91882384936b88054af3dacdf4ec2119ae543b620e9125310af966d0d608cfaca47f534927992fdc9b16ec2632df457f4a8bbf6086914a7f71d1731f52549
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org
-      LICENSE[0]=GPL
-         ENTERED=20010922
-        KEYWORDS="gnome1"
-       
-           SHORT="gnome-chess is chess for GNOME"
-cat << EOF
-gnome-chess is chess for GNOME
-EOF
diff --git a/gnome1-apps/gnome-chess/HISTORY b/gnome1-apps/gnome-chess/HISTORY
deleted file mode 100644
index eff72f2..0000000
--- a/gnome1-apps/gnome-chess/HISTORY
+++ /dev/null
@@ -1,41 +0,0 @@
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of gnome-games2
-
-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-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-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
-
-2004-02-22 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: added libglade as depends
-
-2003-04-08 M.L. <mlubrano at sourcemage.org>
-	* BUILD: added $OPTS
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: Add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-06-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated to 0.3.3
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: added licensing information
-
-2002-03-12 Jon Svendsen <jon-sven at frisurf.no>
-	* HISTORY: added
-	* DETAILS: added myself as MAINTAINER
-	  fixed the backup url i did
-
diff --git a/gnome1-apps/gnome-chess/INSTALL b/gnome1-apps/gnome-chess/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/gnome-chess/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/gnome-chess/PRE_BUILD b/gnome1-apps/gnome-chess/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-apps/gnome-chess/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-apps/gnome-chess/TRIGGERS b/gnome1-apps/gnome-chess/TRIGGERS
deleted file mode 100755
index 5eac695..0000000
--- a/gnome1-apps/gnome-chess/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnome-chess dispel_self
diff --git a/gnome1-libs/gnome-games/BUILD b/gnome1-libs/gnome-games/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-games/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-games/DEPENDS b/gnome1-libs/gnome-games/DEPENDS
deleted file mode 100755
index 233b007..0000000
--- a/gnome1-libs/gnome-games/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gnome-games2
diff --git a/gnome1-libs/gnome-games/DETAILS b/gnome1-libs/gnome-games/DETAILS
deleted file mode 100755
index cf5177f..0000000
--- a/gnome1-libs/gnome-games/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-           SPELL=gnome-games
-         VERSION=1.4.0.4
-	  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_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-#     SOURCE_HASH=sha512:39eb862fdb26274d66d0040e9969e484e70ab251221387f0f6f72b514be5e04f5dbb290a3acb6106805e4f80159607a5dcf6fec48b537b469cf7ed29b809d33e
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org
-      LICENSE[0]=GPL
-      LICENSE[1]=FDL
-         ENTERED=20010922
-        KEYWORDS="games gnome1 libs"
-       
-           SHORT="gnome-games is a collection of games for gnome."
-cat << EOF
-gnome-games is a collection of games for gnome.
-EOF
diff --git a/gnome1-libs/gnome-games/HISTORY b/gnome1-libs/gnome-games/HISTORY
deleted file mode 100644
index 1317a30..0000000
--- a/gnome1-libs/gnome-games/HISTORY
+++ /dev/null
@@ -1,46 +0,0 @@
-2007-05-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of gnome-games2
-
-2006-10-11 Maurizio Boriani <baux at sourcemage.org>
-	* CONFIGURE: Add warning about guile major update.
-
-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-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-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
-
-2004-02-22 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: added gdk-pixbuf
-
-2003-05-27 Robin Cook <rcook at wyrms.net>
-	* BUILD: added ${INSTALL_ROOT}
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: added licensing information
-
-2002-05-26 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated to 1.4.0.4
-	* DEPENDS: added guile as optional dependency
-
-2002-03-12 Jon Svendsen <jon-sven at frisurf.no>
-	* HISTORY: Added HISTORY
-	* DETAILS: Added myself as MAINTAINER
-	  Added backup url
-	* DEPENDS: depends cleanup
-
diff --git a/gnome1-libs/gnome-games/INSTALL b/gnome1-libs/gnome-games/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-games/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-games/PRE_BUILD b/gnome1-libs/gnome-games/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-games/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-games/TRIGGERS b/gnome1-libs/gnome-games/TRIGGERS
deleted file mode 100755
index 0a8468a..0000000
--- a/gnome1-libs/gnome-games/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnome-games dispel_self
diff --git a/gnome1-libs/gnome-karubik-profile/BUILD b/gnome1-libs/gnome-karubik-profile/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-karubik-profile/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-karubik-profile/DEPENDS b/gnome1-libs/gnome-karubik-profile/DEPENDS
deleted file mode 100755
index 11915f6..0000000
--- a/gnome1-libs/gnome-karubik-profile/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gnome2-profile
diff --git a/gnome1-libs/gnome-karubik-profile/DETAILS b/gnome1-libs/gnome-karubik-profile/DETAILS
deleted file mode 100755
index fb20486..0000000
--- a/gnome1-libs/gnome-karubik-profile/DETAILS
+++ /dev/null
@@ -1,80 +0,0 @@
-           SPELL=gnome-karubik-profile
-         VERSION=1.4
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20011122
-        KEYWORDS="gnome1 libs"
-       
-           SHORT="gnome-karubik is an alternate GNOME profile."
-cat << EOF
-
-This profile was taken from http://www.karubik.de/gig/gig14-pga.html
-
-glib
-gtk+
-libsigc++
-gtkmm
-imlib
-gtk-engines
-libxml
-libghttp
-libproplist
-orbit
-audiofile
-esound
-gnome-libs
-gnomemm
-oaf
-gdk-pixbuf
-gnome-print
-bonobo
-libgtop
-libglade
-gconf
-gnome-vfs
-control-center
-scrollkeeper
-gnome-core
-gnome-applets
-gnome-python
-gnome-utils
-gnome-audio
-gnome-games
-gnome-media
-gnome-pim
-bug-buddy
-gdm
-ggv
-ghex
-gtop
-panelmm
-librep
-rep-gtk
-sawfish
-windowmaker
-xalf
-gnome-user-docs
-glade
-guppi
-pspell
-balsa
-libxslt
-libole2
-libunicode
-gal
-gnumeric
-freetype2
-mozilla
-librsvg
-eel
-# ammonite
-nautilus
-galeon
-db
-bonobo-conf
-gtkhtml
-pilot-link
-# gnome-pilot
-# gnome-pilot-conduits
-evolution
-EOF
diff --git a/gnome1-libs/gnome-karubik-profile/HISTORY b/gnome1-libs/gnome-karubik-profile/HISTORY
deleted file mode 100644
index 176825a..0000000
--- a/gnome1-libs/gnome-karubik-profile/HISTORY
+++ /dev/null
@@ -1,35 +0,0 @@
-2007-05-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of gnome2-profile
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2004-08-03 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Guppi, ORBit, libPropList, GConf, and WindowMaker lowercased
-	* DEPENDS: libPropList renamed to libproplist
-
-2004-07-18 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: GConf renamed to gconf
-	  ORBit renamed to orbit
-	  Guppi renamed to guppi
-	  WindowMaker renamed to windowmaker
-	  Formatted to Guru Handbook
-
-2003-10-10 hgg <hgreig at bigpond.net.au>
-	* DEPENDS: Change x11-libs to X11-LIBS
-
-2003-10-03 hgg <hgreig at bigpond.net.au>
-	* DEPENDS: Change requires x11-libs to depends x11-libs
-
-2003-09-17 hgg <hgreig at bigpond.net.au>
-	* DEPENDS: Change depends xfree86 to requires x11-libs
-
-2002-03-12 Jon Svendsen <jon-sven at frisurf.no>
-	* HISTORY: Added
-
diff --git a/gnome1-libs/gnome-karubik-profile/INSTALL b/gnome1-libs/gnome-karubik-profile/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-karubik-profile/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-karubik-profile/PRE_BUILD b/gnome1-libs/gnome-karubik-profile/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-karubik-profile/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-karubik-profile/TRIGGERS b/gnome1-libs/gnome-karubik-profile/TRIGGERS
deleted file mode 100755
index d1a5e15..0000000
--- a/gnome1-libs/gnome-karubik-profile/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnome-karubik-profile dispel_self
diff --git a/gnome1-libs/gnome-utils/BUILD b/gnome1-libs/gnome-utils/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-utils/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-utils/DEPENDS b/gnome1-libs/gnome-utils/DEPENDS
deleted file mode 100755
index e8182f3..0000000
--- a/gnome1-libs/gnome-utils/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gnome-utils2
diff --git a/gnome1-libs/gnome-utils/DETAILS b/gnome1-libs/gnome-utils/DETAILS
deleted file mode 100755
index 43d122a..0000000
--- a/gnome1-libs/gnome-utils/DETAILS
+++ /dev/null
@@ -1,60 +0,0 @@
-           SPELL=gnome-utils
-         VERSION=1.4.1.3
-	  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_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-#     SOURCE_HASH=sha512:acbc820818c819308705504dabb79a08ea976e87d9479d16aeff7da32db9c587e60cd772a2971b096064fd8b95f2a291c9c4b9256d2d6d60eb920dd2706b47f3
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org
-      LICENSE[0]=GPL
-         ENTERED=20010922
-         UPDATED=20030212
-        KEYWORDS="gnome1 libs"
-       
-           SHORT="gnome-utils provides useful gnome based utilities."
-cat << EOF
-Gnome is the "GNU Network Object Model Environment". It is a project to         
-build a complete, user-friendly desktop based entirely on free software.        
-                                                                                
-This package contains some assorted utilities for use with the Gnome.           
-These are:                                                                      
-                                                                                
-gcalc
-a simple calculator.
-gcharmap
-character map viewer.
-gcolorsel
-a color selector.
-gdialog
-a Gtk version of the 'dialog' program.
-gdict
-dictionary server query and display.
-gdiskfree
-graphical disk free (df) utility.
-gfloppy
-GUI for formatting floppy.
-gfontsel
-a font selector.
-gless
-a Gtk version of the 'less' pager.
-gsearchtool
-a tool for finding and grepping through files.
-gshutdown
-reboot or shutdown your machine.
-gtt
-a task timer/tracker.
-guname
-display 'uname' information about your system.
-gw
-display users on the system, like 'w'.
-idetool
-an IDE disk viewing tool.
-logview
-Log viewing applications.
-splash/splac
-splash screen renderer.
-stripchart
-plot system measurements (including applet version).
-EOF
diff --git a/gnome1-libs/gnome-utils/HISTORY b/gnome1-libs/gnome-utils/HISTORY
deleted file mode 100644
index 04358d1..0000000
--- a/gnome1-libs/gnome-utils/HISTORY
+++ /dev/null
@@ -1,45 +0,0 @@
-2007-05-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of gnome-utils2
-
-2006-10-11 Maurizio Boriani <baux at sourcemage.org>
-	* CONFIGURE: Add warning about guile major update.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed MAINTAINER.
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-2006-05-14 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: added xml-i18n-tools (bug 11393)
-
-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
-
-2003-05-27 Robin Cook <rcook at wyrms.net>
-	* Added ${INSTALL_ROOT} to BUILD
-
-2003-04-08 M.L. <mlubrano at sourcemage.org>
-	* Added $OPTS in BUILD.
-
-2003-02-12 Robin Cook <rcook at wyrms.net>
-	* Update 1.4.1.3
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* Add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* URLs now match new ftp.gnome.org layout
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* Added licensing information
-
-2002-13-14 Jon Svendsen <jon-sven at frisurf.no>
-	* Added HISTORY
-	* Added myself as MAINTAINER
-	* fixed backup url
-	* FIXME: /var/log/messages is sysklogd-centric (BUILD)
-
diff --git a/gnome1-libs/gnome-utils/INSTALL b/gnome1-libs/gnome-utils/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-utils/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-utils/PRE_BUILD b/gnome1-libs/gnome-utils/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/gnome-utils/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/gnome-utils/TRIGGERS b/gnome1-libs/gnome-utils/TRIGGERS
deleted file mode 100755
index 97ebdf9..0000000
--- a/gnome1-libs/gnome-utils/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnome-utils dispel_self
diff --git a/gnome1-libs/guppi/BUILD b/gnome1-libs/guppi/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/guppi/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/guppi/DETAILS b/gnome1-libs/guppi/DETAILS
deleted file mode 100755
index b067686..0000000
--- a/gnome1-libs/guppi/DETAILS
+++ /dev/null
@@ -1,24 +0,0 @@
-           SPELL=guppi
-         VERSION=0.40.3
-          BRANCH=`echo $VERSION|cut -d . -f 1,2`
-#          SOURCE=Guppi-$VERSION.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/Guppi-$VERSION
-#   SOURCE_URL[0]=$GNOME_URL/sources/Guppi/$BRANCH/$SOURCE
-#   SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/Guppi/$BRANCH/$SOURCE
-#     SOURCE_HASH=sha512:cfeabc6554ac06586dc6c72f77637812279040d6408c5643f6ab93aad03cdecbff6d52ca7d4f4be59568dddefa5cff418edda3f30e8023a7ec768b54589cb630
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org/projects/Guppi
-         ENTERED=20011022
-         UPDATED=20020124
-      LICENSE[0]=GPL
-     GCC_VERSION=3.4
-        KEYWORDS="gnome1 libs"
-           SHORT="GNOME-based framework for graphing and data analysis."
-cat << EOF
-Guppi is a GNOME-based framework for graphing and interactive data
-analysis.
-
-Guppi is a library that can be used to extend other programs. Your own
-programs can either link directly to Guppi's shared libraries, or can
-embed Guppi plots via Bonobo, GNOME's component architecture.
-EOF
diff --git a/gnome1-libs/guppi/HISTORY b/gnome1-libs/guppi/HISTORY
deleted file mode 100644
index edda4b2..0000000
--- a/gnome1-libs/guppi/HISTORY
+++ /dev/null
@@ -1,54 +0,0 @@
-2007-05-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated, upstream unmaintained and spell unused
-
-2006-10-11 Maurizio Boriani <baux at sourcemage.org>
-	* CONFIGURE: Add warning about guile major update.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-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
-
-2005-07-10 Sergey Lipnevich <sergey at sourcemage.org>
-	* DEPENDS,DETAILS: use GCC 3.4.
-
-2005-02-28 Eric Sandall <sandalle at sourcemage.org>
-	* CONFLICTS: Removed conflicting spell
-
-2004-12-16 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Python renamed to python
-
-2004-07-22 Jose Bernardo Silva <jbernardo at sourcemage.org>
-	* BUILD, gcc341.diff: added to allow casting with gcc 3.4.1
-
-2004-07-18 Eric Sandall <sandalle at sourcemage.org>
-	* Renamed to guppi
-	* DETAILS: Renamed to guppi
-	  Removed MAINTAINER
-	  Removed TAB 
-	  Shortened SHORT
-	  BUILD_API=2
-	* DEPENDS: Formatted to Guru Handbook
-	* CONFLICTS: Conflicts with Guppi
-	* HISTORY: Formatted to Guru Handbook
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: Add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: Added licensing information and MAINTAINER=me
-
-2002-03-15 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: fixed backup url
-
-2002-03-11 Jon Svendsen <jon-sven at frisurf.no>
-	* HISTORY: Added
-	* DETAILS: Added MAINTAINER=myself
-
diff --git a/gnome1-libs/guppi/INSTALL b/gnome1-libs/guppi/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/guppi/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/guppi/PRE_BUILD b/gnome1-libs/guppi/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome1-libs/guppi/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome1-libs/guppi/TRIGGERS b/gnome1-libs/guppi/TRIGGERS
deleted file mode 100755
index d62de40..0000000
--- a/gnome1-libs/guppi/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast guppi dispel_self
diff --git a/gnome2-apps/epiphany/DETAILS b/gnome2-apps/epiphany/DETAILS
index 5c54a3c..a41d7c9 100755
--- a/gnome2-apps/epiphany/DETAILS
+++ b/gnome2-apps/epiphany/DETAILS
@@ -2,7 +2,7 @@
 if [[ "$EPIPHANY_DEVEL" == "y" ]]; then
          VERSION=2.31.3
 else
-         VERSION=2.30.5
+         VERSION=2.30.6
 fi
           BRANCH=$(echo $VERSION|cut -d . -f 1,2)
           SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/gnome2-apps/epiphany/HISTORY b/gnome2-apps/epiphany/HISTORY
index e1017e7..bf81849 100644
--- a/gnome2-apps/epiphany/HISTORY
+++ b/gnome2-apps/epiphany/HISTORY
@@ -1,3 +1,6 @@
+2010-09-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.30.6
+
 2010-09-01 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.30.5
 
diff --git a/gnome2-apps/epiphany/epiphany-2.30.5.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.30.5.tar.bz2.sig
deleted file mode 100644
index 383a949..0000000
Binary files a/gnome2-apps/epiphany/epiphany-2.30.5.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/epiphany/epiphany-2.30.6.tar.bz2.sig b/gnome2-apps/epiphany/epiphany-2.30.6.tar.bz2.sig
new file mode 100644
index 0000000..0d388fb
Binary files /dev/null and b/gnome2-apps/epiphany/epiphany-2.30.6.tar.bz2.sig differ
diff --git a/gnome2-apps/file-roller2/BUILD b/gnome2-apps/file-roller2/BUILD
deleted file mode 100755
index 7eead1e..0000000
--- a/gnome2-apps/file-roller2/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-true
-
diff --git a/gnome2-apps/file-roller2/CONFLICTS b/gnome2-apps/file-roller2/CONFLICTS
deleted file mode 100755
index 7df4651..0000000
--- a/gnome2-apps/file-roller2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts file-roller2 y
diff --git a/gnome2-apps/file-roller2/DEPENDS b/gnome2-apps/file-roller2/DEPENDS
deleted file mode 100755
index a19eac7..0000000
--- a/gnome2-apps/file-roller2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends file-roller
diff --git a/gnome2-apps/file-roller2/DETAILS b/gnome2-apps/file-roller2/DETAILS
deleted file mode 100755
index 52342c7..0000000
--- a/gnome2-apps/file-roller2/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-           SPELL=file-roller2
-         VERSION=2.18.4
-          BRANCH=`echo $VERSION | cut -d . -f 1,2`
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/file-roller-$VERSION
-      LICENSE[0]=GPL
-        WEB_SITE=http://fileroller.sourceforge.net
-         ENTERED=20020505
-        KEYWORDS="archive gnome2"
-           SHORT="File Roller is an archive manager for the GNOME environment."
-cat << EOF
-File Roller is an archive manager for the GNOME environment.  This means
-that you can : create and modify archives; view the content of an
-archive;  view a file contained in the archive; extract files from the 
-archive. File Roller is only a front-end (a graphical interface) to archiving
-programs like tar and zip.
-EOF
diff --git a/gnome2-apps/file-roller2/G_SCHEMAS b/gnome2-apps/file-roller2/G_SCHEMAS
deleted file mode 100644
index 8acfc30..0000000
--- a/gnome2-apps/file-roller2/G_SCHEMAS
+++ /dev/null
@@ -1 +0,0 @@
-file-roller.schemas
diff --git a/gnome2-apps/file-roller2/HISTORY b/gnome2-apps/file-roller2/HISTORY
deleted file mode 100644
index 21e404b..0000000
--- a/gnome2-apps/file-roller2/HISTORY
+++ /dev/null
@@ -1,250 +0,0 @@
-2007-09-27 Eric Sandall <sandalle at sourcemage.org>
-	* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014
-
-2007-07-02 Robin Cook <rcook at wryms.net>
-	* SPELL: deprecated in favor of file-roller
-
-2007-05-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.3
-
-2007-04-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.2
-
-2007-04-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.1
-
-2007-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.0
-
-2007-03-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.17.92
-
-2007-02-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.17.91
-
-2007-02-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.16.3
-
-2006-10-03 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: Updated to 2.16.1
-
-2006-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.16.0
-
-2006-08-30 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: Updated to 2.14.4
-
-2006-08-15 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED (deprecated in favor of 
-	  PATCHLEVEL).
-
-2006-05-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.3
-
-2006-05-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added PATCHLEVEL
-	  removed BUILD_API
-	* G_SCHEMAS: added
-
-2006-04-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.2
-
-2006-03-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.0
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-03-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.13.92
-
-2006-02-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.13.91
-
-2006-02-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.3
-
-2005-11-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.2
-
-2005-10-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.1
-
-2005-09-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.0
-
-2005-08-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.11.92
-
-2005-08-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.11.91
-	  converted MD5 to GPG
-
-2005-07-08 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.4
-	  updated MD5
-
-2005-04-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.3
-	  updated MD5
-
-2005-04-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.2
-	  updated MD5
-
-2005-03-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.1
-	  updated MD5
-
-2005-03-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.0
-	  updated MD5
-
-2005-03-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.9.92
-	  updated MD5
-
-2005-02-08 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.9.91
-	  updated MD5
-
-2004-10-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.3
-	  updated MD5
-
-2004-10-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.2
-	  updated MD5
-
-2004-09-29 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.1
-	  updated MD5
-
-2004-09-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.0
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.7.5
-	  updated MD5
-	  added BUILD_API=2
-	* WIP: added
-
-2004-06-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.2
-	  updated MD5
-
-2004-04-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.1
-	  updated MD5
-
-2004-03-22 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.0
-	  updated MD5
-
-2004-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.7
-	  updated MD5
-
-2004-03-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.6
-	  updated MD5
-
-2004-03-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.5
-	  updated MD5
-	  removed MAINTAINER
-
-2004-01-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.3
-	  updated MD5
-
-2003-11-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.2
-	  updated MD5
-
-2003-10-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.1.1
-	  updated MD5
-
-2003-10-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.1
-	  updated MD5
-
-2003-09-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.0.1
-	  updated MD5
-
-2003-09-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.0
-	  updated MD5
-
-2003-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.3.6
-	  updated MD5
-
-2003-07-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.5
-	  updated MD5
-
-2003-05-24 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.4
-	  updated MD5
-
-2003-03-24 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.3
-	  updated MD5
-
-2003-03-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.2
-	  updated MD5
-
-2003-01-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.1
-	  updated MD5
-
-2003-01-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.0
-	  updated MD5
-
-2002-01-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.5
-	  updated MD5
-
-2002-12-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.4
-	  updated MD5
-	  added BRANCH variable
-	  added SOURCE_URL to GNOME_URL
-
-2002-11-08 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.4
-	  updated MD5
-
-2002-11-03 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.3
-	  updated MD5
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added MD5
-
-2002-07-30 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.0
-
-2002-07-17 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.109
-
-2002-06-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: use $SOURCEFORGE_URL in SOURCE_URL
-
-2002-06-11 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.107
-
-2002-05-21 Jon Svendsen <jon-sven at frisurf.no>
-	* renamed to file-roller2
-	* DETAILS: updated VERSION to 1.106
-	* CONFLICTS: added conflicts against hyphothetical file-roller spell
-
-2002-05-17 Jon Svendsen <jon-sven at frisurf.no>
-	* Initial version of spell
-
diff --git a/gnome2-apps/file-roller2/INSTALL b/gnome2-apps/file-roller2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/file-roller2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/file-roller2/PRE_BUILD b/gnome2-apps/file-roller2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/file-roller2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/file-roller2/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS b/gnome2-apps/file-roller2/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
deleted file mode 100755
index deb98f7..0000000
--- a/gnome2-apps/file-roller2/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
+++ /dev/null
@@ -1,15 +0,0 @@
-#---------------------------------------------------------------------
-## Replaces sorcerys default_pre-remove with a custom version
-#---------------------------------------------------------------------
-function default_pre_remove() {
-    debug "libapi" "$FUNCNAME - $*"
-    real_default_pre_remove "$@"
-    if [[ -f "${SCRIPT_DIRECTORY}/G_SCHEMAS" && -e "/usr/bin/gconftool-2" ]]; then
-       local G_FILE
-       export GCONF_CONFIG_SOURCE="xml:readwrite:${INSTALL_ROOT}/etc/gconf/gconf.xml.defaults"
-       for G_FILE in `cat ${SCRIPT_DIRECTORY}/G_SCHEMAS`
-       do
-          gconftool-2 --makefile-uninstall-rule "${INSTALL_ROOT}/etc/gconf/schemas/${G_FILE}" > /dev/null || true
-       done
-    fi
-}
diff --git a/gnome2-apps/file-roller2/TRIGGERS b/gnome2-apps/file-roller2/TRIGGERS
deleted file mode 100755
index fecf016..0000000
--- a/gnome2-apps/file-roller2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast file-roller2 dispel_self
diff --git a/gnome2-apps/gftp2/BUILD b/gnome2-apps/gftp2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/gftp2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/gftp2/CONFLICTS b/gnome2-apps/gftp2/CONFLICTS
deleted file mode 100755
index 0854f31..0000000
--- a/gnome2-apps/gftp2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts gftp
diff --git a/gnome2-apps/gftp2/DEPENDS b/gnome2-apps/gftp2/DEPENDS
deleted file mode 100755
index 1a5a12d..0000000
--- a/gnome2-apps/gftp2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  gftp
diff --git a/gnome2-apps/gftp2/DETAILS b/gnome2-apps/gftp2/DETAILS
deleted file mode 100755
index 8b54d7a..0000000
--- a/gnome2-apps/gftp2/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-           SPELL=gftp2
-         VERSION=2.0.18
-          BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          #SOURCE=gftp-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gftp-$VERSION
-#   SOURCE_URL[0]=http://www.gftp.org/$SOURCE
- #    SOURCE_HASH=sha512:e7f00f4048d91d47db90fbd55598c1a14eb707c41809ee33652d698514e1d602dd2bfadbbef335e6af9a08eb1c64ee74ea53c72f97f8b7c20ae514cf8ef1db07
-      LICENSE[0]=GPL
-        WEB_SITE=http://gftp.seul.org
-         ENTERED=20020521
-         UPDATED=20060212
-        KEYWORDS="ftp gnome2"
-           SHORT="gFTP is a graphical ftp client"
-cat << EOF
-gFTP is a multithreaded FTP client for X Windows written using GTK+.
-It features simultaneous downloads, resuming of interrupted file
-transfers, FTP, HTTP, and SSH protocols, file transfer queues,
-downloading of entire directories, FTP and HTTP proxy support, remote 
-directory caching, passive and non-passive file transfers,
-drag-n-drop support, a very nice connection manager, and more.
-EOF
diff --git a/gnome2-apps/gftp2/HISTORY b/gnome2-apps/gftp2/HISTORY
deleted file mode 100644
index 57d751a..0000000
--- a/gnome2-apps/gftp2/HISTORY
+++ /dev/null
@@ -1,67 +0,0 @@
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-02-12 Mathieu Lonjaret <lejatorn at sourcemage.org>
-	* deprecated, spell belongs to ftp section.
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-02-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.18
-	  updated MD5
-
-2004-11-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.18rc1
-	  updated MD5
-	  added BUILD_API=2
-	  removed MAINTAINER
-
-2004-03-29 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.17
-	  updated MD5
-
-2003-11-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.16
-	  updated MD5
-	* BUILD: removed BUILD and patch
-
-2003-10-21 Robin Cook <rcook at wyrms.net>
-	* BUILD: Added BUILD to apply gftp-truncate.patch
-	* Added gftp-truncate.patch to fix directory listings getting
-	  truncated when there was a dangling symlink.
-
-2003-08-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.15
-	  updated MD5
-
-2002-12-28 Robin Cook <rcook at wyrms.net>
-	* BUILD: removed as gftp now uses gtk+2 by default now.
-
-2002-12-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.14
-	  updated MD5
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* BUILD: add MD5
-
-2002-09-05 Jon Svendsen <jon-sven at frisurf.no>
-	* CONFLICTS: remove autotools conflicts
-
-2002-08-29 Jon Svendsen <jon-sven at frisurf.no>
-	* CONFLICTS: autoconf/automake hopefully fixes #765
-
-2002-07-23 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.13
-
-2002-05-23 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.12
-	  Changed $SOURCE to use bz2
-	  Changed $SOURCE_URL[0] to use $SOURCE
-
-2002-05-21 Jon Svendsen <jon-sven at frisurf.no>
-	* Initial version, ported from main grimoire
-
diff --git a/gnome2-apps/gftp2/INSTALL b/gnome2-apps/gftp2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/gftp2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/gftp2/PRE_BUILD b/gnome2-apps/gftp2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/gftp2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/gftp2/TRIGGERS b/gnome2-apps/gftp2/TRIGGERS
deleted file mode 100755
index 566e2e7..0000000
--- a/gnome2-apps/gftp2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gftp2 dispel_self
diff --git a/gnome2-apps/ggv2/BUILD b/gnome2-apps/ggv2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/ggv2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/ggv2/DEPENDS b/gnome2-apps/ggv2/DEPENDS
deleted file mode 100755
index a4798d3..0000000
--- a/gnome2-apps/ggv2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends ggv
diff --git a/gnome2-apps/ggv2/DETAILS b/gnome2-apps/ggv2/DETAILS
deleted file mode 100755
index e6abcbb..0000000
--- a/gnome2-apps/ggv2/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-           SPELL=ggv2
-         VERSION=2.12.0
-	  BRANCH=`echo $VERSION|cut -d . -f 1,2` 
-#          SOURCE=ggv-$VERSION.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/ggv-$VERSION
-#   SOURCE_URL[0]=$GNOME_URL/sources/ggv/$BRANCH/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      PATCHLEVEL=2
-      LICENSE[0]=GPL
-      LICENSE[1]=FDL
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20020510
-        KEYWORDS="gnome2"
-           SHORT="GGV is GNOME GhostView"
-cat << EOF
-GGV is a PDF/PostScript renderer for GNOME. It is based on GhostScript.
-EOF
diff --git a/gnome2-apps/ggv2/HISTORY b/gnome2-apps/ggv2/HISTORY
deleted file mode 100644
index 72d6b92..0000000
--- a/gnome2-apps/ggv2/HISTORY
+++ /dev/null
@@ -1,152 +0,0 @@
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated, renamed to ggv
-
-2006-08-15 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED (deprecated in favor of 
-	  PATCHLEVEL).
-
-2006-05-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added PATCHLEVEL
-	  removed BUILD_API
-	* G_SCHEMAS: added
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-09-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.0
-	  converted MD5 to GPG
-
-2005-06-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.5
-	  updated MD5
-
-2005-03-20 Arjan Bouter <abouter at sourcemage.org>
-	* POST_REMOVE: source FUNCTIONS untill dispel does that
-
-2005-03-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.4
-	  updated MD5
-
-2005-02-21 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* FINAL, POST_REMOVE: run update_desktop_database
-
-2005-02-03 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.3
-	  updated MD5
-
-2005-01-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.2
-	  updated MD5
-
-2004-12-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.1
-	  updated MD5
-
-2004-09-13 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 2.8.0
-
-2004-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.799
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.70
-	  updated MD5
-	  added BUILD_API=2
-	* WIP: added
-
-2004-07-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.2
-	  updated MD5
-
-2004-04-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.1
-	  updated MD5
-
-2004-04-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.0.1
-	  updated MD5
-
-2004-03-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.0
-	  updated MD5
-
-2004-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.99.1
-	  updated MD5
-
-2004-03-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.99
-	  updated MD5
-	  removed MAINTAINER
-
-2004-02-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.1
-	  updated MD5
-
-2003-10-30 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: upper-case provides
-
-2003-10-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.0.2
-	  updated MD5
-
-2003-09-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.0.1
-	  updated MD5
-
-2003-09-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.0
-	  updated MD5
-
-2003-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 2.3.99
-	  updated MD5
-
-2003-06-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.1
-	  updated MD5
-
-2003-04-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.0
-	  updated MD5
-
-2003-02-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated to VERSION 1.99.98
-	  updated MD5
-
-2002-12-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.97
-	  updated MD5
-	* DEPENDS: changed postscript interpreter from depends to requires
-
-2002-12-07 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: changed ghostsctipt to postscript-interpreter
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-08-27 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated to VERSION 1.99.90
-	  s/2.0.0/2.0.1 on URLs
-	* BUILD: Removed broken BUILD
-
-2002-08-04 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.99.9
-
-2002-07-16 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.99.8
-
-2002-06-13 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.99.7
-
-2002-06-02 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.99.6
-
-2002-05-17 Jon Svendsen <jon-sven at frisurf.no>
-	* Initial version of spell
-
diff --git a/gnome2-apps/ggv2/INSTALL b/gnome2-apps/ggv2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/ggv2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/ggv2/PRE_BUILD b/gnome2-apps/ggv2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/ggv2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/ggv2/TRIGGERS b/gnome2-apps/ggv2/TRIGGERS
deleted file mode 100755
index 4f500af..0000000
--- a/gnome2-apps/ggv2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast ggv2 dispel_self
diff --git a/gnome2-apps/glabels2/BUILD b/gnome2-apps/glabels2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/glabels2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/glabels2/DEPENDS b/gnome2-apps/glabels2/DEPENDS
deleted file mode 100755
index e44e428..0000000
--- a/gnome2-apps/glabels2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends glabels
diff --git a/gnome2-apps/glabels2/DETAILS b/gnome2-apps/glabels2/DETAILS
deleted file mode 100755
index 03da9ce..0000000
--- a/gnome2-apps/glabels2/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=glabels2
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by glabels]
-EOF
-
diff --git a/gnome2-apps/glabels2/DOWNLOAD b/gnome2-apps/glabels2/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/glabels2/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/glabels2/HISTORY b/gnome2-apps/glabels2/HISTORY
deleted file mode 100644
index 25d070f..0000000
--- a/gnome2-apps/glabels2/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2009-06-27  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by glabels]
diff --git a/gnome2-apps/glabels2/INSTALL b/gnome2-apps/glabels2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/glabels2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/glabels2/PRE_BUILD b/gnome2-apps/glabels2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/glabels2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/glabels2/TRIGGERS b/gnome2-apps/glabels2/TRIGGERS
deleted file mode 100755
index f0be777..0000000
--- a/gnome2-apps/glabels2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast glabels2 dispel_self
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index acaf32c..727c274 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,18 +1,13 @@
 depends  libole2-2    &&
 depends  libgsf       &&
 
-if [[ $GNUMERIC_DEVEL == y ]]; then
-         depends goffice-dev &&
-         depends rarian
-else
-         depends goffice &&
-         if spell_ok goffice && [[ $(installed_version goffice) < 0.8.5 ]]; then
-           force_depends goffice
-         fi
+depends goffice &&
+
+if spell_ok goffice && [[ $(installed_version goffice) < 0.8.11 ]]; then
+  force_depends goffice
 fi &&
 
 depends  libxml2      &&
-
 depends  cairo &&
 depends  -sub SVG cairo &&
 
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index e65473b..5bff34c 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,11 +1,11 @@
            SPELL=gnumeric
 if [[ $GNUMERIC_DEVEL == y ]]; then
-         VERSION=1.10.10
+         VERSION=1.10.11
 #     SOURCE_HASH=sha512:e2f7984f869dbfaf9a5fdeee0aae544a0070c1e4edac3ffb085fb196ef1fb1e40df6f922bc9ec1eeb67ee3d2dd0b28aaf9ec2731e7120c1d485617bd0ad4d7ce
           SOURCE=$SPELL-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 else
-         VERSION=1.10.10
+         VERSION=1.10.11
           SOURCE=$SPELL-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 fi
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index 7d0108d..80da7b3 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,7 @@
+2010-10-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.10.11
+	* DEPENDS: removed useless checks for devel branch
+
 2010-09-05 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.10.10
 
diff --git a/gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sig
deleted file mode 100644
index 24bc17f..0000000
Binary files a/gnome2-apps/gnumeric/gnumeric-1.10.10.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sig
new file mode 100644
index 0000000..7dd0534
Binary files /dev/null and b/gnome2-apps/gnumeric/gnumeric-1.10.11.tar.bz2.sig differ
diff --git a/gnome2-apps/gswitchit/BUILD b/gnome2-apps/gswitchit/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/gswitchit/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/gswitchit/DEPENDS b/gnome2-apps/gswitchit/DEPENDS
deleted file mode 100755
index 3381b10..0000000
--- a/gnome2-apps/gswitchit/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends control-center2
diff --git a/gnome2-apps/gswitchit/DETAILS b/gnome2-apps/gswitchit/DETAILS
deleted file mode 100755
index b1bd899..0000000
--- a/gnome2-apps/gswitchit/DETAILS
+++ /dev/null
@@ -1,31 +0,0 @@
-           SPELL=gswitchit
-         VERSION=2.3.3
-#          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=$SOURCEFORGE_URL/gswitchit/$SOURCE
-#          MD5[0]='102678f707471f77f9c22aa33414235e'
-      LICENSE[0]=GPL
-        WEB_SITE=http://gswitchit.sourceforge.net/
-         ENTERED=20021231
-         UPDATED=20040425
-        KEYWORDS="gnome2"
-           SHORT='GSwitchIt is an XKB toolkit for GNOME (including GNOME 2)'
-cat << EOF
-Features
-* Support up to 4 keyboard groups
-* Customizable images for each group (see this HOWTO)
-* Switching using the applet menu or by click.
-* Audible bell on group switching (BTW, it can be turned off!).
-* Support for "secondary" groups(i.e. groups reachable only from popup menu).
-* Customizable group switch shortcut. Currently ~15 fixed combinations are supported
-  (besides the ones in X distribution). Also, user can create its own key combination.
-* Independent group switching per window (optional).
-* Any key combination can be used as switchcut.
-* Indicators (Caps Lock, Scroll Lock, Num Lock) can be maintained the same per-window way as keyboard groups.
-* Abitility to track the configuration changes (setxkbmap compability).
-* XKB configuration tool. Allows per-user XKB settings.
-* Ability to work correctly with the global (set in /etc/X11/XF86Config) XKB configuration.
-* Optional "default" group - assigned to all new window on creation.
-* User-defined commands on the group switching: "mpg123 /home/johnny/russiansound.mpg")
-  (only by direct setting of undocumented GConf entries:)
-EOF
diff --git a/gnome2-apps/gswitchit/HISTORY b/gnome2-apps/gswitchit/HISTORY
deleted file mode 100644
index b60765e..0000000
--- a/gnome2-apps/gswitchit/HISTORY
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-
-2004-04-25 Robin Cook <rcook at wryms.net>
-	* NOTE: Prep for deprecation
-
-2004-02-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.3.3 and MD5 updated
-
-2003-05-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.31 and MD5 updated
-
-2003-02-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.2 and MD5 updated
-
-2002-12-31 Sergey Lipnevich <sergey at sourcemage.org>
-	* Spell added.
-
diff --git a/gnome2-apps/gswitchit/PRE_BUILD b/gnome2-apps/gswitchit/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/gswitchit/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/memprof2/BUILD b/gnome2-apps/memprof2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/memprof2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/memprof2/DEPENDS b/gnome2-apps/memprof2/DEPENDS
deleted file mode 100755
index 150bde5..0000000
--- a/gnome2-apps/memprof2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends memprof
diff --git a/gnome2-apps/memprof2/DETAILS b/gnome2-apps/memprof2/DETAILS
deleted file mode 100755
index 51a68d3..0000000
--- a/gnome2-apps/memprof2/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-           SPELL=memprof2
-         VERSION=0.6
-         BRANCH=`echo $VERSION|cut -d . -f 1,2`
-#          SOURCE=memprof-$VERSION.tar.gz
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/memprof-$VERSION
-#   SOURCE_URL[0]=${GNOME_URL}/sources/memprof/${BRANCH}/${SOURCE}
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      LICENSE[0]=GPL
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org/projects/memprof/
-         ENTERED=20020320
-        KEYWORDS="gnome2"
-           SHORT="Memory profiling tool"
-cat << EOF
-MemProf is a tool for profiling memory usage and finding memory leaks.
-EOF
diff --git a/gnome2-apps/memprof2/HISTORY b/gnome2-apps/memprof2/HISTORY
deleted file mode 100644
index 6a9a53a..0000000
--- a/gnome2-apps/memprof2/HISTORY
+++ /dev/null
@@ -1,38 +0,0 @@
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated, renamed to memprof
-
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* CONFLICTS: added conflict memprof for deprecation
-
-2006-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.6
-	  added BRANCH
-	  SOURCE_URL to gnome
-	  WEB_SITE to new site
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-12-09 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 0.5.9 (from Rasterman of E16/E17) for glibc >= 2.3.4
-	  Changed SOURCE_URL to Raster's site
-	  Removed LICENSE and MAINTAINER
-	  Use GPG checking
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2003-01-12 Robin Cook <rcook at wyrms.net>
-	* Updated to gnome2 version 0.5.1
-
-2002-10-03 Julian v. Bock <julian at wongr.net>
-	* DETAILS: add LICENSE and MD5 fields.
-
-2002-03-20 Jean-Michel Smith <jean at kcco.com>
-	* initial review of spell for inclusion in grimoire
-	* added LICENSE information to DETAILS file
-	* created HISTORY file
-
-2002-02-13 Gerrit Germis <gerrit.germis at pi.be>
-	* Spell initially created
-
diff --git a/gnome2-apps/memprof2/INSTALL b/gnome2-apps/memprof2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/memprof2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/memprof2/PRE_BUILD b/gnome2-apps/memprof2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/memprof2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/memprof2/TRIGGERS b/gnome2-apps/memprof2/TRIGGERS
deleted file mode 100755
index ef75f6a..0000000
--- a/gnome2-apps/memprof2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast memprof2 dispel_self
diff --git a/gnome2-apps/metatheme/BUILD b/gnome2-apps/metatheme/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/metatheme/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-apps/metatheme/DEPENDS b/gnome2-apps/metatheme/DEPENDS
deleted file mode 100755
index 3381b10..0000000
--- a/gnome2-apps/metatheme/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends control-center2
diff --git a/gnome2-apps/metatheme/DETAILS b/gnome2-apps/metatheme/DETAILS
deleted file mode 100755
index dbca9ef..0000000
--- a/gnome2-apps/metatheme/DETAILS
+++ /dev/null
@@ -1,25 +0,0 @@
-           SPELL=metatheme
-         VERSION=0.9.7
-	  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_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/$SPELL/$BRANCH/$SOURCE
-#          MD5[0]='e805b1b8ad4f87729a9c248a5397181b'
-        WEB_SITE=http://www.gnome.org
-      LICENSE[0]=LGPL
-         ENTERED=20020509
-         UPDATED=20040425
-        KEYWORDS="theme gnome2"
-           SHORT="metatheme manages theme sets for gtk, window manager, etc."
-cat << EOF
-This is metatheme, a way of managing theme sets that accomodate
-gtk, your window manager, etc etc.
-
-Basic Usage:
-        There is a capplet to select/apply themes.
-        To install a new theme (or one you've created):
-        * if it is a tarball untar into ~/.metathemes
-        * if it is a directory copy it into ~/.metathemes
-        Themes can also be installed in $prefix/share/metathemes
-EOF
diff --git a/gnome2-apps/metatheme/HISTORY b/gnome2-apps/metatheme/HISTORY
deleted file mode 100644
index f13fee2..0000000
--- a/gnome2-apps/metatheme/HISTORY
+++ /dev/null
@@ -1,18 +0,0 @@
-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
-
-2004-04-25 Robin Cook <rcook at wyrms.net>
-	* NOTE: prep for deprecation
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* Add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* URLs now match new ftp.gnome.org layout
-
-2002-05-17 Jon Svendsen <jon-sven at frisurf.no>
-	* Initial version of spell
-
diff --git a/gnome2-apps/metatheme/PRE_BUILD b/gnome2-apps/metatheme/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-apps/metatheme/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/clutter-gtk/DETAILS b/gnome2-libs/clutter-gtk/DETAILS
index bbb6006..82dfa1a 100755
--- a/gnome2-libs/clutter-gtk/DETAILS
+++ b/gnome2-libs/clutter-gtk/DETAILS
@@ -1,5 +1,5 @@
            SPELL=clutter-gtk
-         VERSION=0.10.6
+         VERSION=0.10.8
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://www.clutter-project.org/sources/${SPELL}/${VERSION:0:4}/${SOURCE}
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
diff --git a/gnome2-libs/clutter-gtk/HISTORY b/gnome2-libs/clutter-gtk/HISTORY
index 8c06b1a..19e1c6c 100644
--- a/gnome2-libs/clutter-gtk/HISTORY
+++ b/gnome2-libs/clutter-gtk/HISTORY
@@ -1,3 +1,6 @@
+2010-09-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.10.8
+
 2010-08-13 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.10.6
 
diff --git a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig b/gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig
deleted file mode 100644
index 2ca2124..0000000
Binary files a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.6.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig b/gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig
new file mode 100644
index 0000000..cd74a93
Binary files /dev/null and b/gnome2-libs/clutter-gtk/clutter-gtk-0.10.8.tar.bz2.sig differ
diff --git a/gnome2-libs/eel2/BUILD b/gnome2-libs/eel2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/eel2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/eel2/DETAILS b/gnome2-libs/eel2/DETAILS
deleted file mode 100755
index 7aede83..0000000
--- a/gnome2-libs/eel2/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-           SPELL=eel2
-         VERSION=2.26.0
-          BRANCH=`echo $VERSION|cut -d . -f 1,2`
-#          SOURCE=eel-$VERSION.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/eel-$VERSION
-#   SOURCE_URL[0]=$GNOME_URL/sources/eel/$BRANCH/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      LICENSE[0]=LGPL
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20020505
-        KEYWORDS="gnome2 libs"
-           SHORT="Eazel Extensions Library is widgets and functions for use with GNOME."
-cat << EOF
-The Eazel Extensions Library is a collection of widgets and extensions
-to many modules of the GNOME platform. These widgets and extensions 
-were developed by hackers working on Nautilus. For the duration of
-the Nautilus 1.0 development cycle, the code was internal to Nautilus
-and its components.
-EOF
diff --git a/gnome2-libs/eel2/HISTORY b/gnome2-libs/eel2/HISTORY
deleted file mode 100644
index cb04ff7..0000000
--- a/gnome2-libs/eel2/HISTORY
+++ /dev/null
@@ -1,283 +0,0 @@
-2010-04-06 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated not developed anymore, unused, doesn't compile,
-	  bug 15651
-
-2010-04-05 Vasil Yonkov <spirtbrat at sourcemage.org>
-	* DEPENDS: removed libglade2, libgnome, libgnomeui,
-	  startup-notification,
-	  added libgail-gnome
-
-2009-03-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.26.0
-
-2008-11-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.24.1
-
-2008-10-15 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: typo fix: startup_notification -> startup-notification
-
-2008-09-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.24.0
-	* DEPENDS: removed libart_lgpl, gnome-menus, and gnome-vfs2
-	  added optional on startup-notification
-
-2008-09-20 Elisamuel Resto <ryuji at sourcemage.org>
-	* DEPENDS: stop depending on gail, since gtk+2 provides it now
-
-2008-07-24 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.22.2
-
-2008-03-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.22.1
-
-2008-03-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.22.0
-
-2008-02-26 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.21.92
-
-2007-09-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.20.0
-
-2007-09-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.19.90
-
-2007-07-02 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.3
-
-2007-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.0.1
-
-2007-02-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.17.90
-
-2006-11-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.16.3
-
-2006-11-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.16.1
-
-2006-09-22 Juuso Alasuutari <iuso at sourcemage.org>
-	* DEPENDS: Added depends libart_lgpl, gnome-vfs2, libglade2, 
-	  libgnome, libxml2, gconf2, and glib2; removed depends 
-	  librsvg2.
-	* DETAILS: PATCHLEVEL++
-
-2006-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.16.0
-
-2006-08-30 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: Updated to 2.14.3
-
-2006-04-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.1
-
-2006-03-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.0
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-02-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.13.92
-
-2006-02-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.13.91
-
-2005-11-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.2
-
-2005-10-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.1
-
-2005-09-05 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.0
-
-2005-08-26 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.11.92
-
-2005-08-19 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: type fix ${SOURCE}.gpg -> ${SOURCE}.sig
-
-2005-08-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: corrected spelling error
-
-2005-08-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.11.91
-	  converted from MD5 to GPG
-
-2005-04-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.1
-	  updated MD5
-
-2005-03-19 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: added gnome-desktop
-
-2005-03-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.0
-	  updated MD5
-
-2005-03-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.9.92
-	  updated MD5
-
-2005-02-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.9.91
-	  updated MD5
-	* DEPENDS: added gnome-menus
-
-2005-02-08 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.9.90
-	  updated MD5
-	  removed BUILD_API
-
-2004-10-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.2
-	  updated MD5
-
-2004-10-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.1
-	  updated MD5
-
-2004-09-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.0
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.7.92
-	  updated MD5
-	* WIP: added
-
-2004-06-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.2
-	  updated MD5
-	  added BUILD_API=2
-
-2004-04-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.1
-	  updated MD5
-
-2004-03-22 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.0
-	  updated MD5
-
-2004-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.91.1
-	  updated MD5
-
-2004-03-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.90
-	  updated MD5
-
-2004-03-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.6
-	  updated MD5
-	  removed MAINTAINER
-
-2004-02-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.2
-	  updated MD5
-
-2003-10-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.1
-	  updated MD5
-
-2003-09-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.0
-	  updated MD5
-
-2003-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.3.90
-	  updated MD5
-
-2003-05-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.4
-	  updated MD5
-
-2003-04-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.3.1
-	  updated MD5
-
-2003-03-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.2
-	  updated MD5
-
-2003-02-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.1
-	  updated MD5
-
-2003-01-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.0.2
-	  updated MD5
-
-2003-01-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.0.1
-	  updated MD5
-
-2003-01-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.0
-	  updated MD5
-
-2003-01-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.91
-	  updated MD5
-
-2003-01-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.6
-	  updated MD5
-
-2002-12-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.5
-	  updated MD5
-
-2002-11-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.8
-	  updated MD5
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-09-14 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.7
-	  s/2.0.1/2.0.2 on URLs
-
-2002-08-30 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.6
-
-2002-08-27 Jon Svendsen <jon-sven at frisurf.no>
-	* BUILD: removed broken BUILD
-
-2002-08-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.5
-	* DETAILS: s/2.0.0/2.0.1 on URLs
-
-2002-08-16 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.4
-
-2002-08-06 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.3
-
-2002-07-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.2
-
-2002-07-23 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.1
-
-2002-06-11 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 2.0.0
-
-2002-06-04 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.1.17
-
-2002-05-27 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.1.6
-
-2002-05-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.1.5
-
-2002-05-17 Jon Svendsen <jon-sven at frisurf.no>
-	* Initial version of spell
-
diff --git a/gnome2-libs/eel2/INSTALL b/gnome2-libs/eel2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/eel2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/eel2/PRE_BUILD b/gnome2-libs/eel2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/eel2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/eel2/UP_TRIGGERS b/gnome2-libs/eel2/UP_TRIGGERS
deleted file mode 100755
index 206bba7..0000000
--- a/gnome2-libs/eel2/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger eel2 dispel_self
diff --git a/gnome2-libs/gail/BUILD b/gnome2-libs/gail/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/gail/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/gail/DEPENDS b/gnome2-libs/gail/DEPENDS
deleted file mode 100755
index a0e80ef..0000000
--- a/gnome2-libs/gail/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  gtk+2
diff --git a/gnome2-libs/gail/DETAILS b/gnome2-libs/gail/DETAILS
deleted file mode 100755
index 67f68d8..0000000
--- a/gnome2-libs/gail/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-           SPELL=gail
-         VERSION=1.22.3
-	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-      LICENSE[0]=LGPL
-      PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org/
-         ENTERED=20020505
-        KEYWORDS="gnome2 libs"
-           SHORT="gail has something to do with the GNOME A11y Project"
-cat << EOF
-gail has something to do with the GNOME Accessability Project. The
-website goes to great lengths to avoid revealing exactly what.
-EOF
diff --git a/gnome2-libs/gail/HISTORY b/gnome2-libs/gail/HISTORY
deleted file mode 100644
index b8f9bd8..0000000
--- a/gnome2-libs/gail/HISTORY
+++ /dev/null
@@ -1,195 +0,0 @@
-2008-09-07 Robin Cook <rcook at lackland.af.mil>
-	* Deprecated spell as it is now in gtk+2
-
-2008-07-01 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: updated spell to 1.22.3, added WEB_SITE
-
-2008-04-08 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: updated spell to 1.22.1, removed some dupe
-
-2008-03-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.22.0
-
-2008-02-26 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.21.5
-
-2007-11-26 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.20.2
-
-2007-10-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.20.1
-
-2007-09-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.20.0
-
-2007-09-15 Juuso Alasuutari <iuso at sourcemage.org>
-	* DEPENDS: Removed depends libgnomecanvas because it
-	  depends on gail, not vice versa.
-
-2007-09-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.19.6
-
-2007-03-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.18.0
-
-2007-02-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.17.0
-
-2007-01-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.9.4
-
-2006-10-03 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: Updated to 1.9.3
-
-2006-09-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.9.2
-
-2006-03-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.11
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-02-22 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.10
-
-2006-02-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.9
-
-2005-11-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.8
-
-2005-11-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.6
-
-2005-08-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.5
-	  converted MD5 to GPG
-
-2005-05-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: converted from MD5 to GPG
-	  removed BUILD_API
-	* DEPENDS: added gtk-doc as optional depends
-
-2005-05-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.4
-	  updated MD5
-
-2005-04-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.3
-	  updated MD5
-
-2005-01-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.2
-	  updated MD5
-
-2004-11-25 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.1
-	  updated MD5
-
-2004-09-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.8.0
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.7.0
-	  updated MD5
-	* WIP: added
-
-2004-08-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added BUILD_API=2
-
-2004-06-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.6.6
-	  updated MD5
-
-2004-05-26 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.6.5
-	  updated MD5
-
-2004-05-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.6.4
-	  updated MD5
-
-2004-04-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.6.3
-	  updated MD5
-
-2004-04-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.6.2
-	  updated MD5
-
-2004-04-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.6.1
-	  updated MD5
-
-2004-03-22 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.6.0
-	  updated MD5
-
-2004-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.5.8
-	  updated MD5
-
-2004-03-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.5.7
-	  updated MD5
-
-2004-03-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.5.6
-	  updated MD5
-	  removed MAINTAINER
-	* BUILD: removed to see of still needed
-
-2003-10-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.4.1
-	  updated MD5
-
-2003-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.4.0
-	  updated MD5
-
-2003-05-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.2.2
-	  updated MD5
-
-2003-04-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.2.1
-	  updated MD5
-
-2003-01-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.2.0
-	  updated MD5
-
-2003-01-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.1.7
-	  updated MD5
-
-2003-01-03 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.1.6
-	  updated MD5
-
-2002-12-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.1.5
-	  updated MD5
-
-2002-10-30 Eric Schabell <eschabell at sourcemage.org>
-	* BUILD: added build file, fixed bug#1493.
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-07-23 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 0.17
-
-2002-06-11 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 0.16
-
-2002-06-04 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 0.15
-
-2002-05-17 Jon Svendsen <jon-sven at frisurf.no>
-	* Initial version of spell
diff --git a/gnome2-libs/gail/INSTALL b/gnome2-libs/gail/INSTALL
deleted file mode 100755
index f32a580..0000000
--- a/gnome2-libs/gail/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/gnome2-libs/gail/PRE_BUILD b/gnome2-libs/gail/PRE_BUILD
deleted file mode 100755
index f32a580..0000000
--- a/gnome2-libs/gail/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/gnome2-libs/gail/TRIGGERS b/gnome2-libs/gail/TRIGGERS
deleted file mode 100755
index af87f47..0000000
--- a/gnome2-libs/gail/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gail dispel_self
\ No newline at end of file
diff --git a/gnome2-libs/gail/gail-1.22.3.tar.bz2.sig b/gnome2-libs/gail/gail-1.22.3.tar.bz2.sig
deleted file mode 100644
index 5cf73d7..0000000
Binary files a/gnome2-libs/gail/gail-1.22.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gal2/BUILD b/gnome2-libs/gal2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/gal2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/gal2/DETAILS b/gnome2-libs/gal2/DETAILS
deleted file mode 100755
index e2a18c0..0000000
--- a/gnome2-libs/gal2/DETAILS
+++ /dev/null
@@ -1,28 +0,0 @@
-           SPELL=gal2
-         VERSION=2.5.3
-	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-#          SOURCE=gal-$VERSION.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/gal-$VERSION
-#   SOURCE_URL[0]=$GNOME_URL/sources/gal/$BRANCH/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      LICENSE[0]=GPL
-      LICENSE[1]=LGPL
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20011009
-         UPDATED=20050605
-        KEYWORDS="gnome2 libs"
-           SHORT="Gnome 2.x Application Libraries"
-cat << EOF
-GAL are the Gnome Application Libraries"
-
-This module contains some library functions that came from Gnumeric and
-Evolution.  The idea is to reuse the code across various larger GNOME
-applications that might want to use it.  The API is not frozen and might
-change at any time.  Larger class renaming might happen at any point
-without notice. Use this library at your own risk.
-
-We envision some of this code being moved to Gtk+ or Gnome-Libs at
-some point, but not before 2.0, and certainly we don't know which ones
-yet.
-EOF
diff --git a/gnome2-libs/gal2/HISTORY b/gnome2-libs/gal2/HISTORY
deleted file mode 100644
index 0d6a025..0000000
--- a/gnome2-libs/gal2/HISTORY
+++ /dev/null
@@ -1,196 +0,0 @@
-2010-01-13 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated unused and doesn't compile
-
-2008-01-11 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Depends on libgnomeui
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-08-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.5.3
-	  converted from MD5 to GPG
-	* DEPENDS: added gtk-doc as optional depends
-	* BUILD: removed apply gcc 3.4 patch
-
-2005-06-05 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.3
-	  updated MD5
-
-2005-04-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.2
-	  updated MD5
-
-2005-04-07 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Removed MAKE_NJOBS=1
-	  Shortened SHORT
-	* BUILD: Run make_single before make and make_normal afterwards
-
-2005-03-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.4.1
-	  updated MD5
-
-2005-03-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.3.5
-	  updated MD5
-
-2005-02-08 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.3.4
-	  updated MD5
-	  removed BUILD_API
-	  removed MAINTAINER
-
-2004-12-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.4
-	  updated MD5
-
-2004-10-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.3
-	  updated MD5
-
-2004-09-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.2
-	  updated MD5
-
-2004-09-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.1
-	  updated MD5
-
-2004-09-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.0
-	  updated MD5
-
-2004-08-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.14
-	  updated MD5
-
-2004-08-03 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.13
-	  updated MD5
-
-2004-07-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.12
-	  updated MD5
-
-2004-07-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.11
-	  updated MD5
-
-2004-06-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.10
-	  updated MD5
-	  added BUILD_API=2
-	* BUILD: removed $C_FIFO
-
-2004-05-25 Unet <audio at sourcemage.org>
-	* BUILD, gcc-3.4.patch: added, fix compilation with gcc3.4
-
-2004-05-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.9
-	  updated MD5
-
-2004-04-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.8
-	  updated MD5
-
-2004-04-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.7
-	  updated MD5
-
-2004-03-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.6
-	  updated MD5
-	  removed MAINTAINER
-
-2003-09-29 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Ximian SOURCE_URL changed to non-beta
-
-2003-09-25 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.10
-	  updated MD5
-
-2003-08-02 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.9
-	  updated MD5
-
-2003-07-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.8
-	  updated MD5
-
-2003-06-19 Seth Woolley <seth at tautology.org>
-	* DETAILS: modified to fix md5 for SOURCE.
-
-2003-06-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: removed old MD5[0] from previous version
-
-2003-06-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.7
-	  updated MD5
-
-2003-05-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.6
-	  updated MD5
-
-2003-05-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.4
-	  updated MD5
-
-2003-04-17 Robin Cook <rcook at wyrms.net>
-	* CONFLICTS: removed CONFLICTS file
-
-2003-04-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.3
-	  updated MD5
-	* Updated to 1.99.3
-
-2003-04-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added MAKE_NJOBS=1
-
-2003-03-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.2
-	  updated MD5
-
-2003-02-04 Robin Cook <rcook at wyrms.net>
-	* NOTE: created gal and gal2
-	* CONFLICTS: added conflicts gal
-
-2003-01-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.99.1
-	  updated MD5
-	* CONFLICTS: added Conflict of gal2-0 as gal2-0 has been merged back into gal
-
-2002-12-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.22
-	  updated MD5
-
-2002-11-03 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.21
-	  updated MD5
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-07-23 Jon Svendsen <jon-sven at frisurf.no>
-	* DEPENDS: added depends gnome-print
-
-2002-07-16 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 1.99.3
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: added licensing information
-
-2002-05-14 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 0.19.2
-
-2002-03-16 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 0.19.1
-
-2002-03-12 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: added MAINTAINER=myself
-	  fixed backup url
-	  trimmed description
-	* HISTORY: added HISTORY
-
diff --git a/gnome2-libs/gal2/INSTALL b/gnome2-libs/gal2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/gal2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/gal2/PRE_BUILD b/gnome2-libs/gal2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/gal2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/gal2/UP_TRIGGERS b/gnome2-libs/gal2/UP_TRIGGERS
deleted file mode 100755
index d4d41e2..0000000
--- a/gnome2-libs/gal2/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger gal2 dispel_self
diff --git a/gnome2-libs/gconfmm/BUILD b/gnome2-libs/gconfmm/BUILD
new file mode 100755
index 0000000..23683fc
--- /dev/null
+++ b/gnome2-libs/gconfmm/BUILD
@@ -0,0 +1,2 @@
+OPTS="--disable-documentation $OPTS" &&
+default_build
diff --git a/gnome2-libs/gconfmm/HISTORY b/gnome2-libs/gconfmm/HISTORY
index 329cefe..c905525 100644
--- a/gnome2-libs/gconfmm/HISTORY
+++ b/gnome2-libs/gconfmm/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* BUILD: --disable-documentation to fix build error
+
 2010-06-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.28.2
 
diff --git a/gnome2-libs/gdk-pixbuf2/DEPENDS b/gnome2-libs/gdk-pixbuf2/DEPENDS
index 3954532..b182b29 100755
--- a/gnome2-libs/gdk-pixbuf2/DEPENDS
+++ b/gnome2-libs/gdk-pixbuf2/DEPENDS
@@ -2,5 +2,9 @@ depends  glib2   &&
 depends  libpng  &&
 depends  zlib    &&
 depends  jpeg    &&
-depends  tiff
+depends  tiff    &&
 
+optional_depends gobject-introspection \
+                 "--enable-introspection" \
+                 "--disable-introspection" \
+                 "enable gobject-introspection"
diff --git a/gnome2-libs/gdk-pixbuf2/DETAILS b/gnome2-libs/gdk-pixbuf2/DETAILS
index caabc69..0321dd5 100755
--- a/gnome2-libs/gdk-pixbuf2/DETAILS
+++ b/gnome2-libs/gdk-pixbuf2/DETAILS
@@ -1,11 +1,11 @@
            SPELL=gdk-pixbuf2
-         VERSION=2.21.6
+         VERSION=2.22.0
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=gdk-pixbuf-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdk-pixbuf-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/gdk-pixbuf/$BRANCH/$SOURCE
    SOURCE_URL[1]=ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/$BRANCH/$SOURCE
-     SOURCE_HASH=sha512:19576a8ba89ff8676d9a39351e7f28d7157cfed63c2b54029df3efc7a58e7b7a08123ad37a859c8000d82ba01f03c198a6d6a42b8f89d9ba5be74a2becf76d88
+     SOURCE_HASH=sha512:e7fe88d45f14281c68a16e4e51c04172013539d2720e9be18e4f8ca9d245777169a087e6d3da0c6bf1754d482279f92e629a6a76110e09168401660fd1f84632
       LICENSE[0]=GPL
       LICENSE[1]=LGPL
         WEB_SITE=http://www.gnome.org
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
index 5e2662f..7828d85 100644
--- a/gnome2-libs/gdk-pixbuf2/HISTORY
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -1,2 +1,8 @@
+2010-09-25 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 2.22.0
+
+2010-09-11 George Sherwood <gsherwood at sourcemage.org>
+	* DEPENDS: Added optional depends gobject_introspection
+
 2010-08-17 George Sherwood <gsherwood at sourcemage.org>
 	* ALL: Created new spell
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index d339343..c2ec993 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=glib2 
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.25.15
+         VERSION=2.25.17
           SOURCE=glib-$VERSION.tar.bz2
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 else
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 36f5902..15da539 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2010-09-25 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 2.25.17
+
 2010-09-06 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to version 2.25.15
 
diff --git a/gnome2-libs/glib2/glib-2.25.15.tar.bz2.sig b/gnome2-libs/glib2/glib-2.25.15.tar.bz2.sig
deleted file mode 100644
index e96cabc..0000000
Binary files a/gnome2-libs/glib2/glib-2.25.15.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/glib2/glib-2.25.17.tar.bz2.sig b/gnome2-libs/glib2/glib-2.25.17.tar.bz2.sig
new file mode 100644
index 0000000..a180d8f
Binary files /dev/null and b/gnome2-libs/glib2/glib-2.25.17.tar.bz2.sig differ
diff --git a/gnome2-libs/gobject-introspection/DETAILS b/gnome2-libs/gobject-introspection/DETAILS
index e62a279..0adbbac 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gobject-introspection
 if [[ $GOBJ_VER == devel ]]; then
-         VERSION=0.9.3
+         VERSION=0.9.9
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 else
          VERSION=0.6.14
diff --git a/gnome2-libs/gobject-introspection/HISTORY b/gnome2-libs/gobject-introspection/HISTORY
index 6e6f68d..5546968 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,9 @@
+2010-09-30 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 0.9.9
+
+2010-09-25 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 0.9.6
+
 2010-08-25 Peng Chang (Charles) <chp at sourcemage.org>
 	* PRE_BUILD: fix typo GOBJ_DEVEL -> GOBJ_VER
 
diff --git a/gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig
deleted file mode 100644
index da3f2f1..0000000
Binary files a/gnome2-libs/gobject-introspection/gobject-introspection-0.9.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/gobject-introspection/gobject-introspection-0.9.9.tar.bz2.sig b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.9.tar.bz2.sig
new file mode 100644
index 0000000..288d809
Binary files /dev/null and b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.9.tar.bz2.sig differ
diff --git a/gnome2-libs/goffice/DETAILS b/gnome2-libs/goffice/DETAILS
index 02daf3d..e8a59df 100755
--- a/gnome2-libs/goffice/DETAILS
+++ b/gnome2-libs/goffice/DETAILS
@@ -1,5 +1,5 @@
            SPELL=goffice
-         VERSION=0.8.10
+         VERSION=0.8.11
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index e3e082a..a5af17f 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.8.11
+
 2010-09-05 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.8.10
 
diff --git a/gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sig b/gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sig
deleted file mode 100644
index c40d3f8..0000000
Binary files a/gnome2-libs/goffice/goffice-0.8.10.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sig b/gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sig
new file mode 100644
index 0000000..a81f699
Binary files /dev/null and b/gnome2-libs/goffice/goffice-0.8.11.tar.bz2.sig differ
diff --git a/gnome2-libs/gtksourceview/DETAILS b/gnome2-libs/gtksourceview/DETAILS
index 07f8f09..207c19d 100755
--- a/gnome2-libs/gtksourceview/DETAILS
+++ b/gnome2-libs/gtksourceview/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=LGPL
-         WEBSITE=http://projects.gnome.org/gtksourceview/
+        WEB_SITE=http://projects.gnome.org/gtksourceview/
          ENTERED=20020505
         KEYWORDS="gnome2 libs"
            SHORT="Library needed by gedit2"
diff --git a/gnome2-libs/gtksourceview/HISTORY b/gnome2-libs/gtksourceview/HISTORY
index 2aa7ca8..ca70ddc 100644
--- a/gnome2-libs/gtksourceview/HISTORY
+++ b/gnome2-libs/gtksourceview/HISTORY
@@ -1,3 +1,6 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: changed WEBSITE -> WEB_SITE
+
 2010-06-20 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.10.4
 
diff --git a/gnome2-libs/gvfs/DETAILS b/gnome2-libs/gvfs/DETAILS
index 92c69de..e26a2e1 100755
--- a/gnome2-libs/gvfs/DETAILS
+++ b/gnome2-libs/gvfs/DETAILS
@@ -1,5 +1,6 @@
            SPELL=gvfs
          VERSION=1.6.3
+      PATCHLEVEL=1
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index a7f4960..f0bbab6 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,8 @@
+2010-09-18 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: added, to apply patch
+	* openssh56.patch: added, to fix a bug with openssh 5.6 release
+	  (gnome bug #629184)
+
 2010-07-13 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.6.3
 
diff --git a/gnome2-libs/gvfs/PRE_BUILD b/gnome2-libs/gvfs/PRE_BUILD
new file mode 100755
index 0000000..b7dd25a
--- /dev/null
+++ b/gnome2-libs/gvfs/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/openssh56.patch"
diff --git a/gnome2-libs/gvfs/openssh56.patch b/gnome2-libs/gvfs/openssh56.patch
new file mode 100644
index 0000000..d3a146e
--- /dev/null
+++ b/gnome2-libs/gvfs/openssh56.patch
@@ -0,0 +1,56 @@
+--- daemon/gvfsbackendsftp.c
++++ daemon/gvfsbackendsftp.c
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ 
+ #include <stdlib.h>
++#include <sys/poll.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+@@ -852,6 +853,9 @@ handle_login (GVfsBackend *backend,
+   const gchar *authtype = NULL;
+   gchar *object = NULL;
+   char *prompt;
++  /*
++   * TODO: compare this with sshfs.c where the prompt appears on stdin_fd
++   */
+   
+   if (op_backend->client_vendor == SFTP_VENDOR_SSH) 
+     prompt_fd = stderr_fd;
+@@ -864,14 +868,13 @@ handle_login (GVfsBackend *backend,
+   ret_val = TRUE;
+   while (1)
+     {
+-      FD_ZERO (&ifds);
+-      FD_SET (stdout_fd, &ifds);
+-      FD_SET (prompt_fd, &ifds);
+-      
+-      tv.tv_sec = SFTP_READ_TIMEOUT;
+-      tv.tv_usec = 0;
++      struct pollfd fds[2];
++      fds[0].fd = stdout_fd;
++      fds[0].events = POLLIN;
++      fds[1].fd = prompt_fd;
++      fds[1].events = POLLIN;
+       
+-      ret = select (MAX (stdout_fd, prompt_fd)+1, &ifds, NULL, NULL, &tv);
++      ret = poll(fds, 2, SFTP_READ_TIMEOUT);
+       
+       if (ret <= 0)
+         {
+@@ -882,11 +885,11 @@ handle_login (GVfsBackend *backend,
+           break;
+         }
+       
+-      if (FD_ISSET (stdout_fd, &ifds))
++      if (fds[0].revents)
+         break; /* Got reply to initial INIT request */
+       
+-      g_assert (FD_ISSET (prompt_fd, &ifds));
+-      
++      if (!(fds[1].revents & POLLIN))
++        continue;
+       
+       len = g_input_stream_read (prompt_stream,
+                                  buffer, sizeof (buffer) - 1,
diff --git a/gnome2-libs/libgee/DETAILS b/gnome2-libs/libgee/DETAILS
index 318367c..e609e83 100755
--- a/gnome2-libs/libgee/DETAILS
+++ b/gnome2-libs/libgee/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libgee
-         VERSION=0.5.0
+         VERSION=0.5.3
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/${SPELL}/0.5/${SOURCE}
-     SOURCE_HASH=sha512:6f6484da9b6d68ad52424c0a1f91cc5239a8d5e9817735cd358c34ff6967388855f1d91e9eac922f371a03abaca9eda8a7ee4f427bd2c0d28c48b3ff159c6c41
+     SOURCE_HASH=sha512:2771b9a87afb916b80c3b49736c84bb467a63ae370698d07de89ff8b4cfec092f77339b3e042e4c1d114c3cec071c516801da5fded0618cc4e9a6290aa1e5d7b
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://live.gnome.org/Libgee"
       LICENSE[0]="GPL"
diff --git a/gnome2-libs/libgee/HISTORY b/gnome2-libs/libgee/HISTORY
index e72d856..65e0699 100644
--- a/gnome2-libs/libgee/HISTORY
+++ b/gnome2-libs/libgee/HISTORY
@@ -1,3 +1,9 @@
+2010-09-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.5.3
+
+2010-09-11 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.5.2
+
 2010-08-21 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: depends glib2 vice glib
 
diff --git a/gnome2-libs/libgnomedb-dev/BUILD b/gnome2-libs/libgnomedb-dev/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/libgnomedb-dev/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/libgnomedb-dev/CONFLICTS b/gnome2-libs/libgnomedb-dev/CONFLICTS
deleted file mode 100755
index 7a44eba..0000000
--- a/gnome2-libs/libgnomedb-dev/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts libgnomedb y      &&
-conflicts libgnomedb-dev y  
diff --git a/gnome2-libs/libgnomedb-dev/DEPENDS b/gnome2-libs/libgnomedb-dev/DEPENDS
deleted file mode 100755
index baf9aa8..0000000
--- a/gnome2-libs/libgnomedb-dev/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends libgnomedb3
diff --git a/gnome2-libs/libgnomedb-dev/DETAILS b/gnome2-libs/libgnomedb-dev/DETAILS
deleted file mode 100755
index ed1acfb..0000000
--- a/gnome2-libs/libgnomedb-dev/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-           SPELL=libgnomedb-dev
-         VERSION=3.0.0
-          BRANCH=`echo $VERSION | cut -d . -f 1,2`
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/libgnomedb-$VERSION
-      LICENSE[0]="LGPL"
-      LICENSE[1]="GPL"
-        WEB_SITE=http://www.gnome-db.org
-      PATCHLEVEL=1
-         ENTERED=20020509
-        KEYWORDS="database gnome2 libs"
-           SHORT="a database widget library with data bound widgets and more."
-cat << EOF
-Libgnomedb: a database widget library with data bound widgets and more.
-Features:
-* Libgnomedb gives you a set of powerful widgets to show and edit data directly
-  in the database, you can also create new Data Sources and conect to your
-  preconfigured database server.
-* Libgnomedb is based in the GTK Object framework and allows you to create new
-  widgets that meets your needs using the flexibility of GObject.
-EOF
diff --git a/gnome2-libs/libgnomedb-dev/G_SCHEMAS b/gnome2-libs/libgnomedb-dev/G_SCHEMAS
deleted file mode 100644
index 43303ef..0000000
--- a/gnome2-libs/libgnomedb-dev/G_SCHEMAS
+++ /dev/null
@@ -1 +0,0 @@
-libgnomedb.schemas
diff --git a/gnome2-libs/libgnomedb-dev/HISTORY b/gnome2-libs/libgnomedb-dev/HISTORY
deleted file mode 100644
index a0284a6..0000000
--- a/gnome2-libs/libgnomedb-dev/HISTORY
+++ /dev/null
@@ -1,27 +0,0 @@
-2007-09-27 Eric Sandall <sandalle at sourcemage.org>
-	* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014
-
-2007-07-02 Robin Cook <rcook at wyrms.net>
-	* SPELL: deprecated in favor of libgnomedb3
-
-2007-05-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 3.0.0
-
-2007-03-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.99.6
-
-2007-03-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.99.5
-
-2007-02-02 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.99.3
-
-2006-11-04 Alexander Tsamutali <astsmtl at gmail.com>
-	* DETAILS: updated to 1.99.1, better description
-
-2006-10-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.9.103
-
-2006-10-09 Robin Cook <rcook at wyrms.net>
-	* Split from libgnomedb
-
diff --git a/gnome2-libs/libgnomedb-dev/INSTALL b/gnome2-libs/libgnomedb-dev/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/libgnomedb-dev/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/libgnomedb-dev/PRE_BUILD b/gnome2-libs/libgnomedb-dev/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/libgnomedb-dev/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/libgnomedb-dev/PROVIDES b/gnome2-libs/libgnomedb-dev/PROVIDES
deleted file mode 100755
index 402c26f..0000000
--- a/gnome2-libs/libgnomedb-dev/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-LIBGNOMEDB
diff --git a/gnome2-libs/libgnomedb-dev/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS b/gnome2-libs/libgnomedb-dev/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
deleted file mode 100755
index deb98f7..0000000
--- a/gnome2-libs/libgnomedb-dev/REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS
+++ /dev/null
@@ -1,15 +0,0 @@
-#---------------------------------------------------------------------
-## Replaces sorcerys default_pre-remove with a custom version
-#---------------------------------------------------------------------
-function default_pre_remove() {
-    debug "libapi" "$FUNCNAME - $*"
-    real_default_pre_remove "$@"
-    if [[ -f "${SCRIPT_DIRECTORY}/G_SCHEMAS" && -e "/usr/bin/gconftool-2" ]]; then
-       local G_FILE
-       export GCONF_CONFIG_SOURCE="xml:readwrite:${INSTALL_ROOT}/etc/gconf/gconf.xml.defaults"
-       for G_FILE in `cat ${SCRIPT_DIRECTORY}/G_SCHEMAS`
-       do
-          gconftool-2 --makefile-uninstall-rule "${INSTALL_ROOT}/etc/gconf/schemas/${G_FILE}" > /dev/null || true
-       done
-    fi
-}
diff --git a/gnome2-libs/libgnomedb-dev/TRIGGERS b/gnome2-libs/libgnomedb-dev/TRIGGERS
deleted file mode 100755
index fc707e7..0000000
--- a/gnome2-libs/libgnomedb-dev/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast libgnomedb-dev dispel_self
diff --git a/gnome2-libs/libgnomedb-dev/libgnomedb-3.0.0.tar.bz2.sig b/gnome2-libs/libgnomedb-dev/libgnomedb-3.0.0.tar.bz2.sig
deleted file mode 100644
index b476acb..0000000
Binary files a/gnome2-libs/libgnomedb-dev/libgnomedb-3.0.0.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libgsf/DETAILS b/gnome2-libs/libgsf/DETAILS
index 63a9e62..96f5c63 100755
--- a/gnome2-libs/libgsf/DETAILS
+++ b/gnome2-libs/libgsf/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libgsf
-         VERSION=1.14.18
+         VERSION=1.14.19
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/libgsf/HISTORY b/gnome2-libs/libgsf/HISTORY
index ebd378e..b7fec89 100644
--- a/gnome2-libs/libgsf/HISTORY
+++ b/gnome2-libs/libgsf/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.14.19
+
 2010-07-06 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added python dep
 
diff --git a/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig b/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig
deleted file mode 100644
index 3cbc843..0000000
Binary files a/gnome2-libs/libgsf/libgsf-1.14.18.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sig b/gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sig
new file mode 100644
index 0000000..a28d767
Binary files /dev/null and b/gnome2-libs/libgsf/libgsf-1.14.19.tar.bz2.sig differ
diff --git a/gnome2-libs/liboobs/DETAILS b/gnome2-libs/liboobs/DETAILS
index 38921e5..2b888bd 100755
--- a/gnome2-libs/liboobs/DETAILS
+++ b/gnome2-libs/liboobs/DETAILS
@@ -13,9 +13,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
            SHORT="System-tool-backends wrapping library"
 cat << EOF
 Liboobs is a wrapping library to the System Tools Backends, it will provide
-easy
-to access GObjects to system configuration details, like users, groups and
-network interfaces, it will handle sessions with the backend and data
-consistency
-too.
+easy to access GObjects to system configuration details, like users, groups
+and network interfaces, it will handle sessions with the backend and data
+consistency too.
 EOF
diff --git a/gnome2-libs/libwnck/DETAILS b/gnome2-libs/libwnck/DETAILS
index 28f37a4..2abf4e8 100755
--- a/gnome2-libs/libwnck/DETAILS
+++ b/gnome2-libs/libwnck/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libwnck
-         VERSION=2.30.3
+         VERSION=2.30.4
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/libwnck/HISTORY b/gnome2-libs/libwnck/HISTORY
index a331c73..63ce338 100644
--- a/gnome2-libs/libwnck/HISTORY
+++ b/gnome2-libs/libwnck/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILL: 2.30.4
+
 2010-08-04 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILL: 2.30.3
 
diff --git a/gnome2-libs/libwnck/libwnck-2.30.3.tar.bz2.sig b/gnome2-libs/libwnck/libwnck-2.30.3.tar.bz2.sig
deleted file mode 100644
index 1734a51..0000000
Binary files a/gnome2-libs/libwnck/libwnck-2.30.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/libwnck/libwnck-2.30.4.tar.bz2.sig b/gnome2-libs/libwnck/libwnck-2.30.4.tar.bz2.sig
new file mode 100644
index 0000000..4ac9cdf
Binary files /dev/null and b/gnome2-libs/libwnck/libwnck-2.30.4.tar.bz2.sig differ
diff --git a/gnome2-libs/metacity/DETAILS b/gnome2-libs/metacity/DETAILS
index 3db5b33..64de3c9 100755
--- a/gnome2-libs/metacity/DETAILS
+++ b/gnome2-libs/metacity/DETAILS
@@ -1,5 +1,5 @@
            SPELL=metacity
-         VERSION=2.30.1
+         VERSION=2.30.2
           BRANCH=`echo $VERSION|cut -d . -f 1,2` 
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/metacity/HISTORY b/gnome2-libs/metacity/HISTORY
index 322cf00..a8109da 100644
--- a/gnome2-libs/metacity/HISTORY
+++ b/gnome2-libs/metacity/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.30.2
+
 2010-04-11 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.30.1
 
diff --git a/gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig b/gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig
deleted file mode 100644
index ac40f1a..0000000
Binary files a/gnome2-libs/metacity/metacity-2.30.1.tar.gz.sig and /dev/null differ
diff --git a/gnome2-libs/metacity/metacity-2.30.2.tar.gz.sig b/gnome2-libs/metacity/metacity-2.30.2.tar.gz.sig
new file mode 100644
index 0000000..a128131
Binary files /dev/null and b/gnome2-libs/metacity/metacity-2.30.2.tar.gz.sig differ
diff --git a/gnome2-libs/nautilus-cd-burner/BUILD b/gnome2-libs/nautilus-cd-burner/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/nautilus-cd-burner/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/nautilus-cd-burner/DEPENDS b/gnome2-libs/nautilus-cd-burner/DEPENDS
deleted file mode 100755
index 66a38ff..0000000
--- a/gnome2-libs/nautilus-cd-burner/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends brasero
diff --git a/gnome2-libs/nautilus-cd-burner/DETAILS b/gnome2-libs/nautilus-cd-burner/DETAILS
deleted file mode 100755
index 85f8ee0..0000000
--- a/gnome2-libs/nautilus-cd-burner/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-           SPELL=nautilus-cd-burner
-         VERSION=2.24.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
-      LICENSE[1]=LGPL
-PATCHLEVEL=1
-        WEB_SITE=http://developer.gnome.org
-         ENTERED=20020509
-        KEYWORDS="gnome2 libs"
-           SHORT="nautilus-cd-burner is an extension to Nautilus"
-cat << EOF
-Nautilus-cd-burner is an extension to Nautilus that makes it easy to
-write files to a CD burner.
-EOF
diff --git a/gnome2-libs/nautilus-cd-burner/HISTORY b/gnome2-libs/nautilus-cd-burner/HISTORY
deleted file mode 100644
index 1a286ed..0000000
--- a/gnome2-libs/nautilus-cd-burner/HISTORY
+++ /dev/null
@@ -1,248 +0,0 @@
-2010-04-06 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of brasero
-
-2008-10-03 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: removed gnome-vfs2 
-	  added explicit gnome depends
-
-2008-09-29 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.24.0
-	* G_SCHEMAS: updated to new name
-
-2008-04-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.22.1
-
-2008-03-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.22.0
-
-2008-02-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.21.6
-
-2007-09-27 Eric Sandall <sandalle at sourcemage.org>
-	* REPAIR^f28a3645c12b689590aaf423d217e22e^FUNCTIONS: Fix Bug #14014
-
-2007-09-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.20.0
-
-2007-09-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.19.6
-
-2007-05-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.2
-
-2007-04-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.1
-
-2007-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.18.0
-
-2007-03-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.17.8
-
-2007-02-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.17.7
-
-2007-02-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.16.3
-
-2006-10-03 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: Updated to 2.16.1
-
-2006-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.16.0
-
-2006-08-30 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: Updated to 2.14.3
-
-2006-08-15 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED (deprecated in favor of 
-	  PATCHLEVEL).
-
-2006-06-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* UP_TRIGGERS: replaced fast_up_depends with show_up_depends, bug #12665
-
-2006-05-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.2
-
-2006-05-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added PATCHLEVEL
-	* G_SCHEMAS: added
-
-2006-04-28 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* UP_TRIGGERS: replaced 'gaze depends' call with
-	  fast_up_depends, bug #10661
-
-2006-04-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.1
-
-2006-03-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.0.2
-
-2006-03-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.14.0.1
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-03-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.13.92
-
-2006-02-28 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* UP_TRIGGERS: added because of libnautilus-burn so-version change
-
-2006-02-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.13.90
-
-2006-02-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.3
-
-2005-11-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.2
-
-2005-10-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.1
-
-2005-09-06 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.0
-
-2005-08-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.11.7
-
-2005-08-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.11.6
-	  converted MD5 to GPG
-
-2005-08-03 David Brown <dmlb2000 at gmail.com>
-	* BUILD: added to export PKG_CONFIG var so it won't compilain about not
-	  finding it.
-
-2005-06-26 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.2
-	  updated MD5
-
-2005-04-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.1
-	  updated MD5
-
-2005-03-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.10.0
-	  updated MD5
-
-2005-03-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.9.7
-	  updated MD5
-
-2005-02-08 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.9.6
-	  updated MD5
-	  remove BUILD_API
-
-2004-12-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.6
-	  updated MD5
-
-2004-11-03 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.5
-	  updated MD5
-
-2004-10-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.4
-	  updated MD5
-
-2004-09-22 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.3
-	  updated MD5
-
-2004-09-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.2
-	  updated MD5
-	* DEPENDS: added optional on hal
-
-2004-09-17 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.1
-	  updated MD5
-
-2004-09-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.8.0
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.7.6
-	  updated MD5
-	  added BUILD_API=2
-	* WIP: added
-
-2004-04-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.1
-	  updated MD5
-
-2004-03-22 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.6.0
-	  updated MD5
-
-2004-03-16 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.6.7
-	  updated MD5
-
-2004-03-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.6.6
-	  updated MD5
-
-2004-03-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.6.5
-	  updated MD5
-	  removed MAINTAINER
-
-2003-11-02 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: changed requires to depends
-	* HISTORY: formatted to Guru Handbook
-
-2003-09-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.5.3
-	  updated MD5
-
-2003-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.5.2
-	  updated MD5
-
-2003-05-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.4.3
-	  updated MD5
-
-2003-05-24 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.4.2
-	  updated MD5
-
-2003-05-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.4.1
-	  updated MD5
-
-2003-04-10 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: changed depends cdrtools to requires cd-burn-utility
-
-2003-04-05 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: changed cdrutils to cdrtools in DEPENDS
-
-2003-04-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.4.0
-	  updated MD5
-
-2003-01-29 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.3.2
-	  updated MD5
-
-2003-01-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.3.1
-	  updated MD5
-
-2003-01-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.3
-	  updated MD5
-
-2002-12-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.2 
-	  updated MD5
-
-2002-12-07 Robin Cook <rcook at wyrms.net>
-	* Initial version of spell
-
diff --git a/gnome2-libs/nautilus-cd-burner/INSTALL b/gnome2-libs/nautilus-cd-burner/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/nautilus-cd-burner/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/nautilus-cd-burner/PRE_BUILD b/gnome2-libs/nautilus-cd-burner/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/nautilus-cd-burner/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS b/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
deleted file mode 100755
index 4a0a628..0000000
--- a/gnome2-libs/nautilus-cd-burner/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger nautilus-cd-burner dispel_self
diff --git a/gnome2-libs/nautilus-media/BUILD b/gnome2-libs/nautilus-media/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/nautilus-media/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/nautilus-media/DETAILS b/gnome2-libs/nautilus-media/DETAILS
deleted file mode 100755
index 01521ac..0000000
--- a/gnome2-libs/nautilus-media/DETAILS
+++ /dev/null
@@ -1,61 +0,0 @@
-           SPELL=nautilus-media
-         VERSION=0.8.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_HASH=sha512:460377f44602a6a2566456db337e46e99bc6948f895873c0e0b9822cdf910b2cc20ada1d04e461d2a242d377c8516611ef7abdbba6ed983e5feb37f24056ca81
-      LICENSE[0]=GPL
-      LICENSE[1]=LGPL
-PATCHLEVEL=1
-        WEB_SITE=http://developer.gnome.org
-         ENTERED=20020509
-         UPDATED=20040913
-        KEYWORDS="gnome2 libs"
-           SHORT="Media extension to Nautilus 2.2"
-cat << EOF
-WHAT THIS IS
-------------
-                                                                                
-Media goodies for Nautilus
-                                                                                
-- audio view            displays directory as audio tracks, plays them
-- audio properties view a property page for audio files, used in nautilus
-- gst-thumbnail         thumbnails videos for nautilus
-                                                                                
-Educational stuff for writing Nautilus views
-- test view             a test view to learn from
-                                                                                
-AUDIO VIEW
-----------
-- the audio view plays tracks using GStreamer.
-- it currently plays wav, ogg, mp3 and flac (if your gnome-vfs is current)
-- seeking should work
-- if you want to help test, do the following things (in audio-view):
-  - start by trying audio-play-test (my music file)
-    and see if it can play the file and prints out lots of stuff
-  - if that works, try the gnome-test app.  Run
-    ./gnome-test (dir with music files)
-    and see if it recognizes them and plays them as well.
-  - if that works, you can try the bonobo-test app.  Run it in the same way.
-    For it to work, the server file needs to be installed to your bonobo
-    servers dir (\$(prefix)/lib/bonobo/servers) and the nautilus-audio-view
-    should be installed to \$(prefix)/libexec.
-    (If you ran configure with the same prefix as nautilus and bonobo, this
-     should just work).  If this test app works, is able to bring up the
-     component, and it plays, then on to the final step.
-  - in nautilus, go to a dir containing audio files, and choose View as...
-    next to the location bar.  Then from the menu, choose "View as Audio"
-    and see if it works.
-                                                                                
-I appreciate any and all bug reports, with a mention of which of these four
-did work and which didn't, and possibly a link to the problematic audio files,
-so I can fix this and help you further.
-                                                                                
-THUMBNAILER
------------
-* to use the thumbnailer:
-  - you need nautilus >= 2.1
-  - you need to install the GConf schema that tells nautilus how to thumbnail.
-    (the old method, ~/.gnome2/thumbnailrc, is gone)
-EOF
diff --git a/gnome2-libs/nautilus-media/HISTORY b/gnome2-libs/nautilus-media/HISTORY
deleted file mode 100644
index 4ef521f..0000000
--- a/gnome2-libs/nautilus-media/HISTORY
+++ /dev/null
@@ -1,72 +0,0 @@
-2009-01-22 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated because it does not compile anymore due to API changes
-
-2006-05-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: removed BULID_API
-
-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
-
-2004-09-13 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.8.1
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added BUILD_API=2
-
-2004-03-31 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.8.0
-	  updated MD5
-	* DEPENDS: changed gst-plugins-0.6 to gst-plugins
-
-2004-03-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.7.0
-	  updated MD5
-
-2004-03-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.5.3
-	  updated MD5
-	  removed MAINTAINER
-
-2004-02-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.3.4
-	  updated MD5
-
-2003-09-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.3.3.1
-	  updated MD5
-
-2003-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.3.3
-	  updated MD5
-
-2003-06-09 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.2.2
-	  updated MD5
-
-2003-03-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: fixed long discription $(prefix)'s Bug 2767
-
-2003-02-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.2.1
-	  updated MD5
-
-2003-01-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.2.0
-	  fixed descriptions
-	  updated MD5
-
-2003-01-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.1.2
-	  updated MD5
-
-2002-12-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: update VERSION to 0.1.0
-	  updated MD5
-
-2002-12-03 Robin Cook <rcook at wyrms.net>
-	* Initial version of spell
-
diff --git a/gnome2-libs/nautilus-media/INSTALL b/gnome2-libs/nautilus-media/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/nautilus-media/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/nautilus-media/PRE_BUILD b/gnome2-libs/nautilus-media/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/nautilus-media/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/nautilus-media/TRIGGERS b/gnome2-libs/nautilus-media/TRIGGERS
deleted file mode 100755
index abb919e..0000000
--- a/gnome2-libs/nautilus-media/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast nautilus-media dispel_self
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index 54769c1..1513b4b 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pango
-         VERSION=1.28.1
+         VERSION=1.28.2
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 91c6162..6c0c31c 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2010-09-28 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.28.2
+
 2010-06-23 Mark Bainter <mbainter at sourcemage.org>
 	* PRE_SUB_DEPENDS,SUB_DEPENDS: Add subdepends support for x11
 	* CONFIGURE: Remove x11 query in favor of depends entry
diff --git a/gnome2-libs/pango/pango-1.28.1.tar.bz2.sig b/gnome2-libs/pango/pango-1.28.1.tar.bz2.sig
deleted file mode 100644
index ee588ce..0000000
Binary files a/gnome2-libs/pango/pango-1.28.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/pango/pango-1.28.2.tar.bz2.sig b/gnome2-libs/pango/pango-1.28.2.tar.bz2.sig
new file mode 100644
index 0000000..22b8706
Binary files /dev/null and b/gnome2-libs/pango/pango-1.28.2.tar.bz2.sig differ
diff --git a/gnome2-libs/profile-gnome2-desktop/BUILD b/gnome2-libs/profile-gnome2-desktop/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/profile-gnome2-desktop/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/profile-gnome2-desktop/DETAILS b/gnome2-libs/profile-gnome2-desktop/DETAILS
deleted file mode 100755
index df82694..0000000
--- a/gnome2-libs/profile-gnome2-desktop/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-           SPELL=profile-gnome2-desktop
-         VERSION=2.14.0
-PATCHLEVEL=1
-        WEB_SITE=http://www.gnome.org/start/2.0
-         ENTERED=20050208
-         UPDATED=20050907
-        KEYWORDS="gnome2 libs"
-           SHORT="Cast this to install GNOME2 desktop"
-cat << EOF
-Cast this spell to install GNOME2 base desktop
-
-GNOME is the GNU Network Object Model Environment. 
-This project is building a complete, user-friendly 
-desktop based entirely on free software.  This desktop 
-consists of small utilities and larger applications that 
-share a consistent look and feel.  It uses the GTK as
-the GUI toolkit for all GNOME-compliant applications.
-EOF
diff --git a/gnome2-libs/profile-gnome2-desktop/HISTORY b/gnome2-libs/profile-gnome2-desktop/HISTORY
deleted file mode 100644
index 434873d..0000000
--- a/gnome2-libs/profile-gnome2-desktop/HISTORY
+++ /dev/null
@@ -1,36 +0,0 @@
-2010-04-06 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated unmaintained profile spell
-
-2009-04-14 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Removed deprecated gal2
-	  Avoids Bug #15170
-
-2009-01-03 George Sherwood <gsherwood at sourcemage.org>
-	* DEPENDS: ekiga now depends on ptlib vice pwlib
-
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: changed evolution2 to evolution, gedit2 to gedit
-
-2006-05-07 Robin Cook <rcook at wyrms.net>
-	* PREPARE: removed, no longer needed with sub_depends
-
-2006-04-08 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: removed gnomemeeting bug 10760
-
-2006-03-20 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated to 2.14.0
-	* DEPENDS: added 2.14.0 depends
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-12-03 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: gstreamer -> gstreamer-0.8
-
-2005-09-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.12.0
-	* DEPENDS: updated to 2.12.0 DESKTOP
-
-2005-07-15 Robin Cook <rcook at wyrms.net>
-	* Initial Spell
-
diff --git a/gnome2-libs/profile-gnome2-desktop/INSTALL b/gnome2-libs/profile-gnome2-desktop/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/profile-gnome2-desktop/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/profile-gnome2-desktop/PRE_BUILD b/gnome2-libs/profile-gnome2-desktop/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/profile-gnome2-desktop/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS b/gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS
deleted file mode 100755
index 9e5e09a..0000000
--- a/gnome2-libs/profile-gnome2-desktop/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger profile-gnome2-desktop dispel_self
diff --git a/gnome2-libs/pygtksourceview/DEPENDS b/gnome2-libs/pygtksourceview/DEPENDS
index e9fa6b8..ee9370f 100755
--- a/gnome2-libs/pygtksourceview/DEPENDS
+++ b/gnome2-libs/pygtksourceview/DEPENDS
@@ -1,3 +1,4 @@
+depends python        &&
 depends pygtk2        &&
 depends pygobject     &&
 depends libxslt       &&
diff --git a/gnome2-libs/pygtksourceview/HISTORY b/gnome2-libs/pygtksourceview/HISTORY
index 83188c3..50ebed7 100644
--- a/gnome2-libs/pygtksourceview/HISTORY
+++ b/gnome2-libs/pygtksourceview/HISTORY
@@ -1,3 +1,6 @@
+2010-09-17 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: add explicit depends python 
+
 2010-04-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.10.1
 
diff --git a/gnome2-libs/sawfish2/BUILD b/gnome2-libs/sawfish2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/sawfish2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/sawfish2/DEPENDS b/gnome2-libs/sawfish2/DEPENDS
deleted file mode 100755
index 34747e8..0000000
--- a/gnome2-libs/sawfish2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends sawfish
diff --git a/gnome2-libs/sawfish2/DETAILS b/gnome2-libs/sawfish2/DETAILS
deleted file mode 100755
index 703e3a2..0000000
--- a/gnome2-libs/sawfish2/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-           SPELL=sawfish2
-         VERSION=deprecated
-      LICENSE[0]=GPL
-         ENTERED=20020510
-        KEYWORDS="gnome2 libs"
-           SHORT="Extensible window manager"
-      PATCHLEVEL=1
-cat << EOF
-Sawfish is an extensible window manager using a Lisp-based scripting 
-language --all window decorations are configurable and all user-interface 
-policy is controlled through the extension language. This is no layer 
-on top of twm, but a wholly new architecture.
-
-Despite this extensibility its policy is very minimal compared to most 
-window managers. Its aim is simply to manage windows in the most
-flexible and attractive manner possible. As such it does not implement
-desktop backgrounds, applications docks, or other things that may be achieved 
-through separate applications.
-
-This is the GTK+/GNOME 2.0 version of sawfish
-EOF
diff --git a/gnome2-libs/sawfish2/HISTORY b/gnome2-libs/sawfish2/HISTORY
deleted file mode 100644
index f1cf8e2..0000000
--- a/gnome2-libs/sawfish2/HISTORY
+++ /dev/null
@@ -1,76 +0,0 @@
-2009-12-18 Arjan Bouter <abouter at sourcemage.org>
-	* deprecated spell in favour of sawfish
-
-2007-07-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.3.1
-	  removed CVS option
-	* DEPENDS: added imlib
-	  made audiofile optional
-	  added optional on esound
-	* PREPARE: removed 
-	* PRE_BUILD: changed to always run autogen.sh
-	* CONFIGURE: added
-	* BUILD: changed to just check for options
-	  added make_single
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-05-21 Robin Cook <rcook at wyrms.net>
-	DETAILS: really remove BULID_API
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-12-30 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added cvs option code
-	  converted SOURCEHASH to SOURCE_GPG
-	  removed BUILD_API
-	* PREARE: added for cvs query
-	* PRE_BUILD: added for cvs option
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-04-07 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Removed MAKE_NJOBS=1
-	  Shortened SHORT
-	* BUILD: Run make_single before make and make_normal afterwards
-
-2005-01-15 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added BUILD_API=2
-	* BUILD: added missing &&
-
-2004-02-22 Robin Cook <rcook at wyrms.net>
-	* DEPENDS: added audiofile
-
-2003-03-24 Robin Cook <rcook at wyrms.net>
-	* DETAILS: Updated to 1.3
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: add MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-09-05 Jon Svendsen <jon-sven at frisurf.no>
-	* CONFLICTS: removed autotools conflicts
-
-2002-08-29 Jon Svendsen <jon-sven at frisurf.no>
-	* CONFLICTS: autoconf/automake, hopefully fixes #765
-
-2002-08-27 Jon Svendsen <jon-sven at frisurf.no>
-	* BUILD: removed broken option from BUILD
-
-2002-06-22 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated to 2.0
-
-2002-06-11 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated to 2002-06-11
-
-2002-05-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated to 2002-05-24
-
-2002-05-17 Jon Svendsen <jon-sven at frisurf.no>
-	* Initial version of spell
-
diff --git a/gnome2-libs/sawfish2/INSTALL b/gnome2-libs/sawfish2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/sawfish2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/sawfish2/PRE_BUILD b/gnome2-libs/sawfish2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/sawfish2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/sawfish2/TRIGGERS b/gnome2-libs/sawfish2/TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/gnome2-libs/sawfish2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/gnome2-libs/scrollkeeper/BUILD b/gnome2-libs/scrollkeeper/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/scrollkeeper/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/scrollkeeper/DEPENDS b/gnome2-libs/scrollkeeper/DEPENDS
deleted file mode 100755
index fc72265..0000000
--- a/gnome2-libs/scrollkeeper/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends rarian
diff --git a/gnome2-libs/scrollkeeper/DETAILS b/gnome2-libs/scrollkeeper/DETAILS
deleted file mode 100755
index 13554d4..0000000
--- a/gnome2-libs/scrollkeeper/DETAILS
+++ /dev/null
@@ -1,23 +0,0 @@
-           SPELL=scrollkeeper
-         VERSION=0.3.14
-	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-#          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-#   SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-      PATCHLEVEL=1
-      LICENSE[0]=LGPL
-      LICENSE[1]=FDL
-        WEB_SITE=http://scrollkeeper.sourceforge.net
-         ENTERED=20010922
-         UPDATED=20031207
-        KEYWORDS="gnome2 libs"
-           SHORT="scrollkeeper is a cataloging system."
-cat << EOF
-This is the Scrollkeeper Open Documentation Cataloging System. 
-The following modules are included:
-Scrollkeeper_cl, the Content List handling system in the cl subdir.
-Scrollkeeper_toc, the Table Of Contents extraction utility from DocBook
-files in the toc subdir.
-EOF
diff --git a/gnome2-libs/scrollkeeper/HISTORY b/gnome2-libs/scrollkeeper/HISTORY
deleted file mode 100644
index 6e6bb99..0000000
--- a/gnome2-libs/scrollkeeper/HISTORY
+++ /dev/null
@@ -1,91 +0,0 @@
-2007-09-07 Robin Cook <rcook at wyrms.net>
-	* DEPRECATED: replaced by rarian
-
-2007-03-03 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* DETAILS: updated the signature #12941
-
-2006-10-24 David Brown <dmlb2000 at gmail.com>
-	* DETAILS: removed staged install flag
-
-2006-07-06 Thomas Orgis <sobukus at sourcemage.org>
-	* DETAILS: deactivated stage root, waiting for real fix
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-10-24 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Added optional dependency on gettext
-
-2005-08-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: converted MD5 to GPG
-	  removed BUILD_API
-
-2005-04-07 Sergey Lipnevich <sergey at sourcemage.org>
-	* DEPENDS: use new xml-parser-expat spell name.
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added BUILD_API=2
-
-2004-03-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: removed MAINTAINER
-
-2004-02-08 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BUILD: removed, breaks the compile now docbook-dtd installs
-	  both 4.1.2 and 4.2 (bug #5710)
-
-2003-12-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.3.14 and MD5 updated
-	* DEPENDS: added XML-Parser-Expat as depends
-
-2003-01-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 0.3.12 and MD5 updated
-	* BUILD: removed scrollkeeper-security.patch
-	  removed the added Include path
-
-2002-11-07 Robin Cook <rcook at wyrms.net>
-	* BUILD: added work around for the docbook 4.1.2 problem
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added MD5
-
-2002-09-20 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: URLs now match new ftp.gnome.org layout
-
-2002-09-04 Jon Svendsen <jon-sven at frisurf.no>
-	* BUILD: Patch against security issue reported in bug 838
-
-2002-07-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 0.3.11
-
-2002-06-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: use $SOURCEFORGE_URL
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: added licensing information
-
-2002-06-16 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: updated VERSION to 0.3.9 
-	  Reintroduced gnome.org as backup download location.
-
-2002-05-26 Jon Svendsen <jon-sven at frisurf.no>
-	* DEPENDS: Much cleaning up of dependencies
-	* DETAILS: Updated VERSION to 0.3.8
-	  Using sourceforge download location (gnome.org has only 0.3.6)
-
-2002-05-19 Jon Svendsen <jon-sven at frisurf.no>
-	* DEPENDS: removed dependancy on xml-i18n-tools
-
-2002-04-07 Jon Svendsen <jon-sve at frisurf.no>
-	* DETAILS: updated to 0.3.6 too see if it works better
-	* DEPENDS: changed depends from docbook-dtd to docbook-xsl
-
-2002-03-30 Jon Svendsen <jon-sven at frisurf.no>
-	* BUILD: Worked around libxml2 include path problem
-	* DEPENDS: removed incorrect dependency on libxml
-
-2002-03-14 Jon Svendsen <jon-sven at frisurf.no>
-	* HISTORY: Added HISTORY
-	* DETAILS: Added MAINTAINER=me
-	  fixed backup url
-	* DEPENDS: FIXME: depends are A MESS, clean up
-
diff --git a/gnome2-libs/scrollkeeper/INSTALL b/gnome2-libs/scrollkeeper/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/scrollkeeper/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/scrollkeeper/PRE_BUILD b/gnome2-libs/scrollkeeper/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/scrollkeeper/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/scrollkeeper/TRIGGER b/gnome2-libs/scrollkeeper/TRIGGER
deleted file mode 100755
index b005d8e..0000000
--- a/gnome2-libs/scrollkeeper/TRIGGER
+++ /dev/null
@@ -1 +0,0 @@
-on_cast scrollkeeper dispel_self
diff --git a/gnome2-libs/scrollkeeper/scrollkeeper-0.3.14.tar.gz.sig b/gnome2-libs/scrollkeeper/scrollkeeper-0.3.14.tar.gz.sig
deleted file mode 100644
index 6dd2843..0000000
Binary files a/gnome2-libs/scrollkeeper/scrollkeeper-0.3.14.tar.gz.sig and /dev/null differ
diff --git a/gnome2-libs/ximian-connector/BUILD b/gnome2-libs/ximian-connector/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/ximian-connector/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/ximian-connector/DEPENDS b/gnome2-libs/ximian-connector/DEPENDS
deleted file mode 100755
index c0f4839..0000000
--- a/gnome2-libs/ximian-connector/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends evolution-exchange
diff --git a/gnome2-libs/ximian-connector/DETAILS b/gnome2-libs/ximian-connector/DETAILS
deleted file mode 100755
index 60f4962..0000000
--- a/gnome2-libs/ximian-connector/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-	   SPELL=ximian-connector
-         VERSION=2.2.3
-          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_HASH=sha512:8d811611bc12d60c4568f22e3eff36e44101324fe8f562ee3380a07269d7bc7abc97b7b86da888e5f5a64daa40242f847d026b9941f95d2f4a960fb895a69a05
-      LICENSE[0]=GPL
-      LICENSE[1]=FDL
-        WEB_SITE=http://developer.ximian.com
-         ENTERED=20040904
-         UPDATED=20050605
- KEYWORDS="evolution gnome2 libs"
-PATCHLEVEL=1
-           SHORT="Evolution to Exchange connector. Deprecated!" 
-cat << EOF
-Please use evolution-exchange instead.
-EOF
diff --git a/gnome2-libs/ximian-connector/HISTORY b/gnome2-libs/ximian-connector/HISTORY
deleted file mode 100644
index 44e70d4..0000000
--- a/gnome2-libs/ximian-connector/HISTORY
+++ /dev/null
@@ -1,58 +0,0 @@
-2008-08-19 Thomas Orgis <sobukus at sourcemage.org>
-	* DETAILS, DEPENDS, TRIGGERS, BUILD, PRE_BUILD, INSTALL:
-	  deprecated, evolution-exchange is to be used nowadays.
-
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: changed evolution2 to evolution
-
-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
-
-2005-06-05 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.3
-	  updated MD5
-
-2005-04-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.2
-	  updated MD5
-
-2005-04-07 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Removed MAKE_NJOBS=1
-	* BUILD: Run make_single before make and make_normal afterwards
-
-2005-03-18 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.2.1
-	  updated MD5
-
-2005-03-01 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.6
-	  updated MD5
-
-2005-02-08 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.1.5
-	  updated MD5
-	  remove BUILD_API
-
-2004-12-07 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.3
-	  updated MD5
-
-2004-10-12 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.2
-	  updated MD5
-	* HISTORY: added missing &&
-
-2004-09-28 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.1
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.0
-	  updated MD5
-
-2004-09-04 Robin Cook <rcook at wyrms.net>
-	* Initial spell version 1/5/94/1
-
diff --git a/gnome2-libs/ximian-connector/INSTALL b/gnome2-libs/ximian-connector/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/ximian-connector/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/ximian-connector/PRE_BUILD b/gnome2-libs/ximian-connector/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnome2-libs/ximian-connector/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnome2-libs/ximian-connector/TRIGGERS b/gnome2-libs/ximian-connector/TRIGGERS
deleted file mode 100755
index 301d723..0000000
--- a/gnome2-libs/ximian-connector/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast ximian-connector dispel_self
diff --git a/gnustep-libs/gnustep-back-art/BUILD b/gnustep-libs/gnustep-back-art/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnustep-libs/gnustep-back-art/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnustep-libs/gnustep-back-art/DEPENDS b/gnustep-libs/gnustep-back-art/DEPENDS
deleted file mode 100755
index 70563f5..0000000
--- a/gnustep-libs/gnustep-back-art/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gnustep-back
diff --git a/gnustep-libs/gnustep-back-art/DETAILS b/gnustep-libs/gnustep-back-art/DETAILS
deleted file mode 100755
index cec017a..0000000
--- a/gnustep-libs/gnustep-back-art/DETAILS
+++ /dev/null
@@ -1,28 +0,0 @@
-           SPELL=gnustep-back-art
-         VERSION=0.11.0
-        WEB_SITE=http://www.gnustep.org
-      LICENSE[0]=LGPL
-         ENTERED=20050908
-        KEYWORDS="gnustep libs"
-           SHORT="It is a back-end component for the GNUstep GUI Library."
-
-cat << EOF
-It is a back-end component for the GNUstep GUI Library.  The
-implementation of the GNUstep GUI Library is designed in two parts.  The
-first part is the front-end component which is independent of platform
-and display system.  This front-end is combined with a back-end
-component which handles all of the display system dependent such as
-specific calls to the X Window System.  This design allows the GNUstep
-applications to have the "look and feel" of the underlying display
-system without any changes to the application, and the library can be
-easily ported to other display systems.
-
-   The GNUstep GUI Backend is for platforms using the X-Window System or
-Window's Systems. It works via a DPS emulation engine to emulate the
-DPS functions required by the front-end system.
-
-This is the art graphic enabled version.
-EOF
-
-
-
diff --git a/gnustep-libs/gnustep-back-art/HISTORY b/gnustep-libs/gnustep-back-art/HISTORY
deleted file mode 100644
index 2a45c6c..0000000
--- a/gnustep-libs/gnustep-back-art/HISTORY
+++ /dev/null
@@ -1,53 +0,0 @@
-2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* DETAILS: Deprecation protocol in favour of gnustep-back
-	* DEPENDS: Deprecation protocol in favour of gnustep-back
-	* PRE_BUILD: Deprecation protocol in favour of gnustep-back
-	* BUILD: Deprecation protocol in favour of gnustep-back
-	* INSTALL: Deprecation protocol in favour of gnustep-back
-	* CONFIGURE: Deprecation protocol in favour of gnustep-back
-	* PROVIDES: Deprecation protocol in favour of gnustep-back
-	* TRIGGERS: Deprecation protocol in favour of gnustep-back
-
-2006-10-09 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump up to release 0.11.0
-	Remove build_api and updated.
-
-2006-04-14 Maurizio Boriani <baux at sourcemage.org>
-	* Fix dummy concatenations bugs and others.
-
-2006-04-13 Maurizio Boriani <baux at sourcemage.org>
-	* PROVIDES: New, fix bug#10826.
-
-2006-04-12 Maurizio Boriani <baux at sourcemage.org>
-	* BUILD: Fix bug#10834.
-	* DEPENDS: Fix bug#10835.
-
-2006-03-24 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump to release 0.10.3.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-01-24 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Fix license field, close bug#10444.
-
-2005-01-13 Maurizio Boriani <baux at sourcemage.org>
-	* BUILD: Removed, use default_build.
-	* INSTALL: Likewise.
-	* CONFIGURE: Fix build doc var.
-
-2005-12-27 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump to release 0.10.2.
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-11-23 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Fix source directory path.
-
-2005-10-03 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump to release 0.10.1.
-
-2005-08-31 Maurizio Boriani <baux at sourcemage.org>
-	* BUILD, DEPENDS, DETAILS, CONFIGURE, INSTALL: created the 
-	  spell.
diff --git a/gnustep-libs/gnustep-back-art/INSTALL b/gnustep-libs/gnustep-back-art/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnustep-libs/gnustep-back-art/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnustep-libs/gnustep-back-art/PRE_BUILD b/gnustep-libs/gnustep-back-art/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnustep-libs/gnustep-back-art/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnustep-libs/gnustep-back-art/TRIGGERS b/gnustep-libs/gnustep-back-art/TRIGGERS
deleted file mode 100755
index 2898626..0000000
--- a/gnustep-libs/gnustep-back-art/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnustep-back-art dispel_self
diff --git a/gnustep-libs/gnustep-back-xlib/BUILD b/gnustep-libs/gnustep-back-xlib/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnustep-libs/gnustep-back-xlib/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnustep-libs/gnustep-back-xlib/DEPENDS b/gnustep-libs/gnustep-back-xlib/DEPENDS
deleted file mode 100755
index 70563f5..0000000
--- a/gnustep-libs/gnustep-back-xlib/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gnustep-back
diff --git a/gnustep-libs/gnustep-back-xlib/DETAILS b/gnustep-libs/gnustep-back-xlib/DETAILS
deleted file mode 100755
index f0475b8..0000000
--- a/gnustep-libs/gnustep-back-xlib/DETAILS
+++ /dev/null
@@ -1,25 +0,0 @@
-           SPELL=gnustep-back-xlib
-         VERSION=0.11.0
-        WEB_SITE=http://www.gnustep.org
-      LICENSE[0]=LGPL
-         ENTERED=20050908
-        KEYWORDS="gnustep libs"
-           SHORT="It is a back-end component for the GNUstep GUI Library."
-
-cat << EOF
-It is a back-end component for the GNUstep GUI Library.  The
-implementation of the GNUstep GUI Library is designed in two parts.  The
-first part is the front-end component which is independent of platform
-and display system.  This front-end is combined with a back-end
-component which handles all of the display system dependent such as
-specific calls to the X Window System.  This design allows the GNUstep
-applications to have the "look and feel" of the underlying display
-system without any changes to the application, and the library can be
-easily ported to other display systems.
-
-   The GNUstep GUI Backend is for platforms using the X-Window System or
-Window's Systems. It works via a DPS emulation engine to emulate the
-DPS functions required by the front-end system.
-
-This is the xlib graphic enabled version.
-EOF
diff --git a/gnustep-libs/gnustep-back-xlib/HISTORY b/gnustep-libs/gnustep-back-xlib/HISTORY
deleted file mode 100644
index f578be0..0000000
--- a/gnustep-libs/gnustep-back-xlib/HISTORY
+++ /dev/null
@@ -1,56 +0,0 @@
-2007-04-17 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* DETAILS: Deprecation protocol in favour of gnustep-back
-	* DEPENDS: Deprecation protocol in favour of gnustep-back
-	* PRE_BUILD: Deprecation protocol in favour of gnustep-back
-	* BUILD: Deprecation protocol in favour of gnustep-back
-	* INSTALL: Deprecation protocol in favour of gnustep-back
-	* CONFIGURE: Deprecation protocol in favour of gnustep-back
-	* PROVIDES: Deprecation protocol in favour of gnustep-back
-	* TRIGGERS: Deprecation protocol in favour of gnustep-back
-
-2007-02-22 David Kowis <dkowis at shlrm.org>
-	* DETAILS: wtf? there was a hash at the end of the file
-
-2006-10-09 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump up to release 0.11.0.
-	Remove build_api and updated.
-
-2006-04-14 Maurizio Boriani <baux at sourcemage.org>
-	* Fix dummy concatenations bugs and others.
-
-2006-04-13 Maurizio Boriani <baux at sourcemage.org>
-	* PROVIDES: New, fix bug#10826.
-
-2006-04-12 Maurizio Boriani <baux at sourcemage.org>
-	* BUILD: Fix bug#10836.
-	* DEPENDS: Fix bug#10837.
-
-2006-03-24 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump to release 0.10.3.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-01-24 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Fix license field, close bug#10444.
-
-2005-01-13 Maurizio Boriani <baux at sourcemage.org>
-	* BUILD: Removed, use default_build.
-	* INSTALL: Likewise.
-	* CONFIGURE: Fix build doc var.
-
-2005-12-27 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump to release 0.10.2.
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-11-23 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Fix source directory path.
-
-2005-10-03 Maurizio Boriani <baux at sourcemage.org>
-	* DETAILS: Bump to release 0.10.1.
-
-2005-09-08 Maurizio Boriani <baux at sourcemage.org>
-	* BUILD, DEPENDS, DETAILS, CONFIGURE, INSTALL: 
-	  created the spell.
diff --git a/gnustep-libs/gnustep-back-xlib/INSTALL b/gnustep-libs/gnustep-back-xlib/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/gnustep-libs/gnustep-back-xlib/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnustep-libs/gnustep-back-xlib/PRE_BUILD b/gnustep-libs/gnustep-back-xlib/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/gnustep-libs/gnustep-back-xlib/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/gnustep-libs/gnustep-back-xlib/TRIGGERS b/gnustep-libs/gnustep-back-xlib/TRIGGERS
deleted file mode 100755
index 7bc2339..0000000
--- a/gnustep-libs/gnustep-back-xlib/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gnustep-back-xlib dispel_self
diff --git a/graphics-libs/freetype2/DETAILS b/graphics-libs/freetype2/DETAILS
index 71ba2cb..50caeca 100755
--- a/graphics-libs/freetype2/DETAILS
+++ b/graphics-libs/freetype2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=freetype2
-         VERSION=2.4.2
+         VERSION=2.4.3
   SECURITY_PATCH=3
           SOURCE=freetype-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/freetype2/HISTORY b/graphics-libs/freetype2/HISTORY
index 1ce0568..b7019dd 100644
--- a/graphics-libs/freetype2/HISTORY
+++ b/graphics-libs/freetype2/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4.3
+
 2010-08-08 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.4.2; SECURITY_PATCH++
 
diff --git a/graphics-libs/glew/DETAILS b/graphics-libs/glew/DETAILS
index 60fea68..fe21b08 100755
--- a/graphics-libs/glew/DETAILS
+++ b/graphics-libs/glew/DETAILS
@@ -1,6 +1,6 @@
            SPELL=glew
-         VERSION=1.5.5
-     SOURCE_HASH=sha512:cced5c3f113f886529166699aaad123bd2d9d9afc9764e156761c7d63ae21b0e5810d949dc4aa382552882196aa5110ad9c4a58b593ba82c994eabfeaaa98386
+         VERSION=1.5.6
+     SOURCE_HASH=sha512:4752fca3c8abb4e1005470d55ecbba2336a45449ad0e62f76f149c8ab5f4d4b80d5c19173e9a01283e70a1b10c2ab0a680c1e5911ca7cc1a1cda3fae741f3095
           SOURCE=$SPELL-$VERSION.tgz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-$VERSION
diff --git a/graphics-libs/glew/HISTORY b/graphics-libs/glew/HISTORY
index ee84317..d113af1 100644
--- a/graphics-libs/glew/HISTORY
+++ b/graphics-libs/glew/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.5.6
+
 2010-07-29 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: updated spell to 1.5.5
 
diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS
index 0592cd9..3665b21 100755
--- a/graphics-libs/libraw/DETAILS
+++ b/graphics-libs/libraw/DETAILS
@@ -1,7 +1,7 @@
            SPELL=libraw
           SPELLX=LibRaw
-         VERSION=0.8.5
-     SOURCE_HASH=sha512:05b4830ea66c4347dfef743e1d27f10b1914574deefdca69d96e4f071f5e00f09da9a1bfd2e73a044124ee620fb40e58f73757bd9bbdd95b93c26452353ee420
+         VERSION=0.10.0
+     SOURCE_HASH=sha512:e4ccc8f34fae5d970989e71bec9d58aa91f612746a2c4c1c692f5fd68e19c3d7187a4b3fa33ed3db90cee919c2ecd9d6628bb8095a3aed857a0ef314fcd0a496
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://www.libraw.org/
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index 23e8036..c871324 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,6 @@
+2010-09-11 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.10.0
+
 2009-12-31 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.8.5
 
diff --git a/graphics-libs/libspectre/DETAILS b/graphics-libs/libspectre/DETAILS
index fee5403..76b56ce 100755
--- a/graphics-libs/libspectre/DETAILS
+++ b/graphics-libs/libspectre/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libspectre
-         VERSION=0.2.4
-     SOURCE_HASH=sha512:c74460dd45ccf9ee3fdecaf6fa1845263c6d54042c10f82219e95048c57d5f51ebaf549d64cd00e6fa6d055f9179b9ff9fdb3b08de58b98d6fac10cf639d5d2e
+         VERSION=0.2.6
+     SOURCE_HASH=sha512:4f99afe68293e188f70a5043f0c5199123d6ab0936f196b198f1c66eff980d54a6fba093be39839180dcef82db5fd9780a9d50887e453352d7b90b986829dfb6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://libspectre.freedesktop.org/releases/$SOURCE
diff --git a/graphics-libs/libspectre/HISTORY b/graphics-libs/libspectre/HISTORY
index 0494ce1..e5ccf50 100644
--- a/graphics-libs/libspectre/HISTORY
+++ b/graphics-libs/libspectre/HISTORY
@@ -1,3 +1,6 @@
+2010-09-22 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.2.6
+
 2010-03-19 Sukneet Basuta <sukneet at sourcemage.org>
 	* DETAILS: updated spell to 0.2.4
 
diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index 6bffb44..c56a12e 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,13 +1,20 @@
 local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}"  &&
 
 case $MESALIB_GALLIUM in
-  none) OPTS="${OPTS} --disable-gallium" ;;
-  intel) OPTS="${OPTS} --enable-gallium-intel" ;;
-  radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel" ;;
+  llvm)    OPTS="${OPTS} --enable-gallium-llvm" ;;
+  svga)    OPTS="${OPTS} --enable-gallium-svga" ;;
+  intel)   OPTS="${OPTS} --enable-gallium-intel" ;;
+  i915)    OPTS="${OPTS} --enable-gallium-i915" ;;
+  i965)    OPTS="${OPTS} --enable-gallium-i965" ;;
+  radeon)  OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel" ;;
+  r600)    OPTS="${OPTS} --enable-gallium-r600" ;;
   nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel" ;;
-  all) OPTS="${OPTS} --enable-gallium-intel --enable-gallium-radeon --enable-gallium-nouveau" ;;
+  swrast)  OPTS="${OPTS} --enable-gallium-swrast" ;;
+  none)    OPTS="${OPTS} --disable-gallium" ;;
 esac &&
+
 OPTS="--with-driver=$MESALIB_BUILD                     \
       --with-dri-drivers=$MESALIB_DRIVERS_CONF         \
+      $MESALIB_OPTS \
       $OPTS"                                           &&
 default_build
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 9059a41..decd7d4 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -31,29 +31,70 @@ config_query_list MESALIB_BUILD                                          \
                   xlib                                                   \
                   dri                                                    \
                   osmesa                                                 &&
+
 if [[ $MESALIB_BUILD == dri ]]; then
-  if  [[  "$MESALIB_VER"  ==  "stable"  ]];  then
-    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb swrast"
-  elif  [[  "$MESALIB_VER"  ==  "feature"  ]];  then
-    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+  if [[ "$MESALIB_VER" == "stable" ]]; then
+    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+                      savage sis tdfx trident unichrome ffb swrast"
   else
-    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"
-  fi
+    AVAILABLE_DRIVERS="i915 i965 mach64 mga r128 r200 r300 r600 radeon savage \
+                      tdfx unichrome swrast"
+  fi &&
+
 config_query_multi MESALIB_DRIVERS                                       \
                    "What drivers would you like to build?"               \
-                   $AVAILABLE_DRIVERS                                    &&
-  if list_find "$MESALIB_DRIVERS" all
-  then
-  MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
+                   all $AVAILABLE_DRIVERS
+
+  if list_find "$MESALIB_DRIVERS" all; then
+    MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
   fi
-fi                                                                       &&
 
-if [[ $MESALIB_BUILD == xlib ]]; then
-config_query_multi MESALIB_DRIVERS                                       \
-                   "What drivers would you like to build?"               \
-                   swrast
-fi                                                                       &&
+if [[ "$MESALIB_VER" == "stable" ]] || \
+   [[ "$MESALIB_VER" == "feature" ]]; then
 
 config_query_multi MESALIB_GALLIUM                                       \
                    "What Gallium3D drivers woulld you like to build?"    \
-                   none intel radeon nouveau all
+                   none intel radeon nouveau
+
+else
+config_query_multi MESALIB_GALLIUM                                       \
+                   "What Gallium3D drivers woulld you like to build?"    \
+                   none llvm svga i915 i965 radeon r600 nouveau swrast
+
+fi
+fi &&
+
+if [[ $MESALIB_BUILD == xlib ]]; then MESALIB_DRIVERS="swrast"
+fi &&
+
+config_query_option MESALIB_OPTS "enable TLS support in GLX" n \
+                    "--enable-glx-tls" "--disable-glx-tls" &&
+
+config_query_option MESALIB_OPTS "enable EGL library?" y \
+                    "--enable-egl" "--disable-egl" &&
+
+config_query_option MESALIB_OPTS "enable OpenGL Utility library?" y \
+                    "--enable-glu" "--disable-glu" &&
+
+config_query_option MESALIB_OPTS "enable Xt/Motif widget library?" y \
+                    "--enable-glw" "--disable-glw" &&
+
+# config_query_option MESALIB_OPTS "enable GLUT library" y \
+#                     "--enable-glut" "--disable-glut"
+
+if [[ "$MESALIB_VER" == "developement" ]] || \
+   [[ "$MESALIB_VER" == "git" ]]; then
+
+config_query_option MESALIB_OPTS "enable support for OpenGL ES 1.x API?" n \
+                    "--enable-gles1" "--disable-gles1" &&
+
+config_query_option MESALIB_OPTS "enable support for OpenGL ES 2.x API?" n \
+                    "--enable-gles2" "--disable-gles2" &&
+
+if ( list_find "--enable-gles1" $MESALIB_OPTS ) || \
+   ( list_find "--enable-gles2" $MESALIB_OPTS ); then
+
+config_query_option MESALIB_OPTS "build separate OpenGL ES only libraries?" n \
+                    "--enable-gles-overlay" "--disable-gles-overlay"
+fi
+fi
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index 88ad890..e4ca679 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -10,11 +10,14 @@ depends libxdamage &&
 depends libx11 &&
 depends libxext &&
 depends libxxf86vm &&
-depends libxt &&
 depends libxau &&
 depends libxfixes &&
 depends glproto &&
 
+if list_find "--enable-glw" $MESALIB_OPTS; then
+  depends libxt
+fi &&
+
 optional_depends libxcb \
                  '--enable-xcb' \
                  '--disable-xcb' \
@@ -28,6 +31,20 @@ if spell_ok libdrm && [[ $(installed_version libdrm|sed 's:\.::g') -lt 243 ]]; t
   force_depends libdrm
 fi &&
 
+if ( list_find "i915" $MESALIB_DRIVERS ) || \
+   ( list_find "i965" $MESALIB_DRIVERS ); then
+  sub_depends libdrm INTEL
+fi &&
+
+if ( list_find "r200" $MESALIB_DRIVERS ) || \
+   ( list_find "r300" $MESALIB_DRIVERS ) || \
+   ( list_find "r600" $MESALIB_DRIVERS ); then
+  sub_depends libdrm RADEON
+fi &&
+
+if [[ $MESALIB_VER == "developement" ]]; then
+  depends talloc
+fi &&
 
 if [[ $MESALIB_VER == "git" ]]; then
   depends  git  &&
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 562cb53..f79f3e7 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -21,10 +21,10 @@ case $MESALIB_VER in
          VERSION=7.5.2
   ;;
      feature)
-         VERSION=7.7.1
+         VERSION=7.6.1
   ;;
 developement)
-         VERSION=7.8.2
+         VERSION=7.9
   ;;
          git)
        if [[ "$MESALIB_GIT_AUTOUPDATE" == "y" ]]; then
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 16db081..ce5a424 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,15 @@
+2010-10-05 Vasil Yonkov <spirtbrat at sourcemage.org>
+	* DETAILS: feature => 7.6.2, developement => 7.9;
+	  updated MESALIB_VER=developement to 7.9
+	  updated MESALIB_VER=feature to 7.6.1
+	  BUILD: updated gallium options, added MESALIB_OPTS;
+	  CONFIGURE: updated gallium and dri drivers options; added missing options;
+	  DEPENDS: made libxt optional; added conditional sub_depends on libdrm;
+	  added talloc
+
+2010-09-14 Pol Vinogradov <vin.public at gmail.com>
+	* PRE_BUILD: removed link creation for git branch
+
 2010-08-19 Arjan Bouter <abouter at sourcemage.org>
 	* PROVIDES: enabled GLUT again, see docs/glu.html
 	* DEPENDS: added talloc for the scm version
diff --git a/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig
new file mode 100644
index 0000000..ff46b02
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.6.1.tar.bz2.sig differ
diff --git a/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig
deleted file mode 100644
index 37e6fc7..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.7.1.tar.bz2.sig and /dev/null differ
diff --git a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig
deleted file mode 100644
index a7118aa..0000000
Binary files a/graphics-libs/mesalib/MesaLib-7.8.2.tar.bz2.sig and /dev/null differ
diff --git a/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig
new file mode 100644
index 0000000..69f9746
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.9.tar.bz2.sig differ
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index acf89c1..01b02eb 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -37,6 +37,5 @@ if [[ $MESALIB_VER == "git" ]]; then
   cd "$SOURCE_DIRECTORY"                                     &&
   patch -p0 < "${SCRIPT_DIRECTORY}/autogen.patch"            &&
   ./autogen.sh
-  cd bin                                                     &&
-  ln -s install-sh minstall
+  cd bin
 fi
diff --git a/graphics-libs/poppler/CONFIGURE b/graphics-libs/poppler/CONFIGURE
index 44e9e28..a959d93 100755
--- a/graphics-libs/poppler/CONFIGURE
+++ b/graphics-libs/poppler/CONFIGURE
@@ -1,6 +1,7 @@
 config_query_option POPPLER_OPTS "Install unsupported xpdf headers?" n \
                                  "--enable-xpdf-headers" \
                                  "--disable-xpdf-headers" &&
+
 config_query_option POPPLER_OPTS "Compile poppler command line utils?" n \
                                  "--enable-utils" \
                                  "--disable-utils"
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 100a435..4bebf50 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -53,6 +53,11 @@ optional_depends cairo \
                  "for cairo output"
 fi &&
 
+optional_depends curl \
+                 "--enable-libcurl" \
+                 "--disable-libcurl" \
+                 "for libcurl based HTTP support" &&
+
 optional_depends abiword \
                  "--enable-abiword-output" \
                  "--disable-abiword-output" \
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index cacc2f9..371794f 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_VER == devel ]]; then
-         VERSION=0.14.2
-     SOURCE_HASH=sha512:e002f8cb525612bfde6298f10ad444a289a4cc7358ca152b73d9f42f01a523f402f4526e7b84043352950414ec0f23e5a19f873d4a1cabc4a0a1a8e3b018519b
+         VERSION=0.14.3
+     SOURCE_HASH=sha512:53461eb418a0bfab68164a1fac87d8837354165bc9a3830defa54ec0a46c0f7cb876303d50dfa6aae903c9336eff39241a90679a63371ca6f228b8014143ee70
  else
-         VERSION=0.14.2
-     SOURCE_HASH=sha512:e002f8cb525612bfde6298f10ad444a289a4cc7358ca152b73d9f42f01a523f402f4526e7b84043352950414ec0f23e5a19f873d4a1cabc4a0a1a8e3b018519b
+         VERSION=0.14.3
+     SOURCE_HASH=sha512:53461eb418a0bfab68164a1fac87d8837354165bc9a3830defa54ec0a46c0f7cb876303d50dfa6aae903c9336eff39241a90679a63371ca6f228b8014143ee70
  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 3b7bfce..c381731 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2010-09-11 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.14.3
+	* DEPENDS: added curl dependency
+
 2010-08-16 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.14.2
 	* UP_TRIGGERS: libpoppler.so.6 -> libpoppler.so.7 in this version
diff --git a/graphics-libs/pycairo/DETAILS b/graphics-libs/pycairo/DETAILS
index 295f77e..3afff4d 100755
--- a/graphics-libs/pycairo/DETAILS
+++ b/graphics-libs/pycairo/DETAILS
@@ -1,6 +1,7 @@
            SPELL=pycairo
-         VERSION=1.8.8
-          SOURCE=$SPELL-$VERSION.tar.gz
+          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"
    SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
diff --git a/graphics-libs/pycairo/HISTORY b/graphics-libs/pycairo/HISTORY
index 1477410..507dcba 100644
--- a/graphics-libs/pycairo/HISTORY
+++ b/graphics-libs/pycairo/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.8.10, source tarball pycairo -> py2cairo
+
 2009-08-26 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.8.8
 
diff --git a/graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig b/graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig
new file mode 100644
index 0000000..9cc6ed1
Binary files /dev/null and b/graphics-libs/pycairo/py2cairo-1.8.10.tar.gz.sig differ
diff --git a/graphics-libs/pycairo/pycairo-1.8.8.tar.gz.sig b/graphics-libs/pycairo/pycairo-1.8.8.tar.gz.sig
deleted file mode 100644
index d5449d0..0000000
Binary files a/graphics-libs/pycairo/pycairo-1.8.8.tar.gz.sig and /dev/null differ
diff --git a/graphics-libs/pythonmagick/BUILD b/graphics-libs/pythonmagick/BUILD
new file mode 100755
index 0000000..3f5e8bf
--- /dev/null
+++ b/graphics-libs/pythonmagick/BUILD
@@ -0,0 +1,3 @@
+CFLAGS="-I/usr/include/python2.6" &&
+CXXFLAGS="-I/usr/include/python2.6" &&
+default_build
diff --git a/graphics-libs/pythonmagick/DEPENDS b/graphics-libs/pythonmagick/DEPENDS
new file mode 100755
index 0000000..282283d
--- /dev/null
+++ b/graphics-libs/pythonmagick/DEPENDS
@@ -0,0 +1,3 @@
+depends python &&
+depends -sub PYTHON boost &&
+depends imagemagick 
diff --git a/graphics-libs/pythonmagick/DETAILS b/graphics-libs/pythonmagick/DETAILS
new file mode 100755
index 0000000..c618470
--- /dev/null
+++ b/graphics-libs/pythonmagick/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=pythonmagick
+         VERSION=0.9.2
+          SOURCE="PythonMagick-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://www.imagemagick.org/download/python/${SOURCE}
+     SOURCE_HASH=sha512:a995f0f88163e17c73e6d8863398403597641f8677147eedc146520f0b5f634eb1abf183a41bdc1857b6519631dd01c528e005650e77dfc2b608e9c95bc40cf3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/PythonMagick-${VERSION}"
+        WEB_SITE="http://wiki.python.org/moin/PythonMagick"
+      LICENSE[0]="APACHE2"
+         ENTERED=20100926
+        KEYWORDS=""
+           SHORT="PythonMagick provides object oriented bindings for the ImageMagick Library."
+cat << EOF
+PythonMagick provides object oriented bindings for the ImageMagick Library.
+EOF
diff --git a/graphics-libs/pythonmagick/HISTORY b/graphics-libs/pythonmagick/HISTORY
new file mode 100644
index 0000000..3b4d64b
--- /dev/null
+++ b/graphics-libs/pythonmagick/HISTORY
@@ -0,0 +1,3 @@
+2010-09-26 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DEPENDS, DETAILS: spell created
+
diff --git a/graphics-libs/sane-backends/DEPENDS b/graphics-libs/sane-backends/DEPENDS
index f70c4ce..f17fd66 100755
--- a/graphics-libs/sane-backends/DEPENDS
+++ b/graphics-libs/sane-backends/DEPENDS
@@ -10,6 +10,6 @@ optional_depends libgphoto2 \
                  "Enable libgphoto2 backend" &&
 
 optional_depends texlive \
-                 "--enable-translations" \
-                 "--disable-translations" \
-                 "Build translated documentation"
+                 "--enable-latex" \
+                 "--disable-latex" \
+                 "Build documentation"
diff --git a/graphics-libs/sane-backends/HISTORY b/graphics-libs/sane-backends/HISTORY
index 1c948c8..ce798a5 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,7 @@
+2010-08-24 Finn Haedicke <finn at sourcemage.org>
+	* DEPENDS: optiona_depends for texlive uses 
+	  flag --enable/--disable-latex
+
 2010-04-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.0.21
 	* PRE_BUILD, udev.diff: deleted
diff --git a/graphics/djview4/DETAILS b/graphics/djview4/DETAILS
index 2b6023d..b33b767 100755
--- a/graphics/djview4/DETAILS
+++ b/graphics/djview4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=djview4
-         VERSION=4.5
-     SOURCE_HASH=sha512:19c7aed22fa84a6ade9707d7ccd82b1624d6346da17bae7bb335a89cdb00a2a6918e5b16a21ca881d94f9fcec4f66c9544920e26e930379f49e96c5b96881767
+         VERSION=4.6
+     SOURCE_HASH=sha512:2d34bc2a38beaeebc1e56579b49fd7b6f76e0306b79ea49a828e4bc4b89ec3c9adf741a78d3935e76c9bcb768307ab185ff7f74080808c32f200432a48881cd0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/$SOURCE
diff --git a/graphics/djview4/HISTORY b/graphics/djview4/HISTORY
index 9bb9974..882de6c 100644
--- a/graphics/djview4/HISTORY
+++ b/graphics/djview4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-23 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.6
+
 2009-05-25 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 4.5
 
diff --git a/graphics/djvulibre/BUILD b/graphics/djvulibre/BUILD
deleted file mode 100755
index de33b68..0000000
--- a/graphics/djvulibre/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-make_single   &&
-default_build &&
-make_normal
diff --git a/graphics/djvulibre/DETAILS b/graphics/djvulibre/DETAILS
index 6c86d1f..e8036f9 100755
--- a/graphics/djvulibre/DETAILS
+++ b/graphics/djvulibre/DETAILS
@@ -1,9 +1,9 @@
            SPELL=djvulibre
-         VERSION=3.5.22
-     SOURCE_HASH=sha512:37cf0f11cdb9c0971b5de110984b6b93b877a99cd677a3bb5861d9ec93fadb21bdd569479092bc44a83ff352848d8d6e2b41f1be05d8a549c445d35bdbb5bb29
+         VERSION=3.5.23
+     SOURCE_HASH=sha512:4edbe96266f775185f7fcc9b660446f021263f9d2a56c8f1c14947d8a4d523dbf0f8295f98283253861c14f9fa70d0f15099527e7e09a221c8f4b12fd17b68b6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-?}
-   SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/files/DjVuLibre/$VERSION/$SOURCE
+   SOURCE_URL[0]=http://sourceforge.net/projects/djvu/files/DjVuLibre/$VERSION/$SOURCE
         WEB_SITE=http://djvu.sourceforge.net/
          ENTERED=20030125
       LICENSE[0]=GPL
diff --git a/graphics/djvulibre/HISTORY b/graphics/djvulibre/HISTORY
index 21f4e9c..a5db5e2 100644
--- a/graphics/djvulibre/HISTORY
+++ b/graphics/djvulibre/HISTORY
@@ -1,3 +1,8 @@
+2010-09-23 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: updated to 3.5.23
+	  fixed SOURCE_URL
+	* BUILD: deleted
+
 2010-02-05 Vasil Yonkov <spirtbrat at sourcemage.org>
 	* DETAILS: fixed SOURCE_URL
 
diff --git a/graphics/fotox/BUILD b/graphics/fotox/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/graphics/fotox/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/graphics/fotox/DEPENDS b/graphics/fotox/DEPENDS
deleted file mode 100755
index 28a8417..0000000
--- a/graphics/fotox/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends fotoxx
diff --git a/graphics/fotox/DETAILS b/graphics/fotox/DETAILS
deleted file mode 100755
index fb41a4f..0000000
--- a/graphics/fotox/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-           SPELL=fotox
-         VERSION=deprecated-37
-        WEB_SITE="http://kornelix.squarespace.com/fotox "
-      LICENSE[0]=GPL
-         ENTERED=20080329
-           SHORT="Software for digital image editing, HDR composites, and panoramas."
-cat << EOF
-Fotox is a program for improving digital photos.  Navigate through
-large image directories using a window of thumbnail images. Create HDR
-(high dynamic range) images by combining bright and dark images to improve
-details visible in both bright and dark areas. Create panorama (extra wide)
-images by joining overlapped images. Adjust brightness and color intensity
-independently for different underlying brightness levels. Reduce fog or haze
-by removing "whiteness" and intensifying colors. Rotate an image
-(level a tilted image or turn 90 degrees). Remove the red-eye effect from
-electronic flash photos. Resize or crop an image.
-EOF
diff --git a/graphics/fotox/HISTORY b/graphics/fotox/HISTORY
deleted file mode 100644
index 660511f..0000000
--- a/graphics/fotox/HISTORY
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-07-06 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* BUILD, INSTALL, PRE_BUILD, DETAILS: deprecation in progress
-	* DEPENDS, TRIGGERS: deprecation in progress fotox -> fotoxx
-
-2008-03-29 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* BUILD, DEPENDS, DETAILS, INSTALL: spell created
-
diff --git a/graphics/fotox/INSTALL b/graphics/fotox/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/graphics/fotox/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/graphics/fotox/PRE_BUILD b/graphics/fotox/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/graphics/fotox/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/graphics/fotox/TRIGGERS b/graphics/fotox/TRIGGERS
deleted file mode 100755
index 4724102..0000000
--- a/graphics/fotox/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast fotox dispel_self
diff --git a/graphics/fotoxx/BUILD b/graphics/fotoxx/BUILD
index 4c74ff9..9c07601 100755
--- a/graphics/fotoxx/BUILD
+++ b/graphics/fotoxx/BUILD
@@ -1,3 +1,2 @@
-PREFIX=${INSTALL_ROOT}/usr make  &&
-PREFIX=${INSTALL_ROOT}/usr make launcher
+CXXFLAGS=$CXXFLAGS LDFLAGS=$LDFLAGS PREFIX=${INSTALL_ROOT}/usr make
 
diff --git a/graphics/fotoxx/DEPENDS b/graphics/fotoxx/DEPENDS
index 4f68867..568729f 100755
--- a/graphics/fotoxx/DEPENDS
+++ b/graphics/fotoxx/DEPENDS
@@ -1,4 +1,7 @@
 depends gtk+2 &&
 depends g++   &&
 depends exiv2 &&
+depends tiff  &&
+depends ufraw &&
+depends image-exiftool &&
 depends xdg-utils
diff --git a/graphics/fotoxx/DETAILS b/graphics/fotoxx/DETAILS
index f4774ae..95a7674 100755
--- a/graphics/fotoxx/DETAILS
+++ b/graphics/fotoxx/DETAILS
@@ -1,9 +1,9 @@
            SPELL=fotoxx
-         VERSION=5.7
+         VERSION=10.10.1
           SOURCE="${SPELL}-$VERSION.tar.gz"
-   SOURCE_URL[0]=http://kornelix.squarespace.com/storage/$SPELL/${SOURCE}
-     SOURCE_HASH=sha512:e3b43fa62523f6a9eff079b2485ab7e516ff24a2ca9eb0bdaff5513221c2302543d1ae9fa3110a163e0431c76aa651f718b76d53dcfdf7b1bdf5ebe58e5ed738
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+   SOURCE_URL[0]=http://kornelix.squarespace.com/storage/downloads/${SOURCE}
+     SOURCE_HASH=sha512:063c632917ad6b0ec78c98bc26a03980e8f6817cc3b44c2504c6edc6fd3af5dca9963cd09a6580dbb9efa1117018ec226d085ecdc47affa2dff66d4b1bba0483
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
         WEB_SITE="http://kornelix.squarespace.com/fotoxx"
       LICENSE[0]=GPL
          ENTERED=20080329
diff --git a/graphics/fotoxx/HISTORY b/graphics/fotoxx/HISTORY
index 5bc528e..4feed96 100644
--- a/graphics/fotoxx/HISTORY
+++ b/graphics/fotoxx/HISTORY
@@ -1,3 +1,11 @@
+2010-10-03 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: Fixed SOURCE_URL[0]
+	  updated spell to 10.10.1
+	* PRE_BUILD: removed
+	* BUILD: updated
+	* DEPENDS: fresh depends
+	* INSTALL: updated
+
 2008-12-02 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 5.7
 
diff --git a/graphics/fotoxx/INSTALL b/graphics/fotoxx/INSTALL
index 23f6512..0992043 100755
--- a/graphics/fotoxx/INSTALL
+++ b/graphics/fotoxx/INSTALL
@@ -1,3 +1,4 @@
-PREFIX=${INSTALL_ROOT}/usr make install          &&
-mkdir -vp $INSTALL_ROOT/usr/share/applications/  &&
-cp -v kornelix-$SPELL.desktop $INSTALL_ROOT/usr/share/applications/
+PREFIX=${INSTALL_ROOT}/usr make install &&
+PREFIX=${INSTALL_ROOT}/usr make menu &&
+PREFIX=${INSTALL_ROOT}/usr make manpage
+
diff --git a/graphics/fotoxx/PRE_BUILD b/graphics/fotoxx/PRE_BUILD
deleted file mode 100755
index d350a1b..0000000
--- a/graphics/fotoxx/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build                                              &&
-cd $SOURCE_DIRECTORY                                           &&
-sed -i "s:^CFLAGS = -O \(.*\):CFLAGS = \1 $CFLAGS:g" Makefile  &&
-sed -i "s:^LFLAGS = -O \(.*\):LFLAGS = \1 $CFLAGS:g" Makefile  &&
-sed -i "s:^LAUNCHER = .*:LAUNCHER = kornelix-\$(PROGRAM).desktop:g" Makefile
diff --git a/graphics/gexiv2/DETAILS b/graphics/gexiv2/DETAILS
index 3687cf6..95086f1 100755
--- a/graphics/gexiv2/DETAILS
+++ b/graphics/gexiv2/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gexiv2
           SPELLX=libgexiv2
-         VERSION=0.2.0
-     SOURCE_HASH=sha512:61cf48bf9e79810cf7b9de622d3ec58d1d65c0df8c4c1dc472ef6f60675ca96eec5d40d2b76fd22c34047c4df60edfb5c862798517f33954f8fb6fbe9f2a1703
+         VERSION=0.2.1
+     SOURCE_HASH=sha512:8906d22ed8cfd08198f9a14b27c94123292f1cc962cb2460a1706eafdcb6ad066e6423c777cf03e0aed429c37d45f3b529a613e74cb84bf13465eeb8550bb634
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://trac.yorba.org/wiki/gexiv2
diff --git a/graphics/gexiv2/HISTORY b/graphics/gexiv2/HISTORY
index ac2dccf..b831161 100644
--- a/graphics/gexiv2/HISTORY
+++ b/graphics/gexiv2/HISTORY
@@ -1,3 +1,6 @@
+2010-09-11 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.2.1
+
 2010-08-21 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 0.2.0. Fixed SOURCE_URL[0]
 
diff --git a/graphics/gimp/DETAILS b/graphics/gimp/DETAILS
index 7a554f7..a2631d1 100755
--- a/graphics/gimp/DETAILS
+++ b/graphics/gimp/DETAILS
@@ -1,13 +1,13 @@
            SPELL=gimp
 if [[ $GIMP_DEVEL == y ]]; then
-         VERSION=2.6.10
+         VERSION=2.6.11
           SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:10fb5c42d3c72385e5b270ef5de96484adfd7aff95e671b00da9dbfca28b8c971eb8dfaf22c2c1691cdc7b7af53aa170c3009bf808ce1e7293a5dacc34b0004b
+     SOURCE_HASH=sha512:51aa40c914fe9ea9214196dd01a9afcf688fef032af1f83b5895a5ab1911ee861f177580a417d9b533fe1dec6a4fca630f90cdc6d27d14a4d5560b336ab31c43
    SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
 else
-         VERSION=2.6.10
+         VERSION=2.6.11
           SOURCE=$SPELL-$VERSION.tar.bz2
-     SOURCE_HASH=sha512:10fb5c42d3c72385e5b270ef5de96484adfd7aff95e671b00da9dbfca28b8c971eb8dfaf22c2c1691cdc7b7af53aa170c3009bf808ce1e7293a5dacc34b0004b
+     SOURCE_HASH=sha512:51aa40c914fe9ea9214196dd01a9afcf688fef032af1f83b5895a5ab1911ee861f177580a417d9b533fe1dec6a4fca630f90cdc6d27d14a4d5560b336ab31c43
    SOURCE_URL[0]=ftp://ftp.gimp.org/pub/gimp/v${VERSION%.*}/$SOURCE
 #     SOURCE_GPG=gurus.gpg:$SOURCE.sig
 fi
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index 8792635..73580cf 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.6.11
+
 2010-07-07 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.6.10
 
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index f9b7a92..1b92f80 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
            SPELL=imagemagick
-         VERSION=6.6.4-0
+         VERSION=6.6.4-8
   SECURITY_PATCH=1
           SOURCE=ImageMagick-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
    SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
    SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:6dee5600a15ad9bdd1886abbba6b385f3055c878b847276f63f74caaaab4bf033661bb2ea35b98af51fb080bcfdee358d6c7b7519909d8e4e34eeeb58f191ef8
+     SOURCE_HASH=sha512:20ba58ab0244513ca5a8ee3aa071f10de356426e1f42ec98a778f1d3dd0aefb2ee942f79d367a4c9e26a1c87c6b71549e674ae24013d8eda42ba6632d5ba233e
           CCACHE="off"
         WEB_SITE=http://www.imagemagick.org/
          ENTERED=20010922
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 653968b..0edf3f0 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,12 @@
+2010-10-03 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.4-8
+
+2010-09-26 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.4-6
+
+2010-09-18 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 6.6.4-3
+
 2010-09-06 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 6.6.4-0
 
diff --git a/graphics/shotwell/DEPENDS b/graphics/shotwell/DEPENDS
index 85ce842..4e1ce30 100755
--- a/graphics/shotwell/DEPENDS
+++ b/graphics/shotwell/DEPENDS
@@ -1,4 +1,5 @@
 depends gtk+2 &&
+depends libgphoto2 &&
 depends gexiv2 &&
 depends libraw &&
 depends libgee
diff --git a/graphics/shotwell/DETAILS b/graphics/shotwell/DETAILS
index 55755da..0a04dd3 100755
--- a/graphics/shotwell/DETAILS
+++ b/graphics/shotwell/DETAILS
@@ -1,11 +1,11 @@
            SPELL=shotwell
-         VERSION=0.7.1
+         VERSION=0.7.2
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://yorba.org/download/shotwell/0.7/$SOURCE
         WEB_SITE=http://yorba.org/shotwell/
          ENTERED=20100709
-     SOURCE_HASH=sha512:a603492f4fce5cd64f533a0a546599f08db6eff3c88ff891f9eeedfba30771ef2e374404b2d1b01993693258de78972c88f69b395b4d0da05a81025be35fba9f
+     SOURCE_HASH=sha512:f81f4d420389184c2db784c914cd07fc3168bb5d861e12b48f7d1800d8a1a7f952e7a76455e108bd1c2c3320c49660a498272f53a8cd857889bee4816fe2954c
       LICENSE[0]=GPL
             SHORT="digital photo organizer"
 cat << EOF
diff --git a/graphics/shotwell/HISTORY b/graphics/shotwell/HISTORY
index 9431180..abe402b 100644
--- a/graphics/shotwell/HISTORY
+++ b/graphics/shotwell/HISTORY
@@ -1,3 +1,9 @@
+2010-09-21 PHilippe "Puppet_Master" Caseiro <puppetmaster at sourcemage.org>
+	* DEPENDS: Adding libgphoto2 as dep
+
+2010-09-11 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.7.2
+
 2010-08-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.7.1
 
diff --git a/graphics/tesseract/DETAILS b/graphics/tesseract/DETAILS
index 0f9eded..bb7e672 100755
--- a/graphics/tesseract/DETAILS
+++ b/graphics/tesseract/DETAILS
@@ -1,7 +1,7 @@
            SPELL=tesseract
-         VERSION=2.04
+         VERSION=3.00
          LANGVER=2.00
-     SOURCE_HASH=sha512:c095407910235f7f914aa6a51feedade3f0b33108c7801b88c5ade26f2b75d1756b034d9ac32ad362a326ee468f97b69476978102ef0cefcc1b5c93be2342d42
+     SOURCE_HASH=sha512:f5362869c1b215a2a39dd934aa464409120fe5943b4e3c9f7a62cc11abc59ba03241d899410b6c0cd7a6856aea70b6102f1cc7b1a0fce66bbf0205243032bdf0
              URI=http://tesseract-ocr.googlecode.com/files
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$URI/$SOURCE
diff --git a/graphics/tesseract/HISTORY b/graphics/tesseract/HISTORY
index 4afd327..6c75557 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,8 @@
+2010-10-04 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 3.00
+	* PRE_BUILD: remove gg patch
+	* gcc-4.4.diff: deleted
+
 2009-08-20 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.04
 	* gcc-4.3.diff: deleted
diff --git a/graphics/tesseract/PRE_BUILD b/graphics/tesseract/PRE_BUILD
index d3b1a41..a414f29 100755
--- a/graphics/tesseract/PRE_BUILD
+++ b/graphics/tesseract/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build            &&
 cd $SOURCE_DIRECTORY         &&
-# fix compile with gcc-4.4.1
-patch -p1 <$SPELL_DIRECTORY/gcc-4.4.diff &&
 # won't install if java not present
 if  ! spell_ok JAVA ;then
 sed -i 's/java//' Makefile.in 
diff --git a/graphics/tesseract/gcc-4.4.diff b/graphics/tesseract/gcc-4.4.diff
deleted file mode 100644
index a7fc13f..0000000
--- a/graphics/tesseract/gcc-4.4.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr tesseract-2.04/viewer/svutil.cpp tesseract-2.04.orig/viewer/svutil.cpp
---- tesseract-2.04/viewer/svutil.cpp	2009-06-03 18:29:38.000000000 +0200
-+++ tesseract-2.04.orig/viewer/svutil.cpp	2009-08-20 18:30:36.000000000 +0200
-@@ -42,6 +42,7 @@
- #endif
- #endif
- 
-+#include <stdio.h>
- #include <iostream>
- 
- const int kBufferSize = 65536;
diff --git a/graphics/ufraw/BUILD b/graphics/ufraw/BUILD
index e1b74fe..54f8d89 100755
--- a/graphics/ufraw/BUILD
+++ b/graphics/ufraw/BUILD
@@ -1,2 +1,2 @@
-OPTS="$UFR_EXT $UFR_CRTST $UFR_HTPX $OPTS" &&
+OPTS="$UFRAW_OPTS $OPTS" &&
 default_build
diff --git a/graphics/ufraw/CONFIGURE b/graphics/ufraw/CONFIGURE
index 2663b92..4bd0e29 100755
--- a/graphics/ufraw/CONFIGURE
+++ b/graphics/ufraw/CONFIGURE
@@ -1,11 +1,16 @@
-config_query_option UFR_EXT "build dcraw and nikon-curve ?" n          \
-                    "--enable-extras"                                  \
-                    "--disable-extras"                                 &&
+config_query_option UFRAW_OPTS "Build dcraw and nikon-curve" n \
+                    "--enable-extras" \
+                    "--disable-extras" &&
 
-config_query_option UFR_CRTST "enable the contrast setting option ?" n \
-                    "--enable-contrast"                                \
-                    "--disable-constrast"                              && 
+config_query_option UFRAW_OPTS "Enable the contrast setting option" n \
+                    "--enable-contrast" \
+                    "--disable-constrast" && 
+
+config_query_option UFRAW_OPTS "Enable DST correction" n \
+                    "--enable-dst-correction" \
+                    "--disable-dst-correction" && 
+
+config_query_option UFRAW_OPTS "Install MIME files" n \
+                    "--enable-mime" \
+                    "--disable-mime" 
 
-config_query_option UFR_HTPX "enable hot pixel elimination ?" n        \
-                    "--enable-hotpixels"                               \
-                    "--disable-hotpixels"
diff --git a/graphics/ufraw/DEPENDS b/graphics/ufraw/DEPENDS
index 5e671c2..af5f1ea 100755
--- a/graphics/ufraw/DEPENDS
+++ b/graphics/ufraw/DEPENDS
@@ -1,35 +1,42 @@
-depends gtk+2  &&
-depends lcms  &&
-depends gtkimageview  &&
-if [ "$UFRAW_CVS" == "y" ]; then
+depends lcms &&
+depends glib2 &&
+if [[ "$UFRAW_CVS" == "y" ]]; then
   depends CVS
 fi &&
 
-optional_depends gimp              \
-               "--with-gimp"       \
-               "--without-gimp"    \
-               "for gimp plugin"   &&
-optional_depends cinepaint            \
-               "--with-cinepaint"     \
-               "--without-cinepaint"  \
+optional_depends gtk+2 \
+               "--with-gtk" \
+               "--without-gtk" \
+               "Build GTK UI" &&
+if is_depends_enabled $SPELL gtk+2 ; then
+depends gtkimageview
+fi &&
+optional_depends gimp \
+               "--with-gimp" \
+               "--without-gimp" \
+               "Build gimp plugin" &&
+optional_depends cinepaint \
+               "--with-cinepaint" \
+               "--without-cinepaint" \
                "for cinepaint plugin" &&
-optional_depends jpeg          \
-               ""              \
-               ""              \
-               "for jpeg support"  &&
-optional_depends tiff          \
-               ""              \
-               ""              \
-               "for tiff support"  &&
-optional_depends exiv2             \
-               "--with-exiv2"      \
-               "--without-exiv2"   \
-               "for exif support"  &&
-optional_depends lensfun           \
-               "--with-lensfun"    \
+optional_depends jpeg \
+               "" \
+               "" \
+               "for jpeg support" &&
+optional_depends tiff \
+               "" \
+               "" \
+               "for tiff support" &&
+optional_depends exiv2 \
+               "--with-exiv2" \
+               "--without-exiv2" \
+               "for exif support" &&
+optional_depends lensfun \
+               "--with-lensfun" \
                "--without-lensfun" \
-               "lensfun support"   &&
-optional_depends cfitsio           \
-               ""                  \
-               ""                  \
-               "for FITS format support" 
+               "lensfun support" &&
+optional_depends cfitsio \
+               "" \
+               "" \
+               "for FITS format support"
+
diff --git a/graphics/ufraw/DETAILS b/graphics/ufraw/DETAILS
index 012f6f7..331b2ba 100755
--- a/graphics/ufraw/DETAILS
+++ b/graphics/ufraw/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ufraw
-if [ "$UFRAW_CVS" == "y" ]; then
-  if [ "$UFRAW_CVS_AUTOUPDATE" == "y" ]; then
+if [[ "$UFRAW_CVS" == "y" ]]; then
+  if [[ "$UFRAW_CVS_AUTOUPDATE" == "y" ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=sfcvs
diff --git a/graphics/ufraw/HISTORY b/graphics/ufraw/HISTORY
index 4cf5a77..dce872f 100644
--- a/graphics/ufraw/HISTORY
+++ b/graphics/ufraw/HISTORY
@@ -1,3 +1,11 @@
+2010-10-03 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* BUILD: cleanup
+	* DEPENDS: some stuff is optional
+	* CONFIGURE: updated options
+	* PRE_BUILD: cleanup
+	* DETAILS: cleanup
+	* PREPARE: cleanup
+
 2010-04-13 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 0.17
 
diff --git a/graphics/ufraw/PREPARE b/graphics/ufraw/PREPARE
index 43e221b..2d0c48b 100755
--- a/graphics/ufraw/PREPARE
+++ b/graphics/ufraw/PREPARE
@@ -1,6 +1,6 @@
 config_query  UFRAW_CVS  "Use CVS version" n
-if [ "$UFRAW_CVS" == "y" ]; then
+if [[ "$UFRAW_CVS" == "y" ]]; then
   config_query  UFRAW_CVS_AUTOUPDATE                                    \
                 "Update to the latest CVS automatically on every cast?" \
                 n
-fi
\ No newline at end of file
+fi
diff --git a/graphics/ufraw/PRE_BUILD b/graphics/ufraw/PRE_BUILD
index dce5e87..48b8190 100755
--- a/graphics/ufraw/PRE_BUILD
+++ b/graphics/ufraw/PRE_BUILD
@@ -1,5 +1,5 @@
 default_pre_build &&
-if [ "$UFRAW_CVS" == "y" ]; then
+if [[ "$UFRAW_CVS" == "y" ]]; then
   cd "$SOURCE_DIRECTORY" &&
   NOCONFIGURE=ON ./autogen.sh
 fi
diff --git a/groups b/groups
index 29fdbc9..aa718ef 100755
--- a/groups
+++ b/groups
@@ -107,5 +107,6 @@ mariadb:180:
 avahi-autoipd:180:
 puppet:181:
 prosody:182:
+dovenull:183:
 users:1000:
 nogroup:65534:
diff --git a/http/apache/BUILD b/http/apache/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/apache/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/apache/DEPENDS b/http/apache/DEPENDS
deleted file mode 100755
index 41c0af3..0000000
--- a/http/apache/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends APACHE
diff --git a/http/apache/DETAILS b/http/apache/DETAILS
deleted file mode 100755
index e8221ef..0000000
--- a/http/apache/DETAILS
+++ /dev/null
@@ -1,7 +0,0 @@
-          SPELL=apache
-        VERSION=0
-     PATCHLEVEL=9999
-          SHORT="deprecated"
-  cat << EOF
-    deprecated spell [replaced by apache1]
-  EOF
diff --git a/http/apache/DOWNLOAD b/http/apache/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/apache/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/apache/HISTORY b/http/apache/HISTORY
deleted file mode 100644
index 8725814..0000000
--- a/http/apache/HISTORY
+++ /dev/null
@@ -1,158 +0,0 @@
-2010-04-09 Mark Bainter <mbainter at sourcemage.org>
-	* DEPENDS: Upated to depend on APACHE provider
-
-2010-03-23 Mark Bainter <mbainter at sourcemage.org>
-	* spell deprecated [renamed to apache1]
-	* PATCHLEVEL=9999
-	* DETAILS: version 0
-   * Deprecated in preparation for turning apache into profile spell (Bug #13532)
-
-2009-09-04 Quentin Rameau <quinq at sourcemage.org>
-	* PRE_BUILD, apache_1.3.41_glic.patch: added, glibc 2.10 compatibility
-
-2008-05-27 Remko van der Vossen <wich at sourcemage.org>
-	* CONFLICTS: conflict with xshttpd if that is compiled without prefix
-
-2008-01-25 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Optionally depend on gdbm (Bug #14241) for mod_rewrite
-
-2008-01-19 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.3.41, SECURITY_PATCH=3
-	  http://httpd.apache.org/security/vulnerabilities_13.html
-
-2007-11-29 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Use upstream apache.gpg
-
-2007-09-10 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.3.39, SECURITY_PATCH=2, updated SOURCE_URLs
-	  CVE-2006-5752, CVE-2007-3304
-
-2006-09-29 Arjan Bouter <abouter at sourcemage.org>
-	* CONFLICTS: added apache22
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-08-13 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.3.37
-
-2006-07-04 George Sherwood <george at beernabeer.com>
-	* DETAILS: Upgrade to 1.3.36
-
-2006-05-11 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.3.35.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-10-22 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.3.34.
-
-2005-04-17 George Sherwood <george at beernabeer.com>
-	* PROVIDES: added APACHE1 (Bug 6705)
-
-2005-03-09 Sergey Lipnevich <sergey at sourcemage.org>
-	* services: remove, no longer used.
-
-2004-10-31 Ladislav Hagara <hgr at vabo.cz>
-	* BUILD: removed the && from the last line
-
-2004-10-29 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 1.3.33 (SECURITY FIX)
-	  Added BUILD_API=2
-	* BUILD: Converted to BUILD_API 2
-
-2004-06-05 Jason Flatt <jflatt at sourcemage.org>
-	* POST_INSTALL: Removed as it was still trying to start the init
-	  script from the old init system.
-
-2004-04-15 Seth Woolley <seth at tautology.org>
-	* DETAILS: updated to 1.3.31 for non-critical security updates
-
-2004-03-11 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* PROVIDES: added provides APACHE, so WEBSERVER can be used more
-	  generally for other web servers too
-
-2003-11-02 Eric Sandall <sandalle at sourcemage.org>
-	* PROVIDES: Upper-case provides
-	* HISTORY: Formatted to Guru Handbook
-
-2003-10-28 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.3.29.
-
-2003-08-22 hgg <hgreig at bigpond.net.au>
-	* DETAILS: Update UPDATED purely for test grimoire integration.
-
-2003-07-30 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* init.d/*: updated to new init system
-	* BUILD: no longer creates /var/run/http dir, the init script
-	  takes care of this
-
-2003-07-18 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.28.
-
-2003-06-29 Sergey Lipnevich <sergey at sourcemage.org>
-	* CONFIGURE: set correct OPTS.
-	* Added a patch for Berkeley DB 4.1.
-	* POST_INSTALL: will check configuration before restarting.
-	  Spell will not stop a running server.
-
-2003-05-01 Rob Verkuylen <rob at verkuylen.net>
-	* init.d/*: Copied /init.d/apache.sh to /init.d/apache.sh
-	  Step 1/3 in bug#: 3115
-
-2003-04-08 M.L. <mlubrano at sourcemage.org>
-	* BUILD: Added $OPTS
-
-2003-02-25 Eric Schabell <eschabell at sourcemage.org>
-	* Cleaned up installscript call, not needed.
-
-2003-02-24 Eric Schabell <eschabell at sourcemage.org>
-	* BUILD: Updated and moved apache.sh to init.d script dir
-	  for correct usage of init.d as now updated in devel grimoire.
-	  runlevel links done automagically, see apache script headder
-	  for runlevel settings.
-
-2002-01-08 Sergey Lipnevich <sergey at sourcemage.org>
-	* apache.sh: Improved init script.
-	  Copy init script only if none present.
-	* BUILD: Create /var/run/httpd directory.
-
-2002-09-01 Sergey Lipnevich <sergey at sourcemage.org>
-	* BUILD: Updated to have --localstatedir=/var, fixing bug 701.
-
-2002-06-19 Eric Schabell <eric at schabell.com>
-	* DETAILS: Security fix version increase, also changed UPDATE field as this
-	  should be applied on your box.
-
-2002-04-08 Eric Schabell <eric at schabell.com>
-	* DETAILS: Reverted back to 1.3.24 due to bugs/complications with php spell and
-	  other user problems.
-
-2002-04-07 Eric Schabell <eric at schabell.com>
-	* DETAILS: Updated version to 2.0.35:
-	* This is the initial, stable release of the Apache 2.0 series. Compared
-	  to the 1.3 series, Apache 2.0 offers higher performance, better
-	  scalability, integrated SSL and WebDAV support, improved HTTP proxy
-	  support, and I/O layering and filtering.
-
-2002-03-28 Eric Schabell <eric at schabell.com>
-	* DETAILS: Added MAINTAINER line.
-
-2002-03-25 Eric Schabell <eric at schabell.com>
-	* DETAILS: Updated version to 1.3.24:
-	  The Apache Group is pleased to announce the release
-	  of the 1.3.24 version of the Apache HTTP server.
-	  Apache 1.3.24 is principally a security and bug fix
-	  release. Of particular note is that 1.3.24 addresses
-	  and fixes the issues noted in CAN-2002-0061 (mitre.org)
-	  regarding escaping of command line args on Win32.
-	  Apache 1.3.24 is the best version of Apache currently
-	  available.
-
-2002-03-13 Eric Schabell <eric at schabell.com>
-	* HISTORY: Added
-
diff --git a/http/apache/INSTALL b/http/apache/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/http/apache/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/apache/PRE_BUILD b/http/apache/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/apache/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/apache/TRIGGERS b/http/apache/TRIGGERS
deleted file mode 100755
index a2943e5..0000000
--- a/http/apache/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast apache dispel_self
diff --git a/http/arora/DEPENDS b/http/arora/DEPENDS
index c294d28..e2bcced 100755
--- a/http/arora/DEPENDS
+++ b/http/arora/DEPENDS
@@ -1 +1 @@
-depends  -sub WEBKIT qt4
+depends  -sub "WEBKIT EXCEPT" qt4
diff --git a/http/arora/HISTORY b/http/arora/HISTORY
index fe08439..5ead92b 100644
--- a/http/arora/HISTORY
+++ b/http/arora/HISTORY
@@ -1,3 +1,6 @@
+2010-09-13 Bor Kraljič <pyrobor at ver.si>
+	* DEPENDS: depend on qt4 with exceptions (fixes bug #15551)
+
 2009-12-06 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.10.2
 
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index fd58dfe..4ad0b28 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=4.0b4
+         VERSION=4.0b6
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -8,7 +8,7 @@ if [[ $FIREFOX_CVS == y ]]; then
 #     SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
   SOURCE2_URL[0]=$SOURCE_URL.asc
 else
-         VERSION=3.6.9
+         VERSION=3.6.10
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 60b926f..28855b8 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,14 @@
+2010-09-18 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 4.0b6
+
+2010-09-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.6.10
+
+2010-09-10 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 4.0b5
+	* INSTALL: 4.0 doesn't use make install anymore. 3.6.x works
+	  with make -f client.mk install
+
 2010-09-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.6.9, SECURITY_PATCH=35
 
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index aba58af..d643e42 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -6,7 +6,7 @@ if  spell_ok  Firebird;  then
   dispel Firebird
 fi  &&
 
-make install &&
+make -f client.mk install &&
 
 
 ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox &&
diff --git a/http/galeon/BUILD b/http/galeon/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/galeon/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/galeon/DEPENDS b/http/galeon/DEPENDS
deleted file mode 100755
index 59ff41a..0000000
--- a/http/galeon/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends epiphany
diff --git a/http/galeon/DETAILS b/http/galeon/DETAILS
deleted file mode 100755
index 6faa5b1..0000000
--- a/http/galeon/DETAILS
+++ /dev/null
@@ -1,28 +0,0 @@
-           SPELL=galeon
-if [ "$GALEON_CVS" = "y" ]; then
-         VERSION=deprecated
-  if [ "$GALEON_CVS_AUTOUPDATE" = "y" ]; then
-         VERSION=deprecated
-  fi
-#          SOURCE=galeon-cvs.tar.bz2
-#   SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:galeon
-  FORCE_DOWNLOAD=1
-#   SOURCE_IGNORE=volatile
-else
-         VERSION=deprecated
-#          SOURCE=galeon-$VERSION.tar.bz2
-#   SOURCE_URL[0]=$SOURCEFORGE_URL/galeon/$SOURCE
-#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-fi
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/galeon-${VERSION}
-PATCHLEVEL=1
-        WEB_SITE=http://galeon.sourceforge.net/
-      LICENSE[0]=GPL
-         ENTERED=20010922
-        KEYWORDS="gnome web http"
-           SHORT="Galeon is a GNOME Web browser based on Gecko"
-cat << EOF
-Galeon is a GNOME Web browser based on Gecko (the Mozilla rendering
-engine). It is fast, has a light interface, and is fully
-standards-compliant.
-EOF
diff --git a/http/galeon/HISTORY b/http/galeon/HISTORY
deleted file mode 100644
index 2aafada..0000000
--- a/http/galeon/HISTORY
+++ /dev/null
@@ -1,223 +0,0 @@
-2009-12-18 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated in favor of epiphany, galeon is not developed
-	anymore, and neither 2.0.7 nor the git version work with any gecko
-	provider we have
-
-2008-10-21 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: removed GECKO, added seamonkey, that's the only one working
-	  right now
-	* BUILD: removed, only necessary for GECKO detection
-
-2007-12-17 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 2.0.4
-
-2007-09-22 Robin Cook <rcook at wyrms.net>
-        * DEPENDS: changed scrollkeeper to rarian
-
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: renamed from galeon2 to galeon
-	* CONFLICTS: conflict to galeon2, removed conflict galeon
-	* PREPARE: persistent_read the variables from galeon2 spell
-
-2007-05-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* CONFLICTS: added conflict galeon for deprecation
-
-2006-11-15 Alexander Tsamutali <astsmtl at gmail.com>
-	* PROVIDES: Added NS-PLUGIN-COMPATIBLE
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-08-30 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* BUILD: added xulrunner support
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-02-27 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 2.0.1
-	* DEPENDS, DETAILS, PRE_BUILD, PREPARE: fixed cvs version, added
-	  cvs autoupdate query
-	* LICENSE: removed, this has been obsolete for ages
-
-2005-12-15 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BUILD: added support for seamonkey as GECKO provider
-
-2005-12-14 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 2.0.0
-	  converted SOURCEHASH to SOURCE_GPG
-
-2005-11-30 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 IGNORE to SOURCE_HASH volatile
-
-2005-11-29 Seth Woolley <seth at tautology.org>
-	* DETAILS: MD5 -> SHA512
-
-2005-04-13 Flavien Bridault <disk at sourcemage.org>
-	* DETAILS: Updated to 1.3.21
-
-2005-05-02 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BUILD: use get_spell_provider to choose between firefox and mozilla
-	* DEPENDS: removed optional_depends on nautilus2 as that doesn't
-	  work with current nautilus2 anymore
-
-2005-04-13 Flavien Bridault <disk at sourcemage.org>
-	* DETAILS: Updated to 1.3.20
-	  Removed '' from MD5SUM and replaced '' by "" in SHORT
-
-2005-02-06 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BUILD: default to build against mozilla if both mozilla and firefox
-	  are installed
-
-2005-01-27 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated to 1.3.19
-	  updated MD5
-	* DEPENDS: changed mozilla to GECKO as now builds against firefox
-	* BUILD: added to set opts depending on firefox or mozilla
-
-2004-10-31 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 1.3.18
-
-2004-10-10 Robin Cook <rcook at wyrms.net>
-	* DETAILS: added option of building cvs version
-	* PREPARE: added to ask CVS question
-	* PRE_BUILD: added to run automake.sh if CVS
-	* DEPENDS: added if CVS depends cvs, autoconf, and automake-1.7
-
-2004-08-11 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.3.17
-	  updated MD5
-	* BUILD: removed css patches
-
-2004-07-20 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* INSTALL: removed, running galeon-config-tool --fix-gconf-permissions
-	  is _very_ harmful (causes all of gconf to be tracked by the galeon2
-	  spell) and useless
-
-2004-07-19 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated UPDATED to recompile applying patches
-	* BUILD: added to apply css-crash fixes.
-	* NOTES: added css-crash-fix-1.patch and css-crash-fix-2.patch
-
-2004-07-18 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: GConf2 renamed to gconf2
-	  Formatted to Guru Handbook
-
-2004-06-04 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.3.16;
-	* BUILD, gcc-3.4.patch: patch not needed (thanks CuZnDragonD);
-	* BUILD, INSTALL: use API 2.
-
-2004-06-02 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 1.3.15
-	* BUILD: removed libegg fix, no longer needed
-	* BUILD, gcc-3.4.patch: fix compilation with gcc 3.4
-	* BUILD: use default_build for middle part so INSTALL_ROOT and mandir
-	  get used
-
-2004-05-09 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BUILD: fix compilation of libegg with gcc 3.4
-
-2004-03-29 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: PhoboX's upgrade to 1.3.14a.
-
-2004-03-28 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: fix SOURCE_DIRECTORY
-
-2004-03-14 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.3.13a thanks to Jeremy Kolb.
-
-2004-01-27 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 1.3.12
-
-2003-12-21 Robin Cook <rcook at wyrms.net>
-	* DETAILS: updated VERSION to 1.3.11a-fixed and MD5 updated
-
-2003-12-10 Sergey Lipnevich <sergey at sourcemage.org>
-	* DEPENDS: add optional nautilus2 dependency thanks to
-	  Arwed v. Merkatz.
-
-2003-12-05 Sergey Lipnevich <sergey at sourcemage.org>
-	* DEPENDS: use `MOZILLA-BROWSER' instead of `mozilla'.
-
-2003-11-03 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.10.
-
-2003-10-28 Eric Sandall <sandalle at sourcemage.org>
-	* PROVIDES: Uppercase provides
-	* HISTORY: Formatted to Guru Handbook
-
-2003-09-18 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.9.
-
-2003-09-17 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.8.
-
-2003-08-05 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: added depends on libgnomeui and scrollkeeper
-
-2003-07-26 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.7.
-
-2003-06-13 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.5 thanks to CuZnDragon.
-
-2003-05-21 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.4 thanks to Steven Pinkham.
-
-2003-03-12 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.3 thanks to CuZnDragon.
-
-2003-02-17 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to 1.3.2 thanks to eric_s at gmx.de.
-
-2003-01-30 Seth Woolley <seth at tautology.org>
-	* DETAILS: Modified to correct MD5
-
-2003-01-16 Sergey Lipnevich <sergey at sourcemage.org>
-	* PROVIDES: Now provides `web-browser' and `graphical-web-browser'.
-
-2002-10-23 Robin Cook <rcook at wyrms.net>
-	* DETAILS: Add MD5
-
-2002-09-17 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: Updated to 1.2.6
-
-2002-06-25 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: Use $SOURCEFORGE_URL
-
-2002-06-19 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: Added myself as MAINTAINER
-	  Added licensing information
-	* DEPENDS: Removed completely bogus gnome-applets dependency
-
-2002-06-16 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: Updated to 1.2.5
-	* BUILD: --disable-werror to build with gcc3
-
-2002-05-26 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: Updated to 1.2.3
-
-2002-05-05 Jon Svendsen <jon-sven at frisurf.no>
-	* DETAILS: Updated to 1.2.1
-
-2002-04-21 Eric Schabell <eric at schabell.com>
-	* ChangeLog,HISTORY: Moved a Changlog entry to the History
-	  file and moved spell from ftp-http section to gnome section.
-
-2002-03-13 Eric Schabell <eric at schabell.com>
-	* HISTORY: Added
-	* DETAILS: Updated version to 1.2.0:
-	* This release requires Mozilla 0.9.9. It features favicon speedups, a
-	  better crash recovery dialog, and fixed memory leaks. It also has new
-	  smart bookmarks and "Properties" and "Page Info" windows. Favicons are
-	  now shown in tabs. Changes in the preferences are now automatically
-	  applied. There is a new bookmarks removal confirmation dialog, session
-	  autosave improvements, and mouse gesture support. A "Copy email
-	  address" context menu item has been added, as well as a native
-	  JavaScript console, and new preference window icons. Also, a lot of
-	  other improvements and bugfixes have been made.
-
diff --git a/http/galeon/INSTALL b/http/galeon/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/http/galeon/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/galeon/PRE_BUILD b/http/galeon/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/galeon/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/galeon/UP_TRIGGERS b/http/galeon/UP_TRIGGERS
deleted file mode 100755
index 8f6394b..0000000
--- a/http/galeon/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger $SPELL dispel_self
diff --git a/http/ijb-waldhoff/BUILD b/http/ijb-waldhoff/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/ijb-waldhoff/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/ijb-waldhoff/CONFLICTS b/http/ijb-waldhoff/CONFLICTS
deleted file mode 100755
index 9ed8442..0000000
--- a/http/ijb-waldhoff/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts ijb-waldhoff y
diff --git a/http/ijb-waldhoff/DEPENDS b/http/ijb-waldhoff/DEPENDS
deleted file mode 100755
index 5c1a0a9..0000000
--- a/http/ijb-waldhoff/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends privoxy
diff --git a/http/ijb-waldhoff/DETAILS b/http/ijb-waldhoff/DETAILS
deleted file mode 100755
index 3cb05a8..0000000
--- a/http/ijb-waldhoff/DETAILS
+++ /dev/null
@@ -1,23 +0,0 @@
-           SPELL=ijb-waldhoff
-         VERSION=2.0.2-8
-#         SOURCE=junkbuster-$VERSION.tar.gz
-#    SOURCE_HASH=sha512:ea3ff8b8f5ebfec37ff4fc3c0eb729e101788966651af06bcc3b6a8d7409917ac888f238e7c72bd134cf775212eb18d253a53ab827f2e7dfc5523fba2e179621
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ijb20
-#  SOURCE_URL[0]=http://www.waldherr.org/redhat/rpm/srpm/$SOURCE
-        WEB_SITE=http://www.waldherr.org/junkbuster
-      PATCHLEVEL=1
-         ENTERED=20010922
-         UPDATED=20040220
-        KEYWORDS="web http"
-           SHORT="junkbuster is an ad filtering web proxy"
-cat << EOF
-The Internet Junkbuster Proxy (TM) blocks unwanted banner ads and
-protects your privacy from cookies and other threats. It's free
-under the GPL. It works as a proxy that stands between your browser
-and the Internet, checking every HTTP request for each resource
-(including graphics) against a blockfile of URLs before sending
-it over the Internet. It can be configured as a plain old
-non-caching, non-blocking proxy as well.
-Note that this versions is not the original version, but an
-enhanced that replaces the ads with a transparent 1x1 gif.
-EOF
diff --git a/http/ijb-waldhoff/HISTORY b/http/ijb-waldhoff/HISTORY
deleted file mode 100644
index 8170f09..0000000
--- a/http/ijb-waldhoff/HISTORY
+++ /dev/null
@@ -1,43 +0,0 @@
-2008-08-21 Martin Spitzbarth <m.spitzbarth at gmx.de>
-	* DETAILS, PRE_BUILD, BUILD, INSTALL, CONFLICTS, DEPENDS, TRIGGERS:
-	  deprecated the spell in favour of privoxy
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed MAINTAINER.
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-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
-
-2005-03-09 Sergey Lipnevich <sergey at sourcemage.org>
-	* services: remove, no longer used.
-
-2004-02-20 Robert Helgesson <rhelgesson at sourcemage.org>
-	* PREPARE: Added deprecation message.
-	* DETAILS: Updated UPDATED.
-
-2003-08-22 hgg <hgreig at bigpond.net.au>
-	* Update UPDATED purely for test grimoire integration.
-
-2003-07-29 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* updated to new init system
-
-2003-05-01 Rob Verkuylen <rob at verkuylen.net>
-	* Copied /junkbuster.sh to /junkbuster
-	  Copied /init.d/junkbuster.sh to /init.d/junkbuster
-	  Step 1/3 in bug#: 3115
-
-2003-03-31 Eric Sandall <sandalle at sourcemage.org>
-	* Updated to use sorcery's init.d installer
-
-2002-03-28 Eric Schabell <eric at schabell.com>
-	* Added MAINTAINER line.
-
-2002-03-13 Eric Schabell <eric at schabell.com>
-	* Added this History file.
-
diff --git a/http/ijb-waldhoff/INSTALL b/http/ijb-waldhoff/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/http/ijb-waldhoff/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/ijb-waldhoff/PREPARE b/http/ijb-waldhoff/PREPARE
deleted file mode 100755
index 0d112b7..0000000
--- a/http/ijb-waldhoff/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-message $PROBLEM_COLOR
-message 'The "ijb-waldhoff" spell has been deprecated. You are adviced to'
-message 'start using the spell "privoxy" instead. The "ijb-waldhoff" spell'
-message 'will be removed in the near future.'
-message $DEFAULT_COLOR
diff --git a/http/ijb-waldhoff/PRE_BUILD b/http/ijb-waldhoff/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/ijb-waldhoff/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/ijb-waldhoff/TRIGGERS b/http/ijb-waldhoff/TRIGGERS
deleted file mode 100644
index 6b60c1d..0000000
--- a/http/ijb-waldhoff/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast ijb-waldhoff dispel_self
diff --git a/http/ijb-waldhoff/init.d/junkbuster b/http/ijb-waldhoff/init.d/junkbuster
deleted file mode 100644
index db94a88..0000000
--- a/http/ijb-waldhoff/init.d/junkbuster
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-PROGRAM=/usr/sbin/junkbuster
-ARGS="/etc/junkbuster/config"
-RUNLEVEL=3
-NEEDS="+remote_fs"
-
-. /etc/init.d/smgl_init
diff --git a/http/ijb/BUILD b/http/ijb/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/ijb/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/ijb/CONFLICTS b/http/ijb/CONFLICTS
deleted file mode 100755
index 30aef27..0000000
--- a/http/ijb/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts ijb y
diff --git a/http/ijb/DEPENDS b/http/ijb/DEPENDS
deleted file mode 100755
index 5c1a0a9..0000000
--- a/http/ijb/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends privoxy
diff --git a/http/ijb/DETAILS b/http/ijb/DETAILS
deleted file mode 100755
index 30a29ee..0000000
--- a/http/ijb/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-           SPELL=ijb
-         VERSION=20
-#         SOURCE=$SPELL$VERSION.tar.Z
-#    SOURCE_HASH=sha512:cb7951767d623e517364bc37c962f6a86002eecacc96c683254a8ab6c5b85518299d18c8eb9773f91368eb6c6231f08f8d177c22c4a58d3d331d2ba1ba3b4a99
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
-#  SOURCE_URL[0]=http://www.junkbuster.com/$SOURCE
-        WEB_SITE=http://www.junkbuster.com
-      PATCHLEVEL=1
-         ENTERED=20010922
-         UPDATED=20040220
-        KEYWORDS="web http"
-           SHORT="ijb, internet junk buster is an ad filtering web proxy"
-cat << EOF
-The Internet Junkbuster Proxy (TM) blocks unwanted banner ads and
-protects your privacy from cookies and other threats. It's free
-under the GPL. It works as a proxy that stands between your browser
-and the Internet, checking every HTTP request for each resource
-(including graphics) against a blockfile of URLs before sending
-it over the Internet. It can be configured as a plain old
-non-caching, non-blocking proxy as well.
-EOF
diff --git a/http/ijb/HISTORY b/http/ijb/HISTORY
deleted file mode 100644
index 4bb6956..0000000
--- a/http/ijb/HISTORY
+++ /dev/null
@@ -1,42 +0,0 @@
-2008-08-21 Martin Spitzbarth <m.spitzbarth at gmx.de>
-	* DETAILS, PRE_BUILD, BUILD, INSTALL, CONFLICTS, DEPENDS, TRIGGERS:
-	  deprecated the spell in favour of privoxy
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed MAINTAINER.
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-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
-
-2005-03-09 Sergey Lipnevich <sergey at sourcemage.org>
-	* services: remove, no longer used.
-
-2004-02-20 Robert Helgesson <rhelgesson at sourcemage.org>
-	* PREPARE: Added deprecation message (bug #3859).
-	* DETAILS: Updated UPDATED.
-
-2003-08-22 hgg <hgreig at bigpond.net.au>
-	* Update UPDATED purely for test grimoire integration.
-
-2003-07-29 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* updated to new init system
-
-2003-05-01 Rob Verkuylen <rob at verkuylen.net>
-	* Copied /init.d/junkbuster.sh to /init.d/junkbuster
-	  Step 1/3 in bug#: 3115
-
-2003-03-31 Eric Sandall <sandalle at sourcemage.org>
-	* Updated to use sorcery's init.d installer
-
-2002-03-28 Eric Schabell <eric at schabell.com>
-	* Added MAINTAINER line.
-
-2002-03-13 Eric Schabell <eric at schabell.com>
-	* Added this History file.
-
diff --git a/http/ijb/INSTALL b/http/ijb/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/http/ijb/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/ijb/PREPARE b/http/ijb/PREPARE
deleted file mode 100755
index 63518b7..0000000
--- a/http/ijb/PREPARE
+++ /dev/null
@@ -1,5 +0,0 @@
-message $PROBLEM_COLOR
-message 'The "ijb" spell has been deprecated. You are adviced to start using'
-message 'the spell "privoxy" instead. The "ijb" spell will be removed in the'
-message 'near future.'
-message $DEFAULT_COLOR
diff --git a/http/ijb/PRE_BUILD b/http/ijb/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/ijb/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/ijb/TRIGGERS b/http/ijb/TRIGGERS
deleted file mode 100755
index ed53b5d..0000000
--- a/http/ijb/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast ijb dispel_self
diff --git a/http/ijb/init.d/junkbuster b/http/ijb/init.d/junkbuster
deleted file mode 100644
index 2527c0d..0000000
--- a/http/ijb/init.d/junkbuster
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-PROGRAM=/usr/sbin/junkbuster
-ARGS="/etc/junkbuster/junkbstr.ini"
-RUNLEVEL=3
-NEEDS="+remote_fs"
-
-. /etc/init.d/smgl_init
diff --git a/http/live-f1/2AD09CBA.gpg b/http/live-f1/2AD09CBA.gpg
new file mode 100644
index 0000000..bbf66cd
Binary files /dev/null and b/http/live-f1/2AD09CBA.gpg differ
diff --git a/http/live-f1/DETAILS b/http/live-f1/DETAILS
index 85e33f4..715fa07 100755
--- a/http/live-f1/DETAILS
+++ b/http/live-f1/DETAILS
@@ -1,9 +1,13 @@
            SPELL=live-f1
-         VERSION=0.2.7
-          SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://ftp.netsplit.com/pub/live-f1/0.2/$SOURCE
-     SOURCE_HASH=sha512:7d8dcd918506ce6dee0da2d0a830a3c6f56b31cc6b6ffa66f52251d724b0729e809eafa56106af2e29887bcdfca8352eaad6e7c8fa947b58283342ab5f49ddc0
+         VERSION=0.2.10
+          SOURCE=$SPELL-$VERSION.tar.gz
+         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_$VERSION
+        WEB_SITE=https://launchpad.net/live-f1
+   SOURCE_URL[0]=https://launchpad.net/live-f1/${VERSION%.*}/$VERSION/+download/$SOURCE
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+      SOURCE_GPG=2AD09CBA.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20070527
            SHORT="a client for viewing the official formula1.com live timing"
diff --git a/http/live-f1/HISTORY b/http/live-f1/HISTORY
index 4422c91..4144409 100644
--- a/http/live-f1/HISTORY
+++ b/http/live-f1/HISTORY
@@ -1,2 +1,8 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.2.10 (fixes bug #15855)
+	  Changed SOURCE extension, fixed SOURCE_URL[0], added WEB_SITE
+	  converted to upstream signature checking
+	* 2AD09CBA.gpg: added gpg keyring
+
 2007-05-27 Alexander Tsamutali <astsmtl at gmail.com>
 	* DETAILS, DEPENDS, HISTORY: Created this spell.
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 37489c5..24c50fc 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -10,11 +10,11 @@ if [[ $MIDORI_VCS == y ]]; then
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.2.7
+         VERSION=0.2.8
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-     SOURCE_HASH=sha512:1ae050fead749e29205c81f56c79f3cc68f3213c674ff92b288c99c844eddc3bf61d743ea9a8ecb07a1fe2aa591937c5105639602381d00aa94ef6d3fb562e61
+     SOURCE_HASH=sha512:75d7868326d6dcac7c68c4adbc28007152e722310847e3b21b8e5f324080fb7e015d1642777a1d878885e8c3fbc96ebe1f698e8b3eebfcabb32fa0899f5472d0
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://software.twotoasts.de/?page=midori
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 2cef223..70ab6c3 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2010-09-19 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 0.2.8
+
 2010-08-16 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 0.2.7
 	* DEPENDS: depends sqlite, 
diff --git a/http/mozilla/BUILD b/http/mozilla/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/mozilla/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/mozilla/DEPENDS b/http/mozilla/DEPENDS
deleted file mode 100755
index 4f1a7ad..0000000
--- a/http/mozilla/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends seamonkey
diff --git a/http/mozilla/DETAILS b/http/mozilla/DETAILS
deleted file mode 100755
index 9079813..0000000
--- a/http/mozilla/DETAILS
+++ /dev/null
@@ -1,7 +0,0 @@
-          SPELL=mozilla
-        VERSION=0
-     PATCHLEVEL=9999
-          SHORT="deprecated"
-  cat << EOF
-    deprecated spell [replaced by seamonkey]
-  EOF
diff --git a/http/mozilla/DOWNLOAD b/http/mozilla/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/mozilla/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/mozilla/HISTORY b/http/mozilla/HISTORY
deleted file mode 100644
index 1804490..0000000
--- a/http/mozilla/HISTORY
+++ /dev/null
@@ -1,419 +0,0 @@
-2008-11-25 George Sherwood <gsherwood at sourcemage.org>
-	* spell deprecated [security issues]
-	* PATCHLEVEL=9999
-	* DETAILS: version 0
-
-2008-03-22 Eric Sandall <sandalle at sourcemage.org>
-	* PRE_BUILD: Apply mimemult.patch for gcc4*
-	* mimemult.patch: Fix compilation (found with gcc 4.3.0)
-	  From http://mail-index.netbsd.org/pkgsrc-bugs/2006/07/19/0000.html
-
-2008-02-11 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated Enigmail to 0.93.2
-	  PATCHLEVEL=1
-	* DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
-	  Fixes Bug #7977
-
-2007-09-29 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* freetype.patch: another fix for a freetype2 api change, some const
-	  were added to functions in freetype
-
-2006-11-15 Alexander Tsamutali <astsmtl at gmail.com>
-	* PROVIDES: Added NS-PLUGIN-COMPATIBLE
-
-2006-10-26 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* INSTALL: use TRACK_ROOT not INSTALL_ROOT when linking #9163
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-06-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS, enigmail.gpg: added public key of enigmail, bug #12333
-
-2006-04-21 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 1.7.13, SECURITY_PATCH=1
-	* PRE_BUILD: small build fix for extensions/p3p broken Makefile.in
-	* gcc4.patch: removed a part that wasn't necessary anymore
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-01-31 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Added UPSTREAM_KEY to SOURCE_GPG
-
-2005-09-23 Thomas Houssin <Thomas.Houssin at sourcemage.org>
-	* DETAILS: Updated to 1.7.12
-
-2005-09-19 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to use vendor Mozilla GPG signatures (mozilla.gpg)
-	  Enigmail updated to 0.92.1
-	  Updated UPDATED for newer Enigmail version
-	* PRE_BUILD: Use default_pre_build
-	  Use unpack_file instead of unpack
-
-2005-08-03 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.7.11.
-
-2005-07-24 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to Mozilla 1.7.10, Enigmail 0.92.0, IPC 1.1.3;
-	* PRE_BUILD: use sorcery API for GCC;
-	* freetype.patch: use the one from Firefox.
-
-2005-07-20 Jeremy Blosser <jblosser-smgl at firinn.org>
-	* INSTALL: Create symlink from /usr/lib/libnssckbi.so if it exists to
-	  $MOZILLA_HOME to get Root CA certs (bug 9208)
-
-2005-05-24 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* CONFIGURE, BUILD: make svg support optional
-	* INSTALL: remove setup of nss stuff, that's part of the nss spell now,
-	  don't add /usr/lib/mozilla to /etc/ld.so.conf, that's unnecessary
-	* BUILD, pkgconfig.patch: fix the pkgconfig files so they use the
-	  system installed mozilla-nspr.pc and mozilla-nss.pc and don't install
-	  their own
-	* BUILD: call make with NSPR_CONFIG=$INSTALL_ROOT/usr/bin/nspr-config
-	  so mozilla-config is generated correctly
-
-2005-05-23 Sergey Lipnevich <sergey at sourcemage.org>
-	* CONFIGURE: question about crypto moved to DEPENDS; remove LDAP;
-	* DEPENDS: include optional nss dependency;
-	* BUILD: use common Mozilla fix-up routine for NSPR and NSS;
-	* gcc4.patch,security_manager_makefile.diff: integrate from Firefox.
-
-2005-05-14 Sergey Lipnevich <sergey at sourcemage.org>
-	* PRE_BUILD,gcc4.patch: integrate patch from Firefox;
-	* DEPENDS: remove NSS.
-
-2005-05-13 Eric Sandall <sandalle at sourcemage.org>
-	* CONFIGURE: Made cairo the default (libart usually gives me problems)
-	* DEPENDS: Forgot to update DEPENDS properly
-	* BUILD: Remove debugging echos
-	  Apply CONFIGURE options (e.g. MOZILLA_CRYPTO)
-	  Apply libart/cairo flags to OPTS
-	  Only do the enigmail export fix if building enigmail
-
-2005-05-12 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to Mozilla 1.7.8 and Enigmail 0.91.0;
-	* DEPENDS: use NSPR and NSS spells;
-	* PROVIDES: no longer provides NSS.
-
-2005-05-05 Eric Sandall <sandalle at sourcemage.org>
-	* CONFIGURE: Converted to config_query* and removed configure_optional
-	* DEPENDS: Use variables from CONFIGURE
-	  Added dependency (and flag) on freetype2
-	* PRE_BUILD: Use variables from CONFIGURE
-	* BUILD: Use variables from CONFIGURE
-	  Only use --enable-strip if the user is using -s in LDFLAGS (strip)
-	* INSTALL: Install profile to INSTALL_ROOT/etc/profile.d
-	* FIXME: This spell is broken with INSTALL_ROOT (check ./configure in
-	  BUILD and the symlink generation in INSTALL)
-
-2005-04-23 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* PRE_BUILD, gcc4.patch: fix compilation with gcc 4.0
-
-2005-04-17 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 1.7.7
-
-2005-03-25 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 1.7.6
-	  Updated Enigmail to 0.90.1
-	  Removed MAKE_NJOBS=1
-	* BUILD,INSTALL: Use new make_single/make_normal
-
-2005-03-03 Arjan Bouter <abouter at sourcemage.org>
-	* desktop/mozilla.desktop: added
-
-2005-01-05 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 1.7.5 (they skipped 1.7.4)
-	  Updated enigmail to 0.89.6
-	  Updated ipc to 1.1.2
-	  Removed extra LICENSE[3] and MD5[3]
-	  Formatted to Guru Handbook
-	  SOURCE_URI now uses "source" instead of "src"
-	  Shortened SHORT
-	  Renamed VERSION2 and VERSION3 to ENIGMAIL_VERSION and IPC_VERSION
-	* xpfe-bootstrap.diff: Updated to 1.7.5
-
-2005-01-04 Eric Sandall <sandalle at sourcemage.org>
-	* CONFLICTS: No longer conflicts with firefox
-
-2004-12-09 Eric Sandall <sandalle at sourcemage.org>
-	* xpfe-bootstrap.diff: Updated to 1.7.3
-	* PRE_BUILD: xpfe-bootstrap.diff now uses -p1
-	  Cleaned up
-
-2004-09-28 Robin Cook <rcook at wyrms.net>
-	* PROVIDES: added GECKO for spells that can use both
-	  mozilla or firefox for the gecko engine
-
-2004-09-20 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.7.3 (security release), Enigmail to 0.86.0.
-
-2004-08-26 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* BUILD: add --mandir switch so manpage goes to the correct location
-
-2004-08-14 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.7.2 (security release), Enigmail to 0.85.0.
-
-2004-07-29 Eric Sandall <sandalle at sourcemage.org>
-	* INSTALL: Install mozilla.sh
-	* mozilla.sh: profile.d script to set MOZILLA_FIVE_HOME
-
-2004-07-18 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: libIDL renamed to libidl
-
-2004-07-18 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.7.1 and Enigmail 0.84.2.
-
-2004-07-04 Sergey Lipnevich <sergey at sourcemage.org>
-	* INSTALL: include David Braaten's patch for proper NSS installation;
-	* PROVIDES: added MOZILLA-NSS;
-	* BUILD, PRE_BUILD: move patching to PRE_BUILD and include freetype 2.1.9.
-
-2004-06-20 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: need enigmail 0.84.1 and ipc 1.0.5;
-	* PRE_BUILD: those were good patches, get them back :-), the problem's still there.
-
-2004-06-18 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 1.7
-	  removed SOURCE4, the extra mozilla-libart tarball isn't needed anymore
-	  BUILD_API=2
-	* PRE_BUILD: removed SOURCE4 stuff
-	* BUILD, INSTALL: split for BUILD_API=2
-	* CONFIGURE: added option to use cairo svg backend
-	* DEPENDS: removed dependency on libart_lgpl, added dependency on cairo,
-	  added optional_depends on gnome-vfs2
-	* PRE_BUILD, libreg-standalone.diff, xpfe-bootstrap.diff: removed these
-	  patches, don't seem to be needed anymore
-	* BUILD, freetype.patch: fix compilation with freetype 2.1.8
-
-2004-05-03 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.7rc1 (SOURCE changed), Enigmail 0.83.6;
-	  added VERSION[2,3] variables for Enigmail and IPC.
-
-2004-03-26 Sergey Lipnevich <sergey at sourcemage.org>
-	* DEPENDS: add libart_lgpl dependency thanks to Wolfgang Scheicher.
-
-2004-03-21 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.7b, EnigMail 0.83.5; change SOURCE name.
-
-2004-02-08 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to Mozilla 1.6 and Enigmail 0.83.latest (.2).
-
-2003-12-10 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to Mozilla 1.6b, Enigmail 0.82.latest (0.82.4),
-	  IPC 1.0.5;
-	* PRE_BUILD, extensions-enigmail-src.diff: patch not necessary.
-
-2003-11-30 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: fix the checksum, I can't trace back how I came up
-	  with the current checksum for version 1.5.
-
-2003-11-26 Eric Sandall <sandalle at sourcemage.org>
-	* BUILD: Quick fix for gaim to work (and anything
-	  else which may need the mozilla libs as such) by adding
-	  /usr/lib/mozilla to /etc/ld.so.conf
-
-2003-11-03 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* PRE_BUILD, DETAILS: added mozilla-libart source so a svg enabled build
-	  is possible
-
-2003-10-28 Eric Sandall <sandalle at sourcemage.org>
-	* PROVIDES: Uppercase provides
-
-2003-09-02 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: Upgrade to Mozilla 1.5, Enigmail 0.76.7.
-
-2003-09-02 Sergey Lipnevich <sergey at sourcemage.org>
-	* Added operation to get rid of /root/.mozconfig in PRE_BUILD.
-
-2003-09-19 Eric Sandall <sandalle at sourcemage.org>
-	* Changed mozilla to mozilla-browser (Bug #4278).
-
-2003-09-02 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgrade to Mozilla 1.5b, Enigmail 0.76.6, and IPC 1.0.4.
-	* Removed conflict with self (why?).
-	* Minor patching.
-
-2003-08-23 Eric Sandall <sandalle at sourcemage.org>
-	* Conflicts with mozilla-nightly, phoenix-devel and Firebird
-
-2003-08-10 hgg <hgreig at bigpond.net.au>
-	* Update BUILD for gcc3.3.1 (--disable-pedantic switch)
-
-2003-07-23 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgrade to Mozilla 1.5a and Enigmail 0.76.3.
-	* Single make job, otherwise Enigmail IDL compilation fails.
-	* [A little later] Downgrade to 1.4 because 1.5a is too raw.
-
-2003-07-09 Sergey Lipnevich <sergey at sourcemage.org>
-	* Sorry, Mozilla, no -O3 for you...
-
-2003-06-30 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgrade to Mozilla 1.4 and Enigmail 0.76.1.
-
-2003-06-29 Sergey Lipnevich <sergey at sourcemage.org>
-	* Removed the part where pentium4 architecture will not use -O3 optimization.
-	* This is fixed by GCC 3.3 (bug 2949). Discovered by Steven Fodstad.
-
-2003-06-16 Sergey Lipnevich <sergey at sourcemage.org>
-	* Changed the UPDATED value to bring everyone to this new version if they want.
-
-2003-06-13 Sergey Lipnevich <sergey at sourcemage.org>
-	* Removed custom install procedure in favor of standard `make install'+ln.
-	* Thanks to Arwed v. Merkatz for the `make install' idea and
-	  to Jimmy Yen for `sln dir dir-$VERSION' idea!
-	* It appears to be not so trivial for a full build, but anyway...
-	* Fix gtk2 directive thanks to CuZnDragon.
-	* Fix Enigmail compilation with two patches.
-
-2003-05-26 Sergey Lipnevich <sergey at sourcemage.org>
-	* Downgraded Enigmail to a proper version 0.75.0.
-	* Remove Blackwood Java extension option.
-	* Make CONFIGURE and BUILD leaner.
-	* Make CONFIGURE ask about Enigmail only if Mail/News client is selected.
-	* Added a composer option.
-	* Added a JavaScript profiling option.
-	* Removed optional dependency on freetype2 because it's part of xfree86 starting from 4.3.
-
-2003-05-21 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgrade to 1.4b, Enigmail 0.75.1.
-	* Added a whopping number of mirrors, eleven (!), thanks to M.L.
-
-2003-04-06 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgrade to 1.4a, Enigmail 0.74.1, and IPC 1.0.3.
-	* URLs changed for Enigmail and IPC.
-	* Replaced --with-xft with --enable-xft, thanks to Kyle (kfergusson at mpdlaw.com).
-	* Remove Tab character from BUILD.
-
-2003-04-05 Sergey Lipnevich <sergey at sourcemage.org>
-	* Put back optimization flags tweaking thanks to Eric Sandall.
-	* See http://bugs.sourcemage.org/show_bug.cgi?id=2949.
-
-2003-03-27 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* removed the setting of PKG_CONFIG_PATH in BUILD
-	* (xfree spell now takes care that pkg-config finds the .pc files)
-
-2003-03-27 Gareth Clay <garethclay at ntlworld.com>
-	* Removed dependency on Xft2 (now uses XFree86's Xft2)
-
-2003-03-13 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgrade to 1.3 release.
-
-2003-02-20 Sergey Lipnevich <sergey at sourcemage.org>
-	* Added Calendar support as suggested by Jimmy Yen.
-	* Tests show that libical is not required.
-
-2003-02-18 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgraded to Enigmail 0.73.1 and IPC 1.0.2, required for Mozilla 1.3b.
-	* Updated URLs of these two source tarballs.
-
-2003-02-17 Sergey Lipnevich <sergey at sourcemage.org>
-	* Added `--disable-installer' to ./configure.
-	* Upgraded to 1.3b, but no Enigmail 0.73.0 source tarball is available ATM.
-	* Choosing Enigmail plugin is not recommended.
-
-2003-01-16 Sergey Lipnevich <sergey at sourcemage.org>
-	* Added `web-browser' and `graphical-web-browser' to
-	  the `provides' file.
-
-2002-12-16 Sergey Lipnevich <sergey at sourcemage.org>
-	* Updated to 1.3a + a fix for mail performance regression.
-	* Made Xinerama support disabled by default because GTK+2
-	  doesn't have it by default as well.
-
-2002-12-15 Sergey Lipnevich <sergey at sourcemage.org>
-	* Question about LDAP schema will be asked.
-	* Patch for Galeon is back.
-
-2002-12-04 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgraded to 1.2.1 and Enigmail to 0.71.0.
-	* Made PSM (and hence Enigmail) to compile and function.
-	* Reorganized support for Xft2 and freetype2 into optional
-	  dependencies, no questions asked in CONFIGURE.
-	* Changed to depend on ORBit2.
-	* Made a temporary fix where answer for MOZILLA_EMAIL is
-	  the fefault for MOZILLA_ENIGMAIL, so that there is a chance
-	  that people will not ask for Enigmail without Mail client.
-	* TODO: fix the above mentioned fix.
-	* Added libIDL as required dependency.
-
-2002-11-10 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgraded to version 1.2.
-	* Removed patching for Xft2 and GTK+2.
-	* Added optional depends for openldap instead
-	  of asking for them in CONFIGURE. Let the sorcery rule this.
-	* Calendar question removed because the calendar itself is not
-	  included in the standard source.
-
-2002-11-10 Sergey Lipnevich <sergey at sourcemage.org>
-	* Upgraded Enigmail plugin to 0.70.0.
-	* "No questions asked" Galeon 2 support. Default toolkit is GTK 2 now.
-
-2002-11-03 Robin Cook <rcook at wyrms.net>
-	* Added galeon2 support
-	* Added installing of mozilla-gtkmozembed.pc
-
-2002-10-09 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* Added fontconfig/Xft2 support
-
-2002-10-02 Sergey Lipnevich <sergey at sourcemage.org>
-	* Introduced a function configure_set_bool in CONFIGURE.
-
-2002-09-30 Geoffrey Derber <gderber at sourcemage.org>
-	* Added the Enigmail plugin.
-
-2002-09-01 Sergey Lipnevich <sergey at sourcemage.org>
-	* Updated to 1.1, added checksum and license information.
-	* Created a SOURCE_URI variable to use in SOURCE_URL[n] array.
-	* Added `provides' information according to bug 805.
-
-2002-07-02 Justin Rocha <jrocha at sourcemage.org>
-	* Removed compile optomizations, as per Mozilla bug #148723
-
-2002-06-06 Mads Laursen <dossen+sgl at daimi.au.dk>
-	* Even more options (mail/news, chat and freetype).
-	* And added Mads as maintainer (Eric Schabell)
-
-2002-06-05 Mads Laursen <dossen+sgl at daimi.au.dk>
-	* BUILD updated to build with SVG support and other optional stuff.
-	* Added dependency for perl (configure checks for it).
-	* Ohh, and it's version 1.0...
-
-2002-05-12 Justin Rocha <jrocha at sourcemage.org>
-	* Bumped version to 1.0rc2
-
-2002-04-24 Eric Schabell <eric at schabell.com>
-	* Bug fix, my fault, fixed DETAILS file source line,
-	  copied dezmond's fix incorrectly...
-	  flame me not him! ;)
-
-2002-04-23 The Well-Beloved Bard <dezmond at bardicgrove.org>
-	* Version upgrade 1.0rc1:
-	* Mozilla has released a new version (1.0rc1), and broken the spell in 
-	  doing so. The directory and filename represent the version differently.
-
-2002-04-11 Yoav Avitzour <avitzour at princeton.edu>
-	* Commented the /etc/mozilla references from BUILD. This means
-	  the spell ignores any previous configuration that existed
-	  in /etc/mozilla, however, since this configuration is from 
-	  some reason deleted anyway during the cast, it does not 
-	  matter for now and it's a bad fix (but still a fix) for a 
-	  broken spell
-
-2002-04-08 Jon Svendsen <jon-sven at frisurf.no>
-	* Install NSS headers
-	  symlink libraries into /usr/lib on install
-
-2002-03-29 Mads Laursen <dossen+sgl at daimi.au.dk>
-	* Added symlink to config in /etc
-
-2002-03-18 Eric Schabell <eric at schabell.com>
-	* Updated UPDATE field as was set to OO for 
-	  month, sorry for the recompile.... I know...
-
-2002-03-13 Eric Schabell <eric at schabell.com>
-	* Added this History file.
-
diff --git a/http/mozilla/INSTALL b/http/mozilla/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/http/mozilla/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/mozilla/PRE_BUILD b/http/mozilla/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/mozilla/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/mozilla/TRIGGERS b/http/mozilla/TRIGGERS
deleted file mode 100755
index 53a712e..0000000
--- a/http/mozilla/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast mozilla dispel_self
diff --git a/http/nvu/BUILD b/http/nvu/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/nvu/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/nvu/CONFLICTS b/http/nvu/CONFLICTS
deleted file mode 100755
index 6af401c..0000000
--- a/http/nvu/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts  nvu  y
diff --git a/http/nvu/DEPENDS b/http/nvu/DEPENDS
deleted file mode 100755
index 2ebeb53..0000000
--- a/http/nvu/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  kompozer
diff --git a/http/nvu/DETAILS b/http/nvu/DETAILS
deleted file mode 100755
index cebc3e6..0000000
--- a/http/nvu/DETAILS
+++ /dev/null
@@ -1,25 +0,0 @@
-           SPELL=nvu
-         VERSION=1.0
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-      PATCHLEVEL=1
-        WEB_SITE=http://www.nvu.com/
-        KEYWORDS="web http editors"
-         ENTERED=20070417
-           SHORT='GECKO-based web editing environment'
-cat << EOF
-Nvu is the new Web editing environment based on the Mozilla platform and its Gecko layout engine. Primarily made for  Linspire  and other Linux flavors, its cross-platform architecture makes it available on a wide variety of other platforms. 
-Features:
-  * WYSIWYG editing of pages, making web creation as easy as typing a letter
-    with your word processor.
-  * Integrated file management via FTP. Simply login to your web site and
-    navigate through your files, editing web pages on the fly, directly from
-    your site.
-  * Reliable HTML code creation that will work with all of today's most popular
-    browsers.
-  * Jump between WYSIWYG Editing Mode and HTML using tabs.
-  * Tabbed editing to make working on multiple pages a snap.
-  * Powerful support for forms, tables, and templates.
-  * The easiest-to-use, most powerful Web Authoring System available for
-    Desktop Linux, Microsoft Windows and Apple Macintosh users.
-
-EOF
diff --git a/http/nvu/HISTORY b/http/nvu/HISTORY
deleted file mode 100644
index 7985d0b..0000000
--- a/http/nvu/HISTORY
+++ /dev/null
@@ -1,26 +0,0 @@
-2008-03-12 Eric Sandall <sandalle at sourcemage.org>
-	* Deprecate in favour of maintained kompozer (fork of defunct nvu)
-
-2008-02-11 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS, PRE_BUILD, BUILD: Create unique SOURCE_DIRECTORY
-	  Fixes Bug #7977
-
-2007-04-17 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created
-	  Note that SVG is broken (both cairo and libart_lgpl), so disable it
-	* security_manager_makefile.diff: Copied from mozilla and updated to
-	  nvu 1.0
-	* nvu-1.0-gcc4-1.patch: Copied from http://aur.archlinux.org/packages/nvu-kde/nvu-kde/nvu-1.0-gcc4-1.patch
-	  to fix compilation with gcc 4.1.x
-	* nvu-1.0-glibc-2.4.patch: Copied from http://aur.archlinux.org/packages/nvu-kde/nvu-kde/nvu-1.0-glibc-2.4.patch
-	  to fix compilation with glibc 2.4
-	  Updated for nvu 1.0
-	* gfxshared_s.patch: Properly link against gfxshared_s
-	  From http://www.redhat.com/archives/fedora-cvs-commits/2005-April/msg00816.html
-	  Updated to nvu 1.0
-	* xprintutil.patch: Link against xprintutil
-	  Updated to nvu 1.0
-	  From http://www.linuxfromscratch.org/patches/downloads/mozilla/mozilla-1.7.12-gfx_fixes-1.patch
-	* desktop/nvu.desktop: Copied from mozilla and modified for nvu
-	* nvu: Run script copied and modified from firefox
-
diff --git a/http/nvu/INSTALL b/http/nvu/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/http/nvu/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/nvu/PRE_BUILD b/http/nvu/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/http/nvu/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/http/nvu/TRIGGERS b/http/nvu/TRIGGERS
deleted file mode 100755
index 9d130bc..0000000
--- a/http/nvu/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast  nvu  dispel_self
diff --git a/http/nvu/gfxshared_s.patch b/http/nvu/gfxshared_s.patch
deleted file mode 100644
index f96f0b7..0000000
--- a/http/nvu/gfxshared_s.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur mozilla.orig/gfx/src/gtk/Makefile.in mozilla/gfx/src/gtk/Makefile.in
---- mozilla.orig/gfx/src/gtk/Makefile.in	2007-04-17 12:44:26.861000605 -0700
-+++ mozilla/gfx/src/gtk/Makefile.in	2007-04-17 12:45:12.523034576 -0700
-@@ -135,6 +135,8 @@
- SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)gfxft2_s.$(LIB_SUFFIX)
- endif
- 
-+EXTRA_DSO_LDOPTS = $(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX)
-+
- include $(topsrcdir)/config/rules.mk
- 
- ifdef MOZ_ENABLE_XINERAMA
-@@ -145,7 +147,6 @@
- EXTRA_DSO_LDOPTS += \
- 		$(LIBS_DIR) \
- 		-lgkgfx \
--		-lgfxshared_s \
- 		$(GFX_XINERAMA_LIBS) \
- 		-lgtksuperwin \
- 		$(MOZ_COMPONENT_LIBS) \
-@@ -165,7 +166,6 @@
- ifdef MOZ_ENABLE_GTK2
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
- 		-lgkgfx \
--		-lgfxshared_s \
- 		$(GFX_XINERAMA_LIBS) \
- 		$(MOZ_JS_LIBS) \
- 		$(MOZ_UNICHARUTIL_LIBS) \
diff --git a/http/nvu/nvu b/http/nvu/nvu
deleted file mode 100644
index c42eadc..0000000
--- a/http/nvu/nvu
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# Created by Eric Sandall 2007-04-17
-#
-# This script is here to set the correct LD_LIBRARY_PATH for firefox 1.0+
-# based on the information from this thread:
-# http://lists.freebsd.org/pipermail/freebsd-gnome/2004-October/008443.html
-#
-
-export LD_LIBRARY_PATH=/usr/lib/nvu
-remote=""
-if /usr/lib/nvu/nvu-bin -remote "ping()" > /dev/null 2>&1 ; then
-	if [ -z "$@" ] ; then
-		remote='-remote xfeDoCommand(openBrowser)'
-	fi
-fi
-
-/usr/lib/nvu/nvu-bin $remote $@
diff --git a/http/nvu/nvu-1.0-gcc4-1.patch b/http/nvu/nvu-1.0-gcc4-1.patch
deleted file mode 100644
index ff58d9b..0000000
--- a/http/nvu/nvu-1.0-gcc4-1.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
---- mozilla-orig/security/nss/lib/pki1/oiddata.h	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/oiddata.h	2005-03-13 19:15:19.000000000 -0500
-@@ -43,12 +43,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
--/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--/*extern const PRUint32 nss_attribute_type_alias_count;*/
--
- extern const NSSOID *NSS_OID_RFC1274_UID;
- extern const NSSOID *NSS_OID_RFC1274_EMAIL;
- extern const NSSOID *NSS_OID_RFC2247_DC;
-diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
---- mozilla-orig/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:15:19.000000000 -0500
-@@ -233,12 +233,6 @@
- #include "nsspki1t.h"
- #endif /* NSSPKI1T_H */
- 
--extern const NSSOID nss_builtin_oids[];
--extern const PRUint32 nss_builtin_oid_count;
--
--/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
--/*extern const PRUint32 nss_attribute_type_alias_count;*/
--
- EOD
-     ;
- 
-diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
---- mozilla-orig/security/nss/lib/pki1/pki1.h	2005-03-13 19:12:25.000000000 -0500
-+++ mozilla/security/nss/lib/pki1/pki1.h	2005-03-13 19:15:19.000000000 -0500
-@@ -55,7 +55,9 @@
- 
- PR_BEGIN_EXTERN_C
- 
--/* fgmr 19990505 moved these here from oiddata.h */
-+extern const NSSOID nss_builtin_oids[];
-+extern const PRUint32 nss_builtin_oid_count;
-+
- extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
- extern const PRUint32 nss_attribute_type_alias_count;
- 
-diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h
---- mozilla-orig/xpcom/base/nscore.h	2005-07-24 05:07:54.627311840 +0000
-+++ mozilla/xpcom/base/nscore.h	2005-07-24 05:13:02.327534296 +0000
-@@ -365,8 +365,9 @@
-  * Use these macros to do 64bit safe pointer conversions.
-  */
- 
--#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
--#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
-+#define NS_PTR_TO_INT32(x)  ((PRInt32)  (PRWord) (x))
-+#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x))
-+#define NS_INT32_TO_PTR(x)  ((void *)   (PRWord) (x))
- 
- /*
-  * These macros allow you to give a hint to the compiler about branch
-diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
---- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	2005-07-24 05:07:51.199832896 +0000
-+++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	2005-07-24 05:13:08.302625944 +0000
-@@ -834,8 +834,8 @@
- void
- nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
- {
--    PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
--    PRUint16 value =  PRUint32(param) & 0x0000FFFF;
-+    PRUint16 name  = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16;
-+    PRUint16 value =  NS_PTR_TO_UINT32(param) & 0x0000FFFF;
- 
-     switch (name) {
-     case MAX_CONNECTIONS:
-diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp
---- mozilla-orig/widget/src/gtk2/nsDragService.cpp	2005-07-24 05:08:57.666728392 +0000
-+++ mozilla/widget/src/gtk2/nsDragService.cpp	2005-07-24 05:13:33.910732920 +0000
-@@ -838,7 +838,7 @@
-             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-         listTarget->target = g_strdup(gMimeListType);
-         listTarget->flags = 0;
--        listTarget->info = (guint)listAtom;
-+        listTarget->info = GPOINTER_TO_UINT(listAtom);
-         PR_LOG(sDragLm, PR_LOG_DEBUG,
-                ("automatically adding target %s with id %ld\n",
-                listTarget->target, listAtom));
-@@ -877,7 +877,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             listTarget->target = g_strdup(gTextUriListType);
-                             listTarget->flags = 0;
--                            listTarget->info = (guint)listAtom;
-+                            listTarget->info = GPOINTER_TO_UINT(listAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", listTarget->target, listAtom));
-@@ -914,7 +930,7 @@
-                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                         target->target = g_strdup(flavorStr);
-                         target->flags = 0;
--                        target->info = (guint)atom;
-+                        target->info = GPOINTER_TO_UINT(atom);
-                         PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                ("adding target %s with id %ld\n",
-                                target->target, atom));
-@@ -931,7 +947,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             plainTarget->target = g_strdup(kTextMime);
-                             plainTarget->flags = 0;
--                            plainTarget->info = (guint)plainAtom;
-+                            plainTarget->info = GPOINTER_TO_UINT(plainAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", plainTarget->target, plainAtom));
-@@ -948,7 +964,7 @@
-                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
-                             urlTarget->target = g_strdup(gMozUrlType);
-                             urlTarget->flags = 0;
--                            urlTarget->info = (guint)urlAtom;
-+                            urlTarget->info = GPOINTER_TO_UINT(urlAtom);
-                             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                                    ("automatically adding target %s with \
-                                    id %ld\n", urlTarget->target, urlAtom));
-diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp
---- mozilla-orig/gfx/src/freetype/nsFreeType.cpp	2005-10-22 13:17:35.151589250 -0500
-+++ mozilla/gfx/src/freetype/nsFreeType.cpp	2005-10-22 13:23:07.672370500 -0500
-@@ -96,7 +96,7 @@
- // Define the FreeType2 functions we resolve at run time.
- // see the comment near nsFreeType2::DoneFace() for more info
- //
--#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
-+#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
- FtFuncList nsFreeType2::FtFuncs [] = {
-   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
-   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
diff --git a/http/nvu/nvu-1.0-glibc-2.4.patch b/http/nvu/nvu-1.0-glibc-2.4.patch
deleted file mode 100644
index da92f8d..0000000
--- a/http/nvu/nvu-1.0-glibc-2.4.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur mozilla.orig/xpcom/base/nsStackFrameUnix.cpp mozilla/xpcom/base/nsStackFrameUnix.cpp
---- mozilla.orig/xpcom/base/nsStackFrameUnix.cpp	2007-04-17 12:44:25.090270741 -0700
-+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2007-04-17 13:09:43.169678209 -0700
-@@ -77,9 +77,20 @@
- #endif // MOZ_DEMANGLE_SYMBOLS
- }
- 
-+#if defined(linux) // Linux
-+#if (__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)) // use glibc backtrace()
-+#include <execinfo.h>
-+void DumpStackToFile(FILE* aStream)
-+{
-+  void *array[20];
-+  size_t size;
- 
--#if defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // i386 or PPC Linux stackwalking code
-+  fflush(aStream);
-+  size = backtrace (array, 20);
-+  backtrace_symbols_fd (array, size, fileno(aStream));
-+}
- 
-+#elif defined(__GLIBC__) && (defined(__i386) || defined(PPC)) // old style i386 or PPC Linux stackwalking code
- #include <setjmp.h>
- //
- 
-@@ -135,6 +146,13 @@
-   }
- }
- 
-+#else // not implemented
-+void DumpStackToFile(FILE* aStream)
-+{
-+  fprintf(aStream, "Info: Stacktrace not implemented for this Linux platform\n");
-+}
-+#endif // Linux
-+
- #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))
- 
- /*
-diff -Naur mozilla.orig/xpcom/base/nsTraceRefcntImpl.cpp mozilla/xpcom/base/nsTraceRefcntImpl.cpp
---- mozilla.orig/xpcom/base/nsTraceRefcntImpl.cpp	2007-04-17 12:44:25.089270894 -0700
-+++ mozilla/xpcom/base/nsTraceRefcntImpl.cpp	2007-04-17 13:09:43.174677447 -0700
-@@ -857,8 +857,8 @@
- }
- 
- // WIN32 x86 stack walking code
--// i386 or PPC Linux stackwalking code or Solaris
--#elif (defined(linux) && defined(__GLIBC__) && (defined(__i386) || defined(PPC))) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
-+// Linux stackwalking code or Solaris
-+#elif (defined(linux) && defined(__GLIBC__)) || (defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386)))
- #include "nsStackFrameUnix.h"
- void
- nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
diff --git a/http/nvu/nvu-1.0-sources.tar.bz2.sig b/http/nvu/nvu-1.0-sources.tar.bz2.sig
deleted file mode 100644
index 99b539a..0000000
Binary files a/http/nvu/nvu-1.0-sources.tar.bz2.sig and /dev/null differ
diff --git a/http/nvu/security_manager_makefile.diff b/http/nvu/security_manager_makefile.diff
deleted file mode 100644
index 27f978b..0000000
--- a/http/nvu/security_manager_makefile.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur mozilla.orig/security/manager/Makefile.in mozilla/security/manager/Makefile.in
---- mozilla.orig/security/manager/Makefile.in	2007-04-17 11:54:03.749195266 -0700
-+++ mozilla/security/manager/Makefile.in	2007-04-17 11:54:05.041998040 -0700
-@@ -30,35 +30,6 @@
- MODULE = psm
- 
- PACKAGE_FILE = psm.pkg
--PACKAGE_VARS += \
--	NSS3_LIB \
--	SMIME3_LIB \
--	SSL3_LIB \
--	SOFTOKEN3_LIB \
--	SOFTOKEN3_CHK \
--	LOADABLE_ROOT_MODULE \
--	HAVE_FREEBL_MODULES \
--	$(NULL)
--
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
--
--NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
--SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
--SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
--SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
--
--ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
--ifeq (,$(filter i86pc ia64,$(OS_TEST)))
--ifndef HAVE_64BIT_OS
--HAVE_FREEBL_MODULES = 1
--FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
--FREEBL_PURE32_CHK = libfreebl_pure32_3.chk
--FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
--FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
--endif
--endif
--endif
- 
- # NSS makefiles are not safe for parallel execution.
- DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-@@ -120,19 +91,7 @@
- include $(topsrcdir)/config/rules.mk
- 
- # Attempt to properly handle NSS' refusal to implement a dependency system
--export:: .nss.cleaned
--
--.nss.cleaned: .nss.checkout
--	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
--	touch $@
--
--.nss.checkout:
--	touch $(srcdir)/$@
-+export::
- 
- dependclean export packages chrome::
- 	$(MAKE) -C boot $@
-@@ -143,48 +102,6 @@
- 
- libs::
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--ifeq ($(OS_ARCH),WINNT)
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--else
--	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
--endif
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
--endif
--ifndef DISABLE_DIST_GRE
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
--endif
--endif
--ifndef _SKIP_OLD_GRE_INSTALL
--	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
--ifndef SKIP_CHK
--	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
--endif
--	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
--ifdef HAVE_FREEBL_MODULES
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
--	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
--	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
--endif
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -192,20 +109,6 @@
- endif
- 
- install::
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
--ifndef SKIP_CHK
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
--endif
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
--ifdef HAVE_FREEBL_MODULES
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
--	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
--endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
- ifdef MOZ_XUL
-@@ -219,11 +122,6 @@
- 	$(MAKE) -C pki $@
- endif
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 
- echo-requires-recursive::
- 	$(MAKE) -C boot $@
diff --git a/http/nvu/xprintutil.patch b/http/nvu/xprintutil.patch
deleted file mode 100644
index 1c7b85f..0000000
--- a/http/nvu/xprintutil.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mozilla.orig/gfx/src/gtk/Makefile.in mozilla/gfx/src/gtk/Makefile.in
---- mozilla.orig/gfx/src/gtk/Makefile.in	2007-04-17 12:44:26.861000605 -0700
-+++ mozilla/gfx/src/gtk/Makefile.in	2007-04-17 13:03:22.151804875 -0700
-@@ -197,9 +197,9 @@
- endif
- 
- ifdef MOZ_ENABLE_XPRINT
-+EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)xprintutil.$(LIB_SUFFIX)
- DEFINES         += -DUSE_XPRINT -DUSE_MOZILLA_TYPES
- EXTRA_DSO_LDOPTS += \
--		-lxprintutil \
- 		$(MOZ_XPRINT_LDFLAGS)
- endif
- 
diff --git a/http/pywebkitgtk/DETAILS b/http/pywebkitgtk/DETAILS
index 4c5607c..ba8be6b 100755
--- a/http/pywebkitgtk/DETAILS
+++ b/http/pywebkitgtk/DETAILS
@@ -1,8 +1,8 @@
            SPELL=pywebkitgtk
-         VERSION=1.1.7
+         VERSION=1.1.8
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://pywebkitgtk.googlecode.com/files/$SOURCE
-     SOURCE_HASH=sha512:61c67f741d0a7da5c46f0805d556a310cf239edb8aca5de28dca70048a03872d0931540c89220e5475c21602b253eab3166da62b7ac1ee3a32849ee9bd056d47
+     SOURCE_HASH=sha512:97f027db252850c67a875089b5c0769bfe32313b534c45e49f2da4e1bf38eef597dbf14c880519db38d9da10d55ec84ae0b8d684bf229a5a86bf40919745db9b
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://code.google.com/p/pywebkitgtk/
       LICENSE[0]=PYTHON
diff --git a/http/pywebkitgtk/HISTORY b/http/pywebkitgtk/HISTORY
index 2099400..4742115 100644
--- a/http/pywebkitgtk/HISTORY
+++ b/http/pywebkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-09-23 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.1.8
+
 2009-10-04 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.1.7
 
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 8c23f7a..37e0587 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -36,9 +36,15 @@ if [[ "$SEAMONKEY_XINERAMA" == "--enable-xinerama" ||     \
 else
    SEAMONKEY_XINERAMA=n
 fi &&
+
+config_query  SEAMONKEY_CAIRO                             \
+                     "Use system installed cairo?"        \
+                      n                                   &&
+
 config_query  SEAMONKEY_XINERAMA                          \
                      'Enable Xinerama support?'           \
                      n                                    &&
+
 config_query  SEAMONKEY_PANGO                             \
                      'Enable Pango support for complex font rendering?' \
                      n                                    &&
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index eb01c9d..c267ad7 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,4 +1,6 @@
-depends cairo &&
+if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
+   depends cairo
+fi &&
 depends  gtk+2  &&
 depends  jpeg   &&
 depends  libidl  &&
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 5248bb6..df654a2 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,7 +1,7 @@
            SPELL=seamonkey
-         VERSION=2.0.7
+         VERSION=2.0.8
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:2634e25f2bc4c3f1fc95e6062f873ce15c366ac681dac838d2068da6f8c5931f669134469885fbb3a4954059f7ae37bb0bde665e3cd330d6296b87d4f6a54109
+     SOURCE_HASH=sha512:222a596e846e14050fb2dfd16bc5db63d3ea1ea031ff704435c53d7a01abb051356b54e4adcab894c6f9a14c58f9d3e326cf6cca75fbfc78bc52e628e315da0f
 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
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 5687f44..0f0d134 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,12 @@
+2010-09-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.0.8
+
+2010-09-12 George Sherwood <gsherwood at sourcemage.org>
+	* CONFIGURE: Added option to use system installed cairo
+	* PRE_BUILD: Set option to enable/disable system installed cairo
+	* blfs-mozconfig: Removed default use of system cairo
+	* DEPENDS: Make depends cairo conditional
+
 2010-09-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.7, SECURITY_PATCH=26
 	* PRE_BUILD: added --disable-crashreporter, broken
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 5fee834..d3cf3c6 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -7,6 +7,12 @@ cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&
 
 #cp -v $SPELL_DIRECTORY/blfs-mozconfig mozilla/.mozconfig &&
 
+if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
+   sed -i '85iac_add_options --enable-system-cairo' .mozconfig
+else
+   sed -i '85iac_add_options --disable-system-cairo' .mozconfig
+fi &&
+
 if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
    sed -i '85iac_add_options --disable-mailnews' .mozconfig
 fi &&
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
index cdc3eb4..8d9b6d3 100644
--- a/http/seamonkey/blfs-mozconfig
+++ b/http/seamonkey/blfs-mozconfig
@@ -32,7 +32,7 @@ ac_add_options --prefix=/usr
 ac_add_options --with-system-zlib
 ac_add_options --with-system-png
 ac_add_options --with-system-jpeg
-ac_add_options --enable-system-cairo
+#ac_add_options --enable-system-cairo
 
 # This option specifies to include support for rendering the HTML
 # <canvas></canvas> tag in the SeaMonkey browser.
diff --git a/http/squid/DETAILS b/http/squid/DETAILS
index 63e1ccf..24551af 100755
--- a/http/squid/DETAILS
+++ b/http/squid/DETAILS
@@ -1,12 +1,12 @@
            SPELL=squid
-         VERSION=3.1.7
+         VERSION=3.1.8
           SOURCE=$SPELL-$VERSION.tar.bz2
 #        SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       SOURCE_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE
 #    SOURCE2_URL=http://www.squid-cache.org/Versions/v${VERSION%%\.*}/${VERSION%\.*}/$SOURCE2
 #     SOURCE_GPG=squid.gpg:$SOURCE2
-     SOURCE_HASH=sha512:2bb33b076a127d7326a287c588ba36ce31201d1611e93aec6586d6c9dfb0eab5185fd6426c937319e04ae16c9b3f630c407729c83015b1014701ee025ba8b469
+     SOURCE_HASH=sha512:89256943414e315b26c4030c068874defa1847ebd3546b03b08b7ad9b8cdd234aaaff19978abf43a9e5e51ff35979ba8e72314274123043e981702f4d8ffc435
         WEB_SITE=http://www.squid-cache.org/
          ENTERED=20011214
   SECURITY_PATCH=1
diff --git a/http/squid/HISTORY b/http/squid/HISTORY
index 5865915..21f125c 100644
--- a/http/squid/HISTORY
+++ b/http/squid/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.1.8
+
 2010-08-28 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.1.7
 
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 20725b8..6facb12 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,9 +1,9 @@
            SPELL=webkitgtk
 if [[ $WEBKITGTK_NIGHT == "y" ]]; then
-         VERSION=1.3.3
+         VERSION=1.3.4
           SOURCE=webkit-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.webkitgtk.org/$SOURCE
-     SOURCE_HASH=sha512:9159f2542a704072b7106ef153126f9ca4926c0cf433662e65732c59115b2793f152ab3d3769398498b0a021fd2604e6d539f7385988080712dea807145da246
+     SOURCE_HASH=sha512:ebdd3309af6d4e6725e781bf6fb788f56e3c992ebcde8a6bd75c75db29803dd0a5f52c6b47338378b5622fa6763943081b247ea3df4265990ea9752e0c5a1a66
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/webkit-$VERSION"
 else
          VERSION=1.2.4
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 915f70a..9fee456 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2010-09-26 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated devel to version 1.3.4
+
 2010-09-06 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.2.4, SECURITY_PATCH=1
 
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 4cf1f3b..599d041 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xulrunner
-         VERSION=1.9.2.9
-       FFVERSION=3.6.9
+         VERSION=1.9.2.10
+       FFVERSION=3.6.10
           SOURCE=firefox-$FFVERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 887d61d..04a52d3 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2010-09-16 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.9.2.10, FFVERSION=3.6.10
+
 2010-09-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.9.2.9, FFVERSION=3.6.9, SECURITY_PATCH=17
 	* DEPENDS: added -sub SECURE_DELETE to sqlite
diff --git a/kde-apps/kxneur/BUILD b/kde-apps/kxneur/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde-apps/kxneur/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde-apps/kxneur/DEPENDS b/kde-apps/kxneur/DEPENDS
deleted file mode 100755
index 949defd..0000000
--- a/kde-apps/kxneur/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gxneur
diff --git a/kde-apps/kxneur/DETAILS b/kde-apps/kxneur/DETAILS
deleted file mode 100755
index c72d38c..0000000
--- a/kde-apps/kxneur/DETAILS
+++ /dev/null
@@ -1,7 +0,0 @@
-          SPELL=kxneur
-        VERSION=0
-     PATCHLEVEL=9999
-          SHORT="deprecated"
-  cat << EOF
-    deprecated spell [replaced by gxneur]
-  EOF
diff --git a/kde-apps/kxneur/DOWNLOAD b/kde-apps/kxneur/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde-apps/kxneur/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde-apps/kxneur/HISTORY b/kde-apps/kxneur/HISTORY
deleted file mode 100644
index cb916f3..0000000
--- a/kde-apps/kxneur/HISTORY
+++ /dev/null
@@ -1,16 +0,0 @@
-2010-03-19 Pol Vinogradov <vin.public at gmail.com>
-	* spell deprecated [No longer upstream support]
-	* PATCHLEVEL=9999
-	* DETAILS: version 0
-
-2008-06-25 Pol Vinogradov <vin.public at gmail.com>
-	* DETAILS: updated to 0.9.0
-
-2007-10-13 Pol Vinogradov <vin.public at gmail.com>
-	* DETAILS: updated to 0.8.0, added sourcing of
-	  section-wide KDE_DETAILS
-	* BUILD, CONFIGURE: added for section way of building
-	* DEPENDS: added sourcing of section-wide KDE_DEPENDS
-
-2007-07-26 Pol Vinogradov <vin.public at gmail.com>
-	* DETAILS, DEPENDS: created spell
diff --git a/kde-apps/kxneur/INSTALL b/kde-apps/kxneur/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kde-apps/kxneur/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde-apps/kxneur/PRE_BUILD b/kde-apps/kxneur/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde-apps/kxneur/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde-apps/kxneur/UP_TRIGGERS b/kde-apps/kxneur/UP_TRIGGERS
deleted file mode 100755
index f5d30d7..0000000
--- a/kde-apps/kxneur/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast kxneur dispel_self
diff --git a/kde-look/qtcurve-gtk2/DETAILS b/kde-look/qtcurve-gtk2/DETAILS
index ea5b96c..bb3dbaa 100755
--- a/kde-look/qtcurve-gtk2/DETAILS
+++ b/kde-look/qtcurve-gtk2/DETAILS
@@ -1,11 +1,11 @@
            SPELL=qtcurve-gtk2
-         VERSION=1.5.2
+         VERSION=1.6.3
           SOURCE=QtCurve-Gtk2-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/QtCurve-Gtk2-$VERSION
    SOURCE_URL[0]=http://craigd.wikispaces.com/file/view/$SOURCE
         WEB_SITE=http://www.kde-look.org/content/show.php/QtCurve+%28KDE4%2C+KDE3%2C+%26+Gtk2+Theme%29?content=40492
          ENTERED=20070805
-     SOURCE_HASH=sha512:6e85471397c3ec737eb55c34b57963e3a76322aae49ceb6fb8644b619c5902f1794fb469159847932706a6c52ccd07b8187a345e69fd2f439f66d8e45840dfdd
+     SOURCE_HASH=sha512:d813204ea9ada11473c2775f169db9d1e0ca2ee18fa6b55ea0c4b629ac7823f5dc0f0ccba81e6a62149ef3df4df437ebd0bd31319608ab5d5cb74cc59340c219
       LICENSE[0]=GPL
         KEYWORDS="kde style theme qt gtk compatibility widget"
            SHORT="A set of QT widget styles (used to unify look of KDE and GNOME applications)."
diff --git a/kde-look/qtcurve-gtk2/HISTORY b/kde-look/qtcurve-gtk2/HISTORY
index 40055e6..aa80903 100644
--- a/kde-look/qtcurve-gtk2/HISTORY
+++ b/kde-look/qtcurve-gtk2/HISTORY
@@ -1,3 +1,9 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.6.3
+
+2010-09-15 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.6.1
+
 2010-08-16 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.5.2
 
diff --git a/kde4-apps/amarok2/DETAILS b/kde4-apps/amarok2/DETAILS
index d1e2df5..978fe0f 100755
--- a/kde4-apps/amarok2/DETAILS
+++ b/kde4-apps/amarok2/DETAILS
@@ -7,8 +7,8 @@ if [[ $AMR_SVN == y ]];then
    SOURCE_URL[0]=git://gitorious.org/amarok/amarok.git
   FORCE_DOWNLOAD=1
 else
-         VERSION=2.3.0
-     SOURCE_HASH=sha512:61bd837aca7b8f6e745e8966be586c009b9440361b7308b0e61fe914b5fde4dee1321a961632a1efaa2c714961fe3a60f7bb1bcceb7fd2ac57d4e3b459e8698e
+         VERSION=2.3.2
+     SOURCE_HASH=sha512:0325766d3d51f10abfe75b5506d979277c1b39a1ae3afb48930b4bbdbec4da8760cf4f567e7314a2817ad6753d78f2b40e2fc313c82df921ec4192596a99d27a
           SOURCE=$SPELLX-$VERSION.tar.bz2
 #   SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
    SOURCE_URL[0]=$KDE_URL/stable/$SPELLX/$VERSION/src/$SOURCE
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index 64b0702..a4d3244 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,6 @@
+2010-09-22 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 2.3.2
+
 2010-03-16 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2.3.0
 
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index be95000..01c718f 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -7,8 +7,8 @@ if [[ $DIG_SVN == y ]];then
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk/extragear/graphics/$SPELLX:$SPELLX
 else
-         VERSION=1.2.0
-     SOURCE_HASH=sha512:3f8d6994b2c05fd39e6e54cdc2a056b8282b399d15f3b8c9c7feecbe2e29c5ef5ba9cd835c2121c551d877ea8a125d235a3e73e5ed23a4975326a3bc32b98dde
+         VERSION=1.4.0
+     SOURCE_HASH=sha512:a1c73fb45db9d837eb78b3df23cf5e47ae5d38c81610d06f1fdba7c2bb611e82f4f7dc35b833b3f2a09e61b90380c748627793cf4560e30b787bafc983812ae5
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
 fi
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index a72b9ff..5597783 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,7 @@
+2010-09-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.0
+	* PRE_BUILD: added
+
 2010-03-29 Treeve Jelbert <treevesourcemage.org>
 	* DETAILS: version 1.2.0
 
diff --git a/kde4-apps/digikam4/PRE_BUILD b/kde4-apps/digikam4/PRE_BUILD
new file mode 100755
index 0000000..c3b8461
--- /dev/null
+++ b/kde4-apps/digikam4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+export PKG_CONFIG_PATH=/opt/kde4/lib/pkgconfig
+
diff --git a/kde4-apps/dragonplayer/BUILD b/kde4-apps/dragonplayer/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/dragonplayer/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/dragonplayer/DEPENDS b/kde4-apps/dragonplayer/DEPENDS
deleted file mode 100755
index f737aff..0000000
--- a/kde4-apps/dragonplayer/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends kdemultimedia4
diff --git a/kde4-apps/dragonplayer/DETAILS b/kde4-apps/dragonplayer/DETAILS
deleted file mode 100755
index a33f849..0000000
--- a/kde4-apps/dragonplayer/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=dragonplayer
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by kdemultimedia4]
-EOF
-
diff --git a/kde4-apps/dragonplayer/DOWNLOAD b/kde4-apps/dragonplayer/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/dragonplayer/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/dragonplayer/HISTORY b/kde4-apps/dragonplayer/HISTORY
deleted file mode 100644
index 1ceefc4..0000000
--- a/kde4-apps/dragonplayer/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2009-08-02  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by kdemultimedia4]
diff --git a/kde4-apps/dragonplayer/INSTALL b/kde4-apps/dragonplayer/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/dragonplayer/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/dragonplayer/PRE_BUILD b/kde4-apps/dragonplayer/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/dragonplayer/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/dragonplayer/TRIGGERS b/kde4-apps/dragonplayer/TRIGGERS
deleted file mode 100755
index 8de7a92..0000000
--- a/kde4-apps/dragonplayer/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast dragonplayer dispel_self
diff --git a/kde4-apps/k3b4/HISTORY b/kde4-apps/k3b4/HISTORY
index 7f1acec..870d998 100644
--- a/kde4-apps/k3b4/HISTORY
+++ b/kde4-apps/k3b4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
 2010-08-17 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2.0.1
 
diff --git a/kde4-apps/k3b4/PRE_BUILD b/kde4-apps/k3b4/PRE_BUILD
new file mode 100755
index 0000000..a2d2a57
--- /dev/null
+++ b/kde4-apps/k3b4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' src/CMakeLists.txt
diff --git a/kde4-apps/kdenlive4/DETAILS b/kde4-apps/kdenlive4/DETAILS
index 9330c1d..68e6a32 100755
--- a/kde4-apps/kdenlive4/DETAILS
+++ b/kde4-apps/kdenlive4/DETAILS
@@ -12,8 +12,8 @@ if [[ $KDN_SVN  == y ]]; then
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-svn
   FORCE_DOWNLOAD=on
 else
-         VERSION=0.7.7.1
-     SOURCE_HASH=sha512:50b39a5b5bfd87a02270d805781345a10be3e15bb75576dc7b782a76160c0ce10f57b217dc184588c09ed29e41bdaf26fed7b5392a3c9c88e270374c95871c5a
+         VERSION=0.7.8
+     SOURCE_HASH=sha512:7a870271dd94135b364d32eeaf58cfc2db6997f4bd59817149baf1e1e56d3f299246cce5b26ad2cbc7f0b21a22c3adc2b0e8078103b437db6d3e22d6a65e658a
           SOURCE=$SPELLX-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
diff --git a/kde4-apps/kdenlive4/HISTORY b/kde4-apps/kdenlive4/HISTORY
index 9754d13..3ea7d28 100755
--- a/kde4-apps/kdenlive4/HISTORY
+++ b/kde4-apps/kdenlive4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.7.8
+
 2010-02-28 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.7.7.1
 
diff --git a/kde4-apps/kdiamond/BUILD b/kde4-apps/kdiamond/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/kdiamond/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/kdiamond/DEPENDS b/kde4-apps/kdiamond/DEPENDS
deleted file mode 100755
index 98a55b7..0000000
--- a/kde4-apps/kdiamond/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends kdegames4
diff --git a/kde4-apps/kdiamond/DETAILS b/kde4-apps/kdiamond/DETAILS
deleted file mode 100755
index 90ccfb6..0000000
--- a/kde4-apps/kdiamond/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=kdiamond
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by kdegames4]
-EOF
-
diff --git a/kde4-apps/kdiamond/DOWNLOAD b/kde4-apps/kdiamond/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/kdiamond/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/kdiamond/HISTORY b/kde4-apps/kdiamond/HISTORY
deleted file mode 100644
index 62466a2..0000000
--- a/kde4-apps/kdiamond/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2009-08-02  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by kdegames4]
diff --git a/kde4-apps/kdiamond/INSTALL b/kde4-apps/kdiamond/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/kdiamond/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/kdiamond/PRE_BUILD b/kde4-apps/kdiamond/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4-apps/kdiamond/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4-apps/kdiamond/TRIGGERS b/kde4-apps/kdiamond/TRIGGERS
deleted file mode 100755
index 55cbeb8..0000000
--- a/kde4-apps/kdiamond/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast kdiamond dispel_self
diff --git a/kde4-apps/kid3-kde4/DETAILS b/kde4-apps/kid3-kde4/DETAILS
index 73a21dc..0b9c93d 100755
--- a/kde4-apps/kid3-kde4/DETAILS
+++ b/kde4-apps/kid3-kde4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kid3-kde4
            SPELLX=kid3
-         VERSION=1.4
-     SOURCE_HASH=sha512:2f16a87b00061825f55438bd2d0f32cb452e0d5632a65ba85021ccd5263d6cbacadbbc74f50fd35a6f7cdeff0f78652448a3f7a8c8496383fde5cf217222bf36
+         VERSION=1.5
+     SOURCE_HASH=sha512:ffd2b100b9289b31ea6ed67e08272436e985228975bc9a24a37a956843a9a5f881aaad63f1a39ed7bf8bc3474e9cd3a0cd88fee55f2b0e64254ddf58ed790c37
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
diff --git a/kde4-apps/kid3-kde4/HISTORY b/kde4-apps/kid3-kde4/HISTORY
index 3f6ba5e..a0fbdd0 100644
--- a/kde4-apps/kid3-kde4/HISTORY
+++ b/kde4-apps/kid3-kde4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.5
+
 2010-05-19 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
 
diff --git a/kde4-apps/kipi-plugins4/DETAILS b/kde4-apps/kipi-plugins4/DETAILS
index 887ca18..d2719e4 100755
--- a/kde4-apps/kipi-plugins4/DETAILS
+++ b/kde4-apps/kipi-plugins4/DETAILS
@@ -1,10 +1,10 @@
            SPELL=kipi-plugins4
-         VERSION=1.2.0
-     SOURCE_HASH=sha512:b3dbe667497e777b97dd5f2be7f704b0f518c13b99bf94d0f2498e8273d293840b9b5d4e42e068279fcc89e75f00bf19335a97d7aebb1b149d4ccfc406575404
+         VERSION=1.4.0
+     SOURCE_HASH=sha512:b6047d7bb6953fee4243a21d88c188c23a8930aee673c34b5c95e0e4956993ccbbc1bac4e820d11d2d12497b5915fbec83fdd7f0735d7774ef9ccd8854cac9af
           SOURCE=${SPELL//4}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
-        WEB_SITE=http://extragear.kde.org/apps/kipi
+        WEB_SITE=http://www.kipi-plugins.org/
          LICENSE=GPL
          ENTERED=20080921
         KEYWORDS="kde4"
diff --git a/kde4-apps/kipi-plugins4/HISTORY b/kde4-apps/kipi-plugins4/HISTORY
index ac82396..54eba65 100644
--- a/kde4-apps/kipi-plugins4/HISTORY
+++ b/kde4-apps/kipi-plugins4/HISTORY
@@ -1,3 +1,7 @@
+2010-09-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.4.0, new WEB_SITE
+	* PRE_BUILD: added, #15829
+
 2010-03-30 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.2.0
 
diff --git a/kde4-apps/kipi-plugins4/PRE_BUILD b/kde4-apps/kipi-plugins4/PRE_BUILD
new file mode 100755
index 0000000..c3b8461
--- /dev/null
+++ b/kde4-apps/kipi-plugins4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+export PKG_CONFIG_PATH=/opt/kde4/lib/pkgconfig
+
diff --git a/kde4-apps/krename4/DETAILS b/kde4-apps/krename4/DETAILS
index 4e2df16..91fddd0 100755
--- a/kde4-apps/krename4/DETAILS
+++ b/kde4-apps/krename4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=krename4
           SPELLX=krename
-         VERSION=4.0.4
-     SOURCE_HASH=sha512:c7bbded84149af6fbd67eae7a1b69ffec777b237dd1bb6878bfffa8f247e652d28c1de369d7551982fb20628fddfc145625747bf0649bac37caa84de177eb17a
+         VERSION=4.0.5
+     SOURCE_HASH=sha512:8bacdc09e5b462648d4a5626f22f5742d4b4374c278b9053f0d2f9798dfccc9561e38a788c2dbb8cf17f32b0da0b8ae1e4218124ae50837778aa016fcec0d9d8
           SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
diff --git a/kde4-apps/krename4/HISTORY b/kde4-apps/krename4/HISTORY
index 3ac0162..ea5a0c6 100644
--- a/kde4-apps/krename4/HISTORY
+++ b/kde4-apps/krename4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 4.0.5
+
 2010-06-29 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.0.4
 
diff --git a/kde4-apps/quassel/DETAILS b/kde4-apps/quassel/DETAILS
index 720ab25..10451bb 100755
--- a/kde4-apps/quassel/DETAILS
+++ b/kde4-apps/quassel/DETAILS
@@ -1,6 +1,6 @@
            SPELL=quassel
-         VERSION=0.6.2
-     SOURCE_HASH=sha512:05042c2d45bcbd80d9fa6a93767f1d0fbe7cc0323708a0df8b2aec05a881b07fb0294b8d1a3bc39ef0eddf136b20cf46188e2e090065aa96af298dddae802886
+         VERSION=0.7.1
+     SOURCE_HASH=sha512:19f14ccb062ada1368fc9587f95342634b6704354dca747737480513a8fc85f7a8a5c8c0726f4d683db83e1df8b69634fa952ae69152753939e259c42711a2c7
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://quassel-irc.org/
diff --git a/kde4-apps/quassel/HISTORY b/kde4-apps/quassel/HISTORY
index f9fb146..3582204 100644
--- a/kde4-apps/quassel/HISTORY
+++ b/kde4-apps/quassel/HISTORY
@@ -1,3 +1,6 @@
+2010-09-22 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 0.7.1
+
 2010-09-08 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.6.2
 
diff --git a/kde4-look/qtcurve-kde4/DETAILS b/kde4-look/qtcurve-kde4/DETAILS
index d21d2ab..872a670 100755
--- a/kde4-look/qtcurve-kde4/DETAILS
+++ b/kde4-look/qtcurve-kde4/DETAILS
@@ -1,6 +1,6 @@
            SPELL=qtcurve-kde4
-         VERSION=1.5.2
-     SOURCE_HASH=sha512:dc944d77eceab5881f41d687850c9ef3aace89bc2aa89e4bc0ace0c5ce3b3dfbf1e8da725f35c4a7e25e4f30898af9712cf5eefeab36486c261572a1eec41b09
+         VERSION=1.6.3
+     SOURCE_HASH=sha512:519ea124c0af792f5abf16b59cf1020eb02e5dfa920718cc3e98cf0b30ea255e6c1536814aa1b7533aa6980f4791339f6ad477d109968dc86dda450576f54c8c
           SOURCE=QtCurve-KDE4-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://craigd.wikispaces.com/file/view/${SOURCE}
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/QtCurve-KDE4-${VERSION}"
diff --git a/kde4-look/qtcurve-kde4/HISTORY b/kde4-look/qtcurve-kde4/HISTORY
index 6949fda..7e6e698 100644
--- a/kde4-look/qtcurve-kde4/HISTORY
+++ b/kde4-look/qtcurve-kde4/HISTORY
@@ -1,3 +1,9 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.6.3
+
+2010-09-15 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 1.6.1
+
 2010-08-16 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 1.5.2
 
diff --git a/kde4-support/grantlee/DETAILS b/kde4-support/grantlee/DETAILS
index 08fdb3b..fd3149e 100755
--- a/kde4-support/grantlee/DETAILS
+++ b/kde4-support/grantlee/DETAILS
@@ -1,9 +1,10 @@
            SPELL=grantlee
-         VERSION=0.1.5
-     SOURCE_HASH=sha512:a65ff7bacf575e01df5e9744fa8253818bfcc6e73a3af9ff5da26d2c1364c14e40af0698ce68c1b48976aabd7203ff7723d8cb1558b985a51a9a5fe1e39a7ca4
+         VERSION=0.1.6
+     SOURCE_HASH=sha512:00cfb433e7758b7e1af449de8ca0fa04a4a186d1a16bcd3307da9f513bd35f5686e0c75528192bf20a81fd58e54877d83d704c96bfd21aff2d32cd9698ed6534
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://downloads.grantlee.org/$SOURCE
+   SOURCE_URL[1]=http://www.loegria.net/grantlee/$SOURCE
         WEB_SITE=http://www.grantlee.org
       LICENSE[0]=GPL
          ENTERED=20100409
diff --git a/kde4-support/grantlee/HISTORY b/kde4-support/grantlee/HISTORY
index 12f696b..817834e 100644
--- a/kde4-support/grantlee/HISTORY
+++ b/kde4-support/grantlee/HISTORY
@@ -1,3 +1,7 @@
+2010-09-27 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.1.6
+	  add a download mirror
+
 2010-09-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.1.5
 	  fix typo in website
diff --git a/kde4-support/phonon/DEPENDS b/kde4-support/phonon/DEPENDS
index bcdd73c..b01db38 100755
--- a/kde4-support/phonon/DEPENDS
+++ b/kde4-support/phonon/DEPENDS
@@ -5,7 +5,7 @@ depends  cmake       &&
 depends  automoc     &&
 depends  g++         &&
 
-depends -sub DBUS qt4  &&
+depends -sub "DBUS NO_PHONON" qt4  &&
 depends  libx11   &&
 depends  libice   &&
 depends  libxext  &&
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index 529ca07..bd09797 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,7 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* INSTALL: added, create link to pc file in /usr/lib/pkgconfig
+	* DEPENDS: depends on qt4 without phonon
+
 2010-09-01 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: Fixed SOURCE & updated spell to 4.4.2
 
diff --git a/kde4-support/phonon/INSTALL b/kde4-support/phonon/INSTALL
new file mode 100755
index 0000000..719a7cf
--- /dev/null
+++ b/kde4-support/phonon/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+ln -sf  ${INSTALL_ROOT}/opt/kde4/lib/pkgconfig/phonon.pc ${INSTALL_ROOT}/usr/lib/pkgconfig/
diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index a3f8b10..7967710 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
 2010-08-31 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.1
 
diff --git a/kde4/kdebase4-runtime/PRE_BUILD b/kde4/kdebase4-runtime/PRE_BUILD
new file mode 100755
index 0000000..4f687d3
--- /dev/null
+++ b/kde4/kdebase4-runtime/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' kioslave/network/mimetypes/CMakeLists.txt
diff --git a/kde4/kdegames4/HISTORY b/kde4/kdegames4/HISTORY
index 471d189..f619189 100644
--- a/kde4/kdegames4/HISTORY
+++ b/kde4/kdegames4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
 2010-08-31 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.1
 
diff --git a/kde4/kdegames4/PRE_BUILD b/kde4/kdegames4/PRE_BUILD
new file mode 100755
index 0000000..a00c0be
--- /dev/null
+++ b/kde4/kdegames4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' palapeli/mime/CMakeLists.txt
diff --git a/kde4/kdegraphics4/HISTORY b/kde4/kdegraphics4/HISTORY
index 88929a0..78c4ea6 100644
--- a/kde4/kdegraphics4/HISTORY
+++ b/kde4/kdegraphics4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* INSTALL: added, create symlink to pc files in /usr/lib/pkgconfig
+
 2010-08-31 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.1
 
diff --git a/kde4/kdegraphics4/INSTALL b/kde4/kdegraphics4/INSTALL
new file mode 100755
index 0000000..b935451
--- /dev/null
+++ b/kde4/kdegraphics4/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+for pcfile in libkdcraw.pc libkexiv2.pc libkipi.pc libksane.pc; do
+  ln -sf $INSTALL_ROOT/opt/kde4/lib/pkgconfig/$pcfile $INSTALL_ROOT/usr/lib/pkgconfig/
+done
diff --git a/kde4/kdelibs4-experimental/BUILD b/kde4/kdelibs4-experimental/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdelibs4-experimental/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdelibs4-experimental/DEPENDS b/kde4/kdelibs4-experimental/DEPENDS
deleted file mode 100755
index e31c0a3..0000000
--- a/kde4/kdelibs4-experimental/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends kdelibs4
diff --git a/kde4/kdelibs4-experimental/DETAILS b/kde4/kdelibs4-experimental/DETAILS
deleted file mode 100755
index ec1ff01..0000000
--- a/kde4/kdelibs4-experimental/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=kdelibs4-experimental
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by kdelibs4]
-EOF
-
diff --git a/kde4/kdelibs4-experimental/DOWNLOAD b/kde4/kdelibs4-experimental/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdelibs4-experimental/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdelibs4-experimental/HISTORY b/kde4/kdelibs4-experimental/HISTORY
deleted file mode 100644
index 35670e4..0000000
--- a/kde4/kdelibs4-experimental/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-03-05  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by kdelibs4]
diff --git a/kde4/kdelibs4-experimental/INSTALL b/kde4/kdelibs4-experimental/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdelibs4-experimental/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdelibs4-experimental/PRE_BUILD b/kde4/kdelibs4-experimental/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kde4/kdelibs4-experimental/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kde4/kdelibs4-experimental/TRIGGERS b/kde4/kdelibs4-experimental/TRIGGERS
deleted file mode 100755
index 974b855..0000000
--- a/kde4/kdelibs4-experimental/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast kdelibs4-experimental dispel_self
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index bede7a6..4153d8e 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -23,4 +23,4 @@ optional_depends  python      '' '' 'kross scripting support'   &&
 optional_depends  libmng      '' '' 'for animated PNG'          &&
 optional_depends  jasper      '' '' 'jpeg 2000 support'         &&
 optional_depends  openexr     '' '' 'high dynamic-range images' &&
-optional_depends  xz-utils  '' ''   'very high compression utility'
+optional_depends  LZMA  '' ''   'very high compression utility'
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index a6e6ff3..d1adf98 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,7 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* PRE_BUILD: removed that hack. It is not needed anymore
+	* DEPENDS: xz-utils -> LZMA
+
 2010-09-01 Bor Kraljič <pyrobor at ver.si>
 	* PRE_BUILD: removed lines to apply patch
 	  added hack to search for phonon in /opt/kde4 first
diff --git a/kde4/kdelibs4/PRE_BUILD b/kde4/kdelibs4/PRE_BUILD
index 0524c09..0dcce2d 100755
--- a/kde4/kdelibs4/PRE_BUILD
+++ b/kde4/kdelibs4/PRE_BUILD
@@ -1,5 +1,3 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-sed -i '/update_xdg_mimetypes/D' mimetypes/CMakeLists.txt &&
-sedit "s:\${KDE4_LIB_INSTALL_DIR}:$INSTALL_ROOT/opt/kde4/lib \${KDE4_LIB_INSTALL_DIR}:" cmake/modules/FindPhonon.cmake &&
-sedit "s:\${KDE4_INCLUDE_INSTALL_DIR}:$INSTALL_ROOT/opt/kde4/include \${KDE4_INCLUDE_INSTALL_DIR}:" cmake/modules/FindPhonon.cmake 
+sed -i '/update_xdg_mimetypes/D' mimetypes/CMakeLists.txt
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index 97e03c2..1ec8b09 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* PRE_BUILD: changed, prevent update_xdg_mimetypes (fixes bug #14918)
+
 2010-09-01 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.1
 
diff --git a/kde4/kdesdk4/PRE_BUILD b/kde4/kdesdk4/PRE_BUILD
index d3a6396..ad7a21a 100755
--- a/kde4/kdesdk4/PRE_BUILD
+++ b/kde4/kdesdk4/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build  &&
 cd  $SOURCE_DIRECTORY  &&
+sedit '/update_xdg_mimetypes/D' kate/plugins/snippets_tng/CMakeLists.txt
 
 # fix compilation issue of 4.1.x version with apr-util
 # see http://bugs.kde.org/show_bug.cgi?id=161005
diff --git a/kde4/kdeutils4/HISTORY b/kde4/kdeutils4/HISTORY
index e2c2c88..9137f3d 100644
--- a/kde4/kdeutils4/HISTORY
+++ b/kde4/kdeutils4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
 2010-08-31 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.5.1
 
diff --git a/kde4/kdeutils4/PRE_BUILD b/kde4/kdeutils4/PRE_BUILD
new file mode 100755
index 0000000..6aa97d4
--- /dev/null
+++ b/kde4/kdeutils4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' okteta/mimetypes/CMakeLists.txt
diff --git a/kde4/kdevelop4/HISTORY b/kde4/kdevelop4/HISTORY
index 644077a..d783bc6 100644
--- a/kde4/kdevelop4/HISTORY
+++ b/kde4/kdevelop4/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Bor Kraljič <pyrobor at ver.si>
+	* PRE_BUILD: added, prevent update_xdg_mimetypes (fixes bug #14918)
+
 2010-09-02 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 4.0.1
 
diff --git a/kde4/kdevelop4/PRE_BUILD b/kde4/kdevelop4/PRE_BUILD
new file mode 100755
index 0000000..9f3efd4
--- /dev/null
+++ b/kde4/kdevelop4/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '/update_xdg_mimetypes/D' app/CMakeLists.txt
diff --git a/kernels/cdemu/BUILD b/kernels/cdemu/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/cdemu/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/cdemu/DEPENDS b/kernels/cdemu/DEPENDS
deleted file mode 100755
index 076c144..0000000
--- a/kernels/cdemu/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends  cdemu-client  &&
-depends  cdemu-daemon  &&
-depends  cdemu-module  &&
-depends  libmirage
diff --git a/kernels/cdemu/DETAILS b/kernels/cdemu/DETAILS
deleted file mode 100755
index 82d10f2..0000000
--- a/kernels/cdemu/DETAILS
+++ /dev/null
@@ -1,12 +0,0 @@
-           SPELL=cdemu
-         VERSION=0.8
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE="http://www.cdemu.org"
-         ENTERED=20050710
-        KEYWORDS="kernels"
-      LICENSE[0]=GPL
-      PATCHLEVEL=1
-           SHORT="CD bin/cue file module"
-cat << EOF
-CDemu is a kernel module for Linux. It is designed to simulate a CD drive + CD with just simple cue/bin files, which are pretty common in the Windows world. It includes an user space program to control the kernel module. You can use it to watch an SVCD or mount the data track of an bin/cue. However, for watching an SVCD, we would recommend MPlayer which can play bin/cue images directly with the patch a friend and I made for it (more under History). The CDemu project is licensed under the GPL (v2 or later) !
-EOF
diff --git a/kernels/cdemu/HISTORY b/kernels/cdemu/HISTORY
deleted file mode 100644
index 69d1c02..0000000
--- a/kernels/cdemu/HISTORY
+++ /dev/null
@@ -1,15 +0,0 @@
-2007-05-04 Eric Sandall <sandalle at sourcemage.org>
-	* Deprecate in favour of experimental userland cdemu
-
-2006-10-02 Anton Brondz <dinolinux at sourcemage.org>
-	* DETAILS: updated to 0.8, fixes #13150, added LICENSE
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-07-10 David Brown <dmlb2000 at excite.com>
-	* ALL: created spell
-
diff --git a/kernels/cdemu/INSTALL b/kernels/cdemu/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/cdemu/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/cdemu/PRE_BUILD b/kernels/cdemu/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/cdemu/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/cdemu/TRIGGERS b/kernels/cdemu/TRIGGERS
deleted file mode 100755
index 47dac57..0000000
--- a/kernels/cdemu/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast  cdemu  dispel_self
diff --git a/kernels/cdemu/volatiles b/kernels/cdemu/volatiles
deleted file mode 100755
index 170a6c5..0000000
--- a/kernels/cdemu/volatiles
+++ /dev/null
@@ -1 +0,0 @@
-^/lib/modules/*/modules.*
diff --git a/kernels/device-mapper/BUILD b/kernels/device-mapper/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/device-mapper/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/device-mapper/DETAILS b/kernels/device-mapper/DETAILS
deleted file mode 100755
index e72c60c..0000000
--- a/kernels/device-mapper/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-           SPELL=device-mapper
-
-         VERSION=DEPRECATED
-
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL.$VERSION
-        WEB_SITE=http://sources.redhat.com/dm/
-         ENTERED=20031210
-        KEYWORDS="kernels"
-           SHORT="userspace files of device-mapper"
-      LICENSE[0]=GPL
-cat << EOF
-The Device-mapper is a new component of the linux kernel that supports logical 
-volume management. It is required by LVM2 and EVMS. The original LVM (included 
-in stock 2.4 kernels) does not use it.
-
-If you intend to use Device-mapper, as well as adding it to your kernel, you 
-should install the userspace configuration tool (dmsetup) and library 
-(libdevmapper), you should install this spell.
-EOF
diff --git a/kernels/device-mapper/HISTORY b/kernels/device-mapper/HISTORY
deleted file mode 100644
index 4cdc7f4..0000000
--- a/kernels/device-mapper/HISTORY
+++ /dev/null
@@ -1,107 +0,0 @@
-2009-02-26 Ladislav Hagara <hgr at vabo.cz>
-	* *: deprecated, device-mapper is provided by lvm now
-
-2008-09-19 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.28
-
-2008-06-29 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.27
-
-2008-06-07 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.26
-
-2008-04-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.25
-
-2007-12-27 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: fixed gpg ring name
-
-2007-12-26 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: updated 1.02 branch to 1.02.24, made use of upstream GPG sigs
-
-2007-12-06 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.23
-
-2007-08-26 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.22
-
-2007-06-16 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.20
-
-2007-04-28 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.19
-
-2007-04-03 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.18
-
-2007-01-31 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.17
-
-2007-01-26 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.02.16
-
-2007-01-14 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 1.02.14 (devel)
-
-2006-12-02 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: updated default to 1.02.13 
-
-2006-10-25 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 1.02.12 (devel)
-
-2006-09-27 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS, PREPARE: added support for branches (1.01, 1.02)
-	  DEVICE_MAPPER_DEVEL -> DEVICE_MAPPER_BRANCH
-	* DETAILS: 1.02 branch updated to 1.02.10 and make it DEFAULT [Bug 13098]
-
-2006-08-16 Flavien Bridault <vlaaad at sourcemage.org>
-	* DETAILS: Updated devel to 1.02.09
-
-2006-07-29 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 1.02.08 (devel)
-	  remove BUILD_API
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-2006-06-08 Ladislav Hagara <hgr at vabo.cz>
-	* PREPARE, DETAILS: added devel/stable version support [Bugs 11893,12559]
-
-2006-05-18 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 1.02.07
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-02-27 Jeremy Blosser <jblosser-smgl at firinn.org>
-	* BUILD: --libdir=$INSTALL_ROOT/lib and --sbindir=$INSTALL_ROOT/sbin,
-	  bug 10063.
-	* DETAILS: PATCHLEVEL=1.
-
-2005-10-08 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.01.05
-
-2005-08-25 Sergey Lipnevich <sergey at sourcemage.org>
-	* DETAILS: upgrade to 1.01.04;
-	* BUILD: enable static build of dmsetup.
-
-2005-06-24 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.01.03
-
-2005-04-08 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.01.01
-
-2005-01-20 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.01.00
-
-2005-01-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.00.21
-
-2004-07-28 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: VERSION updated to 1.00.19
-	  new WEB_SITE and SOURCE_URL
-	  new SHORT and description
-
-2003-12-10 Seth Woolley <seth at tautology.org>
-	* DETAILS: clarifications.
-	* Spell created as per low's request.
diff --git a/kernels/device-mapper/INSTALL b/kernels/device-mapper/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/device-mapper/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/device-mapper/PRE_BUILD b/kernels/device-mapper/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/device-mapper/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/device-mapper/UP_TRIGGERS b/kernels/device-mapper/UP_TRIGGERS
deleted file mode 100755
index 30102de..0000000
--- a/kernels/device-mapper/UP_TRIGGERS
+++ /dev/null
@@ -1,2 +0,0 @@
-up_trigger device-mapper dispel_self
-up_trigger lvm cast_self
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index e6a3f4f..a4cad3f 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,28 @@
+2010-10-02 Ladislav Hagara <hgr at vabo.cz>
+	* info/patches/maintenance_patches/patch-2.6.32.24: added
+
+2010-09-29 Ladislav Hagara <hgr at vabo.cz>
+	* latest.defaults: updated latest to patch-2.6.35.7
+	* info/patches/maintenance_patches/patch-2.6.35.7: added
+
+2010-09-27 Ladislav Hagara <hgr at vabo.cz>
+	* latest.defaults: updated latest to patch-2.6.35.6
+	* info/patches/maintenance_patches/patch-2.6.35.6: added
+	* info/patches/maintenance_patches/patch-2.6.32.23: added
+
+2010-09-21 Ladislav Hagara <hgr at vabo.cz>
+	* latest.defaults: updated latest to patch-2.6.35.5
+	* info/patches/maintenance_patches/patch-2.6.35.5: added
+	* info/patches/maintenance_patches/patch-2.6.32.22: added
+	* info/patches/maintenance_patches/patch-2.6.27.54: added
+
+2010-09-14 Ladislav Hagara <hgr at vabo.cz>
+	* info/patches/maintenance_patches/patch-2.6.34.7: added
+
+2010-09-08 Eric Sandall <sandalle at sourcemage.org>
+	* info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch: Applies to
+	  2.6.34 and 2.6.35
+
 2010-08-27 Ladislav Hagara <hgr at vabo.cz>
 	* latest.defaults: updated latest to patch-2.6.35.4
 	* info/patches/maintenance_patches/patch-2.6.35.4: added
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.54 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.54
new file mode 100755
index 0000000..e721b9f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.27.54
@@ -0,0 +1,6 @@
+appliedkernels="2.6.27"
+patchversion="${appliedkernels}.54"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.22 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.22
new file mode 100755
index 0000000..5ef5b8d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.22
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.22"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.23 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.23
new file mode 100755
index 0000000..9a1aee8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.23
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.23"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.24 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.24
new file mode 100755
index 0000000..c6b7397
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.32.24
@@ -0,0 +1,6 @@
+appliedkernels="2.6.32"
+patchversion="${appliedkernels}.24"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.7 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.7
new file mode 100755
index 0000000..8a533de
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.34.7
@@ -0,0 +1,6 @@
+appliedkernels="2.6.34"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.5 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.5
new file mode 100755
index 0000000..8002d6f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.5
@@ -0,0 +1,6 @@
+appliedkernels="2.6.35"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.6 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.6
new file mode 100755
index 0000000..ce5850c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.6
@@ -0,0 +1,6 @@
+appliedkernels="2.6.35"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.7 b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.7
new file mode 100755
index 0000000..d340e35
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.7
@@ -0,0 +1,6 @@
+appliedkernels="2.6.35"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
index 6625d6c..466f2ec 100755
--- a/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
+++ b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
@@ -1,4 +1,4 @@
-appliedkernels="2.6.31 2.6.32 2.6.33"
+appliedkernels="2.6.31 2.6.32 2.6.33 2.6.34 2.6.35"
 source="smgl-logo-0.2-for-2.6.31.patch.bz2"
 source_url="http://download.sourcemage.org/distro/kernel/${source}"
 source_gpg="gurus.gpg:${source}.sig"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index d37c6c4..3243c95 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,6 +1,6 @@
 LATEST_2_6=2.6.35
 LATEST_PRE_2_6=patch-2.6.35
-LATEST_maintenance_patches=patch-2.6.35.4
+LATEST_maintenance_patches=patch-2.6.35.7
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.37.9
 LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/kernels/suspend2-userui/BUILD b/kernels/suspend2-userui/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/suspend2-userui/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/suspend2-userui/DEPENDS b/kernels/suspend2-userui/DEPENDS
deleted file mode 100755
index 4161ce7..0000000
--- a/kernels/suspend2-userui/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends tuxonice-userui
diff --git a/kernels/suspend2-userui/DETAILS b/kernels/suspend2-userui/DETAILS
deleted file mode 100755
index fb7094c..0000000
--- a/kernels/suspend2-userui/DETAILS
+++ /dev/null
@@ -1,6 +0,0 @@
-           SPELL=suspend2-userui
-         VERSION=DEAD
-           SHORT='splash suspend tools'
-cat << EOF
-Splash screen utilities for software suspend
-EOF
diff --git a/kernels/suspend2-userui/HISTORY b/kernels/suspend2-userui/HISTORY
deleted file mode 100644
index 14a9e47..0000000
--- a/kernels/suspend2-userui/HISTORY
+++ /dev/null
@@ -1,6 +0,0 @@
-2009-04-03 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* PRE_BUILD, TRIGGERS, BUILD: deprecates into tuxonice-userui
-	* DEPENDS, DETAILS, INSTALL: deprecates into tuxonice-userui
-
-2006-09-19 David Brown <dmlb2000 at gmail.com>
-	* ALL: created spell
diff --git a/kernels/suspend2-userui/INSTALL b/kernels/suspend2-userui/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/suspend2-userui/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/suspend2-userui/PRE_BUILD b/kernels/suspend2-userui/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/kernels/suspend2-userui/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/kernels/suspend2-userui/TRIGGERS b/kernels/suspend2-userui/TRIGGERS
deleted file mode 100755
index 81222fa..0000000
--- a/kernels/suspend2-userui/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast tuxonice-userui dispel_self
diff --git a/libs/commonc++/BUILD b/libs/commonc++/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/commonc++/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/commonc++/DEPENDS b/libs/commonc++/DEPENDS
deleted file mode 100755
index b7850ec..0000000
--- a/libs/commonc++/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends commoncpp2
diff --git a/libs/commonc++/DETAILS b/libs/commonc++/DETAILS
deleted file mode 100755
index 4b0c908..0000000
--- a/libs/commonc++/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=commonc++
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by commoncpp2]
-EOF
-
diff --git a/libs/commonc++/DOWNLOAD b/libs/commonc++/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/commonc++/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/commonc++/HISTORY b/libs/commonc++/HISTORY
deleted file mode 100644
index 79ce8dc..0000000
--- a/libs/commonc++/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2008-02-17  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by commoncpp2]
diff --git a/libs/commonc++/INSTALL b/libs/commonc++/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/commonc++/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/commonc++/PRE_BUILD b/libs/commonc++/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/commonc++/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/commonc++/TRIGGERS b/libs/commonc++/TRIGGERS
deleted file mode 100755
index 5d8f99a..0000000
--- a/libs/commonc++/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast commonc++ dispel_self
diff --git a/libs/elfutils/DETAILS b/libs/elfutils/DETAILS
index 0d9aa51..13fc5b0 100755
--- a/libs/elfutils/DETAILS
+++ b/libs/elfutils/DETAILS
@@ -1,5 +1,5 @@
            SPELL=elfutils
-         VERSION=0.148
+         VERSION=0.149
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
       SOURCE_GPG="gnu.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/libs/elfutils/HISTORY b/libs/elfutils/HISTORY
index 61ffe41..b7f44a0 100644
--- a/libs/elfutils/HISTORY
+++ b/libs/elfutils/HISTORY
@@ -1,3 +1,6 @@
+2010-09-19 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.149
+
 2010-08-17 Remko van der Vossen <wich at sourcemage.org>
 	* DETAILS: Use other download URL
 	* DOWNLOAD: force SSLv2, otherwise download fails
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8b172d2..762a99d 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2010-09-12 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* PRE_BUILD: fixed build with make 3.82
+
 2010-08-06 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.12.1, HEADERS_VERSION=2.6.35, gnu.gpg -> glibc.gpg
 	* PRE_BUILD, binutils-2.20.patch: removed patch
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 5c94952..8d99f5d 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -81,5 +81,7 @@ mk_source_dir  $SOURCE_DIRECTORY.bld &&
 # fix #11832 - linking in /tmp doesn't work with grsecurity so do it elsewhere
 local test_path=$SOURCE_DIRECTORY.bld/test-installation &&
 mkdir $test_path &&
-sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl
+sed -i "s,/tmp,$test_path,g" scripts/test-installation.pl &&
+sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile
+
 
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index f09ffec..fbe9791 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,12 +1,12 @@
            SPELL=icu
 if [[ "$ICU_DEV" == 'y' ]]; then
-         VERSION=4.4.1
-     SOURCE_HASH=sha512:0e623de080f28bcc3c352ab4eb28ad0b0f6e3b1d78800bf909f6debfec45198531792979d4bc17dc12464bfef97331d1bf35feb572104b900998e1b03d9a8bae
+         VERSION=4.4.2
+     SOURCE_HASH=sha512:01a3009a2e625a7ba64ac771aea9e0dbb7df67a5f8070809e62a8d8d91657bee44e8fe2dff88f024dc5e916ee8af9e8185b201f90e7114a01316db7859ac5d35
               VX=${VERSION//.r/r}
 else
-         VERSION=4.2.1
+         VERSION=4.4.2
               VX=$VERSION
-     SOURCE_HASH=sha512:c2ec0edbdb9a5790e88f7b09c96b31f9b2120bed0c1a575cdabbcc1f9281e6cb137b44707d0ad44f794e6c9abde64c6b76d8cf4818d51459d3fb11c2e10e01dc
+     SOURCE_HASH=sha512:01a3009a2e625a7ba64ac771aea9e0dbb7df67a5f8070809e62a8d8d91657bee44e8fe2dff88f024dc5e916ee8af9e8185b201f90e7114a01316db7859ac5d35
 fi
           SPELLX=icu4c
         VERSIONX=${VERSION//./_}
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index e6ebf40..27b75a3 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.4.2 (both)
+
 2010-06-13 Robin Cook <rcook at wyrms.net>
 	* DETAILS: added missing SOURCE2_URL[0]
 
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index cac2ab4..5150d2e 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=1
 else
-         VERSION=2.4.21
+         VERSION=2.4.22
 #     SOURCE_HASH=sha512:92ee0c40396c77fd32570660bfc3358a76fed46cb4d918809dd295c76b032d01658156aa715896547de2bed68bab5cfa79e76481f25f5f5c4d44c2e02f6b94fd
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE}
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index 3eede70..26bc345 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 2.4.22
+
 2010-06-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.4.21
 
diff --git a/libs/libdrm/libdrm-2.4.21.tar.bz2.sig b/libs/libdrm/libdrm-2.4.21.tar.bz2.sig
deleted file mode 100644
index de71c2e..0000000
Binary files a/libs/libdrm/libdrm-2.4.21.tar.bz2.sig and /dev/null differ
diff --git a/libs/libdrm/libdrm-2.4.22.tar.bz2.sig b/libs/libdrm/libdrm-2.4.22.tar.bz2.sig
new file mode 100644
index 0000000..6c463b3
Binary files /dev/null and b/libs/libdrm/libdrm-2.4.22.tar.bz2.sig differ
diff --git a/libs/libvirt/DETAILS b/libs/libvirt/DETAILS
index 88d2e35..1929dce 100755
--- a/libs/libvirt/DETAILS
+++ b/libs/libvirt/DETAILS
@@ -1,5 +1,5 @@
            SPELL=libvirt
-         VERSION=0.8.3
+         VERSION=0.8.4
           SOURCE=$SPELL-$VERSION.tar.gz
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index f0fd5db..2490c1d 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2010-09-16 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 0.8.4
+
 2010-09-04 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Seems to require libnl for macvtap even when disabled
 
diff --git a/libs/libvirt/libvirt-0.8.3.tar.gz.sig b/libs/libvirt/libvirt-0.8.3.tar.gz.sig
deleted file mode 100644
index 2a86d9d..0000000
Binary files a/libs/libvirt/libvirt-0.8.3.tar.gz.sig and /dev/null differ
diff --git a/libs/libvirt/libvirt-0.8.4.tar.gz.sig b/libs/libvirt/libvirt-0.8.4.tar.gz.sig
new file mode 100644
index 0000000..5a63f91
Binary files /dev/null and b/libs/libvirt/libvirt-0.8.4.tar.gz.sig differ
diff --git a/libs/mxml/BUILD b/libs/mxml/BUILD
new file mode 100755
index 0000000..6bf90bf
--- /dev/null
+++ b/libs/mxml/BUILD
@@ -0,0 +1,3 @@
+OPTS="--enable-shared $OPTS" &&
+
+default_build
diff --git a/libs/mxml/DETAILS b/libs/mxml/DETAILS
index d05843a..27cf05d 100755
--- a/libs/mxml/DETAILS
+++ b/libs/mxml/DETAILS
@@ -1,17 +1,16 @@
            SPELL=mxml
-         VERSION=2.2.2
+         VERSION=2.6
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
    SOURCE_URL[1]=ftp://ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
    SOURCE_URL[2]=ftp://ftp2.easysw.com/pub/$SPELL/$VERSION/$SOURCE
-   SOURCE_URL[3]=ftp://ftp3.easysw.com/pub/$SPELL/$VERSION/$SOURCE
-   SOURCE_URL[4]=http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
-   SOURCE_URL[5]=ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
-     SOURCE_HASH=sha512:e17f399170b14b1c960b03d436ce419e3a65b535292f5ac0837efa4b2fbbea334d10c1d3fbeb3dc07a05372c40b95fbaba0d8a8028d5d26082bad2883e6b5ab6
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://www.easysw.com/~mike/mxml/
+   SOURCE_URL[3]=http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
+   SOURCE_URL[4]=ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/$SPELL/$VERSION/$SOURCE
+     SOURCE_HASH=sha512:ca66a18a44ad8b6a204ed2130107c73c746fafd7925fd229fed9ba56f4c1654c5d289c08954eb102941d1b2a0c164c1174e169d472b7867c0cb3d0822616219b
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://www.minixml.org/
       LICENSE[0]=LGPL
-           SHORT="A small XML parsing library."
+           SHORT="lightweight XML Library"
 cat << EOF
 Mini-XML is a small XML parsing library that you can use to read XML and
 XML-like data files in your application without requiring large non-standard
diff --git a/libs/mxml/HISTORY b/libs/mxml/HISTORY
index 0996c0a..3928b46 100644
--- a/libs/mxml/HISTORY
+++ b/libs/mxml/HISTORY
@@ -1,2 +1,6 @@
+2010-10-03 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.6; removed broken source url; fixed desc
+	* BUILD: added, to enable building of shared libraries
+
 2006-08-07 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS, HISTORY: created spell
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 807f4a1..c09e8d0 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 Eric Sandall <sandalle at sourcemage.org>
+	* SUB_DEPENDS: Remove incorrect check on UL_VERSION from util-linux
+	  Thanks Ladislav :)
+
 2010-09-08 Eric Sandall <sandalle at sourcemage.org>
 	* *SUB_DEPENDS: Allow forcing UTF8 fonts (Bug #15760)
 
diff --git a/libs/ncurses/SUB_DEPENDS b/libs/ncurses/SUB_DEPENDS
index 57b993f..32b7000 100755
--- a/libs/ncurses/SUB_DEPENDS
+++ b/libs/ncurses/SUB_DEPENDS
@@ -1,7 +1,5 @@
 case $THIS_SUB_DEPENDS in
-  UTF8) if [[ $UL_VERSION != aes ]]; then
-               message "Requested UTF8 fonts of $SPELL, forcing option UTF8=y" &&
-               UTF8=y
-       fi ;;
+  UTF8) message "Requested UTF8 fonts of $SPELL, forcing option UTF8=y" &&
+        UTF8=y ;;
     *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
 esac
diff --git a/libs/neon/DETAILS b/libs/neon/DETAILS
index de52306..41af392 100755
--- a/libs/neon/DETAILS
+++ b/libs/neon/DETAILS
@@ -1,5 +1,5 @@
            SPELL=neon
-         VERSION=0.29.3
+         VERSION=0.29.4
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index 6ce7d59..4cfdddd 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.29.4
+
 2010-01-12 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.29.3
 
diff --git a/libs/orc/DETAILS b/libs/orc/DETAILS
index 9d88c1d..5299e93 100755
--- a/libs/orc/DETAILS
+++ b/libs/orc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=orc
-         VERSION=0.4.8
-     SOURCE_HASH=sha512:3f79e8ac583d864a21f2ea503836c40756dec0845e78fa24ab6cc790963d0e79ff182eac0def8a16ad23320e7c3132177cc239781e47cc427f9ee24963a869b1
+         VERSION=0.4.9
+     SOURCE_HASH=sha512:1bfde04fa83ae441c3f0051f4d9d6397e231a17428a26c1694111f7531d8692a64ee032cbc003273996e059c315185f871842c1c5eed5962aec05f1c9601bc46
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://code.entropywave.com/download/orc/$SOURCE
diff --git a/libs/orc/HISTORY b/libs/orc/HISTORY
index b90c4e9..7b21dae 100644
--- a/libs/orc/HISTORY
+++ b/libs/orc/HISTORY
@@ -1,3 +1,6 @@
+2010-09-18 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 0.4.9
+
 2010-09-03 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.4.8
 
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 469e6ad..422fef5 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Eric Sandall <sandalle at sourcemage.org>
+	* INSTALL: Use make_single, fails with multiple jobs (actually fails)
+
 2010-06-26 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 8.10
 
diff --git a/libs/pcre/INSTALL b/libs/pcre/INSTALL
new file mode 100755
index 0000000..03b8bb9
--- /dev/null
+++ b/libs/pcre/INSTALL
@@ -0,0 +1,2 @@
+make_single &&
+default_install
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index 848f4de..380853c 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=pyqt4
           SPELLX=PyQt-x11-gpl
-         VERSION=4.7.6
-     SOURCE_HASH=sha512:8c0c6519af88c200606f7e88c1d5cc19be2ebb93b6bcfa1071bc8d4eb8d34ab7b917f34d2f83c422adb5a4bbbb9cef0240c5b512b18b6b2ed4035d23da324d98
+         VERSION=4.7.7
+     SOURCE_HASH=sha512:e839ca7999deea2875e132308190fc84db7454431b78395d9b5b5d0feae90ba9f711679d774fe08ab7c909ba11afef901770312a0cd102732b2a6176aae95431
              URI=PyQt4
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index ddcadca..bb37242 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,5 +1,5 @@
-2010-09-08 Bor Kraljič <pyrobor at ver.si>
-	* DETAILS: updated spell to 4.7.6
+2010-09-28 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.7.7
 
 2010-09-04 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: We don't care about pyqt, but rather pyqt4
diff --git a/libs/rasqal/DETAILS b/libs/rasqal/DETAILS
index c366f5e..275dbda 100755
--- a/libs/rasqal/DETAILS
+++ b/libs/rasqal/DETAILS
@@ -1,5 +1,5 @@
            SPELL=rasqal
-         VERSION=0.9.19
+         VERSION=0.9.20
           SOURCE="${SPELL}-${VERSION}.tar.gz"
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=$SOURCEFORGE_URL/librdf/$SOURCE
diff --git a/libs/rasqal/HISTORY b/libs/rasqal/HISTORY
index 7324f46..430c4f1 100644
--- a/libs/rasqal/HISTORY
+++ b/libs/rasqal/HISTORY
@@ -1,3 +1,6 @@
+2010-09-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 0.9.20
+
 2010-02-15 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 0.9.18
 	* DETAILS: version 0.9.19
diff --git a/libs/redland-bindings/DETAILS b/libs/redland-bindings/DETAILS
index 3469edc..d61a2d2 100755
--- a/libs/redland-bindings/DETAILS
+++ b/libs/redland-bindings/DETAILS
@@ -1,5 +1,5 @@
            SPELL=redland-bindings
-         VERSION=1.0.8.1
+         VERSION=1.0.11.1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=$SOURCEFORGE_URL/librdf/$SOURCE
diff --git a/libs/redland-bindings/HISTORY b/libs/redland-bindings/HISTORY
index 9aa6695..397fcb7 100644
--- a/libs/redland-bindings/HISTORY
+++ b/libs/redland-bindings/HISTORY
@@ -1,3 +1,6 @@
+2010-09-28 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.11.1
+
 2010-02-25 Remko van der Vossen <wich at sourcemage.org>
 	* DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/libs/redland/DETAILS b/libs/redland/DETAILS
index 60e5dcd..d6fee13 100755
--- a/libs/redland/DETAILS
+++ b/libs/redland/DETAILS
@@ -1,6 +1,5 @@
            SPELL=redland
-         VERSION=1.0.10
-      PATCHLEVEL=2
+         VERSION=1.0.11
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=$SOURCEFORGE_URL/librdf/$SOURCE
diff --git a/libs/redland/HISTORY b/libs/redland/HISTORY
index 09c13d3..0b11205 100644
--- a/libs/redland/HISTORY
+++ b/libs/redland/HISTORY
@@ -1,3 +1,7 @@
+2010-09-26 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 1.0.11
+	* librdf_storage_register_factory.patch, PRE_BUILD: deleted
+
 2010-09-06 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: PATCHLEVEL++
 	* librdf_storage_register_factory.patch: added upstream patch
diff --git a/libs/redland/PRE_BUILD b/libs/redland/PRE_BUILD
deleted file mode 100755
index 911ba45..0000000
--- a/libs/redland/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build  &&
-cd $SOURCE_DIRECTORY &&
-bzcat $SPELL_DIRECTORY/virt.diff.bz2 | patch  -p1 &&
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/librdf_storage_register_factory.patch &&
-libtoolize --force &&
-aclocal    &&
-autoheader &&
-automake --add-missing &&
-autoconf
diff --git a/libs/redland/librdf_storage_register_factory.patch b/libs/redland/librdf_storage_register_factory.patch
deleted file mode 100644
index 9d99bbe..0000000
--- a/libs/redland/librdf_storage_register_factory.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dave Beckett <dave at dajobe.org>
-Date: Fri, 18 Dec 2009 16:03:31 +0000 (+0000)
-Subject: Add librdf.la to librdf_storage_virtuoso_la_LIBADD
-X-Git-Url: http://git.librdf.org/view?p=librdf.git;a=commitdiff_plain;h=bfeaca74108e5a1e0c8143b2dc4c36f23e78f311;hp=5dfe6dc3361cccdf47a9db32bfa8374d405ad1e4
-
-Add librdf.la to librdf_storage_virtuoso_la_LIBADD
----
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6bb4aa0..fcbe149 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -152,7 +152,7 @@ if STORAGE_VIRTUOSO
- plugin_LTLIBRARIES += librdf_storage_virtuoso.la 
- librdf_storage_virtuoso_la_SOURCES = rdf_storage_virtuoso.c rdf_storage_virtuoso_internal.h
- librdf_storage_virtuoso_la_CPPFLAGS = @ODBC_CFLAGS@
--librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@
-+librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@ librdf.la
- librdf_storage_virtuoso_la_LDFLAGS = -module -avoid-version
- endif
- 
diff --git a/libs/redland/virt.diff.bz2 b/libs/redland/virt.diff.bz2
deleted file mode 100644
index fdca8f8..0000000
Binary files a/libs/redland/virt.diff.bz2 and /dev/null differ
diff --git a/libs/serveez/BUILD b/libs/serveez/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/serveez/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/serveez/DETAILS b/libs/serveez/DETAILS
deleted file mode 100755
index f94de7f..0000000
--- a/libs/serveez/DETAILS
+++ /dev/null
@@ -1,23 +0,0 @@
-           SPELL=serveez
-         VERSION=0.1.1
-#          SOURCE=$SPELL-$VERSION.tar.gz
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
-        WEB_SITE=http://www.gnu.org/software/serveez/
-#     SOURCE_HASH=sha512:e04e006e7e6653384cba197ff6c368cd0c5490966b22a00cf6d3b224c5b6c250e9342977945059bb912cc4bfda1b135e7463c8ca352c98fb16faeadddca3ee6a
-      LICENSE[0]=GPL
-         ENTERED=20050201
-      PATCHLEVEL=1
-        KEYWORDS="libs"
-           SHORT="Serveez is a server framework."
-
-cat << EOF
-Serveez is a server framework. It provides routines and help for
-implementing IP based servers (currently TCP, UDP and ICMP). It is also
-possible to use named pipes for all connection oriented protocols.
-We think it is worth the effort because many people need server functionality
-within their applications. However, many people experience problems 
-with select()- or poll()-loops and non-blocking operations.
-This application demonstrates various aspects of advanced network
-programming in a portable manner.
-EOF
diff --git a/libs/serveez/HISTORY b/libs/serveez/HISTORY
deleted file mode 100644
index 872b22a..0000000
--- a/libs/serveez/HISTORY
+++ /dev/null
@@ -1,19 +0,0 @@
-2007-05-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* all: deprecated spell, upstream has been unmaintained for years and
-	  it doesn't build anymore
-
-2006-10-11 Maurizio Boriani <baux at sourcemage.org>
-	* CONFIGURE: Add warning about guile major update.
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-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
-
-2005-02-01 Maurizio Boriani <baux at member.fsf.org>
-	* BUILD, DEPENDS: created the spell.
-
diff --git a/libs/serveez/INSTALL b/libs/serveez/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/serveez/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/serveez/PRE_BUILD b/libs/serveez/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/serveez/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/serveez/TRIGGERS b/libs/serveez/TRIGGERS
deleted file mode 100755
index f5e0e60..0000000
--- a/libs/serveez/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast serveez dispel_self
diff --git a/lxde/lxsession/BUILD b/lxde/lxsession/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/lxde/lxsession/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/lxde/lxsession/DEPENDS b/lxde/lxsession/DEPENDS
deleted file mode 100755
index b913fe0..0000000
--- a/lxde/lxsession/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends lxsession-lite
diff --git a/lxde/lxsession/DETAILS b/lxde/lxsession/DETAILS
deleted file mode 100755
index 53ca502..0000000
--- a/lxde/lxsession/DETAILS
+++ /dev/null
@@ -1,39 +0,0 @@
-           SPELL=lxsession
-         VERSION=deprecated
-        WEB_SITE=http://lxde.sourceforge.net/
-      LICENSE[0]=GPL
-         ENTERED=20070108
-           SHORT="Lightweight X11 session manager derived from XSM."
-cat << EOF
-Lightweight X11 session manager derived from XSM.
-
- LXSession is the default X11 session manager of LXDE.  (LXDE: Lightweight
- X11 Desktop Environment) http://lxde.sourceforge.net/
-
- Though being part of LXDE, it's totally desktop-independent.  It doesn't
- depend on any desktop environment, and has few dependencies.  The goal
- of this project is to make a simple and clean a X11 session manager which
- isn't tight to any desktop environment.
-
- We know that GNOME session by default loads GNOME, XFCE4 session by default
- loads XFCE, and what will LXSession load then?  "It's all up to you." You can
- give it a list of applications you want to launch, including window manager
- and other components of a regular desktop environment should have. Then,
- give this combination a new name, and you can have "your own custom
- desktop environment" now.  At the end of this README file, there will be
- a tutorial telling you how to create your own new desktop environment. So,
- be patient. :-)
-
- By default LXSession ships with a set of config files giving you a new
- desktop environment called LXDE. When you choose LXDE in GDM, KDM, or
- simply execute startlxde in xinitrc, When launching, LXDE will load icewm
- (window manager), pcmanfm (file manager), and lxpanel (desktop panel).
- This, of course, can be changed, but I guess users will be intrested in
- creating their own new customized DE.
-
- Check these files with text editors to see how LXSession works.  These files
- define a default session named LXDE: /usr/share/xsessions/LXDE.desktop:
- Add an entry in GDM & KDM /usr/bin/startlxde: Convinient script launching
- LXDE /etc/LXSM-LXDE-Default: Default programs loaded when LXDE is started,
- containing window manager, desktop panel...etc.
-EOF
diff --git a/lxde/lxsession/HISTORY b/lxde/lxsession/HISTORY
deleted file mode 100644
index 9b0845d..0000000
--- a/lxde/lxsession/HISTORY
+++ /dev/null
@@ -1,5 +0,0 @@
-2009-04-24 Arjan Bouter <abouter at sourcemage.org>
-	* spell deprecated in favour of lxsession-lite
-
-2007-01-08 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/lxde/lxsession/INSTALL b/lxde/lxsession/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/lxde/lxsession/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/lxde/lxsession/PRE_BUILD b/lxde/lxsession/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/lxde/lxsession/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/lxde/lxsession/TRIGGERS b/lxde/lxsession/TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/lxde/lxsession/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index 5fd76f3..eb082a8 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -1,6 +1,6 @@
            SPELL=alpine
              PKG=re-alpine
-         VERSION=2.01
+         VERSION=2.02
           SOURCE=${PKG}-${VERSION}.tar.bz2
          SOURCE2=${PKG}-${VERSION}.tar.bz2.sig
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index 60508dc..b9826e0 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,6 @@
+2010-10-02 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 2.02
+
 2010-08-11 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* maildir.patch.diff: no longer needed
 	* outgoing.patch.diff: no longer needed
diff --git a/mail/dovecot/BUILD b/mail/dovecot/BUILD
index cc165f7..c4c012f 100755
--- a/mail/dovecot/BUILD
+++ b/mail/dovecot/BUILD
@@ -2,31 +2,24 @@ if list_find "$DOVECOT_MAILSTORE" "all" ; then
 OPTS="--with-storages=maildir,mbox,dbox,cydir $OPTS"
 else
 OPTS="--with-storages=$(echo $DOVECOT_MAILSTORE | tr " " ",") $OPTS"
-fi                                              &&
+fi                                                  &&
 OPTS="--with-notify=$DOVECOT_NOTIFY $OPTS"
 #if [[ $DOVECOT_SSL == none ]]; then
 #OPTS="--without-ssl $OPTS"
 #fi                                              &&
 # desired to have dev headers installed else it's hard
 # to have external plugins built
-OPTS="--without-vpopmail                        \
-      --enable-header-install                   \
-      --without-sia                             \
-      --without-bsdauth                         \
-      --with-ioloop=$DOVECOT_IOLOOP             \
-      $DOVECOT_OPTS                             \
-      $OPTS"                                    &&
-default_build                                   &&
-if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-${VERSION%.*}-sieve-$VERSION2     &&
-OPTS="--with-dovecot=.."                        &&
-default_build                                   &&
-if [[ $DOVECOT_MANAGESIEVE == y ]]; then
-pushd dovecot-${VERSION%.*}-managesieve-$VERSION3    &&
-OPTS="--with-dovecot=../.. --with-dovecot-sieve=.."  &&
-default_build                                   &&
-popd
-fi
+OPTS="--without-vpopmail                            \
+      --without-sia                                 \
+      --without-bsdauth                             \
+      --with-ioloop=$DOVECOT_IOLOOP                 \
+      $DOVECOT_OPTS                                 \
+      $OPTS"                                        &&
+default_build                                       &&
+if [[ $DOVECOT_PIGEONHOLE == y ]]; then
+pushd dovecot-${VERSION%.*}-pigeonhole-$VERSION2    &&
+OPTS="$DOVECOT_PIGEONHOLE_OPTS --with-dovecot=.."   &&
+default_build                                       &&
 popd
 fi
 
diff --git a/mail/dovecot/CONFIGURE b/mail/dovecot/CONFIGURE
index a6ad15a..ce7d541 100755
--- a/mail/dovecot/CONFIGURE
+++ b/mail/dovecot/CONFIGURE
@@ -6,7 +6,15 @@
 #config_query_list DOVECOT_SSL 'Which SSL provider do you want?' \
 #                  openssl gnutls none
 #fi                                                           &&
-                  
+
+if [[ $DOVECOT_PIGEONHOLE == y ]]; then
+config_query_option DOVECOT_PIGEONHOLE_OPTS                  \
+                    'Do you want to use managesieve?'        \
+                    y                                        \
+                    "--with-managesieve"                     \
+                    "--without-managesieve"
+fi                                                           &&
+
 config_query_multi DOVECOT_MAILSTORE                         \
                   'What mail storage support do you want?'   \
                   all                                        \
@@ -29,36 +37,11 @@ config_query_option DOVECOT_OPTS                             \
                     "--with-sql"                             \
                     "--without-sql"                          &&
 config_query_option DOVECOT_OPTS                             \
-                    'Build with /etc/passwd support'         \
-                    y                                        \
-                    "--with-passwd"                          \
-                    "--without-passwd"                       &&
-config_query_option DOVECOT_OPTS                             \
                     'Build with NSS support'                 \
                     y                                        \
                     "--with-nss"                             \
                     "--without-nss"                          &&
 config_query_option DOVECOT_OPTS                             \
-                    'Build with passwd-like file support'    \
-                    y                                        \
-                    "--with-passwd-file"                     \
-                    "--without-passwd-file"                  &&
-config_query_option DOVECOT_OPTS                             \
-                    'Build with checkpassword support'       \
-                    y                                        \
-                    "--with-checkpassword"                   \
-                    "--without-checkpassword"                &&
-config_query_option DOVECOT_OPTS                             \
-                    'Build with static userdb support'       \
-                    y                                        \
-                    "--with-static-userdb"                   \
-                    "--without-static-userdb"                &&
-config_query_option DOVECOT_OPTS                             \
-                    'Build with prefetch userdb support'     \
-                    y                                        \
-                    "--with-prefetch-userdb"                 \
-                    "--without-prefetch-userdb"              &&
-config_query_option DOVECOT_OPTS                             \
                     'Install documentation'                  \
                     y                                        \
                     "--with-docs"                            \
diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index 44960c3..9a398a8 100755
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -1,8 +1,4 @@
 depends libtool                                  &&
-if [[ $DOVECOT_MANAGESIEVE == y ]] ; then
-depends autoconf                                 &&
-depends automake
-fi                                               &&
 
 #if [[ $DOVECOT_SSL == gnutls ]]; then
 #depends gnutls "--with-ssl=gnutls"
@@ -30,6 +26,10 @@ optional_depends linux-pam                       \
                  '--with-pam'                    \
                  '--without-pam'                 \
                  'for PAM support'               &&
+optional_depends shadow                          \
+                 '--with-shadow'                 \
+                 '--without-shadow'              \
+                 'for shadow support'            &&
 optional_depends krb5                            \
                  '--with-gssapi'                 \
                  '--without-gssapi'              \
@@ -49,8 +49,4 @@ optional_depends postgresql                      \
 optional_depends sqlite                          \
                  '--with-sqlite'                 \
                  '--without-sqlite'              \
-                 'for SQLite support'            &&
-optional_depends clucene                         \
-                 '--with-lucene'                 \
-                 '--without-lucene'              \
-                 'for CLucene full text search support'
+                 'for SQLite support'
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 509fb8a..d109411 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,38 +1,20 @@
            SPELL=dovecot
-         VERSION=1.2.12
+         VERSION=2.0.5
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
   SOURCE2_IGNORE=signature
       SOURCE_GPG="dovecot.gpg:${SOURCE2}:UPSTREAM_KEY"
    SOURCE_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE
   SOURCE2_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE2
-if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
-        VERSION2=0.1.17
-      PATHCLEVEL=6
-         SOURCE3=$SPELL-${VERSION%.*}-sieve-$VERSION2.tar.gz
-         SOURCE4=$SPELL-${VERSION%.*}-sieve-$VERSION2.tar.gz.sig
+if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
+        VERSION2=0.2.1
+      PATHCLEVEL=7
+         SOURCE3=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz
+         SOURCE4=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz.sig
   SOURCE3_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE3
   SOURCE4_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE4
   SOURCE4_IGNORE=signature
      SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
-  if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-        VERSION3=0.11.11
-# VERSION4 might not always be up to date
-        VERSION4=$VERSION
-      PATCHLEVEL=4
-         SOURCE5=$SPELL-${VERSION%.*}-managesieve-$VERSION3.tar.gz
-  SOURCE5_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE5
-         SOURCE6=$SPELL-${VERSION%.*}-managesieve-$VERSION3.tar.gz.sig
-  SOURCE6_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE6
-  SOURCE6_IGNORE=signature
-     SOURCE5_GPG="dovecot.gpg:${SOURCE6}:UPSTREAM_KEY"
-         SOURCE7=$SPELL-${VERSION4}-managesieve-$VERSION3.diff.gz
-  SOURCE7_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE7
-         SOURCE8=$SPELL-${VERSION4}-managesieve-$VERSION3.diff.gz.sig
-  SOURCE8_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE8
-  SOURCE8_IGNORE=signature
-     SOURCE7_GPG="dovecot.gpg:${SOURCE8}:UPSTREAM_KEY"
-  fi
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          ENTERED=20030224
diff --git a/mail/dovecot/FINAL b/mail/dovecot/FINAL
index 89095a1..61ebdfc 100755
--- a/mail/dovecot/FINAL
+++ b/mail/dovecot/FINAL
@@ -2,18 +2,11 @@ message "${MESSAGE_COLOR}Use the following script to generate certificates for I
 message "${MESSAGE_COLOR}sudo $GRIMOIRE_DIR/http/httpd-dev/mksscert.sh <imap|pop3>${DEFAULT_COLOR}"
 message "Or get a fully free certificate from http://www.cacert.org for various purposes"
 
-if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
+if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
 message "${MESSAGE_COLOR}"
-message "You have enabled the managesieve server patch but you still need to"
-message "enable it in the config file. To do so the following lines should help"
-message "####"
-message "# Add managesieve to protocols"
-message "protocols = managesieve"
-message "# Configure the managesieve protocol"
-message "protocol managesieve {"
-message "   listen = *:2000"
-message "   login_executable = /usr/libexec/dovecot/managesieve-login"
-message "   mail_executable = /usr/libexec/dovecot/managesieve"
-message "}"
-message "####${DEFAULT_COLOR}"
+message "For further info about Pigeonhole look on:"
+message "http://wiki2.dovecot.org/Pigeonhole/ManageSieve/Configuration#migration"
+message "http://wiki2.dovecot.org/Pigeonhole/Sieve/Configuration#migration"
+message "http://pigeonhole.dovecot.org/documentation.html"
+message "${DEFAULT_COLOR}"
 fi
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index d895314..6cdf9a6 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,19 @@
+2010-10-02 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 2.0.5,
+	  updated pigeonhole to 0.2.1
+
+2010-09-19 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 2.0.3
+	* PREPARE: update to 2.0.3, updated warning for upgrade, no more split
+	  of lda and dovecot, pigeonhole replaces previous managesieve
+	* DEPENDS: update to 2.0.3, removed broken things
+	* BUILD: update to 2.0.3, no more separate lda, pigeonhole update
+	* PRE_BUILD: update to 2.0.3, no more patching for managesieve
+	* INSTALL: update to 2.0.3, only need to install pigeonhole now, add
+	  dovenull user
+	* CONFIGURE: removed unused options
+	* FINAL: point to the pigeonhole docs for further info
+
 2010-07-04 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated spell, managesieve and sieve to 1.2.12
 
diff --git a/mail/dovecot/INSTALL b/mail/dovecot/INSTALL
index ddaefa5..8a2957d 100755
--- a/mail/dovecot/INSTALL
+++ b/mail/dovecot/INSTALL
@@ -1,13 +1,8 @@
-default_install            &&
-create_account dovecot     &&
-pwd
-if [[ $DOVECOT_EXT_LDA == y ]]; then
-pushd dovecot-${VERSION%.*}-sieve-$VERSION2      &&
-default_install            &&
-if [[ $DOVECOT_MANAGESIEVE == y ]]; then
-pushd dovecot-${VERSION%.*}-managesieve-$VERSION3  &&
-default_install            &&
-popd
-fi                         &&
+default_install                                   &&
+create_account dovecot                            &&
+create_account dovenull                           &&
+if [[ $DOVECOT_PIGEONHOLE == y ]]; then
+pushd dovecot-${VERSION%.*}-pigeonhole-$VERSION2  &&
+default_install                                   &&
 popd
 fi
diff --git a/mail/dovecot/PREPARE b/mail/dovecot/PREPARE
index 307f5b7..27c35b5 100755
--- a/mail/dovecot/PREPARE
+++ b/mail/dovecot/PREPARE
@@ -1,12 +1,9 @@
-if [[ "$(installed_version $SPELL | cut -c-3 | sed -e 's/\.//g')" -lt "12" ]] && \
+if [[ "$(installed_version $SPELL | cut -c-3 | sed -e 's/\.//g')" -lt "20" ]] && \
     spell_ok $SPELL ; then
     message "Warning the dovecot.conf has some minor changes. Please see"
-    message "http://wiki.dovecot.org/Upgrading/1.2 for further information"
+    message "http://wiki2.dovecot.org/Upgrading/2.0 for further information"
     query "Please acknowledge that you've read the warning from above" n || return 1
 fi &&
 
-config_query DOVECOT_EXT_LDA 'Use extended LDA with Sieve support?' y  &&
+config_query DOVECOT_PIGEONHOLE 'Use Dovecot Pigeonhole(sieve, managesieve)?' y
 
-if [[ $DOVECOT_EXT_LDA == y ]]; then
-    config_query DOVECOT_MANAGESIEVE 'Do you want the manage sieve server patch?' n
-fi
diff --git a/mail/dovecot/PRE_BUILD b/mail/dovecot/PRE_BUILD
index 3bcbc45..bb97586 100755
--- a/mail/dovecot/PRE_BUILD
+++ b/mail/dovecot/PRE_BUILD
@@ -1,17 +1,5 @@
 default_pre_build                                   &&
 cd $SOURCE_DIRECTORY                                &&
-if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
-unpack_file 3                                       &&
-if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
-pushd $SOURCE_DIRECTORY                             &&
-verify_file 7                                       &&
-zcat $SOURCE_CACHE/$SOURCE7 | patch -p1             &&
-libtoolize -f                                       &&
-aclocal                                             &&
-automake -f --add-missing                           &&
-autoreconf -f                                       &&
-popd                                                &&
-pushd dovecot-${VERSION%.*}-sieve-$VERSION2         &&
-unpack_file 5
-fi
+if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
+unpack_file 3
 fi
diff --git a/mail/dspam/BUILD b/mail/dspam/BUILD
index e24261e..c531333 100755
--- a/mail/dspam/BUILD
+++ b/mail/dspam/BUILD
@@ -1,19 +1,18 @@
-OPTS="$OPTS $DSPAM_DAEMON $DSPAM_PREFS" &&
-
+OPTS="$DSPAM_OPTS $OPTS" &&
 STORAGE_DRIVERS='hash_drv' &&
-if [[ "$DSPAM_SQLITE" == y ]]; then STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"; fi &&
-if [[ "$DSPAM_DB"     == y ]]; then STORAGE_DRIVERS="$STORAGE_DRIVERS,libdb4_drv" ; fi &&
-if [[ "$DSPAM_MYSQL"  == y ]]; then 
-  STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv" &&
-  OPTS="$OPTS --with-mysql-includes=/usr/include/mysql"
+if is_depends_enabled $SPELL sqlite ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,sqlite3_drv"
 fi &&
-if [[ "$DSPAM_PGSQL"  == y ]]; then 
-  STORAGE_DRIVERS="$STORAGE_DRIVERS,pgsql_drv"  &&
-  OPTS="$OPTS --with-pgsql-includes=/usr/include/postgresql"
+if is_depends_enabled $SPELL db ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,libdb4_drv"
 fi &&
-OPTS="$OPTS --with-storage-driver=$STORAGE_DRIVERS" &&
-
-if [[ "$DSPAM_VIRTUAL_USERS" == 'y' ]]; then OPTS="$OPTS --enable-virtual-users" ; fi &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,mysql_drv"
+fi &&
+if is_depends_enabled $SPELL postgresql ; then
+STORAGE_DRIVERS="$STORAGE_DRIVERS,pgsql_drv"
+fi &&
+OPTS="--with-storage-driver=$STORAGE_DRIVERS $OPTS" &&
 
 case "$DSPAM_SCALE" in
   "none") ;;
@@ -21,7 +20,4 @@ case "$DSPAM_SCALE" in
   "Domain Scale") OPTS="$OPTS --enable-domain-scale" ;;
 esac  &&
 
-# no need for $INSTALL_ROOT here
-OPTS="$OPTS --with-logdir=/var/log" &&
-
 default_build
diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index e2c9236..14e1142 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -1,18 +1,22 @@
-config_query DSPAM_SQLITE 'Enable SQLite driver?' n      &&
-config_query DSPAM_MYSQL  'Enable MySQL driver?' n       &&
-config_query DSPAM_PGSQL  'Enable PostgreSQL driver?' n  &&
 config_query DSPAM_GD     'Use gd for pretty graphs?' n  &&
 
-if [[ "$DSPAM_PGSQL" == 'y' || "$DSPAM_MYSQL" == 'y' ]] ; then
-  config_query DSPAM_VIRTUAL_USERS 'Enable virtual users?' n
+if is_depends_enabled $SPELL postgresql ||
+   is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL)
+then
+  config_query_option DSPAM_OPTS 'Enable virtual users?' n \
+               '--enable-virtual-users' '--disable-virtual-users'
 fi  &&
 
-config_query_option DSPAM_DAEMON 'Enable daemon mode?' y          \
-                 '--enable-daemon' '--disable-daemon'                               &&
-config_query_option DSPAM_PREFS 'Enable preferences extension?' y \
-                 '--enable-preferences-extension' '--disable-preferences-extension' &&
+config_query_option DSPAM_OPTS 'Enable daemon mode?' y \
+             '--enable-daemon' '--disable-daemon' &&
+config_query_option DSPAM_OPTS 'Enable preferences extension?' y \
+             '--enable-preferences-extension' '--disable-preferences-extension' &&
+config_query_option DSPAM_OPTS 'Enable split configuration file support?' y \
+             '--enable-split-configuration' '--disable--split-configuration' &&
+config_query_option DSPAM_OPTS 'Enable long usernames?' y \
+             '--enable-long-usernames' '--disable-long-usernames' &&
 config_query_list DSPAM_SCALE 'Select a filesystem organization method:'\
-                  'None'         \
-                  'Domain Scale' \
-                  'Large Scale'
+             'None'         \
+             'Domain Scale' \
+             'Large Scale'
 
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index 3000063..3708050 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -1,9 +1,19 @@
-depends automake &&
-
-if [[ "$DSPAM_SQLITE" == y ]]; then depends sqlite    ; fi &&
-if [[ "$DSPAM_MYSQL"  == y ]]; then depends MYSQL     ; fi &&
-if [[ "$DSPAM_PGSQL"  == y ]]; then depends postgresql; fi &&
-
+optional_depends db \
+                 '' \
+                 '' \
+                 'Enable DB driver' &&
+optional_depends sqlite \
+                 '' \
+                 '' \
+                 'Enable SQLite driver' &&
+optional_depends MYSQL \
+                 '--with-mysql-includes=/usr/include/mysql' \
+                 '' \
+                 'Enable MYSQL driver' &&
+optional_depends postgresql \
+                 '--with-pgsql-includes=/usr/include/postgresql' \
+                 '' \
+                 'Enable PostgreSQL driver' &&
 if [[ "$DSPAM_GD"  == y ]]; then
   depends gd            &&
   sub_depends gd libpng &&
@@ -12,7 +22,16 @@ if [[ "$DSPAM_GD"  == y ]]; then
   depends gd-text       &&
   depends perl-cgi; 
 fi                      &&
+optional_depends openldap \
+                 '--enable-external-lookup --enable-ldap' \
+                 '--disable-ldap' \
+                 'for LDAP support' &&
+optional_depends clamav \
+                 '--enable-clamav' \
+                 '--disable-clamav' \
+                 'for virus detection' &&
+optional_depends SYSTEM-LOGGER \
+                 '--enable-syslog' \
+                 '--disable-syslog' \
+                 'for logging through syslog'
 
-optional_depends openldap '--enable-ldap'   '--disable-ldap'   'for LDAP support'    &&
-optional_depends clamav   '--enable-clamav' '--disable-clamav' 'for virus detection' &&
-optional_depends SYSTEM-LOGGER '--enable-syslog' '--disable-syslog' 'for logging through syslog'
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index 76c4293..d2fe513 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -1,25 +1,32 @@
            SPELL=dspam
-if [[ $DSPAM_SCM == n ]]; then
-         VERSION=3.8.0
-          SOURCE="${SPELL}-${VERSION}.tar.gz"
-     SOURCE_HASH=sha512:7a9e69ca1ce67dc14d98305a7d780ff9faf925e0380fbac755d53c8eb593445662350b6c62c8860151a8c8000e714d992a60cd9b8c83450e5557422366d1b60c
-   SOURCE_URL[0]="http://dspam.nuclearelephant.com/sources/${SOURCE}"
-else
+if [[ $DSPAM_BRANCH == scm ]]; then
 if [[ $DSPAM_SCM_AUTO == y ]]; then
          VERSION=$(date +%Y%m%d)
 else
          VERSION=scm
 fi
-          SOURCE="${SPELL}-scm.tar.bz2"
-   SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam/dspam
+          SOURCE="${SPELL}-git.tar.bz2"
+   SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam/dspam:dspam-scm
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
-fi
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-scm"
+elif [[ $DSPAM_BRANCH == devel ]]; then
+         VERSION=3.9.1-RC1
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:fd70938b3ef368fbfb992921a596972dc665ce9c6869ca362274c4bd02174fbfd3419438f63c1cdef06167fcde1ceea30fe359228642010bef4d77036e6bcf2f
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+else
+         VERSION=3.9.0
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+     SOURCE_HASH=sha512:9208e973855e4527802603570ae7a8fbdafe9c4a40aaa55eda91810d98c13a234e1e1f681c9a219869fbb58c5be10d908d8a974d63d75dab965641b29ef557e6
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
         WEB_SITE="http://dspam.sourceforge.net/"
             DOCS="$DOCS RELEASE.NOTES UPGRADING"
       LICENSE[0]='GPL'
-      PATCHLEVEL=3
+      PATCHLEVEL=0
         KEYWORDS="email mail spam filter"
            SHORT='A server-side anti-spam agent for UNIX email servers'
 cat << EOF
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index 2507fa1..f7b52a6 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,14 @@
+2010-09-30 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated stable to 3.9.0, added devel 3.9.1-RC1, modified scm
+	  to use a SCM specific tarball so that any SCM migration by upstream won't
+	  be a problem later on
+	* BUILD: cleaned up
+	* CONFIGURE: added more options, cleaned up current ones
+	* DEPENDS: cleaned up
+	* INSTALL: cleaned up
+	* PREPARE: added devel version
+	* PRE_BUILD: only needed in scm version(and maybe not even then)
+
 2010-04-27 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed scm SOURCE_URL
 
diff --git a/mail/dspam/INSTALL b/mail/dspam/INSTALL
index be17051..70bba0d 100755
--- a/mail/dspam/INSTALL
+++ b/mail/dspam/INSTALL
@@ -1,7 +1,6 @@
 default_install                                             &&
 # needed if one wants to build anything with it afterwards
-cp src/pref.h                                               \
-   ${INSTALL_ROOT}/usr/include/dspam/                       &&
+cp src/pref.h ${INSTALL_ROOT}/usr/include/dspam/             &&
 pushd webui                                                 &&
 rm Makefile*                                                &&
 rm cgi-bin/Makefile*                                        &&
@@ -9,15 +8,11 @@ rm cgi-bin/templates/Makefile*                              &&
 rm htdocs/Makefile*                                         &&
 install_www_files                                           &&
 popd                                                        &&
-if [[ "$DSPAM_PGSQL"  == y ]]; then
-   [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql ]  &&
-     mkdir -p ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql
-   install -D src/tools.pgsql_drv/*.sql                     \
-              ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql/
-fi                                                          &&
-if [[ "$DSPAM_MYSQL"  == y ]]; then
-   [ ! -e ${INSTALL_ROOT}/usr/share/doc/dspam/mysql ]       &&
-     mkdir -p ${INSTALL_ROOT}/usr/share/doc/dspam/mysql
-   install -D src/tools.mysql_drv/*.sql                     \
-              ${INSTALL_ROOT}/usr/share/doc/dspam/mysql/
+if is_depends_enabled $SPELL postgresql ; then
+mkdir -vp ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql     &&
+install -vD src/tools.pgsql_drv/*.sql ${INSTALL_ROOT}/usr/share/doc/dspam/postgresql/
+fi &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) ; then
+mkdir -vp ${INSTALL_ROOT}/usr/share/doc/dspam/mysql          &&
+install -vD src/tools.mysql_drv/*.sql ${INSTALL_ROOT}/usr/share/doc/dspam/mysql/
 fi
diff --git a/mail/dspam/PREPARE b/mail/dspam/PREPARE
index d1f4b32..251710b 100755
--- a/mail/dspam/PREPARE
+++ b/mail/dspam/PREPARE
@@ -1,8 +1,12 @@
-config_query  DSPAM_SCM                                           \
-              "Do you want to use the dspam development version?" \
-              ${DSPAM_CVS:-n} &&
+config_query_list DSPAM_BRANCH "What branch do you want to use?" \
+              release \
+              devel \
+              scm &&
+
+if [[ $DSPAM_BRANCH == scm ]]; then
 if [[ $DSPAM_SCM == y ]]; then
 config_query DSPAM_SCM_AUTO \
              "Automaticaly update the spell on sorcery queue/system-update?" \
 						 n
 fi
+fi
diff --git a/mail/dspam/PRE_BUILD b/mail/dspam/PRE_BUILD
index 27dec07..0a0667e 100755
--- a/mail/dspam/PRE_BUILD
+++ b/mail/dspam/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build     &&
+if [[ $DSPAM_BRANCH == scm ]]; then
 cd $SOURCE_DIRECTORY  &&
 aclocal               &&
 NOCONFIGURE=1 ./autogen.sh
+fi
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 92ea4f6..4efb499 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,9 @@
+2010-09-20 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* PRE_BUILD: added the dovecot patch
+	* exim-dovecot-1.1.diff: fixes some issues and brings the
+	  compatibility to the latest version
+	  Upstream: http://bugs.exim.org/show_bug.cgi?id=954
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster at sourcemage.org>
 	* DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/mail/exim/PRE_BUILD b/mail/exim/PRE_BUILD
index 694980c..d2e3201 100755
--- a/mail/exim/PRE_BUILD
+++ b/mail/exim/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+patch -p1 < $SPELL_DIRECTORY/exim-dovecot-1.1.diff &&
+
 patch "$SOURCE_DIRECTORY/scripts/exim_install" \
       "$SPELL_DIRECTORY/config.patch" &&
 
diff --git a/mail/exim/exim-dovecot-1.1.diff b/mail/exim/exim-dovecot-1.1.diff
new file mode 100644
index 0000000..3dc5067
--- /dev/null
+++ b/mail/exim/exim-dovecot-1.1.diff
@@ -0,0 +1,52 @@
+diff --git a/src/auths/dovecot.c b/src/auths/dovecot.c
+index 6bfbba2..5b5e829 100644
+--- a/src/auths/dovecot.c
++++ b/src/auths/dovecot.c
+@@ -209,35 +209,23 @@ int auth_dovecot_server(auth_instance *ablock, uschar *data)
+                HDEBUG(D_auth) debug_printf("received: %s\n", buffer);
+                nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0]));
+ 
+-               switch (toupper(*args[0])) {
+-               case 'C':
++               /* Code below rewritten by Kirill Miazine (km at krot.org). Only check commands that
++                  Exim will need. Original code also failed if Dovecot server sent unknown
++                  command. E.g. COOKIE in version 1.1 of the protocol would cause troubles. */
++               if (Ustrcmp(args[0], US"CUID") == 0) {
+                        CHECK_COMMAND("CUID", 1, 1);
+                        cuid = Uatoi(args[1]);
+-                       break;
+-
+-               case 'D':
+-                       CHECK_COMMAND("DONE", 0, 0);
+-                       cont = 0;
+-                       break;
+-
+-               case 'M':
+-                       CHECK_COMMAND("MECH", 1, INT_MAX);
+-                       if (strcmpic(US args[1], ablock->public_name) == 0)
+-                               found = 1;
+-                       break;
+-
+-               case 'S':
+-                       CHECK_COMMAND("SPID", 1, 1);
+-                       break;
+-
+-               case 'V':
++               } else if (Ustrcmp(args[0], US"VERSION") == 0) {
+                        CHECK_COMMAND("VERSION", 2, 2);
+                        if (Uatoi(args[1]) != VERSION_MAJOR)
+                                OUT("authentication socket protocol version mismatch");
+-                       break;
+-
+-               default:
+-                       goto out;
++               } else if (Ustrcmp(args[0], US"MECH") == 0) {
++                       CHECK_COMMAND("MECH", 1, INT_MAX);
++                       if (strcmpic(US args[1], ablock->public_name) == 0)
++                               found = 1;
++               } else if (Ustrcmp(args[0], US"DONE") == 0) {
++                       CHECK_COMMAND("DONE", 0, 0);
++                       cont = 0;
+                }
+        }
+ 
diff --git a/mail/libgmail/DETAILS b/mail/libgmail/DETAILS
index 590da9d..68088c1 100755
--- a/mail/libgmail/DETAILS
+++ b/mail/libgmail/DETAILS
@@ -12,7 +12,7 @@
       fi
    SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
          LICENSE[0]=GPL
-                URL=http://libgmail.sourceforge.net/ 
+           WEB_SITE=http://libgmail.sourceforge.net/
            KEYWORDS="mail python"
               SHORT="libgmail, Python binding for Google's Gmail service"
 cat << EOF
diff --git a/mail/libgmail/HISTORY b/mail/libgmail/HISTORY
index 907a9a8..2c8f2ba 100644
--- a/mail/libgmail/HISTORY
+++ b/mail/libgmail/HISTORY
@@ -1,3 +1,6 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: changed URL -> WEB_SITE
+
 2008-01-16 Elisamuel Resto <ryuji at sourcemage.org>
 	* DETAILS: uptated version to 0.1.8; fixups in DETAILS
 
diff --git a/mail/offlineimap/DETAILS b/mail/offlineimap/DETAILS
index 4bf4e3a..dcf30bf 100755
--- a/mail/offlineimap/DETAILS
+++ b/mail/offlineimap/DETAILS
@@ -1,9 +1,9 @@
            SPELL=offlineimap
-         VERSION=6.2.0+nmu2ubuntu1
-          SOURCE=${SPELL}_${VERSION}.tar.gz
-   SOURCE_URL[0]=http://archive.ubuntu.com/ubuntu/pool/universe/o/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:dc59e36782447cec978b4eb698078a2d535af048e760ad61df9997a358cd9865ff18f3e6c3394caa9bafb314f4deb754c28af2a6ceab1a13d82bb8d8e2ed1b40
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+         VERSION=6.2.0.2
+          SOURCE=jgoerzen-${SPELL}-debian-${VERSION}-0-g6b1cb5e.tar.gz
+   SOURCE_URL[0]=http://github.com/jgoerzen/offlineimap/tarball/debian/${VERSION}
+     SOURCE_HASH=sha512:fdf73eea4cbf5eaa091e904b5f12273701a5ca70ae523815d35da8979dd71471fad0b639e8614ad1c425b96869d8f6696baa132c21db5140ca254111d91ae088
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/jgoerzen-${SPELL}-0f1a667"
         WEB_SITE=http://software.complete.org/offlineimap
          ENTERED=20060804
       LICENSE[0]=GPL
diff --git a/mail/offlineimap/HISTORY b/mail/offlineimap/HISTORY
index 3fb7dd0..d1a6dbb 100644
--- a/mail/offlineimap/HISTORY
+++ b/mail/offlineimap/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: version 6.2.0.2
+
 2010-05-19 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: changed source url to download ubuntu's tarball
 	  since upstream's tarball is once again un-downloadable
diff --git a/mail/qwikmail/DETAILS b/mail/qwikmail/DETAILS
index ad83f31..aeb602d 100755
--- a/mail/qwikmail/DETAILS
+++ b/mail/qwikmail/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwik-smtpd-$VERSION
          ENTERED=20020820
       LICENSE[0]=GPL
   SECURITY_PATCH=1
-             URL=http://qwikmail.sourceforge.net/smtpd/
+        WEB_SITE=http://qwikmail.sourceforge.net/smtpd/
         KEYWORDS="server mail"
            SHORT="qwikmail is lightweight, simple MTA."
 cat << EOF
diff --git a/mail/qwikmail/HISTORY b/mail/qwikmail/HISTORY
index f63512d..f5fc02e 100644
--- a/mail/qwikmail/HISTORY
+++ b/mail/qwikmail/HISTORY
@@ -1,3 +1,6 @@
+2010-09-29 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: changed URL -> WEB_SITE
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/mail/sylpheed-claws-extra-plugins/BUILD b/mail/sylpheed-claws-extra-plugins/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/mail/sylpheed-claws-extra-plugins/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mail/sylpheed-claws-extra-plugins/CONFIGURE b/mail/sylpheed-claws-extra-plugins/CONFIGURE
deleted file mode 100755
index 657b921..0000000
--- a/mail/sylpheed-claws-extra-plugins/CONFIGURE
+++ /dev/null
@@ -1,16 +0,0 @@
-persistent_add  SYLPHEED_CLAWS_EXTRA_PLUGINS       &&
-SYLPHEED_CLAWS_EXTRA_PLUGINS="acpi_notifier        \
-                              att_remover          \
-                              cachesaver           \
-                              etpan-privacy        \
-                              fetchinfo-plugin     \
-                              gtkhtml2_viewer      \
-                              maildir              \
-                              mailmbox             \
-                              newmail              \
-                              notification_plugin  \
-                              perl_plugin          \
-                              rssyl                \
-                              smime                \
-                              synce_plugin         \
-                              vcalendar"
diff --git a/mail/sylpheed-claws-extra-plugins/DEPENDS b/mail/sylpheed-claws-extra-plugins/DEPENDS
deleted file mode 100755
index 38d755f..0000000
--- a/mail/sylpheed-claws-extra-plugins/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends claws-mail-extra-plugins
diff --git a/mail/sylpheed-claws-extra-plugins/DETAILS b/mail/sylpheed-claws-extra-plugins/DETAILS
deleted file mode 100755
index 2a9c89a..0000000
--- a/mail/sylpheed-claws-extra-plugins/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-           SPELL=sylpheed-claws-extra-plugins
-         VERSION=2.6.0
-#          SOURCE=$SPELL-$VERSION.tar.bz2
-#      SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
-#         SOURCE2=${SOURCE}.asc
-#     SOURCE2_URL=${SOURCE_URL}.asc
-#      SOURCE_GPG=sylpheed.gpg:${SOURCE}.asc
-#  SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-        WEB_SITE=http://www.sylpheed-claws.net/plugins.php
-         ENTERED=20060926
-      PATCHLEVEL=1
-      LICENSE[0]=GPL
-        KEYWORDS="reader email mail"
-           SHORT="extra plugins for sylpheed-claws"
-cat << EOF
-extra plugins for sylpheed-claws
-EOF
diff --git a/mail/sylpheed-claws-extra-plugins/EXPORTS b/mail/sylpheed-claws-extra-plugins/EXPORTS
deleted file mode 100755
index 1d51f4f..0000000
--- a/mail/sylpheed-claws-extra-plugins/EXPORTS
+++ /dev/null
@@ -1 +0,0 @@
-SYLPHEED_CLAWS_EXTRA_PLUGINS
diff --git a/mail/sylpheed-claws-extra-plugins/HISTORY b/mail/sylpheed-claws-extra-plugins/HISTORY
deleted file mode 100644
index cdb837d..0000000
--- a/mail/sylpheed-claws-extra-plugins/HISTORY
+++ /dev/null
@@ -1,17 +0,0 @@
-2006-12-12 George Sherwood <george at beernabeer.com>
-	* ALL: Spell deprecated due to name change. Now claws-mail-extra-plugins
-
-2006-11-20 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.6.0
-
-2006-10-04 Ladislav Hagara <hgr at vabo.cz>
-	* TRIGGERS: added, on_cast sylpheed-claws cast_self
-
-2006-09-28 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.2
-	* CONFIGURE: added new synce_plugin
-	* DEPENDS: added optional_depends synce-libsynce and synce-librapi2
-
-2006-09-26 Ladislav Hagara <hgr at vabo.cz>
-	* *: created this spell, version 2.5.0
-
diff --git a/mail/sylpheed-claws-extra-plugins/INSTALL b/mail/sylpheed-claws-extra-plugins/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/mail/sylpheed-claws-extra-plugins/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mail/sylpheed-claws-extra-plugins/PRE_BUILD b/mail/sylpheed-claws-extra-plugins/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/mail/sylpheed-claws-extra-plugins/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mail/sylpheed-claws-extra-plugins/REPAIR^none^EXPORTS b/mail/sylpheed-claws-extra-plugins/REPAIR^none^EXPORTS
deleted file mode 100644
index 1d51f4f..0000000
--- a/mail/sylpheed-claws-extra-plugins/REPAIR^none^EXPORTS
+++ /dev/null
@@ -1 +0,0 @@
-SYLPHEED_CLAWS_EXTRA_PLUGINS
diff --git a/mail/sylpheed-claws-extra-plugins/TRIGGERS b/mail/sylpheed-claws-extra-plugins/TRIGGERS
deleted file mode 100755
index c9a6a25..0000000
--- a/mail/sylpheed-claws-extra-plugins/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast sylpheed-claws-extra-plugins dispel_self
diff --git a/mail/sylpheed-claws/BUILD b/mail/sylpheed-claws/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/mail/sylpheed-claws/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mail/sylpheed-claws/CONFIGURE b/mail/sylpheed-claws/CONFIGURE
deleted file mode 100755
index 49ff14f..0000000
--- a/mail/sylpheed-claws/CONFIGURE
+++ /dev/null
@@ -1,11 +0,0 @@
-config_query_option SYLPHEED_OPTS "Compile tray-icon plugin?" y \
-                                  "--enable-trayicon-plugin"    \
-                                  "--disable-trayicon-plugin"   &&
-
-config_query_option SYLPHEED_OPTS "Compile crash dialog?" n \
-                                  "--enable-crash-dialog"   \
-                                  "--disable-crash-dialog"  &&
-
-config_query_option SYLPHEED_OPTS "Enable IPv6 support?" y \
-                                  "--enable-ipv6"          \
-                                  "--disable-ipv6"
diff --git a/mail/sylpheed-claws/CONFLICTS b/mail/sylpheed-claws/CONFLICTS
deleted file mode 100755
index 2618f8f..0000000
--- a/mail/sylpheed-claws/CONFLICTS
+++ /dev/null
@@ -1,2 +0,0 @@
-conflicts sylpheed
-conflicts sylpheed-gtk2
diff --git a/mail/sylpheed-claws/DEPENDS b/mail/sylpheed-claws/DEPENDS
deleted file mode 100755
index e16354c..0000000
--- a/mail/sylpheed-claws/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends claws-mail
diff --git a/mail/sylpheed-claws/DETAILS b/mail/sylpheed-claws/DETAILS
deleted file mode 100755
index da4971b..0000000
--- a/mail/sylpheed-claws/DETAILS
+++ /dev/null
@@ -1,21 +0,0 @@
-           SPELL=sylpheed-claws
-         VERSION=2.6.0
-#          SOURCE=sylpheed-claws-${VERSION}.tar.bz2
-#      SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
-#         SOURCE2=${SOURCE}.asc
-#     SOURCE2_URL=${SOURCE_URL}.asc
-#      SOURCE_GPG=sylpheed.gpg:${SOURCE}.asc
-#  SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/sylpheed-claws-$VERSION
-        WEB_SITE=http://sylpheed-claws.sourceforge.net
-         ENTERED=20020928
-      LICENSE[0]=GPL
-      PATCHLEVEL=2
-        KEYWORDS="reader email mail"
-           SHORT="e-mail client (& news reader) based on GTK+2"
-cat << EOF
-Sylpheed-Claws is a bleeding edge branch of  Sylpheed, a GTK+2 based, lightweight,
-and fast e-mail client. The messages are managed in MH format. You can also
-utilize fetchmail and/or procmail, and external programs on receiving (like inc
-or imget).
-EOF
diff --git a/mail/sylpheed-claws/EXPORTS b/mail/sylpheed-claws/EXPORTS
deleted file mode 100755
index 422144b..0000000
--- a/mail/sylpheed-claws/EXPORTS
+++ /dev/null
@@ -1 +0,0 @@
-SYLPHEED_OPTS
diff --git a/mail/sylpheed-claws/HISTORY b/mail/sylpheed-claws/HISTORY
deleted file mode 100644
index af3660b..0000000
--- a/mail/sylpheed-claws/HISTORY
+++ /dev/null
@@ -1,198 +0,0 @@
-2006-12-13 Ladislav Hagara <hgr at vabo.cz>
-	* TRIGGERS: fixed typo
-
-2006-12-09 George Sherwood <george at beernabeer.com>
-	* ALL: Spell deprecated due to name change. Now claws-mail
-
-2006-11-14 Arjan Bouter <abouter at sourcemage.org>
-	* DEPENDS: libetpan is now required for imap4
-	* DETAILS: patchlevel 1
-
-2006-11-09 George Sherwood <george at beernabeer.com>
-	* DETAILS: Updated to 2.6.0
-
-2006-10-19 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.6
-
-2006-10-12 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.5
-
-2006-10-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.4
-
-2006-10-04 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.3
-
-2006-09-28 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.2
-
-2006-09-26 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.1
-
-2006-09-25 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.5.0
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* PROVIDES: [automated] Fixed invalid entries.
-
-2006-07-31 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.4.0, removed BUILD_API and UPDATED
-
-2006-06-20 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.3.1
-
-2006-06-12 David Kowis <dkowis at shlrm.org>
-	* DETAILS, CONFIGURE, PREPARE: removed setting between GTK+ and GTK+2
-	  as it's not anywhere on their site, nor can the files be downloaded.
-
-2006-06-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: inserted BUILD_API=1 line
-
-2006-06-08 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.2.3
-
-2006-06-05 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.2.1
-
-2006-05-09 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.2.0
-	* desktop/sylpheed.desktop: deleted
-	  sylpheed-claws uses its own sylpheed-claws.desktop
-
-2006-04-24 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.1.1
-
-2006-04-06 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 2.1.0
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2006-01-30 George Sherwood <george at beernabeer.com>
-	* DETAILS: 2.0.0
-
-2005-11-01 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.9.99
-
-2005-09-26 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.9.14
-
-2005-08-23 Pieter Lenaerts <e-type at sourcemage.org>
-	* DETAILS: added gpg verification
-	* added CONFIGURE: crash dialog, tray icon and IPv6 questions
-	* added BUILD: needed to add options from CONFIGURE to $OPTS
-	* DEPENDS: added optional dependencies: gnome-print, libetpan, openldap,
-	clamav, dillo, aspell.
-
-2005-08-07 David C. Haley <dhaley at hot.rr.com>
-	* Last modification made. Tested on peronal computer and spell is working fine.
-	* WIP: No longer needed. Will contain last details about final mods made to spell
-          and can be removed when spell is bumped to test.
-
-2005-08-01 David C. Haley <dhaley at hot.rr.com>
-	* CONFIGURE: Created; ask for GTK or GTK2
-	* DEPENDS: Updated to change required depends based on CONFIGURE selection.
-	* DETAILS: Updated to change version and MD5 based on CONFIGURE selection.
-	* WIP: Created; I am not sure if this will work first time, better safe than sorry ;)
-
-2005-06-27 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.0.5
-
-2005-05-16 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.0.4a
-
-2005-04-04 Ladislav Hagara <hgr at vabo.cz>
-	* DEPENDS: added --disable-pgpmime-plugin for gpgme [Bug 8540]
-	  sylpheed-claws is compatible only with OLD 3.0 branch of gpgme
-
-2005-03-24 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.0.4
-
-2005-03-11 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.0.3
-
-2005-02-09 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.0.1
-
-2005-01-20 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 1.0.0
-	* DEPENDS: Mail-SpamAssassin -> spamassassin
-
-2005-01-12 Arjan Bouter <abouter at sourcemage.org>
-	* Added desktop file
-
-2004-12-07 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.13
-
-2004-09-27 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.12b
-
-2004-09-17 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.12a, shortened SHORT and description
-	  removed MENU_* items
-
-2004-07-02 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.12
-
-2004-05-31 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.11
-	* DEPENDS: --enable-ssl changed to --enable-openssl [Bug 6917]
-	  thanks to Florian Franzmann
-
-2004-03-25 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS: added optional_depends on spamassassin (bug #6434)
-
-2004-03-08 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.10
-
-2004-02-07 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.9, removed MAINTAINER=tmarx at digitalprojects.com
-
-2004-01-21 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 0.9.8
-
-2003-12-02 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: 0.9.7
-
-2003-11-18 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 0.9.6 (Bug #4746)
-	  Changed LICENSE to LICENSE[0]
-	  Moved MENU* items to before SHORT (SHORT should be last)
-
-2003-10-28 Eric Sandall <sandalle at sourcemage.org>
-	* PROVIDES: Uppercase provides
-	* HISTORY: Formatted to Guru Handbook
-
-2003-09-17 Ladislav Hagara <hgr at vabo.cz>
-	* DETAILS: updated to 0.9.5
-
-2003-05-24 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (0.9.0).
-
-2003-03-13 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (0.8.11).
-
-2003-03-02 M.L. <mlubrano at sourcemage.org>
-	* TRIGGERS: Added
-
-2003-02-12 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (0.8.10).
-
-2003-01-02 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (0.8.8).
-
-2002-11-26 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (0.8.6).
-
-2002-11-05 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Added MENU_* entries
-
-2002-10-09 M.L. <mlubrano at sourcemage.org>
-	* DETAILS: Version++ (0.8.5).
-
-2002-09-29 M.L. <mlubrano at sourcemage.org>
-	* Minor spell fix.
-
-2002-09-28 Tobias Marx <tmarx at digitalprojects.com>
-	* Created spell (ripped from sylpheed's spell).
-
diff --git a/mail/sylpheed-claws/INSTALL b/mail/sylpheed-claws/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/mail/sylpheed-claws/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mail/sylpheed-claws/PRE_BUILD b/mail/sylpheed-claws/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/mail/sylpheed-claws/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mail/sylpheed-claws/PROVIDES b/mail/sylpheed-claws/PROVIDES
deleted file mode 100755
index 35a9a9e..0000000
--- a/mail/sylpheed-claws/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-X11-EMAIL-CLIENT
diff --git a/mail/sylpheed-claws/REPAIR^none^EXPORTS b/mail/sylpheed-claws/REPAIR^none^EXPORTS
deleted file mode 100644
index 422144b..0000000
--- a/mail/sylpheed-claws/REPAIR^none^EXPORTS
+++ /dev/null
@@ -1 +0,0 @@
-SYLPHEED_OPTS
diff --git a/mail/sylpheed-claws/TRIGGERS b/mail/sylpheed-claws/TRIGGERS
deleted file mode 100755
index 0f4837b..0000000
--- a/mail/sylpheed-claws/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast sylpheed-claws dispel_self
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 001eb43..6b3e58a 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,13 +1,13 @@
            SPELL=thunderbird
-         VERSION=3.1.2
+         VERSION=3.1.4
           SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
-      SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
+      SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE
   SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
   SOURCE2_IGNORE=signature
-  SECURITY_PATCH=20
+  SECURITY_PATCH=21
         WEB_SITE=http://www.mozilla.org/products/thunderbird/
          ENTERED=20041028
       LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 1a730b1..03abbd7 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,9 @@
+2010-09-17 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.1.4
+
+2010-09-10 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 3.1.3. SECURITY_PATCH++
+
 2010-08-05 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 3.1.2
 
diff --git a/mail/thunderbird/thunderbird.gpg b/mail/thunderbird/thunderbird.gpg
new file mode 100644
index 0000000..baf8bdd
Binary files /dev/null and b/mail/thunderbird/thunderbird.gpg differ
diff --git a/mobile/wbxml2/BUILD b/mobile/wbxml2/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/mobile/wbxml2/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mobile/wbxml2/DEPENDS b/mobile/wbxml2/DEPENDS
deleted file mode 100755
index 248bcfc..0000000
--- a/mobile/wbxml2/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends libwbxml
diff --git a/mobile/wbxml2/DETAILS b/mobile/wbxml2/DETAILS
deleted file mode 100755
index de90bc1..0000000
--- a/mobile/wbxml2/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
-           SPELL=wbxml2
-         VERSION=0
-      PATCHLEVEL=9999
-           SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by libwbxml]
-EOF
-
diff --git a/mobile/wbxml2/DOWNLOAD b/mobile/wbxml2/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/mobile/wbxml2/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mobile/wbxml2/HISTORY b/mobile/wbxml2/HISTORY
deleted file mode 100644
index 15f53b7..0000000
--- a/mobile/wbxml2/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2009-02-24  Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0
-	  PATCHLEVEL=9999
-	  spell deprecated [replaced by libwbxml]
diff --git a/mobile/wbxml2/INSTALL b/mobile/wbxml2/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/mobile/wbxml2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mobile/wbxml2/PRE_BUILD b/mobile/wbxml2/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/mobile/wbxml2/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/mobile/wbxml2/TRIGGERS b/mobile/wbxml2/TRIGGERS
deleted file mode 100755
index 176b5f9..0000000
--- a/mobile/wbxml2/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast wbxml2 dispel_self
diff --git a/net/gridentd/BUILD b/net/gridentd/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/net/gridentd/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/gridentd/CONFLICTS b/net/gridentd/CONFLICTS
deleted file mode 100755
index 7a1dcd4..0000000
--- a/net/gridentd/CONFLICTS
+++ /dev/null
@@ -1,3 +0,0 @@
-conflicts linux-identd &&
-conflicts oidentd &&
-conflicts pidentd
diff --git a/net/gridentd/DEPENDS b/net/gridentd/DEPENDS
deleted file mode 100755
index 9254c41..0000000
--- a/net/gridentd/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  linux-identd
diff --git a/net/gridentd/DETAILS b/net/gridentd/DETAILS
deleted file mode 100755
index d3a799e..0000000
--- a/net/gridentd/DETAILS
+++ /dev/null
@@ -1,26 +0,0 @@
-           SPELL=gridentd
-         VERSION=1.0
-#          SOURCE=$SPELL.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-#   SOURCE_URL[0]=http://tx-us.lunar-linux.org/lunar/mirrors/$SOURCE
-        WEB_SITE=
-         ENTERED=20020219
-         UPDATED=20031003
-#     SOURCE_HASH=sha512:717e09efc7469ef13f0b937388494bfb3cb8c9c4d351468989b5f3e7aa75e59c41f2a93f6b6e9785742434cf9663f583d0b0bdd2a3b366b35d4f8bddacc251fa
-        KEYWORDS="net"
-           SHORT="gridentd very small and secure RFC1413 compliant ident (auth) server."
-cat << EOF
-Part of grsecurity utils.
-gridentd very small and secure RFC1413 compliant ident (auth) server.
-
-config file by default in /etc/gridentd.conf in the format:
-
-user:policy
-
-with one "user:policy" group per line, where user can be the username of
-a user on the system or "all" to represent all users.  policy can be
-any one of the following: stealth, drop, or random....stealth returns
-an error message for valid users, drop automatically drops ident
-requests for that user, and random generates a random ident for that
-user.  first rules match first.
-EOF
diff --git a/net/gridentd/HISTORY b/net/gridentd/HISTORY
deleted file mode 100644
index bcac6c6..0000000
--- a/net/gridentd/HISTORY
+++ /dev/null
@@ -1,43 +0,0 @@
-2007-03-26 Mark Bainter <mbainter-smgl at lostinagoodbook.org>
-	* DEPENDS: Updated to depend on linux-identd
-	* DETAILS, BUILD, PRE_BUILD, INSTALL: Changed for spell deprecation
-	  Completed deprecation of spell to fix bug #12445
-	* TRIGGERS: Set to dispel self
-
-2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed BUILD_API=2.
-
-2006-04-23 Matthew Clark <matthewclark at inlesserterms.net>
-	* DETAILS: Adding source URL, removing website URL
-
-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
-
-2005-10-02 George Sherwood <george at beernabeer.com>
-	* DETAILS, BUILD: Updated for BUILD_API=2
-
-2003-11-02 Eric Sandall <sandalle at sourcemage.org>
-	* DEPENDS: Changed requires to depends
-	* HISTORY: Formatted to Guru Handbook
-
-2003-10-10 Robert Helgesson <rycee at home.se>
-	* HISTORY: Converted to new format.
-
-2003-10-03 Robert Helgesson <rycee at home.se>
-	* This package seems to have fallen off the Internet. Preparing
-	  to remove it from the grimoire. If anybody know if gridentd
-	  still exists somewhere then please inform me.
-	* BUILD: Exit with an error.
-	* DEPENDS: Added this file to give user choice of new ident daemon.
-	* CONFLICTS: Removed.
-
-2003-02-20 Robert Helgesson <rycee at home.se>
-	* CONFLICTS: added conflicts with all other identd spells (bug #2560)
-
-2003-01-30 Seth Woolley <seth at tautology.org>
-	* DETAILS: Added md5
-	* HISTORY: Added
-
diff --git a/net/gridentd/INSTALL b/net/gridentd/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/net/gridentd/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/gridentd/PREPARE b/net/gridentd/PREPARE
deleted file mode 100755
index 69ad987..0000000
--- a/net/gridentd/PREPARE
+++ /dev/null
@@ -1,8 +0,0 @@
-cat << EOF
-Development on the gridentd program seems to have been halted and it is
-therefore being phased out from the grimoire. If anybody happen to know if
-gridentd still is being developed then please inform the net guru
-<net at sourcemage.org>.
-
-For now, please use any of the other ident daemons.
-EOF
diff --git a/net/gridentd/PRE_BUILD b/net/gridentd/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/net/gridentd/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/gridentd/TRIGGERS b/net/gridentd/TRIGGERS
deleted file mode 100755
index ea2868e..0000000
--- a/net/gridentd/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast gridentd dispel_self
diff --git a/net/gridentd/services b/net/gridentd/services
deleted file mode 100644
index cea5c25..0000000
--- a/net/gridentd/services
+++ /dev/null
@@ -1 +0,0 @@
-auth		113/tcp
diff --git a/net/gridentd/xinetd.d/gridentd b/net/gridentd/xinetd.d/gridentd
deleted file mode 100755
index dc345a0..0000000
--- a/net/gridentd/xinetd.d/gridentd
+++ /dev/null
@@ -1,13 +0,0 @@
-service auth
-{
-	socket_type	= stream
-	protocol	= tcp
-	wait		= no
-	user		= nobody
-	server		= /usr/sbin/gridentd
-	server_args	= 
-	per_source	= 4
-	log_type	= FILE /var/log/xinetd/gridentd
-	log_on_success	= PID HOST USERID EXIT DURATION
-	log_on_failure	= USERID ATTEMPT
-}
diff --git a/net/libnetfilter_log/BUILD b/net/libnetfilter_log/BUILD
deleted file mode 100755
index 22cec4e..0000000
--- a/net/libnetfilter_log/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-./autogen.sh &&
-default_build
diff --git a/net/libnetfilter_log/DEPENDS b/net/libnetfilter_log/DEPENDS
deleted file mode 100755
index 573c24d..0000000
--- a/net/libnetfilter_log/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends libnfnetlink
-
diff --git a/net/libnetfilter_log/DETAILS b/net/libnetfilter_log/DETAILS
deleted file mode 100755
index b34f9ef..0000000
--- a/net/libnetfilter_log/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-           SPELL=libnetfilter_log
-if  [[  "$LIBNETFILTER_LOG_SVN_AUTOUPDATE"  ==  "y"  ]];  then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=svn
-fi
-          SOURCE=$SPELL-svn.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_IGNORE=volatile
-         NFT_SVN='https://svn.netfilter.org/netfilter/trunk/libnetfilter_log/'
-         WEBSITE=http://www.netfilter.org
-         ENTERED=20060413
-      LICENSE[0]=GPL
-           SHORT="netfilter libnetfilter_log"
-cat << EOF
-libnetfilter_log is a userspace library providing interface to packets
-that have been logged by the kernel packet filter. It is is part of a
-system that deprecates the old syslog/dmesg based packet logging.
-EOF
diff --git a/net/libnetfilter_log/DOWNLOAD b/net/libnetfilter_log/DOWNLOAD
deleted file mode 100755
index 2326934..0000000
--- a/net/libnetfilter_log/DOWNLOAD
+++ /dev/null
@@ -1,16 +0,0 @@
-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 export $NFT_SVN $SPELL &&
-mv $SPELL $SPELL-$VERSION &&
-
-tar -jcf $SOURCE $SPELL-$VERSION &&
-
-mv $SOURCE $SOURCE_CACHE/$SOURCE &&
-
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-
diff --git a/net/libnetfilter_log/HISTORY b/net/libnetfilter_log/HISTORY
deleted file mode 100644
index 891ce61..0000000
--- a/net/libnetfilter_log/HISTORY
+++ /dev/null
@@ -1,13 +0,0 @@
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-08-28 Eric Sandall <sandalle at sourcemage.org>
-	* PREPARE: Query for SVN auto-update
-	* DETAILS: Check for SVN auto-update
-	  SOURCE uses -svn suffix
-	  Removed BUILD_API=2 (grimoire-wide)
-	  Removed MAINTAINER
-
-2006-04-13 Unet <unet at sourcemage.org>
-	* ALL: Created
-
diff --git a/net/libnetfilter_log/PREPARE b/net/libnetfilter_log/PREPARE
deleted file mode 100755
index ba42c2e..0000000
--- a/net/libnetfilter_log/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query  LIBNETFILTER_LOG_SVN_AUTOUPDATE  "Automatically update $SPELL on system-update?"  n
diff --git a/net/libnetfilter_queue/BUILD b/net/libnetfilter_queue/BUILD
deleted file mode 100755
index 22cec4e..0000000
--- a/net/libnetfilter_queue/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-./autogen.sh &&
-default_build
diff --git a/net/libnetfilter_queue/DEPENDS b/net/libnetfilter_queue/DEPENDS
deleted file mode 100755
index 573c24d..0000000
--- a/net/libnetfilter_queue/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends libnfnetlink
-
diff --git a/net/libnetfilter_queue/DETAILS b/net/libnetfilter_queue/DETAILS
deleted file mode 100755
index db1c2d3..0000000
--- a/net/libnetfilter_queue/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-           SPELL=libnetfilter_queue
-if  [[  "$LIBNETFILTER_QUEUE"  ==  "y"  ]];  then
-         VERSION=$(date +%Y%m%d)
-else
-         VERSION=svn
-fi
-          SOURCE=$SPELL-svn.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_IGNORE=volatile
-         NFT_SVN='https://svn.netfilter.org/netfilter/trunk/libnetfilter_queue/'
-         WEBSITE=http://www.netfilter.org
-         ENTERED=20060413
-      LICENSE[0]=GPL
-           SHORT="netfilter libnfnetfilter_queue"
-cat << EOF
-libnetfilter_queue is a userspace library providing an API to packets
-that have been queued by the kernel packet filter. It is is part of a
-system that deprecates the old ip_queue / libipq mechanism.
-EOF
diff --git a/net/libnetfilter_queue/DOWNLOAD b/net/libnetfilter_queue/DOWNLOAD
deleted file mode 100755
index 2326934..0000000
--- a/net/libnetfilter_queue/DOWNLOAD
+++ /dev/null
@@ -1,16 +0,0 @@
-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 export $NFT_SVN $SPELL &&
-mv $SPELL $SPELL-$VERSION &&
-
-tar -jcf $SOURCE $SPELL-$VERSION &&
-
-mv $SOURCE $SOURCE_CACHE/$SOURCE &&
-
-message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"
-
diff --git a/net/libnetfilter_queue/HISTORY b/net/libnetfilter_queue/HISTORY
deleted file mode 100644
index 891ce61..0000000
--- a/net/libnetfilter_queue/HISTORY
+++ /dev/null
@@ -1,13 +0,0 @@
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-08-28 Eric Sandall <sandalle at sourcemage.org>
-	* PREPARE: Query for SVN auto-update
-	* DETAILS: Check for SVN auto-update
-	  SOURCE uses -svn suffix
-	  Removed BUILD_API=2 (grimoire-wide)
-	  Removed MAINTAINER
-
-2006-04-13 Unet <unet at sourcemage.org>
-	* ALL: Created
-
diff --git a/net/libnetfilter_queue/PREPARE b/net/libnetfilter_queue/PREPARE
deleted file mode 100755
index ec0855e..0000000
--- a/net/libnetfilter_queue/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query  LIBNETFILTER_QUEUE  "Automatically update $SPELL on system-update?"  n
diff --git a/net/nsd/DETAILS b/net/nsd/DETAILS
index ab2f241..9abe089 100755
--- a/net/nsd/DETAILS
+++ b/net/nsd/DETAILS
@@ -1,9 +1,9 @@
            SPELL=nsd
-         VERSION=3.2.5
+         VERSION=3.2.6
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:083a8baf5f57b38cd1deab8c75fc846d5abc993952be37f33b11ac09196f590e492488744a21af4250bacb587e6922755d4e858bdd8fbbd35b7f63ffa47583e0
+     SOURCE_HASH=sha512:e681bac2a9ebd284135411477a55f56f0f1e664c7342cb9bb7eceba97e1b652d53bee109bca976992ae9b613c15f51cea2ef81ace965c65adc759551a12a73ff
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.nlnetlabs.nl/projects/nsd/
       LICENSE[0]=BSD
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index 93480f2..779c593 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 3.2.6
+
 2010-04-15 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 3.2.5
 
diff --git a/net/openwbem/DEPENDS b/net/openwbem/DEPENDS
new file mode 100755
index 0000000..78b67b6
--- /dev/null
+++ b/net/openwbem/DEPENDS
@@ -0,0 +1,31 @@
+depends g++  &&
+
+optional_depends linux-pam              \
+                 "--enable-pam"         \
+                 "--disable-pam"        \
+                 "for pam integration"  &&
+
+optional_depends  openslp                \
+                  "--enable-openslp"     \
+                  "--disable-openslp"    \
+                  "openslp integration"  &&
+
+optional_depends  openssl                \
+                  "--enable-ssl"         \
+                  "--disable-ssl"        \
+                  "OpenSSL integration"  &&
+
+optional_depends perl                                  \
+                 "--enable-perl-providerifc"           \
+                 "--disable-perl-providerifc"          \
+                 "enable the perl provider interface"  &&
+
+optional_depends valgrind                                                      \
+                 "--enable-valgrind-support"                                   \
+                 "--disable-valgrind-support"                                  \
+                 "enable workarounds so the code can work well with valgrind"  &&
+
+optional_depends zlib              \
+                 "--enable-zlib"   \
+                 "--disable-zlib"  \
+                 "for zlib integration"
diff --git a/net/openwbem/DETAILS b/net/openwbem/DETAILS
new file mode 100755
index 0000000..718f081
--- /dev/null
+++ b/net/openwbem/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=openwbem
+         VERSION=3.2.2
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:82f8c1cd43991b00be065ef524874924180f42144cbd77a471996b02f84bcc8706ac819d8344e50d67ff9ff2dcd85ba822614b6c0df39fd160a6783bb180d39a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://openwbem.sourceforge.net"
+      LICENSE[0]="http://openwbem.sourceforge.net/license.html"
+         ENTERED=20100921
+        KEYWORDS="net"
+           SHORT="Open implementation of Web Based Enterprise Management."
+cat << EOF
+Web Based Enterprise Management is an Industry initiative to provide a set
+of management and Internet standard technologies developed to unify the
+management of systems, networks, users and applications across multiple
+vendor environments.
+EOF
diff --git a/net/openwbem/HISTORY b/net/openwbem/HISTORY
new file mode 100644
index 0000000..74e1110
--- /dev/null
+++ b/net/openwbem/HISTORY
@@ -0,0 +1,4 @@
+2010-09-21 Pol Vinogradov <vin.public at gmail.com>
+	* DEPENDS, DETAILS, PRE_BUILD, init.d/owcimomd, gcc4.4.patch: spell
+	  created
+
diff --git a/net/openwbem/PRE_BUILD b/net/openwbem/PRE_BUILD
new file mode 100755
index 0000000..636d700
--- /dev/null
+++ b/net/openwbem/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+cd ${SOURCE_DIRECTORY}  &&
+
+patch -p1 < ${SCRIPT_DIRECTORY}/gcc4.4.patch
diff --git a/net/openwbem/gcc4.4.patch b/net/openwbem/gcc4.4.patch
new file mode 100644
index 0000000..5edce27
--- /dev/null
+++ b/net/openwbem/gcc4.4.patch
@@ -0,0 +1,261 @@
+diff -aur openwbem-3.2.2.orig/configure openwbem-3.2.2.new/configure
+--- openwbem-3.2.2.orig/configure	2006-10-20 01:08:04.000000000 +0200
++++ openwbem-3.2.2.new/configure	2009-08-15 17:52:06.000000000 +0200
+@@ -6711,8 +6711,7 @@
+ ostream.h \
+ istream \
+ istream.h \
+-hash_map \
+-ext/hash_map \
++backward/hash_map \
+ cxxabi.h \
+ 
+ do
+diff -aur openwbem-3.2.2.orig/src/cim/OW_CIMDateTime.cpp openwbem-3.2.2.new/src/cim/OW_CIMDateTime.cpp
+--- openwbem-3.2.2.orig/src/cim/OW_CIMDateTime.cpp	2005-02-03 01:52:41.000000000 +0100
++++ openwbem-3.2.2.new/src/cim/OW_CIMDateTime.cpp	2009-08-15 16:02:25.000000000 +0200
+@@ -50,6 +50,8 @@
+ #else
+ #include <iostream>
+ #endif
++#include <cstring>
++#include <cstdlib>
+ 
+ namespace OW_NAMESPACE
+ {
+diff -aur openwbem-3.2.2.orig/src/cimom/server/OW_Platform.cpp openwbem-3.2.2.new/src/cimom/server/OW_Platform.cpp
+--- openwbem-3.2.2.orig/src/cimom/server/OW_Platform.cpp	2005-05-12 18:12:37.000000000 +0200
++++ openwbem-3.2.2.new/src/cimom/server/OW_Platform.cpp	2009-08-15 19:39:16.000000000 +0200
+@@ -34,6 +34,7 @@
+  * @author Bart Whiteley
+  */
+ 
++#include <cstdlib>
+ #include "OW_config.h"
+ #include "OW_Platform.hpp"
+ #include "OW_ConfigOpts.hpp"
+diff -aur openwbem-3.2.2.orig/src/cimom/server/OW_PlatformSignal.cpp openwbem-3.2.2.new/src/cimom/server/OW_PlatformSignal.cpp
+--- openwbem-3.2.2.orig/src/cimom/server/OW_PlatformSignal.cpp	2005-03-22 03:20:00.000000000 +0100
++++ openwbem-3.2.2.new/src/cimom/server/OW_PlatformSignal.cpp	2009-08-15 19:49:50.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include "OW_Platform.hpp"
+ #include "OW_PlatformSignal.hpp"
+ #include "OW_UserUtils.hpp"
++#include <cstring>
+ #include <ostream>
+ 
+ namespace OW_NAMESPACE
+diff -aur openwbem-3.2.2.orig/src/common/OW_BaseStreamBuffer.cpp openwbem-3.2.2.new/src/common/OW_BaseStreamBuffer.cpp
+--- openwbem-3.2.2.orig/src/common/OW_BaseStreamBuffer.cpp	2005-02-03 01:52:44.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_BaseStreamBuffer.cpp	2009-08-15 16:04:58.000000000 +0200
+@@ -40,6 +40,7 @@
+ #include "OW_Assertion.hpp"
+ #include <iostream> // for cerr
+ #include <cstring> // for memcpy
++#include <cstdio>
+ 
+ namespace OW_NAMESPACE
+ {
+diff -aur openwbem-3.2.2.orig/src/common/OW_Cache.hpp openwbem-3.2.2.new/src/common/OW_Cache.hpp
+--- openwbem-3.2.2.orig/src/common/OW_Cache.hpp	2005-02-03 01:52:44.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_Cache.hpp	2009-08-15 17:05:41.000000000 +0200
+@@ -41,6 +41,7 @@
+ #include "OW_MutexLock.hpp"
+ #include "OW_CIMNULL.hpp"
+ #include <list>
++#include <ext/hash_map>
+ 
+ // The classes and functions defined in this file are not meant for general
+ // use, they are internal implementation details.  They may change at any time.
+diff -aur openwbem-3.2.2.orig/src/common/OW_DataStreams.hpp openwbem-3.2.2.new/src/common/OW_DataStreams.hpp
+--- openwbem-3.2.2.orig/src/common/OW_DataStreams.hpp	2005-02-03 01:52:44.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_DataStreams.hpp	2009-08-15 16:07:25.000000000 +0200
+@@ -49,6 +49,7 @@
+ #include <streambuf.h>
+ #endif
+ #include <vector>
++#include <cstdio>
+ 
+ // The classes and functions defined in this file are not meant for general
+ // use, they are internal implementation details.  They may change at any time.
+diff -aur openwbem-3.2.2.orig/src/common/OW_HashMap.hpp openwbem-3.2.2.new/src/common/OW_HashMap.hpp
+--- openwbem-3.2.2.orig/src/common/OW_HashMap.hpp	2005-02-12 00:00:40.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_HashMap.hpp	2009-08-15 17:52:34.000000000 +0200
+@@ -50,6 +50,7 @@
+ #endif
+ #ifndef OW_HASH_SPECIALIZED_INCLUDE_GUARD_
+ #define OW_HASH_SPECIALIZED_INCLUDE_GUARD_
++
+ #if defined(OW_HAVE_HASH_MAP) || defined(OW_HAVE_EXT_HASH_MAP)
+ #include "OW_String.hpp"
+ 
+diff -aur openwbem-3.2.2.orig/src/common/OW_IstreamBufIterator.hpp openwbem-3.2.2.new/src/common/OW_IstreamBufIterator.hpp
+--- openwbem-3.2.2.orig/src/common/OW_IstreamBufIterator.hpp	2005-02-03 01:52:44.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_IstreamBufIterator.hpp	2009-08-15 16:26:38.000000000 +0200
+@@ -40,7 +40,7 @@
+ #else
+ #include <iostream>
+ #endif
+-
++#include <cstdio>
+ 
+ namespace OW_NAMESPACE
+ {
+diff -aur openwbem-3.2.2.orig/src/common/OW_LogMessagePatternFormatter.cpp openwbem-3.2.2.new/src/common/OW_LogMessagePatternFormatter.cpp
+--- openwbem-3.2.2.orig/src/common/OW_LogMessagePatternFormatter.cpp	2005-02-03 01:52:45.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_LogMessagePatternFormatter.cpp	2009-08-15 16:10:54.000000000 +0200
+@@ -45,6 +45,7 @@
+ 
+ #include <vector>
+ #include <cstdlib> // for strtol
++#include <limits.h>
+ 
+ extern "C"
+ {
+diff -aur openwbem-3.2.2.orig/src/common/OW_PosixFile.cpp openwbem-3.2.2.new/src/common/OW_PosixFile.cpp
+--- openwbem-3.2.2.orig/src/common/OW_PosixFile.cpp	2005-02-03 01:52:45.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_PosixFile.cpp	2009-08-15 16:13:54.000000000 +0200
+@@ -47,7 +47,7 @@
+ 		#include <unistd.h>
+ 	#endif
+ #endif
+-
++#include <cstring>
+ 
+ namespace OW_NAMESPACE
+ {
+diff -aur openwbem-3.2.2.orig/src/common/OW_StackTrace.cpp openwbem-3.2.2.new/src/common/OW_StackTrace.cpp
+--- openwbem-3.2.2.orig/src/common/OW_StackTrace.cpp	2005-02-03 01:52:45.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_StackTrace.cpp	2009-08-15 16:20:12.000000000 +0200
+@@ -54,6 +54,7 @@
+ #include "OW_Array.hpp"
+ #include <fstream>
+ #include <iostream>	// for cerr
++#include <cstdlib>
+ 
+ #if defined(OW_HAVE_BACKTRACE)
+ #include <execinfo.h>
+diff -aur openwbem-3.2.2.orig/src/common/OW_StringStream.hpp openwbem-3.2.2.new/src/common/OW_StringStream.hpp
+--- openwbem-3.2.2.orig/src/common/OW_StringStream.hpp	2005-02-03 01:52:45.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_StringStream.hpp	2009-08-15 15:49:22.000000000 +0200
+@@ -49,7 +49,7 @@
+ #else
+ #include <streambuf.h>
+ #endif
+-
++#include <cstdio>
+ namespace OW_NAMESPACE
+ {
+ 
+diff -aur openwbem-3.2.2.orig/src/common/OW_TempFileStream.cpp openwbem-3.2.2.new/src/common/OW_TempFileStream.cpp
+--- openwbem-3.2.2.orig/src/common/OW_TempFileStream.cpp	2005-02-03 01:52:45.000000000 +0100
++++ openwbem-3.2.2.new/src/common/OW_TempFileStream.cpp	2009-08-15 16:23:04.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include "OW_TmpFile.hpp"
+ #include "OW_Assertion.hpp"
+ #include <cstring>
++#include <cstdio>
+ 
+ namespace OW_NAMESPACE
+ {
+diff -aur openwbem-3.2.2.orig/src/mof/OW_MOFCompiler.cpp openwbem-3.2.2.new/src/mof/OW_MOFCompiler.cpp
+--- openwbem-3.2.2.orig/src/mof/OW_MOFCompiler.cpp	2005-02-11 22:18:31.000000000 +0100
++++ openwbem-3.2.2.new/src/mof/OW_MOFCompiler.cpp	2009-08-15 20:08:39.000000000 +0200
+@@ -32,6 +32,7 @@
+  * @author Dan Nuffer
+  */
+ 
++#include <limits.h>
+ #include "OW_MOFCompiler.hpp"
+ #include "OW_Format.hpp"
+ #include "OW_MOFParserDecls.hpp"
+diff -aur openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp
+--- openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp	2006-09-12 22:04:17.000000000 +0200
++++ openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp	2009-08-15 19:17:34.000000000 +0200
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <cstring>
+ #include "cmpisrv.h"
+ #include "OW_CIMException.hpp"
+ #include "OW_CIMProperty.hpp"
+diff -aur openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiInstance.cpp openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiInstance.cpp
+--- openwbem-3.2.2.orig/src/providerifcs/cmpi/common/cmpiInstance.cpp	2006-09-11 18:38:07.000000000 +0200
++++ openwbem-3.2.2.new/src/providerifcs/cmpi/common/cmpiInstance.cpp	2009-08-15 19:23:59.000000000 +0200
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <cstring>
+ #include "cmpisrv.h"
+ #include "OW_CIMInstance.hpp"
+ 
+diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_FTABLERef.hpp openwbem-3.2.2.new/src/providerifcs/npi/OW_FTABLERef.hpp
+--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_FTABLERef.hpp	2005-02-03 01:52:52.000000000 +0100
++++ openwbem-3.2.2.new/src/providerifcs/npi/OW_FTABLERef.hpp	2009-08-15 19:04:23.000000000 +0200
+@@ -29,7 +29,7 @@
+ *******************************************************************************/
+ #ifndef OW_FTABLE_REF_HPP_
+ #define OW_FTABLE_REF_HPP_
+-//#include <string.h>
++#include <cstring>
+ #include "OW_config.h"
+ #include "OW_CIMOMHandleIFC.hpp"
+ #include "OW_CIMDataType.hpp"
+diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp
+--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp	2005-02-03 01:52:52.000000000 +0100
++++ openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIAssociatorProviderProxy.cpp	2009-08-15 18:52:31.000000000 +0200
+@@ -27,6 +27,9 @@
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************/
++#include <cstring>
++#include <cstdlib>
++
+ #include "OW_config.h"
+ #include "OW_FTABLERef.hpp"
+ #include "OW_NPIAssociatorProviderProxy.hpp"
+diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp
+--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp	2005-02-03 01:52:52.000000000 +0100
++++ openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIInstanceProviderProxy.cpp	2009-08-15 19:11:13.000000000 +0200
+@@ -27,6 +27,7 @@
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************/
++#include <cstdlib>
+ #include "OW_config.h"
+ #include "OW_FTABLERef.hpp"
+ #include "OW_NPIInstanceProviderProxy.hpp"
+diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp
+--- openwbem-3.2.2.orig/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp	2005-02-03 01:52:52.000000000 +0100
++++ openwbem-3.2.2.new/src/providerifcs/npi/OW_NPIProviderIFCUtils.hpp	2009-08-15 19:11:52.000000000 +0200
+@@ -27,6 +27,7 @@
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************/
++#include <cstdlib>
+ #ifndef OW_NPI_PROFIDER_IFC_UTILS_HPP_
+ #define OW_NPI_PROFIDER_IFC_UTILS_HPP_
+ #include "OW_config.h"
+diff -aur openwbem-3.2.2.orig/src/providerifcs/npi/common/NPIExternal.cpp openwbem-3.2.2.new/src/providerifcs/npi/common/NPIExternal.cpp
+--- openwbem-3.2.2.orig/src/providerifcs/npi/common/NPIExternal.cpp	2005-02-03 01:52:52.000000000 +0100
++++ openwbem-3.2.2.new/src/providerifcs/npi/common/NPIExternal.cpp	2009-08-15 18:11:11.000000000 +0200
+@@ -1,4 +1,6 @@
+ #include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include "OW_config.h"
+ #include "NPIExternal.hpp"
+ #include "OW_CIMParamValue.hpp"
+diff -aur openwbem-3.2.2.orig/src/repositories/hdb/OW_AssocDb.hpp openwbem-3.2.2.new/src/repositories/hdb/OW_AssocDb.hpp
+--- openwbem-3.2.2.orig/src/repositories/hdb/OW_AssocDb.hpp	2005-04-20 22:09:38.000000000 +0200
++++ openwbem-3.2.2.new/src/repositories/hdb/OW_AssocDb.hpp	2009-08-15 17:57:42.000000000 +0200
+@@ -49,6 +49,7 @@
+ #include "OW_ResultHandlerIFC.hpp"
+ #include "OW_IntrusiveReference.hpp"
+ #include "OW_IntrusiveCountableBase.hpp"
++#include <cstring>
+ 
+ namespace OW_NAMESPACE
+ {
diff --git a/net/openwbem/init.d/owcimomd b/net/openwbem/init.d/owcimomd
new file mode 100644
index 0000000..1a1ce4a
--- /dev/null
+++ b/net/openwbem/init.d/owcimomd
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/owcimomd
+NEEDS="+network"
+RUNLEVEL=3
+
+. /etc/init.d/smgl_init
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 4437c3f..ad3527a 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,18 +1,18 @@
            SPELL=samba
-         VERSION=3.5.4
+         VERSION=3.5.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
    SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
    SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-     SOURCE_HASH=sha512:65d95726eb53cce1942270f00b8fc007573783ab6b6401e6acb8d9e05af6d2fa1552c1a2ad9260e09a5a66af5c9696a3a24e0c03028ed56f464e2e4d7ba176b2
+     SOURCE_HASH=sha512:54a469c3c960fea82499b124046affc9b0c81fe6ce9b8ce564da40e4a19bff9c643eb8981a5f2c9ebf36722aa6e4337ef911a2af467639089cd32851c37ffd6e
 if [[ "$SAMBA_VSCAN" == "y" ]] ; then
    VSCAN_VERSION=0.3.6c-beta4
          SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
   SOURCE2_URL[0]=http://www.openantivirus.org/download/$SOURCE2
     SOURCE2_HASH=sha512:6a4d6f9c033777a54af19f5e4d637ba0515cfb6ca3c815357d8ee4d735586f372d9b7e2b315a783be21ce524aa6f39e1536f91031f496acffbda225a6c8a996f
 fi
-  SECURITY_PATCH=12
+  SECURITY_PATCH=13
       LICENSE[0]=GPL
         WEB_SITE=http://www.samba.org/
         KEYWORDS="net"
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 78c1dcc..eae04fd 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2010-09-14 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.5.5, SECURITY_PATCH=13
+	* {libcap,valgrind-include,wrong_python_ldflags}.patch: removed
+
 2010-06-23 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.5.4
 
diff --git a/net/samba/libcap.patch b/net/samba/libcap.patch
deleted file mode 100644
index d097173..0000000
--- a/net/samba/libcap.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# From http://bugs.gentoo.org/show_bug.cgi?id=210527
-#
-Revision: 1.1 - (download) (annotate)
-Wed Feb 20 20:02:54 2008 UTC (4 weeks, 5 days ago) by dev-zero
-Branch: MAIN
-CVS Tags: HEAD
-
-Added patches to fix bugs #210527 and #210662 and the broken-readdir detection.
-(Portage version: 2.1.4.4)
-
-diff -Naurb samba-3.0.28.orig/source/configure.in samba-3.0.28/source/configure.in
---- samba-3.0.28.orig/source/configure.in	2007-11-21 04:58:01.000000000 +0100
-+++ samba-3.0.28/source/configure.in	2008-02-20 14:31:05.167709211 +0100
-@@ -2663,6 +2663,7 @@
- if test x"$samba_cv_HAVE_POSIX_CAPABILITIES" = x"yes"; then
-     AC_DEFINE(HAVE_POSIX_CAPABILITIES, 1,
- 	    [Whether POSIX capabilities are available])
-+    AC_CHECK_DECLS([capget], , , [#include <sys/capability.h>])
- else
-     LIBS=$ac_save_LIBS
- fi
-diff -Naurb samba-3.0.28.orig/source/include/config.h.in samba-3.0.28/source/include/config.h.in
---- samba-3.0.28.orig/source/include/config.h.in	2007-12-10 17:04:29.000000000 +0100
-+++ samba-3.0.28/source/include/config.h.in	2008-02-20 14:32:41.246837408 +0100
-@@ -1211,6 +1211,9 @@
- /* Whether POSIX capabilities are available */
- #undef HAVE_POSIX_CAPABILITIES
- 
-+/* Whether the capget (and capset) function is available (libcap-2.x has it) */
-+#undef HAVE_DECL_CAPGET
-+
- /* Whether posix_fadvise is available */
- #undef HAVE_POSIX_FADVISE
- 
-diff -Naurb samba-3.0.28.orig/source/smbd/oplock_linux.c samba-3.0.28/source/smbd/oplock_linux.c
---- samba-3.0.28.orig/source/smbd/oplock_linux.c	2007-11-15 04:15:04.000000000 +0100
-+++ samba-3.0.28/source/smbd/oplock_linux.c	2008-02-20 14:31:48.327720338 +0100
-@@ -34,10 +34,12 @@
- 	uint32 inheritable;
- } data;
- 
-+#if defined HAVE_DECL_CAPGET && !HAVE_DECL_CAPGET
- extern int capget(struct cap_user_header * hdrp,
- 		  struct cap_user_data * datap);
- extern int capset(struct cap_user_header * hdrp,
- 		  const struct cap_user_data * datap);
-+#endif
- 
- static SIG_ATOMIC_T signals_received;
- #define FD_PENDING_SIZE 100
-
diff --git a/net/samba/valgrind-include.patch b/net/samba/valgrind-include.patch
deleted file mode 100644
index e4f5463..0000000
--- a/net/samba/valgrind-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naupr samba-3.0.29.orig/source/include/includes.h samba-3.0.29/source/include/includes.h
---- samba-3.0.29.orig/source/include/includes.h	2008-05-25 15:19:04.092291327 +0200
-+++ samba-3.0.29/source/include/includes.h	2008-05-25 15:19:34.167036737 +0200
-@@ -255,6 +255,7 @@ typedef int ber_int_t;
- #include <aio.h>
- #endif
- 
-+#if 0
- /* skip valgrind headers on 64bit AMD boxes */
- #ifndef HAVE_64BIT_LINUX
- /* Special macros that are no-ops except when run under Valgrind on
-@@ -275,7 +276,7 @@ typedef int ber_int_t;
- #define VALGRIND
- #endif
- #endif
--
-+#endif
- 
- /* we support ADS if we want it and have krb5 and ldap libs */
- #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
diff --git a/net/samba/wrong_python_ldflags.patch b/net/samba/wrong_python_ldflags.patch
deleted file mode 100644
index 6f5c8ba..0000000
--- a/net/samba/wrong_python_ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur samba-3.0.28a.orig/source/Makefile.in samba-3.0.28a/source/Makefile.in
---- samba-3.0.28a.orig/source/Makefile.in	2008-05-17 12:20:23.000000000 +0200
-+++ samba-3.0.28a/source/Makefile.in	2008-05-17 12:23:38.000000000 +0200
-@@ -1666,7 +1666,8 @@
- 	fi
- 	PYTHON_OBJS="$(PYTHON_OBJ)" \
- 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
--	LIBS="$(LDFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
-+	LDFLAGS="$(LDSHFLAGS)" \
-+	LIBS="$(LDSHFLAGS) $(LIBS) $(PASSDB_LIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAP_LIBS)" \
- 		$(PYTHON) python/setup.py build
- 
- python_install: $(PYTHON_OBJ)
-@@ -1676,8 +1677,9 @@
- 	fi
- 	PYTHON_OBJS="$(PYTHON_OBJ)" \
- 	PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
--	LIBS="$(LDFLAGS) $(LIBS)" \
--		$(PYTHON) python/setup.py install --root=$(DESTDIR)
-+	LDFLAGS="$(LDSHFLAGS)" \
-+	LIBS="$(LDSHFLAGS) $(LIBS)" \
-+		$(PYTHON) python/setup.py install --root="$(DESTDIR)"
- 
- python_clean:
- 	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
diff --git a/net/shorewall-perl/BUILD b/net/shorewall-perl/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/net/shorewall-perl/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/shorewall-perl/DEPENDS b/net/shorewall-perl/DEPENDS
deleted file mode 100755
index 1517e66..0000000
--- a/net/shorewall-perl/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends  shorewall-common
diff --git a/net/shorewall-perl/DETAILS b/net/shorewall-perl/DETAILS
deleted file mode 100755
index 5cf30ea..0000000
--- a/net/shorewall-perl/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
-           SPELL=shorewall-perl
-         VERSION=deprecated
-        WEB_SITE=http://www.shorewall.net/
-         ENTERED=20070902
-        KEYWORDS="firewall net"
-           SHORT="A high-level tool for configuring Netfilter."
-cat << EOF
-You need the shorewall-common package to actually do anything. This is just
-a compiler.
-This is only one part of the entire shorewall system. This is the reccomended
-compiler, because it's nice and fast :D
-
-The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
-tool for configuring Netfilter. You describe your firewall/gateway
-requirements using entries in a set of configuration files. Shorewall reads
-those configuration files and with the help of the iptables utility, Shorewall
-configures Netfilter to match your requirements. Shorewall can be used on a
-dedicated firewall system, a multi-function gateway/router/server or on a
-standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
-compatibility mode and can thus take advantage of Netfilter's connection state
-tracking capabilities.
-EOF
diff --git a/net/shorewall-perl/HISTORY b/net/shorewall-perl/HISTORY
deleted file mode 100644
index 957f9f1..0000000
--- a/net/shorewall-perl/HISTORY
+++ /dev/null
@@ -1,35 +0,0 @@
-2009-10-08 Arjan Bouter <abouter at sourcemage.org>
-	* deprecated in favour of shorewall-common
-
-2009-07-25 Arjan Bouter <abouter at sourcemage.org>
-	* PROVIDES: added, provide SHOREWALL_COMPILER
-
-2009-06-02 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: updated to 4.2.9
-
-2009-03-08 Arjan Bouter <abouter at sourcemage.org>
-	* DETAILS: updated to 4.2.6.2
-
-2008-09-30 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: updated to 4.0.14
-
-2008-08-11 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: shorewall.gpg.key -> shorewall.gpg
-	  Updated to 4.0.13
-
-2008-03-12 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.0.9.1
-	  RELEASE should use ${VERSION:0:5}
-	  Use FTP instead of HTTP (except Germany)
-	  Remove viisage URL
-
-2008-01-28 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: VERSION updated to 4.0.8
-
-2007-10-24 Elisamuel Resto <ryuji at mages.ath.cx>
-	* DETAILS: VERSION updated to 4.0.5
-
-2007-09-02 David Kowis <dkowis at shlrm.org>
-	* DETAILS, BUILD, INSTALL, DEPENDS: created this spell
-	  to replace existing shorewall spell
-
diff --git a/net/shorewall-perl/INSTALL b/net/shorewall-perl/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/net/shorewall-perl/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/shorewall-perl/PREPARE b/net/shorewall-perl/PREPARE
deleted file mode 100755
index 120a1ae..0000000
--- a/net/shorewall-perl/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-message "shorewall-perl is deprecated and no longer available upstream." &&
-message "switching to shorewall-common"
diff --git a/net/shorewall-perl/PRE_BUILD b/net/shorewall-perl/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/net/shorewall-perl/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/shorewall-perl/PROVIDES b/net/shorewall-perl/PROVIDES
deleted file mode 100755
index 4733b8e..0000000
--- a/net/shorewall-perl/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-SHOREWALL_COMPILER
diff --git a/net/shorewall-perl/TRIGGERS b/net/shorewall-perl/TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/net/shorewall-perl/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/net/shorewall-shell/BUILD b/net/shorewall-shell/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/net/shorewall-shell/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/shorewall-shell/DEPENDS b/net/shorewall-shell/DEPENDS
deleted file mode 100755
index 1a9ea50..0000000
--- a/net/shorewall-shell/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends shorewall-common
diff --git a/net/shorewall-shell/DETAILS b/net/shorewall-shell/DETAILS
deleted file mode 100755
index b633c8b..0000000
--- a/net/shorewall-shell/DETAILS
+++ /dev/null
@@ -1,22 +0,0 @@
-           SPELL=shorewall-shell
-         VERSION=deprecated
-        WEB_SITE=http://www.shorewall.net/
-         ENTERED=20070902
-        KEYWORDS="firewall net"
-           SHORT="A high-level tool for configuring Netfilter."
-cat << EOF
-You need the shorewall-common package to actually do anything. This is just
-a compiler.
-This is only one part of the entire shorewall system. This is one of the
-compilers, shorewall-perl is reccomended over this, as it's faster.
-
-The Shoreline Firewall, more commonly known as "Shorewall", is a high-level
-tool for configuring Netfilter. You describe your firewall/gateway
-requirements using entries in a set of configuration files. Shorewall reads
-those configuration files and with the help of the iptables utility, Shorewall
-configures Netfilter to match your requirements. Shorewall can be used on a
-dedicated firewall system, a multi-function gateway/router/server or on a
-standalone GNU/Linux system. Shorewall does not use Netfilter's ipchains
-compatibility mode and can thus take advantage of Netfilter's connection state
-tracking capabilities.
-EOF
diff --git a/net/shorewall-shell/HISTORY b/net/shorewall-shell/HISTORY
deleted file mode 100644
index 60d01b6..0000000
--- a/net/shorewall-shell/HISTORY
+++ /dev/null
@@ -1,35 +0,0 @@
-2009-10-08 Arjan Bouter <abouter at sourcemage.org>
-	* deprecated spell in favour of shorewall-common
-
-2009-07-25 Arjan Bouter <abouter at sourcemage.org>
-        * PROVIDES: added, provide SHOREWALL_COMPILER
-
-2009-06-02 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: updated to 4.2.9
-
-2009-03-08 Arjan Bouter <abouter at sourcemage.org>
-        * DETAILS: updated to 4.2.6
-
-2008-09-30 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: updated to 4.0.14
-
-2008-08-11 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: shorewall.gpg.key -> shorewall.gpg
-	  Updated to 4.0.13
-
-2008-03-12 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 4.0.9.1
-	  RELEASE should use ${VERSION:0:5}
-	  Use FTP instead of HTTP (except Germany)
-	  Remove viisage URL
-
-2008-01-28 Elisamuel Resto <ryuji at sourcemage.org>
-	* DETAILS: VERSION updated to 4.0.8
-
-2007-10-24 Elisamuel Resto <ryuji at mages.ath.cx>
-	* DETAILS: VERSION updated to 4.0.5
-
-2007-09-02 David Kowis <dkowis at shlrm.org>
-	* DETAILS, BUILD, INSTALL, DEPENDS: created this spell
-	  to replace existing shorewall spell
-
diff --git a/net/shorewall-shell/INSTALL b/net/shorewall-shell/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/net/shorewall-shell/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/shorewall-shell/PREPARE b/net/shorewall-shell/PREPARE
deleted file mode 100755
index 820dc6c..0000000
--- a/net/shorewall-shell/PREPARE
+++ /dev/null
@@ -1,21 +0,0 @@
-message "shorewall-shell is deprecated and no longer available upstream." &&
-message "switching to shorewall-common"
-echo << EOF
-If you are currently using Shorewall-shell:
-
-    a) In shorewall.conf, if you have specified
-       "SHOREWALL_COMPILER=shell" then you must either:
-
-       -  change that specification to "SHOREWALL_COMPILER=perl"; or
-       -  change that specification to "SHOREWALL_COMPILER="; or
-       -  delete the specification altogether.
-
-       Failure to do so will result in the following warning:
-
-       WARNING: SHOREWALL_COMPILER=shell ignored. Shorewall-shell
-                support has been removed in this release.
-
-    b) Review the migration issues at
-       http://www.shorewall.net/LennyToSqueeze.html and make changes as
-       required.
-EOF
diff --git a/net/shorewall-shell/PRE_BUILD b/net/shorewall-shell/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/net/shorewall-shell/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/net/shorewall-shell/PROVIDES b/net/shorewall-shell/PROVIDES
deleted file mode 100755
index 4733b8e..0000000
--- a/net/shorewall-shell/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-SHOREWALL_COMPILER
diff --git a/net/shorewall-shell/TRIGGERS b/net/shorewall-shell/TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/net/shorewall-shell/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/net/traceroute/DETAILS b/net/traceroute/DETAILS
index 95af937..aa69aff 100755
--- a/net/traceroute/DETAILS
+++ b/net/traceroute/DETAILS
@@ -1,9 +1,9 @@
            SPELL=traceroute
-         VERSION=2.0.15
+         VERSION=2.0.16
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:b0e89265fbeb68a3c5dd69d5b3413de59b67712277021be474be1a9be39046d25c5b7191a1fd8ed1720d34ca68343043b3f28863927806e93c0edf14a6fb3dec
+     SOURCE_HASH=sha512:003422c3edd13989436cf470e3e34ebae543b921fcf2ecca1afc797ed2bc536a2ae5626192443e722100f3a38c131d497c62e462399214d361e9b26d60908122
         WEB_SITE=http://traceroute.sourceforge.net/
          ENTERED=20010922
       LICENSE[0]=GPL
diff --git a/net/traceroute/HISTORY b/net/traceroute/HISTORY
index e945bd9..ac6b322 100644
--- a/net/traceroute/HISTORY
+++ b/net/traceroute/HISTORY
@@ -1,3 +1,6 @@
+2010-09-15 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* DETAILS: 2.0.16
+
 2010-07-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.15
 
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index ba38200..75b20dc 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -3,7 +3,7 @@ if [ "$LIFEREA_DEVEL" == "y" ]; then
          VERSION=1.7.4
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 else
-         VERSION=1.6.4
+         VERSION=1.6.5
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 fi
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index dec4444..9845ac0 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,6 @@
+2010-10-03 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated stable to version 1.6.5
+
 2010-07-03 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated stable to version 1.6.4
 
diff --git a/news/liferea/liferea-1.6.4.tar.gz.sig b/news/liferea/liferea-1.6.4.tar.gz.sig
deleted file mode 100644
index 9ad0131..0000000
Binary files a/news/liferea/liferea-1.6.4.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.6.5.tar.gz.sig b/news/liferea/liferea-1.6.5.tar.gz.sig
new file mode 100644
index 0000000..3acc3aa
Binary files /dev/null and b/news/liferea/liferea-1.6.5.tar.gz.sig differ
diff --git a/perl-cpan/class-methodmaker/DETAILS b/perl-cpan/class-methodmaker/DETAILS
index 6112e04..08e1d61 100755
--- a/perl-cpan/class-methodmaker/DETAILS
+++ b/perl-cpan/class-methodmaker/DETAILS
@@ -1,9 +1,9 @@
            SPELL=class-methodmaker
-         VERSION=2.15
+         VERSION=2.16
+     SOURCE_HASH=sha512:6e2847d431dec2600035292204ed999d3c43e27f73c6aaf94da34382524261dbed802de546a1bf2dd64c68a43e67bc9b86064438b7d21996a22ca29cc9574dd3
           SOURCE=Class-MethodMaker-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Class-MethodMaker-$VERSION
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/S/SC/SCHWIGON/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:d59df2860e5c90681bfa31de0b40ccc6a2a6cf3e99e826e8d6ebdb386750a7955b8b9702b28341341b63a6f06bacc9779903d12e672fc3e9e97b101c54e15ec4
          LICENSE=ART
         WEB_SITE=http://search.cpan.org/~schwigon/Class-MethodMaker/
          ENTERED=20020403
diff --git a/perl-cpan/class-methodmaker/HISTORY b/perl-cpan/class-methodmaker/HISTORY
index 9152d63..4661d3a 100644
--- a/perl-cpan/class-methodmaker/HISTORY
+++ b/perl-cpan/class-methodmaker/HISTORY
@@ -1,3 +1,6 @@
+2010-09-28 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.16
+
 2010-03-14 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
 	* DETAILS: updated spell to 2.15
 
diff --git a/perl-cpan/mime-parser/BUILD b/perl-cpan/mime-parser/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/mime-parser/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/mime-parser/DEPENDS b/perl-cpan/mime-parser/DEPENDS
deleted file mode 100755
index 5dd00fd..0000000
--- a/perl-cpan/mime-parser/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends perl &&
-depends io-stringy &&
-depends mailtools
diff --git a/perl-cpan/mime-parser/DETAILS b/perl-cpan/mime-parser/DETAILS
deleted file mode 100755
index 4e167ed..0000000
--- a/perl-cpan/mime-parser/DETAILS
+++ /dev/null
@@ -1,12 +0,0 @@
-           SPELL=mime-parser
-         VERSION=5.427
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
-        WEB_SITE="http://search.cpan.org/search?query=MIME%3A%3AParser&mode=all"
-      PATCHLEVEL=1
-      LICENSE[0]=ART
-         ENTERED=20080630
-           SHORT="Parses streams to create MIME entities"
-cat << EOF
-You can inherit from this class to create your own subclasses that parse
-MIME streams into MIME::Entity objects.
-EOF
diff --git a/perl-cpan/mime-parser/HISTORY b/perl-cpan/mime-parser/HISTORY
deleted file mode 100644
index 129d4a9..0000000
--- a/perl-cpan/mime-parser/HISTORY
+++ /dev/null
@@ -1,7 +0,0 @@
-2008-07-01 David Kowis <dkowis at shlrm.org>
-	* DETAILS: quill forgot the sha512
-	* DOH!: deprecated in favor of the real thing mime-tools
-
-2008-06-30 David Kowis <dkowis at shlrm.org>
-	* BUILD, DEPENDS, DETAILS: spell created
-
diff --git a/perl-cpan/mime-parser/INSTALL b/perl-cpan/mime-parser/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/mime-parser/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/mime-parser/PRE_BUILD b/perl-cpan/mime-parser/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/mime-parser/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/mime-parser/TRIGGERS b/perl-cpan/mime-parser/TRIGGERS
deleted file mode 100755
index 4b1a7c2..0000000
--- a/perl-cpan/mime-parser/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast mime-parser dispel_self
diff --git a/perl-cpan/module-build/BUILD b/perl-cpan/module-build/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/module-build/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/module-build/DEPENDS b/perl-cpan/module-build/DEPENDS
deleted file mode 100755
index 6826bc7..0000000
--- a/perl-cpan/module-build/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends perl
diff --git a/perl-cpan/module-build/DETAILS b/perl-cpan/module-build/DETAILS
deleted file mode 100755
index 1cd0c4a..0000000
--- a/perl-cpan/module-build/DETAILS
+++ /dev/null
@@ -1,7 +0,0 @@
-          SPELL=module-build
-        VERSION=0
-     PATCHLEVEL=9999
-          SHORT="deprecated"
-cat << EOF
-  deprecated spell [replaced by perl]
-EOF
diff --git a/perl-cpan/module-build/DOWNLOAD b/perl-cpan/module-build/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/module-build/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/module-build/HISTORY b/perl-cpan/module-build/HISTORY
deleted file mode 100644
index 38b810f..0000000
--- a/perl-cpan/module-build/HISTORY
+++ /dev/null
@@ -1,55 +0,0 @@
-2009-07-19 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
-	* spell deprecated [was merged into perl] #15248
-	* PATCHLEVEL=9999
-	* DETAILS: version 0
-
-2008-10-11 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.30
-
-2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
-	* BUILD: useless
-
-2007-06-20 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.2808
-
-2006-11-13 Treeve Jelbert <treeve at sourcemage.org>
-	* DETAILS: version 0.2805_01
-
-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 BUILD_API=2.
-
-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
-
-2005-09-23 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* CONFLICTS: removed, deprecated uppercase spell is gone
-
-2005-05-14 Eric Sandall <sandalle at sourcemage.org>
-	* DETAILS: Updated to 0.27_01
-	  Filled in SHORT and long description
-	  Changed LICENSE to LICENSE[0] and changed from GPL to ART
-	  Removed MAINTAINER
-	  Updated WEB_SITE
-	* DEPENDS: Removed perl, params-validate depends on it
-
-2005-05-02 Eric Sandall <sandalle at sourcemage.org>
-	* BUILD: That's SECTION_DIRECTORY not SOURCE_DIRECTORY
-
-2005-04-30 Rafael George <george.rafael at gmail.com>
-	* DETAILS: build api 2, lowercased spell
-	* BUILD: PERL_BUILD use
-	* CONFLICTS: added
-
-2002-06-18 Lyon Lemmens <redlemon at knoware.nl>
-	* DETAILS: added MD5 signature
-	* DETAILS: added LICENSE
-
-2002-05-12 Sergey Lipnevich <sergey at sourcemage.org>
-	* All files: Spell created
-
diff --git a/perl-cpan/module-build/INSTALL b/perl-cpan/module-build/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/module-build/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/module-build/PRE_BUILD b/perl-cpan/module-build/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/module-build/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/module-build/TRIGGERS b/perl-cpan/module-build/TRIGGERS
deleted file mode 100755
index aa288e0..0000000
--- a/perl-cpan/module-build/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast module-build dispel_self
diff --git a/perl-cpan/template-plugin-gd-image/BUILD b/perl-cpan/template-plugin-gd-image/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/template-plugin-gd-image/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/template-plugin-gd-image/DEPENDS b/perl-cpan/template-plugin-gd-image/DEPENDS
deleted file mode 100755
index 241d48c..0000000
--- a/perl-cpan/template-plugin-gd-image/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends template-gd
diff --git a/perl-cpan/template-plugin-gd-image/DETAILS b/perl-cpan/template-plugin-gd-image/DETAILS
deleted file mode 100755
index 07fd472..0000000
--- a/perl-cpan/template-plugin-gd-image/DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-           SPELL=template-plugin-gd-image
-         VERSION=2.66
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Template-GD-${VERSION}"
-        WEB_SITE="http://search.cpan.org/~abw/Template-GD-2.66/lib/Template/Plugin/GD/Image.pm"
-      LICENSE[0]=ART
-         ENTERED=20070310
-           SHORT="The GD.Image plugin provides an interface to GD.pm's GD::Image class"
-cat << EOF
-The GD.Image plugin provides an interface to GD.pm's GD::Image class.
-The GD::Image class is the main interface to GD.pm.
-EOF
diff --git a/perl-cpan/template-plugin-gd-image/HISTORY b/perl-cpan/template-plugin-gd-image/HISTORY
deleted file mode 100644
index 2ff1d76..0000000
--- a/perl-cpan/template-plugin-gd-image/HISTORY
+++ /dev/null
@@ -1,8 +0,0 @@
-2008-06-30 David Kowis <dkowis at shlrm.org>
-	* DEPRECATED: template-gd is more correct
-
-2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
-	* BUILD: useless
-
-2007-03-10 David Kowis <dkowis at shlrm.org>
-	* DETAILS, DEPENDS, BUILD, HISTORY: created spell
diff --git a/perl-cpan/template-plugin-gd-image/INSTALL b/perl-cpan/template-plugin-gd-image/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/template-plugin-gd-image/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/template-plugin-gd-image/PRE_BUILD b/perl-cpan/template-plugin-gd-image/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/perl-cpan/template-plugin-gd-image/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/perl-cpan/template-plugin-gd-image/TRIGGERS b/perl-cpan/template-plugin-gd-image/TRIGGERS
deleted file mode 100755
index 4340b2b..0000000
--- a/perl-cpan/template-plugin-gd-image/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast template-plugin-gd-image dispel_self
diff --git a/perl-cpan/xml-parser-expat/DETAILS b/perl-cpan/xml-parser-expat/DETAILS
index af7dd0f..ce6b180 100755
--- a/perl-cpan/xml-parser-expat/DETAILS
+++ b/perl-cpan/xml-parser-expat/DETAILS
@@ -1,9 +1,9 @@
            SPELL=xml-parser-expat
-         VERSION=2.36
+         VERSION=2.40
+     SOURCE_HASH=sha512:ecb2af535a616f709c9e79e1e72e0bf875611c35b193b516d09896e0deba2dd1332173d16f5fb45e5630bb8019f852209dc3611b8c7a31c5eeed4f30cac288ab
           SOURCE=XML-Parser-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-Parser-$VERSION
-   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MS/MSERGEANT/$SOURCE
-     SOURCE_HASH=sha512:aadc1d5dcfddf7ad79f5cf05a9b8368d78418cea70b6550011d3ce099ab4eb8333b03ab478eb0faae361b27718e9c4e46f6eca16f68241f2a5c6096af6564110
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/C/CH/CHORNY/$SOURCE
          LICENSE=ART
         WEB_SITE=http://search.cpan.org/~msergeant/XML-Parser/
          ENTERED=20020314
diff --git a/perl-cpan/xml-parser-expat/HISTORY b/perl-cpan/xml-parser-expat/HISTORY
index dc35e10..3ca3171 100644
--- a/perl-cpan/xml-parser-expat/HISTORY
+++ b/perl-cpan/xml-parser-expat/HISTORY
@@ -1,3 +1,7 @@
+2010-09-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.40
+	  new SOURCE_URL
+
 2008-01-07 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: cleaned up, updated to 2.36
 	* BUILD: useless
diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 0b3b3cc..53e7640 100755
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -1,6 +1,8 @@
 depends  e2fsprogs              &&
 depends  ghostscript-fonts-std  &&
+depends  freetype2              &&
 depends  jpeg                   &&
+depends  tiff '--with-system-libtiff' &&
 depends  libpng                 &&
 depends  zlib                   &&
 
@@ -17,15 +19,14 @@ optional_depends  "libx11"                                             \
 
 if is_depends_enabled $SPELL libx11;then
   depends libxt   &&
-  depends libxext &&
-  optional_depends cairo \
-                   "--enable-cairo" \
-                   "--disable-cairo" \
-                   "for cairo output device"
-else
-  OPTS="--disable-cairo $OPTS"
+  depends libxext
 fi &&
 
+optional_depends  libpaper \
+                  "--with-libpaper" \
+                  "--without-libpaper" \
+                  "papersize support" &&
+
 optional_depends  "CUPS"                           \
                   "--enable-cups"                  \
                   "--disable-cups"                 \
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index ba0845e..4fc346b 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,12 +1,11 @@
            SPELL=ghostscript
-         VERSION=8.71
-     SOURCE_HASH=sha512:86ae1e797d7bb3d3e65ad36cab0434bdd957812c5340fc8cff14e76fd772b3d65742dc81ab39d7320482b1fe35b501658b5c64c5c7377b359f7357f3244c1173
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://ghostscript.com/releases/$SOURCE
-        WEB_SITE=http://www.ghostscript.com/awki
+         VERSION=9.00
+          SOURCE=$SPELL-$VERSION.tar.bz2
+     SOURCE_HASH=sha512:bbe0f9064e6a15102eb9ca042c110f87dd418555453d036465fca4ad98bd80cb2934845914ef5edd339cb3b55364549c6a4f2b7b76ffc7163bd1175c477a006a
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+        WEB_SITE=http://www.ghostscript.com/
+   SOURCE_URL[0]=$WEB_SITE/releases/$SOURCE
       LICENSE[0]=GPL
-      PATCHLEVEL=1
          ENTERED=20010922
         KEYWORDS="interpreter postscript printer"
            SHORT="interpreter for the PostScript language"
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index fc08321..d113d36 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,21 @@
+2010-09-20 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: update sha512
+	  upstream modified the tarball to include the autocnf stuff
+	* PRE_BUILD: deleted
+	* DEPENDS: add tiff, optional libpaper, remove cairo
+
+2010-09-18 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 9.00
+	  change URL
+	  no upstream signature available
+	* PRE_BUILD: added, to run autoconf
+	* DEPENDS: add freetype2
+
+2010-09-12 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 8.71.1; changed source extension; converted
+	  to upstream signature checking
+	* PRE_BUILD, ghostscript.patch: removed, fixed by upstream
+
 2010-06-07 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* BUILD: always build the JAPAN set of drivers #14764
 
diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
deleted file mode 100755
index b22a0de..0000000
--- a/printer/ghostscript/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/ghostscript.patch
diff --git a/printer/ghostscript/ghostscript.patch b/printer/ghostscript/ghostscript.patch
deleted file mode 100644
index 826c029..0000000
--- a/printer/ghostscript/ghostscript.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/cups/gdevcups.c b/cups/gdevcups.c
-index 551b806..4000abf 100644
---- a/cups/gdevcups.c
-+++ b/cups/gdevcups.c
-@@ -975,7 +975,8 @@ cups_map_cmyk(gx_device *pdev,		/* I - Device info */
- 	      frac      k,		/* I - Black value */
- 	      frac      *out)		/* O - Device colors */
- {
--  int	c0, c1, c2, c3;			/* Temporary color values */
-+  int	c0 = 0, c1 = 0,
-+        c2 = 0, c3 = 0;			/* Temporary color values */
-   float	rr, rg, rb,			/* Real RGB colors */
- 	ciex, ciey, ciez,		/* CIE XYZ colors */
- 	ciey_yn,			/* Normalized luminance */
-@@ -2703,9 +2704,13 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
-   int			color_set;	/* Were the color attrs set? */
-   gdev_prn_space_params	sp;		/* Space parameter data */
-   int			width,		/* New width of page */
--                        height;		/* New height of page */
-+                        height,		/* New height of page */
-+                        colorspace,     /* New color space */
-+                        bitspercolor;   /* New bits per color */
-   static int            width_old = 0,  /* Previous width */
--                        height_old = 0; /* Previous height */
-+                        height_old = 0, /* Previous height */
-+                        colorspace_old = 0,/* Previous color space */
-+                        bitspercolor_old = 0;/* Previous bits per color */
-   ppd_attr_t            *backside = NULL,
-                         *backsiderequiresflippedmargins = NULL;
-   float                 swap;
-@@ -2800,9 +2805,10 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
-   else if (code == 0) \
-   { \
-     dprintf1("DEBUG: Setting %s to", sname); \
--    for (i = 0; i < count; i ++) \
--      dprintf1(" %d", (unsigned)(arrayval.data[i]));	 \
--      cups->header.name[i] = (unsigned)arrayval.data[i]; \
-+    for (i = 0; i < count; i ++) { \
-+      dprintf1(" %d", (unsigned)(arrayval.data[i])); \
-+      cups->header.name[i] = (unsigned)(arrayval.data[i]); \
-+    } \
-     dprintf("...\n"); \
-   }
- 
-@@ -3243,23 +3249,31 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
-     }
- #endif /* CUPS_RASTER_SYNCv1 */
- 
-+    colorspace = cups->header.cupsColorSpace;
-+    bitspercolor = cups->header.cupsBitsPerColor;
-+
-    /*
-     * Don't reallocate memory unless the device has been opened...
-     * Also reallocate only if the size has actually changed...
-     */
- 
--    if (pdev->is_open && (width != width_old || height != height_old))
-+    if (pdev->is_open &&
-+	(width != width_old || height != height_old ||
-+	 colorspace != colorspace_old || bitspercolor != bitspercolor_old))
-     {
- 
-       width_old = width;
-       height_old = height;
-+      colorspace_old = colorspace;
-+      bitspercolor_old = bitspercolor;
- 
-      /*
-       * Device is open and size has changed, so reallocate...
-       */
- 
--      dprintf4("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n",
--	       pdev->MediaSize[0], pdev->MediaSize[1], width, height);
-+      dprintf6("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels, color space: %d, bits per color: %d...\n",
-+	       pdev->MediaSize[0], pdev->MediaSize[1], width, height,
-+	       colorspace, bitspercolor);
- 
-       sp = ((gx_device_printer *)pdev)->space_params;
diff --git a/printer/hplip/DETAILS b/printer/hplip/DETAILS
index fb1c6d0..1c3040a 100755
--- a/printer/hplip/DETAILS
+++ b/printer/hplip/DETAILS
@@ -1,5 +1,5 @@
            SPELL=hplip
-         VERSION=3.10.6
+         VERSION=3.10.9
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
diff --git a/printer/hplip/HISTORY b/printer/hplip/HISTORY
index 5e48508..e1b1c19 100644
--- a/printer/hplip/HISTORY
+++ b/printer/hplip/HISTORY
@@ -1,3 +1,6 @@
+2010-10-04 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 3.10.9
+
 2010-07-23 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 3.10.6
 	* install.patch, PRE_BUILD removed, no longer needed
diff --git a/printer/zint/DETAILS b/printer/zint/DETAILS
index bec396b..fa86873 100755
--- a/printer/zint/DETAILS
+++ b/printer/zint/DETAILS
@@ -1,6 +1,6 @@
            SPELL=zint
-         VERSION=2.3.1
-     SOURCE_HASH=sha512:313d4a73d3b53ebc1865962c118c23db4bbd1c201e190ccdcb74b8f5757f1a8ac169d41ca65346ffc4d94ceb5d5983d33299282351732e7abe59a52987679b49
+         VERSION=2.4.0
+     SOURCE_HASH=sha512:15fb00159ddb8378551defcd8fe6dac796742437b285124faf9cbcf9f445fd1460e22506a88cd522da44feffe782b01101d3094809097044edb3a5eef9ccd1e8
           SOURCE=$SPELL-$VERSION.src.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
@@ -8,9 +8,23 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
       LICENSE[0]=GPL
          ENTERED=20090129
         KEYWORDS="printer"
-           SHORT="barcode encoding library supporting over 40 symbologies"
+           SHORT="barcode encoding library"
 cat << EOF
-A barcode encoding library supporting over 40 symbologies including Code 128, Data Matrix, 
-USPS OneCode, EAN-128, UPC/EAN, ITF, QR Code, Code 16k, PDF417, MicroPDF417, LOGMARS, 
-Maxicode, GS1 DataBar, Aztec, Codablock, Composite Symbols and more.
+Zint is an barcode encoding and image generating library written entirely
+in C.
+
+It features:
+ * Over 50 symbologies including many not available in any other free software
+   package.
+ * Unicode translation for symbologies which support Latin-1 and Kanji character
+   sets.
+ * Full GS1 support including data verification and automated insertion of FNC1
+   characters.
+ * Support for encoding binary data including NULL (ASCII 0) characters.
+ * Health Industry Barcode (HIBC) encoding capabilities.
+ * Output in PNG, EPS and SVG formats with user adjustable sizes and colours.
+ * Verification stage for SBN, ISBN and ISBN-13 data.
+ * Fully documented API for integration with your own project.
+ * Command line and Qt4-based GUI front-ends.
+ * Fully multi-platform.
 EOF
diff --git a/printer/zint/HISTORY b/printer/zint/HISTORY
index 720cf3f..bf03270 100644
--- a/printer/zint/HISTORY
+++ b/printer/zint/HISTORY
@@ -1,3 +1,7 @@
+2010-09-16 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: fixed description
+	  updated spell to 2.4.0
+
 2010-03-07 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.3.1
 
diff --git a/python-pypi/bzr/DETAILS b/python-pypi/bzr/DETAILS
index 1bfb257..2e93f95 100755
--- a/python-pypi/bzr/DETAILS
+++ b/python-pypi/bzr/DETAILS
@@ -1,5 +1,6 @@
            SPELL=bzr
-         VERSION=2.1.2
+         VERSION=2.2.0
+      PATCHLEVEL=1
               VX=`echo $VERSION|cut -c-3`
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
diff --git a/python-pypi/bzr/HISTORY b/python-pypi/bzr/HISTORY
index 0cd4e23..95a6441 100644
--- a/python-pypi/bzr/HISTORY
+++ b/python-pypi/bzr/HISTORY
@@ -1,3 +1,12 @@
+2010-09-19 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: PATCHLEVEL=1
+	* PREBUILD: apply patch
+	* xmlrpclib.diff: added, upstream patch 
+	  Fix traceback with python-2.7's xmlrpclib
+
+2010-09-12 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 2.2.0
+
 2010-07-05 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 2.1,2
 	* bzr.gpg: add FBD3EB8E: public key "Robert Collins
diff --git a/python-pypi/bzr/PRE_BUILD b/python-pypi/bzr/PRE_BUILD
index dd4b7ff..7793b2b 100755
--- a/python-pypi/bzr/PRE_BUILD
+++ b/python-pypi/bzr/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
+patch -p0 <$SPELL_DIRECTORY/xmlrpclib.diff &&
 sedit "s:man/man1:share/man/man1:" setup.py
diff --git a/python-pypi/bzr/xmlrpclib.diff b/python-pypi/bzr/xmlrpclib.diff
new file mode 100644
index 0000000..88e67e0
--- /dev/null
+++ b/python-pypi/bzr/xmlrpclib.diff
@@ -0,0 +1,40 @@
+=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
+--- bzrlib/transport/http/_urllib2_wrappers.py	2010-05-08 05:56:28 +0000
++++ bzrlib/transport/http/_urllib2_wrappers.py	2010-09-15 02:43:44 +0000
+@@ -75,6 +75,26 @@
+     )
+ 
+ 
++class addinfourl(urllib2.addinfourl):
++    '''Replacement addinfourl class compatible with python-2.7's xmlrpclib
++
++    In python-2.7, xmlrpclib expects that the response object that it receives
++    has a getheader method.  httplib.HTTPResponse provides this but
++    urllib2.addinfourl does not.  Add the necessary functions here, ported to
++    use the internal data structures of addinfourl.
++    '''
++
++    def getheader(self, name, default=None):
++        if self.headers is None:
++            raise httplib.ResponseNotReady()
++        return self.headers.getheader(name, default)
++
++    def getheaders(self):
++        if self.headers is None:
++            raise httplib.ResponseNotReady()
++        return self.headers.items()
++
++
+ class _ReportingFileSocket(object):
+ 
+     def __init__(self, filesock, report_activity=None):
+@@ -656,7 +676,7 @@
+             r = response
+             r.recv = r.read
+             fp = socket._fileobject(r, bufsize=65536)
+-            resp = urllib2.addinfourl(fp, r.msg, req.get_full_url())
++            resp = addinfourl(fp, r.msg, req.get_full_url())
+             resp.code = r.status
+             resp.msg = r.reason
+             resp.version = r.version
+
diff --git a/python-pypi/calibre/DEPENDS b/python-pypi/calibre/DEPENDS
index c986c60..4965530 100755
--- a/python-pypi/calibre/DEPENDS
+++ b/python-pypi/calibre/DEPENDS
@@ -11,4 +11,10 @@ depends dbus-python &&
 depends lxml &&
 depends beautifulsoup &&
 depends podofo &&
-depends python-dateutil 
+depends python-dateutil &&
+depends chmlib &&
+depends cssutils &&
+depends fontconfig &&
+depends pythonmagick &&
+depends -sub "QT4 XPDF_HEADERS" poppler
+
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index 6835927..c075cf7 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,10 +1,8 @@
            SPELL=calibre
-         VERSION=0.6.16
+         VERSION=0.7.20
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-# unless you have a great reason to changing this don't
-# upstream site removes older releases
-   SOURCE_URL[0]=http://pypi.python.org/packages/source/c/$SPELL/${SOURCE}
-     SOURCE_HASH=sha512:0e4f7746e12d62aae23b645fede82dc67d8d2e1740e018325cf74f83283312089c60ab6d492076f00c8044d37d26a8f14b41d5696488ab9e2161304519230029
+   SOURCE_URL