Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (0a6cd9c91dd3a15d6f7dee154187d86e35f5a2e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (0a6cd9c91dd3a15d6f7dee154187d86e35f5a2e1)
  • Date: Sat, 7 Sep 2013 02:00:51 -0500

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

audio-drivers/pulseaudio/DEPENDS | 14 +-
audio-drivers/pulseaudio/HISTORY | 4
crypto/gnutls/DETAILS | 2
crypto/gnutls/HISTORY | 3
database/sqlite/DETAILS | 6
database/sqlite/HISTORY | 3
dev/null |binary
e-17/e17/DEPENDS | 5
e-17/e17/HISTORY | 4
e-17/evas/DEPENDS | 3
e-17/evas/HISTORY | 3
gnome2-libs/dconf/DETAILS | 6
gnome2-libs/dconf/HISTORY | 4
graphics-libs/cegui/DEPENDS | 9 -
graphics-libs/cegui/HISTORY | 3
i18n/ibus-anthy/DEPENDS | 6
i18n/ibus-anthy/DETAILS | 5
i18n/ibus-anthy/HISTORY | 4
i18n/ibus/DEPENDS | 39
+++++
i18n/ibus/DETAILS | 5
i18n/ibus/HISTORY | 4
libs/sdl/DEPENDS | 1
libs/sdl/HISTORY | 4
libs/sdl/PRE_SUB_DEPENDS | 2
libs/sdl/REPAIR^f2c2d723cb24017050035a9c9cd3f210^PRE_SUB_DEPENDS | 5
libs/sdl/SUB_DEPENDS | 2
libs/tbb/HISTORY | 3
libs/tbb/INSTALL | 2
mail/claws-mail/CONFIGURE | 68
+++++++++-
mail/claws-mail/DEPENDS | 68
+++++++++-
mail/claws-mail/HISTORY | 4
mail/postfix/DETAILS | 2
mail/postfix/HISTORY | 3
net/amap/BUILD | 1
net/amap/DEPENDS | 1
net/amap/DETAILS | 24
+--
net/amap/DOWNLOAD | 1
net/amap/HISTORY | 5
net/amap/INSTALL | 1
net/amap/PRE_BUILD | 1
net/amap/UP_TRIGGERS | 2
net/thc-amap/BUILD | 9 -
net/thc-amap/CONFLICTS | 1
net/thc-amap/DETAILS | 5
net/thc-amap/HISTORY | 6
net/thc-amap/INSTALL | 9 -
net/thc-amap/PRE_BUILD | 5
perl-cpan/x11-protocol/DEPENDS | 8 -
perl-cpan/x11-protocol/HISTORY | 4
printer/ghostscript/DETAILS | 4
printer/ghostscript/HISTORY | 3
python-pypi/mercurial/DETAILS | 4
python-pypi/mercurial/HISTORY | 3
qt5/qtbase/DETAILS | 4
qt5/qtbase/HISTORY | 3
qt5/qtdeclarative/DETAILS | 4
qt5/qtdeclarative/HISTORY | 3
qt5/qtgraphicaleffects/DETAILS | 4
qt5/qtgraphicaleffects/HISTORY | 3
qt5/qtimageformats/DETAILS | 4
qt5/qtimageformats/HISTORY | 5
qt5/qtjsbackend/DETAILS | 4
qt5/qtjsbackend/HISTORY | 3
qt5/qtmultimedia/DETAILS | 4
qt5/qtmultimedia/HISTORY | 3
qt5/qtquick1/DETAILS | 4
qt5/qtquick1/HISTORY | 5
qt5/qtquickcontrols/DETAILS | 4
qt5/qtquickcontrols/HISTORY | 3
qt5/qtscript/DETAILS | 4
qt5/qtscript/HISTORY | 3
qt5/qtsvg/DETAILS | 4
qt5/qtsvg/HISTORY | 3
qt5/qttools/DETAILS | 4
qt5/qttools/HISTORY | 5
qt5/qtwebkit5/DETAILS | 4
qt5/qtwebkit5/HISTORY | 3
qt5/qtx11extras/DETAILS | 4
qt5/qtx11extras/HISTORY | 3
qt5/qtxmlpatterns/DETAILS | 4
qt5/qtxmlpatterns/HISTORY | 3
utils/qemu/DEPENDS | 5
utils/qemu/HISTORY | 4
utils/qemu/PRE_SUB_DEPENDS | 6
utils/qemu/REPAIR^none^PRE_SUB_DEPENDS | 6
utils/qemu/SUB_DEPENDS | 6
utils/spice-gtk/DEPENDS | 17 ++
utils/spice-gtk/HISTORY | 6
utils/spice/DEPENDS | 32
+++-
utils/spice/HISTORY | 6
x11/gtk-vnc/CONFIGURE | 5
x11/gtk-vnc/DEPENDS | 9 +
x11/gtk-vnc/HISTORY | 4
x11/gtk-vnc/PRE_SUB_DEPENDS | 8 -
x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS | 8 +
x11/gtk-vnc/SUB_DEPENDS | 2
x11/virt-viewer/CONFIGURE | 2
x11/virt-viewer/DEPENDS | 13 +
x11/virt-viewer/HISTORY | 3
x11/virt-viewer/PRE_SUB_DEPENDS | 8 +
x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS | 8 +
x11/virt-viewer/SUB_DEPENDS | 21
+++
x11/xscreensaver/DEPENDS | 13 +
x11/xscreensaver/DETAILS | 5
x11/xscreensaver/HISTORY | 5
x11/xscreensaver/xscreensaver-5.22.tar.gz.sig |binary
xfce/xfce4-profile/DEPENDS | 2
xfce/xfce4-profile/HISTORY | 3
108 files changed, 571 insertions(+), 133 deletions(-)

New commits:
commit 4701d4cf7351a59430adb6fe03b10d20fb663f3a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

postfix: => 2.9.8

commit f78a62e8034f57c9c2ddf6b04efefab76b3eee0a
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Deprecation: amap (cont.)

After the initial deprecation attempt for amap it was found with
additional follow up and investigation that the wrong file
(TRIGGERS) was created. This file has been removed and the correct
file (UP_TRIGGERS) has been created with the appropriate lines added.

Also, it was found that in the preferred spell (thc_amap) the
CONFLICTS file was missing. This file has also been created and the
apprpriate line added.

commit e97f1cdba3e794e8b0cf5c7876a69b8515fc02c9
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

ibus-anthy: updated to 1.5.3

commit cbc621d27909d0c0dea0dc0761c5257b145b16f8
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

ibus: updated to 1.5.3

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

cegui: Replaced xorg-libs with libx11 and libxxf86vm

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

pulseaudio: gtk+2 support also needs libxxf86vm

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

pulseaudio: Replaced xorg-libs with libx11, libice, libsm, libxext,
libxtst

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

sdl: Replaced xorg-libs with libx11

Additionally depend on libice when depending on libx11

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

xfce4-profile: Replaced runtime dependency on xorg-libs with X11-SERVER

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

xscreensaver: Updated to 5.22

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

xscreensaver: Replaced xorg-libs

Replaced xorg-libs with libice, libx11, libxxf86misc, libxxf86vm,
libxi, libxmu, libxrender, and libxt

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

evas: Replaced xorg-libs with libsm and libx11

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

x11-protocol: Replace xorg-libs with libx11, libxau, and libxext
as runtime dependencies
Per README, doesn't require an X11-SERVER on the current machine

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

e17: Replace xorg-libs with libx11, libxau, libxdmcp, and libxext

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

mercurial: => 2.7.1

commit 83f3109a1a2134c53bd3795a1623b51712f037a9
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Update: thc-amap 5.2 -> 5.4

This is a simple version bump. Three files (BUILD, INSTALL, and
PRE_BUILD) have been removed as no longer being required.

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

virt-viewer: Allow for selecting spice-gtk or gtk-vnc, these are
exclusive options

Without this selection, ./configure fails and specifies that one must
be disabled for the other to live (compile).

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

gtk-vnc: Allow for building gtk-vnc without an external entity enforcing
gtk+2|3

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

gtk-vnc: Suggest virt-viewer with appropriate gtk

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

spice-gtk: Optionally depend on qemu with nss for smart cards

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

spice-gtk: Suggest virt-viewer for a better spice client
See http://spice-space.org/download.html
Make sure virt-viewer uses spice and the same GTK as spice-gtk

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

spice: Optionally depends on qemu with nss

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

spice: Optionally depends on libxinerama

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

spice: OPENGL optional dependency is for the spice client

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

spice: Optionally depends on LIBSASL

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

spice: Depends on qemu built with nss support

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

qemu: Optionally depends on nss
*SUB_DEPENDS: Allow forcing dependency on nss

commit 2daaa4893721e10dccc06499b298d962c8caa04b
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Deprecation: amap

After this spell was created it was found to already exist under
a similar name, thc-amap. As the duplicate spell was pushed to the
repository, a deprecation was created and the duplicate spell will
be removed after an appropriate amount of time has passed, currently
about two weeks.

Quill was used to setup the deprecation. Besides the minute update
to the HISTORY file, no other changed have been made against quill's
setup.

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

sqlite: => 3.8.0.2

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

qtwebkit5: => 5.1.1

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

qtquickcontrols: => 5.1.1

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

qtquick1: => 5.1.1

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

qtx11extras: => 5.1.1

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

qtmultimedia: => 5.1.1

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

qtgraphicaleffects: => 5.1.1

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

qtimageformats: => 5.1.1

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

qttools: => 5.1.1

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

qtsvg: => 5.1.1

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

qtscript: => 5.1.1

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

qtdeclarative: => 5.1.1

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

qtjsbackend: => 5.1.1

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

qtxmlpatterns: => 5.1.1

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

qtbase: => 5.1.1

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

ghostscript: => 9.10

commit e60fb856ee6c5bc01eb6e290f1f83aa18b82b233
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

tbb: adde -f to link command

commit 700e6f0579af286981cec318ea51e98885d5d8bb
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

dconf: updated to 0.16.1

commit f10f988e5f587660dff68de58ebccfe7d93f5c25
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

claws-mail: added additional configure and optional depends

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

gnutls: => 3.2.4

diff --git a/audio-drivers/pulseaudio/DEPENDS
b/audio-drivers/pulseaudio/DEPENDS
index 8364f5b..21f5f34 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -17,10 +17,17 @@ optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
"for Native Language Support" &&
-optional_depends xorg-libs \
+optional_depends libx11 \
"--enable-x11" \
"--disable-x11" \
"Enable X11 support?" &&
+
+if is_depends_enabled $SPELL libx11; then
+ depends libice &&
+ depends libsm &&
+ depends libxext &&
+ depends libxtst
+fi &&
depends libsamplerate &&
optional_depends alsa-lib \
"--enable-alsa" \
@@ -34,6 +41,11 @@ optional_depends gtk+2 \
"--enable-gtk2" \
"--disable-gtk2" \
"for GTK+2 support" &&
+
+if is_depends_enabled $SPELL gtk+2; then
+ depends libxxf86vm
+fi &&
+
optional_depends gconf2 \
"--enable-gconf" \
"--disable-gconf" \
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index f1d6a06..400c768 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,7 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Replaced xorg-libs with libx11, libice, libsm, libxext,
libxtst
+ gtk+2 support also needs libxxf86vm
+
2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index ef98b03..ffe4547 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -55,7 +55,7 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.xz
;;
3.2)
- VERSION=3.2.3
+ VERSION=3.2.4
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index cfdfee5..c850503 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2013-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 3.2.4
+
2013-08-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 3.2.3

diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 67003cf..9b6cb0f 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlite
- VERSION=3.7.17
- VERSIONX=autoconf-3071700
-
SOURCE_HASH=sha512:96f3e51b46741450bc6b63779c10ebb4a7066860fe544385d64d1eda52592e376a589ef282ace2e1df73df61c10eab1a0d793abbdaf770e60289494d4bf3bcb4
+ VERSION=3.8.0.2
+ VERSIONX=autoconf-3080002
+
SOURCE_HASH=sha512:936a5b8c809891883e11bb881edcc851ca25c55325699889ab123337aea37afa36129ea802a633e440824a97fff777e51816262e824b21fa387bcecddb91f9e7
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${VERSIONX}"
SOURCE=${SPELL}-${VERSIONX}.tar.gz
SOURCE_URL[0]=http://www.sqlite.org/2013/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 6bc674c..53e0d50 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,6 @@
+2013-09-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.8.0.2
+
2013-05-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.7.17

diff --git a/e-17/e17/DEPENDS b/e-17/e17/DEPENDS
index 439fba3..78c8b1e 100755
--- a/e-17/e17/DEPENDS
+++ b/e-17/e17/DEPENDS
@@ -1,9 +1,12 @@
depends imlib2 &&
+depends libx11 &&
+depends libxau &&
depends libxcursor &&
depends libxdamage &&
+depends libxdmcp &&
+depends libxext &&
depends libxinerama &&
depends libxrandr &&
-depends xorg-libs &&

if [[ "x${E17_BRANCH}" == "xscm" ]]; then
depends edbus &&
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index eed1cac..fe6f303 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,7 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Replace xorg-libs with libx11, libxau, libxdmcp, and
+ libxext
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.17.4

diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index 07b588a..ee2186e 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -5,7 +5,8 @@ depends libtool &&
depends freetype2 &&

if [[ "x${EVAS_X11XCB}" == "xx11" ]]; then
- depends xorg-libs "--enable-software-xlib --with-x"
+ depends libsm &&
+ depends libx11 "--enable-software-xlib --with-x"
elif [[ "x${EVAS_X11XCB}" == "xxcb" ]]; then
depends libxcb "--enable-software-xcb --enable-async-events"
# else "none" handled in BUILD
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index 54d7fc1..bfc9eb1 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,3 +1,6 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Replaced xorg-libs with libsm and libx11
+
2013-07-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.7.8

diff --git a/gnome2-libs/dconf/DETAILS b/gnome2-libs/dconf/DETAILS
index dad198e..626c37e 100755
--- a/gnome2-libs/dconf/DETAILS
+++ b/gnome2-libs/dconf/DETAILS
@@ -1,8 +1,8 @@
SPELL=dconf
- VERSION=0.14.1
+ VERSION=0.16.1
SOURCE="${SPELL}-${VERSION}.tar.xz"
-
SOURCE_URL[0]=http://download.gnome.org/sources/${SPELL}/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:110e1fe8ac986d61491f10c25ccfb687d914cbbacad70a0c6918bd07d32a19058050267e677626cb2dbc26928923f49b0495e0cf1eeeb210537f42b6936eed5f
+
SOURCE_URL[0]=http://ftp.gnome.org/pub/GNOME/sources/$SPELL/${VERSION:0:4}/$SOURCE
+
SOURCE_HASH=sha512:8ec267fd8e769da4e4316e697e76eeb228ad2699e7aad8b2d1034314073c650ac880449a8be79e5c86ba263db89a12eabc1cd40bbb1edf0b0c710e2e32567f78

SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://live.gnome.org/dconf";
LICENSE[0]="LGPL"
diff --git a/gnome2-libs/dconf/HISTORY b/gnome2-libs/dconf/HISTORY
index b8733d4..b5bc71c 100644
--- a/gnome2-libs/dconf/HISTORY
+++ b/gnome2-libs/dconf/HISTORY
@@ -1,3 +1,7 @@
+2013-09-02 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.16.1
+ changed SOURCE_URL
+
2013-06-11 Eric Sandall <sandalle AT sourcemage.org>
* Bug #450 (apply Javier's fix)

diff --git a/graphics-libs/cegui/DEPENDS b/graphics-libs/cegui/DEPENDS
index e3cfea2..3b53528 100755
--- a/graphics-libs/cegui/DEPENDS
+++ b/graphics-libs/cegui/DEPENDS
@@ -1,7 +1,8 @@
-depends freetype2 &&
-depends -sub CXX gcc &&
-depends pcre &&
-depends xorg-libs '--with-x' &&
+depends freetype2 &&
+depends -sub CXX gcc &&
+depends pcre &&
+depends libx11 '--with-x' &&
+depends libxxf86vm &&

