Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (0b1cf78359b5752c2963c60b78dbd269924d1797)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (0b1cf78359b5752c2963c60b78dbd269924d1797)
  • Date: Sun, 18 Sep 2011 10:21:08 -0500

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

ChangeLog | 15 +++++
FUNCTIONS | 36
+++++++++++-
apache.gpg |binary
archive/bacula/BUILD | 2
archive/bacula/DEPENDS | 2
archive/bacula/DETAILS | 4 -
archive/bacula/HISTORY | 3 +
archive/bacula/PREPARE | 7 --
audio-drivers/oss/DETAILS | 2
audio-drivers/oss/HISTORY | 3 +
audio-drivers/pyalsa/DETAILS | 4 -
audio-drivers/pyalsa/HISTORY | 3 +
audio-drivers/pyalsa/PREPARE | 8 --
audio-libs/openal-soft/DEPENDS | 6 +-
audio-libs/openal-soft/HISTORY | 3 +
audio-players/qmmp/BUILD | 1
audio-players/qmmp/DEPENDS | 4 +
audio-players/qmmp/DETAILS | 15 +++++
audio-players/qmmp/HISTORY | 3 +
chat-im/choqok/DETAILS | 8 +-
chat-im/choqok/HISTORY | 4 +
chat-im/pidgin-encryption/DEPENDS | 2
chat-im/pidgin-encryption/DETAILS | 6 +-
chat-im/pidgin-encryption/HISTORY | 5 +
chat-im/pidgin-encryption/pidgin-encryption-3.0.tar.gz.sig | 0
chat-im/pidgin-encryption/pidgin-encryption-3.1.tar.gz.sig |binary
chat-irc/irssi/DEPENDS | 2
chat-irc/irssi/DETAILS | 10 +--
chat-irc/irssi/HISTORY | 3 +
chat-irc/irssi/PREPARE | 8 --
chat-irc/irssi/PRE_BUILD | 2
chat-libs/loudmouth/DEPENDS | 6 +-
chat-libs/loudmouth/HISTORY | 3 +
crypto/bcrypt/DETAILS | 6 +-
crypto/bcrypt/HISTORY | 3 +
crypto/gpa/DETAILS | 5 -
crypto/gpa/HISTORY | 3 +
crypto/gpa/PREPARE | 8 --
crypto/gpa/PRE_BUILD | 2
crypto/libssh/DETAILS | 10 ++-
crypto/libssh/HISTORY | 3 +
crypto/p11-kit/DETAILS | 2
crypto/p11-kit/HISTORY | 3 +
database/mongodb/BUILD | 3 +
database/mongodb/DEPENDS | 6 +-
database/mongodb/DETAILS | 4 -
database/mongodb/HISTORY | 24 ++++++--
database/mongodb/PRE_BUILD | 5 -
database/mongodb/jsscan.patch | 10 +++
database/mongodb/scons.patch | 21 -------
database/mongodb/sm185.patch.bz2 | 0
database/postgresql/FINAL | 2
database/postgresql/HISTORY | 3 +
dev/null |binary
devel/b43-tools/DETAILS | 2
devel/b43-tools/HISTORY | 3 +
devel/b43-tools/PREPARE | 4 -
devel/spidermonkey/DEPENDS | 2
devel/spidermonkey/HISTORY | 3 +
disk/udev/HISTORY | 3 +
disk/udev/REPAIR^all^PRE_SUB_DEPENDS | 10 ++-
disk/udev/REPAIR^all^SUB_DEPENDS | 9 +++
doc/dvipng/DETAILS | 4 -
doc/dvipng/HISTORY | 3 +
ftp-libs/rb-libtorrent/DETAILS | 4 -
ftp-libs/rb-libtorrent/HISTORY | 3 +
ftp/curl/DETAILS | 3 -
ftp/curl/HISTORY | 3 +
ftp/lftp/DETAILS | 2
ftp/lftp/HISTORY | 3 +
ftp/qbittorrent/DEPENDS | 3 -
ftp/qbittorrent/DETAILS | 4 -
ftp/qbittorrent/HISTORY | 4 +
ftp/wget/DETAILS | 6 +-
ftp/wget/HISTORY | 7 ++
ftp/wget/REPAIR^all^PRE_SUB_DEPENDS | 5 +
ftp/wget/REPAIR^none^PRE_SUB_DEPENDS | 5 -
gnome2-libs/clutter/DETAILS | 2
gnome2-libs/clutter/HISTORY | 3 +
gnome2-libs/clutter/clutter-1.6.16.tar.bz2.sig | 0
gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig |binary
gnome2-libs/libgee/DETAILS | 2
gnome2-libs/libgee/HISTORY | 3 +
gnome2-libs/libgee/libgee-0.6.1.tar.bz2.sig | 0
gnome2-libs/libgee/libgee-0.6.2.1.tar.bz2.sig |binary
gnome2-libs/librsvg2/DETAILS | 3 -
gnome2-libs/librsvg2/HISTORY | 6 ++
gnome2-libs/librsvg2/librsvg-2.32.1.tar.bz2.sig | 0
gnome2-libs/librsvg2/librsvg-2.34.1.tar.bz2.sig |binary
gnu/gcc/HISTORY | 3 +
gnu/gcc/PRE_BUILD | 4 -
graphics-libs/poppler-data/DETAILS | 4 -
graphics-libs/poppler-data/HISTORY | 3 +
graphics/feh/DETAILS | 4 -
graphics/feh/HISTORY | 3 +
http/apache22/BUILD | 3 +
http/apache22/CONFIGURE | 2
http/apache22/DETAILS | 4 -
http/apache22/HISTORY | 10 +++
http/ashd/DETAILS | 6 +-
http/ashd/HISTORY | 3 +
http/midori/DETAILS | 11 ++-
http/midori/HISTORY | 4 +
http/midori/PREPARE | 8 --
kde4-apps/bluedevil/DETAILS | 5 -
kde4-apps/bluedevil/HISTORY | 3 +
kde4-apps/kid3-kde4/DETAILS | 5 -
kde4-apps/kid3-kde4/HISTORY | 3 +
kde4-support/akonadi/DETAILS | 5 -
kde4-support/akonadi/HISTORY | 3 +
kde4-support/shared-desktop-ontologies/DETAILS | 6 +-
kde4-support/shared-desktop-ontologies/HISTORY | 3 +
kde4-support/soprano/DEPENDS | 14 +---
kde4-support/soprano/HISTORY | 5 +
kde4-support/soprano/PREPARE | 1
kde4-support/soprano/PRE_SUB_DEPENDS | 8 ++
kde4-support/soprano/SUB_DEPENDS | 12 ++++
kde4/kdelibs4/BUILD | 3 +
kde4/kdelibs4/DEPENDS | 23 +++++++
kde4/kdelibs4/HISTORY | 7 ++
kde4/kdenetwork4/DEPENDS | 3 -
kde4/kdenetwork4/HISTORY | 3 +
kde4/kdenetwork4/WIP | 7 --
kernels/cloop/DETAILS | 2
kernels/cloop/HISTORY | 3 +
libs/glibc/DEPENDS | 4 -
libs/glibc/DETAILS | 15 ++---
libs/glibc/HISTORY | 4 +
libs/glibc/PREPARE | 6 +-
libs/libestr/DETAILS | 6 +-
libs/libestr/HISTORY | 3 +
libs/libmemcached/DETAILS | 4 -
libs/libmemcached/HISTORY | 3 +
mail/dovecot/DETAILS | 6 +-
mail/dovecot/HISTORY | 3 +
mobile/obex-data-server/DETAILS | 4 -
mobile/obex-data-server/HISTORY | 3 +
net/dnsmasq/DETAILS | 2
net/dnsmasq/HISTORY | 4 +
net/dnsmasq/PRE_BUILD | 7 ++
net/dnsmasq/dnsmasq-2.57.tar.gz.sig | 0
net/dnsmasq/dnsmasq-2.58.tar.gz.sig |binary
net/monit/BUILD | 3 +
net/monit/CONFIGURE | 1
net/monit/DEPENDS | 3 -
net/monit/DETAILS | 4 -
net/monit/HISTORY | 6 ++
net/stunnel/DETAILS | 2
net/stunnel/HISTORY | 3 +
net/tor/DETAILS | 2
net/tor/HISTORY | 3 +
python-pypi/bzr/DETAILS | 2
python-pypi/bzr/HISTORY | 3 +
python-pypi/camelot/DETAILS | 4 -
python-pypi/camelot/HISTORY | 3 +
python-pypi/django/DETAILS | 5 +
python-pypi/django/HISTORY | 3 +
python-pypi/fb-python/DETAILS | 4 -
python-pypi/fb-python/HISTORY | 3 +
python-pypi/nevow/DETAILS | 10 +--
python-pypi/nevow/HISTORY | 4 +
python-pypi/pyqscintilla/BUILD | 4 +
python-pypi/pyqscintilla/DEPENDS | 8 ++
python-pypi/pyqscintilla/DETAILS | 23 +++++++
python-pypi/pyqscintilla/HISTORY | 3 +
python-pypi/pyqscintilla/INSTALL | 3 +
science/viking/HISTORY | 4 +
science/viking/PRE_BUILD | 2
science/viking/curl_types.patch | 24 ++++++++
security/pwsafe/DETAILS | 12 ++--
security/pwsafe/HISTORY | 3 +
shell-term-fm/mc/DETAILS | 5 +
shell-term-fm/mc/HISTORY | 7 ++
shell-term-fm/mc/PRE_BUILD | 3 +
shell-term-fm/mc/ctrl-x.patch | 38
+++++++++++++
utils/file/DETAILS | 4 -
utils/file/HISTORY | 3 +
utils/flashrom/DEPENDS | 2
utils/flashrom/DETAILS | 9 ++-
utils/flashrom/HISTORY | 6 ++
utils/flashrom/PREPARE | 8 --
utils/gnuplot/BUILD | 8 --
utils/gnuplot/DEPENDS | 10 ++-
utils/gnuplot/DETAILS | 7 --
utils/gnuplot/HISTORY | 9 +++
utils/gnuplot/PREPARE | 11 ---
utils/pv/DETAILS | 18 ++++++
utils/pv/HISTORY | 2
utils/rsyslog/DETAILS | 17 +++--
utils/rsyslog/HISTORY | 6 +-
video-libs/xine-lib/DEPENDS | 2
video-libs/xine-lib/HISTORY | 5 +
video/dvdauthor/DETAILS | 6 +-
video/dvdauthor/HISTORY | 3 +
video/xine-ui/HISTORY | 4 +
video/xine-ui/PRE_BUILD | 2
video/xine-ui/curl.patch | 10 +++
windowmanagers/wmii/DEPENDS | 2
windowmanagers/wmii/DETAILS | 2
windowmanagers/wmii/DOWNLOAD | 2
windowmanagers/wmii/HISTORY | 3 +
windowmanagers/wmii/PREPARE | 9 ---
x11-libs/wine/DEPENDS | 2
x11-libs/wine/DETAILS | 6 +-
x11-libs/wine/HISTORY | 3 +
x11-libs/wine/PREPARE | 10 ---
x11-libs/wine/PRE_BUILD | 2
x11-toolkits/qscintilla/BUILD | 8 --
x11-toolkits/qscintilla/DEPENDS | 1
x11-toolkits/qscintilla/HISTORY | 6 ++
x11-toolkits/qscintilla/INSTALL | 7 --
x11-toolkits/qt4/DETAILS | 2
x11-toolkits/qt4/HISTORY | 3 +
x11/conky/DETAILS | 2
x11/conky/HISTORY | 5 +
x11/conky/PRE_BUILD | 4 +
x11/conky/curl.patch | 20 ++++++
x11/x11vnc/DETAILS | 4 -
x11/x11vnc/HISTORY | 3 +
xfce/exo/DETAILS | 4 -
xfce/exo/HISTORY | 3 +
xfce/thunar/DETAILS | 4 -
xfce/thunar/HISTORY | 3 +
xfce/xfburn/BUILD | 2
xfce/xfburn/DEPENDS | 2
xfce/xfburn/DETAILS | 4 -
xfce/xfburn/HISTORY | 3 +
xfce/xfburn/PREPARE | 8 --
xorg-driver/wizardpen/DETAILS | 2
xorg-driver/wizardpen/HISTORY | 3 +
xorg-driver/wizardpen/PREPARE | 4 -
231 files changed, 856 insertions(+), 338 deletions(-)

New commits:
commit 6a3285e16fa544d4ccc081c76edc8218e930462f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

p11-kit: updated spell to 0.6

commit 2092306bb345bb99e6cf8aad2a41a75418ddc3f1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

cloop: updated WEB_SITE

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

stunnel 4.44

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

wget: => 1.13.4

commit 3003c560e6744c8067957c4f021881bed6695b59
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

openal-soft: added flags for disabling optional dependency

commit 33019948021844a77164dda236864d1c4bb9156d
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

file: updated spell to 5.09

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

lftp: updated spell to 4.3.2

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

linssh 0.5.2

commit f83e532801611c80031671d2cea06725a3cc4994
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

flashrom: Fix SOURCE for scm

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

pv: new spell, terminal-based tool for monitoring the progress of data
through a pipeline

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

akonadi: updated spell to 1.6.1

commit 02b787900333a489961ef41fc679d762369f57d7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

kdelibs4: Fix CXXFLAGS instead of CFLAGS

commit 05e765b6646831d28f1f7d465561f687e3ed1127
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

doc/dvipng: updated spell to 1.14

commit 990b589153b5ec12fc60dcddc70cfaa5f6dbd39c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pyalsa: Use prepare_select_branch

commit 9023ab87bddca56b632ce105db17b07a518e811b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gpa: Use prepare_select_branch

commit ac3a6e549a2ef16c1e0d08f1a26365b13331a2ff
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bacula: Use prepare_select_branch

commit 914c8e55c244aefd7a4029c62fb555630f260b32
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

bzr: => 2.4.1

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

clutter 1.6.18

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

libgee 0.6.2.1

commit 2317a69982f507d4a9b13f6a9d9c2eea0cae1dd4
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

viking: added upstream patch so it builds after curl update

upstream bug:

http://sourceforge.net/tracker/?func=detail&aid=3376584&group_id=83870&atid=570954

upstream commit:

http://viking.git.sourceforge.net/git/gitweb.cgi?p=viking/viking;a=commit;h=f715a77fbdc11aafff35f066380b34a99401a698

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

shared-desktop-ontologies 0.8.0

commit 1dae39b079e11622e568e6f47c0bc8b30b2bf277
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wine: Use prepare_select_branch

commit 924f1109475ca04de538c1986be28abe872ad659
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

b43-tools: Use prepare_select_branch

commit 7ac558646310be4e7b41d7e577ff58fd8f158cb4
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

irssi: Use prepare_select_branch

commit 7ac7556f149a2dec57a20c917bfb69f1a0537df3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wizardpen: Use prepare_select_branch

commit d0e005a77f9af33a8226da0aa70a43f8d9bde56f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

wmii: Use prepare_select_branch

commit fd73c5a5d7b27628e286de58a3d8d8ae724f56fe
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xfburn: Use prepare_select_branch

commit bc5fb5079926bb64b0b86c313e557263f498e1ab
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

flashrom: Use prepare_select_branch

commit 6070677c5e725b3fb9896f22343193b740256c57
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gnuplot: Use prepare_select_branch

commit f01167e41b92874693c191e82bf47bfdf64dbd30
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

kdelibs4: Remove --ffast-math from CFLAGS

KJS does not like it.

commit 513eb00b3be10f6298357bbebb0450cc5bda0a28
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

choqok: updated spell to 1.1

commit 77a51a05c89ae3d9e6c5703e135a761c0760b010
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

pwsafe: Fix long description

commit af114cb1bbd2026b9c7f822c33b450e2c6c449f9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ashd: Remove non-ASCII dash from long description

commit 4e1edbb439b00447d3223e7358f0568b6e07cce6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

bcrypt: Word-wrap long description

commit 3af63a2442a4ca1a46091531f999aba0f2a1ab45
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

midori: Use prepare_select_branch

commit cc3d5e5815b680346e385382a4545df2f277371a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

midori: Fix scm SOURCE and SOURCE_DIRECTORY

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

wget: REPAIR files fixed, #225

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

xine-ui: fix compilation with curl >=7.21.7

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

conky: fix compilation with curl >=7.21.7

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

curl: => 7.22.0

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

tor: => 0.2.2.33

commit 1adb0bdf146d20828697e89911e9f85290ca88da
Author: Robert Figura <template AT sourcemage.org>
Commit: Robert Figura <template AT sourcemage.org>

qscintilla: cleanup: python api is now in spell pyqscintilla

commit 55d2cf4666ab36fa090f61770786e28da6074654
Author: Robert Figura <template AT sourcemage.org>
Commit: Robert Figura <template AT sourcemage.org>

pyqscintilla: new spell: install qscintilla bindings for python

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

mc: ctrl-x fix

http://mail.gnome.org/archives/mc/2011-September/msg00003.html

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

mongodb: => 2.0.0

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

