sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bbecf900ebbac635156e05e84f9641c65c38685d)
Date: Wed, 3 Apr 2013 13:40:48 -0500

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

ChangeLog | 19
archive/burp/DETAILS | 4
archive/burp/HISTORY | 3
audio-players/moc/DETAILS | 16
collab/openldap/DETAILS | 8
collab/openldap/HISTORY | 3
crypto/nss/DETAILS | 5
crypto/nss/HISTORY | 5
crypto/nss/PRE_BUILD | 5
crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch | 407
++++++++++
database/firebird25/DETAILS | 6
database/firebird25/HISTORY | 4
database/sqlite/DETAILS | 6
database/sqlite/HISTORY | 3
dev/null |binary
devel/binutils/DEPENDS | 6
devel/binutils/DETAILS | 2
devel/binutils/HISTORY | 6
devel/cppunit/BUILD | 3
devel/cppunit/DETAILS | 4
devel/cppunit/HISTORY | 4
devel/ghc/BUILD | 4
devel/ghc/HISTORY | 3
devel/unifdef/DETAILS | 4
devel/unifdef/HISTORY | 3
disk/libmtp/DETAILS | 6
disk/libmtp/HISTORY | 3
disk/partclone/DETAILS | 4
disk/partclone/HISTORY | 3
e-17/e17/DETAILS | 2
e-17/e17/HISTORY | 4
e-17/e17/e17update | 4
e-17/evas/BUILD | 2
e-17/evas/HISTORY | 3
e-17/evas_generic_loaders/DETAILS | 8
e-17/evas_generic_loaders/HISTORY | 3
editors/texmaker/DEPENDS | 5
editors/texmaker/HISTORY | 4
fonts-x11/terminus-font/BUILD | 2
gnome2-apps/gramps/DETAILS | 4
gnome2-apps/gramps/HISTORY | 3
gnome2-libs/glibmm/DETAILS | 4
gnome2-libs/glibmm/HISTORY | 4
gnome2-libs/glibmm/glibmm-2.34.1.tar.xz.sig |binary
gnome3-libs/libsecret/BUILD | 2
gnome3-libs/libsecret/DETAILS | 4
gnome3-libs/libsecret/HISTORY | 4
graphics-libs/harfbuzz/HISTORY | 3
graphics-libs/harfbuzz/PRE_BUILD | 5
graphics-libs/pythonmagick/DEPENDS | 2
graphics-libs/pythonmagick/HISTORY | 3
graphics/imagemagick/DETAILS | 4
graphics/imagemagick/HISTORY | 7
graphics/imagemagick/PRE_SUB_DEPENDS | 4
graphics/imagemagick/SUB_DEPENDS | 5
http/firefox/DETAILS | 6
http/firefox/HISTORY | 3
kernels/linux-fusion/DEPENDS | 2
kernels/linux-fusion/DETAILS | 2
kernels/linux-fusion/HISTORY | 3
kernels/linux/HISTORY | 4
kernels/linux/info/patches/maintenance_patches_3/patch-3.8.5 | 5
kernels/linux/latest.defaults | 2
libs/gettext/DEPENDS | 1
libs/gettext/HISTORY | 3
libs/nspr/DETAILS | 4
libs/nspr/HISTORY | 3
libs/podofo/DEPENDS | 4
libs/podofo/HISTORY | 4
libs/podofo/PRE_BUILD | 6
libs/pyqt4/DETAILS | 4
libs/pyqt4/HISTORY | 3
libs/sip/DETAILS | 4
libs/sip/HISTORY | 3
python-pypi/beautifulsoup/DETAILS | 8
python-pypi/beautifulsoup/HISTORY | 5
python-pypi/calibre/DEPENDS | 6
python-pypi/calibre/DETAILS | 4
python-pypi/calibre/HISTORY | 10
python-pypi/calibre/PRE_BUILD | 2
python-pypi/calibre/calibre-stop-phone-home.diff | 22
python-pypi/clientform/BUILD | 1
python-pypi/clientform/DEPENDS | 3
python-pypi/clientform/DETAILS | 23
python-pypi/clientform/DETAILS.orig | 16
python-pypi/clientform/DOWNLOAD | 1
python-pypi/clientform/HISTORY | 5
python-pypi/clientform/INSTALL | 1
python-pypi/clientform/PRE_BUILD | 1
python-pypi/clientform/TRIGGERS | 1
python-pypi/lxml/DETAILS | 2
python-pypi/lxml/HISTORY | 3
python-pypi/mechanize/DEPENDS | 3
python-pypi/mechanize/DETAILS | 4
python-pypi/mechanize/HISTORY | 5
python-pypi/python-cssselect/DEPENDS | 1
python-pypi/python-cssselect/DETAILS | 15
python-pypi/python-cssselect/HISTORY | 3
python-pypi/python-futures/DEPENDS | 1
python-pypi/python-futures/DETAILS | 13
python-pypi/python-futures/HISTORY | 3
python-pypi/python-netifaces/DEPENDS | 1
python-pypi/python-netifaces/DETAILS | 15
python-pypi/python-netifaces/HISTORY | 3
python-pypi/urlwatch/DEPENDS | 2
python-pypi/urlwatch/DETAILS | 18
python-pypi/urlwatch/HISTORY | 3
science/qlandkarte-gt/DEPENDS | 2
science/qlandkarte-gt/HISTORY | 6
science/stellarium/DETAILS | 2
science/stellarium/HISTORY | 3
shell-term-fm/eaglemode/DEPENDS | 32
shell-term-fm/eaglemode/DETAILS | 2
shell-term-fm/eaglemode/HISTORY | 8
utils/latencytop/DEPENDS | 5
utils/latencytop/HISTORY | 4
utils/latencytop/PRE_BUILD | 5
utils/littleutils/DETAILS | 6
utils/littleutils/HISTORY | 3
utils/mozcache/BUILD | 3
utils/mozcache/CONFIGURE | 3
utils/mozcache/DEPENDS | 31
utils/mozcache/DETAILS | 15
utils/mozcache/HISTORY | 2
video-libs/live/DETAILS | 4
video-libs/live/HISTORY | 6
video/smplayer/DETAILS | 4
video/smplayer/HISTORY | 3
wm-addons/cairo-dock-plugins/DETAILS | 2
wm-addons/cairo-dock-plugins/HISTORY | 3
wm-addons/cairo-dock/DETAILS | 2
wm-addons/cairo-dock/HISTORY | 3
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
x11-toolkits/gtkmm3/DETAILS | 4
x11-toolkits/gtkmm3/HISTORY | 4
x11-toolkits/gtkmm3/gtkmm-3.6.0.tar.xz.sig |binary
x11-toolkits/qscintilla/DETAILS | 4
x11-toolkits/qscintilla/HISTORY | 3
x11-toolkits/qt4-private-headers/BUILD | 1
x11-toolkits/qt4-private-headers/DEPENDS | 1
x11-toolkits/qt4-private-headers/DETAILS | 19
x11-toolkits/qt4-private-headers/HISTORY | 5
x11-toolkits/qt4-private-headers/INSTALL | 12
x11-toolkits/wxgtk-new/BUILD | 1
x11-toolkits/wxgtk-new/CONFIGURE | 2
x11-toolkits/wxgtk-new/DEPENDS | 2
x11-toolkits/wxgtk-new/HISTORY | 4
x11/easystroke/DEPENDS | 2
x11/easystroke/DETAILS | 2
x11/easystroke/HISTORY | 4
x11/easystroke/easystroke-0.6.0.tar.gz.sig |binary
152 files changed, 1001 insertions(+), 147 deletions(-)

New commits:
commit 5bd40282bef578d7159912ddc0d599ec859051ce
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wm-addons/cairo-dock-plugins: version 3.2.0

commit 519d59fa7f5712944c8d5f7f7c30feca57e7ca52
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wm-addons/cairo-dock: version 3.2.0

commit 4c3b97f0185f899de1a861acfd7afae68a8a289e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Eric Sandall <sandalle AT sourcemage.org>

video-libs/live: version 2013.03.23

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

graphics/imagemagick: version 6.8.4-6

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

live 2013.04.01

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

add dependencies on gcc with CXX, qt4 with SQLITE

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

fixup 044deee59562ee70dbc2b1b0a4d77f38cbd1d273

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

utils/latencytop: add dependencies on ncurses and gtk+2

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

shell-term-fm/eaglemode: add missing dependencies, fix SOURCE_URL[0]

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

devel/ghc: use default_build_make

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

fixup 40047660d2b05120389957ffb1586a6a729cf85c

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

science/stellarium: fix SOURCE_URL[0]

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

utils/littleutils: version 1.0.27

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

science/qlandkarte-gt: add sub dependency on OPENGL for qt4

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

fixup for 8ffe1be7f82f556c74b4d1fac110a68617d031ac

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

http/firefox: version 20.0

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

crypto/nss: version 3.14.3

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

libs/nspr: version 4.9.6

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

openldap: => 2.4.35

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

gnome3-libs/libsecret: version 0.15

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

wxgtk-new - allow build with gtk+{3,2}

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

sqlite: => 3.7.16.1

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

gramps: => 3.4.3

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

cppunit: => 1.12.1

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

mozcache: new spell, viewer and manager for cache files stored by
Gecko-based browsers

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

python-pypi/calibre: add SOURCE_HASH

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

python-pypi/calibre: remove obsolete patch

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

python-pypi/calibre: add dependency on qt4-private-headers

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

x11-toolkits/qt4-private-headers: new spell, private headers for qt4

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

wine: => 1.4.1

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

partclone: => 0.2.60

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

unifdef: => 2.7

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

binutils - extra depends

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

evas_generic_loaders: scm version - subversion -> git

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

e17: updated to better work with git version

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

kernels/linux-fusion: switched to git

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

python-pypi/calibre: version 0.9.25

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

libs/podofo: change dep on lua51 to lua, make it mandatory

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

python-pypi/python-cssselect: new spell, a parser for CSS3 selectors

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

python-pypi/python-netifaces: new spell, portable network interface
information

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

python-pypi/beautifulsoup: version 3.2.1

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

disk/libmtp: version 1.1.6

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

python-pypi/lxml: version 3.1.1

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

python-pypi/clientform: deprecated, is part of mechanize now

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

python-pypi/mechanize: version 0.2.5

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

x11-toolkits/qscintilla: version 2.7.1

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

libs/pyqt4: version 4.10

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

libs/sip: version 4.14.5

commit 0cd445877f2a9c77a775075f3065e68470079e5d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

easystroke: => 0.6.0

commit 15b60272ba97193a2963f9814494c78169d4c724
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

gtkmm3: => 3.6.0

commit ddf780dbe9f28ec25a870c438a73eb06b38fd088
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

glibmm: => 2.34.1

commit 78d26cf5bed30fbfaf0f997c2851e6c8e9c978a3
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

smplayer: => 0.8.4

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

burp: => 1.3.28 (devel)

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

python-pypi/urlwatch: new spell, a tool for monitoring webpages for
updates

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

python-pypi/python-futures: new spell, backport of concurrent.futures to
python2

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

graphics-libs/pythonmagick: add dependency on imagemagick with HDRI
enabled

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

graphics/imagemagick: add sub dependency for HDRI

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

graphics/imagemagick: version 6.8.4-3

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

kernels/linux: version 3.8.5

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

devel/binutils: version 2.23.2

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

firebird25: => 2.5.2.26540-0 SECURITY FIX

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

harfbuzz - fix build with icu

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

gettext - depends libxml2

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

e-17/evas: fix glib include paths

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

wm-addons/cairo-dock-plugins: version 3.2.0

commit 5d181218544e161cd4aa8b0471a9da47956ce43f
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

wm-addons/cairo-dock: version 3.2.0

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

video-libs/live: version 2013.03.23

diff --git a/ChangeLog b/ChangeLog
index 07b681f..9581b36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2013-04-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/mozcache: new spell, viewer and manager for cache files stored
+ by Gecko-based browsers
+
+2013-04-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * x11-toolkits/qt4-private-headers: new spell, private headers for qt4
+
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * python-pypi/clientform: spell deprecated [part of mechanize now]
+ * python-pypi/python-netifaces: new spell, portable network interface
+ information
+ * python-pypi/python-cssselect: new spell, a parser for CSS3 selectors
+
+2013-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * python-pypi/python-futures: new spell, backport of the
+ concurrent.futures package from Python 3.2
+ * python-pypi/urlwatch: new spell, a tool for monitoring webpages for
+ updates
+
2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/psutil: new spell, process and system utilities module
for Python
diff --git a/archive/burp/DETAILS b/archive/burp/DETAILS
index 361fc69..9c38751 100755
--- a/archive/burp/DETAILS
+++ b/archive/burp/DETAILS
@@ -11,10 +11,10 @@ if [[ $BURP_BRANCH == scm ]]; then
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
elif [[ $BURP_BRANCH == devel ]]; then
- VERSION=1.3.26
+ VERSION=1.3.28
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:8d7f8ee66a72ce99be1adb1e27b4c836f22b2b09b6b7cf31fa213a80b0ce54c2aa40ea8cec9449d65f023ac4e258180be40c6cf682c3b8cf7d078f6e286ec130
+
SOURCE_HASH=sha512:c63fc8b26251d01b1b8d5613e520b670984a6ab713ec747b5ddc99b84bb084d5facec57e6edd2ff49c705c937ccbc88f9da52ccbfbed110b2d42fecdc2d68904
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
else
VERSION=1.3.10
diff --git a/archive/burp/HISTORY b/archive/burp/HISTORY
index aa01e52..b0bc288 100644
--- a/archive/burp/HISTORY
+++ b/archive/burp/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.28 (devel)
+
2013-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.26 (devel)