optional_depends xerces-c \
"--enable-xerces-c" \
diff --git a/graphics-libs/cegui/HISTORY b/graphics-libs/cegui/HISTORY
index 07714d5..8a1b0f6 100644
--- a/graphics-libs/cegui/HISTORY
+++ b/graphics-libs/cegui/HISTORY
@@ -1,3 +1,6 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Replaced xorg-libs with libx11 and libxxf86vm
+
2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, gcc46.patch: fixed build with gcc 4.6
* CONFLICTS: added conflict with tinyxml
diff --git a/i18n/ibus-anthy/DEPENDS b/i18n/ibus-anthy/DEPENDS
index 18ba5ab..9562b9d 100755
--- a/i18n/ibus-anthy/DEPENDS
+++ b/i18n/ibus-anthy/DEPENDS
@@ -1,2 +1,6 @@
depends ibus &&
-depends anthy
+depends anthy &&
+depends gobject-introspection &&
+depends pygobject3
+
+
diff --git a/i18n/ibus-anthy/DETAILS b/i18n/ibus-anthy/DETAILS
index 99620ed..7b8a37b 100755
--- a/i18n/ibus-anthy/DETAILS
+++ b/i18n/ibus-anthy/DETAILS
@@ -1,8 +1,7 @@
SPELL=ibus-anthy
- VERSION=1.2.7
+ VERSION=1.5.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-#
SOURCE_HASH=sha512:38815571c6421207c91e0af1406fb1a83ad3a9d7e31de9f0c3267e16cde41038fda179f07efae42da8208608fb0bebbe2ae310bbff110cbf0f0744d282b9e3a3
+
SOURCE_HASH=sha512:490a89ef78e31ad9e0f61aadd1d93b7a670852a765cc784cbfa307a208aab4344e851dceee316dd04bdf004e901a1b23bf40ff505e55fa18ab9dafdf097263d3
SOURCE_URL[0]=http://ibus.googlecode.com/files/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/ibus/";
diff --git a/i18n/ibus-anthy/HISTORY b/i18n/ibus-anthy/HISTORY
index fc71d68..9f8a8f3 100644
--- a/i18n/ibus-anthy/HISTORY
+++ b/i18n/ibus-anthy/HISTORY
@@ -1,3 +1,7 @@
+2013-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: update to 1.5.3
+ * DEPENDS: added addition depends
+
2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.2.7

diff --git a/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig
b/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig
deleted file mode 100644
index 0361acb..0000000
Binary files a/i18n/ibus-anthy/ibus-anthy-1.2.7.tar.gz.sig and /dev/null
differ
diff --git a/i18n/ibus/DEPENDS b/i18n/ibus/DEPENDS
index 0a27dae..ab0b969 100755
--- a/i18n/ibus/DEPENDS
+++ b/i18n/ibus/DEPENDS
@@ -1,6 +1,41 @@
depends python &&
-depends pyxdg &&
depends dbus-glib &&
depends dbus-python &&
depends notify-python &&
-depends iso-codes
+depends iso-codes &&
+
+optional_depends gtk+2 \
+ "--enable-gtk2" \
+ "--disable-gtk2" \
+ "Build GTK2 IM Module?" &&
+
+optional_depends gtk+3 \
+ "--enable-gtk3" \
+ "--disable-gtk3" \
+ "Build GTK3 IM Module?" &&
+
+optional_depends gobject-introspection \
+ "--enable-introspection=yes" \
+ "--enable-introspection=no" \
+ "Enable introspection?" &&
+
+optional_depends vala \
+ "--enable-vala=yes" \
+ "--enable-vala=no" \
+ "Build Vala bindings?" &&
+
+optional_depends gconf2 \
+ "--enable-gconf" \
+ "--disable-gconf" \
+ "Use GConf code?" &&
+
+optional_depends dconf \
+ "--enable-dconf" \
+ "--disable-dconf" \
+ "Enable configuration based on dconf?" &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "Use gtk-doc to build documentation?"
+
diff --git a/i18n/ibus/DETAILS b/i18n/ibus/DETAILS
index e9c9767..5ee1fca 100755
--- a/i18n/ibus/DETAILS
+++ b/i18n/ibus/DETAILS
@@ -1,8 +1,7 @@
SPELL=ibus
- VERSION=1.4.99.20121006
+ VERSION=1.5.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
-#
SOURCE_HASH=sha512:b7467a522aae99b15f76a05d17db5da14f01e6a17393c86888c0956223ba6563886e78c7ea9126d51d097b0d552eeebd3f7a1ce7d8230fa047848f81196307e1
+
SOURCE_HASH=sha512:fe961f3a6143ea8cb9f14531cfdf6f6058bf8aba7285e6746b1750fb8267947730986e1fc0abb77c4545ddc0d835a41f76f316f7387c85de7bbf4010c10e79db
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://code.google.com/p/ibus/";
diff --git a/i18n/ibus/HISTORY b/i18n/ibus/HISTORY
index 4c4db72..48003b0 100644
--- a/i18n/ibus/HISTORY
+++ b/i18n/ibus/HISTORY
@@ -1,3 +1,7 @@
+2013-09-06 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 1.5.3
+ * DEPENDS: updated to current depends and added optionals
+
2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.4.99.20121006 (for gnome-settings-daemon
3.6.1)
Nothing else currently uses ibus
diff --git a/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig
b/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig
deleted file mode 100644
index e6b673a..0000000
Binary files a/i18n/ibus/ibus-1.4.99.20121006.tar.gz.sig and /dev/null differ
diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS
index 70ca345..882eb0c 100755
--- a/libs/sdl/DEPENDS
+++ b/libs/sdl/DEPENDS
@@ -11,6 +11,7 @@ optional_depends libx11 \
"for X11 video output support" &&

if is_depends_enabled $SPELL libx11;then
+ depends libice &&
depends libxext &&
depends libxrender &&
optional_depends libxrandr "--enable-video-x11-xrandr" '' "X11 Xrandr
extension support" &&
diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index 3d7e860..1516806 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,7 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * *SUB_DEPENDS: Replaced xorg-libs with libx11
+ * DEPENDS: Additionally depend on libice when depending on libx11
+
2012-01-27 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 1.2.15
* PRE_BUILD: removed mouse fix patch as no longer needed
diff --git a/libs/sdl/PRE_SUB_DEPENDS b/libs/sdl/PRE_SUB_DEPENDS
index aba4593..d371766 100755
--- a/libs/sdl/PRE_SUB_DEPENDS
+++ b/libs/sdl/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
-X11-LIBS) is_depends_enabled $SPELL xorg-libs && return 0 ;;
+X11-LIBS) is_depends_enabled $SPELL libx11 && return 0 ;;
esac &&

return 1
diff --git a/libs/sdl/REPAIR^f2c2d723cb24017050035a9c9cd3f210^PRE_SUB_DEPENDS
b/libs/sdl/REPAIR^f2c2d723cb24017050035a9c9cd3f210^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..d371766
--- /dev/null
+++ b/libs/sdl/REPAIR^f2c2d723cb24017050035a9c9cd3f210^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+X11-LIBS) is_depends_enabled $SPELL libx11 && return 0 ;;
+esac &&
+
+return 1
diff --git a/libs/sdl/SUB_DEPENDS b/libs/sdl/SUB_DEPENDS
index 9d604f2..aeca28e 100755
--- a/libs/sdl/SUB_DEPENDS
+++ b/libs/sdl/SUB_DEPENDS
@@ -1,4 +1,4 @@
case $THIS_SUB_DEPENDS in
-X11-LIBS) depends xorg-libs '--with-x' ;;
+X11-LIBS) depends libx11 '--with-x' ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac
diff --git a/libs/tbb/HISTORY b/libs/tbb/HISTORY
index dd7d440..67177e9 100644
--- a/libs/tbb/HISTORY
+++ b/libs/tbb/HISTORY
@@ -1,3 +1,6 @@
+2013-09-02 Robin Cook <rcook AT wyrms.net>
+ * INSTALL: added -f to link command
+
2013-08-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 41_20130613

diff --git a/libs/tbb/INSTALL b/libs/tbb/INSTALL
index f4641fd..5966dcd 100755
--- a/libs/tbb/INSTALL
+++ b/libs/tbb/INSTALL
@@ -3,7 +3,7 @@ cd $SOURCE_DIRECTORY &&
for foo in $(find -executable -type f); do
bar=$(basename $foo)
cp $foo ${INSTALL_ROOT}/usr/lib/$bar &&
- ln -s ${INSTALL_ROOT}/usr/lib/$bar ${INSTALL_ROOT}/usr/lib/$(expr match
"${bar}" '\([a-z_]*\.so\)')
+ ln -sf ${INSTALL_ROOT}/usr/lib/$bar ${INSTALL_ROOT}/usr/lib/$(expr match
"${bar}" '\([a-z_]*\.so\)')
done &&

#install the include files
diff --git a/mail/claws-mail/CONFIGURE b/mail/claws-mail/CONFIGURE
index 49ff14f..d4b180a 100755
--- a/mail/claws-mail/CONFIGURE
+++ b/mail/claws-mail/CONFIGURE
@@ -1,11 +1,73 @@
-config_query_option SYLPHEED_OPTS "Compile tray-icon plugin?" y \
+config_query_list CLAWSMAIL_GTK "Use which GTK to build?" gtk+2 gtk+3 &&
+
+config_query_option CLAWSMAIL_OPTS "Compile tray-icon plugin?" y \
"--enable-trayicon-plugin" \
"--disable-trayicon-plugin" &&