kdenetwork4: qca2 is mandatory dependency (fixes #222)

commit 2df1bfcd7603acd116db7c3151d545944e14998a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdelibs4: request soprano with REDLAND RAPTOR DBUS VIRTUOSO support
(issue #223)

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

soprano: added SUB_DEPENDS and cleaned DEPENDS

* DEPENDS: only optional dependencies will do since we have SUB_DEPENDS
now
* {,PRE_}SUB_DEPENDS: added option to request REDLAND RAPTOR DBUS
VIRTUOSO support
* PREPARE: removed query for kde4 (we will now request support)

commit 09c1d71393aba964db8a48c12de941dc8f23f98c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kdelibs4: added dependencies from KDE_DEPENDS

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

dovecot: updated to 2.0.14 and pigeonhole to 0.2.4

commit 7610399c4598d0ef143d5918f81b623744172f12
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>

loudmouth: fixed ssl dependency

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

monit: update to 5.3

commit 009d0d068dde8eb63489094dfac580f335b3215f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/exo: updated spell to 0.6.2

commit 4ba0243a911be7ac5cb7093e434be2db01ee0372
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xfce/thunar: updated spell to 1.3.0

commit bb22244811c706138c2bc365e200ffb66528a3df
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Replace prepare_scm_queries with prepare_select_branch

commit 3fb51a7602804226a60e8389011824f00446dd20
Author: Robert Figura <template AT sourcemage.org>
Commit: Robert Figura <template AT sourcemage.org>

revert broken python api changes (bug 197)

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

pidgin-encryption: fixed SOURCE_URL for svn version (fixes #218)

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

pidgin-encryption: updated spell to 3.1

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

qt4: updated sha512 only doc/ was changed (fixes #198)

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

gnuplot: added lua and cairo as optional dependency

DETAILS,PREPARE,BUILD: removed support for lua 3rd party addon (fixes
#138)

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

nevow: updated spell to 0.10.0 (fixes #96)

Fixed SOURCE, SOURCE_URL & WEB_SITE

commit 65bf27fde92f66bbb797266a4e26fc347cd5e446
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

FUNCTIONS: Simplify get_up_spell_name

commit 5abd1dd16d8c9a007d743fe5415670d6e7c39f4a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

qbittorrent: updated spell to 2.8.5

commit 4b47f9376460846fa463e5f3de0f214b592a21ed
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

rb-libtorrent: updated spell to 0.15.7

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

libmemcached: updated spell to 0.52

commit 357bcbc5ae6f38d022b137d8d18e464f08935940
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

bluedevil: updated spell to 1.2

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

xine-lib: fixed issue #133
--with-external-vcdnav is now longer a recognized configure switch
It has been replaced with --with-internal-vcdlibs not to use external
libs from vcdimager-unstable

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

feh 1.16.1

commit 14b971f7f43eff56f31bb4dcc3b2dcf5d755732a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

camelot: => 11.09.10

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

x11vnc: => 0.9.13

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

FUNCTIONS: added function prepare_scm_queries & get_up_spell_name

commit 6bff199d9802f726efceee27b812b11c51f8840b
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

audio-players/qmmp: new spell: Qt4-based Multimedia Player

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

apache22: => 2.2.21 (security)

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

added public key B55D9977 (William A. Rowe, Jr. <wrowe AT rowe-clan.net>)

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

mongodb: => 1.8.3

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

poppler-data: => 0.4.5

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

mongodb: fixed indentation

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

spidermonkey: added required zip dep

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

django: => 1.3.1 (security)

commit 24da04334c58f553607e948f2f0c9781bce15c8c
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

gcc: fixed the source numbers for java in PRE_BUILD (fixes #115)

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

mc 4.7.5.4

commit 65d8386f8e15fa65593bd5be87e45bcb4494b289
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

udev: use the latest version of {,PRE}SUB_DEPENDS for REPAIR not some
ancient

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

dvdauthor: updated spell to 0.7.0 (fixed SOURCE_DIRECTORY)

commit 7194e6ae3f1a52ca1ff50fc1ede9d3165e808de1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

glibc: changed cvs url to git (uses 2.13 branch) (fixes #195)

commit 820426235850a7420cd827ea3c1838b368d7040f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

obex-data-server: updated spell to 0.4.6

commit 1b9e241056e941f5eccdc84548c4695043249b70
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

postgresql: show user url that exists (sourcemage.org ->
wiki.sourcemage.org)

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

fb-python: => 0.5.0

commit 10f03170a363bbd5a239a038f278c46fc552b9c3
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

apache22: fixed url sourcemage.org -> wiki.sourcemage.org (fixes #181)

commit 8b6824e34bf4dae128bbe6625fc3bfd0d9622151
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

dnsmasq: updated spell to 2.58

commit 1a1b29d63ee9482c717b1f79b68e88a0f089abb9
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

dnsmasq: added hack to build with dbus (from Arch Linux) (fixes #183)

commit 913db3368bec30afacf681e88b97946bc5073489
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

kid3-kde4: updated spell to 2.0

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

rsyslog: => 4.8.0 (v4stable), 5.8.5 (v5stable), 6.3.5 (devel) [security]

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

libestr: => 0.1.2

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

rsyslog: fix time machine

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

librsvg2: => 2.34.1 (security)
(cherry picked from commit 34119322eff0c15212fa4ab32f5a006ccdfbd52a)

commit 54da316ca6c4d4eef7946c385e8928b817f4c4c4
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

librsvg2 2.34.0
(cherry picked from commit 11ee7d5e63e17e4fe884acaa95147cd87ddee2de)

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

apache22: fixed build with external apr-util

commit 55aa52f8ce5bd5f2fbeb88949111561bdc012507
Author: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie+2054d253 AT codemages.net>

oss: switched scm to sourceforge

diff --git a/ChangeLog b/ChangeLog
index 183188d..de7af09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-09-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/pv: new spell, terminal-based tool for monitoring the progress
+ of data through a pipeline
+
+2011-09-14 Robert Figura <template AT sourcemage.org>
+ * python-pypi/pyqscintilla: new spell: install qscintilla bindings
for python
+
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * audio-players/qmmp: new spell: Qt4-based Multimedia Player
+ * FUNCTIONS: added function prepare_scm_queries & get_up_spell_name
+
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * apache.gpg: added public key B55D9977 (William A. Rowe, Jr.
+ <wrowe AT rowe-clan.net>)
+
2011-09-08 Bor Kraljič <pyrobor AT ver.si>
* kde4-look/plasma-wifi: removed, doesn't buid (plasmoids can now be
installed as user)
* kde4-look/plasmoid-atips: removed, doesn't buid (plasmoids can now
be installed as user)
diff --git a/FUNCTIONS b/FUNCTIONS
index 2b2bedc..0eb70eb 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -663,13 +663,45 @@ function default_kde3_build() {

}

+
+#---
+## Select SCM branch. If no parameter is given, it assumes a single scm
branch.
+##
+## Saves selected branch in ${SPELL}_BRANCH, and auto-update setting on
+## ${SPELL}_AUTOUPDATE.
+##
+## Usage:
+## . ${GRIMOIRE}/FUNCTIONS &&
+## prepare_select_branch [branch] ...
+#---
+function prepare_select_branch() {
+ local spell=$(get_up_spell_name) &&
+ local branch="$spell"_BRANCH &&
+
+ if [[ $# > 1 ]]; then
+ config_query_list $branch "Select one of the available branches:" "$@"
+ else
+ eval $branch=\""${1:-scm}"\"
+ fi &&
+
+ if [[ "${!branch/-*}" = scm ]]; then
+ config_query "$spell"_AUTOUPDATE 'Automatically update on every system
update?' n
+ fi
+}
+
+#---
+## Get uppercase spell name with _ instead of -
+#---
+function get_up_spell_name() {
+ echo ${1:-$SPELL} | tr "a-z-" "A-Z_"
+}
+
# Move SPELL_OPTS to OPTS
# basicly generic OPTS="$SPELL_OPTS $OPTS"
function prepare_opts() {
# this is here so that config_query_option can be used without
# extra junk
- local up_spell_name=$(echo $SPELL | tr "a-z" "A-Z") &&
- local up_spell_name=$(echo $up_spell_name | tr "-" "_") &&
+ local up_spell_name=$(get_up_spell_name) &&
local tempopts="${up_spell_name}_OPTS" &&
OPTS="${!tempopts} $OPTS"
}
diff --git a/apache.gpg b/apache.gpg
index 7c7efad..67d54cc 100644
Binary files a/apache.gpg and b/apache.gpg differ
diff --git a/archive/bacula/BUILD b/archive/bacula/BUILD
index ba4ab71..bbfa292 100755
--- a/archive/bacula/BUILD
+++ b/archive/bacula/BUILD
@@ -6,7 +6,7 @@ OPTS="--with-scriptdir=$INSTALL_ROOT/etc/bacula \
--with-working-dir=$INSTALL_ROOT/var/bacula \
$OPTS" &&

-if [[ $BACULA_SCM == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
cd bacula
fi &&

diff --git a/archive/bacula/DEPENDS b/archive/bacula/DEPENDS
index b0d2d78..1bfa85d 100755
--- a/archive/bacula/DEPENDS
+++ b/archive/bacula/DEPENDS
@@ -1,6 +1,6 @@
depends -sub CXX gcc &&

-if [[ $BACULA_SCM == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
depends git
fi &&

diff --git a/archive/bacula/DETAILS b/archive/bacula/DETAILS
index c33a539..edf3ab7 100755
--- a/archive/bacula/DETAILS
+++ b/archive/bacula/DETAILS
@@ -1,6 +1,6 @@
SPELL=bacula
-if [[ $BACULA_SCM == y ]]; then
- if [[ $BACULA_SCM_AUTOUPDATE == y ]]; then
+if [[ $BACULA_BRANCH == scm ]]; then
+ if [[ $BACULA_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=scm
diff --git a/archive/bacula/HISTORY b/archive/bacula/HISTORY
index 5a04b50..ecd8152 100644
--- a/archive/bacula/HISTORY
+++ b/archive/bacula/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/archive/bacula/PREPARE b/archive/bacula/PREPARE
index f9b16ec..98d27e4 100755
--- a/archive/bacula/PREPARE
+++ b/archive/bacula/PREPARE
@@ -1,5 +1,2 @@
-config_query BACULA_SCM 'Build scm version ?' n &&
-
-if [[ $BACULA_SCM == y ]]; then
- config_query BACULA_SCM_AUTOUPDATE 'Update on every system update?' n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index 628497a..c771b4f 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -6,7 +6,7 @@ else
VERSION="4.3-scm"
fi
SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=hg_http://mercurial.opensound.com/:$SPELL-scm
+
SOURCE_URL[0]=hg_http://opensound.hg.sourceforge.net:8000/hgroot/opensound/opensound:$SPELL-scm
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-scm"
elif [[ $OSS_BRANCH == test ]]; then
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index 3999ae8..b3a897b 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,6 +1,9 @@
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DOWNLOAD: source $GRIMOIRE/hg_download.function before using
hg_download

+2011-06-11 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: switched scm to sf
+
2011-06-01 Ismael Luceno <ismael AT sourcemage.org>
* DOWNLOAD: use hg_download

diff --git a/audio-drivers/pyalsa/DETAILS b/audio-drivers/pyalsa/DETAILS
index e981906..d79506a 100755
--- a/audio-drivers/pyalsa/DETAILS
+++ b/audio-drivers/pyalsa/DETAILS
@@ -1,6 +1,6 @@
SPELL=pyalsa
-if [[ $PYALSA_GIT == y ]]; then
- if [[ $PYALSA_GIT_AUTOUPDATE == y ]]; then
+if [[ $PYALSA_BRANCH == scm ]]; then
+ if [[ $PYALSA_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/audio-drivers/pyalsa/HISTORY b/audio-drivers/pyalsa/HISTORY
index 0ef09ac..18ada58 100644
--- a/audio-drivers/pyalsa/HISTORY
+++ b/audio-drivers/pyalsa/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.24

diff --git a/audio-drivers/pyalsa/PREPARE b/audio-drivers/pyalsa/PREPARE
index 6ab056e..98d27e4 100755
--- a/audio-drivers/pyalsa/PREPARE
+++ b/audio-drivers/pyalsa/PREPARE
@@ -1,6 +1,2 @@
-config_query PYALSA_GIT "Build latest version from development tree?" n &&
-
-if [[ $PYALSA_GIT == y ]]; then
- config_query PYALSA_GIT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/audio-libs/openal-soft/DEPENDS b/audio-libs/openal-soft/DEPENDS
index 74b4c42..795e004 100755
--- a/audio-libs/openal-soft/DEPENDS
+++ b/audio-libs/openal-soft/DEPENDS
@@ -1,3 +1,5 @@
depends cmake &&
-optional_depends portaudio19 "" "" "for a portaudio backend" &&
-optional_depends pulseaudio "" "" "for a pulseaudio backend"
+optional_depends portaudio19 "-DPORTAUDIO=ON" "-DPORTAUDIO=OFF" \
+ "for a portaudio backend" &&
+optional_depends pulseaudio "-DPULSEAUDIO=ON" "-DPULSEAUDIO=OFF" \
+ "for a pulseaudio backend"
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index b2e2161..d2fdb56 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added flags for disabling optional dependency
+
2010-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.12.854

diff --git a/audio-players/qmmp/BUILD b/audio-players/qmmp/BUILD
new file mode 100755
index 0000000..2113434
--- /dev/null
+++ b/audio-players/qmmp/BUILD
@@ -0,0 +1 @@
+qt4_cmake_build
diff --git a/audio-players/qmmp/DEPENDS b/audio-players/qmmp/DEPENDS
new file mode 100755
index 0000000..cd22645
--- /dev/null
+++ b/audio-players/qmmp/DEPENDS
@@ -0,0 +1,4 @@
+depends qt4 &&
+depends taglib &&
+depends curl &&
+depends cmake
diff --git a/audio-players/qmmp/DETAILS b/audio-players/qmmp/DETAILS
new file mode 100755
index 0000000..81927b0
--- /dev/null
+++ b/audio-players/qmmp/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=qmmp
+ VERSION=0.5.2
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://${SPELL}.ylsoftware.com/files/${SOURCE}
+
SOURCE_HASH=sha512:be42fdbf69afc5f76164a843f2747b5fbc496cef0b3ae1eac2bb0c34014ea743403a0f3bc1e4bb7fe1f2d6e160ed8a18f08b95fa802b36ffb41dff597d71fe12
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://qmmp.ylsoftware.com/";
+ LICENSE[0]="GPL"
+ ENTERED=20110913
+ KEYWORDS=""
+ SHORT="Qt-based Multimedia Player"
+cat << EOF
+This program is an audio-player, written with help of Qt library. The user
+interface is similar to winamp or xmms.
+EOF
diff --git a/audio-players/qmmp/HISTORY b/audio-players/qmmp/HISTORY
new file mode 100644
index 0000000..1598135
--- /dev/null
+++ b/audio-players/qmmp/HISTORY
@@ -0,0 +1,3 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS, DETAILS, BUILD: spell created
+
diff --git a/chat-im/choqok/DETAILS b/chat-im/choqok/DETAILS
index a291d18..7fc0ab3 100755
--- a/chat-im/choqok/DETAILS
+++ b/chat-im/choqok/DETAILS
@@ -11,10 +11,10 @@ if [ "$CHOQOK_SCM" = y ]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION=0.9.98
- SOURCE="${SPELL}_${VERSION}.tar.bz2"
- SOURCE_URL[0]=http://${SPELL}.gnufolks.org/pkgs/${SOURCE}
-
SOURCE_HASH=sha512:cdf1d6fc00f729cedf9817724ef5fee857d71ef140bcb4a7169cfb4d5ce49afd992750a4aac8069b8d293a36eb3a738ad5b99dc036f3bb8e3b353daa432fd70b
+ VERSION=1.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=http://downloads.sourceforge.net/project/$SPELL/Choqok/$SOURCE
+
SOURCE_HASH=sha512:496247424fc099a9f8a61abd145a0876f42a9af50cee97f507b4258d97a4fb0092fdc65213954aa5629a5dbfc28e6e3a3c2150c4234202223a88f7c64cd14d43
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
fi
WEB_SITE="http://choqok.gnufolks.org";
diff --git a/chat-im/choqok/HISTORY b/chat-im/choqok/HISTORY
index eda3765..4c61460 100644
--- a/chat-im/choqok/HISTORY
+++ b/chat-im/choqok/HISTORY
@@ -1,3 +1,7 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 1.1
+
2011-01-12 Ismael Luceno <ismael AT sourcemage.org>
* PREPARE, DETAILS: add scm version
* DEPENDS: depends on kdelibs4
diff --git a/chat-im/pidgin-encryption/DEPENDS
b/chat-im/pidgin-encryption/DEPENDS
index 0aae5a9..9b72396 100755
--- a/chat-im/pidgin-encryption/DEPENDS
+++ b/chat-im/pidgin-encryption/DEPENDS
@@ -2,5 +2,5 @@ depends pidgin &&
depends nss &&

if [ "$PE_CVS" == "y" ]
-then depends CVS
+then depends subversion
fi
diff --git a/chat-im/pidgin-encryption/DETAILS
b/chat-im/pidgin-encryption/DETAILS
index 16d4d3f..33d6550 100755
--- a/chat-im/pidgin-encryption/DETAILS
+++ b/chat-im/pidgin-encryption/DETAILS
@@ -2,11 +2,12 @@
if [ "$PE_CVS" == "y" ]; then
VERSION=cvs
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=svn://:pserver:anonymous AT pidgin-encrypt.cvs.sourceforge.net:/svnroot/pidgin-encrypt/trunk:encrypt
+
SOURCE_URL[0]=svn_https://pidgin-encrypt.svn.sourceforge.net:/svnroot/pidgin-encrypt/trunk:encrypt
+
FORCE_DOWNLOAD=1
SOURCE_IGNORE=volatile
else
- VERSION=3.0
+ VERSION=3.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/pidgin-encrypt/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
@@ -16,7 +17,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
CCACHE=off
ENTERED=20040627
- PATCHLEVEL=1
KEYWORDS="im chat pidgin encryption"
SHORT="uses NSS to provide RSA encryption as a Gaim plugin."
cat << EOF
diff --git a/chat-im/pidgin-encryption/HISTORY
b/chat-im/pidgin-encryption/HISTORY
index a82dfe6..8b914ce 100644
--- a/chat-im/pidgin-encryption/HISTORY
+++ b/chat-im/pidgin-encryption/HISTORY
@@ -1,3 +1,8 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 3.1
+ fixed SOURCE_URL for svn version (fixes #218)
+ * DEPENDS: changed CVS -> subversion
+
2007-10-15 Lalo Martins <lalo AT sourcemage.org>
* DETAILS, CONFIGURE: updating urls, and cvs->svn

diff --git a/chat-im/pidgin-encryption/pidgin-encryption-3.0.tar.gz.sig
b/chat-im/pidgin-encryption/pidgin-encryption-3.0.tar.gz.sig
deleted file mode 100644
index 544b2fc..0000000
Binary files a/chat-im/pidgin-encryption/pidgin-encryption-3.0.tar.gz.sig and
/dev/null differ
diff --git a/chat-im/pidgin-encryption/pidgin-encryption-3.1.tar.gz.sig
b/chat-im/pidgin-encryption/pidgin-encryption-3.1.tar.gz.sig
new file mode 100644
index 0000000..4a9d38c
Binary files /dev/null and
b/chat-im/pidgin-encryption/pidgin-encryption-3.1.tar.gz.sig differ
diff --git a/chat-irc/irssi/DEPENDS b/chat-irc/irssi/DEPENDS
index ef7bead..41b2b8e 100755
--- a/chat-irc/irssi/DEPENDS
+++ b/chat-irc/irssi/DEPENDS
@@ -17,6 +17,6 @@ optional_depends "dante" \
"--without-socks" \
"for SOCKS support" &&

-if [[ $IRSSI_SVN == y ]]; then
+if [[ $IRSSI_BRANCH == scm ]]; then
depends subversion
fi
diff --git a/chat-irc/irssi/DETAILS b/chat-irc/irssi/DETAILS
index 1e105ee..384e122 100755
--- a/chat-irc/irssi/DETAILS
+++ b/chat-irc/irssi/DETAILS
@@ -1,12 +1,10 @@
SPELL=irssi
-if [[ $IRSSI_SVN == y ]]; then
- if [[ $IRSSI_SVN_AUTOUPDATE == y ]]; then
+if [[ $IRSSI_BRANCH == scm ]]; then
+ if [[ $IRSSI_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
fi
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
FORCE_DOWNLOAD=ON
SOURCE_HINTS=old_svn_compat
SOURCE_URL[0]=svn://svn.irssi.org/repos/irssi/trunk:irssi-svn
@@ -14,14 +12,14 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
else
VERSION=0.8.15
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.irssi.org/files/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=http://www.irssi.org/files/$SOURCE2
SOURCE2_IGNORE=signature
SOURCE_GPG=irssi.gpg:$SOURCE.sig:VERIFIED_UPSTREAM_KEY
fi
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.irssi.org
ENTERED=20011126
LICENSE[0]=GPL
diff --git a/chat-irc/irssi/HISTORY b/chat-irc/irssi/HISTORY
index b4e7751..757ec6d 100644
--- a/chat-irc/irssi/HISTORY
+++ b/chat-irc/irssi/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, PRE_BUILD, PREPARE, DETAILS: Use prepare_select_branch
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/chat-irc/irssi/PREPARE b/chat-irc/irssi/PREPARE
index 0c7a8c7..98d27e4 100755
--- a/chat-irc/irssi/PREPARE
+++ b/chat-irc/irssi/PREPARE
@@ -1,6 +1,2 @@
-config_query IRSSI_SVN "Build SVN version?" n &&
-
-if [[ $IRSSI_SVN == "y" ]]; then
- config_query IRSSI_SVN_AUTOUPDATE \
- "Automaticaly update the spell on sorcery
queue/system-update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/chat-irc/irssi/PRE_BUILD b/chat-irc/irssi/PRE_BUILD
index b51ec91..50eea5f 100755
--- a/chat-irc/irssi/PRE_BUILD
+++ b/chat-irc/irssi/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $IRSSI_SVN == y ]]; then
+if [[ $IRSSI_BRANCH == scm ]]; then
NOCONFIGURE=yes ./autogen.sh
fi
diff --git a/chat-libs/loudmouth/DEPENDS b/chat-libs/loudmouth/DEPENDS
index fe2bd08..94ed4d8 100755
--- a/chat-libs/loudmouth/DEPENDS
+++ b/chat-libs/loudmouth/DEPENDS
@@ -1,6 +1,6 @@
depends glib2 &&
depends libidn &&
-optional_depends "gnutls" \
- "" \
- "--without-ssl" \
+optional_depends "openssl" \
+ "--with-ssl=openssl" \
+ "--with-ssl=no" \
"for SSL support"
diff --git a/chat-libs/loudmouth/HISTORY b/chat-libs/loudmouth/HISTORY
index f529c61..e6427ef 100644
--- a/chat-libs/loudmouth/HISTORY
+++ b/chat-libs/loudmouth/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DEPENDS: fix ssl dependency
+
2009-08-08 Peng Chang (Charles) <chp AT sourcemage.org>
* PRE_BUILD: the macro for testing strndup is changed
* BUILD: added make_single
diff --git a/crypto/bcrypt/DETAILS b/crypto/bcrypt/DETAILS
index 01043ee..b6a2043 100755
--- a/crypto/bcrypt/DETAILS
+++ b/crypto/bcrypt/DETAILS
@@ -10,5 +10,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
KEYWORDS="crypto"
SHORT="bcrypt - a cross platform file encryption utility"
cat << EOF
-Bcrypt is a cross platform file encryption utility. Encrypted files are
portable across all supported operating systems and processors. Passphrases
must be between 8 and 56 characters and are hashed internally to a 448 bit
key. However, all characters supplied are significant. The stronger your
passphrase, the more secure your data.
+Bcrypt is a cross platform file encryption utility. Encrypted files are
+portable across all supported operating systems and processors. Passphrases
+must be between 8 and 56 characters and are hashed internally to a 448 bit
+key. However, all characters supplied are significant. The stronger your
+passphrase, the more secure your data.
EOF
diff --git a/crypto/bcrypt/HISTORY b/crypto/bcrypt/HISTORY
index 2c7d3f6..009eac2 100644
--- a/crypto/bcrypt/HISTORY
+++ b/crypto/bcrypt/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Word-wrap long description.
+
2010-02-21 Ladislav Hagara <hgr AT vabo.cz>
* BUILD, PRE_BUILD: fixed man path #15576

diff --git a/crypto/gpa/DETAILS b/crypto/gpa/DETAILS
index f71a848..ed38d61 100755
--- a/crypto/gpa/DETAILS
+++ b/crypto/gpa/DETAILS
@@ -1,7 +1,6 @@
SPELL=gpa
-
-if [ "$GPA_SVN" == "y" ]; then
- if [ "$GPA_SVN_AUTOUPDATE" == "y" ]; then
+if [ "$GPA_BRANCH" == "scm" ]; then
+ if [ "$GPA_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
diff --git a/crypto/gpa/HISTORY b/crypto/gpa/HISTORY
index 9ea987b..d927e3d 100644
--- a/crypto/gpa/HISTORY
+++ b/crypto/gpa/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2010-06-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, PREPARE, PRE_BUILD: added support for svn version #15730

diff --git a/crypto/gpa/PREPARE b/crypto/gpa/PREPARE
index 0ae4ee1..98d27e4 100755
--- a/crypto/gpa/PREPARE
+++ b/crypto/gpa/PREPARE
@@ -1,6 +1,2 @@
-config_query GPA_SVN "Build SCM (subversion) version?" n &&
-
-if [ "$GPA_SVN" == "y" ]; then
- config_query GPA_SVN_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/crypto/gpa/PRE_BUILD b/crypto/gpa/PRE_BUILD
index d9b31dd..ece5339 100755
--- a/crypto/gpa/PRE_BUILD
+++ b/crypto/gpa/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&

-if [ "$GPA_SVN" == "y" ]; then
+if [ "$GPA_BRANCH" == "scm" ]; then
cd $SOURCE_DIRECTORY &&
autopoint &&
NOCONFIGURE=ON ./autogen.sh
diff --git a/crypto/libssh/DETAILS b/crypto/libssh/DETAILS
index bb0c748..630e640 100755
--- a/crypto/libssh/DETAILS
+++ b/crypto/libssh/DETAILS
@@ -1,11 +1,15 @@
SPELL=libssh
- VERSION=0.5.1
+ VERSION=0.5.2
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.libssh.org/files/${VERSION::3}/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_URL[0]=https://red.libssh.org/attachments/download/27/$SOURCE
+ SOURCE2_URL[0]=https://red.libssh.org/attachments/download/29/$SOURCE2
+ SOURCE_HINTS[0]="no-check-certificate"
+SOURCE2_HINTS[0]="no-check-certificate"
+# SOURCE_URL[0]=http://www.libssh.org/files/${VERSION::3}/$SOURCE
+# SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
WEB_SITE=http://www.libssh.org/
ENTERED=20041208
SOURCE_GPG=F33E3FC6.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index 21e30a7..57925fd 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,6 @@
+2011-09-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.5.2, SOURCE_URLs updated, SOURCE_HINTSs added
+
2011-08-17 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.5.1

diff --git a/crypto/p11-kit/DETAILS b/crypto/p11-kit/DETAILS
index 8ea60cd..140d41c 100755
--- a/crypto/p11-kit/DETAILS
+++ b/crypto/p11-kit/DETAILS
@@ -1,5 +1,5 @@
SPELL=p11-kit
- VERSION=0.5
+ VERSION=0.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_GPG=D92765AF.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/crypto/p11-kit/HISTORY b/crypto/p11-kit/HISTORY
index c881f5e..6ab18df 100644
--- a/crypto/p11-kit/HISTORY
+++ b/crypto/p11-kit/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.6
+
2011-09-02 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.5
converted to upstream signature checking
diff --git a/database/mongodb/BUILD b/database/mongodb/BUILD
index a10f43f..2b10b63 100755
--- a/database/mongodb/BUILD
+++ b/database/mongodb/BUILD
@@ -1,3 +1,6 @@
create_account mongodb &&

+# use bundled spidermonkey, 2.2 will switch to V8
+OPTS="--sharedclient --usesm $OPTS" &&
+
scons --jobs=$MAKE_NJOBS --prefix="$INSTALL_ROOT/usr" $OPTS
diff --git a/database/mongodb/DEPENDS b/database/mongodb/DEPENDS
index 47cabb5..0dd5739 100755
--- a/database/mongodb/DEPENDS
+++ b/database/mongodb/DEPENDS
@@ -1,5 +1,7 @@
depends -sub CXX gcc &&
depends scons &&
depends readline &&
-depends spidermonkey '--usesm' &&
-depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost
+depends -sub "THREAD FILESYSTEM PROGRAM_OPTIONS" boost &&
+
+optional_depends openssl "--ssl" "" "for OpenSSL support" &&
+optional_depends distcc "--distcc" "" "to use distcc for distributing builds"
diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index c0772cb..a395948 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,8 +1,8 @@
SPELL=mongodb
- VERSION=1.8.2
+ VERSION=2.0.0
SOURCE=$SPELL-src-r$VERSION.tar.gz
SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-
SOURCE_HASH=sha512:0a0baca37854e4ed351daa0a1b75e3ff2a3773c66deba211e47b4c3cc9ef793c053da42f4ccf7636bc20565259bdacef8e0d8b47f3bc034f94ed88fed58be03d
+
SOURCE_HASH=sha512:51d8d13c64a37c8b0a51682cd387f8cea7f8e037fbf3f5ff403cb6b615d6e9335fc9e3cd6d3ad1f229cf558a12c39069991b2f3951ef214e82ef4e1522d8e9eb
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index 0c448a1..de57dbb 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,15 +1,29 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.0
+ * DEPENDS: added optional dependencies, spidermonkey is included in
+ distribution now
+ * BUILD: moved '--usesm' flag here
+ * PRE_BUILD: apply the patch, take CXXFLAGS from env var
+ * jsscan.patch: added, to fix compilation with non-needed header
+ * scons.patch: removed, replaced with sed in PRE_BUILD
+ * sm185.patch.bz2: removed, not needed anymore
+
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.3
+ * DEPENDS: check spidermonkey version
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)

2011-07-02 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.8.2
- * PRE_BUILD: apply the patch
- * sm185.patch.bz2: added, to fix functionality with spidermonkey 1.8.5
- * scons.patch: pass warnings
+ * DETAILS: updated spell to 1.8.2
+ * PRE_BUILD: apply the patch
+ * sm185.patch.bz2: added, to fix functionality with spidermonkey 1.8.5
+ * scons.patch: pass warnings

2011-06-05 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.8.1
+ * DETAILS: updated spell to 1.8.1

2011-03-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.0
diff --git a/database/mongodb/PRE_BUILD b/database/mongodb/PRE_BUILD
index da81106..bf67a0f 100755
--- a/database/mongodb/PRE_BUILD
+++ b/database/mongodb/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/scons.patch" &&
-bzcat "$SPELL_DIRECTORY/sm185.patch.bz2" | patch -p0 &&
+patch -p0 < "$SPELL_DIRECTORY/jsscan.patch" &&

-sed -i "s:lib64:lib:g" SConstruct
+sed -i "s:\" -O3 \":os.environ['CXXFLAGS']:;s:lib64:lib:g" SConstruct
diff --git a/database/mongodb/jsscan.patch b/database/mongodb/jsscan.patch
new file mode 100644
index 0000000..b44e0b4
--- /dev/null
+++ b/database/mongodb/jsscan.patch
@@ -0,0 +1,10 @@
+--- third_party/js-1.7/jsscan.c.orig 2011-09-14 12:36:51.000000000 +0400
++++ third_party/js-1.7/jsscan.c 2011-09-14 12:39:38.920064658 +0400
+@@ -109,7 +109,6 @@
+ #define JSKW_GOT_MATCH(index) i = (index); goto got_match;
+ #define JSKW_TEST_GUESS(index) i = (index); goto test_guess;
+ #define JSKW_NO_MATCH() goto no_match;
+-#include "jsautokw.h"
+ #undef JSKW_NO_MATCH
+ #undef JSKW_TEST_GUESS
+ #undef JSKW_GOT_MATCH
diff --git a/database/mongodb/scons.patch b/database/mongodb/scons.patch
deleted file mode 100644
index 2f1c698..0000000
--- a/database/mongodb/scons.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- SConstruct.orig
-+++ SConstruct
-@@ -671,8 +671,8 @@
- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall
-Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux:
-- env.Append( CPPFLAGS=" -Werror " )
- env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is
faster than gcc's
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
- env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
- env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
- env.Append( LIBS=[] )
-@@ -688,7 +688,7 @@
- env.Append( CPPFLAGS=" -O0 -fstack-protector " );
- env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
- else:
-- env.Append( CPPFLAGS=" -O3" )
-+ pass
- #env.Append( CPPFLAGS=" -fprofile-generate" )
- #env.Append( LINKFLAGS=" -fprofile-generate" )
- # then:
diff --git a/database/mongodb/sm185.patch.bz2
b/database/mongodb/sm185.patch.bz2
deleted file mode 100644
index c989d3c..0000000
Binary files a/database/mongodb/sm185.patch.bz2 and /dev/null differ
diff --git a/database/postgresql/FINAL b/database/postgresql/FINAL
index 3aa766a..ce39da9 100755
--- a/database/postgresql/FINAL
+++ b/database/postgresql/FINAL
@@ -7,6 +7,6 @@ if is_depends_enabled $SPELL openssl; then
fi &&

message "${MESSAGE_COLOR}" &&
-message "See the PostgreSQL HOWTO at http://sourcemage.org/HowTo/Postgresql
if you" &&
+message "See the PostgreSQL HOWTO at
http://wiki.sourcemage.org/HowTo/Postgresql if you" &&
message "need help setting up PostgreSQL." &&
message "${DEFAULT_COLOR}"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index d5c9eba..17c42f0 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * FINAL: show user url that exists (sourcemage.org ->
wiki.sourcemage.org)
+
2011-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: apply the patch
* perl514.patch: added, to fix compilation with perl 5.14
diff --git a/devel/b43-tools/DETAILS b/devel/b43-tools/DETAILS
index 824068f..e0800c4 100755
--- a/devel/b43-tools/DETAILS
+++ b/devel/b43-tools/DETAILS
@@ -1,5 +1,5 @@
SPELL=b43-tools
-if [[ $B43TOOLS_AUTOUPDATE == y ]]; then
+if [[ $B43_TOOLS_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/devel/b43-tools/HISTORY b/devel/b43-tools/HISTORY
index 1101114..6c94ef5 100644
--- a/devel/b43-tools/HISTORY
+++ b/devel/b43-tools/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE, DETAILS: Use prepare_select_branch
+
2010-10-08 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed SOURCE_URL

diff --git a/devel/b43-tools/PREPARE b/devel/b43-tools/PREPARE
index 6ef5a11..f8b7d7e 100755
--- a/devel/b43-tools/PREPARE
+++ b/devel/b43-tools/PREPARE
@@ -1,2 +1,2 @@
-config_query B43TOOLS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch
diff --git a/devel/spidermonkey/DEPENDS b/devel/spidermonkey/DEPENDS
index e210e76..f039f37 100755
--- a/devel/spidermonkey/DEPENDS
+++ b/devel/spidermonkey/DEPENDS
@@ -1,3 +1,5 @@
+depends zip &&
+
optional_depends nspr \
"--with-system-nspr" \
"--without-system-nspr" \
diff --git a/devel/spidermonkey/HISTORY b/devel/spidermonkey/HISTORY
index 3704d95..3754a21 100644
--- a/devel/spidermonkey/HISTORY
+++ b/devel/spidermonkey/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing required zip dependency
+
2011-07-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, BUILD, INSTALL: updated spell to 1.8.5
* DEPENDS: added, for missing dependencies
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index aea9a4b..600cae4 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * REPAIR^all^{,PRE}SUB_DEPENDS: use the latest version for REPAIR not
some ancient
+
2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: killed another typo

diff --git a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
index 34515c6..5922183 100755
--- a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
+++ b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,9 @@
case $THIS_SUB_DEPENDS in
- EXTRAS) list_find "$UDEV_OPTS" --enable-extras;;
-*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
+ EXTRAS) message "the spell you are trying to cast is broken."
+ message "Udev's sub_depends have changed, contact the maintainer."
;;
+ GUDEV) is_depends_enabled $SPELL glib2 && return 0 ;;
+ ACL) is_depends_enabled $SPELL acl && return 0 ;;
+ HWDB) list_find "$UDEV_HWDB" --enable-hwdb ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
esac
diff --git a/disk/udev/REPAIR^all^SUB_DEPENDS
b/disk/udev/REPAIR^all^SUB_DEPENDS
new file mode 100755
index 0000000..f078172
--- /dev/null
+++ b/disk/udev/REPAIR^all^SUB_DEPENDS
@@ -0,0 +1,9 @@
+case "$THIS_SUB_DEPENDS" in
+ EXTRAS) message "${PROBLEM_COLOR}EXTRAS is obsolete, please fix the
spell using it${DEFAULT_COLOR}" ;;
+ GUDEV) depends glib2 '--enable-gudev' ;;
+ ACL) depends acl '--enable-udev_acl' ;;
+ HWDB) list_remove UDEV_HWDB '--disable-hwdb'
+ list_add UDEV_HWDB '--enable-hwdb' ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
+ return 1;;
+esac
diff --git a/doc/dvipng/DETAILS b/doc/dvipng/DETAILS
index 033e1fd..5a6415e 100755
--- a/doc/dvipng/DETAILS
+++ b/doc/dvipng/DETAILS
@@ -1,8 +1,8 @@
SPELL=dvipng
- VERSION=1.12
+ VERSION=1.14
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://mirror.lihnidos.org/GNU/savannah/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:66cc9140cc04cc79a483b440ca6784a31c16266b3ffd0d2fdc47282173d27bdc5c7312b5e3a29e50024bb6e587254672a9f4571d238afcdd14cd04034c3f092f
+
SOURCE_HASH=sha512:d7dda0e83ec93c0ebb9c970f2464ed1b04cdd41c178165db6da7c37b90810f3be0a513b9a43162563cb5ca15a7dec3c12a49f27abeb44fca3739090661ab53ba
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.nongnu.org/dvipng/";
LICENSE[0]="LGPL"
diff --git a/doc/dvipng/HISTORY b/doc/dvipng/HISTORY
index 2d2364c..e7b8d41 100644
--- a/doc/dvipng/HISTORY
+++ b/doc/dvipng/HISTORY
@@ -1,3 +1,6 @@
+2011-09-16 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated spell to 1.14
+
2010-08-10 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: removed dos newlines

diff --git a/ftp-libs/rb-libtorrent/DETAILS b/ftp-libs/rb-libtorrent/DETAILS
index eaa7aa4..f3f61ed 100755
--- a/ftp-libs/rb-libtorrent/DETAILS
+++ b/ftp-libs/rb-libtorrent/DETAILS
@@ -1,8 +1,8 @@
SPELL=rb-libtorrent
- VERSION=0.15.6
+ VERSION=0.15.7
SOURCE=libtorrent-rasterbar-$VERSION.tar.gz
SOURCE_URL[0]=http://libtorrent.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:b62939fd8e067c536236bc5b96498c65de454eaeb76e23c360c848a523f6b306410164ef90ca2540324f4f6d6be88072903f6002075621e108c26550ad447e2d
+
SOURCE_HASH=sha512:2716625cc663a471d6b78425965a93041cca383b598de265d94f0b3db59187d6193216514e0d15d278a6ce45f41040d4613c0dad938b61800cbf22346ff2c3bd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/libtorrent-rasterbar-$VERSION"
WEB_SITE=http://www.rasterbar.com/products/libtorrent/
LICENSE=BSD
diff --git a/ftp-libs/rb-libtorrent/HISTORY b/ftp-libs/rb-libtorrent/HISTORY
index b3b8d30..134eb77 100644
--- a/ftp-libs/rb-libtorrent/HISTORY
+++ b/ftp-libs/rb-libtorrent/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.15.7
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index e6c0e5a..9b5fc52 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,5 +1,5 @@
SPELL=curl
- VERSION=7.21.7
+ VERSION=7.22.0
SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
@@ -10,7 +10,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=$SOURCE_URL.asc
SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- PATCHLEVEL=0
WEB_SITE=http://curl.haxx.se/
ENTERED=20010922
LICENSE[0]=MIT
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 4ef9e19..b74b860 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 7.22.0
+
2011-06-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.21.7, SECURITY_PATCH=8
http://curl.haxx.se/docs/adv_20110623.html
diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 8211a23..85804a4 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
SPELL=lftp
- VERSION=4.3.1
+ VERSION=4.3.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 84caff6..92eea62 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,6 @@
+2011-09-17 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 4.3.2
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/ftp/qbittorrent/DEPENDS b/ftp/qbittorrent/DEPENDS
index a1b3e70..a31e43e 100755
--- a/ftp/qbittorrent/DEPENDS
+++ b/ftp/qbittorrent/DEPENDS
@@ -1,5 +1,4 @@
depends qt4 &&
depends rb-libtorrent &&
depends curl &&
-optional_depends geoip "" "--disable-geoip-database" "for GeoIP location
support" &&
-optional_depends libnotify "" "--disable-libnotify" "for libnotify support"
+optional_depends geoip "" "--disable-geoip-database" "for GeoIP location
support"
diff --git a/ftp/qbittorrent/DETAILS b/ftp/qbittorrent/DETAILS
index 0a20bcf..8983dc7 100755
--- a/ftp/qbittorrent/DETAILS
+++ b/ftp/qbittorrent/DETAILS
@@ -1,8 +1,8 @@
SPELL=qbittorrent
- VERSION=2.5.1
+ VERSION=2.8.5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:033a4992d17acd12f8644eed07d8337142e054b53ea971a294c7f1a2631042ed0ff32395ff31df4b2934da568ff2964c67d1fc213703931a1ee0cbb549dc2ea3
+
SOURCE_HASH=sha512:086f614f296b4c46bc46848e434839108707552e35e48c863ed3bd90e6702d631836715cce520e1b2318f4be127154717805f14fc35deec63a7234f8cd2b5c9a
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE="http://www.qbittorrent.org/";
LICENSE=GPL
diff --git a/ftp/qbittorrent/HISTORY b/ftp/qbittorrent/HISTORY
index 6bca70f..e7b0ed7 100644
--- a/ftp/qbittorrent/HISTORY
+++ b/ftp/qbittorrent/HISTORY
@@ -1,3 +1,7 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.8.5
+ * DEPENDS: removed libnotify as optional dependency
+
2010-12-08 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.5.1

diff --git a/ftp/wget/DETAILS b/ftp/wget/DETAILS
index a68601f..4c89e2a 100755
--- a/ftp/wget/DETAILS
+++ b/ftp/wget/DETAILS
@@ -1,13 +1,13 @@
SPELL=wget
- VERSION=1.13.3
+ VERSION=1.13.4
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
SOURCE_GPG=wget.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE2_IGNORE=signature
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.gnu.org/software/wget/
ENTERED=20010922
LICENSE[0]=GPL
diff --git a/ftp/wget/HISTORY b/ftp/wget/HISTORY
index a5a2f17..f7590d0 100644
--- a/ftp/wget/HISTORY
+++ b/ftp/wget/HISTORY
@@ -1,3 +1,10 @@
+2011-09-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.13.4; switched source to bz2; quoting
path
+
+2011-08-15 Ladislav Hagara <hgr AT vabo.cz>
+ * REPAIR^all^PRE_SUB_DEPENDS: updated, #225
+ * REPAIR^none^PRE_SUB_DEPENDS: removed
+
2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.13.3

diff --git a/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS
b/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS
index fe1f8b9..be2be9d 100755
--- a/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS
+++ b/ftp/wget/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,8 @@
case $THIS_SUB_DEPENDS in
- SSL) is_depends_enabled $SPELL openssl && return 0 ;;
+ SSL) if is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL
gnutls; then
+ return 0
+ fi
+ ;;
*) echo "unknown sub_depends!" ;;
esac
return 1
diff --git a/ftp/wget/REPAIR^none^PRE_SUB_DEPENDS
b/ftp/wget/REPAIR^none^PRE_SUB_DEPENDS
deleted file mode 100755
index fe1f8b9..0000000
--- a/ftp/wget/REPAIR^none^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- SSL) is_depends_enabled $SPELL openssl && return 0 ;;
- *) echo "unknown sub_depends!" ;;
-esac
-return 1
diff --git a/gnome2-libs/clutter/DETAILS b/gnome2-libs/clutter/DETAILS
index 6701629..8186f39 100755
--- a/gnome2-libs/clutter/DETAILS
+++ b/gnome2-libs/clutter/DETAILS
@@ -1,5 +1,5 @@
SPELL=clutter
- VERSION=1.6.16
+ VERSION=1.6.18
BRANCH=${VERSION:0:3}
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/clutter/HISTORY b/gnome2-libs/clutter/HISTORY
index 2c97866..3c6c13c 100644
--- a/gnome2-libs/clutter/HISTORY
+++ b/gnome2-libs/clutter/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.18
+
2011-06-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.16

diff --git a/gnome2-libs/clutter/clutter-1.6.16.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.6.16.tar.bz2.sig
deleted file mode 100644
index b03b522..0000000
Binary files a/gnome2-libs/clutter/clutter-1.6.16.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig
b/gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig
new file mode 100644
index 0000000..63f8e45
Binary files /dev/null and b/gnome2-libs/clutter/clutter-1.6.18.tar.bz2.sig
differ
diff --git a/gnome2-libs/libgee/DETAILS b/gnome2-libs/libgee/DETAILS
index 536798d..140fb06 100755
--- a/gnome2-libs/libgee/DETAILS
+++ b/gnome2-libs/libgee/DETAILS
@@ -1,5 +1,5 @@
SPELL=libgee
- VERSION=0.6.1
+ VERSION=0.6.2.1
BRANCH=${VERSION:0:3}
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/libgee/HISTORY b/gnome2-libs/libgee/HISTORY
index dfdee6f..4007d99 100644
--- a/gnome2-libs/libgee/HISTORY
+++ b/gnome2-libs/libgee/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.6.2.1
+
2011-01-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.1

diff --git a/gnome2-libs/libgee/libgee-0.6.1.tar.bz2.sig
b/gnome2-libs/libgee/libgee-0.6.1.tar.bz2.sig
deleted file mode 100644
index 680dd33..0000000
Binary files a/gnome2-libs/libgee/libgee-0.6.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/libgee/libgee-0.6.2.1.tar.bz2.sig
b/gnome2-libs/libgee/libgee-0.6.2.1.tar.bz2.sig
new file mode 100644
index 0000000..d1d35d9
Binary files /dev/null and b/gnome2-libs/libgee/libgee-0.6.2.1.tar.bz2.sig
differ
diff --git a/gnome2-libs/librsvg2/DETAILS b/gnome2-libs/librsvg2/DETAILS
index e8bcf7a..494eb0a 100755
--- a/gnome2-libs/librsvg2/DETAILS
+++ b/gnome2-libs/librsvg2/DETAILS
@@ -1,5 +1,6 @@
SPELL=librsvg2
- VERSION=2.32.1
+ VERSION=2.34.1
+ SECURITY_PATCH=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/librsvg2/HISTORY b/gnome2-libs/librsvg2/HISTORY
index 54746cd..2947639 100644
--- a/gnome2-libs/librsvg2/HISTORY
+++ b/gnome2-libs/librsvg2/HISTORY
@@ -1,3 +1,9 @@
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.34.1; SECURITY_PATCH++
+
+2011-04-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.34.0
+
2010-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.32.1

diff --git a/gnome2-libs/librsvg2/librsvg-2.32.1.tar.bz2.sig
b/gnome2-libs/librsvg2/librsvg-2.32.1.tar.bz2.sig
deleted file mode 100644
index 08561f3..0000000
Binary files a/gnome2-libs/librsvg2/librsvg-2.32.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/librsvg2/librsvg-2.34.1.tar.bz2.sig
b/gnome2-libs/librsvg2/librsvg-2.34.1.tar.bz2.sig
new file mode 100644
index 0000000..4373b8c
Binary files /dev/null and b/gnome2-libs/librsvg2/librsvg-2.34.1.tar.bz2.sig
differ
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 48aee69..57e250b 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: fixed the source numbers for java (fixes #115)
+
2011-09-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 55398f4..db485e2 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -40,9 +40,9 @@ fi &&
if list_find "$GCC_COMPILER" "java" ; then
cd $BUILD_DIRECTORY &&
unpack_file 9 &&
- verify_file 14 &&
+ verify_file 15 &&

- cp -v $SOURCE_CACHE/$SOURCE14 $SOURCE_DIRECTORY/ecj.jar
+ cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar
fi &&
if list_find "$GCC_COMPILER" "fortran" ; then
cd $BUILD_DIRECTORY &&
diff --git a/graphics-libs/poppler-data/DETAILS
b/graphics-libs/poppler-data/DETAILS
index ee562c8..a36cc13 100755
--- a/graphics-libs/poppler-data/DETAILS
+++ b/graphics-libs/poppler-data/DETAILS
@@ -1,6 +1,6 @@
SPELL=poppler-data
- VERSION=0.4.4
-
SOURCE_HASH=sha512:0d30c282522e174546af86e737ec1a5eeb85ea4126e4ee4981e0e4d7ccff835ec7a8edcda4a3ef7d9422580ea21d72da5e88bfb0f381e27f3f058f38a711519b
+ VERSION=0.4.5
+
SOURCE_HASH=sha512:0120f4261597be8aa11b687a4dedacb865e125bd1142093de3c213d82f36c5ed7fb29c830bf7b327c49c4544d91462e9daeaa59fd813c15d3c0bc3dcb42ce067
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://poppler.freedesktop.org/$SOURCE
diff --git a/graphics-libs/poppler-data/HISTORY
b/graphics-libs/poppler-data/HISTORY
index 185942c..baf7b26 100644
--- a/graphics-libs/poppler-data/HISTORY
+++ b/graphics-libs/poppler-data/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.4.5
+
2010-10-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.4.4

diff --git a/graphics/feh/DETAILS b/graphics/feh/DETAILS
index cf02849..65c06fe 100755
--- a/graphics/feh/DETAILS
+++ b/graphics/feh/DETAILS
@@ -1,5 +1,5 @@
SPELL=feh
- VERSION=1.16
+ VERSION=1.16.1
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[1]=http://www.chaosdorf.de/~derf/feh/$SOURCE
WEB_SITE=http://feh.finalrewind.org/
ENTERED=20011101
-
SOURCE_HASH=sha512:c773421c58d3a558fafd581df0a391aa9ca321f837fb7067bb2c6894ed4c3800bdd26b85b9e417d7e484fe4569263f5eac64b910848390626db01953f37cc453
+
SOURCE_HASH=sha512:99cde8b54c1a244612e22653d6be90003d067715ac72c19c9ba461914bba427f0db38b4fa0825fb0c633b0da8b68d956155089d7cc01aef30463060e99386c62
LICENSE[0]=GPL
KEYWORDS="graphics"
SHORT="A fast, lightweight image viewer which uses imlib2"
diff --git a/graphics/feh/HISTORY b/graphics/feh/HISTORY
index d626e95..2fcf61e 100644
--- a/graphics/feh/HISTORY
+++ b/graphics/feh/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.16.1
+
2011-09-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.16

diff --git a/http/apache22/BUILD b/http/apache22/BUILD
index 32db176..67ab6cc 100755
--- a/http/apache22/BUILD
+++ b/http/apache22/BUILD
@@ -4,6 +4,9 @@ APACHE22_EXTRA="${APACHE22_EXTRA} --with-mpm=${APACHE22_MPM}"
&&
# remove APR and APU and reconfigure to use external ones
rm -fr srclib/apr*/ &&

+# correct flags to find external apr-util
+CPPFLAGS="`apr-config --includes` $CPPFLAGS" &&
+
# use smgl standard layout
cp -f $SCRIPT_DIRECTORY/config.layout $SOURCE_DIRECTORY &&

diff --git a/http/apache22/CONFIGURE b/http/apache22/CONFIGURE
index 54bc751..b8f5444 100755
--- a/http/apache22/CONFIGURE
+++ b/http/apache22/CONFIGURE
@@ -1,4 +1,4 @@
-message "${PROBLEM_COLOR}Before picking a MPM, please see:
http://sourcemage.org/ApacheMPM${DEFAULT_COLOR}"; &&
+message "${PROBLEM_COLOR}Before picking a MPM, please see:
http://wiki.sourcemage.org/ApacheMPM${DEFAULT_COLOR}"; &&
config_query_list APACHE22_MPM "Which MPM would you like?" prefork worker
event &&

# Apache2 CONFIGURE script
diff --git a/http/apache22/DETAILS b/http/apache22/DETAILS
index 6d9f5d8..d55d3e9 100755
--- a/http/apache22/DETAILS
+++ b/http/apache22/DETAILS
@@ -1,6 +1,6 @@
SPELL=apache22
- VERSION=2.2.20
- SECURITY_PATCH=13
+ VERSION=2.2.21
+ SECURITY_PATCH=14
SOURCE=httpd-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="apache.gpg:$SOURCE2:UPSTREAM_KEY"
diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index b583274..98b1151 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,13 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.21; SECURITY_PATCH++ (CVE-2011-3348,
+ regression introduced by the CVE-2011-3192)
+
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * CONFIGURE: fixed url sourcemage.org -> wiki.sourcemage.org (fixes
#181)
+
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed build with external apr-util (resolves #51)
+
2011-08-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.20; SECURITY_PATCH++ (CVE-2011-3192)

diff --git a/http/ashd/DETAILS b/http/ashd/DETAILS
index 3b7e741..5316660 100755
--- a/http/ashd/DETAILS
+++ b/http/ashd/DETAILS
@@ -30,9 +30,9 @@ simple protocol (not unlike Unix pipelines). The design of
Ashd brings it
a number of nice properties, the following being the most noteworthy ones.

Sanity of design The separation of concerns between different, independent
-programs is an example of standard Unix philosophy – each program
+programs is an example of standard Unix philosophy - each program
does one thing only, but does it well (I hope). The clean delineation of
-functions allows each program to be very small and simple – currently,
+functions allows each program to be very small and simple - currently,
each of the programs in the collection (including even the core HTTP parser
program, htparser, as long as one does not count its, quite optional, SSL
implementation) is implemented in less than 1,000 lines of C code (and most
@@ -54,6 +54,6 @@ possible, and most programs are configured simply with
command-line options.
Persistence Though Ashd is a multi-process program, it is not in the same
sense as e.g. Apache. Each request handler continues to run indefinitely
and does not spawn multiple copies of itself, meaning that all process
-state persists between requests – session data can be kept in memory,
+state persists between requests - session data can be kept in memory,
connections to back-end services can be kept open, and so on.
EOF
diff --git a/http/ashd/HISTORY b/http/ashd/HISTORY
index ac0d6a9..1af6cb5 100644
--- a/http/ashd/HISTORY
+++ b/http/ashd/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Remove non-ASCII dash from long description.
+
2011-05-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: updated spell to 0.8

diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index 4d0a573..fc57c6c 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -1,22 +1,23 @@
SPELL=midori
-if [[ $MIDORI_VCS == y ]]; then
- if [[ $MIDOTRI_VCS_AUTOUPDATE == y ]]; then
+if [[ $MIDORI_BRANCH == scm ]]; then
+ if [[ $MIDORI_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
fi
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=git://git.xfce.org/apps/midori:$SPELL
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://git.xfce.org/apps/$SPELL:$SPELL
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
else
VERSION=0.4.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE

SOURCE_HASH=sha512:8a48bfdfd630e85371caa7be9da56925e2bb1abfa1bcdfda59643493753d66c1b96b68e8fd8194455439b4ed85413cefdc3b14cc3738f47a1691faf0e27633bd
-fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+fi
WEB_SITE=http://software.twotoasts.de/?page=midori
LICENSE[0]=GPL
ENTERED=20071209
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index e75a4bc..7958555 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fix scm SOURCE and SOURCE_DIRECTORY
+ * PREPARE, DETAILS: Use prepare_select_branch
+
2011-08-01 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.4.0
* DEPENDS: Now depends vala
diff --git a/http/midori/PREPARE b/http/midori/PREPARE
index ea40eb7..98d27e4 100755
--- a/http/midori/PREPARE
+++ b/http/midori/PREPARE
@@ -1,6 +1,2 @@
-config_query MIDORI_VCS "Build latest version from development tree?" n &&
-
-if [[ $MIDORI_VCS == y ]]; then
- config_query MIDORI_VCS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/kde4-apps/bluedevil/DETAILS b/kde4-apps/bluedevil/DETAILS
index 9b98c77..28774e1 100755
--- a/kde4-apps/bluedevil/DETAILS
+++ b/kde4-apps/bluedevil/DETAILS
@@ -1,9 +1,8 @@
SPELL=bluedevil
- VERSION=1.1.1
- PATCHLEVEL=1
+ VERSION=1.2
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$KDE_URL/stable/${SPELL}/${VERSION}/src/${SOURCE}
-
SOURCE_HASH=sha512:34fc6128cc42de1da9010046abf36b220018c3f19c620a9fd315a65add334ba490a9999eebc9903b55ee16d1f10a32e6c847d20940254f900ddc03762bf84008
+
SOURCE_HASH=sha512:cd4e6c93b9d7ba18e3ec499a1facb4a5351667e54f6c707e31938fc01f83b043af9499757376b44db6b8caecfe34adc74afca46b85852cc80ca37a3d81a3f5a8
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://projects.kde.org/projects/extragear/base/bluedevil";
LICENSE[0]="GPL"
diff --git a/kde4-apps/bluedevil/HISTORY b/kde4-apps/bluedevil/HISTORY
index 9ab0fac..de79fe1 100644
--- a/kde4-apps/bluedevil/HISTORY
+++ b/kde4-apps/bluedevil/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.2
+
2011-09-06 Bor Kraljič <pyrobor AT ver.si>
* CONFLICTS: added, conflict with kdebluetooth4

diff --git a/kde4-apps/kid3-kde4/DETAILS b/kde4-apps/kid3-kde4/DETAILS
index 0340067..7824861 100755
--- a/kde4-apps/kid3-kde4/DETAILS
+++ b/kde4-apps/kid3-kde4/DETAILS
@@ -1,8 +1,7 @@
SPELL=kid3-kde4
SPELLX=kid3
- VERSION=1.5
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:ffd2b100b9289b31ea6ed67e08272436e985228975bc9a24a37a956843a9a5f881aaad63f1a39ed7bf8bc3474e9cd3a0cd88fee55f2b0e64254ddf58ed790c37
+ VERSION=2.0
+
SOURCE_HASH=sha512:dc9b065316e020853b79b2d89f626e28adf4ee29ed58f8fdec844a09d1fdd40e24e7b9f4f4b66ddace7a2bac788ff9493c053e93aaa3fbb436b5dbc4528d30e1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELLX/$SOURCE
diff --git a/kde4-apps/kid3-kde4/HISTORY b/kde4-apps/kid3-kde4/HISTORY
index 3617a3d..de6b636 100644
--- a/kde4-apps/kid3-kde4/HISTORY
+++ b/kde4-apps/kid3-kde4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.0
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-support/akonadi/DETAILS b/kde4-support/akonadi/DETAILS
index 09ac4e2..bfd0f28 100755
--- a/kde4-support/akonadi/DETAILS
+++ b/kde4-support/akonadi/DETAILS
@@ -1,7 +1,6 @@
SPELL=akonadi
- VERSION=1.6.0
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:ea122845fd66b7a01b93a9a949a38718390778149fc3f5405d80ed2947ae21451b3a4207b196fe45f482330d6c731d9526237330089964dc0825dfb41f61cd3f
+ VERSION=1.6.1
+
SOURCE_HASH=sha512:e221df425aadf4ccd02000c94b12f87d6f1cf130e2e0187d59b8b19874d1de4ef00de126834fe273377284a7f6362b125d62d85a3024ac81d54ea8c3bee7284d
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$KDE_URL/stable/$SPELL/src/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/kde4-support/akonadi/HISTORY b/kde4-support/akonadi/HISTORY
index 8d69dd6..c930c14 100644
--- a/kde4-support/akonadi/HISTORY
+++ b/kde4-support/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2011-09-16 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 1.6.1
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-support/shared-desktop-ontologies/DETAILS
b/kde4-support/shared-desktop-ontologies/DETAILS
index 77df401..387c83c 100755
--- a/kde4-support/shared-desktop-ontologies/DETAILS
+++ b/kde4-support/shared-desktop-ontologies/DETAILS
@@ -1,7 +1,7 @@
SPELL=shared-desktop-ontologies
- VERSION=0.7.1
- PATCHLEVEL=1
-
SOURCE_HASH=sha512:1d8594fbd226d028ca0c90f17ca797c296a9a4eef8f9417ad0cac1bd19400b9a42eb335f74d2b07b01ee06cf45ee56c745c4a0e827493d9c0120635d541c6396
+ VERSION=0.8.0
+ PATCHLEVEL=0
+
SOURCE_HASH=sha512:22969d597bec575afeb3bd8535ec91e1040222fe34760f4d0119039d17b7aed89a38c5c6c4aed26ae7b9f575fdcde25f3661374d6cb5f3edc26d4fe67a8976b1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://downloads.sourceforge.net/project/oscaf/$SPELL/${VERSION:0:3}/$SOURCE
diff --git a/kde4-support/shared-desktop-ontologies/HISTORY
b/kde4-support/shared-desktop-ontologies/HISTORY
index 3f27bc4..5357ae8 100644
--- a/kde4-support/shared-desktop-ontologies/HISTORY
+++ b/kde4-support/shared-desktop-ontologies/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.8.0
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-support/soprano/DEPENDS b/kde4-support/soprano/DEPENDS
index 18205a4..3b9c186 100755
--- a/kde4-support/soprano/DEPENDS
+++ b/kde4-support/soprano/DEPENDS
@@ -1,17 +1,11 @@
depends qt4 &&
depends cmake &&

-if [[ $SOP_KDE == y ]];then
- depends redland &&
- depends raptor
- depends dbus &&
- runtime_depends virtuoso
-else
- optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
+optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'raptor
parser and serializer plugins' &&
- suggest_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1'
'full-text search database' &&
- optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'dbus integration'
-fi &&
+suggest_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1'
'full-text search database' &&
+optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'dbus integration'
+
if is_depends_enabled $SPELL dbus;then
sub_depends qt4 DBUS
fi &&
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 8819346..143e1e7 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,8 @@
+2011-09-14 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: only optional dependencies will do since we have
SUB_DEPENDS now
+ * {,PRE_}SUB_DEPENDS: added option to request REDLAND RAPTOR DBUS
VIRTUOSO support
+ * PREPARE: removed query for kde4 (we will now request support)
+
2011-09-04 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: PATCHLEVEL++ for /opt/kde4 -> /usr change

diff --git a/kde4-support/soprano/PREPARE b/kde4-support/soprano/PREPARE
deleted file mode 100755
index 3ab87dd..0000000
--- a/kde4-support/soprano/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SOP_KDE 'build for use with KDE4?' y
diff --git a/kde4-support/soprano/PRE_SUB_DEPENDS
b/kde4-support/soprano/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..f2116b2
--- /dev/null
+++ b/kde4-support/soprano/PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ REDLAND) is_depends_enabled $SPELL redland ;;
+ RAPTOR) is_depends_enabled $SPELL raptor ;;
+ DBUS) is_depends_enabled $SPELL dbus ;;
+ VIRTUOSO) is_depends_enabled $SPELL virtuoso ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/kde4-support/soprano/SUB_DEPENDS
b/kde4-support/soprano/SUB_DEPENDS
new file mode 100755
index 0000000..64aa2bb
--- /dev/null
+++ b/kde4-support/soprano/SUB_DEPENDS
@@ -0,0 +1,12 @@
+case $THIS_SUB_DEPENDS in
+ REDLAND) message "Redland support requested forcing dependency" &&
+ depends redland ;;
+ RAPTOR) message "Raptor support requested forcing dependency" &&
+ depends raptor ;;
+ DBUS) message "Dbus support requested forcing dependency" &&
+ depends dbus ;;
+ VIRTUOSO) message "Redland support requested forcing dependency" &&
+ runtime_depends virtuoso ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/kde4/kdelibs4/BUILD b/kde4/kdelibs4/BUILD
new file mode 100755
index 0000000..fa55fb3
--- /dev/null
+++ b/kde4/kdelibs4/BUILD
@@ -0,0 +1,3 @@
+# KJS does not work correctly with -ffast-math
+CXXFLAGS="${CXXFLAGS/-ffast-math}" &&
+default_build
diff --git a/kde4/kdelibs4/DEPENDS b/kde4/kdelibs4/DEPENDS
index d3c6a59..8acb1d5 100755
--- a/kde4/kdelibs4/DEPENDS
+++ b/kde4/kdelibs4/DEPENDS
@@ -1,8 +1,27 @@
-source $SECTION_DIRECTORY/KDE_DEPENDS &&
+depends -sub "WEBKIT DBUS SSL OPENGL QT3 TOOLS ACCESS" qt4 &&
+depends iceauth &&
+depends libice &&
+depends libsm &&
+depends libxtst &&
+depends libxext &&
+depends phonon &&
+depends desktop-file-utils &&
+depends dbus &&
+depends pkgconfig &&
+depends openssl &&
+depends pcre &&
+depends strigi &&
+depends -sub "QT4" strigi &&
+depends shared-mime-info &&
+depends perl &&
+depends libpng &&
+depends libxml2 &&
+depends libxslt &&
+depends giflib &&
depends JPEG &&
depends attica &&
depends shared-desktop-ontologies &&
-depends soprano &&
+depends -sub "REDLAND RAPTOR DBUS VIRTUOSO" soprano &&
depends redland &&
depends raptor &&
depends libdbusmenu-qt &&
diff --git a/kde4/kdelibs4/HISTORY b/kde4/kdelibs4/HISTORY
index 820dbe7..c541705 100644
--- a/kde4/kdelibs4/HISTORY
+++ b/kde4/kdelibs4/HISTORY
@@ -1,3 +1,10 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Remove --ffast-math from CXXFLAGS
+
+2011-09-14 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added dependencies from KDE_DEPENDS
+ request soprano with REDLAND RAPTOR DBUS VIRTUOSO support (issue
#223)
+
2011-09-08 Bor Kraljič <pyrobor AT ver.si>
* CONFLICTS: conflict with yakuake and not yakuake4

diff --git a/kde4/kdenetwork4/DEPENDS b/kde4/kdenetwork4/DEPENDS
index cbe9a5f..9f9409f 100755
--- a/kde4/kdenetwork4/DEPENDS
+++ b/kde4/kdenetwork4/DEPENDS
@@ -2,13 +2,14 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
depends kdepimlibs4 &&
depends libv4l &&
depends jasper &&
+depends qca2 &&
optional_depends gmp '' '' 'KGet Torrent support' &&
optional_depends ppp '' '' 'for dialup support' &&
optional_depends openslp '' '' 'to find available remote desktops' &&
optional_depends wireless_tools '' '' 'Wireless support' &&
optional_depends libidn '' '' 'International Domain Name Support' &&
#optional_depends decibel '' '' 'Decibel support' &&
-optional_depends qca2 '' '' 'needed to build kopete' &&
+#optional_depends qca2 '' '' 'needed to build kopete' &&
optional_depends ktorrent4 '' '' 'use system torrent library' &&
optional_depends alsa-lib '' '' 'sound support' &&
optional_depends xmms '' '' 'nowlistening plugin' &&
diff --git a/kde4/kdenetwork4/HISTORY b/kde4/kdenetwork4/HISTORY
index 2f475eb..1e6f692 100644
--- a/kde4/kdenetwork4/HISTORY
+++ b/kde4/kdenetwork4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: qca2 is mandatory dependency (fixes #222)
+
2011-09-07 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.1

diff --git a/kde4/kdenetwork4/WIP b/kde4/kdenetwork4/WIP
deleted file mode 100644
index dc85f9c..0000000
--- a/kde4/kdenetwork4/WIP
+++ /dev/null
@@ -1,7 +0,0 @@
-2009-11-24
-
--- Building KGet torrent support with embedded torrent library (libbtcore)
(-DENABLE_EMBEDDED_TORRENT_SUPPORT=false to disable)
-CMake Error: File
/var/git/kdenetwork/kget/transfer-plugins/bittorrent/libbtcore/config-btcore.h.cmake
does not exist.
-CMake Error at kget/transfer-plugins/bittorrent/CMakeLists.txt:47
(configure_file):
- configure_file Problem configuring file
-
diff --git a/kernels/cloop/DETAILS b/kernels/cloop/DETAILS
index ea9be2d..0ef7237 100755
--- a/kernels/cloop/DETAILS
+++ b/kernels/cloop/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-2.01
SOURCE_URL[0]=http://developer.linuxtag.net/knoppix/sources/$SOURCE

SOURCE_HASH=sha512:0beb9ea553d10e7c89a715678207642d8184194f2b41842c140a183c6b8a766be45ff5fa89ec2905254ac47b7da1bca7473a71e371e5af11d35e99fe1a1b8d09
- WEB_SITE=http://www.knoppix.net/docs/index.php/cloop
+ WEB_SITE=http://www.knoppix.net/wiki/Cloop
ENTERED=20041228
LICENSE[0]=GPL
KEYWORDS="kernels"
diff --git a/kernels/cloop/HISTORY b/kernels/cloop/HISTORY
index 73337cc..f30cf95 100644
--- a/kernels/cloop/HISTORY
+++ b/kernels/cloop/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated WEB_SITE
+
2010-04-11 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Fix kernel headers path

diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index 9367123..218280f 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -7,8 +7,8 @@ depends smgl-fhs &&
depends smgl-archspecs &&
optional_depends libselinux '--with-selinux' '--without-selinux' 'for
selinux support' &&

-if [ "$GLIBC_CVS" = "y" ]; then
- depends CVS
+if [ "$GLIBC_GIT" = "y" ]; then
+ depends git
fi &&

if [ "$GLIBC_USEIDN" = "y" ]; then
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 926e198..0219656 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -20,17 +20,18 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE5_HASH=sha512:c1931495915c8461de97e4156c9d0edd7b44e4b48cbce2d4c3a52b83d331a9ce48f3c7abb7dd787ed897f1e7d0e81c5cdb4eb3986bc24a5e2788708427e2dcb1
PATCHLEVEL=1
else
- if [[ "$GLIBC_CVS" == "y" ]]; then
+ if [[ "$GLIBC_GIT" == "y" ]]; then
local GLIBC_VERSION
GLIBC_VERSION=2.13
- if [[ "${GLIBC_CVS_AUTOUPDATE}" == "y" ]]; then
- VERSION=${GLIBC_VERSION}-$(date +%Y%m%d) && FORCE_DOWNLOAD=on
+ if [[ "${GLIBC_GIT_AUTOUPDATE}" == "y" ]]; then
+ VERSION=${GLIBC_VERSION}-git-$(date +%Y%m%d)
else
- VERSION=${GLIBC_VERSION}
+ VERSION=${GLIBC_VERSION}-git
fi
- SOURCE=$SPELL-${GLIBC_VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${GLIBC_VERSION}
-
SOURCE_URL=cvs://:pserver:anoncvs:anoncvs AT sources.redhat.com:/cvs/glibc:libc:$SPELL-${GLIBC_VERSION/./_}-branch
+ FORCE_DOWNLOAD=on
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+
SOURCE_URL="git://sourceware.org/git/glibc.git:$SPELL-git:release/${GLIBC_VERSION}/master"
SOURCE_IGNORE=volatile
else
VERSION=2.13
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7416236..642b1f9 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * PREPARE,DETAILS: changed cvs url to git (uses 2.13 branch) (fixes
#195)
+ * DEPENDS: replaced CVS with git
+
2011-07-25 Ladislav Hagara <hgr AT vabo.cz>
* PREPARE, DETAILS: linux 3 support added

diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 14df969..39ce0cc 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -5,9 +5,9 @@ if [[ $(uname -r) = 2.6.* ]] || [[ $(uname -r) = 3.*
]]; then
else
config_query GLIBC_NPTL "As you are running a $(uname -r | cut -f1,2
-d.) kernel, would you like to use the new nptl (Native Posix Thread
Libary)?" y &&
if [[ "$GLIBC_NPTL" == "y" ]]; then
- config_query GLIBC_CVS "Do you want to install the latest unstable
release (requires cvs)?" n &&
- if [[ "$GLIBC_CVS" == "y" ]]; then
- config_query GLIBC_CVS_AUTOUPDATE "Update cvs repo on every system
update?" n
+ config_query GLIBC_GIT "Do you want to install the latest unstable
(requires git)?" n &&
+ if [[ "$GLIBC_GIT" == "y" ]]; then
+ config_query GLIBC_GIT_AUTOUPDATE "Update on every system update?" n
fi
fi &&
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
diff --git a/libs/libestr/DETAILS b/libs/libestr/DETAILS
index faf20bb..0f5355e 100755
--- a/libs/libestr/DETAILS
+++ b/libs/libestr/DETAILS
@@ -1,8 +1,8 @@
SPELL=libestr
- VERSION=0.1.0
+ VERSION=0.1.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://${SPELL}.adiscon.com/files/download/${SOURCE}
-
SOURCE_HASH=sha512:b237f91cecfee117b0c3ab5e0d4890c9d1cdf188c3862e002d0430dc033e2b61e63f1d6174d9c644a65afb4753f6684c6bb4889a72d70e12a4902d43d2f1237e
+ SOURCE_URL[0]=http://libestr.adiscon.com/files/download/${SOURCE}
+
SOURCE_HASH=sha512:dd423f534d4aad72819d6ed27b0b29a66afd3955acfda4051a389398e58cb2b6f25d47b79729df19e86fdf3cbd2a6e4814e670e4d8d27eaa07f6c40bd01e5667
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://libestr.adiscon.com/";
LICENSE[0]=GPL
diff --git a/libs/libestr/HISTORY b/libs/libestr/HISTORY
index 26a5229..d678091 100644
--- a/libs/libestr/HISTORY
+++ b/libs/libestr/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.1.2
+
2011-04-06 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: spell created

diff --git a/libs/libmemcached/DETAILS b/libs/libmemcached/DETAILS
index ce8ef26..58dea42 100755
--- a/libs/libmemcached/DETAILS
+++ b/libs/libmemcached/DETAILS
@@ -1,10 +1,10 @@
SPELL=libmemcached
- VERSION=0.51
+ VERSION=0.52
LP_SERIES=1.0
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://launchpad.net/$SPELL/$LP_SERIES/$VERSION/+download/$SOURCE
SOURCE_URL[1]=http://download.tangent.org/$SOURCE
-
SOURCE_HASH=sha512:99895eb433d318bca92766e25f3c2abd626e917242abea60adfd0204708e942db1989a6413b09f7c2aa6be5424968d5843fa965fc9682120eb669a06e9298a3a
+
SOURCE_HASH=sha512:3c4382ea534fa5beded89d6a9c26715391fe2d048e09ca778e7d86f181216de78125738445a457b027633004e5d914ed989cae563d676f2079c8afc11478c038
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://libmemcached.org/libMemcached.html";
LICENSE[0]=BSD
diff --git a/libs/libmemcached/HISTORY b/libs/libmemcached/HISTORY
index 889d69d..3932bc0 100644
--- a/libs/libmemcached/HISTORY
+++ b/libs/libmemcached/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.52
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 4e816fd..1f2ee73 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
SPELL=dovecot
- VERSION=2.0.13
+ VERSION=2.0.14
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -7,8 +7,8 @@
SOURCE_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE
SOURCE2_URL[0]=http://www.dovecot.org/releases/${VERSION%.*}/$SOURCE2
if [[ "$DOVECOT_PIGEONHOLE" == "y" ]]; then
- VERSION2=0.2.3
- PATHCLEVEL=8
+ VERSION2=0.2.4
+ PATHCLEVEL=9
SOURCE3=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz
SOURCE4=$SPELL-${VERSION%.*}-pigeonhole-$VERSION2.tar.gz.sig
SOURCE3_URL[0]=http://www.rename-it.nl/dovecot/${VERSION%.*}/$SOURCE3
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 7df7f25..339f582 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 2.0.14, pigeonhole to 0.2.4
+
2011-05-27 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: updated spell to 2.0.13, updated pigeonhole to 0.2.3.
SECURITY_PATCH=5 CVE-2011-1929
diff --git a/mobile/obex-data-server/DETAILS b/mobile/obex-data-server/DETAILS
index 5a8233e..c1057e5 100755
--- a/mobile/obex-data-server/DETAILS
+++ b/mobile/obex-data-server/DETAILS
@@ -1,8 +1,8 @@
SPELL=obex-data-server
- VERSION=0.4.5
+ VERSION=0.4.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://tadas.dailyda.com/software/$SOURCE
-
SOURCE_HASH=sha512:086d0fd099174421df1a91262f34259125bb2bc14e0a12c4ea046b83a8668e7fab00aa296bde14eb364235694a45143f6fc8aff150fed5bd18c63d9e7e0e4838
+
SOURCE_HASH=sha512:5f924377fa45fec22a15d74fa45bf6ae98f56a9f8c98142cce6123e4ca6dcca042a636469b491f4103e230e270ad1af18dc38274b661795cac4beb4f7b798d5b
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://wiki.muiline.com/obex-data-server
LICENSE[0]=GPL
diff --git a/mobile/obex-data-server/HISTORY b/mobile/obex-data-server/HISTORY
index 0e17ca9..da9f935 100644
--- a/mobile/obex-data-server/HISTORY
+++ b/mobile/obex-data-server/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.4.6
+
2009-10-21 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.4.5

diff --git a/net/dnsmasq/DETAILS b/net/dnsmasq/DETAILS
index 7fd16b7..43d44a8 100755
--- a/net/dnsmasq/DETAILS
+++ b/net/dnsmasq/DETAILS
@@ -1,5 +1,5 @@
SPELL=dnsmasq
- VERSION=2.57
+ VERSION=2.58
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.thekelleys.org.uk/dnsmasq/$SOURCE
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index 2fa7c11..562a12d 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -1,3 +1,7 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 2.58
+ * PRE_BUILD: added hack to build with dbus (from Arch Linux) (fixes
#183)
+
2011-05-19 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 2.57
* DEPENDS: --enable-dbus had no use, changed to optional -DHAVE_DBUS
in BUILD
diff --git a/net/dnsmasq/PRE_BUILD b/net/dnsmasq/PRE_BUILD
new file mode 100755
index 0000000..08e6829
--- /dev/null
+++ b/net/dnsmasq/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if is_depends_enabled $SPELL dbus; then
+ # link against dbus
+ echo '#define HAVE_DBUS' >> src/config.h
+fi
diff --git a/net/dnsmasq/dnsmasq-2.57.tar.gz.sig
b/net/dnsmasq/dnsmasq-2.57.tar.gz.sig
deleted file mode 100644
index f02926e..0000000
Binary files a/net/dnsmasq/dnsmasq-2.57.tar.gz.sig and /dev/null differ
diff --git a/net/dnsmasq/dnsmasq-2.58.tar.gz.sig
b/net/dnsmasq/dnsmasq-2.58.tar.gz.sig
new file mode 100644
index 0000000..459a171
Binary files /dev/null and b/net/dnsmasq/dnsmasq-2.58.tar.gz.sig differ
diff --git a/net/monit/BUILD b/net/monit/BUILD
new file mode 100755
index 0000000..9781da1
--- /dev/null
+++ b/net/monit/BUILD
@@ -0,0 +1,3 @@
+OPTS="--bindir=/sbin $OPTS" &&
+default_build_configure &&
+default_build_make
diff --git a/net/monit/CONFIGURE b/net/monit/CONFIGURE
new file mode 100755
index 0000000..f0debb2
--- /dev/null
+++ b/net/monit/CONFIGURE
@@ -0,0 +1 @@
+config_query_option MONIT_OPTS 'Enable optimised build' n
'--enable-optimized' '--disable-optimized'
diff --git a/net/monit/DEPENDS b/net/monit/DEPENDS
index ebcdd0d..3dfc6fc 100755
--- a/net/monit/DEPENDS
+++ b/net/monit/DEPENDS
@@ -1 +1,2 @@
-optional_depends openssl '--with-ssl' '--without-ssl' 'for SSL support'
+optional_depends openssl '--with-ssl' '--without-ssl' 'for SSL support' &&
+optional_depends linux-pam '' '--without-pam' 'for PAM support'
diff --git a/net/monit/DETAILS b/net/monit/DETAILS
index a2986fc..c492ba8 100755
--- a/net/monit/DETAILS
+++ b/net/monit/DETAILS
@@ -1,6 +1,6 @@
SPELL=monit
- VERSION=5.2.5
-
SOURCE_HASH=sha512:422a09fc31be5b338f542c2f400ea5c57840e1471f5a3516b5c70bdb3fa0b763adfef81ec046b51410b3fb3c6cd47b5709670ee7e1d50ce2c2d7fa2621fc51a8
+ VERSION=5.3
+
SOURCE_HASH=sha512:4f2027e707496b3459e37b49ea22e6695d514b678310b48b7d1e736c60bb99dc0dc5a957829f2f2df6e268ac287f2c3a171561330db52ce2bd29329162070c71
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]="http://mmonit.com/monit/dist/${SOURCE}";
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/net/monit/HISTORY b/net/monit/HISTORY
index f8e4f7a..a22c958 100644
--- a/net/monit/HISTORY
+++ b/net/monit/HISTORY
@@ -1,3 +1,9 @@
+2011-09-13 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DETAILS: updated spell to 5.3
+ * BUILD: added for OPTS
+ * CONFIGURE: added optimise
+ * DEPENDS: added linux-pam optional
+
2011-05-26 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 5.2.5

diff --git a/net/stunnel/DETAILS b/net/stunnel/DETAILS
index 1b92dd5..50d12b9 100755
--- a/net/stunnel/DETAILS
+++ b/net/stunnel/DETAILS
@@ -1,5 +1,5 @@
SPELL=stunnel
- VERSION=4.42
+ VERSION=4.44
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/stunnel/HISTORY b/net/stunnel/HISTORY
index 09c3613..ff7f39b 100644
--- a/net/stunnel/HISTORY
+++ b/net/stunnel/HISTORY
@@ -1,3 +1,6 @@
+2011-09-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.44
+
2011-08-20 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.42
Fixed SOURCE_URL[1], SOURCE_URL[2]
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 6ad54a4..7387f0a 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,7 +4,7 @@ if [ "$TOR_DEVEL" == "y" ]; then
VERSION=0.2.2.23-alpha
SECURITY_PATCH=4
else
- VERSION=0.2.2.32
+ VERSION=0.2.2.33
SECURITY_PATCH=4
fi

diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 0b95b4c..c352839 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.2.2.33
+
2011-08-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.2.2.32; quoting paths

diff --git a/python-pypi/bzr/DETAILS b/python-pypi/bzr/DETAILS
index b913de2..22a521e 100755
--- a/python-pypi/bzr/DETAILS
+++ b/python-pypi/bzr/DETAILS
@@ -1,5 +1,5 @@
SPELL=bzr
- VERSION=2.4.0
+ VERSION=2.4.1
VX=`echo $VERSION|cut -c-3`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/python-pypi/bzr/HISTORY b/python-pypi/bzr/HISTORY
index 797ce71..4eb1f85 100644
--- a/python-pypi/bzr/HISTORY
+++ b/python-pypi/bzr/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.1
+
2011-08-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.0

diff --git a/python-pypi/camelot/DETAILS b/python-pypi/camelot/DETAILS
index d83d486..80e0596 100755
--- a/python-pypi/camelot/DETAILS
+++ b/python-pypi/camelot/DETAILS
@@ -1,7 +1,7 @@
SPELL=camelot
SPELLX=Camelot
- VERSION=11.05.13
-
SOURCE_HASH=sha512:0bf408734e0bcb5e5787357eb20c41813408c4863e6d02e2a9dd99ca98301f2025f5122bf731e3759e0fd2da0fcca53699cf01ecf4d41d8d04532400c7ff7899
+ VERSION=11.09.10
+
SOURCE_HASH=sha512:29adaaf9bc9db056f6ec32140ba69c78353cdeb9d47885739d5e9c5204633e97ac7fc1fcb81f4a903649f27fac5f99ff4f85c4da1389de36092571a3fbdab2f3
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/C/$SPELLX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/camelot/HISTORY b/python-pypi/camelot/HISTORY
index efe1ba5..e6b9bdb 100644
--- a/python-pypi/camelot/HISTORY
+++ b/python-pypi/camelot/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 11.09.10
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/python-pypi/django/DETAILS b/python-pypi/django/DETAILS
index 8a1707c..00e2330 100755
--- a/python-pypi/django/DETAILS
+++ b/python-pypi/django/DETAILS
@@ -11,11 +11,12 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.3
+ VERSION=1.3.1
+ SECURITY_PATCH=1
SOURCE=Django-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Django-$VERSION"
SOURCE_URL[0]=http://www.djangoproject.com/download/$VERSION/tarball/
-
SOURCE_HASH=sha512:b70f45a86b3f6823a8dda5a90e97745d640d7a1b20281aac0008a353097cd9318bb18317b246a65e1aa825f9f7c0f0d592db600a6c82388276f3ff526fff8b63
+
SOURCE_HASH=sha512:5a7de5877634136bf6ac8e85b54420bbd08331b22c24798e47e4c805f7f05053dff0da8a7585827945e211bb28a935e14ac9cf9efc4eb38f7d8b59686758bb3a
fi
WEB_SITE=http://www.djangoproject.com/
LICENSE[0]=BSD
diff --git a/python-pypi/django/HISTORY b/python-pypi/django/HISTORY
index ac302d3..6375739 100644
--- a/python-pypi/django/HISTORY
+++ b/python-pypi/django/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.1; SECURITY_PATCH++
+
2011-05-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3

diff --git a/python-pypi/fb-python/DETAILS b/python-pypi/fb-python/DETAILS
index c5782ec..04e43b6 100755
--- a/python-pypi/fb-python/DETAILS
+++ b/python-pypi/fb-python/DETAILS
@@ -1,7 +1,7 @@
SPELL=fb-python
SPELLX=firebirdsql
- VERSION=0.4.4
-
SOURCE_HASH=sha512:4775a7cf224db5b31e68045bcd7ff9fb1f5a652b0ccf924da2c4caa671320eb9fe90f5515495605cf7ff3503db353ec5a2202f328bca727998b44231b9d773df
+ VERSION=0.5.0
+
SOURCE_HASH=sha512:c75c1ac5f2e9d62823583ef6412422641f828d6b749fc376befc164d94ec936557de3e9db4edb6690dfcb337581589082359d3d4c56c755731ffe24fbfa8da4e
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL=http://pypi.python.org/packages/source/f/$SPELLX/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/python-pypi/fb-python/HISTORY b/python-pypi/fb-python/HISTORY
index c1db1a6..e7ab521 100644
--- a/python-pypi/fb-python/HISTORY
+++ b/python-pypi/fb-python/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.0
+
2011-08-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.4

diff --git a/python-pypi/nevow/DETAILS b/python-pypi/nevow/DETAILS
index d87e0b8..8f07afd 100755
--- a/python-pypi/nevow/DETAILS
+++ b/python-pypi/nevow/DETAILS
@@ -1,11 +1,11 @@
SPELL=nevow
PKG=Nevow
- VERSION=0.9.32
- SOURCE="${PKG}-${VERSION}.tar.gz?format=raw"
-
SOURCE_URL[0]=http://divmod.org/trac/attachment/wiki/SoftwareReleases/${SOURCE}
-
SOURCE_HASH=sha512:235ba0a18970dc74177e82416513546cc2299bff6bf61d422b69057e056efc03680988eb544e59f0929849facc161872b210938734cd36f8f22baf7e30153f46
+ VERSION=0.10.0
+ SOURCE=${SPELL}_${VERSION}.orig.tar.gz
+
SOURCE_URL[0]=https://launchpad.net/ubuntu/oneiric/+source/nevow/0.10.0-4/+files/${SOURCE}
+
SOURCE_HASH=sha512:454c8780655ac9f08107f0aa53dec2bab7e225cd429c7c892218d0dab99d33b5741a95d67f9e41cb2fce57259a4df14b7cbbfc56e9beee8018c1940b06b89d82
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${PKG}-${VERSION}"
- WEB_SITE="http://divmod.org/trac/wiki/DivmodNevow "
+ WEB_SITE="https://launchpad.net/nevow";
LICENSE[0]=MIT
ENTERED=20090102
SHORT="A Web application construction kit."
diff --git a/python-pypi/nevow/HISTORY b/python-pypi/nevow/HISTORY
index b64bb7b..63b9c84 100644
--- a/python-pypi/nevow/HISTORY
+++ b/python-pypi/nevow/HISTORY
@@ -1,3 +1,7 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.10.0 (fixes #96)
+ Fixed SOURCE, SOURCE_URL & WEB_SITE
+
2009-01-02 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS, DETAILS: spell created

diff --git a/python-pypi/pyqscintilla/BUILD b/python-pypi/pyqscintilla/BUILD
new file mode 100755
index 0000000..7809ee4
--- /dev/null
+++ b/python-pypi/pyqscintilla/BUILD
@@ -0,0 +1,4 @@
+QTDIR=/usr &&
+cd $SOURCE_DIRECTORY/Python &&
+python configure.py &&
+make
diff --git a/python-pypi/pyqscintilla/DEPENDS
b/python-pypi/pyqscintilla/DEPENDS
new file mode 100755
index 0000000..53b89e8
--- /dev/null
+++ b/python-pypi/pyqscintilla/DEPENDS
@@ -0,0 +1,8 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+depends qscintilla &&
+depends python &&
+
+if spell_ok qscintilla && is_version_less $(installed_version qscintilla)
$VERSION; then
+ force_depends qscintilla
+fi
+
diff --git a/python-pypi/pyqscintilla/DETAILS
b/python-pypi/pyqscintilla/DETAILS
new file mode 100755
index 0000000..f07d52b
--- /dev/null
+++ b/python-pypi/pyqscintilla/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=pyqscintilla
+ VERSION=2.5.1
+
SOURCE_HASH=sha512:97ed3c387e6a4495a586e921db40502a9b2949672097efb51531c06046e2e0ee88a5adc198b90752acb356ec7bdff75a75a6cddfdbc1dc304a3b880ee3c4e14f
+ SOURCE=QScintilla-gpl-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION
+
WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+
SOURCE_URL[0]=http://www.riverbankcomputing.com/static/Downloads/QScintilla2/$SOURCE
+ LICENSE[0]=GPL
+ ENTERED=20060206
+ KEYWORDS="python qt libs"
+SHORT="Python API for Neil Hodgson's Scintilla C++ editor class"
+cat << EOF
+This spell is installs the Python API part of QScintilla:
+
+QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class.
+As well as features found in standard text editing components, QScintilla
+includes features especially useful when editing and debugging source code.
+These include support for syntax styling, error indicators, code completion
+and call tips. The selection margin can contain markers like those used in
+debuggers to indicate breakpoints and the current line. Styling choices are
+more open than with many editors, allowing the use of proportional fonts,
bold
+and italics, multiple foreground and background colours and multiple fonts.
+EOF
diff --git a/python-pypi/pyqscintilla/HISTORY
b/python-pypi/pyqscintilla/HISTORY
new file mode 100644
index 0000000..aaae835
--- /dev/null
+++ b/python-pypi/pyqscintilla/HISTORY
@@ -0,0 +1,3 @@
+2011-09-14 Robert Figura <template AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: version 2.5.1
+ spell created (cut&paste from qscintilla)
diff --git a/python-pypi/pyqscintilla/INSTALL
b/python-pypi/pyqscintilla/INSTALL
new file mode 100755
index 0000000..9b71ccb
--- /dev/null
+++ b/python-pypi/pyqscintilla/INSTALL
@@ -0,0 +1,3 @@
+QTDIR=/usr &&
+cd $SOURCE_DIRECTORY/Python &&
+make install
diff --git a/science/viking/HISTORY b/science/viking/HISTORY
index 43a30f2..79c4c3f 100644
--- a/science/viking/HISTORY
+++ b/science/viking/HISTORY
@@ -1,3 +1,7 @@
+2011-09-15 Bor Kraljič <pyrobor AT ver.si>
+ * curl_types.patch: fixes build after curl update (upstream patch)
+ * PRE_BUILD: apply the patch for curl/types.h
+
2011-06-17 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.2.1

diff --git a/science/viking/PRE_BUILD b/science/viking/PRE_BUILD
new file mode 100755
index 0000000..1273ebd
--- /dev/null
+++ b/science/viking/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/curl_types.patch
diff --git a/science/viking/curl_types.patch b/science/viking/curl_types.patch
new file mode 100644
index 0000000..803e12d
--- /dev/null
+++ b/science/viking/curl_types.patch
@@ -0,0 +1,24 @@
+From f715a77fbdc11aafff35f066380b34a99401a698 Mon Sep 17 00:00:00 2001
+From: Hanno Boeck <ctulhu AT users.sourceforge.net>
+Date: Mon, 25 Jul 2011 19:39:59 +0100
+Subject: [PATCH] Fix compilation with curl 7.21.7 (SF#3376584)
+
+Remove include of curl/types.h, which has been deprecated for a long time.
+---
+ src/osm-traces.c | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/osm-traces.c b/src/osm-traces.c
+index 6ef5bb5..f5088ce 100644
+--- a/src/osm-traces.c
++++ b/src/osm-traces.c
+@@ -27,7 +27,6 @@
+ #include <errno.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <glib.h>
+--
+1.7.4.1
diff --git a/security/pwsafe/DETAILS b/security/pwsafe/DETAILS
index 3747bc9..c389199 100755
--- a/security/pwsafe/DETAILS
+++ b/security/pwsafe/DETAILS
@@ -9,10 +9,12 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
ENTERED=20080601
SHORT="a unix commandline program that manages encrypted password
databases"
cat << EOF
-* Pure command-line operation if desired (good for remote access over ssh) *
-or can interact with X11 selection & clipboard. * Portable, endianess-clean,
-misaligned-access-free C++. Compiles cleanly
- on linux, *bsd, macos x, solaris.
-* Compatible with CounterPane's PasswordSafe Win32 program versions 2.x
+Pure command-line operation if desired (good for remote access over ssh)
+or can interact with X11 selection & clipboard.
+
+Portable, endianess-clean, misaligned-access-free C++. Compiles cleanly
+on linux, *bsd, macos x, solaris.
+
+Compatible with CounterPane's PasswordSafe Win32 program versions 2.x
and 1.x.
EOF
diff --git a/security/pwsafe/HISTORY b/security/pwsafe/HISTORY
index 38db71e..768cb57 100644
--- a/security/pwsafe/HISTORY
+++ b/security/pwsafe/HISTORY
@@ -1,3 +1,6 @@
+2011-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fix long description.
+
2010-09-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency from getopt-long to perl

diff --git a/shell-term-fm/mc/DETAILS b/shell-term-fm/mc/DETAILS
index e998039..da00452 100755
--- a/shell-term-fm/mc/DETAILS
+++ b/shell-term-fm/mc/DETAILS
@@ -1,11 +1,12 @@
SPELL=mc
- VERSION=4.7.5.3
+ VERSION=4.7.5.4
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=https://www.midnight-commander.org/downloads/$SOURCE
WEB_SITE=http://www.midnight-commander.org/
ENTERED=20010922
-
SOURCE_HASH=sha512:9b0f2addb168a5152803f234aad16a67351873a8565852a69d5b68cb3292c0d8e4267b83d29d928101d1cc5fa913b6490d03f567ad4e3a8302e796326ddc2f9f
+
SOURCE_HASH=sha512:b5391e1cd7de31c978c46b4582e66dbdfc4b4d590773cf129b4895535d7163a116fa01f4e9313323f921016d2f0275560717108cc8947eed5b014931f709e627
SOURCE_HINTS=no-check-certificate
LICENSE[0]=GPL
KEYWORDS="console"
diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index e07ad41..fde0477 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,10 @@
+2011-09-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD, ctrl-x.patch: official patch added
+
+2011-09-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.7.5.4
+
2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: corrected source url to make it downloadable via wget

diff --git a/shell-term-fm/mc/PRE_BUILD b/shell-term-fm/mc/PRE_BUILD
new file mode 100755
index 0000000..43d3a48
--- /dev/null
+++ b/shell-term-fm/mc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/ctrl-x.patch
diff --git a/shell-term-fm/mc/ctrl-x.patch b/shell-term-fm/mc/ctrl-x.patch
new file mode 100644
index 0000000..87c1aa2
--- /dev/null
+++ b/shell-term-fm/mc/ctrl-x.patch
@@ -0,0 +1,38 @@
+Index: misc/mc.keymap.default
+===================================================================
+--- misc/mc.keymap.default (revision
5f0cef1e6e8982cd0503d025d7c08a36f2fece74)
++++ misc/mc.keymap.default (revision
be145b595b23932570dd79d393fc3b68306f74b9)
+@@ -162,4 +162,8 @@
+ SelectCodepage = alt-e
+
++EditExtMode =
++
++[edit:xmap]
++
+ [viewer]
+ ViewHelp = f1
+@@ -251,5 +255,5 @@
+ CmdReverseSelection = kpasterisk
+ CmdDialogList = alt-prime
+-ExtMap1 =
++ExtMap1 = ctrl-x
+
+ [main:xmap]
+--- misc/mc.keymap (revision 5f0cef1e6e8982cd0503d025d7c08a36f2fece74)
++++ misc/mc.keymap (revision be145b595b23932570dd79d393fc3b68306f74b9)
+@@ -162,4 +162,8 @@
+ SelectCodepage = alt-e
+
++EditExtMode =
++
++[edit:xmap]
++
+ [viewer]
+ ViewHelp = f1
+@@ -251,5 +255,5 @@
+ CmdReverseSelection = kpasterisk
+ CmdDialogList = alt-prime
+-ExtMap1 =
++ExtMap1 = ctrl-x
+
+ [main:xmap]
diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index 674355c..180aa6e 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,6 +1,6 @@
SPELL=file
- VERSION=5.08
-
SOURCE_HASH=sha512:9696d45cbfd4931abe66f13717b227f8a284cd094a32f054d91d40e7f2a16a7d96c4994064887a986b39174de7702e73b7626742a06e4bf736d3e082904004fb
+ VERSION=5.09
+
SOURCE_HASH=sha512:8808b35dae6c150f0ca09ae36813a64dfb1cde2172e1749488e59ccef2e5dd217d8d8d72d1abc86589cddc0a018ccc665491ed1dd0de00bc0bb7e565d9a9dfe2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index 2960327..a4f64e9 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,6 @@
+2011-09-17 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 5.09
+
2011-08-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.08
* PRE_BUILD, file-5.07-zip-detect.patch: removed
diff --git a/utils/flashrom/DEPENDS b/utils/flashrom/DEPENDS
index 9ec18a7..32cc6fb 100755
--- a/utils/flashrom/DEPENDS
+++ b/utils/flashrom/DEPENDS
@@ -1,4 +1,4 @@
-if [[ ${FLASHROM_SCM} == "y" ]]
+if [[ ${FLASHROM_BRANCH} == scm ]]
then
depends subversion
fi &&
diff --git a/utils/flashrom/DETAILS b/utils/flashrom/DETAILS
index 916ea2d..972462f 100755
--- a/utils/flashrom/DETAILS
+++ b/utils/flashrom/DETAILS
@@ -1,8 +1,13 @@
SPELL=flashrom
-if [[ ${FLASHROM_SCM} == "y" ]]
+if [[ ${FLASHROM_BRANCH} == scm ]]
then
+ if [[ $FLASHROM_AUTOUPDATE = y ]]
+ then
+ VERSION=$(date +%Y%m%d)
+ else
VERSION=scm
- SOURCE=${SPELL}-${VERSION}.tar.bz2
+ fi
+ SOURCE=${SPELL}-scm.tar.bz2
SOURCE_URL[0]=svn://coreboot.org/flashrom/trunk:${SOURCE%.tar.bz2}
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
diff --git a/utils/flashrom/HISTORY b/utils/flashrom/HISTORY
index c68e8be..ac67de1 100644
--- a/utils/flashrom/HISTORY
+++ b/utils/flashrom/HISTORY
@@ -1,3 +1,9 @@
+2011-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE for scm
+
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2010-03-28 Quentin Rameau <quinq AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, BUILD, INSTALL, HISTORY:
spell created
diff --git a/utils/flashrom/PREPARE b/utils/flashrom/PREPARE
index 849c43e..98d27e4 100755
--- a/utils/flashrom/PREPARE
+++ b/utils/flashrom/PREPARE
@@ -1,6 +1,2 @@
-config_query FLASHROM_SCM "Build SCM (svn) version?" n &&
-
-if [[ ${FLASHROM_SCM} == "y" ]]
-then
- config_query FLASHROM_SCM_AUTOUPDATE "Update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/utils/gnuplot/BUILD b/utils/gnuplot/BUILD
index caba3fc..95ff7a2 100755
--- a/utils/gnuplot/BUILD
+++ b/utils/gnuplot/BUILD
@@ -1,12 +1,6 @@
OPTS="--without-tutorial $OPTS" &&

-if [[ $GNUPLOT_SCM == "y" ]]; then
+if [[ $GNUPLOT_BRANCH == scm ]]; then
./prepare
fi &&
-if [[ $GNUPLOT_LUA == "y" ]]; then
- LIBS="-llua $LIBS"
- cd $SOURCE_DIRECTORY/gnuplot_lua_terminal &&
- lua gnuplot.lua style &&
- cd $SOURCE_DIRECTORY
-fi &&
default_build
diff --git a/utils/gnuplot/DEPENDS b/utils/gnuplot/DEPENDS
index fe25f6a..8c560a1 100755
--- a/utils/gnuplot/DEPENDS
+++ b/utils/gnuplot/DEPENDS
@@ -20,10 +20,12 @@ optional_depends svgalib \
"--with-linux-vga" \
"--without-linux-vga" \
"Linux SVGA console driver?" &&
-if ! [[ $GNUPLOT_LUA == "n" ]]; then
- depends texlive &&
- depends lua
-fi &&
+
+optional_depends lua "--with-lua" "--without-lua" \
+ "lua/TikZ terminal" &&
+
+optional_depends cairo "--with-cairo" "--without-cairo" \
+ "cairo-based terminals" &&

if is_depends_enabled $SPELL wxgtk; then
depends cairo &&
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS
index d2a23c7..7b69eaf 100755
--- a/utils/gnuplot/DETAILS
+++ b/utils/gnuplot/DETAILS
@@ -1,5 +1,5 @@
SPELL=gnuplot
-if [[ $GNUPLOT_SCM == "y" ]]; then
+if [[ $GNUPLOT_BRANCH == scm ]]; then
if [[ $GNUPLOT_AUTOUPDATE == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
@@ -17,11 +17,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE_HASH=sha512:dc520e8074e00f8ba346451ca9e229c31907735185f0ed4ae066ad5f2caa799db04c28181729bef1af467af7341f3b721eba8a0d5ecd6988c5740351fe002fd6
fi
-if [[ $GNUPLOT_LUA == "y" ]]; then
- SOURCE2=${SPELL}_lua_terminal.tgz
- SOURCE2_URL[0]=http://peter.affenbande.org/$SPELL/$SOURCE2
- SOURCE2_IGNORE=unversioned
-fi
WEB_SITE=http://www.gnuplot.info
ENTERED=20020210

LICENSE[0]=http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright?view=markup
diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY
index 41a758b..4b2e6d7 100644
--- a/utils/gnuplot/HISTORY
+++ b/utils/gnuplot/HISTORY
@@ -1,3 +1,12 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, PREPARE, DETAILS: Use prepare_select_branch
+
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DEPENDS: added lua and cairo as optional dependency
+ * DETAILS: removed SOURCE & SOURCE_URL for lua 3rd party addon (fixes
#138)
+ * PREPARE: removed query about lua 3rd party addon
+ * BUILD: removed code for building lua 3rd party addon
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/utils/gnuplot/PREPARE b/utils/gnuplot/PREPARE
index 6528253..98d27e4 100755
--- a/utils/gnuplot/PREPARE
+++ b/utils/gnuplot/PREPARE
@@ -1,9 +1,2 @@
-config_query GNUPLOT_SCM "Do you want to use the development version from
CVS?" n &&
-
-if [[ $GNUPLOT_SCM == "y" ]]; then
- config_query GNUPLOT_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi &&
-
-config_query GNUPLOT_LUA "Do you want to enable the lua terminal (3rd party
addon)?" n
-
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/utils/pv/DETAILS b/utils/pv/DETAILS
new file mode 100755
index 0000000..1def3f4
--- /dev/null
+++ b/utils/pv/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=pv
+ VERSION=1.2.0
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=http://pipeviewer.googlecode.com/files/${SOURCE}
+
SOURCE_HASH=sha512:9b5a880b54b55f79c421b159fd6de379cacf233ba32ccdaa51cfdd18db5959b366ab50074ff84e67b09fd8377bcc9ef428efd864da1d5a8774ecbb7d3936475d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ DOCS="COPYING NEWS TODO"
+ WEB_SITE=http://www.ivarch.com/programs/pv.shtml
+ LICENSE[0]=Artistic
+ ENTERED=20110916
+ SHORT="terminal-based tool for monitoring the progress of data
through a pipeline"
+cat << EOF
+Pipe Viewer is a terminal-based tool for monitoring the progress of data
through
+a pipeline. It can be inserted into any normal pipeline between two
processes to
+give a visual indication of how quickly data is passing through, how long it
has
+taken, how near to completion it is, and an estimate of how long it will be
+until completion.
+EOF
diff --git a/utils/pv/HISTORY b/utils/pv/HISTORY
new file mode 100644
index 0000000..24ba4c1
--- /dev/null
+++ b/utils/pv/HISTORY
@@ -0,0 +1,2 @@
+2011-09-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: spell created
diff --git a/utils/rsyslog/DETAILS b/utils/rsyslog/DETAILS
index 51fb485..58e362e 100755
--- a/utils/rsyslog/DETAILS
+++ b/utils/rsyslog/DETAILS
@@ -1,16 +1,17 @@
SPELL=rsyslog

if [[ "${RSYSLOG_BRANCH}" == "devel" ]]; then
- VERSION=6.3.1
- SECURITY_PATCH=1
-
SOURCE_HASH=sha512:ac47ec4a5540c3d8ffe3e63a64fe1a75caa97c2e366b5464bf98692fb8f46da3ea4160671abef5900bed9f01a0d0cbb22a9bbc37d99b3b9492902c82ee7f2206
+ VERSION=6.3.5
+ SECURITY_PATCH=2
+
SOURCE_HASH=sha512:91d33c96c3c251baccb0ce04b27051aa5c605a5a1c31158e4e9a01796f8102af639f9a22227d41541d39275720c3227d09965787998fca897015961462ce38cc
elif [[ "${RSYSLOG_BRANCH}" == "v4stable" ]]; then
- VERSION=4.6.5
- SECURITY_PATCH=1
-
SOURCE_HASH=sha512:56444acde025ad2dacea3aa394ee9e2d84d7a54a9fff083c8cee84df4885c661d8ae7685f79dab82700ba25eb7f5cd3dd748615c530aa5705a32b0aea60d1828
+ VERSION=4.8.0
+ SECURITY_PATCH=2
+
SOURCE_HASH=sha512:47cef6c60a9fc0505c315cbf532755af78ea53af09e127a01d99c38ae52c026cf7f0b828881d6536ee131ef050f036cede297c1d070fa565cec98391158a7be6
elif [[ "${RSYSLOG_BRANCH}" == "v5stable" ]]; then
- VERSION=5.8.2
-
SOURCE_HASH=sha512:c4e99ea98bc89940e47d87f8493db8efda956244657f3fcd9b60fa8d8d7d7c3ae4676dea3fda65660b61e2a40642e336c46d59fb2c0ace0e5aa3008d1884d2d2
+ VERSION=5.8.5
+ SECURITY_PATCH=1
+
SOURCE_HASH=sha512:0e38bd03d0dd681f68ab11ef2f9d0633958a49d50379721f807fc9d31441b192c331ff56df0c8f8b5c319e0d9c65072402559ace665e80cce4f251dd24e45715
else
VERSION=3.22.3
SECURITY_PATCH=1
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 1ccbccf..f07d2f9 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,4 +1,8 @@
-2001-06-24 Elisamuel Resto <ryuji AT sourcemage.org>
+2011-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.8.0 (v4stable), 5.8.5 (v5stable), 6.3.5
+ (devel), SECURITY_PATCH++ (fixes CVE-2011-3200)
+
+2011-06-24 Elisamuel Resto <ryuji AT sourcemage.org>
* DETAILS: devel updated to 6.3.1, v5stable to 5.8.2

2011-04-06 Arjan Bouter <abouter AT sourcemage.org>
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index 6bb6eb3..c9bbdff 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -194,7 +194,7 @@ optional_depends samba \
"for Samba input support" &&

optional_depends vcdimager-unstable \
- "--with-external-vcdnav" "" \
+ "" "--with-internal-vcdlibs" \
"for dynamically linked vcd plugin (not recommended)" &&

optional_depends libfame \
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 3a603ac..ef720a4 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,8 @@
+2011-09-13 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: configure switch for vcdimager-unstable has changed from
+ --with-external-vcdnav to use it, to --with-internal-vcdlibs not to
+ use it (fix issue #133)
+
2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Fix compiling with libxvmc 1.0.6
See
http://www.mail-archive.com/blfs-support AT linuxfromscratch.org/msg12514.html
diff --git a/video/dvdauthor/DETAILS b/video/dvdauthor/DETAILS
index 304f7bc..c13fe7a 100755
--- a/video/dvdauthor/DETAILS
+++ b/video/dvdauthor/DETAILS
@@ -1,9 +1,9 @@
SPELL=dvdauthor
- VERSION=0.6.14
+ VERSION=0.7.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_HASH=sha512:97fd7906cfe9fc4f8ba45225875398464432f3cf4739743d3bdf3f7fb40cfda929c5d155bbcf1ecb05768cb53d146b1c50346a47c740e675b6b21892450079b6
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+
SOURCE_HASH=sha512:2f450ef02dac774a8611f3398f71a8d9d4f7ebb3c9de56ec1c4ec2d54350f371bf32387f95bc90dcd399618819f46cd589cacfef6f7aae68ee3addda5e9ce892
WEB_SITE=http://dvdauthor.sourceforge.net/
ENTERED=20030921
LICENSE[0]=GPL
diff --git a/video/dvdauthor/HISTORY b/video/dvdauthor/HISTORY
index bf01fd4..1017ab4 100644
--- a/video/dvdauthor/HISTORY
+++ b/video/dvdauthor/HISTORY
@@ -1,3 +1,6 @@
+2011-09-12 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.7.0 (fixed SOURCE_DIRECTORY)
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/video/xine-ui/HISTORY b/video/xine-ui/HISTORY
index 5e48d25..f9ce18d 100644
--- a/video/xine-ui/HISTORY
+++ b/video/xine-ui/HISTORY
@@ -1,3 +1,7 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: apply the patch
+ * curl.patch: added, to fix compilation with curl >=7.21.7
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* xine.desktop: added generic name

diff --git a/video/xine-ui/PRE_BUILD b/video/xine-ui/PRE_BUILD
index 33a35e7..4d61fa0 100755
--- a/video/xine-ui/PRE_BUILD
+++ b/video/xine-ui/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/curl.patch" &&
+
sed -i "s: install-data-hook::" misc/Makefile.in
diff --git a/video/xine-ui/curl.patch b/video/xine-ui/curl.patch
new file mode 100644
index 0000000..57a7f57
--- /dev/null
+++ b/video/xine-ui/curl.patch
@@ -0,0 +1,10 @@
+--- src/xitk/download.c.orig 2009-12-19 03:34:22.000000000 +0300
++++ src/xitk/download.c 2011-09-14 23:13:28.299536494 +0400
+@@ -28,7 +28,6 @@
+
+ #ifdef HAVE_CURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+
diff --git a/windowmanagers/wmii/DEPENDS b/windowmanagers/wmii/DEPENDS
index 6f28dda..d074d88 100755
--- a/windowmanagers/wmii/DEPENDS
+++ b/windowmanagers/wmii/DEPENDS
@@ -11,6 +11,6 @@ optional_depends PLAN9TOOLS \
optional_depends dmenu \
"" "" "for dynamic menus (of programs and actions)" &&

-if [[ ${WMII_RELEASE} == "SCM version" ]]; then
+if [[ ${WMII_BRANCH} == scm ]]; then
depends mercurial
fi
diff --git a/windowmanagers/wmii/DETAILS b/windowmanagers/wmii/DETAILS
index 760ba9d..0fb0599 100755
--- a/windowmanagers/wmii/DETAILS
+++ b/windowmanagers/wmii/DETAILS
@@ -1,5 +1,5 @@
SPELL="wmii"
-if [[ ${WMII_RELEASE} == "SCM version" ]]; then
+if [[ ${WMII_BRANCH} == scm ]]; then
if [[ ${WMII_AUTOUPDATE} == "y" ]]
then
VERSION=$(date +%Y%m%d)
diff --git a/windowmanagers/wmii/DOWNLOAD b/windowmanagers/wmii/DOWNLOAD
index b57329b..7e0495f 100755
--- a/windowmanagers/wmii/DOWNLOAD
+++ b/windowmanagers/wmii/DOWNLOAD
@@ -1,7 +1,7 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg
handler

-if [[ $WMII_RELEASE != "SCM version" ]]; then
+if [[ $WMII_BRANCH != scm ]]; then
default_download
else
. $GRIMOIRE/hg_download.function
diff --git a/windowmanagers/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index c5fed2b..e23efb6 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DOWNLOAD, PREPARE, DETAILS: Use prepare_select_branch
+
2011-07-25 Bor Kraljič <pyrobor AT ver.si>
* DOWNLOAD: source $GRIMOIRE/hg_download.function before using
hg_download

diff --git a/windowmanagers/wmii/PREPARE b/windowmanagers/wmii/PREPARE
index e5bfaa0..98d27e4 100755
--- a/windowmanagers/wmii/PREPARE
+++ b/windowmanagers/wmii/PREPARE
@@ -1,7 +1,2 @@
-config_query_list WMII_RELEASE "Which release would you like to build ?" \
- "release" \
- "SCM version" &&
-if [[ ${WMII_RELEASE} == "SCM version" ]]
-then
- config_query WMII_AUTOUPDATE "Update on every system update ?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index 3a6bfdb..8d4b27f 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -2,7 +2,7 @@ depends bison &&
depends flex &&
depends giflib &&

-if [[ $WINE_VCS == y ]]; then
+if [[ $WINE_BRANCH == scm ]]; then
depends git
fi &&

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 89aed33..c88582d 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -1,6 +1,6 @@
SPELL=wine
-if [[ $WINE_VCS == y ]]; then
- if [[ $WINE_VCS_AUTOUPDATE == y ]]; then
+if [[ $WINE_BRANCH == scm ]]; then
+ if [[ $WINE_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
@@ -11,7 +11,7 @@ if [[ $WINE_VCS == y ]]; then
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
- if [[ $WINE_DEVEL == y ]]; then
+ if [[ $WINE_BRANCH == devel ]]; then
VERSION=1.3.28
else
VERSION=1.2.3
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index d86624e..b8ecf51 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PRE_BUILD, PREPARE: Use prepare_select_branch
+
2011-09-09 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated latest devel to 1.3.28

diff --git a/x11-libs/wine/PREPARE b/x11-libs/wine/PREPARE
index 23526f2..40600f7 100755
--- a/x11-libs/wine/PREPARE
+++ b/x11-libs/wine/PREPARE
@@ -1,8 +1,2 @@
-config_query WINE_VCS "Build latest version from development tree?" n &&
-
-if [[ $WINE_VCS == y ]]; then
- config_query WINE_VCS_AUTOUPDATE \
- "Automatically update on every system update?" n
-else
- config_query WINE_DEVEL "Use development branch?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/x11-libs/wine/PRE_BUILD b/x11-libs/wine/PRE_BUILD
index 596f69e..f2e8001 100755
--- a/x11-libs/wine/PRE_BUILD
+++ b/x11-libs/wine/PRE_BUILD
@@ -4,7 +4,7 @@ if [[ "$WINE_SC2_LOGIN" == "y" ]]; then
message "${MESSAGE_COLOR}Applying StarCraft II login bug
patch...${DEFAULT_COLOR}" &&
cd $SOURCE_DIRECTORY &&
patch -p1 < $SPELL_DIRECTORY/sc2-login.diff &&
- if [[ "$WINE_DEVEL" == "n" ]]; then
+ if [[ "$WINE_BRANCH" == "devel" ]]; then
message "${MESSAGE_COLOR}Applying StarCraft II Patch 16
fix...${DEFAULT_COLOR}" &&
patch -p1 < $SPELL_DIRECTORY/sc2-bug23556.diff
fi
diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 38a0138..285f3ab 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -9,10 +9,4 @@ else
fi &&
cd $SOURCE_DIRECTORY/$QTSCINT &&
qmake qscintilla.pro &&
- make &&
-
-if is_depends_enabled $SPELL python ; then
- cd $SOURCE_DIRECTORY/Python &&
- python configure.py &&
- make
-fi
+ make
diff --git a/x11-toolkits/qscintilla/DEPENDS b/x11-toolkits/qscintilla/DEPENDS
index 37f1ba4..9b5014e 100755
--- a/x11-toolkits/qscintilla/DEPENDS
+++ b/x11-toolkits/qscintilla/DEPENDS
@@ -1,3 +1,2 @@
-optional_depends python 'true' '' "python api" &&
depends -sub CXX gcc &&
depends QT
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index 1072873..2b83506 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,9 @@
+2011-09-14 Robert Figura <template AT sourcemage.org>
+ * BUILD, DEPENDS, INSTALL: cleanup, python api is now in spell
pyqscintilla
+
+2011-09-13 Robert Figura <template AT sourcemage.org>
+ * DEPENDS, BUILD, INSTALL: revert broken python api changes (bug 197)
+
2011-09-07 Robert Figura <template AT sourcemage.org>
* DETAILS: updated spell to 2.5.1
* INSTALL: added
diff --git a/x11-toolkits/qscintilla/INSTALL b/x11-toolkits/qscintilla/INSTALL
deleted file mode 100755
index 59b79b5..0000000
--- a/x11-toolkits/qscintilla/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-
- cd $SOURCE_DIRECTORY/$QTSCINT &&
- make install &&
-if is_depends_enabled $SPELL python ; then
- cd $SOURCE_DIRECTORY/Python &&
- make install
-fi
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 2ada024..0fff379 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -3,7 +3,7 @@ persistent_remove QT_VER
TMPFS=off
SPELLX=qt-everywhere-opensource-src
VERSION=4.7.4
-
SOURCE_HASH=sha512:3d5dd21d20e5638e70192121a9780cdf3e35e7f404f790fb58a1920b2e24dd60d9dade1b4877782dc7ebc27d5bb10c5cc7706e24d8724c66e3575698ca3cfdad
+
SOURCE_HASH=sha512:8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=4
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index e427ebd..1872b09 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated sha512 only doc/ was changed (fixes #198)
+
2011-09-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.7.4

diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 2212da6..9277d54 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,6 +1,6 @@
SPELL=conky
VERSION=1.8.1
- PATCH_LEVEL=1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index 6148758..409bedb 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,8 @@
+2011-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: corrected PATCHLEVEL
+ * PRE_BUILD: added, to apply the patch
+ * curl.patch: added, to fix compilation with curl >=7.21.7
+
2011-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFIGURE, BUILD: added optional support for METAR and XOAP weather,
IBM/Lenovo laptops, Eve-Online skill monitor and RSS
diff --git a/x11/conky/PRE_BUILD b/x11/conky/PRE_BUILD
new file mode 100755
index 0000000..2486ec5
--- /dev/null
+++ b/x11/conky/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/curl.patch"
diff --git a/x11/conky/curl.patch b/x11/conky/curl.patch
new file mode 100644
index 0000000..d6c7e74
--- /dev/null
+++ b/x11/conky/curl.patch
@@ -0,0 +1,20 @@
+--- src/ccurl_thread.c.orig 2010-10-06 01:29:36.000000000 +0400
++++ src/ccurl_thread.c 2011-09-14 23:09:00.762899542 +0400
+@@ -33,7 +33,6 @@
+ #endif /* DEBUG */
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ /*
+--- src/eve.c.orig 2010-10-06 01:29:36.000000000 +0400
++++ src/eve.c 2011-09-14 23:09:15.386715713 +0400
+@@ -37,7 +37,6 @@
+ #include <libxml/xmlwriter.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <time.h>
diff --git a/x11/x11vnc/DETAILS b/x11/x11vnc/DETAILS
index e367037..bdd870a 100755
--- a/x11/x11vnc/DETAILS
+++ b/x11/x11vnc/DETAILS
@@ -1,6 +1,6 @@
SPELL=x11vnc
- VERSION=0.9.12
-
SOURCE_HASH=sha512:c9bcca13858fd239ffdfacb34112d1994ee7fe46c4a848982a1f9521b2a0691394cf7d4a1e7c3106be2c788069d99532a9e780e2a729d21396b9590bb76f465f
+ VERSION=0.9.13
+
SOURCE_HASH=sha512:7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/libvncserver/$SOURCE
WEB_SITE=http://www.karlrunge.com/x11vnc/
diff --git a/x11/x11vnc/HISTORY b/x11/x11vnc/HISTORY
index 4aebb5c..8603f91 100644
--- a/x11/x11vnc/HISTORY
+++ b/x11/x11vnc/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.13
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/xfce/exo/DETAILS b/xfce/exo/DETAILS
index cbb9c9a..0b22046 100755
--- a/xfce/exo/DETAILS
+++ b/xfce/exo/DETAILS
@@ -1,10 +1,10 @@
SPELL=exo
- VERSION=0.6.0
+ VERSION=0.6.2
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:4f949c5e58294369ebd7ac8838967af115e3594beb65473d3447f0be56712b7bba5a05cc505ba86b5ad9a3869e4442742fc879c016f7c075d08a852e4cf893e1
+
SOURCE_HASH=sha512:e9e1f51268cfcb856eece1deecb11a8a3ace7564055fd135f3179f12ad9087b883361079ffd8e415545b2d5080e994b56157df0a783805c0e0283f8eb4b2a03e
WEB_SITE=http://thunar.xfce.org/
ENTERED=20050101
LICENSE=LGPL
diff --git a/xfce/exo/HISTORY b/xfce/exo/HISTORY
index f31c3bd..823f4f5 100644
--- a/xfce/exo/HISTORY
+++ b/xfce/exo/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated spell to 0.6.2
+
2011-01-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.0 (part of Xfce 4.8)
* DEPENDS: updated dependencies
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index fb42c07..d25f2ae 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,11 +1,11 @@
SPELL=thunar
- VERSION=1.2.2
+ VERSION=1.3.0
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=Thunar-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Thunar-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://thunar.xfce.org/
-
SOURCE_HASH=sha512:6bb932ae6820ebab47e82b2fd43afec868db0ea5631b74543a7e42573a40aaac21bfc6322a9c903b95cffa119d0685e4e0c716522931562611e64d20246d4e55
+
SOURCE_HASH=sha512:c6254fcd64038a245f2ea16d753f18c672df0c164b33b63787800617a7666390f19814fa5e50bcda290326bff2e93a9141ba0b6576099498f0f3070df78020ce
LICENSE[0]=GPL
LICENSE[1]=LGPL
ENTERED=20030608
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index f00fdbb..cb7fc7e 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,6 @@
+2011-09-13 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: updated spell to 1.3.0
+
2011-08-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.2 -- return back to stable branch

diff --git a/xfce/xfburn/BUILD b/xfce/xfburn/BUILD
index 9bce9fb..b5d4cff 100755
--- a/xfce/xfburn/BUILD
+++ b/xfce/xfburn/BUILD
@@ -1,4 +1,4 @@
-if [[ $XFBURN_GIT == y ]]; then
+if [[ $XFBURN_BRANCH == scm ]]; then
./autogen.sh --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/xfce/xfburn/DEPENDS b/xfce/xfburn/DEPENDS
index 5e3abd7..6691172 100755
--- a/xfce/xfburn/DEPENDS
+++ b/xfce/xfburn/DEPENDS
@@ -6,7 +6,7 @@ depends gtk+2 &&
depends intltool &&
depends libxfcegui4 &&

-if [[ $XFBURN_GIT == y ]]; then
+if [[ $XFBURN_BRANCH == scm ]]; then
depends docbook-xsl &&
depends git &&
depends xfce4-dev-tools
diff --git a/xfce/xfburn/DETAILS b/xfce/xfburn/DETAILS
index 0bacfbd..b2e36c5 100755
--- a/xfce/xfburn/DETAILS
+++ b/xfce/xfburn/DETAILS
@@ -1,6 +1,6 @@
SPELL=xfburn
-if [[ $XFBURN_GIT == y ]]; then
- if [[ $XFBURN_GIT_AUTOUPDATE == y ]]; then
+if [[ $XFBURN_BRANCH == scm ]]; then
+ if [[ $XFBURN_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/xfce/xfburn/HISTORY b/xfce/xfburn/HISTORY
index 1f7b483..37f7e4c 100644
--- a/xfce/xfburn/HISTORY
+++ b/xfce/xfburn/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
+
2011-02-26 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: fixed git SOURCE_URL[0]

diff --git a/xfce/xfburn/PREPARE b/xfce/xfburn/PREPARE
index 18fd51a..98d27e4 100755
--- a/xfce/xfburn/PREPARE
+++ b/xfce/xfburn/PREPARE
@@ -1,6 +1,2 @@
-config_query XFBURN_GIT "Use git version?" n &&
-
-if [[ $XFBURN_GIT == y ]]; then
- config_query XFBURN_GIT_AUTOUPDATE \
- "Queue for update on every system update?" n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/xorg-driver/wizardpen/DETAILS b/xorg-driver/wizardpen/DETAILS
index 0f96042..f638e5d 100755
--- a/xorg-driver/wizardpen/DETAILS
+++ b/xorg-driver/wizardpen/DETAILS
@@ -1,5 +1,5 @@
SPELL=wizardpen
-if [[ "$WIZARDPEN_SCM_AUTOUPDATE" = y ]]; then
+if [[ "$WIZARDPEN_AUTOUPDATE" = y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=trunk
diff --git a/xorg-driver/wizardpen/HISTORY b/xorg-driver/wizardpen/HISTORY
index 99020a8..b8eb237 100644
--- a/xorg-driver/wizardpen/HISTORY
+++ b/xorg-driver/wizardpen/HISTORY
@@ -1,3 +1,6 @@
+2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
+ * PREPARE, DETAILS: Use prepare_select_branch
+
2011-04-25 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS: spell created
* BUILD: use autogen.sh
diff --git a/xorg-driver/wizardpen/PREPARE b/xorg-driver/wizardpen/PREPARE
index 61898e2..f8b7d7e 100755
--- a/xorg-driver/wizardpen/PREPARE
+++ b/xorg-driver/wizardpen/PREPARE
@@ -1,2 +1,2 @@
-config_query WIZARDPEN_SCM_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (0b1cf78359b5752c2963c60b78dbd269924d1797), Vlad Glagolev, 09/18/2011

Archive powered by MHonArc 2.6.24.

Top of Page