Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

9 files changed, 42 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 854032ad5f..d02e256fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-08-30 Arjan Bouter <abouter@sourcemage.org>
+	* http/luakit: new spell, lua based browser framework
+
 2010-08-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* devel/asis: new spell, Ada Semantic Interface Specification
 	* devel/florist: new spell, POSIX bindings for Ada
diff --git a/http/luakit/BUILD b/http/luakit/BUILD
new file mode 100755
index 0000000000..8f58e6df93
--- /dev/null
+++ b/http/luakit/BUILD
@@ -0,0 +1 @@
+make
diff --git a/http/luakit/DEPENDS b/http/luakit/DEPENDS
new file mode 100755
index 0000000000..22eea363da
--- /dev/null
+++ b/http/luakit/DEPENDS
@@ -0,0 +1,3 @@
+depends lua &&
+depends webkitgtk &&
+depends wget 
diff --git a/http/luakit/DETAILS b/http/luakit/DETAILS
new file mode 100755
index 0000000000..3f5504d298
--- /dev/null
+++ b/http/luakit/DETAILS
@@ -0,0 +1,22 @@
+           SPELL=luakit
+if [[ "$LUAKIT_AUTOUPDATE" == "y" ]]; then
+         VERSION=$(date +%Y%m%d)
+else
+         VERSION=git
+fi
+          SOURCE="${SPELL}-git.tar.bz2"
+   SOURCE_URL[0]=git://github.com/mason-larobina/luakit:luakit-git
+   SOURCE_IGNORE=volatile
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+        WEB_SITE="http://www.luakit.org/projects/luakit"
+      LICENSE[0]=GPL
+         ENTERED=20100830
+           SHORT="a highly configurable, micro-browser framework"
+cat << EOF
+luakit is a highly configurable, micro-browser framework based on the WebKit
+web content engine and the GTK+ toolkit.
+It is very fast, extensible by Lua.
+It is primarily targeted at power users, developers and any people with too
+much time on their hands who want to have fine-grained control over their web
+browsers behaviour and interface.
+EOF
diff --git a/http/luakit/HISTORY b/http/luakit/HISTORY
new file mode 100644
index 0000000000..312071fbbc
--- /dev/null
+++ b/http/luakit/HISTORY
@@ -0,0 +1,3 @@
+2010-08-30 Arjan Bouter <abouter@sourcemage.org>
+	* BUILD, DEPENDS, DETAILS, PRE_BUILD, PREPARE: spell created
+
diff --git a/http/luakit/PREPARE b/http/luakit/PREPARE
new file mode 100755
index 0000000000..f4414105df
--- /dev/null
+++ b/http/luakit/PREPARE
@@ -0,0 +1 @@
+config_query LUAKIT_AUTOUPDATE "Queue for update on every system update?" n
diff --git a/http/luakit/PRE_BUILD b/http/luakit/PRE_BUILD
new file mode 100755
index 0000000000..f9fea0687c
--- /dev/null
+++ b/http/luakit/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+sedit 's#luakit/docs#doc/luakit#' config.mk &&
+sedit 's#usr/local#usr#' config.mk
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index c5f9af49f4..289a9481fe 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,10 +1,9 @@
            SPELL=awesome
-         VERSION=3.4.6
+         VERSION=3.4.7
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
-#      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-     SOURCE_HASH=sha512:4ca1b2663eb97cb57b3618ea9f4cd1ef4f83705adfdd55aa44edd5110d96ddfb9a9b2eecd82777dbae947bade4d31e67465341d22620b211fd07bdca1cf75a87
+     SOURCE_HASH=sha512:b965ce394e17715aceff5b476ae776a03cdcf906cd2480979cfad57b600b7470bd5e384746204acbd75ede28d0fc9dc4322bd758082eb4eefd2c7cc08c0f7cd2
       LICENSE[0]=MIT
         KEYWORDS="windowmanagers"
         WEB_SITE=http://awesome.naquadah.org/
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index d8d9a3788b..1e399e01b5 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,6 @@
+2010-08-30 Arjan Bouter <abouter@sourcemage.org>
+	* DETAILS: version 3.4.7
+
 2010-08-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* PRE_BUILD, awesome.desktop, startawesome: install
 	  our .desktop and start script like we do for other