-config_query_option SYLPHEED_OPTS "Compile crash dialog?" n \
+config_query_option CLAWSMAIL_OPTS "Compile crash dialog?" n \
"--enable-crash-dialog" \
"--disable-crash-dialog" &&

config_query_option SYLPHEED_OPTS "Enable IPv6 support?" y \
"--enable-ipv6" \
- "--disable-ipv6"
+ "--disable-ipv6" &&
+
+config_query_option CLAWSMAIL_OPTS "Build generic UMPC Code?" n \
+ "--enable-generic-umpc" \
+ "--disable-generic-umpc" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable pthread support?" y \
+ "--enable-pthread" \
+ "--disable-pthread" &&
+
+config_query_option CLAWSMAIL_OPTS "Build external address book support?" n \
+ "--enable-new-addrbook" \
+ "--disable-new-addrbook" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable acpi_notifier plugin?" y \
+ "--enable-acpi_notifier-plugin" \
+ "--disable-acpi_notifier-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable address_keeper plugin?" y \
+ "--enable-address_keeper-plugin" \
+ "--disable-address_keeper-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable attachement remover plugin?" y \
+ "--enable-att_remover-plugin" \
+ "--disable-att_remover-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable attachement warning plugin?" y \
+ "--enable-attachwarner-plugin" \
+ "--disable-attachwarner-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable fetchinfo plugin?" y \
+ "--enable-fetchinfo-plugin" \
+ "--disable-fetchinfo-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable mailmbox plugin?" y \
+ "--enable-mailmbox-plugin" \
+ "--disable-mailmbox-plugin" &&
+config_query_option CLAWSMAIL_OPTS "Enable newmail plugin?" y \
+ "--enable-newmail-plugin" \
+ "--disable-newmail-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable notification plugin?" y \
+ "--enable-notification-plugin" \
+ "--disable-notification-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable rssyl plugin?" y \
+ "--enable-rssyl-plugin" \
+ "--disable-rssyl-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable smime plugin?" y \
+ "--enable-smime-plugin" \
+ "--disable-smime-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable spam report plugin?" y \
+ "--enable-spam_report-plugin" \
+ "--disable-spam_report-plugin" &&
+
+config_query_option CLAWSMAIL_OPTS "Enable vcalendar plugin?" y \
+ "--enable-vcalendar-plugin" \
+ "--disable-vcalendar-plugin"
+
diff --git a/mail/claws-mail/DEPENDS b/mail/claws-mail/DEPENDS
index b867e20..1e40fc5 100755
--- a/mail/claws-mail/DEPENDS
+++ b/mail/claws-mail/DEPENDS
@@ -1,4 +1,8 @@
-depends gtk+2 &&
+if [ "$CLAWSMAIL_GTK" == "gtk+3" ]; then
+ depends gtk+3 --enable-gtk3
+else
+ depends gtk+2
+fi &&
depends c-ares &&

optional_depends "dbus" \
@@ -81,6 +85,68 @@ optional_depends network-manager \
"--disable-networkmanager-support" \
"support for NetworkManager" &&

+optional_depends valgrind \
+ "--enable-valgrind" \
+ "--disable-valgrind" \
+ "Enable valgrind support for debugging?" &&
+
+optional_depends libarchive \
+ "--enable-archive-plugin" \
+ "--disable-archive-plugin" \
+ "to build archive plugin" &&
+
+optional_depends bsfilter \
+ "--enable-bsfilter-plugin" \
+ "--disable-bsfilter-plugin" \
+ "Enable bsfilter plugin (Bayesian spam filtering)" &&
+
+optional_depends clamav \
+ "--enable-clamd-plugin" \
+ "--disable-clamd-plugin" \
+ "Enable clamd plugin?" &&
+
+optional_depends libchamplain \
+ "--enable-geolocation-plugin" \
+ "--disable-geolocation-plugin" \
+ "Enable geolocation plugin" &&
+
+optional_depends libgdata \
+ "--enable-gdata-plugin" \
+ "--disable-gdata-plugin" \
+ "Enable gdata plugin?" &&
+
+optional_depends libytnef \
+ "--enable-tnef_parse-plugin" \
+ "--disable-tnef_parse-plugin" \
+ "Enable tnef_parse plugin?" &&
+
+optional_depends poppler \
+ "--enable-pdf_viewer-plugin" \
+ "--disable-pdf_viewer-plugin" \
+ "Enable pdf_viewer plugin?" &&
+
+optional_depends perl \
+ "--enable-perl-plugin" \
+ "--disable-perl-plugin" \
+ "Enable perl plugin?" &&
+
+optional_depends PYTHON \
+ "--enable-python-plugin" \
+ "--disable-python-plugin" \
+ "Enable python plugin?" &&
+
+if [ "$CLAWSMAIL_GTK" == "gtk+3" ]; then
+ optional_depends webkitgtk3 \
+ "--enable-fancy-plugin" \
+ "--disable-fancy-plugin" \
+ "Enable fancy plugin?"
+else
+ optional_depends webkitgtk \
+ "--enable-fancy-plugin" \
+ "--disable-fancy-plugin" \
+ "Enable fancy plugin?"
+fi &&
+
depends atk &&
depends cairo &&
depends curl &&
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 1c90e63..67ec17c 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,7 @@
+2013-09-02 Robin Cook <rcook AT wyrms.net>
+ * CONFIGURE: added additional configure options
+ * DEPENDS: added additional optional depends
+
2013-06-24 Ladislav Hagara <hgr AT vabo.cz>
* CONFLICTS: claws-mail-extra-plugins added, part of claws-mail now

diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 1c24ae6..2895678 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -4,7 +4,7 @@ if [[ "${POSTFIX_EXP}" == "y" ]]; then
VERSION=2.9-20110615
PFIX_BRANCH=experimental
else
- VERSION=2.9.7
+ VERSION=2.9.8
PFIX_BRANCH=official
SECURITY_PATCH=1
fi
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 7a80944..2e811a3 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,6 @@
+2013-09-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.8
+
2013-07-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.9.7
* no-db.patch: updated patch to support Linux kernel 3.x
diff --git a/net/amap/BUILD b/net/amap/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/amap/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/amap/DEPENDS b/net/amap/DEPENDS
new file mode 100755
index 0000000..cf43e0d
--- /dev/null
+++ b/net/amap/DEPENDS
@@ -0,0 +1 @@
+depends thc-amap
diff --git a/net/amap/DETAILS b/net/amap/DETAILS
index 6ba8a82..8df27f4 100755
--- a/net/amap/DETAILS
+++ b/net/amap/DETAILS
@@ -1,17 +1,7 @@
- SPELL=amap
- VERSION=5.4
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.thc.org/releases/${SOURCE}
-
SOURCE_HASH=sha512:e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://www.thc.org/thc-amap/";
- LICENSE[0]=GPL
- ENTERED=20130829
- SHORT="Amap was innovative - the first tool to perform
application protocol detection."
-cat << EOF
-Amap was the first next-generation scanning tool for pentesters. It attempts
-to identify applications even if they are running on a different port
-than normal. It also identifies non-ascii based applications. This is
-achieved by sending trigger packets, and looking up the responses in a list
-of response strings.
-EOF
+ SPELL=amap
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by thc-amap]
+ EOF
diff --git a/net/amap/DOWNLOAD b/net/amap/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/amap/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/net/amap/HISTORY b/net/amap/HISTORY
index 0e4a90c..a0a3b03 100644
--- a/net/amap/HISTORY
+++ b/net/amap/HISTORY
@@ -1,3 +1,8 @@
+2013-09-04 David C. Haley <khoralin AT gmail.com>
+ * Spell deprecated. Deprecating in favor of original spell.
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2013-08-29 David C. Haley <khoralin AT gmail.com>
* DETAILS: spell created

