Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (9c03e1d1989d71747ed5363af9978f83667156c6)
  • Date: Tue, 8 Jan 2013 06:47:01 -0600

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

ChangeLog | 10 +++
audio-players/cmus/CONFIGURE | 2
audio-players/mpd/DETAILS | 4 -
audio-players/mpd/HISTORY | 3
cluster/drbd/DETAILS | 20 ++++--
cluster/drbd/HISTORY | 3
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 +++++++++++++++++++
dev/null |binary
devel/ccache/DETAILS | 2
devel/ccache/HISTORY | 3
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
e-17/eet/CONFLICTS | 1
e-17/eet/HISTORY | 3
e-17/efl/CONFLICTS | 14 ++--
e-17/efl/DEPENDS | 64 ++++++++++++++++++-
e-17/efl/HISTORY | 10 +++
e-17/efl/INSTALL | 2
e-17/eina/BUILD | 4 -
e-17/eina/CONFIGURE | 7 --
e-17/eina/CONFLICTS | 1
e-17/eina/DETAILS | 16 ----
e-17/eina/HISTORY | 6 +
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.4.tar.gz.sig |binary
e-17/embryo/CONFLICTS | 1
e-17/embryo/HISTORY | 3
e-17/eobj/CONFLICTS | 1
e-17/eobj/HISTORY | 3
e-17/ephysics/DEPENDS | 2
e-17/ephysics/HISTORY | 3
e-17/evas/CONFLICTS | 1
e-17/evas/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/opencv/BUILD | 2
graphics-libs/opencv/HISTORY | 1
libs/upower/DETAILS | 4 -
libs/upower/HISTORY | 3
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
python-pypi/fabric/DEPENDS | 8 ++
python-pypi/fabric/DETAILS | 4 -
python-pypi/fabric/HISTORY | 4 +
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-ssh/DETAILS | 4 -
python-pypi/python-ssh/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
+++++++++++++++++++++
x11-libs/wine/DETAILS | 2
x11-libs/wine/HISTORY | 3
104 files changed, 587 insertions(+), 136 deletions(-)

New commits:
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

diff --git a/ChangeLog b/ChangeLog
index 6cdc354..34bbefa 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
@@ -2706,6 +2713,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-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/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/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/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/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/HISTORY b/e-17/eet/HISTORY
index 2f51014..040fdfb 100644
--- a/e-17/eet/HISTORY
+++ b/e-17/eet/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * 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/efl/CONFLICTS b/e-17/efl/CONFLICTS
index 06ce2ec..46dd403 100755
--- a/e-17/efl/CONFLICTS
+++ b/e-17/efl/CONFLICTS
@@ -1,9 +1,9 @@
-conflicts eina &&
-conflicts eet &&
-conflicts embryo &&
-conflicts evas &&
conflicts ecore &&
-conflicts eio &&
-conflicts efreet &&
conflicts edbus &&
-conflicts eobj
+conflicts eet &&
+conflicts efreet &&
+conflicts eina &&
+conflicts eio &&
+conflicts embryo &&
+conflicts eobj &&
+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..ee61972 100644
--- a/e-17/efl/HISTORY
+++ b/e-17/efl/HISTORY
@@ -1,3 +1,12 @@
+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 +22,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/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..d3891d0 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
+ VERSION=1.7.4
SOURCE=$SPELL-$VERSION.tar.gz
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..631a315 100644
--- a/e-17/eina/HISTORY
+++ b/e-17/eina/HISTORY
@@ -1,3 +1,9 @@
+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.4.tar.gz.sig b/e-17/eina/eina-1.7.4.tar.gz.sig
new file mode 100644
index 0000000..f5848af
Binary files /dev/null and b/e-17/eina/eina-1.7.4.tar.gz.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/HISTORY b/e-17/embryo/HISTORY
index ab47d74..4df0ba1 100644
--- a/e-17/embryo/HISTORY
+++ b/e-17/embryo/HISTORY
@@ -1,3 +1,6 @@
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with efl
+
2011-11-12 Robin Cook <rcook AT wyrms.net>
* DEPENDS: added eina

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/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/HISTORY b/e-17/evas/HISTORY
index c9bedd8..0985e7d 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/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 eobj as scm depends

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/opencv/BUILD b/graphics-libs/opencv/BUILD
index 21e0b59..4e7d3e5 100755
--- a/graphics-libs/opencv/BUILD
+++ b/graphics-libs/opencv/BUILD
@@ -1,4 +1,6 @@
CXXFLAGS=-D__STDC_CONSTANT_MACROS &&
+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
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 022deac..732e07b 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,5 +1,6 @@
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
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/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/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/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-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/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/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




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (9c03e1d1989d71747ed5363af9978f83667156c6), Vlad Glagolev, 01/08/2013

Archive powered by MHonArc 2.6.24.

Top of Page