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

19 files changed, 89 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index da85eefb65..c3da04021a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,7 +58,6 @@
 	* gnustep-libs/gnustep-back-art: removed deprecated spell
 	* gnustep-libs/gnustep-back-xlib: removed deprecated spell
 	* graphics/fotox: removed deprecated spell
-	* graphics-libs/giflib: removed deprecated spell
 	* http/apache: removed deprecated spell
 	* http/galeon: removed deprecated spell
 	* http/ijb: removed deprecated spell
diff --git a/disk/gparted/DETAILS b/disk/gparted/DETAILS
index aa4ed16948..3ed3e73865 100755
--- a/disk/gparted/DETAILS
+++ b/disk/gparted/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gparted
-         VERSION=0.6.3
-     SOURCE_HASH=sha512:060d1786cd0f4298a4c3a142304ff5f15168860b48ff570bfdd39abbc89e645e23a0fe56e757002e92f03f509a04ba5c5831e196b1461b892a660a48b8c2b5dd
+         VERSION=0.6.4
+     SOURCE_HASH=sha512:c368630da952fb3ca23ccde049055a8d57e6278112a519a0d3d2a0ef2d49fd8ddbd93f188850a2b01686e6ed99200a59e5c53c53d6654fe7cf654e037c56f7c7
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/disk/gparted/HISTORY b/disk/gparted/HISTORY
index 3e984e22a6..fcdbd81296 100644
--- a/disk/gparted/HISTORY
+++ b/disk/gparted/HISTORY
@@ -1,3 +1,6 @@
+2010-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.6.4
+
 2010-09-24 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.6.3
 
diff --git a/gnome2-libs/gobject-introspection/DETAILS b/gnome2-libs/gobject-introspection/DETAILS
index 90fff50ed1..0adbbac966 100755
--- a/gnome2-libs/gobject-introspection/DETAILS
+++ b/gnome2-libs/gobject-introspection/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gobject-introspection
 if [[ $GOBJ_VER == devel ]]; then
-         VERSION=0.9.6
+         VERSION=0.9.9
           SOURCE=${SPELL}-${VERSION}.tar.bz2
 else
          VERSION=0.6.14
diff --git a/gnome2-libs/gobject-introspection/HISTORY b/gnome2-libs/gobject-introspection/HISTORY
index e690a1f3c1..55469682e8 100644
--- a/gnome2-libs/gobject-introspection/HISTORY
+++ b/gnome2-libs/gobject-introspection/HISTORY
@@ -1,3 +1,6 @@
+2010-09-30 George Sherwood <gsherwood@sourcemage.org>
+	* DETAILS: Updated devel to version 0.9.9
+
 2010-09-25 George Sherwood <gsherwood@sourcemage.org>
 	* DETAILS: Updated devel to version 0.9.6
 