diff --git a/net/amap/INSTALL b/net/amap/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/amap/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/net/amap/PRE_BUILD b/net/amap/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/amap/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/amap/UP_TRIGGERS b/net/amap/UP_TRIGGERS
new file mode 100644
index 0000000..8bc6d99
--- /dev/null
+++ b/net/amap/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger amap dispel_self
+up_trigger thc_amap cast_self
diff --git a/net/thc-amap/BUILD b/net/thc-amap/BUILD
deleted file mode 100755
index 3b5db3c..0000000
--- a/net/thc-amap/BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-./configure &&
-sedit "s:/usr/local:/:" Makefile &&
-sedit "s:/bin:usr/bin:" Makefile &&
-sedit "s:/etc:etc/amap:" Makefile &&
-sedit "s:/man/man1:usr/man/man1:" Makefile &&
-sedit "s:/usr/local:/usr:" amap.h &&
-sedit "s:AMAP_PREFIX:\"/\":" amap-lib.c &&
-sedit "s:etc/:etc/amap/:" amap-lib.c &&
-make
diff --git a/net/thc-amap/CONFLICTS b/net/thc-amap/CONFLICTS
new file mode 100755
index 0000000..0757c82
--- /dev/null
+++ b/net/thc-amap/CONFLICTS
@@ -0,0 +1 @@
+conflicts amap y
diff --git a/net/thc-amap/DETAILS b/net/thc-amap/DETAILS
index 1c271dc..cf46882 100755
--- a/net/thc-amap/DETAILS
+++ b/net/thc-amap/DETAILS
@@ -1,12 +1,11 @@
SPELL=thc-amap
- VERSION=5.2
+ VERSION=5.4
SOURCE=amap-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/amap-$VERSION
SOURCE_URL[0]=http://www.thc.org/releases/$SOURCE
WEB_SITE=http://www.thc.org
ENTERED=20041208
- UPDATED=20050429
-
SOURCE_HASH=sha512:46d4f500751e709de03f3b03a717538657390780cc753498ba75dc09a6824f7765c66e72dab7362cc1696f9af7aab9a18f71ed736bf1ff54d7e1a21e2c251600
+
SOURCE_HASH=sha512:e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d
LICENSE[0]=GPL
KEYWORDS="net"
SHORT="A next-generation scanning tool, identifies applications
and services."
diff --git a/net/thc-amap/HISTORY b/net/thc-amap/HISTORY
index 3537547..1b52cdb 100644
--- a/net/thc-amap/HISTORY
+++ b/net/thc-amap/HISTORY
@@ -1,3 +1,9 @@
+2013-09-05 David C. Haley <khoralin AT gmail.com>
+ * INSTALL: removed, no longer needed
+ * BUILD: removed, no longer needed
+ * PRE_BUILD: removed, no longer needed
+ * DETAILS: updated spell to 5.4
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/net/thc-amap/INSTALL b/net/thc-amap/INSTALL
deleted file mode 100755
index da6ceea..0000000
--- a/net/thc-amap/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-mkdir -p $INSTALL_ROOT/etc/amap &&
-mkdir -p $INSTALL_ROOT/usr/share/amap &&
-
-install -m 755 amap amapcrap $INSTALL_ROOT/usr/bin &&
-
-install -m 644 appdefs.trig appdefs.resp appdefs.rpc \
- $INSTALL_ROOT/etc/amap &&
-
-install -m 644 amap.1 $INSTALL_ROOT/usr/share/man/man1/
diff --git a/net/thc-amap/PRE_BUILD b/net/thc-amap/PRE_BUILD
deleted file mode 100755
index 7f9ef19..0000000
--- a/net/thc-amap/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-sedit "s:/usr/local:$INSTALL_ROOT/usr:" amap.h &&
-sedit "s:/bin:/share/amap:" amap.h
diff --git a/perl-cpan/x11-protocol/DEPENDS b/perl-cpan/x11-protocol/DEPENDS
index 999ba5c..3175185 100755
--- a/perl-cpan/x11-protocol/DEPENDS
+++ b/perl-cpan/x11-protocol/DEPENDS
@@ -1,3 +1,5 @@
-depends perl &&
-depends X11-SERVER &&
-depends X11-LIBS
+depends perl &&
+
+runtime_depends libx11 &&
+runtime_depends libxau &&
+runtime_depends libxext
diff --git a/perl-cpan/x11-protocol/HISTORY b/perl-cpan/x11-protocol/HISTORY
index e355cfd..a58438f 100644
--- a/perl-cpan/x11-protocol/HISTORY
+++ b/perl-cpan/x11-protocol/HISTORY
@@ -1,3 +1,7 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Per README, doesn't require an X11-SERVER on the current
machine
+ Replace xorg-libs with libx11, libxau, and libxext as runtime
dependencies
+
2008-04-16 Mark Bainter <mbainter AT sourcemage.org>
* BUILD, DEPENDS, DETAILS, HISTORY: spell created

diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index 85277f4..4c48187 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,6 +1,6 @@
SPELL=ghostscript
- VERSION=9.07
-
SOURCE_HASH=sha512:7e075b82afd8057adb5b788d64e7bf6e1c769dd64acd74b8be13621504521ba088b3115984b0610967c1da6a54f6d824f7fef36b79264a949408912fc9a558d4
+ VERSION=9.10
+
SOURCE_HASH=sha512:59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.ghostscript.com/
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index 47e1581..b99cfd7 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,6 @@
+2013-09-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 9.10
+
2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: remove jasper

diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index 4a82280..b1785f2 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
SPELL=mercurial
- VERSION=2.7
-
SOURCE_HASH=sha512:e425778edb0f71c34e719e04561ee3de37feaa1be4d60b94c780aebdbe6d41f8f4ab15103a8bbe8894ebeb228c42f0e2cd41b8db840f8384e1cd7cd2d5b67b97
+ VERSION=2.7.1
+
SOURCE_HASH=sha512:f8ff09b852ebe36c86af30ccd43118006c44958441f8590e557634a19a7c01c9b077ca335ebc92fa86b33bc77388db1c12ce60eaaf31c695b46e4283fc00794f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://mercurial.selenic.com/release/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index aca8807..f167359 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2013-09-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated to 2.7.1
+
2013-08-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: updated to 2.7

diff --git a/qt5/qtbase/DETAILS b/qt5/qtbase/DETAILS
index c8fb695..05a6768 100755
--- a/qt5/qtbase/DETAILS
+++ b/qt5/qtbase/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtbase
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:300f00045ba974d980859613f1409e3a9fb9a8405a1b6efaa03eae22fdd3c5e74e2fc2bf526e0ce3f0a80559a79a25ae64b3ab709fd0f06343fcdca7683ffe02
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:db7e25a520584b10370d898747f2cfb84ebbce3a8b9027f373cac7ab713fe199da5465df2453d04107406101ad4eff8cd82871efab40377ff44d789a424667c3
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index f2a9627..97c665d 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV

diff --git a/qt5/qtdeclarative/DETAILS b/qt5/qtdeclarative/DETAILS
index 260543a..f300a8b 100755
--- a/qt5/qtdeclarative/DETAILS
+++ b/qt5/qtdeclarative/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtdeclarative
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:cc9260e57b7440d26f8d8ae2efabc3ea8bbe335816614f4b48130e098371a5eb24028ceb84cee9b3750d31c31b6238ba434e0679d57d38761bc91383d3304a0c
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:279511624723d6774ef308b9029d950b0be951c1c3b6b09f8d67962c927617db67b023c81065875d65c1dd2c048e618aa8b6b13a311040c6d5ddf1c42a4718f9
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtdeclarative/HISTORY b/qt5/qtdeclarative/HISTORY
index d20d352..254ecd5 100644
--- a/qt5/qtdeclarative/HISTORY
+++ b/qt5/qtdeclarative/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

diff --git a/qt5/qtgraphicaleffects/DETAILS b/qt5/qtgraphicaleffects/DETAILS
index 69ab1f8..37e6e2a 100755
--- a/qt5/qtgraphicaleffects/DETAILS
+++ b/qt5/qtgraphicaleffects/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtgraphicaleffects
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:0089979df80ffc85b6e820cb03268ed80e58e2631c14a9569818b0583d6204383b58ebabef82fe2452b3a48688dea761c1f1a19326b2a0513abf13b7610d99b7
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:3ccc9215169e83a1975d24455ad38e3224d14c11c849a0b796f7020be385ef78b9a99f1ec885916ed29bd46c7ac9d7aaf20fe8115bebb18cc3c1b74c208420c0
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtgraphicaleffects/HISTORY b/qt5/qtgraphicaleffects/HISTORY
index aa70f31..fa8bb56 100644
--- a/qt5/qtgraphicaleffects/HISTORY
+++ b/qt5/qtgraphicaleffects/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

