summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Orgis2012-01-20 09:55:21 +0100
committerThomas Orgis2012-01-20 09:55:21 +0100
commit55f6b36ddfc9129c941f43ccaf030021ca4052c9 (patch)
treef9b4a2bce956950b3124f2b1c1f8d4434516a9ba
parentfb53a259a0efa3b0dc6d5f594e418402489c4759 (diff)
parent1c38e0661cf5a7583aef8f1821f818c547466cf2 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rw-r--r--ChangeLog24
-rwxr-xr-xaccounts1
-rwxr-xr-xarchive-libs/libzip/DETAILS4
-rw-r--r--archive-libs/libzip/HISTORY4
-rwxr-xr-xarchive-libs/libzip/UP_TRIGGERS9
-rwxr-xr-xarchive-libs/snappy/DETAILS15
-rw-r--r--archive-libs/snappy/HISTORY2
-rwxr-xr-xarchive/unrar/DETAILS4
-rw-r--r--archive/unrar/HISTORY3
-rwxr-xr-xaudio-libs/audiofile/BUILD2
-rwxr-xr-xaudio-libs/audiofile/DETAILS2
-rw-r--r--audio-libs/audiofile/HISTORY5
-rwxr-xr-xaudio-libs/audiofile/UP_TRIGGERS19
-rw-r--r--audio-libs/audiofile/audiofile-0.3.2.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--audio-libs/audiofile/audiofile-0.3.3.tar.gz.sigbin0 -> 287 bytes
-rw-r--r--crypto/6581B5F1.gpg (renamed from crypto/cyrus-sasl/6581B5F1.gpg)bin1248 -> 1248 bytes
-rwxr-xr-xcrypto/cyrus-sasl/DETAILS4
-rw-r--r--crypto/cyrus-sasl/HISTORY8
-rwxr-xr-xcrypto/cyrus-sasl/PRE_BUILD7
-rw-r--r--crypto/cyrus-sasl/db5.patch24
-rw-r--r--crypto/cyrus-sasl/gcc44.diff20
-rw-r--r--crypto/libsasl/6581B5F1.gpgbin1248 -> 0 bytes
-rwxr-xr-xcrypto/openssl/DETAILS8
-rw-r--r--crypto/openssl/HISTORY4
-rwxr-xr-xcrypto/pcsc-lite/DETAILS6
-rw-r--r--crypto/pcsc-lite/HISTORY3
-rwxr-xr-xdatabase/kyotocabinet/DETAILS4
-rw-r--r--database/kyotocabinet/HISTORY3
-rwxr-xr-xdatabase/pgadmin3/DETAILS2
-rw-r--r--database/pgadmin3/HISTORY3
-rwxr-xr-xdatabase/sqlite/DETAILS6
-rw-r--r--database/sqlite/HISTORY3
-rwxr-xr-xdatabase/tokyocabinet/BUILD3
-rwxr-xr-xdatabase/tokyocabinet/CONFLICTS1
-rwxr-xr-xdatabase/tokyocabinet/DEPENDS4
-rwxr-xr-xdatabase/tokyocabinet/DETAILS6
-rw-r--r--database/tokyocabinet/HISTORY6
-rwxr-xr-xdevel/git/DETAILS8
-rw-r--r--devel/git/HISTORY3
-rwxr-xr-xdevel/python/DETAILS1
-rw-r--r--devel/python/HISTORY6
-rwxr-xr-xdevel/python/INSTALL11
-rwxr-xr-xdevel/python/PRE_BUILD4
-rwxr-xr-xdevel/python3/DETAILS1
-rw-r--r--devel/python3/HISTORY6
-rwxr-xr-xdevel/python3/INSTALL10
-rwxr-xr-xdevel/python3/PRE_BUILD4
-rwxr-xr-xdisk/brasero/DEPENDS2
-rw-r--r--disk/brasero/HISTORY3
-rwxr-xr-xdoc/devhelp/DEPENDS2
-rw-r--r--doc/devhelp/HISTORY3
-rwxr-xr-xdoc/docx2txt/DETAILS4
-rw-r--r--doc/docx2txt/HISTORY4
-rwxr-xr-xdoc/docx2txt/INSTALL2
-rwxr-xr-xdoc/fbreader/DEPENDS2
-rwxr-xr-xdoc/fbreader/DETAILS5
-rw-r--r--doc/fbreader/HISTORY5
-rwxr-xr-xdoc/fbreader/PREPARE9
-rwxr-xr-xdoc/fbreader/PRE_BUILD6
-rwxr-xr-xdoc/po4a/DEPENDS1
-rw-r--r--doc/po4a/HISTORY3
-rwxr-xr-xe-17/enki/DEPENDS2
-rw-r--r--e-17/enki/HISTORY3
-rwxr-xr-xeditors/focuswriter/BUILD1
-rwxr-xr-xeditors/focuswriter/DEPENDS4
-rwxr-xr-xeditors/focuswriter/DETAILS13
-rw-r--r--editors/focuswriter/HISTORY2
-rwxr-xr-xftp/ncftp/DETAILS2
-rw-r--r--ftp/ncftp/HISTORY3
-rwxr-xr-xgnome2-apps/empathy/DEPENDS2
-rwxr-xr-xgnome2-apps/empathy/DETAILS2
-rw-r--r--gnome2-apps/empathy/HISTORY6
-rw-r--r--gnome2-apps/empathy/empathy-3.2.1.2.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/empathy/empathy-3.2.2.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-apps/gthumb2/DEPENDS2
-rw-r--r--gnome2-apps/gthumb2/HISTORY3
-rwxr-xr-xgnome2-apps/gucharmap/DETAILS2
-rw-r--r--gnome2-apps/gucharmap/HISTORY3
-rw-r--r--gnome2-apps/gucharmap/gucharmap-3.0.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-apps/gucharmap/gucharmap-3.2.2.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-apps/vinagre/DEPENDS2
-rw-r--r--gnome2-apps/vinagre/HISTORY3
-rwxr-xr-xgnome2-libs/gdm2/DETAILS2
-rw-r--r--gnome2-libs/gdm2/HISTORY3
-rw-r--r--gnome2-libs/gdm2/gdm-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gdm2/gdm-3.2.1.1.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/gjs/DETAILS4
-rw-r--r--gnome2-libs/gjs/HISTORY3
-rw-r--r--gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gjs/gjs-1.30.1.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/gnome-control-center/DEPENDS2
-rwxr-xr-xgnome2-libs/gnome-control-center/DETAILS2
-rw-r--r--gnome2-libs/gnome-control-center/HISTORY6
-rw-r--r--gnome2-libs/gnome-control-center/gnome-control-center-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-control-center/gnome-control-center-3.2.2.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/gnome-media2/DEPENDS2
-rw-r--r--gnome2-libs/gnome-media2/HISTORY3
-rwxr-xr-xgnome2-libs/gnome-settings-daemon/DETAILS2
-rw-r--r--gnome2-libs/gnome-settings-daemon/HISTORY3
-rw-r--r--gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.2.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/gnome-system-monitor/DETAILS2
-rw-r--r--gnome2-libs/gnome-system-monitor/HISTORY3
-rw-r--r--gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.1.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/gnome-utils2/DETAILS2
-rw-r--r--gnome2-libs/gnome-utils2/HISTORY3
-rw-r--r--gnome2-libs/gnome-utils2/gnome-utils-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gnome-utils2/gnome-utils-3.2.1.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/gnome2-user-docs/DETAILS2
-rw-r--r--gnome2-libs/gnome2-user-docs/HISTORY3
-rw-r--r--gnome2-libs/gnome2-user-docs/gnome-user-docs-2.32.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/gnome2-user-docs/gnome-user-docs-3.2.2.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/gtk-engines2/DEPENDS9
-rw-r--r--gnome2-libs/gtk-engines2/HISTORY8
-rwxr-xr-xgnome2-libs/gtk-engines2/INSTALL2
-rwxr-xr-xgnome2-libs/gtk-engines2/PRE_BUILD3
-rw-r--r--gnome2-libs/gtk-engines2/animation.c.patch11
-rwxr-xr-xgnome2-libs/libcanberra/DEPENDS6
-rw-r--r--gnome2-libs/libcanberra/HISTORY4
-rwxr-xr-xgnome2-libs/libcanberra/PRE_SUB_DEPENDS1
-rwxr-xr-xgnome2-libs/libcanberra/SUB_DEPENDS3
-rwxr-xr-xgnome2-libs/libgweather/DETAILS2
-rw-r--r--gnome2-libs/libgweather/HISTORY3
-rw-r--r--gnome2-libs/libgweather/libgweather-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/libgweather/libgweather-3.2.1.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/libsoup/DEPENDS3
-rwxr-xr-xgnome2-libs/libsoup/DETAILS5
-rw-r--r--gnome2-libs/libsoup/HISTORY6
-rw-r--r--gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sigbin0 -> 72 bytes
-rwxr-xr-xgnome2-libs/mutter/DETAILS4
-rw-r--r--gnome2-libs/mutter/HISTORY3
-rw-r--r--gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/mutter/mutter-3.2.2.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/nautilus2/DEPENDS2
-rw-r--r--gnome2-libs/nautilus2/HISTORY3
-rwxr-xr-xgnome2-libs/vino/DEPENDS2
-rwxr-xr-xgnome2-libs/vino/DETAILS2
-rw-r--r--gnome2-libs/vino/HISTORY6
-rw-r--r--gnome2-libs/vino/vino-3.0.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/vino/vino-3.2.2.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/yelp-tools/DETAILS2
-rw-r--r--gnome2-libs/yelp-tools/HISTORY3
-rw-r--r--gnome2-libs/yelp-tools/yelp-tools-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/yelp-tools/yelp-tools-3.2.1.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome2-libs/yelp/BUILD15
-rwxr-xr-xgnome2-libs/yelp/CONFIGURE1
-rwxr-xr-xgnome2-libs/yelp/DEPENDS10
-rwxr-xr-xgnome2-libs/yelp/DETAILS2
-rw-r--r--gnome2-libs/yelp/HISTORY5
-rw-r--r--gnome2-libs/yelp/yelp-3.2.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/yelp/yelp-3.2.1.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgnome3-libs/gnome-shell/DETAILS4
-rw-r--r--gnome3-libs/gnome-shell/HISTORY6
-rw-r--r--gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sigbin0 -> 287 bytes
-rwxr-xr-xgnome3-libs/gnome-themes-standard/DETAILS2
-rw-r--r--gnome3-libs/gnome-themes-standard/HISTORY3
-rw-r--r--gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.0.2.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.1.tar.bz2.sigbin0 -> 543 bytes
-rwxr-xr-xgraphics-libs/libvisio/DETAILS4
-rw-r--r--graphics-libs/libvisio/HISTORY5
-rwxr-xr-xgraphics-libs/poppler/DETAILS8
-rw-r--r--graphics-libs/poppler/HISTORY3
-rwxr-xr-xgroups1
-rwxr-xr-xhttp/midori/DETAILS4
-rw-r--r--http/midori/HISTORY3
-rwxr-xr-xhttp/webkitgtk/DEPENDS2
-rw-r--r--http/webkitgtk/HISTORY3
-rw-r--r--kde4-support/phonon-backend-gstreamer/HISTORY4
-rwxr-xr-xkde4-support/phonon-backend-gstreamer/PRE_BUILD3
-rw-r--r--kde4-support/phonon-backend-gstreamer/message.h.patch11
-rwxr-xr-xkernels/kmod/DEPENDS3
-rwxr-xr-xkernels/kmod/DETAILS25
-rw-r--r--kernels/kmod/HISTORY9
-rw-r--r--kernels/kmod/lucas.demarchi.gpgbin0 -> 5041 bytes
-rw-r--r--kernels/linux/HISTORY4
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.2.15
-rw-r--r--kernels/linux/latest.defaults2
-rwxr-xr-xlibs/gssdp/DEPENDS3
-rw-r--r--libs/gssdp/HISTORY5
-rwxr-xr-xlibs/libidn/DETAILS2
-rw-r--r--libs/libidn/HISTORY3
-rwxr-xr-xlibs/libnih/DETAILS10
-rw-r--r--libs/libnih/HISTORY3
-rwxr-xr-xlibs/upower/DETAILS4
-rw-r--r--libs/upower/HISTORY3
-rwxr-xr-xmail/courier/CONFLICTS1
-rw-r--r--mail/courier/HISTORY3
-rwxr-xr-xmail/esmtp/CONFLICTS1
-rw-r--r--mail/esmtp/HISTORY3
-rwxr-xr-xmail/exim/CONFLICTS1
-rw-r--r--mail/exim/HISTORY3
-rwxr-xr-xmail/masqmail/BUILD10
-rwxr-xr-xmail/masqmail/CONFIGURE11
-rwxr-xr-xmail/masqmail/CONFLICTS6
-rwxr-xr-xmail/masqmail/DEPENDS6
-rwxr-xr-xmail/masqmail/DETAILS47
-rw-r--r--mail/masqmail/HISTORY3
-rwxr-xr-xmail/masqmail/INSTALL24
-rwxr-xr-xmail/masqmail/PROVIDES2
-rwxr-xr-xmail/masqmail/SECURITY3
-rwxr-xr-xmail/masqmail/init.d/masqmail11
-rw-r--r--mail/masqmail/init.d/masqmail.conf10
-rw-r--r--mail/masqmail/masqmail.gpgbin0 -> 1167 bytes
-rwxr-xr-xmail/postfix/CONFLICTS1
-rw-r--r--mail/postfix/HISTORY3
-rwxr-xr-xmail/qmail/CONFLICTS1
-rw-r--r--mail/qmail/HISTORY3
-rwxr-xr-xmail/sendmail/CONFLICTS1
-rw-r--r--mail/sendmail/HISTORY3
-rwxr-xr-xmail/ssmtp/CONFLICTS1
-rw-r--r--mail/ssmtp/HISTORY3
-rwxr-xr-xmail/thunderbird/DEPENDS34
-rw-r--r--mail/thunderbird/HISTORY3
-rwxr-xr-xnet/cacti/DETAILS18
-rw-r--r--net/cacti/HISTORY5
-rwxr-xr-xnet/cacti/INSTALL7
-rwxr-xr-xnet/cacti/PREPARE4
-rwxr-xr-xnet/cacti/PRE_BUILD14
-rw-r--r--net/cacti/patches/settings_checkbox.patch56
-rwxr-xr-xnet/cifs-utils/DETAILS4
-rw-r--r--net/cifs-utils/HISTORY3
-rwxr-xr-xnet/ethtool/DETAILS4
-rw-r--r--net/ethtool/HISTORY3
-rwxr-xr-xnet/ipset/DETAILS4
-rw-r--r--net/ipset/HISTORY3
-rwxr-xr-xnet/spine/DETAILS4
-rw-r--r--net/spine/HISTORY3
-rwxr-xr-xperl-cpan/dbd-odbc/DETAILS4
-rw-r--r--perl-cpan/dbd-odbc/HISTORY3
-rwxr-xr-xperl-cpan/io-socket-ssl/DETAILS2
-rw-r--r--perl-cpan/io-socket-ssl/HISTORY3
-rw-r--r--perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xperl-cpan/net-ssleay/DETAILS6
-rw-r--r--perl-cpan/net-ssleay/HISTORY3
-rw-r--r--perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sigbin543 -> 0 bytes
-rw-r--r--perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xperl-cpan/podlators/DEPENDS1
-rwxr-xr-xperl-cpan/podlators/DETAILS17
-rw-r--r--perl-cpan/podlators/HISTORY3
-rwxr-xr-xpython-pypi/calibre/DETAILS4
-rw-r--r--python-pypi/calibre/HISTORY4
-rwxr-xr-xpython-pypi/calibre/PRE_BUILD5
-rw-r--r--python-pypi/calibre/calibre-0.8.27.tar.gz.sigbin287 -> 0 bytes
-rw-r--r--python-pypi/calibre/calibre-0.8.35.tar.xz.sigbin0 -> 543 bytes
-rwxr-xr-xpython-pypi/fabric/DETAILS4
-rw-r--r--python-pypi/fabric/HISTORY3
-rwxr-xr-xpython-pypi/matplotlib/DETAILS8
-rw-r--r--python-pypi/matplotlib/HISTORY3
-rw-r--r--python-pypi/pygame/HISTORY5
-rwxr-xr-xpython-pypi/pygame/PRE_BUILD3
-rw-r--r--python-pypi/pygame/pygame-v4l.patch88
-rwxr-xr-xpython-pypi/python-ldap/DEPENDS5
-rwxr-xr-xpython-pypi/python-ldap/DETAILS6
-rw-r--r--python-pypi/python-ldap/HISTORY5
-rwxr-xr-xpython-pypi/python-ldap/PRE_BUILD11
-rwxr-xr-xsmgl/upstart/DETAILS16
-rw-r--r--smgl/upstart/HISTORY10
-rwxr-xr-xsmgl/upstart/PRE_BUILD2
-rw-r--r--smgl/upstart/upstart.gpgbin0 -> 187026 bytes
-rwxr-xr-xutils/convmv/DEPENDS2
-rw-r--r--utils/convmv/HISTORY3
-rwxr-xr-xutils/notification-daemon/DEPENDS3
-rw-r--r--utils/notification-daemon/HISTORY3
-rwxr-xr-xutils/ntp/DEPENDS6
-rw-r--r--utils/ntp/HISTORY3
-rwxr-xr-xutils/pciutils/DETAILS4
-rw-r--r--utils/pciutils/HISTORY3
-rwxr-xr-xutils/smem/BUILD1
-rwxr-xr-xutils/smem/DEPENDS3
-rwxr-xr-xutils/smem/DETAILS34
-rw-r--r--utils/smem/HISTORY2
-rwxr-xr-xutils/smem/INSTALL4
-rwxr-xr-xutils/stow/DETAILS5
-rw-r--r--utils/stow/HISTORY3
-rwxr-xr-xutils/util-linux/DETAILS15
-rwxr-xr-xutils/util-linux/FINAL9
-rw-r--r--utils/util-linux/HISTORY13
-rwxr-xr-xutils/util-linux/PRE_BUILD6
-rw-r--r--utils/util-linux/util-linux.gpgbin0 -> 2222 bytes
-rwxr-xr-xutils/youtube-dl/DETAILS4
-rw-r--r--utils/youtube-dl/HISTORY3
-rw-r--r--video-libs/gst-plugins-bad/HISTORY3
-rwxr-xr-xvideo-libs/gst-plugins-bad/PRE_BUILD4
-rw-r--r--video-libs/gst-plugins-bad/mjpegtools-fix.patch15
-rwxr-xr-xvideo/ffmpeg/DETAILS6
-rw-r--r--video/ffmpeg/HISTORY3
-rwxr-xr-xvideo/lives/DETAILS4
-rw-r--r--video/lives/HISTORY3
-rw-r--r--windowmanagers/awesome/HISTORY3
-rwxr-xr-xwindowmanagers/awesome/PRE_BUILD3
-rwxr-xr-xwindowmanagers/blackbox/DEPENDS2
-rw-r--r--windowmanagers/blackbox/HISTORY3
-rwxr-xr-xwm-addons/light-monitor/BUILD1
-rwxr-xr-xwm-addons/light-monitor/DEPENDS3
-rwxr-xr-xwm-addons/light-monitor/DETAILS36
-rw-r--r--wm-addons/light-monitor/HISTORY3
-rwxr-xr-xwm-addons/light-monitor/PRE_BUILD3
-rw-r--r--wm-addons/light-monitor/makefile.patch66
-rwxr-xr-xwm-addons/netwmpager/BUILD2
-rwxr-xr-xwm-addons/netwmpager/DEPENDS2
-rwxr-xr-xwm-addons/netwmpager/DETAILS19
-rw-r--r--wm-addons/netwmpager/HISTORY4
-rwxr-xr-xwm-addons/xmobar/DETAILS4
-rw-r--r--wm-addons/xmobar/HISTORY3
-rw-r--r--x11-libs/cairo/HISTORY4
-rwxr-xr-xx11-libs/cairo/SUB_DEPENDS4
-rwxr-xr-xx11-libs/wine/DETAILS2
-rw-r--r--x11-libs/wine/HISTORY3
-rwxr-xr-xx11-toolkits/wxgtk-new/DETAILS4
-rw-r--r--x11-toolkits/wxgtk-new/HISTORY3
-rwxr-xr-xx11/gtk-vnc/DEPENDS2
-rw-r--r--x11/gtk-vnc/HISTORY7
-rwxr-xr-xx11/gtk-vnc/PRE_SUB_DEPENDS6
-rwxr-xr-xx11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS8
-rwxr-xr-xx11/gtk-vnc/SUB_DEPENDS11
-rwxr-xr-xx11/lightdm/DETAILS5
-rw-r--r--x11/lightdm/HISTORY5
-rwxr-xr-xx11/lightdm/PRE_BUILD3
-rw-r--r--x11/lightdm/lightdm-1.1.0.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xxfce/ristretto/DETAILS4
-rw-r--r--xfce/ristretto/HISTORY3
324 files changed, 1361 insertions, 290 deletions
diff --git a/ChangeLog b/ChangeLog
index b6f5b0c22f..1a9abcb324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * editors/focuswriter: new, simple, distraction-free writing environment
+
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * accounts, groups: added account data for masqmail
+ * mail/masqmail: new spell, MTA for workstations and for servers in
+ small networks
+ * crypto/6581B5F1.gpg: moved from libsasl spell
+
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * archive-libs/snappy: new, fast compression/decompression library
+
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * wm-addons/netwmpager: new spell, an EWMH compliant pager
+ * wm-addons/light-monitor: new spell, a panel for window managers
+ that don't provide their own one
+ * perl-cpan/podlators: new spell, installs pod2man and pod2text
+
+2012-01-14 Vlad Glagolev <stealth@sourcemage.org>
+ * utils/smem: new spell, tool for meaningful memory reporting
+
+2012-01-13 Treeve Jelbert <treeve@sourcemage.org>
+ * kernels/kmod: new spell, tool to replace module-init-tools
+
2012-01-13 Thomas Orgis <sobukus@sourcemage.org>
* kde4-apps/FUNCTIONS: ensure build finds correct QT binaries first
diff --git a/accounts b/accounts
index 45531bf7e0..7cc238f3cb 100755
--- a/accounts
+++ b/accounts
@@ -96,4 +96,5 @@ dspam:187:188
nslcd:188:189
redis:189:190
lightdm:191:191
+masqmail:192:192
nobody:65534:65534
diff --git a/archive-libs/libzip/DETAILS b/archive-libs/libzip/DETAILS
index 3453eca9fb..825daac2ce 100755
--- a/archive-libs/libzip/DETAILS
+++ b/archive-libs/libzip/DETAILS
@@ -1,6 +1,6 @@
SPELL=libzip
- VERSION=0.9.3
- SOURCE_HASH=sha512:e10e563d79dbe633e8dc10e47c4b724be08d1d15176f46ba0dc433c6a8697484a55c2778d37ce93fbf760ca27a6d12268520d1af79aa0fa3e6926648ccd161e5
+ VERSION=0.10
+ SOURCE_HASH=sha512:5d42fae92d04dae038c416debabfb11293d66ad886a0189b7409c15efe36b759a8908c7b492084e252d1a0a5a9fe142cc97a5e339e4fd936253189a6097dc710
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.nih.at/libzip
diff --git a/archive-libs/libzip/HISTORY b/archive-libs/libzip/HISTORY
index 62809521b7..c1b185f44a 100644
--- a/archive-libs/libzip/HISTORY
+++ b/archive-libs/libzip/HISTORY
@@ -1,3 +1,7 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.10
+ * UP_TRIGGERS: added, libzip.so.1 -> libzip.so.2
+
2010-06-27 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.9.3
diff --git a/archive-libs/libzip/UP_TRIGGERS b/archive-libs/libzip/UP_TRIGGERS
new file mode 100755
index 0000000000..abfbe0ef57
--- /dev/null
+++ b/archive-libs/libzip/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
+ message "This is an incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/archive-libs/snappy/DETAILS b/archive-libs/snappy/DETAILS
new file mode 100755
index 0000000000..ed55d03a43
--- /dev/null
+++ b/archive-libs/snappy/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=snappy
+ VERSION=1.0.4
+ SOURCE_HASH=sha512:34e70dc35af9e8d7601618c2521be0cd0ba74907b8e67362d02c515c06c7bf2a2f58dac3dfed75270b7d9c9a1d6ec408c76e3665dc70bbeda8f87584cb4f01b0
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://snappy.googlecode.com/files/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://code.google.com/p/snappy/
+ LICENSE[0]=BSD
+ ENTERED=20120116
+ SHORT="fast compression/decompression library"
+cat << EOF
+Snappy is a compression/decompression library. It does not aim for maximum
+compression, or compatibility with any other compression library; instead,
+it aims for very high speeds and reasonable compression.
+EOF
diff --git a/archive-libs/snappy/HISTORY b/archive-libs/snappy/HISTORY
new file mode 100644
index 0000000000..7351a51195
--- /dev/null
+++ b/archive-libs/snappy/HISTORY
@@ -0,0 +1,2 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: spell created, version 1.0.4
diff --git a/archive/unrar/DETAILS b/archive/unrar/DETAILS
index 175fba7ccd..11fb095e35 100755
--- a/archive/unrar/DETAILS
+++ b/archive/unrar/DETAILS
@@ -1,11 +1,11 @@
SPELL=unrar
- VERSION=4.1.3
+ VERSION=4.1.4
SOURCE=${SPELL}src-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]=http://www.rarlab.com/rar/$SOURCE
WEB_SITE=http://www.rarlab.com
ENTERED=20011117
- SOURCE_HASH=sha512:fd853a844bdd5ba40049c7be569a443bb927f3a324dfdb981d9ccaebe6768e8b695e5f84aa10052f3b559ebb60a59a559f64f721d792dc0500d16a6b69a0f607
+ SOURCE_HASH=sha512:585e817d3246a4b5cc960298a40ae07c25d54becef680b67e59a441a279de3305a764ec455924eff09e8869dcceac2242e5657e8a3a9b741ca29e848e5f9c8e2
LICENSE[0]=freeware
KEYWORDS="archive"
SHORT="unRAR is a utility to extract, view, and test the contents of an RAR archive, version 1.50 and above."
diff --git a/archive/unrar/HISTORY b/archive/unrar/HISTORY
index d22bb994d5..a9809881f0 100644
--- a/archive/unrar/HISTORY
+++ b/archive/unrar/HISTORY
@@ -1,3 +1,6 @@
+2012-01-18 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 4.1.4
+
2012-01-12 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 4.1.3
diff --git a/audio-libs/audiofile/BUILD b/audio-libs/audiofile/BUILD
index 3fb8087c26..b4704fdd9a 100755
--- a/audio-libs/audiofile/BUILD
+++ b/audio-libs/audiofile/BUILD
@@ -1,2 +1,2 @@
OPTS+=" --disable-static" &&
-LIBS+=" -lm" default_build
+default_build
diff --git a/audio-libs/audiofile/DETAILS b/audio-libs/audiofile/DETAILS
index 1dd9e7f54c..faac0d8be4 100755
--- a/audio-libs/audiofile/DETAILS
+++ b/audio-libs/audiofile/DETAILS
@@ -1,5 +1,5 @@
SPELL=audiofile
- VERSION=0.3.2
+ VERSION=0.3.3
# SOURCE_HASH=sha512:a8ce05848b03d53014328d0dcdb231c211fbe9003ece0c59b9fbeac5b6e5cb72de8ded08a61ba8e0888ae013355c18e31ea6c7a4f12d76f889b5e157f60cf662
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/audio-libs/audiofile/HISTORY b/audio-libs/audiofile/HISTORY
index c44d997b69..f89c0b917d 100644
--- a/audio-libs/audiofile/HISTORY
+++ b/audio-libs/audiofile/HISTORY
@@ -1,3 +1,8 @@
+2012-01-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.3.3
+ * BUILD: -lm is included upstream now
+ * UP_TRIGGERS: added, for migration libaudiofile.so.0 -> libaudiofile.so.1
+
2012-01-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* BUILD: LIBS+=-lm
diff --git a/audio-libs/audiofile/UP_TRIGGERS b/audio-libs/audiofile/UP_TRIGGERS
new file mode 100755
index 0000000000..7cb4f94d92
--- /dev/null
+++ b/audio-libs/audiofile/UP_TRIGGERS
@@ -0,0 +1,19 @@
+# up_trigger everything on updated to 0.3.3 as soname changed from libaudiofile.so.0 to libaudiofile.so.1
+
+. "$GRIMOIRE/FUNCTIONS" &&
+
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if is_version_less "${OLD_SPELL_VERSION}" "0.3.3"; then
+
+ message "This is a possibly incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a while."
+ for each in $(show_up_depends $SPELL); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libaudiofile\.so\.0"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/audio-libs/audiofile/audiofile-0.3.2.tar.gz.sig b/audio-libs/audiofile/audiofile-0.3.2.tar.gz.sig
deleted file mode 100644
index 8bbb8d9426..0000000000
--- a/audio-libs/audiofile/audiofile-0.3.2.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/audio-libs/audiofile/audiofile-0.3.3.tar.gz.sig b/audio-libs/audiofile/audiofile-0.3.3.tar.gz.sig
new file mode 100644
index 0000000000..23906d4e2f
--- /dev/null
+++ b/audio-libs/audiofile/audiofile-0.3.3.tar.gz.sig
Binary files differ
diff --git a/crypto/cyrus-sasl/6581B5F1.gpg b/crypto/6581B5F1.gpg
index eda7920283..eda7920283 100644
--- a/crypto/cyrus-sasl/6581B5F1.gpg
+++ b/crypto/6581B5F1.gpg
Binary files differ
diff --git a/crypto/cyrus-sasl/DETAILS b/crypto/cyrus-sasl/DETAILS
index 7ec850068e..d1d1c7a07e 100755
--- a/crypto/cyrus-sasl/DETAILS
+++ b/crypto/cyrus-sasl/DETAILS
@@ -1,9 +1,9 @@
SPELL=cyrus-sasl
- VERSION=2.1.23
+ VERSION=2.1.25
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$SOURCE
SOURCE_URL[1]=ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/crypto/cyrus-sasl/HISTORY b/crypto/cyrus-sasl/HISTORY
index e33393492c..303d2bc9b4 100644
--- a/crypto/cyrus-sasl/HISTORY
+++ b/crypto/cyrus-sasl/HISTORY
@@ -1,3 +1,11 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * 6581B5F1.gpg: deleted, use the same key from section
+
+2012-01-18 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.1.25; quoting paths
+ * gcc44.diff: removed, fixed by upstream
+ * db5.patch: added, for db >5.0 support
+
2011-09-26 Bor Kraljič <pyrobor@ver.si>
* DETAILS: converted to upstream signature checking
* 6581B5F1.gpg: added gpg keyring
diff --git a/crypto/cyrus-sasl/PRE_BUILD b/crypto/cyrus-sasl/PRE_BUILD
index ec632ca52d..ba9528d40f 100755
--- a/crypto/cyrus-sasl/PRE_BUILD
+++ b/crypto/cyrus-sasl/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/gcc44.diff
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/db5.patch"
diff --git a/crypto/cyrus-sasl/db5.patch b/crypto/cyrus-sasl/db5.patch
new file mode 100644
index 0000000000..522824074a
--- /dev/null
+++ b/crypto/cyrus-sasl/db5.patch
@@ -0,0 +1,24 @@
+Author: Ondřej Surý <ondrej@debian.org>
+Description: Support newer Berkeley DB versions
+--- a/sasldb/db_berkeley.c
++++ b/sasldb/db_berkeley.c
+@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+--- a/utils/dbconverter-2.c
++++ b/utils/dbconverter-2.c
+@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/crypto/cyrus-sasl/gcc44.diff b/crypto/cyrus-sasl/gcc44.diff
deleted file mode 100644
index 9f3fb531db..0000000000
--- a/crypto/cyrus-sasl/gcc44.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/digestmd5.c 2006-05-17 18:46:17.000000000 +0200
-+++ plugins/digestmd5.c.cp 2009-04-07 16:20:31.000000000 +0200
-@@ -2715,7 +2715,7 @@
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4034,7 +4034,7 @@
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
diff --git a/crypto/libsasl/6581B5F1.gpg b/crypto/libsasl/6581B5F1.gpg
deleted file mode 100644
index eda7920283..0000000000
--- a/crypto/libsasl/6581B5F1.gpg
+++ /dev/null
Binary files differ
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index c195bf3820..6f9094d3d8 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi
case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8s
- SECURITY_PATCH=14
+ VERSION=0.9.8t
+ SECURITY_PATCH=15
;;
1.0)
- VERSION=1.0.0f
- SECURITY_PATCH=14
+ VERSION=1.0.0g
+ SECURITY_PATCH=15
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 04837c3762..ad4034afc1 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2012-01-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.9.8t, 1.0.0g, SECURITY_PATCH=15
+ http://www.openssl.org/news/secadv_20120118.txt
+
2012-01-04 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.9.8s, 1.0.0f, SECURITY_PATCH=14
http://www.openssl.org/news/secadv_20120104.txt
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index bb7da7eaf8..8721e810b7 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
SPELL=pcsc-lite
- VERSION=1.8.1
- SOURCE_HASH=sha512:fe9b8ae6654cb79af9772d2cf765e9459c3742b5cdf64b10fbe2cfbb4e8066b3e646a49517f992c480e077e856258c13d727327cd5c4da85da3b708236fa1717
+ VERSION=1.8.2
+ SOURCE_HASH=sha512:093666b8e44c24ef259cc5cf1f46ffebed7f0eedda43f7a4e58112695912b87148b5d1ae8fbd398bd0a623b943bb6f75253e5c6fdccf64f38b750c78a10f3064
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3687/$SOURCE
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3695/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/
LICENSE[0]=BSD
ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index 8b4159583d..f8c1b010e3 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.8.2
+
2011-11-27 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.8.1
diff --git a/database/kyotocabinet/DETAILS b/database/kyotocabinet/DETAILS
index 6caef17601..fc0b444f70 100755
--- a/database/kyotocabinet/DETAILS
+++ b/database/kyotocabinet/DETAILS
@@ -1,6 +1,6 @@
SPELL=kyotocabinet
- VERSION=1.2.60
- SOURCE_HASH=sha512:67107c82e4580f4d1709edc508a46f26ffdf2144e83976e76848374d31ba5d6134795af4f0f19350d830d64dd23b4bc21139855d280cb63048bf47824d7a091f
+ VERSION=1.2.72
+ SOURCE_HASH=sha512:e6ca755cbb3efc057b376638571077024c3021586751386e24bdcfe4529e73742d1dab78423b37b0046746b9e57fbbf039b2f5e4a8089de29edcadd305d32623
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://fallabs.com/kyotocabinet
diff --git a/database/kyotocabinet/HISTORY b/database/kyotocabinet/HISTORY
index 694d17c462..bfb5086da7 100644
--- a/database/kyotocabinet/HISTORY
+++ b/database/kyotocabinet/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.2.72
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/database/pgadmin3/DETAILS b/database/pgadmin3/DETAILS
index 848cff305b..be403cd914 100755
--- a/database/pgadmin3/DETAILS
+++ b/database/pgadmin3/DETAILS
@@ -1,5 +1,5 @@
SPELL=pgadmin3
- VERSION=1.14.0
+ VERSION=1.14.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/database/pgadmin3/HISTORY b/database/pgadmin3/HISTORY
index 983a03bc65..83920fd308 100644
--- a/database/pgadmin3/HISTORY
+++ b/database/pgadmin3/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.14.1
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index f618b843c4..092e86dd87 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.9
- VERSIONX=autoconf-3070900
- SOURCE_HASH=sha512:f2f1739af728ed6f3bd53265fdba7d1f93872daf7a8744c58cf1f54f64873ec3306fadc04d60e5e11e1f9e24caee5d3f936c4f7d7efe2e5c8562a98dfb32fb07
+ VERSION=3.7.10
+ VERSIONX=autoconf-3071000
+ SOURCE_HASH=sha512:b66ca1eb59eec97415d110879077c0c7cac24e79cdd1f98143cfaa663d5c08888bc243ac3c10efe36e1c9c15b4fb9d661882e0e80c24f2b86bf385f81e058120
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index ccd7c8bb54..0e62acbe27 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.7.10
+
2011-11-01 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 3.7.9
diff --git a/database/tokyocabinet/BUILD b/database/tokyocabinet/BUILD
deleted file mode 100755
index 6ad186e0fb..0000000000
--- a/database/tokyocabinet/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-CFLAGS="$CFLAGS -std=c99" &&
-LDFLAGS="$LDFLAGS= -L./" &&
-default_build
diff --git a/database/tokyocabinet/CONFLICTS b/database/tokyocabinet/CONFLICTS
deleted file mode 100755
index d418754a56..0000000000
--- a/database/tokyocabinet/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts tokyocabinet y
diff --git a/database/tokyocabinet/DEPENDS b/database/tokyocabinet/DEPENDS
new file mode 100755
index 0000000000..b48ec5d1f4
--- /dev/null
+++ b/database/tokyocabinet/DEPENDS
@@ -0,0 +1,4 @@
+depends zlib &&
+depends bzip2 &&
+optional_depends xz-utils '' '--disable-exlzma' 'LZMA support' &&
+optional_depends lzo '' '--disable-exlzo' 'LZO support'
diff --git a/database/tokyocabinet/DETAILS b/database/tokyocabinet/DETAILS
index 9438af7b1b..cb79b0db17 100755
--- a/database/tokyocabinet/DETAILS
+++ b/database/tokyocabinet/DETAILS
@@ -1,9 +1,9 @@
SPELL=tokyocabinet
- VERSION=1.4.46
- SOURCE_HASH=sha512:bdec41a9dc4f73421d1f304fe1c9d814b18450e1bf2b6de7d484145e7598484b08b00450eccda32b3ce03a418380e3323932c518a9994142ce6db39008eb11d6
+ VERSION=1.4.47
+ SOURCE_HASH=sha512:ccc90e2fba39a0507125a696c58ed6519b8a503e3a7433e7b34440cdccba75f6573ff8c4e3917e54c96171d459d1fb7d44afad7606d3833415fdfc63a9302a89
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://1978th.net/tokyocabinet/
+ WEB_SITE=http://fallabs.com/tokyocabinet
SOURCE_URL[0]=$WEB_SITE/$SOURCE
LICENSE[0]=LGPL
ENTERED=20071208
diff --git a/database/tokyocabinet/HISTORY b/database/tokyocabinet/HISTORY
index e42f8fecaa..e5298675da 100644
--- a/database/tokyocabinet/HISTORY
+++ b/database/tokyocabinet/HISTORY
@@ -1,3 +1,9 @@
+2012-01-14 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.47
+ new WEB_SITE
+ * DEPENDS: added
+ * BUILD, CONFLICTS: removed
+
2010-09-04 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.46
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index a5fdd374c9..b9ae433a0d 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.7.8.3
+ VERSION=1.7.8.4
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
- SOURCE_HASH=sha512:e2e4dc6d94b77ef74bf7e327fadb0b19494aa1d73acd9994b8c36471808dd80a5c2eb23065ae7f852a9269a45f5f6e311fe05a7ada2801966533e82891cd453a
+ SOURCE_HASH=sha512:d1ca22acd4a3d1b4b3b257fd2417d09df662865101a3d42bf6a22ae6f28053505124340ca129200e2c3bf1074a0ec9a245dbacf56c50301045010ef4530ebf23
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
- SOURCE3_HASH=sha512:5eca7e853d7ed21cf810c273e5f930f4cbc388c839773d974faeba07148272acfaea874f2c297e35a71e6ffb3612305ccc845a5155f180773354d0cb8ff00c7c
+ SOURCE3_HASH=sha512:d376d90e41139e896409f1631415f3528c5843452b2b9910257a3d121056d7071380ba556375c10c77be4eea7b8f6cf878d0702cc84215ff1c81f7e902f7717f
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
- SOURCE5_HASH=sha512:bef36c8f98921bdaf66fe4f7183b89c7153bf9bb2317989d70bcd85c6eb5ac232ce818b49f8db1a3e717bfa7d5ed407225b4819a56fced1b29eec586188ff07d
+ SOURCE5_HASH=sha512:d520a9b34920ffd844849e071575e80ddc9c911e12c77db6f9b8999ec8fc909eb4a9de882126453df574b84e38e3a537cb07b196760839bd264a910a428d25a7
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index bd06e3e306..a4c32e2107 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.7.8.4
+
2012-01-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.7.8.3
diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 01a6fdf590..07d4e72d7a 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -12,6 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
ENTERED=20010922
LICENSE[0]=PYTHON
SECURITY_PATCH=1
+ PATCHLEVEL=1
KEYWORDS="devel"
SHORT="interpreted, interactive, object-oriented language"
cat << EOF
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 58fbb6db15..1735b167de 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,9 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * PRE_BUILD: added to fix linux2/linux3 issue
+ * INSTALL: added copying of plat directory
+ https://bugs.gentoo.org/374579
+ * DETAILS: add PATCHLEVEL
+
2011-10-23 Vlad Glagolev <stealth@sourcemage.org>
* PROVIDES: added, provides PYTHON
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index a205210a49..86ae17c4a8 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -7,3 +7,14 @@ fi &&
# gettext
install -vm 755 "$SOURCE_DIRECTORY"/Tools/i18n/{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
+
+local PYVER=`echo ${VERSION}|cut -d . -f 1,2`
+
+if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
+ cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
+ "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
+else
+ cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" \
+ "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2"
+fi
+
diff --git a/devel/python/PRE_BUILD b/devel/python/PRE_BUILD
new file mode 100755
index 0000000000..ee53ba4f3b
--- /dev/null
+++ b/devel/python/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/Lib &&
+
+cp -R plat-linux2 plat-linux3
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index bdd80c80a8..2b0fb7400c 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -10,6 +10,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
WEB_SITE=http://www.python.org/
ENTERED=20081203
LICENSE[0]=PYTHON
+ PATCHLEVEL=1
KEYWORDS="devel"
SHORT="interpreted, interactive, object-oriented language, version 3"
cat << EOF
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index b503fc0861..5c39c293a7 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,9 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * PRE_BUILD: added to fix linux2/linux3 issue
+ * INSTALL: added copying of plat directory
+ https://bugs.gentoo.org/374579
+ * DETAILS: added patchlevel
+
2011-10-23 Vlad Glagolev <stealth@sourcemage.org>
* PROVIDES: added, provides PYTHON
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index c3531dea86..82047e1f15 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -7,3 +7,13 @@ fi &&
# gettext
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
+
+local PYVER=`echo ${VERSION}|cut -d . -f 1,2`
+
+if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
+ cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
+ "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
+else
+ cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" \
+ "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2"
+fi
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
new file mode 100755
index 0000000000..ee53ba4f3b
--- /dev/null
+++ b/devel/python3/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/Lib &&
+
+cp -R plat-linux2 plat-linux3
diff --git a/disk/brasero/DEPENDS b/disk/brasero/DEPENDS
index b045312fe6..c09baa91f4 100755
--- a/disk/brasero/DEPENDS
+++ b/disk/brasero/DEPENDS
@@ -2,7 +2,7 @@ depends gtk+3 &&
depends gconf2 &&
depends gst-plugins-base &&
depends libxml2 &&
-depends unique &&
+depends libunique &&
depends dbus &&
depends libcanberra &&
depends gstreamer &&
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index c48aeff376..4163464822 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2011-10-09 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0
diff --git a/doc/devhelp/DEPENDS b/doc/devhelp/DEPENDS
index 11dcdf3a79..3325e0995a 100755
--- a/doc/devhelp/DEPENDS
+++ b/doc/devhelp/DEPENDS
@@ -2,7 +2,7 @@ depends glib2 &&
depends gconf2 &&
depends libwnck &&
depends webkitgtk &&
-depends unique &&
+depends libunique &&
depends intltool &&
depends gtk+2 &&
depends libice &&
diff --git a/doc/devhelp/HISTORY b/doc/devhelp/HISTORY
index e36b369ff5..34e0a16af1 100644
--- a/doc/devhelp/HISTORY
+++ b/doc/devhelp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2011-04-13 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.0.0
diff --git a/doc/docx2txt/DETAILS b/doc/docx2txt/DETAILS
index 8915e51098..4bff9847df 100755
--- a/doc/docx2txt/DETAILS
+++ b/doc/docx2txt/DETAILS
@@ -1,6 +1,6 @@
SPELL=docx2txt
- VERSION=1.0
- SOURCE_HASH=sha512:a7206ea209adf95b9ed468913713a37067fe4c4fd0ce6471b2178556c7492ea9f1664b62ad2fe9ae2e0048b0569081ad9d2272df7064d49c05ed535f7aa7f97d
+ VERSION=1.2
+ SOURCE_HASH=sha512:ba5884c4d85e23aad26f74727b40e2d9d43cdf2e63f270486cbbfed5ef431f44f8f40a2583d3185fa3c16a97d9cd78e84feaf8f1f7be78ae9e1662e04a2013d6
SOURCE=$SPELL-$VERSION.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/docx2txt/HISTORY b/doc/docx2txt/HISTORY
index 16b716d4f2..67435cdfaf 100644
--- a/doc/docx2txt/HISTORY
+++ b/doc/docx2txt/HISTORY
@@ -1,3 +1,7 @@
+2012-01-16 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.2
+ * INSTALL: fix BINDIR
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/doc/docx2txt/INSTALL b/doc/docx2txt/INSTALL
index e747336c41..860f12c9de 100755
--- a/doc/docx2txt/INSTALL
+++ b/doc/docx2txt/INSTALL
@@ -1 +1 @@
-make INSTALLDIR=$INSTALL_ROOT/usr/bin install
+make BINDIR=$INSTALL_ROOT/usr/bin install
diff --git a/doc/fbreader/DEPENDS b/doc/fbreader/DEPENDS
index ab08d04ce7..8c06048348 100755
--- a/doc/fbreader/DEPENDS
+++ b/doc/fbreader/DEPENDS
@@ -6,6 +6,6 @@ if [[ $UI == gtk2 ]]; then
depends gtk+2
fi &&
depends sqlite &&
-if [[ $FBREADER_SCM == y ]];then
+if [[ "$FBREADER_BRANCH" == "scm" ]];then
depends subversion
fi
diff --git a/doc/fbreader/DETAILS b/doc/fbreader/DETAILS
index d542abf28a..dcc1f96480 100755
--- a/doc/fbreader/DETAILS
+++ b/doc/fbreader/DETAILS
@@ -1,6 +1,6 @@
SPELL=fbreader
-if [[ $FBREADER_SCM == y ]];then
-if [[ $FBREADER_SCM_AUTO == y ]];then
+if [[ "$FBREADER_BRANCH" == "scm" ]];then
+if [[ "$FBREADER_AUTOUPDATE" == "y" ]];then
VERSION=$(date +%Y%m%d)
else
VERSION=scm
@@ -8,6 +8,7 @@ fi
SOURCE=$SPELL-scm.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
SOURCE_URL[0]=svn_https://only.mawhrin.net/repos/stuff/trunk:$SPELL-scm
+ SOURCE_HINTS[0]="no-check-certificate"
SOURCE_IGNORE=volatile
else
VERSION=0.12.10
diff --git a/doc/fbreader/HISTORY b/doc/fbreader/HISTORY
index 378dc88094..2ec8d84750 100644
--- a/doc/fbreader/HISTORY
+++ b/doc/fbreader/HISTORY
@@ -1,3 +1,8 @@
+2012-01-14 Pol Vinogradov <vin.public@gmail.com>
+ * DETAILS, DEPENDS, PREPARE: converted to prepare_select_branch
+ function, added SOURCE_HINTS[0]="no-check-certificate"
+ * PRE_BUILD: added fix for scm branch
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DEPENDS,CONFIGURE: removed qt-x11 as gui option
diff --git a/doc/fbreader/PREPARE b/doc/fbreader/PREPARE
index ed0d8093fc..98d27e41ff 100755
--- a/doc/fbreader/PREPARE
+++ b/doc/fbreader/PREPARE
@@ -1,7 +1,2 @@
-config_query FBREADER_SCM "Do you want SCM version" "n" &&
-if [[ "${FBREADER_SCM}" == "y" ]]
-then
-config_query FBREADER_SCM_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?" \
- "n"
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/doc/fbreader/PRE_BUILD b/doc/fbreader/PRE_BUILD
index 520faab7ad..60904fd6b6 100755
--- a/doc/fbreader/PRE_BUILD
+++ b/doc/fbreader/PRE_BUILD
@@ -9,4 +9,8 @@ if [ "$UI" = "gtk2" ]; then
echo "UI_TYPE = gtk" >> makefiles/target.mk
fi &&
-sed -i 's/Library::Library \&Library/Library \&Library/' fbreader/src/library/Library.cpp
+sed -i 's/Library::Library \&Library/Library \&Library/' fbreader/src/library/Library.cpp &&
+
+if [[ "$FBREADER_BRANCH" == "scm" ]];then
+ sed -i "s/ccache gcc/gcc/" makefiles/arch/desktop.mk
+fi
diff --git a/doc/po4a/DEPENDS b/doc/po4a/DEPENDS
index 755fbfb799..6d4cf1e2c2 100755
--- a/doc/po4a/DEPENDS
+++ b/doc/po4a/DEPENDS
@@ -1,4 +1,5 @@
depends perl &&
+depends podlators &&
depends sgmlspm &&
# I really don't think they mean J. Clark's SP
depends opensp &&
diff --git a/doc/po4a/HISTORY b/doc/po4a/HISTORY
index c5208112bc..87066dd402 100644
--- a/doc/po4a/HISTORY
+++ b/doc/po4a/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on podlators
+
2010-10-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 0.40.1
diff --git a/e-17/enki/DEPENDS b/e-17/enki/DEPENDS
index 9a013e3294..1c52371e4a 100755
--- a/e-17/enki/DEPENDS
+++ b/e-17/enki/DEPENDS
@@ -1,4 +1,4 @@
-depends enia &&
+depends eina &&
depends ecore &&
depends eet &&
depends enlil &&
diff --git a/e-17/enki/HISTORY b/e-17/enki/HISTORY
index 046bf7b491..8369123e5e 100644
--- a/e-17/enki/HISTORY
+++ b/e-17/enki/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: fix typo
+
2011-12-26 Robin Cook <rcook@wyrms.net>
* DEPENDS: added missing depends
diff --git a/editors/focuswriter/BUILD b/editors/focuswriter/BUILD
new file mode 100755
index 0000000000..eec3de4651
--- /dev/null
+++ b/editors/focuswriter/BUILD
@@ -0,0 +1 @@
+qt4_build
diff --git a/editors/focuswriter/DEPENDS b/editors/focuswriter/DEPENDS
new file mode 100755
index 0000000000..1d42d0e572
--- /dev/null
+++ b/editors/focuswriter/DEPENDS
@@ -0,0 +1,4 @@
+depends -sub CXX gcc &&
+depends qt4 &&
+depends hunspell &&
+depends libzip
diff --git a/editors/focuswriter/DETAILS b/editors/focuswriter/DETAILS
new file mode 100755
index 0000000000..8a75c4fa56
--- /dev/null
+++ b/editors/focuswriter/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=focuswriter
+ VERSION=1.3.5.2
+ SOURCE=${SPELL}-${VERSION}-src.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ SOURCE_URL=http://gottcode.org/focuswriter/focuswriter-1.3.5.2-src.tar.bz2
+ SOURCE_HASH=sha512:3dce6927ad5c7e8d521962d01d8c646393523e22a9e039aa8a44cb4d10f0fdd4f2858a25a1e108031ce3dd2168b761331f2679d4d4c63ee2f4b43ff843ed04d2
+ WEB_SITE=http://gottcode.org/focuswriter/
+ ENTERED=20120119
+ LICENSE[0]=GPL
+ SHORT="simple, distraction-free writing environment"
+cat << EOF
+FocusWriter is a simple, distraction-free writing environment.
+EOF
diff --git a/editors/focuswriter/HISTORY b/editors/focuswriter/HISTORY
new file mode 100644
index 0000000000..23f3153f7b
--- /dev/null
+++ b/editors/focuswriter/HISTORY
@@ -0,0 +1,2 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS, DEPENDS, BUILD: spell created, version 1.3.5.2
diff --git a/ftp/ncftp/DETAILS b/ftp/ncftp/DETAILS
index 8b153dccb9..93389d796c 100755
--- a/ftp/ncftp/DETAILS
+++ b/ftp/ncftp/DETAILS
@@ -10,7 +10,7 @@ if [[ "$NCFTP_IPV6" == "y" ]]; then
SOURCE_HASH=sha512:7fad4b2234e4f4506c5129cfccba1b4d89172b40e5d611c16d11722a3c1a602b0644ad11784eab2ad412aca245c23dfd471f344ece954b791d7ce9d9404ecfc7
SOURCE=$SPELL-$VERSION-src.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.ncftp.com/ncftp/older_versions/${SOURCE}
VERSION2=20080821
SOURCE2=$SPELL-$(echo $VERSION | sed -e 's/\.//g')-v6-$VERSION2.diff.gz
SOURCE2_URL[0]=ftp://ftp.kame.net/pub/kame/misc/$SOURCE2
diff --git a/ftp/ncftp/HISTORY b/ftp/ncftp/HISTORY
index 25e4a77d0c..702311e04c 100644
--- a/ftp/ncftp/HISTORY
+++ b/ftp/ncftp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: fixe source url
+
2011-02-14 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: SOURCE_HASH updated, sources changed upstream, #15942
diff --git a/gnome2-apps/empathy/DEPENDS b/gnome2-apps/empathy/DEPENDS
index 5089b18643..bfdf6a0297 100755
--- a/gnome2-apps/empathy/DEPENDS
+++ b/gnome2-apps/empathy/DEPENDS
@@ -5,7 +5,7 @@ depends gnome-doc-utils &&
depends -sub "GTK" libcanberra &&
depends gst-plugins-base &&
depends libnotify &&
-depends unique &&
+depends libunique &&
depends folks &&
depends telepathy-logger &&
diff --git a/gnome2-apps/empathy/DETAILS b/gnome2-apps/empathy/DETAILS
index aefb1431df..a071666c74 100755
--- a/gnome2-apps/empathy/DETAILS
+++ b/gnome2-apps/empathy/DETAILS
@@ -1,5 +1,5 @@
SPELL=empathy
- VERSION=3.2.1.2
+ VERSION=3.2.2
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-apps/empathy/HISTORY b/gnome2-apps/empathy/HISTORY
index a45c1884ce..bb96b45f52 100644
--- a/gnome2-apps/empathy/HISTORY
+++ b/gnome2-apps/empathy/HISTORY
@@ -1,3 +1,9 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.2
+
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2011-11-14 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.1.2
diff --git a/gnome2-apps/empathy/empathy-3.2.1.2.tar.bz2.sig b/gnome2-apps/empathy/empathy-3.2.1.2.tar.bz2.sig
deleted file mode 100644
index 8fe3579fc4..0000000000
--- a/gnome2-apps/empathy/empathy-3.2.1.2.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/empathy/empathy-3.2.2.tar.bz2.sig b/gnome2-apps/empathy/empathy-3.2.2.tar.bz2.sig
new file mode 100644
index 0000000000..b91ff9d006
--- /dev/null
+++ b/gnome2-apps/empathy/empathy-3.2.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/gthumb2/DEPENDS b/gnome2-apps/gthumb2/DEPENDS
index 000f6b7a53..9120687f27 100755
--- a/gnome2-apps/gthumb2/DEPENDS
+++ b/gnome2-apps/gthumb2/DEPENDS
@@ -8,7 +8,7 @@ depends gnome-vfs2 &&
depends libexif &&
depends libgnomeprintui &&
depends xorg-libs &&
-depends unique &&
+depends libunique &&
optional_depends rarian \
"--enable-scrollkeeper" \
diff --git a/gnome2-apps/gthumb2/HISTORY b/gnome2-apps/gthumb2/HISTORY
index 47a2d31137..1f7c2baaaf 100644
--- a/gnome2-apps/gthumb2/HISTORY
+++ b/gnome2-apps/gthumb2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2011-12-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.14.1, tar.bz2 -> tar.xz
* PRE_BUILD: added due to bz2 -> xz
diff --git a/gnome2-apps/gucharmap/DETAILS b/gnome2-apps/gucharmap/DETAILS
index 2411487fd3..1377023290 100755
--- a/gnome2-apps/gucharmap/DETAILS
+++ b/gnome2-apps/gucharmap/DETAILS
@@ -1,5 +1,5 @@
SPELL=gucharmap
- VERSION=3.0.1
+ VERSION=3.2.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gucharmap/HISTORY b/gnome2-apps/gucharmap/HISTORY
index af002ff62d..fe92a5e924 100644
--- a/gnome2-apps/gucharmap/HISTORY
+++ b/gnome2-apps/gucharmap/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.2
+
2011-08-19 Bor Kraljič <pyrobor@ver.si>
* DEPENDS: fixed typo (issue #30)
diff --git a/gnome2-apps/gucharmap/gucharmap-3.0.1.tar.bz2.sig b/gnome2-apps/gucharmap/gucharmap-3.0.1.tar.bz2.sig
deleted file mode 100644
index cf7a6bff30..0000000000
--- a/gnome2-apps/gucharmap/gucharmap-3.0.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-apps/gucharmap/gucharmap-3.2.2.tar.bz2.sig b/gnome2-apps/gucharmap/gucharmap-3.2.2.tar.bz2.sig
new file mode 100644
index 0000000000..5c9f895179
--- /dev/null
+++ b/gnome2-apps/gucharmap/gucharmap-3.2.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-apps/vinagre/DEPENDS b/gnome2-apps/vinagre/DEPENDS
index 3982ae9dc9..3bc90e76ca 100755
--- a/gnome2-apps/vinagre/DEPENDS
+++ b/gnome2-apps/vinagre/DEPENDS
@@ -1,7 +1,7 @@
depends libxml2 &&
depends vala &&
depends gtk+3 &&
-depends gtk-vnc &&
+depends -sub 'GTK3' gtk-vnc &&
depends glib2 &&
depends gconf2 &&
depends gnome-doc-utils &&
diff --git a/gnome2-apps/vinagre/HISTORY b/gnome2-apps/vinagre/HISTORY
index 3a48e3a370..49593fb2c1 100644
--- a/gnome2-apps/vinagre/HISTORY
+++ b/gnome2-apps/vinagre/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Requires gtk-vnc built with gtk+3 bindings
+
2011-11-26 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 3.2.2
* DEPENDS: gtk+2 -> gtk+3
diff --git a/gnome2-libs/gdm2/DETAILS b/gnome2-libs/gdm2/DETAILS
index b46957d77d..5fd90c947c 100755
--- a/gnome2-libs/gdm2/DETAILS
+++ b/gnome2-libs/gdm2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gdm2
- VERSION=3.2.0
+ VERSION=3.2.1.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gdm-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdm-$VERSION
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index fb3bdede4c..958a994b06 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.1.1
+
2011-10-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0
diff --git a/gnome2-libs/gdm2/gdm-3.2.0.tar.bz2.sig b/gnome2-libs/gdm2/gdm-3.2.0.tar.bz2.sig
deleted file mode 100644
index c0d5ac6759..0000000000
--- a/gnome2-libs/gdm2/gdm-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gdm2/gdm-3.2.1.1.tar.bz2.sig b/gnome2-libs/gdm2/gdm-3.2.1.1.tar.bz2.sig
new file mode 100644
index 0000000000..163def8fe5
--- /dev/null
+++ b/gnome2-libs/gdm2/gdm-3.2.1.1.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gjs/DETAILS b/gnome2-libs/gjs/DETAILS
index f598c58b77..2e1fdfc4e3 100755
--- a/gnome2-libs/gjs/DETAILS
+++ b/gnome2-libs/gjs/DETAILS
@@ -1,7 +1,7 @@
SPELL=gjs
- VERSION=1.30.0
+ VERSION=1.30.1
BRANCH=$(echo $VERSION|cut -d . -f 1,2)
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/gnome2-libs/gjs/HISTORY b/gnome2-libs/gjs/HISTORY
index 30ce899276..a4d60cd592 100644
--- a/gnome2-libs/gjs/HISTORY
+++ b/gnome2-libs/gjs/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.30.1
+
2011-10-06 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.30.0
* DEPENDS: xulrunner removed
diff --git a/gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sig b/gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sig
deleted file mode 100644
index 30a7584e18..0000000000
--- a/gnome2-libs/gjs/gjs-1.30.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gjs/gjs-1.30.1.tar.xz.sig b/gnome2-libs/gjs/gjs-1.30.1.tar.xz.sig
new file mode 100644
index 0000000000..b501cd228c
--- /dev/null
+++ b/gnome2-libs/gjs/gjs-1.30.1.tar.xz.sig
Binary files differ
diff --git a/gnome2-libs/gnome-control-center/DEPENDS b/gnome2-libs/gnome-control-center/DEPENDS
index b80315bdc4..2334a536d0 100755
--- a/gnome2-libs/gnome-control-center/DEPENDS
+++ b/gnome2-libs/gnome-control-center/DEPENDS
@@ -21,7 +21,7 @@ depends libxklavier &&
depends libgnomekbd &&
depends desktop-file-utils &&
depends -sub GTK libcanberra &&
-depends unique &&
+depends libunique &&
depends gnome-online-accounts &&
depends pulseaudio &&
diff --git a/gnome2-libs/gnome-control-center/DETAILS b/gnome2-libs/gnome-control-center/DETAILS
index f733db0b03..32496a6a95 100755
--- a/gnome2-libs/gnome-control-center/DETAILS
+++ b/gnome2-libs/gnome-control-center/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-control-center
- VERSION=3.2.0
+ VERSION=3.2.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-control-center/HISTORY b/gnome2-libs/gnome-control-center/HISTORY
index ae0f726160..db7aefaf6c 100644
--- a/gnome2-libs/gnome-control-center/HISTORY
+++ b/gnome2-libs/gnome-control-center/HISTORY
@@ -1,3 +1,9 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.2
+
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2011-10-19 Arjan Bouter <abouter@sourcemage.org>
* DEPENDS: added missing dep on pulseaudio and cups
diff --git a/gnome2-libs/gnome-control-center/gnome-control-center-3.2.0.tar.bz2.sig b/gnome2-libs/gnome-control-center/gnome-control-center-3.2.0.tar.bz2.sig
deleted file mode 100644
index 42764db308..0000000000
--- a/gnome2-libs/gnome-control-center/gnome-control-center-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome-control-center/gnome-control-center-3.2.2.tar.bz2.sig b/gnome2-libs/gnome-control-center/gnome-control-center-3.2.2.tar.bz2.sig
new file mode 100644
index 0000000000..2177d4c6e7
--- /dev/null
+++ b/gnome2-libs/gnome-control-center/gnome-control-center-3.2.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gnome-media2/DEPENDS b/gnome2-libs/gnome-media2/DEPENDS
index a16ebe9406..77c0e953b4 100755
--- a/gnome2-libs/gnome-media2/DEPENDS
+++ b/gnome2-libs/gnome-media2/DEPENDS
@@ -2,7 +2,7 @@ depends glib2 &&
depends gtk+2 &&
depends gconf2 &&
depends sox &&
-depends unique &&
+depends libunique &&
depends data-uuid &&
depends gstreamer &&
depends gst-plugins-base &&
diff --git a/gnome2-libs/gnome-media2/HISTORY b/gnome2-libs/gnome-media2/HISTORY
index a7a7308ac1..0dd528506d 100644
--- a/gnome2-libs/gnome-media2/HISTORY
+++ b/gnome2-libs/gnome-media2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2010-09-30 Vasil Yonkov <spirtbrat@sourcemage.org>
* DETAILS: updated spell to 2.32.0
diff --git a/gnome2-libs/gnome-settings-daemon/DETAILS b/gnome2-libs/gnome-settings-daemon/DETAILS
index 19770f3bdf..234d2d8004 100755
--- a/gnome2-libs/gnome-settings-daemon/DETAILS
+++ b/gnome2-libs/gnome-settings-daemon/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-settings-daemon
- VERSION=3.2.1
+ VERSION=3.2.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-settings-daemon/HISTORY b/gnome2-libs/gnome-settings-daemon/HISTORY
index 4b2e0df4fa..cbdc59b604 100644
--- a/gnome2-libs/gnome-settings-daemon/HISTORY
+++ b/gnome2-libs/gnome-settings-daemon/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.2
+
2011-10-18 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.1
diff --git a/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.1.tar.bz2.sig b/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.1.tar.bz2.sig
deleted file mode 100644
index 30becf84b4..0000000000
--- a/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.2.tar.bz2.sig b/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.2.tar.bz2.sig
new file mode 100644
index 0000000000..30931d2b7a
--- /dev/null
+++ b/gnome2-libs/gnome-settings-daemon/gnome-settings-daemon-3.2.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gnome-system-monitor/DETAILS b/gnome2-libs/gnome-system-monitor/DETAILS
index b9f4e4d63b..357ad5ed32 100755
--- a/gnome2-libs/gnome-system-monitor/DETAILS
+++ b/gnome2-libs/gnome-system-monitor/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-system-monitor
- VERSION=3.2.0
+ VERSION=3.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/gnome-system-monitor/HISTORY b/gnome2-libs/gnome-system-monitor/HISTORY
index 1de180aa7e..babd9f5343 100644
--- a/gnome2-libs/gnome-system-monitor/HISTORY
+++ b/gnome2-libs/gnome-system-monitor/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.1
+
2011-10-07 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0
diff --git a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.0.tar.bz2.sig b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.0.tar.bz2.sig
deleted file mode 100644
index ca0f7fe0ab..0000000000
--- a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.1.tar.bz2.sig b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000000..1be008480a
--- /dev/null
+++ b/gnome2-libs/gnome-system-monitor/gnome-system-monitor-3.2.1.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gnome-utils2/DETAILS b/gnome2-libs/gnome-utils2/DETAILS
index 7231afcfba..3e164e6273 100755
--- a/gnome2-libs/gnome-utils2/DETAILS
+++ b/gnome2-libs/gnome-utils2/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-utils2
- VERSION=3.2.0
+ VERSION=3.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=gnome-utils-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-utils-$VERSION
diff --git a/gnome2-libs/gnome-utils2/HISTORY b/gnome2-libs/gnome-utils2/HISTORY
index eb7dbe5122..97ea61c4f8 100644
--- a/gnome2-libs/gnome-utils2/HISTORY
+++ b/gnome2-libs/gnome-utils2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.1
+
2011-09-30 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0
diff --git a/gnome2-libs/gnome-utils2/gnome-utils-3.2.0.tar.bz2.sig b/gnome2-libs/gnome-utils2/gnome-utils-3.2.0.tar.bz2.sig
deleted file mode 100644
index 6d7e793e21..0000000000
--- a/gnome2-libs/gnome-utils2/gnome-utils-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome-utils2/gnome-utils-3.2.1.tar.bz2.sig b/gnome2-libs/gnome-utils2/gnome-utils-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000000..2c62a77a20
--- /dev/null
+++ b/gnome2-libs/gnome-utils2/gnome-utils-3.2.1.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gnome2-user-docs/DETAILS b/gnome2-libs/gnome2-user-docs/DETAILS
index f77938ec29..20724e064d 100755
--- a/gnome2-libs/gnome2-user-docs/DETAILS
+++ b/gnome2-libs/gnome2-user-docs/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome2-user-docs
- VERSION=2.32.0
+ VERSION=3.2.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=gnome-user-docs-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gnome-user-docs-$VERSION
diff --git a/gnome2-libs/gnome2-user-docs/HISTORY b/gnome2-libs/gnome2-user-docs/HISTORY
index 8d7554ba02..1f8a0d567c 100644
--- a/gnome2-libs/gnome2-user-docs/HISTORY
+++ b/gnome2-libs/gnome2-user-docs/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.2
+
2010-09-30 Vasil Yonkov <spirtbrat@sourcemage.org>
* DETAILS: updated spell to 2.32.0
diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.32.0.tar.bz2.sig b/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.32.0.tar.bz2.sig
deleted file mode 100644
index ac02184d4e..0000000000
--- a/gnome2-libs/gnome2-user-docs/gnome-user-docs-2.32.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/gnome2-user-docs/gnome-user-docs-3.2.2.tar.bz2.sig b/gnome2-libs/gnome2-user-docs/gnome-user-docs-3.2.2.tar.bz2.sig
new file mode 100644
index 0000000000..1161fd21a0
--- /dev/null
+++ b/gnome2-libs/gnome2-user-docs/gnome-user-docs-3.2.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/gtk-engines2/DEPENDS b/gnome2-libs/gtk-engines2/DEPENDS
index edffa0e35e..b49148d095 100755
--- a/gnome2-libs/gtk-engines2/DEPENDS
+++ b/gnome2-libs/gtk-engines2/DEPENDS
@@ -1 +1,8 @@
-depends gtk+2
+depends gtk+3 &&
+depends atk &&
+depends pango &&
+depends gdk-pixbuf2 &&
+depends cairo &&
+depends freetype2 &&
+depends fontconfig &&
+depends glib2
diff --git a/gnome2-libs/gtk-engines2/HISTORY b/gnome2-libs/gtk-engines2/HISTORY
index 5274c27587..b79589ad9c 100644
--- a/gnome2-libs/gtk-engines2/HISTORY
+++ b/gnome2-libs/gtk-engines2/HISTORY
@@ -1,3 +1,11 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: changed dependency on gtk+2 to gtk+3, added missing
+ dependencies on atk, pango, gdk-pixbuf2, cairo, freetype2,
+ fontconfig and glib2.
+ * PRE_BUILD, animation.c.patch: fixed compile error
+ * INSTALL: added symlink to gtk-engines-3.pc to fix packages which
+ expect gtk-engines-2.pc
+
2011-04-14 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.91.1
diff --git a/gnome2-libs/gtk-engines2/INSTALL b/gnome2-libs/gtk-engines2/INSTALL
new file mode 100755
index 0000000000..1e802dd0c2
--- /dev/null
+++ b/gnome2-libs/gtk-engines2/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+ln -s /usr/lib/pkgconfig/gtk-engines-3.pc ${INSTALL_ROOT}/usr/lib/pkgconfig/gtk-engines-2.pc
diff --git a/gnome2-libs/gtk-engines2/PRE_BUILD b/gnome2-libs/gtk-engines2/PRE_BUILD
new file mode 100755
index 0000000000..b7fc0e714b
--- /dev/null
+++ b/gnome2-libs/gtk-engines2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/animation.c.patch
diff --git a/gnome2-libs/gtk-engines2/animation.c.patch b/gnome2-libs/gtk-engines2/animation.c.patch
new file mode 100644
index 0000000000..3cf6af159e
--- /dev/null
+++ b/gnome2-libs/gtk-engines2/animation.c.patch
@@ -0,0 +1,11 @@
+--- gtk-engines-2.91.1/engines/clearlooks/src/animation.c.orig 2012-01-15 14:42:22.742666206 +0100
++++ gtk-engines-2.91.1/engines/clearlooks/src/animation.c 2012-01-15 14:42:47.796339351 +0100
+@@ -28,7 +28,7 @@
+ #include "animation.h"
+
+ #ifdef HAVE_WORKING_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+
+ struct _AnimationInfo {
+ GTimer *timer;
diff --git a/gnome2-libs/libcanberra/DEPENDS b/gnome2-libs/libcanberra/DEPENDS
index 20c7478753..8e8ae79d00 100755
--- a/gnome2-libs/libcanberra/DEPENDS
+++ b/gnome2-libs/libcanberra/DEPENDS
@@ -20,6 +20,12 @@ optional_depends gtk+2 \
"--disable-gtk" \
"Enable GTK+ support?" &&
+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "Enable GTK+3 support?" &&
+
+
optional_depends tdb \
"--enable-tdb" \
"--disable-tdb" \
diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY
index b52bfc8b49..b545a572f1 100644
--- a/gnome2-libs/libcanberra/HISTORY
+++ b/gnome2-libs/libcanberra/HISTORY
@@ -1,3 +1,7 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: added optional dependency on gtk+3
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: added sub dependency on gtk+3
+
2011-04-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.28
diff --git a/gnome2-libs/libcanberra/PRE_SUB_DEPENDS b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
index 91ac72086c..c0ea5d4381 100755
--- a/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
+++ b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
GTK) is_depends_enabled $SPELL gtk+2 && return 0;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/gnome2-libs/libcanberra/SUB_DEPENDS b/gnome2-libs/libcanberra/SUB_DEPENDS
index e80d179011..9fd85cbb3e 100755
--- a/gnome2-libs/libcanberra/SUB_DEPENDS
+++ b/gnome2-libs/libcanberra/SUB_DEPENDS
@@ -3,5 +3,8 @@ case $THIS_SUB_DEPENDS in
GTK) echo "GTK support requested, forcing gtk+2 dependency." &&
depends gtk+2 '--enable-gtk'
;;
+GTK3) echo "GTK3 support requested, forcing gtk+3 dependency." &&
+ depends gtk+3 '--enable-gtk3'
+ ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac
diff --git a/gnome2-libs/libgweather/DETAILS b/gnome2-libs/libgweather/DETAILS
index f475e087c2..521f1e1beb 100755
--- a/gnome2-libs/libgweather/DETAILS
+++ b/gnome2-libs/libgweather/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgweather
- VERSION=3.2.0
+ VERSION=3.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgweather/HISTORY b/gnome2-libs/libgweather/HISTORY
index 9a2e389968..fda7f7ebed 100644
--- a/gnome2-libs/libgweather/HISTORY
+++ b/gnome2-libs/libgweather/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.1
+
2011-10-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0
diff --git a/gnome2-libs/libgweather/libgweather-3.2.0.tar.bz2.sig b/gnome2-libs/libgweather/libgweather-3.2.0.tar.bz2.sig
deleted file mode 100644
index e89509a8da..0000000000
--- a/gnome2-libs/libgweather/libgweather-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/libgweather/libgweather-3.2.1.tar.bz2.sig b/gnome2-libs/libgweather/libgweather-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000000..a2e60f13a9
--- /dev/null
+++ b/gnome2-libs/libgweather/libgweather-3.2.1.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/libsoup/DEPENDS b/gnome2-libs/libsoup/DEPENDS
index 43698effa7..eee1bd6123 100755
--- a/gnome2-libs/libsoup/DEPENDS
+++ b/gnome2-libs/libsoup/DEPENDS
@@ -13,7 +13,8 @@ if [[ $LIBSOUP_GNOME == "y" ]]; then
fi &&
if [[ $LIBSOUP_DEVEL == "y" ]]; then
-depends glib-networking
+ sub_depends glib2 'GLIB_DEVEL' &&
+ depends glib-networking
else
optional_depends gnutls \
"--enable-ssl" \
diff --git a/gnome2-libs/libsoup/DETAILS b/gnome2-libs/libsoup/DETAILS
index c65539d3ec..4966bb5496 100755
--- a/gnome2-libs/libsoup/DETAILS
+++ b/gnome2-libs/libsoup/DETAILS
@@ -1,11 +1,12 @@
SPELL=libsoup
if [[ $LIBSOUP_DEVEL == y ]]; then
- VERSION=2.36.1
+ VERSION=2.37.3
+ SOURCE=$SPELL-$VERSION.tar.xz
else
VERSION=2.36.1
+ SOURCE=$SPELL-$VERSION.tar.bz2
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/libsoup/HISTORY b/gnome2-libs/libsoup/HISTORY
index 7d07c6653b..1585fd5eee 100644
--- a/gnome2-libs/libsoup/HISTORY
+++ b/gnome2-libs/libsoup/HISTORY
@@ -1,3 +1,9 @@
+2012-01-18 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Devel libsoup requires devel glib2
+
+2012-01-11 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: devel version 2.37.3
+
2011-10-18 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.36.1
diff --git a/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig
new file mode 100644
index 0000000000..19e4da3412
--- /dev/null
+++ b/gnome2-libs/libsoup/libsoup-2.37.3.tar.xz.sig
Binary files differ
diff --git a/gnome2-libs/mutter/DETAILS b/gnome2-libs/mutter/DETAILS
index d7d4f1391c..0f10cd2716 100755
--- a/gnome2-libs/mutter/DETAILS
+++ b/gnome2-libs/mutter/DETAILS
@@ -1,7 +1,7 @@
SPELL=mutter
- VERSION=3.2.1
+ VERSION=3.2.2
BRANCH=${VERSION:0:3}
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/gnome2-libs/mutter/HISTORY b/gnome2-libs/mutter/HISTORY
index 23e855f692..d3ebdb9d80 100644
--- a/gnome2-libs/mutter/HISTORY
+++ b/gnome2-libs/mutter/HISTORY
@@ -1,3 +1,6 @@
+2012-01-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2, bz2 -> xz
+
2011-11-09 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Merged two optional dependencies on libxext
diff --git a/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig b/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig
deleted file mode 100644
index e6e629857f..0000000000
--- a/gnome2-libs/mutter/mutter-3.2.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig b/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig
new file mode 100644
index 0000000000..8c2eff4428
--- /dev/null
+++ b/gnome2-libs/mutter/mutter-3.2.2.tar.xz.sig
Binary files differ
diff --git a/gnome2-libs/nautilus2/DEPENDS b/gnome2-libs/nautilus2/DEPENDS
index f2d8f63dd8..1f9223a5b9 100755
--- a/gnome2-libs/nautilus2/DEPENDS
+++ b/gnome2-libs/nautilus2/DEPENDS
@@ -5,7 +5,7 @@ depends gtk+3 &&
depends gconf2 &&
depends gnome-desktop3 &&
depends libexif &&
-depends unique &&
+depends libunique &&
depends pango &&
depends glib2 &&
depends libxml2 &&
diff --git a/gnome2-libs/nautilus2/HISTORY b/gnome2-libs/nautilus2/HISTORY
index ed0b535924..da0a88dec6 100644
--- a/gnome2-libs/nautilus2/HISTORY
+++ b/gnome2-libs/nautilus2/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2011-10-18 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.1
* DEPENDS: gtk+2 -> gtk+3, gnome-desktop -> gnome-desktop3
diff --git a/gnome2-libs/vino/DEPENDS b/gnome2-libs/vino/DEPENDS
index 24fc6885ba..b68b0454f8 100755
--- a/gnome2-libs/vino/DEPENDS
+++ b/gnome2-libs/vino/DEPENDS
@@ -30,7 +30,7 @@ optional_depends gnome-keyring \
optional_depends avahi \
"--enable-avahi" "--disable-avahi" \
"Enable avahi support?" &&
-optional_depends unique \
+optional_depends libunique \
"--enable-libunique" "--disable-libunique" \
"Use the library unique to allow only one instance running" &&
optional_depends telepathy-glib \
diff --git a/gnome2-libs/vino/DETAILS b/gnome2-libs/vino/DETAILS
index 61a510b54f..1d332f0997 100755
--- a/gnome2-libs/vino/DETAILS
+++ b/gnome2-libs/vino/DETAILS
@@ -1,5 +1,5 @@
SPELL=vino
- VERSION=3.0.1
+ VERSION=3.2.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/gnome2-libs/vino/HISTORY b/gnome2-libs/vino/HISTORY
index 60ab93b9d0..156b66ede5 100644
--- a/gnome2-libs/vino/HISTORY
+++ b/gnome2-libs/vino/HISTORY
@@ -1,3 +1,9 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.2
+
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * DEPENDS: change unique to libunique
+
2011-04-29 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.0.1
diff --git a/gnome2-libs/vino/vino-3.0.1.tar.bz2.sig b/gnome2-libs/vino/vino-3.0.1.tar.bz2.sig
deleted file mode 100644
index 99e3b7f72d..0000000000
--- a/gnome2-libs/vino/vino-3.0.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/vino/vino-3.2.2.tar.bz2.sig b/gnome2-libs/vino/vino-3.2.2.tar.bz2.sig
new file mode 100644
index 0000000000..f11cce061f
--- /dev/null
+++ b/gnome2-libs/vino/vino-3.2.2.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/yelp-tools/DETAILS b/gnome2-libs/yelp-tools/DETAILS
index d3bf604984..33e9301e78 100755
--- a/gnome2-libs/yelp-tools/DETAILS
+++ b/gnome2-libs/yelp-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=yelp-tools
- VERSION=3.2.0
+ VERSION=3.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/yelp-tools/HISTORY b/gnome2-libs/yelp-tools/HISTORY
index 2342f236f1..85bc4555a0 100644
--- a/gnome2-libs/yelp-tools/HISTORY
+++ b/gnome2-libs/yelp-tools/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.1
+
2011-09-30 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: spell created, version 3.2.0
diff --git a/gnome2-libs/yelp-tools/yelp-tools-3.2.0.tar.bz2.sig b/gnome2-libs/yelp-tools/yelp-tools-3.2.0.tar.bz2.sig
deleted file mode 100644
index 224a117af6..0000000000
--- a/gnome2-libs/yelp-tools/yelp-tools-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/yelp-tools/yelp-tools-3.2.1.tar.bz2.sig b/gnome2-libs/yelp-tools/yelp-tools-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000000..af750c4cd2
--- /dev/null
+++ b/gnome2-libs/yelp-tools/yelp-tools-3.2.1.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/yelp/BUILD b/gnome2-libs/yelp/BUILD
deleted file mode 100755
index fc05fa4339..0000000000
--- a/gnome2-libs/yelp/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-if [ "$YELPSEARCH" == "n" ]; then
- OPTS="$OPTS --with-search=basic"
-fi &&
-
-if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
- OPTS="$OPTS --with-gecko=firefox"
-elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
- OPTS="$OPTS --with-gecko=seamonkey"
-elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
- OPTS="$OPTS --with-gecko=libxul-embedding"
-else
- OPTS="$OPTS --with-gecko=mozilla"
-fi &&
-
-default_build
diff --git a/gnome2-libs/yelp/CONFIGURE b/gnome2-libs/yelp/CONFIGURE
deleted file mode 100755
index 5cfb9f2a0f..0000000000
--- a/gnome2-libs/yelp/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query YELPSEARCH "Enable search?" n
diff --git a/gnome2-libs/yelp/DEPENDS b/gnome2-libs/yelp/DEPENDS
index 52393d1d13..6c4513302f 100755
--- a/gnome2-libs/yelp/DEPENDS
+++ b/gnome2-libs/yelp/DEPENDS
@@ -10,12 +10,4 @@ depends libxml2 &&
depends libxslt &&
depends startup-notification &&
depends dbus-glib &&
-depends rarian &&
-depends GECKO &&
-
-if [[ "$YELPSEARCH" == "y" ]]; then
- optional_depends beagle \
- "--with-search=beagle" \
- "--with-search=basic" \
- "Use Beagle for search support?"
-fi
+depends webkitgtk
diff --git a/gnome2-libs/yelp/DETAILS b/gnome2-libs/yelp/DETAILS
index 074f1ba0a5..ed93bb97e4 100755
--- a/gnome2-libs/yelp/DETAILS
+++ b/gnome2-libs/yelp/DETAILS
@@ -1,5 +1,5 @@
SPELL=yelp
- VERSION=3.2.0
+ VERSION=3.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/yelp/HISTORY b/gnome2-libs/yelp/HISTORY
index 4bc3c93172..c2c9425157 100644
--- a/gnome2-libs/yelp/HISTORY
+++ b/gnome2-libs/yelp/HISTORY
@@ -1,3 +1,8 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * BUILD: removed no longer needed
+ * CONFIGURE: removed no longer needed
+ * DETAILS: updated VERSION to 3.2.1
+
2011-09-30 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0
diff --git a/gnome2-libs/yelp/yelp-3.2.0.tar.bz2.sig b/gnome2-libs/yelp/yelp-3.2.0.tar.bz2.sig
deleted file mode 100644
index 0bc5a2af48..0000000000
--- a/gnome2-libs/yelp/yelp-3.2.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/yelp/yelp-3.2.1.tar.bz2.sig b/gnome2-libs/yelp/yelp-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000000..ba3f75b308
--- /dev/null
+++ b/gnome2-libs/yelp/yelp-3.2.1.tar.bz2.sig
Binary files differ
diff --git a/gnome3-libs/gnome-shell/DETAILS b/gnome3-libs/gnome-shell/DETAILS
index 41cb1305dd..e83ecf7901 100755
--- a/gnome3-libs/gnome-shell/DETAILS
+++ b/gnome3-libs/gnome-shell/DETAILS
@@ -1,7 +1,7 @@
SPELL=gnome-shell
- VERSION=3.2.1
+ VERSION=3.2.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome3-libs/gnome-shell/HISTORY b/gnome3-libs/gnome-shell/HISTORY
index 65a153a120..d3e529437c 100644
--- a/gnome3-libs/gnome-shell/HISTORY
+++ b/gnome3-libs/gnome-shell/HISTORY
@@ -1,3 +1,9 @@
+2012-01-20 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2.1
+
+2012-01-18 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2.2, bz2 -> xz
+
2011-12-14 Ladislav Hagara <hgr@vabo.cz>
* DEPENDS: pulseaudio added
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig b/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig
deleted file mode 100644
index a1ad193f99..0000000000
--- a/gnome3-libs/gnome-shell/gnome-shell-3.2.1.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig
new file mode 100644
index 0000000000..65943e7b0d
--- /dev/null
+++ b/gnome3-libs/gnome-shell/gnome-shell-3.2.2.1.tar.xz.sig
Binary files differ
diff --git a/gnome3-libs/gnome-themes-standard/DETAILS b/gnome3-libs/gnome-themes-standard/DETAILS
index dd61c4bb39..972912f1d8 100755
--- a/gnome3-libs/gnome-themes-standard/DETAILS
+++ b/gnome3-libs/gnome-themes-standard/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnome-themes-standard
- VERSION=3.2.0.2
+ VERSION=3.2.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome3-libs/gnome-themes-standard/HISTORY b/gnome3-libs/gnome-themes-standard/HISTORY
index 971b182b13..b42b08d7b0 100644
--- a/gnome3-libs/gnome-themes-standard/HISTORY
+++ b/gnome3-libs/gnome-themes-standard/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 3.2.1
+
2011-10-08 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0.2
diff --git a/gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.0.2.tar.bz2.sig b/gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.0.2.tar.bz2.sig
deleted file mode 100644
index 6e1c375dc3..0000000000
--- a/gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.0.2.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.1.tar.bz2.sig b/gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.1.tar.bz2.sig
new file mode 100644
index 0000000000..5a4b8eb7f9
--- /dev/null
+++ b/gnome3-libs/gnome-themes-standard/gnome-themes-standard-3.2.1.tar.bz2.sig
Binary files differ
diff --git a/graphics-libs/libvisio/DETAILS b/graphics-libs/libvisio/DETAILS
index 982ad52ff7..1f2be4b248 100755
--- a/graphics-libs/libvisio/DETAILS
+++ b/graphics-libs/libvisio/DETAILS
@@ -1,6 +1,6 @@
SPELL=libvisio
- VERSION=0.0.12
- SOURCE_HASH=sha512:f60595a2d34b81d80d571173f91ad833da864deb5ea7ffe8a95dd59a1b33fb54a28c355c6809c43304d8761ecb4ff2e24bc3b2a6d25ff982118f82c344379a7d
+ VERSION=0.0.13
+ SOURCE_HASH=sha512:cc03e384c9b30a54b17f1ced3d15695c5d4ae146ac83f66c7d28afd99ec6cb83c7490e939d567590ab83372637ce7c00614f2ebca03fe5a2ac9d2b0f7b1df169
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://dev-www.libreoffice.org/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/libvisio/HISTORY b/graphics-libs/libvisio/HISTORY
index 433a043073..e8b6935c44 100644
--- a/graphics-libs/libvisio/HISTORY
+++ b/graphics-libs/libvisio/HISTORY
@@ -1,2 +1,5 @@
-2011-01-12 Ladislav Hagara <hgr@vabo.cz>
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.0.13
+
+2012-01-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS, DEPENDS: spell created, version 0.0.12
diff --git a/graphics-libs/poppler/DETAILS b/graphics-libs/poppler/DETAILS
index de8c5328b2..568ae5543f 100755
--- a/graphics-libs/poppler/DETAILS
+++ b/graphics-libs/poppler/DETAILS
@@ -12,11 +12,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
else
if [[ $POPPLER_BRANCH == devel ]]; then
- VERSION=0.18.2
- SOURCE_HASH=sha512:49bcf54fd93e0a6db0090bf3d01143673ff260b8b1b295a72a9924f694ea6fd83889d70958cdff61bddd57d64f0b7634971613b1167c8f52bc560aff23aa0763
+ VERSION=0.18.3
+ SOURCE_HASH=sha512:90b4b4a735bb190da073488b2e3dde358c404245a43c1c4fb6406d832d565d23470a77861e42cf99f858c89121000fe453b04f92440f9c7e026daca45e037550
else
- VERSION=0.18.2
- SOURCE_HASH=sha512:49bcf54fd93e0a6db0090bf3d01143673ff260b8b1b295a72a9924f694ea6fd83889d70958cdff61bddd57d64f0b7634971613b1167c8f52bc560aff23aa0763
+ VERSION=0.18.3
+ SOURCE_HASH=sha512:90b4b4a735bb190da073488b2e3dde358c404245a43c1c4fb6406d832d565d23470a77861e42cf99f858c89121000fe453b04f92440f9c7e026daca45e037550
fi
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 2979342940..370d48c910 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.18.3
+
2011-12-25 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added missing optional dependency
diff --git a/groups b/groups
index d65f43d7e9..25464466a8 100755
--- a/groups
+++ b/groups
@@ -116,5 +116,6 @@ dspam:188:
nslcd:189:
redis:190:
lightdm:191:
+masqmail:192:
users:1000:
nogroup:65534:
diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 0c9d5c7583..7e7c023ced 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -6,10 +6,10 @@ if [[ $MIDORI_BRANCH == scm ]]; then
VERSION=git
fi
SOURCE=$SPELL-git.tar.bz2
- SOURCE_URL[0]=git://git.xfce.org/apps/$SPELL:$SPELL
+ SOURCE_URL[0]=git://git.xfce.org/apps/$SPELL:$SPELL-git
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
VERSION=0.4.3
BRANCH=`echo $VERSION | cut -d . -f 1,2`
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index e64dbe4b34..702eaa1308 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Fix SOURCE_DIRECTORY for scm version.
+
2011-12-18 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.4.3
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 66f43a0bdd..796824aade 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -10,7 +10,7 @@ depends JPEG &&
depends bison &&
depends flex &&
depends sqlite &&
-depends -sub SOUP_DEVEL libsoup
+depends libsoup &&
depends enchant &&
depends libxt &&
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index eef4e0a024..1f4420b19d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: libsoup is up to date enough to be used as stable
+
2011-09-29 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.6.1
* BUILD: --with-gtk=2.0 added
diff --git a/kde4-support/phonon-backend-gstreamer/HISTORY b/kde4-support/phonon-backend-gstreamer/HISTORY
index a4e799dd6a..ce0626ff35 100644
--- a/kde4-support/phonon-backend-gstreamer/HISTORY
+++ b/kde4-support/phonon-backend-gstreamer/HISTORY
@@ -1,3 +1,7 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, message.h.patch: fixed compile error with current
+ versions of glib2
+
2011-09-04 Bor Kraljič <pyrobor@ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change
diff --git a/kde4-support/phonon-backend-gstreamer/PRE_BUILD b/kde4-support/phonon-backend-gstreamer/PRE_BUILD
new file mode 100755
index 0000000000..b2a0a0fc6c
--- /dev/null
+++ b/kde4-support/phonon-backend-gstreamer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/message.h.patch
diff --git a/kde4-support/phonon-backend-gstreamer/message.h.patch b/kde4-support/phonon-backend-gstreamer/message.h.patch
new file mode 100644
index 0000000000..a6ab7cfdde
--- /dev/null
+++ b/kde4-support/phonon-backend-gstreamer/message.h.patch
@@ -0,0 +1,11 @@
+--- phonon-backend-gstreamer-4.4.4/gstreamer/message.h.orig 2012-01-15 15:11:10.270718918 +0100
++++ phonon-backend-gstreamer-4.4.4/gstreamer/message.h 2012-01-15 15:11:21.532577144 +0100
+@@ -20,7 +20,7 @@
+
+ #include <QtCore/QMetaType>
+
+-#include <glib-2.0/glib/gmacros.h> // For G_*_DECLS macros primarily
++#include <glib.h> // For G_*_DECLS macros primarily
+ #include <gst/gstmessage.h>
+
+ QT_BEGIN_NAMESPACE
diff --git a/kernels/kmod/DEPENDS b/kernels/kmod/DEPENDS
new file mode 100755
index 0000000000..8d4650eb6b
--- /dev/null
+++ b/kernels/kmod/DEPENDS
@@ -0,0 +1,3 @@
+depends xz-utils '--with-xz' &&
+depends zlib '--with-zlib'
+
diff --git a/kernels/kmod/DETAILS b/kernels/kmod/DETAILS
new file mode 100755
index 0000000000..2a68c3a5f9
--- /dev/null
+++ b/kernels/kmod/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=kmod
+ VERSION=4
+ SOURCE_HASH=sha512:5f1db9ecdd90da39a99c256e4cc6740da8ee19351652325538b40c731d073fb277312541ab8969ea7caf777c45ea97202e07ac13268111e322fcd3fe8a875189
+ SOURCE=$SPELL-$VERSION.tar.xz
+# SOURCE2=$SOURCE.sign
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://packages.profusion.mobi/kmod/$SOURCE
+# SOURCE2_URL[0]=${SOURCE_URL[0]}.sign
+# SOURCE_GPG=lucas.demarchi.gpg:$SOURCE.sign:UPSTREAM_KEY
+# SOURCE2_IGNORE=signature
+
+ WEB_SITE=http://git.profusion.mobi/cgit.cgi/kmod.git
+ LICENSE[0]=GPL
+ ENTERED=20120113
+ KEYWORDS=""
+ SHORT="kernel support tools"
+cat << EOF
+kmod is a set of tools to handle common tasks with Linux kernel modules like
+insert, remove, list, check properties, resolve dependencies and aliases.
+
+These tools are designed on top of libkmod, a library that is shipped with
+kmod. See libkmod/README for more details on this library and how to use it.
+The aim is to be compatible with tools, configurations and indexes from
+module-init-tools project.
+EOF
diff --git a/kernels/kmod/HISTORY b/kernels/kmod/HISTORY
new file mode 100644
index 0000000000..d856fc2b92
--- /dev/null
+++ b/kernels/kmod/HISTORY
@@ -0,0 +1,9 @@
+2012-01-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 4
+ * PRE_BUILD: removed
+
+2012-01-13 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 3
+ using key 30CBEA53: public key "Lucas De Marchi <lucas.demarchi@profusion.mobi>"
+ spell created
+
diff --git a/kernels/kmod/lucas.demarchi.gpg b/kernels/kmod/lucas.demarchi.gpg
new file mode 100644
index 0000000000..ea21eab2f0
--- /dev/null
+++ b/kernels/kmod/lucas.demarchi.gpg
Binary files differ
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index c40ef9b5c2..4814ee6036 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2012-01-13 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.2.1
+ * info/patches/maintenance_patches_3/patch-3.2.1: added
+
2012-01-10 Eric Sandall <sandalle@sourcemage.org>
* INSTALL: Since 3.0 series seems to semi-regularly fail to install
with multiple make jobs.
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
new file mode 100755
index 0000000000..b63160aef4
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.1
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3e6dbebd459f21d03e542f933f2d391281871fd6"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 75bf332556..a7c0e2ea5e 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.2
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.2
+LATEST_maintenance_patches_3=patch-3.2.1
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/gssdp/DEPENDS b/libs/gssdp/DEPENDS
index d8dcd8fc5f..0d3313a5b2 100755
--- a/libs/gssdp/DEPENDS
+++ b/libs/gssdp/DEPENDS
@@ -1,4 +1,5 @@
+depends gtk+2 &&
depends glib2 &&
+depends libsoup &&
optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' \
'for documentation generation' &&
-optional_depends GTK2 '' '--without-gtk' 'for GTK+2 support'
diff --git a/libs/gssdp/HISTORY b/libs/gssdp/HISTORY
index 001428b46a..10ab6bfb63 100644
--- a/libs/gssdp/HISTORY
+++ b/libs/gssdp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ismael Luceno <ismael@sourcemage.org>
+ * DEPENDS: gtk+2 is not optional
+ * DEPENDS: depends on libsoup
+
2009-10-08 Arjan Bouter <abouter@sourcemage.org>
* DETAILS, DEPENDS: spell created
-
diff --git a/libs/libidn/DETAILS b/libs/libidn/DETAILS
index 097f83db58..357757b700 100755
--- a/libs/libidn/DETAILS
+++ b/libs/libidn/DETAILS
@@ -1,5 +1,5 @@
SPELL=libidn
- VERSION=1.22
+ VERSION=1.24
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index e657632183..7a6816ffff 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.24
+
2011-05-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.22
diff --git a/libs/libnih/DETAILS b/libs/libnih/DETAILS
index 6dfd4f3453..991dabe98c 100755
--- a/libs/libnih/DETAILS
+++ b/libs/libnih/DETAILS
@@ -1,9 +1,9 @@
SPELL=libnih
- VERSION=1.0.2.orig
- SOURCE="${SPELL}_${VERSION}.tar.gz"
- SOURCE_URL[0]=http://archive.ubuntu.com/ubuntu/pool/main/libn/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:d13f46dc2e449d8864a39e1b71747e419b8d262d3c8ce7f555569208e3b72c5e74550d05336036794cc9debec52fec03eb7e9544b7bd93f37691048d0e52ad6c
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-1.0.2"
+ VERSION=1.0.3
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]="http://launchpad.net/${SPELL}/${VERSION:0:3}/${VERSION}/+download/${SOURCE}"
+ SOURCE_HASH=sha512:fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://launchpad.net/libnih"
LICENSE[0]=GPL
ENTERED=20101114
diff --git a/libs/libnih/HISTORY b/libs/libnih/HISTORY
index f98a20a719..7cb036971d 100644
--- a/libs/libnih/HISTORY
+++ b/libs/libnih/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: version 1.0.3
+
2010-11-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index be89ce2c75..8683596f3a 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.9.14
- SOURCE_HASH=sha512:405642b973cb92e6e6c95d4503ec36d6c2bdcdda4c10dcf23e15abfb29484aeb76bf5f02555dd923ae04369d7835afa103a729220766f65e62a66cb00e17452c
+ VERSION=0.9.15
+ SOURCE_HASH=sha512:c56263dbaa1c6d6ef1ab5a7dfd05b4abf440efc3042573f7ba04dccc1efe58db858042335131b9f3f2eaa2911f963b1ef61533b3a38e7cf4cf97d5de071b382b
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index bee99938a7..42bdd1b8c3 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0.9.15
+
2011-10-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.9.14
diff --git a/mail/courier/CONFLICTS b/mail/courier/CONFLICTS
index d60101b952..36fa790a71 100755
--- a/mail/courier/CONFLICTS
+++ b/mail/courier/CONFLICTS
@@ -1,4 +1,5 @@
conflicts courier-imap &&
+conflicts masqmail &&
conflicts esmtp &&
conflicts exim &&
conflicts postfix &&
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index 8bbee30899..496ca4e901 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-03-27 Remko van der Vossen <wich@sourcemage.org>
* DETAILS: version 0.65.3
* init.d/*: simplified and use smgl_init (working NEEDS)
diff --git a/mail/esmtp/CONFLICTS b/mail/esmtp/CONFLICTS
index 3ae5540f6b..6482df0138 100755
--- a/mail/esmtp/CONFLICTS
+++ b/mail/esmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts courier &&
conflicts exim &&
conflicts postfix &&
diff --git a/mail/esmtp/HISTORY b/mail/esmtp/HISTORY
index 3060a7cb8b..7862f87b3b 100644
--- a/mail/esmtp/HISTORY
+++ b/mail/esmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-10-23 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.2
diff --git a/mail/exim/CONFLICTS b/mail/exim/CONFLICTS
index 91e224b3f3..d8f360d343 100755
--- a/mail/exim/CONFLICTS
+++ b/mail/exim/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts courier &&
conflicts esmtp &&
conflicts postfix &&
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 902294025a..3d9d4dd608 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-10-10 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 4.77; SECURITY_PATCH++
diff --git a/mail/masqmail/BUILD b/mail/masqmail/BUILD
new file mode 100755
index 0000000000..be4c244b30
--- /dev/null
+++ b/mail/masqmail/BUILD
@@ -0,0 +1,10 @@
+create_account masqmail &&
+create_account mail &&
+
+OPTS="--with-user=masqmail \
+ --with-group=masqmail \
+ --with-spooldir=$INSTALL_ROOT/var/spool/mail \
+ $MASQMAIL_OPTS \
+ $OPTS" &&
+
+default_build
diff --git a/mail/masqmail/CONFIGURE b/mail/masqmail/CONFIGURE
new file mode 100755
index 0000000000..e203269f93
--- /dev/null
+++ b/mail/masqmail/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option MASQMAIL_OPTS "Enable resolver support?" y \
+ "--enable-resolver" \
+ "--disable-resolver" &&
+
+config_query_option MASQMAIL_OPTS "Enable AUTH (RFC 2554) client support?" y \
+ "--enable-auth" \
+ "--disable-auth" &&
+
+config_query_option MASQMAIL_OPTS "Enable debugging?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/mail/masqmail/CONFLICTS b/mail/masqmail/CONFLICTS
new file mode 100755
index 0000000000..a1641aa7e3
--- /dev/null
+++ b/mail/masqmail/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts exim &&
+conflicts courier &&
+conflicts esmtp &&
+conflicts postfix &&
+conflicts sendmail &&
+conflicts netqmail
diff --git a/mail/masqmail/DEPENDS b/mail/masqmail/DEPENDS
new file mode 100755
index 0000000000..dad78f04a9
--- /dev/null
+++ b/mail/masqmail/DEPENDS
@@ -0,0 +1,6 @@
+depends glib2 &&
+
+optional_depends liblockfile \
+ "--with-liblockfile" \
+ "--without-liblockfile" \
+ "to use liblock"
diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
new file mode 100755
index 0000000000..aab8643033
--- /dev/null
+++ b/mail/masqmail/DETAILS
@@ -0,0 +1,47 @@
+ SPELL=masqmail
+ VERSION=0.3.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.asc
+ SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=masqmail.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ LICENSE[0]=GPL
+ WEB_SITE=http://marmaro.de/prog/masqmail/
+ ENTERED=20120119
+ SHORT="MTA for workstations and for servers in small networks"
+cat << EOF
+Masqmail is a mail server designed for hosts that are not permanently connected
+to the Internet. It handles outgoing messages, i.e. those that are to be sent
+over the non-permanent link (usually a ppp or slip connection over a modem or
+ISDN adapter) specially and delivers them only when explicitely told to do so.
+There is support for multiple providers, it is possible to write different
+configurations for each one. The configuration chosen is selected at delivery
+time, so that if for example a delivery of a message failed while connected with
+provider 1, it may be delivered when connected to provider 2. For each provider
+another mail host (or none) can be specified.
+
+Masqmail provides (a yet simple) mechanism to rewrite headers, also depending on
+the current connection. This makes it possible to deliver messages with a return
+address on the local network which will be rewitten at delivery time.
+
+The purpose of this is:
+
+- to allow delivery failure messages that are produced on the local network to
+be delivered immediately, while those that are produced outside can be delivered
+to a mailbox on the internet, to be retrieved later.
+
+- to give mail servers a return address which they can accept if they check for
+spam mail. Many mail servers require a return address which has the same domain
+as the server it is getting the message from. If you normally connect to only
+one provider, this is usually not a problem as you can configure your mailer to
+a fixed address (but then there is still the problem with the failure messages),
+but it is a problem if you use different ones from time to time.
+
+Masqmail shall once be a complete replacement for sendmail (or other MTAs such
+as exim, qmail or smail) on a local network, but it is NOT supposed to be
+installed in a network with a permanent internet connection (at least if it is
+not behind a secure firewall) because it has no ability to check for undesired
+relaying or spam filtering.
+EOF
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
new file mode 100644
index 0000000000..80df95cc02
--- /dev/null
+++ b/mail/masqmail/HISTORY
@@ -0,0 +1,3 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS, CONFIGURE, BUILD, CONFLICTS, PROVIDES, SECURITY,
+ INSTALL, init.d/masqmail{,.conf}, masqmail.gpg: spell created
diff --git a/mail/masqmail/INSTALL b/mail/masqmail/INSTALL
new file mode 100755
index 0000000000..2fb052be5f
--- /dev/null
+++ b/mail/masqmail/INSTALL
@@ -0,0 +1,24 @@
+default_install &&
+
+install_config_file examples/masqmail.conf "$INSTALL_ROOT/etc/masqmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/lib/sendmail" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/sendmail" &&
+
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/runq" &&
+ln -vsf "$TRACK_ROOT/usr/sbin/masqmail" "$INSTALL_ROOT/usr/sbin/mailrm" &&
+
+install -vm 1777 -d -o masqmail -g masqmail "$INSTALL_ROOT/var/spool/mail" &&
+
+if [[ -e $INSTALL_ROOT/var/spool/mail/input ]]; then
+ chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/input"
+fi &&
+if [[ -e $INSTALL_ROOT/var/spool/mail/lock ]]; then
+ chown -R masqmail:masqmail "$INSTALL_ROOT/var/spool/mail/lock"
+fi &&
+
+if [[ $INIT_INSTALLED ]]; then
+ install_config_file "$SPELL_DIRECTORY/init.d/masqmail.conf" \
+ "$INSTALL_ROOT/etc/sysconfig/masqmail"
+fi
diff --git a/mail/masqmail/PROVIDES b/mail/masqmail/PROVIDES
new file mode 100755
index 0000000000..bebbaa4e08
--- /dev/null
+++ b/mail/masqmail/PROVIDES
@@ -0,0 +1,2 @@
+MAIL-TRANSPORT-AGENT
+SENDMAIL
diff --git a/mail/masqmail/SECURITY b/mail/masqmail/SECURITY
new file mode 100755
index 0000000000..e1979f3438
--- /dev/null
+++ b/mail/masqmail/SECURITY
@@ -0,0 +1,3 @@
+The use of MasqMail is *strongly* discouraged if you have a permanent connection
+to the internet without a firewall. Mainly because it does not have the ability
+to block relaying (it relays every mail). --FAQ
diff --git a/mail/masqmail/init.d/masqmail b/mail/masqmail/init.d/masqmail
new file mode 100755
index 0000000000..478438c9bb
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. /etc/sysconfig/masqmail
+
+PROGRAM=/usr/sbin/masqmail
+ARGS="-bd -q${QUEUE_DELAY}"
+PIDFILE="/var/run/masqmail/masqmail.pid"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init
diff --git a/mail/masqmail/init.d/masqmail.conf b/mail/masqmail/init.d/masqmail.conf
new file mode 100644
index 0000000000..0e16086234
--- /dev/null
+++ b/mail/masqmail/init.d/masqmail.conf
@@ -0,0 +1,10 @@
+#
+# Configuration file for masqmail's init.d script
+#
+
+#
+# Accumulated message queue process time
+# e.g. every 10 minutes
+#
+QUEUE_DELAY=10m
+
diff --git a/mail/masqmail/masqmail.gpg b/mail/masqmail/masqmail.gpg
new file mode 100644
index 0000000000..b489034c0a
--- /dev/null
+++ b/mail/masqmail/masqmail.gpg
Binary files differ
diff --git a/mail/postfix/CONFLICTS b/mail/postfix/CONFLICTS
index ef52ac0b50..b94f6db1b3 100755
--- a/mail/postfix/CONFLICTS
+++ b/mail/postfix/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts exim &&
conflicts qmail &&
conflicts sendmail
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 79e1a0254c..a795e426a1 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-06-25 Elisamuel Resto <ryuji@sourcemage.org>
* DEPENDS: updated stable to 2.8.3; experimental to 2.9-20110615
diff --git a/mail/qmail/CONFLICTS b/mail/qmail/CONFLICTS
index 6496d05560..3c0a6f0aef 100755
--- a/mail/qmail/CONFLICTS
+++ b/mail/qmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts exim &&
conflicts netqmail &&
conflicts sendmail &&
diff --git a/mail/qmail/HISTORY b/mail/qmail/HISTORY
index b05ddd1d71..287eff917d 100644
--- a/mail/qmail/HISTORY
+++ b/mail/qmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2010-04-20 Dave Josephsen <dave@sourcemage.org>
* CONFIGURE, PRE_BUILD, patches/qmail-tls-patch: Add TLS patch
diff --git a/mail/sendmail/CONFLICTS b/mail/sendmail/CONFLICTS
index ecde46672a..38cde47993 100755
--- a/mail/sendmail/CONFLICTS
+++ b/mail/sendmail/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail &&
conflicts courier &&
conflicts esmtp &&
conflicts exim &&
diff --git a/mail/sendmail/HISTORY b/mail/sendmail/HISTORY
index 41219d9b72..98ec9e1949 100644
--- a/mail/sendmail/HISTORY
+++ b/mail/sendmail/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/mail/ssmtp/CONFLICTS b/mail/ssmtp/CONFLICTS
index de2ee9241b..f55db76758 100755
--- a/mail/ssmtp/CONFLICTS
+++ b/mail/ssmtp/CONFLICTS
@@ -1,3 +1,4 @@
+conflicts masqmail
conflicts esmtp
conflicts exim
conflicts qmail
diff --git a/mail/ssmtp/HISTORY b/mail/ssmtp/HISTORY
index e91b691969..1ed69d3a00 100644
--- a/mail/ssmtp/HISTORY
+++ b/mail/ssmtp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFLICTS: added masqmail
+
2010-02-05 Bor Kraljič <pyrobor@ver.si>
* DETAILS: changed SOURCE .gz => .bz2
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 331aea42f4..569ddb6fdf 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,14 +1,15 @@
-depends -sub CXX gcc &&
-depends nspr '--with-system-nspr' &&
-depends nss '--with-system-nss' &&
-depends zlib '--with-system-zlib' &&
-depends JPEG '--with-system-jpeg' &&
-depends libidl &&
-depends libmng '--with-system-mng' &&
-depends perl &&
-depends zip &&
-depends gtk+2 \
- '--enable-xft --disable-freetype2 --enable-default-toolkit=gtk2' &&
+depends -sub CXX gcc &&
+depends nspr '--with-system-nspr' &&
+depends nss '--with-system-nss' &&
+depends zlib '--with-system-zlib' &&
+depends JPEG '--with-system-jpeg' &&
+depends libidl &&
+depends libmng '--with-system-mng' &&
+depends perl &&
+depends zip &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends -sub 'TEE' cairo "--enable-system-cairo \
+ --enable-default-toolkit=cairo-gtk2" &&
#
# LDAP support doesn't work (fails to build)
#
@@ -22,17 +23,6 @@ optional_depends gnome-vfs2 \
"--disable-gnomevfs" \
"for GnomeVFS support" &&
-optional_depends cairo \
- "--enable-system-cairo \
- --enable-default-toolkit=cairo-gtk2" \
- "" \
- "for native SVG rendering" &&
-
-# tee surface backend must be enabled in cairo
-if is_depends_enabled $SPELL cairo; then
- depends -sub "TEE" cairo
-fi &&
-
optional_depends startup-notification \
'--enable-startup-notification' \
'--disable-startup-notification' \
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 8314cdfff1..78d40765e9 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: cairo is now required (not pure gtk2 toolkit option)
+
2012-01-03 Julien "_kaze_" ROZO <julien@rozo.org>
* DETAILS: updated version to 9.0.1, SECURITY_PATCH=29
* DEPENDS: if cairo dependency is enabled, cairo must have tee surface
diff --git a/net/cacti/DETAILS b/net/cacti/DETAILS
index 4971f4d770..6b878bebae 100755
--- a/net/cacti/DETAILS
+++ b/net/cacti/DETAILS
@@ -1,16 +1,10 @@
SPELL=cacti
- VERSION=0.8.7h
- SECURITY_PATCH=2
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:cbd96e8d0fd0fe49249fa4b85174dbdf27d79b42a7934a6466995585f748ddc8b771cd7903199fe4e53d54b1bcfd3c271bbdc93477904cece00520b65c806ebf
-if [[ $CACTI_PA == y ]]; then
- VERSION_PA=3.0
- SOURCE2=$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.tar.gz
- SOURCE2_URL[0]=http://www.cacti.net/downloads/pia/$SOURCE2
- SOURCE2_HASH=sha512:2d6d45b2095ec1c09e504516f5c0ebee8734c351a25750565ec09fe5d2a98ccc6e74e0bed12e005d4157f4ec85a3fe3941bf0e538621011c36ba79f0f764c224
-SOURCE_DIRECTORY2="$BUILD_DIRECTORY/$SPELL-PA-${VERSION_PA}"
-fi
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ VERSION=0.8.7i
+ VERSION_PIA=3.1
+ SECURITY_PATCH=3
+ SOURCE=$SPELL-$VERSION-PIA-${VERSION_PIA}.tar.gz
+ SOURCE_HASH=sha512:239e5e4f8697029b6075cd194937aefd95bba961388c98591a867d2ad83d3284d9960bf1ca9241e167f100697fd91b532d311d842a91d63220d6b678eec3699c
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-PIA-${VERSION_PIA}"
SOURCE_URL[0]=http://www.cacti.net/downloads/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.cacti.net/
diff --git a/net/cacti/HISTORY b/net/cacti/HISTORY
index 92862c42ca..f688dd0435 100644
--- a/net/cacti/HISTORY
+++ b/net/cacti/HISTORY
@@ -1,3 +1,8 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.8.7i; SECURITY_PATCH++; PA is now bundled
+ * PREPARE: removed
+ * patches: added official patch (http://cacti.net/download_patches.php)
+
2011-10-12 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.8.7h; SECURITY_PATCH++; updated plugin
arch to 3.0; updated PA source url
diff --git a/net/cacti/INSTALL b/net/cacti/INSTALL
index cd7fd5849c..3ab09b7aac 100755
--- a/net/cacti/INSTALL
+++ b/net/cacti/INSTALL
@@ -1,6 +1 @@
-cd ${SOURCE_DIRECTORY} &&
-install_www_files &&
-
-if [[ $CACTI_PA == y ]]; then
- rm_source_dir "$SOURCE_DIRECTORY2"
-fi
+install_www_files
diff --git a/net/cacti/PREPARE b/net/cacti/PREPARE
deleted file mode 100755
index 521ab6dc0d..0000000000
--- a/net/cacti/PREPARE
+++ /dev/null
@@ -1,4 +0,0 @@
-message "Plugin Architecture provides users with the ability to write or use\n" \
- "plugins with Cacti" &&
-
-config_query CACTI_PA "Install Plugin Architecture?" n
diff --git a/net/cacti/PRE_BUILD b/net/cacti/PRE_BUILD
index 5d34bebf90..4f1cd3fcdb 100755
--- a/net/cacti/PRE_BUILD
+++ b/net/cacti/PRE_BUILD
@@ -5,18 +5,4 @@ if [[ -d "$SPELL_DIRECTORY/patches" ]]; then
for patch in "$SPELL_DIRECTORY/patches"/*.patch; do
patch -p1 < $patch
done
-fi &&
-
-if [[ $CACTI_PA == y ]]; then
- mk_source_dir "$SOURCE_DIRECTORY2"
- cd "$SOURCE_DIRECTORY2" &&
- unpack_file 2 &&
-
- cd "$SOURCE_DIRECTORY" &&
-
- cat "$SOURCE_DIRECTORY2/cacti-plugin-arch/pa.sql" >> cacti.sql &&
- patch -p1 < "$SOURCE_DIRECTORY2/cacti-plugin-arch/$SPELL-plugin-$VERSION-PA-v${VERSION_PA}.diff" &&
-
- # cleaning up post-patching
- rm -f *.orig
fi
diff --git a/net/cacti/patches/settings_checkbox.patch b/net/cacti/patches/settings_checkbox.patch
new file mode 100644
index 0000000000..2226df2632
--- /dev/null
+++ b/net/cacti/patches/settings_checkbox.patch
@@ -0,0 +1,56 @@
+--- 0.8.7i/graph_settings.php 2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/graph_settings.php 2011-12-21 11:34:38.000000000 -0500
+@@ -54,7 +54,29 @@
+
+ while (list($tab_short_name, $tab_fields) = each($settings_graphs)) {
+ while (list($field_name, $field_array) = each($tab_fields)) {
+- if ((isset($field_array["items"])) && (is_array($field_array["items"]))) {
++ if ($field_array["method"] == "checkbox") {
++ if (isset($_POST[$field_name])) {
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$field_name', 'on')");
++ }else{
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$field_name', '')");
++ }
++ }elseif ($field_array["method"] == "checkbox_group") {
++ while (list($sub_field_name, $sub_field_array) = each($field_array["items"])) {
++ if (isset($_POST[$sub_field_name])) {
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$sub_field_name', 'on')");
++ }else{
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$sub_field_name', '')");
++ }
++ }
++ }elseif ($field_array["method"] == "textbox_password") {
++ if ($_POST[$field_name] != $_POST[$field_name."_confirm"]) {
++ raise_message(4);
++ break;
++ }elseif (isset($_POST[$field_name])) {
++ $value = $cnn_id->qstr(get_request_var_post($field_name));
++ db_execute("REPLACE INTO settings_graphs (user_id,name,value) VALUES (" . $_SESSION["sess_user_id"] . ",'$field_name', $value)");
++ }
++ }elseif ((isset($field_array["items"])) && (is_array($field_array["items"]))) {
+ while (list($sub_field_name, $sub_field_array) = each($field_array["items"])) {
+ if (isset($_POST[$sub_field_name])) {
+ $value = $cnn_id->qstr(get_request_var_post($sub_field_name));
+--- 0.8.7i/settings.php 2011-10-12 15:43:42.356672000 -0400
++++ 0.8.7i-patched/settings.php 2011-12-21 13:50:23.868244800 -0500
+@@ -32,6 +31,20 @@
+ while (list($field_name, $field_array) = each($settings{$_POST["tab"]})) {
+ if (($field_array["method"] == "header") || ($field_array["method"] == "spacer" )){
+ /* do nothing */
++ }elseif ($field_array["method"] == "checkbox") {
++ if (isset($_POST[$field_name])) {
++ db_execute("replace into settings (name,value) values ('$field_name', 'on')");
++ }else{
++ db_execute("replace into settings (name,value) values ('$field_name', '')");
++ }
++ }elseif ($field_array["method"] == "checkbox_group") {
++ while (list($sub_field_name, $sub_field_array) = each($field_array["items"])) {
++ if (isset($_POST[$sub_field_name])) {
++ db_execute("replace into settings (name,value) values ('$sub_field_name', 'on')");
++ }else{
++ db_execute("replace into settings (name,value) values ('$sub_field_name', '')");
++ }
++ }
+ }elseif ($field_array["method"] == "textbox_password") {
+ if ($_POST[$field_name] != $_POST[$field_name."_confirm"]) {
+ raise_message(4);
diff --git a/net/cifs-utils/DETAILS b/net/cifs-utils/DETAILS
index 6daffbc626..02767afa37 100755
--- a/net/cifs-utils/DETAILS
+++ b/net/cifs-utils/DETAILS
@@ -1,8 +1,8 @@
SPELL=cifs-utils
- VERSION=5.1
+ VERSION=5.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=ftp://ftp.samba.org/pub/linux-cifs/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:f30640dcfc55cf529b012735b5d5d93db7950a7c5e397ac886a4c83b43d136be13f15eb1ad9ba35d935f0033743c1218cda059b4850e548935235cffb990ae0e
+ SOURCE_HASH=sha512:e5ab1a90911bfd0df6c7ee691f289deda04c38ceaeb5e1e67fda700b687e3cc63874c4261e124467fdf561a7678660ca8f9d17c0e2159242f6e9d7f938fccd7e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
LICENSE[0]=GPL
diff --git a/net/cifs-utils/HISTORY b/net/cifs-utils/HISTORY
index cab9e44ac6..0a80e0c552 100644
--- a/net/cifs-utils/HISTORY
+++ b/net/cifs-utils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 5.2
+
2011-12-19 Julien "_kaze_" ROZO <julien@rozo.org>
* CONFIGURE, DEPENDS, BUILD: added the possibility to enable/disable
cifsacl, which depends on keyutils to be built
diff --git a/net/ethtool/DETAILS b/net/ethtool/DETAILS
index 7a6d3ff19c..26302737d1 100755
--- a/net/ethtool/DETAILS
+++ b/net/ethtool/DETAILS
@@ -1,9 +1,9 @@
SPELL=ethtool
- VERSION=3.0
+ VERSION=3.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/software/network/ethtool/$SOURCE
- SOURCE_HASH=sha512:8a1ae1fa50a28c9fd525f19b695b739bc6f896575315a281cc4b751241385c949d8960e402796b5f36450861063546f037516d41daaea099e7b14ff38f4f1fdb
+ SOURCE_HASH=sha512:ecb23d68c40014bf61cb7e592e593e5cd52bdf4e8073991d33fff1d070e76908275442b2609c093b6a3ccd950352ce152b941d1f25953b1e7758eb74ad1ae3f5
WEB_SITE=http://www.kernel.org/pub/software/network/ethtool/
LICENSE[0]=GPL
ENTERED=20040702
diff --git a/net/ethtool/HISTORY b/net/ethtool/HISTORY
index 26224fcd49..407905fde5 100644
--- a/net/ethtool/HISTORY
+++ b/net/ethtool/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.2
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/net/ipset/DETAILS b/net/ipset/DETAILS
index 45782f45fc..15fd03b34d 100755
--- a/net/ipset/DETAILS
+++ b/net/ipset/DETAILS
@@ -6,9 +6,9 @@ if is_version_less $(get_kernel_version) 2.6.35; then
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_HASH=sha512:ccac555257600b8fd2e229426514582e6f3f04000b4f2bc704d28efdae0869c1c6952ddb9a833a32e49604d16a4a9aa0a5ea847d469a31e567e84f36b76e19f2
else
- VERSION=6.9.1
+ VERSION=6.11
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_HASH=sha512:024a071613fd56577a2fd37ea6e2a961c113f3ca816077fd24b1698e4bd78a8cb3897291505ea02a9b6565b110170ba93b321b3e1a6476ce93b8d93abe3bd1ed
+ SOURCE_HASH=sha512:ac210f71c2a7a55fc71e36044b8d35174c4a423c74204ac24f056b684af03dde57a617d1f0f4f8e77336db8d716a4d50b58704038fb34073f8fa1bffa9d44210
fi
SOURCE_URL[0]=http://ipset.netfilter.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/ipset/HISTORY b/net/ipset/HISTORY
index 363010289c..f45283ae86 100644
--- a/net/ipset/HISTORY
+++ b/net/ipset/HISTORY
@@ -1,2 +1,5 @@
+2012-01-16 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 6.11
+
2011-09-26 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS, DEPENDS, {PRE_}BUILD, INSTALL: spell created
diff --git a/net/spine/DETAILS b/net/spine/DETAILS
index 13385aa1a6..e8d4fcca5c 100755
--- a/net/spine/DETAILS
+++ b/net/spine/DETAILS
@@ -1,8 +1,8 @@
SPELL=spine
- VERSION=0.8.7h
+ VERSION=0.8.7i
SOURCE=cacti-$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.cacti.net/downloads/$SPELL/$SOURCE
- SOURCE_HASH=sha512:681ea0849a477636348fbede7b11d04900cb3a2bbcb747deccaea31c67adfdb07f2692934a44de5975a142632154c7249ca66455c4f1beb1679bcfb56088e396
+ SOURCE_HASH=sha512:3ccca10cdd12672c37591579a9ce9e70a7b4a60c562904ed99c4f26bd73b9227421ea0ba3a87351629847fcf54fdc659404b6e0abaf97d4b63213de82703fabd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/cacti-$SPELL-$VERSION"
WEB_SITE=http://www.cacti.net/spine_info.php
LICENSE[0]=LGPL
diff --git a/net/spine/HISTORY b/net/spine/HISTORY
index eac465201e..d8fe182efa 100644
--- a/net/spine/HISTORY
+++ b/net/spine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.8.7i
+
2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.8.7h
* DEPENDS: added libcap optional dependency
diff --git a/perl-cpan/dbd-odbc/DETAILS b/perl-cpan/dbd-odbc/DETAILS
index 276875a4f6..bcefda3f83 100755
--- a/perl-cpan/dbd-odbc/DETAILS
+++ b/perl-cpan/dbd-odbc/DETAILS
@@ -1,8 +1,8 @@
SPELL=dbd-odbc
- VERSION=1.24
+ VERSION=1.33
SOURCE="DBD-ODBC-${VERSION}.tar.gz"
SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MJ/MJEVANS/${SOURCE}
- SOURCE_HASH=sha512:900ee360e0b4d24afadd467039ed3f8c200630ad5dc5260c5b0991bfa612cff9b1d9fe721b28a48e5406de528c1b9e79d61d28a0bef448d4d1291de619a26352
+ SOURCE_HASH=sha512:d5fb494adc2de526a28cd8d860821cd1a551eac05cd2fb6d1b682d266ad77bcf82791c575d687bef1ddffad6ef30d73b089542d2ead34b133309aef972acdcd0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/DBD-ODBC-${VERSION}"
WEB_SITE="http://search.cpan.org/~mjevans/DBD-ODBC/"
LICENSE[0]=GPL
diff --git a/perl-cpan/dbd-odbc/HISTORY b/perl-cpan/dbd-odbc/HISTORY
index c6dd56f077..290afc2ddb 100644
--- a/perl-cpan/dbd-odbc/HISTORY
+++ b/perl-cpan/dbd-odbc/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.33
+
2010-08-17 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.24
diff --git a/perl-cpan/io-socket-ssl/DETAILS b/perl-cpan/io-socket-ssl/DETAILS
index 9adb13021b..70b7cb2026 100755
--- a/perl-cpan/io-socket-ssl/DETAILS
+++ b/perl-cpan/io-socket-ssl/DETAILS
@@ -1,5 +1,5 @@
SPELL=io-socket-ssl
- VERSION=1.33
+ VERSION=1.54
SOURCE=IO-Socket-SSL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/IO-Socket-SSL-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/S/SU/SULLR/$SOURCE
diff --git a/perl-cpan/io-socket-ssl/HISTORY b/perl-cpan/io-socket-ssl/HISTORY
index afc730fe46..9345bd36f3 100644
--- a/perl-cpan/io-socket-ssl/HISTORY
+++ b/perl-cpan/io-socket-ssl/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.54
+
2010-06-17 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 1.33
diff --git a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig
deleted file mode 100644
index b981e2cc2e..0000000000
--- a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.33.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig
new file mode 100644
index 0000000000..2fdd46efe1
--- /dev/null
+++ b/perl-cpan/io-socket-ssl/IO-Socket-SSL-1.54.tar.gz.sig
Binary files differ
diff --git a/perl-cpan/net-ssleay/DETAILS b/perl-cpan/net-ssleay/DETAILS
index 48e912074f..38b31a3586 100755
--- a/perl-cpan/net-ssleay/DETAILS
+++ b/perl-cpan/net-ssleay/DETAILS
@@ -1,11 +1,11 @@
SPELL=net-ssleay
- VERSION=1.36
+ VERSION=1.42
SOURCE=Net-SSLeay-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Net-SSLeay-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/CPAN/authors/id/F/FL/FLORA/$SOURCE
+ SOURCE_URL[0]=$PERL_CPAN_URL/CPAN/authors/id/M/MI/MIKEM/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE=ART
- WEB_SITE=http://search.cpan.org/~flora/Net-SSLeay/
+ WEB_SITE=http://search.cpan.org/~mikem/Net-SSLeay/
ENTERED=20011212
KEYWORDS="perl"
SHORT="allows scripts to call the functions in the OpenSSL library"
diff --git a/perl-cpan/net-ssleay/HISTORY b/perl-cpan/net-ssleay/HISTORY
index 9e9b2b3b67..9e8ee592bf 100644
--- a/perl-cpan/net-ssleay/HISTORY
+++ b/perl-cpan/net-ssleay/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.42; renewed urls
+
2011-08-11 Vlad Glagolev <stealth@sourcemage.org>
* BUILD: made build non-interactive
diff --git a/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig b/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig
deleted file mode 100644
index 8b712a805e..0000000000
--- a/perl-cpan/net-ssleay/Net-SSLeay-1.36.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig b/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig
new file mode 100644
index 0000000000..d23a97b4bf
--- /dev/null
+++ b/perl-cpan/net-ssleay/Net-SSLeay-1.42.tar.gz.sig
Binary files differ
diff --git a/perl-cpan/podlators/DEPENDS b/perl-cpan/podlators/DEPENDS
new file mode 100755
index 0000000000..c1a1bc6231
--- /dev/null
+++ b/perl-cpan/podlators/DEPENDS
@@ -0,0 +1 @@
+depends perl
diff --git a/perl-cpan/podlators/DETAILS b/perl-cpan/podlators/DETAILS
new file mode 100755
index 0000000000..e09866facf
--- /dev/null
+++ b/perl-cpan/podlators/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=podlators
+ VERSION=2.4.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/R/RR/RRA/${SOURCE}
+ SOURCE_HASH=sha512:486a29c34e1083bb3dad32e75ffba95844c64ae3967cc90c1f1c4171961707407bc70e0270ef3728b77cf8e66e5e73c8c9a82bdce07c3932ac66ca935564b62d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://search.cpan.org/~rra/podlators-2.4.0/"
+ LICENSE[0]=ART
+ ENTERED=20120115
+ SHORT="tools for converting POD data to various formats"
+cat << EOF
+podlators contains Pod::Man and Pod::Text modules which convert POD input
+to *roff source output, suitable for man pages, or plain text. It also
+includes several subclasses of Pod::Text for formatted output to terminals
+with various capabilities. It is the source package for the Pod::Man and
+Pod::Text modules included with Perl.
+EOF
diff --git a/perl-cpan/podlators/HISTORY b/perl-cpan/podlators/HISTORY
new file mode 100644
index 0000000000..11bcb47029
--- /dev/null
+++ b/perl-cpan/podlators/HISTORY
@@ -0,0 +1,3 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index e1a3108bcb..4c874ee30a 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,6 +1,6 @@
SPELL=calibre
- VERSION=0.8.27
- SOURCE="${SPELL}-${VERSION}.tar.gz"
+ VERSION=0.8.35
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]=http://calibre-ebook.googlecode.com/files/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index dbfc662ca6..320d6ef558 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,7 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * DETAILS: updated VERSION to 0.8.35
+ * PRE_BUILD: added to exract the xz archive
+
2011-11-18 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 0.8.27
* DEPENDS: added depends icu, dnspython
diff --git a/python-pypi/calibre/PRE_BUILD b/python-pypi/calibre/PRE_BUILD
index d0009d98da..c2617f075d 100755
--- a/python-pypi/calibre/PRE_BUILD
+++ b/python-pypi/calibre/PRE_BUILD
@@ -1,4 +1,7 @@
-default_pre_build &&
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
cd $SOURCE_DIRECTORY &&
if [ "$CALIBRE_PHOME" = "y" ]; then
diff --git a/python-pypi/calibre/calibre-0.8.27.tar.gz.sig b/python-pypi/calibre/calibre-0.8.27.tar.gz.sig
deleted file mode 100644
index e34e0dff44..0000000000
--- a/python-pypi/calibre/calibre-0.8.27.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/python-pypi/calibre/calibre-0.8.35.tar.xz.sig b/python-pypi/calibre/calibre-0.8.35.tar.xz.sig
new file mode 100644
index 0000000000..065738a95a
--- /dev/null
+++ b/python-pypi/calibre/calibre-0.8.35.tar.xz.sig
Binary files differ
diff --git a/python-pypi/fabric/DETAILS b/python-pypi/fabric/DETAILS
index c595a6e99d..80c1109402 100755
--- a/python-pypi/fabric/DETAILS
+++ b/python-pypi/fabric/DETAILS
@@ -1,9 +1,9 @@
SPELL=fabric
SPELLX=Fabric
- VERSION=1.3.3
+ VERSION=1.3.4
SOURCE=${SPELLX}-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/${SPELLX:0:1}/${SPELLX}/${SOURCE}
- SOURCE_HASH=sha512:b399448b82121051582fd9ad99f9307eada96c8e698ab234b59d3c4452d566025656a68bb0cf98ddcc6191d3d7bd98d9a529ceb674ef4f4b2648f36e47f0a26a
+ SOURCE_HASH=sha512:e71e6c1367ca3b9021cd6191ce97be9e8f11ef635a80c9b0005aeefc2936394b39e11d463e806514fcd29061b09e10a4b6eb3e9d1134a5fb5dd2dd0860db6044
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE=http://fabfile.org/
LICENSE[0]=BSD
diff --git a/python-pypi/fabric/HISTORY b/python-pypi/fabric/HISTORY
index 6ed8160873..a600fb75b0 100644
--- a/python-pypi/fabric/HISTORY
+++ b/python-pypi/fabric/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.3.4
+
2011-11-25 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.3.3
diff --git a/python-pypi/matplotlib/DETAILS b/python-pypi/matplotlib/DETAILS
index 570b7f956e..a0f26572a0 100755
--- a/python-pypi/matplotlib/DETAILS
+++ b/python-pypi/matplotlib/DETAILS
@@ -1,13 +1,13 @@
SPELL=matplotlib
- VERSION=1.0.0
- SOURCE_HASH=sha512:796ae6abc976fda515c22b4e72d011bfea33b2b7fb86bdedd847762bd9f96c65dde527e5980a7c7db22ef093da0b071cab1d2ed8a5924d937c37785bc617efeb
+ VERSION=1.1.0
+ SOURCE_HASH=sha512:f5ab95c29ef6958096970265a6079f0eb8c43a500924346c4a6c6eb89d9110eeeb6c34a53715e71240e82ded2b76a7b8d5a9b05a07baa000b2926718264ad8ff
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE[0]=PYTHON
WEB_SITE=http://matplotlib.sourceforge.net/
KEYWORDS="python devel"
- SHORT="Matplotlib is a pure python plotting library"
+ SHORT="pure python plotting library"
cat << EOF
Matplotlib is a pure python plotting library with the goal of making
publication quality plots using a syntax familiar to matlab users. The library
diff --git a/python-pypi/matplotlib/HISTORY b/python-pypi/matplotlib/HISTORY
index 84d13884b9..10bfcea549 100644
--- a/python-pypi/matplotlib/HISTORY
+++ b/python-pypi/matplotlib/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.1.0
+
2011-05-24 Peng Chang (Charles) <chp@sourcemage.org>
* DETAILS: updated spell to 1.0.0
fixed WEB_SITE
diff --git a/python-pypi/pygame/HISTORY b/python-pypi/pygame/HISTORY
index 2201b277e5..19f1322814 100644
--- a/python-pypi/pygame/HISTORY
+++ b/python-pypi/pygame/HISTORY
@@ -1,3 +1,8 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, pygame-v4l.patch: patched v4l version 1 support
+ out of pygame to make the spell build with recent kernels.
+ cf. https://bitbucket.org/pygame/pygame/issue/68/pygame-wont-compile-against-linux-headers
+
2010-05-23 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* SUB_DEPENDS: added missing ;
diff --git a/python-pypi/pygame/PRE_BUILD b/python-pypi/pygame/PRE_BUILD
new file mode 100755
index 0000000000..2ae0bf34e5
--- /dev/null
+++ b/python-pypi/pygame/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/pygame-v4l.patch
diff --git a/python-pypi/pygame/pygame-v4l.patch b/python-pypi/pygame/pygame-v4l.patch
new file mode 100644
index 0000000000..3b5a2b9d2b
--- /dev/null
+++ b/python-pypi/pygame/pygame-v4l.patch
@@ -0,0 +1,88 @@
+diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
+*** pygame-1.9.1release/Setup.in Thu Jul 2 06:41:56 2009
+--- pygame-1.9.1release-v4lpatch//Setup.in Thu Mar 24 17:31:22 2011
+***************
+*** 34,40 ****
+ _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+ movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+ scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+ pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+
+ GFX = src/SDL_gfx/SDL_gfxPrimitives.c
+--- 34,40 ----
+ _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+ movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+ scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
+ pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+
+ GFX = src/SDL_gfx/SDL_gfxPrimitives.c
+diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
+*** pygame-1.9.1release/src/_camera.c Sun Mar 15 20:30:41 2009
+--- pygame-1.9.1release-v4lpatch//src/_camera.c Thu Mar 24 16:58:18 2011
+***************
+*** 160,179 ****
+ {
+ #if defined(__unix__)
+ if (v4l2_open_device(self) == 0) {
+! if (v4l_open_device(self) == 0) {
+! v4l2_close_device(self);
+! return NULL;
+! } else {
+! self->camera_type = CAM_V4L;
+! if (v4l_init_device(self) == 0) {
+! v4l2_close_device(self);
+! return NULL;
+! }
+! if (v4l_start_capturing(self) == 0) {
+! v4l2_close_device(self);
+! return NULL;
+! }
+! }
+ } else {
+ self->camera_type = CAM_V4L2;
+ if (v4l2_init_device(self) == 0) {
+--- 160,167 ----
+ {
+ #if defined(__unix__)
+ if (v4l2_open_device(self) == 0) {
+! v4l2_close_device(self);
+! return NULL;
+ } else {
+ self->camera_type = CAM_V4L2;
+ if (v4l2_init_device(self) == 0) {
+diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
+*** pygame-1.9.1release/src/camera.h Fri Oct 10 04:37:10 2008
+--- pygame-1.9.1release-v4lpatch//src/camera.h Thu Mar 24 16:44:32 2011
+***************
+*** 39,45 ****
+
+ #include <asm/types.h> /* for videodev2.h */
+
+- #include <linux/videodev.h>
+ #include <linux/videodev2.h>
+ #endif
+
+--- 39,44 ----
+***************
+*** 51,57 ****
+ #define RGB_OUT 1
+ #define YUV_OUT 2
+ #define HSV_OUT 4
+- #define CAM_V4L 1
+ #define CAM_V4L2 2
+
+ struct buffer
+--- 50,55 ----
+***************
+*** 111,118 ****
+ int v4l2_close_device (PyCameraObject* self);
+ int v4l2_open_device (PyCameraObject* self);
+
+- /* internal functions specific to v4l */
+- int v4l_open_device (PyCameraObject* self);
+- int v4l_init_device(PyCameraObject* self);
+- int v4l_start_capturing(PyCameraObject* self);
+ #endif
+--- 109,112 ----
diff --git a/python-pypi/python-ldap/DEPENDS b/python-pypi/python-ldap/DEPENDS
index 9960b58d0b..aedea46424 100755
--- a/python-pypi/python-ldap/DEPENDS
+++ b/python-pypi/python-ldap/DEPENDS
@@ -1,5 +1,8 @@
depends python &&
depends openldap &&
-optional_depends LIBSASL "" "" "for SASL support" &&
+if is_depends_enabled openldap cyrus-sasl; then
+ optional_depends LIBSASL "" "" "for SASL support"
+fi &&
+
optional_depends openssl "" "" "for encrypted communications"
diff --git a/python-pypi/python-ldap/DETAILS b/python-pypi/python-ldap/DETAILS
index 2652997466..90e30bf47b 100755
--- a/python-pypi/python-ldap/DETAILS
+++ b/python-pypi/python-ldap/DETAILS
@@ -1,11 +1,11 @@
SPELL=python-ldap
- VERSION=2.4.3
- SOURCE_HASH=sha512:30addd6e0985a0962cb254643411c666430f0fb6353a33bf7cdfaabd0e86076871da1ac3269c4dd7373cbe5dd3a658652307895ec61ab9891593004b4d6edadd
+ VERSION=2.4.7
+ SOURCE_HASH=sha512:acb10be5ad1a654096018d488c9c6bf252668daae971881665e6ab15f03ad8d761b2602ebff2eb44e010d1ba028d023556f5dcd1ffcc39dd916b9e9095ed2feb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
LICENSE[0]=PYTHON
- WEB_SITE=http://python-ldap.sourceforge.net/
+ WEB_SITE=http://www.python-ldap.org/
ENTERED=20020416
SHORT="Python interface to LDAP"
cat << EOF
diff --git a/python-pypi/python-ldap/HISTORY b/python-pypi/python-ldap/HISTORY
index 0a27af4c28..01404b543d 100644
--- a/python-pypi/python-ldap/HISTORY
+++ b/python-pypi/python-ldap/HISTORY
@@ -1,3 +1,8 @@
+2012-01-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.4.7; renewed website
+ * DEPENDS: corrected dependencies
+ * PRE_BUILD: reimplemented defines' selection
+
2011-07-23 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 2.4.3
diff --git a/python-pypi/python-ldap/PRE_BUILD b/python-pypi/python-ldap/PRE_BUILD
index bea747c09a..9ad426d1fb 100755
--- a/python-pypi/python-ldap/PRE_BUILD
+++ b/python-pypi/python-ldap/PRE_BUILD
@@ -1,11 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-if ! is_depends_enabled $SPELL cyrus-sasl; then
- sed -i "s:sasl2 ::" setup.cfg
+if ! is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL); then
+ sedit "s: HAVE_SASL::" setup.cfg
fi &&
-sed -i "s|^\(library_dirs[[:space:]]*=\).*$|\1 /usr/lib /usr/lib/sasl2|" \
- setup.cfg &&
-sed -i "s|^\(include_dirs[[:space:]]*=\).*$|\1 /usr/include /usr/include/sasl|" \
- setup.cfg
+if ! is_depends_enabled $SPELL openssl; then
+ sedit "s: HAVE_TLS::" setup.cfg
+fi
diff --git a/smgl/upstart/DETAILS b/smgl/upstart/DETAILS
index e601825d5c..e4aa4405e7 100755
--- a/smgl/upstart/DETAILS
+++ b/smgl/upstart/DETAILS
@@ -1,15 +1,19 @@
SPELL=upstart
- VERSION=0.6.7
+ VERSION=1.4
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:789b66eef67d98e320ae859cb1ee157f86d675adb5cebff5db2eb50a172045925d2a39833c5ae3a5885a6a9ad753fe63bc0ff624e0785075cb952d05ef7bbe09
- SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION:0:3}/${SOURCE}
+ SOURCE2=${SOURCE}.asc
+ SOURCE_URL[0]=http://upstart.ubuntu.com/download/${VERSION}/${SOURCE}
+# SOURCE_URL[0]=http://launchpad.net/upstart/1.x/${VERSION}/+download/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE2_IGNORE=signature
+ SOURCE_GPG=upstart.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://upstart.ubuntu.com
ENTERED=20080113
LICENSE[0]=GPL
SHORT="init system"
cat << EOF
-upstart is a replacement for the /sbin/init daemon which handles starting
-of tasks and services during boot,
-stopping them during shutdown and supervising them while the system is running.
+upstart is a replacement for the /sbin/init daemon which handles starting of
+tasks and services during boot, stopping them during shutdown and supervising
+them while the system is running.
EOF
diff --git a/smgl/upstart/HISTORY b/smgl/upstart/HISTORY
index 02aa917a39..6badb02ccc 100644
--- a/smgl/upstart/HISTORY
+++ b/smgl/upstart/HISTORY
@@ -1,5 +1,11 @@
-2011-10-14 Bor Kraljič <pyrobor@ver.si>
- * DETAILS: fixed long description wrap (scripted)
+2012-01-17 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: version 1.4
+ * PRE_BUILD: fixed removal of sysv-compat jobs
+ * upstart.gpg: added another key they use for releases
+
+2011-11-10 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: version 1.2, long description <80 col
+ switched to upstream gpg checking
2011-03-30 Arjan Bouter <abouter@sourcemage.org>
* DETAILS: version 0.6.7
diff --git a/smgl/upstart/PRE_BUILD b/smgl/upstart/PRE_BUILD
index bbb1de0c39..dfcbe6d6be 100755
--- a/smgl/upstart/PRE_BUILD
+++ b/smgl/upstart/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-sedit 's/util conf doc/util doc/' Makefile.in
+sedit 's/ conf / /' Makefile.in
diff --git a/smgl/upstart/upstart.gpg b/smgl/upstart/upstart.gpg
new file mode 100644
index 0000000000..765a46dbb9
--- /dev/null
+++ b/smgl/upstart/upstart.gpg
Binary files differ
diff --git a/utils/convmv/DEPENDS b/utils/convmv/DEPENDS
index 6826bc7952..3e1a5485a0 100755
--- a/utils/convmv/DEPENDS
+++ b/utils/convmv/DEPENDS
@@ -1 +1 @@
-depends perl
+depends podlators
diff --git a/utils/convmv/HISTORY b/utils/convmv/HISTORY
index bdae4d0d47..653e2d140e 100644
--- a/utils/convmv/HISTORY
+++ b/utils/convmv/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: changed dependency from perl to podlators
+
2009-04-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: updated to 1.14
diff --git a/utils/notification-daemon/DEPENDS b/utils/notification-daemon/DEPENDS
index c97d4bbf4a..712ab08c47 100755
--- a/utils/notification-daemon/DEPENDS
+++ b/utils/notification-daemon/DEPENDS
@@ -1,4 +1,5 @@
-depends gtk+2 &&
+depends gtk+3 &&
+depends -sub GTK3 libcanberra &&
depends dbus-glib &&
depends libsexy &&
depends gconf2 &&
diff --git a/utils/notification-daemon/HISTORY b/utils/notification-daemon/HISTORY
index b3b5569dff..b8e1050620 100644
--- a/utils/notification-daemon/HISTORY
+++ b/utils/notification-daemon/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on libcanberra with activated gtk+3
+
2011-10-18 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.7.3
diff --git a/utils/ntp/DEPENDS b/utils/ntp/DEPENDS
index 80847c1ead..cebfbec84c 100755
--- a/utils/ntp/DEPENDS
+++ b/utils/ntp/DEPENDS
@@ -11,4 +11,8 @@ optional_depends mdnsresponder \
optional_depends w3c-libwww \
"" "" \
- "for MD5 functions"
+ "for MD5 functions" &&
+
+optional_depends net-snmp \
+ "--with-ntpsnmpd" "--without-ntpsnmpd" \
+ "for snmp support"
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 2564cdea59..1649c37309 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,6 @@
+2012-01-17 Arjan Bouter <abouter@sourcemage.org>
+ * DEPENDS: added missing optional dep on net-snmp
+
2012-01-05 Julien "_kaze_" ROZO <julien@rozo.org>
* DETAILS: updated version to 4.2.6p5
diff --git a/utils/pciutils/DETAILS b/utils/pciutils/DETAILS
index 61b03fab60..985a6525de 100755
--- a/utils/pciutils/DETAILS
+++ b/utils/pciutils/DETAILS
@@ -1,6 +1,6 @@
SPELL=pciutils
- VERSION=3.1.8
- SOURCE_HASH=sha512:ec81bad10d84fc7a906e78323a896d4014c014e7678b190775f56b4c88768a5423af5825e06c90e544b3f693f4a611310c82e6b9b5a44943f2a7b004f4640142
+ VERSION=3.1.9
+ SOURCE_HASH=sha512:9e15ae5743bfbdaeb73d02c237d2632ee31f36be3efa5c26688473d2720157ca728384d98a06738eacab0d9a160641a22d53422d0a5d507d9779e0517e18bffb
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$SOURCE
diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index de42e60422..c0f6a19e35 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 3.1.9
+
2011-10-27 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.1.8
diff --git a/utils/smem/BUILD b/utils/smem/BUILD
new file mode 100755
index 0000000000..127985571b
--- /dev/null
+++ b/utils/smem/BUILD
@@ -0,0 +1 @@
+gcc $CFLAGS $LDFLAGS -o smemcap smemcap.c
diff --git a/utils/smem/DEPENDS b/utils/smem/DEPENDS
new file mode 100755
index 0000000000..857f1db007
--- /dev/null
+++ b/utils/smem/DEPENDS
@@ -0,0 +1,3 @@
+runtime_depends python &&
+
+suggest_depends matplotlib "" "" "for chart generation"
diff --git a/utils/smem/DETAILS b/utils/smem/DETAILS
new file mode 100755
index 0000000000..abd903167f
--- /dev/null
+++ b/utils/smem/DETAILS
@@ -0,0 +1,34 @@
+ SPELL=smem
+ VERSION=1.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://www.selenic.com/smem/download/$SOURCE
+ SOURCE_HASH=sha512:f7589f5ec87f79768f67b87d1640e9264bff3faf04b938ebb2029c47678e7e00ce3d93f74b3f62c0919176867d00f15f9a0b2d64fb1ec605c7a76f24f9029512
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.selenic.com/smem/
+ DOCS="COPYING"
+ LICENSE[0]=GPL
+ ENTERED=20120114
+ SHORT="tool for meaningful memory reporting"
+cat << EOF
+smem is a tool that can give numerous reports on memory usage on Linux systems.
+Unlike existing tools, smem can report proportional set size (PSS), which is a
+more meaningful representation of the amount of memory used by libraries and
+applications in a virtual memory system.
+
+Because large portions of physical memory are typically shared among multiple
+applications, the standard measure of memory usage known as resident set size
+(RSS) will significantly overestimate memory usage. PSS instead measures each
+application's "fair share" of each shared area to give a realistic measure.
+
+smem has many features:
+ * system overview listing
+ * listings by process, mapping, user
+ * filtering by process, mapping, or user
+ * configurable columns from multiple data sources
+ * configurable output units and percentages
+ * configurable headers and totals
+ * reading live data from /proc
+ * reading data snapshots from directory mirrors or compressed tarballs
+ * lightweight capture tool for embedded systems
+ * built-in chart generation
+EOF
diff --git a/utils/smem/HISTORY b/utils/smem/HISTORY
new file mode 100644
index 0000000000..52003a650b
--- /dev/null
+++ b/utils/smem/HISTORY
@@ -0,0 +1,2 @@
+2012-01-14 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL: spell created
diff --git a/utils/smem/INSTALL b/utils/smem/INSTALL
new file mode 100755
index 0000000000..deb94c92f2
--- /dev/null
+++ b/utils/smem/INSTALL
@@ -0,0 +1,4 @@
+install -vm 755 smem smemcap "$INSTALL_ROOT/usr/bin" &&
+
+install -vm 755 -d "$INSTALL_ROOT/usr/share/man/man8" &&
+install -vm 644 smem.8 "$INSTALL_ROOT/usr/share/man/man8"
diff --git a/utils/stow/DETAILS b/utils/stow/DETAILS
index 54c114d0d4..0bdb165557 100755
--- a/utils/stow/DETAILS
+++ b/utils/stow/DETAILS
@@ -1,13 +1,12 @@
SPELL=stow
- VERSION=1.3.3
+ VERSION=2.1.3
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_HASH=sha512:27b5b4b89f22ba644a6dcece2b36b57feab392eb9702dc0e5659cecfd034f8ece21de1628027d3d717e9f663859e3ce0b174b90e6ac0363218918e330dccda6f
+ SOURCE_HASH=sha512:cbc2abd534484f24d403062b2dac656d9cba2a3b36eea9b7d3715a06cd7a0f468cb0a656322bbc6d36feb2aa8e05f3afe29c571f85900fe39c78f0d8f873aab6
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNU_URL/stow/$SOURCE
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$SPELL/$SOURCE
WEB_SITE=http://www.gnu.org/software/stow
ENTERED=20010922
- UPDATED=20020107
KEYWORDS="utils"
SHORT="stow manages the installation of software packages."
cat << EOF
diff --git a/utils/stow/HISTORY b/utils/stow/HISTORY
index e938aef3a4..9115c6aed6 100644
--- a/utils/stow/HISTORY
+++ b/utils/stow/HISTORY
@@ -1,3 +1,6 @@
+2012-01-16 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.1.3
+
2006-06-28 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=2, set grimoire-wide
diff --git a/utils/util-linux/DETAILS b/utils/util-linux/DETAILS
index aa1b6219a0..48d0ef8351 100755
--- a/utils/util-linux/DETAILS
+++ b/utils/util-linux/DETAILS
@@ -1,8 +1,8 @@
SPELL=util-linux
if [[ $UL_VERSION == aes ]]; then
- VERSION=2.19.1
+ VERSION=2.20
SECURITY_PATCH=2
- SOURCE3=$SPELL-$VERSION-20110510.diff.bz2
+ SOURCE3=$SPELL-$VERSION-20110905.diff.bz2
SOURCE4=$SOURCE3.sign
SOURCE3_URL[0]=http://loop-aes.sourceforge.net/updates/$SOURCE3
SOURCE3_URL[1]=http://koti.tnnet.fi/jari.ruusu/linux/$SOURCE3
@@ -11,16 +11,17 @@ if [[ $UL_VERSION == aes ]]; then
SOURCE3_GPG=loop-AES.gpg:$SOURCE4:UPSTREAM_KEY
SOURCE4_IGNORE=signature
else
- VERSION=2.19.1
+ VERSION=2.20.1
SECURITY_PATCH=2
fi
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SOURCE.sign
+ SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/v$BRANCH/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sign
- SOURCE_GPG=kernel.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_URL[0]=ftp://ftp.infradead.org/pub/util-linux/v$BRANCH/$SOURCE
+# SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/$SPELL/v$BRANCH/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.asc
+ SOURCE_GPG=util-linux.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
WEB_SITE=http://userweb.kernel.org/~kzak/util-linux-ng/
ENTERED=20010922
diff --git a/utils/util-linux/FINAL b/utils/util-linux/FINAL
index 3d4d117a26..7ebc1687b7 100755
--- a/utils/util-linux/FINAL
+++ b/utils/util-linux/FINAL
@@ -1,3 +1,12 @@
+# util-linux 2.20 needs ttyX in /etc/inittab without /dev
+# http://www.sourcemage.org/issues/110
+if [ "${VERSION:0:4}" == "2.20" ] && [ "${OLD_SPELL_VERSION:0:4}" == "2.19" ]; then
+ message "New version of util-linux needs to update /etc/inittab ..." &&
+ cp $INSTALL_ROOT/etc/inittab $INSTALL_ROOT/etc/inittab-$(date +'%Y%m%d%H%M') &&
+ sed -i "s:/dev/tty:tty:" $INSTALL_ROOT/etc/inittab &&
+ message "Updated"
+fi &&
+
if test -f "$INSTALL_ROOT/etc/sysconfig/hwclock" && [[ $UTC ]]; then
sed -i "s/^UTC=.*$/UTC=$UTC/" "$INSTALL_ROOT/etc/sysconfig/hwclock"
fi
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 052d3a489b..bacd50d3ab 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,16 @@
+2012-01-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated aes version to 2.20; updated aes patch to 20110905
+
+2012-01-13 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.20.1, SOURCE_URL[0] updated, sign -> asc
+ * util-linux.gpg: added with key EC39C284 (Karel Zak <kzak@redhat.com>)
+ http://www.spinics.net/lists/util-linux-ng/msg05331.html
+ http://people.redhat.com/kzak/README.html
+ * PRE_BUILD, FINAL: /etc/inittab updated for util-linux 2.20, #110
+
+2011-08-30 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.20
+
2011-05-13 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated aes version to 2.19.1 (security); updated aes patch
to 20110510
diff --git a/utils/util-linux/PRE_BUILD b/utils/util-linux/PRE_BUILD
index 5757181be3..56366db5b9 100755
--- a/utils/util-linux/PRE_BUILD
+++ b/utils/util-linux/PRE_BUILD
@@ -3,4 +3,8 @@ cd "$SOURCE_DIRECTORY" &&
if [[ $UL_VERSION == aes ]]; then
bzcat "$SOURCE_CACHE/$SOURCE3" | patch -p1
-fi
+fi &&
+
+# OLD_SPELL_VERSION is needed in FINAL
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
diff --git a/utils/util-linux/util-linux.gpg b/utils/util-linux/util-linux.gpg
new file mode 100644
index 0000000000..8627b8b7cc
--- /dev/null
+++ b/utils/util-linux/util-linux.gpg
Binary files differ
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 994a97305f..7db904c386 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,10 +1,10 @@
SPELL=youtube-dl
- VERSION=2011.08.04
+ VERSION=2012.01.08b
SOURCE=$SPELL
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://github.com/rg3/youtube-dl/raw/$VERSION/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
- SOURCE_HASH=sha512:4a8e0428a9cb6226295fcc111130804136b070f35fdd8f0000284250e8ff1cc43958cd22d8da601102751d934653b2089cffb94795d6a9a484f4391797321056
+ SOURCE_HASH=sha512:c5394f60df62466ab400bf73fdb94f803ab4c83df93d18cde2c3882d5e9027d4832802e21b664f16d283881604e649d76a0a8fe0f12ea672739a67874071d08a
FORCE_DOWNLOAD=on
LICENSE[0]=BSD
KEYWORDS="utils"
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index ed38779219..f821197a0c 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2012.01.08b
+
2011-08-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2011.08.04
diff --git a/video-libs/gst-plugins-bad/HISTORY b/video-libs/gst-plugins-bad/HISTORY
index 180fc4a92c..a3e3e28667 100644
--- a/video-libs/gst-plugins-bad/HISTORY
+++ b/video-libs/gst-plugins-bad/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Robin Cook <rcook@wyrms.net>
+ * PRE_BUILD: added to apply patch so will build with update mjpegtools
+
2011-05-12 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.10.22
diff --git a/video-libs/gst-plugins-bad/PRE_BUILD b/video-libs/gst-plugins-bad/PRE_BUILD
new file mode 100755
index 0000000000..99990668ea
--- /dev/null
+++ b/video-libs/gst-plugins-bad/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SCRIPT_DIRECTORY/mjpegtools-fix.patch
diff --git a/video-libs/gst-plugins-bad/mjpegtools-fix.patch b/video-libs/gst-plugins-bad/mjpegtools-fix.patch
new file mode 100644
index 0000000000..de5460cdc5
--- /dev/null
+++ b/video-libs/gst-plugins-bad/mjpegtools-fix.patch
@@ -0,0 +1,15 @@
+diff -ur gst-plugins-bad-0.10.22/ext/mpeg2enc/gstmpeg2encoder.cc gst-plugins-bad-mod/ext/mpeg2enc/gstmpeg2encoder.cc
+--- gst-plugins-bad-0.10.22/ext/mpeg2enc/gstmpeg2encoder.cc 2010-04-29 03:59:29.000000000 -0500
++++ gst-plugins-bad-mod/ext/mpeg2enc/gstmpeg2encoder.cc 2012-01-13 16:46:44.177259807 -0600
+@@ -27,9 +27,8 @@
+ #include <mpegconsts.h>
+ #include <quantize.hh>
+ #if GST_MJPEGTOOLS_API >= 10900
+-#include <ontheflyratectl.hh>
+-#include <pass1ratectl.hh>
+-#include <pass2ratectl.hh>
++#include <ontheflyratectlpass1.hh>
++#include <ontheflyratectlpass2.hh>
+ #else
+ #include <ratectl.hh>
+ #endif
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index c2060b5c77..5a47e7277c 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,10 +1,10 @@
SPELL=ffmpeg
- VERSION=0.7.10
- SECURITY_PATCH=9
+ VERSION=0.7.11
+ SECURITY_PATCH=10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
- SOURCE_HASH=sha512:73d54f41b3f20450ea98010de433eea5f8be5805754795291c81b70c778fa7a02a7ed3ed92a5febf72c3ee8d19c20c3a1aa93889c692fdee5cbbf20e5c49bd9b
+ SOURCE_HASH=sha512:2078e13d40d660a85540349681c7a9a8d2648812167775c2d28cd1be3e29eb34aae944e18e1c798e4cf52f631737af1831eb508634e47e6ae0dee5c0cf9fe0fa
#case $FFAMR in
# none);;
# *)
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index c01102b7fb..b4687aa9f0 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.7.11, SECURITY_PATCH=10
+
2012-01-05 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.7.10
diff --git a/video/lives/DETAILS b/video/lives/DETAILS
index 7f8d30f424..ee2fa57681 100755
--- a/video/lives/DETAILS
+++ b/video/lives/DETAILS
@@ -1,6 +1,6 @@
SPELL=lives
- VERSION=1.0.10
- SOURCE_HASH=sha512:564d3efcce4e7803f0d8cc9828177ef6c1a28976babc5f62767951387bcd28742f91ede959c98a863ee0d1c7ef0feb2406bae07f4e53f7f0ac7704061a05c12a
+ VERSION=1.6.0
+ SOURCE_HASH=sha512:020ec26b58fccd39c0cfd83354aab562343d908891d8f4c97c14d9280b89ec0a95e2bc335381a8d7c62dc5ebd873ef36311fcb4ce19af2cb31a66f5c95aded05
SOURCE=LiVES-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/lives-$VERSION
SOURCE_URL[0]=http://www.xs4all.nl/%7Esalsaman/lives/current/$SOURCE
diff --git a/video/lives/HISTORY b/video/lives/HISTORY
index fc263f1423..072e433f79 100644
--- a/video/lives/HISTORY
+++ b/video/lives/HISTORY
@@ -1,3 +1,6 @@
+2012-01-19 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 1.6.0
+
2011-04-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.10
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 593ba3f0bd..1ec7c95b8d 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,6 @@
+2012-01-11 Arjan Bouter <abouter@sourcemage.org>
+ * PRE_BUILD: added to fix glib2 include
+
2011-12-17 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: lua -> lua51
diff --git a/windowmanagers/awesome/PRE_BUILD b/windowmanagers/awesome/PRE_BUILD
new file mode 100755
index 0000000000..0a1261e8af
--- /dev/null
+++ b/windowmanagers/awesome/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#glib/gspawn.h#glib-2.0/glib.h#' spawn.c
diff --git a/windowmanagers/blackbox/DEPENDS b/windowmanagers/blackbox/DEPENDS
index d381d56a9f..ff5c67f4e8 100755
--- a/windowmanagers/blackbox/DEPENDS
+++ b/windowmanagers/blackbox/DEPENDS
@@ -1,5 +1,5 @@
depends xorg-libs &&
-if [[ ${BLACKBOX_BRANCH == scm ]]; then
+if [[ $BLACKBOX_BRANCH == scm ]]; then
depends libtool &&
depends automake
fi &&
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index 2a578973b1..256a4ba3c0 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed { which prevented the spell from being built
+
2011-09-20 Ismael Luceno <ismael@sourcemage.org>
* BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
diff --git a/wm-addons/light-monitor/BUILD b/wm-addons/light-monitor/BUILD
new file mode 100755
index 0000000000..6dfecc1f8a
--- /dev/null
+++ b/wm-addons/light-monitor/BUILD
@@ -0,0 +1 @@
+default_build_make
diff --git a/wm-addons/light-monitor/DEPENDS b/wm-addons/light-monitor/DEPENDS
new file mode 100755
index 0000000000..9450630ce6
--- /dev/null
+++ b/wm-addons/light-monitor/DEPENDS
@@ -0,0 +1,3 @@
+depends libx11 &&
+depends libxft &&
+depends libxpm
diff --git a/wm-addons/light-monitor/DETAILS b/wm-addons/light-monitor/DETAILS
new file mode 100755
index 0000000000..769cbbb2a9
--- /dev/null
+++ b/wm-addons/light-monitor/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=light-monitor
+ VERSION=
+ SOURCE="${SPELL}-v1.7.tgz"
+ SOURCE_URL[0]=http://www.dixsous.org/media/download/${SOURCE}
+ SOURCE_HASH=sha512:acab08a00f2c91ee693a8751000710a9f86e265d5806d71e0ec73a19e4e3a4014d668f053f45ae7bcafdbd0dfd0ba291ffe2391fcfd1c73a3aef9d980da350b0
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-v1.7"
+ WEB_SITE="http://www.dixsous.org/Light-monitor"
+ LICENSE[0]=GPL
+ ENTERED=20120115
+ SHORT="a transparent panel for window managers without their own panel"
+cat << EOF
+light-monitor is a transparent panel with dependency only on X and Xft for
+40Ko. It is distributed under the license GPLv2.
+
+Those two programs are written to consume the lowest possible resources. Used
+with sawfish, you can have an incredible low resources consumption for
+the desktop.
+
+light-monitor is base on widgets to display the state of the computer (a la
+gtkrellm). Current widgets are:
+
+* vol Manages the volume (pcm and vol). To change the current volume just
+ clic on it or use the mouse-wheel.
+* cpufreq Manages the scaling_governor : blue means powersave, blue and
+ green means ondemand, and blue green and red stands for performance. To
+ change to the next one, just clic on the processor
+* load Shows the current load on the system and the processor temperature
+
+* time Shows the time * date Shows the date * network Shows the cumulative
+bandwidth over all network interfaces except lo.
+ It is hidden if current upload and download are null
+* ac Shows if the power supply is plugged for laptop * battery Shows the
+current percentage of remaining charge in the battery if it
+ is not full. IF ac is unplugged, it shows an estimation of the remaining
+ time too.
+EOF
diff --git a/wm-addons/light-monitor/HISTORY b/wm-addons/light-monitor/HISTORY
new file mode 100644
index 0000000000..d6f64281b1
--- /dev/null
+++ b/wm-addons/light-monitor/HISTORY
@@ -0,0 +1,3 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, makefile.patch, PRE_BUILD: spell created
+
diff --git a/wm-addons/light-monitor/PRE_BUILD b/wm-addons/light-monitor/PRE_BUILD
new file mode 100755
index 0000000000..356a6c7358
--- /dev/null
+++ b/wm-addons/light-monitor/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/makefile.patch
diff --git a/wm-addons/light-monitor/makefile.patch b/wm-addons/light-monitor/makefile.patch
new file mode 100644
index 0000000000..b2101e962e
--- /dev/null
+++ b/wm-addons/light-monitor/makefile.patch
@@ -0,0 +1,66 @@
+--- light-monitor-v1.7/makefile.orig 2012-01-15 11:30:36.602147571 +0100
++++ light-monitor-v1.7/makefile 2012-01-15 11:37:31.402732926 +0100
+@@ -1,44 +1,41 @@
+ DEST=light-monitor-v1.7
+ all : light-monitor light-calendar
+
+-OPTS=-O2 -Wall
+-#OPTS=-g -Wall #-DDEBUG
+-
+-XFTCFLAGS=`xft-config --cflags`
+-XFTLIBS=`xft-config --libs`
++XFTCFLAGS=`pkg-config --cflags xft`
++XFTLIBS=`pkg-config --libs xft`
+
+ ##########################################################
+
+ OBJ=light-monitor.o captor.o calendar.o gosd.o
+
+ light-monitor: ${OBJ}
+- gcc ${OBJ} ${XFTLIBS} -lXpm -o light-monitor
++ gcc ${LDFLAGS} ${OBJ} ${XFTLIBS} -lXpm -o light-monitor
+
+ ##########################################################
+
+ OBJ2=light-calendar.o gosd.o calendar.o
+
+ light-calendar: ${OBJ2}
+- gcc ${OBJ2} -o light-calendar ${XFTLIBS}
++ gcc ${LDFLAGS} ${OBJ2} -o light-calendar ${XFTLIBS}
+
+ ##########################################################
+ TOOLS=gosd.h toolbox.h
+ GFX=next.xpm
+
+ light-calendar.o: light-calendar.c ${TOOLS}
+- gcc ${OPTS} ${XFTCFLAGS} -c light-calendar.c
++ gcc ${CFLAGS} ${XFTCFLAGS} -c light-calendar.c
+
+ gosd.o: gosd.c
+- gcc ${OPTS} ${XFTCFLAGS} -c gosd.c
++ gcc ${CFLAGS} ${XFTCFLAGS} -c gosd.c
+
+ light-monitor.o: light-monitor.c captor.h calendar.h ${TOOLS} ${GFX}
+- gcc ${OPTS} ${XFTCFLAGS} -c light-monitor.c
++ gcc ${CFLAGS} ${XFTCFLAGS} -c light-monitor.c
+
+ captor.o: captor.c
+- gcc ${OPTS} -c captor.c
++ gcc ${CFLAGS} -c captor.c
+
+ calendar.o: calendar.c
+- gcc ${OPTS} -c calendar.c
++ gcc ${CFLAGS} -c calendar.c
+
+ dist-clean:
+ rm -f *~ *.o light-monitor light-calendar
+@@ -57,6 +54,6 @@
+
+
+ install:
+- install -m 0755 -s light-monitor /usr/bin/
+- install -m 0755 -s light-calendar /usr/bin/
+- install -m 0644 light-monitor.conf /etc/
++ install -m 0755 -s light-monitor ${DESTDIR}/usr/bin/
++ install -m 0755 -s light-calendar ${DESTDIR}/usr/bin/
++ install -m 0644 light-monitor.conf ${DESTDIR}/etc/
diff --git a/wm-addons/netwmpager/BUILD b/wm-addons/netwmpager/BUILD
new file mode 100755
index 0000000000..5b1fe93ee4
--- /dev/null
+++ b/wm-addons/netwmpager/BUILD
@@ -0,0 +1,2 @@
+./configure --prefix=${INSTALL_ROOT}/usr &&
+default_build_make
diff --git a/wm-addons/netwmpager/DEPENDS b/wm-addons/netwmpager/DEPENDS
new file mode 100755
index 0000000000..652314694b
--- /dev/null
+++ b/wm-addons/netwmpager/DEPENDS
@@ -0,0 +1,2 @@
+depends libx11 &&
+depends libxft
diff --git a/wm-addons/netwmpager/DETAILS b/wm-addons/netwmpager/DETAILS
new file mode 100755
index 0000000000..cb6ecbfdf6
--- /dev/null
+++ b/wm-addons/netwmpager/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=netwmpager
+ VERSION=2.03
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/sf-xpaint/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:55c933677974443c321dec32c467b637a3a599a89e4acd7e27e3b8a5cb6e765ed8ac71a40f042f1ec6ab1ac9592537d725b226574f9a9cd45d3af01574d0a108
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://freecode.com/projects/netwmpager"
+ LICENSE[0]=GPL
+ ENTERED=20120115
+ SHORT="an EWMH compliant pager"
+cat << EOF
+netwmpager is an enhanced version of the original netwmpager-1.11 program
+written around 2005 by Timo Hirvonen. It should be compliant with the EWMH
+(or NetWM) specifications. This version implements virtual desktops split into
+different viewports, into different desks, or both, while the earlier version
+only supported desks. As a consequence, netwmpager-2 should work with most
+window managers; it has been tested especially with compiz, fluxbox, and fvwm.
+It also has many parametrizable features, and it implements a convenient zoom.
+EOF
diff --git a/wm-addons/netwmpager/HISTORY b/wm-addons/netwmpager/HISTORY
new file mode 100644
index 0000000000..18a2014f52
--- /dev/null
+++ b/wm-addons/netwmpager/HISTORY
@@ -0,0 +1,4 @@
+2012-01-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * BUILD, DETAILS: spell created
+ * DEPENDS: added dependencies on libx11 and libxft
+
diff --git a/wm-addons/xmobar/DETAILS b/wm-addons/xmobar/DETAILS
index 61dfa0a998..b3aa73035f 100755
--- a/wm-addons/xmobar/DETAILS
+++ b/wm-addons/xmobar/DETAILS
@@ -1,8 +1,8 @@
SPELL=xmobar
- VERSION=0.12
+ VERSION=0.14
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
- SOURCE_HASH=sha512:bcdbbdae17d0e07f63e3c2dc2dd22fe381f6456f6327ac51c93de8ddf6863db31ba6c2a2deed2b8a6048c22eaf19152aad3c08c35c7ac0430b5ae1c3df1d8cec
+ SOURCE_HASH=sha512:ee6037052a066f1e4366f0b528ca3557a7fa6950a58e6bc310bff20d38c8f9de7a44faf739bc362dafd3e9a0d4da5e064c38d0f008860421aa33212f37ea9f65
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gorgias.mine.nu/xmobar/"
LICENSE[0]=BSD3
diff --git a/wm-addons/xmobar/HISTORY b/wm-addons/xmobar/HISTORY
index bce403b5bd..5eab295079 100644
--- a/wm-addons/xmobar/HISTORY
+++ b/wm-addons/xmobar/HISTORY
@@ -1,3 +1,6 @@
+2012-01-14 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.14
+
2010-12-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, BUILD: added optional dependency on haskell-x11-xft
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f46c4b62ef..2d3ecd975d 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2012-01-13 Eric Sandall <sandalle@sourcemage.org>
+ * SUB_DEPENDS: Remove prior TEE entries in CAIRO_OPTS to keep the list sane
+ Override any other entries in CAIRO_OPTS when doing a sub-dependency
+
2011-07-25 Vlad Glagolev <stealth@sourcemage.org>
* BUILD, CONFIGURE, {{REPAIR^all^,}PRE_,}SUB_DEPENDS: simplified tee
backend selection
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 8fe658ff13..328686715e 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -12,7 +12,9 @@ case $THIS_SUB_DEPENDS in
X) message "Cairo with Xlib support requested, forcing libx11 dependency" &&
depends libx11 "--enable-xlib";;
TEE) message "Cairo with tee backend request, forcing it" &&
- CAIRO_OPTS="--enable-tee=yes $CAIRO_OPTS" ;;
+ list_remove CAIRO_OPTS '--enable-tee=no' &&
+ list_remove CAIRO_OPTS '--enable-tee=yes' &&
+ CAIRO_OPTS="$CAIRO_OPTS --enable-tee=yes" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 4da21de856..566b5df56b 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.3.36
+ VERSION=1.3.37
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index c378c5a7a3..dd9a10e091 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated devel to 1.3.37
+
2012-01-02 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated devel to 1.3.36
diff --git a/x11-toolkits/wxgtk-new/DETAILS b/x11-toolkits/wxgtk-new/DETAILS
index 933c10193f..c669a14d2c 100755
--- a/x11-toolkits/wxgtk-new/DETAILS
+++ b/x11-toolkits/wxgtk-new/DETAILS
@@ -1,8 +1,8 @@
SPELL=wxgtk-new
SPELLX=wxGTK
SPELLX=wxWidgets
- VERSION=2.9.2
- SOURCE_HASH=sha512:364169f5ca3552f9c0a33b0ae45af36927b128070a93cd80ab8d914660eb95c4066a089971191e31ac5a741fda1c5b878bef78f67ef43f22f4e6a8a476711af7
+ VERSION=2.9.3
+ SOURCE_HASH=sha512:f81d0b8f6b8964d2b98d630bdd14266fb69534eba6e613d2bb14451449097b84f98d841abc857cd3f0e228ec8bc300b1c1d01baa211be61babf04fcd1fe0bf91
SOURCE=$SPELLX-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index 00fb178525..573fe732e9 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.9.3
+
2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 694ea2ef53..0285a90d85 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -1,5 +1,3 @@
-depends gtk+3 "--with-gtk=3.0" &&
-
depends gnutls &&
depends -sub VAPIGEN vala &&
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index 7fcdbcff59..316a5232f3 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,10 +1,15 @@
+2012-01-19 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS, SUB_DEPENDS: Allow choice between gtk+2 (default) and gtk+3
+ Some apps require pythong bindings (e.g. virt-manager) which
+ do not build with gtk+3 selected.
+
2011-11-20 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: bz2 => xz
2011-11-11 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: updated spell to 0.4.4
bz2 => xz
- * DEPENDS: added depends vala with VAPIGEN
+ * DEPENDS: added depends vala with VAPIGEN
2011-07-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 0.4.3
diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS
index 6d312e2eb2..241941fd42 100755
--- a/x11/gtk-vnc/PRE_SUB_DEPENDS
+++ b/x11/gtk-vnc/PRE_SUB_DEPENDS
@@ -1,6 +1,8 @@
case $THIS_SUB_DEPENDS in
- PYTHON) is_depends_enabled $SPELL python && return 0
- ;;
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
esac
return 1
diff --git a/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..241941fd42
--- /dev/null
+++ b/x11/gtk-vnc/REPAIR^fa4f2fa4289ffc42c28cf63eb48ec61a^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+esac
+
+return 1
diff --git a/x11/gtk-vnc/SUB_DEPENDS b/x11/gtk-vnc/SUB_DEPENDS
index 474d20839e..e9d41db01e 100755
--- a/x11/gtk-vnc/SUB_DEPENDS
+++ b/x11/gtk-vnc/SUB_DEPENDS
@@ -1,6 +1,13 @@
case $THIS_SUB_DEPENDS in
- PYTHON) echo "python bindings requested, forcing them."
- depends python '--with-python'
+ PYTHON) echo "python bindings requested, forcing them." &&
+ depends python '--with-python' &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ GTK2) echo "gtk+2 bindings requested, forcing them." &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ GTK3) echo "gtk+3 bindings requested, forcing them." &&
+ depends gtk+3 '--with-gtk=3.0'
;;
*) echo "unknown sub-depends!"
return 1
diff --git a/x11/lightdm/DETAILS b/x11/lightdm/DETAILS
index 857d5f87dc..97bff7fdd2 100755
--- a/x11/lightdm/DETAILS
+++ b/x11/lightdm/DETAILS
@@ -1,8 +1,9 @@
SPELL=lightdm
- VERSION=1.0.6
+ VERSION=1.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_URL[0]=http://launchpad.net/${SPELL}/trunk/${VERSION}/+download/${SOURCE}
- SOURCE_HASH=sha512:6d0e6fe7e038e3c9200563e2baea684d8c675fb9e568d6d65f83fd512d2fa94fffbef785e882566487c3d83c6d493f0c1da14d0ed9bbb6dd617cbfac68fdfd2a
+# SOURCE_HASH=sha512:6d0e6fe7e038e3c9200563e2baea684d8c675fb9e568d6d65f83fd512d2fa94fffbef785e882566487c3d83c6d493f0c1da14d0ed9bbb6dd617cbfac68fdfd2a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://launchpad.net/lightdm"
LICENSE[0]=GPL3/LGPL3
diff --git a/x11/lightdm/HISTORY b/x11/lightdm/HISTORY
index f23bb146ae..cbeb8afbb5 100644
--- a/x11/lightdm/HISTORY
+++ b/x11/lightdm/HISTORY
@@ -1,3 +1,8 @@
+2012-01-12 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.1.0
+ * PRE_BUILD: Remove MOC files (need to be regenerated with qt 4.8)
+ Remove lightdm-session tests (missing)
+
2011-12-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* INSTALL: fixed typo that prevented the installation if pam
is used
diff --git a/x11/lightdm/PRE_BUILD b/x11/lightdm/PRE_BUILD
new file mode 100755
index 0000000000..7eb4e34058
--- /dev/null
+++ b/x11/lightdm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+find "${SOURCE_DIRECTORY}" -type f -iname '*moc*' -exec rm -f {} \; &&
+sed -i 's/.*lightdm-session//' "${SOURCE_DIRECTORY}"/tests/src/Makefile.*
diff --git a/x11/lightdm/lightdm-1.1.0.tar.gz.sig b/x11/lightdm/lightdm-1.1.0.tar.gz.sig
new file mode 100644
index 0000000000..0b6a0b7296
--- /dev/null
+++ b/x11/lightdm/lightdm-1.1.0.tar.gz.sig
Binary files differ
diff --git a/xfce/ristretto/DETAILS b/xfce/ristretto/DETAILS
index cf193f7b1b..73c3c8dd48 100755
--- a/xfce/ristretto/DETAILS
+++ b/xfce/ristretto/DETAILS
@@ -1,9 +1,9 @@
SPELL=ristretto
- VERSION=0.3.0
+ VERSION=0.3.2
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:8f0565e2d8f2a0ea9fb1edc455bdb1352a83c547d94989e68b7344f189f4b857813217e20cf09a9d2c464d98e5a8f8d243ef1d00a5b0c9556a2b602f690f1168
+ SOURCE_HASH=sha512:cf009e3b4429d58c305d2a17db886516a0faaf2bed3033657187cff44f9c9ceab7c485cf2ed08d4598794b06d333ccc0cefa24f8a8d5df284934e1f2dd5300f9
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://goodies.xfce.org/projects/applications/ristretto/
LICENSE[0]=GPL
diff --git a/xfce/ristretto/HISTORY b/xfce/ristretto/HISTORY
index dc413be0fb..c7de62f7d0 100644
--- a/xfce/ristretto/HISTORY
+++ b/xfce/ristretto/HISTORY
@@ -1,3 +1,6 @@
+2012-01-15 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.3.2
+
2011-12-03 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.3.0