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 (ef3cfa4ce6ef91366dc0d9dfc186e41e4c6b9a87)

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 (ef3cfa4ce6ef91366dc0d9dfc186e41e4c6b9a87)
Date: Mon, 25 Mar 2013 15:02:30 -0500

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

ChangeLog | 7 +
accounts | 1
chat-im/gajim/DEPENDS | 2
chat-im/gajim/DETAILS | 2
chat-im/gajim/HISTORY | 3
chat-im/gajim/gajim-0.15.3.tar.bz2.sig |binary
chat-irc/znc/CONFIGURE | 22 ++++-
chat-irc/znc/DEPENDS | 49 ++++++------
chat-irc/znc/DETAILS | 4 -
chat-irc/znc/HISTORY | 7 +
chat-irc/znc/znc.gpg |binary
database/mysql/HISTORY | 4 +
database/mysql/PRE_BUILD | 6 +
dev/null |binary
devel/bin86/DETAILS | 6 -
devel/bin86/HISTORY | 3
editors/texmaker/DETAILS | 4 -
editors/texmaker/HISTORY | 4 +
graphics-libs/harfbuzz/DETAILS | 4 -
graphics-libs/harfbuzz/HISTORY | 3
graphics/darktable/0001-remove-Werror-from-CXXFLAGS.patch | 29 +++++++
graphics/darktable/HISTORY | 4 +
graphics/darktable/PRE_BUILD | 3
graphics/djvulibre/DETAILS | 6 -
graphics/djvulibre/HISTORY | 3
groups | 1
http/firefox/BUILD | 8 +-
http/firefox/HISTORY | 3
libs/glibc/DETAILS | 1
libs/glibc/HISTORY | 3
php-pear/fileinfo/CONFLICTS | 6 +
php-pear/fileinfo/HISTORY | 3
php-pear/php/CONFLICTS | 9 ++
php-pear/php/DEPENDS | 10 +-
php-pear/php/DETAILS | 17 ++--
php-pear/php/HISTORY | 7 +
python-pypi/distribute/DETAILS | 4 -
python-pypi/distribute/HISTORY | 3
python-pypi/egenix-mx-base/DETAILS | 6 -
python-pypi/egenix-mx-base/HISTORY | 3
python-pypi/psutil/DEPENDS | 2
python-pypi/psutil/DETAILS | 34 ++++++++
python-pypi/psutil/HISTORY | 2
python-pypi/pudb/DETAILS | 4 -
python-pypi/pudb/HISTORY | 3
python-pypi/roundup/DEPENDS | 3
python-pypi/roundup/HISTORY | 4 +
python-pypi/urwid/DETAILS | 2
python-pypi/urwid/HISTORY | 3
python-pypi/urwid/urwid-1.1.1.tar.gz.sig |binary
science/gpsbabel/BUILD | 2
science/gpsbabel/DEPENDS | 1
science/gpsbabel/HISTORY | 5 +
utils/installwatch/0001-fix-signatures.patch | 54
++++++++++++++
utils/installwatch/HISTORY | 4 +
utils/installwatch/PRE_BUILD | 2
56 files changed, 314 insertions(+), 71 deletions(-)

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

utils/installwatch: fix function signatures

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

psutil: new spell, process and system utilities module for Python

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

egenix-mx-base: => 3.2.5

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

graphics-libs/harfbuzz: version 0.9.14

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

fileinfo: added conflicts with PHP >=5.3

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

php: added conflicts with fileinfo for PHP >=5.3

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

php: removed icu dependency for branches older than 5.3

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

php: updated backports+security patches for legacy branch to 20130320

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

php: => 5.3.23 (previous), 5.4.13 (stable) [security]

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

pudb: => 2013.1

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

urwid: => 1.1.1

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

distribute: => 0.6.35

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

libs/glibc: TMPFS=off

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

roundup: added suggest dependency on native SQLite extension for Python

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

added missing 'ratbox' account for ircd-ratbox spell

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

devel/bin86: version 0.16.19

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

gajim: => 0.15.3

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

fix build error due to qt4 missin from $PATH and incompatible system zlib

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

znc: => 1.0

commit 8d0713e6ef5dee3f070d62d8d18f74124b0fc4e0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

mysql: Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD)
Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD)
for extra/yassl/taocrypt/src/Makefile.in