diff --git a/qt5/qtimageformats/DETAILS b/qt5/qtimageformats/DETAILS
index 3239e79..91a9d17 100755
--- a/qt5/qtimageformats/DETAILS
+++ b/qt5/qtimageformats/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtimageformats
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:9863c3830ca85555d2c2e8e9a8add190f08bd794a1703ca4a2c943de9313cf396cc98d110b7bae787564e933b0d8e75a91d583af8a148bb8dd5cb35912a70dde
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:c42144fe39df5da69eec6b00e54bb0d0795a7f8c1617094c9dd9c5f79f96ff7ba5c447bbd931aa730bf5dcebac8a7e8e6f397501264d7279233876df6cbd2771
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtimageformats/HISTORY b/qt5/qtimageformats/HISTORY
index bd6fac8..a65aabb 100644
--- a/qt5/qtimageformats/HISTORY
+++ b/qt5/qtimageformats/HISTORY
@@ -1,4 +1,7 @@
-2013-07/09 Treeve Jelbert <treeve AT sourcemage.org>
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
+2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

2013-04-12 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/qt5/qtjsbackend/DETAILS b/qt5/qtjsbackend/DETAILS
index b8204f0..81f70c0 100755
--- a/qt5/qtjsbackend/DETAILS
+++ b/qt5/qtjsbackend/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtjsbackend
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:0ffd8670b8d4426aaacd12272a149626d4184e697a4a1fe71aa09c2d1214d255e6ae717a7b29a2599cc858d7b74f0115d4e27391d216ce12b8c2d39b5b3dd87c
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:5772b4fa73610a8c47ed07a46d020045e3f298b303e014772a2418af14350dbca6f7bc76db64cbcd1712f679e42ff4aa9d88feb658559fd7dd994c3810443b85
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtjsbackend/HISTORY b/qt5/qtjsbackend/HISTORY
index a41c6e2..8853ef6 100644
--- a/qt5/qtjsbackend/HISTORY
+++ b/qt5/qtjsbackend/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

diff --git a/qt5/qtmultimedia/DETAILS b/qt5/qtmultimedia/DETAILS
index 66e6f78..9104c3c 100755
--- a/qt5/qtmultimedia/DETAILS
+++ b/qt5/qtmultimedia/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtmultimedia
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:12edaa20c2d1bbce7311fab2e273262570bfa537a985b5e11a044402ed9d552964dd233bba44809599793805daf997e9668cb31a98f903a97db4090086a8c51b
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:14e2ff2037d41220acca34534b947ae5918edbb878f118d34594b8bbc1c857a745b7a7eba21c063f18dc0d5de25cbee525d66cb203ab52165203ed4ccb185ec1
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtmultimedia/HISTORY b/qt5/qtmultimedia/HISTORY
index a66bb8f..a65aabb 100644
--- a/qt5/qtmultimedia/HISTORY
+++ b/qt5/qtmultimedia/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

diff --git a/qt5/qtquick1/DETAILS b/qt5/qtquick1/DETAILS
index 7d8c2a8..2a8f756 100755
--- a/qt5/qtquick1/DETAILS
+++ b/qt5/qtquick1/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtquick1
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:7ebc79ab860d10bcf95956e8a1778ba3f18ebe44b08fe448b9d79fc001729d6aec283873b402de94bf395e254dd0b094762090d6d9c9f5b3f5b2526686e50a11
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:d42334280d365308b7402120a2b828544787254283ac1cdc6c4abe66075a05092fb016eeae169a52a813f8cef240d1d39b863319ba7d0231c7c936b7d59aa02d
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtquick1/HISTORY b/qt5/qtquick1/HISTORY
index 4768309..837c42b 100644
--- a/qt5/qtquick1/HISTORY
+++ b/qt5/qtquick1/HISTORY
@@ -1,4 +1,7 @@
-2013-07-094-13 Treeve Jelbert <treeve AT sourcemage.org>
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
+2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

2013-04-13 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/qt5/qtquickcontrols/DETAILS b/qt5/qtquickcontrols/DETAILS
index ccd5609..2808d9b 100755
--- a/qt5/qtquickcontrols/DETAILS
+++ b/qt5/qtquickcontrols/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtquickcontrols
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:b0bb8a3c32d039600451f642f4911da11aea3d057a63765c1a446dbeaf86ec6b5dae9b9e64dc9fe3b46fcd6e02456478fcdec3070b1c77a9d94fff0a4efa3f98
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:d5afe06465606a65a012b003055a2566b16caa77328f77c4ce5b713d94dde04744093ef8894cc0c58741320427815abcebed7d7694f3ff8cbcfe64d99de25261
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtquickcontrols/HISTORY b/qt5/qtquickcontrols/HISTORY
index 949a0bc..d618058 100644
--- a/qt5/qtquickcontrols/HISTORY
+++ b/qt5/qtquickcontrols/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0
new spell, for modular qt
diff --git a/qt5/qtscript/DETAILS b/qt5/qtscript/DETAILS
index c3c2991..4965f33 100755
--- a/qt5/qtscript/DETAILS
+++ b/qt5/qtscript/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtscript
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:226a8b56646a3c62ef1eaa122e45e42594321e0570f8d70398dcbc7a2ea10e22cd1435d4d010b3ca10c1305b91f627da902946ccccd4e5f2b5bd9dcaf2b639b3
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:0435cd4fbbda6b14c750c563368658b781be0f8d73e88c290aae08ac0445ae6a8807765e30d1f2527b06a51ef95bc4f46dcbcead874f8930718ddab53b6ea632
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtscript/HISTORY b/qt5/qtscript/HISTORY
index d20d352..254ecd5 100644
--- a/qt5/qtscript/HISTORY
+++ b/qt5/qtscript/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

diff --git a/qt5/qtsvg/DETAILS b/qt5/qtsvg/DETAILS
index 96ae580..fb7fea1 100755
--- a/qt5/qtsvg/DETAILS
+++ b/qt5/qtsvg/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtsvg
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:1e620efac65f0404eab00863180cab2ff8aafb849dd2a0a97c79383adf0bd3cddbf3dbed47e01ba47187b3a7fe1ca714341a23327adea333185c74b9f914c078
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:c6faa5e0e0815180e6183fd71caa19973d08707d729b83d269bedcfe62d9eaa1634d71a390ad11b3665601ec0d39b08728b0d14d07552fe7d7b81b9d930aa5b6
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtsvg/HISTORY b/qt5/qtsvg/HISTORY
index d20d352..254ecd5 100644
--- a/qt5/qtsvg/HISTORY
+++ b/qt5/qtsvg/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

diff --git a/qt5/qttools/DETAILS b/qt5/qttools/DETAILS
index a65ebc2..6404bb4 100755
--- a/qt5/qttools/DETAILS
+++ b/qt5/qttools/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qttools
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:63f4ec5551e07afab0b8d0113c0e214a4370a0186190fa324205f4088feeda24c4286c783eed6875ab0da066bf8d73af14f1b1462df39adbbdde56ba001aafdf
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:9fdd3063357fc961c972e50f61e7b9b028e72dfca27830bd0316a02ca7898ce98e4170b4687d511aa12cd1c77aac6ac8900374f6bab28846a484dd9acbed6565
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index 3e0cbaa..03597d7 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,4 +1,7 @@
-2013-0707 Treeve Jelbert <treeve AT sourcemage.org>
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
+2013-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/qt5/qtwebkit5/DETAILS b/qt5/qtwebkit5/DETAILS
index c096fcc..d7a081d 100755
--- a/qt5/qtwebkit5/DETAILS
+++ b/qt5/qtwebkit5/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtwebkit5
SPELLX=${SPELL/5}-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:fc1becd431ab7dbfb5146cdc5de8abc3d57362278b77df4e6678551bf29c927501d39d1472d7973cf7f8c3497eff4cc926b65191a1ac6960a23cd803e36d8d4c
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:aa7e310f1319902131dab5705a5bb2c02252f0d3d6b288ab13478ae42d38664578c52708cf3fa504ffc0b1f9f161e5bbcc65bdf6a7028c043b992211986a5f64
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtwebkit5/HISTORY b/qt5/qtwebkit5/HISTORY
index cca30be..c30f9f8 100644
--- a/qt5/qtwebkit5/HISTORY
+++ b/qt5/qtwebkit5/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0