diff --git a/audio-players/moc/DETAILS b/audio-players/moc/DETAILS
index e9e24be..1b14df6 100755
--- a/audio-players/moc/DETAILS
+++ b/audio-players/moc/DETAILS
@@ -1,14 +1,22 @@
SPELL=moc
-if [[ "$MOC_SVN_AUTOUPDATE" == "y" ]]; then
+if [[ "$MOC_BRANCH" == "scm" ]]; then
+ if [[ "$MOC_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
FORCE_DOWNLOAD=on
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=${SPELL}-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn://daper.net/moc/trunk:moc
SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
+else
+ VERSION=2.5.0-beta1
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+ SOURCE_URL[0]=ftp://ftp.daper.net/pub/soft/moc/unstable/${SOURCE}
+
SOURCE_HASH[0]=sha512:16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
+fi
WEB_SITE=http://moc.daper.net/
ENTERED=20050706
LICENSE[0]=GPLv2
diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 014d1fd..f5e5cdd 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,12 +1,12 @@
SPELL=openldap
if [[ $OPENLDAP_BRANCH == stable ]]; then
- VERSION=2.4.34
+ VERSION=2.4.35
SOURCE=$SPELL-$VERSION.tgz
-
SOURCE_HASH=sha512:e72d5b8ce9cdeeca1d0c418532c8430ad153bb08301a80caed94659bda46ae8dc90dd1cc1efd90089e609cdd4712fea05062fda87810e15a92de3e7635752d64
+
SOURCE_HASH=sha512:b39232b4bab7ecb0ae14961adaa555590ca24ecbaeb3d94ea251e2de3bf7425ce364a2a488f9745fae17f106cdf198c852c73b5f2b910d329c598db435d6b31d
else
- VERSION=2.4.34
+ VERSION=2.4.35
SOURCE=$SPELL-$VERSION.tgz
-
SOURCE_HASH=sha512:e72d5b8ce9cdeeca1d0c418532c8430ad153bb08301a80caed94659bda46ae8dc90dd1cc1efd90089e609cdd4712fea05062fda87810e15a92de3e7635752d64
+
SOURCE_HASH=sha512:b39232b4bab7ecb0ae14961adaa555590ca24ecbaeb3d94ea251e2de3bf7425ce364a2a488f9745fae17f106cdf198c852c73b5f2b910d329c598db435d6b31d
fi
SECURITY_PATCH=2
SOURCE_URI=$SPELL-release/$SOURCE
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index 68f9fe4..e2ab21e 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,6 @@
+2013-04-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.35
+
2013-03-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.4.34

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 927790b..fba0f10 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -37,11 +37,10 @@ case $NSS_BRANCH in

SOURCE_HASH=sha512:45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d
;;
3.14)
- VERSION=3.14.2
- PATCHLEVEL=1
+ VERSION=3.14.3
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:65303f09ef09900512da8d19f7f35f50ef07926256bc5b548a665b5f2ea82bf02548bc8464e0f3723014f3f0f3d2e908faf9ef82b564be21adb7da7f5295e137
+
SOURCE_HASH=sha512:4e8d8517ffb6d03da274afe9a7c50e2f0a15ffdd83e63f29a445e7aee829a8b7e2fbc772695322bd6acee81c052811735b542978044996156cb52dd7e4c001ec
;;
esac

diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 7e3e899..04e5e6d 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,8 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.14.3
+ * nss-3.14.3_sync_with_upstream_softokn_changes.patch, PRE_BUILD:
+ apply patch from gentoo to fix compile error
+
2013-02-19 Remko van der Vossen <wich AT sourcemage.org>
* PRE_BUILD: fix patch apply if statement

diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 9828554..e1c1e62 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -10,5 +10,8 @@ fi &&

if [[ "$NSS_PEM" == "y" ]]; then
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
-patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch
+patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
+if [[ $NSS_BRANCH == "3.14" || $NSS_BRANCH == "DEFAULT" ]]; then
+ patch -p1 <
$SPELL_DIRECTORY/nss-3.14.3_sync_with_upstream_softokn_changes.patch
+fi
fi
diff --git a/crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch
b/crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch
new file mode 100644
index 0000000..9611c13
--- /dev/null
+++ b/crypto/nss/nss-3.14.3_sync_with_upstream_softokn_changes.patch
@@ -0,0 +1,407 @@
+From d6dbecfea317a468be12423595e584f43d84d8ec Mon Sep 17 00:00:00 2001
+From: Elio Maldonado <emaldona AT redhat.com>
+Date: Sat, 9 Feb 2013 17:11:00 -0500
+Subject: [PATCH] Sync up with upstream softokn changes
+
+- Disable RSA OEP case in FormatBlock, RSA_OAEP support is experimental and
in a state of flux
+- Numerous change upstream due to the work for TLS/DTLS 'Lucky 13'
vulnerability CVE-2013-0169
+- It now compiles with the NSS_3_14_3_BETA1 source
+---
+ mozilla/security/nss/lib/ckfw/pem/rsawrapr.c | 338
+++++++-------------------
+ 1 files changed, 82 insertions(+), 256 deletions(-)
+
+diff --git a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
+index 5ac4f39..3780d30 100644
+--- a/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
++++ b/mozilla/security/nss/lib/ckfw/pem/rsawrapr.c
+@@ -46,6 +46,7 @@
+ #include "sechash.h"
+ #include "base.h"
+
++#include "lowkeyi.h"
+ #include "secerr.h"
+
+ #define RSA_BLOCK_MIN_PAD_LEN 8
+@@ -54,9 +55,8 @@
+ #define RSA_BLOCK_PRIVATE_PAD_OCTET 0xff
+ #define RSA_BLOCK_AFTER_PAD_OCTET 0x00
+
+-#define OAEP_SALT_LEN 8
+-#define OAEP_PAD_LEN 8
+-#define OAEP_PAD_OCTET 0x00
++/* Needed for RSA-PSS functions */
++static const unsigned char eightZeros[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+ #define FLAT_BUFSIZE 512 /* bytes to hold flattened SHA1Context. */
+
+@@ -78,127 +78,39 @@ pem_PublicModulusLen(NSSLOWKEYPublicKey *pubk)
+ return 0;
+ }
+
+-static SHA1Context *SHA1_CloneContext(SHA1Context * original)
+-{
+- SHA1Context *clone = NULL;
+- unsigned char *pBuf;
+- int sha1ContextSize = SHA1_FlattenSize(original);
+- SECStatus frv;
+- unsigned char buf[FLAT_BUFSIZE];
+-
+- PORT_Assert(sizeof buf >= sha1ContextSize);
+- if (sizeof buf >= sha1ContextSize) {
+- pBuf = buf;
+- } else {
+- pBuf = nss_ZAlloc(NULL, sha1ContextSize);
+- if (!pBuf)
+- goto done;
+- }
+-
+- frv = SHA1_Flatten(original, pBuf);
+- if (frv == SECSuccess) {
+- clone = SHA1_Resurrect(pBuf, NULL);
+- memset(pBuf, 0, sha1ContextSize);
+- }
+- done:
+- if (pBuf != buf)
+- nss_ZFreeIf(pBuf);
+- return clone;
++/* Constant time comparison of a single byte.
++ * Returns 1 iff a == b, otherwise returns 0.
++ * Note: For ranges of bytes, use constantTimeCompare.
++ */
++static unsigned char constantTimeEQ8(unsigned char a, unsigned char b) {
++ unsigned char c = ~(a - b | b - a);
++ c >>= 7;
++ return c;
+ }
+
+-/*
+- * Modify data by XORing it with a special hash of salt.
++/* Constant time comparison of a range of bytes.
++ * Returns 1 iff len bytes of a are identical to len bytes of b, otherwise
++ * returns 0.
+ */
+-static SECStatus
+-oaep_xor_with_h1(unsigned char *data, unsigned int datalen,
+- unsigned char *salt, unsigned int saltlen)
+-{
+- SHA1Context *sha1cx;
+- unsigned char *dp, *dataend;
+- unsigned char end_octet;
+-
+- sha1cx = SHA1_NewContext();
+- if (sha1cx == NULL) {
+- return SECFailure;
+- }
+-
+- /*
+- * Get a hash of salt started; we will use it several times,
+- * adding in a different end octet (x00, x01, x02, ...).
+- */
+- SHA1_Begin(sha1cx);
+- SHA1_Update(sha1cx, salt, saltlen);
+- end_octet = 0;
+-
+- dp = data;
+- dataend = data + datalen;
+-
+- while (dp < dataend) {
+- SHA1Context *sha1cx_h1;
+- unsigned int sha1len, sha1off;
+- unsigned char sha1[SHA1_LENGTH];
+-
+- /*
+- * Create hash of (salt || end_octet)
+- */
+- sha1cx_h1 = SHA1_CloneContext(sha1cx);
+- SHA1_Update(sha1cx_h1, &end_octet, 1);
+- SHA1_End(sha1cx_h1, sha1, &sha1len, sizeof(sha1));
+- SHA1_DestroyContext(sha1cx_h1, PR_TRUE);
+- PORT_Assert(sha1len == SHA1_LENGTH);
+-
+- /*
+- * XOR that hash with the data.
+- * When we have fewer than SHA1_LENGTH octets of data
+- * left to xor, use just the low-order ones of the hash.
+- */
+- sha1off = 0;
+- if ((dataend - dp) < SHA1_LENGTH)
+- sha1off = SHA1_LENGTH - (dataend - dp);
+- while (sha1off < SHA1_LENGTH)
+- *dp++ ^= sha1[sha1off++];
+-
+- /*
+- * Bump for next hash chunk.
+- */
+- end_octet++;
+- }
+-
+- SHA1_DestroyContext(sha1cx, PR_TRUE);
+- return SECSuccess;
++static unsigned char constantTimeCompare(const unsigned char *a,
++ const unsigned char *b,
++ unsigned int len) {
++ unsigned char tmp = 0;
++ unsigned int i;
++ for (i = 0; i < len; ++i, ++a, ++b)
++ tmp |= *a ^ *b;
++ return constantTimeEQ8(0x00, tmp);
+ }
+
+-/*
+- * Modify salt by XORing it with a special hash of data.
++/* Constant time conditional.
++ * Returns a if c is 1, or b if c is 0. The result is undefined if c is
++ * not 0 or 1.
+ */
+-static SECStatus
+-oaep_xor_with_h2(unsigned char *salt, unsigned int saltlen,
+- unsigned char *data, unsigned int datalen)
++static unsigned int constantTimeCondition(unsigned int c,
++ unsigned int a,
++ unsigned int b)
+ {
+- unsigned char sha1[SHA1_LENGTH];
+- unsigned char *psalt, *psha1, *saltend;
+- SECStatus rv;
+-
+- /*
+- * Create a hash of data.
+- */
+- rv = SHA1_HashBuf(sha1, data, datalen);
+- if (rv != SECSuccess) {
+- return rv;
+- }
+-
+- /*
+- * XOR the low-order octets of that hash with salt.
+- */
+- PORT_Assert(saltlen <= SHA1_LENGTH);
+- saltend = salt + saltlen;
+- psalt = salt;
+- psha1 = sha1 + SHA1_LENGTH - saltlen;
+- while (psalt < saltend) {
+- *psalt++ ^= *psha1++;
+- }
+-
+- return SECSuccess;
++ return (~(c - 1) & a) | ((c - 1) & b);
+ }
+
+ /*
+@@ -212,7 +124,7 @@ static unsigned char *rsa_FormatOneBlock(unsigned
modulusLen,
+ unsigned char *block;
+ unsigned char *bp;
+ int padLen;
+- int i;
++ int i, j;
+ SECStatus rv;
+
+ block = (unsigned char *) nss_ZAlloc(NULL, modulusLen);
+@@ -260,124 +172,58 @@ static unsigned char *rsa_FormatOneBlock(unsigned
modulusLen,
+ */
+ case RSA_BlockPublic:
+
+- /*
+- * 0x00 || BT || Pad || 0x00 || ActualData
+- * 1 1 padLen 1 data->len
+- * Pad is all non-zero random bytes.
+- */
+- padLen = modulusLen - data->len - 3;
+- PORT_Assert(padLen >= RSA_BLOCK_MIN_PAD_LEN);
+- if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
+- nss_ZFreeIf(block);
+- return NULL;
+- }
+- for (i = 0; i < padLen; i++) {
+- /* Pad with non-zero random data. */
+- do {
+- rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
+- } while (rv == SECSuccess
+- && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
+- if (rv != SECSuccess) {
+- nss_ZFreeIf(block);
+- return NULL;
+- }
+- }
+- bp += padLen;
+- *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
+- nsslibc_memcpy(bp, data->data, data->len);
+-
+- break;
+-
+- /*
+- * Blocks intended for public-key operation, using
+- * Optimal Asymmetric Encryption Padding (OAEP).
+- */
+- case RSA_BlockOAEP:
+- /*
+- * 0x00 || BT || Modified2(Salt) || Modified1(PaddedData)
+- * 1 1 OAEP_SALT_LEN OAEP_PAD_LEN + data->len [+ N]
+- *
+- * where:
+- * PaddedData is "Pad1 || ActualData [|| Pad2]"
+- * Salt is random data.
+- * Pad1 is all zeros.
+- * Pad2, if present, is random data.
+- * (The "modified" fields are all the same length as the original
+- * unmodified values; they are just xor'd with other values.)
+- *
+- * Modified1 is an XOR of PaddedData with a special octet
+- * string constructed of iterated hashing of Salt (see below).
+- * Modified2 is an XOR of Salt with the low-order octets of
+- * the hash of Modified1 (see farther below ;-).
+- *
+- * Whew!
+- */
+-
+-
+- /*
+- * Salt
+- */
+- rv = RNG_GenerateGlobalRandomBytes(bp, OAEP_SALT_LEN);
+- if (rv != SECSuccess) {
+- nss_ZFreeIf(block);
+- return NULL;
+- }
+- bp += OAEP_SALT_LEN;
+-
+- /*
+- * Pad1
+- */
+- nsslibc_memset(bp, OAEP_PAD_OCTET, OAEP_PAD_LEN);
+- bp += OAEP_PAD_LEN;
+-
+- /*
+- * Data
+- */
+- nsslibc_memcpy(bp, data->data, data->len);
+- bp += data->len;
+-
+- /*
+- * Pad2
+- */
+- if (bp < (block + modulusLen)) {
+- rv = RNG_GenerateGlobalRandomBytes(bp,
+- block - bp + modulusLen);
+- if (rv != SECSuccess) {
+- nss_ZFreeIf(block);
+- return NULL;
+- }
+- }
+-
+- /*
+- * Now we have the following:
+- * 0x00 || BT || Salt || PaddedData
+- * (From this point on, "Pad1 || Data [|| Pad2]" is treated
+- * as the one entity PaddedData.)
+- *
+- * We need to turn PaddedData into Modified1.
+- */
+- if (oaep_xor_with_h1(block + 2 + OAEP_SALT_LEN,
+- modulusLen - 2 - OAEP_SALT_LEN,
+- block + 2, OAEP_SALT_LEN) != SECSuccess) {
+- nss_ZFreeIf(block);
+- return NULL;
+- }
+-
+- /*
+- * Now we have:
+- * 0x00 || BT || Salt || Modified1(PaddedData)
+- *
+- * The remaining task is to turn Salt into Modified2.
+- */
+- if (oaep_xor_with_h2(block + 2, OAEP_SALT_LEN,
+- block + 2 + OAEP_SALT_LEN,
+- modulusLen - 2 - OAEP_SALT_LEN) !=
+- SECSuccess) {
+- nss_ZFreeIf(block);
+- return NULL;
+- }
+-
+- break;
++ /*
++ * 0x00 || BT || Pad || 0x00 || ActualData
++ * 1 1 padLen 1 data->len
++ * Pad is all non-zero random bytes.
++ *
++ * Build the block left to right.
++ * Fill the entire block from Pad to the end with random bytes.
++ * Use the bytes after Pad as a supply of extra random bytes from
++ * which to find replacements for the zero bytes in Pad.
++ * If we need more than that, refill the bytes after Pad with
++ * new random bytes as necessary.
++ */
++ padLen = modulusLen - (data->len + 3);
++ PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
++ if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
++ nss_ZFreeIf (block);
++ return NULL;
++ }
++ j = modulusLen - 2;
++ rv = RNG_GenerateGlobalRandomBytes(bp, j);
++ if (rv == SECSuccess) {
++ for (i = 0; i < padLen; ) {
++ unsigned char repl;
++ /* Pad with non-zero random data. */
++ if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
++ ++i;
++ continue;
++ }
++ if (j <= padLen) {
++ rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
++ modulusLen - (2 + padLen));
++ if (rv != SECSuccess)
++ break;
++ j = modulusLen - 2;
++ }
++ do {
++ repl = bp[--j];
++ } while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
++ if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
++ bp[i++] = repl;
++ }
++ }
++ }
++ if (rv != SECSuccess) {
++ /*sftk_fatalError = PR_TRUE;*/
++ nss_ZFreeIf (block);
++ return NULL;
++ }
++ bp += padLen;
++ *bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
++ nsslibc_memcpy(bp, data->data, data->len);
++ break;
+
+ default:
+ PORT_Assert(0);
+@@ -427,26 +273,6 @@ rsa_FormatBlock(SECItem * result, unsigned modulusLen,
+
+ break;
+
+- case RSA_BlockOAEP:
+- /*
+- * 0x00 || BT || M1(Salt) || M2(Pad1||ActualData[||Pad2])
+- *
+- * The "2" below is the first octet + the second octet.
+- * (The other fields do not contain the clear values, but are
+- * the same length as the clear values.)
+- */
+- PORT_Assert(data->len <= (modulusLen - (2 + OAEP_SALT_LEN
+- + OAEP_PAD_LEN)));
+-
+- result->data = rsa_FormatOneBlock(modulusLen, blockType, data);
+- if (result->data == NULL) {
+- result->len = 0;
+- return SECFailure;
+- }
+- result->len = modulusLen;
+-
+- break;
+-
+ case RSA_BlockRaw:
+ /*
+ * Pad || ActualData
+--
+1.7.1
+
+
diff --git a/database/firebird25/DETAILS b/database/firebird25/DETAILS
index 614a8f0..1b1ac7d 100755
--- a/database/firebird25/DETAILS
+++ b/database/firebird25/DETAILS
@@ -1,8 +1,8 @@
SPELL=firebird25
SPELLX=Firebird
- VERSION=2.5.2.26539-0
-
SOURCE_HASH=sha512:f3b3a8ec35202620bd6b35d5b1004a0d668b8d1a0a7c0864b40b9a7fb682e8b0d0f7b68fbbdc1ee8ace4602f1756103798a1ed8f4b8b14dfa921e06b81c10e8b
- SECURITY_PATCH=1
+ VERSION=2.5.2.26540-0
+
SOURCE_HASH=sha512:a057f78825bcfe992f9e079704621a1c659588a906e200ed56e269d0a3d78f968553146f21bde1b680795c760b896af1ec689f33dd293dbbc2242ba77b491b3c
+ SECURITY_PATCH=2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION/-0\.RC?/}
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
diff --git a/database/firebird25/HISTORY b/database/firebird25/HISTORY
index 6842538..a01d82e 100644
--- a/database/firebird25/HISTORY
+++ b/database/firebird25/HISTORY
@@ -1,3 +1,7 @@
+2013-03-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.2.26540-0
+ SECURITY_PATCH++ - fixes CVE-2013-2492
+
2012-11-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1
fixes CVE-2012-5529
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 5eced7a..416daeb 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.16
- VERSIONX=autoconf-3071600
-
SOURCE_HASH=sha512:5f63a1ce5d06e4e09c86bac5cf78091ff4444b1a79b05008443e6ef211512acc6bea258052a83cee290b42fe2dd395698526b0e2cade9bb9d09ae522245454e2
+ VERSION=3.7.16.1
+ VERSIONX=autoconf-3071601
+
SOURCE_HASH=sha512:293d78d14a9347cb83e1a644e5f3e4447ed6fc21642c51683e5495dda08d2312194a73d1fc3c1d78287e33ed065aa251ecbaa7c0ea9189456c1702e96d78becd
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://www.sqlite.org/2013/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index ee8f964..d90db8a 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2013-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.7.16.1
+
2013-03-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.7.16; renewed SOURCE_URL[0]

diff --git a/devel/binutils/DEPENDS b/devel/binutils/DEPENDS
index cb35e8e..5d66bf5 100755
--- a/devel/binutils/DEPENDS
+++ b/devel/binutils/DEPENDS
@@ -2,4 +2,8 @@ depends bison &&
depends flex &&
depends gnupg &&
depends smgl-fhs &&
-depends texinfo
+depends texinfo &&
+depends gmp &&
+depends mpfr &&
+depends libmpc &&
+optional_depends gettext '' '--disable-nls' 'NLS support'
diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index fc0ef8b..b91cf38 100755
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=binutils
- VERSION=2.23.1
+ VERSION=2.23.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index 93a843a..3e3ace5 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,9 @@
+2013-03-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add mpffpr, gmp, libmpc - optional gettext
+
+2013-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.23.2
+
2013-01-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.13.1

diff --git a/devel/cppunit/BUILD b/devel/cppunit/BUILD
new file mode 100755
index 0000000..78b4538
--- /dev/null
+++ b/devel/cppunit/BUILD
@@ -0,0 +1,3 @@
+LDFLAGS=${LDFLAGS/-Wl,--as-needed/} &&
+OPTS+=" --disable-static" &&
+default_build
diff --git a/devel/cppunit/DETAILS b/devel/cppunit/DETAILS
index accd6b5..3f31148 100755
--- a/devel/cppunit/DETAILS
+++ b/devel/cppunit/DETAILS
@@ -1,6 +1,6 @@
SPELL=cppunit
- VERSION=1.12.0
-
SOURCE_HASH=sha512:d80c027c6701d87516a29e8acd2d57c1d0334b1dc03db4928df496c9fd6694748241dafab5199a4cb37aa6b29bf14bbb8ed0edf317c9e947cad31bb5bdb3bc21
+ VERSION=1.12.1
+ SOURCE_HASH=sha512:/var/spool/sorcery/cppunit-1.12.1.tar.gz
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/cppunit/HISTORY b/devel/cppunit/HISTORY
index c91676b..8f65057 100644
--- a/devel/cppunit/HISTORY
+++ b/devel/cppunit/HISTORY
@@ -1,3 +1,7 @@
+203-03-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.12.1
+ * BUILD: added, fix build
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/devel/ghc/BUILD b/devel/ghc/BUILD
index 1998651..02a755e 100755
--- a/devel/ghc/BUILD
+++ b/devel/ghc/BUILD
@@ -1,5 +1,3 @@
-[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST} --build=${BUILD}"
-
GHC_DIR=/usr/bin

if [[ -x ${INSTALL_ROOT}/usr/bin/ghc-pkg-7.2.1 ]]; then
@@ -29,4 +27,4 @@ cd $SPELL-$VERSION &&
--infodir=${INSTALL_ROOT}/usr/share/info \
--with-ghc=$GHC_DIR/ghc \
$OPTS &&
-make
+default_build_make
diff --git a/devel/ghc/HISTORY b/devel/ghc/HISTORY
index c65cfce..799ef8b 100644
--- a/devel/ghc/HISTORY
+++ b/devel/ghc/HISTORY
@@ -1,3 +1,6 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: use default_build_make instead of make
+
2013-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.6.2

diff --git a/devel/unifdef/DETAILS b/devel/unifdef/DETAILS
index 86b54af..6cd9687 100755
--- a/devel/unifdef/DETAILS
+++ b/devel/unifdef/DETAILS
@@ -1,6 +1,6 @@
SPELL=unifdef
- VERSION=2.6
-
SOURCE_HASH=sha512:cc1720806ae3cecb85aafe462efec4e874d6a981f17f275dcf3435acc965c57a1b835506073bf112fe97395ddf07ab6e92fac0ba5cffccc9966567cfcee762e7
+ VERSION=2.7
+
SOURCE_HASH=sha512:01e367ea17ee3f1de33965cc24f118e366853312c9cdaf9f8722354a58191d5e639edfdfd75ec0371c370cff32990526073a772fbb6ac9757f6b1bc627cc2204
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://dotat.at/prog/unifdef/
diff --git a/devel/unifdef/HISTORY b/devel/unifdef/HISTORY
index d255633..7d34092 100644
--- a/devel/unifdef/HISTORY
+++ b/devel/unifdef/HISTORY
@@ -1,3 +1,6 @@
+2013-03=29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7
+
2011-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.6
new website & url
diff --git a/disk/libmtp/DETAILS b/disk/libmtp/DETAILS
index 362c763..cb7e6a0 100755
--- a/disk/libmtp/DETAILS
+++ b/disk/libmtp/DETAILS
@@ -1,8 +1,8 @@
SPELL=libmtp
- VERSION=1.1.5
+ VERSION=1.1.6
SOURCE="$SPELL-$VERSION.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE
+
SOURCE_HASH=sha512:fe6d9bc0621d6ad2325164585ec5f3e20824add5ee763d6d14ba7dbea6d2aacd75afa450627f3a03691c33ffb92675abebce64c3f8e32e8c2db511e814207ab3
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://libmtp.sourceforge.net/";
LICENSE[0]=LGPL
diff --git a/disk/libmtp/HISTORY b/disk/libmtp/HISTORY
index d9e2449..8954f32 100644
--- a/disk/libmtp/HISTORY
+++ b/disk/libmtp/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.6
+
2012-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.1.5

diff --git a/disk/partclone/DETAILS b/disk/partclone/DETAILS
index 45b04d3..edb8c6c 100755
--- a/disk/partclone/DETAILS
+++ b/disk/partclone/DETAILS
@@ -1,6 +1,6 @@
SPELL=partclone
- VERSION=0.2.59
-
SOURCE_HASH=sha512:e7b9dd7daa8a9323eb9629c8cb0073a6fb383b7ae8da91625ba57295eebb1e004f518346cf7d64911692c4a3b8f53339d6e6fe5b6b2a7bcc049d13da36e6d979
+ VERSION=0.2.60
+
SOURCE_HASH=sha512:3ad2810c656cb28fbc88dd38c4f3b8b9b837b05e01a50cd62b7f2aa0940002b75caacdd0737af04e8ae4fd1ac4aadf65b3c0d98e6dac4eca3b775abca960326e
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
diff --git a/disk/partclone/HISTORY b/disk/partclone/HISTORY
index d21d5d2..cebad17 100644
--- a/disk/partclone/HISTORY
+++ b/disk/partclone/HISTORY
@@ -1,3 +1,6 @@
+2013-03-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.2.60
+
2013-02-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.59

diff --git a/e-17/e17/DETAILS b/e-17/e17/DETAILS
index 32a5445..05e2a82 100755
--- a/e-17/e17/DETAILS
+++ b/e-17/e17/DETAILS
@@ -9,7 +9,7 @@ else
PATCHLEVEL=6
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/enlightenment-0.17-git
-
SOURCE_URL[0]=git://git.enlightenment.org/core/enlightenment.git:$SPELL-git
+
SOURCE_URL[0]=git://git.enlightenment.org/core/enlightenment.git:enlightenment-0.17-git
SOURCE_IGNORE=volatile
else
VERSION=0.17.0
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index fb06a1c..a8102f7 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,7 @@
+2013-03-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: SOURCE_URL[0] for git version fixed
+ * e17update: updated to work also with git version
+
2013-03-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: subversion -> git

diff --git a/e-17/e17/e17update b/e-17/e17/e17update
index a88dbb9..144f317 100644
--- a/e-17/e17/e17update
+++ b/e-17/e17/e17update
@@ -22,7 +22,7 @@ function get_spell_list () {
message "${MESSAGE_COLOR}Building list of packages to update..." \
"${DEFAULT_COLOR}" &&
for e_spell in `gaze section e-17 e`; do
- if [[ `installed_version $e_spell` == "svn" ]]; then
+ if [[ `installed_version $e_spell` == "svn" ]] || [[
`installed_version $e_spell` == "git" ]]; then
update_spells="$update_spells $e_spell"
fi
done
@@ -34,7 +34,7 @@ if [ "$#" == '0' ]; then
elif [ "$#" == '1' ]; then
case $1 in
-h|--help) echo "usage: $0 [option]"
- echo "-s|--summon Do a SVN checkout only (using summon)";
+ echo "-s|--summon Do a SVN or GIT checkout only (using
summon)";
echo "-h|--help Print this help message";
;;
-s|--summon) get_spell_list &&
diff --git a/e-17/evas/BUILD b/e-17/evas/BUILD
index c795dcb..f125546 100755
--- a/e-17/evas/BUILD
+++ b/e-17/evas/BUILD
@@ -55,4 +55,4 @@ fi &&
# We don't have wayland spells yet, http://wayland.freedesktop.org/
OPTS="--disable-wayland-shm --disable-wayland-egl $OPTS" &&

-default_build
+CFLAGS+=" -I/usr/lib/glib-2.0/include -I/usr/include/glib-2.0" default_build
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index 02cd7fa..ea924e4 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2013-03-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: fix glib include paths
+
2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.5
* BUILD, CONFIGURE, DEPENDS: X11 and XCB are mutually exclusive
diff --git a/e-17/evas_generic_loaders/DETAILS
b/e-17/evas_generic_loaders/DETAILS
index 955150e..9d9df2e 100755
--- a/e-17/evas_generic_loaders/DETAILS
+++ b/e-17/evas_generic_loaders/DETAILS
@@ -4,11 +4,11 @@ if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ];
then
if [ "$EVAS_GENERIC_LOADERS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
- VERSION=svn
+ VERSION=git
fi
- SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
+ SOURCE=$SPELL-git.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ SOURCE_URL[0]=git://git.enlightenment.org/core/${SPELL}.git:$SPELL-git
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
else
diff --git a/e-17/evas_generic_loaders/HISTORY
b/e-17/evas_generic_loaders/HISTORY
index bdbe264..249a204 100644
--- a/e-17/evas_generic_loaders/HISTORY
+++ b/e-17/evas_generic_loaders/HISTORY
@@ -1,3 +1,6 @@
+2013-03-31 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: subversion -> git
+
2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.5

diff --git a/editors/texmaker/DEPENDS b/editors/texmaker/DEPENDS
index 97dae7d..91907a8 100755
--- a/editors/texmaker/DEPENDS
+++ b/editors/texmaker/DEPENDS
@@ -1,2 +1,3 @@
-depends qt4 &&
-depends -sub QT4 poppler
+depends -sub SQLITE qt4 &&
+depends -sub QT4 poppler &&
+depends -sub CXX gcc
diff --git a/editors/texmaker/HISTORY b/editors/texmaker/HISTORY
index 9c5724e..6cab122 100644
--- a/editors/texmaker/HISTORY
+++ b/editors/texmaker/HISTORY
@@ -1,6 +1,8 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on gcc with CXX and qt4 with SQLITE
+
2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.0.1
- * DEPENDS: added dependency on gcc with CXX and qt4 with SQLITE

2012-03-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.3.2
diff --git a/fonts-x11/terminus-font/BUILD b/fonts-x11/terminus-font/BUILD
index aa0b28e..f52f330 100755
--- a/fonts-x11/terminus-font/BUILD
+++ b/fonts-x11/terminus-font/BUILD
@@ -2,6 +2,6 @@
--psfdir="$INSTALL_ROOT/usr/share/consolefonts" \
--acmdir="$INSTALL_ROOT/usr/share/consoletrans" \
--unidir="$INSTALL_ROOT/usr/share/consoletrans" \
- --x11dir="$INSTALL_ROOT/usr/share/fonts/misc" &&
+ --x11dir="$INSTALL_ROOT/usr/share/fonts/X11/misc" &&

make psf txt pcf
diff --git a/gnome2-apps/gramps/DETAILS b/gnome2-apps/gramps/DETAILS
index ed40730..2bb5a93 100755
--- a/gnome2-apps/gramps/DETAILS
+++ b/gnome2-apps/gramps/DETAILS
@@ -1,6 +1,6 @@
SPELL=gramps
- VERSION=3.4.2
-
SOURCE_HASH=sha512:73406fd5f5a29af5c8b03972a40ca73cc2198e93bacbf05bec521828c6fd50229b099380eafb7515e4e49c19f8395d992cf03a7ce256d85884294466eb3daa6b
+ VERSION=3.4.3
+
SOURCE_HASH=sha512:f30a5f7ce89f3570f73a7576906342edab25d3c3d12686acc0d5ec6fff142e443f42d3345a55e30ca47a304fe63225b310e7d11ad3d22ce69098a539f9adae02
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION//-?}
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/gnome2-apps/gramps/HISTORY b/gnome2-apps/gramps/HISTORY
index 2ad3df0..206534c 100644
--- a/gnome2-apps/gramps/HISTORY
+++ b/gnome2-apps/gramps/HISTORY
@@ -1,3 +1,6 @@
+2013-04-011 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.4.3
+
2012-11-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.2

diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index 84176a4..b3bb5a4 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,7 +1,7 @@
SPELL=glibmm
- VERSION=2.30.1
+ VERSION=2.34.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index f5fadb4..54f3cd2 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,7 @@
+2013-03-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 2.34.1
+ bz2->xz
+
2011-11-18 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 2.30.1

diff --git a/gnome2-libs/glibmm/glibmm-2.30.1.tar.bz2.sig
b/gnome2-libs/glibmm/glibmm-2.30.1.tar.bz2.sig
deleted file mode 100644
index 2c274d5..0000000
Binary files a/gnome2-libs/glibmm/glibmm-2.30.1.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-libs/glibmm/glibmm-2.34.1.tar.xz.sig
b/gnome2-libs/glibmm/glibmm-2.34.1.tar.xz.sig
new file mode 100644
index 0000000..fc5966a
Binary files /dev/null and b/gnome2-libs/glibmm/glibmm-2.34.1.tar.xz.sig
differ
diff --git a/gnome3-libs/libsecret/BUILD b/gnome3-libs/libsecret/BUILD
new file mode 100755
index 0000000..357206f
--- /dev/null
+++ b/gnome3-libs/libsecret/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" --disable-manpages" &&
+default_build
diff --git a/gnome3-libs/libsecret/DETAILS b/gnome3-libs/libsecret/DETAILS
index 6832ffa..76d907f 100755
--- a/gnome3-libs/libsecret/DETAILS
+++ b/gnome3-libs/libsecret/DETAILS
@@ -1,9 +1,9 @@
SPELL=libsecret
- VERSION=0.14
+ VERSION=0.15
SOURCE="${SPELL}-${VERSION}.tar.xz"
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE_URL[0]=$GNOME_URL/sources/libsecret/${BRANCH}/${SOURCE}
-
SOURCE_HASH=sha512:63b8fd947d63f178f48a79aa195f4b6a9eb1e802134779436981ab8aa00b268a449709139704843656f8b4616cc13a2dbc79a4ba4460b09cf250cef3478fd172
+
SOURCE_HASH=sha512:d89f3b52c5300306b92b222a56c976e5c42f761c2a8691b0dbac9f533853a54f6dd91f9f22f577e336c77e9771dd3cb098963dab086759ead2750f2a8fce5dca
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://live.gnome.org/Libsecret";
LICENSE[0]="LGPLv2"
diff --git a/gnome3-libs/libsecret/HISTORY b/gnome3-libs/libsecret/HISTORY
index 7dbfa8a..1f51c9e 100644
--- a/gnome3-libs/libsecret/HISTORY
+++ b/gnome3-libs/libsecret/HISTORY
@@ -1,3 +1,7 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.15
+ * BUILD: don't build manpages to prevent build error
+
2013-03-04 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.14

diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index d2b57ad..a173515 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2013-03-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: add fix for icu-51.1
+
2013-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.9.14

diff --git a/graphics-libs/harfbuzz/PRE_BUILD
b/graphics-libs/harfbuzz/PRE_BUILD
index 5d1215e..97ef57b 100755
--- a/graphics-libs/harfbuzz/PRE_BUILD
+++ b/graphics-libs/harfbuzz/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
-
+cd $SOURCE_DIRECTORY &&
+sed -i '/ustring/ i\
+#include <unicode/utf16.h>
+' src/hb-icu.cc &&
if [[ "$HARFBUZZ_BRANCH" == "scm" ]]; then
cd $SOURCE_DIRECTORY &&
NOCONFIGURE=y ./autogen.sh
diff --git a/graphics-libs/pythonmagick/DEPENDS
b/graphics-libs/pythonmagick/DEPENDS
index 282283d..e3482b8 100755
--- a/graphics-libs/pythonmagick/DEPENDS
+++ b/graphics-libs/pythonmagick/DEPENDS
@@ -1,3 +1,3 @@
depends python &&
depends -sub PYTHON boost &&
-depends imagemagick
+depends -sub HDRI imagemagick
diff --git a/graphics-libs/pythonmagick/HISTORY
b/graphics-libs/pythonmagick/HISTORY
index 404df69..be76c93 100644
--- a/graphics-libs/pythonmagick/HISTORY
+++ b/graphics-libs/pythonmagick/HISTORY
@@ -1,3 +1,6 @@
+2013-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on imagemagick with HDRI enabled
+
2012-09-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.9.8

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 512091b..fe06d54 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.3-10
+ VERSION=6.8.4-6
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-
SOURCE_HASH=sha512:24462043b04d6a033cd43cc963c8cfedbf03222e67d47167a874d7c51613dc9b1665bc0ebf02940eb6a0822c3b99c5de09642fcf0e3678ce0d09f6e8027e0eaf
+
SOURCE_HASH=sha512:35d6d883351818a52f0dd0d23434fa53bb60b564fdbecb608f537aef2b7ddde2de38ab726146a42d1c3456196009786a7bcfd3db89fe3e2001f43d70ada95a69
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index f6294ca..c33bcf2 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,10 @@
+2013-04-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.4-6
+
+2013-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.4-3
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: add sub dependency for HDRI
+
2013-03-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.3-10

diff --git a/graphics/imagemagick/PRE_SUB_DEPENDS
b/graphics/imagemagick/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..2ab8604
--- /dev/null
+++ b/graphics/imagemagick/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ HDRI) [[ $IMAGEMAGICK_HDRI == "--enable-hdri" ]] && return 0;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/graphics/imagemagick/SUB_DEPENDS
b/graphics/imagemagick/SUB_DEPENDS
new file mode 100755
index 0000000..8285fcc
--- /dev/null
+++ b/graphics/imagemagick/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ HDRI) message "HDRI needed, forcing it." &&
+ IMAGEMAGICK_HDRI="--enable-hdri" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 3a8fb71..59f0513 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=19.0
+ VERSION=20.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=19.0.2
+ VERSION=20.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
@@ -15,7 +15,7 @@ else

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
- SECURITY_PATCH=62
+ SECURITY_PATCH=63
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index ead19ea..046cab4 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 20.0, SECURITY_PATCH++
+
2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: disable avx support for all versions of gcc >= 4.6

diff --git a/kernels/linux-fusion/DEPENDS b/kernels/linux-fusion/DEPENDS
index f1e954a..21f6e3f 100755
--- a/kernels/linux-fusion/DEPENDS
+++ b/kernels/linux-fusion/DEPENDS
@@ -1 +1 @@
-depends CVS
+depends git
diff --git a/kernels/linux-fusion/DETAILS b/kernels/linux-fusion/DETAILS
index 1d2e810..5406548 100755
--- a/kernels/linux-fusion/DETAILS
+++ b/kernels/linux-fusion/DETAILS
@@ -6,7 +6,7 @@
fi
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_IGNORE=volatile
-
SOURCE_URL[0]=cvs://:pserver:anonymous AT git.directfb.org:/git/directfb/core/linux-fusion.git:master
+
SOURCE_URL[0]=git://git.directfb.org/git/directfb/core/linux-fusion.git:master
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://directfb.org
ENTERED=20071111
diff --git a/kernels/linux-fusion/HISTORY b/kernels/linux-fusion/HISTORY
index 9ff6aa9..bafc90b 100644
--- a/kernels/linux-fusion/HISTORY
+++ b/kernels/linux-fusion/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, DEPENDS: CVS -> git
+
2008-01-13 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: patchlevel 1
* TRIGGERS: added
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 8220aeb..000a866 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2013-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.5
+ * info/patches/maintenance_patches_3/patch-3.8.5: added
+
2013-03-21 Ladislav Hagara <hgr AT vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=patch-3.8.4
* info/patches/maintenance_patches_3/patch-3.8.4: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.5
new file mode 100755
index 0000000..37ec910
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.5
@@ -0,0 +1,5 @@
+appliedkernels="3.8"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="7d690bb21ea1cbe1d8b01bf5a29b23db6220e2d6"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index f87bf51..8bbd740 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.8
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.8.4
+LATEST_maintenance_patches_3=patch-3.8.5
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/gettext/DEPENDS b/libs/gettext/DEPENDS
index 19a1cc8..aa37f5b 100755
--- a/libs/gettext/DEPENDS
+++ b/libs/gettext/DEPENDS
@@ -1,5 +1,6 @@
depends gnupg &&
depends smgl-fhs &&
+depends libxml2 &&
optional_depends libcroco "" "--with-included-libcroco" "use system
libcroco" &&

optional_depends -sub CXX gcc \
diff --git a/libs/gettext/HISTORY b/libs/gettext/HISTORY
index 5f9b20f..24b075c 100644
--- a/libs/gettext/HISTORY
+++ b/libs/gettext/HISTORY
@@ -1,3 +1,6 @@
+2013-03-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add libxml2
+
2012-10-08 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to fix build with glibc 2.16

diff --git a/libs/nspr/DETAILS b/libs/nspr/DETAILS
index 9fe1e80..e88d0b6 100755
--- a/libs/nspr/DETAILS
+++ b/libs/nspr/DETAILS
@@ -1,11 +1,11 @@
SPELL=nspr
- VERSION=4.9.5
+ VERSION=4.9.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$VERSION/src/$SOURCE
WEB_SITE=http://www.mozilla.org/projects/nspr/
ENTERED=20050512
-
SOURCE_HASH=sha512:cbe60e4c5265863fa3250d7c16a2727d3a4a8762d17bc63d044ec88d11758fe9f54f54c08e198db6278ee68c55edd88f7c4bc5db9bdc46bdea4e4cf9eb277f27
+
SOURCE_HASH=sha512:635abfbf982d073803a76dc413097b7ac38d415c395e4a018d024f4620903e494b08f6e659ce0dfab06dc73eb7979c92824701bb613f8519b151e686811d3300
# SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=MPL
GATHER_DOCS=no
diff --git a/libs/nspr/HISTORY b/libs/nspr/HISTORY
index b08a0d7..246f15d 100644
--- a/libs/nspr/HISTORY
+++ b/libs/nspr/HISTORY
@@ -1,3 +1,6 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.9.6
+
2013-02-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.9.5

diff --git a/libs/podofo/DEPENDS b/libs/podofo/DEPENDS
index b398a80..5a556a1 100755
--- a/libs/podofo/DEPENDS
+++ b/libs/podofo/DEPENDS
@@ -3,7 +3,7 @@ depends openssl &&
depends freetype2 &&
depends zlib &&
depends fontconfig &&
+depends lua &&
optional_depends cppunit "" "" "Enable cppunit support" &&
optional_depends JPEG "" "" "Enable jpeg support" &&
-optional_depends tiff "" "" "Enable tiff support" &&
-optional_depends lua51 "" "" "Enable lua support"
+optional_depends tiff "" "" "Enable tiff support"
diff --git a/libs/podofo/HISTORY b/libs/podofo/HISTORY
index 0955da1..bfdbe04 100644
--- a/libs/podofo/HISTORY
+++ b/libs/podofo/HISTORY
@@ -1,3 +1,7 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: lua51 -> lua, mandatory
+ * PRE_BUILD: fix compile error
+
2013-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.2
* DEPENDS: add openssl, cmake
diff --git a/libs/podofo/PRE_BUILD b/libs/podofo/PRE_BUILD
new file mode 100755
index 0000000..6d29d19
--- /dev/null
+++ b/libs/podofo/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sed -e 's: lua_open(: luaL_newstate(:' \
+ -e 's: luaL_getn(: lua_rawlen(:' -i \
+ tools/podofocolor/luaconverter.cpp \
+ tools/podofoimpose/planreader_lua.cpp
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index 444032e..90e2f84 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,7 +1,7 @@
SPELL=pyqt4
SPELLX=PyQt-x11-gpl
- VERSION=4.9.6
-
SOURCE_HASH=sha512:1d0ca00d529f67d33e51b947b9e2c49a64611a842f1a78220c9390afd1657e909451d9b758d0c008b6efbba7ed047f18ca41323e4db2269d685b9d2400a604aa
+ VERSION=4.10
+
SOURCE_HASH=sha512:caf856d84659375cdaee9eead34d05f7bb0cbacbebf6e53bcfefa054335a774c09475d2e2b4be62967443700fc88e97389484e26e1a7d3ef4e3aa43a20afaade
URI=PyQt4
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index e0448da..70dd17a 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.10
+
2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.9.6

diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 16fd00d..6ad97e3 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
SPELL=sip
- VERSION=4.14.2
-
SOURCE_HASH=sha512:d23eba57c271e5ed4f9e434709108c33bca0166987606b02b48485996d4de385d6c6057e5b0432f18248b3b786f2dce7e80a06f8dce848b90a046418dd294ec6
+ VERSION=4.14.5
+
SOURCE_HASH=sha512:0100197678bfe1742b35817eeed40f9b38375b146c412679f24c11faa4f0ac02abade79d1567a23d107d28916322f97fc16ddc3600fc1e23c0721385a99a6650
URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index ddae31b..90f6b10 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.14.5
+
2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.14.2

diff --git a/python-pypi/beautifulsoup/DETAILS
b/python-pypi/beautifulsoup/DETAILS
index 981a1be..6bf29ec 100755
--- a/python-pypi/beautifulsoup/DETAILS
+++ b/python-pypi/beautifulsoup/DETAILS
@@ -1,11 +1,11 @@
SPELL=beautifulsoup
SPELLX=BeautifulSoup
- VERSION=3.0.7a
-
SOURCE_HASH=sha512:deb1dcad59b10dd2bfedb312c58daee77edd748676a3a758d381e11eb6e41c397a9a432ce09a9de762ff189270f73043972af67155551226bbb17f5fdce8b72b
+ VERSION=3.2.1
+
SOURCE_HASH=sha512:365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- WEB_SITE=http://www.crummy.com/software/BeautifulSoup/
- SOURCE_URL[0]=$WEB_SITE/download/$SOURCE
+ WEB_SITE=http://www.crummy.com/software/BeautifulSoup
+ SOURCE_URL[0]=$WEB_SITE/download/3.x/$SOURCE
LICENSE[0]=BSD
ENTERED=20070225
KEYWORDS="python"
diff --git a/python-pypi/beautifulsoup/HISTORY
b/python-pypi/beautifulsoup/HISTORY
index c79d4c6..f585360 100644
--- a/python-pypi/beautifulsoup/HISTORY
+++ b/python-pypi/beautifulsoup/HISTORY
@@ -1,4 +1,7 @@
-2008-0923 Treeve Jelbert <treeve AT sourcemage.org>
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.2.1
+
+2008-09-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.7a

2007-12-22 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/python-pypi/calibre/DEPENDS b/python-pypi/calibre/DEPENDS
index c434fca..e753938 100755
--- a/python-pypi/calibre/DEPENDS
+++ b/python-pypi/calibre/DEPENDS
@@ -3,6 +3,7 @@ depends SETUPTOOLS &&
depends pil &&
depends LIBUSB &&
depends qt4 &&
+depends qt4-private-headers &&
depends pyqt4 &&
depends mechanize &&
depends imagemagick &&
@@ -21,4 +22,7 @@ depends libwmf &&
depends sqlite &&
depends icu &&
depends dnspython &&
-depends libmtp
+depends libmtp &&
+depends python-netifaces &&
+depends psutil &&
+depends python-cssselect
diff --git a/python-pypi/calibre/DETAILS b/python-pypi/calibre/DETAILS
index ce45094..1647006 100755
--- a/python-pypi/calibre/DETAILS
+++ b/python-pypi/calibre/DETAILS
@@ -1,8 +1,8 @@
SPELL=calibre
- VERSION=0.8.70
+ VERSION=0.9.25
SOURCE="${SPELL}-${VERSION}.tar.xz"
SOURCE_URL[0]="$SOURCEFORGE_URL/$SPELL/$VERSION/$SOURCE"
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:27a62ba48d6e0bde868c4ae0f10cd5abf5432c2cb4d3076183cd35c6662340b47cb6143924675b3eadb54fb4641594cc59e1c291ef45decdb7e814dd13f8ec1c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
WEB_SITE="http://calibre-ebook.com/";
LICENSE[0]=GPL
diff --git a/python-pypi/calibre/HISTORY b/python-pypi/calibre/HISTORY
index 8549377..16b5180 100644
--- a/python-pypi/calibre/HISTORY
+++ b/python-pypi/calibre/HISTORY
@@ -1,3 +1,13 @@
+2013-04-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependency on qt4-private-headers
+ * PRE_BUILD, calibre-stop-phone-home.diff: removed obsolete
+ patch, sed in PRE_BUILD instead
+ * DETAILS: add SOURCE_HASH
+
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.25
+ * DEPENDS: added dependencies on python-netifaces, psutil,
python-cssselect
+
2012-12-26 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update SOURCE_URL to point to sf.net; old one being dead

diff --git a/python-pypi/calibre/PRE_BUILD b/python-pypi/calibre/PRE_BUILD
index c2617f0..6c30990 100755
--- a/python-pypi/calibre/PRE_BUILD
+++ b/python-pypi/calibre/PRE_BUILD
@@ -5,5 +5,5 @@ xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
cd $SOURCE_DIRECTORY &&

if [ "$CALIBRE_PHOME" = "y" ]; then
- patch -p1 < $SCRIPT_DIRECTORY/calibre-stop-phone-home.diff
+ sed -i -e
's/$--no-update-check.*$False$.*$store_true/\1True\2store_false/g'
src/calibre/gui2/main.py
fi
diff --git a/python-pypi/calibre/calibre-stop-phone-home.diff
b/python-pypi/calibre/calibre-stop-phone-home.diff
deleted file mode 100644
index 6c3f09d..0000000
--- a/python-pypi/calibre/calibre-stop-phone-home.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur calibre.orig/src/calibre/gui2/update.py
calibre/src/calibre/gui2/update.py
---- calibre.orig/src/calibre/gui2/update.py 2012-09-20 16:27:22.398340171
-0500
-+++ calibre/src/calibre/gui2/update.py 2012-09-20 16:27:58.594339911 -0500
-@@ -20,18 +20,6 @@
- VSEP = '|'
-
- def get_newest_version():
-- br = browser()
-- req = mechanize.Request(URL)
-- req.add_header('CALIBRE_VERSION', __version__)
-- req.add_header('CALIBRE_OS',
-- 'win' if iswindows else 'osx' if isosx else 'oth')
-- req.add_header('CALIBRE_INSTALL_UUID', prefs['installation_uuid'])
-- version = br.open(req).read().strip()
-- try:
-- version = version.decode('utf-8')
-- except UnicodeDecodeError:
-- version = u''
-- return version
-
- class CheckForUpdates(QThread):
-
diff --git a/python-pypi/clientform/BUILD b/python-pypi/clientform/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/clientform/BUILD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/clientform/DEPENDS b/python-pypi/clientform/DEPENDS
index 503782e..1e07613 100755
--- a/python-pypi/clientform/DEPENDS
+++ b/python-pypi/clientform/DEPENDS
@@ -1,2 +1 @@
-depends python &&
-depends SETUPTOOLS
+depends mechanize
diff --git a/python-pypi/clientform/DETAILS b/python-pypi/clientform/DETAILS
index a651816..0f7466e 100755
--- a/python-pypi/clientform/DETAILS
+++ b/python-pypi/clientform/DETAILS
@@ -1,16 +1,7 @@
- SPELL=clientform
- VERSION=0.2.7
-
SOURCE_HASH=sha512:c6e8ffbe28e1acf6df1c3b3a8af64c937a73a11a61a95c0f24b6bb86063b84ec131cbfacfa40abe1eac5850320210256cedddec360cacc1341413306a6c863fa
- SOURCE=ClientForm-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ClientForm-$VERSION
- SOURCE_URL[0]=http://wwwsearch.sourceforge.net/ClientForm/src/$SOURCE
- WEB_SITE=http://wwwsearch.sourceforge.net/ClientForm/
- LICENSE[0]=BSD
- KEYWORDS="html python devel"
- SHORT="Python module for handling HTML forms on the client side"
-cat << EOF
-ClientForm is a Python module for handling HTML forms on the client side,
useful
-for parsing HTML forms, filling them in and returning the completed forms to
the
-server. It developed from a port of Gisle Aas' Perl module HTML::Form, from
the
-libwww-perl library, but the interface is not the same.
-EOF
+ SPELL=clientform
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by mechanize]
+ EOF
diff --git a/python-pypi/clientform/DETAILS.orig
b/python-pypi/clientform/DETAILS.orig
new file mode 100755
index 0000000..a651816
--- /dev/null
+++ b/python-pypi/clientform/DETAILS.orig
@@ -0,0 +1,16 @@
+ SPELL=clientform
+ VERSION=0.2.7
+
SOURCE_HASH=sha512:c6e8ffbe28e1acf6df1c3b3a8af64c937a73a11a61a95c0f24b6bb86063b84ec131cbfacfa40abe1eac5850320210256cedddec360cacc1341413306a6c863fa
+ SOURCE=ClientForm-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ClientForm-$VERSION
+ SOURCE_URL[0]=http://wwwsearch.sourceforge.net/ClientForm/src/$SOURCE
+ WEB_SITE=http://wwwsearch.sourceforge.net/ClientForm/
+ LICENSE[0]=BSD
+ KEYWORDS="html python devel"
+ SHORT="Python module for handling HTML forms on the client side"
+cat << EOF
+ClientForm is a Python module for handling HTML forms on the client side,
useful
+for parsing HTML forms, filling them in and returning the completed forms to
the
+server. It developed from a port of Gisle Aas' Perl module HTML::Form, from
the
+libwww-perl library, but the interface is not the same.
+EOF
diff --git a/python-pypi/clientform/DOWNLOAD b/python-pypi/clientform/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/clientform/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/clientform/HISTORY b/python-pypi/clientform/HISTORY
index 71495db..c6f25c8 100644
--- a/python-pypi/clientform/HISTORY
+++ b/python-pypi/clientform/HISTORY
@@ -1,3 +1,8 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [part of mechanize now]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2011-05-23 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider

diff --git a/python-pypi/clientform/INSTALL b/python-pypi/clientform/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/clientform/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/clientform/PRE_BUILD
b/python-pypi/clientform/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/clientform/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/clientform/TRIGGERS b/python-pypi/clientform/TRIGGERS
new file mode 100755
index 0000000..fce6886
--- /dev/null
+++ b/python-pypi/clientform/TRIGGERS
@@ -0,0 +1 @@
+on_cast clientform dispel_self
diff --git a/python-pypi/lxml/DETAILS b/python-pypi/lxml/DETAILS
index 152d50d..75713e7 100755
--- a/python-pypi/lxml/DETAILS
+++ b/python-pypi/lxml/DETAILS
@@ -1,5 +1,5 @@
SPELL=lxml
- VERSION=3.1.0
+ VERSION=3.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://pypi.python.org/packages/source/l/$SPELL/$SOURCE
diff --git a/python-pypi/lxml/HISTORY b/python-pypi/lxml/HISTORY
index 5fb4faf..c9acaf3 100644
--- a/python-pypi/lxml/HISTORY
+++ b/python-pypi/lxml/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.1.1
+
2013-03-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.1.0; updated WEB_SITE

diff --git a/python-pypi/mechanize/DEPENDS b/python-pypi/mechanize/DEPENDS
index d129c11..7402e7b 100755
--- a/python-pypi/mechanize/DEPENDS
+++ b/python-pypi/mechanize/DEPENDS
@@ -1 +1,2 @@
-depends clientform
+depends SETUPTOOLS &&
+depends python
diff --git a/python-pypi/mechanize/DETAILS b/python-pypi/mechanize/DETAILS
index d47b1ab..fe8fc94 100755
--- a/python-pypi/mechanize/DETAILS
+++ b/python-pypi/mechanize/DETAILS
@@ -1,6 +1,6 @@
SPELL=mechanize
- VERSION=0.1.11
-
SOURCE_HASH=sha512:70d8ecee47961fe9afcf87e10bde4c8e8a5fcc8865ecde5a1542a9734c74d772f587d310f187bf7ad505898d6ba0523788a5af8d0d0cffc7a429b43a649c76e8
+ VERSION=0.2.5
+
SOURCE_HASH=sha512:23de1d9a5fba63d76fd577889594dacf5412fb2fccb58908a10ab350a81dd16a7a31019d0b4a59a5ed4115320c7e3585c77eef88dcd80a88a9c3c2da3c28fa68
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://wwwsearch.sourceforge.net/mechanize/src/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/mechanize/HISTORY b/python-pypi/mechanize/HISTORY
index 28f0e78..cc0af66 100644
--- a/python-pypi/mechanize/HISTORY
+++ b/python-pypi/mechanize/HISTORY
@@ -1,3 +1,8 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.2.5
+ * DEPENDS: removed dependency on clientform, added dependencies
+ on SETUPTOOLS, python
+
2009-03-14 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 0.1.11

diff --git a/python-pypi/python-cssselect/DEPENDS
b/python-pypi/python-cssselect/DEPENDS
new file mode 100755
index 0000000..6e84a0e
--- /dev/null
+++ b/python-pypi/python-cssselect/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-pypi/python-cssselect/DETAILS
b/python-pypi/python-cssselect/DETAILS
new file mode 100755
index 0000000..06d095c
--- /dev/null
+++ b/python-pypi/python-cssselect/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=python-cssselect
+ VERSION=0.8
+ SOURCE="cssselect-${VERSION}.tar.gz"
+
SOURCE_URL[0]=https://pypi.python.org/packages/source/c/cssselect/${SOURCE}
+
SOURCE_HASH=sha512:4001f48e804b19170a328a1bd7dedf3cdfd0ca4103713448e69288fcefa87dba74066a43e5cf4287db312e17719a4eec67ac54827e1bf917d664d0fed515da52
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/cssselect-${VERSION}"
+ WEB_SITE="https://pypi.python.org/pypi/cssselect";
+ LICENSE[0]=BSD
+ ENTERED=20130330
+ SHORT="parses CSS3 Selectors and translates them to XPath 1.0"
+cat << EOF
+cssselect parses CSS3 Selectors and translate them to XPath 1.0 expressions.
+Such expressions can be used in lxml or another XPath engine to find the
+matching elements in an XML or HTML document.
+EOF
diff --git a/python-pypi/python-cssselect/HISTORY
b/python-pypi/python-cssselect/HISTORY
new file mode 100644
index 0000000..0a9414e
--- /dev/null
+++ b/python-pypi/python-cssselect/HISTORY
@@ -0,0 +1,3 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/python-futures/DEPENDS
b/python-pypi/python-futures/DEPENDS
new file mode 100755
index 0000000..6e84a0e
--- /dev/null
+++ b/python-pypi/python-futures/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-pypi/python-futures/DETAILS
b/python-pypi/python-futures/DETAILS
new file mode 100755
index 0000000..0295db7
--- /dev/null
+++ b/python-pypi/python-futures/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=python-futures
+ VERSION=2.1.3
+ SOURCE="futures-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/f/futures/$SOURCE
+
SOURCE_HASH=sha512:46f7d758193eca02c0c591472617413a349ee647776e6b8fc1894a61619dc7dd2aa292f870b94d4f53c04f57a4e2a48012b4a02a18a97b6bac35afd322c7920b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/futures-${VERSION}"
+ WEB_SITE="https://pypi.python.org/pypi/futures";
+ LICENSE[0]=BSD
+ ENTERED=20130329
+ SHORT="backport of the concurrent.futures package from Python 3.2"
+cat << EOF
+Backport of the concurrent.futures package from Python 3.2
+EOF
diff --git a/python-pypi/python-futures/HISTORY
b/python-pypi/python-futures/HISTORY
new file mode 100644
index 0000000..16bbc85
--- /dev/null
+++ b/python-pypi/python-futures/HISTORY
@@ -0,0 +1,3 @@
+2013-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/python-netifaces/DEPENDS
b/python-pypi/python-netifaces/DEPENDS
new file mode 100755
index 0000000..6e84a0e
--- /dev/null
+++ b/python-pypi/python-netifaces/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-pypi/python-netifaces/DETAILS
b/python-pypi/python-netifaces/DETAILS
new file mode 100755
index 0000000..cecb2be
--- /dev/null
+++ b/python-pypi/python-netifaces/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=python-netifaces
+ VERSION=0.8
+ SOURCE="netifaces-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://alastairs-place.net/projects/netifaces/${SOURCE}
+
SOURCE_HASH=sha512:b3735c4f83d4ed1d52f59937187659f148205a721fd05ce5a10e9ec89ea3519971001b2985e24bb30fb112ee741310babd847f84d4c3fbb34989edc6a743f551
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/netifaces-${VERSION}"
+ WEB_SITE="http://alastairs-place.net/projects/netifaces/";
+ LICENSE[0]=MIT
+ ENTERED=20130330
+ SHORT="portable network interface information"
+cat << EOF
+netifaces provides a (hopefully portable-ish) way for Python programmers
+to get access to a list of the network interfaces on the local machine,
+and to obtain the addresses of those network interfaces.
+EOF
diff --git a/python-pypi/python-netifaces/HISTORY
b/python-pypi/python-netifaces/HISTORY
new file mode 100644
index 0000000..0a9414e
--- /dev/null
+++ b/python-pypi/python-netifaces/HISTORY
@@ -0,0 +1,3 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/python-pypi/urlwatch/DEPENDS b/python-pypi/urlwatch/DEPENDS
new file mode 100755
index 0000000..e93ecef
--- /dev/null
+++ b/python-pypi/urlwatch/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends python-futures
diff --git a/python-pypi/urlwatch/DETAILS b/python-pypi/urlwatch/DETAILS
new file mode 100755
index 0000000..281a6a6
--- /dev/null
+++ b/python-pypi/urlwatch/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=urlwatch
+ VERSION=1.15
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://thp.io/2008/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:60b7904ec10fcc20c4d3096381d26c7baf0a4a3abe4aed0a9c7b6e5de74e212a8221279438ca0e3186966f9a9ba50138ce5cbe7564b155b2d4e7ffc17e94da1e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://thp.io/2008/urlwatch/";
+ LICENSE[0]=BSD
+ ENTERED=20130329
+ SHORT="a tool for monitoring webpages for updates"
+cat << EOF
+This script is intended to help you watch URLs and get notified (via email
+or in your terminal) of any changes. The change notification will include
+the URL that has changed and a unified diff of what has changed.
+
+The script supports the use of a filtering hook function to strip
+trivially-varying elements of a webpage.
+EOF
diff --git a/python-pypi/urlwatch/HISTORY b/python-pypi/urlwatch/HISTORY
new file mode 100644
index 0000000..16bbc85
--- /dev/null
+++ b/python-pypi/urlwatch/HISTORY
@@ -0,0 +1,3 @@
+2013-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/science/qlandkarte-gt/DEPENDS b/science/qlandkarte-gt/DEPENDS
index b3d4578..6c86a16 100755
--- a/science/qlandkarte-gt/DEPENDS
+++ b/science/qlandkarte-gt/DEPENDS
@@ -1,5 +1,5 @@
depends cmake &&
-depends qt4 &&
+depends -sub OPENGL qt4 &&
depends gdal &&
depends proj &&
depends PYTHON &&
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index ef20f66..7ed9e9f 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,9 +1,9 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add sub dependency on OPENGL for qt4
+
2013-03-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.0

-2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: add sub dependency on OPENGL for qt4
-
2012-12-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.6.0

diff --git a/science/stellarium/DETAILS b/science/stellarium/DETAILS
index 945aa42..22509a0 100755
--- a/science/stellarium/DETAILS
+++ b/science/stellarium/DETAILS
@@ -2,7 +2,7 @@
VERSION=0.12.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/Stellarium-sources/${VERSION}/${SOURCE}

SOURCE_HASH=sha512:21dade0ab830d1c4db1c739a71d7e22deedbf57486a71ad2cc04c7757de5e559f2151ca83949426f69f87d87ae5a7ebfb405372d4db0bd34c498e7dc10570d2b
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
diff --git a/science/stellarium/HISTORY b/science/stellarium/HISTORY
index b06727f..8b4780c 100644
--- a/science/stellarium/HISTORY
+++ b/science/stellarium/HISTORY
@@ -1,3 +1,6 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+
2013-01-31 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: 0.12.0

diff --git a/shell-term-fm/eaglemode/DEPENDS b/shell-term-fm/eaglemode/DEPENDS
new file mode 100755
index 0000000..4fff37b
--- /dev/null
+++ b/shell-term-fm/eaglemode/DEPENDS
@@ -0,0 +1,32 @@
+depends perl &&
+depends xine-lib &&
+depends libx11 &&
+depends -sub CXX gcc &&
+depends xterm &&
+depends ghostscript &&
+
+optional_depends JPEG "" "" "for viewing jpeg files" &&
+optional_depends libpng "" "" "for viewing png files" &&
+optional_depends tiff "" "" "for viewing tiff files" &&
+optional_depends librsvg2 "" "" "for viewing svg files" &&
+optional_depends poppler "" "" "for viewing pdf files" &&
+optional_depends freetype2 "" "" "for extending the fontset with font2em" &&
+
+suggest_depends 7z "" "" "for working with 7z files" &&
+suggest_depends arc "" "" "for working with arc files" &&
+suggest_depends arj "" "" "for working with arj files" &&
+suggest_depends lha "" "" "for working with lha files" &&
+suggest_depends lzop "" "" "for working with lzo files" &&
+suggest_depends unrar "" "" "for working with rar files" &&
+suggest_depends LZMA "" "" "for working with lzma and xz files" &&
+suggest_depends unzip "" "" "for working with zip files" &&
+suggest_depends zoo "" "" "for working with zoo files" &&
+suggest_depends abiword "" "" "for viewing abw, doc, odt and rtf files" &&
+suggest_depends dia "" "" "for viewing dia files" &&
+suggest_depends texlive "" "" "for viewing dvi files" &&
+suggest_depends transfig "" "" "for viewing fig files" &&
+suggest_depends netpbm "" "" "for viewing g3 and xwd files" &&
+suggest_depends htmldoc "" "" "for viewing html files" &&
+suggest_depends genisoimage "" "" "for viewing infos from iso files" &&
+suggest_depends povray "" "" "for viewing pov files" &&
+suggest_depends rpm "" "" "for viewing infos from rpm files"
diff --git a/shell-term-fm/eaglemode/DETAILS b/shell-term-fm/eaglemode/DETAILS
index b01e9c7..9aa8fda 100755
--- a/shell-term-fm/eaglemode/DETAILS
+++ b/shell-term-fm/eaglemode/DETAILS
@@ -1,7 +1,7 @@
SPELL=eaglemode
VERSION=0.84.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}-${VERSION}/${SOURCE}

SOURCE_HASH=sha512:7e5706bd883b812af5dc7fe1c8a1644ba6a68c17547275558a754c7afaedcbf296fc48ea8984df7bdc9699cc1a1fe8e4ea6567c6f949c99a6b496644136aac32
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://eaglemode.sourceforge.net/";
diff --git a/shell-term-fm/eaglemode/HISTORY b/shell-term-fm/eaglemode/HISTORY
index f777582..bf20cfd 100644
--- a/shell-term-fm/eaglemode/HISTORY
+++ b/shell-term-fm/eaglemode/HISTORY
@@ -1,3 +1,11 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fixed SOURCE_URL[0]
+ * DEPENDS: added dependencies on perl, xine-lib, libx11, gcc with CXX,
+ xterm and ghostscript, optional dependencies on JPEG, libpng, tiff,
+ librsvg2, poppler, freetype2, suggest dependencies on 7z, arc, arj,
+ lha, lzop, unrar, LZMA, unzip, zoo, abiword, dia, texlive, transfig,
+ netpbm, htmldoc, genisoimage, povray, rpm
+
2012-06-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.84.0

diff --git a/utils/latencytop/DEPENDS b/utils/latencytop/DEPENDS
new file mode 100755
index 0000000..a3cf08b
--- /dev/null
+++ b/utils/latencytop/DEPENDS
@@ -0,0 +1,5 @@
+depends ncurses &&
+optional_depends gtk+2 \
+ "" \
+ "" \
+ "enable GTK GUI"
diff --git a/utils/latencytop/HISTORY b/utils/latencytop/HISTORY
index 8fb3244..91fd2ce 100644
--- a/utils/latencytop/HISTORY
+++ b/utils/latencytop/HISTORY
@@ -1,3 +1,7 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, PRE_BUILD: added dependency on ncurses and optional
+ dependency on gtk+2
+
2010-01-29 Finn Haedicke <finn AT sourcemage.org>
* DETAILS: added sha512sum
* BUILD: created (make)
diff --git a/utils/latencytop/PRE_BUILD b/utils/latencytop/PRE_BUILD
new file mode 100755
index 0000000..2f8241c
--- /dev/null
+++ b/utils/latencytop/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+if is_depends_enable latencytop gtk+2; then
+ cd ${SOURCE_DIRECTORY} &&
+ sedit 's:HAS_GTK_GUI = 1:HAS_GTK_GUI = 0:' Makefile || return 1
+fi
diff --git a/utils/littleutils/DETAILS b/utils/littleutils/DETAILS
index 4374231..ff8a645 100755
--- a/utils/littleutils/DETAILS
+++ b/utils/littleutils/DETAILS
@@ -1,8 +1,8 @@
SPELL=littleutils
- VERSION=1.0.23
+ VERSION=1.0.27
SOURCE="$SPELL-$VERSION.tar.bz2"
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}-source/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:6aaa7f98e1bea694cd770b845aff96797e391c4bfe2663ff71cc244fecab325c8bff46de163696c14dc00dbc609aa2722a869978fc3ced19d98fbed26be1e60c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL-$VERSION"
WEB_SITE=http://sourceforge.net/projects/littleutils/
LICENSE[0]=GPL
diff --git a/utils/littleutils/HISTORY b/utils/littleutils/HISTORY
index 57e0fdd..9572cd4 100644
--- a/utils/littleutils/HISTORY
+++ b/utils/littleutils/HISTORY
@@ -1,3 +1,6 @@
+2013-04-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.27
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/utils/littleutils/littleutils-1.0.23.tar.bz2.sig
b/utils/littleutils/littleutils-1.0.23.tar.bz2.sig
deleted file mode 100644
index 15bd4b4..0000000
Binary files a/utils/littleutils/littleutils-1.0.23.tar.bz2.sig and /dev/null
differ
diff --git a/utils/mozcache/BUILD b/utils/mozcache/BUILD
new file mode 100755
index 0000000..64d9c44
--- /dev/null
+++ b/utils/mozcache/BUILD
@@ -0,0 +1,3 @@
+OPTS="$MOZCACHE_OPTS $OPTS" &&
+
+default_build
diff --git a/utils/mozcache/CONFIGURE b/utils/mozcache/CONFIGURE
new file mode 100755
index 0000000..6fdf806
--- /dev/null
+++ b/utils/mozcache/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_list MOZCACHE_GTK "Which GTK+ version to use for GUI?" \
+ gtk+2 \
+ gtk+
diff --git a/utils/mozcache/DEPENDS b/utils/mozcache/DEPENDS
new file mode 100755
index 0000000..8a79aa9
--- /dev/null
+++ b/utils/mozcache/DEPENDS
@@ -0,0 +1,31 @@
+depends zlib &&
+depends pkgconfig &&
+depends $MOZCACHE_GTK &&
+
+if is_depends_enabled $SPELL gtk+; then
+ persistent_add MOZCACHE_OPTS &&
+
+ list_add "MOZCACHE_OPTS" "--enable-gtk-1v2" &&
+
+ optional_depends libx11 \
+ "--enable-xsetlocale" \
+ "--disable-xsetlocale" \
+ "to use Xsetlocale" &&
+
+ optional_depends libunicode \
+ "--with-unicode" \
+ "--without-unicode" \
+ "for Unicode support"
+fi &&
+
+if is_depends_enabled $SPELL gtk+2; then
+ optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "for Native Language Support"
+fi &&
+
+optional_depends pcre \
+ "--with-regex=pcre" \
+ "--with-regex=posix" \
+ "for regular expressions support via PCRE"
diff --git a/utils/mozcache/DETAILS b/utils/mozcache/DETAILS
new file mode 100755
index 0000000..25e079a
--- /dev/null
+++ b/utils/mozcache/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=mozcache
+ VERSION=1.3.4
+
SOURCE_HASH=sha512:688ae9e90f5a02d890bb54c77acea3a5796a2ac432225dd9b7cd8fb8ed2557cae75173f96a149fa37bab4d37c16a3d7bb062e2c0b1bc7db99f8350b9817f084f
+ SOURCE=$SPELL-$VERSION-src.tar.bz2
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://mozcache.sourceforge.net/
+ LICENSE[0]=GPL
+ ENTERED=20130402
+ SHORT="viewer and manager for cache files stored by Gecko-based
browsers"
+cat << EOF
+MozCache is a program for viewing, searching in, saving and deleting cache
files
+of Mozilla, Firefox, SeaMonkey and both current and older versions of
Netscape
+web browsers.
+EOF
diff --git a/utils/mozcache/HISTORY b/utils/mozcache/HISTORY
new file mode 100644
index 0000000..9052155
--- /dev/null
+++ b/utils/mozcache/HISTORY
@@ -0,0 +1,2 @@
+2013-03-31 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, CONFIGURE, BUILD: spell created
diff --git a/video-libs/live/DETAILS b/video-libs/live/DETAILS
index 3023617..d92d5cf 100755
--- a/video-libs/live/DETAILS
+++ b/video-libs/live/DETAILS
@@ -1,7 +1,7 @@
SPELL=live
- VERSION=2013.02.11
+ VERSION=2013.04.01
SOURCE=$SPELL.$VERSION.tar.gz
-
SOURCE_HASH=sha512:c0f2efbf2af06d5e5f2bc58955ca37942022a439e3c48bec06a49b636e08d4d31855e884586448c698b0c90d35ef24f282570d0026c4454c9e58855ff36713be
+
SOURCE_HASH=sha512:f98467c682e6ba40a02b2279c1cfc6b5bbe02784113fac35c4a54039ac5a570ec6b49eefe25bdd3c92c3a10e3581bfce97901f0f708552147515b3ecb4686b62
#SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.live555.com/liveMedia/public/$SOURCE
diff --git a/video-libs/live/HISTORY b/video-libs/live/HISTORY
index d783fed..ee8a143 100644
--- a/video-libs/live/HISTORY
+++ b/video-libs/live/HISTORY
@@ -1,3 +1,9 @@
+2013-04-02 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2013.04.01
+
+2013-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2013.03.23
+
2013-02-22 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 2013.02.11

diff --git a/video/smplayer/DETAILS b/video/smplayer/DETAILS
index e091a76..023b408 100755
--- a/video/smplayer/DETAILS
+++ b/video/smplayer/DETAILS
@@ -1,8 +1,8 @@
SPELL=smplayer
- VERSION=0.8.3
+ VERSION=0.8.4
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:14d1830ce4ff3f4bf4b7f6cce1c74c84edf11dbe43fad540b9919a9b06aa148ad22c8a13498a2a61b576677c27b44482d52accf5f5c89294c4e0d7a3eba46252
+
SOURCE_HASH=sha512:d9b28154fbc6a47d5efa7313eed06ea8c683ab8a5c717a417d2dc9b0610f8da0aac56ed795296e006ef0756dd88aa5e91c14f09380e7ef2dd65d046c25803893
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://smplayer.sourceforge.net/
LICENSE[0]=GPL
diff --git a/video/smplayer/HISTORY b/video/smplayer/HISTORY
index 31a1776..c8f6536 100644
--- a/video/smplayer/HISTORY
+++ b/video/smplayer/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.4
+
2012-12-28 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.8.3

diff --git a/wm-addons/cairo-dock-plugins/DETAILS
b/wm-addons/cairo-dock-plugins/DETAILS
index 4ef97da..a8fcdb9 100755
--- a/wm-addons/cairo-dock-plugins/DETAILS
+++ b/wm-addons/cairo-dock-plugins/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock-plugins
- VERSION=3.1.2
+ VERSION=3.2.0
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock-plugins/HISTORY
b/wm-addons/cairo-dock-plugins/HISTORY
index fd80e60..1070cc7 100644
--- a/wm-addons/cairo-dock-plugins/HISTORY
+++ b/wm-addons/cairo-dock-plugins/HISTORY
@@ -1,3 +1,6 @@
+2013-03-25 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 3.2.0
+
2012-12-18 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.1.2

diff --git a/wm-addons/cairo-dock/DETAILS b/wm-addons/cairo-dock/DETAILS
index e8eeb09..dab86e8 100755
--- a/wm-addons/cairo-dock/DETAILS
+++ b/wm-addons/cairo-dock/DETAILS
@@ -1,5 +1,5 @@
SPELL=cairo-dock
- VERSION=3.1.2
+ VERSION=3.2.0
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY
index 5ba6a61..4076e65 100644
--- a/wm-addons/cairo-dock/HISTORY
+++ b/wm-addons/cairo-dock/HISTORY
@@ -1,3 +1,6 @@
+2013-03-25 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: version 3.2.0
+
2012-12-18 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.1.2

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 94259ff..7ba4968 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.5.26
+ VERSION=1.5.27
else
VERSION=1.4.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index f860bb1..36fdd8e 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2013-03-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.27 (devel)
+
2013-03-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.26 (devel)

diff --git a/x11-toolkits/gtkmm3/DETAILS b/x11-toolkits/gtkmm3/DETAILS
index 66788c7..ee532c1 100755
--- a/x11-toolkits/gtkmm3/DETAILS
+++ b/x11-toolkits/gtkmm3/DETAILS
@@ -1,7 +1,7 @@
SPELL=gtkmm3
- VERSION=3.2.0
+ VERSION=3.6.0
BRANCH=`echo $VERSION|cut -d . -f 1,2`
- SOURCE=${SPELL%?}-$VERSION.tar.bz2
+ SOURCE=${SPELL%?}-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL%?}-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/${SPELL%?}/$BRANCH/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/x11-toolkits/gtkmm3/HISTORY b/x11-toolkits/gtkmm3/HISTORY
index 16a72f7..c7e1e5e 100644
--- a/x11-toolkits/gtkmm3/HISTORY
+++ b/x11-toolkits/gtkmm3/HISTORY
@@ -1,3 +1,7 @@
+2013-03-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.0
+ bz2 -> xz
+
2011-10-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.0

diff --git a/x11-toolkits/gtkmm3/gtkmm-3.2.0.tar.bz2.sig
b/x11-toolkits/gtkmm3/gtkmm-3.2.0.tar.bz2.sig
deleted file mode 100644
index efc7b04..0000000
Binary files a/x11-toolkits/gtkmm3/gtkmm-3.2.0.tar.bz2.sig and /dev/null
differ
diff --git a/x11-toolkits/gtkmm3/gtkmm-3.6.0.tar.xz.sig
b/x11-toolkits/gtkmm3/gtkmm-3.6.0.tar.xz.sig
new file mode 100644
index 0000000..4c302de
Binary files /dev/null and b/x11-toolkits/gtkmm3/gtkmm-3.6.0.tar.xz.sig differ
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index 448c7b9..1c59654 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,6 +1,6 @@
SPELL=qscintilla
- VERSION=2.6.2
-
SOURCE_HASH=sha512:5d92c70182817f34141c4166a41807a3ef506c38cc2cd3c83d140eeca329e4aa6f1fa379bb9422da95d65a3385eefc27b0948b342af89c93eeca49f233a63a81
+ VERSION=2.7.1
+
SOURCE_HASH=sha512:7e1c003ac210f27e60666385fa4b0b42b20371b48ac4a05b0a5740c963beaa5403df42e2d516bbe6e9eb3d2ad1e5acb5825fcb3d0b4aabfbe971ecae3c86296b
SOURCE=QScintilla-gpl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION

WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index fd97e26..6cab53e 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,6 @@
+2013-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.7.1
+
2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.6.2
* BUILD: fixed QTSCINT variable
diff --git a/x11-toolkits/qt4-private-headers/BUILD
b/x11-toolkits/qt4-private-headers/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/BUILD
@@ -0,0 +1 @@
+true
diff --git a/x11-toolkits/qt4-private-headers/DEPENDS
b/x11-toolkits/qt4-private-headers/DEPENDS
new file mode 100755
index 0000000..428f269
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/x11-toolkits/qt4-private-headers/DETAILS
b/x11-toolkits/qt4-private-headers/DETAILS
new file mode 100755
index 0000000..051f747
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=qt4-private-headers
+ SPELLX=qt-everywhere-opensource-src
+ VERSION=4.8.4
+
SOURCE_HASH=sha512:472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
+ GATHER_DOCS=no
+ SOURCE_URL[0]=http://releases.qt-project.org/qt4/source/$SOURCE
+ WEB_SITE=http://www.qtsoftware.com/products
+ ENTERED=20130330
+ LICENSE[0]=LGPL
+ SHORT="Private headers for QT4 ver 4.8.4"
+cat << EOF
+Some applications, such as calibre, require the QT4
+private headers API, and they are missing when casting
+QT4. To avoid rcompiling QT4, with such option on
+(which by now doesn't exist on SMGL), the fastest is
+to provide the headers in a separate spell.
+EOF
diff --git a/x11-toolkits/qt4-private-headers/HISTORY
b/x11-toolkits/qt4-private-headers/HISTORY
new file mode 100644
index 0000000..081af49
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/HISTORY
@@ -0,0 +1,5 @@
+2013-03-30 Javier Vasquez <j.e.vasquez.v AT gmail.com>
+ * DETAILS, BUILD, INSTALL: New spell based on qt4, but
+ following what arch does for qt4-private-headers.
+ See:
+
https://projects.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/qt4-private-headers
diff --git a/x11-toolkits/qt4-private-headers/INSTALL
b/x11-toolkits/qt4-private-headers/INSTALL
new file mode 100755
index 0000000..eb82179
--- /dev/null
+++ b/x11-toolkits/qt4-private-headers/INSTALL
@@ -0,0 +1,12 @@
+install -d ${INSTALL_ROOT}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
&&
+install -d
${INSTALL_ROOT}/usr/include/qt4/private-src/{corelib,declarative,gui,script}
&&
+
+for i in QtCore QtDeclarative QtGui QtScript; do
+ cp -r ${SOURCE_DIRECTORY}/include/${i}/private
${INSTALL_ROOT}/usr/include/${i}
+done
&&
+
+find ${INSTALL_ROOT}/usr/include/Qt*/private/ -name *.h -exec sed -i
's|#include "../../../src/|#include "../../qt4/private-src/|' {} \; &&
+
+for i in corelib declarative gui script; do
+ cp -r ${SOURCE_DIRECTORY}/src/${i}
${INSTALL_ROOT}/usr/include/qt4/private-src
+done
diff --git a/x11-toolkits/wxgtk-new/BUILD b/x11-toolkits/wxgtk-new/BUILD
index 9fd93f4..e78af14 100755
--- a/x11-toolkits/wxgtk-new/BUILD
+++ b/x11-toolkits/wxgtk-new/BUILD
@@ -7,7 +7,6 @@ OPTS="$OPTS
--enable-geometry
--enable-unicode
--enable-graphics_ctx
- --with-gtk=2
" &&
# wx project recommends building in a separate directory
cd $SOURCE_DIRECTORY &&
diff --git a/x11-toolkits/wxgtk-new/CONFIGURE
b/x11-toolkits/wxgtk-new/CONFIGURE
new file mode 100755
index 0000000..d4b76e3
--- /dev/null
+++ b/x11-toolkits/wxgtk-new/CONFIGURE
@@ -0,0 +1,2 @@
+source $GRIMOIRE/FUNCTIONS &&
+config_query_multi WX_GTK "which gtk+ version?" 3 2
diff --git a/x11-toolkits/wxgtk-new/DEPENDS b/x11-toolkits/wxgtk-new/DEPENDS
index 46600b0..25c97f4 100755
--- a/x11-toolkits/wxgtk-new/DEPENDS
+++ b/x11-toolkits/wxgtk-new/DEPENDS
@@ -1,5 +1,5 @@
depends -sub CXX gcc &&
-depends gtk+2 &&
+depends gtk+${WX_GTK} "--with-gtk=$WX_GTK" &&
depends libx11 '--with-x' &&

# all of the "depends" below strictly speaking are not required, e.g. we can
diff --git a/x11-toolkits/wxgtk-new/HISTORY b/x11-toolkits/wxgtk-new/HISTORY
index 85d5081..c2420f6 100644
--- a/x11-toolkits/wxgtk-new/HISTORY
+++ b/x11-toolkits/wxgtk-new/HISTORY
@@ -1,3 +1,7 @@
+2013-04-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE: added
+ * BUILD, DEPENDS: allow use of gtk+{3,2}
+
2012-07-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.9.4
* DEPENDS: libxpm is optional
diff --git a/x11/easystroke/DEPENDS b/x11/easystroke/DEPENDS
index 7f6cb34..55d277f 100755
--- a/x11/easystroke/DEPENDS
+++ b/x11/easystroke/DEPENDS
@@ -1,6 +1,6 @@
depends boost &&
depends intltool &&
-depends gtkmm2 &&
+depends gtkmm3 &&
depends libxtst &&
depends dbus-glib &&
optional_depends help2man "" "" "to build man page"
diff --git a/x11/easystroke/DETAILS b/x11/easystroke/DETAILS
index 29fa6b5..5fb56fa 100755
--- a/x11/easystroke/DETAILS
+++ b/x11/easystroke/DETAILS
@@ -1,5 +1,5 @@
SPELL=easystroke
- VERSION=0.5.6
+ VERSION=0.6.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/x11/easystroke/HISTORY b/x11/easystroke/HISTORY
index 00eea71..fa87517 100644
--- a/x11/easystroke/HISTORY
+++ b/x11/easystroke/HISTORY
@@ -1,3 +1,7 @@
+2013-03-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.0
+ * DEPENDS: gtkmm2 -> gtkmm3
+
2012-10-06 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.5.6

diff --git a/x11/easystroke/easystroke-0.5.6.tar.gz.sig
b/x11/easystroke/easystroke-0.5.6.tar.gz.sig
deleted file mode 100644
index 3c1393e..0000000
Binary files a/x11/easystroke/easystroke-0.5.6.tar.gz.sig and /dev/null differ
diff --git a/x11/easystroke/easystroke-0.6.0.tar.gz.sig
b/x11/easystroke/easystroke-0.6.0.tar.gz.sig
new file mode 100644
index 0000000..d8e1a86
Binary files /dev/null and b/x11/easystroke/easystroke-0.6.0.tar.gz.sig differ

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (bbecf900ebbac635156e05e84f9641c65c38685d), Eric Sandall, 04/03/2013