$ cast mysql
...
Making all in src
make[5]: Entering directory
`/usr/src/mysql-5.1.67/extra/yassl/taocrypt/src' /bin/sh
../../../../libtool --preserve-dup-deps --tag=CXX --mode=compile g++
-DHAVE_CONFIG_H -I. -I../../../../include -I./../include -I./../mySTL
-D_GNU_SOURCE -DYASSL_PURE_C -DYASSL_THREAD_SAFE -march=native -mtune=native
-m32 -pipe -DPIC -fPIC -O2 -fno-implicit-templates -fno-exceptions
-fno-rtti -MT libtaocrypt_la-integer.lo -MD -MP -MF
.deps/libtaocrypt_la-integer.Tpo -c -o libtaocrypt_la-integer.lo `test -f
'integer.cpp' || echo './'`integer.cpp libtool: compile: g++ -DHAVE_CONFIG_H
-I. -I../../../../include -I./../include -I./../mySTL -D_GNU_SOURCE
-DYASSL_PURE_C -DYASSL_THREAD_SAFE -march=native -mtune=native -m32 -pipe
-DPIC -fPIC -O2 -fno-implicit-templates -fno-exceptions -fno-rtti -MT
libtaocrypt_la-integer.lo -MD -MP -MF .deps/libtaocrypt_la-integer.Tpo -c
integer.cpp -fPIC -DPIC -o .libs/libtaocrypt_la-integer.o
integer.cpp: In member function 'TaoCrypt::AlignedAllocator<T>::pointer
TaoCrypt::AlignedAllocator<T>::allocate(TaoCrypt::AlignedAllocator<T>::size_type,
const void*)':
integer.cpp:76:22: error: there are no arguments to 'max_size' that
depend on a template parameter, so a declaration of 'max_size' must be
available [-fpermissive]
integer.cpp:76:22: note: (if you use '-fpermissive', G++ will accept your
code, but allowing the use of an undeclared name is deprecated)
make[5]: *** [libtaocrypt_la-integer.lo] Error 1
make[5]: Leaving directory
`/usr/src/mysql-5.1.67/extra/yassl/taocrypt/src'

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

http/firefox: disable avx for all gcc versions >= 4.6

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

graphics/djvulibre: version 3.5.25.3

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

graphics/darktable: remove -Werror from FLAGS

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

editors/texmaker: version 4.0.1

diff --git a/ChangeLog b/ChangeLog
index 614f5f9..07b681f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * python-pypi/psutil: new spell, process and system utilities module
+ for Python
+
+2013-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * accounts, groups: added missing 'ratbox' account for ircd-ratbox
spell
+
2013-03-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics/xli: new spell, command line driven image viewer
* haskell/haskell-x11-rm: new spell, Xrm bindings for haskell
diff --git a/accounts b/accounts
index d0d80d3..1236387 100755
--- a/accounts
+++ b/accounts
@@ -98,4 +98,5 @@ redis:189:190
lightdm:191:191
masqmail:192:192
burp:193:194
+ratbox:194:195
nobody:65534:65534
diff --git a/chat-im/gajim/DEPENDS b/chat-im/gajim/DEPENDS
index 5f85e5f..341f108 100755
--- a/chat-im/gajim/DEPENDS
+++ b/chat-im/gajim/DEPENDS
@@ -2,7 +2,7 @@ depends pygtk2 &&
depends -sub SQLITE python &&
depends intltool &&

-# TODO: added subdepends according to the spells
+# TODO: add subdepends according to the spells
suggest_depends avahi "" "" "for serverless chatting in a local network" &&

suggest_depends -sub PYTHON farstream "" "" "for ability to start audio and
video chat" &&
diff --git a/chat-im/gajim/DETAILS b/chat-im/gajim/DETAILS
index dcd18b4..1e987c6 100755
--- a/chat-im/gajim/DETAILS
+++ b/chat-im/gajim/DETAILS
@@ -1,5 +1,5 @@
SPELL=gajim
- VERSION=0.15.2
+ VERSION=0.15.3
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.gajim.org/downloads/$BRANCH/$SOURCE
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index a0a958e..90c4438 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,6 @@
+2013-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.15.3
+
2012-11-18 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: pyasn1 is required for secure connections

diff --git a/chat-im/gajim/gajim-0.15.2.tar.bz2.sig
b/chat-im/gajim/gajim-0.15.2.tar.bz2.sig
deleted file mode 100644
index 7c60da7..0000000
Binary files a/chat-im/gajim/gajim-0.15.2.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/gajim/gajim-0.15.3.tar.bz2.sig
b/chat-im/gajim/gajim-0.15.3.tar.bz2.sig
new file mode 100644
index 0000000..7c97e47
Binary files /dev/null and b/chat-im/gajim/gajim-0.15.3.tar.bz2.sig differ
diff --git a/chat-irc/znc/CB8FCB06.gpg b/chat-irc/znc/CB8FCB06.gpg
deleted file mode 100644
index a67956d..0000000
Binary files a/chat-irc/znc/CB8FCB06.gpg and /dev/null differ
diff --git a/chat-irc/znc/CONFIGURE b/chat-irc/znc/CONFIGURE
index cbacfb0..e4f1912 100755
--- a/chat-irc/znc/CONFIGURE
+++ b/chat-irc/znc/CONFIGURE
@@ -1,3 +1,19 @@
-config_query_option ZNC_OPTS "Build some extra modules?" y \
- "--enable-extra" \
- "--disable-extra"
+# remove obsolete options from ZNC_OPTS
+list_remove ZNC_OTS "--enable-extra" &&
+list_remove ZNC_OTS "--disable-extra" &&
+
+config_query_option ZNC_OPTS "Enable threads usage for DNS resolving?" y \
+ "--enable-tdns" \
+ "--disable-tdns" &&
+
+config_query_option ZNC_OPTS "Enable ipv6 support?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&
+
+config_query_option ZNC_OPTS "Use select() instead of poll()?" n \
+ "--disable-poll" \
+ "--enable-poll" &&
+
+config_query_option ZNC_OPTS "Enable debugging?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/chat-irc/znc/DEPENDS b/chat-irc/znc/DEPENDS
index 491572e..5074274 100755
--- a/chat-irc/znc/DEPENDS
+++ b/chat-irc/znc/DEPENDS
@@ -2,16 +2,10 @@

depends -sub CXX gcc &&