diff --git a/qt5/qtx11extras/DETAILS b/qt5/qtx11extras/DETAILS
index dade371..13f2f5d 100755
--- a/qt5/qtx11extras/DETAILS
+++ b/qt5/qtx11extras/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases
SPELL=qtx11extras
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:0f370a5427fd45f25d019b2eba397b5509238e4cc1372cfc88cb26317f51d51452326a2f2c26fe654c5d8b66c7225eae228c3d5b24735ca8de986a7f3911fc18
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:63b0ca30f7c8acd957857825121739c353bd1c03e5546f20128112b3877badd9f1804e261c03224e08e9caa63ba071d7706da9211642114124727b6f4a6c204b
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtx11extras/HISTORY b/qt5/qtx11extras/HISTORY
index 9f46401..99af3cd 100644
--- a/qt5/qtx11extras/HISTORY
+++ b/qt5/qtx11extras/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.0
new spell, for modular qt5
diff --git a/qt5/qtxmlpatterns/DETAILS b/qt5/qtxmlpatterns/DETAILS
index 54459f9..f965b08 100755
--- a/qt5/qtxmlpatterns/DETAILS
+++ b/qt5/qtxmlpatterns/DETAILS
@@ -1,8 +1,8 @@
QT_URL=http://download.qt-project.org/official_releases/
SPELL=qtxmlpatterns
SPELLX=$SPELL-opensource-src
- VERSION=5.1.0
-
SOURCE_HASH=sha512:5805bd3ec8fe943e53b87d432cf0b2b00744af5c0d1f91382b17195afa5d8c958aa8667ee7013d5f25c9de11cb92b7d030c4400131742689d681a0c0bf21c0b2
+ VERSION=5.1.1
+
SOURCE_HASH=sha512:53387ea9d4c6e72febf1156872506f89662c6b2793f6d39f88005c12b613fe83922e052bfdb12f8bc394e67811a97f806efaa371d9bdf715ad8f1435c6bcd106
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5/qtxmlpatterns/HISTORY b/qt5/qtxmlpatterns/HISTORY
index 3555985..d78d4c4 100644
--- a/qt5/qtxmlpatterns/HISTORY
+++ b/qt5/qtxmlpatterns/HISTORY
@@ -1,3 +1,6 @@
+2013-09-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.1
+
2013-07-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.1.o

diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 529a9a9..13283cb 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -69,6 +69,11 @@ optional_depends libusbx \
'--disable-libusb' \
'for USB pass-through support' &&

+optional_depends nss \
+ '--enable-smartcard-nss' \
+ '--disable-smartcard-nss' \
+ 'for SmartCard NSS support' &&
+
if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then
suggest_depends gnutls \
"--enable-vnc-tls" \
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index b4341e4..cfd6f3d 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,7 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on nss
+ * *SUB_DEPENDS: Allow forcing dependency on nss
+
2013-08-13 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.5.2
* CONFIGURE: sb16, cs4231a, adlib, and gus sound cards removed
diff --git a/utils/qemu/PRE_SUB_DEPENDS b/utils/qemu/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c19df56
--- /dev/null
+++ b/utils/qemu/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL nss && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
b/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..c19df56
--- /dev/null
+++ b/utils/qemu/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) is_depends_enabled $SPELL nss && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/utils/qemu/SUB_DEPENDS b/utils/qemu/SUB_DEPENDS
new file mode 100755
index 0000000..75b63ab
--- /dev/null
+++ b/utils/qemu/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ NSS) echo "nss support requested, forcing nss dependency." &&
+ depends nss '--enable-smartcard-nss'
+ ;;
+ *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac
diff --git a/utils/spice-gtk/DEPENDS b/utils/spice-gtk/DEPENDS
index 97fc9a1..479d315 100755
--- a/utils/spice-gtk/DEPENDS
+++ b/utils/spice-gtk/DEPENDS
@@ -50,4 +50,19 @@ optional_depends PYTHON \
optional_depends 'vala' \
'--enable-vala' \
'--disable-vala' \
- 'for Vala language support'
+ 'for Vala language support' &&
+
+message "${MESSAGE_COLOR}It is recommended to NOT enable the" \
+ "smartcard support via qemu or there will be a circular" \
+ "dependency between qemu and spice${DEFAULT_COLOR}" &&
+
+optional_depends qemu \
+ '--enable-smartcard' \
+ '--disable-smartcard' \
+ 'for smartcard support' &&
+
+if is_depends_enabled $SPELL qemu; then
+ depends -sub 'NSS' qemu
+fi &&
+
+suggest_depends -sub "GTK${SPICE_GTK_VER} SPICE" 'virt-viewer' '' '' 'for
a better spice client'
diff --git a/utils/spice-gtk/HISTORY b/utils/spice-gtk/HISTORY
index f781dcf..d24b7f3 100644
--- a/utils/spice-gtk/HISTORY
+++ b/utils/spice-gtk/HISTORY
@@ -1,3 +1,9 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Suggest virt-viewer for a better spice client
+ See http://spice-space.org/download.html
+ Make sure virt-viewer uses spice and the same GTK as spice-gtk
+ Optionally depend on qemu with nss for smart cards
+
2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
* Created

diff --git a/utils/spice/DEPENDS b/utils/spice/DEPENDS
index 994f9f6..7e7f82c 100755
--- a/utils/spice/DEPENDS
+++ b/utils/spice/DEPENDS
@@ -1,6 +1,5 @@
depends alsa-lib &&
depends celt051 &&
-depends qemu &&
depends cairo &&
depends pixman &&
depends spice-protocol &&
@@ -12,7 +11,30 @@ depends libxext &&
depends libxrender &&
depends pyparsing &&

-optional_depends OPENGL \
- "--enable-opengl" \
- "--disable-opengl" \
- "for OpenGL video output"
+optional_depends LIBSASL \
+ '--with-sasl' \
+ '--without-sasl' \
+ 'for Cyrus SASL authentication' &&
+
+optional_depends libxinerama \
+ '--enable-xinerama' \
+ '--disable-xinerama' \
+ 'for multi-monitor support via Xinerama' &&
+
+optional_depends OPENGL \
+ "--enable-client --enable-opengl" \
+ "--disable-client --disable-opengl" \
+ "for OpenGL video output" &&
+
+message "${MESSAGE_COLOR}It is recommended to NOT enable the" \
+ "smartcard support via qemu or there will be a circular" \
+ "dependency between qemu and spice${DEFAULT_COLOR}" &&
+
+optional_depends qemu \
+ '--enable-smartcard' \
+ '--disable-smartcard' \
+ 'for smartcard support' &&
+
+if is_depends_enabled $SPELL qemu; then
+ depends -sub 'NSS' qemu
+fi
diff --git a/utils/spice/HISTORY b/utils/spice/HISTORY
index ee7b049..5a17d19 100644
--- a/utils/spice/HISTORY
+++ b/utils/spice/HISTORY
@@ -1,3 +1,9 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Optionally depends on qemu built with nss support
+ Optionally depends on LIBSASL
+ OPENGL optional dependency is for the spice client
+ Optionally depends on libxinerama
+
2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.12.4
* DEPENDS: Depends on pyparsing
diff --git a/x11/gtk-vnc/CONFIGURE b/x11/gtk-vnc/CONFIGURE
index 1e44014..40b4012 100755
--- a/x11/gtk-vnc/CONFIGURE
+++ b/x11/gtk-vnc/CONFIGURE
@@ -1,2 +1,5 @@
config_query_option GTK_VNC_EXAMPLES 'Install example programs?' n \
- '--with-examples' '--without-examples'
+ '--with-examples' '--without-examples' &&
+
+config_query_list GTK_VNC_VER 'Which GTK version (RECOMMEND 3)' \
+ 3 2
diff --git a/x11/gtk-vnc/DEPENDS b/x11/gtk-vnc/DEPENDS
index 0a05090..a73685c 100755
--- a/x11/gtk-vnc/DEPENDS
+++ b/x11/gtk-vnc/DEPENDS
@@ -1,4 +1,5 @@
depends gnutls &&
+depends gtk+${GTK_VNC_VER} "--with-gtk=${GTK_VNC_VER}.0" &&
depends -sub VAPIGEN vala &&

optional_depends gettext \
@@ -30,4 +31,10 @@ optional_depends gobject-introspection \
optional_depends pulseaudio \
'--with-pulseaudio' \
'--without-pulseaudio' \
- 'for PulseAudio audio playback'
+ 'for PulseAudio audio playback' &&
+
+if is_depends_enabled $SPELL gtk+2; then
+ suggest_depends -sub "GTK2 VNC" 'virt-viewer' '' '' 'for a better spice
client'
+else
+ suggest_depends -sub "GTK3 VNC" 'virt-viewer' '' '' 'for a better spice
client'
+fi
diff --git a/x11/gtk-vnc/HISTORY b/x11/gtk-vnc/HISTORY
index a57c554..77275d2 100644
--- a/x11/gtk-vnc/HISTORY
+++ b/x11/gtk-vnc/HISTORY
@@ -1,3 +1,7 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Suggest virt-viewer with appropriate gtk
+ * Allow for building gtk-vnc without an external entity enforcing
gtk+2|3
+
2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.5.1
SOURCE matches upstream SHA256
diff --git a/x11/gtk-vnc/PRE_SUB_DEPENDS b/x11/gtk-vnc/PRE_SUB_DEPENDS
index 241941f..0f2f0ba 100755
--- a/x11/gtk-vnc/PRE_SUB_DEPENDS
+++ b/x11/gtk-vnc/PRE_SUB_DEPENDS
@@ -1,8 +1,12 @@
case $THIS_SUB_DEPENDS in
PYTHON) is_depends_enabled $SPELL python &&
is_depends_enabled $SPELL gtk+2 && return 0 ;;
- GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
- GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 &&
+ [[ "x${GTK_VNC_VER}" == "x2" ]] &&
+ return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 &&
+ [[ "x${GTK_VNC_VER}" == "x3" ]] &&
+ return 0 ;;
esac

