Source Mage code commit list

[Bor Kraljič <scm AT sourcemage.org>]

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

 ChangeLog                                                      |    7 
 antivirus/clamav/DEPENDS                                       |    2 
 antivirus/clamav/HISTORY                                       |    4 
 antivirus/inoclam/DEPENDS                                      |    2 
 antivirus/inoclam/HISTORY                                      |    4 
 archive-libs/libbasic/DEPENDS                                  |    2 
 archive-libs/libbasic/HISTORY                                  |    4 
 archive/bacula/DEPENDS                                         |    2 
 archive/bacula/HISTORY                                         |    4 
 archive/dar/DEPENDS                                            |    2 
 archive/dar/HISTORY                                            |    4 
 archive/dar22/DEPENDS                                          |    2 
 archive/dar22/HISTORY                                          |    4 
 archive/p7zip/DEPENDS                                          |    2 
 archive/p7zip/HISTORY                                          |    4 
 archive/pbzip2/DEPENDS                                         |    2 
 archive/pbzip2/HISTORY                                         |    4 
 archive/unrar/DEPENDS                                          |    2 
 archive/unrar/HISTORY                                          |    4 
 archive/uudeview/HISTORY                                       |    3 
 archive/uudeview/PROVIDES                                      |    1 
 audio-creation/ams/DEPENDS                                     |    2 
 audio-creation/ams/HISTORY                                     |    4 
 audio-creation/amsynth/DEPENDS                                 |    2 
 audio-creation/amsynth/HISTORY                                 |    4 
 audio-creation/ardour2/DEPENDS                                 |    2 
 audio-creation/ardour2/HISTORY                                 |    4 
 audio-creation/beast/DEPENDS                                   |    2 
 audio-creation/beast/HISTORY                                   |    4 
 audio-creation/espeak/DEPENDS                                  |    2 
 audio-creation/espeak/HISTORY                                  |    4 
 audio-creation/ggseq/DEPENDS                                   |    2 
 audio-creation/ggseq/HISTORY                                   |    4 
 audio-creation/gigedit/DEPENDS                                 |    2 
 audio-creation/gigedit/HISTORY                                 |    4 
 audio-creation/klick/DEPENDS                                   |    2 
 audio-creation/klick/HISTORY                                   |    4 
 audio-creation/linuxsampler/DEPENDS                            |    2 
 audio-creation/linuxsampler/HISTORY                            |    4 
 audio-creation/nted/DEPENDS                                    |    2 
 audio-creation/nted/HISTORY                                    |    4 
 audio-creation/om-synth/DEPENDS                                |    2 
 audio-creation/om-synth/HISTORY                                |    4 
 audio-creation/qsynth/DEPENDS                                  |    2 
 audio-creation/qsynth/HISTORY                                  |    4 
 audio-creation/qtractor/DEPENDS                                |    2 
 audio-creation/qtractor/HISTORY                                |    4 
 audio-creation/rosegarden/DEPENDS                              |    2 
 audio-creation/rosegarden/HISTORY                              |    4 
 audio-creation/seq24/DEPENDS                                   |    2 
 audio-creation/seq24/HISTORY                                   |    4 
 audio-creation/traverso/DEPENDS                                |    2 
 audio-creation/traverso/HISTORY                                |    4 
 audio-creation/zynaddsubfx/DEPENDS                             |    2 
 audio-creation/zynaddsubfx/HISTORY                             |    4 
 audio-drivers/jack2/DEPENDS                                    |    2 
 audio-drivers/jack2/HISTORY                                    |    4 
 audio-drivers/jackdmp/DEPENDS                                  |    2 
 audio-drivers/jackdmp/HISTORY                                  |    4 
 audio-drivers/libffado/DEPENDS                                 |    2 
 audio-drivers/libffado/HISTORY                                 |    4 
 audio-drivers/yiff/DEPENDS                                     |    2 
 audio-drivers/yiff/HISTORY                                     |    4 
 audio-libs/clalsadrv/DEPENDS                                   |    2 
 audio-libs/clalsadrv/HISTORY                                   |    4 
 audio-libs/faad2/DEPENDS                                       |    2 
 audio-libs/faad2/HISTORY                                       |    4 
 audio-libs/flac/DEPENDS                                        |    2 
 audio-libs/flac/HISTORY                                        |    4 
 audio-libs/game-music-emu/DEPENDS                              |    2 
 audio-libs/game-music-emu/HISTORY                              |    4 
 audio-libs/id3lib/DEPENDS                                      |    2 
 audio-libs/id3lib/HISTORY                                      |    4 
 audio-libs/libao/DEPENDS                                       |    2 
 audio-libs/libao/HISTORY                                       |    4 
 audio-libs/libgig/DEPENDS                                      |    2 
 audio-libs/libgig/HISTORY                                      |    4 
 audio-libs/libid3tag/DEPENDS                                   |    2 
 audio-libs/libid3tag/HISTORY                                   |    4 
 audio-libs/libmodplug/DEPENDS                                  |    2 
 audio-libs/libmodplug/HISTORY                                  |    4 
 audio-libs/libmpcdec/DEPENDS                                   |    2 
 audio-libs/libmpcdec/HISTORY                                   |    4 
 audio-libs/libmusicbrainz/DEPENDS                              |    2 
 audio-libs/libmusicbrainz/HISTORY                              |    4 
 audio-libs/libmusicbrainz3/DEPENDS                             |    2 
 audio-libs/libmusicbrainz3/HISTORY                             |    4 
 audio-libs/libofa/DEPENDS                                      |    2 
 audio-libs/libofa/HISTORY                                      |    4 
 audio-libs/libzzub/DEPENDS                                     |    2 
 audio-libs/libzzub/HISTORY                                     |    4 
 audio-libs/lilypond/DEPENDS                                    |    2 
 audio-libs/lilypond/HISTORY                                    |    4 
 audio-libs/mp4v2/DEPENDS                                       |    2 
 audio-libs/mp4v2/HISTORY                                       |    4 
 audio-libs/opencore-amr/DEPENDS                                |    2 
 audio-libs/opencore-amr/HISTORY                                |    4 
 audio-libs/raul/DEPENDS                                        |    2 
 audio-libs/raul/HISTORY                                        |    4 
 audio-libs/resid/DEPENDS                                       |    2 
 audio-libs/resid/HISTORY                                       |    4 
 audio-libs/rubberband/DEPENDS                                  |    2 
 audio-libs/rubberband/HISTORY                                  |    4 
 audio-libs/sidplay-libs/DEPENDS                                |    2 
 audio-libs/sidplay-libs/HISTORY                                |    4 
 audio-libs/soundtouch/DEPENDS                                  |    2 
 audio-libs/soundtouch/HISTORY                                  |    4 
 audio-players/alsaplayer/DEPENDS                               |    2 
 audio-players/alsaplayer/HISTORY                               |    4 
 audio-players/dcd/DEPENDS                                      |    2 
 audio-players/dcd/HISTORY                                      |    4 
 audio-players/dermixd/DEPENDS                                  |    2 
 audio-players/dermixd/HISTORY                                  |    4 
 audio-players/xmms2_jump/DEPENDS                               |    2 
 audio-players/xmms2_jump/HISTORY                               |    4 
 audio-plugins/amb-plugins/DEPENDS                              |    2 
 audio-plugins/amb-plugins/HISTORY                              |    4 
 audio-plugins/caps-plugins/DEPENDS                             |    2 
 audio-plugins/caps-plugins/HISTORY                             |    4 
 audio-plugins/fil-plugins/DEPENDS                              |    2 
 audio-plugins/fil-plugins/HISTORY                              |    4 
 audio-plugins/mcp-plugins/DEPENDS                              |    2 
 audio-plugins/mcp-plugins/HISTORY                              |    4 
 audio-plugins/rev-plugins/DEPENDS                              |    2 
 audio-plugins/rev-plugins/HISTORY                              |    4 
 audio-plugins/vco-plugins/DEPENDS                              |    2 
 audio-plugins/vco-plugins/HISTORY                              |    4 
 audio-soft/fusepod/DEPENDS                                     |    2 
 audio-soft/fusepod/HISTORY                                     |    4 
 audio-soft/jack_capture/DEPENDS                                |    2 
 audio-soft/jack_capture/HISTORY                                |    4 
 audio-soft/patchage/DEPENDS                                    |    2 
 audio-soft/patchage/HISTORY                                    |    4 
 audio-soft/qjackctl/DEPENDS                                    |    2 
 audio-soft/qjackctl/HISTORY                                    |    4 
 chat-im/amsn/DEPENDS                                           |    2 
 chat-im/amsn/HISTORY                                           |    4 
 chat-irc/irssi/DEPENDS                                         |    2 
 chat-irc/irssi/HISTORY                                         |    4 
 chat-irc/znc/DEPENDS                                           |    2 
 chat-irc/znc/HISTORY                                           |    4 
 chat-libs/gloox/DEPENDS                                        |    2 
 chat-libs/gloox/HISTORY                                        |    4 
 chat-libs/libmsn/DEPENDS                                       |    2 
 chat-libs/libmsn/HISTORY                                       |    4 
 chat-libs/opal/DEPENDS                                         |    2 
 chat-libs/opal/HISTORY                                         |    4 
 chat-libs/openh323/DEPENDS                                     |    2 
 chat-libs/openh323/HISTORY                                     |    4 
 chat-libs/ptlib/DEPENDS                                        |    2 
 chat-libs/ptlib/HISTORY                                        |    4 
 chat-libs/pwlib/DEPENDS                                        |    2 
 chat-libs/pwlib/HISTORY                                        |    4 
 cluster/lapack/DEPENDS                                         |    2 
 cluster/lapack/HISTORY                                         |    4 
 cluster/mpich2/DEPENDS                                         |    2 
 cluster/mpich2/HISTORY                                         |    4 
 crypto/beecrypt/DEPENDS                                        |    2 
 crypto/beecrypt/HISTORY                                        |    4 
 crypto/botan/DEPENDS                                           |    2 
 crypto/botan/HISTORY                                           |    4 
 crypto/cryptopp/DEPENDS                                        |    2 
 crypto/cryptopp/HISTORY                                        |    4 
 crypto/libecc/DEPENDS                                          |    2 
 crypto/libecc/HISTORY                                          |    4 
 crypto/libgcrypt/DEPENDS                                       |    2 
 crypto/libgcrypt/HISTORY                                       |    4 
 crypto/libksba/DEPENDS                                         |    2 
 crypto/libksba/HISTORY                                         |    4 
 crypto/pcsc-lite/DEPENDS                                       |    2 
 crypto/pcsc-lite/HISTORY                                       |    4 
 crypto/qca-pkcs11/DEPENDS                                      |    2 
 crypto/qca-pkcs11/HISTORY                                      |    4 
 crypto/steghide/DEPENDS                                        |    2 
 crypto/steghide/HISTORY                                        |    4 
 crypto/yassl/DEPENDS                                           |    2 
 crypto/yassl/HISTORY                                           |    4 
 database/db/DEPENDS                                            |    2 
 database/db/HISTORY                                            |    4 
 database/drizzle/DEPENDS                                       |    2 
 database/drizzle/HISTORY                                       |    4 
 database/fbcopy/DEPENDS                                        |    2 
 database/fbcopy/HISTORY                                        |    4 
 database/fbexport/DEPENDS                                      |    2 
 database/fbexport/HISTORY                                      |    4 
 database/firebird/DEPENDS                                      |    2 
 database/firebird/HISTORY                                      |    4 
 database/firebird25/DEPENDS                                    |    2 
 database/firebird25/HISTORY                                    |    4 
 database/flamerobin/DEPENDS                                    |    2 
 database/flamerobin/HISTORY                                    |    4 
 database/hk_classes/DEPENDS                                    |    2 
 database/hk_classes/HISTORY                                    |    4 
 database/ibpp/DEPENDS                                          |    2 
 database/ibpp/HISTORY                                          |    4 
 database/kyotocabinet/DEPENDS                                  |    2 
 database/kyotocabinet/HISTORY                                  |    4 
 database/libinterbasexx/DEPENDS                                |    2 
 database/libinterbasexx/HISTORY                                |    4 
 database/mariadb/DEPENDS                                       |    2 
 database/mariadb/HISTORY                                       |    4 
 database/mongodb/DEPENDS                                       |    2 
 database/mongodb/HISTORY                                       |    4 
 database/mysql-workbench/DEPENDS                               |    2 
 database/mysql-workbench/HISTORY                               |    4 
 database/mysql/DEPENDS                                         |    2 
 database/mysql/HISTORY                                         |    4 
 database/openrpt/DEPENDS                                       |    2 
 database/openrpt/HISTORY                                       |    4 
 database/pgadmin3/DEPENDS                                      |    2 
 database/pgadmin3/HISTORY                                      |    4 
 database/rekall/DEPENDS                                        |    2 
 database/rekall/HISTORY                                        |    4 
 database/sqlite/DEPENDS                                        |    2 
 database/sqlite/HISTORY                                        |    4 
 database/unixodbc/DEPENDS                                      |    2 
 database/unixodbc/HISTORY                                      |    4 
 database/xbase64/DEPENDS                                       |    2 
 database/xbase64/HISTORY                                       |    4 
 dev/null                                                       |binary
 devel/adagoop/DEPENDS                                          |    2 
 devel/adagoop/HISTORY                                          |    4 
 devel/afay/DEPENDS                                             |    2 
 devel/afay/HISTORY                                             |    4 
 devel/apiextractor/DEPENDS                                     |    2 
 devel/apiextractor/HISTORY                                     |    4 
 devel/arx/DEPENDS                                              |    2 
 devel/arx/HISTORY                                              |    4 
 devel/asis/DEPENDS                                             |    2 
 devel/asis/HISTORY                                             |    4 
 devel/astyle/DEPENDS                                           |    2 
 devel/astyle/HISTORY                                           |    4 
 devel/aunit/DEPENDS                                            |    2 
 devel/aunit/HISTORY                                            |    4 
 devel/bison/DEPENDS                                            |    2 
 devel/bison/HISTORY                                            |    4 
 devel/bisonc++/DEPENDS                                         |    2 
 devel/bisonc++/HISTORY                                         |    4 
 devel/bobcat/DEPENDS                                           |    2 
 devel/bobcat/HISTORY                                           |    4 
 devel/ccbuild/DEPENDS                                          |    2 
 devel/ccbuild/HISTORY                                          |    4 
 devel/cmake/DEPENDS                                            |    2 
 devel/cmake/HISTORY                                            |    4 
 devel/cppcheck/DEPENDS                                         |    2 
 devel/cppcheck/HISTORY                                         |    4 
 devel/cppsocket/DEPENDS                                        |    2 
 devel/cppsocket/HISTORY                                        |    4 
 devel/cppunit/DEPENDS                                          |    2 
 devel/cppunit/HISTORY                                          |    4 
 devel/ctemplate/DEPENDS                                        |    2 
 devel/ctemplate/HISTORY                                        |    4 
 devel/distcc/BUILD                                             |    5 
 devel/distcc/DEPENDS                                           |   22 
 devel/distcc/DETAILS                                           |    9 
 devel/distcc/HISTORY                                           |    7 
 devel/distcc/INSTALL                                           |    8 
 devel/distcc/PRE_BUILD                                         |    2 
 devel/distcc/init.d/distcc                                     |    3 
 devel/distcc/init.d/distcc.conf                                |    9 
 devel/doxygen/DEPENDS                                          |    2 
 devel/doxygen/HISTORY                                          |    4 
 devel/duma/DEPENDS                                             |    2 
 devel/duma/HISTORY                                             |    4 
 devel/falcon/DEPENDS                                           |    2 
 devel/falcon/HISTORY                                           |    4 
 devel/florist/DEPENDS                                          |    2 
 devel/florist/HISTORY                                          |    4 
 devel/gambas/DEPENDS                                           |    2 
 devel/gambas/HISTORY                                           |    4 
 devel/gambas2/DEPENDS                                          |    2 
 devel/gambas2/HISTORY                                          |    4 
 devel/gdb/DETAILS                                              |    6 
 devel/gdb/HISTORY                                              |    3 
 devel/gdb/INSTALL                                              |    3 
 devel/geany/DEPENDS                                            |    2 
 devel/geany/HISTORY                                            |    4 
 devel/gnat-gps/DEPENDS                                         |    2 
 devel/gnat-gps/HISTORY                                         |    4 
 devel/gperf/DEPENDS                                            |    2 
 devel/gperf/HISTORY                                            |    4 
 devel/gprbuild/DEPENDS                                         |    2 
 devel/gprbuild/HISTORY                                         |    4 
 devel/lazarus/DEPENDS                                          |    2 
 devel/lazarus/HISTORY                                          |    4 
 devel/libcutl/DEPENDS                                          |    2 
 devel/libcutl/HISTORY                                          |    4 
 devel/libgc/DEPENDS                                            |    4 
 devel/libgc/HISTORY                                            |    8 
 devel/llvm/DEPENDS                                             |    2 
 devel/llvm/HISTORY                                             |    4 
 devel/nant/DEPENDS                                             |    2 
 devel/nant/HISTORY                                             |    4 
 devel/ncc/DEPENDS                                              |    2 
 devel/ncc/HISTORY                                              |    4 
 devel/odb/DEPENDS                                              |    2 
 devel/odb/HISTORY                                              |    4 
 devel/openfst/DEPENDS                                          |    2 
 devel/openfst/HISTORY                                          |    4 
 devel/oprofile/DEPENDS                                         |    2 
 devel/oprofile/HISTORY                                         |    4 
 devel/pkgconfig/DEPENDS                                        |    8 
 devel/pkgconfig/DETAILS                                        |    4 
 devel/pkgconfig/HISTORY                                        |    4 
 devel/polyorb/DEPENDS                                          |    2 
 devel/polyorb/HISTORY                                          |    4 
 devel/propertyeditor/DEPENDS                                   |    2 
 devel/propertyeditor/HISTORY                                   |    4 
 devel/python/DEPENDS                                           |    2 
 devel/python/HISTORY                                           |    4 
 devel/python3/DEPENDS                                          |    2 
 devel/python3/HISTORY                                          |    4 
 devel/qdevelop/DEPENDS                                         |    2 
 devel/qdevelop/HISTORY                                         |    4 
 devel/qt-creator/DEPENDS                                       |    2 
 devel/qt-creator/HISTORY                                       |    4 
 devel/qt4pas/DEPENDS                                           |    2 
 devel/qt4pas/DETAILS                                           |    4 
 devel/qt4pas/HISTORY                                           |    7 
 devel/quazip/DEPENDS                                           |    2 
 devel/quazip/HISTORY                                           |    4 
 devel/ragel/DEPENDS                                            |    2 
 devel/ragel/HISTORY                                            |    4 
 devel/re2c/DEPENDS                                             |    2 
 devel/re2c/HISTORY                                             |    4 
 devel/s11n/DEPENDS                                             |    2 
 devel/s11n/HISTORY                                             |    4 
 devel/scatcdsk/DEPENDS                                         |    2 
 devel/scatcdsk/HISTORY                                         |    4 
 devel/spark/BUILD                                              |    3 
 devel/spark/DEPENDS                                            |    2 
 devel/spark/DETAILS                                            |   21 
 devel/spark/HISTORY                                            |    3 
 devel/spark/INSTALL                                            |    1 
 devel/spark/PRE_BUILD                                          |    6 
 devel/spark/spark-gpl-2010-swi_patches.tgz                     |binary
 devel/swig/DEPENDS                                             |    2 
 devel/swig/HISTORY                                             |    4 
 disk/ddrescue/DEPENDS                                          |    2 
 disk/ddrescue/HISTORY                                          |    4 
 disk/discid/DEPENDS                                            |    2 
 disk/discid/HISTORY                                            |    4 
 disk/dvd+rw-tools/DEPENDS                                      |    2 
 disk/dvd+rw-tools/HISTORY                                      |    4 
 disk/gdisk/DEPENDS                                             |    2 
 disk/gdisk/HISTORY                                             |    4 
 disk/gparted/DEPENDS                                           |    2 
 disk/gparted/HISTORY                                           |    4 
 disk/libaal/DEPENDS                                            |    2 
 disk/libaal/HISTORY                                            |    4 
 disk/partimage-ng/DEPENDS                                      |    2 
 disk/partimage-ng/HISTORY                                      |    4 
 disk/partimage/DEPENDS                                         |    2 
 disk/partimage/HISTORY                                         |    4 
 disk/qpxtool/DEPENDS                                           |    2 
 disk/qpxtool/HISTORY                                           |    4 
 disk/udev/DETAILS                                              |    4 
 disk/udev/HISTORY                                              |    3 
 display/fbterm/DEPENDS                                         |    2 
 display/fbterm/HISTORY                                         |    4 
 doc/aiksaurus/DEPENDS                                          |    2 
 doc/aiksaurus/HISTORY                                          |    4 
 doc/groff/DEPENDS                                              |    2 
 doc/groff/HISTORY                                              |    4 
 doc/opensp/DEPENDS                                             |    2 
 doc/opensp/HISTORY                                             |    4 
 doc/pdftohtml/DEPENDS                                          |    2 
 doc/pdftohtml/HISTORY                                          |    4 
 doc/pstoedit/DEPENDS                                           |    2 
 doc/pstoedit/HISTORY                                           |    4 
 doc/source-highlight/DEPENDS                                   |    2 
 doc/source-highlight/HISTORY                                   |    4 
 doc/wv2/DEPENDS                                                |    2 
 doc/wv2/HISTORY                                                |    4 
 editors/gle/DEPENDS                                            |    2 
 editors/gle/HISTORY                                            |    4 
 editors/ht/DEPENDS                                             |    2 
 editors/ht/HISTORY                                             |    4 
 editors/jed/BUILD                                              |    2 
 editors/jed/HISTORY                                            |    3 
 editors/lyx/DEPENDS                                            |    2 
 editors/lyx/HISTORY                                            |    4 
 editors/moe/DEPENDS                                            |    2 
 editors/moe/HISTORY                                            |    4 
 editors/openoffice/DEPENDS                                     |    2 
 editors/openoffice/HISTORY                                     |    4 
 editors/scribus4/DEPENDS                                       |    2 
 editors/scribus4/HISTORY                                       |    4 
 editors/translator/DEPENDS                                     |    2 
 editors/translator/HISTORY                                     |    4 
 ftp-libs/rb-libtorrent/DEPENDS                                 |    2 
 ftp-libs/rb-libtorrent/HISTORY                                 |    4 
 ftp/aria2/DEPENDS                                              |    2 
 ftp/aria2/HISTORY                                              |    4 
 ftp/lftp/DEPENDS                                               |    2 
 ftp/lftp/HISTORY                                               |    4 
 ftp/linuxdcpp/DEPENDS                                          |    2 
 ftp/linuxdcpp/HISTORY                                          |    4 
 ftp/mldonkey/DEPENDS                                           |    2 
 ftp/mldonkey/HISTORY                                           |    4 
 ftp/wxdfast/DEPENDS                                            |    2 
 ftp/wxdfast/HISTORY                                            |    4 
 gnome1-libs/gnome-objc/DEPENDS                                 |    2 
 gnome1-libs/gnome-objc/HISTORY                                 |    4 
 gnome2-apps/abiword/HISTORY                                    |    5 
 gnome2-apps/abiword/PRE_BUILD                                  |    4 
 gnome2-apps/abiword/abiword-gcc46.patch                        |   58 +
 gnome2-apps/pan/DEPENDS                                        |    2 
 gnome2-apps/pan/HISTORY                                        |    4 
 gnome2-apps/workrave/DEPENDS                                   |    2 
 gnome2-apps/workrave/HISTORY                                   |    4 
 gnome2-libs/enchant/DEPENDS                                    |    2 
 gnome2-libs/enchant/HISTORY                                    |    4 
 gnome2-libs/glib-java/DEPENDS                                  |    2 
 gnome2-libs/glib-java/HISTORY                                  |    4 
 gnome2-libs/guiloader-c++/DEPENDS                              |    2 
 gnome2-libs/guiloader-c++/HISTORY                              |    4 
 gnome2-libs/libgconf-java/DEPENDS                              |    2 
 gnome2-libs/libgconf-java/HISTORY                              |    4 
 gnome2-libs/libglade-java/DEPENDS                              |    2 
 gnome2-libs/libglade-java/HISTORY                              |    4 
 gnome2-libs/libgnome-java/DEPENDS                              |    2 
 gnome2-libs/libgnome-java/HISTORY                              |    4 
 gnome2-libs/libvte-java/DEPENDS                                |    2 
 gnome2-libs/libvte-java/HISTORY                                |    4 
 gnome2-libs/pango/DEPENDS                                      |   12 
 gnome2-libs/pango/HISTORY                                      |    3 
 gnome2-libs/pango/SUB_DEPENDS                                  |    2 
 gnu/ada/BUILD                                                  |   45 -
 gnu/ada/DEPENDS                                                |   10 
 gnu/ada/DETAILS                                                |   39 -
 gnu/ada/FINAL                                                  |    1 
 gnu/ada/HISTORY                                                |   17 
 gnu/ada/INSTALL                                                |    8 
 gnu/ada/PRE_BUILD                                              |   36 -
 gnu/fortran/BUILD                                              |   31 
 gnu/fortran/DEPENDS                                            |   10 
 gnu/fortran/DETAILS                                            |   20 
 gnu/fortran/FINAL                                              |    3 
 gnu/fortran/HISTORY                                            |   28 
 gnu/fortran/INSTALL                                            |   15 
 gnu/fortran/POST_REMOVE                                        |    2 
 gnu/fortran/POST_RESURRECT                                     |    2 
 gnu/fortran/PRE_BUILD                                          |   10 
 gnu/fortran/specs_fortran                                      |   41 -
 gnu/g++/BUILD                                                  |   54 -
 gnu/g++/DEPENDS                                                |   30 
 gnu/g++/DETAILS                                                |   19 
 gnu/g++/FINAL                                                  |    3 
 gnu/g++/HISTORY                                                |   30 
 gnu/g++/INSTALL                                                |   14 
 gnu/g++/POST_REMOVE                                            |    3 
 gnu/g++/POST_RESURRECT                                         |    2 
 gnu/g++/PRE_BUILD                                              |   10 
 gnu/g++/REPAIR^all^POST_REMOVE                                 |    3 
 gnu/g++/specs_g++                                              |   39 -
 gnu/gcc/BUILD                                                  |   75 +-
 gnu/gcc/CONFIGURE                                              |   18 
 gnu/gcc/CONFLICTS                                              |    5 
 gnu/gcc/DEPENDS                                                |   20 
 gnu/gcc/DETAILS                                                |  102 +++
 gnu/gcc/EXPORTS                                                |    5 
 gnu/gcc/HISTORY                                                |  101 ++-
 gnu/gcc/INSTALL                                                |   22 
 gnu/gcc/POST_RESURRECT                                         |    2 
 gnu/gcc/PREPARE                                                |   29 
 gnu/gcc/PRE_BUILD                                              |   63 +-
 gnu/gcc/PRE_SUB_DEPENDS                                        |   11 
 gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS                            |   10 
 gnu/gcc/REPAIR^none^SUB_DEPENDS                                |   12 
 gnu/gcc/SUB_DEPENDS                                            |   13 
 gnu/gcc/ada-symbolic-tracebacks.diff                           |  313 
++++++++++
 gnu/gcc/ecj-4.3.jar.sig                                        |binary
 gnu/gcc/txt00120.txt.gz                                        |binary
 gnu/gcj/BUILD                                                  |   36 -
 gnu/gcj/DEPENDS                                                |   19 
 gnu/gcj/DETAILS                                                |   32 -
 gnu/gcj/FINAL                                                  |    3 
 gnu/gcj/HISTORY                                                |   28 
 gnu/gcj/INSTALL                                                |   16 
 gnu/gcj/POST_REMOVE                                            |    2 
 gnu/gcj/POST_RESURRECT                                         |    2 
 gnu/gcj/PREPARE                                                |    1 
 gnu/gcj/PRE_BUILD                                              |   17 
 gnu/gcj/ecj-4.3.jar.sig                                        |    0 
 gnu/gcj/specs_java                                             |   17 
 gnu/ghdl/DEPENDS                                               |    2 
 gnu/ghdl/HISTORY                                               |    4 
 gnu/gnat-gpl/DEPENDS                                           |    2 
 gnu/gnat-gpl/HISTORY                                           |    4 
 gnu/objc/BUILD                                                 |   30 
 gnu/objc/DEPENDS                                               |   10 
 gnu/objc/DETAILS                                               |   25 
 gnu/objc/FINAL                                                 |    3 
 gnu/objc/HISTORY                                               |   23 
 gnu/objc/INSTALL                                               |   14 
 gnu/objc/POST_REMOVE                                           |    2 
 gnu/objc/POST_RESURRECT                                        |    2 
 gnu/objc/PRE_BUILD                                             |   10 
 gnu/objc/specs_objc                                            |   15 
 gnustep-libs/gnustep-make/DEPENDS                              |    2 
 gnustep-libs/gnustep-make/HISTORY                              |    4 
 graphics-libs/agg/DEPENDS                                      |    2 
 graphics-libs/agg/HISTORY                                      |    4 
 graphics-libs/cegui/DEPENDS                                    |    2 
 graphics-libs/cegui/HISTORY                                    |    4 
 graphics-libs/cimg/DEPENDS                                     |    2 
 graphics-libs/cimg/HISTORY                                     |    4 
 graphics-libs/etl/DEPENDS                                      |    2 
 graphics-libs/etl/HISTORY                                      |    4 
 graphics-libs/flowcanvas/DEPENDS                               |    2 
 graphics-libs/flowcanvas/HISTORY                               |    4 
 graphics-libs/freeimage/DEPENDS                                |    2 
 graphics-libs/freeimage/HISTORY                                |    4 
 graphics-libs/ftgl/DEPENDS                                     |    2 
 graphics-libs/ftgl/HISTORY                                     |    4 
 graphics-libs/geglmm/DEPENDS                                   |    2 
 graphics-libs/geglmm/HISTORY                                   |    4 
 graphics-libs/libcaca/DEPENDS                                  |    2 
 graphics-libs/libcaca/HISTORY                                  |    4 
 graphics-libs/libraw/DEPENDS                                   |    2 
 graphics-libs/libraw/HISTORY                                   |    4 
 graphics-libs/ogre/DEPENDS                                     |    2 
 graphics-libs/ogre/HISTORY                                     |    4 
 graphics-libs/opencv/DEPENDS                                   |    2 
 graphics-libs/opencv/HISTORY                                   |    4 
 graphics-libs/poppler/DEPENDS                                  |    2 
 graphics-libs/poppler/HISTORY                                  |    4 
 graphics-libs/tiff/DEPENDS                                     |    2 
 graphics-libs/tiff/HISTORY                                     |    4 
 graphics-libs/vigra/DEPENDS                                    |    2 
 graphics-libs/vigra/HISTORY                                    |    4 
 graphics-libs/vips/DEPENDS                                     |    2 
 graphics-libs/vips/HISTORY                                     |    4 
 graphics/djvulibre/DEPENDS                                     |    2 
 graphics/djvulibre/HISTORY                                     |    4 
 graphics/enblend/DEPENDS                                       |    2 
 graphics/enblend/HISTORY                                       |    4 
 graphics/exact-image/DEPENDS                                   |    2 
 graphics/exact-image/HISTORY                                   |    4 
 graphics/exiv2/DEPENDS                                         |    2 
 graphics/exiv2/HISTORY                                         |    4 
 graphics/fotoxx/DEPENDS                                        |    2 
 graphics/fotoxx/HISTORY                                        |    4 
 graphics/graphicsmagick/DEPENDS                                |    2 
 graphics/graphicsmagick/HISTORY                                |    4 
 graphics/imagemagick/DEPENDS                                   |    2 
 graphics/imagemagick/HISTORY                                   |    4 
 graphics/inkscape/DEPENDS                                      |    2 
 graphics/inkscape/HISTORY                                      |    4 
 graphics/ocrad/DEPENDS                                         |    2 
 graphics/ocrad/HISTORY                                         |    4 
 graphics/openvrml/DEPENDS                                      |    2 
 graphics/openvrml/HISTORY                                      |    4 
 graphics/plotutils/DEPENDS                                     |    2 
 graphics/plotutils/HISTORY                                     |    4 
 graphics/synfig/DEPENDS                                        |    2 
 graphics/synfig/HISTORY                                        |    4 
 graphics/synfigstudio/DEPENDS                                  |    2 
 graphics/synfigstudio/HISTORY                                  |    4 
 graphics/tesseract/DEPENDS                                     |    2 
 graphics/tesseract/HISTORY                                     |    4 
 graphics/xaralx/DEPENDS                                        |    2 
 graphics/xaralx/HISTORY                                        |    4 
 graphics/yafray/DEPENDS                                        |    2 
 graphics/yafray/HISTORY                                        |    4 
 ham/hamlib/DEPENDS                                             |    2 
 ham/hamlib/HISTORY                                             |    4 
 http/amaya/DEPENDS                                             |    2 
 http/amaya/HISTORY                                             |    4 
 http/bfilter/DEPENDS                                           |    2 
 http/bfilter/HISTORY                                           |    4 
 http/dansguardian/DEPENDS                                      |    2 
 http/dansguardian/HISTORY                                      |    4 
 http/firefox/DEPENDS                                           |    2 
 http/firefox/HISTORY                                           |    4 
 http/gnash/DEPENDS                                             |    2 
 http/gnash/HISTORY                                             |    4 
 http/icecat/DEPENDS                                            |    2 
 http/icecat/HISTORY                                            |    4 
 http/javascriptcore/DEPENDS                                    |    2 
 http/javascriptcore/HISTORY                                    |    4 
 http/kazehakase/DEPENDS                                        |    2 
 http/kazehakase/HISTORY                                        |    4 
 http/lightspark/DETAILS                                        |    6 
 http/lightspark/HISTORY                                        |    3 
 http/middleman/DEPENDS                                         |    2 
 http/middleman/HISTORY                                         |    4 
 http/midori/DEPENDS                                            |    5 
 http/midori/DETAILS                                            |    4 
 http/midori/HISTORY                                            |    4 
 http/newsbeuter/DEPENDS                                        |    2 
 http/newsbeuter/HISTORY                                        |    4 
 http/nrcit/DEPENDS                                             |    2 
 http/nrcit/HISTORY                                             |    4 
 http/nrcore/DEPENDS                                            |    2 
 http/nrcore/HISTORY                                            |    4 
 http/osb-browser/DEPENDS                                       |    2 
 http/osb-browser/HISTORY                                       |    4 
 http/swish++/DEPENDS                                           |    2 
 http/swish++/HISTORY                                           |    4 
 http/webkitgtk/DEPENDS                                         |    2 
 http/webkitgtk/HISTORY                                         |    4 
 http/webkitgtk3/DEPENDS                                        |    2 
 http/webkitgtk3/HISTORY                                        |    4 
 http/wt/DEPENDS                                                |    2 
 http/wt/HISTORY                                                |    4 
 i18n/scim/DEPENDS                                              |    2 
 i18n/scim/HISTORY                                              |    4 
 java/antlr/DEPENDS                                             |    2 
 java/antlr/HISTORY                                             |    4 
 java/jikes/DEPENDS                                             |    2 
 java/jikes/HISTORY                                             |    4 
 java/kaffe/DEPENDS                                             |    2 
 java/kaffe/HISTORY                                             |    4 
 kde-apps/kdevelop/DEPENDS                                      |    4 
 kde-apps/kdevelop/HISTORY                                      |    8 
 kde-apps/kid3/DEPENDS                                          |    2 
 kde-apps/kid3/HISTORY                                          |    4 
 kde-apps/knoda/DEPENDS                                         |    2 
 kde-apps/knoda/HISTORY                                         |    4 
 kde-apps/kpowersave/DEPENDS                                    |    2 
 kde-apps/kpowersave/HISTORY                                    |    4 
 kde4-apps/digikam4/DETAILS                                     |    4 
 kde4-apps/digikam4/HISTORY                                     |    3 
 kde4-apps/yakuake4/DETAILS                                     |    6 
 kde4-apps/yakuake4/HISTORY                                     |    3 
 kde4-support/akonadi/DEPENDS                                   |    2 
 kde4-support/akonadi/HISTORY                                   |    4 
 kde4-support/attica/DEPENDS                                    |    2 
 kde4-support/attica/HISTORY                                    |    4 
 kde4-support/automoc/DEPENDS                                   |    2 
 kde4-support/automoc/HISTORY                                   |    4 
 kde4-support/gluon/DEPENDS                                     |    2 
 kde4-support/gluon/HISTORY                                     |    4 
 kde4-support/grantlee/DEPENDS                                  |    2 
 kde4-support/grantlee/HISTORY                                  |    4 
 kde4-support/libdbusmenu-qt/DEPENDS                            |    2 
 kde4-support/libdbusmenu-qt/HISTORY                            |    4 
 kde4-support/phonon/DEPENDS                                    |    2 
 kde4-support/phonon/HISTORY                                    |    4 
 kde4-support/polkit-qt-1/DEPENDS                               |    2 
 kde4-support/polkit-qt-1/HISTORY                               |    4 
 kernels/elpp/DEPENDS                                           |    2 
 kernels/elpp/HISTORY                                           |    4 
 kernels/linux-firmware/DETAILS                                 |    2 
 kernels/linux-firmware/HISTORY                                 |    3 
 kernels/linux/HISTORY                                          |    3 
 kernels/linux/info/patches/maintenance_patches/patch-2.6.35.14 |    6 
 latex/texlive/DEPENDS                                          |    2 
 latex/texlive/HISTORY                                          |    4 
 libs/ace/DEPENDS                                               |    2 
 libs/ace/HISTORY                                               |    4 
 libs/asio/DEPENDS                                              |    2 
 libs/asio/HISTORY                                              |    4 
 libs/boost/DEPENDS                                             |    2 
 libs/boost/HISTORY                                             |    4 
 libs/clthreads/DEPENDS                                         |    2 
 libs/clthreads/HISTORY                                         |    4 
 libs/clucene/DEPENDS                                           |    2 
 libs/clucene/HISTORY                                           |    4 
 libs/clxclient/DEPENDS                                         |    2 
 libs/clxclient/HISTORY                                         |    4 
 libs/dfb++/DEPENDS                                             |    2 
 libs/dfb++/HISTORY                                             |    4 
 libs/elfio/DEPENDS                                             |    2 
 libs/elfio/HISTORY                                             |    4 
 libs/fftw/BUILD                                                |    1 
 libs/fftw/HISTORY                                              |    3 
 libs/gettext/DEPENDS                                           |    2 
 libs/gettext/HISTORY                                           |    4 
 libs/glibc/BUILD                                               |    9 
 libs/glibc/HISTORY                                             |    6 
 libs/glibc/PREPARE                                             |    5 
 libs/gmetadom/DEPENDS                                          |    2 
 libs/gmetadom/HISTORY                                          |    4 
 libs/google-perftools/DEPENDS                                  |    2 
 libs/google-perftools/HISTORY                                  |    4 
 libs/guichan/DEPENDS                                           |    2 
 libs/guichan/HISTORY                                           |    4 
 libs/icu/DEPENDS                                               |    2 
 libs/icu/HISTORY                                               |    4 
 libs/libcgroup/DEPENDS                                         |    2 
 libs/libcgroup/HISTORY                                         |    4 
 libs/libextractor/DEPENDS                                      |    2 
 libs/libextractor/HISTORY                                      |    4 
 libs/libgmpada/DEPENDS                                         |    2 
 libs/libgmpada/HISTORY                                         |    4 
 libs/libical/DEPENDS                                           |    2 
 libs/libical/HISTORY                                           |    4 
 libs/libmemcached/DEPENDS                                      |    2 
 libs/libmemcached/HISTORY                                      |    4 
 libs/libodb-mysql/DEPENDS                                      |    2 
 libs/libodb-mysql/HISTORY                                      |    4 
 libs/libodb-tracer/DEPENDS                                     |    2 
 libs/libodb-tracer/HISTORY                                     |    4 
 libs/libodb/DEPENDS                                            |    2 
 libs/libodb/HISTORY                                            |    4 
 libs/libofx/DEPENDS                                            |    2 
 libs/libofx/HISTORY                                            |    4 
 libs/libpqxx/DEPENDS                                           |    2 
 libs/libpqxx/HISTORY                                           |    4 
 libs/libsh/DEPENDS                                             |    2 
 libs/libsh/HISTORY                                             |    4 
 libs/libsigc++/DEPENDS                                         |    2 
 libs/libsigc++/HISTORY                                         |    4 
 libs/libsigc++2/DEPENDS                                        |    2 
 libs/libsigc++2/HISTORY                                        |    4 
 libs/libsigc++3/DEPENDS                                        |    2 
 libs/libsigc++3/HISTORY                                        |    4 
 libs/libsynaptics/DEPENDS                                      |    2 
 libs/libsynaptics/HISTORY                                      |    4 
 libs/libtommath/DEPENDS                                        |    2 
 libs/libtommath/HISTORY                                        |    4 
 libs/libusb/DEPENDS                                            |    2 
 libs/libusb/HISTORY                                            |    4 
 libs/libvdpau/DEPENDS                                          |    2 
 libs/libvdpau/HISTORY                                          |    4 
 libs/libwpd/DEPENDS                                            |    2 
 libs/libwpd/HISTORY                                            |    4 
 libs/libwpg/DEPENDS                                            |    2 
 libs/libwpg/HISTORY                                            |    4 
 libs/libwps/DEPENDS                                            |    2 
 libs/libwps/HISTORY                                            |    4 
 libs/log4cpp/DEPENDS                                           |    2 
 libs/log4cpp/HISTORY                                           |    4 
 libs/loki/DEPENDS                                              |    2 
 libs/loki/HISTORY                                              |    4 
 libs/muparser/DEPENDS                                          |    2 
 libs/muparser/HISTORY                                          |    4 
 libs/ncurses/DEPENDS                                           |    2 
 libs/ncurses/HISTORY                                           |    4 
 libs/nspr/DEPENDS                                              |    2 
 libs/nspr/HISTORY                                              |    4 
 libs/ode/DEPENDS                                               |    2 
 libs/ode/HISTORY                                               |    4 
 libs/ois/DEPENDS                                               |    2 
 libs/ois/HISTORY                                               |    4 
 libs/openbabel/DEPENDS                                         |    2 
 libs/openbabel/HISTORY                                         |    4 
 libs/openmpi/DEPENDS                                           |    4 
 libs/openmpi/HISTORY                                           |    8 
 libs/pcre/DEPENDS                                              |    2 
 libs/pcre/HISTORY                                              |    4 
 libs/protobuf/DEPENDS                                          |    2 
 libs/protobuf/HISTORY                                          |    4 
 libs/sdl/DEPENDS                                               |    2 
 libs/sdl/HISTORY                                               |    4 
 libs/silly/DEPENDS                                             |    2 
 libs/silly/HISTORY                                             |    4 
 libs/stlport/DEPENDS                                           |    2 
 libs/stlport/HISTORY                                           |    4 
 libs/sword/DEPENDS                                             |    2 
 libs/sword/HISTORY                                             |    4 
 libs/tbb/DEPENDS                                               |    2 
 libs/tbb/HISTORY                                               |    4 
 libs/tinyxml/DEPENDS                                           |    2 
 libs/tinyxml/HISTORY                                           |    4 
 libs/xalan-c/DEPENDS                                           |    2 
 libs/xalan-c/HISTORY                                           |    4 
 libs/xapian-core/DEPENDS                                       |    2 
 libs/xapian-core/HISTORY                                       |    4 
 libs/xerces-c/DEPENDS                                          |    2 
 libs/xerces-c/HISTORY                                          |    4 
 libs/xmlada/DEPENDS                                            |    2 
 libs/xmlada/HISTORY                                            |    4 
 libs/xmlrpc-c/DEPENDS                                          |    2 
 libs/xmlrpc-c/HISTORY                                          |    4 
 lua-forge/luadbi/BUILD                                         |    6 
 lua-forge/luadbi/DEPENDS                                       |    4 
 lua-forge/luadbi/DETAILS                                       |    3 
 lua-forge/luadbi/HISTORY                                       |    6 
 lua-forge/luadbi/INSTALL                                       |   18 
 lua-forge/luasec/DETAILS                                       |    6 
 lua-forge/luasec/HISTORY                                       |    3 
 lxde/gpicview/DETAILS                                          |    4 
 lxde/gpicview/HISTORY                                          |    3 
 lxde/lxterminal/DETAILS                                        |    4 
 lxde/lxterminal/HISTORY                                        |    3 
 mail/thunderbird/DEPENDS                                       |    2 
 mail/thunderbird/HISTORY                                       |    4 
 mobile/kismet/DEPENDS                                          |    2 
 mobile/kismet/HISTORY                                          |    4 
 mobile/mumpot/DEPENDS                                          |    2 
 mobile/mumpot/HISTORY                                          |    4 
 mobile/pilot-link/DEPENDS                                      |    2 
 mobile/pilot-link/HISTORY                                      |    4 
 mobile/plptools/DEPENDS                                        |    2 
 mobile/plptools/HISTORY                                        |    4 
 mobile/powersave/DEPENDS                                       |    2 
 mobile/powersave/HISTORY                                       |    4 
 mobile/rutilt/DEPENDS                                          |    2 
 mobile/rutilt/HISTORY                                          |    4 
 net/bitcoin/DEPENDS                                            |    2 
 net/bitcoin/HISTORY                                            |    4 
 net/ifstatus/DEPENDS                                           |    2 
 net/ifstatus/HISTORY                                           |    4 
 net/jigdo/DEPENDS                                              |    2 
 net/jigdo/HISTORY                                              |    4 
 net/lisa/DEPENDS                                               |    2 
 net/lisa/HISTORY                                               |    4 
 net/netkit-telnet/DEPENDS                                      |    2 
 net/netkit-telnet/HISTORY                                      |    4 
 net/nload/DEPENDS                                              |    2 
 net/nload/HISTORY                                              |    4 
 net/openwbem/DEPENDS                                           |    2 
 net/openwbem/HISTORY                                           |    4 
 net/paris-traceroute/DEPENDS                                   |    2 
 net/paris-traceroute/HISTORY                                   |    4 
 net/tcptrack/DEPENDS                                           |    2 
 net/tcptrack/HISTORY                                           |    4 
 net/wvstreams/DEPENDS                                          |    2 
 net/wvstreams/HISTORY                                          |    4 
 net/xplc/DEPENDS                                               |    2 
 net/xplc/HISTORY                                               |    4 
 odbc-drivers/odbcfb/DEPENDS                                    |    2 
 odbc-drivers/odbcfb/HISTORY                                    |    4 
 odbc-drivers/picoodbc/DEPENDS                                  |    2 
 odbc-drivers/picoodbc/HISTORY                                  |    4 
 perl-cpan/alien-wxwidgets/DEPENDS                              |    2 
 perl-cpan/alien-wxwidgets/HISTORY                              |    4 
 perl-cpan/digest-sha1/DETAILS                                  |   10 
 perl-cpan/digest-sha1/HISTORY                                  |    3 
 printer/cups/DEPENDS                                           |    2 
 printer/cups/HISTORY                                           |    4 
 printer/exaro/DEPENDS                                          |    2 
 printer/exaro/HISTORY                                          |    4 
 printer/photoprint/DEPENDS                                     |    2 
 printer/photoprint/HISTORY                                     |    4 
 printer/splix/DEPENDS                                          |    2 
 printer/splix/HISTORY                                          |    4 
 printer/zint/DEPENDS                                           |    2 
 printer/zint/HISTORY                                           |    4 
 science-libs/clhep/DEPENDS                                     |    2 
 science-libs/clhep/HISTORY                                     |    4 
 science-libs/eigen/DEPENDS                                     |    2 
 science-libs/eigen/HISTORY                                     |    4 
 science-libs/eigen2/DEPENDS                                    |    2 
 science-libs/eigen2/HISTORY                                    |    4 
 science-libs/eigen3/DEPENDS                                    |    2 
 science-libs/eigen3/HISTORY                                    |    4 
 science-libs/gmm/DEPENDS                                       |    2 
 science-libs/gmm/HISTORY                                       |    4 
 science-libs/gtkmathview/DEPENDS                               |    2 
 science-libs/gtkmathview/HISTORY                               |    4 
 science-libs/lmfit/DEPENDS                                     |    2 
 science-libs/lmfit/HISTORY                                     |    4 
 science/boinc/DEPENDS                                          |    2 
 science/boinc/HISTORY                                          |    4 
 science/cocoalib/DEPENDS                                       |    2 
 science/cocoalib/HISTORY                                       |    4 
 science/ggobi/DEPENDS                                          |    4 
 science/ggobi/HISTORY                                          |    8 
 science/giac/DEPENDS                                           |    4 
 science/giac/HISTORY                                           |    4 
 science/gnucap/DEPENDS                                         |    2 
 science/gnucap/HISTORY                                         |    4 
 science/ntl/DEPENDS                                            |    2 
 science/ntl/HISTORY                                            |    4 
 science/octave-devel/DEPENDS                                   |    2 
 science/octave-devel/HISTORY                                   |    4 
 science/octave/DEPENDS                                         |    2 
 science/octave/HISTORY                                         |    4 
 science/orsa/DEPENDS                                           |    2 
 science/orsa/HISTORY                                           |    4 
 science/pari/DEPENDS                                           |    2 
 science/pari/HISTORY                                           |    4 
 science/plplot/DEPENDS                                         |    6 
 science/plplot/HISTORY                                         |   12 
 science/ppl/DEPENDS                                            |    2 
 science/ppl/HISTORY                                            |    4 
 science/r/DEPENDS                                              |    4 
 science/r/HISTORY                                              |    8 
 science/scilab/DEPENDS                                         |    2 
 science/scilab/HISTORY                                         |    4 
 science/stellarium/DEPENDS                                     |    2 
 science/stellarium/HISTORY                                     |    4 
 science/tisean/DEPENDS                                         |    2 
 science/tisean/HISTORY                                         |    4 
 science/xd3d/DEPENDS                                           |    2 
 science/xd3d/HISTORY                                           |    4 
 security/nmap/DEPENDS                                          |    2 
 security/nmap/HISTORY                                          |    4 
 security/nsat/DEPENDS                                          |    2 
 security/nsat/HISTORY                                          |    4 
 security/xprobe2/DEPENDS                                       |    2 
 security/xprobe2/HISTORY                                       |    4 
 shell-term-fm/rxvt-unicode/DEPENDS                             |    2 
 shell-term-fm/rxvt-unicode/HISTORY                             |    4 
 shell-term-fm/sakura/DETAILS                                   |    4 
 shell-term-fm/sakura/HISTORY                                   |    3 
 shell-term-fm/worker/DEPENDS                                   |    2 
 shell-term-fm/worker/HISTORY                                   |    4 
 smgl/init.d/DETAILS                                            |    2 
 smgl/init.d/HISTORY                                            |    4 
 smgl/init.d/init.d/devices                                     |    4 
 spelling/aspell/DEPENDS                                        |    2 
 spelling/aspell/HISTORY                                        |    4 
 spelling/mythes/DEPENDS                                        |    2 
 spelling/mythes/HISTORY                                        |    4 
 spelling/stardict/DEPENDS                                      |    2 
 spelling/stardict/HISTORY                                      |    4 
 telephony/asterisk/DEPENDS                                     |    2 
 telephony/asterisk/HISTORY                                     |    4 
 telephony/bayonne2/DEPENDS                                     |    2 
 telephony/bayonne2/HISTORY                                     |    4 
 telephony/ccaudio2/DEPENDS                                     |    2 
 telephony/ccaudio2/HISTORY                                     |    4 
 telephony/ccrtp/DEPENDS                                        |    2 
 telephony/ccrtp/HISTORY                                        |    4 
 telephony/ccscript/DEPENDS                                     |    2 
 telephony/ccscript/HISTORY                                     |    4 
 telephony/ccscript3/DEPENDS                                    |    2 
 telephony/ccscript3/HISTORY                                    |    4 
 telephony/commoncpp2/DEPENDS                                   |    2 
 telephony/commoncpp2/HISTORY                                   |    4 
 telephony/libjingle-tapioca/DEPENDS                            |    2 
 telephony/libjingle-tapioca/HISTORY                            |    4 
 telephony/twinkle/DEPENDS                                      |    2 
 telephony/twinkle/HISTORY                                      |    4 
 telephony/ucommon/DEPENDS                                      |    2 
 telephony/ucommon/HISTORY                                      |    4 
 utils/cdemu-daemon/DEPENDS                                     |    2 
 utils/cdemu-daemon/HISTORY                                     |    4 
 utils/crosstool-ng/DEPENDS                                     |    2 
 utils/crosstool-ng/DETAILS                                     |   16 
 utils/crosstool-ng/HISTORY                                     |    3 
 utils/dbus-c++/DEPENDS                                         |    2 
 utils/dbus-c++/HISTORY                                         |    4 
 utils/deltup/DEPENDS                                           |    2 
 utils/deltup/HISTORY                                           |    4 
 utils/exmap/DEPENDS                                            |    2 
 utils/exmap/HISTORY                                            |    4 
 utils/findwild/DEPENDS                                         |    2 
 utils/findwild/HISTORY                                         |    4 
 utils/gnuplot/DEPENDS                                          |    2 
 utils/gnuplot/HISTORY                                          |    4 
 utils/ledger/DEPENDS                                           |    2 
 utils/ledger/HISTORY                                           |    4 
 utils/log4cplus/DEPENDS                                        |    2 
 utils/log4cplus/HISTORY                                        |    4 
 utils/lshw/DEPENDS                                             |    2 
 utils/lshw/HISTORY                                             |    4 
 utils/lsvpd/DEPENDS                                            |    2 
 utils/lsvpd/HISTORY                                            |    4 
 utils/phoronix-test-suite/DEPENDS                              |    2 
 utils/phoronix-test-suite/HISTORY                              |    4 
 utils/pinot/DEPENDS                                            |    2 
 utils/pinot/HISTORY                                            |    4 
 utils/psmisc/DEPENDS                                           |    2 
 utils/psmisc/HISTORY                                           |    4 
 utils/schroot/DEPENDS                                          |    2 
 utils/schroot/HISTORY                                          |    4 
 utils/sphinx/DEPENDS                                           |    2 
 utils/sphinx/HISTORY                                           |    4 
 utils/strigi/DEPENDS                                           |    2 
 utils/strigi/HISTORY                                           |    4 
 utils/sunbird/DEPENDS                                          |    2 
 utils/sunbird/HISTORY                                          |    4 
 utils/syslinux/DEPENDS                                         |    1 
 utils/syslinux/HISTORY                                         |    3 
 utils/teardrop/DEPENDS                                         |    2 
 utils/teardrop/HISTORY                                         |    4 
 utils/tree/DETAILS                                             |    2 
 utils/tree/HISTORY                                             |    3 
 utils/tree/tree-1.5.2.2.tgz.sig                                |    0 
 utils/tree/tree-1.6.0.tgz.sig                                  |binary
 video-libs/dirac/DEPENDS                                       |    2 
 video-libs/dirac/HISTORY                                       |    4 
 video-libs/libmediainfo/DEPENDS                                |    2 
 video-libs/libmediainfo/HISTORY                                |    4 
 video-libs/libzen/DEPENDS                                      |    2 
 video-libs/libzen/HISTORY                                      |    4 
 video-libs/live/DEPENDS                                        |    2 
 video-libs/live/DETAILS                                        |    4 
 video-libs/live/HISTORY                                        |    7 
 video/avidemux2/DEPENDS                                        |    2 
 video/avidemux2/HISTORY                                        |    4 
 video/dvgrab/DEPENDS                                           |    2 
 video/dvgrab/HISTORY                                           |    4 
 video/kino/DEPENDS                                             |    2 
 video/kino/HISTORY                                             |    4 
 video/mjpegtools/DEPENDS                                       |    2 
 video/mjpegtools/HISTORY                                       |    4 
 video/mlt/DEPENDS                                              |    2 
 video/mlt/HISTORY                                              |    4 
 video/xbmc/DEPENDS                                             |    2 
 video/xbmc/HISTORY                                             |    4 
 windowmanagers/fluxbox/DEPENDS                                 |    2 
 windowmanagers/fluxbox/HISTORY                                 |    4 
 wm-addons/wbar/DEPENDS                                         |    2 
 wm-addons/wbar/HISTORY                                         |    4 
 x11-libs/cairo-java/DEPENDS                                    |    2 
 x11-libs/cairo-java/HISTORY                                    |    4 
 x11-libs/cairomm/DEPENDS                                       |    2 
 x11-libs/cairomm/HISTORY                                       |    4 
 x11-libs/xfstt/DEPENDS                                         |    2 
 x11-libs/xfstt/HISTORY                                         |    4 
 x11-toolkits/efltk/DEPENDS                                     |    2 
 x11-toolkits/efltk/HISTORY                                     |    4 
 x11-toolkits/fltk/DEPENDS                                      |    2 
 x11-toolkits/fltk/HISTORY                                      |    4 
 x11-toolkits/fltk2/DEPENDS                                     |    2 
 x11-toolkits/fltk2/HISTORY                                     |    4 
 x11-toolkits/fox/DEPENDS                                       |    2 
 x11-toolkits/fox/HISTORY                                       |    4 
 x11-toolkits/gtk+/BUILD                                        |    2 
 x11-toolkits/gtk+/DEPENDS                                      |   15 
 x11-toolkits/gtk+/DETAILS                                      |    7 
 x11-toolkits/gtk+/HISTORY                                      |    6 
 x11-toolkits/gtk+/PRE_BUILD                                    |    4 
 x11-toolkits/libgtk-java/DEPENDS                               |    2 
 x11-toolkits/libgtk-java/HISTORY                               |    4 
 x11-toolkits/nucleo/DEPENDS                                    |    2 
 x11-toolkits/nucleo/HISTORY                                    |    4 
 x11-toolkits/polymer/DEPENDS                                   |    2 
 x11-toolkits/polymer/HISTORY                                   |    4 
 x11-toolkits/qscintilla/DEPENDS                                |    2 
 x11-toolkits/qscintilla/HISTORY                                |    4 
 x11-toolkits/qt-embedded/DEPENDS                               |    2 
 x11-toolkits/qt-embedded/HISTORY                               |    4 
 x11-toolkits/qt-x11/DEPENDS                                    |    2 
 x11-toolkits/qt-x11/HISTORY                                    |    4 
 x11-toolkits/qt4/DEPENDS                                       |    2 
 x11-toolkits/qt4/HISTORY                                       |    4 
 x11-toolkits/qtada/DEPENDS                                     |    2 
 x11-toolkits/qtada/HISTORY                                     |    4 
 x11-toolkits/sptk/DEPENDS                                      |    2 
 x11-toolkits/sptk/HISTORY                                      |    4 
 x11-toolkits/wxgtk-new/DEPENDS                                 |    2 
 x11-toolkits/wxgtk-new/HISTORY                                 |    4 
 x11-toolkits/wxgtk/DEPENDS                                     |    2 
 x11-toolkits/wxgtk/HISTORY                                     |    4 
 x11/nx/DEPENDS                                                 |    2 
 x11/nx/HISTORY                                                 |    4 
 x11/nxcomp/DEPENDS                                             |    2 
 x11/nxcomp/HISTORY                                             |    4 
 x11/qsynergy/DEPENDS                                           |    2 
 x11/qsynergy/HISTORY                                           |    4 
 x11/quasar/DEPENDS                                             |    2 
 x11/quasar/HISTORY                                             |    4 
 x11/slim/DEPENDS                                               |    2 
 x11/slim/HISTORY                                               |    4 
 x11/synergy/DEPENDS                                            |    2 
 x11/synergy/HISTORY                                            |    4 
 x11/xchm/DEPENDS                                               |    2 
 x11/xchm/HISTORY                                               |    4 
 xorg-lib/libfontenc/DEPENDS                                    |    2 
 xorg-lib/libfontenc/HISTORY                                    |    4 
 xorg-lib/libice/DEPENDS                                        |    2 
 xorg-lib/libice/HISTORY                                        |    4 
 xorg-lib/liblbxutil/DEPENDS                                    |    2 
 xorg-lib/liblbxutil/HISTORY                                    |    4 
 xorg-lib/libxau/DEPENDS                                        |    2 
 xorg-lib/libxau/HISTORY                                        |    4 
 xorg-lib/libxdmcp/DEPENDS                                      |    2 
 xorg-lib/libxdmcp/HISTORY                                      |    4 
 1057 files changed, 3510 insertions(+), 1353 deletions(-)

New commits:
commit 60faafaf36e275c2d7eeb2e77d907a2a33d4e79a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    abiword: Added patch to build with gcc 4.6.x

commit e543b3f06b2861e59587f0f1b59aa478281cda43
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    midori: Updated to version 0.4.0. Now depends vala

commit 2c8c4b5cba7dc4a5a916b742775c61eb5fd2fd42
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

    linux 2.6.35.14

commit 4280fab3f5dd2651bee47fb5ff4f76d18cb739c4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    gtk+: corrected dependencies

commit 7beb478571c0a1dd0457ad5c62d6d6772266877f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qt4pas: => V2.4

commit 7b845391add6f3529cd3c073d908f3614af2b970
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    crosstool-ng: new spell, a toolchains builder

commit 122db3a6d5031178167e0da3110467bef6b85c56
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    yakuake4: updated version to 2.9.8, fixed SOURCE_URL

commit 54d63bcb724e78bf43543f5d5ce1520fad8c0bf1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    pkgconfig 0.26
    
    This creates problem with casting glib2 and pkgconfig after new
    Source Mage installation. pkgconfig depends on glib2 and glib2 depends
    on pkgconfig. glib2's DEPENDS now contains depends pkgconfig, this must
    be changed.  optional_depends pkgconfig is not enough. For the first
    time (if pkgconfig isn't installed) glib2 must be cast with
    PCRE_LIBS and PCRE_CFLAGS defined:
    
    PCRE_LIBS="-L/usr/lib -lpcre" PCRE_CFLAGS="-I/usr/include" default_build
    
    Another option is installation of pkg-config 0.25 with internal glib 
after fresh
    installation and later update into 0.26. Something like:
    if spell_ok glib2 then VERSION=0.26 else VERSION=0.25.
    Probably better solution.
    
    Need some discussion and testing.

commit d5b139d4d4e3e9b3112d3a2164edb04c239d6886
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    Revert "archive/uudeview: now provides UUDECODE"
    
    This reverts commit 3cf28eff16a6723af981cae7d1da4777208b8925.
    
    uudeview's uudecode isn't possible to use to cast lilo
    btw, why we have these links creation in INSTALL, not by upstream
    
    ln  -sf  uudeview    ${INSTALL_ROOT}/usr/bin/uudecode               &&
    ln  -sf  uuenview    ${INSTALL_ROOT}/usr/bin/uuencode               &&
    ln  -sf  uudeview.1  ${INSTALL_ROOT}/usr/share/man/man1/uudecode.1  &&
    ln  -sf  uuenview.1  ${INSTALL_ROOT}/usr/share/man/man1/uuencode.1

commit 93a4b909ef87402d774098b9418a98d57597911b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    Revert "Revert "lilo - depends UUDECODE""
    
    This reverts commit 607c4fe6c2a970747d62b2208cb7ac2ccee6fd35.
    
    gmime's uudecode is OK.
    
    $ gaze provides UUDECODE
    UUDECODE:
    gmime
    sharutils
    uudeview
    
    I will revert this and remove UUDECODE provider from uudeview.

commit 729c913e391951819100ba728b756d18667f025b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    distcc: => 3.1

commit 8a8566ce9e03e0fbbf04b8a95f712b061834aee7
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    gcc: fix multi -> list

commit 7be56bbbf5bd404c04ea2bd1e49442ace47f64c1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    pango: backported X11 flags fix (cherry picked from commit 
d173f039fbf42a540763be62c45830cab93e6929)

commit 2949ae82689b1ff86e43937061004ec961e67805
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    fftw: removed deprecated option

commit 7cb5249ac9fcc28c780c8e89b35cfe9028ce56c1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    gdb: => 7.3

commit f31394bc1cca0ac30912f2e1eaedb547c0c0d63b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    digest-sha1: => 2.13

commit d27aa9e234fcd4ebb2aaaf260257b3ffc4a45ff7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    syslinux: added missing dep

commit 66a0c09322ef4c3848b3fec08eaa0b5db61bcb7e
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

    gcc: TMPFS=off for all (1GB is not enough space)

commit fb3df49480af5358f48e88a020052a43ff4ef26c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    jed: BUILD: complete the chain, so we can fail properly

commit 607c4fe6c2a970747d62b2208cb7ac2ccee6fd35
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

    Revert "lilo - depends UUDECODE"
    
    uudeview's uudecode cannot decode all the images, so casting fails.
    Reverted back to sharutils.
    
    This reverts commit fae14ff10e29c614b861290a34afd4e58b007b08.
    
    Conflicts:
    
        disk/lilo/HISTORY

commit ac4785e9cd61d398a82851df2b2d243e21656542
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    digikam4 2.0.0
    this version contains own kipi-plugins4, after official announcement and
    confirmation we have to remove from depends and deprecate it

commit 69a3f0419c0def252a20726d60292b199a99ad19
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    sakura 2.4.2

commit a1e058cd6b67ca4d3b6ec1dd5ff07ea47106dd9e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    init.d: updated to work with linux 3

commit 0a1c44ea9d21863ac31f3ccdcb24ea493e4a3e7e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    udev 173

commit ceeb2f0482f842c3821e21ee9823aff81ca7efdc
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    live 2011.07.21

commit 1b47b63597316981b1ac786c18d3b91c4c465e63
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    gpicview 0.2.2

commit 9f8c83fa7b3267b8c9e87e9fa47563a11a5fb62d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    linux-firmware 20110730

commit a63d567d460e0ff3632649105f45abe904a9696c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    lxterminal 0.1.11

commit 72f36d107aef9037d7dc5468ef41349574cc256e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    tree 1.6.0

commit 89a98d1c5e67a00acc0a2e19d95ed6755b61c294
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    lightspark 0.5.0

commit 6987a9f60a633538e78d293671de503e8a28927e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    Revert "libs/gmp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)"
    
    This reverts commit 9a00cb0bd07aadd476d3e5486bd9a4ea50d34dfd.
    
    There is no spell_ok for sub depends.

commit 18923d28a9e97eceb520c5169e55232d35e7c208
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    Revert "cluster/atlas: changed dependency on fortran to dependency on gcc 
with FORTRAN (scripted)"
    
    This reverts commit a086aa863f9b90f73cfe036e7c2d2017c60476d7.
    
    There is no equivalient for 'if is_depends_enabled $SPELL fortran' when
    sub-depending.

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

    graphics/imagemagick: changed optional dependency on g++ to gcc with
    sub-depends on CXX

commit 75d4ff0fe5a6e624a7336af91ffe3d943d398f3d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    telephony/asterisk: changed dependency on g++ to dependency on gcc with
    sub-depends on CXX

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

    gnustep-libs/gnustep-make: changed dependency on objc to dependency on 
gcc with OBJC (scripted)

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

    gnome1-libs/gnome-objc: changed dependency on objc to dependency on gcc 
with OBJC (scripted)

commit 90172a4b754f8782157da90a5067daa446847511
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/libgtk-java: changed dependency on gcj to dependency on gcc 
with JAVA (scripted)

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

    x11-libs/cairo-java: changed dependency on gcj to dependency on gcc with 
JAVA (scripted)

commit 3fc13871f2285342fb754157f060b3c4b6b7b1a7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    java/kaffe: changed dependency on gcj to dependency on gcc with JAVA 
(scripted)

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

    gnome2-libs/libvte-java: changed dependency on gcj to dependency on gcc 
with JAVA (scripted)

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

    gnome2-libs/libgnome-java: changed dependency on gcj to dependency on gcc 
with JAVA (scripted)

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

    gnome2-libs/libglade-java: changed dependency on gcj to dependency on gcc 
with JAVA (scripted)

commit 68404d28c8650f889dbc62ae28ba0f86ce61c9a9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnome2-libs/libgconf-java: changed dependency on gcj to dependency on gcc 
with JAVA (scripted)

commit 8e8a5ef2eeb1c873b868d355194dcb295e047f43
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnome2-libs/glib-java: changed dependency on gcj to dependency on gcc 
with JAVA (scripted)

commit 4737594f204f0db231dc89a3a74e7d4e5a2fd87d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    editors/openoffice: changed dependency on gcj to dependency on gcc with 
JAVA (scripted)

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

    devel/libgc: changed dependency on gcj to dependency on gcc with JAVA 
(scripted)

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

    xorg-lib/libxdmcp: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    xorg-lib/libxau: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    xorg-lib/liblbxutil: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    xorg-lib/libice: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    xorg-lib/libfontenc: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 06e32fecfe8efeaac8c6e1c5028014a143243ab9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11/xchm: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    x11-toolkits/wxgtk-new: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 14be82c396a648fc17882adb0262586d171d9777
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/wxgtk: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 6647a718146831ef9a5673a14dc3cafe3bc978ea
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/sptk: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    x11-toolkits/qt-x11: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4a93ebfae5cb9ca2b6900d7fd347745e5ed3cf63
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/qt-embedded: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    x11-toolkits/qt4: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 679e84f4febb5db0bfcfcbe01a0cf6878b65825a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/qscintilla: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 20ecd467747c13f049fa68417d12cb8935eb6b9b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/polymer: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 922a726a2af7380e794547a8b85e419c5b6ed339
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/nucleo: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 47b4c3a709b7da952afe54ad3f0dd334b0fb5b83
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/fox: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3dc5e6e39b72ba2a93be8d7d182c6547f16b1eae
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/fltk: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 31636d49024faaaf3a8157799bf27987029cd5e4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/fltk2: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    x11-toolkits/efltk: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    x11/synergy: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 1981397651d95a5d5aa831df1cba4547a4f685f9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11/slim: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 915b39862cf55e1891d206492089dd21b466c2b8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11/quasar: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 745f3b6abc51b5bd244f0471857a396dde6b72ab
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11/qsynergy: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4f6d70c0be69c94137f2e156750ab8ab37bade19
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11/nx: changed dependency on g++ to dependency on gcc with CXX (scripted)

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

    x11/nxcomp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    x11-libs/xfstt: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6c56026c0dc634d7bba85cea65c20c14efa5531c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-libs/cairomm: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 5bb831e162433ef9a8a0afbb9c86d5530bbdcfbe
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    wm-addons/wbar: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 256af2991fc4a2aed923501349ddcffc77fc160c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    windowmanagers/fluxbox: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    video/xbmc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 84bcef0e2de28827f831a97d05776833873a20a5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/mlt: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 865665dee21c295dffbd4c87edaec8fb0760689a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/mjpegtools: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6ad4ba677eef87fee5e60b2c73add6231aa4df13
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video-libs/live: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 46cce1f0db9f5b842738b7eb3c0e36d05e9f9569
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video-libs/libzen: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    video-libs/libmediainfo: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    video-libs/dirac: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 510b1f354a56e52fc67c1d783333eabc946734a4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/kino: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3c8573206b52d753b12d5fc173aa6fbfa40e63ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/dvgrab: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 78686578ddc4b1d9088a66f8a4ef97f325ad9f0e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    video/avidemux2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 06343be2987bd22432d74a2b8a2cc0bdedd12093
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/teardrop: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 76ec739bae1324b885e06f4f8c72dc1f2574e55c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/sunbird: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 404c834b350489f9f71c8bf0a8fd7b2424fc3954
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/strigi: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    utils/sphinx: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 693733b57bc0422bdb4ebf4384571b41d37cb3a1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/schroot: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    utils/psmisc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6d4d3e456f9a5865a14042d96a3a1aeb594053a0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/pinot: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    utils/lsvpd: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3df9fbaaaed56b00f2c6c2a1a5223f75336497e4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/lshw: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    utils/log4cplus: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    utils/ledger: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 96e12c5ad3ae65cc0499aa06bf8cb53a638312fb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/gnuplot: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 790fb145b7da06434730fb9699f841353395e4bb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/findwild: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9122af0ddaef9a7bd740e7f37212bed6a6fcdfea
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/exmap: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    utils/deltup: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 62a0bb8ec4a68be49114351741b71be056314f1b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/dbus-c++: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9741f8deb2e3b3420d56b175dcc47b87399aa864
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/cdemu-daemon: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    telephony/ucommon: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 0c58f724828e76572037f572e9e82b431d7df2c9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    telephony/twinkle: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    telephony/libjingle-tapioca: changed dependency on g++ to dependency on 
gcc with CXX (scripted)

commit 552429262b49f7dade7e525bfaf903d73b3f48bb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    telephony/commoncpp2: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 8045ee09b133dd1ce5e06151d0017409baef16ca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    telephony/ccscript: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 768c32e0524ccb27e0f754833314061d9bf9f1d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    telephony/ccscript3: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    telephony/ccrtp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4fdb3bc7829997572655a730aaffa46a5ae5fdca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    telephony/ccaudio2: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 2974d5331cf14175aa273dcba4780a9c4996b7c0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    telephony/bayonne2: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 83bd657fd794b0df8c751a3e32e6ec23ed9e4bf2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    spelling/stardict: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    spelling/mythes: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6793a6760f2d968f9a77cb0acc7e160b185d60de
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    spelling/aspell: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    shell-term-fm/worker: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 0513e372c197b02182d5cc4d005f9ec135dde0e3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    shell-term-fm/rxvt-unicode: changed dependency on g++ to dependency on 
gcc with CXX (scripted)

commit 87c52f7603d73bc1e2dfb7e04fbdbbdac64123b6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    security/xprobe2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 41acb064d5e729cb355f0372ba2a876d1df6c373
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    security/nsat: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    security/nmap: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9168e8e7d9e589319e1761c09daa9412bd824306
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/stellarium: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 51188b510dfb77ae91002426e60cbed8f78aef5d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/r: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    science/ppl: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 0872e69dfc8963ea41929b6c2f70e4800d80a0a2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/plplot: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    science/pari: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    science/orsa: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 0ccfd030bc90c1a279a15f9b4212083f8785ecc9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/ntl: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4ffdac3191cd70b92acd5c27c481f54aac52f59f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science-libs/lmfit: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 5bebcd29c0a2e75f45b30a1f3b8690d4cd19a879
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science-libs/gtkmathview: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 2cb95f68af92e66beea2e1dbb8f2b52401a59da3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science-libs/gmm: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    science-libs/eigen: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 5303c092fd815dd0f55b966ffcc76c8fd3fac5f5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science-libs/eigen3: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 5337ae907c31de086d2a4069ad94699c654ce68a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science-libs/eigen2: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 2aa3738487fd53afa8f82fcd7f6846d322a58517
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science-libs/clhep: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 257a046bded9a91916ecd58e77c9dbc06f79ec9b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/gnucap: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8b21051204890b01e2c51d2a28368a3958830248
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/giac: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    science/ggobi: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4e9e2cbc4b71437ea67163df22f19efe68b14270
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/cocoalib: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    science/boinc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    printer/zint: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 810e220ef8e17d26712e87c36847b83d4b0cc7ab
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    printer/splix: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4b5e01f7169b664e35ddc0d2ab1a247e722004ac
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    printer/photoprint: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    printer/exaro: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    printer/cups: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6a9c7e7e45bb9c7b8f68aa50f37e8afdba256f1f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    perl-cpan/alien-wxwidgets: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    odbc-drivers/picoodbc: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 22795c2527b32c0c24fc471700848e9745576521
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    odbc-drivers/odbcfb: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 5373bf7fd1d049eef8d7b1677bba62f9a1737597
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    net/xplc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 730a52b7ac7e9039d420f82e4eade5541db02045
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    net/wvstreams: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    net/tcptrack: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    net/paris-traceroute: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    net/openwbem: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    net/nload: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    net/netkit-telnet: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    net/lisa: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 56daa19bc64a39f46c6872bdfb4491d752f51fc9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    net/jigdo: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 437f576b9ea7d124adfc12c9bdf1c7665400e333
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    net/ifstatus: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4b1a72d22bf35132003501b3a62e22719a362966
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    net/bitcoin: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    mobile/rutilt: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    mobile/powersave: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 77964156ab0c47ea1154d99a36496cf924d9a7c2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    mobile/plptools: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    mobile/pilot-link: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4014dbe0597b949ca35984fba5e357e01041c250
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    mobile/mumpot: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    mobile/kismet: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    mail/thunderbird: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 398484652740fe2f6278347ad3b8e6d0601d421f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/xmlrpc-c: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/xerces-c: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6c8b26faa785cd32e4316cd6d3897c663fa97bee
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/xapian-core: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3b473ae11c6f661ef2e892fee8f4258eeff960bd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/xalan-c: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/tinyxml: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9ff03b6352198999ca0e90881bed14442c48c35f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/tbb: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/sword: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 96af2b9f9a57cdbcdf103b0a6f9d2ebf8825fa85
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/stlport: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 7385a779102635897dc71a86e6f37e9945a3c721
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/silly: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/sdl: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/protobuf: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 5c0ef031e87ec40a08dfe20e3df67420489816ec
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/pcre: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/openmpi: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8fd7834d68a4ed453d8b883ff4cd58037323833e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/openbabel: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/ois: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 5d638e90e275e0422cbae765629df23bb4f39b3c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/ode: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/nspr: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/ncurses: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 105f7beb389cce2d9cacad800d0ee9e03ab2ce65
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/muparser: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/loki: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9e0a4467d91ebf4a1a5cc6e0b070fd204a6c33c5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/log4cpp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/libwps: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 53a21a6224db2c5e74c5dc131cdf6b2f1430e324
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libwpg: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 5482c75176739262afcd33d3f09cdaaceae908c3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libwpd: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 45b821814bed449d138883b60f115c0b78056915
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libvdpau: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/libusb: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/libtommath: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/libsynaptics: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 753150364868b6a78eba5013e0fa6f70af99f2b4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libsigc++: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 5c43dd791388e434d0ad2b1bdbe6baab04ff6097
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libsigc++3: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 375173a70604367bc7b638dd3abf43e0fef96ba2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libsigc++2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9937d7645a8f6691bccc34be7dfbeb69f0636636
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libsh: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/libpqxx: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 55776d5ad3a9b9d15844b04a62dfae35dabdb4b2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libofx: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/libodb-tracer: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 8b713332a3de03f9ce5f7a9677fa427a2d43b941
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libodb-mysql: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    libs/libodb: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6c08ee72a3e576ded80496b6343e31d6e019e9c8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libmemcached: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    libs/libical: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/libextractor: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 704e3883f0f0ae3b16800eba9aebb3f64fc6269f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/libcgroup: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3ada9cc2f582c2de6e4b44a2233bb752a9a0bfb8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/icu: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 50e8db0921cac2f5ff3238dfc6c1c1d9ccd0fa29
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/guichan: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 67b4d307f5746921a50fefd4b940cc5136aae4b7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/google-perftools: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 9a00cb0bd07aadd476d3e5486bd9a4ea50d34dfd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/gmp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3b82ea8b63cad20f2f241f228ae6f4c254500b2b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/gmetadom: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6e0cd985bc572c4202b67876351a88f5240ba2c6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/gettext: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 69f1f7f96f391b393e3356b3ac71984267840152
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/elfio: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/dfb++: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 113e85f74d893332440a5c750cd04e5d8eceb4c0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/clxclient: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/clucene: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 99c5e5905c20428b2c7802921641938215b4c546
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/clthreads: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 79c704fd44a5138cfcf555080fed8a0cb6264e7e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/boost: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9b2804e389add8f35444b45301b4a9ae0cc83c7b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/asio: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    libs/ace: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    latex/texlive: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    kernels/elpp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 283fec3bf721af9be7ed25d25a4c439d4058eaff
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde-apps/kpowersave: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 40982c1c76bf093e1a36c297297c3f17c9b56b49
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde-apps/knoda: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 60d41591df788d6451b03218eaa7d7f00fb875f9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde-apps/kid3: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 7755bad36c9318bc21138dce23340075aa40e6f8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde-apps/kdevelop: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 79a70e45df98215b208a180c222da409efa54269
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde4-support/polkit-qt-1: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 9dda5f946e84c7d9fa09c4c0efed8f9f46ad31e5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde4-support/phonon: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    kde4-support/libdbusmenu-qt: changed dependency on g++ to dependency on 
gcc with CXX (scripted)

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

    kde4-support/grantlee: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    kde4-support/gluon: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 822c08a341c35db6bfa7be10e919ae3171e9593b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde4-support/automoc: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    kde4-support/attica: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4ca3f585f29940b3b2769998e162dfa8e6794a04
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    kde4-support/akonadi: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    java/jikes: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    java/antlr: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6b9384e5f9e571e7301c140d2b7a270651517d75
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    i18n/scim: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3710f54fbcfdb200bf1a123b06af4da514b8a554
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/wt: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    http/webkitgtk: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8ba81873545984dc0272ae5538537ecb8437ea37
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/webkitgtk3: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6eeb335dd853ce8c6af830998aef34072acee447
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/swish++: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    http/osb-browser: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 1141d552623ddc4f5c2828e6b7f44faf9ca61ef8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/nrcore: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 5d81758852a9840e4f3ea385b8a2944a2ee8a859
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/nrcit: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    http/newsbeuter: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3e4f07c32384392d075813188f738c57620e39c6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/middleman: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    http/kazehakase: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3b3fd0e1cca2e11f5596b9dfc101f58c339d5012
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/javascriptcore: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 64fa445837cefa0ddc1733a77144c319295debe7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/icecat: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8840158350c33108209cb2b8344c735ad266e176
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/gnash: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8ba42f3292a9839bc90d42fdb9fba09a0d434056
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    http/firefox: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    http/dansguardian: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    http/bfilter: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    http/amaya: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 06ac9feb9eea25a8d5b37a733f6c919877ae92e2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    ham/hamlib: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6bdfd233688fe16b82bfe1f2e7842108b452a673
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/yafray: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3fd636ebf88ef20ceec58307fda303e6330a4a10
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/xaralx: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 2f4031828699c02403209b8ecdfd35ff9c15fd0f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/tesseract: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 80cd9a3f40399d3b64f496b73d4007e2f2de4b6f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/synfigstudio: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 6457b9e1c313c2bacfc695700ebbfea11f125482
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/synfig: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9d3e95cffbc2e5b12d7bc60f8f01c2958ba6d016
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/plotutils: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 860da567c9463173f2cd60c4c25e741acc771910
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/openvrml: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    graphics/ocrad: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    graphics-libs/vips: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 0f143b53b709b740857483816ce2e7434406ae40
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/vigra: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4531e99181dd3294e128d24e458dc24b19152129
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/tiff: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 8792942c01a01fe626c054b982795421cbb829c5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/poppler: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 9cfe2ee67dffb677f98dd4e5f2dfac1ca1a59bcb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/opencv: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 8ee4e7e065672763ee2fd1396ae68e2341bccc3f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/ogre: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 3a2f59adfa59732fc3761ec596cb7bf664cd96d6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/libraw: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 083477c7a9ae823870729fc30b8542bc8f77f0ca
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/libcaca: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 711867067fad1578004d746dda5136dac982d899
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/geglmm: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    graphics-libs/ftgl: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 5e64e4d0b6be451e80396e5ebcd8c085db3238d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/freeimage: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    graphics-libs/flowcanvas: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    graphics-libs/etl: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    graphics-libs/cimg: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 8215385e86151a6709ddb636a72f359b035a1b97
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics-libs/cegui: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    graphics-libs/agg: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    graphics/inkscape: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 5ba2309de03b7fb59ca8b645dd63f2893efa8cd0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/graphicsmagick: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 4df5225109fd3c9c97bc59bc72d54b9e24eaa141
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/fotoxx: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4204a3f5d3b9db5cdb7cdbdd352d63e459a0f5e2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/exiv2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    graphics/exact-image: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    graphics/enblend: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 513d14d5c72841de1bf9950159ca3af1ac6633d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    graphics/djvulibre: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    gnome2-libs/guiloader-c++: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    gnome2-libs/enchant: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    gnome2-apps/workrave: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    gnome2-apps/pan: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    ftp/wxdfast: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    ftp/mldonkey: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    ftp/linuxdcpp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 361f40ffdb28f0b3d0fe3e59504e2967dbe11ad9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    ftp-libs/rb-libtorrent: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 17e4e6f328ea3e1144b3899c597a77f8a8395520
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    ftp/lftp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 5ad0556d4ba0f4e680348f212ce546569159cb31
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    ftp/aria2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 87fc6353f4860ebb325dd86e9f38303be202e97f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    editors/translator: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    editors/scribus4: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    editors/moe: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 01ce2f55a2e2bc29e3ed0f6ce308082c07e32d36
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    editors/lyx: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4a45ff7f4a8d332fd07ab865f2a3b6497ec4cb84
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    editors/ht: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 147694830e4ed9358a66e7de24decdcc6e2b3b79
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    editors/gle: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3dce8c9d91e83f9c934a22a57ddd3b3e499f1d89
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    doc/wv2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    doc/source-highlight: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 9b14fc703a33f07b13080ecb8dacb7ed7fb4602b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    doc/pstoedit: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    doc/pdftohtml: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    doc/opensp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    doc/groff: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 60d3b5fd41e20dd039754ec737e3e28e32d03d91
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    doc/aiksaurus: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 1566e3fab4c465113422d12f228c9895f2762808
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    display/fbterm: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 0fa7c26204b68936c4e5b25b852cb36b5164e45c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    disk/qpxtool: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    disk/partimage-ng: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 817bf501c6b2e5364dc5709efb183ceeec05fd33
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    disk/partimage: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    disk/libaal: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3d9442d34dacb835d5feae763b44fae7c14d0496
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    disk/gparted: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 1661aafadf99f6ea03f51b7f749cb4bd995c53e4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    disk/gdisk: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    disk/dvd+rw-tools: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 3131f20b81abb723d959fdebd19ba8e07c1bc495
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    disk/discid: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 0e16e14f49fa25436d89674cab98201eac8e31b7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    disk/ddrescue: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9f6f09a0c9d4a04676dbc0483528ee3082834221
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/swig: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/s11n: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 0da89a32c7937028a91c40cddabca678c5d8d32b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/re2c: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/ragel: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/quazip: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 97ef1ba08715a5cf1fac8e0fac1dbd970cccc67b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/qt-creator: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 0bb68f5d26f311e3e87bb5194ceb2a4e01df3793
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/qt4pas: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6ec5a26702279d04f87b53a384e6632e202b5571
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/qdevelop: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3dce8b8d7117718156269cf86666c5eb59395fad
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/python: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/python3: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/propertyeditor: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    devel/oprofile: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3b6df990769c6d81c0190de6431003248a82a967
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/openfst: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 96d367e8a7d7cefa5ba4b3abbdc95c3bd018fbb3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/odb: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/ncc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/nant: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 550ee0ecac1122f7570e5e4f1f1b3d57facd17e5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/llvm: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 056397e957d17b88ad4ae2a2eae30049d3a2065b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/libgc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/libcutl: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 49b3b32d4e52bb45631134f0fb35a14da4ae0fd9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/lazarus: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8af1ecac63f2197c7498b0e85121fff2792cfd90
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/gperf: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/geany: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6de7020d296b9bec3629a1d87db22ab7c6168759
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/gambas: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/gambas2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/falcon: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/duma: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 18fd90135c75aa13a22bd62540b641566969cb22
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/doxygen: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 893e9f579dfd4545d4165a8654c82aaf5af8b111
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/ctemplate: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/cppunit: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/cppsocket: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/cppcheck: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8a4712cf44bcf15721fcc254acc4186bdce43f21
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/cmake: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/ccbuild: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3fa1a92efbbfc134ccbb8a401e1df15ec9f1d97c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/bobcat: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 38c17b11b92991a69a1e8d6b7eaecf521dbad312
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/bison: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 17de96a3835d1ecdfc3258424d45be454891156b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/bisonc++: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    devel/astyle: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 72469b593148d1fafb7d130f6f3947958478736a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/arx: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 019e56270876c53b09a3d3790627c8e4c08ba445
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/apiextractor: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 9ef6253bc47cd2237b5e8e7a0c478f75791a5968
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/xbase64: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 3be15d3d6aa8ccf1e9120f5cac04c4964cd4c458
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/unixodbc: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 285f2c6e55c5518ae091e075ce5587a8d973392f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/sqlite: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 7963c056383933850bf20cdad4b804a10e585494
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/rekall: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 35ad803e81c821a03e92f727c94d65af7c041af7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/pgadmin3: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    database/openrpt: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    database/mysql-workbench: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    database/mysql: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 90ced40f1414bdcd087fbeda0292fee574915027
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/mongodb: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 14c60b6d3210029c01387884da572b0c5f37aa00
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/mariadb: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 6108c7f0fdc792c452c6db0e1a5a614676d525f1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/libinterbasexx: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 761244049acff948fc6ca1ec6ceeb3ad0a90b763
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/kyotocabinet: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 8e8ebb7f1ebed7a14d5888c4c2d9ec568f6e348f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/ibpp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    database/hk_classes: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4d17ee3cf2afdbf4335c3051b435462e1f6d435c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/flamerobin: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4ba5eebe54b64bc8268612b8c8664628aa292bb9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/firebird: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 09d48f2e5aea374111075a0bfc9eea3496ab296d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/firebird25: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4cf9a490d75795736c9e228360bc04bb764153f9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/fbexport: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    database/fbcopy: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9903b3255bc538a5c1282f97f0144233ff0a1806
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    database/drizzle: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    database/db: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 01e507e7f693d09aebf792dab3b72fd5f7d6fecf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/yassl: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 46dba610cf3d72e3b10f90876a73cc2e9a6f3418
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/steghide: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 74a6fdb2811f8b86b9bd11479f9367f9f135c2ad
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/qca-pkcs11: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 0e90cfb59063e5793ccf4f6be1bcce5d5ff26bc6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/pcsc-lite: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 22adcfb4b00500d3c522f006d0e4e014a073235a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/libksba: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    crypto/libgcrypt: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 63cae07ecdd30afcc99f6df913ff1d4d3908469a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/libecc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 8a77c278a22cc6354f126e1672f3ceb70af10ce6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/cryptopp: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 92b224fd2fe73186ac25343e32f983d4e6af3d05
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/botan: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    crypto/beecrypt: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    chat-libs/pwlib: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 251030f30106d42fdead47aafeb2b1380d57df68
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    chat-libs/ptlib: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    chat-libs/openh323: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    chat-libs/opal: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 40fe20d15c8b9101c3ac77070f2fa326092311aa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    chat-libs/libmsn: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 950609b2203eed6d6bbe6a68e920bf02ba745d9a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    chat-libs/gloox: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    chat-irc/znc: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    chat-irc/irssi: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 42ff2a479769f2e7887e7470c4fbad4587c24bc2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    chat-im/amsn: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 109eba28fdccd42777affb72e2d3afb4d297f302
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-soft/qjackctl: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-soft/patchage: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-soft/jack_capture: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-soft/fusepod: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4fe6d4e2219b60a82131b951a185655d5d3ec090
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-plugins/vco-plugins: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-plugins/rev-plugins: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-plugins/mcp-plugins: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 4c8964712c9b688c44959216bcb19713fbd2f995
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-plugins/fil-plugins: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-plugins/caps-plugins: changed dependency on g++ to dependency on 
gcc with CXX (scripted)

commit 250b3c5786aed1d548e4d75cd03954d27bd87866
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-plugins/amb-plugins: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 08c3a291b6229f61b16bd53eaef726ade938e813
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-players/xmms2_jump: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-players/dermixd: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 2138df586526e729f7481b049c56470be81f8b82
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-players/dcd: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 6b11c6e079e0371c55e5980122e8c895a125351a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-players/alsaplayer: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 693dd11ef8f94e66623b200939a04c3bbbac1fc0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/soundtouch: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 40343e4bad448a52d82d763098a45dbae47cb7fa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/sidplay-libs: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-libs/rubberband: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-libs/resid: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 0a367e784ff0d593af6bf39a5feaa9ce32ed3990
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/raul: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    audio-libs/opencore-amr: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 9e543ddaa9aecca3b20a4c3d0a86a483ae238375
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/mp4v2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 2a64d37822c676c6365310a3e0ddc440666e219c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/lilypond: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 74033176cface5011f052db6eb5e9328b8d68bf0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/libzzub: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 79b394b8bb44b3eeecb0ba066f83b9e7b9efa81f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/libofa: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-libs/libmusicbrainz: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 6f8c44b2039a23750f3d09413b75866b8a69612d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/libmusicbrainz3: changed dependency on g++ to dependency on 
gcc with CXX (scripted)

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

    audio-libs/libmpcdec: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-libs/libmodplug: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 09f11803e7098452a72486c80c0c159c6aa8cc4d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/libid3tag: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-libs/libgig: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 2dad0488936a766a22a3b53c803ea558644c2ac0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/libao: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    audio-libs/id3lib: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 469a9d074a13757167926ae881f55d5743dbff61
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/game-music-emu: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-libs/flac: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    audio-libs/faad2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 503c94ecdaaf54d5bd16f6e16ace7918a26f784b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-libs/clalsadrv: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 12c5163f1678cca4636ac1dfeff985b4e8c4da94
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-drivers/yiff: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 28546ed7c2e460155a5872fe0fbe6a9522055733
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-drivers/libffado: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-drivers/jackdmp: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 0b10bfdbb3f85217c9841033b85488839f4c38f3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-drivers/jack2: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-creation/zynaddsubfx: changed dependency on g++ to dependency on 
gcc with CXX (scripted)

commit 584a073b0fc4055a307f13919c7dab6486fd4e0c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/traverso: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 86b95adf0fa162e71b99c07737a28467eb572e1c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/seq24: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 4854ac86291c5d7a250936904439a4fd22383c54
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/rosegarden: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-creation/qtractor: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 729f5db9f0534a0d687c2805420be2637d2a39ce
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/qsynth: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 0f95706fee4fae94c2af08557027ad0ecc87b0ee
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/om-synth: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-creation/nted: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 147be207cbde901ac7068981408e559e5b5dc98e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/linuxsampler: changed dependency on g++ to dependency on 
gcc with CXX (scripted)

commit 76601dbc641d919fa5b33180f3fe2f60489734ad
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/klick: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-creation/gigedit: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 4854976ae063eca06c3d569a79acf68ab1e43500
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/ggseq: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

commit 358e7fe4fbaa0fbff1b955cfe712fe405c7b8dbd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/espeak: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    audio-creation/beast: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    audio-creation/ardour2: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 9d4013f562ef226f3e77edc5eef44538c1161bbe
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/amsynth: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

commit 2f92270c0887859d448714edceb87f58cf46b563
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    audio-creation/ams: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    archive/unrar: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 600d2d1c4989197837230d0cbd36a93ccced8cf7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    archive/pbzip2: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 56c4d53c6faab0414ec47f062d3b121a9e9220c6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    archive/p7zip: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 77a069bc17faceb6717e0e5a3624c2641eb6b842
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    archive-libs/libbasic: changed dependency on g++ to dependency on gcc 
with CXX (scripted)

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

    archive/dar: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 64086891d86c7ca492682c786631b82dfe03311f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    archive/dar22: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 4aa2b1c66c19ec91883450ba0b30b1f82f2fab87
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    archive/bacula: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

commit 9ac7943111dbfce92ef6a017ba03334963abbfb0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    antivirus/inoclam: changed dependency on g++ to dependency on gcc with 
CXX (scripted)

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

    antivirus/clamav: changed dependency on g++ to dependency on gcc with CXX 
(scripted)

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

    utils/phoronix-test-suite: changed dependency on fortran to dependency on 
gcc with FORTRAN (scripted)

commit 57965d82aaf40f9083121a995735995a36707f6f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/xd3d: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

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

    science/tisean: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

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

    science/scilab: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

commit 3468f73d76413890996d367d3514fabb1cfaf928
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/r: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

commit 9ca6072db8905dad61d1e41b4ec3a4d8ebaff343
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/plplot: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

commit 5ebcf25c57a8ada9fa7698840df19d4310c1da2c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/octave-devel: changed dependency on fortran to dependency on gcc 
with FORTRAN (scripted)

commit 4f2b5c4045c8586927262de4d0e8991bae9c3116
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/octave: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

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

    science/ggobi: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

commit 47e289ec4d231b21f68244792e6c776e1aabd24e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    libs/openmpi: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

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

    kde-apps/kdevelop: changed dependency on fortran to dependency on gcc 
with FORTRAN (scripted)

commit 5f87c1237c9949e204fbf903c2e08ecff73cb1bf
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    cluster/mpich2: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

commit 823d0bfeff00f329556e1ef5588903630485ef90
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    cluster/lapack: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

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

    cluster/atlas: changed dependency on fortran to dependency on gcc with 
FORTRAN (scripted)

commit 219ad01cbb47ad76f5223e5da686812e45f94f2f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    x11-toolkits/qtada: changed dependency on ada to dependency on gcc with 
ADA (scripted)

commit 92360520673e49b8a30b13e2294f6151423503c7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    science/plplot: changed dependency on ada to dependency on gcc with ADA 
(scripted)

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

    libs/xmlada: changed dependency on ada to dependency on gcc with ADA 
(scripted)

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

    libs/libgmpada: changed dependency on ada to dependency on gcc with ADA 
(scripted)

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

    gnu/gnat-gpl: changed dependency on ada to dependency on gcc with ADA 
(scripted)

commit 64f45854ce44df572826453cd95a191255ce61fd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/ghdl: changed dependency on ada to dependency on gcc with ADA 
(scripted)

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

    devel/scatcdsk: changed dependency on ada to dependency on gcc with ADA 
(scripted)

commit 1684bb683b2d6b153312dde72978730b0b9b6289
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/polyorb: changed dependency on ada to dependency on gcc with ADA 
(scripted)

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

    devel/gprbuild: changed dependency on ada to dependency on gcc with ADA 
(scripted)

commit 67d41bda7e97678a6e3d64703619986f4eaae11e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/gnat-gps: changed dependency on ada to dependency on gcc with ADA 
(scripted)

commit 77d12d57d205a335fd2e26d697ac8ce2ea0ce619
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/florist: changed dependency on ada to dependency on gcc with ADA 
(scripted)

commit 213b0a2219f056c6a1dc0b80691bdea66758750f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/aunit: changed dependency on ada to dependency on gcc with ADA 
(scripted)

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

    devel/asis: changed dependency on ada to dependency on gcc with ADA 
(scripted)

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

    devel/afay: changed dependency on ada to dependency on gcc with ADA 
(scripted)

commit 9c8528c49d7ae3fccecfc1aaf35340eac19c862c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/adagoop: changed dependency on ada to dependency on gcc with ADA 
(scripted)

commit 81f2ba63e7eb99a372367eae8b0039bed60a8a32
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    luadbi: added mysql support, fixed library path

commit 38f34e056b3910482a0b3326ff15e8b4dd404be1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    luasec: => 0.4.1

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

    gnu/objc: version 4.6.1

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

    gnu/gcj: version 4.6.1

commit 51f81ee8745377c1e1d332382ac43a8cdc28c3a2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/g++: version 4.6.1

commit 22064d1e8ffa4b7042f955400ef7a41f53593549
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/fortran: version 4.6.1

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

    gnu/ada: version 4.6.1

commit 1868eb01a66ab0b4c5bbecfc9244a07475e2f1c8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: version 4.6.1

commit 1079e77f9613acf60ae35aaae5326e4f88894e3a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: removed dependency on cloog/ppl

commit 48abd48d500e08ea05c48bb0431616dbadac52e9
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/objc: version 4.6.0

commit 8f46bfdd1fba0a4e86bb71941076a05669d9dc42
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcj: version 4.6.0

commit 22aba60a7630fab433042cc153436abd843c832e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/g++: version 4.6.0

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

    gnu/fortran: version 4.6.0

commit 3ef8afcfd7992e96c999b601705f7cb4d29a5d3d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/ada: version 4.6.0

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

    gnu/gcc: version 4.6.0, added optional dependency on cloog-ppl,
    added support for go, commented out patches for gnat, added dependency
    on zlib, updated Ada bootstrap compiler to 4.5.2

commit 2928274078f48fae3e289181c21689a9251dd049
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: version 4.5.2

commit 51b9c69a8049f905915c8b43100445e1b335b37f
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

    collectd: new spell for statistics collection
    
    It's not 100% perfect, but it's better than nothing! it does build and
    install the plugins configured. There's probably some more intricate
    details that will be worked out with time.

commit 6d03ff2d0ea13b1a12b7b912c2ca31a6ea9e6802
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    gcc: hopefully fixes bug 15851

commit 3dea4208857927890aa4bfe0f27a84cb25298c29
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/spark: new spell, a formally defined
    programming language based on ada

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

    gnu/gcc: added optional patch to allow for symbolic tracebacks

commit 77ba994aa258ceec5b2db11d66201594a48aa312
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: corrected variable names in DETAILS, switched ada bootstrap
    compiler to 4.3.3

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

    gnu/gcc: added optional patch to make -fdump-ada-spec available

commit 4dfbe488b6719c91c7b35ef6a555d6abecaff50d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    gnu/gcc: version 4.5.1

commit dadbb500d1d15191e4135e583246410b9945dd68
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gcc: gcj depends on unzip and zip

commit f9604fab09f0bef7b2bec9fe987b61bf9515373f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gcc: Auto-conflict with ada, fortran, g++, gcj, and objc
    This will remove the old stand-alone files before the combined
    gcc installs them.
    
    Should fix this test case:
        Recasting g++ causes the following:
        1. g++ to depend on gcc with CXX
        2. gcc to be cast
                a. gcc now installs the gcc and g++ binaries
        3. g++ is now cast, removing the g++ binary

commit 789e02972c44524003604cdf8e08149c2a73e6da
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gcc: don't fail casting if persistent vars are not there

commit aee166e1d74de0c9ac8daca0a99d2b0adcb39bf2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    ada: Updated to 4.4.3

commit ad1f1ce83afb5967a181e475bc68d914cec73ca3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    objc: Updated to 4.4.3

commit aad0951e40c5c4d9dcc87aa72305421f765810ef
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gcj: Updated to 4.4.3

commit 93183658a9f232d5f873035e6334e0fd23f9c6fa
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    fortran: Updated to 4.4.3

commit eaf45b2336c3c3c3c8b8ac51c86d4a13c3c01be5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    g++: Updated to 4.4.3

commit 74fcf54c70dbf4620aac286c1e4433025ee5df67
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    gcc: Updated to 4.4.3
    gcc-4.3.0-ffast-math.patch updated to GCC 4.4 and renamed to
    gcc-4.4.0-ffast-math.patch

commit 314e9eaba19bde60e60b66820ac6e81a4312ebe0
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>

    gcc: removed POST_RESURRECT

commit 41bf568459796298e20b9ff102460569c28dd780
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    mpg123: bump to 1.9.0

commit 956986be63636ca854659360c17eba0033c14bca
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    glibc: dreppod the no lib64 query it's always lib now

commit 6ead7e6e993e7070d74c480c36d158b3a9587c93
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    gcc: removed the /lib workaround and specs handling

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

    gcc: reformatting

commit 0ab69d8b8275849c560455e84af25af28dc7ee4d
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    gcc: cleaned up PRE_BUILD slightly

commit 45f10740a8f5112a356e7911f6d730380aeaa601
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    gcc: query for GCJ_AWT only when java is selected

commit 1708aa3bc8b488a0e3a3a5d8e82601a96abf5747
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    gcc: updated ada for sigs

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

    gcc: fixed fortran

commit 557e41c31a7b8d23fd029f379d36c83d06ec9ea2
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    fortran: now part of unified gcc spell, this is now a transitional 
package so that spells can be moved over to the sub depends stuff

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

    objc: now part of unified gcc spell, this is now a transitional package 
so that spells can be moved over to the sub depends stuff

commit 0ac050b94adc48c83bea4f965f275b290e116115
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    gcj: now part of unified gcc spell, this is now a transitional package so 
that spells can be moved over to the sub depends stuff

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

    ada: now part of unified gcc spell, this is now a transitional package so 
that spells can be moved over to the sub depends stuff

commit 54efb38692bb13e33a89001cf2d59baef122d675
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    g++: now part of unified gcc spell, this is now a transitional package so 
that spells can be moved over to the sub depends stuff

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

    gcc: unified gcc spell

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

    Revert "gcc: merged into a single spell"
    
    Forgot HISTORY
    This reverts commit da39f52f9ab27e17fed762d964f31d636b618cfe.

commit 46bb2d3fe5db704a20e30250113df9fd875117cb
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    Revert "g++: merged into a single spell, this one is a meta spell for 
transition"
    Forgot HISTORY
    
    This reverts commit 2b15f5b2f69ae52fb471673957a6b823e48d5f24.

commit 4b77a37212a42a396a829bc5662b7bb76792208e
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    Revert "ada: merged into a single spell, this one is a meta spell for 
transition"
    Forgot HISTORY entries
    
    This reverts commit 54112ba7c805b483600eb45feee3586dd761de16.

commit 54112ba7c805b483600eb45feee3586dd761de16
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    ada: merged into a single spell, this one is a meta spell for transition

commit 2b15f5b2f69ae52fb471673957a6b823e48d5f24
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

    g++: merged into a single spell, this one is a meta spell for transition

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

    gcc: merged into a single spell

diff --git a/ChangeLog b/ChangeLog
index 44e370b..caa5d95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-08-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * utils/crosstool-ng: new spell, a toolchains builder
+
 2011-07-26 Vlad Glagolev <stealth AT sourcemage.org>
        * php-pear/php-geoip: new spell, PHP extension for mapping IP address 
to
          geographic places
@@ -894,6 +897,10 @@
        * 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 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * devel/spark: new spell, a formally-defined computer programming
+         language based on Ada
+
 2010-09-08 Ladislav Hagara <hgr AT vabo.cz>
        * video-libs/gst-plugins-gl: new spell, GStreamer OpenGL Plugins
 
diff --git a/antivirus/clamav/DEPENDS b/antivirus/clamav/DEPENDS
index bda085a..e0845a2 100755
--- a/antivirus/clamav/DEPENDS
+++ b/antivirus/clamav/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends zlib           &&
 optional_depends bzip2  "--enable-bzip2"           \
                         "--disable-bzip2"          \
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index d93054a..029a3e8 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-26 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.97.2
        * FINAL: needs to run ldconfig
diff --git a/antivirus/inoclam/DEPENDS b/antivirus/inoclam/DEPENDS
index 64c92a6..ea7d402 100755
--- a/antivirus/inoclam/DEPENDS
+++ b/antivirus/inoclam/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends cmake  &&
 depends clamav &&
 depends inotify-tools &&
diff --git a/antivirus/inoclam/HISTORY b/antivirus/inoclam/HISTORY
index f0e1c10..5243311 100644
--- a/antivirus/inoclam/HISTORY
+++ b/antivirus/inoclam/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-04-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.4.0
 
diff --git a/archive-libs/libbasic/DEPENDS b/archive-libs/libbasic/DEPENDS
index bcd1eeb..f148724 100755
--- a/archive-libs/libbasic/DEPENDS
+++ b/archive-libs/libbasic/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/archive-libs/libbasic/HISTORY b/archive-libs/libbasic/HISTORY
index c25f816..f80cea2 100644
--- a/archive-libs/libbasic/HISTORY
+++ b/archive-libs/libbasic/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/archive/bacula/DEPENDS b/archive/bacula/DEPENDS
index 13aeded..b0d2d78 100755
--- a/archive/bacula/DEPENDS
+++ b/archive/bacula/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 if [[ $BACULA_SCM == y ]]; then
   depends git
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index a9af70c..5a04b50 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-11-09 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.0.3; small clean up; use UPSTREAM_KEY
        * bacula-3.0.2.gpg: renamed to bacula.gpg
diff --git a/archive/dar/DEPENDS b/archive/dar/DEPENDS
index 06b0758..58bab3b 100755
--- a/archive/dar/DEPENDS
+++ b/archive/dar/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends zlib "" "--disable-libz-linking" "for gzip compression" &&
 optional_depends bzip2 "" "--disable-libbz2-linking" "for bzip2 compression" 
&&
diff --git a/archive/dar/HISTORY b/archive/dar/HISTORY
index 4d46b82..3679d15 100644
--- a/archive/dar/HISTORY
+++ b/archive/dar/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-06-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.3.8
        * UP_TRIGGERS: generalize the .so check, so that it is more obvious
diff --git a/archive/dar22/DEPENDS b/archive/dar22/DEPENDS
index 06b0758..58bab3b 100755
--- a/archive/dar22/DEPENDS
+++ b/archive/dar22/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends zlib "" "--disable-libz-linking" "for gzip compression" &&
 optional_depends bzip2 "" "--disable-libbz2-linking" "for bzip2 compression" 
&&
diff --git a/archive/dar22/HISTORY b/archive/dar22/HISTORY
index b5bf772..fe71599 100644
--- a/archive/dar22/HISTORY
+++ b/archive/dar22/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-06-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.2.7
          make separate spells for old(dar22) and new dar
diff --git a/archive/p7zip/DEPENDS b/archive/p7zip/DEPENDS
index fd0b0eb..f148724 100755
--- a/archive/p7zip/DEPENDS
+++ b/archive/p7zip/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/archive/p7zip/HISTORY b/archive/p7zip/HISTORY
index 8194f8a..6525382 100644
--- a/archive/p7zip/HISTORY
+++ b/archive/p7zip/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-15 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 9.20.1
        * PRE_BUILD: corrected template filename
diff --git a/archive/pbzip2/DEPENDS b/archive/pbzip2/DEPENDS
index 9fdbfb1..3ea3857 100755
--- a/archive/pbzip2/DEPENDS
+++ b/archive/pbzip2/DEPENDS
@@ -1,3 +1,3 @@
 depends bzip2 &&
-depends g++
+depends -sub CXX gcc
 ## Auto-generated from Freshmeat.net's project descriptor
diff --git a/archive/pbzip2/HISTORY b/archive/pbzip2/HISTORY
index 5b8c9e7..ef9e4bc 100644
--- a/archive/pbzip2/HISTORY
+++ b/archive/pbzip2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-18 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.1.5
 
diff --git a/archive/unrar/DEPENDS b/archive/unrar/DEPENDS
index fd0b0eb..f148724 100755
--- a/archive/unrar/DEPENDS
+++ b/archive/unrar/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/archive/unrar/HISTORY b/archive/unrar/HISTORY
index e9d1f05..bb5c255 100644
--- a/archive/unrar/HISTORY
+++ b/archive/unrar/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-15 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 3.9.10
 
diff --git a/archive/uudeview/HISTORY b/archive/uudeview/HISTORY
index c78bb1b..9d2c873 100644
--- a/archive/uudeview/HISTORY
+++ b/archive/uudeview/HISTORY
@@ -1,6 +1,3 @@
-2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-       * PROVIDES: added UUDECODE
-
 2006-06-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/archive/uudeview/PROVIDES b/archive/uudeview/PROVIDES
deleted file mode 100755
index f0c0c24..0000000
--- a/archive/uudeview/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-UUDECODE
diff --git a/audio-creation/ams/DEPENDS b/audio-creation/ams/DEPENDS
index ee0e655..0d2130d 100755
--- a/audio-creation/ams/DEPENDS
+++ b/audio-creation/ams/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  fftw2        &&
 depends  qt-x11       &&
 depends  ladspa       &&
diff --git a/audio-creation/ams/HISTORY b/audio-creation/ams/HISTORY
index 2f7495d..1188cf5 100644
--- a/audio-creation/ams/HISTORY
+++ b/audio-creation/ams/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: We're all one big happy xorg-modular, no need to check 
anymore
 
diff --git a/audio-creation/amsynth/DEPENDS b/audio-creation/amsynth/DEPENDS
index ae4af6f..a05928e 100755
--- a/audio-creation/amsynth/DEPENDS
+++ b/audio-creation/amsynth/DEPENDS
@@ -1,6 +1,6 @@
 depends  libtool    &&
 depends  pkgconfig  &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  gtkmm2     &&
 
 optional_depends  alsa-lib            \
diff --git a/audio-creation/amsynth/HISTORY b/audio-creation/amsynth/HISTORY
index ef4b275..5fb6744 100644
--- a/audio-creation/amsynth/HISTORY
+++ b/audio-creation/amsynth/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-03-01 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS, CONFIGURE, DEPENDS, BUILD: Created spell.
diff --git a/audio-creation/ardour2/DEPENDS b/audio-creation/ardour2/DEPENDS
index 02eb2a8..cd942c0 100755
--- a/audio-creation/ardour2/DEPENDS
+++ b/audio-creation/ardour2/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++             &&
+depends -sub CXX gcc             &&
 depends  scons           &&
 depends  python          &&
 depends  pkgconfig       &&
diff --git a/audio-creation/ardour2/HISTORY b/audio-creation/ardour2/HISTORY
index 0e1996f..bea8e65 100644
--- a/audio-creation/ardour2/HISTORY
+++ b/audio-creation/ardour2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-12 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: updated spell to 2.8.11
 
diff --git a/audio-creation/beast/DEPENDS b/audio-creation/beast/DEPENDS
index 016b9f5..960d5ef 100755
--- a/audio-creation/beast/DEPENDS
+++ b/audio-creation/beast/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++               &&
+depends -sub CXX gcc               &&
 depends  gtk+2             &&
 depends  libgnomecanvas    &&
 depends  guile             &&
diff --git a/audio-creation/beast/HISTORY b/audio-creation/beast/HISTORY
index 6e45ff2..706a326 100644
--- a/audio-creation/beast/HISTORY
+++ b/audio-creation/beast/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-11-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DEPENDS: alsa is optional
 
diff --git a/audio-creation/espeak/DEPENDS b/audio-creation/espeak/DEPENDS
index 7e77dca..629a1f3 100755
--- a/audio-creation/espeak/DEPENDS
+++ b/audio-creation/espeak/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  portaudio
diff --git a/audio-creation/espeak/HISTORY b/audio-creation/espeak/HISTORY
index c1c0016..75ba2d3 100644
--- a/audio-creation/espeak/HISTORY
+++ b/audio-creation/espeak/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-10 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.45.03
 
diff --git a/audio-creation/ggseq/DEPENDS b/audio-creation/ggseq/DEPENDS
index d3c2167..50562fc 100755
--- a/audio-creation/ggseq/DEPENDS
+++ b/audio-creation/ggseq/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends wxgtk &&
 depends libsndfile &&
 depends libsamplerate &&
diff --git a/audio-creation/ggseq/HISTORY b/audio-creation/ggseq/HISTORY
index 3346e39..86d098a 100644
--- a/audio-creation/ggseq/HISTORY
+++ b/audio-creation/ggseq/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-11-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: added to apply a patch
        * use_system_portaudio_and_soundtouch.patch: use system libs patch,
diff --git a/audio-creation/gigedit/DEPENDS b/audio-creation/gigedit/DEPENDS
index a1d947b..229ca9d 100755
--- a/audio-creation/gigedit/DEPENDS
+++ b/audio-creation/gigedit/DEPENDS
@@ -1,5 +1,5 @@
 depends  pkgconfig         &&
-depends  g++               &&
+depends -sub CXX gcc               &&
 depends  perl              &&
 depends  xml-parser-expat  &&
 depends  gtkmm2            &&
diff --git a/audio-creation/gigedit/HISTORY b/audio-creation/gigedit/HISTORY
index 0aab785..d579e28 100644
--- a/audio-creation/gigedit/HISTORY
+++ b/audio-creation/gigedit/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-06 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: bump to 0.2.0
        * PRE_BUILD, gcc43.patch: patch not needed anymore
diff --git a/audio-creation/klick/DEPENDS b/audio-creation/klick/DEPENDS
index f6fb27e..72d27a6 100755
--- a/audio-creation/klick/DEPENDS
+++ b/audio-creation/klick/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++             &&
+depends -sub CXX gcc             &&
 depends  scons           &&
 depends  boost           &&
 depends  libsamplerate   &&
diff --git a/audio-creation/klick/HISTORY b/audio-creation/klick/HISTORY
index 798a37f..b9f2ccc 100644
--- a/audio-creation/klick/HISTORY
+++ b/audio-creation/klick/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-12-13 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS, DEPENDS, BUILD, INSTALL: Created spell.
diff --git a/audio-creation/linuxsampler/DEPENDS 
b/audio-creation/linuxsampler/DEPENDS
index 08d45f3..1094482 100755
--- a/audio-creation/linuxsampler/DEPENDS
+++ b/audio-creation/linuxsampler/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  libtool    &&
 depends  pkgconfig  &&
 depends  libgig     &&
diff --git a/audio-creation/linuxsampler/HISTORY 
b/audio-creation/linuxsampler/HISTORY
index fb0ee09..f3c6a71 100644
--- a/audio-creation/linuxsampler/HISTORY
+++ b/audio-creation/linuxsampler/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-06 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: bump to 1.0.0
 
diff --git a/audio-creation/nted/DEPENDS b/audio-creation/nted/DEPENDS
index 1dd4319..3b9f39d 100755
--- a/audio-creation/nted/DEPENDS
+++ b/audio-creation/nted/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends pkgconfig &&
 depends gtk+2 &&
 depends cairo &&
diff --git a/audio-creation/nted/HISTORY b/audio-creation/nted/HISTORY
index b95d1f7..6e1ab18 100644
--- a/audio-creation/nted/HISTORY
+++ b/audio-creation/nted/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-08 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 1.10.16
 
diff --git a/audio-creation/om-synth/DEPENDS b/audio-creation/om-synth/DEPENDS
index d2a597d..41b6f1b 100755
--- a/audio-creation/om-synth/DEPENDS
+++ b/audio-creation/om-synth/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  liblo        &&
 depends  flowcanvas   &&
 depends  JACK-DRIVER  &&
diff --git a/audio-creation/om-synth/HISTORY b/audio-creation/om-synth/HISTORY
index 1cb2311..239a1f0 100644
--- a/audio-creation/om-synth/HISTORY
+++ b/audio-creation/om-synth/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: removed is_depends_enabled.function reference
 
diff --git a/audio-creation/qsynth/DEPENDS b/audio-creation/qsynth/DEPENDS
index 21e042e..4670636 100755
--- a/audio-creation/qsynth/DEPENDS
+++ b/audio-creation/qsynth/DEPENDS
@@ -1,5 +1,5 @@
 depends  fluidsynth  &&
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  libx11      &&
 depends  libxext     &&
 depends  qt4
diff --git a/audio-creation/qsynth/HISTORY b/audio-creation/qsynth/HISTORY
index 7e02554..711792f 100644
--- a/audio-creation/qsynth/HISTORY
+++ b/audio-creation/qsynth/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-11-02 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.3.4
 
diff --git a/audio-creation/qtractor/DEPENDS b/audio-creation/qtractor/DEPENDS
index a5a2d15..16b3bf8 100755
--- a/audio-creation/qtractor/DEPENDS
+++ b/audio-creation/qtractor/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++           &&
+depends -sub CXX gcc           &&
 depends  -sub STL qt4  &&
 depends  alsa-lib      &&
 depends  libsndfile    &&
diff --git a/audio-creation/qtractor/HISTORY b/audio-creation/qtractor/HISTORY
index 77ffb7b..d0577d7 100644
--- a/audio-creation/qtractor/HISTORY
+++ b/audio-creation/qtractor/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-01-10 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.4.3
 
diff --git a/audio-creation/rosegarden/DEPENDS 
b/audio-creation/rosegarden/DEPENDS
index 6a7a192..61acf77 100755
--- a/audio-creation/rosegarden/DEPENDS
+++ b/audio-creation/rosegarden/DEPENDS
@@ -1,6 +1,6 @@
 depends  cmake      &&
 depends  fftw       &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  libsm      &&
 depends  libice     &&
 depends  libx11     &&
diff --git a/audio-creation/rosegarden/HISTORY 
b/audio-creation/rosegarden/HISTORY
index 2758687..7fb84ab 100644
--- a/audio-creation/rosegarden/HISTORY
+++ b/audio-creation/rosegarden/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-01-20 Robert Figura <template AT sourcemage.org>
        * DETAILS: Updated to 1.7.2
 
diff --git a/audio-creation/seq24/DEPENDS b/audio-creation/seq24/DEPENDS
index 6356ae3..5275b1a 100755
--- a/audio-creation/seq24/DEPENDS
+++ b/audio-creation/seq24/DEPENDS
@@ -1,6 +1,6 @@
 depends  alsa-lib   &&
 depends  gtkmm2     &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 
 optional_depends  JACK-DRIVER                \
                   "--enable-jack-support"    \
diff --git a/audio-creation/seq24/HISTORY b/audio-creation/seq24/HISTORY
index 59b5c8d..cf578e6 100644
--- a/audio-creation/seq24/HISTORY
+++ b/audio-creation/seq24/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-17 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 0.8.7, replaced MD5 with SOURCE_HASH, 
          added KEYWORDS, removed UPDATED & MAINTAINER, updated 
diff --git a/audio-creation/traverso/DEPENDS b/audio-creation/traverso/DEPENDS
index 7e4c3ad..f0efe4b 100755
--- a/audio-creation/traverso/DEPENDS
+++ b/audio-creation/traverso/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends cmake &&
 depends qt4 &&
 depends JACK-DRIVER &&
diff --git a/audio-creation/traverso/HISTORY b/audio-creation/traverso/HISTORY
index 584be8c..b4cb238 100644
--- a/audio-creation/traverso/HISTORY
+++ b/audio-creation/traverso/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-29 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.49.2
        * DOWNLOAD: removed, no longer needed
diff --git a/audio-creation/zynaddsubfx/DEPENDS 
b/audio-creation/zynaddsubfx/DEPENDS
index b80776e..c15435f 100755
--- a/audio-creation/zynaddsubfx/DEPENDS
+++ b/audio-creation/zynaddsubfx/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++   &&
+depends -sub CXX gcc   &&
 depends  fftw  &&
 depends  mxml  &&
 
diff --git a/audio-creation/zynaddsubfx/HISTORY 
b/audio-creation/zynaddsubfx/HISTORY
index b05a6d0..61c511e 100644
--- a/audio-creation/zynaddsubfx/HISTORY
+++ b/audio-creation/zynaddsubfx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * PRE_BUILD: removed is_depends_enabled.function reference
 
diff --git a/audio-drivers/jack2/DEPENDS b/audio-drivers/jack2/DEPENDS
index 62f6f66..c657edc 100755
--- a/audio-drivers/jack2/DEPENDS
+++ b/audio-drivers/jack2/DEPENDS
@@ -1,6 +1,6 @@
 depends  pkgconfig  &&
 depends  expat      &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  python     &&
 depends  alsa-lib   &&
 
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index 76bccad..4ad2e8b 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-06-22 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: updated spell to 1.9.5
 
diff --git a/audio-drivers/jackdmp/DEPENDS b/audio-drivers/jackdmp/DEPENDS
index 37142c6..6451d19 100755
--- a/audio-drivers/jackdmp/DEPENDS
+++ b/audio-drivers/jackdmp/DEPENDS
@@ -1,5 +1,5 @@
 depends  pkgconfig  &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 
 if [[ $JACKDMP_VCS != y ]]
 then
diff --git a/audio-drivers/jackdmp/HISTORY b/audio-drivers/jackdmp/HISTORY
index 341c7b3..8415b0f 100644
--- a/audio-drivers/jackdmp/HISTORY
+++ b/audio-drivers/jackdmp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-05-26 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS, PREPARE, DEPENDS: Removed 'control' svn branch option,
          it is now merged to trunk upstream.
diff --git a/audio-drivers/libffado/DEPENDS b/audio-drivers/libffado/DEPENDS
index 5a91ec2..50ae336 100755
--- a/audio-drivers/libffado/DEPENDS
+++ b/audio-drivers/libffado/DEPENDS
@@ -8,7 +8,7 @@ depends libraw1394 &&
 depends libiec61883 &&
 depends libavc1394 &&
 depends dbus &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends glib2 &&
 depends libsigc++3 &&
 optional_depends PYQT "" "" "for mixer GUI" &&
diff --git a/audio-drivers/libffado/HISTORY b/audio-drivers/libffado/HISTORY
index 061f0f7..f47a024 100644
--- a/audio-drivers/libffado/HISTORY
+++ b/audio-drivers/libffado/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2020-02-08 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: Update to release version 2.0.0 .
 
diff --git a/audio-drivers/yiff/DEPENDS b/audio-drivers/yiff/DEPENDS
index 5546039..aedef47 100755
--- a/audio-drivers/yiff/DEPENDS
+++ b/audio-drivers/yiff/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++   &&  
+depends -sub CXX gcc   &&  
 depends  zlib &&
 
 optional_depends alsa-lib "" "" "to use alsa for the backend" &&
diff --git a/audio-drivers/yiff/HISTORY b/audio-drivers/yiff/HISTORY
index 8fe2348..608a62d 100644
--- a/audio-drivers/yiff/HISTORY
+++ b/audio-drivers/yiff/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-08-18 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
        * DETAILS: delinting (80-col)
 
diff --git a/audio-libs/clalsadrv/DEPENDS b/audio-libs/clalsadrv/DEPENDS
index 585902e..3052dfc 100755
--- a/audio-libs/clalsadrv/DEPENDS
+++ b/audio-libs/clalsadrv/DEPENDS
@@ -1,2 +1,2 @@
 depends  alsa-lib  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/audio-libs/clalsadrv/HISTORY b/audio-libs/clalsadrv/HISTORY
index caabf0c..a13ad64 100644
--- a/audio-libs/clalsadrv/HISTORY
+++ b/audio-libs/clalsadrv/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-08-07 Thomas Orgis <sobukus AT sourcemage.org>
        * INSTALL: no lib64!
         * BUILD: actually do build there
diff --git a/audio-libs/faad2/DEPENDS b/audio-libs/faad2/DEPENDS
index 1f1c4a3..6d95a99 100755
--- a/audio-libs/faad2/DEPENDS
+++ b/audio-libs/faad2/DEPENDS
@@ -1,7 +1,7 @@
 depends  autoconf  &&
 depends  automake  &&
 depends  libtool   &&
-depends  g++       &&
+depends -sub CXX gcc       &&
 
 if [ "$XMMS" = "y" ]; then
   depends  xmms  '--with-xmms'  &&
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index a7866ef..e7dd003 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-19 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: libmp4v2 deprecated in favour of mp4v2 (Bug #15536)
 
diff --git a/audio-libs/flac/DEPENDS b/audio-libs/flac/DEPENDS
index 20a583a..221cf7f 100755
--- a/audio-libs/flac/DEPENDS
+++ b/audio-libs/flac/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 optional_depends  xmms                     \
                   ""                       \
                   ""                       \
diff --git a/audio-libs/flac/HISTORY b/audio-libs/flac/HISTORY
index 49d2ca8..6a49103 100644
--- a/audio-libs/flac/HISTORY
+++ b/audio-libs/flac/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Apply gcc43.patch
        * gcc43.patch: Patch to compile with gcc 4.3.0
diff --git a/audio-libs/game-music-emu/DEPENDS 
b/audio-libs/game-music-emu/DEPENDS
index 193f83b..ea22aff 100755
--- a/audio-libs/game-music-emu/DEPENDS
+++ b/audio-libs/game-music-emu/DEPENDS
@@ -1,2 +1,2 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends cmake
diff --git a/audio-libs/game-music-emu/HISTORY 
b/audio-libs/game-music-emu/HISTORY
index b539580..3f3cf7f 100644
--- a/audio-libs/game-music-emu/HISTORY
+++ b/audio-libs/game-music-emu/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-01 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DEPENDS, DETAILS, BUILD: spell created
 
diff --git a/audio-libs/id3lib/DEPENDS b/audio-libs/id3lib/DEPENDS
index ea5d621..40acc60 100755
--- a/audio-libs/id3lib/DEPENDS
+++ b/audio-libs/id3lib/DEPENDS
@@ -1,2 +1,2 @@
 depends  autoconf  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/audio-libs/id3lib/HISTORY b/audio-libs/id3lib/HISTORY
index 950798f..4bd632a 100644
--- a/audio-libs/id3lib/HISTORY
+++ b/audio-libs/id3lib/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on autoconf to regenerate configure after 
gcc43.patch
        * PRE_BUILD: Apply gcc43.patch
diff --git a/audio-libs/libao/DEPENDS b/audio-libs/libao/DEPENDS
index bf0487c..f5e90a3 100755
--- a/audio-libs/libao/DEPENDS
+++ b/audio-libs/libao/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends  "nas"            \
                   "--enable-nas"   \
                   "--disable-nas"  \
diff --git a/audio-libs/libao/HISTORY b/audio-libs/libao/HISTORY
index b907b5e..3535abe 100644
--- a/audio-libs/libao/HISTORY
+++ b/audio-libs/libao/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-04 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * CONFLICTS: added conflict libao-pulse for deprecation
 
diff --git a/audio-libs/libgig/DEPENDS b/audio-libs/libgig/DEPENDS
index 9dd2a43..d33fd4d 100755
--- a/audio-libs/libgig/DEPENDS
+++ b/audio-libs/libgig/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++            &&
+depends -sub CXX gcc            &&
 depends  libtool        &&
 depends  pkgconfig      &&
 depends  AUDIOFILE-LIB  &&
diff --git a/audio-libs/libgig/HISTORY b/audio-libs/libgig/HISTORY
index 1827bf9..a2dda8e 100644
--- a/audio-libs/libgig/HISTORY
+++ b/audio-libs/libgig/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-06 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: bump to 3.3.0
        * PRE_BUILD, gcc34.patch: gcc43 patch not needed anymore
diff --git a/audio-libs/libid3tag/DEPENDS b/audio-libs/libid3tag/DEPENDS
index 0445e11..adf99c6 100755
--- a/audio-libs/libid3tag/DEPENDS
+++ b/audio-libs/libid3tag/DEPENDS
@@ -1,3 +1,3 @@
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  libtool  &&
 depends  zlib
diff --git a/audio-libs/libid3tag/HISTORY b/audio-libs/libid3tag/HISTORY
index c926386..00331ae 100644
--- a/audio-libs/libid3tag/HISTORY
+++ b/audio-libs/libid3tag/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-04-18 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=1
        * INSTALL: install pkg-config file
diff --git a/audio-libs/libmodplug/DEPENDS b/audio-libs/libmodplug/DEPENDS
index bcd1eeb..f148724 100755
--- a/audio-libs/libmodplug/DEPENDS
+++ b/audio-libs/libmodplug/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/audio-libs/libmodplug/HISTORY b/audio-libs/libmodplug/HISTORY
index b2219c3..58ab2e2 100644
--- a/audio-libs/libmodplug/HISTORY
+++ b/audio-libs/libmodplug/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.8.8.3, UPDATED removed
        * BUILD: removed
diff --git a/audio-libs/libmpcdec/DEPENDS b/audio-libs/libmpcdec/DEPENDS
index 72ed2de..6cf9cc1 100755
--- a/audio-libs/libmpcdec/DEPENDS
+++ b/audio-libs/libmpcdec/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends autoconf &&
 depends automake
diff --git a/audio-libs/libmpcdec/HISTORY b/audio-libs/libmpcdec/HISTORY
index 712becb..15b6524 100644
--- a/audio-libs/libmpcdec/HISTORY
+++ b/audio-libs/libmpcdec/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-04-29 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.2.6, fixed source url
        * DEPENDS: automake OK
diff --git a/audio-libs/libmusicbrainz/DEPENDS 
b/audio-libs/libmusicbrainz/DEPENDS
index 1b6ec5c..fd65bda 100755
--- a/audio-libs/libmusicbrainz/DEPENDS
+++ b/audio-libs/libmusicbrainz/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends  expat &&
 if [[ "${LIBMUSICBRAINZ_PYTHON}" == "y" ]]
 then depends ctypes
diff --git a/audio-libs/libmusicbrainz/HISTORY 
b/audio-libs/libmusicbrainz/HISTORY
index 80ecb6a..4e8d341 100644
--- a/audio-libs/libmusicbrainz/HISTORY
+++ b/audio-libs/libmusicbrainz/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Apply gcc43.patch
        * gcc43.patch: Patch to compile against gcc 4.3.0
diff --git a/audio-libs/libmusicbrainz3/DEPENDS 
b/audio-libs/libmusicbrainz3/DEPENDS
index 2348807..da6150e 100755
--- a/audio-libs/libmusicbrainz3/DEPENDS
+++ b/audio-libs/libmusicbrainz3/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends cmake  &&
 depends neon   &&
 optional_depends libdiscid '' '' 'create DiscIDs from audio CDs'
diff --git a/audio-libs/libmusicbrainz3/HISTORY 
b/audio-libs/libmusicbrainz3/HISTORY
index a4d46a4..8eb98c8 100644
--- a/audio-libs/libmusicbrainz3/HISTORY
+++ b/audio-libs/libmusicbrainz3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version  3.0.3
 
diff --git a/audio-libs/libofa/DEPENDS b/audio-libs/libofa/DEPENDS
index 216a760..4c8ea4f 100755
--- a/audio-libs/libofa/DEPENDS
+++ b/audio-libs/libofa/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends expat  &&
 depends curl   &&
 depends fftw
diff --git a/audio-libs/libofa/HISTORY b/audio-libs/libofa/HISTORY
index da249f5..f1a65fd 100644
--- a/audio-libs/libofa/HISTORY
+++ b/audio-libs/libofa/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-07-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.4
          different url, see http://blog.musicbrainz.org/?p=307
diff --git a/audio-libs/libzzub/DEPENDS b/audio-libs/libzzub/DEPENDS
index 0c62b31..1d28df6 100755
--- a/audio-libs/libzzub/DEPENDS
+++ b/audio-libs/libzzub/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends scons &&
 depends zlib &&
 depends libsndfile &&
diff --git a/audio-libs/libzzub/HISTORY b/audio-libs/libzzub/HISTORY
index e140152..a81013d 100644
--- a/audio-libs/libzzub/HISTORY
+++ b/audio-libs/libzzub/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-05-26 Remko van der Vossen <wich AT sourcemage.org>
        * DETAILS: Version 0.2.5
        * CONFIGURE,DEPENDS: libsndfile no longer option
diff --git a/audio-libs/lilypond/DEPENDS b/audio-libs/lilypond/DEPENDS
index 2c32e8e..2b1c098 100755
--- a/audio-libs/lilypond/DEPENDS
+++ b/audio-libs/lilypond/DEPENDS
@@ -4,7 +4,7 @@ depends flex                    &&
 depends texlive                        &&
 depends texinfo                        &&
 depends gcc                    &&
-depends g++                    &&
+depends -sub CXX gcc                   &&
 depends python                 &&
 depends fontconfig                     &&
 depends bison                  &&
diff --git a/audio-libs/lilypond/HISTORY b/audio-libs/lilypond/HISTORY
index 283439c..286c39f 100644
--- a/audio-libs/lilypond/HISTORY
+++ b/audio-libs/lilypond/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
         * DEPENDS: switch from tetex to texlive [auto]
 
diff --git a/audio-libs/mp4v2/DEPENDS b/audio-libs/mp4v2/DEPENDS
index fd0b0eb..f148724 100755
--- a/audio-libs/mp4v2/DEPENDS
+++ b/audio-libs/mp4v2/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/audio-libs/mp4v2/HISTORY b/audio-libs/mp4v2/HISTORY
index 2eec359..672510b 100644
--- a/audio-libs/mp4v2/HISTORY
+++ b/audio-libs/mp4v2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-19 Eric Sandall <sandalle AT sourcemage.org>
        * CONFLICTS: Conflict with deprecated libmp4v2
 
diff --git a/audio-libs/opencore-amr/DEPENDS b/audio-libs/opencore-amr/DEPENDS
index fd0b0eb..f148724 100755
--- a/audio-libs/opencore-amr/DEPENDS
+++ b/audio-libs/opencore-amr/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/audio-libs/opencore-amr/HISTORY b/audio-libs/opencore-amr/HISTORY
index 0e47c12..fbaf88a 100644
--- a/audio-libs/opencore-amr/HISTORY
+++ b/audio-libs/opencore-amr/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-06 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS, DEPENDS: spell created
diff --git a/audio-libs/raul/DEPENDS b/audio-libs/raul/DEPENDS
index ddc12df..48ebc26 100755
--- a/audio-libs/raul/DEPENDS
+++ b/audio-libs/raul/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  boost   &&
 depends  glibmm  &&
 
diff --git a/audio-libs/raul/HISTORY b/audio-libs/raul/HISTORY
index e8fc845..8e90e5c 100644
--- a/audio-libs/raul/HISTORY
+++ b/audio-libs/raul/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 0.5.0.
 
diff --git a/audio-libs/resid/DEPENDS b/audio-libs/resid/DEPENDS
index bcd1eeb..f148724 100755
--- a/audio-libs/resid/DEPENDS
+++ b/audio-libs/resid/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/audio-libs/resid/HISTORY b/audio-libs/resid/HISTORY
index fabd808..bd84b54 100644
--- a/audio-libs/resid/HISTORY
+++ b/audio-libs/resid/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-07-08 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS, DEPENDS: spell created
 
diff --git a/audio-libs/rubberband/DEPENDS b/audio-libs/rubberband/DEPENDS
index d8fcad2..c9ef7c3 100755
--- a/audio-libs/rubberband/DEPENDS
+++ b/audio-libs/rubberband/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++              &&
+depends -sub CXX gcc              &&
 depends  fftw             &&
 depends  ladspa           &&
 depends  libsndfile       &&
diff --git a/audio-libs/rubberband/HISTORY b/audio-libs/rubberband/HISTORY
index 7b4894c..8f85d71 100644
--- a/audio-libs/rubberband/HISTORY
+++ b/audio-libs/rubberband/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-05-18 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 1.3.
        * PRE_BUILD: Removed, not needed anymore.
diff --git a/audio-libs/sidplay-libs/DEPENDS b/audio-libs/sidplay-libs/DEPENDS
index bcd1eeb..f148724 100755
--- a/audio-libs/sidplay-libs/DEPENDS
+++ b/audio-libs/sidplay-libs/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/audio-libs/sidplay-libs/HISTORY b/audio-libs/sidplay-libs/HISTORY
index 599a7bb..de8c67e 100644
--- a/audio-libs/sidplay-libs/HISTORY
+++ b/audio-libs/sidplay-libs/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-11-22 George Sherwood <gsherwood AT sourcemage.org>
        * BUILD: Deleted. Patches should be in PRE_BUILD
        * PRE_BUILD: Added to apply patches
diff --git a/audio-libs/soundtouch/DEPENDS b/audio-libs/soundtouch/DEPENDS
index 72ed2de..6cf9cc1 100755
--- a/audio-libs/soundtouch/DEPENDS
+++ b/audio-libs/soundtouch/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends autoconf &&
 depends automake
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index b396ead..fe6a172 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-12-21 Thomas Orgis <sobukus AT sourcemage.org>
        * soundtouch-1.5.0-x86_64-asm-broken.patch, PRE_BUILD:
          disable asm code on x86-64. It just segfaults.
diff --git a/audio-players/alsaplayer/DEPENDS 
b/audio-players/alsaplayer/DEPENDS
index 60e5e21..6da66d9 100755
--- a/audio-players/alsaplayer/DEPENDS
+++ b/audio-players/alsaplayer/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  pkgconfig  &&
 
 # output drivers
diff --git a/audio-players/alsaplayer/HISTORY 
b/audio-players/alsaplayer/HISTORY
index 8092ffe..7751c75 100644
--- a/audio-players/alsaplayer/HISTORY
+++ b/audio-players/alsaplayer/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.99.81
        * PRE_BUILD, alsaplayer_{gcc43,jackdmp}.patch: patches removed
diff --git a/audio-players/dcd/DEPENDS b/audio-players/dcd/DEPENDS
index e56d019..2e4d008 100755
--- a/audio-players/dcd/DEPENDS
+++ b/audio-players/dcd/DEPENDS
@@ -1,2 +1,2 @@
 depends libmusicbrainz &&
-depends g++
+depends -sub CXX gcc
diff --git a/audio-players/dcd/HISTORY b/audio-players/dcd/HISTORY
index 7da0e2b..44f187e 100644
--- a/audio-players/dcd/HISTORY
+++ b/audio-players/dcd/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-11-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * BUILD: convert to build api 2, simplify, fix #10733, fix man 
install path
        * DETAILS: bump to 0.99.2
diff --git a/audio-players/dermixd/DEPENDS b/audio-players/dermixd/DEPENDS
index 44693cd..ba3eeea 100755
--- a/audio-players/dermixd/DEPENDS
+++ b/audio-players/dermixd/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends alsa-lib --enable-alsa --disable-alsa "ALSA output" &&
 optional_depends perl --enable-perl --disable-perl "install PERL frontend" &&
 optional_depends mpg123 "" "" "for mpeg input -- \
diff --git a/audio-players/dermixd/HISTORY b/audio-players/dermixd/HISTORY
index 9c09399..db9b7ea 100644
--- a/audio-players/dermixd/HISTORY
+++ b/audio-players/dermixd/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-06-26 Thomas Orgis <sobukus AT sourcemage.org>
        * PRE_BUILD: hotfix for gcc-4.3
 
diff --git a/audio-players/xmms2_jump/DEPENDS 
b/audio-players/xmms2_jump/DEPENDS
index 1c4e33d..1b7dece 100755
--- a/audio-players/xmms2_jump/DEPENDS
+++ b/audio-players/xmms2_jump/DEPENDS
@@ -9,4 +9,4 @@ optional_depends  ncurses                     \
                   ""                          \
                   "WITHOUT_CURSES=1"          \
                   "Enable the curses client"  &&
-depends g++ 
+depends -sub CXX gcc 
diff --git a/audio-players/xmms2_jump/HISTORY 
b/audio-players/xmms2_jump/HISTORY
index 66a503f..0d77220 100644
--- a/audio-players/xmms2_jump/HISTORY
+++ b/audio-players/xmms2_jump/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-07-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS, DEPENDS, HISTORY: created spell
        * PRE_BUILD, BUILD, INSTALL: created spell
diff --git a/audio-plugins/amb-plugins/DEPENDS 
b/audio-plugins/amb-plugins/DEPENDS
index 79ed6c0..7e44d7e 100755
--- a/audio-plugins/amb-plugins/DEPENDS
+++ b/audio-plugins/amb-plugins/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  ladspa
diff --git a/audio-plugins/amb-plugins/HISTORY 
b/audio-plugins/amb-plugins/HISTORY
index ce41880..a544b42 100644
--- a/audio-plugins/amb-plugins/HISTORY
+++ b/audio-plugins/amb-plugins/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-02-02 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 0.4.0.
 
diff --git a/audio-plugins/caps-plugins/DEPENDS 
b/audio-plugins/caps-plugins/DEPENDS
index eca6f52..d186a77 100755
--- a/audio-plugins/caps-plugins/DEPENDS
+++ b/audio-plugins/caps-plugins/DEPENDS
@@ -1,2 +1,2 @@
 depends  ladspa  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/audio-plugins/caps-plugins/HISTORY 
b/audio-plugins/caps-plugins/HISTORY
index c4ebd83..d50beef 100644
--- a/audio-plugins/caps-plugins/HISTORY
+++ b/audio-plugins/caps-plugins/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-11-27 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 0.4.2.
        * DEPENDS: Added depends g++.
diff --git a/audio-plugins/fil-plugins/DEPENDS 
b/audio-plugins/fil-plugins/DEPENDS
index 79ed6c0..7e44d7e 100755
--- a/audio-plugins/fil-plugins/DEPENDS
+++ b/audio-plugins/fil-plugins/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  ladspa
diff --git a/audio-plugins/fil-plugins/HISTORY 
b/audio-plugins/fil-plugins/HISTORY
index 04de02c..70548bf 100644
--- a/audio-plugins/fil-plugins/HISTORY
+++ b/audio-plugins/fil-plugins/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-11-27 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated SOURCE_URL[0] and WEB_SITE.
 
diff --git a/audio-plugins/mcp-plugins/DEPENDS 
b/audio-plugins/mcp-plugins/DEPENDS
index 79ed6c0..7e44d7e 100755
--- a/audio-plugins/mcp-plugins/DEPENDS
+++ b/audio-plugins/mcp-plugins/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  ladspa
diff --git a/audio-plugins/mcp-plugins/HISTORY 
b/audio-plugins/mcp-plugins/HISTORY
index a83ac38..8088819 100644
--- a/audio-plugins/mcp-plugins/HISTORY
+++ b/audio-plugins/mcp-plugins/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-02-02 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 0.4.0.
 
diff --git a/audio-plugins/rev-plugins/DEPENDS 
b/audio-plugins/rev-plugins/DEPENDS
index 79ed6c0..7e44d7e 100755
--- a/audio-plugins/rev-plugins/DEPENDS
+++ b/audio-plugins/rev-plugins/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  ladspa
diff --git a/audio-plugins/rev-plugins/HISTORY 
b/audio-plugins/rev-plugins/HISTORY
index 04de02c..70548bf 100644
--- a/audio-plugins/rev-plugins/HISTORY
+++ b/audio-plugins/rev-plugins/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-11-27 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated SOURCE_URL[0] and WEB_SITE.
 
diff --git a/audio-plugins/vco-plugins/DEPENDS 
b/audio-plugins/vco-plugins/DEPENDS
index 79ed6c0..7e44d7e 100755
--- a/audio-plugins/vco-plugins/DEPENDS
+++ b/audio-plugins/vco-plugins/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  ladspa
diff --git a/audio-plugins/vco-plugins/HISTORY 
b/audio-plugins/vco-plugins/HISTORY
index 04de02c..70548bf 100644
--- a/audio-plugins/vco-plugins/HISTORY
+++ b/audio-plugins/vco-plugins/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-11-27 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated SOURCE_URL[0] and WEB_SITE.
 
diff --git a/audio-soft/fusepod/DEPENDS b/audio-soft/fusepod/DEPENDS
index cf89afe..b8ef3b5 100755
--- a/audio-soft/fusepod/DEPENDS
+++ b/audio-soft/fusepod/DEPENDS
@@ -1,5 +1,5 @@
 depends pkgconfig  &&
 depends libgpod    &&
 depends taglib     &&
-depends g++        &&
+depends -sub CXX gcc        &&
 depends fuse
diff --git a/audio-soft/fusepod/HISTORY b/audio-soft/fusepod/HISTORY
index 1143fb8..b18c436 100644
--- a/audio-soft/fusepod/HISTORY
+++ b/audio-soft/fusepod/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-01-03 Remko van der Vossen <wich AT sourcemage.org>
        * PRE_BUILD: sedit in an include to make gcc 4.3 compatible
 
diff --git a/audio-soft/jack_capture/DEPENDS b/audio-soft/jack_capture/DEPENDS
index eaec69a..3ec73e6 100755
--- a/audio-soft/jack_capture/DEPENDS
+++ b/audio-soft/jack_capture/DEPENDS
@@ -14,6 +14,6 @@ optional_depends gtk+2                \
                  "to build GTK+2 GUI" &&
 
 if is_depends_enabled $SPELL gtk+2; then
-  depends g++ &&
+  depends -sub CXX gcc &&
   depends pkgconfig
 fi
diff --git a/audio-soft/jack_capture/HISTORY b/audio-soft/jack_capture/HISTORY
index 554c0d9..032e657 100644
--- a/audio-soft/jack_capture/HISTORY
+++ b/audio-soft/jack_capture/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-01-29 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 0.9.32.
        * DEPENDS: Added depends libsndfile, added optional_depends xdialog
diff --git a/audio-soft/patchage/DEPENDS b/audio-soft/patchage/DEPENDS
index 2914c72..6f2eaaf 100755
--- a/audio-soft/patchage/DEPENDS
+++ b/audio-soft/patchage/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  boost       &&
 depends  libglademm  &&
 depends  raul        &&
diff --git a/audio-soft/patchage/HISTORY b/audio-soft/patchage/HISTORY
index f181096..cd2ca46 100644
--- a/audio-soft/patchage/HISTORY
+++ b/audio-soft/patchage/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-08-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: fixed jack #14690
 
diff --git a/audio-soft/qjackctl/DEPENDS b/audio-soft/qjackctl/DEPENDS
index 8e35e04..5902cc6 100755
--- a/audio-soft/qjackctl/DEPENDS
+++ b/audio-soft/qjackctl/DEPENDS
@@ -1,7 +1,7 @@
 depends  autoconf  &&
 depends  libx11    &&
 depends  libxext   &&
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  qt4       &&
 
 if [[ $QJCTL_VCS == y ]]
diff --git a/audio-soft/qjackctl/HISTORY b/audio-soft/qjackctl/HISTORY
index 10843d4..d5af4d8 100644
--- a/audio-soft/qjackctl/HISTORY
+++ b/audio-soft/qjackctl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-22 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: update to 0.3.5
 
diff --git a/chat-im/amsn/DEPENDS b/chat-im/amsn/DEPENDS
index 835d61f..ca9017e 100755
--- a/chat-im/amsn/DEPENDS
+++ b/chat-im/amsn/DEPENDS
@@ -1,6 +1,6 @@
 depends tk &&
 depends imagemagick &&
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends tls "" "" "for secure connection using SSL, for MSNP9" &&
 optional_depends libv4l "" "--disable-libv4l" \
                  "for webcam and audio support via v4l" &&
diff --git a/chat-im/amsn/HISTORY b/chat-im/amsn/HISTORY
index 25527d6..0320250 100644
--- a/chat-im/amsn/HISTORY
+++ b/chat-im/amsn/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.98.4
 
diff --git a/chat-irc/irssi/DEPENDS b/chat-irc/irssi/DEPENDS
index 7faeeef..ef7bead 100755
--- a/chat-irc/irssi/DEPENDS
+++ b/chat-irc/irssi/DEPENDS
@@ -1,6 +1,6 @@
 depends  glib2    &&
 depends  ncurses  &&
-depends  g++      &&
+depends -sub CXX gcc      &&
 
 optional_depends  "openssl"          \
                   ""                 \
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index 966bb90..b4e7751 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
        * irssi.desktop: added generic name and comment
 
diff --git a/chat-irc/znc/DEPENDS b/chat-irc/znc/DEPENDS
index 7953608..32f69f6 100755
--- a/chat-irc/znc/DEPENDS
+++ b/chat-irc/znc/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 message "NOTE: ZNC needs swig enabled for modperl/modpython support" &&
 
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index 1c27fe8..1659007 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.098; renewed source url
        * DEPENDS: added python support; corrected [sub]deps selection
diff --git a/chat-libs/gloox/DEPENDS b/chat-libs/gloox/DEPENDS
index 92900f8..d9c8c77 100755
--- a/chat-libs/gloox/DEPENDS
+++ b/chat-libs/gloox/DEPENDS
@@ -1,4 +1,4 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends gnutls  &&
 depends openssl &&
 depends libidn  &&
diff --git a/chat-libs/gloox/HISTORY b/chat-libs/gloox/HISTORY
index 59c7fe0..d805679 100644
--- a/chat-libs/gloox/HISTORY
+++ b/chat-libs/gloox/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-11-11 Bor Kraljič <pyrobor AT ver.si>
        * DEPENDS: updated zlib query
        * DETAILS: updated spell to 1.0
diff --git a/chat-libs/libmsn/DEPENDS b/chat-libs/libmsn/DEPENDS
index 49fbec0..38d1195 100755
--- a/chat-libs/libmsn/DEPENDS
+++ b/chat-libs/libmsn/DEPENDS
@@ -1,3 +1,3 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends cmake   &&
 depends openssl
diff --git a/chat-libs/libmsn/HISTORY b/chat-libs/libmsn/HISTORY
index 816cf05..ab57f5f 100644
--- a/chat-libs/libmsn/HISTORY
+++ b/chat-libs/libmsn/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-12 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Only apply openssl-1.0.0.patch for openssl 1.0.0+
          Print patch application message
diff --git a/chat-libs/opal/DEPENDS b/chat-libs/opal/DEPENDS
index e32719c..4459850 100755
--- a/chat-libs/opal/DEPENDS
+++ b/chat-libs/opal/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends swig &&
 depends ptlib
diff --git a/chat-libs/opal/HISTORY b/chat-libs/opal/HISTORY
index 0589f62..f7be350 100644
--- a/chat-libs/opal/HISTORY
+++ b/chat-libs/opal/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-20 Pol Vinogradov <vin.public AT gmail.com>
        * DETAILS: updated to 3.10.1
 
diff --git a/chat-libs/openh323/DEPENDS b/chat-libs/openh323/DEPENDS
index edceee0..399f29a 100755
--- a/chat-libs/openh323/DEPENDS
+++ b/chat-libs/openh323/DEPENDS
@@ -1,4 +1,4 @@
-depends g++              &&
+depends -sub CXX gcc              &&
 depends pwlib            &&
 
 optional_depends "speex" \
diff --git a/chat-libs/openh323/HISTORY b/chat-libs/openh323/HISTORY
index 2ab76c6..581dbfe 100644
--- a/chat-libs/openh323/HISTORY
+++ b/chat-libs/openh323/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-11-14 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated to version 1.18.0, SOURCE_GPG
 
diff --git a/chat-libs/ptlib/DEPENDS b/chat-libs/ptlib/DEPENDS
index c60163c..82d89ae 100755
--- a/chat-libs/ptlib/DEPENDS
+++ b/chat-libs/ptlib/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  autoconf  &&
 
 optional_depends  "openldap"            \
diff --git a/chat-libs/ptlib/HISTORY b/chat-libs/ptlib/HISTORY
index 84f8286..aa08f4f 100644
--- a/chat-libs/ptlib/HISTORY
+++ b/chat-libs/ptlib/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-20 Pol Vinogradov <vin.public AT gmail.com>
        * DETAILS: updated to 2.10.1
 
diff --git a/chat-libs/pwlib/DEPENDS b/chat-libs/pwlib/DEPENDS
index abd2c66..dfc5bb0 100755
--- a/chat-libs/pwlib/DEPENDS
+++ b/chat-libs/pwlib/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  autoconf  &&
 
 optional_depends  "openldap"            \
diff --git a/chat-libs/pwlib/HISTORY b/chat-libs/pwlib/HISTORY
index 49ce7cc..e83e3c7 100644
--- a/chat-libs/pwlib/HISTORY
+++ b/chat-libs/pwlib/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-03 George Sherwood <gsherwood AT sourcemage.org>
        * CONFLICTS: Added conflicts ptlib. Bug #15002
 
diff --git a/cluster/lapack/DEPENDS b/cluster/lapack/DEPENDS
index 8e5f286..f1b3fc8 100755
--- a/cluster/lapack/DEPENDS
+++ b/cluster/lapack/DEPENDS
@@ -1 +1 @@
-depends fortran
+depends -sub FORTRAN gcc
diff --git a/cluster/lapack/HISTORY b/cluster/lapack/HISTORY
index 83a33f7..429d70b 100644
--- a/cluster/lapack/HISTORY
+++ b/cluster/lapack/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2010-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.3.0
 
diff --git a/cluster/mpich2/DEPENDS b/cluster/mpich2/DEPENDS
index 7ae25e5..4044f2d 100755
--- a/cluster/mpich2/DEPENDS
+++ b/cluster/mpich2/DEPENDS
@@ -1,2 +1,2 @@
 depends  python  &&
-depends  fortran
+depends -sub FORTRAN gcc
diff --git a/cluster/mpich2/HISTORY b/cluster/mpich2/HISTORY
index 817001c..8253765 100644
--- a/cluster/mpich2/HISTORY
+++ b/cluster/mpich2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2010-04-23 Tommy Boatman <tboatman AT sourcemage.org>
        * DETAILS: Updated to 1.2.1p1, changed SOURCE_URL to http 
        * BUILD: added make_single - distcc fails
diff --git a/crypto/beecrypt/DEPENDS b/crypto/beecrypt/DEPENDS
index b6da3be..12bb58f 100755
--- a/crypto/beecrypt/DEPENDS
+++ b/crypto/beecrypt/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++ &&
+depends -sub CXX gcc &&
 optional_depends icu    '' '' 'unicode support' &&
 optional_depends python '' '' 'extra bindings' &&
 optional_depends JAVA   '' '' 'extra bindings'
diff --git a/crypto/beecrypt/HISTORY b/crypto/beecrypt/HISTORY
index ff9df40..3186f19 100644
--- a/crypto/beecrypt/HISTORY
+++ b/crypto/beecrypt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-17 George Sherwood <gsherwood AT sourcemage.org>
        * BUILD: Added fix from lunar to allow rpm to find beecrypt
 
diff --git a/crypto/botan/DEPENDS b/crypto/botan/DEPENDS
index 797c62b..f29e647 100755
--- a/crypto/botan/DEPENDS
+++ b/crypto/botan/DEPENDS
@@ -1,2 +1,2 @@
 depends python &&
-depends g++
+depends -sub CXX gcc
diff --git a/crypto/botan/HISTORY b/crypto/botan/HISTORY
index 9a32a86..6fc379e 100644
--- a/crypto/botan/HISTORY
+++ b/crypto/botan/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-10 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.8.11
 
diff --git a/crypto/cryptopp/DEPENDS b/crypto/cryptopp/DEPENDS
index bcd1eeb..f148724 100755
--- a/crypto/cryptopp/DEPENDS
+++ b/crypto/cryptopp/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/crypto/cryptopp/HISTORY b/crypto/cryptopp/HISTORY
index f7d9dcb..f739c28 100644
--- a/crypto/cryptopp/HISTORY
+++ b/crypto/cryptopp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 561, SOURCE_URL[1] updated
        * PRE_BUILD: added sed to fix problem with .so file
diff --git a/crypto/libecc/DEPENDS b/crypto/libecc/DEPENDS
index fd0b0eb..f148724 100755
--- a/crypto/libecc/DEPENDS
+++ b/crypto/libecc/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/crypto/libecc/HISTORY b/crypto/libecc/HISTORY
index 425dda5..792192b 100644
--- a/crypto/libecc/HISTORY
+++ b/crypto/libecc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.14.0
 
diff --git a/crypto/libgcrypt/DEPENDS b/crypto/libgcrypt/DEPENDS
index a88e0c5..43f8515 100755
--- a/crypto/libgcrypt/DEPENDS
+++ b/crypto/libgcrypt/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++           &&
+depends -sub CXX gcc           &&
 depends  libgpg-error
diff --git a/crypto/libgcrypt/HISTORY b/crypto/libgcrypt/HISTORY
index 1f17793..c252bc0 100644
--- a/crypto/libgcrypt/HISTORY
+++ b/crypto/libgcrypt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-30 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 1.5.0
 
diff --git a/crypto/libksba/DEPENDS b/crypto/libksba/DEPENDS
index a88e0c5..43f8515 100755
--- a/crypto/libksba/DEPENDS
+++ b/crypto/libksba/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++           &&
+depends -sub CXX gcc           &&
 depends  libgpg-error
diff --git a/crypto/libksba/HISTORY b/crypto/libksba/HISTORY
index 2106b7d..c2428c0 100644
--- a/crypto/libksba/HISTORY
+++ b/crypto/libksba/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.2.0
 
diff --git a/crypto/pcsc-lite/DEPENDS b/crypto/pcsc-lite/DEPENDS
index 8d4802a..f3bc5a8 100755
--- a/crypto/pcsc-lite/DEPENDS
+++ b/crypto/pcsc-lite/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 if [[ $PCSC_DEVICE_ACCESS == libusb ]]; then
   depends libusb "--enable-libusb"
 elif [[ $PCSC_DEVICE_ACCESS == udev ]]; then
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index d052be6..c75d7cf 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-06 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.7.4
 
diff --git a/crypto/qca-pkcs11/DEPENDS b/crypto/qca-pkcs11/DEPENDS
index 8576c0b..5ea9548 100755
--- a/crypto/qca-pkcs11/DEPENDS
+++ b/crypto/qca-pkcs11/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends qca2 &&
 depends pkcs11-helper
 
diff --git a/crypto/qca-pkcs11/HISTORY b/crypto/qca-pkcs11/HISTORY
index 8e4a2b0..fce37d5 100644
--- a/crypto/qca-pkcs11/HISTORY
+++ b/crypto/qca-pkcs11/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-03-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.0-beta2
          spell created
diff --git a/crypto/steghide/DEPENDS b/crypto/steghide/DEPENDS
index 6c273f4..8ce7e11 100755
--- a/crypto/steghide/DEPENDS
+++ b/crypto/steghide/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  libtool    &&
 depends  libmcrypt  &&
 depends  mhash      &&
diff --git a/crypto/steghide/HISTORY b/crypto/steghide/HISTORY
index 7e14d69..348ffa5 100644
--- a/crypto/steghide/HISTORY
+++ b/crypto/steghide/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/crypto/yassl/DEPENDS b/crypto/yassl/DEPENDS
index fd0b0eb..f148724 100755
--- a/crypto/yassl/DEPENDS
+++ b/crypto/yassl/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/crypto/yassl/HISTORY b/crypto/yassl/HISTORY
index ee93d32..fd6a6cd 100644
--- a/crypto/yassl/HISTORY
+++ b/crypto/yassl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-03-16 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS: spell created, version 1.9.6
 
diff --git a/database/db/DEPENDS b/database/db/DEPENDS
index c6af657..56a2f06 100755
--- a/database/db/DEPENDS
+++ b/database/db/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends  g++             \
+optional_depends -sub CXX gcc             \
                   "--enable-cxx"  \
                   ""              \
                   "for C++ API"   &&
diff --git a/database/db/HISTORY b/database/db/HISTORY
index 271a84c..db7cb4a 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-31 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: removed useless configure flag
 
diff --git a/database/drizzle/DEPENDS b/database/drizzle/DEPENDS
index 1935877..98c2b1f 100755
--- a/database/drizzle/DEPENDS
+++ b/database/drizzle/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  protobuf   &&
 depends  libdrizzle &&
 depends  pcre       &&
diff --git a/database/drizzle/HISTORY b/database/drizzle/HISTORY
index c9a3542..5c53d33 100644
--- a/database/drizzle/HISTORY
+++ b/database/drizzle/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2010.03.1412
        * DEPENDS: add boost
diff --git a/database/fbcopy/DEPENDS b/database/fbcopy/DEPENDS
index b19e14e..20b4e47 100755
--- a/database/fbcopy/DEPENDS
+++ b/database/fbcopy/DEPENDS
@@ -1,3 +1,3 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends firebird
 
diff --git a/database/fbcopy/HISTORY b/database/fbcopy/HISTORY
index abbbe31..c647d9c 100644
--- a/database/fbcopy/HISTORY
+++ b/database/fbcopy/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-10-14 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD: added, fix use of gcc-4.3.2
 
diff --git a/database/fbexport/DEPENDS b/database/fbexport/DEPENDS
index 2c6c927..c48c5ec 100755
--- a/database/fbexport/DEPENDS
+++ b/database/fbexport/DEPENDS
@@ -1,2 +1,2 @@
 depends firebird  &&
-depends g++
+depends -sub CXX gcc
diff --git a/database/fbexport/HISTORY b/database/fbexport/HISTORY
index 0754abf..c15ecc0 100644
--- a/database/fbexport/HISTORY
+++ b/database/fbexport/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-10-14 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD: added - fix gcc-4.3 issues
 
diff --git a/database/firebird/DEPENDS b/database/firebird/DEPENDS
index 12f8074..b2ae8be 100755
--- a/database/firebird/DEPENDS
+++ b/database/firebird/DEPENDS
@@ -1,4 +1,4 @@
-depends g++             &&
+depends -sub CXX gcc             &&
 depends libtool                &&
 depends openssl                &&
 depends libmcrypt      &&
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 3f0600f..2edaea3 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-01-30 Treeve Jelbert <treeve AT sourcemage.org>
        * PROVIDES: add FIREBIRD
        * CONFLICTS: added
diff --git a/database/firebird25/DEPENDS b/database/firebird25/DEPENDS
index db1afc8..22f5fb9 100755
--- a/database/firebird25/DEPENDS
+++ b/database/firebird25/DEPENDS
@@ -1,4 +1,4 @@
-depends g++             &&
+depends -sub CXX gcc             &&
 depends libtool                &&
 depends openssl                &&
 depends libmcrypt      &&
diff --git a/database/firebird25/HISTORY b/database/firebird25/HISTORY
index b54b33c..1d9eae6 100644
--- a/database/firebird25/HISTORY
+++ b/database/firebird25/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-09-23 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.5.0.26074-0
 
diff --git a/database/flamerobin/DEPENDS b/database/flamerobin/DEPENDS
index 595094f..106f5a7 100755
--- a/database/flamerobin/DEPENDS
+++ b/database/flamerobin/DEPENDS
@@ -1,5 +1,5 @@
 depends FIREBIRD  &&
-depends g++       &&
+depends -sub CXX gcc       &&
 if [[ $FL_VER == svn ]];then
   depends subversion
 fi &&
diff --git a/database/flamerobin/HISTORY b/database/flamerobin/HISTORY
index 4d1197c..e91591d 100644
--- a/database/flamerobin/HISTORY
+++ b/database/flamerobin/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-01-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: firebird => FIREBIRD
 
diff --git a/database/hk_classes/DEPENDS b/database/hk_classes/DEPENDS
index fb8bd76..bbd9a8d 100755
--- a/database/hk_classes/DEPENDS
+++ b/database/hk_classes/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++ &&
+depends -sub CXX gcc &&
 depends  python  &&
 optional_depends  ODBC-MGR               \
                   "--with-odbc"                     \
diff --git a/database/hk_classes/HISTORY b/database/hk_classes/HISTORY
index d7c79b1..5ffac8a 100644
--- a/database/hk_classes/HISTORY
+++ b/database/hk_classes/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/database/ibpp/DEPENDS b/database/ibpp/DEPENDS
index 578d508..e081798 100755
--- a/database/ibpp/DEPENDS
+++ b/database/ibpp/DEPENDS
@@ -1,3 +1,3 @@
-depends g++       &&
+depends -sub CXX gcc       &&
 depends FIREBIRD
 
diff --git a/database/ibpp/HISTORY b/database/ibpp/HISTORY
index 41e6507..d6d2aad 100644
--- a/database/ibpp/HISTORY
+++ b/database/ibpp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-09-06 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: firebird => FIREBIRD
        * INSTALL: another TRACK_ROOT fix
diff --git a/database/kyotocabinet/DEPENDS b/database/kyotocabinet/DEPENDS
index aa98b3d..97f86fb 100755
--- a/database/kyotocabinet/DEPENDS
+++ b/database/kyotocabinet/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends lzo      '--enable-lzo' ''   'LZO compression'  &&
 optional_depends xz-utils '--enable-lzma' ''  'LZMA compression' &&
 optional_depends zlib     '' '--disable-zlib' 'ZLIB compression'
diff --git a/database/kyotocabinet/HISTORY b/database/kyotocabinet/HISTORY
index 543c1fc..4654951 100644
--- a/database/kyotocabinet/HISTORY
+++ b/database/kyotocabinet/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.2.60
 
diff --git a/database/libinterbasexx/DEPENDS b/database/libinterbasexx/DEPENDS
index 54bc71c..cc90cca 100755
--- a/database/libinterbasexx/DEPENDS
+++ b/database/libinterbasexx/DEPENDS
@@ -1,4 +1,4 @@
-depends g++       &&
+depends -sub CXX gcc       &&
 depends firebird  &&
 optional_depends texlive "" "" "to create documentation"
 
diff --git a/database/libinterbasexx/HISTORY b/database/libinterbasexx/HISTORY
index a96b25d..d39fc1c 100644
--- a/database/libinterbasexx/HISTORY
+++ b/database/libinterbasexx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
         * DEPENDS: switch from tetex to texlive [auto]
 
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index c55b14d..073b1ad 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -1,6 +1,6 @@
 depends  perl    &&
 depends  procps  &&
-depends  g++     &&
+depends -sub CXX gcc     &&
 
 optional_depends zlib \
                  "--with-zlib-dir=$INSTALL_ROOT/" \
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index fd4f540..7f0d347 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
        * INSTALL: corrected config installation for init script
        * init.d/mariadb.conf: moved from profile.d/mariadb
diff --git a/database/mongodb/DEPENDS b/database/mongodb/DEPENDS
index 54282c2..47cabb5 100755
--- a/database/mongodb/DEPENDS
+++ b/database/mongodb/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends scons &&
 depends readline &&
 depends spidermonkey '--usesm' &&
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index d4ccdcb..0c448a1 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.8.2
        * PRE_BUILD: apply the patch
diff --git a/database/mysql-workbench/DEPENDS 
b/database/mysql-workbench/DEPENDS
index eaad326..0c264b2 100755
--- a/database/mysql-workbench/DEPENDS
+++ b/database/mysql-workbench/DEPENDS
@@ -10,7 +10,7 @@ depends eggdbus          &&
 depends expat            &&
 depends fontconfig       &&
 depends freetype2        &&
-depends g++              &&
+depends -sub CXX gcc              &&
 depends gconf2           &&
 depends glib2            &&
 depends glibmm           &&
diff --git a/database/mysql-workbench/HISTORY 
b/database/mysql-workbench/HISTORY
index c85de7e..43c3446 100644
--- a/database/mysql-workbench/HISTORY
+++ b/database/mysql-workbench/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-16 Ismael Luceno <ismael AT sourcemage.org>
         * DEPENDS: depend on MYSQL instead of mysql
 
diff --git a/database/mysql/DEPENDS b/database/mysql/DEPENDS
index 3387320..08b626d 100755
--- a/database/mysql/DEPENDS
+++ b/database/mysql/DEPENDS
@@ -1,7 +1,7 @@
 depends  zlib    &&
 depends  perl    &&
 depends  procps  &&
-depends  g++     &&
+depends -sub CXX gcc     &&
 
 if [[ $OLD == y ]]; then
   optional_depends openssl \
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 5dee09b..94bb4fd 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-22 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.1.58
 
diff --git a/database/openrpt/DEPENDS b/database/openrpt/DEPENDS
index 7341c60..dbdb2f0 100755
--- a/database/openrpt/DEPENDS
+++ b/database/openrpt/DEPENDS
@@ -1,3 +1,3 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends qt4
 
diff --git a/database/openrpt/HISTORY b/database/openrpt/HISTORY
index 0b1da02..26b8fde 100644
--- a/database/openrpt/HISTORY
+++ b/database/openrpt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.2.2
 
diff --git a/database/pgadmin3/DEPENDS b/database/pgadmin3/DEPENDS
index df764f0..93d2178 100755
--- a/database/pgadmin3/DEPENDS
+++ b/database/pgadmin3/DEPENDS
@@ -1,4 +1,4 @@
-depends g++        &&
+depends -sub CXX gcc        &&
 depends libxml2    &&
 depends libxslt    &&
 depends postgresql &&
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index f3824cf..f78bc40 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-02 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.12.2
 
diff --git a/database/rekall/DEPENDS b/database/rekall/DEPENDS
index 3244b29..8c75186 100755
--- a/database/rekall/DEPENDS
+++ b/database/rekall/DEPENDS
@@ -1,4 +1,4 @@
-depends g++             &&
+depends -sub CXX gcc             &&
 if [ "$GUI" == "kde" ]; then
   depends  kdelibs  
 #  optional_depends  arts  ""  "--without-arts"  "for arts support"
diff --git a/database/rekall/HISTORY b/database/rekall/HISTORY
index 014aa6c..5709e9f 100644
--- a/database/rekall/HISTORY
+++ b/database/rekall/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/database/sqlite/DEPENDS b/database/sqlite/DEPENDS
index 51ae572..d73aa45 100755
--- a/database/sqlite/DEPENDS
+++ b/database/sqlite/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 if [[ $SQLITE_VERSION == tea ]]; then
   depends tcl "--enable-tcl"
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 81e80a9..fe25c3f 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-29 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.7.7.1
        * PRE_BUILD, sqlite-3.7.7.patch: removed, fixed by upstream
diff --git a/database/unixodbc/DEPENDS b/database/unixodbc/DEPENDS
index 8b160f3..e2c1667 100755
--- a/database/unixodbc/DEPENDS
+++ b/database/unixodbc/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 #depends  libtool  "--enable-ltdllib"  &&
 depends  bison     &&
 depends  flex      &&
diff --git a/database/unixodbc/HISTORY b/database/unixodbc/HISTORY
index aed96ad..e3e00f6 100644
--- a/database/unixodbc/HISTORY
+++ b/database/unixodbc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.3.0
        * DEPENDS: remove qt-x11 - now separate spell for gui
diff --git a/database/xbase64/DEPENDS b/database/xbase64/DEPENDS
index 6a5456e..205a43c 100755
--- a/database/xbase64/DEPENDS
+++ b/database/xbase64/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 optional_depends doxygen "" "" "to create documentation"
diff --git a/database/xbase64/HISTORY b/database/xbase64/HISTORY
index 4804f61..fcc10e5 100644
--- a/database/xbase64/HISTORY
+++ b/database/xbase64/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/devel/adagoop/DEPENDS b/devel/adagoop/DEPENDS
index d6c867c..1ce77f0 100755
--- a/devel/adagoop/DEPENDS
+++ b/devel/adagoop/DEPENDS
@@ -1,2 +1,2 @@
-depends ada &&
+depends -sub ADA gcc &&
 depends scatcdsk
diff --git a/devel/adagoop/HISTORY b/devel/adagoop/HISTORY
index 16b07e3..e283905 100644
--- a/devel/adagoop/HISTORY
+++ b/devel/adagoop/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/devel/afay/DEPENDS b/devel/afay/DEPENDS
index 6c8473d..3b57d3a 100755
--- a/devel/afay/DEPENDS
+++ b/devel/afay/DEPENDS
@@ -1 +1 @@
-depends ada 
+depends -sub ADA gcc 
diff --git a/devel/afay/HISTORY b/devel/afay/HISTORY
index 923b652..68846da 100644
--- a/devel/afay/HISTORY
+++ b/devel/afay/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-02-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/devel/apiextractor/DEPENDS b/devel/apiextractor/DEPENDS
index e980214..b3f4795 100755
--- a/devel/apiextractor/DEPENDS
+++ b/devel/apiextractor/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  qt4      &&
 depends  cmake    &&
 depends  openssl  &&
diff --git a/devel/apiextractor/HISTORY b/devel/apiextractor/HISTORY
index 8e1dbc1..6060434 100644
--- a/devel/apiextractor/HISTORY
+++ b/devel/apiextractor/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-23 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.10.4
 
diff --git a/devel/arx/DEPENDS b/devel/arx/DEPENDS
index 7829c01..35d0cc7 100755
--- a/devel/arx/DEPENDS
+++ b/devel/arx/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends python &&
 depends gnome-vfs2
diff --git a/devel/arx/HISTORY b/devel/arx/HISTORY
index 4aed7fe..76749e7 100644
--- a/devel/arx/HISTORY
+++ b/devel/arx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/devel/asis/DEPENDS b/devel/asis/DEPENDS
index 175563b..4251501 100755
--- a/devel/asis/DEPENDS
+++ b/devel/asis/DEPENDS
@@ -1 +1 @@
-depends ada
+depends -sub ADA gcc
diff --git a/devel/asis/HISTORY b/devel/asis/HISTORY
index b99d030..2bb876e 100644
--- a/devel/asis/HISTORY
+++ b/devel/asis/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2010-08-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/devel/astyle/DEPENDS b/devel/astyle/DEPENDS
index bcd1eeb..f148724 100755
--- a/devel/astyle/DEPENDS
+++ b/devel/astyle/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/devel/astyle/HISTORY b/devel/astyle/HISTORY
index b081afa..8190d0f 100644
--- a/devel/astyle/HISTORY
+++ b/devel/astyle/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-28 Dale E. Edmons <linuxfan AT sourcemage.org>
        * DETAILS: BUILD_DIRECTORY for bug 14100
 
diff --git a/devel/aunit/DEPENDS b/devel/aunit/DEPENDS
index 5bb5e76..3dd023b 100755
--- a/devel/aunit/DEPENDS
+++ b/devel/aunit/DEPENDS
@@ -1,2 +1,2 @@
-depends ada &&
+depends -sub ADA gcc &&
 depends gprbuild 
diff --git a/devel/aunit/HISTORY b/devel/aunit/HISTORY
index 8476004..53c9732 100644
--- a/devel/aunit/HISTORY
+++ b/devel/aunit/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2010-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/devel/bison/DEPENDS b/devel/bison/DEPENDS
index be08f17..11f0a12 100755
--- a/devel/bison/DEPENDS
+++ b/devel/bison/DEPENDS
@@ -13,4 +13,4 @@ optional_depends gettext \
                  "--disable-nls" \
                  "for Native Language Support" &&
 
-optional_depends g++ "" "" "for C++ support"
+optional_depends -sub CXX gcc "" "" "for C++ support"
diff --git a/devel/bison/HISTORY b/devel/bison/HISTORY
index b85c99b..567afc9 100644
--- a/devel/bison/HISTORY
+++ b/devel/bison/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: correctly compare versions
 
diff --git a/devel/bisonc++/DEPENDS b/devel/bisonc++/DEPENDS
index 6777cea..08ed891 100755
--- a/devel/bisonc++/DEPENDS
+++ b/devel/bisonc++/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends flex   &&
 depends icmake &&
 depends yodl   &&
diff --git a/devel/bisonc++/HISTORY b/devel/bisonc++/HISTORY
index 529f289..f62f164 100644
--- a/devel/bisonc++/HISTORY
+++ b/devel/bisonc++/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-21 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.8.0
 
diff --git a/devel/bobcat/DEPENDS b/devel/bobcat/DEPENDS
index a273cad..c3dd799 100755
--- a/devel/bobcat/DEPENDS
+++ b/devel/bobcat/DEPENDS
@@ -1,4 +1,4 @@
 depends icmake  &&
 depends yodl    &&
-depends g++
+depends -sub CXX gcc
 
diff --git a/devel/bobcat/HISTORY b/devel/bobcat/HISTORY
index 7735244..42c954f 100644
--- a/devel/bobcat/HISTORY
+++ b/devel/bobcat/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-21 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.08.01
 
diff --git a/devel/ccbuild/DEPENDS b/devel/ccbuild/DEPENDS
index 50df6db..5ccee93 100755
--- a/devel/ccbuild/DEPENDS
+++ b/devel/ccbuild/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends flex
diff --git a/devel/ccbuild/HISTORY b/devel/ccbuild/HISTORY
index 6d9c531..53be187 100644
--- a/devel/ccbuild/HISTORY
+++ b/devel/ccbuild/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-06-20 Bor Kraljič <pyrobor AT ver.si>
        * 8F79D9FE.gpg: added gpg keyring
        * DETAILS: updated spell to 1.5.4
diff --git a/devel/cmake/DEPENDS b/devel/cmake/DEPENDS
index a804bc4..7a0afc9 100755
--- a/devel/cmake/DEPENDS
+++ b/devel/cmake/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends ncurses &&
 optional_depends libidn '' '' 'internation domain name support' &&
 optional_depends qt4 \
diff --git a/devel/cmake/HISTORY b/devel/cmake/HISTORY
index 1d011d6..5cf92fe 100644
--- a/devel/cmake/HISTORY
+++ b/devel/cmake/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-08 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.8.5
 
diff --git a/devel/cppcheck/DEPENDS b/devel/cppcheck/DEPENDS
index fd0b0eb..f148724 100755
--- a/devel/cppcheck/DEPENDS
+++ b/devel/cppcheck/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/devel/cppcheck/HISTORY b/devel/cppcheck/HISTORY
index 0d6d5bb..d7b59b7 100644
--- a/devel/cppcheck/HISTORY
+++ b/devel/cppcheck/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, INSTALL, DEPENDS: spell created
 
diff --git a/devel/cppsocket/DEPENDS b/devel/cppsocket/DEPENDS
index bcd1eeb..f148724 100755
--- a/devel/cppsocket/DEPENDS
+++ b/devel/cppsocket/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/devel/cppsocket/HISTORY b/devel/cppsocket/HISTORY
index 0a44c30..df6d221 100644
--- a/devel/cppsocket/HISTORY
+++ b/devel/cppsocket/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-04-26 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Moved source modifications to PRE_BUILD
        * PRE_BUILD: Apply gcc43.patch
diff --git a/devel/cppunit/DEPENDS b/devel/cppunit/DEPENDS
index 32a6556..5ebb288 100755
--- a/devel/cppunit/DEPENDS
+++ b/devel/cppunit/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  m4
diff --git a/devel/cppunit/HISTORY b/devel/cppunit/HISTORY
index 47f6a07..9e2f06d 100644
--- a/devel/cppunit/HISTORY
+++ b/devel/cppunit/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-06-30 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.12.0
        * DEPENDS: add g++
diff --git a/devel/ctemplate/DEPENDS b/devel/ctemplate/DEPENDS
index fd0b0eb..f148724 100755
--- a/devel/ctemplate/DEPENDS
+++ b/devel/ctemplate/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/devel/ctemplate/HISTORY b/devel/ctemplate/HISTORY
index fd5c55e..c705632 100644
--- a/devel/ctemplate/HISTORY
+++ b/devel/ctemplate/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.99
        * PRE_BUILD: added, fix for gcc-4.6.0
diff --git a/devel/distcc/BUILD b/devel/distcc/BUILD
new file mode 100755
index 0000000..f7aa896
--- /dev/null
+++ b/devel/distcc/BUILD
@@ -0,0 +1,5 @@
+create_account distcc &&
+
+OPTS="--disable-Werror $OPTS" &&
+
+default_build
diff --git a/devel/distcc/DEPENDS b/devel/distcc/DEPENDS
index cbc1a54..eef9301 100755
--- a/devel/distcc/DEPENDS
+++ b/devel/distcc/DEPENDS
@@ -1,3 +1,19 @@
-depends  popt  &&
-optional_depends "gtk+2" "--with-gtk" "" "for a GUI interface" &&
-optional_depends "libgnomeui" "--with-gnome" "" "for a gnome-based GUI" 
+optional_depends popt \
+                 "--without-included-popt" \
+                 "--with-included-popt" \
+                 "to use system popt library instead of bundled" &&
+
+optional_depends gtk+2 \
+                 "--with-gtk" \
+                 "--without-gtk" \
+                 "for GTK+-based montior" &&
+
+optional_depends libgnomeui \
+                 "--with-gnome" \
+                 "--without-gnome" \
+                 "for GNOME-based monitor" &&
+
+optional_depends avahi \
+                 "--with-avahi" \
+                 "--without-avahi" \
+                 "for getting hosts via avahi"
diff --git a/devel/distcc/DETAILS b/devel/distcc/DETAILS
index 81c3272..b3e4d05 100755
--- a/devel/distcc/DETAILS
+++ b/devel/distcc/DETAILS
@@ -1,13 +1,12 @@
            SPELL=distcc
-         VERSION=2.18.3
+         VERSION=3.1
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://distcc.samba.org/ftp/distcc/$SOURCE
-     
SOURCE_HASH=sha512:2cd1cbd40ae34580f1cf45502e13f683a420d0f954418307942091cb4b34e3e437439ec3f5c971639af89441dccdd0bf40efa503907e435379aac5246ab686e3
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://distcc.googlecode.com/files/$SOURCE
+     
SOURCE_HASH=sha512:0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd
         WEB_SITE=http://distcc.org/
       LICENSE[0]=GPL
          ENTERED=20020717
-         UPDATED=20040515
         KEYWORDS="devel"
            SHORT="spread compilation among several different computers"
 
diff --git a/devel/distcc/HISTORY b/devel/distcc/HISTORY
index f4111a0..1c19eab 100644
--- a/devel/distcc/HISTORY
+++ b/devel/distcc/HISTORY
@@ -1,3 +1,10 @@
+2011-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.1
+       * PRE_BUILD: moved to BUILD
+       * DEPENDS: renewed dependencies
+       * INSTALL: added, to install init config and pid dir
+       * init.d/distcc{,.conf}: fixed several options for proper 
functionality
+
 2008-06-19 Ethan Grammatikidis <eekee57 AT fastmail.fm>
        * DETAILS: updated WEB_SITE
 
diff --git a/devel/distcc/INSTALL b/devel/distcc/INSTALL
new file mode 100755
index 0000000..d4cf2f5
--- /dev/null
+++ b/devel/distcc/INSTALL
@@ -0,0 +1,8 @@
+default_install &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/distcc.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/distcc"
+fi &&
+
+install -d -o distcc -g distcc -vm 755 "$INSTALL_ROOT/var/run/distccd"
diff --git a/devel/distcc/PRE_BUILD b/devel/distcc/PRE_BUILD
deleted file mode 100755
index a22bf12..0000000
--- a/devel/distcc/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-create_account  distcc  &&
-default_pre_build
diff --git a/devel/distcc/init.d/distcc b/devel/distcc/init.d/distcc
index 0e071b0..d924fd1 100755
--- a/devel/distcc/init.d/distcc
+++ b/devel/distcc/init.d/distcc
@@ -3,7 +3,8 @@
 . /etc/sysconfig/distcc
 
 PROGRAM=/usr/bin/distccd
-ARGS="--user $USER --allow $ALLOWED --daemon --log-file $LOGFILE --log-level 
$LOGLEVEL --listen $LISTEN --jobs $JOBS"
+PIDFILE=/var/run/distccd/distccd.pid
+ARGS="--daemon --user distcc --pid-file $PIDFILE $DISTCCD_ARGS"
 RUNLEVEL=3
 NEEDS="+remote_fs"
 
diff --git a/devel/distcc/init.d/distcc.conf b/devel/distcc/init.d/distcc.conf
index 30756fc..c8b373f 100644
--- a/devel/distcc/init.d/distcc.conf
+++ b/devel/distcc/init.d/distcc.conf
@@ -1,6 +1,3 @@
-USER="distcc"
-ALLOWED="0.0.0.0/24"
-LOGFILE="/var/log/distcc"
-LOGLEVEL="info"
-LISTEN="0.0.0.0"
-JOBS="3"
+# For the arguments and description see distccd(1)
+
+DISTCCD_ARGS="--listen 0.0.0.0 --allow 0.0.0.0/24 --jobs 3"
diff --git a/devel/doxygen/DEPENDS b/devel/doxygen/DEPENDS
index 8b97b3f..31c9f35 100755
--- a/devel/doxygen/DEPENDS
+++ b/devel/doxygen/DEPENDS
@@ -1,7 +1,7 @@
 depends  bison  &&
 depends  flex   &&
 depends  perl   &&
-depends  g++    &&
+depends -sub CXX gcc    &&
 
 optional_depends  graphviz                \
                   ""                      \
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index b221166..29b7416 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-15 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 1.7.4
 
diff --git a/devel/duma/DEPENDS b/devel/duma/DEPENDS
index fd0b0eb..f148724 100755
--- a/devel/duma/DEPENDS
+++ b/devel/duma/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/devel/duma/HISTORY b/devel/duma/HISTORY
index 7459d6a..26bf506 100644
--- a/devel/duma/HISTORY
+++ b/devel/duma/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-27 Thomas Orgis <sobukus AT soucemage.org>
        * DETAILS, DEPENDS, BUILD, INSTALL: created spell
diff --git a/devel/falcon/DEPENDS b/devel/falcon/DEPENDS
index 1467936..06e1df2 100755
--- a/devel/falcon/DEPENDS
+++ b/devel/falcon/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends pcre   &&
 depends zlib   &&
 depends cmake
diff --git a/devel/falcon/HISTORY b/devel/falcon/HISTORY
index b3916b5..e483868 100644
--- a/devel/falcon/HISTORY
+++ b/devel/falcon/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-25 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.9.6.6 (& .tar.gz -> .tgz)
        * INSTALL: removed, no longer needed
diff --git a/devel/florist/DEPENDS b/devel/florist/DEPENDS
index 6c8473d..3b57d3a 100755
--- a/devel/florist/DEPENDS
+++ b/devel/florist/DEPENDS
@@ -1 +1 @@
-depends ada 
+depends -sub ADA gcc 
diff --git a/devel/florist/HISTORY b/devel/florist/HISTORY
index b6b3699..7d260a6 100644
--- a/devel/florist/HISTORY
+++ b/devel/florist/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2010-09-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * INSTALL: use florist.gpr from $SCRIPT_DIRECTORY
        * DETAILS: PATCHLEVEL++
diff --git a/devel/gambas/DEPENDS b/devel/gambas/DEPENDS
index bfe3bd3..67d281b 100755
--- a/devel/gambas/DEPENDS
+++ b/devel/gambas/DEPENDS
@@ -1,5 +1,5 @@
 depends libtool   &&
-depends g++       &&
+depends -sub CXX gcc       &&
 depends xorg-libs  &&
 optional_depends  QT         "--enable-qt"                  \
                              "--disable-qt"                 \
diff --git a/devel/gambas/HISTORY b/devel/gambas/HISTORY
index 614c594..4195a58 100644
--- a/devel/gambas/HISTORY
+++ b/devel/gambas/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/devel/gambas2/DEPENDS b/devel/gambas2/DEPENDS
index 13a23db..9e087dc 100755
--- a/devel/gambas2/DEPENDS
+++ b/devel/gambas2/DEPENDS
@@ -1,5 +1,5 @@
 depends libtool   &&
-depends g++       &&
+depends -sub CXX gcc       &&
 depends xorg-libs  &&
 optional_depends  gtk+2      "--enable-gtk"                 \
                              "--disable-gtk"                \
diff --git a/devel/gambas2/HISTORY b/devel/gambas2/HISTORY
index d36eefd..bc4c079 100644
--- a/devel/gambas2/HISTORY
+++ b/devel/gambas2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/devel/gdb/DETAILS b/devel/gdb/DETAILS
index f73d6ce..e5b9a42 100755
--- a/devel/gdb/DETAILS
+++ b/devel/gdb/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gdb
-         VERSION=7.2
+         VERSION=7.3
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
       SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://sources.redhat.com/gdb/
          ENTERED=20011023
         KEYWORDS="debugger devel"
-           SHORT="gdb is the GNU Debugger used for debugging"
+           SHORT="GNU Debugger used for debugging"
 cat << EOF
 The GNU Debugger (GDB) is a source-level debugger for C, C++, Java,
 Modula-2, and several other languages. It runs on GNU/Linux, the
diff --git a/devel/gdb/HISTORY b/devel/gdb/HISTORY
index 4f581ed..9a3573a 100644
--- a/devel/gdb/HISTORY
+++ b/devel/gdb/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 7.3; quoting paths
+
 2010-09-07 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 7.2
 
diff --git a/devel/gdb/INSTALL b/devel/gdb/INSTALL
index 73eed52..3cc5d8c 100755
--- a/devel/gdb/INSTALL
+++ b/devel/gdb/INSTALL
@@ -1,2 +1,3 @@
 default_install  &&
-cp gdb/libgdb.a $INSTALL_ROOT/usr/lib/
+
+install -vm 644 gdb/libgdb.a "$INSTALL_ROOT/usr/lib/"
diff --git a/devel/geany/DEPENDS b/devel/geany/DEPENDS
index 84b793e..bbcbbf3 100755
--- a/devel/geany/DEPENDS
+++ b/devel/geany/DEPENDS
@@ -6,4 +6,4 @@ optional_depends vte \
                  "--disable-vte" \
                  "for virtual terminal support" &&
 
-optional_depends g++ "" "" "to build included Scintilla module"
+optional_depends -sub CXX gcc "" "" "to build included Scintilla module"
diff --git a/devel/geany/HISTORY b/devel/geany/HISTORY
index 0fdc7b7..ea8a64f 100644
--- a/devel/geany/HISTORY
+++ b/devel/geany/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: corrected typo
 
diff --git a/devel/gnat-gps/DEPENDS b/devel/gnat-gps/DEPENDS
index 8cbbc16..96d138a 100755
--- a/devel/gnat-gps/DEPENDS
+++ b/devel/gnat-gps/DEPENDS
@@ -1,5 +1,5 @@
 depends gtkada &&
-depends ada    &&
+depends -sub ADA gcc    &&
 depends gtkada &&
 depends xmlada &&
 depends python &&
diff --git a/devel/gnat-gps/HISTORY b/devel/gnat-gps/HISTORY
index 260862d..05aaa75 100644
--- a/devel/gnat-gps/HISTORY
+++ b/devel/gnat-gps/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-02-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS, PRE_BUILD, src_editor_buffer.adb.diff: spell 
created
 
diff --git a/devel/gperf/DEPENDS b/devel/gperf/DEPENDS
index fd0b0eb..f148724 100755
--- a/devel/gperf/DEPENDS
+++ b/devel/gperf/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/devel/gperf/HISTORY b/devel/gperf/HISTORY
index 2389bd5..b224828 100644
--- a/devel/gperf/HISTORY
+++ b/devel/gperf/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DEPENDS: added, depends on g++
 
diff --git a/devel/gprbuild/DEPENDS b/devel/gprbuild/DEPENDS
index f9758b6..6345f07 100755
--- a/devel/gprbuild/DEPENDS
+++ b/devel/gprbuild/DEPENDS
@@ -1,2 +1,2 @@
 depends xmlada &&
-depends ada 
+depends -sub ADA gcc 
diff --git a/devel/gprbuild/HISTORY b/devel/gprbuild/HISTORY
index c15e792..216a106 100644
--- a/devel/gprbuild/HISTORY
+++ b/devel/gprbuild/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2010-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/devel/lazarus/DEPENDS b/devel/lazarus/DEPENDS
index 947cbf7..31d6000 100755
--- a/devel/lazarus/DEPENDS
+++ b/devel/lazarus/DEPENDS
@@ -7,7 +7,7 @@ case $LAZ_GUI in
   gtk2) depends gtk+2
        ;;
   qt) depends qt4      &&
-      depends g++       &&
+      depends -sub CXX gcc       &&
       depends qt4pas 'OPT="-dUSE_QT_44"'
        ;;
 esac
diff --git a/devel/lazarus/HISTORY b/devel/lazarus/HISTORY
index 1a1de59..eb346c2 100644
--- a/devel/lazarus/HISTORY
+++ b/devel/lazarus/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-03-23 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: snapshot = 0.9.27-19066-20090323
          stable -> 0.9.26.2
diff --git a/devel/libcutl/DEPENDS b/devel/libcutl/DEPENDS
index dcc9e44..82c9dec 100755
--- a/devel/libcutl/DEPENDS
+++ b/devel/libcutl/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libtool
diff --git a/devel/libcutl/HISTORY b/devel/libcutl/HISTORY
index 12ea0df..cf54be8 100644
--- a/devel/libcutl/HISTORY
+++ b/devel/libcutl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
        * INSTALL: install missing header files
diff --git a/devel/libgc/DEPENDS b/devel/libgc/DEPENDS
index 219a524..b730445 100755
--- a/devel/libgc/DEPENDS
+++ b/devel/libgc/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends g++ '--enable-cplusplus' ''    'c++ support' &&
-optional_depends gcj '' '--disable-gcj-support' 'gcj support' &&
+optional_depends -sub CXX gcc '--enable-cplusplus' ''    'c++ support' &&
+optional_depends -sub JAVA gcc '' '--disable-gcj-support' 'gcj support' &&
 optional_depends libatomic_ops '' '' 'system version of libatomic_ops'
diff --git a/devel/libgc/HISTORY b/devel/libgc/HISTORY
index cdc6863..a503297 100644
--- a/devel/libgc/HISTORY
+++ b/devel/libgc/HISTORY
@@ -1,3 +1,11 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-12-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: added, for optional libatomic_ops, g++, gcj
 
diff --git a/devel/llvm/DEPENDS b/devel/llvm/DEPENDS
index e8cf646..ac91425 100755
--- a/devel/llvm/DEPENDS
+++ b/devel/llvm/DEPENDS
@@ -1,5 +1,5 @@
 depends libtool &&
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends doxygen \
                "--enable-doxygen" \
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 8e9d115..58c4ca1 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-12 Peng Chang (Charles) <chp AT sourcemage.org>
        * DETAILS: updated spell to 2.9
 
diff --git a/devel/nant/DEPENDS b/devel/nant/DEPENDS
index e2ea1eb..7e79452 100755
--- a/devel/nant/DEPENDS
+++ b/devel/nant/DEPENDS
@@ -1,2 +1,2 @@
-depends g++            &&
+depends -sub CXX gcc           &&
 depends mono
diff --git a/devel/nant/HISTORY b/devel/nant/HISTORY
index 8114ab4..072502f 100644
--- a/devel/nant/HISTORY
+++ b/devel/nant/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-06-20 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.90
 
diff --git a/devel/ncc/DEPENDS b/devel/ncc/DEPENDS
index bcd1eeb..f148724 100755
--- a/devel/ncc/DEPENDS
+++ b/devel/ncc/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/devel/ncc/HISTORY b/devel/ncc/HISTORY
index 17f4999..8becb6c 100644
--- a/devel/ncc/HISTORY
+++ b/devel/ncc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-01-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS: updated spell to 2.6
        * BUILD: removed make install, this is the default INSTALL stuff
diff --git a/devel/odb/DEPENDS b/devel/odb/DEPENDS
index 7d037d2..14ce376 100755
--- a/devel/odb/DEPENDS
+++ b/devel/odb/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libcutl
diff --git a/devel/odb/HISTORY b/devel/odb/HISTORY
index 40e4632..966758c 100644
--- a/devel/odb/HISTORY
+++ b/devel/odb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/devel/openfst/DEPENDS b/devel/openfst/DEPENDS
index 33f8005..cf20e51 100755
--- a/devel/openfst/DEPENDS
+++ b/devel/openfst/DEPENDS
@@ -1,2 +1,2 @@
-depends g++
+depends -sub CXX gcc
 
diff --git a/devel/openfst/HISTORY b/devel/openfst/HISTORY
index c6eb76e..298642e 100644
--- a/devel/openfst/HISTORY
+++ b/devel/openfst/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-10-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version -beta-20080422
          new url
diff --git a/devel/oprofile/DEPENDS b/devel/oprofile/DEPENDS
index aaf59df..2891f88 100755
--- a/devel/oprofile/DEPENDS
+++ b/devel/oprofile/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libxslt &&
 depends popt &&
 
diff --git a/devel/oprofile/HISTORY b/devel/oprofile/HISTORY
index 4bbede2..9072be3 100644
--- a/devel/oprofile/HISTORY
+++ b/devel/oprofile/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.9.6
 
diff --git a/devel/pkgconfig/DEPENDS b/devel/pkgconfig/DEPENDS
index 7349c44..150d45a 100755
--- a/devel/pkgconfig/DEPENDS
+++ b/devel/pkgconfig/DEPENDS
@@ -1,7 +1 @@
-# only allow dependency if glib2 is installed, otherwise a cycle is created
-if spell_ok glib2; then
-   optional_depends  glib2                       \
-                  "--with-installed-glib"        \
-                  "--without-installed-glib"     \
-                  "to use system GLib"
-fi
+depends glib2
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index 7c58683..ef95a61 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pkgconfig
-         VERSION=0.25
-     
SOURCE_HASH=sha512:6c50ca542733feeb10301097ade32075c5417ada5bdd195957de8521a28b20e0e7a54ed553fa3e022b24969e9deb97d72e289192cb2a3afc2c86241dc6cafa02
+         VERSION=0.26
+     
SOURCE_HASH=sha512:9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
           SOURCE=pkg-config-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
    SOURCE_URL[0]=http://www.freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 6a29c2d..7fbfa21 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,7 @@
+2011-08-01 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.26
+       * DEPENDS: embedded glib has been removed, depends on glib2 now
+
 2010-08-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: let's not try running a subshell in description
 
diff --git a/devel/polyorb/DEPENDS b/devel/polyorb/DEPENDS
index 36e3958..84049ed 100755
--- a/devel/polyorb/DEPENDS
+++ b/devel/polyorb/DEPENDS
@@ -1,4 +1,4 @@
-depends ada    &&
+depends -sub ADA gcc    &&
 depends xmlada &&
 optional_depends openssl \
                  "--with-openssl" \
diff --git a/devel/polyorb/HISTORY b/devel/polyorb/HISTORY
index dc1ca91..151217c 100644
--- a/devel/polyorb/HISTORY
+++ b/devel/polyorb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2010-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD: make_single
 
diff --git a/devel/propertyeditor/DEPENDS b/devel/propertyeditor/DEPENDS
index ae6fd0f..cdd79b2 100755
--- a/devel/propertyeditor/DEPENDS
+++ b/devel/propertyeditor/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends qt4  &&
 depends cmake &&
 depends xz-utils
diff --git a/devel/propertyeditor/HISTORY b/devel/propertyeditor/HISTORY
index 1f1106a..1b3ae17 100644
--- a/devel/propertyeditor/HISTORY
+++ b/devel/propertyeditor/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-05-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.1.3
 
diff --git a/devel/python/DEPENDS b/devel/python/DEPENDS
index 02a6e94..25f191e 100755
--- a/devel/python/DEPENDS
+++ b/devel/python/DEPENDS
@@ -14,7 +14,7 @@ optional_depends valgrind \
                  "--without-valgrind" \
                  "for Valgrind support" &&
 
-optional_depends g++ \
+optional_depends -sub CXX gcc \
                  "--with-cxx-main=g++" \
                  "--without-cxx-main" \
                  "for C++ module support"
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 05310db..65791d1 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-13 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.7.2
 
diff --git a/devel/python3/DEPENDS b/devel/python3/DEPENDS
index 76d7d7f..559c166 100755
--- a/devel/python3/DEPENDS
+++ b/devel/python3/DEPENDS
@@ -5,7 +5,7 @@ optional_depends ncurses "" "" "for Ncurses support" &&
 optional_depends readline "" "" "for Readline support" &&
 optional_depends expat "" "" "for XML parser module" &&
 
-optional_depends g++ \
+optional_depends -sub CXX gcc \
                  "--with-cxx-main=g++" \
                  "--without-cxx-main" \
                  "for C++ module support"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 727ce70..cd22c69 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.2.1
 
diff --git a/devel/qdevelop/DEPENDS b/devel/qdevelop/DEPENDS
index 26f3c34..6b11f72 100755
--- a/devel/qdevelop/DEPENDS
+++ b/devel/qdevelop/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends qt4  &&
 depends cmake &&
 optional_depends gdb   '' '' 'debug support'   &&
diff --git a/devel/qdevelop/HISTORY b/devel/qdevelop/HISTORY
index 299e421..7231156 100644
--- a/devel/qdevelop/HISTORY
+++ b/devel/qdevelop/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-08 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.28 (stable)
          new website & url
diff --git a/devel/qt-creator/DEPENDS b/devel/qt-creator/DEPENDS
index 7341c60..dbdb2f0 100755
--- a/devel/qt-creator/DEPENDS
+++ b/devel/qt-creator/DEPENDS
@@ -1,3 +1,3 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends qt4
 
diff --git a/devel/qt-creator/HISTORY b/devel/qt-creator/HISTORY
index ad839b4..903d35f 100644
--- a/devel/qt-creator/HISTORY
+++ b/devel/qt-creator/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, CONFIGURE: added optional support for the development 
version
 
diff --git a/devel/qt4pas/DEPENDS b/devel/qt4pas/DEPENDS
index 96b12b5..a73857b 100755
--- a/devel/qt4pas/DEPENDS
+++ b/devel/qt4pas/DEPENDS
@@ -1,3 +1,3 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends -sub WEBKIT qt4
 
diff --git a/devel/qt4pas/DETAILS b/devel/qt4pas/DETAILS
index 80082d0..d72d04c 100755
--- a/devel/qt4pas/DETAILS
+++ b/devel/qt4pas/DETAILS
@@ -1,6 +1,6 @@
            SPELL=qt4pas
-         VERSION=V2.3
-     
SOURCE_HASH=sha512:2d4fff8cf7589f5c0e986a330436cc322ef1f727d8d8743a98b8247b98ea5a58fb5790ae24924a32132a941278a4c3dffaf6f717508320da784009d8560c7f2e
+         VERSION=V2.4
+     
SOURCE_HASH=sha512:4a5f7dadbef6b69a8d888ef601593c3fd8d614d6afad92dabf10466e94d02b39d6ef7482d3acda70406220a076f82ac6d87ed0a066150303268d35d596b83dd4
              VQT=Qt4.5.3
               VX=${VERSION}_${VQT}
           SOURCE=$SPELL-$VX.tar.gz
diff --git a/devel/qt4pas/HISTORY b/devel/qt4pas/HISTORY
index dd12544..3a0de98 100644
--- a/devel/qt4pas/HISTORY
+++ b/devel/qt4pas/HISTORY
@@ -1,3 +1,10 @@
+2011-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version V2.4 (qt4.5.3)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version V2.3 (qt4.5.3)
 
diff --git a/devel/quazip/DEPENDS b/devel/quazip/DEPENDS
index c65c94e..a899cec 100755
--- a/devel/quazip/DEPENDS
+++ b/devel/quazip/DEPENDS
@@ -1,2 +1,2 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends qt4
diff --git a/devel/quazip/HISTORY b/devel/quazip/HISTORY
index f8a938c..18c832a 100644
--- a/devel/quazip/HISTORY
+++ b/devel/quazip/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-02-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.2.3
          spell created
diff --git a/devel/ragel/DEPENDS b/devel/ragel/DEPENDS
index 465a6f0..c2b1f5f 100755
--- a/devel/ragel/DEPENDS
+++ b/devel/ragel/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends RUBY '' '' 'Ruby support'
diff --git a/devel/ragel/HISTORY b/devel/ragel/HISTORY
index e90fd96..e2feb8e 100644
--- a/devel/ragel/HISTORY
+++ b/devel/ragel/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
        * DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/devel/re2c/DEPENDS b/devel/re2c/DEPENDS
index fd0b0eb..f148724 100755
--- a/devel/re2c/DEPENDS
+++ b/devel/re2c/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/devel/re2c/HISTORY b/devel/re2c/HISTORY
index 21f10be..60f0f8c 100644
--- a/devel/re2c/HISTORY
+++ b/devel/re2c/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-06-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.13.5
 
diff --git a/devel/s11n/DEPENDS b/devel/s11n/DEPENDS
index f992a83..18b5d5e 100755
--- a/devel/s11n/DEPENDS
+++ b/devel/s11n/DEPENDS
@@ -1,4 +1,4 @@
 depends flex &&
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends expat "" "--without-libexpat" "for expat-based serializers"
diff --git a/devel/s11n/HISTORY b/devel/s11n/HISTORY
index de5b615..06e55f6 100644
--- a/devel/s11n/HISTORY
+++ b/devel/s11n/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-06-13 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: added SOURCE2_IGNORE for signature
 
diff --git a/devel/scatcdsk/DEPENDS b/devel/scatcdsk/DEPENDS
index 175563b..4251501 100755
--- a/devel/scatcdsk/DEPENDS
+++ b/devel/scatcdsk/DEPENDS
@@ -1 +1 @@
-depends ada
+depends -sub ADA gcc
diff --git a/devel/scatcdsk/HISTORY b/devel/scatcdsk/HISTORY
index 71eb4ac..2cf660b 100644
--- a/devel/scatcdsk/HISTORY
+++ b/devel/scatcdsk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
 
diff --git a/devel/spark/BUILD b/devel/spark/BUILD
new file mode 100755
index 0000000..857153a
--- /dev/null
+++ b/devel/spark/BUILD
@@ -0,0 +1,3 @@
+make_single     &&
+make PROLOG=swi &&
+make_normal
diff --git a/devel/spark/DEPENDS b/devel/spark/DEPENDS
new file mode 100755
index 0000000..1bada5b
--- /dev/null
+++ b/devel/spark/DEPENDS
@@ -0,0 +1,2 @@
+depends -sub "ADA ADDRLINE" gcc &&
+depends swiprolog
diff --git a/devel/spark/DETAILS b/devel/spark/DETAILS
new file mode 100755
index 0000000..9daf801
--- /dev/null
+++ b/devel/spark/DETAILS
@@ -0,0 +1,21 @@
+           SPELL=spark
+         VERSION=2010
+          SOURCE="${SPELL}-gpl-${VERSION}-src.tar.gz"
+   
SOURCE_URL[0]=http://www.hawo.stw.uni-erlangen.de/~siflfran/smgl/ada/${SOURCE}
+     
SOURCE_HASH=sha512:6f6ab1a2a7bc1befec45fbb2e8a2e84004d21f41d892750686d7eced4ec536ba39a7196e8dc24c90f9b5f76173d645df89b26a770a4f9f421e6d4adf4858399b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}-src"
+        WEB_SITE="http://libre.adacore.com";
+      LICENSE[0]=GPL
+         ENTERED=20100906
+           SHORT="a formally-defined computer programming language based on 
Ada"
+cat << EOF
+SPARK is a formally-defined computer programming language based on the Ada
+programming language, intended to be secure and to support the development of
+high integrity software used in applications and systems where predictable
+and highly reliable operation is essential either for reasons of safety
+(e.g., avionics in aircraft/spacecraft, or medical systems and process
+control software in nuclear powerplants) or for business integrity (for
+example financial software for banking and insurance companies).
+
+ Description from http://en.wikipedia.org/wiki/SPARK
+EOF
diff --git a/devel/spark/HISTORY b/devel/spark/HISTORY
new file mode 100644
index 0000000..a8daa3a
--- /dev/null
+++ b/devel/spark/HISTORY
@@ -0,0 +1,3 @@
+2010-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * BUILD, DEPENDS, DETAILS, HISTORY, INSTALL, PRE_BUILD,
+         spark-gpl-2010-swi_patches.tgz: spell created
diff --git a/devel/spark/INSTALL b/devel/spark/INSTALL
new file mode 100755
index 0000000..1387768
--- /dev/null
+++ b/devel/spark/INSTALL
@@ -0,0 +1 @@
+install -m755 ${SOURCE_DIRECTORY}/bin/* ${INSTALL_ROOT}/usr/bin
diff --git a/devel/spark/PRE_BUILD b/devel/spark/PRE_BUILD
new file mode 100755
index 0000000..af140a7
--- /dev/null
+++ b/devel/spark/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+tar -xvzf ${SCRIPT_DIRECTORY}/spark-gpl-2010-swi_patches.tgz &&
+for patch in spark-gpl-${VERSION}-swi_patches/*.patch; do
+  patch -p1 < $patch || return 1
+done
diff --git a/devel/spark/spark-gpl-2010-swi_patches.tgz 
b/devel/spark/spark-gpl-2010-swi_patches.tgz
new file mode 100644
index 0000000..4411baf
Binary files /dev/null and b/devel/spark/spark-gpl-2010-swi_patches.tgz differ
diff --git a/devel/swig/DEPENDS b/devel/swig/DEPENDS
index ce6baf0..02d6d6c 100755
--- a/devel/swig/DEPENDS
+++ b/devel/swig/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 optional_depends  tcl                          \
                   "--with-tcl"                 \
diff --git a/devel/swig/HISTORY b/devel/swig/HISTORY
index 8252b07..dcd4408 100644
--- a/devel/swig/HISTORY
+++ b/devel/swig/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-24 Arwed von Merkatz <v.merkatz AT gmx.net>
        * DEPENDS: added optional_depends on pcre, fails
          to build without it otherwise
diff --git a/disk/ddrescue/DEPENDS b/disk/ddrescue/DEPENDS
index bcd1eeb..f148724 100755
--- a/disk/ddrescue/DEPENDS
+++ b/disk/ddrescue/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/disk/ddrescue/HISTORY b/disk/ddrescue/HISTORY
index 1db9070..221bd22 100644
--- a/disk/ddrescue/HISTORY
+++ b/disk/ddrescue/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.14
 
diff --git a/disk/discid/DEPENDS b/disk/discid/DEPENDS
index fd0b0eb..f148724 100755
--- a/disk/discid/DEPENDS
+++ b/disk/discid/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/disk/discid/HISTORY b/disk/discid/HISTORY
index c27fa52..cbffdde 100644
--- a/disk/discid/HISTORY
+++ b/disk/discid/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-04-23 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS: spell created
diff --git a/disk/dvd+rw-tools/DEPENDS b/disk/dvd+rw-tools/DEPENDS
index d5b1dea..4d9db58 100755
--- a/disk/dvd+rw-tools/DEPENDS
+++ b/disk/dvd+rw-tools/DEPENDS
@@ -1,2 +1,2 @@
-depends g++              &&
+depends -sub CXX gcc              &&
 depends CD-BURN-UTILITY
diff --git a/disk/dvd+rw-tools/HISTORY b/disk/dvd+rw-tools/HISTORY
index c0cd389..82c9a97 100644
--- a/disk/dvd+rw-tools/HISTORY
+++ b/disk/dvd+rw-tools/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-06-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS: PATCHLEVEL++
        * BUILD: only build btcflash if cdrtools is not the chosen provider of
diff --git a/disk/gdisk/DEPENDS b/disk/gdisk/DEPENDS
index fd0b0eb..f148724 100755
--- a/disk/gdisk/DEPENDS
+++ b/disk/gdisk/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/disk/gdisk/HISTORY b/disk/gdisk/HISTORY
index 4668461..6b7ca74 100644
--- a/disk/gdisk/HISTORY
+++ b/disk/gdisk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.6.14
 
diff --git a/disk/gparted/DEPENDS b/disk/gparted/DEPENDS
index 2711ee6..aa7b7e7 100755
--- a/disk/gparted/DEPENDS
+++ b/disk/gparted/DEPENDS
@@ -1,4 +1,4 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends xml-parser-expat  &&
 depends parted  &&
 depends udev    &&
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index deb69bf..d73c5cf 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-19 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.9.0
 
diff --git a/disk/libaal/DEPENDS b/disk/libaal/DEPENDS
index fd0b0eb..f148724 100755
--- a/disk/libaal/DEPENDS
+++ b/disk/libaal/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/disk/libaal/HISTORY b/disk/libaal/HISTORY
index ca9dd9c..8e5307e 100644
--- a/disk/libaal/HISTORY
+++ b/disk/libaal/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-29 Justin Boffemmyer <flux AT sourcemage.org>
        * DEPENDS: Added to include dependency on g++
 
diff --git a/disk/partimage-ng/DEPENDS b/disk/partimage-ng/DEPENDS
index dacc9a4..8d86696 100755
--- a/disk/partimage-ng/DEPENDS
+++ b/disk/partimage-ng/DEPENDS
@@ -2,7 +2,7 @@ if [[ $PART_VCS == y ]];then
   depends bzr
 fi &&
 depends cmake           &&
-depends g++             &&
+depends -sub CXX gcc             &&
 depends parted          &&
 depends boost           &&
 depends $PART_NTFS      &&
diff --git a/disk/partimage-ng/HISTORY b/disk/partimage-ng/HISTORY
index 05a87bf..cf29b2a 100644
--- a/disk/partimage-ng/HISTORY
+++ b/disk/partimage-ng/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-25 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Fixed SOURCE_URL[0]
 
diff --git a/disk/partimage/DEPENDS b/disk/partimage/DEPENDS
index f0acbfe..28e79ba 100755
--- a/disk/partimage/DEPENDS
+++ b/disk/partimage/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  newt     &&
 depends  zlib     &&
 depends  bzip2    &&
diff --git a/disk/partimage/HISTORY b/disk/partimage/HISTORY
index 453089f..231e0c0 100644
--- a/disk/partimage/HISTORY
+++ b/disk/partimage/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-11-01 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.6.8
 
diff --git a/disk/qpxtool/DEPENDS b/disk/qpxtool/DEPENDS
index 09289bb..93c02ba 100755
--- a/disk/qpxtool/DEPENDS
+++ b/disk/qpxtool/DEPENDS
@@ -1,2 +1,2 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 optional_depends qt4 "" "" "to build gui"
diff --git a/disk/qpxtool/HISTORY b/disk/qpxtool/HISTORY
index 48492e5..6a7beba 100644
--- a/disk/qpxtool/HISTORY
+++ b/disk/qpxtool/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-09-07 Pol Vinogradov <vin.public AT gmail.com>
        * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: created this spell
 
diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 4fe284e..daf43ce 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -1,6 +1,6 @@
            SPELL=udev
-         VERSION=172
-      PATCHLEVEL=1
+         VERSION=173
+      PATCHLEVEL=0
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sign
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index cb906df..0f83070 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 173
+
 2011-07-17 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: fixed syntax errors
 
diff --git a/display/fbterm/DEPENDS b/display/fbterm/DEPENDS
index 8eadf07..f9f5be2 100755
--- a/display/fbterm/DEPENDS
+++ b/display/fbterm/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends fontconfig &&
 depends freetype2 &&
 
diff --git a/display/fbterm/HISTORY b/display/fbterm/HISTORY
index 166d74a..1648b2a 100644
--- a/display/fbterm/HISTORY
+++ b/display/fbterm/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-15 Justin Boffemmyer <flux AT sourcemage.org>
        * DETAILS: version 1.7
        * PRE_BUILD: removed, patching no longer needed in newer version
diff --git a/doc/aiksaurus/DEPENDS b/doc/aiksaurus/DEPENDS
index c0c5701..19615e1 100755
--- a/doc/aiksaurus/DEPENDS
+++ b/doc/aiksaurus/DEPENDS
@@ -1,3 +1,3 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 
 optional_depends "gtk+2" "--with-gtk" "--without-gtk" "for GTK+ frontend"
diff --git a/doc/aiksaurus/HISTORY b/doc/aiksaurus/HISTORY
index fdfee28..09c215a 100644
--- a/doc/aiksaurus/HISTORY
+++ b/doc/aiksaurus/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-11-10 Robert Figura <template AT sourcemage.org>
        * PRE_BUILD: added patch for gcc 4.3
 
diff --git a/doc/groff/DEPENDS b/doc/groff/DEPENDS
index 90e68be..ef22d34 100755
--- a/doc/groff/DEPENDS
+++ b/doc/groff/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends bison &&
 
 optional_depends POSTSCRIPT-INTERPRETER \
diff --git a/doc/groff/HISTORY b/doc/groff/HISTORY
index a75bcdd..1075df9 100644
--- a/doc/groff/HISTORY
+++ b/doc/groff/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-12-31 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.21
 
diff --git a/doc/opensp/DEPENDS b/doc/opensp/DEPENDS
index 9ade658..cbf4ac5 100755
--- a/doc/opensp/DEPENDS
+++ b/doc/opensp/DEPENDS
@@ -1,4 +1,4 @@
-depends g++            &&
+depends -sub CXX gcc            &&
 depends sgml-common    &&
 optional_depends xmlto "--enable-doc-build"\
                        "--disable-doc-build"\
diff --git a/doc/opensp/HISTORY b/doc/opensp/HISTORY
index fe9ed4d..8bf5df7 100644
--- a/doc/opensp/HISTORY
+++ b/doc/opensp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * INSTALL: use TRACK_ROOT when linking #9163
 
diff --git a/doc/pdftohtml/DEPENDS b/doc/pdftohtml/DEPENDS
index fd0b0eb..f148724 100755
--- a/doc/pdftohtml/DEPENDS
+++ b/doc/pdftohtml/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/doc/pdftohtml/HISTORY b/doc/pdftohtml/HISTORY
index 2c3835b..ee1f847 100644
--- a/doc/pdftohtml/HISTORY
+++ b/doc/pdftohtml/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-01-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.40
        * BUILD: fix bug #13355
diff --git a/doc/pstoedit/DEPENDS b/doc/pstoedit/DEPENDS
index ed10f84..b890498 100755
--- a/doc/pstoedit/DEPENDS
+++ b/doc/pstoedit/DEPENDS
@@ -1,4 +1,4 @@
-depends g++          &&
+depends -sub CXX gcc          &&
 depends pkgconfig    &&
 depends ghostscript  &&
 optional_depends imagemagick     '--with-magick'    \
diff --git a/doc/pstoedit/HISTORY b/doc/pstoedit/HISTORY
index eed1f8a..a1fbcc1 100644
--- a/doc/pstoedit/HISTORY
+++ b/doc/pstoedit/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-08-29 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: updated hash (config & make files updated)
 
diff --git a/doc/source-highlight/DEPENDS b/doc/source-highlight/DEPENDS
index 65357e8..b3684a3 100755
--- a/doc/source-highlight/DEPENDS
+++ b/doc/source-highlight/DEPENDS
@@ -1,4 +1,4 @@
 depends gawk    &&
 depends bison   &&
 depends flex    &&
-depends g++
+depends -sub CXX gcc
diff --git a/doc/source-highlight/HISTORY b/doc/source-highlight/HISTORY
index 366baac..3879ba2 100644
--- a/doc/source-highlight/HISTORY
+++ b/doc/source-highlight/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
        * DETAILS: (automated) Add KEYWORDS
 
diff --git a/doc/wv2/DEPENDS b/doc/wv2/DEPENDS
index 74b5e61..4348462 100755
--- a/doc/wv2/DEPENDS
+++ b/doc/wv2/DEPENDS
@@ -1,6 +1,6 @@
 depends  cmake   &&
 depends  pkgconfig &&
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  libgsf  &&
 depends  zlib    &&
 optional_depends  "libwmf" "" "" "to see embeded images in doc files"
diff --git a/doc/wv2/HISTORY b/doc/wv2/HISTORY
index d4d3c83..dd94070 100644
--- a/doc/wv2/HISTORY
+++ b/doc/wv2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-11-02 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.4.2
 
diff --git a/editors/gle/DEPENDS b/editors/gle/DEPENDS
index 21a3b2e..a8a0338 100755
--- a/editors/gle/DEPENDS
+++ b/editors/gle/DEPENDS
@@ -1,5 +1,5 @@
 depends  boost                 &&
-depends  g++                   &&
+depends -sub CXX gcc                   &&
 depends  pkgconfig             &&
 depends  zlib  '--with-z=yes'  &&
 
diff --git a/editors/gle/HISTORY b/editors/gle/HISTORY
index 1e658d7..85333af 100644
--- a/editors/gle/HISTORY
+++ b/editors/gle/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/editors/ht/DEPENDS b/editors/ht/DEPENDS
index fd0b0eb..f148724 100755
--- a/editors/ht/DEPENDS
+++ b/editors/ht/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/editors/ht/HISTORY b/editors/ht/HISTORY
index 82bb4a1..7b2847b 100644
--- a/editors/ht/HISTORY
+++ b/editors/ht/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-06-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.0.18
 
diff --git a/editors/jed/BUILD b/editors/jed/BUILD
index 34fea9d..319dc59 100755
--- a/editors/jed/BUILD
+++ b/editors/jed/BUILD
@@ -27,7 +27,7 @@ fi
 
 make clean                              &&
 make                                    &&
-make  getmail
+make  getmail &&
 
 if echo ${OPTS} | grep -q "useX"
 then
diff --git a/editors/jed/HISTORY b/editors/jed/HISTORY
index 088dde1..daa9a5d 100644
--- a/editors/jed/HISTORY
+++ b/editors/jed/HISTORY
@@ -1,3 +1,6 @@
+2010-07-31 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+       * BUILD: complete the chain, so we can fail properly
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Switch X11-SERVER to the one and only xorg-server
 
diff --git a/editors/lyx/DEPENDS b/editors/lyx/DEPENDS
index c1839ea..b977bc1 100755
--- a/editors/lyx/DEPENDS
+++ b/editors/lyx/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  libice     &&
 depends  libsm      &&
 depends  libx11     &&
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index dde910a..55de54e 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-14 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 2.0.0. Updated SOURCE_URLs.
 
diff --git a/editors/moe/DEPENDS b/editors/moe/DEPENDS
index 3907479..602b18c 100755
--- a/editors/moe/DEPENDS
+++ b/editors/moe/DEPENDS
@@ -1,2 +1,2 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends ncurses
diff --git a/editors/moe/HISTORY b/editors/moe/HISTORY
index 4a63e6f..9982e65 100644
--- a/editors/moe/HISTORY
+++ b/editors/moe/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-02-24 Sukneet <skipinder AT gmail.com>
        * DETAILS: Fixed SOURCE
          updated spell to 1.3; bug #15602
diff --git a/editors/openoffice/DEPENDS b/editors/openoffice/DEPENDS
index 4f2fded..4737789 100755
--- a/editors/openoffice/DEPENDS
+++ b/editors/openoffice/DEPENDS
@@ -43,7 +43,7 @@ optional_depends JAVA \
 if is_depends_enabled $SPELL $(get_spell_provider $SPELL JAVA); then
    depends  ant "--with-ant-home=${INSTALL_ROOT}/opt/ant/"  &&
 #   depends lucene '--with-system-lucene' &&
-   optional_depends gcj \
+   optional_depends -sub JAVA gcc \
                     '--enable-gcjaot' \
                     '--disable-gcjaot' \
                     'Build with[out] using Ahead of Time java compilation?'
diff --git a/editors/openoffice/HISTORY b/editors/openoffice/HISTORY
index f371ade..423e4f8 100644
--- a/editors/openoffice/HISTORY
+++ b/editors/openoffice/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/editors/scribus4/DEPENDS b/editors/scribus4/DEPENDS
index 925ef6b..e3ec324 100755
--- a/editors/scribus4/DEPENDS
+++ b/editors/scribus4/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  qt4         &&
 depends  cmake       &&
 depends  cairo       &&
diff --git a/editors/scribus4/HISTORY b/editors/scribus4/HISTORY
index 0c84714..7e56e93 100644
--- a/editors/scribus4/HISTORY
+++ b/editors/scribus4/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed optional dependencies on python, cups and libxml2 
to
          mandatory ones, added missing dependency on zlib
diff --git a/editors/translator/DEPENDS b/editors/translator/DEPENDS
index 51344d7..094946d 100755
--- a/editors/translator/DEPENDS
+++ b/editors/translator/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends gtkmm2 &&
 depends gtkspell &&
 depends pkgconfig
diff --git a/editors/translator/HISTORY b/editors/translator/HISTORY
index 7184cf0..e663a2d 100644
--- a/editors/translator/HISTORY
+++ b/editors/translator/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-09-23 Vlad Glagolev <stealth AT sourcemage.org>
        * PRE_BUILD: removed debug output in binary
 
diff --git a/ftp-libs/rb-libtorrent/DEPENDS b/ftp-libs/rb-libtorrent/DEPENDS
index 64b9634..a1c8af2 100755
--- a/ftp-libs/rb-libtorrent/DEPENDS
+++ b/ftp-libs/rb-libtorrent/DEPENDS
@@ -1,5 +1,5 @@
 depends zlib "--with-zlib=system" &&
-depends g++                       &&
+depends -sub CXX gcc                       &&
 depends boost                     &&
 sub_depends boost THREAD          &&
 sub_depends boost FILESYSTEM      &&
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index cbf122a..b3b8d30 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-26 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.15.6
 
diff --git a/ftp/aria2/DEPENDS b/ftp/aria2/DEPENDS
index b15405e..75a7626 100755
--- a/ftp/aria2/DEPENDS
+++ b/ftp/aria2/DEPENDS
@@ -14,5 +14,5 @@ optional_depends ca-certificates                   \
    "--with-ca-bundle='${INSTALL_ROOT}/etc/ssl/certs/ca-certificates.crt'" \
                 ""                                 \
                 "Do you want certificate support?" &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends zlib
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 3a7ec61..33d6f76 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-01 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 1.12.0
 
diff --git a/ftp/lftp/DEPENDS b/ftp/lftp/DEPENDS
index 0f73ba7..494c47b 100755
--- a/ftp/lftp/DEPENDS
+++ b/ftp/lftp/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  readline  '--without-included-readline'  &&
 
 optional_depends  gnutls               \
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 91f8794..84caff6 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-30 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.3.1
 
diff --git a/ftp/linuxdcpp/DEPENDS b/ftp/linuxdcpp/DEPENDS
index 411818d..d57cde0 100755
--- a/ftp/linuxdcpp/DEPENDS
+++ b/ftp/linuxdcpp/DEPENDS
@@ -1,5 +1,5 @@
 depends scons &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends pkgconfig &&
 depends gtk+2 &&
 depends libglade2 &&
diff --git a/ftp/linuxdcpp/HISTORY b/ftp/linuxdcpp/HISTORY
index 70a8232..e45419f 100644
--- a/ftp/linuxdcpp/HISTORY
+++ b/ftp/linuxdcpp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-22 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: added SOURCE2_IGNORE=signature
 
diff --git a/ftp/mldonkey/DEPENDS b/ftp/mldonkey/DEPENDS
index bb97df3..18b7f5c 100755
--- a/ftp/mldonkey/DEPENDS
+++ b/ftp/mldonkey/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++   &&
+depends -sub CXX gcc   &&
 depends  zlib  &&
 depends  m4    &&
 depends  ocaml &&
diff --git a/ftp/mldonkey/HISTORY b/ftp/mldonkey/HISTORY
index 7f9dd40..053b09e 100644
--- a/ftp/mldonkey/HISTORY
+++ b/ftp/mldonkey/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-20 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 3.0.6
 
diff --git a/ftp/wxdfast/DEPENDS b/ftp/wxdfast/DEPENDS
index aa242bd..d83233d 100755
--- a/ftp/wxdfast/DEPENDS
+++ b/ftp/wxdfast/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends wxgtk
diff --git a/ftp/wxdfast/HISTORY b/ftp/wxdfast/HISTORY
index e7ebf0a..90c98b3 100644
--- a/ftp/wxdfast/HISTORY
+++ b/ftp/wxdfast/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-19 Alexander Tsamutali <astsmtl AT gmail.com>
        * DEPENDS, DETAILS, HISTORY: spell created
 
diff --git a/gnome1-libs/gnome-objc/DEPENDS b/gnome1-libs/gnome-objc/DEPENDS
index 4253333..4989f45 100755
--- a/gnome1-libs/gnome-objc/DEPENDS
+++ b/gnome1-libs/gnome-objc/DEPENDS
@@ -1,3 +1,3 @@
-depends  objc        &&
+depends -sub OBJC gcc        &&
 depends  gnome-libs  &&
 depends  orbit
diff --git a/gnome1-libs/gnome-objc/HISTORY b/gnome1-libs/gnome-objc/HISTORY
index d501086..d2074f9 100644
--- a/gnome1-libs/gnome-objc/HISTORY
+++ b/gnome1-libs/gnome-objc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on objc to dependency on gcc with
+         sub-depends on OBJC (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index cd3a0d6..2a20157 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,8 @@
+2001-08-01 George Sherwood <gsherwood AT sourcemage.org>
+       * PRE_BUILD: Added to apply patch
+       * abiword-gcc46.patch: Upstream patch to work with gcc 4.6.x
+         http://bugzilla.abisource.com/show_bug.cgi?id=13066
+
 2011-04-14 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: added a subdependency on a font to fontconfig
 
diff --git a/gnome2-apps/abiword/PRE_BUILD b/gnome2-apps/abiword/PRE_BUILD
new file mode 100755
index 0000000..410429d
--- /dev/null
+++ b/gnome2-apps/abiword/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/abiword-gcc46.patch
diff --git a/gnome2-apps/abiword/abiword-gcc46.patch 
b/gnome2-apps/abiword/abiword-gcc46.patch
new file mode 100644
index 0000000..c4b9e9c
--- /dev/null
+++ b/gnome2-apps/abiword/abiword-gcc46.patch
@@ -0,0 +1,58 @@
+--- src/Makefile.am    2009-09-09 15:11:01.000000000 +0200
++++ src/Makefile.am    2011-05-16 10:12:55.378621418 +0200
+@@ -44,7 +44,7 @@
+ 
+ libabiword_2_8_la_LDFLAGS = \
+       $(DEPS_LIBS) \
+-      --no-undefined \
++      -Wl,--no-undefined \
+       -avoid-version \
+       -export-dynamic
+ 
+@@ -107,7 +107,7 @@
+ 
+ AbiWord_LDFLAGS = \
+       $(DEPS_LIBS) \
+-      --no-undefined \
++      -Wl,--no-undefined \
+       -avoid-version \
+       -export-dynamic \
+       -headerpad_max_install_names 
+@@ -129,7 +129,7 @@
+ 
+ abiword_LDFLAGS = \
+       $(platform_ldflags) \
+-      --no-undefined      \
++      -Wl,--no-undefined      \
+       -avoid-version      \
+       -export-dynamic
+ 
+--- src/Makefile.in    2010-06-13 23:17:56.000000000 +0200
++++ src/Makefile.in    2011-05-16 10:13:35.595224769 +0200
+@@ -503,7 +503,7 @@
+       $(WP_CPPFLAGS) \
+       -DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
+ 
+-libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
++libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined -avoid-version \
+       -export-dynamic $(am__append_6)
+ libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
+       text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
+@@ -538,7 +538,7 @@
+ 
+ @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
+ @TOOLKIT_COCOA_TRUE@  $(DEPS_LIBS) \
+-@TOOLKIT_COCOA_TRUE@  --no-undefined \
++@TOOLKIT_COCOA_TRUE@  -Wl,--no-undefined \
+ @TOOLKIT_COCOA_TRUE@  -avoid-version \
+ @TOOLKIT_COCOA_TRUE@  -export-dynamic \
+ @TOOLKIT_COCOA_TRUE@  -headerpad_max_install_names 
+@@ -554,7 +554,7 @@
+ 
+ @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \
+ @TOOLKIT_COCOA_FALSE@ $(platform_ldflags) \
+-@TOOLKIT_COCOA_FALSE@ --no-undefined      \
++@TOOLKIT_COCOA_FALSE@ -Wl,--no-undefined      \
+ @TOOLKIT_COCOA_FALSE@ -avoid-version      \
+ @TOOLKIT_COCOA_FALSE@ -export-dynamic
+ 
diff --git a/gnome2-apps/pan/DEPENDS b/gnome2-apps/pan/DEPENDS
index 581c855..b657d7c 100755
--- a/gnome2-apps/pan/DEPENDS
+++ b/gnome2-apps/pan/DEPENDS
@@ -4,7 +4,7 @@ if [ "$REL" == "cvs" ]; then
 fi &&
 depends gtk+2   &&
 depends pcre    &&
-depends g++     &&
+depends -sub CXX gcc     &&
 depends -sub "2.4" gmime &&
 
 optional_depends gtkspell                    \
diff --git a/gnome2-apps/pan/HISTORY b/gnome2-apps/pan/HISTORY
index 5590b27..f931472 100644
--- a/gnome2-apps/pan/HISTORY
+++ b/gnome2-apps/pan/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-18 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.135
 
diff --git a/gnome2-apps/workrave/DEPENDS b/gnome2-apps/workrave/DEPENDS
index 8623800..10c8455 100755
--- a/gnome2-apps/workrave/DEPENDS
+++ b/gnome2-apps/workrave/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++            &&
+depends -sub CXX gcc            &&
 depends  gtkmm2         &&
 depends  gnome-panel    &&
 depends  gnet2          &&
diff --git a/gnome2-apps/workrave/HISTORY b/gnome2-apps/workrave/HISTORY
index 6455174..6e1cbd7 100644
--- a/gnome2-apps/workrave/HISTORY
+++ b/gnome2-apps/workrave/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-26 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.9.1
 
diff --git a/gnome2-libs/enchant/DEPENDS b/gnome2-libs/enchant/DEPENDS
index 68ce467..74b4f86 100755
--- a/gnome2-libs/enchant/DEPENDS
+++ b/gnome2-libs/enchant/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends glib2 &&
 
 if [[ $ENCHANT_ZEMBEREK == y ]]; then
diff --git a/gnome2-libs/enchant/HISTORY b/gnome2-libs/enchant/HISTORY
index 52f69e6..a13c622 100644
--- a/gnome2-libs/enchant/HISTORY
+++ b/gnome2-libs/enchant/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.6.0
 
diff --git a/gnome2-libs/glib-java/DEPENDS b/gnome2-libs/glib-java/DEPENDS
index f5212d9..9e37b40 100755
--- a/gnome2-libs/glib-java/DEPENDS
+++ b/gnome2-libs/glib-java/DEPENDS
@@ -2,7 +2,7 @@ depends  JAVA           ''  ''  'z-rejected'     &&
 depends  autoconf                                &&
 depends  automake                                &&
 depends  libtool                                 &&
-depends  gcj                                     &&
+depends -sub JAVA gcc                                     &&
 depends  glib2                                   &&
 
 optional_depends  docbook-utils                  \
diff --git a/gnome2-libs/glib-java/HISTORY b/gnome2-libs/glib-java/HISTORY
index 3d72b66..b35e37c 100644
--- a/gnome2-libs/glib-java/HISTORY
+++ b/gnome2-libs/glib-java/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2007-01-13 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 0.4.2
 
diff --git a/gnome2-libs/guiloader-c++/DEPENDS 
b/gnome2-libs/guiloader-c++/DEPENDS
index 3b3cf76..f45eba6 100755
--- a/gnome2-libs/guiloader-c++/DEPENDS
+++ b/gnome2-libs/guiloader-c++/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++    &&
+depends -sub CXX gcc    &&
 depends  gtk+2  &&
 depends  gtkmm2 &&
 depends  guiloader
diff --git a/gnome2-libs/guiloader-c++/HISTORY 
b/gnome2-libs/guiloader-c++/HISTORY
index 546590d..0b2aa50 100644
--- a/gnome2-libs/guiloader-c++/HISTORY
+++ b/gnome2-libs/guiloader-c++/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-08-23 Pol Vinogradov <vin.public AT gmail.com>
        * DETAILS, DEPENDS: created spell
diff --git a/gnome2-libs/libgconf-java/DEPENDS 
b/gnome2-libs/libgconf-java/DEPENDS
index f82f584..0368f4f 100755
--- a/gnome2-libs/libgconf-java/DEPENDS
+++ b/gnome2-libs/libgconf-java/DEPENDS
@@ -2,7 +2,7 @@ depends  JAVA         ''  ''  'z-rejected'  &&
 depends  autoconf                           &&
 depends  automake                           &&
 depends  libtool                            &&
-depends  gcj                                &&
+depends -sub JAVA gcc                                &&
 depends  glib-java                          &&
 depends  libgtk-java                        &&
 depends  gconf2
diff --git a/gnome2-libs/libgconf-java/HISTORY 
b/gnome2-libs/libgconf-java/HISTORY
index e1b3548..fde05bd 100644
--- a/gnome2-libs/libgconf-java/HISTORY
+++ b/gnome2-libs/libgconf-java/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2007-01-13 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.12.6
 
diff --git a/gnome2-libs/libglade-java/DEPENDS 
b/gnome2-libs/libglade-java/DEPENDS
index 1570d31..1e3acf6 100755
--- a/gnome2-libs/libglade-java/DEPENDS
+++ b/gnome2-libs/libglade-java/DEPENDS
@@ -1,5 +1,5 @@
 depends  JAVA   ''  ''  'z-rejected'  &&
-depends  gcj                          &&
+depends -sub JAVA gcc                          &&
 depends  libglade2                    &&
 depends  glib-java                    &&
 depends  libgtk-java                  &&
diff --git a/gnome2-libs/libglade-java/HISTORY 
b/gnome2-libs/libglade-java/HISTORY
index 320ef10..822b0e2 100644
--- a/gnome2-libs/libglade-java/HISTORY
+++ b/gnome2-libs/libglade-java/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2007-01-13 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.12.8
 
diff --git a/gnome2-libs/libgnome-java/DEPENDS 
b/gnome2-libs/libgnome-java/DEPENDS
index 18caf6e..0877e2e 100755
--- a/gnome2-libs/libgnome-java/DEPENDS
+++ b/gnome2-libs/libgnome-java/DEPENDS
@@ -2,7 +2,7 @@ depends  JAVA           ''  ''  'z-rejected'  &&
 depends  autoconf                             &&
 depends  automake                             &&
 depends  libtool                              &&
-depends  gcj                                  &&
+depends -sub JAVA gcc                                  &&
 depends  glib-java                            &&
 depends  libgtk-java                          &&
 
diff --git a/gnome2-libs/libgnome-java/HISTORY 
b/gnome2-libs/libgnome-java/HISTORY
index 5f2fe99..55160de 100644
--- a/gnome2-libs/libgnome-java/HISTORY
+++ b/gnome2-libs/libgnome-java/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2007-01-13 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.12.7
 
diff --git a/gnome2-libs/libvte-java/DEPENDS b/gnome2-libs/libvte-java/DEPENDS
index 18caf6e..0877e2e 100755
--- a/gnome2-libs/libvte-java/DEPENDS
+++ b/gnome2-libs/libvte-java/DEPENDS
@@ -2,7 +2,7 @@ depends  JAVA           ''  ''  'z-rejected'  &&
 depends  autoconf                             &&
 depends  automake                             &&
 depends  libtool                              &&
-depends  gcj                                  &&
+depends -sub JAVA gcc                                  &&
 depends  glib-java                            &&
 depends  libgtk-java                          &&
 
diff --git a/gnome2-libs/libvte-java/HISTORY b/gnome2-libs/libvte-java/HISTORY
index ce2a44b..5b83266 100644
--- a/gnome2-libs/libvte-java/HISTORY
+++ b/gnome2-libs/libvte-java/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2007-01-13 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 0.12.3
 
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 14e1387..80ccad1 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -6,8 +6,8 @@ depends fontconfig  &&
 depends glib2       &&
 
 optional_depends libx11 \
-                 "--with-x11" \
-                 "--without-x11" \
+                 "--with-x" \
+                 "--without-x" \
                  "for XFT and X11 support" &&
 
 if is_depends_enabled $SPELL libx11; then
@@ -29,11 +29,3 @@ optional_depends gobject-introspection        \
                  "--enable-introspection=yes" \
                  "--enable-introspection=no"  \
                  "to enable introspection"
-
-#
-# For DirectFB support with gtk+-directfb
-#
-#optional_depends xorg-libs \
-#                 "--with-x" \
-#                 "--without-x" \
-#                 "for X library support"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 5d25345..c781dcd 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -4,6 +4,9 @@
 2011-04-05 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.28.4
 
+2011-01-13 Vlad Glagolev <stealth AT sourcemage.org>
+       * {PRE_,}DEPENDS: corrected X11 flags
+
 2010-09-30 Vasil Yonkov <spirtbrat AT sourcemage.org>
        * DETAILS: updated spell to 1.28.3
 
diff --git a/gnome2-libs/pango/SUB_DEPENDS b/gnome2-libs/pango/SUB_DEPENDS
index 058ca27..d14bfb6 100755
--- a/gnome2-libs/pango/SUB_DEPENDS
+++ b/gnome2-libs/pango/SUB_DEPENDS
@@ -1,6 +1,6 @@
 case $THIS_SUB_DEPENDS in
   X) message "Pango with X11 support requested, forcing libx11 dependency" &&
-       depends libx11 "--with-x11" &&
+       depends libx11 "--with-x" &&
        depends libxau &&
        depends libxft &&
        depends libxdmcp &&
diff --git a/gnu/ada/BUILD b/gnu/ada/BUILD
index f632968..27ba77d 100755
--- a/gnu/ada/BUILD
+++ b/gnu/ada/BUILD
@@ -1,44 +1 @@
-# take multilib option from GCC
-# ignore return value as it is only available on x86_64
-persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
-# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
-persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
-persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
-
-# setup bootstrap ada compiler
-ADA_PATH=${SOURCE3/.tar.bz2/}                   &&
-PATH=$SOURCE_DIRECTORY/$ADA_PATH/usr/bin:$PATH  &&
-
-if [[ $CROSS_INSTALL == on ]]; then
-  OPTS="--host=$HOST $OPTS"
-else
-  OPTS="--build=$HOST $OPTS"
-fi  &&
-
-export          CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gnatgcc"             
         &&
-export 
INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.2/include" 
 &&
-export     
LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gnatgcc/$HOST/4.3.2/"         &&
-export     LDFLAGS="-L${LIB_DIR}"
-
-export    LIBRARY_PATH="$LIB_DIR"                             &&
-export LD_LIBRARY_PATH="$LIB_DIR"                             &&
-export   COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin"  &&
-
-export ADA_OBJECTS_PATH="$LIB_DIR/adalib"      &&
-export ADA_INCLUDE_PATH="$LIB_DIR/adainclude"  &&
-
-cd $SOURCE_DIRECTORY.bld                                   &&
-$SOURCE_DIRECTORY/configure                                \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             --program-prefix=gnat                         \
-             --enable-libada                               \
-             --enable-languages="c,ada"                    \
-             $GCC_MULTILIB                                 \
-             $OPTS                                         &&
-
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"  \
-     bootstrap
+true
diff --git a/gnu/ada/DEPENDS b/gnu/ada/DEPENDS
index a1d2c84..4251501 100755
--- a/gnu/ada/DEPENDS
+++ b/gnu/ada/DEPENDS
@@ -1,9 +1 @@
-. $GRIMOIRE/libcompat  &&
-depends  gcc  &&
-if  [[  $VERSION != $(installed_version gcc) ]]; then
-  force_depends  gcc
-fi &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends -sub ADA gcc
diff --git a/gnu/ada/DETAILS b/gnu/ada/DETAILS
index 9205f7f..0aace5e 100755
--- a/gnu/ada/DETAILS
+++ b/gnu/ada/DETAILS
@@ -1,41 +1,12 @@
            SPELL=ada
-         VERSION=4.4.3
-          SOURCE=gcc-core-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
-   SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-         SOURCE2=gcc-$SPELL-$VERSION.tar.gz
-     SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
-  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-if    [[  "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
-         SOURCE3=gnat-4.3.3-i686-pc-linux-gnu.tar.bz2
-elif  [[  "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
-then
-         SOURCE3=gnat-4.3.0-x86_64-pc-linux-gnu.tar.bz2
-else
-         SOURCE3=gnat-4.3.3-i686-pc-linux-gnu.tar.bz2
-fi
-  SOURCE3_URL[0]=http://download.sourcemage.org/distro/$SOURCE3
-     SOURCE3_GPG="gurus.gpg:$SOURCE3.sig:VERIFIED_UPSTREAM_KEY"
-         SOURCE4=$SOURCE3.sig
-  SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
-  SOURCE4_IGNORE=signature
-#upstream signatures
-         SOURCE5=$SOURCE.sig
-  SOURCE5_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE5_IGNORE=signature
-         SOURCE6=$SOURCE2.sig
-  SOURCE6_URL[0]=${SOURCE2_URL[0]}.sig
-  SOURCE6_IGNORE=signature
+         VERSION=4.6.1
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
-         ENTERED=20050213
+         ENTERED=20040704
             DOCS="$DOCS INSTALL"
         KEYWORDS="compiler"
-           SHORT="the GNU Ada Translator"
+           SHORT="the GNU c++ compiler"
 cat << EOF
-The GNU Ada Translator and Ada95 runtime library.
+The GNU C++ compiler and runtime library.
 EOF
+
diff --git a/gnu/ada/FINAL b/gnu/ada/FINAL
deleted file mode 100755
index 907a1a0..0000000
--- a/gnu/ada/FINAL
+++ /dev/null
@@ -1 +0,0 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld
diff --git a/gnu/ada/HISTORY b/gnu/ada/HISTORY
index 3737d8d..eb8bb67 100644
--- a/gnu/ada/HISTORY
+++ b/gnu/ada/HISTORY
@@ -1,8 +1,19 @@
-2010-04-01 Eric Sandall <sandalle AT sourcemage.org>
+2011-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.1
+
+2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.0
+
+2010-08-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.4.3
 
-2010-03-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-       * DETAILS: version 4.4.2
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: do nothing
+       * DEPENDS: sub depend on gcc with ada
+       * DETAILS: no more sources
+       * INSTALL: do nothing
+       * PRE_BUILD: do nothing
+       * FINAL: removed
 
 2009-03-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated Ada i686 bootstrap to 4.3.3
diff --git a/gnu/ada/INSTALL b/gnu/ada/INSTALL
index 32b9891..27ba77d 100755
--- a/gnu/ada/INSTALL
+++ b/gnu/ada/INSTALL
@@ -1,7 +1 @@
-#
-# Bug #10647, also fixed in devel Sorcery
-#
-cd  $SOURCE_DIRECTORY.bld  &&
-
-make -C gcc install lang.install-common lang.install-man  &&
-install -c gcc/gnat1 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/
+true
diff --git a/gnu/ada/PRE_BUILD b/gnu/ada/PRE_BUILD
index 766de30..27ba77d 100755
--- a/gnu/ada/PRE_BUILD
+++ b/gnu/ada/PRE_BUILD
@@ -1,35 +1 @@
-if [ "$(installed_version gcc)" != "$VERSION" ]; then
-  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version 
gcc), not $VERSION!"
-  message "Update gcc first.${DEFAULT_COLOR}"
-  return 1;
-fi
-
-default_pre_build                     &&
-cd $BUILD_DIRECTORY                   &&
-unpack_file 2                         &&
-cd $SOURCE_DIRECTORY                  &&
-mkdir ${SOURCE3/.tar.bz2/}            &&
-cd  ${SOURCE3/.tar.bz2/}              &&
-unpack_file 3                         &&
-mk_source_dir  $SOURCE_DIRECTORY.bld  &&
-
-#
-# This section is used to build a gnat bootstrap cache
-#
-touch  $SOURCE_DIRECTORY/gcc/cstamp-h.in       &&
-touch  $SOURCE_DIRECTORY/gcc/ada/[es]info.h    &&
-touch  $SOURCE_DIRECTORY/gcc/ada/nmake.ad[bs]  &&
-
-#
-# Set the compiler name to gnatgcc
-#
-for file in `find $SOURCE_DIRECTORY/gcc/ada/ -name '*.ad[sb]'`
-do
-  sedit "s:\"gcc\":\"gnatgcc\":g" $file
-done  &&
-
-sedit 's:and Nam is "gnatgcc":and Nam is "gcc":'  \
-       $SOURCE_DIRECTORY/gcc/ada/osint.ads
-#
-# End Ada bootstrap cache code
-#
+true
diff --git a/gnu/fortran/BUILD b/gnu/fortran/BUILD
index 7452bee..27ba77d 100755
--- a/gnu/fortran/BUILD
+++ b/gnu/fortran/BUILD
@@ -1,30 +1 @@
-# take multilib option from GCC
-# ignore return value as it is only available on x86_64
-persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
-# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
-persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
-persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
-
-sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
-
-if [[ $CROSS_INSTALL == on ]]; then
-  OPTS="--host=$HOST $OPTS"
-else
-  OPTS="--build=$HOST $OPTS"
-fi  &&
-
-cd $SOURCE_DIRECTORY.bld                                   &&
-$SOURCE_DIRECTORY/configure                                \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --libdir=${INSTALL_ROOT}/usr/lib              \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             --enable-languages=fortran                    \
-             $GCC_MULTILIB                                 \
-             $OPTS                                         &&
-
-make_single                                                    &&
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-     profiledbootstrap-lean
+true
diff --git a/gnu/fortran/DEPENDS b/gnu/fortran/DEPENDS
index ef57546..f1b3fc8 100755
--- a/gnu/fortran/DEPENDS
+++ b/gnu/fortran/DEPENDS
@@ -1,9 +1 @@
-. $GRIMOIRE/libcompat  &&
-depends  gcc   &&
-if  [[  $VERSION != $(installed_version gcc) ]]; then
-  force_depends  gcc
-fi  &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends -sub FORTRAN gcc
diff --git a/gnu/fortran/DETAILS b/gnu/fortran/DETAILS
index 0587c4e..5168c7e 100755
--- a/gnu/fortran/DETAILS
+++ b/gnu/fortran/DETAILS
@@ -1,23 +1,5 @@
            SPELL=fortran
-         VERSION=4.4.3
-          SOURCE=gcc-core-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
-   SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-         SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
-  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-
-#upstream signatures
-         SOURCE3=$SOURCE.sig
-  SOURCE3_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE3_IGNORE=signature
-         SOURCE4=$SOURCE2.sig
-  SOURCE4_URL[0]=${SOURCE2_URL[0]}.sig
-      SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
-  SOURCE4_IGNORE=signature
-      PATCHLEVEL=1
+         VERSION=4.6.1
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20040705
diff --git a/gnu/fortran/FINAL b/gnu/fortran/FINAL
deleted file mode 100755
index 14a9914..0000000
--- a/gnu/fortran/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld                       &&
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/fortran/HISTORY b/gnu/fortran/HISTORY
index ee5687b..5a14766 100644
--- a/gnu/fortran/HISTORY
+++ b/gnu/fortran/HISTORY
@@ -1,13 +1,22 @@
-2010-04-01 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.3
+2011-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.1
+
+2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.0
 
-2010-01-20 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: PATCHLEVEL++
-       * BUILD: f95 language is deprecated, use fortran
-         configure.in: warning: f95 as language name is deprecated, use 
fortran instead
+2010-08-17 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 4.4.3
 
-2009-12-20 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.2
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: do nothing
+       * DEPENDS: depend on gcc with fortran
+       * DETAILS: no more sources
+       * INSTALL: do nothing
+       * PRE_BUILD: do nothing
+       * POST_REMOVE: removed
+       * POST_RESURRECT: removed
+       * specs_fortran: removed
+       * FINAL: removed
 
 2009-05-29 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Install libraries to $INSTALL_ROOT/usr/lib instead of
@@ -23,9 +32,6 @@
          Build using profiledbootstrap-lean to save disk space during 
compilation
          Thanks to Peng "chp" Chang
 
-2009-04-21 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.0
-
 2009-01-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.3.3
 
diff --git a/gnu/fortran/INSTALL b/gnu/fortran/INSTALL
index 642c9a2..27ba77d 100755
--- a/gnu/fortran/INSTALL
+++ b/gnu/fortran/INSTALL
@@ -1,14 +1 @@
-#
-# Bug #10647, also fixed in devel Sorcery
-#
-cd  $SOURCE_DIRECTORY.bld  &&
-
-make -C gcc lang.install-common lang.install-man  &&
-install -c gcc/f951 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
-sedit 's,lib64,lib,' $HOST/libgfortran/Makefile &&
-make -C $HOST/libgfortran/ install  &&
-
-# specs file stuff
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-mkdir -p $SPECSDIR/specs-local                             &&
-cp $SCRIPT_DIRECTORY/specs_fortran $SPECSDIR/specs-local
+true
diff --git a/gnu/fortran/POST_REMOVE b/gnu/fortran/POST_REMOVE
deleted file mode 100755
index 2ab4140..0000000
--- a/gnu/fortran/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/fortran/POST_RESURRECT b/gnu/fortran/POST_RESURRECT
deleted file mode 100755
index b6c4867..0000000
--- a/gnu/fortran/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
-cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/fortran/PRE_BUILD b/gnu/fortran/PRE_BUILD
index ada199a..27ba77d 100755
--- a/gnu/fortran/PRE_BUILD
+++ b/gnu/fortran/PRE_BUILD
@@ -1,9 +1 @@
-if [ "$(installed_version gcc)" != "$VERSION" ]; then
-  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version 
gcc), not $VERSION!"
-  message "Update gcc first.${DEFAULT_COLOR}"
-  return 1;
-fi
-default_pre_build                &&
-cd $BUILD_DIRECTORY              &&
-unpack_file 2                    &&
-mk_source_dir  $SOURCE_DIRECTORY.bld
+true
diff --git a/gnu/fortran/specs_fortran b/gnu/fortran/specs_fortran
deleted file mode 100644
index 2100d39..0000000
--- a/gnu/fortran/specs_fortran
+++ /dev/null
@@ -1,41 +0,0 @@
-@f77-cpp-input:
-cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) 
%{E|M|MM:%(cpp_debug_options)} %{!M:%{!MM:%{!E: -o %|.f |\n f951 %|.f 
%{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*} -fpreprocessed 
%{!fsyntax-only:%(invoke_as)}}}}
-
-@f95-cpp-input:
-cc1 -E -lang-fortran -traditional-cpp -D_LANGUAGE_FORTRAN %(cpp_options) 
%{E|M|MM:%(cpp_debug_options)} %{!M:%{!MM:%{!E: -o %|.f95 |\n f951 %|.f95 
%(cc1_options) %{J*} %{I*} -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}
-
-@f77:
-%{!E:f951 %i %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*} 
%{!fsyntax-only:%(invoke_as)}}
-
-@f95:
-%{!E:f951 %i %(cc1_options) %{J*} %{I*} %{!fsyntax-only:%(invoke_as)}}
-
-.F:
-@f77-cpp-input
-
-.fpp:
-@f77-cpp-input
-
-.FPP:
-@f77-cpp-input
-
-.F90:
-@f95-cpp-input
-
-.F95:
-@f95-cpp-input
-
-.f:
-@f77
-
-.for:
-@f77
-
-.FOR:
-@f77
-
-.f90:
-@f95
-
-.f95:
-@f95
diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD
index d3f3c30..27ba77d 100755
--- a/gnu/g++/BUILD
+++ b/gnu/g++/BUILD
@@ -1,53 +1 @@
-persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH         &&
-persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH      &&
-
-if [[ $GMP_BUILD_ARCH  != ${SMGL_COMPAT_ARCHS[4]}
-   || $MPFR_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]} ]]; then
-  message "${PROBLEM_COLOR}" 1>&2 &&
-  message "gmp and/or mpfr have been built with a different archspec, 
building g++ now" 1>&2 &&
-  message "would result in a broken compiler" 1>&2 &&
-  message "${DEFAULT_COLOR}" 1>&2
-  return 1
-fi                                                        &&
-
-# take multilib option (and nolib64 option) from GCC
-# ignore return value as they are only available on x86_64
-persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
-persistent_read  gcc  GCC_NOLIB64   GCC_NOLIB64
-# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
-persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
-persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
-
-if  [[  "$ARCHITECTURE"  ==  "pentium4"  ||
-        "$ARCHITECTURE"  ==  "pentium-m"  ]];  then
-  CXXFLAGS=${CXXFLAGS//-ffast-math/}
-fi  &&
-
-if [[ $CROSS_INSTALL == on ]]; then
-  OPTS="--host=$HOST $OPTS"
-else
-  OPTS="--build=$HOST $OPTS"
-fi  &&
-
-sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
-
-if [[ "$GCC_NOLIB64" == 'y' ]]; then
-  # tell gcc (g++) to target binaries to expect the linker in /lib instead 
of /lib64
-  sedit "s/lib64/lib/" gcc/config/i386/t-linux64
-fi                                                         &&
-
-cd $SOURCE_DIRECTORY.bld                                   &&
-# Ignore any installed g++, it could botch up configure!
-CXX=/bin/false $SOURCE_DIRECTORY/configure                 \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             --enable-languages=c++                        \
-             $GCC_MULTILIB                                 \
-             $OPTS                                         &&
-
-make_single                                                    &&
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-     profiledbootstrap-lean
+true
diff --git a/gnu/g++/DEPENDS b/gnu/g++/DEPENDS
index db054db..f148724 100755
--- a/gnu/g++/DEPENDS
+++ b/gnu/g++/DEPENDS
@@ -1,29 +1 @@
-. $GRIMOIRE/libcompat    &&
-
-depends  gcc             &&
-depends  gmp             &&
-depends  gnupg           &&
-depends  mpfr            &&
-depends  smgl-archspecs  &&
-
-if spell_ok gcc; then
-  persistent_read gcc GCC_BUILD_ARCH GCC_BUILD_ARCH || true
-fi  &&
-
-if [[ $VERSION != $(installed_version gcc)
-   || $GCC_BUILD_ARCH  != ${SMGL_COMPAT_ARCHS[4]} ]]; then
-  force_depends  gcc
-fi  &&
-
-if spell_ok gmp; then
-  persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH || true
-fi  &&
-if spell_ok mpfr; then
-  persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH || true
-fi  &&
-
-if [[ $GMP_BUILD_ARCH  != ${SMGL_COMPAT_ARCHS[4]}
-   || $MPFR_BUILD_ARCH != ${SMGL_COMPAT_ARCHS[4]} ]]; then
-  force_depends gmp &&
-  force_depends mpfr
-fi
+depends -sub CXX gcc
diff --git a/gnu/g++/DETAILS b/gnu/g++/DETAILS
index 8646452..cbba3dc 100755
--- a/gnu/g++/DETAILS
+++ b/gnu/g++/DETAILS
@@ -1,22 +1,5 @@
            SPELL=g++
-         VERSION=4.4.3
-          SOURCE=gcc-core-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
-   SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-         SOURCE2=gcc-$SPELL-$VERSION.tar.bz2
-  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-
-#upstream signatures
-         SOURCE3=$SOURCE.sig
-  SOURCE3_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE3_IGNORE=signature
-         SOURCE4=$SOURCE2.sig
-  SOURCE4_URL[0]=${SOURCE2_URL[0]}.sig
-      SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
-  SOURCE4_IGNORE=signature
+         VERSION=4.6.1
       LICENSE[0]=GPL
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20040704
diff --git a/gnu/g++/FINAL b/gnu/g++/FINAL
deleted file mode 100755
index 14a9914..0000000
--- a/gnu/g++/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld                       &&
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index 4b0dcc6..9b66b2a 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,11 +1,15 @@
-2010-04-01 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.3
+2011-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.1
+
+2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.0
 
-2009-12-20 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.2
+2010-08-17 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 4.4.3
 
-2009-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
-       * DEPENDS: don't fail if persistent vars are not available, bug #15476
+2009-09-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: do nothing(again)
+       * DEPENDS: subdepend on gcc with g++(again)
 
 2009-09-06 Remko van der Vossen <wich AT sourcemage.org>
        * BUILD: Stop build if gmp or mpfr were built with a different 
archspec
@@ -15,15 +19,23 @@
        * DEPENDS: force_depends gcc if it was built with a different archspec
          than the current one. Fixes part of bug 15166.
 
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: do nothing
+       * DEPENDS: now sub depends on gcc with g++
+       * DETAILS: no more sources
+       * INSTALL: do nothing
+       * PRE_BUILD: do nothing
+       * POST_REMOVE: removed
+       * POST_RESURRECT: removed
+       * REPAIR^all^POST_REMOVE: removed
+       * specs_g++: removed
+
 2009-05-10 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: profiledbootstrap should not use parallel make
          See http://gcc.gnu.org/install/build.html
          Build using profiledbootstrap-lean to save disk space during 
compilation
          Thanks to Peng "chp" Chang
 
-2009-04-21 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.0
-
 2009-01-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.3.3
 
diff --git a/gnu/g++/INSTALL b/gnu/g++/INSTALL
index 9b93368..27ba77d 100755
--- a/gnu/g++/INSTALL
+++ b/gnu/g++/INSTALL
@@ -1,13 +1 @@
-#
-# Bug #10647, also fixed in devel Sorcery
-#
-cd  $SOURCE_DIRECTORY.bld  &&
-
-make -C gcc lang.install-common lang.install-man  &&
-install -c gcc/cc1plus ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
-make -C $HOST/libstdc++-v3/ install  &&
-
-# specs file stuff
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-mkdir -p $SPECSDIR/specs-local                             &&
-cp $SCRIPT_DIRECTORY/specs_g++ $SPECSDIR/specs-local
+true
diff --git a/gnu/g++/POST_REMOVE b/gnu/g++/POST_REMOVE
deleted file mode 100755
index 7111ff9..0000000
--- a/gnu/g++/POST_REMOVE
+++ /dev/null
@@ -1,3 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
-/bin/true # in case gcc got dispeled and no files can be found in specs-local
diff --git a/gnu/g++/POST_RESURRECT b/gnu/g++/POST_RESURRECT
deleted file mode 100755
index b6c4867..0000000
--- a/gnu/g++/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
-cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/g++/PRE_BUILD b/gnu/g++/PRE_BUILD
index ada199a..27ba77d 100755
--- a/gnu/g++/PRE_BUILD
+++ b/gnu/g++/PRE_BUILD
@@ -1,9 +1 @@
-if [ "$(installed_version gcc)" != "$VERSION" ]; then
-  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version 
gcc), not $VERSION!"
-  message "Update gcc first.${DEFAULT_COLOR}"
-  return 1;
-fi
-default_pre_build                &&
-cd $BUILD_DIRECTORY              &&
-unpack_file 2                    &&
-mk_source_dir  $SOURCE_DIRECTORY.bld
+true
diff --git a/gnu/g++/REPAIR^all^POST_REMOVE b/gnu/g++/REPAIR^all^POST_REMOVE
deleted file mode 100755
index 7111ff9..0000000
--- a/gnu/g++/REPAIR^all^POST_REMOVE
+++ /dev/null
@@ -1,3 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
-/bin/true # in case gcc got dispeled and no files can be found in specs-local
diff --git a/gnu/g++/specs_g++ b/gnu/g++/specs_g++
deleted file mode 100644
index aa09d22..0000000
--- a/gnu/g++/specs_g++
+++ /dev/null
@@ -1,39 +0,0 @@
-@c++-header:
-%{E|M|MM:cc1plus -E -D_GNU_SOURCE %(cpp_options) %2 %(cpp_debug_options)} 
%{!E:%{!M:%{!MM: %{save-temps|no-integrated-cpp:cc1plus -E -D_GNU_SOURCE 
%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n} cc1plus 
%{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} 
%{!save-temps:%g.ii}} 
%{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}} %(cc1_options) 
-D_GNU_SOURCE %2 %{+e1*} -o %g.s %{!o*:--output-pch=%i.gch} 
%W{o*:--output-pch=%*}%V}}}
-
-@c++:
-%{E|M|MM:cc1plus -E -D_GNU_SOURCE %(cpp_options) %2 %(cpp_debug_options)} 
%{!E:%{!M:%{!MM: %{save-temps|no-integrated-cpp:cc1plus -E -D_GNU_SOURCE 
%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n} cc1plus 
%{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} 
%{!save-temps:%g.ii}} 
%{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}} %(cc1_options) 
-D_GNU_SOURCE %2 %{+e1*} %{!fsyntax-only:%(invoke_as)}}}}
-
-@c++-cpp-output:
-%{!M:%{!MM:%{!E: cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*} 
%{!fsyntax-only:%(invoke_as)}}}}
-
-.ii:
-@c++-cpp-output
-
-.cc:
-@c++
-
-.cp:
-@c++
-
-.cxx:
-@c++
-
-.cpp:
-@c++
-
-.c++:
-@c++
-
-.C:
-@c++
-
-.CPP:
-@c++
-
-.H:
-@c++-header
-
-.hh:
-@c++-header
-
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index adf29c2..920604a 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -11,11 +11,9 @@ if [[ $GMP_BUILD_ARCH  != ${SMGL_COMPAT_ARCHS[4]}
 fi                                                        &&
 
 # install gcc libraries to /lib instead of /lib64
-sedit "s/lib64/lib/" gcc/config/i386/linux64.h            &&
-if [[ "$GCC_NOLIB64" == 'y' ]]; then
-  # tell gcc to target binaries to expect the linker in /lib instead of 
/lib64
-  sedit "s/lib64/lib/" gcc/config/i386/t-linux64           
-fi                                                        &&
+sedit "s/lib64/lib/" gcc/config/i386/linux64.h  &&
+# tell gcc to target binaries to expect the linker in /lib instead of /lib64
+sedit "s/lib64/lib/" gcc/config/i386/t-linux64           
 
 if  [[ "$ARCHITECTURE"  ==  "pentium4"  ||
        "$ARCHITECTURE"  ==  "pentium-m"  ]];  then
@@ -24,7 +22,7 @@ if  [[ "$ARCHITECTURE"  ==  "pentium4"  ||
 fi  &&
 
 # fixes seg-fault on libiberty/splay.c in v 4.3.2
-CFLAGS="-O1 $CFLAGS"                                      &&
+CFLAGS="-O1 $CFLAGS"  &&
 
 if [[ $CROSS_INSTALL == on ]]; then
   OPTS="--host=$HOST $OPTS"
@@ -34,19 +32,56 @@ fi  &&
 
 # store CFLAGS and LDFLAGS persistently so they can be read by the other
 # split spells later, see bug #10087
-GCC_CFLAGS="$CFLAGS"                   &&
-GCC_LDFLAGS="$LDFLAGS"                 &&
+GCC_CFLAGS="$CFLAGS"  &&
+GCC_LDFLAGS="$LDFLAGS"  &&
 persistent_add GCC_CFLAGS GCC_LDFLAGS  &&
+# when updating this spell please check if this is still necessary:
+if [[ $GCJ_AWT == y ]]; then
+  CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
+fi  &&
+
+if list_find "$GCC_COMPILER" "ada" ; then
+  # setup bootstrap ada compiler
+  ADA_PATH=${SOURCE13/.tar.bz2/}  &&
+  PATH=$SOURCE_DIRECTORY/$ADA_PATH/usr/bin:$PATH  &&
+
+  if [[  "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
+    export CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gnatgcc"
+  elif [[  "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+    export CC="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin/gcc"
+  fi &&
+  export 
INCLUDE_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/${VERSION13}/include"
  &&
+  export 
LIB_DIR="$SOURCE_DIRECTORY/$ADA_PATH/usr/lib/gcc/$HOST/${VERSION13}/"  &&
+  export LDFLAGS="-L${LIB_DIR}"  &&
+  export LIBRARY_PATH="$LIB_DIR"  &&
+  export LD_LIBRARY_PATH="$LIB_DIR"  &&
+  export COMPILER_PATH="$SOURCE_DIRECTORY/$ADA_PATH/usr/bin"  &&
+
+  export ADA_OBJECTS_PATH="$LIB_DIR/adalib"  &&
+  export ADA_INCLUDE_PATH="$LIB_DIR/adainclude"  &&
+
+  OPTS="--enable-libada $OPTS"
 
-cd $SOURCE_DIRECTORY.bld                                  &&
-$SOURCE_DIRECTORY/configure                                \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             $GCC_MULTILIB $OPTS                          &&
-
-make_single                                                    &&
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-     profiledbootstrap-lean
+fi  &&
+
+OPTS="--without-ppl --without-cloog $OPTS" &&
+
+cd $SOURCE_DIRECTORY.bld                                              &&
+$SOURCE_DIRECTORY/configure                                           \
+             --prefix=${INSTALL_ROOT}/usr                             \
+             --infodir=${INSTALL_ROOT}/usr/share/info                 \
+             --mandir=${INSTALL_ROOT}/usr/share/man                   \
+             --enable-threads=posix                                   \
+             --enable-languages=$(echo ${GCC_COMPILER} | tr " " ",")  \
+             --with-bugurl=http://bugs.sourcemage.org                 \
+             --enable-bootstrap                                       \
+             --enable-checking=release                                \
+             $GCC_MULTILIB $OPTS                                      &&
+
+if [[ "$GCC_TARGET" == "profiledbootstrap" ]] ||
+   [[ "$GCC_TARGET" == "profiledbootstrap-lean" ]] ; then
+  make_single 
+fi  &&
+echo "$MAKE_NJOBS  $JOBS_PER_HOST" &&
+make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $GCC_TARGET &&
+make_normal
diff --git a/gnu/gcc/CONFIGURE b/gnu/gcc/CONFIGURE
index 5544747..81b4a8d 100755
--- a/gnu/gcc/CONFIGURE
+++ b/gnu/gcc/CONFIGURE
@@ -1,2 +1,18 @@
 . $SECTION_DIRECTORY/FUNCTIONS &&
-default_configure_gcc
+default_configure_gcc &&
+
+config_query_list GCC_TARGET "Select what build to use" \
+                              all \
+                              bootstrap \
+                              bootstrap-lean \
+                              profiledbootstrap \
+                              profiledbootstrap-lean    &&
+
+if list_find "$GCC_COMPILER" "java" ; then
+  config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and 
libart_lgpl)?" n
+fi
+
+#if list_find "$GCC_COMPILER" "ada"; then
+#  config_query GCC_ADA_BINDING_GENERATOR "Do you want to patch gcc so 
-fdump-ada-spec is available?" n &&
+#  config_query GCC_ADA_LIBADDRLINE "Do you want to patch gcc so 
libaddr2line is available?" n
+#fi
diff --git a/gnu/gcc/CONFLICTS b/gnu/gcc/CONFLICTS
new file mode 100755
index 0000000..4522282
--- /dev/null
+++ b/gnu/gcc/CONFLICTS
@@ -0,0 +1,5 @@
+conflicts ada y
+conflicts fortran y
+conflicts g++ y
+conflicts gcj y
+conflicts objc y
diff --git a/gnu/gcc/DEPENDS b/gnu/gcc/DEPENDS
index 6e9bcd4..988794f 100755
--- a/gnu/gcc/DEPENDS
+++ b/gnu/gcc/DEPENDS
@@ -1,11 +1,31 @@
 . $GRIMOIRE/libcompat  &&
+if list_find "$GCC_COMPILER" "java" ; then
+  depends  unzip  &&
+  depends  zip  &&
 
+  if [[ $GCJ_AWT == y ]]; then
+    depends  gtk+2 '--enable-java-awt=gtk'  &&
+    depends  libart_lgpl                    &&
+    depends  libxtst
+  fi
+fi &&
 depends  diffutils       &&
 depends  gmp             &&
 depends  gnupg           &&
+depends  libmpc          &&
 depends  mpfr            &&
 depends  smgl-fhs        &&
 depends  smgl-archspecs  &&
+depends  zlib "--with-system-zlib" &&
+
+#optional_depends cloog-ppl \
+#                 "--with-cloog --disable-cloog-version-check" \
+#                 "--without-cloog" \
+#                 "use Graphite high-level memory optimizations?" &&
+#if is_depends_enabled $SPELL cloog-ppl ; then
+#  depends ppl "--with-ppl --enable-cloog-backend=ppl"
+#fi &&
+
 
 optional_depends gettext \
                  "--enable-nls" \
diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 3d08acc..d3b1807 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,19 +1,113 @@
            SPELL=gcc
-         VERSION=4.4.3
+         VERSION=4.6.1
+ BASE_SOURCE_URL="ftp://gcc.gnu.org/gnu/gcc/${SPELL}-${VERSION}";
           SOURCE=gcc-core-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
    SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
+   SOURCE_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
       SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
+
+if list_find "$GCC_COMPILER" "c++" ; then
+         SOURCE3=gcc-g++-$VERSION.tar.bz2
+         SOURCE4=$SOURCE3.sig
+  SOURCE3_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE3
+  SOURCE3_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE3
+  SOURCE4_URL[0]=${SOURCE3_URL[0]}.sig
+     SOURCE3_GPG=gnu.gpg:$SOURCE4:UPSTREAM_KEY
+  SOURCE4_IGNORE=signature
+fi
+if list_find "$GCC_COMPILER" "objc" ; then
+         SOURCE5=gcc-objc-$VERSION.tar.bz2
+         SOURCE6=$SOURCE5.sig
+  SOURCE5_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE5
+  SOURCE5_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE5
+  SOURCE6_URL[0]=${SOURCE5_URL[0]}.sig
+     SOURCE5_GPG=gnu.gpg:$SOURCE6:UPSTREAM_KEY
+  SOURCE6_IGNORE=signature
+fi
+if list_find "$GCC_COMPILER" "ada" ; then
+         SOURCE7=gcc-ada-$VERSION.tar.bz2
+         SOURCE8=$SOURCE7.sig
+  SOURCE7_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE7
+  SOURCE7_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE7
+  SOURCE8_URL[0]=${SOURCE7_URL[0]}.sig
+     SOURCE7_GPG=gnu.gpg:$SOURCE8:UPSTREAM_KEY
+  SOURCE8_IGNORE=signature
+
+# howto generate the ada bootstraper
+# step 1: make a backup of your existing gcc cache you'll lose things like 
libstdc++
+# step 2: modify sorcery CFLAGS to be generic x86_64 only
+# step 3: cast -r gcc -> select c and ada
+# step 4: wait
+# step 5: after it's done copy the generated cache(named 
gcc-$VERSION-$HOST.tar.bz2)
+#         to ada-$VERSION-$HOST.tar.bz2
+# step 7: update version under the right field and test cast gcc with ada 
enabled
+# step 8: cast something ada dependant AND RUN IT
+# step 9: if it all works then upload the cache generated under step 5 
somewhere
+#         bug someone to put it in the right place if you don't have access
+# step 10: restore your old gcc cache and resurrect it
+#
+
+if    [[  "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
+then
+        VERSION13=4.5.2
+         SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2
+elif  [[  "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]
+then
+        VERSION13=4.3.3
+         SOURCE13=ada-$VERSION13-x86_64-pc-linux-gnu.tar.bz2
+else
+        VERSION13=4.5.2
+         SOURCE13=ada-$VERSION13-i686-pc-linux-gnu.tar.bz2
+
+fi
+  SOURCE13_URL[0]=http://download.sourcemage.org/distro/$SOURCE13
+     SOURCE13_GPG="gurus.gpg:$SOURCE13.sig:VERIFIED_UPSTREAM_KEY"
+         SOURCE14=$SOURCE13.sig
+  SOURCE14_URL[0]=${SOURCE13_URL[0]}.sig
+  SOURCE14_IGNORE=signature
+fi
+if list_find "$GCC_COMPILER" "java" ; then
+          SOURCE9=gcc-java-$VERSION.tar.bz2
+         SOURCE10=$SOURCE9.sig
+   SOURCE9_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE9
+   SOURCE9_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE9
+  SOURCE10_URL[0]=${SOURCE9_URL[0]}.sig
+      SOURCE9_GPG=gnu.gpg:$SOURCE10:UPSTREAM_KEY
+  SOURCE10_IGNORE=signature
+# Eclipse compiler for Java (needed since 4.3)
+         SOURCE15=ecj-4.3.jar
+  SOURCE15_URL[0]=ftp://sourceware.org/pub/java/$SOURCE15
+     SOURCE15_GPG=gurus.gpg:$SOURCE15.sig
+fi
+if list_find "$GCC_COMPILER" "fortran" ; then
+         SOURCE11=gcc-fortran-$VERSION.tar.bz2
+         SOURCE12=$SOURCE11.sig
+  SOURCE11_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE11
+  SOURCE11_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE11
+  SOURCE12_URL[0]=${SOURCE11_URL[0]}.sig
+     SOURCE11_GPG=gnu.gpg:$SOURCE12:UPSTREAM_KEY
+  SOURCE12_IGNORE=signature
+fi
+if list_find "$GCC_COMPILER" "go" ; then
+         SOURCE16=gcc-go-$VERSION.tar.bz2
+         SOURCE17=$SOURCE16.sig
+  SOURCE16_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE16
+  SOURCE16_URL[1]=${BASE_SOURCE_URL}-$VERSION/$SOURCE16
+  SOURCE17_URL[0]=${SOURCE16_URL[0]}.sig
+     SOURCE16_GPG=gnu.gpg:$SOURCE17:UPSTREAM_KEY
+  SOURCE17_IGNORE=signature
+fi
       LICENSE[0]=GPL
+           TMPFS=off
         WEB_SITE=http://gcc.gnu.org/
         KEYWORDS="compiler"
          ENTERED=20040420
-           SHORT="the GNU C compiler"
+           SHORT="the GNU C compiler collection"
             DOCS="$DOCS INSTALL"
 cat << EOF
-The GNU C compiler and the core of the GNU compiler collection.
+The entire GNU C Compiler collection.
 EOF
diff --git a/gnu/gcc/EXPORTS b/gnu/gcc/EXPORTS
deleted file mode 100644
index d069ed8..0000000
--- a/gnu/gcc/EXPORTS
+++ /dev/null
@@ -1,5 +0,0 @@
-GCC_CFLAGS
-GCC_LDFLAGS
-GCC_MULTILIB
-GCC_NOLIB64
-GCC_BUILD_ARCH
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 581cc2f..4e20a2e 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,16 +1,105 @@
+2011-07-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * CONFIGURE: should be _list not _multi
+
+2011-07-31 Bor Kraljič <pyrobor AT ver.si>
+       * DETAILS: TMPFS=off for all (1GB is not enough space)
+
+2011-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.1
+       * DEPENDS, BUILD: removed dependency on cloog/ppl since it makes
+         the spell fragile
+
 2011-04-11 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added gettext optional dependency
 
+2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, PREPARE, SUB_DEPENDS, PRE_SUB_DEPENDS: version 4.6.0,
+         added support for the go programming language
+       * BUILD, DEPENDS: added dependency on zlib, moved relevant
+         part of OPTS to DEPENDS
+       * BUILD: added make_normal after make
+       * DETAILS: updated Ada bootstrap compiler to 4.5.2
+       * DEPENDS: added optional dependency on cloog-ppl and ppl
+       * CONFIGURE, PRE_BUILD: commented out patches for gnat since
+         they don't work with gcc 4.6
+
+2010-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.5.2
+
+2010-09-22 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * INSTALL: fixup the cpp and cc symlinks
+
+2010-09-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, CONFIGURE, ada-symbolic-tracebacks.diff,
+         SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^none^PRE_SUB_DEPENDS,
+         REPAIR^none^SUB_DEPENDS: added optional patch to allow
+         for symbolic tracebacks, added a sub depends that activates
+         symbolic tracebacks
+
+2010-09-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, CONFIGURE, txt00120.txt.gz: added optional patch
+         from http://gcc.gnu.org/ml/gcc-patches/2010-04/txt00120.txt
+         to make semi automatic generation of C bindings for Ada
+         available
+       * DETAILS: corrected variable names, switched ada bootstrap compiler
+         to 4.3.3 on ia32
+
+2010-08-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.5.1
+       * DEPENDS: depends libmpc
+       * PRE_BUILD: removed sedit that doesn't apply to gcc 4.5
+       * BUILD: --with-bugurl=http://bugs.sourcemage.org,
+         --enable-bootstrap, --enable-checking=release
+
+2010-08-19 Eric Sandall <sandalle AT sourcemage.org>
+       * DEPENDS: gcj depends on unzip and zip
+
+2010-08-18 Eric Sandall <sandalle AT sourcemage.org>
+       * CONFLICTS: Auto-conflict with ada, fortran, g++, gcj, and objc
+         This will remove the old stand-alone files before the combined gcc
+         installs them.
+
 2010-04-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.4.3
+       * PRE_BUILD: gcc-4.3.0-ffast-math.patch -> gcc-4.4.0-ffast-math.patch
+       * gcc-4.3.0-ffast-math.patch: Updated to GCC 4.4 and renamed to
+         gcc-4.4.0-ffast-math.patch
 
-2009-12-20 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.2
+2009-10-18 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * POST_RESURRECT: removed
 
 2009-10-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DEPENDS: don't fail if mpfr and gmp persistent variables are
          not available, bug #15476
 
+2009-07-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: removed the if about /lib64
+       * PREPARE: no more /lib workaround it's always in /lib
+       * INSTALL: no more specs handling and /lib
+
+2009-07-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: reformatted and added support for x86
+       * PRE_BUILD: reformatted
+
+2009-07-24 Peng Chang (Charles) <chp AT sourcemage.org>
+       * CONFIGURE: query for GCJ_AWT only when java is to be compiled
+       * PRE_BUILD: removed duplicate mk_source_dir $SOURCE_DIRECTORY.bld
+
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: modified for unified gcc
+       * CONFIGURE: modified for unified gcc
+       * DEPENDS: modified for unified gcc
+       * DETAILS: modified for unified gcc, updated the ada stuff
+       * EXPORTS: removed
+       * INSTALL: modified for unified gcc
+       * PREPARE: modified for unified gcc
+       * PRE_BUILD: modified for unified gcc
+       * PRE_SUB_DEPENDS: created, fixed fortran
+       * REPAIR^none^PRE_SUB_DEPENDS: created, fixed fortran
+       * REPAIR^none^SUB_DEPENDS: created, fixed fortran
+       * SUB_DEPENDS: created, fixed fortran
+       * ecj-4.3.jar.sig: added, moved from gcj spell
+
 2009-09-06 Remko van der Vossen <wich AT sourcemage.org>
        * BUILD: Stop build if gmp or mpfr were built with a different 
archspec
          than the current one.
@@ -19,20 +108,12 @@
        * EXPORTS, FINAL, REPAIR^all^EXPORTS: Added export of build arch of
          gcc to force recompile when casting g++ after switching archs.
 
-2009-05-12 Eric Sandall <sandalle AT sourcemage.org>
-       * PRE_BUILD: gcc-4.3.0-ffast-math.patch -> gcc-4.4.0-ffast-math.patch
-       * gcc-4.4.0-ffast-math.patch: Updated to gcc 4.4.0 from
-         gcc-4.3.0-ffast-math.patch
-
 2009-05-10 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: profiledbootstrap should not use parallel make
          See http://gcc.gnu.org/install/build.html
          Build using profiledbootstrap-lean to save disk space during 
compilation
          Thanks to Peng "chp" Chang
 
-2009-04-21 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.0
-
 2009-03-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * PRE_BUILD: removed workaround for
          http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26539, as it's not 
needed
diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index 7ed5d01..1887095 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -6,7 +6,10 @@ cd  $SOURCE_DIRECTORY.bld  &&
 # in some weird cases, this actually fails with multiple jobs
 make_single &&
 make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"  \
-     install-no-fixedincludes  &&
+     install &&
+
+# no symlink to cc
+ln -vsf $INSTALL_ROOT/usr/bin/gcc $INSTALL_ROOT/usr/bin/cc &&
 
 if [[ "$HOST" == x86_64-* ]]; then
   [ -d /lib64 -a ! -f /lib/ld-linux-x86-64.so.2 -a -f 
/lib64/ld-linux-x86-64.so.2 ] &&
@@ -14,19 +17,4 @@ if [[ "$HOST" == x86_64-* ]]; then
   true  # see bug 8626 for info about this conditional
 fi &&
 
-# make some extra symlinks
-ln -sf gcc ${INSTALL_ROOT}/usr/bin/cc     &&
-ln -sf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib            &&
-
-# set up specs file handling
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
-mkdir -p $SPECSDIR/specs-local                                    &&
-cp  gcc/specs  $SPECSDIR/specs-local/specs-gcc                    &&
-if [[ $HOST == x86_64-* && $GCC_NOLIB64 == n ]]
-then
-  # make sure the linker gets compiled in as a /lib64 one
-  sed -i 's#/lib/ld-linux-x86-64.so.2#/lib64/ld-linux-x86-64.so.2#' 
$SPECSDIR/specs-local/specs-gcc
-fi &&
-# make sure installwatch tracks it, the cat alone doesn't do that
-touch  $SPECSDIR/specs                                            &&
-cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
+ln -vsf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib/cpp
diff --git a/gnu/gcc/POST_RESURRECT b/gnu/gcc/POST_RESURRECT
deleted file mode 100755
index b6c4867..0000000
--- a/gnu/gcc/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
-cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/gcc/PREPARE b/gnu/gcc/PREPARE
index 9b4b74b..4fb22ea 100755
--- a/gnu/gcc/PREPARE
+++ b/gnu/gcc/PREPARE
@@ -1,4 +1,27 @@
- if [[ "$HOST" == x86_64-* ]]; then
-   config_query GCC_NOLIB64  "Shall gcc compile binaries to expect the 
dynamic linker in /lib (not /lib64) (lib64 purge part 1 of 2)?"  n
- fi
+message "The following special targets are available for compiler selection:"
+message "default - will build c and c++"
+message "all - will build all compilers"
+. $GRIMOIRE/config_query_multi.function
+config_query_multi GCC_COMPILER "Select the compilers you want to build" \
+                                default \
+                                ada \
+                                c \
+                                c++ \
+                                fortran \
+                                go \
+                                java \
+                                objc \
+                                all &&
+
+list_add GCC_COMPILER c
+if list_find "$GCC_COMPILER" "all" ; then
+  GCC_COMPILER="c c++ ada java fortran objc"
+elif list_find "$GCC_COMPILER" "default" ; then
+  list_add GCC_COMPILER c++
+  list_remove GCC_COMPILER default
+elif list_find "$GCC_COMPILER" "java" ; then
+  if ! list_find "$GCC_COMPILER" "c++" ; then
+    list_add GCC_COMPILER c++
+  fi
+fi
 
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 39cfa77..8e136d6 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -1,5 +1,62 @@
-default_pre_build                     &&
-mk_source_dir  $SOURCE_DIRECTORY.bld  &&
-cd  $SOURCE_DIRECTORY                 &&
+default_pre_build  &&
+if list_find "$GCC_COMPILER" "c++" ; then
+  cd $BUILD_DIRECTORY  &&
+  unpack_file 3
+fi  &&
+if list_find "$GCC_COMPILER" "objc" ; then
+  cd $BUILD_DIRECTORY  &&
+  unpack_file 5
+fi  &&
+if list_find "$GCC_COMPILER" "ada" ; then
+  cd $BUILD_DIRECTORY  &&
+  unpack_file 7
+  cd $SOURCE_DIRECTORY  &&
+
+  mkdir ${SOURCE13/.tar.bz2}  &&
+  cd ${SOURCE13/.tar.bz2}  &&
+  unpack_file 13  &&
+
+  #
+  # This section is used to build a gnat bootstrap cache
+  #
+  touch $SOURCE_DIRECTORY/gcc/cstamp-h.in  &&
+  touch $SOURCE_DIRECTORY/gcc/ada/[es]info.h  &&
+  touch $SOURCE_DIRECTORY/gcc/ada/nmake.ad[bs]  &&
+
+
+  sedit 's:and Nam is "gnatgcc":and Nam is "gcc":'  \
+        $SOURCE_DIRECTORY/gcc/ada/osint.ads &&
+  cd ${SOURCE_DIRECTORY}
+#  if [[ "$GCC_ADA_BINDING_GENERATOR" == "y" ]]; then
+#    zcat ${SCRIPT_DIRECTORY}/txt00120.txt.gz | patch -p0 || return 1
+#  fi &&
+#  if [[ "$GCC_ADA_LIBADDRLINE" == "y" ]]; then
+#    patch -p1 < ${SCRIPT_DIRECTORY}/ada-symbolic-tracebacks.diff || return 1
+#  fi
+  #
+  # End Ada bootstrap cache code
+  #
+fi  &&
+if list_find "$GCC_COMPILER" "java" ; then
+  cd $BUILD_DIRECTORY  &&
+  unpack_file 9  &&
+  verify_file 14  &&
+
+  cp -v $SOURCE_CACHE/$SOURCE14 $SOURCE_DIRECTORY/ecj.jar
+fi  &&
+if list_find "$GCC_COMPILER" "fortran" ; then
+  cd $BUILD_DIRECTORY  &&
+  unpack_file 11
+fi  &&
+if list_find "$GCC_COMPILER" "go" ; then
+  cd $BUILD_DIRECTORY  &&
+  unpack_file 16
+fi  &&
+
+mk_source_dir $SOURCE_DIRECTORY.bld  &&
+cd $SOURCE_DIRECTORY  &&
+
+sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in &&
+sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in &&
 
 patch -p1 < $SPELL_DIRECTORY/gcc-4.4.0-ffast-math.patch
diff --git a/gnu/gcc/PRE_SUB_DEPENDS b/gnu/gcc/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..172005a
--- /dev/null
+++ b/gnu/gcc/PRE_SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+      CXX) list_find "$GCC_COMPILER" c++      ;;
+     JAVA) list_find "$GCC_COMPILER" java     ;;
+     OBJC) list_find "$GCC_COMPILER" objc     ;;
+  FORTRAN) list_find "$GCC_COMPILER" fortran  ;;
+       GO) list_find "$GCC_COMPILER" go       ;;
+      ADA) list_find "$GCC_COMPILER" ada      ;;
+ ADDRLINE) [[ $GCC_ADA_LIBADDRLINE == "y" ]]  ;;
+        *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+   return 1;;
+esac
diff --git a/gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS 
b/gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..36b6eef
--- /dev/null
+++ b/gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,10 @@
+case $THIS_SUB_DEPENDS in
+      CXX) list_find "$GCC_COMPILER" c++      ;;
+     JAVA) list_find "$GCC_COMPILER" java     ;;
+     OBJC) list_find "$GCC_COMPILER" objc     ;;
+  FORTRAN) list_find "$GCC_COMPILER" fortran  ;;
+      ADA) list_find "$GCC_COMPILER" ada      ;;
+ ADDRLINE) [[ $GCC_ADA_LIBADDRLINE == "y" ]]  ;;
+        *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+   return 1;;
+esac
diff --git a/gnu/gcc/REPAIR^none^SUB_DEPENDS b/gnu/gcc/REPAIR^none^SUB_DEPENDS
new file mode 100755
index 0000000..edd1f9e
--- /dev/null
+++ b/gnu/gcc/REPAIR^none^SUB_DEPENDS
@@ -0,0 +1,12 @@
+persistent_add GCC_COMPILER        &&
+persistent_add GCC_ADA_LIBADDRLINE &&
+case $THIS_SUB_DEPENDS in
+      CXX) list_add GCC_COMPILER c++      ;;
+     JAVA) list_add GCC_COMPILER java     ;;
+     OBJC) list_add GCC_COMPILER objc     ;;
+  FORTRAN) list_add GCC_COMPILER fortran  ;;
+      ADA) list_add GCC_COMPILER ada      ;;
+ ADDRLINE) GCC_ADA_LIBADDRLINE=y          ;;
+        *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+   return 1;;
+esac
diff --git a/gnu/gcc/SUB_DEPENDS b/gnu/gcc/SUB_DEPENDS
new file mode 100755
index 0000000..6fda439
--- /dev/null
+++ b/gnu/gcc/SUB_DEPENDS
@@ -0,0 +1,13 @@
+persistent_add GCC_COMPILER        &&
+persistent_add GCC_ADA_LIBADDRLINE &&
+case $THIS_SUB_DEPENDS in
+      CXX) list_add GCC_COMPILER c++      ;;
+     JAVA) list_add GCC_COMPILER java     ;;
+     OBJC) list_add GCC_COMPILER objc     ;;
+  FORTRAN) list_add GCC_COMPILER fortran  ;;
+       GO) list_add GCC_COMPILER go       ;;
+      ADA) list_add GCC_COMPILER ada      ;;
+ ADDRLINE) GCC_ADA_LIBADDRLINE=y          ;;
+        *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+   return 1;;
+esac
diff --git a/gnu/gcc/ada-symbolic-tracebacks.diff 
b/gnu/gcc/ada-symbolic-tracebacks.diff
new file mode 100644
index 0000000..a6e8d60
--- /dev/null
+++ b/gnu/gcc/ada-symbolic-tracebacks.diff
@@ -0,0 +1,313 @@
+--- gcc-4.5.1/gcc/ada/gcc-interface/Makefile.in.orig   2010-09-07 
12:40:41.000000000 +0200
++++ gcc-4.5.1/gcc/ada/gcc-interface/Makefile.in        2010-09-07 
12:44:26.000000000 +0200
+@@ -2233,7 +2233,7 @@
+   a-nucoar.o a-nurear.o i-forbla.o i-forlap.o s-gearop.o
+ 
+ GNATRTL_OBJS = $(GNATRTL_NONTASKING_OBJS) $(GNATRTL_TASKING_OBJS) \
+-  $(GNATRTL_LINEARALGEBRA_OBJS) g-trasym.o memtrack.o
++  $(GNATRTL_LINEARALGEBRA_OBJS) g-trasym.o memtrack.o convert_addresses.o
+ 
+ # Default run time files
+ 
+@@ -2356,7 +2356,6 @@
+       for file in $(RTSDIR)/*.ali; do \
+           $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+       done
+-      -$(INSTALL_DATA) $(RTSDIR)/g-trasym$(objext) 
$(DESTDIR)$(ADA_RTL_OBJ_DIR)
+       -cd $(RTSDIR); for file in *$(arext);do \
+           $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+           $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \
+@@ -2462,7 +2461,7 @@
+               $(GNATRTL_OBJS)
+       $(RM) $(RTSDIR)/libgnat$(arext) $(RTSDIR)/libgnarl$(arext)
+       $(AR_FOR_TARGET) $(AR_FLAGS) $(RTSDIR)/libgnat$(arext) \
+-         $(addprefix $(RTSDIR)/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
++         $(addprefix $(RTSDIR)/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) 
g-trasym.o convert_addresses.o)
+       $(RANLIB_FOR_TARGET) $(RTSDIR)/libgnat$(arext)
+       $(AR_FOR_TARGET) $(AR_FLAGS) $(RTSDIR)/libgnarl$(arext) \
+          $(addprefix $(RTSDIR)/,$(GNATRTL_TASKING_OBJS))
+@@ -2492,6 +2491,7 @@
+               $(TARGET_LIBGCC2_CFLAGS) \
+               -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+               $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
++              g-trasym.o convert_addresses.o \
+               $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+               $(MISCLIB) -lm
+       cd $(RTSDIR); ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
+@@ -2756,6 +2756,7 @@
+ sysdep.o  : sysdep.c
+ raise-gcc.o : raise-gcc.c raise.h
+ raise.o   : raise.c raise.h
++convert_addresses.o : convert_addresses.c
+ vx_stack_info.o : vx_stack_info.c
+ 
+ cio.o     : cio.c
+--- gcc-4.5.1/gcc/ada/adaint.c.orig    2010-09-07 12:46:00.000000000 +0200
++++ gcc-4.5.1/gcc/ada/adaint.c 2010-09-07 12:48:21.000000000 +0200
+@@ -3461,37 +3461,6 @@
+ }
+ #endif
+ 
+-#if defined (IS_CROSS)  \
+-  || (! ((defined (sparc) || defined (i386)) && defined (sun) \
+-      && defined (__SVR4)) \
+-      && ! (defined (linux) && (defined (i386) || defined (__x86_64__))) \
+-      && ! (defined (linux) && defined (__ia64__)) \
+-      && ! (defined (linux) && defined (powerpc)) \
+-      && ! defined (__FreeBSD__) \
+-      && ! defined (__Lynx__) \
+-      && ! defined (__hpux__) \
+-      && ! defined (__APPLE__) \
+-      && ! defined (_AIX) \
+-      && ! (defined (__alpha__)  && defined (__osf__)) \
+-      && ! defined (VMS) \
+-      && ! defined (__MINGW32__) \
+-      && ! (defined (__mips) && defined (__sgi)))
+-
+-/* Dummy function to satisfy g-trasym.o. See the preprocessor conditional
+-   just above for a list of native platforms that provide a non-dummy
+-   version of this procedure in libaddr2line.a.  */
+-
+-void
+-convert_addresses (const char *file_name ATTRIBUTE_UNUSED,
+-                 void *addrs ATTRIBUTE_UNUSED,
+-                 int n_addr ATTRIBUTE_UNUSED,
+-                 void *buf ATTRIBUTE_UNUSED,
+-                 int *len ATTRIBUTE_UNUSED)
+-{
+-  *len = 0;
+-}
+-#endif
+-
+ #if defined (_WIN32)
+ int __gnat_argument_needs_quote = 1;
+ #else
+--- gcc-4.5.1/gcc/ada/g-trasym.adb.orig        2010-09-07 12:49:42.000000000 
+0200
++++ gcc-4.5.1/gcc/ada/g-trasym.adb     2010-09-07 12:52:04.000000000 +0200
+@@ -32,16 +32,16 @@
+ 
------------------------------------------------------------------------------
+ 
+ --  Run-time symbolic traceback support
++--  This file has been modified by Juergen Pfeifer (31-Dec-1999) for
++--  the purpose to support the Ada for Linux Team implementation of
++--  convert_addresses. This implementation has the advantage to run
++--  on the binutils as they are deployed on Linux.
+ 
+ with System.Soft_Links;
+ with Ada.Exceptions.Traceback; use Ada.Exceptions.Traceback;
+ 
+ package body GNAT.Traceback.Symbolic is
+ 
+-   pragma Linker_Options ("-laddr2line");
+-   pragma Linker_Options ("-lbfd");
+-   pragma Linker_Options ("-liberty");
+-
+    package TSL renames System.Soft_Links;
+ 
+    --  To perform the raw addresses to symbolic form translation we rely on 
a
+@@ -80,9 +80,13 @@
+       --  FILENAME. LEN points to an integer which contains the size of the
+       --  BUF buffer at input and the result length at output.
+       --
+-      --  This procedure is provided by libaddr2line on targets that support
+-      --  it. A dummy version is in adaint.c for other targets so that build
+-      --  of shared libraries doesn't generate unresolved symbols.
++      --  This is the ALT Linux specific version adapted to the binutils
++      --  deployed with most Linuxes. These binutils already have an
++      --  addr2line tool that demangles Ada symbolic names, but there are
++      --  version dependant variants for the option names. Therefore our
++      --  implementation spawns a shell script that does normalization of
++      --  the option and then executes addr2line and communicates with it
++      --  through a bidirectional pipe.
+       --
+       --  Note that this procedure is *not* thread-safe.
+ 
+@@ -94,8 +98,9 @@
+         (c_exename : System.Address) return System.Address;
+       pragma Import (C, locate_exec_on_path, "__gnat_locate_exec_on_path");
+ 
+-      Res : String (1 .. 256 * Traceback'Length);
+-      Len : Integer;
++      B_Size : constant Integer := 256 * Traceback'Length;
++      Len    : Integer := B_Size;
++      Res    : String (1 .. B_Size);
+ 
+       use type System.Address;
+ 
+Index: src/gcc/ada/convert_addresses.c
+===================================================================
+--- /dev/null
++++ gcc-4.5.1/gcc/ada/convert_addresses.c
+@@ -0,0 +1,157 @@
++/*
++  Copyright (C) 1999 by Juergen Pfeifer <juergen.pfeifer AT gmx.net>
++  Ada for Linux Team (ALT)
++
++  Permission is hereby granted, free of charge, to any person obtaining a
++  copy of this software and associated documentation files (the
++  "Software"), to deal in the Software without restriction, including
++  without limitation the rights to use, copy, modify, merge, publish,
++  distribute, distribute with modifications, sublicense, and/or sell
++  copies of the Software, and to permit persons to whom the Software is
++  furnished to do so, subject to the following conditions:
++
++  The above copyright notice and this permission notice shall be included
++  in all copies or substantial portions of the Software.
++
++  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++  IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
++  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
++  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
++  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++  Except as contained in this notice, the name(s) of the above copyright
++  holders shall not be used in advertising or otherwise to promote the
++  sale, use or other dealings in this Software without prior written
++  authorization.
++*/
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++#include <signal.h>
++
++#define STDIN_FILENO  0
++#define STDOUT_FILENO 1
++#define MAX_LINE      1024
++
++#define CLOSE1  close(fd1[0]); close(fd1[1])
++#define CLOSE2  close(fd2[0]); close(fd2[1])
++#define RESTSIG sigaction(SIGPIPE,&oact,NULL)
++
++void convert_addresses
++( void* addrs[],
++  int   n_addr,
++  char* buf,
++  int*  len)
++{
++  int max_len = *len;
++  pid_t pid = getpid();
++  pid_t child;
++
++  struct sigaction act, oact;
++
++  int fd1[2], fd2[2];
++  char exe_name[128];
++
++  *buf = 0; *len = 0;
++  /* Thanx to the /proc filesystem we can very easily reference our own
++     executable image:-)*/
++  snprintf(exe_name,sizeof(exe_name),"--exe=/proc/%ld/exe", (long)pid);
++
++  act.sa_handler = SIG_IGN;
++  sigemptyset(&act.sa_mask);
++  act.sa_flags = 0;
++  if (sigaction(SIGPIPE,&act,&oact) < 0)
++    return;
++
++  if (pipe(fd1) >= 0) {
++    if (pipe(fd2)>=0) {
++      if ((child = fork()) < 0) {
++      CLOSE1; CLOSE2; RESTSIG;
++      return;
++      }
++      else {
++      if (0==child) {
++        close(fd1[1]);
++        close(fd2[0]);
++        if (fd1[0] != STDIN_FILENO) {
++          if (dup2(fd1[0],STDIN_FILENO) != STDIN_FILENO) {
++            CLOSE1; CLOSE2;
++          }
++          close(fd1[0]);
++        }
++        if (fd2[1] != STDOUT_FILENO) {
++          if (dup2(fd2[1],STDOUT_FILENO) != STDOUT_FILENO) {
++            CLOSE1; CLOSE2;
++          }
++          close(fd2[1]);
++        }
++        {
++          /* As pointed out by Florian Weimer to me, it is a
++             security threat to call the script with a user defined
++             environment and using the path. That would be Trojans
++             pleasure.  Therefore we use the absolute path to
++             addr2line and an empty environment. That should be
++             safe.
++          */
++          char *const argv[] = { "addr2line",
++                                 exe_name,
++                                 "--demangle=gnat",
++                                 "--functions",
++                                 "--basenames",
++                                 NULL };
++          char *const envp[] = { NULL };
++          if (execve("/usr/bin/addr2line", argv, envp) < 0) {
++            CLOSE1; CLOSE2;
++          }
++        }
++      }
++      else {
++        int i, n;
++        char hex[16];
++        char line[MAX_LINE + 1];
++        char *p;
++        char *s = buf;
++
++        /* Parent context */
++        close(fd1[0]);
++        close(fd2[1]);
++
++        for(i=0; i < n_addr; i++) {
++          snprintf(hex,sizeof(hex),"%p\n",addrs[i]);
++          write(fd1[1],hex,strlen(hex));
++          n = read(fd2[0],line,MAX_LINE);
++          if (n<=0)
++            break;
++          line[n]=0;
++          /* We have approx. 16 additional chars for "%p in " clause.
++             We use this info to prevent a buffer overrun.
++          */
++          if (n + 16 + (*len) > max_len)
++            break;
++          p = strchr(line,'\n');
++          if (p) {
++            if (*(p+1)) {
++              *p = 0;
++              *len += snprintf(s, (max_len - (*len)), "%p in %s at 
%s",addrs[i], line, p+1);
++            }
++            else {
++              *len += snprintf(s, (max_len - (*len)), "%p at %s",addrs[i], 
line);
++            }
++            s = buf + (*len);
++          }
++        }
++        close(fd1[1]);
++        close(fd2[0]);
++      }
++      }
++    }
++    else {
++      CLOSE1;
++    }
++  }
++  RESTSIG;
++}
+--- gcc-4.5.1/gcc/ada/gcc-interface/Makefile.in.orig   2010-09-07 
22:11:06.000000000 +0200
++++ gcc-4.5.1/gcc/ada/gcc-interface/Makefile.in        2010-09-07 
22:12:26.000000000 +0200
+@@ -247,10 +247,10 @@
+ # Both . and srcdir are used, in that order,
+ # so that tm.h and config.h will be found in the compilation
+ # subdirectory rather than in the source directory.
+-INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/config \
++INCLUDES = -iquote -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/config \
+       -I$(srcdir)/../include
+ 
+-ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
++ADA_INCLUDES = -iquote -I. -I$(srcdir)/ada
+ 
+ INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada \
+       -I$(fsrcdir)/../include -I$(fsrcdir)
diff --git a/gnu/gcc/ecj-4.3.jar.sig b/gnu/gcc/ecj-4.3.jar.sig
new file mode 100644
index 0000000..b26563d
Binary files /dev/null and b/gnu/gcc/ecj-4.3.jar.sig differ
diff --git a/gnu/gcc/txt00120.txt.gz b/gnu/gcc/txt00120.txt.gz
new file mode 100644
index 0000000..9921136
Binary files /dev/null and b/gnu/gcc/txt00120.txt.gz differ
diff --git a/gnu/gcj/BUILD b/gnu/gcj/BUILD
index 6dbd7fa..27ba77d 100755
--- a/gnu/gcj/BUILD
+++ b/gnu/gcj/BUILD
@@ -1,35 +1 @@
-# take multilib option from GCC
-# ignore return value as it is only available on x86_64
-persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
-# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
-persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
-persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
-
-# when updating this spell please check if this is still necessary:
-if [[ $GCJ_AWT == y ]]; then
-  CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
-fi &&
-
-if [[ $CROSS_INSTALL == on ]]; then
-  OPTS="--host=$HOST $OPTS"
-else
-  OPTS="--build=$HOST $OPTS"
-fi  &&
-
-sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
-
-cd $SOURCE_DIRECTORY.bld                                   &&
-$SOURCE_DIRECTORY/configure                                \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --libdir=${INSTALL_ROOT}/usr/lib              \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             --enable-languages=java                       \
-             $GCC_MULTILIB                                 \
-             $OPTS                                         &&
-
-make_single                                                    &&
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-     profiledbootstrap-lean
+true
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index a501506..eb7f626 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -1,18 +1 @@
-. $GRIMOIRE/libcompat  &&
-depends  gcc           &&
-
-if [[ $GCJ_AWT == y ]]; then
-  depends  gtk+2 '--enable-java-awt=gtk'  &&
-  depends  libart_lgpl                    &&
-  depends  libxtst
-fi  &&
-
-if [[ $VERSION != $(installed_version gcc) ]]; then
-  force_depends gcc
-fi &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs  &&
-depends  unzip           &&
-depends  zip
+depends -sub JAVA gcc
diff --git a/gnu/gcj/DETAILS b/gnu/gcj/DETAILS
index 98ff7ad..99779d2 100755
--- a/gnu/gcj/DETAILS
+++ b/gnu/gcj/DETAILS
@@ -1,35 +1,5 @@
            SPELL=gcj
-         VERSION=4.4.3
-          SOURCE=gcc-core-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
-   SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-         SOURCE2=gcc-java-$VERSION.tar.bz2
-  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-         SOURCE3=gcc-g++-$VERSION.tar.bz2
-  SOURCE3_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE3_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-
-# upstream signatures
-         SOURCE4=$SOURCE.sig
-  SOURCE4_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE4_IGNORE=signature
-         SOURCE5=$SOURCE2.sig
-  SOURCE5_URL[0]=${SOURCE2_URL[0]}.sig
-      SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
-  SOURCE5_IGNORE=signature
-         SOURCE6=$SOURCE3.sig
-  SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig
-     SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY
-  SOURCE6_IGNORE=signature
-
-# Eclipse compiler for Java (needed since 4.3)
-         SOURCE7=ecj-4.3.jar
-  SOURCE7_URL[0]=ftp://sourceware.org/pub/java/$SOURCE7
-     SOURCE7_GPG=gurus.gpg:$SOURCE7.sig
-
+         VERSION=4.6.1
       LICENSE[0]=GPL
       LICENSE[1]=EPL
         WEB_SITE=http://gcc.gnu.org/java/
diff --git a/gnu/gcj/FINAL b/gnu/gcj/FINAL
deleted file mode 100755
index 14a9914..0000000
--- a/gnu/gcj/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld                       &&
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 4858d2f..82360a2 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,22 +1,38 @@
-2010-04-01 Eric Sandall <sandalle AT sourcemage.org>
+2011-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.1
+
+2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.0
+
+2010-08-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.4.3
 
-2009-12-20 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.2
+2009-09-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: true
 
 2009-08-07 Arjan Bouter <abouter AT sourcemage.org>
        * PROVIDES: added, provides classpath and javac
        * BUILD: use /usr/lib instead of lib64
 
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: do nothing
+       * DEPENDS: sub depend on gcc with java
+       * DETAILS: no more sources
+       * INSTALL: do nothing
+       * PRE_BUILD: do nothing
+       * ecj-4.3.jar.sig: moved to gcc
+       * specs_java: removed
+       * PREPARE: removed
+       * POST_RESURRECT: removed
+       * POST_REMOVE: removed
+       * FINAL: removed
+
 2009-05-10 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: profiledbootstrap should not use parallel make
          See http://gcc.gnu.org/install/build.html
          Build using profiledbootstrap-lean to save disk space during 
compilation
          Thanks to Peng "chp" Chang
 
-2009-04-21 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.0
-
 2009-01-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.3.3
 
diff --git a/gnu/gcj/INSTALL b/gnu/gcj/INSTALL
index f66edaf..27ba77d 100755
--- a/gnu/gcj/INSTALL
+++ b/gnu/gcj/INSTALL
@@ -1,15 +1 @@
-#
-# Bug #10647, also fixed in devel Sorcery
-#
-cd  $SOURCE_DIRECTORY.bld  &&
-
-make_single  &&
-make -C gcc java.install-common java.install-man  &&
-install -c gcc/jc1       ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION  &&
-install -c gcc/jvgenmain ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION  &&
-make -C $HOST/libjava install  &&
-make_normal  &&
-
-# specs file stuff
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-install $SPELL_DIRECTORY/specs_java $SPECSDIR/specs-local
+true
diff --git a/gnu/gcj/POST_REMOVE b/gnu/gcj/POST_REMOVE
deleted file mode 100755
index 2ab4140..0000000
--- a/gnu/gcj/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/gcj/POST_RESURRECT b/gnu/gcj/POST_RESURRECT
deleted file mode 100755
index b6c4867..0000000
--- a/gnu/gcj/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
-cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/gcj/PREPARE b/gnu/gcj/PREPARE
deleted file mode 100755
index 37959d6..0000000
--- a/gnu/gcj/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and 
libart_lgpl)?" n
diff --git a/gnu/gcj/PRE_BUILD b/gnu/gcj/PRE_BUILD
index 63a4b87..27ba77d 100755
--- a/gnu/gcj/PRE_BUILD
+++ b/gnu/gcj/PRE_BUILD
@@ -1,16 +1 @@
-if [[ $(installed_version gcc) != $VERSION ]]; then
-  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version 
gcc), not $VERSION!"
-  message "Update gcc first.${DEFAULT_COLOR}"
-  return 1;
-fi &&
-
-default_pre_build &&
-cd $BUILD_DIRECTORY &&
-
-unpack_file 2 &&
-unpack_file 3 &&
-verify_file 7 &&
-
-cp -v $SOURCE_CACHE/$SOURCE7 $SOURCE_DIRECTORY/ecj.jar &&
-
-mk_source_dir $SOURCE_DIRECTORY.bld
+true
diff --git a/gnu/gcj/ecj-4.3.jar.sig b/gnu/gcj/ecj-4.3.jar.sig
deleted file mode 100644
index b26563d..0000000
Binary files a/gnu/gcj/ecj-4.3.jar.sig and /dev/null differ
diff --git a/gnu/gcj/specs_java b/gnu/gcj/specs_java
deleted file mode 100644
index 4f0dd3d..0000000
--- a/gnu/gcj/specs_java
+++ /dev/null
@@ -1,17 +0,0 @@
-@java:
-%{fjni:%{femit-class-files:%e-fjni and -femit-class-files are incompatible}} 
%{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}} 
%{femit-class-file:%{!fsyntax-only:%e-femit-class-file should used along with 
-fsyntax-only}} %{femit-class-files:%{!fsyntax-only:%e-femit-class-file 
should used along with -fsyntax-only}} %{E:%{e-E is not valid for gcj}} \
-  %{.java|fsaw-java-file:ecj1 %i %{W*} %{w} %{g*} %{fbootclasspath*} 
%{fenable-assertions*} %{fdisable-assertions*} %{fencoding*} 
%{ffilelist-file} %{foutput-class-dir*} %{g*} %{fsource*} 
%{!fsource*:-fsource=1.5} %{ftarget*} 
%{!femit-class-files|!ftarget*:-ftarget=1.5} 
%{!findirect-dispatch:-fzip-dependency %U.zip} %{!fsyntax-only:-fzip-target 
%U.jar}}
-%{.class|.zip|.jar|!fsyntax-only:jc1 %{.java|fsaw-java-file:%U.jar 
-fsource-filename=%i %<ffilelist-file} 
%{.class|.zip|.jar|ffilelist-file|fcompile-resource*:%i} %(jc1) 
%(cc1_options) %{I*} %{!findirect-dispatch:-faux-classpath %U.zip} %{MD:-MD_} 
%{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*} %(invoke_as)}
-
-.java:
-@java
-
-.class:
-@java
-
-.zip:
-@java
-
-.jar:
-@java
-
diff --git a/gnu/ghdl/DEPENDS b/gnu/ghdl/DEPENDS
index 5952923..fd1ef5b 100755
--- a/gnu/ghdl/DEPENDS
+++ b/gnu/ghdl/DEPENDS
@@ -1,3 +1,3 @@
-depends ada                       &&
+depends -sub ADA gcc                       &&
 depends gmp                       &&
 depends mpfr
diff --git a/gnu/ghdl/HISTORY b/gnu/ghdl/HISTORY
index d1af052..45ede34 100644
--- a/gnu/ghdl/HISTORY
+++ b/gnu/ghdl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-03-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: corrected SOURCE_URL[0]
 
diff --git a/gnu/gnat-gpl/DEPENDS b/gnu/gnat-gpl/DEPENDS
index 5952923..fd1ef5b 100755
--- a/gnu/gnat-gpl/DEPENDS
+++ b/gnu/gnat-gpl/DEPENDS
@@ -1,3 +1,3 @@
-depends ada                       &&
+depends -sub ADA gcc                       &&
 depends gmp                       &&
 depends mpfr
diff --git a/gnu/gnat-gpl/HISTORY b/gnu/gnat-gpl/HISTORY
index 7c32c72..39b80be 100644
--- a/gnu/gnat-gpl/HISTORY
+++ b/gnu/gnat-gpl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-03-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
 
diff --git a/gnu/objc/BUILD b/gnu/objc/BUILD
index 60e7c99..27ba77d 100755
--- a/gnu/objc/BUILD
+++ b/gnu/objc/BUILD
@@ -1,29 +1 @@
-# take multilib option from GCC
-# ignore return value as it is only available on x86_64
-persistent_read  gcc  GCC_MULTILIB  GCC_MULTILIB
-# get CFLAGS and LDFLAGS gcc was compiled with, see bug #10087
-persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
-persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
-
-sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
-
-if [[ $CROSS_INSTALL == on ]]; then
-  OPTS="--host=$HOST $OPTS"
-else
-  OPTS="--build=$HOST $OPTS"
-fi  &&
-
-cd $SOURCE_DIRECTORY.bld                                   &&
-$SOURCE_DIRECTORY/configure                                \
-             --prefix=${INSTALL_ROOT}/usr                  \
-             --infodir=${INSTALL_ROOT}/usr/share/info      \
-             --mandir=${INSTALL_ROOT}/usr/share/man        \
-             --enable-threads=posix                        \
-             --with-system-zlib                            \
-             --enable-languages=objc                       \
-             $GCC_MULTILIB                                 \
-             $OPTS                                         &&
-
-make_single                                                    &&
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-     profiledbootstrap-lean
+true
diff --git a/gnu/objc/DEPENDS b/gnu/objc/DEPENDS
index a1d2c84..9cbdc87 100755
--- a/gnu/objc/DEPENDS
+++ b/gnu/objc/DEPENDS
@@ -1,9 +1 @@
-. $GRIMOIRE/libcompat  &&
-depends  gcc  &&
-if  [[  $VERSION != $(installed_version gcc) ]]; then
-  force_depends  gcc
-fi &&
-
-depends  gmp             &&
-depends  mpfr            &&
-depends  smgl-archspecs
+depends -sub OBJC gcc
diff --git a/gnu/objc/DETAILS b/gnu/objc/DETAILS
index 09db6e0..9ad9e5c 100755
--- a/gnu/objc/DETAILS
+++ b/gnu/objc/DETAILS
@@ -1,29 +1,12 @@
            SPELL=objc
-         VERSION=4.4.3
-          SOURCE=gcc-core-$VERSION.tar.bz2
-         SOURCE2=gcc-$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION
-   SOURCE_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE
-   SOURCE_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE
-  SOURCE2_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2
-  SOURCE2_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2
-#upstream signatures
-         SOURCE3=$SOURCE.sig
-  SOURCE3_URL[0]=${SOURCE_URL[0]}.sig
-      SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
-  SOURCE3_IGNORE=signature
-         SOURCE4=$SOURCE2.sig
-  SOURCE4_URL[0]=${SOURCE2_URL[0]}.sig
-      SOURCE2_GPG=gnu.gpg:$SOURCE2.sig:UPSTREAM_KEY
-  SOURCE4_IGNORE=signature
-
+         VERSION=4.6.1
       LICENSE[0]=GPL
-      LICENSE[1]=GPL
         WEB_SITE=http://gcc.gnu.org/
          ENTERED=20040704
             DOCS="$DOCS INSTALL"
         KEYWORDS="compiler"
-           SHORT="the GNU Objective-C compiler"
+           SHORT="the GNU c++ compiler"
 cat << EOF
-The GNU Objective-C compiler and runtime library.
+The GNU C++ compiler and runtime library.
 EOF
+
diff --git a/gnu/objc/FINAL b/gnu/objc/FINAL
deleted file mode 100755
index 14a9914..0000000
--- a/gnu/objc/FINAL
+++ /dev/null
@@ -1,3 +0,0 @@
-rm_source_dir  $SOURCE_DIRECTORY.bld                       &&
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/objc/HISTORY b/gnu/objc/HISTORY
index 676c560..6724d1e 100644
--- a/gnu/objc/HISTORY
+++ b/gnu/objc/HISTORY
@@ -1,8 +1,22 @@
-2010-04-01 Eric Sandall <sandalle AT sourcemage.org>
+2011-07-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.1
+
+2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.0
+
+2010-08-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.4.3
 
-2009-12-20 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.2
+2009-07-23 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: do nothing
+       * DEPENDS: depends on gcc with objc
+       * DETAILS: no more sources
+       * INSTALL: do nothing
+       * PRE_BUILD: do nothing
+       * FINAL: removed
+       * POST_REMOVE: removed
+       * POST_RESURRECT: removed
+       * specs_objc: removed
 
 2009-05-10 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: profiledbootstrap should not use parallel make
@@ -10,9 +24,6 @@
          Build using profiledbootstrap-lean to save disk space during 
compilation
          Thanks to Peng "chp" Chang
 
-2009-04-21 Eric Sandall <sandalle AT sourcemage.org>
-       * DETAILS: Updated to 4.4.0
-
 2009-01-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.3.3
 
diff --git a/gnu/objc/INSTALL b/gnu/objc/INSTALL
index d55d493..27ba77d 100755
--- a/gnu/objc/INSTALL
+++ b/gnu/objc/INSTALL
@@ -1,13 +1 @@
-#
-# Bug #10647, also fixed in devel Sorcery
-#
-cd  $SOURCE_DIRECTORY.bld  &&
-
-make -C gcc lang.install-common lang.install-man  &&
-install -c gcc/cc1obj ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
-make -C $HOST/libobjc/ install  &&
-
-# specs file stuff
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-mkdir -p $SPECSDIR/specs-local                             &&
-cp $SCRIPT_DIRECTORY/specs_objc $SPECSDIR/specs-local
+true
diff --git a/gnu/objc/POST_REMOVE b/gnu/objc/POST_REMOVE
deleted file mode 100755
index 2ab4140..0000000
--- a/gnu/objc/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/objc/POST_RESURRECT b/gnu/objc/POST_RESURRECT
deleted file mode 100755
index b6c4867..0000000
--- a/gnu/objc/POST_RESURRECT
+++ /dev/null
@@ -1,2 +0,0 @@
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION         &&
-cat  $SPECSDIR/specs-local/* > $SPECSDIR/specs
diff --git a/gnu/objc/PRE_BUILD b/gnu/objc/PRE_BUILD
index ada199a..27ba77d 100755
--- a/gnu/objc/PRE_BUILD
+++ b/gnu/objc/PRE_BUILD
@@ -1,9 +1 @@
-if [ "$(installed_version gcc)" != "$VERSION" ]; then
-  message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version 
gcc), not $VERSION!"
-  message "Update gcc first.${DEFAULT_COLOR}"
-  return 1;
-fi
-default_pre_build                &&
-cd $BUILD_DIRECTORY              &&
-unpack_file 2                    &&
-mk_source_dir  $SOURCE_DIRECTORY.bld
+true
diff --git a/gnu/objc/specs_objc b/gnu/objc/specs_objc
deleted file mode 100644
index 4f59a15..0000000
--- a/gnu/objc/specs_objc
+++ /dev/null
@@ -1,15 +0,0 @@
-@objective-c:
-%{E|M|MM:cc1obj -E 
%{traditional|ftraditional|traditional-cpp:-traditional-cpp} %(cpp_options) 
%(cpp_debug_options)} %{!E:%{!M:%{!MM: 
%{traditional|ftraditional|traditional-cpp: %eGNU Objective C no longer 
supports traditional compilation} %{save-temps|no-integrated-cpp:cc1obj -E 
%(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n cc1obj 
-fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) 
%{print-objc-runtime-info} %{gen-decls}} %{!save-temps:%{!no-integrated-cpp: 
cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} 
%{gen-decls}}} %{!fsyntax-only:%(invoke_as)}}}}
-
-@objc-cpp-output:
-%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) 
%{print-objc-runtime-info} %{gen-decls} %{!fsyntax-only:%(invoke_as)}}}}
- 
-@objective-c-header:
-%{E|M|MM:cc1obj -E 
%{traditional|ftraditional|traditional-cpp:-traditional-cpp} %(cpp_options) 
%(cpp_debug_options)} %{!E:%{!M:%{!MM: 
%{traditional|ftraditional|traditional-cpp: %eGNU Objective C no longer 
supports traditional compilation} %{save-temps|no-integrated-cpp:cc1obj -E 
%(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n cc1obj 
-fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls} 
-o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V} 
%{!save-temps:%{!no-integrated-cpp: cc1obj %(cpp_unique_options) 
%(cc1_options) %{print-objc-runtime-info} %{gen-decls} -o %g.s 
%{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}}}
-
-.m:
-@objective-c
-
-.mi:
-@objc-cpp-output
-
diff --git a/gnustep-libs/gnustep-make/DEPENDS 
b/gnustep-libs/gnustep-make/DEPENDS
index ee0ea90..9cbdc87 100755
--- a/gnustep-libs/gnustep-make/DEPENDS
+++ b/gnustep-libs/gnustep-make/DEPENDS
@@ -1 +1 @@
-depends objc
+depends -sub OBJC gcc
diff --git a/gnustep-libs/gnustep-make/HISTORY 
b/gnustep-libs/gnustep-make/HISTORY
index 593bb56..d0df24b 100644
--- a/gnustep-libs/gnustep-make/HISTORY
+++ b/gnustep-libs/gnustep-make/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on objc to dependency on gcc with
+         sub-depends on OBJC (scripted)
+
 2011-05-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.6.0
 
diff --git a/graphics-libs/agg/DEPENDS b/graphics-libs/agg/DEPENDS
index 8f7e739..b7e8395 100755
--- a/graphics-libs/agg/DEPENDS
+++ b/graphics-libs/agg/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends sdl &&
 depends xorg-libs &&
 optional_depends freetype2 \
diff --git a/graphics-libs/agg/HISTORY b/graphics-libs/agg/HISTORY
index 6df8f95..27e86c3 100644
--- a/graphics-libs/agg/HISTORY
+++ b/graphics-libs/agg/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-09-10 Pol Vinogradov <vin.public AT gmail.com>
        * PRE_BUILD, agg-2.5-libtool22_fix-1.patch: added patch for right X
          headers and libs detection
diff --git a/graphics-libs/cegui/DEPENDS b/graphics-libs/cegui/DEPENDS
index 9faeb05..6d051a7 100755
--- a/graphics-libs/cegui/DEPENDS
+++ b/graphics-libs/cegui/DEPENDS
@@ -1,5 +1,5 @@
 depends  freetype2             &&
-depends  g++                   &&
+depends -sub CXX gcc                   &&
 depends  pcre                  &&
 depends  xorg-libs '--with-x'  &&
 
diff --git a/graphics-libs/cegui/HISTORY b/graphics-libs/cegui/HISTORY
index c3ed1a3..8192fc6 100644
--- a/graphics-libs/cegui/HISTORY
+++ b/graphics-libs/cegui/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-24 Robin Cook <rcook AT wyrms.net>
        * DEPENDS: change devil and ogre options from with to enable
 
diff --git a/graphics-libs/cimg/DEPENDS b/graphics-libs/cimg/DEPENDS
index c6c1cc3..7a20f9d 100755
--- a/graphics-libs/cimg/DEPENDS
+++ b/graphics-libs/cimg/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 if [[ "$CIMG_EXAMPLES" == "y" ]]
 then
diff --git a/graphics-libs/cimg/HISTORY b/graphics-libs/cimg/HISTORY
index b67e6e6..6bbcd79 100644
--- a/graphics-libs/cimg/HISTORY
+++ b/graphics-libs/cimg/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-12-26 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.4.6
        * INSTALL: added link /usr/include/CImg.h -> /usr/include/cimg/CImg.h
diff --git a/graphics-libs/etl/DEPENDS b/graphics-libs/etl/DEPENDS
index 9587c99..0599bc6 100755
--- a/graphics-libs/etl/DEPENDS
+++ b/graphics-libs/etl/DEPENDS
@@ -1,2 +1,2 @@
 depends pkgconfig  &&
-depends g++
+depends -sub CXX gcc
diff --git a/graphics-libs/etl/HISTORY b/graphics-libs/etl/HISTORY
index 669071b..3814c99 100644
--- a/graphics-libs/etl/HISTORY
+++ b/graphics-libs/etl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-09-06 Robert Figura <template AT sourcemage.org>
        * DETAILS: upgrade to 0.04.11
 
diff --git a/graphics-libs/flowcanvas/DEPENDS 
b/graphics-libs/flowcanvas/DEPENDS
index 928ff75..e008b6b 100755
--- a/graphics-libs/flowcanvas/DEPENDS
+++ b/graphics-libs/flowcanvas/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++               &&
+depends -sub CXX gcc               &&
 depends  boost             &&
 depends  gtkmm2            &&
 depends  libgnomecanvasmm  &&
diff --git a/graphics-libs/flowcanvas/HISTORY 
b/graphics-libs/flowcanvas/HISTORY
index b92946e..b02a362 100644
--- a/graphics-libs/flowcanvas/HISTORY
+++ b/graphics-libs/flowcanvas/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-07-07 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: Updated to 0.5.0.
        * DEPENDS: Added missing option flags to optional_depends graphviz.
diff --git a/graphics-libs/freeimage/DEPENDS b/graphics-libs/freeimage/DEPENDS
index ec107b1..33d3322 100755
--- a/graphics-libs/freeimage/DEPENDS
+++ b/graphics-libs/freeimage/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends tiff    &&
 depends JPEG    &&
 depends libpng  &&
diff --git a/graphics-libs/freeimage/HISTORY b/graphics-libs/freeimage/HISTORY
index 51a1a2f..e14a52a 100644
--- a/graphics-libs/freeimage/HISTORY
+++ b/graphics-libs/freeimage/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3150
 
diff --git a/graphics-libs/ftgl/DEPENDS b/graphics-libs/ftgl/DEPENDS
index 6240179..38d8618 100755
--- a/graphics-libs/ftgl/DEPENDS
+++ b/graphics-libs/ftgl/DEPENDS
@@ -1,3 +1,3 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  freetype2  &&
 optional_depends  GLUT  ""  ""  "for a demo program"
diff --git a/graphics-libs/ftgl/HISTORY b/graphics-libs/ftgl/HISTORY
index 11e3cd2..7c12b9a 100644
--- a/graphics-libs/ftgl/HISTORY
+++ b/graphics-libs/ftgl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-06-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: Fixed SOURCE_URL[0]
          fixed WEB_SITE
diff --git a/graphics-libs/geglmm/DEPENDS b/graphics-libs/geglmm/DEPENDS
index 9d05294..b2c847f 100755
--- a/graphics-libs/geglmm/DEPENDS
+++ b/graphics-libs/geglmm/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends glibmm &&
 depends gegl
diff --git a/graphics-libs/geglmm/HISTORY b/graphics-libs/geglmm/HISTORY
index 682c643..0e6abf5 100644
--- a/graphics-libs/geglmm/HISTORY
+++ b/graphics-libs/geglmm/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DEPENDS, DETAILS, HISTORY: created this spell
 
diff --git a/graphics-libs/libcaca/DEPENDS b/graphics-libs/libcaca/DEPENDS
index 14e4562..dbc487c 100755
--- a/graphics-libs/libcaca/DEPENDS
+++ b/graphics-libs/libcaca/DEPENDS
@@ -7,6 +7,6 @@ optional_depends libx11 "" "--disable-x11" "Enable X11 
support?"
 optional_depends GLUT "" "" "Enable GLUT support?"                           
      &&
 optional_depends CSHARP "" "--disable-csharp" "Enable C-Sharp bindings?"     
      &&
 optional_depends JAVA "" "--disable-java" "Enable JAVA bindings?"            
      &&
-optional_depends g++  "" "--disable-cxx" "Enable C++ bindings?"              
      &&
+optional_depends -sub CXX gcc  "" "--disable-cxx" "Enable C++ bindings?"     
               &&
 optional_depends RUBY "" "--disable-ruby" "Enable Ruby bindings?"            
      &&
 optional_depends pango "" "" "Enable pango use?"
diff --git a/graphics-libs/libcaca/HISTORY b/graphics-libs/libcaca/HISTORY
index 72f4fe5..e8ff0e3 100644
--- a/graphics-libs/libcaca/HISTORY
+++ b/graphics-libs/libcaca/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: optional_depends on mesalib instead of OPENGL
          nvidia_driver is a provider of OPENGL but doesn't install
diff --git a/graphics-libs/libraw/DEPENDS b/graphics-libs/libraw/DEPENDS
index fd0b0eb..f148724 100755
--- a/graphics-libs/libraw/DEPENDS
+++ b/graphics-libs/libraw/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index 98af787..ee84181 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-05 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.12.2
 
diff --git a/graphics-libs/ogre/DEPENDS b/graphics-libs/ogre/DEPENDS
index bd4ee24..eba2f5c 100755
--- a/graphics-libs/ogre/DEPENDS
+++ b/graphics-libs/ogre/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  freetype2  &&
 depends  libmng     &&
 depends  pkgconfig  &&
diff --git a/graphics-libs/ogre/HISTORY b/graphics-libs/ogre/HISTORY
index 7391985..545e988 100644
--- a/graphics-libs/ogre/HISTORY
+++ b/graphics-libs/ogre/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-23 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 1-7-2
 
diff --git a/graphics-libs/opencv/DEPENDS b/graphics-libs/opencv/DEPENDS
index 681b609..793767b 100755
--- a/graphics-libs/opencv/DEPENDS
+++ b/graphics-libs/opencv/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  pkgconfig  &&
 depends  cmake      &&
 
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index c7c8933..0e8bda8 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-14 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.3.0
 
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index ff2abb2..97e66b4 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends fontconfig &&
 depends poppler-data &&
 
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 19a82e4..5ed1662 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-14 Bor Kraljič <pyrobor AT ver.si>
        * BUILD: added "-lm" to LDFLAGS to avoid ./configure problems
          (http://www.sourcemage.org/issues/15)
diff --git a/graphics-libs/tiff/DEPENDS b/graphics-libs/tiff/DEPENDS
index ed8aea4..dbbfbb4 100755
--- a/graphics-libs/tiff/DEPENDS
+++ b/graphics-libs/tiff/DEPENDS
@@ -20,7 +20,7 @@ optional_depends  libxmu                       \
                   ''                           \
                   'for the X11 XMU extension'  &&
 
-optional_depends  g++                 \
+optional_depends -sub CXX gcc                 \
                   '--enable-cxx'      \
                   '--disable-cxx'     \
                   'for C++ bindings'  &&
diff --git a/graphics-libs/tiff/HISTORY b/graphics-libs/tiff/HISTORY
index a9f349d..b9584ac 100644
--- a/graphics-libs/tiff/HISTORY
+++ b/graphics-libs/tiff/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.9.5
          new source url
diff --git a/graphics-libs/vigra/DEPENDS b/graphics-libs/vigra/DEPENDS
index 4e4f222..a66eddc 100755
--- a/graphics-libs/vigra/DEPENDS
+++ b/graphics-libs/vigra/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 optional_depends  fftw                \
                   "--with-fftw"       \
diff --git a/graphics-libs/vigra/HISTORY b/graphics-libs/vigra/HISTORY
index 8313d1e..6cb400d 100644
--- a/graphics-libs/vigra/HISTORY
+++ b/graphics-libs/vigra/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics-libs/vips/DEPENDS b/graphics-libs/vips/DEPENDS
index 7defd2f..97c3d1d 100755
--- a/graphics-libs/vips/DEPENDS
+++ b/graphics-libs/vips/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++               &&
+depends -sub CXX gcc               &&
 depends  gtk+2             &&
 depends  glib2             &&
 depends  libxml2           &&
diff --git a/graphics-libs/vips/HISTORY b/graphics-libs/vips/HISTORY
index 416155d..678b4a9 100644
--- a/graphics-libs/vips/HISTORY
+++ b/graphics-libs/vips/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-04 Robert Figura <template AT sourcemage.org>
        * DETAILS: Updated to version 7.22.4
 
diff --git a/graphics/djvulibre/DEPENDS b/graphics/djvulibre/DEPENDS
index 6ca2c11..8bbe06c 100755
--- a/graphics/djvulibre/DEPENDS
+++ b/graphics/djvulibre/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 optional_depends  qt-x11                       \
                   "--enable-djview"            \
                   "--disable-djview"           \
diff --git a/graphics/djvulibre/HISTORY b/graphics/djvulibre/HISTORY
index 6295ca3..ff46064 100644
--- a/graphics/djvulibre/HISTORY
+++ b/graphics/djvulibre/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: updated to 3.5.24
        * PRE_BUILD: added, fix for gcc-4.6.0
diff --git a/graphics/enblend/DEPENDS b/graphics/enblend/DEPENDS
index 13a415a..a353126 100755
--- a/graphics/enblend/DEPENDS
+++ b/graphics/enblend/DEPENDS
@@ -2,5 +2,5 @@ depends glew &&
 depends -sub THREAD boost &&
 depends lcms &&
 depends libxmi &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends tiff
diff --git a/graphics/enblend/HISTORY b/graphics/enblend/HISTORY
index a7169b7..5af496d 100644
--- a/graphics/enblend/HISTORY
+++ b/graphics/enblend/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-09-30 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 3.2. Fixed SOURCE_URL[0]
          Updated SOURCE & SOURCE_DIRECTORY
diff --git a/graphics/exact-image/DEPENDS b/graphics/exact-image/DEPENDS
index 7be15cb..eb34b7d 100755
--- a/graphics/exact-image/DEPENDS
+++ b/graphics/exact-image/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 #depends agg  &&
 optional_depends libx11    '--with-x11'      '--without-x11'      '' &&
 optional_depends freetype2 '--with-freetype' '--without-freetype' ''  &&
diff --git a/graphics/exact-image/HISTORY b/graphics/exact-image/HISTORY
index 1450d19..1bfc63a 100644
--- a/graphics/exact-image/HISTORY
+++ b/graphics/exact-image/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/exiv2/DEPENDS b/graphics/exiv2/DEPENDS
index 89658ed..49b7831 100755
--- a/graphics/exiv2/DEPENDS
+++ b/graphics/exiv2/DEPENDS
@@ -1,3 +1,3 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 optional_depends expat '' '' 'XMP tag support'
 
diff --git a/graphics/exiv2/HISTORY b/graphics/exiv2/HISTORY
index c906f7b..9749d70 100644
--- a/graphics/exiv2/HISTORY
+++ b/graphics/exiv2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-15 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.21.1
 
diff --git a/graphics/fotoxx/DEPENDS b/graphics/fotoxx/DEPENDS
index 568729f..bb3c2b9 100755
--- a/graphics/fotoxx/DEPENDS
+++ b/graphics/fotoxx/DEPENDS
@@ -1,5 +1,5 @@
 depends gtk+2 &&
-depends g++   &&
+depends -sub CXX gcc   &&
 depends exiv2 &&
 depends tiff  &&
 depends ufraw &&
diff --git a/graphics/fotoxx/HISTORY b/graphics/fotoxx/HISTORY
index f50bde4..4164a48 100644
--- a/graphics/fotoxx/HISTORY
+++ b/graphics/fotoxx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-07 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 10.12.1
 
diff --git a/graphics/graphicsmagick/DEPENDS b/graphics/graphicsmagick/DEPENDS
index 408abd0..47971ab 100755
--- a/graphics/graphicsmagick/DEPENDS
+++ b/graphics/graphicsmagick/DEPENDS
@@ -6,7 +6,7 @@ optional_depends  bzip2                \
                   "--without-bzlib"    \
                   "for BZLIB support"  &&
 
-optional_depends  g++                           \
+optional_depends -sub CXX gcc                           \
                   "--with-magick-plus-plus"     \
                   "--without-magick-plus-plus"  \
                   "to build Magick++"           &&
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index 68361ca..55e29b9 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index 3c875ca..800d498 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -9,7 +9,7 @@ if [[ "$IMAGEMAGICK_X" == "y" ]]; then
    depends libsm
 fi &&
 
-optional_depends  'g++' \
+optional_depends  -sub CXX gcc \
                   '--with-magick-plus-plus' \
                   '--without-magick-plus-plus' \
                   'for C++ API' &&
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index d14b193..9310b88 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed optional dependency on g++ to gcc with
+         sub-depends on CXX
+
 2011-07-16 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 6.7.1-0
 
diff --git a/graphics/inkscape/DEPENDS b/graphics/inkscape/DEPENDS
index 26a8dc1..6fa5363 100755
--- a/graphics/inkscape/DEPENDS
+++ b/graphics/inkscape/DEPENDS
@@ -1,7 +1,7 @@
 # A kind of bug: inkscape's text font selection freaks out unless this font 
is present.
 # Valid as of 0.48.1, also see 
https://bugs.launchpad.net/inkscape/+bug/273961 .
 depends ttf-bitstream-vera &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends gsl &&
 depends boost &&
 depends gtkmm2 &&
diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY
index c1a6c54..9824ecb 100644
--- a/graphics/inkscape/HISTORY
+++ b/graphics/inkscape/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-09 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.48.2
 
diff --git a/graphics/ocrad/DEPENDS b/graphics/ocrad/DEPENDS
index edf4617..18cdab9 100755
--- a/graphics/ocrad/DEPENDS
+++ b/graphics/ocrad/DEPENDS
@@ -1,3 +1,3 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends texinfo
 
diff --git a/graphics/ocrad/HISTORY b/graphics/ocrad/HISTORY
index a96db53..441bbf6 100644
--- a/graphics/ocrad/HISTORY
+++ b/graphics/ocrad/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-07-03 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.17
 
diff --git a/graphics/openvrml/DEPENDS b/graphics/openvrml/DEPENDS
index 072fe51..8ab2a04 100755
--- a/graphics/openvrml/DEPENDS
+++ b/graphics/openvrml/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  boost   &&
 depends  sdl     &&
 depends  zlib    &&
diff --git a/graphics/openvrml/HISTORY b/graphics/openvrml/HISTORY
index 92bb3a2..d7b4de0 100644
--- a/graphics/openvrml/HISTORY
+++ b/graphics/openvrml/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/plotutils/DEPENDS b/graphics/plotutils/DEPENDS
index 67c1c3a..c9ac1f6 100755
--- a/graphics/plotutils/DEPENDS
+++ b/graphics/plotutils/DEPENDS
@@ -1 +1 @@
-depends g++  
+depends -sub CXX gcc  
diff --git a/graphics/plotutils/HISTORY b/graphics/plotutils/HISTORY
index e43b7f8..808b624 100644
--- a/graphics/plotutils/HISTORY
+++ b/graphics/plotutils/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-04-02 Mathieu Lonjaret <lejatorn AT sourcemage.org>
        * CONFIGURE, BUILD: add libplotter choice
 
diff --git a/graphics/synfig/DEPENDS b/graphics/synfig/DEPENDS
index 1a95b3b..341b1bc 100755
--- a/graphics/synfig/DEPENDS
+++ b/graphics/synfig/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  etl         &&
 depends  libxml++    &&
 depends  libsigc++3  &&
diff --git a/graphics/synfig/HISTORY b/graphics/synfig/HISTORY
index d0c3834..575eae2 100644
--- a/graphics/synfig/HISTORY
+++ b/graphics/synfig/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/synfigstudio/DEPENDS b/graphics/synfigstudio/DEPENDS
index 73b300c..04694cc 100755
--- a/graphics/synfigstudio/DEPENDS
+++ b/graphics/synfigstudio/DEPENDS
@@ -1,4 +1,4 @@
 depends pkgconfig  &&
-depends g++        &&
+depends -sub CXX gcc        &&
 depends gtkmm2     &&
 depends synfig
diff --git a/graphics/synfigstudio/HISTORY b/graphics/synfigstudio/HISTORY
index f8a1968..81d2faa 100644
--- a/graphics/synfigstudio/HISTORY
+++ b/graphics/synfigstudio/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-09-06 Robert Figura <template AT sourcemage.org>
        * DETAILS: upgrade to 0.61.08, removed signature, added SOURCE_HASH
        * PRE_BUILD: removed PRE_BUILD and patch
diff --git a/graphics/tesseract/DEPENDS b/graphics/tesseract/DEPENDS
index afb5708..33c62d3 100755
--- a/graphics/tesseract/DEPENDS
+++ b/graphics/tesseract/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends JPEG   &&
 depends tiff
 
diff --git a/graphics/tesseract/HISTORY b/graphics/tesseract/HISTORY
index c828916..75e2a35 100644
--- a/graphics/tesseract/HISTORY
+++ b/graphics/tesseract/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/xaralx/DEPENDS b/graphics/xaralx/DEPENDS
index 81c00c0..3d31f70 100755
--- a/graphics/xaralx/DEPENDS
+++ b/graphics/xaralx/DEPENDS
@@ -1,4 +1,4 @@
-depends g++       &&
+depends -sub CXX gcc       &&
 depends WXWIDGET  &&
 depends gettext   &&
 depends libtool   &&
diff --git a/graphics/xaralx/HISTORY b/graphics/xaralx/HISTORY
index f7d1ed6..9f6e303 100644
--- a/graphics/xaralx/HISTORY
+++ b/graphics/xaralx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/graphics/yafray/DEPENDS b/graphics/yafray/DEPENDS
index 1b5366b..083cff9 100755
--- a/graphics/yafray/DEPENDS
+++ b/graphics/yafray/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends scons &&
 depends zlib &&
 depends JPEG &&
diff --git a/graphics/yafray/HISTORY b/graphics/yafray/HISTORY
index bdd1677..8c1e909 100644
--- a/graphics/yafray/HISTORY
+++ b/graphics/yafray/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/ham/hamlib/DEPENDS b/ham/hamlib/DEPENDS
index 52e32ff..eb1fe55 100755
--- a/ham/hamlib/DEPENDS
+++ b/ham/hamlib/DEPENDS
@@ -2,6 +2,6 @@ depends libxml2 &&
 
 optional_depends perl --with-perl-binding --without-perl-binding "for perl 
bindings" &&
 optional_depends python --with-python-binding --without-python-binding "for 
python bindings" &&
-optional_depends g++ --with-cxx-binding --without-cxx-binding "for c++ 
bindings and demo" &&
+optional_depends -sub CXX gcc --with-cxx-binding --without-cxx-binding "for 
c++ bindings and demo" &&
 optional_depends tcl --with-tcl-binding --without-tcl-binding "for tcl 
bindings and demo" &&
 optional_depends gd --with-rigmatrix --without-rigmatrix "for the rigmatrix 
tool"
diff --git a/ham/hamlib/HISTORY b/ham/hamlib/HISTORY
index 7a98188..a347bf3 100644
--- a/ham/hamlib/HISTORY
+++ b/ham/hamlib/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-24 Tommy Boatman <tboatman AT sourcemage.org>
        * DETAILS: version 1.2.10
 
diff --git a/http/amaya/DEPENDS b/http/amaya/DEPENDS
index 5bdc2e1..205518d 100755
--- a/http/amaya/DEPENDS
+++ b/http/amaya/DEPENDS
@@ -1,7 +1,7 @@
 depends  JPEG    &&
 depends  libpng  &&
 depends  tiff    &&
-depends  g++     &&
+depends -sub CXX gcc     &&
 
 # TODO figure out where --with-mesa goes if it improves anything
 case "$AMAYA_TOOLKIT" in
diff --git a/http/amaya/HISTORY b/http/amaya/HISTORY
index e000040..daf1e58 100644
--- a/http/amaya/HISTORY
+++ b/http/amaya/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/http/bfilter/DEPENDS b/http/bfilter/DEPENDS
index 570882b..588efc7 100755
--- a/http/bfilter/DEPENDS
+++ b/http/bfilter/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends ace &&
 depends libsigc++3 &&
 depends zlib &&
diff --git a/http/bfilter/HISTORY b/http/bfilter/HISTORY
index a804207..6521c06 100644
--- a/http/bfilter/HISTORY
+++ b/http/bfilter/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-11-11 <dinolinux AT gmail.com>
        * DEPENDS: updated to use gtkmm2 instead of gtkmm #12653
 
diff --git a/http/dansguardian/DEPENDS b/http/dansguardian/DEPENDS
index 2ae8508..a22cfe9 100755
--- a/http/dansguardian/DEPENDS
+++ b/http/dansguardian/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends zlib &&
 
 optional_depends perl '' '' 'for CGI script'    &&
diff --git a/http/dansguardian/HISTORY b/http/dansguardian/HISTORY
index 88d726e..c46265b 100644
--- a/http/dansguardian/HISTORY
+++ b/http/dansguardian/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-02-26 Mark Bainter <mbainter AT sourcemage.org>
        * CONFIGURE: Fixed 32bit arch detection
 
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 1f90fe5..b38a77f 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,6 +1,6 @@
 depends  atk                               &&
 depends  curl                              &&
-depends  g++                               &&
+depends -sub CXX gcc                               &&
 depends  glib2                             &&
 depends  JPEG                              &&
 depends  pango                             &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 3dccce5..861acfc 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-08 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated devel to version 4.0.1
 
diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index bd15522..f70ff89 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -1,7 +1,7 @@
 depends  -sub "THREAD DATE_TIME"  boost     &&
 depends  curl                               &&
 depends  fontconfig                         &&
-depends  g++                                &&
+depends -sub CXX gcc                                &&
 depends  JPEG                               &&
 depends  libpng                             &&
 depends  libxml2                            &&
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 560cd6c..a4494a0 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-19 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.8.9
 
diff --git a/http/icecat/DEPENDS b/http/icecat/DEPENDS
index 3e3c87b..333e667 100755
--- a/http/icecat/DEPENDS
+++ b/http/icecat/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++                   &&
+depends -sub CXX gcc                   &&
 depends  zip                   &&
 depends  glib2                 &&
 depends  xorg-libs  "--with-x"  &&
diff --git a/http/icecat/HISTORY b/http/icecat/HISTORY
index 8773515..a48f8cf 100644
--- a/http/icecat/HISTORY
+++ b/http/icecat/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
        * icecat.desktop: added generic name
 
diff --git a/http/javascriptcore/DEPENDS b/http/javascriptcore/DEPENDS
index 01aed86..a351827 100755
--- a/http/javascriptcore/DEPENDS
+++ b/http/javascriptcore/DEPENDS
@@ -2,7 +2,7 @@ depends pkgconfig  &&
 if [[ $JSC_SCM == y ]]; then
 depends subversion
 fi                 &&
-depends g++        &&
+depends -sub CXX gcc        &&
 depends bison      &&
 depends libtool    &&
 depends glib2
diff --git a/http/javascriptcore/HISTORY b/http/javascriptcore/HISTORY
index b1bec95..dfdd0fe 100644
--- a/http/javascriptcore/HISTORY
+++ b/http/javascriptcore/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-04-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PREPARE: added for svn support
        * DETAILS: svn and release
diff --git a/http/kazehakase/DEPENDS b/http/kazehakase/DEPENDS
index b7b2d8b..d7bf201 100755
--- a/http/kazehakase/DEPENDS
+++ b/http/kazehakase/DEPENDS
@@ -1,4 +1,4 @@
-depends g++                                                &&
+depends -sub CXX gcc                                                &&
 depends gtk+2                                              &&
 depends xml-parser-expat                                   &&
 optional_depends nrcit                                     \
diff --git a/http/kazehakase/HISTORY b/http/kazehakase/HISTORY
index b0d2076..bbbfa47 100644
--- a/http/kazehakase/HISTORY
+++ b/http/kazehakase/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-11-05 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.5.6
        * PRE_BUILD: Removed patch.
diff --git a/http/lightspark/DETAILS b/http/lightspark/DETAILS
index 44f040f..9f8aafa 100755
--- a/http/lightspark/DETAILS
+++ b/http/lightspark/DETAILS
@@ -1,9 +1,9 @@
            SPELL=lightspark
-         VERSION=0.4.8.1
+         VERSION=0.5.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   
SOURCE_URL[0]=http://launchpad.net/$SPELL/trunk/lightspark-0.4.8/+download/$SOURCE
-     
SOURCE_HASH=sha512:3ecdcd2159903f356b28bfde10102987e286b41b10d29704ecb86e6bd7aea707d08d23abc6a68d56803404a7633affe2e4c945c69f77f7ce14d4fc74abc6651a
+   
SOURCE_URL[0]=http://launchpad.net/$SPELL/trunk/lightspark-$VERSION/+download/$SOURCE
+     
SOURCE_HASH=sha512:6d61e6b22ebf502eafe198b9a252dc116e94dad2d984f5f0adcd06b46eaf1e2d53be79f1e8df37cca840e98c6273f97ad1df4ed7afd52c0a995807ce2bf11bc6
         WEB_SITE=http://sourceforge.net/apps/trac/lightspark
          ENTERED=20110528
       LICENSE[0]=GPL
diff --git a/http/lightspark/HISTORY b/http/lightspark/HISTORY
index 85e1022..44dc932 100644
--- a/http/lightspark/HISTORY
+++ b/http/lightspark/HISTORY
@@ -1,2 +1,5 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.5.0
+
 2011-05-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS, BUILD: spell created, version 0.4.8.1
diff --git a/http/middleman/DEPENDS b/http/middleman/DEPENDS
index cbbe089..71f187d 100755
--- a/http/middleman/DEPENDS
+++ b/http/middleman/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++   &&
+depends -sub CXX gcc   &&
 depends  pcre  &&
 
 optional_depends  zlib                             \
diff --git a/http/middleman/HISTORY b/http/middleman/HISTORY
index c57a5e5..f399e3c 100644
--- a/http/middleman/HISTORY
+++ b/http/middleman/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-12-01 Juuso Alasuutari <iuso AT sourcemage.org>
        * DEPENDS: Added depends g++ (bug #13272), reformatted code.
 
diff --git a/http/midori/DEPENDS b/http/midori/DEPENDS
index 8887e6f..5ee2156 100755
--- a/http/midori/DEPENDS
+++ b/http/midori/DEPENDS
@@ -4,11 +4,8 @@ depends libxml2 &&
 depends python  &&
 depends libnotify &&
 depends sqlite &&
-
+depends vala &&
 
 optional_depends unique  "" "" "provide libUnique support" &&
 optional_depends gnome-icon-theme "" "" "for all the icons" &&
-optional_depends vala "--enable-vala"  \
-                      "--disable-vala" \
-                      "enable vala support for extensions"  &&
 optional_depends docutils "" "" "enable user manual"
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index ab76aef..4d0a573 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.3.6
+         VERSION=0.4.0
           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:81f5aa3f0726f176b12d6a1791aea4a52304959e2aec7dd19672f8dc07d3a92f2e6bb6a22bd3aab34917c59edf1227508c13e3b54a033ceb60c2a252bb2c85c0
+     
SOURCE_HASH=sha512:8a48bfdfd630e85371caa7be9da56925e2bb1abfa1bcdfda59643493753d66c1b96b68e8fd8194455439b4ed85413cefdc3b14cc3738f47a1691faf0e27633bd
 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 7cd336e..e75a4bc 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+2011-08-01 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated to version 0.4.0
+       * DEPENDS: Now depends vala
+
 2011-05-15 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.3.6
 
diff --git a/http/newsbeuter/DEPENDS b/http/newsbeuter/DEPENDS
index 54212e5..437d165 100755
--- a/http/newsbeuter/DEPENDS
+++ b/http/newsbeuter/DEPENDS
@@ -3,5 +3,5 @@ depends curl &&
 depends gettext &&
 depends pkgconfig &&
 depends libxml2 &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends stfl 
diff --git a/http/newsbeuter/HISTORY b/http/newsbeuter/HISTORY
index 88e06d2..5b61726 100644
--- a/http/newsbeuter/HISTORY
+++ b/http/newsbeuter/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.4
 
diff --git a/http/nrcit/DEPENDS b/http/nrcit/DEPENDS
index 86ea118..ffa338b 100755
--- a/http/nrcit/DEPENDS
+++ b/http/nrcit/DEPENDS
@@ -1,7 +1,7 @@
 depends pkgconfig             &&
 depends bison                 &&
 depends fontconfig            &&
-depends g++                   &&
+depends -sub CXX gcc                   &&
 depends glib2                 &&
 depends javascriptcore        &&
 depends libtool               &&
diff --git a/http/nrcit/HISTORY b/http/nrcit/HISTORY
index d28879c..23f2105 100644
--- a/http/nrcit/HISTORY
+++ b/http/nrcit/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-09-20 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: removed && from the last line
 
diff --git a/http/nrcore/DEPENDS b/http/nrcore/DEPENDS
index 7e2fa91..3074fd2 100755
--- a/http/nrcore/DEPENDS
+++ b/http/nrcore/DEPENDS
@@ -2,7 +2,7 @@ depends pkgconfig                                             
      &&
 if [[ $NRCORE_SCM == y ]]; then
 depends subversion
 fi                                                                  &&
-depends g++                                                         &&
+depends -sub CXX gcc                                                         
&&
 depends bison                                                       &&
 depends libtool                                                     &&
 depends glib2                                                       &&
diff --git a/http/nrcore/HISTORY b/http/nrcore/HISTORY
index c9554de..484001d 100644
--- a/http/nrcore/HISTORY
+++ b/http/nrcore/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/http/osb-browser/DEPENDS b/http/osb-browser/DEPENDS
index c73bb36..98c881d 100755
--- a/http/osb-browser/DEPENDS
+++ b/http/osb-browser/DEPENDS
@@ -2,7 +2,7 @@ depends pkgconfig             &&
 if [[ $OSB_SCM == y ]]; then
 depends subversion
 fi                            &&
-depends g++                   &&
+depends -sub CXX gcc                   &&
 depends bison                 &&
 depends libtool               &&
 depends xorg-libs  "--with-x"  &&
diff --git a/http/osb-browser/HISTORY b/http/osb-browser/HISTORY
index b80541c..18abd31 100644
--- a/http/osb-browser/HISTORY
+++ b/http/osb-browser/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/http/swish++/DEPENDS b/http/swish++/DEPENDS
index 3ddc7fc..8e4cf51 100755
--- a/http/swish++/DEPENDS
+++ b/http/swish++/DEPENDS
@@ -1,4 +1,4 @@
-# must be "depends g++" but we need GCC 3
+# must be "depends -sub CXX gcc" but we need GCC 3
 depends gcc34 &&
 
 # requires Perl to install (not build) and to run some of the WWW sample 
pages
diff --git a/http/swish++/HISTORY b/http/swish++/HISTORY
index 7fe33e9..4f08386 100644
--- a/http/swish++/HISTORY
+++ b/http/swish++/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * BUILD: removed invoke_gcc #10641
 
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 1859011..66f43a0 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends autoconf &&
 depends automake &&
 depends libtool &&
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 20e66a7..4a6431b 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.4.2
        * PRE_BUILD, perl514.patch: removed, fixed upstream
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 01bec70..9a9b7ac 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends autoconf &&
 depends automake &&
 depends libtool &&
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index cd0fb94..e07513d 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.4.2
        * PRE_BUILD, perl514.patch: removed, fixed upstream
diff --git a/http/wt/DEPENDS b/http/wt/DEPENDS
index ea00c9f..a0637ec 100755
--- a/http/wt/DEPENDS
+++ b/http/wt/DEPENDS
@@ -1,5 +1,5 @@
 depends cmake &&
-depends g++   &&
+depends -sub CXX gcc   &&
 depends boost &&
 
 optional_depends libharu2 \
diff --git a/http/wt/HISTORY b/http/wt/HISTORY
index 6319e59..49bec47 100644
--- a/http/wt/HISTORY
+++ b/http/wt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-09 Ismael Luceno <ismael AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS: spell created
 
diff --git a/i18n/scim/DEPENDS b/i18n/scim/DEPENDS
index dc83882..64548c2 100755
--- a/i18n/scim/DEPENDS
+++ b/i18n/scim/DEPENDS
@@ -3,7 +3,7 @@ depends  cairo        &&
 depends  expat        &&
 depends  fontconfig   &&
 depends  freetype2    &&
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  gcc          &&
 depends  glib2        &&
 depends  glitz        &&
diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY
index cd6904e..3d145d0 100644
--- a/i18n/scim/HISTORY
+++ b/i18n/scim/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-11 Remko van der Vossen <wich AT sourcemage.org>
        * PRE_BUILD, scim_glibc-2.10.patch: patch for glibc 2.10
 
diff --git a/java/antlr/DEPENDS b/java/antlr/DEPENDS
index 1cecc85..24eab6f 100755
--- a/java/antlr/DEPENDS
+++ b/java/antlr/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends  g++                             \
+optional_depends -sub CXX gcc                             \
                   '--enable-cxx'                  \
                   '--disable-cxx'                 \
                   'for C++ language recognition'  &&
diff --git a/java/antlr/HISTORY b/java/antlr/HISTORY
index df6bf48..b347d88 100644
--- a/java/antlr/HISTORY
+++ b/java/antlr/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-19 Robert Figura <template AT sourcemage.org>
        * PRE_BUILD: converted C++ fix to patch, extended fix
 
diff --git a/java/jikes/DEPENDS b/java/jikes/DEPENDS
index fd0b0eb..f148724 100755
--- a/java/jikes/DEPENDS
+++ b/java/jikes/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/java/jikes/HISTORY b/java/jikes/HISTORY
index cec09ac..6b5b7be 100644
--- a/java/jikes/HISTORY
+++ b/java/jikes/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-08-09 Arjan Bouter <abouter AT sourcemage.org>
        * java/jikes: provides JAVAC
 
diff --git a/java/kaffe/DEPENDS b/java/kaffe/DEPENDS
index 5d9b7f1..5d258e4 100755
--- a/java/kaffe/DEPENDS
+++ b/java/kaffe/DEPENDS
@@ -1,7 +1,7 @@
 depends JPEG &&
 depends giflib &&
 depends libpng &&
-optional_depends gcj \
+optional_depends -sub JAVA gcc \
                  '--enable-gcj' \
                  '--disable-gcj' \
                  'enable gcj support?' &&
diff --git a/java/kaffe/HISTORY b/java/kaffe/HISTORY
index d59590f..5305792 100644
--- a/java/kaffe/HISTORY
+++ b/java/kaffe/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/kde-apps/kdevelop/DEPENDS b/kde-apps/kdevelop/DEPENDS
index aac6a99..858c647 100755
--- a/kde-apps/kdevelop/DEPENDS
+++ b/kde-apps/kdevelop/DEPENDS
@@ -32,12 +32,12 @@ optional_depends  kdbg                          \
                   ''                            \
                   'for KDE-based GNU Debugger'  &&
 
-optional_depends  g++                \
+optional_depends -sub CXX gcc                \
                   '--enable-cpp'     \
                   '--disable-cpp'    \
                   'for C++ support'  &&
 
-optional_depends  fortran                \
+optional_depends -sub FORTRAN gcc                \
                   '--enable-fortran'     \
                   '--disable-fortran'    \
                   'for Fortran support'  &&
diff --git a/kde-apps/kdevelop/HISTORY b/kde-apps/kdevelop/HISTORY
index e80ede4..0d38c1b 100644
--- a/kde-apps/kdevelop/HISTORY
+++ b/kde-apps/kdevelop/HISTORY
@@ -1,3 +1,11 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
        * DEPENDS: updated ruby dependency to RUBY provider
 
diff --git a/kde-apps/kid3/DEPENDS b/kde-apps/kid3/DEPENDS
index 9586b9b..ad9d437 100755
--- a/kde-apps/kid3/DEPENDS
+++ b/kde-apps/kid3/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 if [[ $KID3_KDE == "--with-kde" ]]
 then
diff --git a/kde-apps/kid3/HISTORY b/kde-apps/kid3/HISTORY
index fa1fcec..6286960 100644
--- a/kde-apps/kid3/HISTORY
+++ b/kde-apps/kid3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.3
 
diff --git a/kde-apps/knoda/DEPENDS b/kde-apps/knoda/DEPENDS
index ec7c2ba..6b23874 100755
--- a/kde-apps/knoda/DEPENDS
+++ b/kde-apps/knoda/DEPENDS
@@ -1,4 +1,4 @@
-depends g++             &&
+depends -sub CXX gcc             &&
 depends kdelibs         &&
 depends hk_classes
 
diff --git a/kde-apps/knoda/HISTORY b/kde-apps/knoda/HISTORY
index 8c5fd43..ccc55e4 100644
--- a/kde-apps/knoda/HISTORY
+++ b/kde-apps/knoda/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-12-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: kdebase -> kdelibs
 
diff --git a/kde-apps/kpowersave/DEPENDS b/kde-apps/kpowersave/DEPENDS
index a1fa5be..cc2853b 100755
--- a/kde-apps/kpowersave/DEPENDS
+++ b/kde-apps/kpowersave/DEPENDS
@@ -2,7 +2,7 @@
 depends  unsermake  &&
 depends  pkgconfig  &&
 depends  hal        &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 
 optional_depends  doxygen  ''  ''  'to build html documentation'
 
diff --git a/kde-apps/kpowersave/HISTORY b/kde-apps/kpowersave/HISTORY
index 811daf0..1fb11d7 100644
--- a/kde-apps/kpowersave/HISTORY
+++ b/kde-apps/kpowersave/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-11-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.7.3
          new WEB_SITE
diff --git a/kde4-apps/digikam4/DETAILS b/kde4-apps/digikam4/DETAILS
index cfc331a..329b237 100755
--- a/kde4-apps/digikam4/DETAILS
+++ b/kde4-apps/digikam4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=digikam4
           SPELLX=${SPELL//4}
-         VERSION=1.9.0
-     
SOURCE_HASH=sha512:f5fda9d6d367326977897c55ec8586a514819cab0412ba48d7bb9a88f8050c292c4d9bca3ab45ec0c04fbfc2bd21db4caf6cc620845ff8efa38a02ccf69926b6
+         VERSION=2.0.0
+     
SOURCE_HASH=sha512:cf1facd35872baaf64dea20a168439696252e7a71ec21e8c30eb86b9cfa28f6bbaea813ccc4eefc748bd72073ed6722d80eb25aeb449f602feeba9cb91ee4ebc
           SOURCE=${SPELLX}-$VERSION.tar.bz2
    SOURCE_URL[0]=$SOURCEFORGE_URL/digikam/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index d0fb1df..8ee3645 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.0.0
+
 2011-02-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.9.0
 
diff --git a/kde4-apps/yakuake4/DETAILS b/kde4-apps/yakuake4/DETAILS
index b1c7aa3..37da566 100755
--- a/kde4-apps/yakuake4/DETAILS
+++ b/kde4-apps/yakuake4/DETAILS
@@ -1,9 +1,9 @@
            SPELL=yakuake4
-         VERSION=2.9.6
-     
SOURCE_HASH=sha512:46a1ac7b0e3c9184cae12e021a1670f223a00a5420df617a1448f7daf1b45967e17f6c4e723519bde982ec7ee5f777efe14ffcdc42e079e3cb8cc921918df536
+         VERSION=2.9.8
+     
SOURCE_HASH=sha512:37e1c8323c76f09e60677bc6283825e42e3c29c68ef9b86fd3797191d6911ab3958635953bb959e64fa4721b643764f6d2fe3aee6443e2a1f0c5f5c625850b84
           SOURCE=${SPELL//4}-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL//4}-$VERSION
-      SOURCE_URL=http://download.berlios.de/${SPELL//4}/$SOURCE
+      SOURCE_URL=${KDE_URL}/stable/${SPELL//4}/${VERSION}/src/${SOURCE}
         WEB_SITE=http://yakuake.kde.org/
          ENTERED=20060113
          LICENSE=GPL
diff --git a/kde4-apps/yakuake4/HISTORY b/kde4-apps/yakuake4/HISTORY
index 2a1d90b..87e8b2c 100644
--- a/kde4-apps/yakuake4/HISTORY
+++ b/kde4-apps/yakuake4/HISTORY
@@ -1,3 +1,6 @@
+2011-08-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * DETAILS: updated version to 2.9.8, fixed SOURCE_URL
+
 2008-06-09 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 2.9.6
 
diff --git a/kde4-support/akonadi/DEPENDS b/kde4-support/akonadi/DEPENDS
index b19bd3a..55e979a 100755
--- a/kde4-support/akonadi/DEPENDS
+++ b/kde4-support/akonadi/DEPENDS
@@ -1,6 +1,6 @@
 depends -sub DBUS qt4  &&
 depends -sub PROGRAM_OPTIONS boost &&
-depends g++       &&
+depends -sub CXX gcc       &&
 depends cmake     &&
 depends libxslt   &&
 depends automoc   &&
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index f982cda..bedc75a 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-17 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed SOURCE_URL
 
diff --git a/kde4-support/attica/DEPENDS b/kde4-support/attica/DEPENDS
index dea0fd8..bcc4bd0 100755
--- a/kde4-support/attica/DEPENDS
+++ b/kde4-support/attica/DEPENDS
@@ -1,3 +1,3 @@
 depends  cmake  &&
-depends  g++    &&
+depends -sub CXX gcc    &&
 depends  qt4
diff --git a/kde4-support/attica/HISTORY b/kde4-support/attica/HISTORY
index dfb3280..2aa89db 100644
--- a/kde4-support/attica/HISTORY
+++ b/kde4-support/attica/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-26 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.2.0
 
diff --git a/kde4-support/automoc/DEPENDS b/kde4-support/automoc/DEPENDS
index 7efbab0..35b62b7 100755
--- a/kde4-support/automoc/DEPENDS
+++ b/kde4-support/automoc/DEPENDS
@@ -1,3 +1,3 @@
 depends cmake     &&
-depends g++       &&
+depends -sub CXX gcc       &&
 depends qt4
diff --git a/kde4-support/automoc/HISTORY b/kde4-support/automoc/HISTORY
index f221c19..c55fb11 100644
--- a/kde4-support/automoc/HISTORY
+++ b/kde4-support/automoc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-11 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS, DEPENDS: removed svn version
        * PREPARE: removed, no longer needed
diff --git a/kde4-support/gluon/DEPENDS b/kde4-support/gluon/DEPENDS
index 1683363..e72e133 100755
--- a/kde4-support/gluon/DEPENDS
+++ b/kde4-support/gluon/DEPENDS
@@ -1,5 +1,5 @@
 depends  cmake    &&
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  qt4      &&
 depends  eigen2   &&
 depends  glew     &&
diff --git a/kde4-support/gluon/HISTORY b/kde4-support/gluon/HISTORY
index d023d8a..51b2d09 100644
--- a/kde4-support/gluon/HISTORY
+++ b/kde4-support/gluon/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.70.0
          new WEB_SITE
diff --git a/kde4-support/grantlee/DEPENDS b/kde4-support/grantlee/DEPENDS
index f3eb975..b8f1077 100755
--- a/kde4-support/grantlee/DEPENDS
+++ b/kde4-support/grantlee/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends qt4 &&
 depends cmake
 
diff --git a/kde4-support/grantlee/HISTORY b/kde4-support/grantlee/HISTORY
index 61cbac7..4fec1c3 100644
--- a/kde4-support/grantlee/HISTORY
+++ b/kde4-support/grantlee/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-11 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.1.9
 
diff --git a/kde4-support/libdbusmenu-qt/DEPENDS 
b/kde4-support/libdbusmenu-qt/DEPENDS
index e19035d..42b56fc 100755
--- a/kde4-support/libdbusmenu-qt/DEPENDS
+++ b/kde4-support/libdbusmenu-qt/DEPENDS
@@ -1,4 +1,4 @@
 depends  cmake  &&
-depends  g++    &&
+depends -sub CXX gcc    &&
 optional_depends doxygen "-DWITH_DOC=ON" "-DWITH_DOC=OFF" &&
 depends  -sub DBUS qt4
diff --git a/kde4-support/libdbusmenu-qt/HISTORY 
b/kde4-support/libdbusmenu-qt/HISTORY
index 0c29483..c06d34f 100644
--- a/kde4-support/libdbusmenu-qt/HISTORY
+++ b/kde4-support/libdbusmenu-qt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-11 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.8.3
 
diff --git a/kde4-support/phonon/DEPENDS b/kde4-support/phonon/DEPENDS
index c701248..2f2e5a9 100755
--- a/kde4-support/phonon/DEPENDS
+++ b/kde4-support/phonon/DEPENDS
@@ -3,7 +3,7 @@ depends  subversion
 fi
 depends  cmake       &&
 depends  automoc     &&
-depends  g++         &&
+depends -sub CXX gcc         &&
 
 depends -sub "DBUS NO_PHONON" qt4  &&
 depends  libx11   &&
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index a5c74cd..1751cdd 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-26 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 4.5.0
          fixed SOURCE_DIRECTORY
diff --git a/kde4-support/polkit-qt-1/DEPENDS 
b/kde4-support/polkit-qt-1/DEPENDS
index 825ee37..517159a 100755
--- a/kde4-support/polkit-qt-1/DEPENDS
+++ b/kde4-support/polkit-qt-1/DEPENDS
@@ -1,5 +1,5 @@
 depends -sub "DBUS" qt4  &&
-depends g++       &&
+depends -sub CXX gcc       &&
 depends cmake     &&
 depends automoc   &&
 depends policykit
diff --git a/kde4-support/polkit-qt-1/HISTORY 
b/kde4-support/polkit-qt-1/HISTORY
index d902a76..896d1f4 100644
--- a/kde4-support/polkit-qt-1/HISTORY
+++ b/kde4-support/polkit-qt-1/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-12 Bor Kraljič <pyrobor AT ver.si>
        * CONFLICTS: added polkit-qt (deprecated)
 
diff --git a/kernels/elpp/DEPENDS b/kernels/elpp/DEPENDS
index f90e887..6dafe8a 100755
--- a/kernels/elpp/DEPENDS
+++ b/kernels/elpp/DEPENDS
@@ -1,5 +1,5 @@
 if  [  "$ELPP_THEMEMAKER"  =  "y"  ];  then
   depends  qt-x11
 else
-  depends  g++
+  depends -sub CXX gcc
 fi
diff --git a/kernels/elpp/HISTORY b/kernels/elpp/HISTORY
index 05cc217..2ee33d7 100644
--- a/kernels/elpp/HISTORY
+++ b/kernels/elpp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/kernels/linux-firmware/DETAILS b/kernels/linux-firmware/DETAILS
index 2e6317d..b6f6028 100755
--- a/kernels/linux-firmware/DETAILS
+++ b/kernels/linux-firmware/DETAILS
@@ -1,5 +1,5 @@
            SPELL=linux-firmware
-         VERSION=20110709
+         VERSION=20110730
           SOURCE=$SPELL-$VERSION.tar.bz2
    
SOURCE_URL[0]=http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/$SOURCE
          SOURCE2=$SOURCE.sign
diff --git a/kernels/linux-firmware/HISTORY b/kernels/linux-firmware/HISTORY
index 8222c93..f78f78d 100644
--- a/kernels/linux-firmware/HISTORY
+++ b/kernels/linux-firmware/HISTORY
@@ -1,3 +1,6 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 20110730
+
 2011-07-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 20110709
 
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index f65e2af..4968dbe 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2011-08-02 Ladislav Hagara <hgr AT vabo.cz>
+       * info/patches/maintenance_patches/patch-2.6.35.14: added
+
 2011-07-25 Ladislav Hagara <hgr AT vabo.cz>
        * latest.defaults: LATEST_3 and LATEST_maintenance_patches_3 added
        * PREPARE, CONFIGURE, liblinux, INSTALL: linux 3 support added
diff --git a/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.14 
b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.14
new file mode 100755
index 0000000..133f883
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches/patch-2.6.35.14
@@ -0,0 +1,6 @@
+appliedkernels="2.6.35"
+patchversion="${appliedkernels}.14"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v2.6/longterm/v${appliedkernels}/${source}"
+source_gpg="kernel.gpg:${source}.sign:ESTABLISHED_UPSTREAM_KEY"
+gpg_source_url="${source_url}.sign"
diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index b7b2227..663e071 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -1,7 +1,7 @@
 depends texlive-texmf &&
 depends xz-utils &&
 depends bison &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends flex &&
 depends expat &&
 depends ed &&
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index 6f4a392..f33752e 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-07-20 Peng Chang (Charles) <chp AT sourcemage.org>
        * DEPENDS: depends texinfo for install-info
 
diff --git a/libs/ace/DEPENDS b/libs/ace/DEPENDS
index 26fd371..7db1cb6 100755
--- a/libs/ace/DEPENDS
+++ b/libs/ace/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  automake  &&
 depends  autoconf  &&
 depends  libtool
diff --git a/libs/ace/HISTORY b/libs/ace/HISTORY
index 0eb7b1b..e688573 100644
--- a/libs/ace/HISTORY
+++ b/libs/ace/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-09-19 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 5.6.1
          used versioned tarball
diff --git a/libs/asio/DEPENDS b/libs/asio/DEPENDS
index 08da63e..3540721 100755
--- a/libs/asio/DEPENDS
+++ b/libs/asio/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends openssl
diff --git a/libs/asio/HISTORY b/libs/asio/HISTORY
index 1dce1fa..88ccc99 100644
--- a/libs/asio/HISTORY
+++ b/libs/asio/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * PRE_BUILD, gcc-4.4.patch: fixed build with gcc 4.4
 
diff --git a/libs/boost/DEPENDS b/libs/boost/DEPENDS
index b8a516e..18ca687 100755
--- a/libs/boost/DEPENDS
+++ b/libs/boost/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++                                    &&
+depends -sub CXX gcc                                    &&
 if list_find "$BOOST_LIBS" "python"             ||
    list_find "$BOOST_LIBS" "all"
 then
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 9c11984..2d1d40b 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1_47_0
        * UP_TRIGGERS: recast dependees on version update. Boost is
diff --git a/libs/clthreads/DEPENDS b/libs/clthreads/DEPENDS
index fd0b0eb..f148724 100755
--- a/libs/clthreads/DEPENDS
+++ b/libs/clthreads/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/libs/clthreads/HISTORY b/libs/clthreads/HISTORY
index 6a0397f..37b9c98 100644
--- a/libs/clthreads/HISTORY
+++ b/libs/clthreads/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-07-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, PRE_BUILD, BUILD: spell created
        * DETAILS: corrected the license to LGPL
diff --git a/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index bde06e9..a9c6681 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 if [[ $CLUC_VER != stable ]];then
   depends cmake
 fi &&
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 77a6b7d..9cb56c3 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-10-10 Ethan Grammatikidis <eekee57 AT fastmail.fm>
        * DETAILS: fix SHORT
 
diff --git a/libs/clxclient/DEPENDS b/libs/clxclient/DEPENDS
index 67b6c45..8380037 100755
--- a/libs/clxclient/DEPENDS
+++ b/libs/clxclient/DEPENDS
@@ -1,4 +1,4 @@
 depends freetype2 &&
 depends libxft    &&
 depends libx11    &&
-depends g++
+depends -sub CXX gcc
diff --git a/libs/clxclient/HISTORY b/libs/clxclient/HISTORY
index 5cc2f94..3339704 100644
--- a/libs/clxclient/HISTORY
+++ b/libs/clxclient/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-07-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, PRE_BUILD, BUILD, DEPENDS: spell created
 
diff --git a/libs/dfb++/DEPENDS b/libs/dfb++/DEPENDS
index e5bdffd..bfbfd6f 100755
--- a/libs/dfb++/DEPENDS
+++ b/libs/dfb++/DEPENDS
@@ -1,2 +1,2 @@
 depends  directfb  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/libs/dfb++/HISTORY b/libs/dfb++/HISTORY
index 3e19e54..6a69584 100644
--- a/libs/dfb++/HISTORY
+++ b/libs/dfb++/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/libs/elfio/DEPENDS b/libs/elfio/DEPENDS
index bcd1eeb..f148724 100755
--- a/libs/elfio/DEPENDS
+++ b/libs/elfio/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/libs/elfio/HISTORY b/libs/elfio/HISTORY
index dcf3fe5..cc4ab6f 100644
--- a/libs/elfio/HISTORY
+++ b/libs/elfio/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-06-27 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS, DEPENDS: Created
 
diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index 8e66b2b..a0bff89 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -5,7 +5,6 @@ CFLAGS="${CFLAGS/-Os/}" &&
 
 OPTS="$OPTS $FFTW_THREADS $FFTW_OPTS --disable-fma" &&
 OPTS="$OPTS --enable-shared"                        &&
-OPTS="$OPTS --enable-type-prefix"                   &&
 
 COMMON_OPTS="${OPTS}"                               &&
 
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index 0f2ca33..8288134 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * BUILD: removed deprecated option
+
 2011-07-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.3
 
diff --git a/libs/gettext/DEPENDS b/libs/gettext/DEPENDS
index 0e82b4f..34141ec 100755
--- a/libs/gettext/DEPENDS
+++ b/libs/gettext/DEPENDS
@@ -1,7 +1,7 @@
 depends gnupg &&
 depends smgl-fhs &&
 
-optional_depends g++ \
+optional_depends -sub CXX gcc \
                  "--enable-libasprintf" \
                  "--disable-libasprintf" \
                  "for libasprintf support" &&
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index fc86959..0e7f2ef 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-20 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Optionally depends on emacs
          Adds http://www.gnu.org/s/hello/manual/gettext/PO-Mode.html
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 71d430b..f9c2ec6 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -1,11 +1,8 @@
 make_single  &&
 
-if [ "$GLIBC_NOLIB64" = "y" ]; then
-  # install x86_64 linker to lib instead of lib64
-  sedit "s/lib64/lib/"  sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
-  sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
-fi                                                              &&
-
+# install x86_64 linker to lib instead of lib64
+sedit "s/lib64/lib/"  sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
+sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed &&
 
 # this causes configure to be run again where it fails for some people on 
PIII and for me on Alpha
 # the error is about no working grep found...
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 245ab7a..7416236 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -82,6 +82,10 @@
 2009-08-20 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: stubs-32.h and stubs-64.h are also only created if they 
differ
 
+2009-07-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+       * BUILD: removed the /lib workaround it's always in /lib
+       * PREPARE: removed the query it's always in /lib
+
 2009-06-09 Eric Sandall <sandalle AT sourcemage.org>
        * init.d/nscd: Also requires /var/db/nscd to exist
 
@@ -124,7 +128,7 @@
        * PRE_BUILD: don't apply gcc43.patch, fnstsw.patch
        * gcc43.patch, fnstsw.patch: deleted, now included upstream
 
-2008-11-22 Fredrik Carlstr�m <fredrik.carlstrom AT tele2.se>
+2008-11-22 Fredrik Carlström <fredrik.carlstrom AT tele2.se>
        * DETAILS: update cvs version to latest stable (2.9)
          optionally use sanitized kernel headers
          fixes bug #14897
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index b946fbc..14df969 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -13,9 +13,4 @@ if  [[  $(uname -r)  =  2.6.*  ]] || [[  $(uname -r)  =  
3.*  ]];  then
     config_query  GLIBC_USEIDN  "Would you like to compile glibc with libidn 
support?" y &&
     config_query GLIBC_SANITIZE_HEADERS "Do you want to use sanitized linux 
kernel headers from the latest stable release" n
   fi
-fi  &&
-
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
-  config_query GLIBC_NOLIB64  "Shall the dynamic linker install to /lib (not 
/lib64) (lib64 purge  part 2 of 2)?"  n
 fi
-
diff --git a/libs/gmetadom/DEPENDS b/libs/gmetadom/DEPENDS
index 6da2cdb..422e2a1 100755
--- a/libs/gmetadom/DEPENDS
+++ b/libs/gmetadom/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  pkgconfig  &&
 depends  glib      &&
 depends  gdome2
diff --git a/libs/gmetadom/HISTORY b/libs/gmetadom/HISTORY
index 3f96a4b..e8d904e 100644
--- a/libs/gmetadom/HISTORY
+++ b/libs/gmetadom/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/libs/google-perftools/DEPENDS b/libs/google-perftools/DEPENDS
index 4768afe..968d179 100755
--- a/libs/google-perftools/DEPENDS
+++ b/libs/google-perftools/DEPENDS
@@ -6,5 +6,5 @@ else
                     "Use libunwind instead of relying on the frame pointer?"
 fi &&
 
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  libtool
diff --git a/libs/google-perftools/HISTORY b/libs/google-perftools/HISTORY
index b049592..a1e5468 100644
--- a/libs/google-perftools/HISTORY
+++ b/libs/google-perftools/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-11 David Kowis <dkowis AT shlrm.org>
   * DETAILS: version to 1.7
 
diff --git a/libs/guichan/DEPENDS b/libs/guichan/DEPENDS
index 8e982b9..9e8a92f 100755
--- a/libs/guichan/DEPENDS
+++ b/libs/guichan/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 optional_depends  OPENGL                \
                   '--enable-opengl'     \
diff --git a/libs/guichan/HISTORY b/libs/guichan/HISTORY
index 88d9a7b..8bf1456 100644
--- a/libs/guichan/HISTORY
+++ b/libs/guichan/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-03-28 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.8.2, fixed typo in WEB_SITE, new SOURCE_URL[0]
 
diff --git a/libs/icu/DEPENDS b/libs/icu/DEPENDS
index fd0b0eb..f148724 100755
--- a/libs/icu/DEPENDS
+++ b/libs/icu/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 0e4fb41..5e2ab55 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-10 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.8 (both)
 
diff --git a/libs/libcgroup/DEPENDS b/libs/libcgroup/DEPENDS
index 8b34e37..1758494 100755
--- a/libs/libcgroup/DEPENDS
+++ b/libs/libcgroup/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends linux-pam "--enable-pam" "--disable-pam" "to include the 
PAM module"
diff --git a/libs/libcgroup/HISTORY b/libs/libcgroup/HISTORY
index 14f7ac8..3376398 100644
--- a/libs/libcgroup/HISTORY
+++ b/libs/libcgroup/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-05 David Kowis <dkowis AT shlrm.org>
        * DETAILS,DEPENDS,HISTORY: created spell
diff --git a/libs/libextractor/DEPENDS b/libs/libextractor/DEPENDS
index 51547cb..f125d8f 100755
--- a/libs/libextractor/DEPENDS
+++ b/libs/libextractor/DEPENDS
@@ -1,5 +1,5 @@
 depends  zlib    &&
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  glib2   &&
 depends  libtool &&
 optional_depends flac \
diff --git a/libs/libextractor/HISTORY b/libs/libextractor/HISTORY
index dbe4cb4..00c5de3 100644
--- a/libs/libextractor/HISTORY
+++ b/libs/libextractor/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-07-05 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.5.23
 
diff --git a/libs/libgmpada/DEPENDS b/libs/libgmpada/DEPENDS
index 9201610..930fe4a 100755
--- a/libs/libgmpada/DEPENDS
+++ b/libs/libgmpada/DEPENDS
@@ -1,4 +1,4 @@
-depends ada  &&
+depends -sub ADA gcc  &&
 depends gmp  &&
 depends mpfr &&
 depends gprbuild
diff --git a/libs/libgmpada/HISTORY b/libs/libgmpada/HISTORY
index c3ad3e9..c8f877e 100644
--- a/libs/libgmpada/HISTORY
+++ b/libs/libgmpada/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS: spell created
 
diff --git a/libs/libical/DEPENDS b/libs/libical/DEPENDS
index 3e93fe0..f1de40b 100755
--- a/libs/libical/DEPENDS
+++ b/libs/libical/DEPENDS
@@ -1,4 +1,4 @@
 depends cmake &&
-optional_depends  g++    '' '' 'for C++ bindings'  &&
+optional_depends -sub CXX gcc    '' '' 'for C++ bindings'  &&
 optional_depends  JDK    '' '' 'for Java bindings' z-rejected &&
 optional_depends  python '' '' 'for Python bindings'
diff --git a/libs/libical/HISTORY b/libs/libical/HISTORY
index 0732f96..8a57141 100644
--- a/libs/libical/HISTORY
+++ b/libs/libical/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: JDK is in z-rejected
 
diff --git a/libs/libmemcached/DEPENDS b/libs/libmemcached/DEPENDS
index 790dcfa..0dce79d 100755
--- a/libs/libmemcached/DEPENDS
+++ b/libs/libmemcached/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends LIBSASL \
                  "--enable-sasl" \
diff --git a/libs/libmemcached/HISTORY b/libs/libmemcached/HISTORY
index 7f34438..889d69d 100644
--- a/libs/libmemcached/HISTORY
+++ b/libs/libmemcached/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.51
        * DEPENDS: added LIBSASL optional dependency
diff --git a/libs/libodb-mysql/DEPENDS b/libs/libodb-mysql/DEPENDS
index 89134b9..2eda6f3 100755
--- a/libs/libodb-mysql/DEPENDS
+++ b/libs/libodb-mysql/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libodb &&
 depends MYSQL
diff --git a/libs/libodb-mysql/HISTORY b/libs/libodb-mysql/HISTORY
index 40e4632..966758c 100644
--- a/libs/libodb-mysql/HISTORY
+++ b/libs/libodb-mysql/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/libs/libodb-tracer/DEPENDS b/libs/libodb-tracer/DEPENDS
index dfa5730..c4147a4 100755
--- a/libs/libodb-tracer/DEPENDS
+++ b/libs/libodb-tracer/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libodb 
diff --git a/libs/libodb-tracer/HISTORY b/libs/libodb-tracer/HISTORY
index 40e4632..966758c 100644
--- a/libs/libodb-tracer/HISTORY
+++ b/libs/libodb-tracer/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/libs/libodb/DEPENDS b/libs/libodb/DEPENDS
index 1c113e9..fa848c2 100755
--- a/libs/libodb/DEPENDS
+++ b/libs/libodb/DEPENDS
@@ -1 +1 @@
-depends g++ 
+depends -sub CXX gcc 
diff --git a/libs/libodb/HISTORY b/libs/libodb/HISTORY
index 40e4632..966758c 100644
--- a/libs/libodb/HISTORY
+++ b/libs/libodb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/libs/libofx/DEPENDS b/libs/libofx/DEPENDS
index f6400d6..ab2f4af 100755
--- a/libs/libofx/DEPENDS
+++ b/libs/libofx/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends curl   &&
 depends opensp &&
 depends openssl
diff --git a/libs/libofx/HISTORY b/libs/libofx/HISTORY
index 5c1edfd..b4e0002 100644
--- a/libs/libofx/HISTORY
+++ b/libs/libofx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-07-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.9.1
 
diff --git a/libs/libpqxx/DEPENDS b/libs/libpqxx/DEPENDS
index 0acbefd..660930a 100755
--- a/libs/libpqxx/DEPENDS
+++ b/libs/libpqxx/DEPENDS
@@ -1,2 +1,2 @@
 depends  postgresql  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/libs/libpqxx/HISTORY b/libs/libpqxx/HISTORY
index c21060e..acbf392 100644
--- a/libs/libpqxx/HISTORY
+++ b/libs/libpqxx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-12-16 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.1
          new WEB_SITE
diff --git a/libs/libsh/DEPENDS b/libs/libsh/DEPENDS
index 66e3b7c..b0f62d5 100755
--- a/libs/libsh/DEPENDS
+++ b/libs/libsh/DEPENDS
@@ -1,4 +1,4 @@
-depends g++             &&
+depends -sub CXX gcc             &&
 depends libpng          &&
 depends sdl             &&
 optional_depends OPENGL "" ""  "OpenGL Shading Language Backend"
diff --git a/libs/libsh/HISTORY b/libs/libsh/HISTORY
index ed8a583..b186912 100644
--- a/libs/libsh/HISTORY
+++ b/libs/libsh/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/libs/libsigc++/DEPENDS b/libs/libsigc++/DEPENDS
index bcd1eeb..f148724 100755
--- a/libs/libsigc++/DEPENDS
+++ b/libs/libsigc++/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/libs/libsigc++/HISTORY b/libs/libsigc++/HISTORY
index 115707d..d65220d 100644
--- a/libs/libsigc++/HISTORY
+++ b/libs/libsigc++/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-18 Martin Spitzbarth <m.spitzbarth AT gmx.de>
        * PRE_BUILD: added, apply patch for x86_64
        * config.sub.patch: added, patch for x86_64
diff --git a/libs/libsigc++2/DEPENDS b/libs/libsigc++2/DEPENDS
index 5e9f833..6f55f0a 100755
--- a/libs/libsigc++2/DEPENDS
+++ b/libs/libsigc++2/DEPENDS
@@ -1,2 +1,2 @@
 depends  pkgconfig  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/libs/libsigc++2/HISTORY b/libs/libsigc++2/HISTORY
index 3d64b84..6694c23 100644
--- a/libs/libsigc++2/HISTORY
+++ b/libs/libsigc++2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/libs/libsigc++3/DEPENDS b/libs/libsigc++3/DEPENDS
index 2c8032c..91b9ed1 100755
--- a/libs/libsigc++3/DEPENDS
+++ b/libs/libsigc++3/DEPENDS
@@ -1,2 +1,2 @@
 depends pkgconfig &&
-depends g++
+depends -sub CXX gcc
diff --git a/libs/libsigc++3/HISTORY b/libs/libsigc++3/HISTORY
index 160b6b1..47b8eae 100644
--- a/libs/libsigc++3/HISTORY
+++ b/libs/libsigc++3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-11 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.2.9
 
diff --git a/libs/libsynaptics/DEPENDS b/libs/libsynaptics/DEPENDS
index f3b30b0..5590065 100755
--- a/libs/libsynaptics/DEPENDS
+++ b/libs/libsynaptics/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  synaptics
diff --git a/libs/libsynaptics/HISTORY b/libs/libsynaptics/HISTORY
index 38b021c..211b4ab 100644
--- a/libs/libsynaptics/HISTORY
+++ b/libs/libsynaptics/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-05-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS: updated spell to 0.14.6c
 
diff --git a/libs/libtommath/DEPENDS b/libs/libtommath/DEPENDS
index 1c113e9..fa848c2 100755
--- a/libs/libtommath/DEPENDS
+++ b/libs/libtommath/DEPENDS
@@ -1 +1 @@
-depends g++ 
+depends -sub CXX gcc 
diff --git a/libs/libtommath/HISTORY b/libs/libtommath/HISTORY
index b70539e..803000b 100644
--- a/libs/libtommath/HISTORY
+++ b/libs/libtommath/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-09 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.41
          fixed SOURCE_URL & WEB_SITE
diff --git a/libs/libusb/DEPENDS b/libs/libusb/DEPENDS
index 0df0695..60149b4 100755
--- a/libs/libusb/DEPENDS
+++ b/libs/libusb/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 #
 # Fix Bug #8283
diff --git a/libs/libusb/HISTORY b/libs/libusb/HISTORY
index b2151d4..987c89d 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-06-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.0.8
 
diff --git a/libs/libvdpau/DEPENDS b/libs/libvdpau/DEPENDS
index 7547215..aba3d79 100755
--- a/libs/libvdpau/DEPENDS
+++ b/libs/libvdpau/DEPENDS
@@ -1,4 +1,4 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends libxext &&
 depends libx11  &&
 depends libxcb  &&
diff --git a/libs/libvdpau/HISTORY b/libs/libvdpau/HISTORY
index 543c8c1..46cd8f3 100644
--- a/libs/libvdpau/HISTORY
+++ b/libs/libvdpau/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-15 Arjan Bouter <abouter AT sourcemage.org>
        * DEPENDS: made doxygen optional and removed texlive dependency 
entirely
 
diff --git a/libs/libwpd/DEPENDS b/libs/libwpd/DEPENDS
index fd0b0eb..f148724 100755
--- a/libs/libwpd/DEPENDS
+++ b/libs/libwpd/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/libs/libwpd/HISTORY b/libs/libwpd/HISTORY
index 329c7db..094666b 100644
--- a/libs/libwpd/HISTORY
+++ b/libs/libwpd/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-11 Pol Vinogradov <vin.public AT gmail.com>
        * DETAILS: updated to 0.9.2
 
diff --git a/libs/libwpg/DEPENDS b/libs/libwpg/DEPENDS
index 8080a84..2e2f3be 100755
--- a/libs/libwpg/DEPENDS
+++ b/libs/libwpg/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends libwpd
diff --git a/libs/libwpg/HISTORY b/libs/libwpg/HISTORY
index b76456c..5dc2ae6 100644
--- a/libs/libwpg/HISTORY
+++ b/libs/libwpg/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-10 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.2.0
 
diff --git a/libs/libwps/DEPENDS b/libs/libwps/DEPENDS
index 8080a84..2e2f3be 100755
--- a/libs/libwps/DEPENDS
+++ b/libs/libwps/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends libwpd
diff --git a/libs/libwps/HISTORY b/libs/libwps/HISTORY
index b066bb7..e50d34a 100644
--- a/libs/libwps/HISTORY
+++ b/libs/libwps/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-10 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.2.0
 
diff --git a/libs/log4cpp/DEPENDS b/libs/log4cpp/DEPENDS
index b1b8d3e..d4505cf 100755
--- a/libs/log4cpp/DEPENDS
+++ b/libs/log4cpp/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends  doxygen                      \
                   '--enable-doxygen'           \
diff --git a/libs/log4cpp/HISTORY b/libs/log4cpp/HISTORY
index f226e48..f3d6424 100644
--- a/libs/log4cpp/HISTORY
+++ b/libs/log4cpp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-01-17 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: added, thanks to Jose Iria #12612
 
diff --git a/libs/loki/DEPENDS b/libs/loki/DEPENDS
index 1c113e9..fa848c2 100755
--- a/libs/loki/DEPENDS
+++ b/libs/loki/DEPENDS
@@ -1 +1 @@
-depends g++ 
+depends -sub CXX gcc 
diff --git a/libs/loki/HISTORY b/libs/loki/HISTORY
index 2e6a96a..e65d270 100644
--- a/libs/loki/HISTORY
+++ b/libs/loki/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/libs/muparser/DEPENDS b/libs/muparser/DEPENDS
index 1c113e9..fa848c2 100755
--- a/libs/muparser/DEPENDS
+++ b/libs/muparser/DEPENDS
@@ -1 +1 @@
-depends g++ 
+depends -sub CXX gcc 
diff --git a/libs/muparser/HISTORY b/libs/muparser/HISTORY
index 07c50a7..2a34bd0 100644
--- a/libs/muparser/HISTORY
+++ b/libs/muparser/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-10-07 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 1.30
 
diff --git a/libs/ncurses/DEPENDS b/libs/ncurses/DEPENDS
index b6fc0ec..ab43abe 100755
--- a/libs/ncurses/DEPENDS
+++ b/libs/ncurses/DEPENDS
@@ -1,7 +1,7 @@
 depends  gnupg     &&
 depends  smgl-fhs  &&
 
-optional_depends  g++                                     \
+optional_depends -sub CXX gcc                                     \
                   "--with-cxx  --with-cxx-binding"        \
                   "--without-cxx  --without-cxx-binding"  \
                   "for C++ support and bindings"          &&
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 5cecfb9..c986edc 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-27 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 5.8
        * INSTALL: make TMPSTAGING global
diff --git a/libs/nspr/DEPENDS b/libs/nspr/DEPENDS
index bd1f8d2..9cdc825 100755
--- a/libs/nspr/DEPENDS
+++ b/libs/nspr/DEPENDS
@@ -1 +1 @@
-depends g++ '--with-cplus'
+depends -sub CXX gcc '--with-cplus'
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index ef4f7f9..aecc392 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-16 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.8.8
 
diff --git a/libs/ode/DEPENDS b/libs/ode/DEPENDS
index 86cfce2..dc14d9e 100755
--- a/libs/ode/DEPENDS
+++ b/libs/ode/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends OPENGL \
                  "--with-drawstuff=X11" \
diff --git a/libs/ode/HISTORY b/libs/ode/HISTORY
index 48e80c8..d4dd2f7 100644
--- a/libs/ode/HISTORY
+++ b/libs/ode/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-21 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed sha512
 
diff --git a/libs/ois/DEPENDS b/libs/ois/DEPENDS
index 012f695..08eda35 100755
--- a/libs/ois/DEPENDS
+++ b/libs/ois/DEPENDS
@@ -1,3 +1,3 @@
-depends g++      &&
+depends -sub CXX gcc      &&
 depends autoconf &&
 depends automake
diff --git a/libs/ois/HISTORY b/libs/ois/HISTORY
index 97fc27d..e9c6aec 100644
--- a/libs/ois/HISTORY
+++ b/libs/ois/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS, PRE_BUILD: spell created
 
diff --git a/libs/openbabel/DEPENDS b/libs/openbabel/DEPENDS
index 07f8c7b..05ee304 100755
--- a/libs/openbabel/DEPENDS
+++ b/libs/openbabel/DEPENDS
@@ -1,5 +1,5 @@
 depends cmake    &&
-depends g++      &&
+depends -sub CXX gcc      &&
 depends libxml2  &&
 depends eigen2   &&
 optional_depends WXWIDGET '' '' 'build a GUI'  &&
diff --git a/libs/openbabel/HISTORY b/libs/openbabel/HISTORY
index fc621d8..51eb419 100644
--- a/libs/openbabel/HISTORY
+++ b/libs/openbabel/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-27 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.3.0 (stable and devel)
        * DEPENDS: add cmake, optional WXWIDGET, zlib, pcre
diff --git a/libs/openmpi/DEPENDS b/libs/openmpi/DEPENDS
index 551a698..dfb67ea 100755
--- a/libs/openmpi/DEPENDS
+++ b/libs/openmpi/DEPENDS
@@ -1,6 +1,6 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
-optional_depends fortran \
+optional_depends -sub FORTRAN gcc \
                  '--enable-mpi-f77 --disable-mpi-f90' \
                  '--disable-mpi-f77 --disable-mpi-f90' \
                  'Fortran support'
diff --git a/libs/openmpi/HISTORY b/libs/openmpi/HISTORY
index 6554300..5e02c52 100644
--- a/libs/openmpi/HISTORY
+++ b/libs/openmpi/HISTORY
@@ -1,3 +1,11 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2011-03-21 Peng Chang (Charles) <chp AT sourcemage.org>
        * DETAILS: updated spell to 1.4.3
          fixed long description wrap
diff --git a/libs/pcre/DEPENDS b/libs/pcre/DEPENDS
index 4f81a03..de7aa73 100755
--- a/libs/pcre/DEPENDS
+++ b/libs/pcre/DEPENDS
@@ -1,7 +1,7 @@
 depends gnupg &&
 depends smgl-fhs &&
 
-optional_depends g++ \
+optional_depends -sub CXX gcc \
                  "--enable-cpp" \
                  "--disable-cpp" \
                  "for C++ support"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 5836bc8..ef167ed 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-15 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 8.12
 
diff --git a/libs/protobuf/DEPENDS b/libs/protobuf/DEPENDS
index c9eb61f..081a39f 100755
--- a/libs/protobuf/DEPENDS
+++ b/libs/protobuf/DEPENDS
@@ -1,3 +1,3 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 optional_depends "python" "" "" "Python bindings"
 
diff --git a/libs/protobuf/HISTORY b/libs/protobuf/HISTORY
index 51ecec8..fc18df4 100644
--- a/libs/protobuf/HISTORY
+++ b/libs/protobuf/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.4.1
 
diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS
index 4be7d10..497820c 100755
--- a/libs/sdl/DEPENDS
+++ b/libs/sdl/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 optional_depends  nasm                        \
                   "--enable-nasm"             \
diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index cd3a695..dc3cc0d 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: corrected dependency flags
 
diff --git a/libs/silly/DEPENDS b/libs/silly/DEPENDS
index 2a47fac..0c3fd49 100755
--- a/libs/silly/DEPENDS
+++ b/libs/silly/DEPENDS
@@ -1,4 +1,4 @@
 depends JPEG    &&
 depends libpng  &&
 depends zlib    &&
-depends g++ 
+depends -sub CXX gcc 
diff --git a/libs/silly/HISTORY b/libs/silly/HISTORY
index 996a41a..1450969 100644
--- a/libs/silly/HISTORY
+++ b/libs/silly/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/libs/stlport/DEPENDS b/libs/stlport/DEPENDS
index ed60ef0..97c4784 100755
--- a/libs/stlport/DEPENDS
+++ b/libs/stlport/DEPENDS
@@ -1,4 +1,4 @@
-depends g++    &&
+depends -sub CXX gcc    &&
 depends boost  &&
 if  [  "$STLPORT_LATEST"  ==  "y"  ];  then
   depends  CVS
diff --git a/libs/stlport/HISTORY b/libs/stlport/HISTORY
index c958158..903a6e3 100644
--- a/libs/stlport/HISTORY
+++ b/libs/stlport/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-05-09 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Also pass extra LDFLAGS
          Fixes compilation with -Wl,--hash-style=<style>
diff --git a/libs/sword/DEPENDS b/libs/sword/DEPENDS
index b8deb56..6ad8080 100755
--- a/libs/sword/DEPENDS
+++ b/libs/sword/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 optional_depends  zlib                      \
                   "--with-zlib"             \
diff --git a/libs/sword/HISTORY b/libs/sword/HISTORY
index 1d8fb85..c7b71c4 100644
--- a/libs/sword/HISTORY
+++ b/libs/sword/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-06-08 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 1.6.0, changed SOURCE_URL
        * DEPENDS: revamped, added zlib as optional
diff --git a/libs/tbb/DEPENDS b/libs/tbb/DEPENDS
index fd0b0eb..f148724 100755
--- a/libs/tbb/DEPENDS
+++ b/libs/tbb/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index d154c22..0e0766c 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * DETAILS: quote DOCS
 
diff --git a/libs/tinyxml/DEPENDS b/libs/tinyxml/DEPENDS
index f5f6c9e..98b886e 100755
--- a/libs/tinyxml/DEPENDS
+++ b/libs/tinyxml/DEPENDS
@@ -1,2 +1,2 @@
 depends cmake &&
-depends g++ 
+depends -sub CXX gcc 
diff --git a/libs/tinyxml/HISTORY b/libs/tinyxml/HISTORY
index 9dd4cca..3ab473e 100644
--- a/libs/tinyxml/HISTORY
+++ b/libs/tinyxml/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, CMakeLists.txt, DEPENDS, DETAILS, PRE_BUILD: spell created
 
diff --git a/libs/xalan-c/DEPENDS b/libs/xalan-c/DEPENDS
index dedee59..0f42061 100755
--- a/libs/xalan-c/DEPENDS
+++ b/libs/xalan-c/DEPENDS
@@ -1,3 +1,3 @@
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  xerces-c &&
 optional_depends icu '-t icu' '' 'Unicode support'
diff --git a/libs/xalan-c/HISTORY b/libs/xalan-c/HISTORY
index 0e5e5ef..285214c 100644
--- a/libs/xalan-c/HISTORY
+++ b/libs/xalan-c/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-03-06 Treeve Jelbert <treeve AT sourcemage.org>
        * PREPARE: added, for svn support
        * DETAILS: add svn support
diff --git a/libs/xapian-core/DEPENDS b/libs/xapian-core/DEPENDS
index fd0b0eb..f148724 100755
--- a/libs/xapian-core/DEPENDS
+++ b/libs/xapian-core/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/libs/xapian-core/HISTORY b/libs/xapian-core/HISTORY
index d7f4e03..b48ade8 100644
--- a/libs/xapian-core/HISTORY
+++ b/libs/xapian-core/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-22 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated to 1.0.19
 
diff --git a/libs/xerces-c/DEPENDS b/libs/xerces-c/DEPENDS
index 4273c19..eb64e68 100755
--- a/libs/xerces-c/DEPENDS
+++ b/libs/xerces-c/DEPENDS
@@ -1,5 +1,5 @@
 #depends  autoconf        &&
-depends  g++             &&
+depends -sub CXX gcc             &&
 depends  pkgconfig       &&
 optional_depends  curl '-with-curl' '' '' &&
 optional_depends  icu  '--with-icu' '' 'ICU (unicode support)'
diff --git a/libs/xerces-c/HISTORY b/libs/xerces-c/HISTORY
index 2323203..7429250 100644
--- a/libs/xerces-c/HISTORY
+++ b/libs/xerces-c/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-24 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 3.1.1
 
diff --git a/libs/xmlada/DEPENDS b/libs/xmlada/DEPENDS
index 175563b..4251501 100755
--- a/libs/xmlada/DEPENDS
+++ b/libs/xmlada/DEPENDS
@@ -1 +1 @@
-depends ada
+depends -sub ADA gcc
diff --git a/libs/xmlada/HISTORY b/libs/xmlada/HISTORY
index 16029dd..0881b61 100644
--- a/libs/xmlada/HISTORY
+++ b/libs/xmlada/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2010-08-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.2.1
 
diff --git a/libs/xmlrpc-c/DEPENDS b/libs/xmlrpc-c/DEPENDS
index 4cf9e19..eb0e7fd 100755
--- a/libs/xmlrpc-c/DEPENDS
+++ b/libs/xmlrpc-c/DEPENDS
@@ -8,7 +8,7 @@ optional_depends w3c-libwww                 \
                  "--enable-libwww-client"   \
                  "--disable-libwww-client"  \
                  "Enable libwww support"    &&
-optional_depends g++                        \
+optional_depends -sub CXX gcc                        \
                  "--enable-cplusplus"       \
                  "--disable-cplusplus"      \
                  "Enable C++ support"
diff --git a/libs/xmlrpc-c/HISTORY b/libs/xmlrpc-c/HISTORY
index 05cb1b8..ad442f7 100644
--- a/libs/xmlrpc-c/HISTORY
+++ b/libs/xmlrpc-c/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-09-11 Elisamuel Resto <ryuji AT sourcemage.org>
        * DETAILS: updated stable branch to 1.06.30; chaged URLS to use $SPELL
 
diff --git a/lua-forge/luadbi/BUILD b/lua-forge/luadbi/BUILD
index 1e32713..e5f22d5 100755
--- a/lua-forge/luadbi/BUILD
+++ b/lua-forge/luadbi/BUILD
@@ -1,7 +1,11 @@
-cd "${SOURCE_DIRECTORY}" &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
+  make mysql
+fi &&
+
 if is_depends_enabled $SPELL postgresql; then
   make psql
 fi &&
+
 if is_depends_enabled $SPELL sqlite; then
   make sqlite3
 fi
diff --git a/lua-forge/luadbi/DEPENDS b/lua-forge/luadbi/DEPENDS
index f9043bf..2454f4f 100755
--- a/lua-forge/luadbi/DEPENDS
+++ b/lua-forge/luadbi/DEPENDS
@@ -1,6 +1,6 @@
+optional_depends MYSQL '' '' 'for mariadb/mysql support' &&
 optional_depends postgresql '' '' 'for postgresql support' &&
 optional_depends sqlite '' '' 'for sqlite support'
-# the next 3 are supported, feel free to test/enable them
-#optional_depends MYSQL '' '' 'for mariadb/mysql support'
+# the next 2 are supported, feel free to test/enable them
 #optional_depends something '' '' 'for oracle support'
 #optional_depends something '' '' 'for db2 support'
diff --git a/lua-forge/luadbi/DETAILS b/lua-forge/luadbi/DETAILS
index d16a3ef..897f6c3 100755
--- a/lua-forge/luadbi/DETAILS
+++ b/lua-forge/luadbi/DETAILS
@@ -1,9 +1,10 @@
            SPELL=luadbi
          VERSION=0.5
+      PATCHLEVEL=1
           SOURCE="${SPELL}.${VERSION}.tar.gz"
    SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
      
SOURCE_HASH=sha512:4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://code.google.com/p/luadbi/";
       LICENSE[0]=MIT
          ENTERED=20110408
diff --git a/lua-forge/luadbi/HISTORY b/lua-forge/luadbi/HISTORY
index 8470e2b..94f006d 100644
--- a/lua-forge/luadbi/HISTORY
+++ b/lua-forge/luadbi/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * DEPENDS: added mysql support; readability++
+       * INSTALL: simplicity++, verbosity++; corrected library path
+
 2011-04-08 Arjan Bouter <abouter AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
-
diff --git a/lua-forge/luadbi/INSTALL b/lua-forge/luadbi/INSTALL
index b04091e..ec436f0 100755
--- a/lua-forge/luadbi/INSTALL
+++ b/lua-forge/luadbi/INSTALL
@@ -1,10 +1,10 @@
-cd "${SOURCE_DIRECTORY}" &&
 LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)" &&
-LUADBI_INSTALL="${INSTALL_ROOT}/${LUA_LIB}/DBI" &&
-mkdir -p "${LUADBI_INSTALL}" &&
-install -m0755 DBI.lua "${LUADBI_INSTALL}/" &&
-if [ -e ./dbdpostgresql.so ]; then
-  install -m0755 dbdpostgresql.so "${LUADBI_INSTALL}/"
-elif [ -e ./dbdsqlite3.so ]; then
-  install -m0755 dbdsqlite3.so "${LUADBI_INSTALL}/"
-fi
+LUADBI_INSTALL="${INSTALL_ROOT}/${LUA_LIB}" &&
+
+install -vm 0755 -d "${LUADBI_INSTALL}" &&
+
+install -vm 0644 DBI.lua "${LUADBI_INSTALL}" &&
+
+for so in *.so; do
+  install -vm 0755 "$so" "${LUADBI_INSTALL}/$so"
+done
diff --git a/lua-forge/luasec/DETAILS b/lua-forge/luasec/DETAILS
index 3e621a3..27c38b1 100755
--- a/lua-forge/luasec/DETAILS
+++ b/lua-forge/luasec/DETAILS
@@ -1,8 +1,8 @@
            SPELL=luasec
-         VERSION=0.4
+         VERSION=0.4.1
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://luaforge.net/frs/download.php/4255/$SOURCE
-     
SOURCE_HASH=sha512:dfd1b7427ffbd0537707885cdf3ef0d453c745d0c37f682cae71c47374aff6a935d1687ffc8252cc25d5dec174644e962fbcac0e735ba3f07d633c432ecd08bc
+   SOURCE_URL[0]=http://www.inf.puc-rio.br/~brunoos/luasec/download/$SOURCE
+     
SOURCE_HASH=sha512:bc934e952294ec45c9c8cfb70f68ebcd415b241d4af8dbf649016a7d14d7da5380d12cbf490560425235168f2c5abbbcd48192068a4e8e6bf523c92cfbf604d9
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://luasec.luaforge.net/
       LICENSE[0]=MIT
diff --git a/lua-forge/luasec/HISTORY b/lua-forge/luasec/HISTORY
index 01ceec4..b1020ad 100644
--- a/lua-forge/luasec/HISTORY
+++ b/lua-forge/luasec/HISTORY
@@ -1,3 +1,6 @@
+2011-07-30 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.4.1; renewed source url
+
 2009-10-17 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 0.4
 
diff --git a/lxde/gpicview/DETAILS b/lxde/gpicview/DETAILS
index 95c5f4c..46e4bb1 100755
--- a/lxde/gpicview/DETAILS
+++ b/lxde/gpicview/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gpicview
-         VERSION=0.2.1
+         VERSION=0.2.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-     
SOURCE_HASH=sha512:f3ac22f24c78f3366eb478da6c34aa03194ba2f0ded519c83619ef8a1ef99b3da7176d83ac73cf4441abf7b07bd965af822149f7620536a6fba9ca200e2647d1
+     
SOURCE_HASH=sha512:b139952605270406e01b3af001e48a21aaed3021665e0c794974c950623e9fae59a333a496c9fa3f0cc5e577cbf1ac09c0878b6ea75cf105bc969b9ed3aa9b75
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=http://lxde.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/lxde/gpicview/HISTORY b/lxde/gpicview/HISTORY
index f4bd34f..c0cf9d9 100644
--- a/lxde/gpicview/HISTORY
+++ b/lxde/gpicview/HISTORY
@@ -1,3 +1,6 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.2.2
+
 2009-07-12 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated to version 0.2.1
 
diff --git a/lxde/lxterminal/DETAILS b/lxde/lxterminal/DETAILS
index 41b4184..af03af6 100755
--- a/lxde/lxterminal/DETAILS
+++ b/lxde/lxterminal/DETAILS
@@ -1,8 +1,8 @@
            SPELL=lxterminal
-         VERSION=0.1.9
+         VERSION=0.1.11
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-     
SOURCE_HASH=sha512:0084656ef6fab749504525baf0672c1606004d64058af0a8898421d4f01df9dba1fbefcb42d704675303b34fdd5c8bbb643e55767e7f520b2f4683fdbe7917d2
+     
SOURCE_HASH=sha512:4f929e9177775c78dcf4c440e1cff4f4824f56ff5bd165cb76ab42208db350feeb08d22449a482b3979160873b0120a78ace43069d910b5aeeec0736aa550139
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE=http://lxde.sourceforge.net/
       LICENSE[0]=GPL
diff --git a/lxde/lxterminal/HISTORY b/lxde/lxterminal/HISTORY
index 76b14e0..fbe827f 100644
--- a/lxde/lxterminal/HISTORY
+++ b/lxde/lxterminal/HISTORY
@@ -1,3 +1,6 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 0.1.11
+
 2010-11-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.1.9
 
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index ba04bca..359389b 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++                                                                 
&&
+depends -sub CXX gcc                                                         
        &&
 depends  nspr    '--with-system-nspr'                                        
&&
 depends  nss     '--with-system-nss'                                         
&&
 depends  zlib    '--with-system-zlib'                                        
&&
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 6173b86..c77aa53 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-04 George Sherwood <gsherwood AT sourcemage.org>
        * DEPENDS: Removed libpng.  Will not build against newer
          versions.  Use built-in
diff --git a/mobile/kismet/DEPENDS b/mobile/kismet/DEPENDS
index 1635f33..33b19fc 100755
--- a/mobile/kismet/DEPENDS
+++ b/mobile/kismet/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  freetype2  &&
 depends  autoconf   &&
 depends  libxml2    &&
diff --git a/mobile/kismet/HISTORY b/mobile/kismet/HISTORY
index 768d9bd..6feedfb 100644
--- a/mobile/kismet/HISTORY
+++ b/mobile/kismet/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-07-21 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 2010-07-R1
        * INSTALL: search in OPT not OPTS
diff --git a/mobile/mumpot/DEPENDS b/mobile/mumpot/DEPENDS
index c6079d5..af32b88 100755
--- a/mobile/mumpot/DEPENDS
+++ b/mobile/mumpot/DEPENDS
@@ -3,5 +3,5 @@ depends gettext &&
 depends libxml2 &&
 depends curl &&
 depends bison &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends bluez-libs
diff --git a/mobile/mumpot/HISTORY b/mobile/mumpot/HISTORY
index 70e86cc..c97bf9a 100644
--- a/mobile/mumpot/HISTORY
+++ b/mobile/mumpot/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/mobile/pilot-link/DEPENDS b/mobile/pilot-link/DEPENDS
index 644c84e..0056870 100755
--- a/mobile/pilot-link/DEPENDS
+++ b/mobile/pilot-link/DEPENDS
@@ -1,7 +1,7 @@
 depends popt                                  &&
 depends bison                                 &&
 depends pkgconfig                             &&
-optional_depends  g++                         \
+optional_depends -sub CXX gcc                         \
                   ""                          \
                   ""                          \
                   "for a c++ library"         &&
diff --git a/mobile/pilot-link/HISTORY b/mobile/pilot-link/HISTORY
index 86bc6d1..74f2e5f 100644
--- a/mobile/pilot-link/HISTORY
+++ b/mobile/pilot-link/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-05 Thomas Orgis <sobukus AT sourcemage.org>
        * DETAILS: bumped to 0.12.5
 
diff --git a/mobile/plptools/DEPENDS b/mobile/plptools/DEPENDS
index 730f684..328fa73 100755
--- a/mobile/plptools/DEPENDS
+++ b/mobile/plptools/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends fuse
diff --git a/mobile/plptools/HISTORY b/mobile/plptools/HISTORY
index 11238bc..aac9a99 100644
--- a/mobile/plptools/HISTORY
+++ b/mobile/plptools/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-28 Lubomir Blaha <tritol AT trilogic.cz>
        * DEPENDS: removed kdelibs (no longer needed)
          added fuse (for plpfuse)
diff --git a/mobile/powersave/DEPENDS b/mobile/powersave/DEPENDS
index 793e2fa..103cfe0 100755
--- a/mobile/powersave/DEPENDS
+++ b/mobile/powersave/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++           &&
+depends -sub CXX gcc           &&
 depends  automake      &&
 depends  pkgconfig     &&
 depends  cpufrequtils  &&
diff --git a/mobile/powersave/HISTORY b/mobile/powersave/HISTORY
index bfe8194..de2b46e 100644
--- a/mobile/powersave/HISTORY
+++ b/mobile/powersave/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-07 Armando Vega <synan AT rilinux.hr>
        * DETAILS: version bump to 0.14.0
        * DEPENDS: added depends on dbus-glib and hal
diff --git a/mobile/rutilt/DEPENDS b/mobile/rutilt/DEPENDS
index 92cd9f6..8e0c953 100755
--- a/mobile/rutilt/DEPENDS
+++ b/mobile/rutilt/DEPENDS
@@ -1,2 +1,2 @@
 depends  gtk+2  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/mobile/rutilt/HISTORY b/mobile/rutilt/HISTORY
index 8330995..ef19529 100644
--- a/mobile/rutilt/HISTORY
+++ b/mobile/rutilt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-11-10 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.18
 
diff --git a/net/bitcoin/DEPENDS b/net/bitcoin/DEPENDS
index 3070d31..9e66132 100755
--- a/net/bitcoin/DEPENDS
+++ b/net/bitcoin/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends wxgtk-new &&
 depends boost &&
 depends db &&
diff --git a/net/bitcoin/HISTORY b/net/bitcoin/HISTORY
index b37eb57..656d1d2 100644
--- a/net/bitcoin/HISTORY
+++ b/net/bitcoin/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-24 Ismael Luceno <ismael AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created
 
diff --git a/net/ifstatus/DEPENDS b/net/ifstatus/DEPENDS
index f3a9175..ecb6a35 100755
--- a/net/ifstatus/DEPENDS
+++ b/net/ifstatus/DEPENDS
@@ -1,2 +1,2 @@
 depends ncurses &&
-depends g++
+depends -sub CXX gcc
diff --git a/net/ifstatus/HISTORY b/net/ifstatus/HISTORY
index 936d8f7..702d157 100644
--- a/net/ifstatus/HISTORY
+++ b/net/ifstatus/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-05-29 Remko van der Vossen <wich AT sourcemage.org>
        * PRE_BUILD: fixes bug 14503 (cstdlib includes for gcc 4.3)
 
diff --git a/net/jigdo/DEPENDS b/net/jigdo/DEPENDS
index a5346af..0e48aeb 100755
--- a/net/jigdo/DEPENDS
+++ b/net/jigdo/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  zlib  &&
 depends  bzip2  &&
 depends  curl  &&
diff --git a/net/jigdo/HISTORY b/net/jigdo/HISTORY
index 8c7dd18..b4cf1de 100644
--- a/net/jigdo/HISTORY
+++ b/net/jigdo/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-12 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed SOURCE_URL & WEB_SITE
 
diff --git a/net/lisa/DEPENDS b/net/lisa/DEPENDS
index 90a8f38..374c067 100755
--- a/net/lisa/DEPENDS
+++ b/net/lisa/DEPENDS
@@ -1,4 +1,4 @@
 depends  autoconf  &&
 depends  automake  &&
 depends  gcc34
-depends  g++
+depends -sub CXX gcc
diff --git a/net/lisa/HISTORY b/net/lisa/HISTORY
index d900203..aa728b0 100644
--- a/net/lisa/HISTORY
+++ b/net/lisa/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * BUILD: removed invoke_gcc #10641
 
diff --git a/net/netkit-telnet/DEPENDS b/net/netkit-telnet/DEPENDS
index 8f43e48..d29837a 100755
--- a/net/netkit-telnet/DEPENDS
+++ b/net/netkit-telnet/DEPENDS
@@ -1,2 +1,2 @@
 depends  ncurses  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/net/netkit-telnet/HISTORY b/net/netkit-telnet/HISTORY
index d2d4fd2..dd98d8d 100644
--- a/net/netkit-telnet/HISTORY
+++ b/net/netkit-telnet/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-06-02 Robert Figura <template AT sourcemage.org>
        * CONFLICTS: krb5-appl, telnet-bsd
 
diff --git a/net/nload/DEPENDS b/net/nload/DEPENDS
index fd0b0eb..f148724 100755
--- a/net/nload/DEPENDS
+++ b/net/nload/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/net/nload/HISTORY b/net/nload/HISTORY
index 5a5c962..4251440 100644
--- a/net/nload/HISTORY
+++ b/net/nload/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-09-09 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.7.2
        * DEPENDS: added, needs g++
diff --git a/net/openwbem/DEPENDS b/net/openwbem/DEPENDS
index 78b67b6..942f71c 100755
--- a/net/openwbem/DEPENDS
+++ b/net/openwbem/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 
 optional_depends linux-pam              \
                  "--enable-pam"         \
diff --git a/net/openwbem/HISTORY b/net/openwbem/HISTORY
index 74e1110..8989f5e 100644
--- a/net/openwbem/HISTORY
+++ b/net/openwbem/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 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/paris-traceroute/DEPENDS b/net/paris-traceroute/DEPENDS
index fd0b0eb..f148724 100755
--- a/net/paris-traceroute/DEPENDS
+++ b/net/paris-traceroute/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/net/paris-traceroute/HISTORY b/net/paris-traceroute/HISTORY
index e6e064f..6f8ca40 100644
--- a/net/paris-traceroute/HISTORY
+++ b/net/paris-traceroute/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS, HISTORY: created this spell, version 0.92-dev
 
diff --git a/net/tcptrack/DEPENDS b/net/tcptrack/DEPENDS
index 36d2db2..f6d025d 100755
--- a/net/tcptrack/DEPENDS
+++ b/net/tcptrack/DEPENDS
@@ -1,3 +1,3 @@
 depends libpcap &&
 depends ncurses &&
-depends g++
+depends -sub CXX gcc
diff --git a/net/tcptrack/HISTORY b/net/tcptrack/HISTORY
index 073dc93..932eb94 100644
--- a/net/tcptrack/HISTORY
+++ b/net/tcptrack/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/net/wvstreams/DEPENDS b/net/wvstreams/DEPENDS
index e791bc7..06f1bda 100755
--- a/net/wvstreams/DEPENDS
+++ b/net/wvstreams/DEPENDS
@@ -1,4 +1,4 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends openssl &&
 depends zlib    &&
 depends xplc    &&
diff --git a/net/wvstreams/HISTORY b/net/wvstreams/HISTORY
index 92e1d81..98c8b24 100644
--- a/net/wvstreams/HISTORY
+++ b/net/wvstreams/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-12 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 4.6.1 & cleanup
        * wvstreams-4.6.1-glibc212.patch: added to compile & bug #15902
diff --git a/net/xplc/DEPENDS b/net/xplc/DEPENDS
index fd0b0eb..f148724 100755
--- a/net/xplc/DEPENDS
+++ b/net/xplc/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/net/xplc/HISTORY b/net/xplc/HISTORY
index 5a53c56..499eef4 100644
--- a/net/xplc/HISTORY
+++ b/net/xplc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/odbc-drivers/odbcfb/DEPENDS b/odbc-drivers/odbcfb/DEPENDS
index 255040a..c5bd257 100755
--- a/odbc-drivers/odbcfb/DEPENDS
+++ b/odbc-drivers/odbcfb/DEPENDS
@@ -1,4 +1,4 @@
 depends  FIREBIRD &&
-depends  g++   &&
+depends -sub CXX gcc   &&
 #  libiodbc is missing some needed headers??
 depends ODBC-MGR
diff --git a/odbc-drivers/odbcfb/HISTORY b/odbc-drivers/odbcfb/HISTORY
index b1eccad..6dd6ebc 100644
--- a/odbc-drivers/odbcfb/HISTORY
+++ b/odbc-drivers/odbcfb/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-24 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version RC2-2.0.0150
        * INSTALL: fix x86-64 install
diff --git a/odbc-drivers/picoodbc/DEPENDS b/odbc-drivers/picoodbc/DEPENDS
index 57484d2..3c750df 100755
--- a/odbc-drivers/picoodbc/DEPENDS
+++ b/odbc-drivers/picoodbc/DEPENDS
@@ -1,3 +1,3 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  ODBC-MGR  &&
 depends  picosql
diff --git a/odbc-drivers/picoodbc/HISTORY b/odbc-drivers/picoodbc/HISTORY
index 1fa2d48..95806f7 100644
--- a/odbc-drivers/picoodbc/HISTORY
+++ b/odbc-drivers/picoodbc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-06-23 Treeve Jelbert <treeve AT sourcemage.org>
        * FINAL, POST_RESURRECT: move to section level
        * POST_REMOVE: make compatible with libiodbc
diff --git a/perl-cpan/alien-wxwidgets/DEPENDS 
b/perl-cpan/alien-wxwidgets/DEPENDS
index 2545d75..f9d54e1 100755
--- a/perl-cpan/alien-wxwidgets/DEPENDS
+++ b/perl-cpan/alien-wxwidgets/DEPENDS
@@ -1,4 +1,4 @@
 depends perl &&
-depends g++  &&
+depends -sub CXX gcc  &&
 depends WXWIDGET &&
 depends extutils-cbuilder
diff --git a/perl-cpan/alien-wxwidgets/HISTORY 
b/perl-cpan/alien-wxwidgets/HISTORY
index 65ce3a4..9c69684 100644
--- a/perl-cpan/alien-wxwidgets/HISTORY
+++ b/perl-cpan/alien-wxwidgets/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-19 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD: added
          don't let it download its own copy of wxwidgets
diff --git a/perl-cpan/digest-sha1/DETAILS b/perl-cpan/digest-sha1/DETAILS
index 30e30a6..ead5c61 100755
--- a/perl-cpan/digest-sha1/DETAILS
+++ b/perl-cpan/digest-sha1/DETAILS
@@ -1,14 +1,14 @@
            SPELL=digest-sha1
-         VERSION=2.06
+         VERSION=2.13
           SOURCE=Digest-SHA1-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Digest-SHA1-$VERSION
-   SOURCE_URL[0]=http://www.cpan.org/authors/id/GAAS/$SOURCE
-     
SOURCE_HASH=sha512:b2aca0eaec4a00ae7e77699de9790daf7111df8aa1375269dc7a413c860482564a978a2cc2b87e688b42e6d28d90d9326c10c598eaf51920aeea7ca69c87ef22
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/Digest-SHA1-$VERSION"
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/GAAS/$SOURCE
+     
SOURCE_HASH=sha512:44d0c57ecc7d2126a0387552e76c9204e45fba174af6ff7abc1c9ae00d549eb7370ee20948caf12fafefedec0098b8231249d14b109c53470ee1d5bf3de3305d
          LICENSE=ART
         WEB_SITE=http://gisle.aas.no
          ENTERED=20020313
         KEYWORDS="perl"
-           SHORT="Perl interface to the SHA-1 Algorithm "
+           SHORT="Perl interface to the SHA-1 Algorithm"
 cat << EOF
 The "Digest::SHA1" module allows you to use the NIST SHA-1
 message digest algorithm from within Perl programs.  The
diff --git a/perl-cpan/digest-sha1/HISTORY b/perl-cpan/digest-sha1/HISTORY
index 23ebf0a..b1de5b1 100644
--- a/perl-cpan/digest-sha1/HISTORY
+++ b/perl-cpan/digest-sha1/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.13; cleaned up; quoting paths
+
 2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: useless
 
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index b7e0dac..3156326 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -1,5 +1,5 @@
 depends  zlib                                     &&
-depends  g++                                      &&
+depends -sub CXX gcc                                      &&
 depends  pkgconfig                                &&
 
 optional_depends  JPEG                            \
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index 63ebd5f..d073d06 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-30 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: don't install extra lang dir (needed for Mac OS X)
        * DETAILS: PATCHLEVEL=1
diff --git a/printer/exaro/DEPENDS b/printer/exaro/DEPENDS
index fd514e7..12fce56 100755
--- a/printer/exaro/DEPENDS
+++ b/printer/exaro/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends qt4  &&
 depends shared-mime-info &&
 depends cmake &&
diff --git a/printer/exaro/HISTORY b/printer/exaro/HISTORY
index a8d02f7..dd00c3a 100644
--- a/printer/exaro/HISTORY
+++ b/printer/exaro/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-15 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: WEB_SITE now at google
 
diff --git a/printer/photoprint/DEPENDS b/printer/photoprint/DEPENDS
index 479269a..5bbc8d9 100755
--- a/printer/photoprint/DEPENDS
+++ b/printer/photoprint/DEPENDS
@@ -1,4 +1,4 @@
-depends g++        &&
+depends -sub CXX gcc        &&
 depends pkgconfig  &&
 depends gutenprint &&
 depends gtk+2      &&
diff --git a/printer/photoprint/HISTORY b/printer/photoprint/HISTORY
index 0daf49f..c4fa243 100644
--- a/printer/photoprint/HISTORY
+++ b/printer/photoprint/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/printer/splix/DEPENDS b/printer/splix/DEPENDS
index 45a4fc3..7158bc1 100755
--- a/printer/splix/DEPENDS
+++ b/printer/splix/DEPENDS
@@ -1,4 +1,4 @@
-depends g++   &&
+depends -sub CXX gcc   &&
 depends cups    &&
 optional_depends jbigkit 'DISABLE_JBIG=0' \
                          'DISABLE_JBIG=1' \
diff --git a/printer/splix/HISTORY b/printer/splix/HISTORY
index cceef21..a95f8a6 100644
--- a/printer/splix/HISTORY
+++ b/printer/splix/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-02-06 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.0
 
diff --git a/printer/zint/DEPENDS b/printer/zint/DEPENDS
index a29a445..0d47120 100755
--- a/printer/zint/DEPENDS
+++ b/printer/zint/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends cmake   &&
 depends libpng  &&
 depends openssl &&
diff --git a/printer/zint/HISTORY b/printer/zint/HISTORY
index bf03270..b9bb857 100644
--- a/printer/zint/HISTORY
+++ b/printer/zint/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-09-16 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: fixed description
          updated spell to 2.4.0
diff --git a/science-libs/clhep/DEPENDS b/science-libs/clhep/DEPENDS
index bcd1eeb..f148724 100755
--- a/science-libs/clhep/DEPENDS
+++ b/science-libs/clhep/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/science-libs/clhep/HISTORY b/science-libs/clhep/HISTORY
index ad7c5d5..908772b 100644
--- a/science-libs/clhep/HISTORY
+++ b/science-libs/clhep/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/science-libs/eigen/DEPENDS b/science-libs/eigen/DEPENDS
index 02264a0..5f2461d 100755
--- a/science-libs/eigen/DEPENDS
+++ b/science-libs/eigen/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends cmake
diff --git a/science-libs/eigen/HISTORY b/science-libs/eigen/HISTORY
index 740374a..aa7b585 100644
--- a/science-libs/eigen/HISTORY
+++ b/science-libs/eigen/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-07-07 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.5
          spell created
diff --git a/science-libs/eigen2/DEPENDS b/science-libs/eigen2/DEPENDS
index 02264a0..5f2461d 100755
--- a/science-libs/eigen2/DEPENDS
+++ b/science-libs/eigen2/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends cmake
diff --git a/science-libs/eigen2/HISTORY b/science-libs/eigen2/HISTORY
index c4eb93f..688bcef 100644
--- a/science-libs/eigen2/HISTORY
+++ b/science-libs/eigen2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-26 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: sha512 updated, #16000
 
diff --git a/science-libs/eigen3/DEPENDS b/science-libs/eigen3/DEPENDS
index 02264a0..5f2461d 100755
--- a/science-libs/eigen3/DEPENDS
+++ b/science-libs/eigen3/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends cmake
diff --git a/science-libs/eigen3/HISTORY b/science-libs/eigen3/HISTORY
index 69b6cef..d8bedca 100644
--- a/science-libs/eigen3/HISTORY
+++ b/science-libs/eigen3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-31 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.0.1
 
diff --git a/science-libs/gmm/DEPENDS b/science-libs/gmm/DEPENDS
index 33f8005..cf20e51 100755
--- a/science-libs/gmm/DEPENDS
+++ b/science-libs/gmm/DEPENDS
@@ -1,2 +1,2 @@
-depends g++
+depends -sub CXX gcc
 
diff --git a/science-libs/gmm/HISTORY b/science-libs/gmm/HISTORY
index 366de77..526fda7 100644
--- a/science-libs/gmm/HISTORY
+++ b/science-libs/gmm/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-12-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.1
          spell created
diff --git a/science-libs/gtkmathview/DEPENDS 
b/science-libs/gtkmathview/DEPENDS
index dda1a49..caf7882 100755
--- a/science-libs/gtkmathview/DEPENDS
+++ b/science-libs/gtkmathview/DEPENDS
@@ -1,4 +1,4 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends gtk+2   &&
 depends libxml2 &&
 
diff --git a/science-libs/gtkmathview/HISTORY 
b/science-libs/gtkmathview/HISTORY
index ec1f23c..2af82cd 100644
--- a/science-libs/gtkmathview/HISTORY
+++ b/science-libs/gtkmathview/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/science-libs/lmfit/DEPENDS b/science-libs/lmfit/DEPENDS
index 1c113e9..fa848c2 100755
--- a/science-libs/lmfit/DEPENDS
+++ b/science-libs/lmfit/DEPENDS
@@ -1 +1 @@
-depends g++ 
+depends -sub CXX gcc 
diff --git a/science-libs/lmfit/HISTORY b/science-libs/lmfit/HISTORY
index db1776b..87b25fc 100644
--- a/science-libs/lmfit/HISTORY
+++ b/science-libs/lmfit/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/science/boinc/DEPENDS b/science/boinc/DEPENDS
index 247c9da..32bf299 100755
--- a/science/boinc/DEPENDS
+++ b/science/boinc/DEPENDS
@@ -2,7 +2,7 @@ depends  subversion  &&
 depends  autoconf    &&
 depends  automake    &&
 depends  curl        &&
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  openssl     &&
 depends  psmisc      &&
 depends  zlib        &&
diff --git a/science/boinc/HISTORY b/science/boinc/HISTORY
index 6be0180..ca15512 100644
--- a/science/boinc/HISTORY
+++ b/science/boinc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/science/cocoalib/DEPENDS b/science/cocoalib/DEPENDS
index a1291d1..b4ac78c 100755
--- a/science/cocoalib/DEPENDS
+++ b/science/cocoalib/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends gmp "--with-libgmp=${INSTALL_ROOT}/usr/lib/libgmp.a"
diff --git a/science/cocoalib/HISTORY b/science/cocoalib/HISTORY
index 88a7037..b7206e7 100644
--- a/science/cocoalib/HISTORY
+++ b/science/cocoalib/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/science/ggobi/DEPENDS b/science/ggobi/DEPENDS
index 3047dca..c08bbdf 100755
--- a/science/ggobi/DEPENDS
+++ b/science/ggobi/DEPENDS
@@ -1,4 +1,4 @@
 depends gtk+2   &&
 depends libxml2 &&
-depends g++     &&
-depends fortran
+depends -sub CXX gcc     &&
+depends -sub FORTRAN gcc
diff --git a/science/ggobi/HISTORY b/science/ggobi/HISTORY
index 7dc9f4d..656d95e 100644
--- a/science/ggobi/HISTORY
+++ b/science/ggobi/HISTORY
@@ -1,3 +1,11 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2010-12-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/science/giac/DEPENDS b/science/giac/DEPENDS
index 644ae28..167a0d3 100755
--- a/science/giac/DEPENDS
+++ b/science/giac/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends gmp &&
 depends mpfr &&
 depends ntl &&
@@ -6,7 +6,7 @@ depends pari &&
 depends cocoalib &&
 depends gsl &&
 depends fltk  &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends gmp &&
 depends mpfr &&
 depends ntl &&
diff --git a/science/giac/HISTORY b/science/giac/HISTORY
index 8deeb49..58bd30a 100644
--- a/science/giac/HISTORY
+++ b/science/giac/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS: spell created
 
diff --git a/science/gnucap/DEPENDS b/science/gnucap/DEPENDS
index bc034be..dd20cd2 100755
--- a/science/gnucap/DEPENDS
+++ b/science/gnucap/DEPENDS
@@ -1,3 +1,3 @@
-depends g++       &&
+depends -sub CXX gcc       &&
 depends readline  &&
 depends ncurses
diff --git a/science/gnucap/HISTORY b/science/gnucap/HISTORY
index 3d57ce5..c80992f 100644
--- a/science/gnucap/HISTORY
+++ b/science/gnucap/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-27 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: Fixed SOURCE_URL[0] & WEB_SITE
          updated spell to 2009-12-07
diff --git a/science/ntl/DEPENDS b/science/ntl/DEPENDS
index 7080b19..7c14db3 100755
--- a/science/ntl/DEPENDS
+++ b/science/ntl/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends gmp &&
 depends perl
diff --git a/science/ntl/HISTORY b/science/ntl/HISTORY
index 88a7037..b7206e7 100644
--- a/science/ntl/HISTORY
+++ b/science/ntl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/science/octave-devel/DEPENDS b/science/octave-devel/DEPENDS
index 32dd483..91fe7d7 100755
--- a/science/octave-devel/DEPENDS
+++ b/science/octave-devel/DEPENDS
@@ -1,4 +1,4 @@
-depends  fortran  &&
+depends -sub FORTRAN gcc  &&
 
 optional_depends  gnuplot                 \
                   ''                      \
diff --git a/science/octave-devel/HISTORY b/science/octave-devel/HISTORY
index 7dc0c1b..d904305 100644
--- a/science/octave-devel/HISTORY
+++ b/science/octave-devel/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2007-08-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DETAILS, DEPENDS, FINAL, INSTALL: synced from octave
 
diff --git a/science/octave/DEPENDS b/science/octave/DEPENDS
index e863209..48417cd 100755
--- a/science/octave/DEPENDS
+++ b/science/octave/DEPENDS
@@ -1,4 +1,4 @@
-depends  fortran  &&
+depends -sub FORTRAN gcc  &&
 
 optional_depends  gnuplot                 \
                   ''                      \
diff --git a/science/octave/HISTORY b/science/octave/HISTORY
index 356816f..4914167 100644
--- a/science/octave/HISTORY
+++ b/science/octave/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2011-05-18 Peng Chang (Charles) <chp AT sourcemage.org>
        * DETAILS: updated spell to 3.4.0
          fixed SOURCE1_URL[0]
diff --git a/science/orsa/DEPENDS b/science/orsa/DEPENDS
index fd6dec4..b5d1162 100755
--- a/science/orsa/DEPENDS
+++ b/science/orsa/DEPENDS
@@ -1,3 +1,3 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends OPENGL &&
 depends qt-x11
diff --git a/science/orsa/HISTORY b/science/orsa/HISTORY
index e9e937c..f63648d 100644
--- a/science/orsa/HISTORY
+++ b/science/orsa/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/science/pari/DEPENDS b/science/pari/DEPENDS
index a701b23..c441295 100755
--- a/science/pari/DEPENDS
+++ b/science/pari/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends gmp "--with-gmp" "--without-gmp" "use the GMP kernel" &&
 optional_depends readline "--with-readline" "--without-readline" "support 
for line editing" &&
 depends perl  &&
diff --git a/science/pari/HISTORY b/science/pari/HISTORY
index 88a7037..b7206e7 100644
--- a/science/pari/HISTORY
+++ b/science/pari/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/science/plplot/DEPENDS b/science/plplot/DEPENDS
index 6a9a6f5..33be4a4 100755
--- a/science/plplot/DEPENDS
+++ b/science/plplot/DEPENDS
@@ -1,14 +1,14 @@
-optional_depends ada \
+optional_depends -sub ADA gcc \
     "-DENABLE_ada=ON" \
     "-DENABLE_ada=OFF" \
     "Ada bindings" &&
 depends cairo &&
 depends cmake &&
-optional_depends fortran \
+optional_depends -sub FORTRAN gcc \
     "-DENABLE_f77=ON -DENABLE_f95=ON" \
     "-DENABLE_f77=OFF -DENABLE_f95=OFF" \
     "Fortran bindings" &&
-optional_depends g++ \
+optional_depends -sub CXX gcc \
     "-DENABLE_cxx=ON" \
     "-DENABLE_cxx=OFF" \
     "C++ bindings" &&
diff --git a/science/plplot/HISTORY b/science/plplot/HISTORY
index 61f779b..3fa25db 100644
--- a/science/plplot/HISTORY
+++ b/science/plplot/HISTORY
@@ -1,3 +1,15 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2010-12-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, DEPENDS: added optional dependency on numpy
 
diff --git a/science/ppl/DEPENDS b/science/ppl/DEPENDS
index 9418f43..b559f24 100755
--- a/science/ppl/DEPENDS
+++ b/science/ppl/DEPENDS
@@ -1,2 +1,2 @@
 depends -sub GMP_CXX gmp &&
-depends g++
+depends -sub CXX gcc
diff --git a/science/ppl/HISTORY b/science/ppl/HISTORY
index 0e9f6cd..d2bdefd 100644
--- a/science/ppl/HISTORY
+++ b/science/ppl/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: added missing sub depends on gmp -> g++
 
diff --git a/science/r/DEPENDS b/science/r/DEPENDS
index 6488df5..156da2c 100755
--- a/science/r/DEPENDS
+++ b/science/r/DEPENDS
@@ -1,6 +1,6 @@
 depends  ncurses   &&
-depends  fortran   &&
-depends  g++       &&
+depends -sub FORTRAN gcc   &&
+depends -sub CXX gcc       &&
 
 # also looks for but not sure if it needs
 # less, perl, TeX, laTeX, unzip, zip, gzip,
diff --git a/science/r/HISTORY b/science/r/HISTORY
index 0be17df..a97cd1b 100644
--- a/science/r/HISTORY
+++ b/science/r/HISTORY
@@ -1,3 +1,11 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2011-05-12 Peng Chang (Charles) <chp AT sourcemage.org>
        * BUILD: removed deprecated options; set LIBnn env var
        * CONFIGURE: deprecated
diff --git a/science/scilab/DEPENDS b/science/scilab/DEPENDS
index 75114b9..035cdf3 100755
--- a/science/scilab/DEPENDS
+++ b/science/scilab/DEPENDS
@@ -1,5 +1,5 @@
 depends  xorg-libs  &&
-depends  fortran   &&
+depends -sub FORTRAN gcc   &&
 
 if    [  "$SCILAB_GUI" = "gtk+2"  ];  then
   depends  gtk+2  '--with-gtk2'  &&
diff --git a/science/scilab/HISTORY b/science/scilab/HISTORY
index ba3a6e8..b7d68b0 100644
--- a/science/scilab/HISTORY
+++ b/science/scilab/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/science/stellarium/DEPENDS b/science/stellarium/DEPENDS
index b931680..65013c1 100755
--- a/science/stellarium/DEPENDS
+++ b/science/stellarium/DEPENDS
@@ -2,7 +2,7 @@ depends  boost      &&
 depends  cmake      &&
 depends  curl       &&
 depends  freetype2  &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  gettext    &&
 depends  GLUT       &&
 depends  JPEG       &&
diff --git a/science/stellarium/HISTORY b/science/stellarium/HISTORY
index bdeaa40..7e1bb95 100644
--- a/science/stellarium/HISTORY
+++ b/science/stellarium/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-03 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 0.11.0
 
diff --git a/science/tisean/DEPENDS b/science/tisean/DEPENDS
index e247164..8a59ffa 100755
--- a/science/tisean/DEPENDS
+++ b/science/tisean/DEPENDS
@@ -1,2 +1,2 @@
-depends fortran &&
+depends -sub FORTRAN gcc &&
 optional_depends gnuplot "" "" "for viewing examples"
diff --git a/science/tisean/HISTORY b/science/tisean/HISTORY
index 95eed64..e72d5c0 100644
--- a/science/tisean/HISTORY
+++ b/science/tisean/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2007-03-06 Thomas Orgis <sobukus AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS, HISTORY, INSTALL, README.local: created 
spell
diff --git a/science/xd3d/DEPENDS b/science/xd3d/DEPENDS
index b0aad50..63da2c4 100755
--- a/science/xd3d/DEPENDS
+++ b/science/xd3d/DEPENDS
@@ -1,2 +1,2 @@
 depends xorg-libs  &&
-depends fortran
+depends -sub FORTRAN gcc
diff --git a/science/xd3d/HISTORY b/science/xd3d/HISTORY
index cd07793..bf7fe29 100644
--- a/science/xd3d/HISTORY
+++ b/science/xd3d/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index dec4746..e6d023f 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 config_query_list ZENMAP "Who should provide the zenmap graphical frontend?" 
\
   none "python with sqlite support" "pysqlite" &&
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index c7e0571..af43985 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-12 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 5.51
 
diff --git a/security/nsat/DEPENDS b/security/nsat/DEPENDS
index da30740..45e0bbc 100755
--- a/security/nsat/DEPENDS
+++ b/security/nsat/DEPENDS
@@ -1,2 +1,2 @@
 depends  libpcap  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/security/nsat/HISTORY b/security/nsat/HISTORY
index c14a846..d4aaa75 100644
--- a/security/nsat/HISTORY
+++ b/security/nsat/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-09-04 Arjan Bouter <abouter AT sourcemage.org>
        * PRE_BUILD, nsat.patch: added, patch is from the sf project page
        * DEPENDS: added missing dep on g++
diff --git a/security/xprobe2/DEPENDS b/security/xprobe2/DEPENDS
index 4da315c..412d400 100755
--- a/security/xprobe2/DEPENDS
+++ b/security/xprobe2/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  libpcap
diff --git a/security/xprobe2/HISTORY b/security/xprobe2/HISTORY
index 6cc7a8b..e87f051 100644
--- a/security/xprobe2/HISTORY
+++ b/security/xprobe2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/shell-term-fm/rxvt-unicode/DEPENDS 
b/shell-term-fm/rxvt-unicode/DEPENDS
index 1363328..a384fdc 100755
--- a/shell-term-fm/rxvt-unicode/DEPENDS
+++ b/shell-term-fm/rxvt-unicode/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libxrender &&
 
 optional_depends  libxft           \
diff --git a/shell-term-fm/rxvt-unicode/HISTORY 
b/shell-term-fm/rxvt-unicode/HISTORY
index fcb3ba2..d4b9986 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-30 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 9.12
 
diff --git a/shell-term-fm/sakura/DETAILS b/shell-term-fm/sakura/DETAILS
index 4b1d658..ad1b910 100755
--- a/shell-term-fm/sakura/DETAILS
+++ b/shell-term-fm/sakura/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sakura
-         VERSION=2.4.0
+         VERSION=2.4.2
           SOURCE=$SPELL-$VERSION.tar.bz2
-     
SOURCE_HASH=sha512:5614b8ca64e197b7c53bd5d8f5aef6a04e8b7fa3d48bc7b4f59986ad05e9d1591302337b6bb92ccba4887018ebe47cc092fc8db3442c76591cd087ccf8520cf6
+     
SOURCE_HASH=sha512:97a4721771d9512a9b78ddcde3425cf5dd08540ec15ef4236e032319db7db35149ba0223a64849aca70b9e5b091c9bdf237a7be852cb54b79f6d79ab17945d3b
    SOURCE_URL[0]=http://pleyades.net/david/projects/sakura/$SOURCE
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://www.pleyades.net/david/sakura.php
diff --git a/shell-term-fm/sakura/HISTORY b/shell-term-fm/sakura/HISTORY
index f9ae31e..426aa0f 100644
--- a/shell-term-fm/sakura/HISTORY
+++ b/shell-term-fm/sakura/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.4.2
+
 2011-02-12 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.4.0
 
diff --git a/shell-term-fm/worker/DEPENDS b/shell-term-fm/worker/DEPENDS
index c77dbdd..dd01621 100755
--- a/shell-term-fm/worker/DEPENDS
+++ b/shell-term-fm/worker/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++        &&
+depends -sub CXX gcc        &&
 depends  xorg-libs  &&
 
 optional_depends  "zlib"              \
diff --git a/shell-term-fm/worker/HISTORY b/shell-term-fm/worker/HISTORY
index 5ebb06c..aaad526 100644
--- a/shell-term-fm/worker/HISTORY
+++ b/shell-term-fm/worker/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-03-22 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.17.3
 
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index 2b6a208..8c13fa9 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,5 +1,5 @@
            SPELL=init.d
-         VERSION=2.2.12
+         VERSION=2.2.13
       LICENSE[0]=GPL
      GATHER_DOCS=off
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 54f1da1..d47336f 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.2.13
+       * init.d/devices: updated to work with linux 3
+
 2011-06-11 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: 2.2.12
        * init.d/devices: grep shouldn't be used on such low-level stage, 
cause
diff --git a/smgl/init.d/init.d/devices b/smgl/init.d/init.d/devices
index dde9a1b..a86d128 100755
--- a/smgl/init.d/init.d/devices
+++ b/smgl/init.d/init.d/devices
@@ -60,7 +60,7 @@ start_udev()
   SUBLEVEL=${SUBLEVEL/$tmp/}
 
   # kernel 2.6.15-rc1 and higher don't use hotplug
-  if [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6 ]; then
+  if [[  $(uname -r)  =  3.*  ]] || [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6 
]; then
     echo "don't need hotplug for this kernel"
     builtin echo > /proc/sys/kernel/hotplug
   else
@@ -108,7 +108,7 @@ start_static_udev()
   SUBLEVEL=${SUBLEVEL/$tmp/}
 
   # kernel 2.6.15-rc1 and higher don't use hotplug
-  if [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6 ]; then
+  if [[  $(uname -r)  =  3.*  ]] || [ $SUBLEVEL -ge 15 -a $PATCHLEVEL -ge 6 
]; then
     echo "don't need hotplug for this kernel"
     builtin echo > /proc/sys/kernel/hotplug
   else
diff --git a/spelling/aspell/DEPENDS b/spelling/aspell/DEPENDS
index 7d23fcd..484a330 100755
--- a/spelling/aspell/DEPENDS
+++ b/spelling/aspell/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 optional_depends ncurses "" "" "screen display support"
diff --git a/spelling/aspell/HISTORY b/spelling/aspell/HISTORY
index 75eddf8..da4cf00 100644
--- a/spelling/aspell/HISTORY
+++ b/spelling/aspell/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-17 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.60.6.1
 
diff --git a/spelling/mythes/DEPENDS b/spelling/mythes/DEPENDS
index 43c31ff..b16179c 100755
--- a/spelling/mythes/DEPENDS
+++ b/spelling/mythes/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends hunspell
diff --git a/spelling/mythes/HISTORY b/spelling/mythes/HISTORY
index 15b770b..7b8b0d4 100644
--- a/spelling/mythes/HISTORY
+++ b/spelling/mythes/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-20 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Correct WEB_SITE
          Updated to 1.2.0
diff --git a/spelling/stardict/DEPENDS b/spelling/stardict/DEPENDS
index 398b2ae..46b8c61 100755
--- a/spelling/stardict/DEPENDS
+++ b/spelling/stardict/DEPENDS
@@ -1,6 +1,6 @@
 depends  autoconf          &&
 depends  automake          &&
-depends  g++               &&
+depends -sub CXX gcc               &&
 depends  gtk+2             &&
 depends  intltool          &&
 depends  xml-parser-expat  &&
diff --git a/spelling/stardict/HISTORY b/spelling/stardict/HISTORY
index feaa984..ae5923d 100644
--- a/spelling/stardict/HISTORY
+++ b/spelling/stardict/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-01-08 Pol Vinogradov <vin.public AT gmail.com>
        * stardict-g++-sigc++3-fixes.patch.bz2: more fixes to build with
          gtk 2.23
diff --git a/telephony/asterisk/DEPENDS b/telephony/asterisk/DEPENDS
index a8fa158..13b56a2 100755
--- a/telephony/asterisk/DEPENDS
+++ b/telephony/asterisk/DEPENDS
@@ -1,4 +1,4 @@
-depends           "g++"                                            &&
+depends           -sub CXX gcc                                     &&
 depends           "openssl"                                        &&
 depends           "zlib"                                           &&
 
diff --git a/telephony/asterisk/HISTORY b/telephony/asterisk/HISTORY
index a6b6b0d..f908e82 100644
--- a/telephony/asterisk/HISTORY
+++ b/telephony/asterisk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc
+         with sub-depends on CXX
+
 2010-08-12 Martin Spitzbarth <m.spitzbarth AT gmx.de>
        * DETAILS: updated spell to 1.6.2.11
        * DEPENDS: adjusted the configure switch for curl,
diff --git a/telephony/bayonne2/DEPENDS b/telephony/bayonne2/DEPENDS
index ac7e160..618ae06 100755
--- a/telephony/bayonne2/DEPENDS
+++ b/telephony/bayonne2/DEPENDS
@@ -1,4 +1,4 @@
-depends g++         &&
+depends -sub CXX gcc         &&
 depends commoncpp2  &&
 depends ccrtp       &&
 depends ccaudio2    &&
diff --git a/telephony/bayonne2/HISTORY b/telephony/bayonne2/HISTORY
index 787962e..465aa64 100644
--- a/telephony/bayonne2/HISTORY
+++ b/telephony/bayonne2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-01-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.3.2
 
diff --git a/telephony/ccaudio2/DEPENDS b/telephony/ccaudio2/DEPENDS
index 66452c4..e3d1bab 100755
--- a/telephony/ccaudio2/DEPENDS
+++ b/telephony/ccaudio2/DEPENDS
@@ -1,4 +1,4 @@
-depends g++         &&
+depends -sub CXX gcc         &&
 optional_depends "speex"   "" "" "speech codec"            &&
 optional_depends "doxygen" "" "" "to create documentation"
 
diff --git a/telephony/ccaudio2/HISTORY b/telephony/ccaudio2/HISTORY
index 24605cd..7d79d5f 100644
--- a/telephony/ccaudio2/HISTORY
+++ b/telephony/ccaudio2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-02-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.0
 
diff --git a/telephony/ccrtp/DEPENDS b/telephony/ccrtp/DEPENDS
index 0054be5..9ea65c3 100755
--- a/telephony/ccrtp/DEPENDS
+++ b/telephony/ccrtp/DEPENDS
@@ -1,4 +1,4 @@
-depends g++         &&
+depends -sub CXX gcc         &&
 depends commoncpp2  &&
 optional_depends "doxygen" "" "" "to create documentation"
 
diff --git a/telephony/ccrtp/HISTORY b/telephony/ccrtp/HISTORY
index b0deab6..633df53 100644
--- a/telephony/ccrtp/HISTORY
+++ b/telephony/ccrtp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-12-13 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.7.2
 
diff --git a/telephony/ccscript/DEPENDS b/telephony/ccscript/DEPENDS
index e19a34c..68a9a6d 100755
--- a/telephony/ccscript/DEPENDS
+++ b/telephony/ccscript/DEPENDS
@@ -1,4 +1,4 @@
-depends g++         &&
+depends -sub CXX gcc         &&
 depends ucommon     &&
 optional_depends pkgconfig '' '' 'package management'
 
diff --git a/telephony/ccscript/HISTORY b/telephony/ccscript/HISTORY
index 0ec883a..61f082d 100644
--- a/telephony/ccscript/HISTORY
+++ b/telephony/ccscript/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-02-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.1.0
          spell created
diff --git a/telephony/ccscript3/DEPENDS b/telephony/ccscript3/DEPENDS
index a6dedbf..f4ee85a 100755
--- a/telephony/ccscript3/DEPENDS
+++ b/telephony/ccscript3/DEPENDS
@@ -1,4 +1,4 @@
-depends g++         &&
+depends -sub CXX gcc         &&
 depends commoncpp2  &&
 optional_depends "ODBC-MGR" "--with-odb" "--without-odbc" "ODBC database 
support"  &&
 optional_depends "doxygen" "" "" "to create documentation"
diff --git a/telephony/ccscript3/HISTORY b/telephony/ccscript3/HISTORY
index e8bf6c2..3afd318 100644
--- a/telephony/ccscript3/HISTORY
+++ b/telephony/ccscript3/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-01-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.1.6
 
diff --git a/telephony/commoncpp2/DEPENDS b/telephony/commoncpp2/DEPENDS
index 7938c84..1cdc6c5 100755
--- a/telephony/commoncpp2/DEPENDS
+++ b/telephony/commoncpp2/DEPENDS
@@ -1,4 +1,4 @@
-depends g++      &&
+depends -sub CXX gcc      &&
 depends libxml2  &&
 depends zlib     &&
 optional_depends "doxygen" "" "" "to create documentation"
diff --git a/telephony/commoncpp2/HISTORY b/telephony/commoncpp2/HISTORY
index 071d7ea..8a94e62 100644
--- a/telephony/commoncpp2/HISTORY
+++ b/telephony/commoncpp2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-02-25 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.8.0
 
diff --git a/telephony/libjingle-tapioca/DEPENDS 
b/telephony/libjingle-tapioca/DEPENDS
index 5af2d09..f14dd85 100755
--- a/telephony/libjingle-tapioca/DEPENDS
+++ b/telephony/libjingle-tapioca/DEPENDS
@@ -1,4 +1,4 @@
-depends g++        &&
+depends -sub CXX gcc        &&
 depends pkgconfig  &&
 depends expat      &&
 depends openssl
diff --git a/telephony/libjingle-tapioca/HISTORY 
b/telephony/libjingle-tapioca/HISTORY
index 95d6684..5cc090e 100644
--- a/telephony/libjingle-tapioca/HISTORY
+++ b/telephony/libjingle-tapioca/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-08-16 Ethan "eekee" Grammatikidis <eekee57 AT fastmail.fm>
        * DETAILS: deilnting (80-col)
 
diff --git a/telephony/twinkle/DEPENDS b/telephony/twinkle/DEPENDS
index c448676..c5808c9 100755
--- a/telephony/twinkle/DEPENDS
+++ b/telephony/twinkle/DEPENDS
@@ -1,4 +1,4 @@
-depends g++                                     &&
+depends -sub CXX gcc                                     &&
 depends flex                                    &&
 depends commoncpp2                              &&
 depends ccrtp                                   &&
diff --git a/telephony/twinkle/HISTORY b/telephony/twinkle/HISTORY
index fba1c36..976b0f8 100644
--- a/telephony/twinkle/HISTORY
+++ b/telephony/twinkle/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-07-23 David Kowis <dkowis AT shlrm.org>
        * DETAILS: 1.4.2
 
diff --git a/telephony/ucommon/DEPENDS b/telephony/ucommon/DEPENDS
index 2be2a68..8621ccc 100755
--- a/telephony/ucommon/DEPENDS
+++ b/telephony/ucommon/DEPENDS
@@ -1,4 +1,4 @@
-depends g++      &&
+depends -sub CXX gcc      &&
 depends libtool  &&
 optional_depends  pkgconfig '--with-pkg-config' '--without-pkg-config' 'find 
packages'
 
diff --git a/telephony/ucommon/HISTORY b/telephony/ucommon/HISTORY
index 1102c30..53f503b 100644
--- a/telephony/ucommon/HISTORY
+++ b/telephony/ucommon/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-03 Donald Johnson <ltdonny AT gmail.com>
        * DETAILS: Version 5.0.1
        * INSTALL: Removed: Unneeded.
diff --git a/utils/cdemu-daemon/DEPENDS b/utils/cdemu-daemon/DEPENDS
index cbdef02..8d1b730 100755
--- a/utils/cdemu-daemon/DEPENDS
+++ b/utils/cdemu-daemon/DEPENDS
@@ -1,6 +1,6 @@
 depends  vhba-module  &&
 depends  dbus          &&
-depends  g++           &&
+depends -sub CXX gcc           &&
 depends  glib2         &&
 depends  libdaemon     &&
 depends  libmirage     &&
diff --git a/utils/cdemu-daemon/HISTORY b/utils/cdemu-daemon/HISTORY
index 15dcda9..8d0489a 100644
--- a/utils/cdemu-daemon/HISTORY
+++ b/utils/cdemu-daemon/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-19 Bor Kraljič <pyrobor AT ver.si>
        * BUILD:  removed, no longer needed
        * DETAILS: updated spell to 1.3.0
diff --git a/utils/crosstool-ng/DEPENDS b/utils/crosstool-ng/DEPENDS
new file mode 100755
index 0000000..4afeb17
--- /dev/null
+++ b/utils/crosstool-ng/DEPENDS
@@ -0,0 +1,2 @@
+depends cvs &&
+depends subversion
diff --git a/utils/crosstool-ng/DETAILS b/utils/crosstool-ng/DETAILS
new file mode 100755
index 0000000..8d2ab49
--- /dev/null
+++ b/utils/crosstool-ng/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=crosstool-ng
+         VERSION=1.12.0
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+   SOURCE_URL[0]=http://crosstool-ng.org/download/${SPELL}/${SOURCE}
+     
SOURCE_HASH=sha512:54b71a782f40ddaf1985785b56396d50e86d4f919d4123d4131d32dda2b84d0326383bf0b0432637d60a3f79b2432631985d3bba832156f30d5ca5a833cc682f
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://crosstool-ng.org";
+      LICENSE[0]=GPL
+         ENTERED=20110801
+           SHORT="toolchains builder"
+cat << EOF
+crosstool-NG aims at building toolchains. Toolchains are an essential 
component
+in a software development project. It will compile, assemble and link the 
code
+that is being developed. Some pieces of the toolchain will eventually end up 
in
+the resulting binary/ies: static libraries are but an example.
+EOF
diff --git a/utils/crosstool-ng/HISTORY b/utils/crosstool-ng/HISTORY
new file mode 100644
index 0000000..a0c5a93
--- /dev/null
+++ b/utils/crosstool-ng/HISTORY
@@ -0,0 +1,3 @@
+2011-08-01 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * DETAILS, DEPENDS, HISTORY: spell created
+
diff --git a/utils/dbus-c++/DEPENDS b/utils/dbus-c++/DEPENDS
index a800aff..23a9286 100755
--- a/utils/dbus-c++/DEPENDS
+++ b/utils/dbus-c++/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++    &&
+depends -sub CXX gcc    &&
 depends  dbus   &&
 depends  expat  &&
 
diff --git a/utils/dbus-c++/HISTORY b/utils/dbus-c++/HISTORY
index 29c46c1..6ce3022 100644
--- a/utils/dbus-c++/HISTORY
+++ b/utils/dbus-c++/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-07-02 Robin Cook <rcook AT wyrms.net>
        * new spell: DETAILS, DEPENDS, PREPARE, PRE_BUILD
 
diff --git a/utils/deltup/DEPENDS b/utils/deltup/DEPENDS
index 2c3b8b2..6321cd4 100755
--- a/utils/deltup/DEPENDS
+++ b/utils/deltup/DEPENDS
@@ -1,2 +1,2 @@
 depends  openssl  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/utils/deltup/HISTORY b/utils/deltup/HISTORY
index 4401801..dce57cc 100644
--- a/utils/deltup/HISTORY
+++ b/utils/deltup/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed UPDATED.
 
diff --git a/utils/exmap/DEPENDS b/utils/exmap/DEPENDS
index aecd8d3..3d71080 100755
--- a/utils/exmap/DEPENDS
+++ b/utils/exmap/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends gtkmm2 &&
 depends pcre &&
 depends boost # no specification of which part is needed
diff --git a/utils/exmap/HISTORY b/utils/exmap/HISTORY
index 0367320..1c97d45 100644
--- a/utils/exmap/HISTORY
+++ b/utils/exmap/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-01-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * BUILD, DEPENDS, DETAILS, INSTALL, FINAL: spell created
 
diff --git a/utils/findwild/DEPENDS b/utils/findwild/DEPENDS
index cd8b36b..618b45e 100755
--- a/utils/findwild/DEPENDS
+++ b/utils/findwild/DEPENDS
@@ -1,3 +1,3 @@
 depends gtk+2 &&
 depends xdg-utils &&
-depends g++ 
+depends -sub CXX gcc 
diff --git a/utils/findwild/HISTORY b/utils/findwild/HISTORY
index 66f37d9..cbef65c 100644
--- a/utils/findwild/HISTORY
+++ b/utils/findwild/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-03 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
        * BUILD, DEPENDS, DETAILS, INSTALL: spell created
 
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index 72cb761..fe25f6a 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 depends JPEG &&
 
 # gnuplot uses gd for rendering pngs, even with true type fonts...
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index 1ed1b7e..41a758b 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-06 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 4.4.3
 
diff --git a/utils/ledger/DEPENDS b/utils/ledger/DEPENDS
index 42b33da..0cd4b9b 100755
--- a/utils/ledger/DEPENDS
+++ b/utils/ledger/DEPENDS
@@ -1,5 +1,5 @@
 depends  gmp        &&
 depends  pcre       &&
-depends  g++        &&
+depends -sub CXX gcc        &&
 optional_depends libofx '--enable-ofx' '--disable-ofx' 'for OFX support' &&
 optional_depends expat '--enable-xml' '--disable-xml' 'for gnucash ledger 
xml file parsing'
diff --git a/utils/ledger/HISTORY b/utils/ledger/HISTORY
index c0abcef..3402e73 100644
--- a/utils/ledger/HISTORY
+++ b/utils/ledger/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-09-07 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.5
          new WEB_SITE
diff --git a/utils/log4cplus/DEPENDS b/utils/log4cplus/DEPENDS
index fd0b0eb..f148724 100755
--- a/utils/log4cplus/DEPENDS
+++ b/utils/log4cplus/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/utils/log4cplus/HISTORY b/utils/log4cplus/HISTORY
index c693bbf..7c635cc 100644
--- a/utils/log4cplus/HISTORY
+++ b/utils/log4cplus/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-04 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.0.4-rc7
 
diff --git a/utils/lshw/DEPENDS b/utils/lshw/DEPENDS
index bd1cedb..7f9cce5 100755
--- a/utils/lshw/DEPENDS
+++ b/utils/lshw/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 #
 ## Remove this when spell is in stable.
diff --git a/utils/lshw/HISTORY b/utils/lshw/HISTORY
index e049b7d..47b42db 100644
--- a/utils/lshw/HISTORY
+++ b/utils/lshw/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-06 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: B.02.15
 
diff --git a/utils/lsvpd/DEPENDS b/utils/lsvpd/DEPENDS
index 779868c..1b8cbf3 100755
--- a/utils/lsvpd/DEPENDS
+++ b/utils/lsvpd/DEPENDS
@@ -1,2 +1,2 @@
 depends  sg3_utils  &&
-depends  g++
+depends -sub CXX gcc
diff --git a/utils/lsvpd/HISTORY b/utils/lsvpd/HISTORY
index 2f14976..8947fbe 100644
--- a/utils/lsvpd/HISTORY
+++ b/utils/lsvpd/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-08-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS: created this spell, version 1.3.0
 
diff --git a/utils/phoronix-test-suite/DEPENDS 
b/utils/phoronix-test-suite/DEPENDS
index c8d290f..c59f43a 100755
--- a/utils/phoronix-test-suite/DEPENDS
+++ b/utils/phoronix-test-suite/DEPENDS
@@ -3,7 +3,7 @@ depends  -sub CURL  php  &&
 
 optional_depends  bison        ''  ''  'for yacc tests'                      
 &&
 optional_depends  flex         ''  ''  'for Lex tests'                       
 &&
-optional_depends  fortran      ''  ''  'for Fortran tests'                   
 &&
+optional_depends -sub FORTRAN gcc      ''  ''  'for Fortran tests'           
         &&
 optional_depends  freeimage    ''  ''  'for various image tests'             
 &&
 optional_depends  gcc33        ''  ''  'for libstdc++3 tests'                
 &&
 optional_depends  git          ''  ''  'for git checkouts of some tests'     
 &&
diff --git a/utils/phoronix-test-suite/HISTORY 
b/utils/phoronix-test-suite/HISTORY
index 825c6d7..6846d97 100644
--- a/utils/phoronix-test-suite/HISTORY
+++ b/utils/phoronix-test-suite/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on fortran to dependency on gcc with
+         sub-depends on FORTRAN (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/utils/pinot/DEPENDS b/utils/pinot/DEPENDS
index 38fe388..35d283e 100755
--- a/utils/pinot/DEPENDS
+++ b/utils/pinot/DEPENDS
@@ -1,5 +1,5 @@
 depends gtkmm2              &&
-depends g++                 &&
+depends -sub CXX gcc                 &&
 depends xapian-core         &&
 depends sqlite              &&
 depends libxml++            &&
diff --git a/utils/pinot/HISTORY b/utils/pinot/HISTORY
index da14f20..7d42664 100644
--- a/utils/pinot/HISTORY
+++ b/utils/pinot/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-12-21 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 0.95
 
diff --git a/utils/psmisc/DEPENDS b/utils/psmisc/DEPENDS
index 141e40d..ffa8c23 100755
--- a/utils/psmisc/DEPENDS
+++ b/utils/psmisc/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  automake  &&
 depends  ncurses   &&
 optional_depends libselinux "--enable-selinux" "--disable-selinux" "For 
SELINUX support"
diff --git a/utils/psmisc/HISTORY b/utils/psmisc/HISTORY
index 08bfc78..3a67f3f 100644
--- a/utils/psmisc/HISTORY
+++ b/utils/psmisc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-24 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 22.14
 
diff --git a/utils/schroot/DEPENDS b/utils/schroot/DEPENDS
index 9185d77..698a86e 100755
--- a/utils/schroot/DEPENDS
+++ b/utils/schroot/DEPENDS
@@ -1,5 +1,5 @@
 depends  -sub "PROGRAM_OPTIONS REGEX"  boost  &&
-depends  g++                                  &&
+depends -sub CXX gcc                                  &&
 depends  lockdev                              &&
 depends  linux-pam                            &&
 
diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index afbd9a1..0ddccc6 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-08-31 Finn Haedicke <finn AT sourcemage.org>
        * TRIGGERS: added check_self for boost cast (library version changes)
 
diff --git a/utils/sphinx/DEPENDS b/utils/sphinx/DEPENDS
index 719e232..02541b5 100755
--- a/utils/sphinx/DEPENDS
+++ b/utils/sphinx/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 
 optional_depends expat "" "" "for XML parser usage" &&
 
diff --git a/utils/sphinx/HISTORY b/utils/sphinx/HISTORY
index 6b686c9..fd3c987 100644
--- a/utils/sphinx/HISTORY
+++ b/utils/sphinx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-04-06 Philippe "Puppet_Master" Caseiro  <puppetmaster AT sourcemage.org>
        * DEPENDS: updated mysql dependency to MYSQL provider
 
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index 0b52881..badbe9a 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -1,4 +1,4 @@
-depends g++           &&
+depends -sub CXX gcc           &&
 depends cmake         &&
 depends bzip2         &&
 depends pkgconfig     &&
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 160275f..e83dbda 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-23 Bor Kraljič <pyrobor AT ver.si>
        * DEPENDS, PREPARE,  DETAILS: removed svn version since source is no 
longer available
        * PRE_BUILD, 0001-fix-build-for-disabled-qt4-option.patch: added 
patch from
diff --git a/utils/sunbird/DEPENDS b/utils/sunbird/DEPENDS
index 94272f1..78ea11a 100755
--- a/utils/sunbird/DEPENDS
+++ b/utils/sunbird/DEPENDS
@@ -1,6 +1,6 @@
 depends  atk                                                     &&
 depends  fontconfig  '--enable-xft  --disable-freetype2'         &&
-depends  g++                                                     &&
+depends -sub CXX gcc                                                     &&
 depends  gtk+2       '--enable-default-toolkit=gtk2'             &&
 depends  glib2                                                   &&
 depends  JAVA                                                    &&
diff --git a/utils/sunbird/HISTORY b/utils/sunbird/HISTORY
index ad398e9..0908b55 100644
--- a/utils/sunbird/HISTORY
+++ b/utils/sunbird/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/utils/syslinux/DEPENDS b/utils/syslinux/DEPENDS
index 57aa62d..059b4b6 100755
--- a/utils/syslinux/DEPENDS
+++ b/utils/syslinux/DEPENDS
@@ -1,4 +1,5 @@
 depends  perl  &&
+depends  digest-sha1 &&
 depends  nasm  &&
 
 suggest_depends mtools "" "" "for msdos filesystem support"
diff --git a/utils/syslinux/HISTORY b/utils/syslinux/HISTORY
index 21423dc..64847c4 100644
--- a/utils/syslinux/HISTORY
+++ b/utils/syslinux/HISTORY
@@ -1,3 +1,6 @@
+2011-07-31 Vlad Glagolev <stealth AT sourcemage.org>
+       * DEPENDS: added missing dep
+
 2011-07-14 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 4.04
        * PRE_BUILD: pre-remove binary built for x64
diff --git a/utils/teardrop/DEPENDS b/utils/teardrop/DEPENDS
index 1370ca8..871aa84 100755
--- a/utils/teardrop/DEPENDS
+++ b/utils/teardrop/DEPENDS
@@ -1,4 +1,4 @@
-depends g++      &&
+depends -sub CXX gcc      &&
 depends wxgtk    &&
 depends libxml2  &&
 depends pcre     &&
diff --git a/utils/teardrop/HISTORY b/utils/teardrop/HISTORY
index d1a6b25..2fe3285 100644
--- a/utils/teardrop/HISTORY
+++ b/utils/teardrop/HISTORY
@@ -1,2 +1,6 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2007-03-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS, DEPENDS, HISTORY: created spell
diff --git a/utils/tree/DETAILS b/utils/tree/DETAILS
index a9499b9..e47f7f9 100755
--- a/utils/tree/DETAILS
+++ b/utils/tree/DETAILS
@@ -1,5 +1,5 @@
            SPELL=tree
-         VERSION=1.5.2.2
+         VERSION=1.6.0
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://mama.indstate.edu/linux/tree/$SOURCE
diff --git a/utils/tree/HISTORY b/utils/tree/HISTORY
index e24eeb2..2044b4d 100644
--- a/utils/tree/HISTORY
+++ b/utils/tree/HISTORY
@@ -1,3 +1,6 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.6.0
+
 2009-02-18 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.5.2.2
 
diff --git a/utils/tree/tree-1.5.2.2.tgz.sig b/utils/tree/tree-1.5.2.2.tgz.sig
deleted file mode 100644
index c4a5ec7..0000000
Binary files a/utils/tree/tree-1.5.2.2.tgz.sig and /dev/null differ
diff --git a/utils/tree/tree-1.6.0.tgz.sig b/utils/tree/tree-1.6.0.tgz.sig
new file mode 100644
index 0000000..1485842
Binary files /dev/null and b/utils/tree/tree-1.6.0.tgz.sig differ
diff --git a/video-libs/dirac/DEPENDS b/video-libs/dirac/DEPENDS
index ae10161..b0dfe79 100755
--- a/video-libs/dirac/DEPENDS
+++ b/video-libs/dirac/DEPENDS
@@ -1,4 +1,4 @@
-depends g++  &&
+depends -sub CXX gcc  &&
 optional_depends  doxygen                    \
                   ""                         \
                   ""                         \
diff --git a/video-libs/dirac/HISTORY b/video-libs/dirac/HISTORY
index 01a369f..86f96e6 100644
--- a/video-libs/dirac/HISTORY
+++ b/video-libs/dirac/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * PRE_BUILD, gcc-4.5.diff: added patch from debian to fix
          compile error with gcc 4.5
diff --git a/video-libs/libmediainfo/DEPENDS b/video-libs/libmediainfo/DEPENDS
index c158527..b2e7947 100755
--- a/video-libs/libmediainfo/DEPENDS
+++ b/video-libs/libmediainfo/DEPENDS
@@ -1,2 +1,2 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libzen
diff --git a/video-libs/libmediainfo/HISTORY b/video-libs/libmediainfo/HISTORY
index 75ad3bd..ec99a32 100644
--- a/video-libs/libmediainfo/HISTORY
+++ b/video-libs/libmediainfo/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-12-30 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: spell created, v. 
0.7.26
          based on 
http://aur.archlinux.org/packages/libmediainfo/libmediainfo/PKGBUILD
diff --git a/video-libs/libzen/DEPENDS b/video-libs/libzen/DEPENDS
index fd0b0eb..f148724 100755
--- a/video-libs/libzen/DEPENDS
+++ b/video-libs/libzen/DEPENDS
@@ -1 +1 @@
-depends g++
+depends -sub CXX gcc
diff --git a/video-libs/libzen/HISTORY b/video-libs/libzen/HISTORY
index 10b835b..efa506c 100644
--- a/video-libs/libzen/HISTORY
+++ b/video-libs/libzen/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-01-01 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: spell created, version 
0.4.9
          based on http://aur.archlinux.org/packages/libzen/libzen/PKGBUILD
diff --git a/video-libs/live/DEPENDS b/video-libs/live/DEPENDS
index bcd1eeb..f148724 100755
--- a/video-libs/live/DEPENDS
+++ b/video-libs/live/DEPENDS
@@ -1 +1 @@
-depends  g++
+depends -sub CXX gcc
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index cad6d0b..25f0e8b 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
            SPELL=live
-         VERSION=2011.06.16
+         VERSION=2011.07.21
           SOURCE=$SPELL.$VERSION.tar.gz
-     
SOURCE_HASH=sha512:e0103eec4d97478d437f9c7ad19a29bc3ea0cb3926b88ac92008fe6c73e0f72d4696b1fc702cea5732aa4d6884a302f91ce26e3a06e314adea6bb995cd577337
+     
SOURCE_HASH=sha512:ce99c4ceec83cede4fe2b3a9ff91653da79e4b9a47a60b12ac9fbdff47ac87f4600c810ab2c542dc26dc2485f0ffce5f387473451bea0f8f5ba5c7ad6b14efe0
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
    
SOURCE_URL[1]=http://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/nork/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index 7830fde..0a178d1 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,10 @@
+2011-07-30 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2011.07.21
+
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-16 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2011.06.16
 
diff --git a/video/avidemux2/DEPENDS b/video/avidemux2/DEPENDS
index 58d3e61..449751f 100755
--- a/video/avidemux2/DEPENDS
+++ b/video/avidemux2/DEPENDS
@@ -1,5 +1,5 @@
 depends  cmake    &&
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  libxml2  &&
 depends  yasm     &&
 
diff --git a/video/avidemux2/HISTORY b/video/avidemux2/HISTORY
index ec1102d..f243179 100644
--- a/video/avidemux2/HISTORY
+++ b/video/avidemux2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-15 Peng Chang (Charles) <chp AT sourcemage.org>
        * DETAILS: updated spell to 2.5.5
 
diff --git a/video/dvgrab/DEPENDS b/video/dvgrab/DEPENDS
index 4067192..8ce56f1 100755
--- a/video/dvgrab/DEPENDS
+++ b/video/dvgrab/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  libavc1394  &&
 depends  libiec61883 &&
 optional_depends   LIBQUICKTIME "" "" "read/write uncompressed Quicktime 
movies" &&
diff --git a/video/dvgrab/HISTORY b/video/dvgrab/HISTORY
index 0c8feb4..3f8265c 100644
--- a/video/dvgrab/HISTORY
+++ b/video/dvgrab/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/video/kino/DEPENDS b/video/kino/DEPENDS
index f58c9a2..888d44c 100755
--- a/video/kino/DEPENDS
+++ b/video/kino/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  gtk+2       &&
 depends  libglade2   &&
 depends  libavc1394  &&
diff --git a/video/kino/HISTORY b/video/kino/HISTORY
index e0c2357..fb134e4 100644
--- a/video/kino/HISTORY
+++ b/video/kino/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-15 Peng Chang (Charles) <chp AT sourcemage.org>
        * PRE_BUILD: frame.cc.patch no longer needed for 1.3.4
        * frame.cc.patch: removed
diff --git a/video/mjpegtools/DEPENDS b/video/mjpegtools/DEPENDS
index 8c26554..0f83dfe 100755
--- a/video/mjpegtools/DEPENDS
+++ b/video/mjpegtools/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  glib2     &&
 depends  JPEG      &&
 depends  xorg-libs  &&
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index cb04329..d576e19 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index de31550..86430d3 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -1,7 +1,7 @@
 if [[ $VERSION == git ]] ;then
 depends git
 fi  &&
-depends g++ &&
+depends -sub CXX gcc &&
 optional_depends  LIBAVCODEC                              \
                   "--avformat-shared --avformat-ldextra"  \
                   "--disable-avformat"                    \
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 312a6b6..c76038b 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-27 Bor Kraljič <pyrobor AT ver.si>
        * DEPENDS: changed qt-x11 to qt4
        * INSTALL: fixed to also work with other versions of python (not only 
2.7*)
diff --git a/video/xbmc/DEPENDS b/video/xbmc/DEPENDS
index 96b5316..c63800c 100755
--- a/video/xbmc/DEPENDS
+++ b/video/xbmc/DEPENDS
@@ -1,5 +1,5 @@
 depends subversion &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends automake &&
 depends autoconf &&
 depends unzip &&
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
index 56cb94b..3267a3b 100644
--- a/video/xbmc/HISTORY
+++ b/video/xbmc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-16 Ismael Luceno <ismael AT sourcemage.org>
         * DEPENDS: depend on MYSQL instead of mysql
 
diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index 0d9aeb1..8d90499 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends libx11 &&
 depends libsm &&
 depends fontconfig &&
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index b45ec1b..4f9e7e0 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-11 Thomas Orgis <sobukus AT sourcemage.org>
        * PREPARE, DETAILS, DEPENDS, fluxbox-1.1.1.tar.bz2.sig:
          remove outdated development release
diff --git a/wm-addons/wbar/DEPENDS b/wm-addons/wbar/DEPENDS
index 1f16e92..a01cea5 100755
--- a/wm-addons/wbar/DEPENDS
+++ b/wm-addons/wbar/DEPENDS
@@ -1,2 +1,2 @@
-depends  g++    &&
+depends -sub CXX gcc    &&
 depends  imlib2 
diff --git a/wm-addons/wbar/HISTORY b/wm-addons/wbar/HISTORY
index 4b345cc..b78a952 100644
--- a/wm-addons/wbar/HISTORY
+++ b/wm-addons/wbar/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-07-27 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: fixed typo in website url
 
diff --git a/x11-libs/cairo-java/DEPENDS b/x11-libs/cairo-java/DEPENDS
index 66eb1c2..86299c4 100755
--- a/x11-libs/cairo-java/DEPENDS
+++ b/x11-libs/cairo-java/DEPENDS
@@ -2,7 +2,7 @@ depends  JAVA  ''  ''  'z-rejected'              &&
 depends  autoconf                                &&
 depends  automake                                &&
 depends  libtool                                 &&
-depends  gcj                                     &&
+depends -sub JAVA gcc                                     &&
 depends  glib-java                               &&
 depends  cairo                                   &&
 
diff --git a/x11-libs/cairo-java/HISTORY b/x11-libs/cairo-java/HISTORY
index 95c1fdf..0d9ba95 100644
--- a/x11-libs/cairo-java/HISTORY
+++ b/x11-libs/cairo-java/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2007-01-13 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 1.0.8
 
diff --git a/x11-libs/cairomm/DEPENDS b/x11-libs/cairomm/DEPENDS
index a1e816e..979d10b 100755
--- a/x11-libs/cairomm/DEPENDS
+++ b/x11-libs/cairomm/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends cairo &&
 depends libsigc++3 &&
 optional_depends "doxygen" \
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index fbe4d66..9b98c86 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-12-27 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.8.6
 
diff --git a/x11-libs/xfstt/DEPENDS b/x11-libs/xfstt/DEPENDS
index 8d72a42..7370f39 100755
--- a/x11-libs/xfstt/DEPENDS
+++ b/x11-libs/xfstt/DEPENDS
@@ -1,2 +1,2 @@
-depends g++
+depends -sub CXX gcc
 #depends gdk-pixbuf
diff --git a/x11-libs/xfstt/HISTORY b/x11-libs/xfstt/HISTORY
index 25621a2..4ddfb9d 100644
--- a/x11-libs/xfstt/HISTORY
+++ b/x11-libs/xfstt/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2006-05-23 Treeve Jelbert <treeve AT sourcemage.org>
        * CONFIGURE: deleted, it serves no useful purpose
          fixes bug # 11898 
diff --git a/x11-toolkits/efltk/DEPENDS b/x11-toolkits/efltk/DEPENDS
index 7df113b..09a1467 100755
--- a/x11-toolkits/efltk/DEPENDS
+++ b/x11-toolkits/efltk/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++     &&
+depends -sub CXX gcc     &&
 depends  libpng  &&
 depends  JPEG    &&
 
diff --git a/x11-toolkits/efltk/HISTORY b/x11-toolkits/efltk/HISTORY
index 444d305..258ba3d 100644
--- a/x11-toolkits/efltk/HISTORY
+++ b/x11-toolkits/efltk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/x11-toolkits/fltk/DEPENDS b/x11-toolkits/fltk/DEPENDS
index c455680..0ec3f30 100755
--- a/x11-toolkits/fltk/DEPENDS
+++ b/x11-toolkits/fltk/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  xorg-libs  &&
 
 optional_depends  OPENGL  "--enable-gl"  "--disable-gl"  \
diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index 0010e8b..855aa91 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.3.0
        * PRE_BUILD: sedit header to prevent build error in old client
diff --git a/x11-toolkits/fltk2/DEPENDS b/x11-toolkits/fltk2/DEPENDS
index 8a7d99f..d2e12e9 100755
--- a/x11-toolkits/fltk2/DEPENDS
+++ b/x11-toolkits/fltk2/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  libx11    &&
 
 optional_depends  mesalib  "--enable-gl=yes"  "--enable-gl=no"  \
diff --git a/x11-toolkits/fltk2/HISTORY b/x11-toolkits/fltk2/HISTORY
index 3b57768..1210038 100644
--- a/x11-toolkits/fltk2/HISTORY
+++ b/x11-toolkits/fltk2/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/x11-toolkits/fox/DEPENDS b/x11-toolkits/fox/DEPENDS
index c1bf604..645e8de 100755
--- a/x11-toolkits/fox/DEPENDS
+++ b/x11-toolkits/fox/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  autoconf  &&
 depends  automake  &&
 depends  zlib      &&
diff --git a/x11-toolkits/fox/HISTORY b/x11-toolkits/fox/HISTORY
index 1b13bf6..735f0f3 100644
--- a/x11-toolkits/fox/HISTORY
+++ b/x11-toolkits/fox/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.6.43
 
diff --git a/x11-toolkits/gtk+/BUILD b/x11-toolkits/gtk+/BUILD
deleted file mode 100755
index c5a5e5d..0000000
--- a/x11-toolkits/gtk+/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-patch -p0 < $SCRIPT_DIRECTORY/config.sub.patch &&
-default_build
diff --git a/x11-toolkits/gtk+/DEPENDS b/x11-toolkits/gtk+/DEPENDS
index 8da15a6..b34f34d 100755
--- a/x11-toolkits/gtk+/DEPENDS
+++ b/x11-toolkits/gtk+/DEPENDS
@@ -1,2 +1,13 @@
-depends  glib  &&
-depends  xorg-libs
+depends glib &&
+depends libx11 &&
+depends libxext &&
+
+optional_depends libsm \
+                 "--enable-shm" \
+                 "--disable-shm" \
+                 "for shared memory support" &&
+
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "for Native Language Support"
diff --git a/x11-toolkits/gtk+/DETAILS b/x11-toolkits/gtk+/DETAILS
index bffc09d..e6d710c 100755
--- a/x11-toolkits/gtk+/DETAILS
+++ b/x11-toolkits/gtk+/DETAILS
@@ -1,16 +1,15 @@
-           SPELL=gtk\+
+           SPELL=gtk+
          VERSION=1.2.10
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://ftp.gtk.org/pub/gtk/v1.2/$SOURCE
      
SOURCE_HASH=sha512:6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f
       LICENSE[0]=LGPL
         WEB_SITE=http://www.gtk.org
          ENTERED=20010922
         KEYWORDS="x11 libs"
-           SHORT="gtk+ is a multi-platform toolkit for creating GUIs."
+           SHORT="multi-platform toolkit for creating GUIs"
 cat << EOF
-GTK+
 GTK, which stands for the Gimp ToolKit, is a library for creating
 graphical user interfaces. It is designed to be small and efficient, but
 still flexible enough to allow the programmer freedom in the interfaces
diff --git a/x11-toolkits/gtk+/HISTORY b/x11-toolkits/gtk+/HISTORY
index 8b341e3..c78b555 100644
--- a/x11-toolkits/gtk+/HISTORY
+++ b/x11-toolkits/gtk+/HISTORY
@@ -1,3 +1,9 @@
+2011-08-01 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: quoting paths
+       * DEPENDS: corrected dependencies -- killed xorg-libs, see #14699
+       * BUILD: removed
+       * PRE_BUILD: added, patches are applied here
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/x11-toolkits/gtk+/PRE_BUILD b/x11-toolkits/gtk+/PRE_BUILD
new file mode 100755
index 0000000..2039c61
--- /dev/null
+++ b/x11-toolkits/gtk+/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/config.sub.patch"
diff --git a/x11-toolkits/libgtk-java/DEPENDS 
b/x11-toolkits/libgtk-java/DEPENDS
index de73d8a..ebe6c18 100755
--- a/x11-toolkits/libgtk-java/DEPENDS
+++ b/x11-toolkits/libgtk-java/DEPENDS
@@ -2,7 +2,7 @@ depends  JAVA  ''  ''  'z-rejected'  &&
 depends  autoconf                    &&
 depends  automake                    &&
 depends  libtool                     &&
-depends  gcj                         &&
+depends -sub JAVA gcc                         &&
 depends  glib-java                   &&
 depends  cairo-java                  &&
 depends  gtk+2                       &&
diff --git a/x11-toolkits/libgtk-java/HISTORY 
b/x11-toolkits/libgtk-java/HISTORY
index 99ffec6..a63232d 100644
--- a/x11-toolkits/libgtk-java/HISTORY
+++ b/x11-toolkits/libgtk-java/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on gcj to dependency on gcc with
+         sub-depends on JAVA (scripted)
+
 2007-01-13 Robin Cook <rcook AT wyrms.net>
        * DETAILS: updated VERSION to 2.10.2
 
diff --git a/x11-toolkits/nucleo/DEPENDS b/x11-toolkits/nucleo/DEPENDS
index e30c77e..ed695ea 100755
--- a/x11-toolkits/nucleo/DEPENDS
+++ b/x11-toolkits/nucleo/DEPENDS
@@ -2,4 +2,4 @@ depends  xorg-server  &&
 depends  libpng      &&
 depends  JPEG        &&
 depends  freetype2   &&
-depends  g++
+depends -sub CXX gcc
diff --git a/x11-toolkits/nucleo/HISTORY b/x11-toolkits/nucleo/HISTORY
index 6638a85..d68bae1 100644
--- a/x11-toolkits/nucleo/HISTORY
+++ b/x11-toolkits/nucleo/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/x11-toolkits/polymer/DEPENDS b/x11-toolkits/polymer/DEPENDS
index 8301c79..d517b7b 100755
--- a/x11-toolkits/polymer/DEPENDS
+++ b/x11-toolkits/polymer/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++      &&
+depends -sub CXX gcc      &&
 depends  qt-x11   &&
 depends  libxext  &&
 depends  libx11
diff --git a/x11-toolkits/polymer/HISTORY b/x11-toolkits/polymer/HISTORY
index 50f7104..d66b97f 100644
--- a/x11-toolkits/polymer/HISTORY
+++ b/x11-toolkits/polymer/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: No need to check if using modular X as that's all that's
          available now
diff --git a/x11-toolkits/qscintilla/DEPENDS b/x11-toolkits/qscintilla/DEPENDS
index 0a3bd97..7fe95c2 100755
--- a/x11-toolkits/qscintilla/DEPENDS
+++ b/x11-toolkits/qscintilla/DEPENDS
@@ -1,2 +1,2 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends QT
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index bf5f87d..1496e09 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-05-23 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: updated spell to 2.4.3
 
diff --git a/x11-toolkits/qt-embedded/DEPENDS 
b/x11-toolkits/qt-embedded/DEPENDS
index ef0d5e1..b7ec19f 100755
--- a/x11-toolkits/qt-embedded/DEPENDS
+++ b/x11-toolkits/qt-embedded/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  uudeview  &&
 
 optional_depends  freetype2                     \
diff --git a/x11-toolkits/qt-embedded/HISTORY 
b/x11-toolkits/qt-embedded/HISTORY
index b525c5b..f54709b 100644
--- a/x11-toolkits/qt-embedded/HISTORY
+++ b/x11-toolkits/qt-embedded/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/x11-toolkits/qt-x11/DEPENDS b/x11-toolkits/qt-x11/DEPENDS
index f16abf5..6924df6 100755
--- a/x11-toolkits/qt-x11/DEPENDS
+++ b/x11-toolkits/qt-x11/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++       &&
+depends -sub CXX gcc       &&
 depends  xorg-libs  &&
 depends  UUDECODE  &&
 
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index 86287e2..567b9a5 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: uudeview -> UUDECODE
 
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 9253615..d71d81e 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++         &&
+depends -sub CXX gcc         &&
 depends  zlib        &&
 depends  libx11      &&
 depends  libxcursor  &&
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 10b441c..fc1c004 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-05-04 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.7.3, SECURITY_PATCH=4, QTBUG-18338
 
diff --git a/x11-toolkits/qtada/DEPENDS b/x11-toolkits/qtada/DEPENDS
index 03170af..283a98a 100755
--- a/x11-toolkits/qtada/DEPENDS
+++ b/x11-toolkits/qtada/DEPENDS
@@ -2,4 +2,4 @@ depends -sub "ACCESS OPENGL" qt4 &&
 depends gprbuild        &&
 depends asis            &&
 optional_depends gtkada "--with-gtkada" "" "enable gtk bindings?" &&
-depends ada
+depends -sub ADA gcc
diff --git a/x11-toolkits/qtada/HISTORY b/x11-toolkits/qtada/HISTORY
index 1e362c2..5ca7f4c 100644
--- a/x11-toolkits/qtada/HISTORY
+++ b/x11-toolkits/qtada/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on ada to dependency on gcc with
+         sub-depends on ADA (scripted)
+
 2011-02-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: added missing sub dependency on OPENGL for qt4
 
diff --git a/x11-toolkits/sptk/DEPENDS b/x11-toolkits/sptk/DEPENDS
index 4d621c5..27b4c25 100755
--- a/x11-toolkits/sptk/DEPENDS
+++ b/x11-toolkits/sptk/DEPENDS
@@ -1,5 +1,5 @@
 depends cmake    &&
-depends g++      &&
+depends -sub CXX gcc      &&
 
 # using @ instead of : to avoid a sorcery problem,
 # as the colon is used as a separator in depends processing
diff --git a/x11-toolkits/sptk/HISTORY b/x11-toolkits/sptk/HISTORY
index 68605c6..8cd413b 100644
--- a/x11-toolkits/sptk/HISTORY
+++ b/x11-toolkits/sptk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-06-29 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.13
 
diff --git a/x11-toolkits/wxgtk-new/DEPENDS b/x11-toolkits/wxgtk-new/DEPENDS
index bac8d2b..4d2b1e7 100755
--- a/x11-toolkits/wxgtk-new/DEPENDS
+++ b/x11-toolkits/wxgtk-new/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  gtk+2 &&
 depends  libx11 '--with-x' &&
 depends  libxpm '--with-libxpm' &&
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index 813a59c..00fb178 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.9.2
 
diff --git a/x11-toolkits/wxgtk/DEPENDS b/x11-toolkits/wxgtk/DEPENDS
index d2458cf..fd0d5c7 100755
--- a/x11-toolkits/wxgtk/DEPENDS
+++ b/x11-toolkits/wxgtk/DEPENDS
@@ -1,4 +1,4 @@
-depends  g++  &&
+depends -sub CXX gcc  &&
 
 depends  gtk+2 &&
 
diff --git a/x11-toolkits/wxgtk/HISTORY b/x11-toolkits/wxgtk/HISTORY
index 87a86c1..8909728 100644
--- a/x11-toolkits/wxgtk/HISTORY
+++ b/x11-toolkits/wxgtk/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-04-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.8.12
 
diff --git a/x11/nx/DEPENDS b/x11/nx/DEPENDS
index fe4cb70..3048cb3 100755
--- a/x11/nx/DEPENDS
+++ b/x11/nx/DEPENDS
@@ -1,5 +1,5 @@
 depends  autoconf      &&
-depends  g++           &&
+depends -sub CXX gcc           &&
 depends  gccmakedep    &&
 depends  gzip          &&
 depends  imake         &&
diff --git a/x11/nx/HISTORY b/x11/nx/HISTORY
index 92455af..8b1cccf 100644
--- a/x11/nx/HISTORY
+++ b/x11/nx/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/x11/nxcomp/DEPENDS b/x11/nxcomp/DEPENDS
index 595a1e9..ccc6b11 100755
--- a/x11/nxcomp/DEPENDS
+++ b/x11/nxcomp/DEPENDS
@@ -1,4 +1,4 @@
 depends JPEG   &&
 depends libpng &&
-depends g++    &&
+depends -sub CXX gcc    &&
 depends X11-SERVER
diff --git a/x11/nxcomp/HISTORY b/x11/nxcomp/HISTORY
index 296762e..af01f42 100644
--- a/x11/nxcomp/HISTORY
+++ b/x11/nxcomp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-03-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS, INSTALL, Loop.cpp.diff, PRE_BUILD: spell created
 
diff --git a/x11/qsynergy/DEPENDS b/x11/qsynergy/DEPENDS
index 61dd3f1..e421e8d 100755
--- a/x11/qsynergy/DEPENDS
+++ b/x11/qsynergy/DEPENDS
@@ -1,3 +1,3 @@
 depends qt4 &&
-depends g++ &&
+depends -sub CXX gcc &&
 depends synergy 
diff --git a/x11/qsynergy/HISTORY b/x11/qsynergy/HISTORY
index 6ea059f..ae2a61d 100644
--- a/x11/qsynergy/HISTORY
+++ b/x11/qsynergy/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-12 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed SOURCE_URL
 
diff --git a/x11/quasar/DEPENDS b/x11/quasar/DEPENDS
index 35caa6c..02b3622 100755
--- a/x11/quasar/DEPENDS
+++ b/x11/quasar/DEPENDS
@@ -1,4 +1,4 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends tk      &&
 depends tcl     &&
 depends qt-x11  &&
diff --git a/x11/quasar/HISTORY b/x11/quasar/HISTORY
index e9d642d..7f7b520 100644
--- a/x11/quasar/HISTORY
+++ b/x11/quasar/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-10-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: firebird has moved
 
diff --git a/x11/slim/DEPENDS b/x11/slim/DEPENDS
index bc05c0c..b4c8875 100755
--- a/x11/slim/DEPENDS
+++ b/x11/slim/DEPENDS
@@ -1,4 +1,4 @@
-depends g++ &&
+depends -sub CXX gcc &&
 depends fontconfig &&
 depends freetype2 &&
 depends JPEG &&
diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index 6de35b6..2f2b098 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
        * DEPENDS: jpeg -> JPEG
 
diff --git a/x11/synergy/DEPENDS b/x11/synergy/DEPENDS
index 9309374..63f1137 100755
--- a/x11/synergy/DEPENDS
+++ b/x11/synergy/DEPENDS
@@ -1,7 +1,7 @@
 depends  xorg-server  &&
 depends  autoconf  &&
 depends  automake  &&
-depends  g++  &&
+depends -sub CXX gcc  &&
 depends  libxtst  && 
 depends  libxinerama  &&
 depends  libxext  &&
diff --git a/x11/synergy/HISTORY b/x11/synergy/HISTORY
index 265aa5c..c74161d 100644
--- a/x11/synergy/HISTORY
+++ b/x11/synergy/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-08 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Word-wrap long description to 80 cols
 
diff --git a/x11/xchm/DEPENDS b/x11/xchm/DEPENDS
index 36c4f29..7908b4a 100755
--- a/x11/xchm/DEPENDS
+++ b/x11/xchm/DEPENDS
@@ -1,4 +1,4 @@
-depends g++     &&
+depends -sub CXX gcc     &&
 depends WXWIDGET &&
 depends chmlib
 
diff --git a/x11/xchm/HISTORY b/x11/xchm/HISTORY
index 981e4e6..fe805f2 100644
--- a/x11/xchm/HISTORY
+++ b/x11/xchm/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2008-06-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.17
        * DEPENDS: wxgtk -> WXWIDGET
diff --git a/xorg-lib/libfontenc/DEPENDS b/xorg-lib/libfontenc/DEPENDS
index 2fd62ae..60d5bc3 100755
--- a/xorg-lib/libfontenc/DEPENDS
+++ b/xorg-lib/libfontenc/DEPENDS
@@ -1,5 +1,5 @@
 depends  gawk         &&
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  pkgconfig    &&
 depends  libtool      &&
 depends  zlib         &&
diff --git a/xorg-lib/libfontenc/HISTORY b/xorg-lib/libfontenc/HISTORY
index 09356bf..f1f6cf2 100644
--- a/xorg-lib/libfontenc/HISTORY
+++ b/xorg-lib/libfontenc/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-10-24  Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.1.0
 
diff --git a/xorg-lib/libice/DEPENDS b/xorg-lib/libice/DEPENDS
index 8e692b8..71bc1f2 100755
--- a/xorg-lib/libice/DEPENDS
+++ b/xorg-lib/libice/DEPENDS
@@ -1,5 +1,5 @@
 depends  gawk         &&
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  pkgconfig    &&
 depends  libtool      &&
 depends  zlib         &&
diff --git a/xorg-lib/libice/HISTORY b/xorg-lib/libice/HISTORY
index 9a7c917..c2d50a9 100644
--- a/xorg-lib/libice/HISTORY
+++ b/xorg-lib/libice/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2011-07-25 Bor Kraljič <pyrobor AT ver.si>
        * CONFIGURE: remove "--disable-IPv6" from LIBICE_OPTS
 
diff --git a/xorg-lib/liblbxutil/DEPENDS b/xorg-lib/liblbxutil/DEPENDS
index c999c9e..a4357ea 100755
--- a/xorg-lib/liblbxutil/DEPENDS
+++ b/xorg-lib/liblbxutil/DEPENDS
@@ -1,5 +1,5 @@
 depends  gawk         &&
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  pkgconfig    &&
 depends  libtool      &&
 depends  zlib         &&
diff --git a/xorg-lib/liblbxutil/HISTORY b/xorg-lib/liblbxutil/HISTORY
index a248a6b..07718eb 100644
--- a/xorg-lib/liblbxutil/HISTORY
+++ b/xorg-lib/liblbxutil/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.1.0
          SOURCE matches upstream posted SHA1
diff --git a/xorg-lib/libxau/DEPENDS b/xorg-lib/libxau/DEPENDS
index 0c3a146..92e1251 100755
--- a/xorg-lib/libxau/DEPENDS
+++ b/xorg-lib/libxau/DEPENDS
@@ -1,5 +1,5 @@
 depends  gawk         &&
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  libtool      &&
 depends  pkgconfig    &&
 depends  util-macros  &&
diff --git a/xorg-lib/libxau/HISTORY b/xorg-lib/libxau/HISTORY
index f8f54c7..da5cafb 100644
--- a/xorg-lib/libxau/HISTORY
+++ b/xorg-lib/libxau/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-07-23 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.0.6
 
diff --git a/xorg-lib/libxdmcp/DEPENDS b/xorg-lib/libxdmcp/DEPENDS
index 0c3a146..92e1251 100755
--- a/xorg-lib/libxdmcp/DEPENDS
+++ b/xorg-lib/libxdmcp/DEPENDS
@@ -1,5 +1,5 @@
 depends  gawk         &&
-depends  g++          &&
+depends -sub CXX gcc          &&
 depends  libtool      &&
 depends  pkgconfig    &&
 depends  util-macros  &&
diff --git a/xorg-lib/libxdmcp/HISTORY b/xorg-lib/libxdmcp/HISTORY
index 8072ea3..f25b296 100644
--- a/xorg-lib/libxdmcp/HISTORY
+++ b/xorg-lib/libxdmcp/HISTORY
@@ -1,3 +1,7 @@
+2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: changed dependency on g++ to dependency on gcc with
+         sub-depends on CXX (scripted)
+
 2010-11-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.1.0
          update description