-message "NOTE: ZNC needs swig enabled for modperl/modpython support" &&
-
optional_depends perl \
"--enable-perl" \
"--disable-perl" \
- "to use perl" &&
-
-if is_depends_enabled $SPELL perl; then
- depends -sub PERL swig '--enable-swig'
-fi &&
+ "to use Perl" &&

if spell_ok python3; then
local PYTHON3_BRANCH=$(installed_version python3 | cut -d. -f1,2)
@@ -24,12 +18,27 @@ optional_depends python3 \
"--disable-python" \
"to use Python" &&

-if is_depends_enabled $SPELL python3; then
- depends -sub PYTHON3 swig '--enable-swig' &&
+if is_depends_enabled $SPELL perl || is_depends_enabled $SPELL python3; then
+ optional_depends swig \
+ "--enable-swig" \
+ "--disable-swig" \
+ "for automatic generation of source files needed for
modperl/modpython" &&
+
+ if is_depends_enabled $SPELL swig; then
+ if is_depends_enabled $SPELL perl; then
+ depends -sub PERL swig
+ fi &&
+
+ if is_depends_enabled $SPELL python3; then
+ depends -sub PYTHON3 swig
+ fi &&

- if spell_ok swig && is_version_less $(installed_version swig) 2.0.4; then
- force_depends swig
+ if spell_ok swig && is_version_less $(installed_version swig) 2.0.4; then
+ force_depends swig
+ fi
fi
+else
+ list_add ZNC_OPTS "--disable-swig"
fi &&

optional_depends tcl \
@@ -37,20 +46,10 @@ optional_depends tcl \
"--disable-tcl" \
"to use TCL" &&

-if is_depends_enabled $SPELL tcl && list_find "--disable-extra" "$ZNC_OPTS";
then
- message "Requested TCL support, forcing build of extra modules" &&
- ZNC_OPTS="--enable-extra $ZNC_OPTS"
-fi &&
-
-optional_depends cyrus-sasl \
- "--enable-sasl" \
- "--disable-sasl" \
- "for SASL support" &&
-
-optional_depends c-ares \
- "--enable-c-ares" \
- "--disable-c-ares" \
- "for c-ares usage" &&
+optional_depends LIBSASL \
+ "--enable-cyrus" \
+ "--disable-cyrus" \
+ "for SASL support via cyrus" &&

optional_depends openssl \
"--enable-openssl" \
diff --git a/chat-irc/znc/DETAILS b/chat-irc/znc/DETAILS
index c14047b..25b0190 100755
--- a/chat-irc/znc/DETAILS
+++ b/chat-irc/znc/DETAILS
@@ -1,11 +1,11 @@
SPELL=znc
- VERSION=0.206
+ VERSION=1.0
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://znc.in/releases/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=CB8FCB06.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=znc.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://en.znc.in/
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index 9736877..413ea2f 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,10 @@
+2013-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0
+ * DEPENDS: renewed dependencies and flags
+ * CONFIGURE: added missing options; removed obsolete options
+ * CB8FCB06.gpg: dropped
+ * znc.gpg: added 0209989E public key (Alexey Sokolov
<ktonibud AT gmail.com>)
+
2012-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.206

diff --git a/chat-irc/znc/znc.gpg b/chat-irc/znc/znc.gpg
new file mode 100644
index 0000000..5ef2d1c
Binary files /dev/null and b/chat-irc/znc/znc.gpg differ
diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 7e461c3..21e33a1 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,7 @@
+2013-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD) for
+ extra/yassl/taocrypt/src/Makefile.in
+
2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.1.67, 5.0.96 (old); SECURITY_PATCH++

diff --git a/database/mysql/PRE_BUILD b/database/mysql/PRE_BUILD
index a28c410..f5ac745 100755
--- a/database/mysql/PRE_BUILD
+++ b/database/mysql/PRE_BUILD
@@ -4,4 +4,8 @@ cd $SOURCE_DIRECTORY &&
patch -p1 < "$SPELL_DIRECTORY/big_tables.patch" &&

sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in
+sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&
+
+if [[ "x$OLD" == "xn" ]]; then
+ sedit 's:^CXXFLAGS.*:& -fpermissive :' extra/yassl/taocrypt/src/Makefile.in
+fi
diff --git a/devel/bin86/DETAILS b/devel/bin86/DETAILS
index 6c25364..394f9df 100755
--- a/devel/bin86/DETAILS
+++ b/devel/bin86/DETAILS
@@ -1,10 +1,10 @@
SPELL=bin86
- VERSION=0.16.18
+ VERSION=0.16.19
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.debath.co.uk/dev86/$SOURCE
-
SOURCE_HASH=sha512:73751df158210ed75bd4238f7e10630e997ff5fd950860fd794c9dc1e32d682e0f6838063ab6961c1247d3d2c61fadeb56a4fabfba26959369a5248a76e0ca7b
- WEB_SITE=http://homepage.ntlworld.com/robert.debath/
+
SOURCE_HASH=sha512:7cd54b1425a2a631b8af3e3e3b26c91b287f6e14e94f7795eb9e6a746c5acfe9137689bb802adf30f355cb731d59b4753acfa829028380c89ef3259642cad454
+ WEB_SITE=http://www.debath.co.uk/
ENTERED=20010922
LICENSE[0]=GPL
KEYWORDS="devel"
diff --git a/devel/bin86/HISTORY b/devel/bin86/HISTORY
index 7279cc3..d1c3fcf 100644
--- a/devel/bin86/HISTORY
+++ b/devel/bin86/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.16.19, updated WEB_SITE
+
2011-02-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.16.18, SOURCE_URL[0] updated, UPDATED removed
* BUILD: sedit removed, MANDIR has been fixed upstream
diff --git a/editors/texmaker/DETAILS b/editors/texmaker/DETAILS
index 8344584..101423b 100755
--- a/editors/texmaker/DETAILS
+++ b/editors/texmaker/DETAILS
@@ -1,8 +1,8 @@
SPELL=texmaker
- VERSION=3.3.2
+ VERSION=4.0.1
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=http://www.xm1math.net/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:f02e8d206a4a5ce8c6691248f678318298ea35d5c39c0c179eb13ce28d5826dc5e77674cc69633a791d126daee6615854ae6a1cb9107095c5c75bd195c434f99
+
SOURCE_HASH=sha512:85db34f670cad7d39c7acea5eefd61a9985f183277ddf758a3216dd322c0e43c21f94d2659fbe7dbcbf8f25d5df7c8c1408172214080d9234f4048499fbb8c4b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.xm1math.net/texmaker";
LICENSE[0]=GPL
diff --git a/editors/texmaker/HISTORY b/editors/texmaker/HISTORY
index 8e20b25..9c5724e 100644
--- a/editors/texmaker/HISTORY
+++ b/editors/texmaker/HISTORY
@@ -1,3 +1,7 @@
+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/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index 3abf180..2fcdfbd 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -11,8 +11,8 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"

SOURCE_URL[1]=git_http://anongit.freedesktop.org/git/harfbuzz.git:harfbuzz-git
SOURCE_IGNORE=volatile
else
- VERSION=0.9.12
-
SOURCE_HASH=sha512:10c0e174789e36a02e616cf922962a7c75d6f89cb378a33487b81947e16818347c888c39703c64d620eb3d29bf90cd900ae832dd573f5081eb4de25ba4737bff
+ VERSION=0.9.14
+
SOURCE_HASH=sha512:af8978d654033ea06bea876021f1ba80bcf810e5d075f99b4624a75c5631fdc284a80dbcd35948ca2a892d5dc2ae0ea0881f7fd9cbcdd2d0c813e84878b58572
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.freedesktop.org/software/harfbuzz/release/$SOURCE
diff --git a/graphics-libs/harfbuzz/HISTORY b/graphics-libs/harfbuzz/HISTORY
index 235c4f1..d2b57ad 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,6 @@
+2013-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.9.14
+
2013-02-13 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.12