return 1
diff --git
a/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS
b/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..241941f
--- /dev/null
+++ b/x11/gtk-vnc/REPAIR^45fd74954c6d20e34ccd7d3041198c4e^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ PYTHON) is_depends_enabled $SPELL python &&
+ is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 && return 0 ;;
+esac
+
+return 1
diff --git a/x11/gtk-vnc/SUB_DEPENDS b/x11/gtk-vnc/SUB_DEPENDS
index e9d41db..fd0d96b 100755
--- a/x11/gtk-vnc/SUB_DEPENDS
+++ b/x11/gtk-vnc/SUB_DEPENDS
@@ -4,9 +4,11 @@ case $THIS_SUB_DEPENDS in
depends gtk+2 '--with-gtk=2.0'
;;
GTK2) echo "gtk+2 bindings requested, forcing them." &&
+ GTK_VNC_VER=2
depends gtk+2 '--with-gtk=2.0'
;;
GTK3) echo "gtk+3 bindings requested, forcing them." &&
+ GTK_VNC_VER=3
depends gtk+3 '--with-gtk=3.0'
;;
*) echo "unknown sub-depends!"
diff --git a/x11/virt-viewer/CONFIGURE b/x11/virt-viewer/CONFIGURE
new file mode 100755
index 0000000..0c7d84d
--- /dev/null
+++ b/x11/virt-viewer/CONFIGURE
@@ -0,0 +1,2 @@
+config_query_list VIRT_VIEWER_GUI 'Use which GTK viewer (recommend
spice-gtk)?' \
+ spice-gtk gtk-vnc
diff --git a/x11/virt-viewer/DEPENDS b/x11/virt-viewer/DEPENDS
index 7ca551f..f212e86 100755
--- a/x11/virt-viewer/DEPENDS
+++ b/x11/virt-viewer/DEPENDS
@@ -1,5 +1,8 @@
-depends gtk+2 &&
-depends libxml2 &&
-depends gtk-vnc &&
-depends libglade2 &&
-depends libvirt
+depends libxml2 &&
+depends libvirt &&
+
+if [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]]; then
+ depends ${VIRT_VIEWER_GUI} '--without-spice-vnc'
+else
+ depends ${VIRT_VIEWER_GUI} '--without-gtk-vnc'
+fi
diff --git a/x11/virt-viewer/HISTORY b/x11/virt-viewer/HISTORY
index 1b98ef5..9ad7a23 100644
--- a/x11/virt-viewer/HISTORY
+++ b/x11/virt-viewer/HISTORY
@@ -1,3 +1,6 @@
+2013-09-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Allow for selecting spice-gtk or gtk-vnc, these are exclusive
options
+
2013-08-12 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.5.7

diff --git a/x11/virt-viewer/PRE_SUB_DEPENDS b/x11/virt-viewer/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..6900451
--- /dev/null
+++ b/x11/virt-viewer/PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ SPICE) [[ "x${VIRT_VIEWER_GUI}" == "xspice-gtk" ]] && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 ;;
+ VNC) [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS
b/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..6900451
--- /dev/null
+++ b/x11/virt-viewer/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ SPICE) [[ "x${VIRT_VIEWER_GUI}" == "xspice-gtk" ]] && return 0 ;;
+ GTK3) is_depends_enabled $SPELL gtk+3 ;;
+ GTK2) is_depends_enabled $SPELL gtk+2 ;;
+ VNC) [[ "x${VIRT_VIEWER_GUI}" == "xgtk-vnc" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1;;
+esac
diff --git a/x11/virt-viewer/SUB_DEPENDS b/x11/virt-viewer/SUB_DEPENDS
new file mode 100755
index 0000000..16a12fb
--- /dev/null
+++ b/x11/virt-viewer/SUB_DEPENDS
@@ -0,0 +1,21 @@
+case $THIS_SUB_DEPENDS in
+ SPICE) message "spice-gtk requested, forcing enabled spice-gtk
dependency" &&
+ persistent_add VIRT_VIEWER_GUI &&
+ VIRT_VIEWER_GUI=spice-gtk
+ ;;
+ GTK3) message "gtk+3 requested, forcing enabled gtk+3 dependency" &&
+ VIRT_VIEWER_GTK_VER=3 &&
+ depends gtk+3 '--with-gtk=3.0'
+ ;;
+ GTK2) message "gtk+2 requested, forcing enabled gtk+2 dependency" &&
+ VIRT_VIEWER_GTK_VER=2 &&
+ depends gtk+2 '--with-gtk=2.0'
+ ;;
+ VNC) message "gtk-vnc requested, forcing enabled gtk-vnc dependency" &&
+ persistent_add VIRT_VIEWER_GUI &&
+ VIRT_VIEWER_GUI=gtk-vnc
+ ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+ return 1
+ ;;
+esac
diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS
index acc1eca..7df551f 100755
--- a/x11/xscreensaver/DEPENDS
+++ b/x11/xscreensaver/DEPENDS
@@ -1,6 +1,13 @@
-depends bc &&
-depends zlib &&
-depends xorg-libs &&
+depends bc &&
+depends libice &&
+depends libx11 &&
+depends libxxf86misc &&
+depends libxxf86vm &&
+depends libxi &&
+depends libxmu &&
+depends libxrender &&
+depends libxt &&
+depends zlib &&

message "${MESSAGE_COLOR}The xscreensaver demo program allows you to" \
"browse among the different effects available in xscreensaver." \
diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS
index 1e341d4..9c63a21 100755
--- a/x11/xscreensaver/DETAILS
+++ b/x11/xscreensaver/DETAILS
@@ -1,10 +1,11 @@
SPELL=xscreensaver
- VERSION=5.20
+ VERSION=5.22
SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE
WEB_SITE=http://www.jwz.org/xscreensaver/
-
SOURCE_HASH=sha512:2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74
+#
SOURCE_HASH=sha512:2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74
ENTERED=20010922
LICENSE[0]=BSD
KEYWORDS="x11"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index af42dc5..2600b46 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,8 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 5.22
+ * DEPENDS: Replaced xorg-libs with libice, libx11, libxxf86misc,
libxxf86vm,
+ libxi, libxmu, libxrender, and libxt
+
2012-12-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.20

diff --git a/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig
b/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig
new file mode 100644
index 0000000..cdb8565
Binary files /dev/null and b/x11/xscreensaver/xscreensaver-5.22.tar.gz.sig
differ
diff --git a/xfce/xfce4-profile/DEPENDS b/xfce/xfce4-profile/DEPENDS
index d46c7bd..0180d15 100755
--- a/xfce/xfce4-profile/DEPENDS
+++ b/xfce/xfce4-profile/DEPENDS
@@ -1,9 +1,9 @@
-runtime_depends xorg-libs &&
runtime_depends gtk+2 &&
runtime_depends libxml2 &&
runtime_depends libxfce4util &&
runtime_depends libxfce4menu &&
runtime_depends libxfcegui4 &&
+runtime_depends X11-SERVER &&
runtime_depends xfconf &&
runtime_depends xfce4-settings &&
runtime_depends xfdesktop &&
diff --git a/xfce/xfce4-profile/HISTORY b/xfce/xfce4-profile/HISTORY
index 6e595dd..f62e266 100644
--- a/xfce/xfce4-profile/HISTORY
+++ b/xfce/xfce4-profile/HISTORY
@@ -1,3 +1,6 @@
+2013-09-06 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Replaced runtime dependency on xorg-libs with X11-SERVER
+
2013-06-14 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: terminal renamed to xfce4-terminal




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (0a6cd9c91dd3a15d6f7dee154187d86e35f5a2e1), Treeve Jelbert, 09/07/2013

Archive powered by MHonArc 2.6.24.

Top of Page