Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde49 grimoire by Ladislav Hagara (7a63de92eeeb1aa55764c0982dcd0697ffe17582)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde49 grimoire by Ladislav Hagara (7a63de92eeeb1aa55764c0982dcd0697ffe17582)
  • Date: Mon, 14 Jan 2013 09:11:01 -0600

GIT changes to devel-kde49 grimoire by Ladislav Hagara <hgr AT vabo.cz>:

ChangeLog | 10
audio-libs/soundtouch/DETAILS | 4
audio-libs/soundtouch/HISTORY | 3
audio-players/cmus/CONFIGURE | 2
audio-players/mpd/DETAILS | 4
audio-players/mpd/HISTORY | 3
cluster/drbd/DETAILS | 20
cluster/drbd/HISTORY | 3
collab/subversion/CONFIGURE | 3
collab/subversion/DEPENDS | 12
collab/subversion/HISTORY | 4
crypto/cryptcat/BUILD | 3
crypto/cryptcat/CONFIGURE | 3
crypto/cryptcat/CONFLICTS | 2
crypto/cryptcat/DEPENDS | 1
crypto/cryptcat/DETAILS | 27
crypto/cryptcat/HISTORY | 2
crypto/cryptcat/INSTALL | 2
crypto/gnutls/HISTORY | 5
crypto/gnutls/PRE_BUILD | 12
crypto/gnutls/gets.patch | 57 ++
crypto/gnutls/x509.patch | 66 ++
crypto/nss/DETAILS | 8
crypto/nss/HISTORY | 6
crypto/nss/PREPARE | 2
crypto/nss/PRE_BUILD | 6
crypto/nss/PRE_SUB_DEPENDS | 1
crypto/nss/SUB_DEPENDS | 2
crypto/nss/nss-3.14-config-1.patch | 271
++++++++++
database/sqlite/DETAILS | 6
database/sqlite/HISTORY | 3
dev/null |binary
devel/binutils/DETAILS | 2
devel/binutils/HISTORY | 3
devel/ccache/DETAILS | 2
devel/ccache/HISTORY | 3
devel/check/DETAILS | 2
devel/check/HISTORY | 3
devel/check/check-0.9.8.tar.gz.sig | 0
devel/check/check-0.9.9.tar.gz.sig |binary
devel/graphviz/DEPENDS | 15
devel/graphviz/HISTORY | 5
devel/heimdall/BUILD | 16
devel/heimdall/DEPENDS | 1
devel/heimdall/DETAILS | 18
devel/heimdall/HISTORY | 3
devel/heimdall/INSTALL | 1
devel/oprofileui/DEPENDS | 1
devel/oprofileui/HISTORY | 3
devel/scala/DETAILS | 4
devel/scala/HISTORY | 3
e-17/e17/BUILD | 1
e-17/e17/CONFIGURE | 2
e-17/e17/DEPENDS | 58 +-
e-17/e17/DETAILS | 14
e-17/e17/HISTORY | 14
e-17/e17/INSTALL | 6
e-17/e17/PREPARE | 2
e-17/e17/PRE_BUILD | 19
e-17/e17/enlightenment-0.17.0.tar.bz2.sig |binary
e-17/e_dbus/CONFIGURE | 4
e-17/e_dbus/DEPENDS | 7
e-17/e_dbus/DETAILS | 4
e-17/e_dbus/HISTORY | 11
e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig | 0
e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig |binary
e-17/ecore/CONFIGURE | 20
e-17/ecore/CONFLICTS | 1
e-17/ecore/DEPENDS | 76 +-
e-17/ecore/DETAILS | 18
e-17/ecore/HISTORY | 18
e-17/ecore/PREPARE | 2
e-17/ecore/PRE_BUILD | 12
e-17/ecore/PRE_SUB_DEPENDS | 6
e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS | 6
e-17/ecore/SUB_DEPENDS | 6
e-17/ecore/ecore-1.0.1.tar.gz.sig | 0
e-17/ecore/ecore-1.7.5.tar.bz2.sig |binary
e-17/edje/CONFLICTS | 4
e-17/edje/DEPENDS | 27
e-17/edje/DETAILS | 4
e-17/edje/HISTORY | 15
e-17/edje/edje-1.0.1.tar.gz.sig | 0
e-17/edje/edje-1.7.5.tar.bz2.sig |binary
e-17/eet/CONFLICTS | 1
e-17/eet/DEPENDS | 4
e-17/eet/DETAILS | 16
e-17/eet/HISTORY | 8
e-17/eet/PREPARE | 2
e-17/eet/PRE_BUILD | 12
e-17/eet/eet-1.4.1.tar.bz2.sig | 0
e-17/eet/eet-1.7.5.tar.bz2.sig |binary
e-17/eeze/DEPENDS | 12
e-17/eeze/DETAILS | 17
e-17/eeze/HISTORY | 9
e-17/eeze/PREPARE | 6
e-17/eeze/PRE_BUILD | 5
e-17/eeze/eeze-1.0.2.tar.gz.sig | 0
e-17/eeze/eeze-1.7.5.tar.bz2.sig |binary
e-17/efl/CONFLICTS | 17
e-17/efl/DEPENDS | 64 ++
e-17/efl/HISTORY | 13
e-17/efl/INSTALL | 2
e-17/efreet/DEPENDS | 17
e-17/efreet/DETAILS | 20
e-17/efreet/HISTORY | 10
e-17/efreet/PREPARE | 6
e-17/efreet/PRE_BUILD | 10
e-17/efreet/efreet-1.0.1.tar.gz.sig | 0
e-17/efreet/efreet-1.7.5.tar.bz2.sig |binary
e-17/eina/BUILD | 4
e-17/eina/CONFIGURE | 7
e-17/eina/CONFLICTS | 1
e-17/eina/DETAILS | 18
e-17/eina/HISTORY | 9
e-17/eina/PREPARE | 2
e-17/eina/PRE_BUILD | 11
e-17/eina/eina-1.0.1.tar.gz.sig | 0
e-17/eina/eina-1.7.5.tar.bz2.sig |binary
e-17/eio/CONFIGURE | 2
e-17/eio/CONFLICTS | 1
e-17/eio/DEPENDS | 10
e-17/eio/DETAILS | 15
e-17/eio/HISTORY | 10
e-17/eio/PREPARE | 2
e-17/eio/PRE_BUILD | 4
e-17/eio/eio-1.7.5.tar.bz2.sig |binary
e-17/elementary/DEPENDS | 8
e-17/elementary/DETAILS | 14
e-17/elementary/HISTORY | 8
e-17/elementary/PREPARE | 9
e-17/elementary/PRE_BUILD | 7
e-17/elementary/elementary-1.7.5.tar.bz2.sig |binary
e-17/embryo/CONFLICTS | 1
e-17/embryo/DEPENDS | 7
e-17/embryo/DETAILS | 21
e-17/embryo/HISTORY | 9
e-17/embryo/PREPARE | 2
e-17/embryo/PRE_BUILD | 11
e-17/embryo/embryo-1.7.5.tar.bz2.sig |binary
e-17/emotion/DEPENDS | 9
e-17/emotion/DETAILS | 9
e-17/emotion/HISTORY | 8
e-17/emotion/emotion-1.7.5.tar.bz2.sig |binary
e-17/eobj/CONFLICTS | 1
e-17/eobj/HISTORY | 3
e-17/ephysics/DEPENDS | 2
e-17/ephysics/HISTORY | 3
e-17/ethumb/DEPENDS | 21
e-17/ethumb/DETAILS | 14
e-17/ethumb/HISTORY | 9
e-17/ethumb/PREPARE | 9
e-17/ethumb/PRE_BUILD | 7
e-17/ethumb/ethumb-1.7.5.tar.bz2.sig |binary
e-17/evas/BUILD | 14
e-17/evas/CONFIGURE | 21
e-17/evas/CONFLICTS | 1
e-17/evas/DEPENDS | 31 -
e-17/evas/DETAILS | 18
e-17/evas/HISTORY | 16
e-17/evas/PREPARE | 2
e-17/evas/PRE_BUILD | 11
e-17/evas/evas-1.0.1.tar.gz.sig | 0
e-17/evas/evas-1.7.5.tar.bz2.sig |binary
e-17/evas_generic_loaders/DEPENDS | 4
e-17/evas_generic_loaders/DETAILS | 14
e-17/evas_generic_loaders/HISTORY | 7
e-17/evas_generic_loaders/PREPARE | 2
e-17/evas_generic_loaders/PRE_BUILD | 6
e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig |binary
e-17/expedite/DEPENDS | 7
e-17/expedite/DETAILS | 14
e-17/expedite/HISTORY | 7
e-17/expedite/PREPARE | 9
e-17/expedite/PRE_BUILD | 6
e-17/expedite/expedite-1.7.5.tar.bz2.sig |binary
e-17/exquisite/DEPENDS | 11
e-17/exquisite/DETAILS | 14
e-17/exquisite/HISTORY | 4
e-17/exquisite/PREPARE | 9
e-17/exquisite/PRE_BUILD | 6
e-17/exquisite/exquisite-1.0.0.tar.bz2.sig |binary
e-17/terminology/DEPENDS | 10
e-17/terminology/DETAILS | 14
e-17/terminology/HISTORY | 6
e-17/terminology/PREPARE | 2
e-17/terminology/PRE_BUILD | 6
e-17/terminology/terminology-0.2.0.tar.bz2.sig |binary
ftp/transmission/DETAILS | 2
ftp/transmission/HISTORY | 3
ftp/transmission/transmission-2.75.tar.bz2.sig | 0
ftp/transmission/transmission-2.76.tar.bz2.sig |binary
gnome2-libs/gnome-media2/DEPENDS | 1
gnome2-libs/gnome-media2/HISTORY | 3
gnome2-libs/gnome-vfs2/DEPENDS | 4
gnome2-libs/gnome-vfs2/HISTORY | 3
gnome2-libs/pango/BUILD | 4
gnome2-libs/pango/CONFIGURE | 6
gnome2-libs/pango/DEPENDS | 17
gnome2-libs/pango/DETAILS | 3
gnome2-libs/pango/HISTORY | 6
gnome2-libs/pango/PRE_SUB_DEPENDS | 2
gnome2-libs/pango/SUB_DEPENDS | 6
gnome2-libs/pango/pango-1.32.4.tar.xz.sig | 0
gnome2-libs/pango/pango-1.32.5.tar.xz.sig |binary
gnu/java-gcj-compat/DEPENDS | 1
gnu/java-gcj-compat/DETAILS | 14
gnu/java-gcj-compat/HISTORY | 3
gnu/java-gcj-compat/PROVIDES | 3
graphics-libs/cimg/DETAILS | 4
graphics-libs/cimg/HISTORY | 3
graphics-libs/harfbuzz/DEPENDS | 10
graphics-libs/harfbuzz/DETAILS | 2
graphics-libs/harfbuzz/HISTORY | 4
graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig |binary
graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig | 0
graphics-libs/liblqr/DETAILS | 4
graphics-libs/liblqr/HISTORY | 3
graphics-libs/opencv/BUILD | 8
graphics-libs/opencv/HISTORY | 4
graphics/imagemagick/DETAILS | 4
graphics/imagemagick/HISTORY | 3
haskell/haskell-x11/DETAILS | 4
haskell/haskell-x11/HISTORY | 3
http/firefox/DEPENDS | 4
http/firefox/DETAILS | 6
http/firefox/HISTORY | 7
http/seamonkey/DEPENDS | 11
http/seamonkey/DETAILS | 6
http/seamonkey/HISTORY | 5
http/seamonkey/mailnews.patch | 16
http/webkitgtk/DEPENDS | 1
http/webkitgtk/HISTORY | 3
kernels/linux/HISTORY | 3
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.36 | 5
libs/libvirt/DEPENDS | 5
libs/libvirt/DETAILS | 2
libs/libvirt/HISTORY | 4
libs/libvirt/libvirt-1.0.0.tar.gz.sig | 0
libs/libvirt/libvirt-1.0.1.tar.gz.sig |binary
libs/neon/HISTORY | 3
libs/neon/PRE_SUB_DEPENDS | 1
libs/neon/REPAIR^all^PRE_SUB_DEPENDS | 1
libs/neon/SUB_DEPENDS | 14
libs/upower/DETAILS | 4
libs/upower/HISTORY | 3
mail/claws-mail/DEPENDS | 29 -
mail/claws-mail/HISTORY | 6
net/dhcp/DETAILS | 4
net/dhcp/HISTORY | 5
net/dhcp/INSTALL | 6
net/dhcpcd/DETAILS | 4
net/dhcpcd/HISTORY | 3
net/nc/BUILD | 4
net/nc/CONFLICTS | 3
net/nc/HISTORY | 4
net/netcat/CONFLICTS | 3
net/netcat/HISTORY | 3
php-pear/mongo/DETAILS | 4
php-pear/mongo/HISTORY | 3
python-pypi/bpython/DETAILS | 4
python-pypi/bpython/HISTORY | 3
python-pypi/fabric/DEPENDS | 8
python-pypi/fabric/DETAILS | 4
python-pypi/fabric/HISTORY | 4
python-pypi/httplib2/DETAILS | 4
python-pypi/httplib2/HISTORY | 3
python-pypi/mercurial/DETAILS | 4
python-pypi/mercurial/HISTORY | 3
python-pypi/paramiko/DETAILS | 11
python-pypi/paramiko/HISTORY | 4
python-pypi/paramiko/paramiko.gpg | 0
python-pypi/pyasn1/DETAILS | 4
python-pypi/pyasn1/HISTORY | 3
python-pypi/python-mpd/DETAILS | 7
python-pypi/python-mpd/HISTORY | 4
python-pypi/python-mpd/jthalheim.gpg | 0
python-pypi/python-ssh/DETAILS | 4
python-pypi/python-ssh/HISTORY | 3
python-pypi/pytz/DETAILS | 4
python-pypi/pytz/HISTORY | 3
ruby-raa/ruby-1.8/HISTORY | 12
ruby-raa/ruby-1.8/PRE_BUILD | 4
ruby-raa/ruby-1.8/stdout-rouge-fix.patch | 36 +
science/avogadro/DETAILS | 4
science/avogadro/HISTORY | 3
utils/file/BUILD | 1
utils/file/DETAILS | 5
utils/file/HISTORY | 4
video-libs/gst-ffmpeg/DEPENDS | 4
video-libs/gst-ffmpeg/HISTORY | 3
windowmanagers/fluxbox/BUILD | 6
windowmanagers/fluxbox/CONFIGURE | 22
windowmanagers/fluxbox/DEPENDS | 6
windowmanagers/fluxbox/DETAILS | 2
windowmanagers/fluxbox/HISTORY | 7
windowmanagers/fluxbox/PRE_BUILD | 3
windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig |binary
windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig | 0
windowmanagers/fluxbox/size_t.patch | 70 ++
windowmanagers/xmonad/DEPENDS | 1
windowmanagers/xmonad/DETAILS | 4
windowmanagers/xmonad/HISTORY | 4
wm-addons/xmonad-contrib/DEPENDS | 1
wm-addons/xmonad-contrib/DETAILS | 4
wm-addons/xmonad-contrib/HISTORY | 4
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
xfce/tumbler/DETAILS | 4
xfce/tumbler/HISTORY | 3
310 files changed, 1792 insertions(+), 642 deletions(-)

New commits:
commit 73dc1d0443e5b04454ab5d2afe017802899024d4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

tumbler: => 0.1.27

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

binutils: => 2.23.1

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

python-mpd: => 0.5.0

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

efl contains edje, emotion and ethumb

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

check 0.9.9

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

http/firefox: change dependency on JPEG to libjpeg-turbo

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

wm-addons/xmonad-contrib: version 0.11

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

windowmanagers/xmonad: version 0.11

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

haskell/haskell-x11: version 1.6.0.2

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

mongo: => 1.2.12

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

httplib2: => 0.7.4

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

gnome-media2: Depends on gnome-doc-utils

checking gnome-doc-utils >= 0.3.2... no
configure: error: gnome-doc-utils >= 0.3.2 not found

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

dhcp: => 4.2.5

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

dhcp: => 3.2.5

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

sqlite: => 3.7.15.2

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

linux: => 3.2.36 (lts)

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

seamonkey: => 2.15 (security)

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

http/firefox: version 18.0

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

crypto/nss: add 3.14 branch

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

avogadro 1.1.0

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

transmission: => 2.76

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

libvirt: Updated to 1.0.1
Optionally depends on fuse

commit 76ed6a936d6360c6b22e6e9b35c48bf0c9c45af7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

webkitgtk: Depends on RUBY (tested ruby-1.9 and ruby-1.8)

checking for perl... /usr/bin/perl
checking for python... configure: error: You need 'ruby' to compile
WebKit
/usr/bin/python
checking for ruby... no

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

ruby-1.8: Cleanup formatting

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

ruby-1.8: Fix glibc 2.14+ compilation
From http://bugs.ruby-lang.org/issues/5108

commit 92c50f64b6b768b5102f118da43cc5f4ac0379ae
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

neon: Reset color to default at the end of message

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

subversion: Fix subversion SSL support

Subversion itself does not support SSL, but relies
on external software (e.g. neon/Serf)