diff --git a/gnome2-libs/gobject-introspection/gobject-introspection-0.9.6.tar.bz2.sig b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.6.tar.bz2.sig
deleted file mode 100644
index 6c45868d39..0000000000
--- a/gnome2-libs/gobject-introspection/gobject-introspection-0.9.6.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/gobject-introspection/gobject-introspection-0.9.9.tar.bz2.sig b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.9.tar.bz2.sig
new file mode 100644
index 0000000000..288d809215
--- /dev/null
+++ b/gnome2-libs/gobject-introspection/gobject-introspection-0.9.9.tar.bz2.sig
diff --git a/graphics-libs/giflib/CONFLICTS b/graphics-libs/giflib/CONFLICTS
new file mode 100755
index 0000000000..339238cfd4
--- /dev/null
+++ b/graphics-libs/giflib/CONFLICTS
@@ -0,0 +1 @@
+conflicts libungif y
diff --git a/graphics-libs/giflib/DETAILS b/graphics-libs/giflib/DETAILS
new file mode 100755
index 0000000000..80663b8f39
--- /dev/null
+++ b/graphics-libs/giflib/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=giflib
+         VERSION=4.1.6
+     SOURCE_HASH=sha512:f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      LICENSE[0]=MIT
+        WEB_SITE=http://sourceforge.net/projects/giflib/
+        KEYWORDS="images graphics libs"
+         ENTERED=20010922
+           SHORT="giflib is a non-LZQ library for compressed GIF images"
+cat << EOF
+giflib is a library for reading and writing gif images. It is API and ABI 
+compatible with libungif which was in wide use while the LZW compression 
+algorithm was patented.
+EOF
diff --git a/graphics-libs/giflib/HISTORY b/graphics-libs/giflib/HISTORY
new file mode 100644
index 0000000000..75ae7411cb
--- /dev/null
+++ b/graphics-libs/giflib/HISTORY
@@ -0,0 +1,29 @@
+2008-07-12 Vlad Glagolev <stealth@sourcemage.org>
+	* PROVIDES: removed, useless since deprecation of libungif
+
+2007-11-14 Arwed v. Merkatz <v.merkatz@gmx.net>
+	* UP_TRIGGERS: added to up_trigger dependant spells on the switch
+	  from libungif to libgif
+
+2007-11-11 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* CONFLICTS: make it default to y for deprecation
+
+2007-11-11 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 4.1.6
+	  new website & url
+	  update desc
+	* PRE_BUILD, DEPENDS: deleted, not needed
+
+2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
+	* PROVIDES: [automated] Fixed invalid entries.
+
+2006-05-15 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Filled in long description
+	  Added 'non-LZW' to SHORT
+	  Removed UPDATED
+
+2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
+	* DETAILS: (automated) Add KEYWORDS
+
+2005-12-05 Robin Cook <rcook@wyrms.net>
+	* Initial spell
diff --git a/graphics-libs/giflib/UP_TRIGGERS b/graphics-libs/giflib/UP_TRIGGERS
new file mode 100755
index 0000000000..2fc524e71c
--- /dev/null
+++ b/graphics-libs/giflib/UP_TRIGGERS
@@ -0,0 +1,12 @@
+# up_trigger stuff that still uses libungif so it's not broken afterwards
+
+if spell_ok  libungif; then
+  message "Switching from libungif to libgif requires recompiling spells using libungif..."
+  message "Figuring out what spells need to be recast, this may take a while."
+  for each in $(show_up_depends libungif); do
+    if gaze install $each | xargs readelf -d 2> /dev/null |
+       grep -q "NEEDED.*libungif"; then
+         up_trigger $each cast_self
+    fi
+  done
+fi
diff --git a/python-pypi/formalchemy/DETAILS b/python-pypi/formalchemy/DETAILS
index a35de7e645..afe223b2fb 100755
--- a/python-pypi/formalchemy/DETAILS
+++ b/python-pypi/formalchemy/DETAILS
@@ -17,4 +17,5 @@ forms environment.
 FormAlchemy eliminates boilerplate by autogenerating HTML input fields from a given model. 
 FormAlchemy will try to figure out what kind of HTML code should be returned by 
 introspecting the model's properties and generate ready-to-use HTML code that will fit the 
-developer's application.EOF
+developer's application.
+EOF
diff --git a/python-pypi/formalchemy/HISTORY b/python-pypi/formalchemy/HISTORY
index 42dc47ffc6..3f16c142c0 100644
--- a/python-pypi/formalchemy/HISTORY
+++ b/python-pypi/formalchemy/HISTORY
@@ -1,3 +1,6 @@
+2010-10-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: fix typo with EOF
+
 2010-09-16 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1.3.3
 	  spell created
diff --git a/python-pypi/sqlkit/DETAILS b/python-pypi/sqlkit/DETAILS
index bde2e48ee5..e8bf0552bb 100755
--- a/python-pypi/sqlkit/DETAILS
+++ b/python-pypi/sqlkit/DETAILS
@@ -1,7 +1,7 @@
            SPELL=sqlkit