diff --git a/graphics/darktable/0001-remove-Werror-from-CXXFLAGS.patch
b/graphics/darktable/0001-remove-Werror-from-CXXFLAGS.patch
new file mode 100644
index 0000000..fb93c20
--- /dev/null
+++ b/graphics/darktable/0001-remove-Werror-from-CXXFLAGS.patch
@@ -0,0 +1,29 @@
+From ab9d6a3eca3a5a17aa5016d53b050ae1da9ed7ff Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Fri, 22 Mar 2013 18:19:24 +0100
+Subject: [PATCH] remove -Werror from CXXFLAGS
+
+---
+ src/CMakeLists.txt | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a43d2e6..30ac41d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -277,12 +277,6 @@ endif(NOT WIN32)
+
+ if(NOT CUSTOM_CFLAGS)
+
+-if(NOT APPLE AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+- # apple build fails on deprecated warnings..
+- # and too many warnings reported by Clang for now
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+-endif(NOT APPLE AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+-
+ if(NOT BINARY_PACKAGE_BUILD)
+ MESSAGE("-- Checking for -march=native support")
+ CHECK_C_COMPILER_FLAG("-march=native" MARCHNATIVE)
+--
+1.8.1.3
+
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 007acea..2d8961e 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,7 @@
+2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-remove-Werror-from-CXXFLAGS.patch:
+ remove -Werror from FLAGS
+
2013-03-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.4

diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
index 8ebe455..8125dca 100755
--- a/graphics/darktable/PRE_BUILD
+++ b/graphics/darktable/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-fix-gettext-dependency.patch
+patch -p1 < $SPELL_DIRECTORY/0001-fix-gettext-dependency.patch &&
+patch -p1 < $SPELL_DIRECTORY/0001-remove-Werror-from-CXXFLAGS.patch
diff --git a/graphics/djvulibre/DETAILS b/graphics/djvulibre/DETAILS
index 4724495..88914c8 100755
--- a/graphics/djvulibre/DETAILS
+++ b/graphics/djvulibre/DETAILS
@@ -1,9 +1,9 @@
SPELL=djvulibre
- VERSION=3.5.25.2
-
SOURCE_HASH=sha512:824d0d3d193495351cdc18f78cbf45a2d94d0884ff8be2b6a23f9dfa8d6bce8948507cb43633af940ad43b1f8e7520a2500075ef664d67e51a3b2a29b91ae110
+ VERSION=3.5.25.3
+
SOURCE_HASH=sha512:0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION:0:6}
- SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/djvu/DjVuLibre/$(echo $VERSION | cut
-f1,2,3 -d.)/${SOURCE}
WEB_SITE=http://djvu.sourceforge.net/
ENTERED=20030125
LICENSE[0]=GPL
diff --git a/graphics/djvulibre/HISTORY b/graphics/djvulibre/HISTORY
index 6248817..76a5b32 100644
--- a/graphics/djvulibre/HISTORY
+++ b/graphics/djvulibre/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5.25.3
+
2012-04-04 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 3.5.25.2, fixed SOURCE_DIRECTORY
* PRE_BUILD: removed, builds fine with gcc 4.7
diff --git a/groups b/groups
index c64f2b5..a8ca671 100755
--- a/groups
+++ b/groups
@@ -119,5 +119,6 @@ lightdm:191:
masqmail:192:
bumblebee:193:
burp:194:
+ratbox:195:
users:1000:
nogroup:65534:
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 2f44956..6e7d374 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -20,8 +20,12 @@ CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&
#
# Avoid buggy GCC 4.6 AVX code generation, which breaks libxul
#
-local gccver=$(gcc -dumpversion)
-if [ ${gccver%.*} = 4.6 ] || [ ${gccver%.*} = 4.7 ]; then
+local gccver=$(gcc -dumpversion) &&
+local gccmajor=${gccver%.*.*} &&
+local gccminor=${gccver#*.} &&
+gccminor=${gccminor%.*} &&
+
+if [[ $gccmajor == "4" ]] && [[ $gccminor -ge "6" ]]; then
CFLAGS="${CFLAGS//-mavx} -mno-avx"
CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
fi
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 24ab455..ead19ea 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2013-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: disable avx support for all versions of gcc >= 4.6
+
2013-03-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 19.0.2, SECURITY_PATCH++

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 4e36332..f3938b3 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,4 +1,5 @@
SPELL=glibc
+ TMPFS=off
if [ "$GLIBC_NPTL" = "n" ]; then
VERSION=2.3.6
HEADERS_VERSION=2.4.24
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 535628c..478b6a5 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,6 @@
+2013-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: TMPFS=off
+
2013-01-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.17
* glibc.gpg: 6C2A4AFF removed, 82764ED5 added
diff --git a/php-pear/fileinfo/CONFLICTS b/php-pear/fileinfo/CONFLICTS
new file mode 100755
index 0000000..fc3ae33
--- /dev/null
+++ b/php-pear/fileinfo/CONFLICTS
@@ -0,0 +1,6 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+# PHP >=5.3 includes fileinfo
+if spell_ok php && is_version_less 5.2.9999 $(installed_version php); then
+ conflicts php y
+fi
diff --git a/php-pear/fileinfo/HISTORY b/php-pear/fileinfo/HISTORY
index a6fc993..9f9418a 100644
--- a/php-pear/fileinfo/HISTORY
+++ b/php-pear/fileinfo/HISTORY
@@ -1,2 +1,5 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: added, for conflicts with PHP >=5.3
+
2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, PRE_BUILD, FINAL, TRIGGERS: spell created
diff --git a/php-pear/php/CONFLICTS b/php-pear/php/CONFLICTS
index a51827b..7703bf3 100755
--- a/php-pear/php/CONFLICTS
+++ b/php-pear/php/CONFLICTS
@@ -1,2 +1,9 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
conflicts php-dev &&
-conflicts php4
+conflicts php4 &&
+
+# PHP >=5.3 includes fileinfo
+if spell_ok fileinfo && is_version_less 5.2.9999 "${VERSION}"; then
+ conflicts fileinfo y
+fi
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 50b6b7d..12b5f79 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -101,6 +101,11 @@ if is_version_less 5.2.9999 "${VERSION}"; then
"--with-enchant" "--without-enchant" \
"use enchant for spelling functions?" &&

+ optional_depends icu \
+ "--with-icu-dir=${INSTALL_ROOT}/usr" \
+ "--without-icu-dir" \
+ "for ICU unicode support" &&
+
optional_depends oniguruma \
"--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
"for external oniguruma"
@@ -136,11 +141,6 @@ optional_depends gettext \
"--with-gettext" "--without-gettext" \
"for GNU gettext support" &&

-optional_depends icu \
- "--with-icu-dir=${INSTALL_ROOT}/usr" \
- "--without-icu-dir" \
- "for ICU unicode support" &&
-
# new database madness
# DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
# PDO_DRIVERS="mysql pgsql firebird unixODBC iODBC"
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 609fae9..26b703f 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,13 +1,14 @@
SPELL=php
if [[ $PHP5_BRANCH == stable ]]; then
- VERSION=5.4.12
+ VERSION=5.4.13
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
-
SOURCE_HASH=sha512:c4e87ff0d9457114f8428479e41cb69ffc4f4cc98a92fb0359e6130edb09b0af17ff344b3409f2f7850177591f288658f9a2797eac9962c9fb4f9eb58be64c21
+
SOURCE_HASH=sha512:477adf82fcd0ef8c4911e811da25e7d091753289f7887ee76c7f790394497bb71d5e84172d4711888f0194960b3bafc2bcbfb252842cfc4059eb0692e382d6b1
elif [[ $PHP5_BRANCH == previous ]]; then
- VERSION=5.3.22
- SECURITY_PATCH=19
-
SOURCE_HASH=sha512:ab6fbb7cd2c9c0bff2dcc4198622f63c88c5047f7931b367ceb99e030204128fb2f7b3d2eb3578d2f4b6d5b11167976a66fc4d73db442e0e64a2a6376586f9d7
+ VERSION=5.3.23
+ SECURITY_PATCH=20
+
SOURCE_HASH=sha512:6d6579c0c67d75cd3cbc182609fb231cbda486722f47e01b78d50d93072720f37ee74eba8d8cc42308c297009fb3af31f9d2092869a4e78bbd957504cbb4858b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
# if [[ $PHP5_SUHOSIN == y ]]; then
@@ -27,7 +28,7 @@ elif [[ $PHP5_BRANCH == alpha ]]; then

SOURCE_HASH=sha512:647a60adc47392bfa35b73a26873f6ac68a555ba146201b47a7fae7e76c078d6bf41a93f5f7e60b38c005c81ec74979ef5625673695934ebb01069ea465a9b79
elif [[ $PHP5_BRANCH == legacy ]]; then
VERSION=5.2.17
- SECURITY_PATCH=21
+ SECURITY_PATCH=22

SOURCE_HASH=sha512:baf3b5038468c9fa7c1a9e0506ed23559c21ba8df29380498a24e8d31c4c5f3633f29b1bc2faa3e59c6e5336536c09e19a5462b0a9d5916181c08f1f19abbca8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
@@ -41,9 +42,9 @@ elif [[ $PHP5_BRANCH == legacy ]]; then
SOURCE3_URL="http://download.suhosin.org/$SOURCE3";
SOURCE2_GPG="suhosin.gpg:$SOURCE3:UPSTREAM_KEY"
fi
- SOURCE4=php52-backports-20121114.patch
+ SOURCE4=php52-backports-20130320.patch
SOURCE4_URL=http://php52-backports.googlecode.com/files/$SOURCE4
-
SOURCE4_HASH=sha512:cce9b47afd100ff0b650972fa6c7b0ed1c255da95bb8427238d336fee05fc7125cf9aacf5b9503986c3c45d57ca075e5b805dd0a2eb857917281ae4c4d715fad
+
SOURCE4_HASH=sha512:5d9bce0f5975c524b5f26a42e9fd77c16e9d92b30846baf44bf7a2679261d7239903c155b53e7f7790f252111c33d50538e093e2278415cd4e109a1faa5d04f9
else
# rc branch
VERSION=5.3.17
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 8c17d2c..3e78556 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,10 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.3.23 (previous), 5.4.13 (stable);
+ SECURITY_PATCH++ (CVE-2013-1643 and CVE-2013-1635); updated
+ backports+security patches for legacy branch to 20130320
+ * DEPENDS: icu is available only since 5.3
+ * CONFLICTS: added conflicts with fileinfo for PHP >=5.3
+
2013-02-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: switched stable to 5.4 (5.4.12); updated spell to 5.3.22
(previous), 5.5.0alpha5 (alpha)
diff --git a/python-pypi/distribute/DETAILS b/python-pypi/distribute/DETAILS
index 3882843..812aba7 100755
--- a/python-pypi/distribute/DETAILS
+++ b/python-pypi/distribute/DETAILS
@@ -1,6 +1,6 @@
SPELL=distribute
- VERSION=0.6.34
-
SOURCE_HASH=sha512:348d5c77dd1cf24a0f568be68aa19df3e0a1a1971d643850dd6133bbba9b9cb7574cc84195863d824c2d603d408b35bf3518bfb49bae0a90ab8971bf773c5e67
+ VERSION=0.6.35
+
SOURCE_HASH=sha512:79e00fafe3dd1ae499dc3ad6ccd7dfb53254544765de64b929bb32737edc2bc948406973469d830a1e39da229949d9ed966088c635fc20819cc8667d5d8ea2e7
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://pypi.python.org/packages/source/d/${SPELL}/${SOURCE}
diff --git a/python-pypi/distribute/HISTORY b/python-pypi/distribute/HISTORY
index 4ec20b3..d22af8a 100644
--- a/python-pypi/distribute/HISTORY
+++ b/python-pypi/distribute/HISTORY
@@ -1,3 +1,6 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.35
+
2013-01-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.6.34

diff --git a/python-pypi/egenix-mx-base/DETAILS
b/python-pypi/egenix-mx-base/DETAILS
index 565e3ba..675e463 100755
--- a/python-pypi/egenix-mx-base/DETAILS
+++ b/python-pypi/egenix-mx-base/DETAILS
@@ -1,8 +1,8 @@
SPELL=egenix-mx-base
- VERSION=3.0.0
-
SOURCE_HASH=sha512:85dbd3eb20dcb8f3435085c2352d785a0d438914df805c7acd93ddc2b0ceebedfa5ae586c50a2329311717f1c260db7951d146ee96d6aab824a1648fb201184a
+ VERSION=3.2.5
+
SOURCE_HASH=sha512:707d4cb96de04f967c1a37d156f41d9570b580088132f96533b7b4319c1fc0492a29b01ce1dba9527d7fc7cada99da8767a55c0994c285af81af82fd0f370a42
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://downloads.egenix.com/python/$SOURCE
WEB_SITE=http://www.egenix.com/files/python/mxDateTime.html
ENTERED=20021111
diff --git a/python-pypi/egenix-mx-base/HISTORY
b/python-pypi/egenix-mx-base/HISTORY
index 70be9da..d701048 100644
--- a/python-pypi/egenix-mx-base/HISTORY
+++ b/python-pypi/egenix-mx-base/HISTORY
@@ -1,3 +1,6 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.5; quoting paths
+
2008-01-13 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: cleaned up
* DETAILS: cleaned up, word wrapped
diff --git a/python-pypi/psutil/DEPENDS b/python-pypi/psutil/DEPENDS
new file mode 100755
index 0000000..e440941
--- /dev/null
+++ b/python-pypi/psutil/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/psutil/DETAILS b/python-pypi/psutil/DETAILS
new file mode 100755
index 0000000..22c8eac
--- /dev/null
+++ b/python-pypi/psutil/DETAILS
@@ -0,0 +1,34 @@
+ SPELL=psutil
+ VERSION=0.6.1
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_URL[0]=http://psutil.googlecode.com/files/$SOURCE
+
SOURCE_HASH=sha512:83fb9c92731bcc084be2bc0a9b39c8c62c28c9f9ed5a24666b6ebbf0e9164d95032a8ce9d8e8866e8e55dc39e456e51c122ff530129c6cf6faaaf59efcf4d950
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://code.google.com/p/psutil/
+ LICENSE[0]=BSD
+ ENTERED=20130324
+ SHORT="process and system utilities module for Python"
+cat << EOF
+psutil is a module providing an interface for retrieving information on all
+running processes and system utilization (CPU, memory, disks, network, users)
+in a portable way by using Python, implementing many functionalities offered
by
+command line tools such as:
+ * ps
+ * top
+ * df
+ * kill
+ * free
+ * lsof
+ * netstat
+ * ifconfig
+ * nice
+ * ionice
+ * iostat
+ * iotop
+ * uptime
+ * pidof
+ * tty
+ * who
+ * taskset
+ * pmap
+EOF
diff --git a/python-pypi/psutil/HISTORY b/python-pypi/psutil/HISTORY
new file mode 100644
index 0000000..14215ca
--- /dev/null
+++ b/python-pypi/psutil/HISTORY
@@ -0,0 +1,2 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS: created spell
diff --git a/python-pypi/pudb/DETAILS b/python-pypi/pudb/DETAILS
index d9871b8..016553a 100755
--- a/python-pypi/pudb/DETAILS
+++ b/python-pypi/pudb/DETAILS
@@ -1,8 +1,8 @@
SPELL=pudb
- VERSION=2012.3
+ VERSION=2013.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:d9a26a7eaf20b8c59bb453faf7aa698618ac10203ad487cc0791455ae7338c6e04d6ccf821d1e142f6d920bcf89f1f87ac10f4bbf93269b63578c95b44588c87
+
SOURCE_HASH=sha512:ff8464a2b1a6f426a8f4bea6e82d11a8048a4cb7c6d4029d7544c863fee2e7deba394ebb4a93333903e37f80edccfaf61235bc4c9d696b769137fffbab9ba5ba
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pypi.python.org/pypi/pudb
ENTERED=20130210
diff --git a/python-pypi/pudb/HISTORY b/python-pypi/pudb/HISTORY
index 8c145c7..1fa4238 100644
--- a/python-pypi/pudb/HISTORY
+++ b/python-pypi/pudb/HISTORY
@@ -1,3 +1,6 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2013.1
+
2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2012.3
* DEPENDS: added suggest dependencies
diff --git a/python-pypi/roundup/DEPENDS b/python-pypi/roundup/DEPENDS
index 057f00f..87de9ab 100755
--- a/python-pypi/roundup/DEPENDS
+++ b/python-pypi/roundup/DEPENDS
@@ -2,7 +2,8 @@ depends python &&

suggest_depends pytz "" "" "for the full timezone support (recommended)" &&
suggest_depends pyopenssl "" "" "for SSL support in built-in server" &&
-suggest_depends pysqlite "" "" "for SQLite database support" &&
+suggest_depends pysqlite "" "" "for SQLite database support via pysqlite" &&
+suggest_depends -sub SQLITE python "" "" "for SQLite database support via
native Python module" &&
suggest_depends psycopg2 "" "" "for PostgreSQL database support" &&
suggest_depends mysql-python "" "" "for MySQL database support" &&
suggest_depends pyme "" "" "for OpenPGP MIME messages'
verification/decryption"
diff --git a/python-pypi/roundup/HISTORY b/python-pypi/roundup/HISTORY
index ac65baf..d35c918 100644
--- a/python-pypi/roundup/HISTORY
+++ b/python-pypi/roundup/HISTORY
@@ -1,3 +1,7 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added suggest dependency on native SQLite extension for
+ Python
+
2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.20; SECURITY_PATCH++

diff --git a/python-pypi/urwid/DETAILS b/python-pypi/urwid/DETAILS
index eb36588..1b2d134 100755
--- a/python-pypi/urwid/DETAILS
+++ b/python-pypi/urwid/DETAILS
@@ -1,5 +1,5 @@
SPELL=urwid
- VERSION=0.9.9.3
+ VERSION=1.1.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://excess.org/$SPELL/$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/urwid/HISTORY b/python-pypi/urwid/HISTORY
index b70cbf5..4c2aaf6 100644
--- a/python-pypi/urwid/HISTORY
+++ b/python-pypi/urwid/HISTORY
@@ -1,3 +1,6 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.1.1
+
2011-12-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9.9.3

diff --git a/python-pypi/urwid/urwid-0.9.9.3.tar.gz.sig
b/python-pypi/urwid/urwid-0.9.9.3.tar.gz.sig
deleted file mode 100644
index ccd5274..0000000
Binary files a/python-pypi/urwid/urwid-0.9.9.3.tar.gz.sig and /dev/null differ
diff --git a/python-pypi/urwid/urwid-1.1.1.tar.gz.sig
b/python-pypi/urwid/urwid-1.1.1.tar.gz.sig
new file mode 100644
index 0000000..880c5f4
Binary files /dev/null and b/python-pypi/urwid/urwid-1.1.1.tar.gz.sig differ
diff --git a/science/gpsbabel/BUILD b/science/gpsbabel/BUILD
index 42f8438..bcb71ef 100755
--- a/science/gpsbabel/BUILD
+++ b/science/gpsbabel/BUILD
@@ -1,4 +1,4 @@
-default_build &&
+PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH default_build &&
if is_depends_enabled $SPELL qt4; then
pushd gui &&
${TRACK_ROOT}/usr/bin/qt4/lrelease *.ts &&
diff --git a/science/gpsbabel/DEPENDS b/science/gpsbabel/DEPENDS
index 6292cde..075f968 100755
--- a/science/gpsbabel/DEPENDS
+++ b/science/gpsbabel/DEPENDS
@@ -1,5 +1,4 @@
depends libusb-compat &&
depends expat &&
-depends zlib "--with-zlib=system" &&
optional_depends qt4 "" "" "for GUI support" &&
optional_depends perl "" "" "to install documentation"
diff --git a/science/gpsbabel/HISTORY b/science/gpsbabel/HISTORY
index 8049dab..978ea8d 100644
--- a/science/gpsbabel/HISTORY
+++ b/science/gpsbabel/HISTORY
@@ -1,3 +1,8 @@
+2013-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: remove dependency on system zlib as it is incompatible
+ with gpsbabel
+ * BUILD: add /usr/bin/qt4 to PATH to prevent error during linking
+
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.4

diff --git a/utils/installwatch/0001-fix-signatures.patch
b/utils/installwatch/0001-fix-signatures.patch
new file mode 100644
index 0000000..314d2e9
--- /dev/null
+++ b/utils/installwatch/0001-fix-signatures.patch
@@ -0,0 +1,54 @@
+From 610312e2fc22108d3401f91c4e2ade653ada0596 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 25 Mar 2013 13:42:19 +0100
+Subject: [PATCH 1/2] fix signatures
+
+---
+ installwatch.c | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/installwatch.c b/installwatch.c
+index 8004b5b..e67f511 100644
+--- a/installwatch.c
++++ b/installwatch.c
+@@ -2956,13 +2956,8 @@ struct dirent *readdir(DIR *dir) {
+ return result;
+ }
+
+-#if (GLIBC_MINOR <= 4)
+-int readlink(const char *path,char *buf,size_t bufsiz) {
+- int result;
+-#else
+ ssize_t readlink(const char *path,char *buf,size_t bufsiz) {
+ ssize_t result;
+-#endif
+ instw_t instw;
+ int status;
+
+@@ -3097,11 +3092,7 @@ int rmdir(const char *pathname) {
+
+ int scandir( const char *dir,struct dirent ***namelist,
+ int (*select)(const struct dirent *),
+-#if (GLIBC_MINOR >= 10)
+ int (*compar)(const struct dirent **,const struct dirent **)
) {
+-#else
+- int (*compar)(const void *,const void *) ) {
+-#endif
+ int result;
+
+ if (!libc_handle)
+@@ -3713,11 +3704,7 @@ struct dirent64 *readdir64(DIR *dir) {
+
+ int scandir64( const char *dir,struct dirent64 ***namelist,
+ int (*select)(const struct dirent64 *),
+-#if (GLIBC_MINOR >= 10)
+ int (*compar)(const struct dirent64 **,const struct dirent64
**) ) {
+-#else
+- int (*compar)(const void *,const void *) ) {
+-#endif
+ int result;
+
+ if (!libc_handle)
+--
+1.8.1.2
+
diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 49ff536..072335b 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,3 +1,7 @@
+2013-03-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-signatures.patch: fix function signatures to
match
+ current versions of glibc
+
2012-10-31 Ladislav Hagara <hgr AT vabo.cz>
* installwatch-glibc-2.13.patch: glibc 2.15 and 2.16 cases added

diff --git a/utils/installwatch/PRE_BUILD b/utils/installwatch/PRE_BUILD
index 742685b..abfb23a 100755
--- a/utils/installwatch/PRE_BUILD
+++ b/utils/installwatch/PRE_BUILD
@@ -6,6 +6,8 @@ patch -p 1 < $SPELL_DIRECTORY/installwatch-glibc-2.13.patch &&
patch -p 1 < $SPELL_DIRECTORY/installwatch-relpath.patch &&
sed -i "s:PREFIX=/usr/local:PREFIX=/usr:" Makefile &&

+patch -p1 < $SPELL_DIRECTORY/0001-fix-signatures.patch &&
+
# due to the compatibility with stable sorcery
sed -i "s,INSTW_LOGFILE,INSTALLWATCHFILE,g" installwatch* &&
sed -i "/log.*access/ d" installwatch.c

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