From subversion's ./configure:
--with-ssl This option does NOT affect the Subversion build
process in any way. It enables OpenSSL
support in
the Neon HTTP client library. If and only if
you are
building Neon as an integrated part of the
Subversion build process, rather than linking
to an
already installed version of Neon, you
probably want
to pass this option so that Neon (and so
indirectly,
Subversion) will be capable of https://
access via
that library. (Note that Subversion may also
or
alternatively be configured to use the Serf
library
for http:// and https:// access; see the

Plus my svn client couldn't checkout https:// repositories.

commit 38a6be16265044847a0992f774e0427287456d68
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

neon: Allow requiring SSL support

commit 072a49275b63f625b1374e674f1441a08c234cb9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

webkitgtk: Depends on ruby

configure: error: You need 'ruby' to compile WebKit

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

elementary: Updated stable branch to 1.7.5

commit 22280b53e883d289484bcbfa3fb1220bf0a6a2b9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ethumb: Updated stable branch to 1.7.5

commit 6facf18b7971b9563f018dab328753c80c36ab03
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

emotion: Updated stable branch to 1.7.5

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

eio: Updated stable branch to 1.7.5

commit 568009442abf265df0c0b2eb60c943679aa33493
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas_generic_loaders: Updated stable branch to 1.7.5

commit 1135f6a974d4bdda82cc637740490192e22d8053
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

expedite: Updated stable branch to 1.7.5

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

eeze: Updated stable branch to 1.7.5

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

e_dbus: Updated stable branch to 1.7.5

commit 7c9c170ed29452608db3bb45dd20365051fabd52
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efreet: Updated stable branch to 1.7.5

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

edje: Updated stable branch to 1.7.5

commit 0f5c85a40bb2729c075ffa4140010163942b79fc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Updated stable branch to 1.7.5

commit 78e280be3ccff431ca9b9702a726d2423d2eb15d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Updated stable branch to 1.7.5

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

evas: Updated stable branch to 1.7.5

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

eina: Updated stable branch to 1.7.5

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

eet: Updated stable branch to 1.7.5

commit 9bd7b14b6697278e042884e775a10514b3a3b0ab
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

terminology: Add stable branch 0.2.0
Only SCM branch depends on efl
SCM branch depends on subversion
Stable branch depends on edje, eet, efreet, and eina

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

ecore: Add all evas flags for evas optional dependency to SUB_DEPENDS

commit 9a84379b45a728f934f25428d0d4061819e6a152
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: X11 and XCB are mutually exclusive

commit 064fe1a615f9c5de1ccd0545bd497103813e09be
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Depends on ecore built with evas support

commit 901fe2cad16d4968ab56b136a4bc5084cf77d7a0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Add all evas flags for evas optional dependency

commit 228da32457ca010049ba49bbc900ac2f5d9226ea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: eet is required, not optional

commit 3babf5eeff37c8bdfa873209a67c0cf408775702
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: --disable-images-loader-eet -> --disable-image-loader-eet

commit 0c4ecb5f12747fea6e97526606ca1002e9965c81
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas_generic_loaders: Added stable 1.7.4 branch
SCM version depends on subversion

commit 1867571c6f3610e5a5b1501e77bd9eb4fb19dc8f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ethumb: Cleanup formatting

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

ethumb: Add stable 1.7.4 branch
Only SCM branch depends on efl and subversion
e_dbus for stable and edbus for SCM
Optionally depends on doxygen

commit 955f5ce20cb2c45fb43f9559dbd567ccf3fc3db6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

edje: Depends on eet and eina

commit 5b441d5161a27df95a334647c1d43b612ae88aa0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

exquisite: Add stable 1.0.0 branch
Only SCM branch depends on efl and subversion

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

expedite: Add stable 1.7.4 branch
Only SCM branch depends on subversion

commit 454a636c777a7916f1cc07f5bebc19f5be688d28
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

elementary: EDJE_BRANCH -> ELEMENTARY_BRANCH

commit 05ffefaaac1838bcaa301e067ff5f13d93a28ffd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Switch SOURCE from .gz -> .bz2

commit 33099b75a82e01238504d6899860d3063d4f4ec7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Switch SOURCE from .gz -> .bz2

commit 665d7370c2140f654657fc2686e74cfc40f256af
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eina: Switch SOURCE from .gz -> .bz2

commit 41ce5f265a0a03dde102721cb5806737206a19f8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efreet: Switch SOURCE from .gz -> .bz2

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

eeze: Switch SOURCE from .gz -> .bz2

commit 2e42b0952b19bc9314a3cc6137ed56be8552b9dc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

edje: Switch SOURCE from .gz -> .bz2

commit 19d4f427f26139daa2355b27be8facd97435d1a6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Switch SOURCE from .gz -> .bz2

commit 19a598a08fa9878c32d259880cb4ddb2da35a2a1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_dbus: Switch SOURCE from .gz -> .bz2

commit 16c378a4a533797f6d692fae18b0bb22a8ac66c7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Switch SOURCE from .gz -> .bz2

commit 46b076680a1fe34032f7f9a31b9b3b99fe8828d0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Fix trailing &&

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

e17: Cleanup formatting

commit 20479cb8302d20c8ed4b7cbbb900b50435764a6d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eio: Cleanup formatting

commit 693ff1936d163fa3f23d95c35a394ab557fd1091
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Optionally depends on gettext, elementary, and emotion

commit 34b4df317e3609d5495d70f5dc5643b04eddcf13
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

elementary: Added stable 1.7.4 release
Only SCM branch depends on subversion
Stable branch depends on eio edje

commit 0ccfeef8bbe4d9a138da0bda83c0b64b58f3ad13
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eio: Depends on eet and eina

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

e_dbus: Fix ./configure flags for connman and eofono

--disable-ofono -> --disable-eofono
*-connman -> *-connman0_7x

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

emotion: Updated stable to 1.7.4
Optionally depends on doxygen
VLC is now under "generic" (--enable-generic-vlc)

commit 2f64263931759acf8c96f62c0ea4fb57a3aafd7f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: dd stable 0.17.0 branch
SCM depends on efl, subversion, and edbus; stable does not
exchange and bluez are no longer options
Stable depends on e_dbus ecore edje efreet eina eio evas
xcb-util-keysyms
Stable optionally depends on eeze
Only install e17update for SCM version

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

eio: Removed SCM option, included in efl
Updated stable to 1.7.4
Conflicts with efl
Optionally depends on doxygen

commit 4faef88bf9fd9045659a7f4326c70aa41beafb9c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_dbus: Cleanup formatting

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

e_dbus: Updated stable branch to 1.7.4
Stable branch does not use efl, only SCM branch

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

edje: Depends on ecore built with evas support (ecore-evas)

commit 3051c929dc92e688ce6f4aff65e8321930098ae9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Allow forcing using evas

commit 9d876cbf6c7cbe257812ef35a6c1c4923672d1b7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eeze: Stable version updated to 1.7.4
Removed svn version, included in efl package
Depends on eet
Optionally depends on doxygen

commit 640d50d57de26547561d7e28a63e2b02a858d344
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Depends on eina

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

efreet: Stable version updated to 1.7.4
Removed svn version, included in efl package
Removed efl dependency (not for stable)
Does not depend on edbus nor e_dbus
Depends on eet and eina

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

edje: Updated stable to 1.7.4
SCM branch only depends on efl package
SCM branch conflicts with ecore (provided by required efl)
Stable depends on ecore embryo
Optionally depends on doxygen, LIBAVCODEC, and alsa-lib
Stable branch only conflicts with efl package

commit 38750be9e5d730214f0ad42d411d4216e4c73e69
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Updated stable to 1.7.4
Removed svn version, included in efl package
Optionally depends on doxygen

commit 5c50fc5cb37879c5d0fbf5bf28de106366f6fd91
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Optionally depends on evas (auto-detect what evas supports)

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

ecore: Cleanup formatting

commit 89b9aac1b31cb9c174dee27ddcf6ee9fe2dc38e2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Cleanup formatting

commit 3612b165c1aa1441bcc6bc40dc9bd3c5de1ccf7e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Updated stable to 1.7.4
Removed svn version, included in efl package
Expand pixman flags
Optionally depends on doxygen

commit 12248197d9a4d88ef43d39a97d9263ab6d85a633
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Updated stable to 1.7.4
Removed svn support, included in efl package
Stable version does not depend on efl (conflicts!)
Optionally depends on libxcomposite and libxp
Add '--enable*' options for other optional dependencies
Replace 'xorg-libs' optional dependency with libx11

commit 83f8584c8afc30cf8d2808f44d1c09ac9492707d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eet: Updated stable to 1.7.4
Removed svn option, included in efl package

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

drbd: added kernel 3.5-3.7 support

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

pango: => 1.32.5

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

Revert "fluxbox: => 1.3.3"

This reverts commit 5c863583298045fbb16d5f6b25de013ace242616.

Downgrade to 1.3.2 due to upstream bug #3590078

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

Revert "fluxbox: fixed fribidi detection, when built with glib support"

This reverts commit b758db2b5a365bddb1ed14f4df44155c81be170f.

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

dhcpcd: => 5.6.6

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

fabric: => 1.5.1

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

paramiko: => 1.9.0

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

python-ssh: => 1.8.0

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

fabric: => 1.4.4

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

harfbuzz: => 0.9.10

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

java-gcj-compat: new spell, Java SDK compatibility for GCJ

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

oprofileui: Depends on xml-parser

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

heimdall: new spell, Tool to flash Samsung Galaxy S devices

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

mpd: => 0.17.3

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

pyasn1: => 0.1.6

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

ccache: => 3.1.9

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

opencv - improve build

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

upower: => 0.9.19

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

cimg: => 1.5.2

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

nc: conflicts cryptcat

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

netcat: conflicts cryptcat

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

cryptcat: new spell, standard netcat enhanced with twofish encryption

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

mercurial: => 2.4.2

commit 4fceb521715a7901bf2c9923e3a2c4015ca5e9c6
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

audio-players/cmus: really remove CONFIGURE

Somehow didn't include the removal of CONFIGURE in the previous commit.
Thanks to Ladislav for catching this.

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

gnutls: Apply gets.patch/x509.patch for DEFAULT/2.12 branch (Bug #493)
* gets.patch: Fix gets() removal from glibc 2.16 (Bug #493)
* x509.patch: Fix x509 compilation (found after Bug #493 fixed)

commit 7b1c3928fbd5089013731835c853699fdb8224af
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eina: Updated stable to 1.7.4
Remove SVN option, this code is now in the efl package
Remove posix and coverage configure options
configure: WARNING: unrecognized options: --enable-posix-threads,
--disable-coverage

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

efl: Optionally depends on libwebp

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

evas: Conflicts with efl

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

eobj: Conflicts with efl

commit 2b3cda104f5a79692f58281b6618041225b16b8d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Conflicts with efl

commit 1ad4890f5d9fe0f54a02a8943c7338bdd53873d6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eina: Conflicts with efl

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

eet: Conflicts with efl

commit 16bcb6a61f36d0fa7366d6da9097afd98c502b91
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ephysics: typo efs -> efl

commit 1100cb575c89748a246744116a95baba8538911b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Sort CONFLICTS for easier checking what's missing

commit 3e6303b2e74bb828f5acaa620ae2b83f5389b04e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Spell physics correctly :p

commit 638561fdf5db4af1f9fee166d0ab1ac6553e826a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Optionally depend on giflib and tiff for image loaders.

commit 5f62c8eabe2ad01bd9cb5af2e6d7e0e41c46cbf1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Fails with multiple make jobs, use make_single

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

efl: More optional depends
fontconfig, sdl, pixman, curl tslib, pulseaudio, and util-linux

commit 3d029fa46e7edcac573fd3b6c8a62efebbd77cf6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: bullet is optional, not required

commit 5dfc2514efed678f64428bccd52c1ed80a16feb9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Cleanup formatting

commit 3fb9eee8653459070ba8e08c683b838c33aa8694
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Depends on bullet

configure: Start EPhysics checks
configure: error: pkg-config missing bullet >= 2.80

commit 010ce84dcc5fa4f177429ce8219fc92106ce152e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efl: Depends on valgrind

configure: Start Eina checks
checking for VALGRIND... no
configure: error: Package requirements (valgrind >= 2.4.0) were not met:

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

wine: Updated devel to 1.5.21

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

devel/scala: version 2.10.0

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

file: include static version of library

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

file: => 5.12

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

gnome2-libs/gnome-vfs2: remove dependencies on icu, libffi, orbit2, pcre

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

video-libs/gst-ffmpeg: remove dependencies icu, libffi and pcre

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

devel/graphviz: removed dependencies on bzip2, icu, ilmbase, lcms,
libcroco, libffi, libmng, libxau, libxcb, libxdmcp, libxext,
openexr, pcre, tiff, util-linux

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

mail/claws-mail: added optional dependency on bogofilter and
network-manager, removed dependencies on libffi, bzip2, libxau,
libxcb, libxdmcp, libxext, libxrender, libssh2, pcre and zlib,
made the dependency on libassuan dependent on the dependency on gpgme

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

soundtouch: => 1.7.1

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

bpython: => 0.12

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

opencv - fix qt4 support

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

liblqr: => 0.4.2

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

pytz: => 2012j

commit b670afd07bcca9058224712d295d9c2023e55150
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.1-7

diff --git a/ChangeLog b/ChangeLog
index c07f69b..2f1a1dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-08 Ismael Luceno <ismael AT sourcemage.org>
+ * devel/heimdall: new spell, Tool to flash Samsung Galaxy S devices
+
+2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * crypto/cryptcat: new spell, standard netcat enhanced with twofish
+ encryption
+
2013-01-01 Ladislav Hagara <hgr AT vabo.cz>
* fonts-x11/open-dyslexic: new spell,
font created to increase readability for readers with dyslexia
@@ -2692,6 +2699,9 @@
* python-pypi/desktopcouch: Added a CouchDB on every desktop, and the
code
to help it happen

+2010-05-22 Ismael Luceno <ismael AT sourcemage.org>
+ * gnu/java-gcj-compat: new spell, Java SDK compatibility for GCJ
+
2010-05-04 Peng Chang (Charles) <chp AT sourcemage.org>
* i18n/ibus-pinyin: new spell, Chinese pinyin IM for IBus framework

diff --git a/audio-libs/soundtouch/DETAILS b/audio-libs/soundtouch/DETAILS
index 41bca0d..7b2176a 100755
--- a/audio-libs/soundtouch/DETAILS
+++ b/audio-libs/soundtouch/DETAILS
@@ -1,7 +1,7 @@
SPELL=soundtouch
- VERSION=1.7.0
+ VERSION=1.7.1
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:bca405a4ef90ae8ef5eeb622d90bec4f299539af8bb91b41f7994e792b9b4a137766c88b1cd69d59072a9ca164ab48a6ac6bf1fdd722a04e05ed3da5d548414a
+
SOURCE_HASH=sha512:92a9e2fb5e47f573771620f329e9193f559ff25ce21f16917479ff94e2aac1e3ebb79cb0fe1ae55d6505b40f694792e493b388470987fbe7a85505fd88e947cc
SOURCE_URL[0]=http://www.surina.net/soundtouch/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://www.surina.net/soundtouch/
diff --git a/audio-libs/soundtouch/HISTORY b/audio-libs/soundtouch/HISTORY
index 5573dee..f6b870f 100644
--- a/audio-libs/soundtouch/HISTORY
+++ b/audio-libs/soundtouch/HISTORY
@@ -1,3 +1,6 @@
+2013-01-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.1
+
2012-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.0
* PRE_BUILD, soundtouch-1.5.0-x86_64-asm-broken.patch:
diff --git a/audio-players/cmus/CONFIGURE b/audio-players/cmus/CONFIGURE
deleted file mode 100644
index 763e521..0000000
--- a/audio-players/cmus/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option CMUS_OSS "Enable OSS support?" y \
- "CONFIG_OSS=y" "CONFIG_OSS=n"
diff --git a/audio-players/mpd/DETAILS b/audio-players/mpd/DETAILS
index 1909598..f9f967b 100755
--- a/audio-players/mpd/DETAILS
+++ b/audio-players/mpd/DETAILS
@@ -1,9 +1,9 @@
SPELL=mpd
- VERSION=0.17.2
+ VERSION=0.17.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/musicpd/$SOURCE
-
SOURCE_HASH=sha512:9637b06b1b5d8311fc12eb0aa9a8d1bec96b7995329ab6fc0b8a6c7d6d0648cc931982e550f456648c9e08d29e33ab7f066b2bb9ad9c105e60a08cc8bf0ba599
+
SOURCE_HASH=sha512:e421e723cd7d46b87c07d5a3be5aaa592453b6c7d2fa02440cc8ac5a1f931126f5011b0fed9c8d0fcfb142dd7290db67ca2638f75fa8b41d38f2a825816621e1
LICENSE[0]=GPL
KEYWORDS="music players audio"
WEB_SITE=http://www.musicpd.org/
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index eed6655..2ee1d22 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.17.3
+
2012-12-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.17.2
* CONFIGURE: added missing/new configure options; added missing "&&";
diff --git a/cluster/drbd/DETAILS b/cluster/drbd/DETAILS
index d808134..1c5c9d1 100755
--- a/cluster/drbd/DETAILS
+++ b/cluster/drbd/DETAILS
@@ -6,18 +6,30 @@ local KERNEL_BRANCH=`get_kernel_version|cut -d . -f -3` &&
if [[ $KERNEL_BRANCH == 2.6.33 ]] || [[ $KERNEL_BRANCH == 2.6.34 ]]; then
VERSION=8.3.7

SOURCE_HASH=sha512:9ea576ed6a75d80009ade0f9540535b2a65ecee6d38b1a85fa3146a97aac8cb3add31154e2921630aa75121c7115d66bdcf45adb8e0fa481bdb27c011b1c9b15
+elif [[ $KERNEL_BRANCH == 2.6.35 ]] || [[ $KERNEL_BRANCH == 2.6.36 ]]; then
+ VERSION=8.3.8.1
+
SOURCE_HASH=sha512:c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
elif [[ $KERNEL_BRANCH == 2.6.37 ]] || [[ $KERNEL_BRANCH == 2.6.38 ]]; then
VERSION=8.3.9

SOURCE_HASH=sha512:7d6545b3298f2af7cc6ba91a501a15f3232cb914619deae4ff5b09b14d59375015878c8794464cedee298b1209cee60a6bd16cca436471b20c0641cc2a6f2745
elif [[ $KERNEL_BRANCH == 2.6.39 ]]; then
VERSION=8.3.10

SOURCE_HASH=sha512:8d904ada9c80732b47cbf149cf4172658d350856d8688f1dce92c16ce1c4e946a0b3b3a14bb3c9361684fc08b257207c58beaa2fdb534f2abf47ac45aa659389
-elif [[ ${KERNEL_BRANCH%%.*} == 3 ]]; then
+else
+ case ${KERNEL_BRANCH%.*} in
+ 3.[01234])
VERSION=8.3.11

SOURCE_HASH=sha512:2bbf16d69e897adcb247d451f1d844993bdb3ad201027a588f9a45b4fe43fa2f6e98ed6063e8dccc92b9a231ccebf0af85a8671e5672fa710aa986e555ae896d
-else
- VERSION=8.3.8.1
-
SOURCE_HASH=sha512:c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
+ ;;
+ 3.[567])
+ VERSION=8.3.13
+
SOURCE_HASH=sha512:fff72545ae569dad37d202bd7dcb075e443964e4d2e95ae124bbcac098762bee78f91e4863b56abfca2bdce2baa42bb3fdbdf9bb489f498d84aa679fa43ae702
+ ;;
+ *)
+ message "${PROBLEM_COLOR}ERROR: kernel version $KERNEL_BRANCH not
supported.${MESSAGE_COLOR}" &&
+ return 1
+ ;;
+ esac
fi
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz
diff --git a/cluster/drbd/HISTORY b/cluster/drbd/HISTORY
index 583f731..9c34967 100644
--- a/cluster/drbd/HISTORY
+++ b/cluster/drbd/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added kernel 3.5-3.7 support (see
drbd.org/download/mainline)
+
2012-03-31 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: pass KDIR var to build for using correct kernel sources

diff --git a/collab/subversion/CONFIGURE b/collab/subversion/CONFIGURE
index 3969da5..af6fcf8 100755
--- a/collab/subversion/CONFIGURE
+++ b/collab/subversion/CONFIGURE
@@ -6,4 +6,5 @@ function spell_ok_yesno {
config_query SVN_PERL 'Install Subversion bindings for Perl?'
$(spell_ok_yesno perl) &&
config_query SVN_PYTHON 'Install Subversion bindings for Python?'
$(spell_ok_yesno python) &&
config_query SVN_RUBY 'Install Subversion bindings for Ruby?'
$(spell_ok_yesno ruby) &&
-config_query SVN_JAVA 'Install Subversion bindings for JAVA?'
$(spell_ok_yesno JAVA)
+config_query SVN_JAVA 'Install Subversion bindings for JAVA?'
$(spell_ok_yesno JAVA) &&
+config_query SVN_SSL 'Enable SSL support?' n
diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 07e13bc..f3d82c6 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -25,13 +25,17 @@ then
fi &&

optional_depends gettext '--enable-nls' '--disable-nls' 'for language
translations' &&
-optional_depends openssl '--with-ssl' '--without-ssl' 'for SSL/TLS support'
&&
optional_depends LIBSASL '--with-sasl' '--without-sasl' 'for Cyrus SASL
authentication' &&

message ""WARNING, disabling neon is not recommended and may break
downloading some svn spells."" &&
-optional_depends -sub DAV neon "--with-neon=${INSTALL_ROOT}/usr" \
- "--without-neon" \
- "for Subversion client to support DAV" &&
+
+if [[ "x${SVN_SSL}" == "xy" ]]; then
+ depends -sub 'DAV SSL' neon "--with-neon=${INSTALL_ROOT}/usr --with-ssl"
+else
+ optional_depends -sub DAV neon "--with-neon=${INSTALL_ROOT}/usr" \
+ "--without-neon" \
+ "for Subversion client to support DAV"
+fi &&

optional_depends db '--with-berkeley-db' '--without-berkeley-db' 'for
Berkeley DB backend' &&
optional_depends APACHE2 '--with-apxs' '--without-apxs' 'to create Apache 2
modules' &&
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 82b3140..e3a7345 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE, DEPENDS: Subversion itself does not support SSL, but
relies
+ on external software (e.g. neon/Serf)
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.8

diff --git a/crypto/cryptcat/BUILD b/crypto/cryptcat/BUILD
new file mode 100755
index 0000000..abb1ff0
--- /dev/null
+++ b/crypto/cryptcat/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+make linux CFLAGS="$CFLAGS" STATIC="$CRYPTCAT_STATIC" &&
+make_normal
diff --git a/crypto/cryptcat/CONFIGURE b/crypto/cryptcat/CONFIGURE
new file mode 100755
index 0000000..7a1b353
--- /dev/null
+++ b/crypto/cryptcat/CONFIGURE
@@ -0,0 +1,3 @@
+config_query_option CRYPTCAT_STATIC "Build static version?" y \
+ "-static" \
+ ""
diff --git a/crypto/cryptcat/CONFLICTS b/crypto/cryptcat/CONFLICTS
new file mode 100755
index 0000000..c1f0747
--- /dev/null
+++ b/crypto/cryptcat/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts netcat &&
+conflicts nc
diff --git a/crypto/cryptcat/DEPENDS b/crypto/cryptcat/DEPENDS
new file mode 100755
index 0000000..f148724
--- /dev/null
+++ b/crypto/cryptcat/DEPENDS
@@ -0,0 +1 @@
+depends -sub CXX gcc
diff --git a/crypto/cryptcat/DETAILS b/crypto/cryptcat/DETAILS
new file mode 100755
index 0000000..79a3dd5
--- /dev/null
+++ b/crypto/cryptcat/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=cryptcat
+ VERSION=1.2.1
+ SOURCE=$SPELL-unix-$VERSION.tar
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/unix"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:2de6521903e489bc6d4f242aaac7f35a3a7fb226e1812ef5f1c3554420fce4378427e94b3e90eca5476d1068f1a9b44d9c5dbd0362888ad893cf66be106deb17
+ WEB_SITE=http://sourceforge.net/projects/cryptcat/
+ LICENSE[0]=GPL
+ ENTERED=20130107
+ KEYWORDS="net"
+ SHORT="standard netcat enhanced with twofish encryption"
+cat << EOF
+Cryptcat is the standard netcat (v1.10) enhanced with twofish encryption.
+
+Twofish is courtesy of counterpane, and cryptix. We started with the Java
+version of twofish from cryptix, converted it to C++ (don't ask why), and
+enhanced it by adding CBC mode and the ciphertext stealing technique from
+Applied Cryptography (pg. 196).
+
+How do you use it?
+
+ Machine A: cryptcat -l -p 1234 < testfile
+ Machine B: cryptcat <machine A IP> 1234
+
+This is identical to the normal netcat options for doing exactly the same
+thing. However, in this case the data transferred is encrypted.
+EOF
diff --git a/crypto/cryptcat/HISTORY b/crypto/cryptcat/HISTORY
new file mode 100644
index 0000000..0e53e52
--- /dev/null
+++ b/crypto/cryptcat/HISTORY
@@ -0,0 +1,2 @@
+2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, BUILD, INSTALL, CONFIGURE, CONFLICTS: spell
created
diff --git a/crypto/cryptcat/INSTALL b/crypto/cryptcat/INSTALL
new file mode 100755
index 0000000..4f6c617
--- /dev/null
+++ b/crypto/cryptcat/INSTALL
@@ -0,0 +1,2 @@
+install -vm 755 cryptcat "$INSTALL_ROOT/usr/bin/cryptcat" &&
+ln -vsf "$TRACK_ROOT/usr/bin/cryptcat" "$INSTALL_ROOT/usr/bin/nc"
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 0a39617..d05bee4 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,8 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gets.patch and x509.patch for DEFAULT and 2.12
branch
+ * gets.patch: Fix gets() removal from glibc 2.16 (Bug #493)
+ * x509.patch: Fix x509 compilation (found after Bug #493 fixed)
+
2012-12-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 3.1,5
* PREPARE: add new branch 3.1
diff --git a/crypto/gnutls/PRE_BUILD b/crypto/gnutls/PRE_BUILD
new file mode 100755
index 0000000..19ad9af
--- /dev/null
+++ b/crypto/gnutls/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+
+# Fixes from https://aur.archlinux.org/packages/gnutls2/ for gnutls 2.12
+# May affect other 2.x versions, untested for them
+if [[ "x${GNUTLS_BRANCH}" == "2.12" ]] || [[ "x${GNUTLS_BRANCH}" ==
"xDEFAULT" ]]
+then
+ message "${MESSAGE_COLOR}Enabling insecure gets()...${DEFAULT_COLOR}" &&
+ cd "${SOURCE_DIRECTORY}" &&
+ patch -p1 < "${SPELL_DIRECTORY}"/gets.patch &&
+ message "${MESSAGE_COLOR}Apply x509 patch...${DEFAULT_COLOR}" &&
+ patch "${SOURCE_DIRECTORY}"/lib/x509/x509.c "${SPELL_DIRECTORY}"/x509.patch
+fi
diff --git a/crypto/gnutls/gets.patch b/crypto/gnutls/gets.patch
new file mode 100644
index 0000000..2ce70d3
--- /dev/null
+++ b/crypto/gnutls/gets.patch
@@ -0,0 +1,57 @@
+# From
http://git.buildroot.net/buildroot/commit/?id=29b792690b4939b414fef1ad06f71c53feb1ed75
+From 855f72c4fe7f4bbf2137ab60357ae3b27bb65185 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni AT free-electrons.com>
+Date: Sat, 17 Nov 2012 17:45:41 +0100
+Subject: [PATCH] gets() no longer exists in (e)glibc >= 2.16
+
+gnutls has already updated gnulib upstream in more recent versions
+(3.x) but apparently not in the 2.x branch that we are using.
+
+This patch comes from OpenEmbedded, and has originally been written by
+Khem Raj <raj.khem AT gmail.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni AT free-electrons.com>
+---
+ gl/stdio.in.h | 2 ++
+ lib/gl/stdio.in.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gl/stdio.in.h b/gl/stdio.in.h
+index 9dc7c4a..8cb19d7 100644
+--- a/gl/stdio.in.h
++++ b/gl/stdio.in.h
+@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ # undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+
+
+diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h
+index 03bea2a..cb6483b 100644
+--- a/lib/gl/stdio.in.h
++++ b/lib/gl/stdio.in.h
+@@ -710,11 +710,13 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s));
+ _GL_CXXALIAS_SYS (gets, char *, (char *s));
+ # undef gets
+ # endif
++# if defined gets
+ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++# endif
+ #endif
+
+
+--
+1.7.9.5
+
diff --git a/crypto/gnutls/x509.patch b/crypto/gnutls/x509.patch
new file mode 100644
index 0000000..46127b4
--- /dev/null
+++ b/crypto/gnutls/x509.patch
@@ -0,0 +1,66 @@
+# From https://aur.archlinux.org/packages/gnutls2/
+diff -Naur gnutls-2.12.20.orig/lib/x509/x509.c gnutls-2.12.20/lib/x509/x509.c
+--- gnutls-2.12.20.orig/lib/x509/x509.c 2013-01-04 17:20:52.841585812
-0800
++++ gnutls-2.12.20/lib/x509/x509.c 2013-01-04 17:29:30.655702758 -0800
+@@ -2060,10 +2060,12 @@
+ int irdn, int iava, gnutls_x509_ava_st * ava)
+ {
+ ASN1_TYPE rdn, elem;
++ ASN1_DATA_NODE vnode;
+ long len;
+ int lenlen, remlen, ret;
+ char rbuf[ASN1_MAX_NAME_SIZE];
+- unsigned char cls, *ptr;
++ unsigned char cls;
++ const unsigned char *ptr;
+
+ iava++;
+ irdn++; /* 0->1, 1->2 etc */
+@@ -2084,8 +2086,15 @@
+ return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
+ }
+
+- ava->oid.data = elem->value;
+- ava->oid.size = elem->value_len;
++ ret = asn1_read_node_value(elem, &vnode);
++ if (ret != ASN1_SUCCESS)
++ {
++ gnutls_assert ();
++ return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
++ }
++
++ ava->oid.data = (void*)vnode.value;
++ ava->oid.size = vnode.value_len;
+
+ snprintf (rbuf, sizeof (rbuf), "?%d.value", iava);
+ elem = asn1_find_node (rdn, rbuf);
+@@ -2095,12 +2104,18 @@
+ return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
+ }
+
++ ret = asn1_read_node_value(elem, &vnode);
++ if (ret != ASN1_SUCCESS)
++ {
++ gnutls_assert ();
++ return GNUTLS_E_ASN1_ELEMENT_NOT_FOUND;
++ }
+ /* The value still has the previous tag's length bytes, plus the
+ * current value's tag and length bytes. Decode them.
+ */
+
+- ptr = elem->value;
+- remlen = elem->value_len;
++ ptr = vnode.value;
++ remlen = vnode.value_len;
+ len = asn1_get_length_der (ptr, remlen, &lenlen);
+ if (len < 0)
+ {
+@@ -2131,7 +2146,7 @@
+ }
+ ava->value.size = tmp;
+ }
+- ava->value.data = ptr + lenlen;
++ ava->value.data = (void*)(ptr + lenlen);
+
+ return 0;
+ }
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 1c7679c..d5a4d41 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -1,7 +1,7 @@
SPELL=nss

if [ -z "$NSS_BRANCH" ] || [ "$NSS_BRANCH" == "DEFAULT" ]; then
- NSS_BRANCH=3.13
+ NSS_BRANCH=3.14
fi

case $NSS_BRANCH in
@@ -34,6 +34,12 @@ case $NSS_BRANCH in

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_HASH=sha512:45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d
;;
+ 3.14)
+ VERSION=3.14.1
+ 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:f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e
+ ;;
esac

SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 5ef4704..1d10e4a 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+2013-01-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, SUB_DEPENDS, PRE_SUB_DEPENDS, PREPARE: added
+ 3.14 branch, made it the default
+ * PRE_BUILD, nss-3.14-config-1.patch: regenerated patch
+
+no changes added to commit (use "git add" and/or "git commit -a")
2012-08-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.13.6

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 50f62f7..686f58a 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1 +1 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.11 3.12 3.13 3.14
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 7a3df51..22d9c9f 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,7 +2,11 @@ default_pre_build &&

cd $SOURCE_DIRECTORY &&

-patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch &&
+if [[ $NSS_BRANCH == "3.14" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
+else
+ patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
+fi &&

if [[ "$NSS_PEM" == "y" ]]; then
tar jxvf $SCRIPT_DIRECTORY/nss-pem-20100412.tar.bz2 &&
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index dcd5d56..eeb2144 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
case $THIS_SUB_DEPENDS in
3.12.x) if [ $NSS_BRANCH == "3.12" ]; then return 0; fi;;
3.13.x) if [ $NSS_BRANCH == "3.13" ]; then return 0; fi;;
+ 3.14.x) if [ $NSS_BRANCH == "3.14" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index 4ec4937..a80f80c 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -3,6 +3,8 @@ case $THIS_SUB_DEPENDS in
NSS_BRANCH="3.12" ;;
3.13.x) echo "3.13.x release needed, forcing it." &&
NSS_BRANCH="3.13" ;;
+ 3.14.x) echo "3.13.x release needed, forcing it." &&
+ NSS_BRANCH="3.14" ;;
PEM) echo "nss with pem needed, forcing it." &&
NSS_PEM="y" ;;
*) echo "unknown sub-depends!"; return 1 ;;
diff --git a/crypto/nss/nss-3.14-config-1.patch
b/crypto/nss/nss-3.14-config-1.patch
new file mode 100644
index 0000000..43e3d8a
--- /dev/null
+++ b/crypto/nss/nss-3.14-config-1.patch
@@ -0,0 +1,271 @@
+From 6fc285f4176de5cc4f8afed2188c6021c3367511 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 9 Jan 2013 18:12:36 +0100
+Subject: [PATCH] nss-3.14-config-1
+
+---
+ mozilla/security/nss/cmd/disttools/Makefile | 66 +++++++++++
+ mozilla/security/nss/cmd/disttools/nss-config.in | 145
+++++++++++++++++++++++
+ mozilla/security/nss/cmd/disttools/nss.pc.in | 12 ++
+ mozilla/security/nss/cmd/manifest.mn | 1 +
+ 4 files changed, 224 insertions(+)
+ create mode 100644 mozilla/security/nss/cmd/disttools/Makefile
+ create mode 100644 mozilla/security/nss/cmd/disttools/nss-config.in
+ create mode 100644 mozilla/security/nss/cmd/disttools/nss.pc.in
+
+diff --git a/mozilla/security/nss/cmd/disttools/Makefile
b/mozilla/security/nss/cmd/disttools/Makefile
+new file mode 100644
+index 0000000..7395bca
+--- /dev/null
++++ b/mozilla/security/nss/cmd/disttools/Makefile
+@@ -0,0 +1,66 @@
++#! gmake
++#
++# ***** BEGIN LICENSE BLOCK *****
++# Version: MPL 1.1/GPL 2.0/LGPL 2.1
++#
++# The contents of this file are subject to the Mozilla Public License
Version
++# 1.1 (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++# http://www.mozilla.org/MPL/
++#
++# Software distributed under the License is distributed on an "AS IS" basis,
++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++# for the specific language governing rights and limitations under the
++# License.
++#
++# The Original Code is the Netscape security libraries.
++#
++# The Initial Developer of the Original Code is
++# Netscape Communications Corporation.
++# Portions created by the Initial Developer are Copyright (C) 1994-2000
++# the Initial Developer. All Rights Reserved.
++#
++# Contributor(s):
++# DJ Lucas <dj AT linuxfromscratch.org>
++#
++# Alternatively, the contents of this file may be used under the terms of
++# either the GNU General Public License Version 2 or later (the "GPL"), or
++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++# in which case the provisions of the GPL or the LGPL are applicable instead
++# of those above. If you wish to allow use of your version of this file only
++# under the terms of either the GPL or the LGPL, and not to allow others to
++# use your version of this file under the terms of the MPL, indicate your
++# decision by deleting the provisions above and replace them with the notice
++# and other provisions required by the GPL or the LGPL. If you do not delete
++# the provisions above, a recipient may use your version of this file under
++# the terms of any one of the MPL, the GPL or the LGPL.
++#
++# ***** END LICENSE BLOCK *****
++
++CORE_DEPTH = ../../..
++
++VERSION = $(shell grep NSS_VERSION $(CORE_DEPTH)/../dist/public/nss/nss.h |
\
++ cut -d\" -f2)
++NSS_VERSION_MAJOR = $(shell echo $(VERSION) | cut -d. -f1)
++NSS_VERSION_MINOR = $(shell echo $(VERSION) | cut -d. -f2)
++NSS_VERSION_PATCH = $(shell echo $(VERSION) | cut -d. -f3)
++
++
++all: export
++
++export:
++ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
++ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
++ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
++ nss-config.in > nss-config
++ sed -e 's/@NSS_VERSION_MAJOR@/$(NSS_VERSION_MAJOR)/' \
++ -e 's/@NSS_VERSION_MINOR@/$(NSS_VERSION_MINOR)/' \
++ -e 's/@NSS_VERSION_PATCH@/$(NSS_VERSION_PATCH)/' \
++ nss.pc.in > nss.pc
++
++libs:
++ # Do Nothing
++ echo "Done."
++
++.phony: all export
++
+diff --git a/mozilla/security/nss/cmd/disttools/nss-config.in
b/mozilla/security/nss/cmd/disttools/nss-config.in
+new file mode 100644
+index 0000000..d1641cd
+--- /dev/null
++++ b/mozilla/security/nss/cmd/disttools/nss-config.in
+@@ -0,0 +1,145 @@
++#!/bin/sh
++
++prefix=/usr
++
++major_version=@NSS_VERSION_MAJOR@
++minor_version=@NSS_VERSION_MINOR@
++patch_version=@NSS_VERSION_PATCH@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ ssl
++ smime
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_ssl=yes
++lib_smime=yes
++lib_nssutil=yes
++lib_nss=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=${prefix}
++fi
++if test -z "$includedir"; then
++ includedir=${prefix}/include/nss
++fi
++if test -z "$libdir"; then
++ libdir=${prefix}/lib
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-Wl,-R$libdir -L$libdir"
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+diff --git a/mozilla/security/nss/cmd/disttools/nss.pc.in
b/mozilla/security/nss/cmd/disttools/nss.pc.in
+new file mode 100644
+index 0000000..3a65f0e
+--- /dev/null
++++ b/mozilla/security/nss/cmd/disttools/nss.pc.in
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=/usr
++libdir=/usr/lib
++includedir=/usr/include
++
++Name: NSS
++Description: Mozilla Network Security Services
++Version: @NSS_VERSION_MAJOR@.@NSS_VERSION_MINOR@.@NSS_VERSION_PATCH@
++Requires: nspr >= 4.7.0
++Libs: -Wl,-R${libdir} -L${libdir} -lnss3 -lsmime3 -lnssutil3 -lssl3
-lsoftokn3
++Cflags: -I${includedir}/nss
++
+diff --git a/mozilla/security/nss/cmd/manifest.mn
b/mozilla/security/nss/cmd/manifest.mn
+index 3c5b132..b153aac 100644
+--- a/mozilla/security/nss/cmd/manifest.mn
++++ b/mozilla/security/nss/cmd/manifest.mn
+@@ -22,6 +22,7 @@ DIRS = lib \
+ dbtest \
+ derdump \
+ digest \
++ disttools \
+ httpserv \
+ fipstest \
+ $(LOWHASHTEST_SRCDIR) \
+--
+1.8.1
+
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 7d04f0a..233200b 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.15.1
- VERSIONX=autoconf-3071501
-
SOURCE_HASH=sha512:2230752e989541f51189762dbb76e6dc9249d72a2f75f2adba13aff54f0da3128d394962d836cc63a9d20a09c4281e85f0687fe8b72d2e0e9bd88a7dd17d925a
+ VERSION=3.7.15.2
+ VERSIONX=autoconf-3071502
+
SOURCE_HASH=sha512:ccec842f649c1dd47aed4712fc775d41097daca895ccc8b7fee24771f6c1832fb5210473f62dc62d4391c0a47ed3dfc9b92046fa7937aeb859105680942da082
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index bb4490d..9ec3438 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.7.15.2
+
2012-12-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.7.15.1

diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index 7586ae4..fc0ef8b 100755
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=binutils
- VERSION=2.22
+ VERSION=2.23.1
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 78f80ea..93a843a 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2013-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 2.13.1
+
2012-01-20 Thomas Orgis <sobukus AT sourcemage.org>
* INSTALL: install libiberty.h

diff --git a/devel/ccache/DETAILS b/devel/ccache/DETAILS
index 9d6220d..5f9c692 100755
--- a/devel/ccache/DETAILS
+++ b/devel/ccache/DETAILS
@@ -1,5 +1,5 @@
SPELL=ccache
- VERSION=3.1.8
+ VERSION=3.1.9
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/devel/ccache/HISTORY b/devel/ccache/HISTORY
index 80c53a0..815ac65 100644
--- a/devel/ccache/HISTORY
+++ b/devel/ccache/HISTORY
@@ -1,3 +1,6 @@
+2013-01-07 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.1.9
+
2012-08-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.1.8

diff --git a/devel/check/DETAILS b/devel/check/DETAILS
index fed8a78..ed2a16a 100755
--- a/devel/check/DETAILS
+++ b/devel/check/DETAILS
@@ -1,5 +1,5 @@
SPELL=check
- VERSION=0.9.8
+ VERSION=0.9.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/check/$SOURCE
diff --git a/devel/check/HISTORY b/devel/check/HISTORY
index 5d6b230..ddc0fec 100644
--- a/devel/check/HISTORY
+++ b/devel/check/HISTORY
@@ -1,3 +1,6 @@
+2013-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.9
+
2011-08-19 Bor Kraljič <pyrobor AT ver.si>
* BUILD: removed, it only contained unrecognized configure option
(issue #30)

diff --git a/devel/check/check-0.9.8.tar.gz.sig
b/devel/check/check-0.9.8.tar.gz.sig
deleted file mode 100644
index bf17767..0000000
Binary files a/devel/check/check-0.9.8.tar.gz.sig and /dev/null differ
diff --git a/devel/check/check-0.9.9.tar.gz.sig
b/devel/check/check-0.9.9.tar.gz.sig
new file mode 100644
index 0000000..7f4d704
Binary files /dev/null and b/devel/check/check-0.9.9.tar.gz.sig differ
diff --git a/devel/graphviz/DEPENDS b/devel/graphviz/DEPENDS
index 376be82..7f81103 100755
--- a/devel/graphviz/DEPENDS
+++ b/devel/graphviz/DEPENDS
@@ -85,34 +85,19 @@ optional_depends "ghostscript" \
"support for postscript"

depends atk &&
-depends bzip2 &&
if is_depends_enabled $SPELL gtk+2; then
depends gdk-pixbuf2
fi &&
depends harfbuzz &&
-depends icu &&
-depends ilmbase &&
depends jasper &&
-depends lcms &&
-depends libcroco &&
-depends libffi &&
depends libice &&
-depends libmng &&
depends librsvg2 &&
depends libsm &&
depends libx11 &&
-depends libxau &&
-depends libxcb &&
-depends libxdmcp &&
-depends libxext &&
depends libxml2 &&
depends libxmu &&
depends libxpm &&
depends libxrender &&
depends libxt &&
-depends openexr &&
-depends pcre &&
depends pixman &&
-depends tiff &&
-depends util-linux &&
depends LZMA
diff --git a/devel/graphviz/HISTORY b/devel/graphviz/HISTORY
index 08171f2..fe4b42e 100644
--- a/devel/graphviz/HISTORY
+++ b/devel/graphviz/HISTORY
@@ -1,3 +1,8 @@
+2013-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed dependencies on bzip2, icu, ilmbase, lcms,
+ libcroco, libffi, libmng, libxau, libxcb, libxdmcp, libxext,
+ openexr, pcre, tiff, util-linux
+
2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: PATCH_LEVEL -> PATCHLEVEL

diff --git a/devel/heimdall/BUILD b/devel/heimdall/BUILD
new file mode 100755
index 0000000..4429cf9
--- /dev/null
+++ b/devel/heimdall/BUILD
@@ -0,0 +1,16 @@
+OPTS="$OPTS --build=${BUILD}";
+[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}";
+git reset --hard "v$VERSION" &&
+for i in libpit heimdall; do
+ cd "$i" &&
+ ./configure \
+ --prefix=${INSTALL_ROOT}/usr \
+ --sysconfdir=${INSTALL_ROOT}/etc \
+ --localstatedir=${INSTALL_ROOT}/var \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --infodir=${INSTALL_ROOT}/usr/share/info $OPTS &&
+ # Issue #23, fixed in 1.4
+ sed -ie '/^ sudo/d' Makefile &&
+ make &&
+ cd .. || exit
+done
diff --git a/devel/heimdall/DEPENDS b/devel/heimdall/DEPENDS
new file mode 100755
index 0000000..3d5cac5
--- /dev/null
+++ b/devel/heimdall/DEPENDS
@@ -0,0 +1 @@
+depends libusbx
diff --git a/devel/heimdall/DETAILS b/devel/heimdall/DETAILS
new file mode 100755
index 0000000..101ca74
--- /dev/null
+++ b/devel/heimdall/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=heimdall
+ VERSION=1.3.1
+ SOURCE="$SPELL.tar.bz2"
+ SOURCE_URL[0]=git://github.com/Benjamin-Dobell/Heimdall.git:$SPELL
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+ WEB_SITE="http://www.glassechidna.com.au/products/heimdall/";
+ LICENSE[0]="MIT"
+ ENTERED=20130107
+ KEYWORDS=""
+ SHORT="Tool to flash Samsung Galaxy S devices"
+cat << EOF
+Heimdall is a tool suite used to flash firmware (aka ROMs) onto Samsung
+Galaxy S devices.
+
+It uses the same protocol as Odin to interact with a device in download mode.
+EOF
diff --git a/devel/heimdall/HISTORY b/devel/heimdall/HISTORY
new file mode 100644
index 0000000..f6a85a8
--- /dev/null
+++ b/devel/heimdall/HISTORY
@@ -0,0 +1,3 @@
+2013-01-07 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
+
diff --git a/devel/heimdall/INSTALL b/devel/heimdall/INSTALL
new file mode 100755
index 0000000..a6d41a3
--- /dev/null
+++ b/devel/heimdall/INSTALL
@@ -0,0 +1 @@
+make -C heimdall install
diff --git a/devel/oprofileui/DEPENDS b/devel/oprofileui/DEPENDS
index f2e9503..119987e 100755
--- a/devel/oprofileui/DEPENDS
+++ b/devel/oprofileui/DEPENDS
@@ -8,6 +8,7 @@ depends gnome-vfs2 &&
depends gtk+2 &&
depends libpng &&
depends libxml2 &&
+depends xml-parser &&
depends oprofile &&
depends pango &&
optional_depends avahi "--with-avahi" "--without-avahi" "use Avahi to
announce and search for OProfile servers"
diff --git a/devel/oprofileui/HISTORY b/devel/oprofileui/HISTORY
index eaf1a6a..2319cce 100644
--- a/devel/oprofileui/HISTORY
+++ b/devel/oprofileui/HISTORY
@@ -1,3 +1,6 @@
+2012-08-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: depends on xml-parser
+
2010-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/devel/scala/DETAILS b/devel/scala/DETAILS
index 52a09ee..a7b2e47 100755
--- a/devel/scala/DETAILS
+++ b/devel/scala/DETAILS
@@ -1,8 +1,8 @@
SPELL=scala
- VERSION=2.9.2
+ VERSION=2.10.0
SOURCE="${SPELL}-sources-${VERSION}.tgz"

SOURCE_URL[0]=http://www.${SPELL}-lang.org/downloads/distrib/files/${SOURCE}
-
SOURCE_HASH=sha512:c8ce17728976c506c90d2eec792904d39a16d35d153914a7c936e43e530f20d8cdf494287187c513393e2db7837b8ec9d417c56f6bb47be3b0501f2a57f52b63
+
SOURCE_HASH=sha512:2f464800347d644ba589462c074f5ebbd9e72729af8a4d2549aff923b22a5d35081d1be09b258c056c076f57d053dedc0d6d8fd80901348a207d31bd50aac039
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-sources"
WEB_SITE="http://www.scala-lang.org";
LICENSE[0]=BSD
diff --git a/devel/scala/HISTORY b/devel/scala/HISTORY
index 89a564a..1b00fe6 100644
--- a/devel/scala/HISTORY
+++ b/devel/scala/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.10.0
+
2012-04-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.9.2

diff --git a/e-17/e17/BUILD b/e-17/e17/BUILD
index eadce86..2b18913 100755
--- a/e-17/e17/BUILD
+++ b/e-17/e17/BUILD
@@ -11,4 +11,3 @@ OPTS="$E17_RANDR $E17_ENOTIFY $E17_IBAR $E17_DROPSHADOW
$E17_CLOCK \
$OPTS" &&

default_build
-
diff --git a/e-17/e17/CONFIGURE b/e-17/e17/CONFIGURE
index b05451f..9b663c2 100755
--- a/e-17/e17/CONFIGURE
+++ b/e-17/e17/CONFIGURE
@@ -122,5 +122,5 @@ config_query_option E17_PATHS "Enable conf-paths module?"
y \
"--enable-conf-paths" "--disable-conf-paths" &&

config_query_option E17_INTERACTION "Enable conf-interaction module?" y
\
- "--enable-conf-interaction" "--disable-conf-interaction"

+ "--enable-conf-interaction" "--disable-conf-interaction"

diff --git a/e-17/e17/DEPENDS b/e-17/e17/DEPENDS
index 56153de..85b164b 100755
--- a/e-17/e17/DEPENDS
+++ b/e-17/e17/DEPENDS
@@ -1,8 +1,3 @@
-depends subversion &&
-depends efl &&
-depends edbus &&
-depends edje &&
-depends efreet &&
depends imlib2 &&
depends libxcursor &&
depends libxdamage &&
@@ -10,6 +5,30 @@ depends libxinerama &&
depends libxrandr &&
depends xorg-libs &&

+if [[ "x${E17_BRANCH}" == "xscm" ]]; then
+ depends edbus &&
+ depends efl &&
+ depends subversion
+else
+ depends e_dbus &&
+ depends -sub 'EVAS' ecore &&
+ depends edje &&
+ depends efreet &&
+ depends eina &&
+ depends eio &&
+ depends evas &&
+ depends xcb-util-keysyms &&
+
+ optional_depends eeze \
+ "--enable-mount-eeze" "--disable-mount-eeze" \
+ "Enable eeze mounting support?"
+fi &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)' &&
+
optional_depends linux-pam \
"--enable-pam" "--disable-pam" \
"Enable PAM support?" &&
@@ -27,30 +46,29 @@ optional_depends udisks
\
"--enable-mount-udisks" "--disable-mount-udisks" \
"Enable udisks mounting support?" &&

-optional_depends eeze \
- "--enable-mount-eeze" "--disable-mount-eeze" \
- "Enable eeze mounting support?" &&
-
optional_depends alsa-lib
\
'--enable-mixer' '--disable-mixer'
\
'for Advanced Linux Sound Architecture sound driver
support' &&

-optional_depends exchange \
- "--enable-exchange" "--disable-exchange" \
- "Enable Exchange support?" &&
-
-optional_depends bluez \
- "--enable-bluez" "--disable-bluez" \
- "Enable bluez bluetooth module support?" &&
-
optional_depends connman
\
"--enable-connman" "--disable-connman"
\
- 'for conneman network configuration daemon support
(connamn module)' &&
+ 'for conneman network configuration daemon support
(connamn module)' &&

optional_depends dejavu-ttf \
'' \
'' \
- 'for the Enlightenment default font'
+ 'for the Enlightenment default font' &&
+
+optional_depends emotion \
+ '--enable-emotion' \
+ '--disable-emotion' \
+ 'enable Enlightenment video/codec API' &&
+
+optional_depends elementary \
+ '--enable-elementary' \
+ '--disable-elementary' \
+ 'for Enlightenment widget toolkit (recommended)'
+

# Comment these out till figure out how to get them to work
#optional_depends e17-theme-b_and_w \
@@ -61,4 +79,4 @@ optional_depends dejavu-ttf \
#optional_depends e17-theme-blingbling \
# '' \
# '' \
-# 'for the bling theme'
+# 'for the bling theme'
diff --git a/e-17/e17/DETAILS b/e-17/e17/DETAILS
index 06ab780..3ced946 100755
--- a/e-17/e17/DETAILS
+++ b/e-17/e17/DETAILS
@@ -1,16 +1,24 @@
SPELL=e17
-if [[ "$E17_AUTOUPDATE" == "y" ]]; then
+if [[ "$E17_BRANCH" == "scm" ]]; then
+ if [[ "$E17_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
-fi
+ fi
SOURCE=enlightenment-0.17-svn.tar.bz2
+ PATCHLEVEL=6
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/enlightenment-0.17-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/e:e
SOURCE_IGNORE=volatile
+else
+ VERSION=0.17.0
+ SOURCE=enlightenment-${VERSION}.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE_URL=http://download.enlightenment.org/releases/${SOURCE}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/enlightenment-${VERSION}
+fi
LICENSE[0]=BSD
- PATCHLEVEL=6
WEB_SITE=http://www.enlightenment.org/
KEYWORDS="e17 enlightenment wm windowmanager"
ENTERED=20010922
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index aef5f9c..d635913 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,15 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on ecore built with evas support
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Add stable 0.17.0 branch
+ * DEPENDS: SCM depends on efl, subversion, and edbus; stable does not
+ exchange and bluez are no longer options
+ Stable depends on e_dbus ecore edje efreet eina eio evas
xcb-util-keysyms
+ Stable optionally depends on eeze
+ Optionally depends on gettext, elementary, and emotion
+ * INSTALL: Only install e17update for SCM version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed e_dbus to edbus

@@ -19,7 +31,7 @@
* PRE_BUILD: we need .svn directory #15777

2010-02-26 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
- * DEPENDS : adding optional dep on connman
+ * DEPENDS : adding optional dep on connman

2009-11-03 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS,PRE_BUILD: removed old deps on CVS and automake-1.9
diff --git a/e-17/e17/INSTALL b/e-17/e17/INSTALL
index 351e37e..f63c6b0 100755
--- a/e-17/e17/INSTALL
+++ b/e-17/e17/INSTALL
@@ -2,5 +2,7 @@ default_install &&

install_wmfiles &&

-install -m 755 $SCRIPT_DIRECTORY/e17update \
- $INSTALL_ROOT/usr/sbin
+if [[ "x${E17_BRANCH}" == "xscm" ]]; then
+ install -m 755 $SCRIPT_DIRECTORY/e17update \
+ $INSTALL_ROOT/usr/sbin
+fi
diff --git a/e-17/e17/PREPARE b/e-17/e17/PREPARE
index f8b7d7e..8655f6f 100755
--- a/e-17/e17/PREPARE
+++ b/e-17/e17/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
+prepare_select_branch 0.17 scm
diff --git a/e-17/e17/PRE_BUILD b/e-17/e17/PRE_BUILD
index 8acd7ec..bb2afa4 100755
--- a/e-17/e17/PRE_BUILD
+++ b/e-17/e17/PRE_BUILD
@@ -1,10 +1,13 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-#
-# Remove .svn directories, otherwise they get installed
-#
-# #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true &&

-#sedit "s/; aclocal/; aclocal-1.9/" autogen.sh &&
-#sedit "s/; automake/; automake-1.9/" autogen.sh &&
-NOCONFIGURE=ON ./autogen.sh
+if [[ "x${E17_BRANCH}" == "xscm" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ #
+ # Remove .svn directories, otherwise they get installed
+ #
+ # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
+
+ #sedit "s/; aclocal/; aclocal-1.9/" autogen.sh &&
+ #sedit "s/; automake/; automake-1.9/" autogen.sh &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/e17/enlightenment-0.17.0.tar.bz2.sig
b/e-17/e17/enlightenment-0.17.0.tar.bz2.sig
new file mode 100644
index 0000000..f53fe2a
Binary files /dev/null and b/e-17/e17/enlightenment-0.17.0.tar.bz2.sig differ
diff --git a/e-17/e_dbus/CONFIGURE b/e-17/e_dbus/CONFIGURE
index c3f11f7..9ab88b2 100755
--- a/e-17/e_dbus/CONFIGURE
+++ b/e-17/e_dbus/CONFIGURE
@@ -11,10 +11,10 @@ config_query_option EDBUS_EBLUEZ "Enable bluetooth
support?" n \
"--enable-ebluez" "--disable-ebluez" &&

config_query_option EDBUS_ECONNMAN "Enable connman support?" n \
- "--enable-econnman" "--disable-econnman" &&
+ "--enable-econnman0_7x" "--disable-econnman0_7x" &&

config_query_option EDBUS_EOFONO "Enable ofono support?" n \
- "--enable-eofono" "--disable-ofono"
+ "--enable-eofono" "--disable-eofono"

# --disable-edbus-bluez-test
# disable building of edbus_bluez_test
diff --git a/e-17/e_dbus/DEPENDS b/e-17/e_dbus/DEPENDS
index ab2e645..a730133 100755
--- a/e-17/e_dbus/DEPENDS
+++ b/e-17/e_dbus/DEPENDS
@@ -1,3 +1,6 @@
depends dbus &&
-depends efl &&
-depends ecore
+depends ecore &&
+
+if [ "$E_DBUS_CVS" == "y" ]; then
+ depends efl
+fi
diff --git a/e-17/e_dbus/DETAILS b/e-17/e_dbus/DETAILS
index 7c42902..5f4987d 100755
--- a/e-17/e_dbus/DETAILS
+++ b/e-17/e_dbus/DETAILS
@@ -12,8 +12,8 @@ if [ "$E_DBUS_CVS" == "y" ]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
PATCHLEVEL=2
else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
diff --git a/e-17/e_dbus/HISTORY b/e-17/e_dbus/HISTORY
index f85bb53..6330f69 100644
--- a/e-17/e_dbus/HISTORY
+++ b/e-17/e_dbus/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable branch to 1.7.4
+ Stable branch does not use efl, only SCM branch
+ * CONFIGURE: --disable-ofono -> --disable-eofono
+ *-connman -> *-connman0_7x
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

@@ -22,7 +31,7 @@
* PREPARE: adding cvs compile question
* PRE_BUILD: adding CVS build check

-*2010-07-26 Ladislav Hagara <hgr AT vabo.cz>
+2010-07-26 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD: we need .svn directory #15777

2008-10-14 Eric Sandall <sandalle AT sourcemage.org>
diff --git a/e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig
b/e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig
deleted file mode 100644
index 1841e59..0000000
Binary files a/e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig
b/e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..0609a82
Binary files /dev/null and b/e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig differ
diff --git a/e-17/ecore/CONFIGURE b/e-17/ecore/CONFIGURE
index 6f2791b..79de94c 100755
--- a/e-17/ecore/CONFIGURE
+++ b/e-17/ecore/CONFIGURE
@@ -1,15 +1,15 @@
-config_query_option ECORE_PTHREADS "Enable POSIX thread code?" y
\
- "--enable-posix-threads" "--disable-posix-threads"
&&
+config_query_option ECORE_PTHREADS "Enable POSIX thread code?" y \
+ "--enable-posix-threads" "--disable-posix-threads" &&

-config_query_option ECORE_THREAD_SAFETY "Enable thread safety?" n
\
- "--enable-thread-safety" "--disable-thread-safety"
&&
+config_query_option ECORE_THREAD_SAFETY "Enable thread safety?" n \
+ "--enable-thread-safety" "--disable-thread-safety" &&

config_query_option ECORE_FB "Build Ecore_fb module for linux framebuffer?"
n \
- "--enable-ecore-fb --enable-ecore-evas-fb"
\
- "--disable-ecore-fb --disable-ecore-evas-fb"
&&
+ "--enable-ecore-fb --enable-ecore-evas-fb" \
+ "--disable-ecore-fb --disable-ecore-evas-fb" &&

-config_query_option ECORE_IPV6 "Enable IPv6 functionality?" n
\
- "--enable-ipv6" "--disable-ipv6"
&&
+config_query_option ECORE_IPV6 "Enable IPv6 functionality?" n \
+ "--enable-ipv6" "--disable-ipv6" &&

-config_query_list ECORE_CRYPTO "Use which cryptographic library?"
\
- gnutls openssl none

+config_query_list ECORE_CRYPTO "Use which cryptographic library?" \
+ gnutls openssl none
diff --git a/e-17/ecore/CONFLICTS b/e-17/ecore/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/ecore/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS
index e29fb94..638a0e1 100755
--- a/e-17/ecore/DEPENDS
+++ b/e-17/ecore/DEPENDS
@@ -1,68 +1,95 @@
depends curl '--enable-curl' &&
depends dbus &&
-depends efl &&
+depends eina &&

-if [ "$ECORE_BRANCH" = "scm" ]; then
- depends subversion &&
- depends libtool &&
- depends automake &&
- depends subversion
-fi &&
+optional_depends evas \
+ '--enable-ecore-evas --enable-ecore-evas-software-buffer
--enable-ecore-evas-software-x11 --enable-ecore-evas-software-16-x11
--enable-ecore-evas-software-8-x11' \
+ '--disable-ecore-evas' \
+ 'for ecore_evas hardware acceleartion module' &&

optional_depends glib2 \
- "" "--disable-glib" \
+ "--enable-glib" \
+ "--disable-glib" \
"Enable glib support?"
&&

-optional_depends xorg-libs \
- "--enable-ecore-x" "--disable-ecore-x" \
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)'
&&
+
+optional_depends libx11 \
+ "--with-x --enable-ecore-x" \
+ "--without-x --disable-ecore-x" \
"for X11 ecore_x module"
&&

+optional_depends libxcomposite \
+ "--enable-ecore-x-composite" \
+ "--disable-ecore-x-composite" \
+ "Enable ecore_x support for Xcomposite extension?"
&&
+
optional_depends libxcursor \
- "" "--disable-ecore-x-cursor" \
+ "--enable-ecore-x-cursor" \
+ "--disable-ecore-x-cursor" \
"Enable ecore_x support for Xcursor extension?"
&&

optional_depends libxdamage \
- "" "--disable-ecore-x-damage" \
+ "--enable-ecore-x-damage" \
+ "--disable-ecore-x-damage" \
"Enable ecore_x support for Xdamage extension?"
&&

optional_depends libxrender \
- "" "--disable-ecore-x-render" \
+ "--enable-ecore-x-render" \
+ "--disable-ecore-x-render" \
"Enable ecore_x support for Xrender extension?"
&&

optional_depends libxrandr \
- "" "--disable-ecore-x-randr" \
+ "--enable-ecore-x-randr" \
+ "--disable-ecore-x-randr" \
"Enable ecore_x support for Xrandr extension?"
&&

optional_depends libxscrnsaver \
- "" "--disable-ecore-x-screensaver" \
+ "--enable-ecore-x-screensaver" \
+ "--disable-ecore-x-screensaver" \
"Enable ecore_x support for Xscreensaver?"
&&

optional_depends libxfixes \
- "" "--disable-ecore-x-xfixes" \
+ "--enable-ecore-x-xfixes" \
+ "--disable-ecore-x-xfixes" \
"Enable ecore_x support for Xfixes extension?"
&&

optional_depends libxinerama \
- "" "--disable-ecore-x-xinerama" \
+ "--enable-ecore-x-xinerama" \
+ "--disable-ecore-x-xinerama" \
"Enable ecore_x support for Xinerama extension?"
&&

+optional_depends libxp \
+ "--enable-ecore-x-xprint" \
+ "--disable-ecore-x-xprint" \
+ "Enable ecore_x support for Xprint extension?"
&&
+
optional_depends libxtst \
- "" "--disable-ecore-x-xtest" \
+ "--enable-ecore-x-xtest" \
+ "--disable-ecore-x-xtest" \
"Enable ecore_x support for Xtest extension?"
&&

optional_depends libxi \
- "" "--disable-ecore-x-input" \
+ "--enable-ecore-x-input" \
+ "--disable-ecore-x-input" \
"Enable ecore_x support for Xinput/Xinput2 extension?"
&&

optional_depends libxdmcp \
- "" "--disable-ecore-x-dpms" \
+ "--enable-ecore-x-dpms" \
+ "--disable-ecore-x-dpms" \
"Enable ecore_x support for Xdpms extension?"
&&

optional_depends libdrm \
- "" "--disable-ecore-x-dri" \
+ "--enable-ecore-x-dri" \
+ "--disable-ecore-x-dri" \
"Enable ecore_x support for DRI extension?"
&&

optional_depends libxcb \
- "--enable-ecore-x-xcb" "" \
+ "--enable-ecore-x-xcb" \
+ "--disable-ecore-x-xcb" \
"Enable ecore_x module with XCB backend?"
&&

optional_depends directfb \
@@ -76,11 +103,12 @@ optional_depends OPENGL
\
"Enable OpenGL Xlib support in ecore_evas?"
&&

optional_depends sdl \
- "--enable-ecore-sdl" "--disable-ecore-sdl" \
+ "--enable-ecore-sdl" \
+ "--disable-ecore-sdl" \
"Enable SDL ecore_sdl module?"
&&

if [ "$ECORE_CRYPTO" == "gnutls" ]; then
depends gnutls "--enable-gnutls --disable-openssl"
elif [ "$ECORE_CRYPTO" == "openssl" ]; then
depends openssl "--enable-openssl --disable-gnutls"
-fi
+fi
diff --git a/e-17/ecore/DETAILS b/e-17/ecore/DETAILS
index e999a90..5921668 100755
--- a/e-17/ecore/DETAILS
+++ b/e-17/ecore/DETAILS
@@ -1,24 +1,10 @@
SPELL=ecore
-if [ "$ECORE_BRANCH" == "scm" ]; then
- if [ "$ECORE_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:e4739f43abbbce8e78ad739fab9cedb1a6bcf1684958a17b5490f3b7fe00ae90177d26365d43d10708d3a31bfb255991f7be72442f8101840f8cbac8de842cb5
-fi
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Ecore/
ENTERED=20011101
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index b6f3f7e..be47689 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,21 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+ * DEPENDS, SUB_DEPENDS: Add all evas flags for evas optional
dependency
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing using evas
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn support, included in efl package
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Stable version does not depend on efl (conflicts!)
+ Optionally depends on libxcomposite and libxp
+ Add '--enable*' options for other optional dependencies
+ Replace 'xorg-libs' optional dependency with libx11
+ Optionally depends on evas (auto-detect what evas supports)
+ Depends on eina
+ * CONFLICTS: Conflicts with efl
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/ecore/PREPARE b/e-17/ecore/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/ecore/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/ecore/PRE_BUILD b/e-17/ecore/PRE_BUILD
deleted file mode 100755
index 8e591a1..0000000
--- a/e-17/ecore/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-
-if [ "$ECORE_BRANCH" == "scm" ]; then
- cd $SOURCE_DIRECTORY &&
-
- #
- # Remove .svn directories, otherwise they get installed
- # Don't do it #15777
- # find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true &&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/ecore/PRE_SUB_DEPENDS b/e-17/ecore/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..564aa3f
--- /dev/null
+++ b/e-17/ecore/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ EVAS) is_depends_enabled $SPELL evas && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS
b/e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..564aa3f
--- /dev/null
+++ b/e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ EVAS) is_depends_enabled $SPELL evas && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/e-17/ecore/SUB_DEPENDS b/e-17/ecore/SUB_DEPENDS
new file mode 100755
index 0000000..b2c7520
--- /dev/null
+++ b/e-17/ecore/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ EVAS) echo "evas support requested, forcing evas dependency." &&
+ depends evas '--enable-ecore-evas
--enable-ecore-evas-software-buffer --enable-ecore-evas-software-x11
--enable-ecore-evas-software-16-x11 --enable-ecore-evas-software-8-x11'
+ ;;
+ *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac
diff --git a/e-17/ecore/ecore-1.0.1.tar.gz.sig
b/e-17/ecore/ecore-1.0.1.tar.gz.sig
deleted file mode 100644
index fe283c5..0000000
Binary files a/e-17/ecore/ecore-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/ecore/ecore-1.7.5.tar.bz2.sig
b/e-17/ecore/ecore-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..7f0122f
Binary files /dev/null and b/e-17/ecore/ecore-1.7.5.tar.bz2.sig differ
diff --git a/e-17/edje/CONFLICTS b/e-17/edje/CONFLICTS
new file mode 100755
index 0000000..cb61eb5
--- /dev/null
+++ b/e-17/edje/CONFLICTS
@@ -0,0 +1,4 @@
+if [[ "x${EDJE_BRANCH}" != "xscm" ]]
+then
+ conflicts efl
+fi
diff --git a/e-17/edje/DEPENDS b/e-17/edje/DEPENDS
index 0749c5c..46c107c 100755
--- a/e-17/edje/DEPENDS
+++ b/e-17/edje/DEPENDS
@@ -1,10 +1,29 @@
-depends efl &&
-depends ecore &&
-depends lua51 &&
+depends lua51 &&

if [[ "$EDJE_BRANCH" == "scm" ]]; then
+ depends efl &&
depends subversion
-fi
+else
+ depends -sub 'EVAS' ecore &&
+ depends eet &&
+ depends eina &&
+ depends embryo
+fi &&
+
+optional_depends alsa-lib \
+ '--enable-alsa' \
+ '--disable-alsa' \
+ 'for ALSA sound support' &&
+
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&
+
+optional_depends LIBAVCODEC \
+ '--enable-flac' \
+ '--disable-flac' \
+ 'for FLAC audio codec support' &&

optional_depends libsndfile \
"--enable-sndfile" "--disable-sndfile" \
diff --git a/e-17/edje/DETAILS b/e-17/edje/DETAILS
index 9ba123a..315a4d6 100755
--- a/e-17/edje/DETAILS
+++ b/e-17/edje/DETAILS
@@ -12,8 +12,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_IGNORE=volatile
PATCHLEVEL=1
else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
diff --git a/e-17/edje/HISTORY b/e-17/edje/HISTORY
index a67f5b4..3d48b2e 100644
--- a/e-17/edje/HISTORY
+++ b/e-17/edje/HISTORY
@@ -1,3 +1,18 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on ecore built with evas support (ecore-evas)
+ Depends on eet and eina
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: SCM branch only depends on efl package
+ SCM branch conflicts with ecore (provided by required efl)
+ Stable depends on ecore embryo
+ Optionally depends on doxygen, LIBAVCODEC, and alsa-lib
+ * CONFLICTS: Stable branch only conflicts with efl package
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/edje/edje-1.0.1.tar.gz.sig b/e-17/edje/edje-1.0.1.tar.gz.sig
deleted file mode 100644
index cf5bdac..0000000
Binary files a/e-17/edje/edje-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/edje/edje-1.7.5.tar.bz2.sig
b/e-17/edje/edje-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..19f3003
Binary files /dev/null and b/e-17/edje/edje-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eet/CONFLICTS b/e-17/eet/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/eet/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eet/DEPENDS b/e-17/eet/DEPENDS
index 525f615..c5afa2c 100755
--- a/e-17/eet/DEPENDS
+++ b/e-17/eet/DEPENDS
@@ -3,10 +3,6 @@ depends JPEG &&
depends zlib &&
depends libgcrypt &&

-if [[ $EET_BRANCH == scm ]]; then
- depends subversion
-fi &&
-
if [ "$EET_CRYPTO" == "gnutls" ]; then
depends gnutls "--enable-gnutls --disable-openssl --enable-cipher
--enable-signature"
elif [ "$EET_CRYPTO" == "openssl" ]; then
diff --git a/e-17/eet/DETAILS b/e-17/eet/DETAILS
index 6d6fa3b..3393a14 100755
--- a/e-17/eet/DETAILS
+++ b/e-17/eet/DETAILS
@@ -1,24 +1,10 @@
SPELL=eet
-if [[ $EET_BRANCH == scm ]]; then
- if [[ $EET_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.4.1
+ VERSION=1.7.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:fd2143755ab1649928bda92b707ad2ecb87d0a15a942d21dcfb83fa59eb1040943db1bf72c829f1149ba11ec9601543528019928aef7a46271a021c321917e4f
-fi
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Eet/
ENTERED=20040311
diff --git a/e-17/eet/HISTORY b/e-17/eet/HISTORY
index 2f51014..44ae094 100644
--- a/e-17/eet/HISTORY
+++ b/e-17/eet/HISTORY
@@ -1,3 +1,11 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn option, included in efl package
+ * DETAILS: Updated stable to 1.7.4
+ * CONFLICTS: Conflicts with efl
+
2011-11-12 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: added to ask which crypto library to use
* DEPENDS: added depends and modifed crypto depends
diff --git a/e-17/eet/PREPARE b/e-17/eet/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/eet/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/eet/PRE_BUILD b/e-17/eet/PRE_BUILD
deleted file mode 100755
index 747d7f9..0000000
--- a/e-17/eet/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-
-if [[ $EET_BRANCH == scm ]]; then
- cd $SOURCE_DIRECTORY &&
-
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/eet/eet-1.4.1.tar.bz2.sig b/e-17/eet/eet-1.4.1.tar.bz2.sig
deleted file mode 100644
index 4a2d384..0000000
Binary files a/e-17/eet/eet-1.4.1.tar.bz2.sig and /dev/null differ
diff --git a/e-17/eet/eet-1.7.5.tar.bz2.sig b/e-17/eet/eet-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..f4fe30c
Binary files /dev/null and b/e-17/eet/eet-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eeze/DEPENDS b/e-17/eeze/DEPENDS
index 701f878..0b3c470 100755
--- a/e-17/eeze/DEPENDS
+++ b/e-17/eeze/DEPENDS
@@ -1,10 +1,10 @@
depends util-linux &&
-depends efl &&
depends ecore &&
+depends eet &&
depends udev &&

-if [ "$EEZE_CVS" = "y" ]; then
- depends subversion &&
- depends libtool &&
- depends automake
-fi
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation'
+
diff --git a/e-17/eeze/DETAILS b/e-17/eeze/DETAILS
index eae4d0e..ed58166 100755
--- a/e-17/eeze/DETAILS
+++ b/e-17/eeze/DETAILS
@@ -1,23 +1,10 @@
SPELL=eeze
-if [ "$EEZE_CVS" == "y" ]; then
- if [ "$EEZE_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- 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
- FORCE_DOWNLOAD="on"
- SOURCE_IGNORE=volatile
-else
- VERSION=1.0.2
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:629da8b5506581940b74ec638c3bf49514e626719b9a12dbd08dc098ac50fd3f1ff3fb893495dbbb5574290a75956448d889136b9bb766f6ddd719451f6f6f63
-fi
WEB_SITE=http://enlightenment.org/
ENTERED=20100520
LICENSE[0]=BSD
diff --git a/e-17/eeze/HISTORY b/e-17/eeze/HISTORY
index 8d5b346..4561c50 100644
--- a/e-17/eeze/HISTORY
+++ b/e-17/eeze/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Stable version updated to 1.7.4
+ * DEPENDS: Depends on eet
+ Optionally depends on doxygen
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/eeze/PREPARE b/e-17/eeze/PREPARE
deleted file mode 100755
index fec02a6..0000000
--- a/e-17/eeze/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query EEZE_CVS "Build SCM (subversion) version?" y &&
-
-if [ "$EEZE_CVS" == "y" ]; then
- config_query EEZE_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
diff --git a/e-17/eeze/PRE_BUILD b/e-17/eeze/PRE_BUILD
deleted file mode 100755
index bf9a048..0000000
--- a/e-17/eeze/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-if [ "$EEZE_CVS" == "y" ]; then
- cd $SOURCE_DIRECTORY &&
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/eeze/eeze-1.0.2.tar.gz.sig b/e-17/eeze/eeze-1.0.2.tar.gz.sig
deleted file mode 100644
index 579f18a..0000000
Binary files a/e-17/eeze/eeze-1.0.2.tar.gz.sig and /dev/null differ
diff --git a/e-17/eeze/eeze-1.7.5.tar.bz2.sig
b/e-17/eeze/eeze-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..d4c3e7b
Binary files /dev/null and b/e-17/eeze/eeze-1.7.5.tar.bz2.sig differ
diff --git a/e-17/efl/CONFLICTS b/e-17/efl/CONFLICTS
index 06ce2ec..ce2ae3b 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -1,9 +1,12 @@
-conflicts eina &&
-conflicts eet &&
-conflicts embryo &&
-conflicts evas &&
conflicts ecore &&
-conflicts eio &&
-conflicts efreet &&
conflicts edbus &&
-conflicts eobj
+conflicts edje &&
+conflicts eet &&
+conflicts efreet &&
+conflicts eina &&
+conflicts eio &&
+conflicts embryo &&
+conflicts emotion &&
+conflicts eobj &&
+conflicts ethumb &&
+conflicts evas
diff --git a/e-17/efl/DEPENDS b/e-17/efl/DEPENDS
index 859d9d4..1cbd499 100755
--- a/e-17/efl/DEPENDS
+++ b/e-17/efl/DEPENDS
@@ -1,10 +1,72 @@
depends fribidi &&
depends libxp &&
depends subversion &&
+depends valgrind &&

optional_depends check "" "" "Use check?" &&

optional_depends doxygen \
"--enable-doc" \
"--disable-doc" \
- "Build documentation?"
+ "Build documentation?" &&
+
+optional_depends bullet \
+ '--enable-physics' \
+ '--disable-physics' \
+ 'for physics effects and support (recommended)' \
+ 'games' &&
+
+optional_depends curl \
+ '--enable-curl' \
+ '--disable-curl' \
+ 'for curl download support (recommended)' &&
+
+optional_depends fontconfig \
+ '--enable-fontconfig' \
+ '--disable-fontconfig' \
+ 'use fontconfig for finding fonts (recommended)?' &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)' &&
+
+optional_depends giflib \
+ '--enable-image-loader-gif' \
+ '--disable-image-loader-gif' \
+ 'for GIF image loader (recommended)' &&
+
+optional_depends libwebp \
+ '--enable-image-loader-webp' \
+ '--disable-image-loader-webp' \
+ 'for WebP image loader' &&
+
+optional_depends pixman \
+ '--enable-pixman --enable-pixman-font --enable-pixman-rect
--enable-pixman-line --enable-pixman-poly --enable-pixman-image
--enable-pixman-image-scale-sample' \
+ '--disable-pixman' \
+ 'use pixman for software rendering (not recommended)?' &&
+
+optional_depends pulseaudio \
+ '--enable-pulseaudio' \
+ '--disable-pulseaudio' \
+ 'for PulseAudio sound support' &&
+
+optional_depends sdl \
+ '--enable-sdl' \
+ '--disable-sdl' \
+ 'for SDL rendering' &&
+
+optional_depends tiff \
+ '--enable-image-loader-tiff' \
+ '--disable-image-loader-tiff' \
+ 'for TIFF image loader' &&
+
+optional_depends tslib \
+ '--enable-tslib' \
+ '--disable-tslib' \
+ 'for touchscreen events' &&
+
+optional_depends util-linux \
+ '--enable-mount' \
+ '--disable-mount' \
+ 'for mount (libmount) support (recommended)'
diff --git a/e-17/efl/HISTORY b/e-17/efl/HISTORY
index 9807fe8..0a4b704 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,15 @@
+2013-01-12 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: edje, emotion and ethumb added
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on valgrind
+ Optionally depends on bullet (in games)
+ Optionally depends on fontconfig, sdl, pixman, curl tslib,
+ pulseaudio, and util-linux
+ Optionally depend on giflib and tiff for image loaders.
+ Optionally depends on libwebp.
+ * INSTALL: Fails with multiple make jobs, use make_single
+
2013-01-01 Ladislav Hagara <hgr AT vabo.cz>
* CONFLICTS: efreet and edbus added

@@ -13,3 +25,4 @@

2012-11-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD, CONFLICTS: spell created
+
diff --git a/e-17/efl/INSTALL b/e-17/efl/INSTALL
new file mode 100755
index 0000000..9d88c56
--- /dev/null
+++ b/e-17/efl/INSTALL
@@ -0,0 +1,2 @@
+make_single &&
+default_install
diff --git a/e-17/efreet/DEPENDS b/e-17/efreet/DEPENDS
index 8092e87..6db4f8c 100755
--- a/e-17/efreet/DEPENDS
+++ b/e-17/efreet/DEPENDS
@@ -1,4 +1,13 @@
-depends subversion &&
-depends efl &&
-depends ecore &&
-depends edbus
+depends ecore &&
+depends eet &&
+depends eina &&
+
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)'
diff --git a/e-17/efreet/DETAILS b/e-17/efreet/DETAILS
index 41f0478..889872f 100755
--- a/e-17/efreet/DETAILS
+++ b/e-17/efreet/DETAILS
@@ -1,26 +1,10 @@
SPELL=efreet
-if [ "$EFREET_CVS" == "y" ]; then
- if [ "$EFREET_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- 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
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-
-else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:d29d24d10648bd01caa5a61a8401e1875b958eb2bbb0d7f116d2dd0938a9a418d3a715d0985bd73f0de8b88152405c9e7a186abc4510f3fa17e2c4fedaf06190
-fi
WEB_SITE=http://enlightenment.org/
ENTERED=20070205
LICENSE[0]=BSD
diff --git a/e-17/efreet/HISTORY b/e-17/efreet/HISTORY
index dc481a3..e31d30a 100644
--- a/e-17/efreet/HISTORY
+++ b/e-17/efreet/HISTORY
@@ -1,3 +1,13 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Stable version updated to 1.7.4
+ * DEPENDS: Removed efl dependency (not for stable)
+ Does not depend on edbus nor e_dbus
+ Depends on eet and eina
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/efreet/PREPARE b/e-17/efreet/PREPARE
deleted file mode 100755
index 2bc8a1f..0000000
--- a/e-17/efreet/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query EFREET_CVS "Build SCM (subversion) version?" y &&
-
-if [ "$EFREET_CVS" == "y" ]; then
- config_query EFREET_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
diff --git a/e-17/efreet/PRE_BUILD b/e-17/efreet/PRE_BUILD
deleted file mode 100755
index c5c37af..0000000
--- a/e-17/efreet/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-if [ "$EFREET_CVS" == "y" ]; then
- cd $SOURCE_DIRECTORY &&
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/efreet/efreet-1.0.1.tar.gz.sig
b/e-17/efreet/efreet-1.0.1.tar.gz.sig
deleted file mode 100644
index 74fd2ac..0000000
Binary files a/e-17/efreet/efreet-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/efreet/efreet-1.7.5.tar.bz2.sig
b/e-17/efreet/efreet-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..b2eaf12
Binary files /dev/null and b/e-17/efreet/efreet-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eina/BUILD b/e-17/eina/BUILD
index 8825e1d..68260c4 100755
--- a/e-17/eina/BUILD
+++ b/e-17/eina/BUILD
@@ -1,6 +1,4 @@
-OPTS="$EINA_PTHREAD \
- $EINA_TESTS \
- $EINA_COVERAGE \
+OPTS="$EINA_TESTS \
$EINA_BENCHMARK \
$EINA_E17 \
$OPTS" &&
diff --git a/e-17/eina/CONFIGURE b/e-17/eina/CONFIGURE
index 75d4808..c4dd387 100755
--- a/e-17/eina/CONFIGURE
+++ b/e-17/eina/CONFIGURE
@@ -1,12 +1,9 @@
-config_query_option EINA_PTHREAD "Enable POSIX threads?" y \
- '--enable-posix-threads' '--disable-posix-threads' &&
+persistent_remove EINA_PTHREAD &&
+persistent_remove EINA_COVERAGE &&

config_query_option EINA_TESTS "Enable tests?" n \
'--enable-tests' '--disable-tests' &&

-config_query_option EINA_COVERAGE "Enable coverage profiling
instrumentation?" n \
- '--enable-coverage' '--disable-coverage' &&
-
config_query_option EINA_BENCHMARK "Enable benchmarks?" n \
'--enable-benchmark' '--disable-benchmark' &&

diff --git a/e-17/eina/CONFLICTS b/e-17/eina/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/eina/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eina/DETAILS b/e-17/eina/DETAILS
index 9072163..1d0f4d4 100755
--- a/e-17/eina/DETAILS
+++ b/e-17/eina/DETAILS
@@ -1,24 +1,10 @@
SPELL=eina
-if [[ $EINA_BRANCH == scm ]]; then
- if [[ $EINA_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:eaf690cc11a38b19b4ee04475907143c5ac8d9c1c0ba34b8c20d3be535f67dc699edd99d36b4db8e2de5ac9acf6df1f7eace2b8925ce4367d3fecbecef319a53
-fi
LICENSE[0]=LGPL
WEB_SITE=http://trac.enlightenment.org/e/wiki/Eina
ENTERED=20081013
diff --git a/e-17/eina/HISTORY b/e-17/eina/HISTORY
index 41d52b7..d411d54 100644
--- a/e-17/eina/HISTORY
+++ b/e-17/eina/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable to 1.7.4
+ Remove SVN option, this code is now in the efl package
+ * CONFIGURE, BUILD: Remove posix and coverage
+ * CONFLICTS: Conflicts with efl
+
2011-11-12 Robin Cook <rcook AT wyrms.net>
* CONFIGURE: corrected pthreads switch
* DEPENDS: added optional depends psiconv, doxygen, and valgrind
diff --git a/e-17/eina/PREPARE b/e-17/eina/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/eina/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/eina/PRE_BUILD b/e-17/eina/PRE_BUILD
deleted file mode 100755
index fdff541..0000000
--- a/e-17/eina/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-
-if [[ $EINA_BRANCH == scm ]]; then
- cd $SOURCE_DIRECTORY &&
- #
- # Remove .svn directories, otherwise they get installed
- # Don't do it #15777
- # find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true &&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/eina/eina-1.0.1.tar.gz.sig b/e-17/eina/eina-1.0.1.tar.gz.sig
deleted file mode 100644
index d666ee2..0000000
Binary files a/e-17/eina/eina-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/eina/eina-1.7.5.tar.bz2.sig
b/e-17/eina/eina-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..a4a8ee8
Binary files /dev/null and b/e-17/eina/eina-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eio/CONFIGURE b/e-17/eio/CONFIGURE
index c7cdd11..f712171 100755
--- a/e-17/eio/CONFIGURE
+++ b/e-17/eio/CONFIGURE
@@ -2,4 +2,4 @@ config_query_option EIO_PTHREADS "Enable POSIX thread code?"
y \
"--enable-posix-threads" "--disable-posix-threads" &&

config_query_option EIO_INOTIFY "Enable inotify" y \
- "--enable-inotify" "--disable-inotify"
+ "--enable-inotify" "--disable-inotify"
diff --git a/e-17/eio/CONFLICTS b/e-17/eio/CONFLICTS
new file mode 100755
index 0000000..f1d168d
--- /dev/null
+++ b/e-17/eio/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eio/DEPENDS b/e-17/eio/DEPENDS
index 5c420d4..f525a45 100755
--- a/e-17/eio/DEPENDS
+++ b/e-17/eio/DEPENDS
@@ -1,2 +1,8 @@
-depends efl &&
-depends ecore
+depends ecore &&
+depends eet &&
+depends eina &&
+
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation'
diff --git a/e-17/eio/DETAILS b/e-17/eio/DETAILS
index 3fa6f20..a881dc5 100755
--- a/e-17/eio/DETAILS
+++ b/e-17/eio/DETAILS
@@ -1,14 +1,9 @@
SPELL=eio
-if [ "$EIO_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-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
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
WEB_SITE=http://www.enlightenment.org/
ENTERED=20100722
LICENSE[0]=LGPL
diff --git a/e-17/eio/HISTORY b/e-17/eio/HISTORY
index 25fb180..e0d056a 100644
--- a/e-17/eio/HISTORY
+++ b/e-17/eio/HISTORY
@@ -1,3 +1,13 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed SCM option, included in efl
+ * DETAILS: Updated stable to 1.7.4
+ * CONFLICTS, DEPENDS: Conflicts with efl
+ Optionally depends on doxygen
+ Depends on eet and eina
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/eio/PREPARE b/e-17/eio/PREPARE
deleted file mode 100755
index b1e4c65..0000000
--- a/e-17/eio/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query EIO_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
diff --git a/e-17/eio/PRE_BUILD b/e-17/eio/PRE_BUILD
deleted file mode 100755
index 1af1b77..0000000
--- a/e-17/eio/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-NOCONFIGURE=ON ./autogen.sh
diff --git a/e-17/eio/eio-1.7.5.tar.bz2.sig b/e-17/eio/eio-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..8e7adfb
Binary files /dev/null and b/e-17/eio/eio-1.7.5.tar.bz2.sig differ
diff --git a/e-17/elementary/DEPENDS b/e-17/elementary/DEPENDS
index 0f0adcb..b22e205 100755
--- a/e-17/elementary/DEPENDS
+++ b/e-17/elementary/DEPENDS
@@ -1,5 +1,9 @@
-depends subversion &&
-depends eio &&
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ depends subversion
+else
+ depends edje &&
+ depends eio
+fi &&

optional_depends fbset "" "--disable-ecore-fb" \
"Enable Linux Framebuffer support?" &&
diff --git a/e-17/elementary/DETAILS b/e-17/elementary/DETAILS
index f087865..908da8b 100755
--- a/e-17/elementary/DETAILS
+++ b/e-17/elementary/DETAILS
@@ -1,14 +1,22 @@
SPELL=elementary
-if [ "$ELEMENTARY_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ if [ "$ELEMENTARY_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ 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-svn
FORCE_DOWNLOAD="on"
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://trac.enlightenment.org/e/wiki/Elementary
ENTERED=20091022
LICENSE[0]=BSD
diff --git a/e-17/elementary/HISTORY b/e-17/elementary/HISTORY
index 3ff122c..266b5d1 100644
--- a/e-17/elementary/HISTORY
+++ b/e-17/elementary/HISTORY
@@ -1,3 +1,11 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Added stable 1.7.4 release
+ * DEPENDS: Only SCM branch depends on subversion
+ Stable branch depends on eio edje
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed e_dbus to edbus

diff --git a/e-17/elementary/PREPARE b/e-17/elementary/PREPARE
index 1481b24..abdc854 100755
--- a/e-17/elementary/PREPARE
+++ b/e-17/elementary/PREPARE
@@ -1,2 +1,7 @@
-config_query ELEMENTARY_CVS_AUTOUPDATE \
- "Automatically update $SPELL on system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ config_query ELEMENTARY_CVS_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
+fi
diff --git a/e-17/elementary/PRE_BUILD b/e-17/elementary/PRE_BUILD
index 0f559b1..f354f52 100755
--- a/e-17/elementary/PRE_BUILD
+++ b/e-17/elementary/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-NOCONFIGURE=ON ./autogen.sh
+
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/elementary/elementary-1.7.5.tar.bz2.sig
b/e-17/elementary/elementary-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..78cef8d
Binary files /dev/null and b/e-17/elementary/elementary-1.7.5.tar.bz2.sig
differ
diff --git a/e-17/embryo/CONFLICTS b/e-17/embryo/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/embryo/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/embryo/DEPENDS b/e-17/embryo/DEPENDS
index b2f216c..2e5d32d 100755
--- a/e-17/embryo/DEPENDS
+++ b/e-17/embryo/DEPENDS
@@ -2,6 +2,7 @@ depends automake &&
depends libtool &&
depends eina &&

-if [[ "$EMBRYO_BRANCH" == "scm" ]]; then
- depends subversion
-fi
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation'
diff --git a/e-17/embryo/DETAILS b/e-17/embryo/DETAILS
index 9fa354d..664fe43 100755
--- a/e-17/embryo/DETAILS
+++ b/e-17/embryo/DETAILS
@@ -1,23 +1,10 @@
SPELL=embryo
-if [[ "$EMBRYO_BRANCH" == "scm" ]]; then
- if [[ "$EMBRYO_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.0.0
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
-
SOURCE_HASH=sha512:9d311d4c78d717458b471c49e3cc3a15aaba501e1fef718d43117d241766b25169e7909be182b68015b86c754663e25bbb3cdcd6a37c4df8b6962cb31c8649c8
-fi
+#
SOURCE_HASH=sha512:9d311d4c78d717458b471c49e3cc3a15aaba501e1fef718d43117d241766b25169e7909be182b68015b86c754663e25bbb3cdcd6a37c4df8b6962cb31c8649c8
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Embryo/
ENTERED=20040324
diff --git a/e-17/embryo/HISTORY b/e-17/embryo/HISTORY
index ab47d74..779aa0e 100644
--- a/e-17/embryo/HISTORY
+++ b/e-17/embryo/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Optionally depends on doxygen
+ * CONFLICTS: Conflicts with efl
+
2011-11-12 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eina

diff --git a/e-17/embryo/PREPARE b/e-17/embryo/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/embryo/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/embryo/PRE_BUILD b/e-17/embryo/PRE_BUILD
deleted file mode 100755
index dff047c..0000000
--- a/e-17/embryo/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-
-if [ "$EMBRYO_BRANCH" == "scm" ]; then
- cd $SOURCE_DIRECTORY &&
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/embryo/embryo-1.7.5.tar.bz2.sig
b/e-17/embryo/embryo-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..f3034bc
Binary files /dev/null and b/e-17/embryo/embryo-1.7.5.tar.bz2.sig differ
diff --git a/e-17/emotion/DEPENDS b/e-17/emotion/DEPENDS
index 7df4e40..65b926b 100755
--- a/e-17/emotion/DEPENDS
+++ b/e-17/emotion/DEPENDS
@@ -1,5 +1,10 @@
depends edje &&

+optional_depends 'doxygen' \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&
+
optional_depends 'gst-ffmpeg' \
'--enable-gstreamer' \
'--disable-gstreamer' \
@@ -12,8 +17,8 @@ optional_depends 'xine-lib' \
'for Xine backend support' &&

optional_depends 'vlc' \
- '--enable-vlc' \
- '--disable-vlc' &&
+ '--enable-generic-vlc' \
+ '--disable-generic-vlc' &&

optional_depends -sub 'LIBCDIO' 'gst-plugins-ugly' \
'' \
diff --git a/e-17/emotion/DETAILS b/e-17/emotion/DETAILS
index 8b4ca80..ff8b368 100755
--- a/e-17/emotion/DETAILS
+++ b/e-17/emotion/DETAILS
@@ -11,11 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/emotion:emotion
SOURCE_IGNORE=volatile
else
- VERSION=0.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
-
SOURCE_HASH=sha512:8596d842078f0735040de30cee9cb3ad7e8ac5efd25b5eb5857263d7b646d1070b6e97c4fc097c5c9ebd4f1da565aa201ab91ba6c318ec11c7bc86a93939c3a1
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+#
SOURCE_HASH=sha512:8596d842078f0735040de30cee9cb3ad7e8ac5efd25b5eb5857263d7b646d1070b6e97c4fc097c5c9ebd4f1da565aa201ab91ba6c318ec11c7bc86a93939c3a1
fi
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Emotion/index.html
diff --git a/e-17/emotion/HISTORY b/e-17/emotion/HISTORY
index 15fb415..1f3b9e5 100644
--- a/e-17/emotion/HISTORY
+++ b/e-17/emotion/HISTORY
@@ -1,3 +1,11 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Optionally depends on doxygen
+ VLC is now under "generic" (--enable-generic-vlc)
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: Renamed e-emotion emotion, Use prepare_select_branch
* PREPARE PRE_BUILD DEPENDS: Use prepare_select_branch
diff --git a/e-17/emotion/emotion-1.7.5.tar.bz2.sig
b/e-17/emotion/emotion-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..d24697f
Binary files /dev/null and b/e-17/emotion/emotion-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eobj/CONFLICTS b/e-17/eobj/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/eobj/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eobj/HISTORY b/e-17/eobj/HISTORY
index 9e8b0b1..bfdd5e6 100644
--- a/e-17/eobj/HISTORY
+++ b/e-17/eobj/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with efl
+
2012-10-14 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eina and optional check and doxygen

diff --git a/e-17/ephysics/DEPENDS b/e-17/ephysics/DEPENDS
index e96f1ed..59a6316 100755
--- a/e-17/ephysics/DEPENDS
+++ b/e-17/ephysics/DEPENDS
@@ -1,4 +1,4 @@
-depends efs &&
+depends efl &&
depends ecore &&
depends bullet "" "" games &&

diff --git a/e-17/ephysics/HISTORY b/e-17/ephysics/HISTORY
index 5a800a3..07fd5cf 100644
--- a/e-17/ephysics/HISTORY
+++ b/e-17/ephysics/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: typo efs -> efl
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/ethumb/DEPENDS b/e-17/ethumb/DEPENDS
index d1a5625..e4d24e6 100755
--- a/e-17/ethumb/DEPENDS
+++ b/e-17/ethumb/DEPENDS
@@ -1,10 +1,21 @@
-depends subversion &&
-depends efl &&
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ depends subversion &&
+ depends efl &&
+
+ optional_depends edbus \
+ "--enable-ethumbd" "--disable-ethumbd"
+else
+ optional_depends e_dbus \
+ "--enable-ethumbd" "--disable-ethumbd"
+fi &&
+
depends ecore &&
depends edje &&

-optional_depends edbus \
- "--enable-ethumbd" "--disable-ethumbd" &&
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&

optional_depends emotion \
"--enable-emotion" "--disable-emotion" \
@@ -16,4 +27,4 @@ optional_depends epdf \

optional_depends libexif \
"--enable-libexif" "--disable-libexif" \
- "Enable libexif module?"
+ "Enable libexif module?"
diff --git a/e-17/ethumb/DETAILS b/e-17/ethumb/DETAILS
index 6089c61..4b144f8 100755
--- a/e-17/ethumb/DETAILS
+++ b/e-17/ethumb/DETAILS
@@ -1,14 +1,22 @@
SPELL=ethumb
-if [ "$ETHUMB_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ if [ "$ETHUMB_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ 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
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://trac.enlightenment.org/e/wiki/Ethumb
ENTERED=20091022
LICENSE[0]=BSD
diff --git a/e-17/ethumb/HISTORY b/e-17/ethumb/HISTORY
index a7c0895..6d849cf 100644
--- a/e-17/ethumb/HISTORY
+++ b/e-17/ethumb/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable 1.7.4 branch
+ * DEPENDS: Only SCM branch depends on efl and subversion
+ e_dbus for stable and edbus for SCM
+ Optionally depends on doxygen
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed e_dbus to edbus
changed to using efl
diff --git a/e-17/ethumb/PREPARE b/e-17/ethumb/PREPARE
index e77214d..cc62d7e 100755
--- a/e-17/ethumb/PREPARE
+++ b/e-17/ethumb/PREPARE
@@ -1,2 +1,7 @@
-config_query ETHUMB_CVS_AUTOUPDATE \
- "Automatically update $SPELL on system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ config_query ETHUMB_CVS_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
+fi
diff --git a/e-17/ethumb/PRE_BUILD b/e-17/ethumb/PRE_BUILD
index 0f559b1..a11245b 100755
--- a/e-17/ethumb/PRE_BUILD
+++ b/e-17/ethumb/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-NOCONFIGURE=ON ./autogen.sh
+
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/ethumb/ethumb-1.7.5.tar.bz2.sig
b/e-17/ethumb/ethumb-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..25f30a1
Binary files /dev/null and b/e-17/ethumb/ethumb-1.7.5.tar.bz2.sig differ
diff --git a/e-17/evas/BUILD b/e-17/evas/BUILD
index 9102a90..c795dcb 100755
--- a/e-17/evas/BUILD
+++ b/e-17/evas/BUILD
@@ -1,7 +1,7 @@
if [[ $(get_spell_provider $SPELL OPENGL) ]] && is_depends_enabled $SPELL
sdl; then
- EVAS_GL_SDL="--enable-gl-sdl --enable-sdl-primitive"
+ EVAS_GL_SDL="--enable-gl-sdl --enable-sdl-primitive"
else
- EVAS_GL_SDL="--disable-gl-sdl --disable-sdl-primitive"
+ EVAS_GL_SDL="--disable-gl-sdl --disable-sdl-primitive"
fi &&

OPTS="$EVAS_GL_SDL $EVAS_PMAPS $OPTS" &&
@@ -42,7 +42,15 @@ fi &&

if is_depends_enabled $SPELL fribidi && is_depends_enabled fribidi glib2 ;
then
CFLAGS="$CFLAGS -I/usr/include/glib-2.0"
-fi
+fi &&
+
+if [[ "x${EVAS_X11XCB}" == "xnone" ]]; then
+ OPTS="--disable-software-xlib \
+ --without-x \
+ --disable-software-xcb \
+ --disable-async-events \
+ $OPTS"
+fi &&

# We don't have wayland spells yet, http://wayland.freedesktop.org/
OPTS="--disable-wayland-shm --disable-wayland-egl $OPTS" &&
diff --git a/e-17/evas/CONFIGURE b/e-17/evas/CONFIGURE
index c4414a7..e78a841 100755
--- a/e-17/evas/CONFIGURE
+++ b/e-17/evas/CONFIGURE
@@ -1,13 +1,16 @@
-config_query EVAS_BUFFER "Enable memory buffer rendering?" y
&&
-config_query EVAS_SCALE_SAMPLE "Enable sampling scalar code?" y
&&
-config_query EVAS_SCALE_SMOOTH "Enable smooth scalar code?" y
&&
-config_query EVAS_YUV "Enable YUV converter code?" y
&&
-config_query EVAS_DITHER_MASK "Enable small dither mask code?" n
&&
+config_query EVAS_BUFFER "Enable memory buffer rendering?" y &&
+config_query EVAS_SCALE_SAMPLE "Enable sampling scalar code?" y &&
+config_query EVAS_SCALE_SMOOTH "Enable smooth scalar code?" y &&
+config_query EVAS_YUV "Enable YUV converter code?" y &&
+config_query EVAS_DITHER_MASK "Enable small dither mask code?" n &&
config_query EVAS_ASYNC_RENDER "Enable asynchrone render?(use
carefully!!)" n &&

-config_query_option EVAS_PMAPS "Enable portable pixmap support?" y
\
- '--enable-image-loader-pmaps'
'--disable-image-loader-pmaps' &&
+config_query_list EVAS_X11XCB "Use X11 (recommended) or XCB software
rendering?" \
+ x11 xcb none

-config_query_option EVAS_PTHREADS "Enable threaded rendering?" y
\
- "--enable-pthreads" "--disable-pthreads"
+config_query_option EVAS_PMAPS "Enable portable pixmap support?" y \
+ '--enable-image-loader-pmaps' '--disable-image-loader-pmaps' &&
+
+config_query_option EVAS_PTHREADS "Enable threaded rendering?" y \
+ "--enable-pthreads" "--disable-pthreads"

diff --git a/e-17/evas/CONFLICTS b/e-17/evas/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/evas/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index a562d12..07b588a 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -1,13 +1,21 @@
depends automake &&
+depends eet "--enable-image-loader-eet --enable-font-loader-eet" &&
depends eina &&
depends libtool &&
depends freetype2 &&

-if [[ "$EVAS_BRANCH" == "scm" ]]; then
- depends subversion
- depends eobj
+if [[ "x${EVAS_X11XCB}" == "xx11" ]]; then
+ depends xorg-libs "--enable-software-xlib --with-x"
+elif [[ "x${EVAS_X11XCB}" == "xxcb" ]]; then
+ depends libxcb "--enable-software-xcb --enable-async-events"
+# else "none" handled in BUILD
fi &&

+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'build documentation' &&
+
optional_depends fontconfig \
"--enable-fontconfig" \
"--disable-fontconfig" \
@@ -24,7 +32,7 @@ optional_depends fribidi \
"Enable bidirectional text support?" &&

optional_depends pixman \
- "--enable-pixman" \
+ "--enable-pixman --enable-pixman-font --enable-pixman-rect
--enable-pixman-line --enable-pixman-poly --enable-pixman-image
--enable-pixman-image-scale-sample" \
"--disable-pixman" \
"Enable pixman for software rendering?" &&

@@ -43,26 +51,11 @@ optional_depends sdl
\
"--disable-software-16-sdl" \
"Enable software 16bit SDL rendering backend?" &&

-optional_depends xorg-libs \
- "--enable-software-xlib --with-x" \
- "--disable-software-xlib --without-x" \
- "for software X11 rendering backend" &&
-
-optional_depends libxcb \
- "--enable-software-xcb --enable-async-events" \
- "--disable-software-xcb --disable-async-events" \
- "Enable software XCB engine and rendering backend?" &&
-
optional_depends OPENGL \
"--enable-gl-xlib" \
"--disable-gl-xlib" \
"for OpenGL X11 display engine" &&

-optional_depends eet \
- "--enable-image-loader-eet --enable-font-loader-eet" \
- "--disable-images-loader-eet --disable-font-loader-eet" \
- "for eet images and font loader support" &&
-
optional_depends giflib \
'--enable-image-loader-gif' \
'--disable-image-loader-gif' \
diff --git a/e-17/evas/DETAILS b/e-17/evas/DETAILS
index baaa5a0..74f13bc 100755
--- a/e-17/evas/DETAILS
+++ b/e-17/evas/DETAILS
@@ -1,24 +1,10 @@
SPELL=evas
-if [[ "$EVAS_BRANCH" == "scm" ]]; then
- if [[ "$EVAS_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:4db153568433db2bc131713b8b11961ff874de56cb0e398976830ab82681173008d3a487e187343c4e81e7fcd85b7fd23e17c6b9cba8b1a6b006283c420237d0
-fi
WEB_SITE=http://enlightenment.org/Libraries/Evas/
ENTERED=20011101
UPDATED=20020509
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index c9bedd8..02cd7fa 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,15 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+ * BUILD, CONFIGURE, DEPENDS: X11 and XCB are mutually exclusive
+ * DEPENDS: eet is required, not optional
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Expand pixman flags
+ Optionally depends on doxygen
+ * CONFLICTS: Conflicts with efl
+
2012-10-14 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eobj as scm depends

@@ -8,7 +20,7 @@
* BUILD: --disable-wayland-{shm,egl} added

2011-11-26 Robin Cook <rcook AT wyrms.net>
- * BUILD: added CFLAGS include if fribidi is enabled and compiled with
+ * BUILD: added CFLAGS include if fribidi is enabled and compiled with
glib2

2011-11-14 Robin Cook <rcook AT wyrms.net>
@@ -21,7 +33,7 @@
config_query_option
* DEPENDS: corrected changed switches, changed some depends to
optional
added optional depends
-
+
2011-11-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.1

diff --git a/e-17/evas/PREPARE b/e-17/evas/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/evas/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/evas/PRE_BUILD b/e-17/evas/PRE_BUILD
deleted file mode 100755
index e4c19d5..0000000
--- a/e-17/evas/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-
-if [[ "$EVAS_BRANCH" == "scm" ]]; then
- cd $SOURCE_DIRECTORY &&
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/evas/evas-1.0.1.tar.gz.sig b/e-17/evas/evas-1.0.1.tar.gz.sig
deleted file mode 100644
index 91cbad0..0000000
Binary files a/e-17/evas/evas-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/evas/evas-1.7.5.tar.bz2.sig
b/e-17/evas/evas-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..d23fd5d
Binary files /dev/null and b/e-17/evas/evas-1.7.5.tar.bz2.sig differ
diff --git a/e-17/evas_generic_loaders/DEPENDS
b/e-17/evas_generic_loaders/DEPENDS
index b938afd..f2701df 100755
--- a/e-17/evas_generic_loaders/DEPENDS
+++ b/e-17/evas_generic_loaders/DEPENDS
@@ -1 +1,5 @@
+if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ]; then
+ depends subversion
+fi &&
+
depends evas
diff --git a/e-17/evas_generic_loaders/DETAILS
b/e-17/evas_generic_loaders/DETAILS
index d1066d9..955150e 100755
--- a/e-17/evas_generic_loaders/DETAILS
+++ b/e-17/evas_generic_loaders/DETAILS
@@ -1,15 +1,23 @@
SPELL=evas_generic_loaders
PATCHLEVEL=0
-if [ "$EVAS_GENERIC_LOADERS_AUTOUPDATE" == "y" ]; then
+if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ]; then
+ if [ "$EVAS_GENERIC_LOADERS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ 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
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://www.enlightenment.org/
ENTERED=20120812
LICENSE[0]=GPL
diff --git a/e-17/evas_generic_loaders/HISTORY
b/e-17/evas_generic_loaders/HISTORY
index f6d94c0..bdbe264 100644
--- a/e-17/evas_generic_loaders/HISTORY
+++ b/e-17/evas_generic_loaders/HISTORY
@@ -1,2 +1,9 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Added stable 1.7.4 branch
+ * DEPENDS: SCM version depends on subversion
+
2012-08-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/e-17/evas_generic_loaders/PREPARE
b/e-17/evas_generic_loaders/PREPARE
index f8b7d7e..98d27e4 100755
--- a/e-17/evas_generic_loaders/PREPARE
+++ b/e-17/evas_generic_loaders/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
+prepare_select_branch stable scm
diff --git a/e-17/evas_generic_loaders/PRE_BUILD
b/e-17/evas_generic_loaders/PRE_BUILD
index 1af1b77..48d6d12 100755
--- a/e-17/evas_generic_loaders/PRE_BUILD
+++ b/e-17/evas_generic_loaders/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig
b/e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..7745260
Binary files /dev/null and
b/e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig differ
diff --git a/e-17/expedite/DEPENDS b/e-17/expedite/DEPENDS
index f21f7e5..097a507 100755
--- a/e-17/expedite/DEPENDS
+++ b/e-17/expedite/DEPENDS
@@ -1,2 +1,5 @@
-depends evas &&
-depends subversion
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ depends subversion
+fi &&
+
+depends evas
diff --git a/e-17/expedite/DETAILS b/e-17/expedite/DETAILS
index c65c9a1..99e749c 100755
--- a/e-17/expedite/DETAILS
+++ b/e-17/expedite/DETAILS
@@ -1,14 +1,22 @@
SPELL=expedite
-if [ "$EXPEDITE_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ if [ "$EXPEDITE_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ 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
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://enlightenment.sourceforge.net/
ENTERED=20070430
LICENSE[0]=BSD
diff --git a/e-17/expedite/HISTORY b/e-17/expedite/HISTORY
index d69731d..47b645c 100644
--- a/e-17/expedite/HISTORY
+++ b/e-17/expedite/HISTORY
@@ -1,3 +1,10 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable 1.7.4 branch
+ * DEPENDS: Only SCM branch depends on subversion
+
2008-09-11 Ladislav Hagara <hgr AT vabo.cz>
* *: cvs -> svn (subversion)

diff --git a/e-17/expedite/PREPARE b/e-17/expedite/PREPARE
index e80c04f..d52f2b7 100755
--- a/e-17/expedite/PREPARE
+++ b/e-17/expedite/PREPARE
@@ -1,2 +1,7 @@
-config_query EXPEDITE_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ config_query EXPEDITE_CVS_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/e-17/expedite/PRE_BUILD b/e-17/expedite/PRE_BUILD
index 4524f3f..f2b86d8 100755
--- a/e-17/expedite/PRE_BUILD
+++ b/e-17/expedite/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/expedite/expedite-1.7.5.tar.bz2.sig
b/e-17/expedite/expedite-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..6d48a00
Binary files /dev/null and b/e-17/expedite/expedite-1.7.5.tar.bz2.sig differ
diff --git a/e-17/exquisite/DEPENDS b/e-17/exquisite/DEPENDS
index dd8299e..a9a0de3 100755
--- a/e-17/exquisite/DEPENDS
+++ b/e-17/exquisite/DEPENDS
@@ -1,4 +1,7 @@
-depends efl &&
-depends ecore &&
-depends edje &&
-depends subversion
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ depends efl &&
+ depends subversion
+fi &&
+
+depends ecore &&
+depends edje
diff --git a/e-17/exquisite/DETAILS b/e-17/exquisite/DETAILS
index 134bab6..3f078a8 100755
--- a/e-17/exquisite/DETAILS
+++ b/e-17/exquisite/DETAILS
@@ -1,14 +1,22 @@
SPELL=exquisite
-if [ "$EXQUISITE_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ if [ "$EXQUISITE_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ 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
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.0.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://enlightenment.sourceforge.net/
ENTERED=20080106
LICENSE[0]=BSD
diff --git a/e-17/exquisite/HISTORY b/e-17/exquisite/HISTORY
index 513f486..b67ce0a 100644
--- a/e-17/exquisite/HISTORY
+++ b/e-17/exquisite/HISTORY
@@ -1,3 +1,7 @@
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable 1.0.0 branch
+ * DEPENDS: Only SCM branch depends on efl and subversion
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/exquisite/PREPARE b/e-17/exquisite/PREPARE
index bcf5323..e7db2fc 100755
--- a/e-17/exquisite/PREPARE
+++ b/e-17/exquisite/PREPARE
@@ -1,2 +1,7 @@
-config_query EXQUISITE_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ config_query EXQUISITE_CVS_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/e-17/exquisite/PRE_BUILD b/e-17/exquisite/PRE_BUILD
index 4524f3f..4e84baf 100755
--- a/e-17/exquisite/PRE_BUILD
+++ b/e-17/exquisite/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/exquisite/exquisite-1.0.0.tar.bz2.sig
b/e-17/exquisite/exquisite-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000..876c5ea
Binary files /dev/null and b/e-17/exquisite/exquisite-1.0.0.tar.bz2.sig differ
diff --git a/e-17/terminology/DEPENDS b/e-17/terminology/DEPENDS
index b3fb2e5..f9925f7 100755
--- a/e-17/terminology/DEPENDS
+++ b/e-17/terminology/DEPENDS
@@ -1,4 +1,12 @@
-depends efl &&
+if [[ "x${TERMINOLOGY_BRANCH}" == "xscm" ]]; then
+ depends efl &&
+ depends subversion
+fi &&
+
depends ecore &&
+depends edje &&
+depends eet &&
+depends efreet &&
+depends eina &&
depends emotion &&
depends elementary
diff --git a/e-17/terminology/DETAILS b/e-17/terminology/DETAILS
index 34a4d3b..9c8f26c 100755
--- a/e-17/terminology/DETAILS
+++ b/e-17/terminology/DETAILS
@@ -1,15 +1,23 @@
SPELL=terminology
+if [[ "x${TERMINOLOGY_BRANCH}" == "xscm" ]]; then
PATCHLEVEL=0
-if [ "$TERMINOLOGY_AUTOUPDATE" == "y" ]; then
+ if [ "$TERMINOLOGY_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ 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
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=0.2.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://www.enlightenment.org/
ENTERED=20120712
LICENSE[0]=BSD
diff --git a/e-17/terminology/HISTORY b/e-17/terminology/HISTORY
index 6170fda..498af30 100644
--- a/e-17/terminology/HISTORY
+++ b/e-17/terminology/HISTORY
@@ -1,3 +1,9 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable branch 0.2.0
+ * DEPENDS: Only SCM branch depends on efl
+ SCM branch depends on subversion
+ Stable branch depends on edje, eet, efreet, and eina
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/terminology/PREPARE b/e-17/terminology/PREPARE
index f8b7d7e..98d27e4 100755
--- a/e-17/terminology/PREPARE
+++ b/e-17/terminology/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
+prepare_select_branch stable scm
diff --git a/e-17/terminology/PRE_BUILD b/e-17/terminology/PRE_BUILD
index 1af1b77..03a1185 100755
--- a/e-17/terminology/PRE_BUILD
+++ b/e-17/terminology/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [[ "x${TERMINOLOGY_BRANCH}" == "xscm" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/terminology/terminology-0.2.0.tar.bz2.sig
b/e-17/terminology/terminology-0.2.0.tar.bz2.sig
new file mode 100644
index 0000000..55e22e5
Binary files /dev/null and b/e-17/terminology/terminology-0.2.0.tar.bz2.sig
differ
diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
index aba120e..ec5894f 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,5 +1,5 @@
SPELL=transmission
- VERSION=2.75
+ VERSION=2.76
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.transmissionbt.com/files/$SOURCE
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index 784e5e1..7191f91 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,6 @@
+2013-01-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.76
+
2012-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.75

diff --git a/ftp/transmission/transmission-2.75.tar.bz2.sig
b/ftp/transmission/transmission-2.75.tar.bz2.sig
deleted file mode 100644
index 9e7b4c7..0000000
Binary files a/ftp/transmission/transmission-2.75.tar.bz2.sig and /dev/null
differ
diff --git a/ftp/transmission/transmission-2.76.tar.bz2.sig
b/ftp/transmission/transmission-2.76.tar.bz2.sig
new file mode 100644
index 0000000..af2f857
Binary files /dev/null and b/ftp/transmission/transmission-2.76.tar.bz2.sig
differ
diff --git a/gnome2-libs/gnome-media2/DEPENDS
b/gnome2-libs/gnome-media2/DEPENDS
index 77c0e95..bb89cf1 100755
--- a/gnome2-libs/gnome-media2/DEPENDS
+++ b/gnome2-libs/gnome-media2/DEPENDS
@@ -4,6 +4,7 @@ depends gconf2 &&
depends sox &&
depends libunique &&
depends data-uuid &&
+depends gnome-doc-utils &&
depends gstreamer &&
depends gst-plugins-base &&
depends gst-plugins-good &&
diff --git a/gnome2-libs/gnome-media2/HISTORY
b/gnome2-libs/gnome-media2/HISTORY
index 0dd5285..db8f0e4 100644
--- a/gnome2-libs/gnome-media2/HISTORY
+++ b/gnome2-libs/gnome-media2/HISTORY
@@ -1,3 +1,6 @@
+2013-01-09 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on gnome-doc-utils
+
2012-01-13 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change unique to libunique

diff --git a/gnome2-libs/gnome-vfs2/DEPENDS b/gnome2-libs/gnome-vfs2/DEPENDS
index 7aae01f..9c807fd 100755
--- a/gnome2-libs/gnome-vfs2/DEPENDS
+++ b/gnome2-libs/gnome-vfs2/DEPENDS
@@ -84,9 +84,5 @@ depends bzip2 &&
depends dbus &&
depends FAM &&
depends glib2 &&
-depends icu &&
-depends libffi &&
depends libxml2 &&
-depends orbit2 &&
-depends pcre &&
depends LZMA
diff --git a/gnome2-libs/gnome-vfs2/HISTORY b/gnome2-libs/gnome-vfs2/HISTORY
index 3b6dfdd..f223127 100644
--- a/gnome2-libs/gnome-vfs2/HISTORY
+++ b/gnome2-libs/gnome-vfs2/HISTORY
@@ -1,3 +1,6 @@
+2013-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed dependencies on icu, libffi, orbit2, pcre
+
2012-12-31 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: attr and acl are optional, see configure script;
handle dependencies for auto-linking rules in configure
diff --git a/gnome2-libs/pango/BUILD b/gnome2-libs/pango/BUILD
index 1885d21..9dfab36 100755
--- a/gnome2-libs/pango/BUILD
+++ b/gnome2-libs/pango/BUILD
@@ -1,5 +1,3 @@
-if [[ "$PANGO_ARABIC" == "n" ]]; then
-
OPTS="--with-dynamic-modules=basic-fc,hangul-fc,hebrew-fc,indic-fc,khmer-fc,syriac-fc,thai-fc,tibetan-fc
$OPTS"
-fi &&
OPTS="$PANGO_OPTS $OPTS" &&
+
default_build
diff --git a/gnome2-libs/pango/CONFIGURE b/gnome2-libs/pango/CONFIGURE
index f626175..3af96ed 100755
--- a/gnome2-libs/pango/CONFIGURE
+++ b/gnome2-libs/pango/CONFIGURE
@@ -1,2 +1,4 @@
-config_query PANGO_ARABIC "Build arabic dynamic modules (can \
-cause problems with webkit browsers)?" y
+# TODO: thai-fc requires libthai (not in grimoire yet)
+config_query_option PANGO_OPTS "Build arabic dynamic modules (can cause
problems with webkit browsers)?" y \
+
"--with-dynamic-modules=basic-fc,arabic-lang,indic-lang" \
+ "--with-dynamic-modules=basic-fc"
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index a47b489..0bbac40 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -6,15 +6,17 @@ depends fontconfig &&
depends freetype2 &&
depends glib2 &&
depends harfbuzz &&
+depends libpng &&
+depends pixman &&

-optional_depends libx11 \
- "--with-x" \
- "--without-x" \
+optional_depends libxft \
+ "--with-xft" \
+ "--without-xft" \
"for XFT and X11 support" &&

-if is_depends_enabled $SPELL libx11; then
+if is_depends_enabled $SPELL libxft; then
+ depends libx11 &&
depends libxau &&
- depends libxft &&
depends libxdmcp &&
depends libxrender &&
if spell_ok cairo && is_version_less $(installed_version cairo) 1.8; then
@@ -27,7 +29,4 @@ optional_depends gtk-doc "" "" "to build documentation with
gtk-doc" &&
optional_depends gobject-introspection \
"--enable-introspection=yes" \
"--enable-introspection=no" \
- "to enable introspection" &&
-
-depends libpng &&
-depends pixman
+ "to enable introspection"
diff --git a/gnome2-libs/pango/DETAILS b/gnome2-libs/pango/DETAILS
index d5dc10d..96cd256 100755
--- a/gnome2-libs/pango/DETAILS
+++ b/gnome2-libs/pango/DETAILS
@@ -1,6 +1,5 @@
SPELL=pango
- VERSION=1.32.4
- PATCHLEVEL=1
+ VERSION=1.32.5
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 26bb36f..c35ba89 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,9 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.32.5
+ * BUILD, CONFIGURE: fixed arabic dynamic modules build/selection
+ * {{PRE_,}SUB_,}DEPENDS: X support is enabled via libxft and its flag,
+ not libx11
+
2012-12-31 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependencies on libxcb, libxext, expat, libffi,
pcre

diff --git a/gnome2-libs/pango/PRE_SUB_DEPENDS
b/gnome2-libs/pango/PRE_SUB_DEPENDS
index 675b761..1c09093 100755
--- a/gnome2-libs/pango/PRE_SUB_DEPENDS
+++ b/gnome2-libs/pango/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- X) is_depends_enabled $SPELL libx11;;
+ X) is_depends_enabled $SPELL libxft;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/gnome2-libs/pango/SUB_DEPENDS b/gnome2-libs/pango/SUB_DEPENDS
index c3ebf2a..94f9afc 100755
--- a/gnome2-libs/pango/SUB_DEPENDS
+++ b/gnome2-libs/pango/SUB_DEPENDS
@@ -1,8 +1,8 @@
case $THIS_SUB_DEPENDS in
- X) message "Pango with X11 support requested, forcing libx11 dependency" &&
- depends libx11 "--with-x" &&
+ X) message "Pango with XFT support requested, forcing libxft dependency" &&
+ depends libxft "--with-xft" &&
+ depends libx11 &&
depends libxau &&
- depends libxft &&
depends libxdmcp &&
depends libxrender
;;
diff --git a/gnome2-libs/pango/pango-1.32.4.tar.xz.sig
b/gnome2-libs/pango/pango-1.32.4.tar.xz.sig
deleted file mode 100644
index 26db5f5..0000000
Binary files a/gnome2-libs/pango/pango-1.32.4.tar.xz.sig and /dev/null differ
diff --git a/gnome2-libs/pango/pango-1.32.5.tar.xz.sig
b/gnome2-libs/pango/pango-1.32.5.tar.xz.sig
new file mode 100644
index 0000000..b2a073a
Binary files /dev/null and b/gnome2-libs/pango/pango-1.32.5.tar.xz.sig differ
diff --git a/gnu/java-gcj-compat/DEPENDS b/gnu/java-gcj-compat/DEPENDS
new file mode 100755
index 0000000..3de94af
--- /dev/null
+++ b/gnu/java-gcj-compat/DEPENDS
@@ -0,0 +1 @@
+depends gcj
diff --git a/gnu/java-gcj-compat/DETAILS b/gnu/java-gcj-compat/DETAILS
new file mode 100755
index 0000000..d7e140b
--- /dev/null
+++ b/gnu/java-gcj-compat/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=java-gcj-compat
+ VERSION=1.0.80
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=ftp://sources.redhat.com/pub/rhug/${SOURCE}
+
SOURCE_HASH=sha512:da1e2564e7811841342c2a5c3d5a37e28a4136ce88c15c007ca1bcfd5da3f0c243e1b2ca72b771f05d9bd260750ed8d5819a04b1fd42501e867a9b92cd7e7891
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.gnu.org/software/classpath/";
+ LICENSE[0]=GPL
+ ENTERED=20100522
+ SHORT="Java SDK compatibility for GCJ"
+cat << EOF
+A collection of wrapper scripts, symlinks and jar files, meant to provide an
+SDK-like interface to the GCJ tool set.
+EOF
diff --git a/gnu/java-gcj-compat/HISTORY b/gnu/java-gcj-compat/HISTORY
new file mode 100644
index 0000000..7374348
--- /dev/null
+++ b/gnu/java-gcj-compat/HISTORY
@@ -0,0 +1,3 @@
+2010-05-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, DETAILS, PROVIDES: spell created
+
diff --git a/gnu/java-gcj-compat/PROVIDES b/gnu/java-gcj-compat/PROVIDES
new file mode 100644
index 0000000..afedbf7
--- /dev/null
+++ b/gnu/java-gcj-compat/PROVIDES
@@ -0,0 +1,3 @@
+JAVA
+JDK5
+JDK
diff --git a/graphics-libs/cimg/DETAILS b/graphics-libs/cimg/DETAILS
index 21e60ae..ca16e34 100755
--- a/graphics-libs/cimg/DETAILS
+++ b/graphics-libs/cimg/DETAILS
@@ -1,6 +1,6 @@
SPELL=cimg
- VERSION=1.5.0
-
SOURCE_HASH=sha512:48a98f9d50bd091f5692023ef96ad25c9a76366ece9acae2cb751cbcd97a2b99eb941d2ef902dbcd2c0fc3de5041561a0f600f369ef7c14edfcac7a95372c2aa
+ VERSION=1.5.2
+
SOURCE_HASH=sha512:a6927cecb524da128a58de9d655c2bb948bb61f654d6f95c7fe2690d39a521fea5313326610c2b56b370f76139f753469b7e4366196dd83db18c5a0c3b307b52
SOURCE=CImg-${VERSION}.zip
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/CImg-${VERSION}
diff --git a/graphics-libs/cimg/HISTORY b/graphics-libs/cimg/HISTORY
index 5b9ca3e..7f51cd1 100644
--- a/graphics-libs/cimg/HISTORY
+++ b/graphics-libs/cimg/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.2
+
2012-08-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.5.0

diff --git a/graphics-libs/harfbuzz/DEPENDS b/graphics-libs/harfbuzz/DEPENDS
index 9607fda..89c4c6b 100755
--- a/graphics-libs/harfbuzz/DEPENDS
+++ b/graphics-libs/harfbuzz/DEPENDS
@@ -1,5 +1,7 @@
depends ragel &&
-depends cairo &&
+
+optional_depends cairo "" "" \
+ "Enable tools used for command-line utilities?" &&

optional_depends icu "" "" \
"Enable icu use?" &&
@@ -10,7 +12,5 @@ optional_depends freetype2 "" "" \
optional_depends graphite2 "" "" \
"Enable graphite2 use?" &&

-optional_depends gtk-doc \
- "--enable-gtk-doc" \
- "--disable-gtk-doc" \
- "use gtk-doc to build documentation"
+optional_depends gtk-doc "" "" \
+ "Enable gtk-doc to build documentation?"
diff --git a/graphics-libs/harfbuzz/DETAILS b/graphics-libs/harfbuzz/DETAILS
index 9943ceb..73c8b75 100755
--- a/graphics-libs/harfbuzz/DETAILS
+++ b/graphics-libs/harfbuzz/DETAILS
@@ -11,7 +11,7 @@ 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.9
+ VERSION=0.9.10
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 4f89952..f8fe142 100644
--- a/graphics-libs/harfbuzz/HISTORY
+++ b/graphics-libs/harfbuzz/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.10
+ * DEPENDS: made cairo optional; removed non-existent gtk-doc flags
+
2012-12-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.9

diff --git a/graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig
b/graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig
new file mode 100644
index 0000000..52acc59
Binary files /dev/null and
b/graphics-libs/harfbuzz/harfbuzz-0.9.10.tar.bz2.sig differ
diff --git a/graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig
b/graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig
deleted file mode 100644
index 7813820..0000000
Binary files a/graphics-libs/harfbuzz/harfbuzz-0.9.9.tar.bz2.sig and
/dev/null differ
diff --git a/graphics-libs/liblqr/DETAILS b/graphics-libs/liblqr/DETAILS
index 1d1f398..8ac5b41 100755
--- a/graphics-libs/liblqr/DETAILS
+++ b/graphics-libs/liblqr/DETAILS
@@ -1,6 +1,6 @@
SPELL=liblqr
- VERSION=0.4.1
-
SOURCE_HASH=sha512:1f923a1745c30c3e8033602882bbab4160464192646779b5a7c1adff80253f21e6f4e2a516ad3cee061d5c62fb57c606691fb2ed3d9033c3c610e8ed3a6f6c66
+ VERSION=0.4.2
+
SOURCE_HASH=sha512:57d9ed67d5a11c970262263a34b6797576088e14f2ccb01b393eff55bfd22c8bb2b2189e3ed5ff6c187f709c556225fc1fb1038bd0d7e0c03d8839ef0ce998a3
SOURCE="${SPELL}-1-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://${SPELL}.wikidot.com/local--files/en:download-page/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-1-${VERSION}"
diff --git a/graphics-libs/liblqr/HISTORY b/graphics-libs/liblqr/HISTORY
index 892f354..065f03b 100644
--- a/graphics-libs/liblqr/HISTORY
+++ b/graphics-libs/liblqr/HISTORY
@@ -1,3 +1,6 @@
+2013-01-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.4.2
+
2009-07-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4.1
* DEPENDS: add pkgconfig, libtool
diff --git a/graphics-libs/opencv/BUILD b/graphics-libs/opencv/BUILD
index 1bde1fe..4e7d3e5 100755
--- a/graphics-libs/opencv/BUILD
+++ b/graphics-libs/opencv/BUILD
@@ -1,2 +1,8 @@
CXXFLAGS=-D__STDC_CONSTANT_MACROS &&
-cmake_build
+OPTS+=" -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCS=0 -DBUILD_PERF_TESTS=0 \
+ -DBUILD_TESTS=0" &&
+if is_depends_enabled $SPELL qt4;then
+ qt4_cmake_build
+else
+ cmake_build
+fi
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 228673c..732e07b 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,7 @@
+2013-01-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: properly support qt4
+ turn off some build options, to speed things up
+
2013-01-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 2.4.3
new website
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 0e7daec..c7eddab 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.1-5
+ VERSION=6.8.1-7
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:9d7b1ab739f669cf4714333136b4829dae9030d229fd784728250fb886b4053170d57c7407491170df5b18cedf29347b60be492f89b1b598dd1f7a358ff2beb1
+
SOURCE_HASH=sha512:9ed22301eb920e3f7e9bfecde2b84346709b3ae2321a21c014c4134c70e18496bf2335eec5a9b89bf140ef224544b8554a329b3a443efd7a329904188e4ccd43
# 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 704b82e..da9b215 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2013-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.1-7
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.1-5

diff --git a/haskell/haskell-x11/DETAILS b/haskell/haskell-x11/DETAILS
index 9c00d83..d796821 100755
--- a/haskell/haskell-x11/DETAILS
+++ b/haskell/haskell-x11/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-x11
- VERSION=1.5.0.1
+ VERSION=1.6.0.2
SOURCE="X11-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:de3e32543fcdcf86aa14443aea02a6862ed39cdbaaf732cee325155af2e84570a9cbdbb9da69ab247bfcdc8e475b9d3b7c678f9e7b3e996370bbbb9b1aacabce
+
SOURCE_HASH=sha512:753bf147b1933e4c52f087d52ec90d3f2fb8764947abec4908b4fb0ff817f67395f174983054312d67e7175d34a73ff84661343a25a0eb71082391a16b9bceab
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index 363bd26..9fff3bc 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,3 +1,6 @@
+2013-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.0.2
+
2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.5.0.1
* DEPENDS: added dependency on haskell-syb
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 1a93daf..7c8d6d7 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -3,7 +3,7 @@ depends atk &&
depends curl &&
depends -sub CXX gcc &&
depends glib2 &&
-depends JPEG &&
+depends libjpeg-turbo &&
depends pango &&
depends perl &&
depends zip &&
@@ -12,7 +12,7 @@ depends cairo &&
depends python &&
depends libnotify &&
depends nspr &&
-depends -sub "3.13.x" nss &&
+depends -sub "3.14.x" nss &&
depends autoconf-2.13 &&
depends gtk+2 &&
depends libidl &&
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index ea302f8..3fc833c 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=17.0.1
+ VERSION=18.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=17.0.1
+ VERSION=18.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=57
+ SECURITY_PATCH=58
fi
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index edbcc0d..c11bbb7 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2013-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: change dependency on JPEG to libjpeg-turbo
+
+2013-01-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 18.0, bumped SECURITY_PATCH
+ * DEPENDS: depend on nss version 3.14.x
+
2012-12-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 17.0.1
* DEPENDS: castfs added
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index 0744963..ddbdd73 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,24 +1,25 @@
. "$GRIMOIRE/FUNCTIONS" &&

-depends JPEG &&
+# requires JCS_EXTENSIONS
+depends libjpeg-turbo &&
depends gtk+2 &&
depends libidl &&
depends libxft &&
depends nspr &&

-if spell_ok nspr && is_version_less $(installed_version nspr) 4.9.2; then
+if spell_ok nspr && is_version_less $(installed_version nspr) 4.9.3; then
force_depends nspr
fi &&

-depends -sub 3.13.x nss &&
+depends -sub 3.14.x nss &&

-if spell_ok nss && is_version_less $(installed_version nss) 3.13.5; then
+if spell_ok nss && is_version_less $(installed_version nss) 3.14.1; then
force_depends nss
fi &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite &&

-if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.7.13;
then
+if spell_ok sqlite && is_version_less $(installed_version sqlite) 3.7.14.1;
then
force_depends sqlite
fi &&

diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index e70d879..76c066e 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,8 +1,8 @@
SPELL=seamonkey
- VERSION=2.14.1
- SECURITY_PATCH=50
+ VERSION=2.15
+ SECURITY_PATCH=51
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:0a676523386df2fc61ca04f0f311d440f3871703a366b4966cd2dc8205c1be715c0dfc031421d9f68bc752c8932b758c33d5b683fc070a308e19af5dbc2445d2
+
SOURCE_HASH=sha512:98085c2fc0b8122de82e7cc08e72d5c598bd2fab606ef1db24ced105ba3f8f66be7199a5f6bc913c4f2ea22f298332688ea651ffc28d2b35ec11368520cfc58e
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 1812cfd..38c606c 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,8 @@
+2013-01-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.15; SECURITY_PATCH++
+ * DEPENDS: updated dependency requirements
+ * mailnews.patch: updated for new release
+
2012-12-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.14.1

diff --git a/http/seamonkey/mailnews.patch b/http/seamonkey/mailnews.patch
index cada27d..112de2d 100644
--- a/http/seamonkey/mailnews.patch
+++ b/http/seamonkey/mailnews.patch
@@ -28,11 +28,11 @@


# Check whether --enable-crypto or --disable-crypto was given.
-@@ -27051,6 +27051,7 @@
- (''' RCC ''', r''' $RCC ''')
- (''' MOZ_X11 ''', r''' $MOZ_X11 ''')
- (''' MOZ_UI_LOCALE ''', r''' $MOZ_UI_LOCALE ''')
-+ (''' MOZ_MAIL_NEWS ''', r''' $MOZ_MAIL_NEWS ''')
- (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
- (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
- (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
+@@ -27643,6 +27653,7 @@
+ (''' RCC ''', r''' $RCC ''')
+ (''' MOZ_X11 ''', r''' $MOZ_X11 ''')
+ (''' MOZ_UI_LOCALE ''', r''' $MOZ_UI_LOCALE ''')
++ (''' MOZ_MAIL_NEWS ''', r''' $MOZ_MAIL_NEWS ''')
+ (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''')
+ (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''')
+ (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''')
diff --git a/http/webkitgtk/DEPENDS b/http/webkitgtk/DEPENDS
index 0778ba8..e36a940 100755
--- a/http/webkitgtk/DEPENDS
+++ b/http/webkitgtk/DEPENDS
@@ -13,6 +13,7 @@ depends sqlite &&
depends libsoup &&
depends enchant &&
depends libxt &&
+depends RUBY &&

optional_depends cairo '--enable-svg' \
'--disable-svg' \
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 1d87e7b..44ee84d 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on RUBY (tested ruby-1.9 and ruby-1.8)
+
2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFIGURE, DEPENDS: added configuration options for selecting
the acceleration backend and the unicode backend
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index ddd4ed6..8bc8cce 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.2.36: added
+
2012-12-22 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.{56,57}: added
* info/patches/maintenance_patches_3/patch-3.4.{23,24}: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.36
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.36
new file mode 100755
index 0000000..faa946f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.36
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.36"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c0946ab652e452263486ab6766b681dec7acb495"
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index efbdd1f..2d5f377 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -79,6 +79,11 @@ optional_depends 'libselinux' \
'--without-selinux' \
'for Security Enhanced Linux (SELinux) support' &&

+optional_depends 'fuse' \
+ '--with-fuse' \
+ '--without-fuse' \
+ 'for FUSE filesystem support for lxc' &&
+
suggest_depends nc '' '' 'for remote SSH tunneling' &&
suggest_depends 'bridge-utils' '' '' 'for creating TUN/TAP bridges' &&
suggest_depends 'iproute2' '' '' 'for routing between TUN/TAP interfaces' &&
diff --git a/libs/libvirt/DETAILS b/libs/libvirt/DETAILS
index 77927b8..3e7c128 100755
--- a/libs/libvirt/DETAILS
+++ b/libs/libvirt/DETAILS
@@ -1,5 +1,5 @@
SPELL=libvirt
- VERSION=1.0.0
+ VERSION=1.0.1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index aba1da4..085e0eb 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.0.1
+ * DEPENDS: Optionally depends on fuse
+
2012-11-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0

diff --git a/libs/libvirt/libvirt-1.0.0.tar.gz.sig
b/libs/libvirt/libvirt-1.0.0.tar.gz.sig
deleted file mode 100644
index c56bdfc..0000000
Binary files a/libs/libvirt/libvirt-1.0.0.tar.gz.sig and /dev/null differ
diff --git a/libs/libvirt/libvirt-1.0.1.tar.gz.sig
b/libs/libvirt/libvirt-1.0.1.tar.gz.sig
new file mode 100644
index 0000000..8e6fe55
Binary files /dev/null and b/libs/libvirt/libvirt-1.0.1.tar.gz.sig differ
diff --git a/libs/neon/HISTORY b/libs/neon/HISTORY
index c248e9d..f97f29b 100644
--- a/libs/neon/HISTORY
+++ b/libs/neon/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow requiring SSL support
+
2012-10-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: added, to apply the patch
diff --git a/libs/neon/PRE_SUB_DEPENDS b/libs/neon/PRE_SUB_DEPENDS
index 7723200..0a4cde4 100755
--- a/libs/neon/PRE_SUB_DEPENDS
+++ b/libs/neon/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
DAV) is_depends_enabled $SPELL expat || is_depends_enabled $SPELL libxml2;;
+ SSL) is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL gnutls
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
b/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
index 7723200..0a4cde4 100755
--- a/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/neon/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
DAV) is_depends_enabled $SPELL expat || is_depends_enabled $SPELL libxml2;;
+ SSL) is_depends_enabled $SPELL openssl || is_depends_enabled $SPELL gnutls
;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/neon/SUB_DEPENDS b/libs/neon/SUB_DEPENDS
index dea3ce6..f03e46b 100755
--- a/libs/neon/SUB_DEPENDS
+++ b/libs/neon/SUB_DEPENDS
@@ -8,6 +8,20 @@ case $THIS_SUB_DEPENDS in
libxml2 &&

depends $NEON_XML "--with-${NEON_XML}";;
+ SSL) message "${MESSAGE_COLOR}SSL support requested, forcing
it${DEFAULT_COLOR}" &&
+ # Clean out old NEON_SSL settings if "none"
+ [[ "x${NEON_SSL}" == "xnone" ]] && NEON_SSL="" &&
+ persistent_remove NEON_SSL || true &&
+
+ # Re-query with only the SSL options
+ config_query_list NEON_SSL "Which SSL backend do you want for SSL
support?" \
+ openssl gnutls &&
+
+ config_query_option NEON_OPTS "Enable SSL library thread-safety using
POSIX threads?" y \
+ "--enable-threadsafe-ssl=posix" \
+ "--disable-threadsafe-ssl" &&
+ depends "${NEON_SSL}" "--with-ssl=${NEON_SSL}"
+ ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac
diff --git a/libs/upower/DETAILS b/libs/upower/DETAILS
index 1169bf2..f8eee0b 100755
--- a/libs/upower/DETAILS
+++ b/libs/upower/DETAILS
@@ -1,6 +1,6 @@
SPELL=upower
- VERSION=0.9.18
-
SOURCE_HASH=sha512:3630aa15ca9d62f3b1abb9c2f2a9d3b3493aa402b9352cb1c291ad2f59d7dcb40b8a44e17c47c1d07c0c317940bbd89cd321b5c6902624e211dda5d3544a28ca
+ VERSION=0.9.19
+
SOURCE_HASH=sha512:616502dddec23108fc51662e0e08efc2cd7893043558696ea87cc02c05b85322362be3740c81674b619f5e7acfaa42bdbd56444faab8c11820ebc427e127a9b7
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/upower/HISTORY b/libs/upower/HISTORY
index 2eadde7..2f85e0d 100644
--- a/libs/upower/HISTORY
+++ b/libs/upower/HISTORY
@@ -1,3 +1,6 @@
+2013-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.19
+
2012-10-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.9.18

diff --git a/mail/claws-mail/DEPENDS b/mail/claws-mail/DEPENDS
index 05ec77b..b867e20 100755
--- a/mail/claws-mail/DEPENDS
+++ b/mail/claws-mail/DEPENDS
@@ -36,6 +36,11 @@ optional_depends "spamassassin" \
"" \
"for SpamProtection" &&

+optional_depends "bogofilter" \
+ "--enable-bogofilter-plugin" \
+ "--disable-bogofilter-plugin" \
+ "for SpamProtection" &&
+
optional_depends "openldap" \
"--enable-ldap" \
"--disable-ldap" \
@@ -71,8 +76,12 @@ optional_depends "gettext" \
"--disable-nls" \
"for Native Language Support" &&

+optional_depends network-manager \
+ "--enable-networkmanager-support" \
+ "--disable-networkmanager-support" \
+ "support for NetworkManager" &&
+
depends atk &&
-depends bzip2 &&
depends cairo &&
depends curl &&
depends db &&
@@ -86,24 +95,16 @@ depends -sub CXX gcc &&
depends gdk-pixbuf2 &&
depends glib2 &&
depends harfbuzz &&
-depends libassuan &&
-depends libffi &&
if is_depends_enabled $SPELL gpgme; then
+ depends libassuan &&
depends libgpg-error
fi &&
-depends libice &&
-depends libidn &&
depends libpng &&
+
depends libsm &&
-depends libssh2 &&
+depends libice &&
+
depends libx11 &&
-depends libxau &&
-depends libxcb &&
-depends libxdmcp &&
-depends libxext &&
-depends libxrender &&
depends openssl &&
depends pango &&
-depends pcre &&
-depends pixman &&
-depends zlib
+depends pixman
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 248207b..ba9d5b9 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,9 @@
+2013-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added optional dependency on bogofilter and
+ network-manager, removed dependencies on libffi, bzip2, libxau,
+ libxcb, libxdmcp, libxext, libxrender, libssh2, pcre and zlib,
+ made the dependency on libassuan dependent on the dependency on
gpgme
+
2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: made the dependency on openssl unconditional

diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index 32919c9..d66d894 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcp
- VERSION=4.2.4-P2
- SECURITY_PATCH=3
+ VERSION=4.2.5
+ SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index 4b3762a..73e51bf 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,8 @@
+2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.5; SECURITY_PATCH++ (CVE-2012-3571,
+ CVE-2012-3570, CVE-2012-3954, CVE-2012-3955)
+ * INSTALL: renewed example config filenames
+
2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.2.4-P2; SECURITY_PATCH++ (CVE-2012-3955)
* INSTALL: verbosity++
diff --git a/net/dhcp/INSTALL b/net/dhcp/INSTALL
index 0586826..9d7bdad 100755
--- a/net/dhcp/INSTALL
+++ b/net/dhcp/INSTALL
@@ -1,4 +1,6 @@
make LIBDIR="$INSTALL_ROOT/usr/lib" \
INCDIR="$INSTALL_ROOT/usr/include" install &&
-install -vm 644 client/dhclient.conf
$INSTALL_ROOT/etc/dhclient.conf.example &&
-install -vm 644 server/dhcpd.conf $INSTALL_ROOT/etc/dhcpd.conf.example
+install -vm 644 client/dhclient.conf.example \
+ $INSTALL_ROOT/etc/dhclient.conf.example &&
+install -vm 644 server/dhcpd.conf.example \
+ $INSTALL_ROOT/etc/dhcpd.conf.example
diff --git a/net/dhcpcd/DETAILS b/net/dhcpcd/DETAILS
index 0f73e6c..8e90e9d 100755
--- a/net/dhcpcd/DETAILS
+++ b/net/dhcpcd/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcpcd
- VERSION=5.6.4
-
SOURCE_HASH=sha512:eb3892604b2f889b4f34835f4d8e0bb2d129f7d0d91da39760eeaf3f75883a6db0e1397ac65084a3ddc4a2968a389fc723e9f031a844ef5333451527be8cb7a2
+ VERSION=5.6.6
+
SOURCE_HASH=sha512:55e5d8a818c421118c62fcea1cb259f15c8bafbb79f5d9b9d14c4099474fe25489189caa1025f2e07cd3a7446a794b4c757d9a28bea2c3e9bc1bc588d3d5e8dd
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://roy.marples.name/downloads/$SPELL/$SOURCE
diff --git a/net/dhcpcd/HISTORY b/net/dhcpcd/HISTORY
index 474388b..18853f0 100644
--- a/net/dhcpcd/HISTORY
+++ b/net/dhcpcd/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.6.6
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.6.4 (new stable branch)

diff --git a/net/nc/BUILD b/net/nc/BUILD
index 2b65baf..ba14922 100755
--- a/net/nc/BUILD
+++ b/net/nc/BUILD
@@ -1 +1,3 @@
- make linux
+make_single &&
+make linux &&
+make_normal
diff --git a/net/nc/CONFLICTS b/net/nc/CONFLICTS
index 9a5c6cd..bc7c602 100755
--- a/net/nc/CONFLICTS
+++ b/net/nc/CONFLICTS
@@ -1 +1,2 @@
-conflicts netcat
+conflicts netcat &&
+conflicts cryptcat
diff --git a/net/nc/HISTORY b/net/nc/HISTORY
index b8b527a..24ee934 100644
--- a/net/nc/HISTORY
+++ b/net/nc/HISTORY
@@ -1,3 +1,7 @@
+2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: fixed multijob build
+ * CONFLICTS: conflicts cryptcat
+
2011-05-12 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added, to conflict with netcat
* INSTALL: use `install' and INSTALL_ROOT
diff --git a/net/netcat/CONFLICTS b/net/netcat/CONFLICTS
index a8ba927..30f1f19 100755
--- a/net/netcat/CONFLICTS
+++ b/net/netcat/CONFLICTS
@@ -1 +1,2 @@
-conflicts nc
+conflicts nc &&
+conflicts cryptcat
diff --git a/net/netcat/HISTORY b/net/netcat/HISTORY
index 55b8237..3062dd1 100644
--- a/net/netcat/HISTORY
+++ b/net/netcat/HISTORY
@@ -1,2 +1,5 @@
+2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: conflicts cryptcat
+
2011-05-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, CONFLICTS: spell created
diff --git a/php-pear/mongo/DETAILS b/php-pear/mongo/DETAILS
index 202f93f..260e588 100755
--- a/php-pear/mongo/DETAILS
+++ b/php-pear/mongo/DETAILS
@@ -1,8 +1,8 @@
SPELL=mongo
- VERSION=1.1.0
+ VERSION=1.2.12
SOURCE=$SPELL-$VERSION.tgz
SOURCE_URL[0]=http://pecl.php.net/get/$SOURCE
-
SOURCE_HASH=sha512:7457ab211ff304023cfc58143b3f34bc09aa25a7177c62f60a4c55378b22006e5a57aa1798ff7d97772018fecce1a7675cb9206edad0529329fad774d5c5d7a7
+
SOURCE_HASH=sha512:9e290979dcc53fa301bf3abf4d66d1c566e3d76e6f606bbd7130401f2cfbf6344c432de300eba6dd4009666df54e79477e12cfa1525718609e4b41e04b7d0c8d
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mongodb.org/display/DOCS/PHP+Language+Center
LICENSE[0]=APACHE
diff --git a/php-pear/mongo/HISTORY b/php-pear/mongo/HISTORY
index 93429aa..8b06419 100644
--- a/php-pear/mongo/HISTORY
+++ b/php-pear/mongo/HISTORY
@@ -1,3 +1,6 @@
+2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.12
+
2010-12-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.0

diff --git a/python-pypi/bpython/DETAILS b/python-pypi/bpython/DETAILS
index 0adf2a5..272e4fa 100755
--- a/python-pypi/bpython/DETAILS
+++ b/python-pypi/bpython/DETAILS
@@ -1,8 +1,8 @@
SPELL=bpython
- VERSION=0.11
+ VERSION=0.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.bpython-interpreter.org/releases/$SOURCE
-
SOURCE_HASH=sha512:fc798422bd8220220302f08d919c854b832ebb9174e1467dc416e29bd47d69d58f910b827be67ac6c7516ed9b8d02f7706e6e2ecd790e9ccc6bc4d4cc5e8cbf7
+
SOURCE_HASH=sha512:001deb068dbc31e592b1c9c524cfbb5061cc9f1abb30d7597472920032285d20632f4ca75a10d4444be947413f9d2d65f476b64a66717956bca7d52b6b7ce948
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.bpython-interpreter.org/
LICENSE[0]=MIT
diff --git a/python-pypi/bpython/HISTORY b/python-pypi/bpython/HISTORY
index 3af9cee..287ce6e 100644
--- a/python-pypi/bpython/HISTORY
+++ b/python-pypi/bpython/HISTORY
@@ -1,3 +1,6 @@
+2013-01-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.12
+
2012-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.11

diff --git a/python-pypi/fabric/DEPENDS b/python-pypi/fabric/DEPENDS
index 4b86892..17f0989 100755
--- a/python-pypi/fabric/DEPENDS
+++ b/python-pypi/fabric/DEPENDS
@@ -1,3 +1,9 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends python &&
depends SETUPTOOLS &&
-depends python-ssh
+depends paramiko &&
+
+if spell_ok paramiko && is_version_less $(installed_version paramiko) 1.9.0;
then
+ force_depends paramiko
+fi
diff --git a/python-pypi/fabric/DETAILS b/python-pypi/fabric/DETAILS
index aeea84a..69662ea 100755
--- a/python-pypi/fabric/DETAILS
+++ b/python-pypi/fabric/DETAILS
@@ -1,9 +1,9 @@
SPELL=fabric
SPELLX=Fabric
- VERSION=1.4.2
+ VERSION=1.5.1
SOURCE=${SPELLX}-${VERSION}.tar.gz

SOURCE_URL[0]=http://pypi.python.org/packages/source/${SPELLX:0:1}/${SPELLX}/${SOURCE}
-
SOURCE_HASH=sha512:f911357a3ae83f514f0b0e67e6a682606aee819cd19a4db275e455e2452a3b20bdad889ee38834514429dfd30b40dfba865a5e26e1b8500b1702654f2bf8f98b
+
SOURCE_HASH=sha512:fc036d2e354189c26abe00b75ba016142d5aa8da2c523d02e2054da16e28d6fcba3f702379a68f5552ba7a26b6d48bc84fec4359b511b6769779b1488d8ee10a
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE=http://fabfile.org/
LICENSE[0]=BSD
diff --git a/python-pypi/fabric/HISTORY b/python-pypi/fabric/HISTORY
index a833c76..0429309 100644
--- a/python-pypi/fabric/HISTORY
+++ b/python-pypi/fabric/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.5.1
+ * DEPENDS: switched back to paramiko (ssh project was merged back)
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.2

diff --git a/python-pypi/httplib2/DETAILS b/python-pypi/httplib2/DETAILS
index 8d727c6..fef626d 100755
--- a/python-pypi/httplib2/DETAILS
+++ b/python-pypi/httplib2/DETAILS
@@ -1,8 +1,8 @@
SPELL=httplib2
- VERSION=0.6.0
+ VERSION=0.7.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://httplib2.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:5f90ad3423fcdf087288c9ad299c200d8855416c916b5d6d25fbf3d6f5769ec8df98e3a4b80705df5344a4143fcd20931b852f255c4dae70be0c4cc8210e7bbf
+
SOURCE_HASH=sha512:ad269ab4851b5b5dfa3e54a4886452a2cc81b1472343e2ac0fdf00eca1f71e6d658875ca7d30f092f448330df83cd8ecc05634d0c2b4a3ac2992d9c77fbe30aa
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://code.google.com/p/httplib2/
LICENSE[0]=MIT
diff --git a/python-pypi/httplib2/HISTORY b/python-pypi/httplib2/HISTORY
index 886f5a8..4416f16 100644
--- a/python-pypi/httplib2/HISTORY
+++ b/python-pypi/httplib2/HISTORY
@@ -1,3 +1,6 @@
+2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.4
+
2011-02-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.6.0

diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index d329b1c..e592f88 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.4.1
-
SOURCE_HASH=sha512:78be51e205487967d8951d2b5b64e958cdaa0e73a86c0cb7b402ae4a82e16c6af0bdd1aff65de66d7bb8920a81f8693a3a25133847b480641eb56786a76ac254
+ VERSION=2.4.2
+
SOURCE_HASH=sha512:642dbcc9de6662e563059cafadbd4a0f1b4d6cebad48b2bfc7160571fad950a0110456be52690f1aeef6b91a4f6ac1edf6fc3607d1f590337a60c4b2bcab4625
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index f9b050f..3d9af83 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2013-01-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.4.2
+
2012-12-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.4.1

diff --git a/python-pypi/paramiko/DETAILS b/python-pypi/paramiko/DETAILS
index 9c05731..3a154d8 100755
--- a/python-pypi/paramiko/DETAILS
+++ b/python-pypi/paramiko/DETAILS
@@ -1,13 +1,10 @@
SPELL=paramiko
- VERSION=1.7.7.1
+ VERSION=1.9.0
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.asc
- SOURCE_URL[0]=http://www.lag.net/paramiko/download/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.asc
- SOURCE_GPG=paramiko.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:2f91b68b8a652aa773d14cded7a5f17cf6d758624f981c68510ee3b1302b64ee9290830440dca1a1000b7974ef9dca4f0acd13d01958433b6f35ae8a13e1c0a2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- WEB_SITE=http://www.lag.net/paramiko/
+ WEB_SITE=https://github.com/paramiko/paramiko/
ENTERED=20060403
LICENSE=LGPL
KEYWORDS="python devel"
diff --git a/python-pypi/paramiko/HISTORY b/python-pypi/paramiko/HISTORY
index c5f2ed3..b713690 100644
--- a/python-pypi/paramiko/HISTORY
+++ b/python-pypi/paramiko/HISTORY
@@ -1,3 +1,7 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.0; renewed website and source urls
+ * paramiko.gpg: dropped, not used anymore
+
2011-10-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.7.1; converted to upstream signature
checking; changed tarball extension; quoting paths
diff --git a/python-pypi/paramiko/paramiko.gpg
b/python-pypi/paramiko/paramiko.gpg
deleted file mode 100644
index 84a90e6..0000000
Binary files a/python-pypi/paramiko/paramiko.gpg and /dev/null differ
diff --git a/python-pypi/pyasn1/DETAILS b/python-pypi/pyasn1/DETAILS
index 0fc61dd..2ba25b6 100755
--- a/python-pypi/pyasn1/DETAILS
+++ b/python-pypi/pyasn1/DETAILS
@@ -1,10 +1,10 @@
SPELL=pyasn1
- VERSION=0.1.5
+ VERSION=0.1.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:2011fb6362ade9159821d5517d41a5b46f123ffc48d89b4a314ccbc22f64f9ee91134ffe616b736ecd2689c7b40f86f27e7fc398933366b3cd231e9cf25cb641
+
SOURCE_HASH=sha512:5e5eadc20aa0c22bab0280e7c7c8fa58e9c22530bd6af1344dd9448527e6cd008fc4a9c0365072970b9e09c499640bc9c61ea795e9f136b28febd692875c6db4
WEB_SITE=http://pyasn1.sourceforge.net/
ENTERED=20060930
LICENSE[0]=BSD
diff --git a/python-pypi/pyasn1/HISTORY b/python-pypi/pyasn1/HISTORY
index b47d24b..82c5f9d 100644
--- a/python-pypi/pyasn1/HISTORY
+++ b/python-pypi/pyasn1/HISTORY
@@ -1,3 +1,6 @@
+2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.1.6
+
2013-01-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.1.5

diff --git a/python-pypi/python-mpd/DETAILS b/python-pypi/python-mpd/DETAILS
index 6870909..339a61b 100755
--- a/python-pypi/python-mpd/DETAILS
+++ b/python-pypi/python-mpd/DETAILS
@@ -1,12 +1,9 @@
SPELL=python-mpd
SPELLX=${SPELL}2
- VERSION=0.4.3
+ VERSION=0.5.0
SOURCE=$SPELLX-$VERSION.tar.bz2
- SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELLX/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=jthalheim.gpg:$SOURCE2:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
+
SOURCE_HASH=sha512:b275c9ee0b98fa51b5396571504181cdf78e24b2a384ccd5bdadff2bd3ea29bb90811c43b269c369839b63b738545e45cf92e39063de181f898fbb78f77d1c0f
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=https://github.com/Mic92/python-mpd2
LICENSE[0]=LGPL
diff --git a/python-pypi/python-mpd/HISTORY b/python-pypi/python-mpd/HISTORY
index dc12dc4..a9b0266 100644
--- a/python-pypi/python-mpd/HISTORY
+++ b/python-pypi/python-mpd/HISTORY
@@ -1,3 +1,7 @@
+2013-01-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.5.0; switched to hashsum
+ * jthalheim.gpg: removed
+
2012-07-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.4.3
* jthalheim.gpg: added key D7CC79FA (Jörg Thalheim
<jthalheim AT gmail.com>)
diff --git a/python-pypi/python-mpd/jthalheim.gpg
b/python-pypi/python-mpd/jthalheim.gpg
deleted file mode 100644
index 1c74254..0000000
Binary files a/python-pypi/python-mpd/jthalheim.gpg and /dev/null differ
diff --git a/python-pypi/python-ssh/DETAILS b/python-pypi/python-ssh/DETAILS
index fc8d955..0c4333f 100755
--- a/python-pypi/python-ssh/DETAILS
+++ b/python-pypi/python-ssh/DETAILS
@@ -1,9 +1,9 @@
SPELL=python-ssh
SPELLX=ssh
- VERSION=1.7.14
+ VERSION=1.8.0
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELLX/$SOURCE
-
SOURCE_HASH=sha512:0c5b20cfc8fd8b3412fa371e1368607a2688af00ccad44a70b0d71e9aed8ccbe79c1063bbc4c65f0de3cf287fa0d1a3c116d89ab01139d8d6070db1a6ad80c12
+
SOURCE_HASH=sha512:bac32c2cf078c2a06b4b530c905e4b8e0c09b457d9d9feaee163d3a96d71b43c74d159a25ad65bcb4beba692b05b7587e60b4a13be7d049f8493977f9a032da7
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://pypi.python.org/pypi/ssh/
ENTERED=20111025
diff --git a/python-pypi/python-ssh/HISTORY b/python-pypi/python-ssh/HISTORY
index bd64b63..e8c518f 100644
--- a/python-pypi/python-ssh/HISTORY
+++ b/python-pypi/python-ssh/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.0
+
2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.14

diff --git a/python-pypi/pytz/DETAILS b/python-pypi/pytz/DETAILS
index 81759de..cc428fa 100755
--- a/python-pypi/pytz/DETAILS
+++ b/python-pypi/pytz/DETAILS
@@ -1,8 +1,8 @@
SPELL=pytz
- VERSION=2012h
+ VERSION=2012j
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:40e3640524e186314558f1be1c0b67deea39be6a45ac1b09589bc426a036fe3094cf50e17b58e42f22c7eae90367b8bbe0259ee537fde65b8a1cf8fbff54a808
+
SOURCE_HASH=sha512:52dec29039f415d8b4c6c44994b3d147edcf21fd03a9c065f392417da22bd5b9f966546e13be0014223170a21873f4cdc79a459d298b5546b34a5d66e1ab59c4
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pytz.sourceforge.net/
LICENSE[0]=BSD
diff --git a/python-pypi/pytz/HISTORY b/python-pypi/pytz/HISTORY
index 27f62bb..cdd4000 100644
--- a/python-pypi/pytz/HISTORY
+++ b/python-pypi/pytz/HISTORY
@@ -1,3 +1,6 @@
+2013-01-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2012j
+
2012-11-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2012h

diff --git a/ruby-raa/ruby-1.8/HISTORY b/ruby-raa/ruby-1.8/HISTORY
index 106030e..059a715 100644
--- a/ruby-raa/ruby-1.8/HISTORY
+++ b/ruby-raa/ruby-1.8/HISTORY
@@ -1,3 +1,8 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply stdout-rouge-fix.patch
+ * stdout-rouge-fix.patch: Fix glibc 2.14+ compilation
+ From http://bugs.ruby-lang.org/issues/5108
+
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.7-p358; SECURITY_PATCH++; updated
mirrorlist
@@ -25,7 +30,7 @@
2010-01-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.1-p376
SECURITY_PATCH++, fixes CVE-2009-4124, fixes bug #15542
-
+
2009-08-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.7-p174; SECURITY_PATCH++

@@ -102,7 +107,7 @@

2006-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: remove -fomit-frame-pointer from CFLAGS as this causes a
- SEGFAULT #12643
+ SEGFAULT #12643

2006-11-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH
@@ -120,7 +125,7 @@
* PRE_BUILD, yaml-bignum-fix.patch: removed

2006-08-15 Juuso Alasuutari <iuso AT sourcemage.org>
- * DETAILS: [automated] Removed UPDATED (deprecated in favor of
+ * DETAILS: [automated] Removed UPDATED (deprecated in favor of
PATCHLEVEL).

2006-03-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
@@ -176,3 +181,4 @@

2002-10-03 Julian v. Bock <julian AT wongr.net>
* DETAILS: add LICENSE and MD5 fields.
+
diff --git a/ruby-raa/ruby-1.8/PRE_BUILD b/ruby-raa/ruby-1.8/PRE_BUILD
new file mode 100755
index 0000000..91e5271
--- /dev/null
+++ b/ruby-raa/ruby-1.8/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Applying fix for glibc 2.14+...${DEFAULT_COLOR}" &&
+patch "${SOURCE_DIRECTORY}"/lib/mkmf.rb \
+ "${SPELL_DIRECTORY}"/stdout-rouge-fix.patch
diff --git a/ruby-raa/ruby-1.8/stdout-rouge-fix.patch
b/ruby-raa/ruby-1.8/stdout-rouge-fix.patch
new file mode 100644
index 0000000..58c8583
--- /dev/null
+++ b/ruby-raa/ruby-1.8/stdout-rouge-fix.patch
@@ -0,0 +1,36 @@
+# From http://bugs.ruby-lang.org/issues/5108
+diff --git a/lib/mkmf.rb b/lib/mkmf.rb
+index c9e738a..7a8004d 100644
+--- a/lib/mkmf.rb
++++ b/lib/mkmf.rb
+@@ -201,20 +201,26 @@ end
+ module Logging
+ @log = nil
+ @logfile = 'mkmf.log'
+- @orgerr = $stderr.dup
+- @orgout = $stdout.dup
+ @postpone = 0
+ @quiet = $extmk
+
+ def self::open
+ @log ||= File::open(@logfile, 'w')
+ @log.sync = true
++ orgerr = $stderr.dup
++ orgout = $stdout.dup
+ $stderr.reopen(@log)
+ $stdout.reopen(@log)
+ yield
+ ensure
+- $stderr.reopen(@orgerr)
+- $stdout.reopen(@orgout)
++ if orgerr
++ $stderr.reopen(orgerr)
++ orgerr.close
++ end
++ if orgout
++ $stdout.reopen(orgout)
++ orgout.close
++ end
+ end
+
+ def self::message(*s)
diff --git a/science/avogadro/DETAILS b/science/avogadro/DETAILS
index 7b5792f..4d24f03 100755
--- a/science/avogadro/DETAILS
+++ b/science/avogadro/DETAILS
@@ -1,6 +1,6 @@
SPELL=avogadro
- VERSION=1.0.3
-
SOURCE_HASH=sha512:49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210
+ VERSION=1.1.0
+
SOURCE_HASH=sha512:d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/science/avogadro/HISTORY b/science/avogadro/HISTORY
index 0f721c5..41f8191 100644
--- a/science/avogadro/HISTORY
+++ b/science/avogadro/HISTORY
@@ -1,3 +1,6 @@
+2013-01-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.0
+
2011-04-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 1.0.3
fixed long description wrap
diff --git a/utils/file/BUILD b/utils/file/BUILD
index aecc2ab..b328d4c 100755
--- a/utils/file/BUILD
+++ b/utils/file/BUILD
@@ -3,5 +3,6 @@
--prefix=/usr \
--datadir=$TRACK_ROOT/usr/share/misc \
--mandir=$TRACK_ROOT/usr/share/man \
+ --enable-static \
$OPTS &&
make DESTDIR=$INSTALL_ROOT
diff --git a/utils/file/DETAILS b/utils/file/DETAILS
index 21e2f94..15c2fe6 100755
--- a/utils/file/DETAILS
+++ b/utils/file/DETAILS
@@ -1,6 +1,7 @@
SPELL=file
- VERSION=5.11
-
SOURCE_HASH=sha512:a3f740e1a950f84ae53ef477ff255370050b52dd39fa309c8b8c4b0dc061e96fce585eb4a587037003509c01cd067d49e5193f1d0905e5c28347223a15aa271b
+ VERSION=5.12
+ PATCHLEVEL=1
+
SOURCE_HASH=sha512:a982eb0126c7c6028f84bd66da343739e4bf30eeeb4c988d83c172d1797239401858f78faaec87a577bc3a306aae32a7e9c1963b989b380d6aa7b5115076ede4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.astron.com/pub/file/$SOURCE
diff --git a/utils/file/HISTORY b/utils/file/HISTORY
index 3001c44..b0e6fbb 100644
--- a/utils/file/HISTORY
+++ b/utils/file/HISTORY
@@ -1,3 +1,7 @@
+2013-01-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.12
+ * BUILD: include static version of library
+
2012-02-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 5.11

diff --git a/video-libs/gst-ffmpeg/DEPENDS b/video-libs/gst-ffmpeg/DEPENDS
index 70ab958..ebc99b1 100755
--- a/video-libs/gst-ffmpeg/DEPENDS
+++ b/video-libs/gst-ffmpeg/DEPENDS
@@ -1,12 +1,8 @@
-
depends gst-plugins-base &&
depends gstreamer &&
depends LZMA &&
depends bzip2 &&
depends glib2 &&
-depends icu &&
-depends libffi &&
depends libxml2 &&
depends orc &&
-depends pcre &&
depends zlib
diff --git a/video-libs/gst-ffmpeg/HISTORY b/video-libs/gst-ffmpeg/HISTORY
index 08f92b0..20646d2 100644
--- a/video-libs/gst-ffmpeg/HISTORY
+++ b/video-libs/gst-ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2013-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: removed dependencies on icu, libffi, pcre
+
2012-12-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: PATCH_LEVEL -> PATCHLEVEL

diff --git a/windowmanagers/fluxbox/BUILD b/windowmanagers/fluxbox/BUILD
index c3bf9b1..3d8e291 100755
--- a/windowmanagers/fluxbox/BUILD
+++ b/windowmanagers/fluxbox/BUILD
@@ -2,12 +2,6 @@ if [[ $FLUXBOX_BRANCH == scm ]]; then
./autogen.sh
fi &&

-if is_depends_enabled $SPELL fribidi && is_depends_enabled fribidi glib2;
then
- CXXFLAGS="-I$INSTALL_ROOT/usr/include/glib-2.0 \
- -I$INSTALL_ROOT/usr/lib/glib-2.0/include \
- $CXXFLAGS"
-fi &&
-
OPTS="$FLUXBOX_OPTS $OPTS" &&

default_build
diff --git a/windowmanagers/fluxbox/CONFIGURE
b/windowmanagers/fluxbox/CONFIGURE
index 8dc6a74..b0a0dcc 100755
--- a/windowmanagers/fluxbox/CONFIGURE
+++ b/windowmanagers/fluxbox/CONFIGURE
@@ -3,14 +3,8 @@ list_remove FLUXBOX_OPTS '--disable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-ordered-pseudo' &&
list_remove FLUXBOX_OPTS '--enable-gnome' &&
list_remove FLUXBOX_OPTS '--disable-gnome' &&
-list_remove FLUXBOX_OPTS '--enable-randr1.2' &&
-list_remove FLUXBOX_OPTS '--disable-randr1.2' &&
-list_remove FLUXBOX_OPTS '--enable-newwmspec' &&
-list_remove FLUXBOX_OPTS '--disable-newwmspec' &&
-list_remove FLUXBOX_OPTS '--enable-timed-cache' &&
-list_remove FLUXBOX_OPTS '--disable-timed-cache' &&

-config_query FLUXBOX_CONF "Go through all (9) configuration options?" n &&
+config_query FLUXBOX_CONF "Go through all (8) configuration options?" n

if [[ $FLUXBOX_CONF == y ]]; then
config_query_option FLUXBOX_OPTS "include code for the Slit?" y \
@@ -29,21 +23,17 @@ if [[ $FLUXBOX_CONF == y ]]; then
"--enable-regexp" \
"--disable-regexp" &&

- config_query_option FLUXBOX_OPTS "enable support for Extended Window
Manager Hints?" y \
- "--enable-ewmh" \
- "--disable-ewmh" &&
+ config_query_option FLUXBOX_OPTS "include code for new WM Spec?" y \
+ "--enable-newwmspec" \
+ "--disable-newwmspec" &&

config_query_option FLUXBOX_OPTS "include verbose debugging code?" n \
"--enable-debug" \
"--disable-debug" &&

- config_query_option FLUXBOX_OPTS "build programs used in testing fluxbox?"
n \
- "--enable-test" \
- "--disable-test" &&
-
config_query_option FLUXBOX_OPTS "use new timed pixmap cache?" y \
- "--enable-timedcache" \
- "--disable-timedcache" &&
+ "--enable-timed-cache" \
+ "--disable-timed-cache" &&

config_query_option FLUXBOX_OPTS "include Xmb (multibyte font, utf-8)
support?" y \
"--enable-xmb" \
diff --git a/windowmanagers/fluxbox/DEPENDS b/windowmanagers/fluxbox/DEPENDS
index fd3a5d0..da8aae5 100755
--- a/windowmanagers/fluxbox/DEPENDS
+++ b/windowmanagers/fluxbox/DEPENDS
@@ -47,6 +47,12 @@ optional_depends libxrandr \
"--disable-randr" \
"for X Randr extension support" &&

+if is_depends_enabled $SPELL libxrandr; then
+ config_query_option FLUXBOX_OPTS "enable RANDR 1.2 support?" y \
+ "--enable-randr1.2" \
+ "--disable-randr1.2"
+fi &&
+
optional_depends fribidi \
"--enable-fribidi" \
"--disable-fribidi" \
diff --git a/windowmanagers/fluxbox/DETAILS b/windowmanagers/fluxbox/DETAILS
index b6f1a6c..6008d69 100755
--- a/windowmanagers/fluxbox/DETAILS
+++ b/windowmanagers/fluxbox/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=1.3.3
+ VERSION=1.3.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/windowmanagers/fluxbox/HISTORY b/windowmanagers/fluxbox/HISTORY
index b341f16..c40622a 100644
--- a/windowmanagers/fluxbox/HISTORY
+++ b/windowmanagers/fluxbox/HISTORY
@@ -1,10 +1,3 @@
-2012-12-31 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 1.3.3
- * CONFIGURE: dropped deprecated randr1.2 flags; fixed timedcache
flags;
- added test flags; swapped deprecated flags with ewmh support
- * BUILD: fixed fribidi detection, when built with glib support
- * size_t.patch: dropped, fixed by upstream
-
2011-10-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.3.2
* DEPENDS, CONFIGURE: renewed optional flags
diff --git a/windowmanagers/fluxbox/PRE_BUILD
b/windowmanagers/fluxbox/PRE_BUILD
index f4306f4..6f597d5 100755
--- a/windowmanagers/fluxbox/PRE_BUILD
+++ b/windowmanagers/fluxbox/PRE_BUILD
@@ -3,6 +3,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+# Version 1.3.2 needs this patch, git not anymore.
+[[ $FLUXBOX_GIT == y ]] || patch -p0 < "$SPELL_DIRECTORY/size_t.patch" &&
+
if is_depends_enabled $SPELL fribidi && is_version_less $(installed_version
fribidi) 0.19; then
patch -p0 < "$SPELL_DIRECTORY/fribidi.patch" &&
autoreconf -i
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
new file mode 100644
index 0000000..b3d3f00
Binary files /dev/null and b/windowmanagers/fluxbox/fluxbox-1.3.2.tar.bz2.sig
differ
diff --git a/windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig
b/windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig
deleted file mode 100644
index 78eae0a..0000000
Binary files a/windowmanagers/fluxbox/fluxbox-1.3.3.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/fluxbox/size_t.patch
b/windowmanagers/fluxbox/size_t.patch
new file mode 100644
index 0000000..cca7cd0
--- /dev/null
+++ b/windowmanagers/fluxbox/size_t.patch
@@ -0,0 +1,70 @@
+diff -ru src/FbTk/LayerItem.hh ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh
+--- src/FbTk/LayerItem.hh 2011-02-24 17:00:37.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/LayerItem.hh 2011-04-11
07:37:09.000000000 +0200
+@@ -25,6 +25,7 @@
+
+ #include "Layer.hh"
+ #include "NotCopyable.hh"
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/FbTk/MacroCommand.hh
../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh
+--- src/FbTk/MacroCommand.hh 2009-10-04 21:45:38.000000000 +0200
++++ ../fluxbox-1.3.1-size_t/src/FbTk/MacroCommand.hh 2011-04-11
07:35:02.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "Command.hh"
+ #include "RefCount.hh"
+
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/FbTk/Makefile.in ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in
+--- src/FbTk/Makefile.in 2011-02-27 18:40:24.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/Makefile.in 2011-04-10
23:35:33.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+diff -ru src/FbTk/MultLayers.hh
../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh
+--- src/FbTk/MultLayers.hh 2011-02-24 17:00:37.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/FbTk/MultLayers.hh 2011-04-11
07:36:19.000000000 +0200
+@@ -23,6 +23,7 @@
+ #ifndef FBTK_MULTLAYERS_HH
+ #define FBTK_MULTLAYERS_HH
+
++#include <sys/types.h>
+ #include <vector>
+
+ namespace FbTk {
+diff -ru src/Makefile.in ../fluxbox-1.3.1-size_t/src/Makefile.in
+--- src/Makefile.in 2011-02-27 18:40:24.000000000 +0100
++++ ../fluxbox-1.3.1-size_t/src/Makefile.in 2011-04-10 23:35:33.000000000
+0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -569,7 +569,7 @@
+ # (which will cause the Makefiles to be regenerated when you run
`make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -594,7 +594,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
++ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Only in ../fluxbox-1.3.1-size_t/src/: defaults.cc
diff --git a/windowmanagers/xmonad/DEPENDS b/windowmanagers/xmonad/DEPENDS
index bf6249f..daac485 100755
--- a/windowmanagers/xmonad/DEPENDS
+++ b/windowmanagers/xmonad/DEPENDS
@@ -1,4 +1,5 @@
depends ghc &&
depends haskell-x11 &&
depends haskell-mtl &&
+depends haskell-utf8-string &&
depends haskell-extensible-exceptions
diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS
index 0d8892c..d50c82e 100755
--- a/windowmanagers/xmonad/DETAILS
+++ b/windowmanagers/xmonad/DETAILS
@@ -1,8 +1,8 @@
SPELL=xmonad
- VERSION=0.10
+ VERSION=0.11
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:a80b688f20ea10335e2381c40bc425493582e3dbf09a6c9133f875e451b937a8c4255853e570f90d820bbf80e45d148c5e23bbdbb1850d0b6bcfb52db27ed83c
+
SOURCE_HASH=sha512:34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xmonad.org";
LICENSE[0]=BSD3
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index cd0e530..8500329 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,7 @@
+2013-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11
+ * DEPENDS: added dependency on haskell-utf8-string
+
2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add dependency on haskell-extensible-exceptions

diff --git a/wm-addons/xmonad-contrib/DEPENDS
b/wm-addons/xmonad-contrib/DEPENDS
index 0cdfeae..6ca2034 100755
--- a/wm-addons/xmonad-contrib/DEPENDS
+++ b/wm-addons/xmonad-contrib/DEPENDS
@@ -3,4 +3,5 @@ depends haskell-x11 &&
depends haskell-mtl &&
depends haskell-utf8-string &&
depends haskell-random &&
+depends haskell-extensible-exceptions &&
depends xmonad
diff --git a/wm-addons/xmonad-contrib/DETAILS
b/wm-addons/xmonad-contrib/DETAILS
index 3d9db14..996f465 100755
--- a/wm-addons/xmonad-contrib/DETAILS
+++ b/wm-addons/xmonad-contrib/DETAILS
@@ -1,8 +1,8 @@
SPELL=xmonad-contrib
- VERSION=0.10
+ VERSION=0.11
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:b2cf743319c9bdf22074b71d28035781b44d60c70794cf5497abd51fb52e8dee569818f37bf9c05330630ab97927fe217b9e0733844a244396d3214b0bf32937
+
SOURCE_HASH=sha512:ed6c72de3aa5ca652cc8f0c1d69799c9d77f38b37c2763e8a07b0cbc6bd0d18ad57a3f4914a9e7084668a8901df0e98820900f057bb1e42ce224541e56a2b748
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xmonad.org";
LICENSE[0]=BSD3
diff --git a/wm-addons/xmonad-contrib/HISTORY
b/wm-addons/xmonad-contrib/HISTORY
index 92c4cad..d4a094a 100644
--- a/wm-addons/xmonad-contrib/HISTORY
+++ b/wm-addons/xmonad-contrib/HISTORY
@@ -1,3 +1,7 @@
+2012-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11
+ * DEPENDS: added dependency on haskell-extensible-exceptions
+
2011-11-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.10

diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 22e621d..b451e06 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.20
+ VERSION=1.5.21
else
VERSION=1.4.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 18a25bd..a15fd4c 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated devel to 1.5.21
+
2012-12-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated devel to 1.5.20

diff --git a/xfce/tumbler/DETAILS b/xfce/tumbler/DETAILS
index a9a514d..607e3fa 100755
--- a/xfce/tumbler/DETAILS
+++ b/xfce/tumbler/DETAILS
@@ -1,11 +1,11 @@
SPELL=tumbler
- VERSION=0.1.26
+ VERSION=0.1.27
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://archive.xfce.org/src/xfce/$SPELL/$BRANCH/$SOURCE
WEB_SITE=http://www.xfce.org/
-
SOURCE_HASH=sha512:72c3bffa594f3a99e599dee7d35544cdc5fd21a18397b1b0b045378ed10037879aa14fb95a02040348da7cfdf65cfd932b92f1eeda529b5c86c378da98d8e06a
+
SOURCE_HASH=sha512:aec319300536cf890f101c258b290ab8b792b5effcffd4256a86e0cab66147ee06c454f16a5105cdf0b45cbb064b84706a7b1676b4410b0b960749e319d57127
LICENSE[0]=GPL
ENTERED=20121130
KEYWORDS="xfce"
diff --git a/xfce/tumbler/HISTORY b/xfce/tumbler/HISTORY
index ce2e470..6b280d9 100644
--- a/xfce/tumbler/HISTORY
+++ b/xfce/tumbler/HISTORY
@@ -1,3 +1,6 @@
+2013-01-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.1.27
+
2012-12-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.1.26




  • [SM-Commit] GIT changes to devel-kde49 grimoire by Ladislav Hagara (7a63de92eeeb1aa55764c0982dcd0697ffe17582), Ladislav Hagara, 01/14/2013

Archive powered by MHonArc 2.6.24.

Top of Page