-         VERSION=0.9
-     SOURCE_HASH=sha512:30f22583be164d0eff3f7d60ed0a3b1334c337d7f1e6c13944eb75572d81c5728676c9bed420e0c7d25ba1ed2ab0c6203bd443df5507cc17f90c5d4666ba381a
-          SOURCE=$SPELL-$VERSION.tar.gz
+         VERSION=0.9.1
+     SOURCE_HASH=sha512:5dad6fb962a4c454ec726d927c04ba4c349fb203408be3ecd2d3bd1de19424ff679eb94ba992625a34480a7610891eec13ea48c4707ac156cdb3d06f5b13d687
+          SOURCE=$SPELL-${VERSION}.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://sqlkit.argolinux.org
    SOURCE_URL[0]=$WEB_SITE/download/$SOURCE
diff --git a/python-pypi/sqlkit/HISTORY b/python-pypi/sqlkit/HISTORY
index ccd88960dc..e6051afa34 100644
--- a/python-pypi/sqlkit/HISTORY
+++ b/python-pypi/sqlkit/HISTORY
@@ -1,3 +1,6 @@
+2010-09-29 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 0.9.1
+
 2010-09-09 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 0.9
 
diff --git a/security-libs/cracklib/DETAILS b/security-libs/cracklib/DETAILS
index 06ce69ee8f..ea084e6ba3 100755
--- a/security-libs/cracklib/DETAILS
+++ b/security-libs/cracklib/DETAILS
@@ -1,5 +1,5 @@
            SPELL=cracklib
-         VERSION=2.8.16
+         VERSION=2.8.18
     VERSIONWORDS=20080507
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SPELL-words-$VERSIONWORDS.gz
@@ -7,7 +7,7 @@
   SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-    SOURCE_HASH=sha512:f8a19d295499898958b59c772db65f2ec3e66c7fa792bc66f500e2e30e13d7f5a8fc01d50f4d81788768df8a6f5770f45e710dab5659e235d1521138b36b4a17
+    SOURCE_HASH=sha512:f9a754598f9be16507cb4e16a35720da71796dcda664bcfb36038b842ab9f5a1f4bbcdf4c9f64ef0981781ab91dc80117a531cd1651b29def2054be66e485725
     SOURCE2_HASH='sha512:d21055d6439a2b92b23ab6fd31222d9330315a0b44f53fae308ce5749a9fcb33b7df982f85ca8e2d6d2f9cc4c7264dfc3ed454edbccecd76289713df09fd633e'
         WEB_SITE=http://sf.net/projects/$SPELL
          ENTERED=20050310
diff --git a/security-libs/cracklib/HISTORY b/security-libs/cracklib/HISTORY
index 3d8ca17e31..ea5c697916 100644
--- a/security-libs/cracklib/HISTORY
+++ b/security-libs/cracklib/HISTORY
@@ -1,3 +1,6 @@
+2010-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.8.18
+
 2010-09-17 Treeve Jelbert <treeve@sourcemage.org>
 	* DEPENDS: add optional python
 
diff --git a/shell-term-fm/shared-mime-info/DETAILS b/shell-term-fm/shared-mime-info/DETAILS
index b99c75f14f..3d488a6e67 100755
--- a/shell-term-fm/shared-mime-info/DETAILS
+++ b/shell-term-fm/shared-mime-info/DETAILS
@@ -1,6 +1,6 @@
            SPELL=shared-mime-info
-         VERSION=0.71
-     SOURCE_HASH=sha512:cd2f5b84e6b4b7f9119187db350111bbce52990f81bfeb7bbc27fe64277f958243be59d34262eb235c158ce18ca5c11d7d5dedba03c2bdab750dc32d98e1619e
+         VERSION=0.80
+     SOURCE_HASH=sha512:16e3b21d0c40ec19c26bb47f3657e5efb08392b57cc6ae60e16795d60a72e5f896379f02234a22c530435f1f8fe1a5bb262da8ad54844b1a153bc9ee1e9f2b45
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://freedesktop.org/~hadess/$SOURCE
diff --git a/shell-term-fm/shared-mime-info/HISTORY b/shell-term-fm/shared-mime-info/HISTORY
index 8330c21d20..69faa9dcbb 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,6 @@
+2010-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.80
+
 2010-02-15 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.71