summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2014-12-31 11:29:56 +0100
committerTreeve Jelbert2014-12-31 11:29:56 +0100
commitd0b5c55f4700def003b0936992cf38bd88975e7a (patch)
treeac5cc001e12b9cc057f29d9c14b1c9407fa31834
parent0f04d8442e19350a56a44963421891bfb4f367eb (diff)
parent4ec967aaae1742401394b6003ca66b1a1d620743 (diff)
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
-rw-r--r--ChangeLog48
-rwxr-xr-xarchive/gzip/DEPENDS1
-rwxr-xr-xarchive/gzip/DETAILS2
-rw-r--r--archive/gzip/HISTORY5
-rwxr-xr-xarchive/xz-utils/DETAILS2
-rw-r--r--archive/xz-utils/HISTORY3
-rwxr-xr-xaudio-drivers/oss/DETAILS4
-rw-r--r--audio-drivers/oss/HISTORY3
-rwxr-xr-xaudio-libs/lilv-0/DETAILS7
-rw-r--r--audio-libs/lilv-0/HISTORY3
-rwxr-xr-xaudio-libs/sratom-0/DETAILS7
-rw-r--r--audio-libs/sratom-0/HISTORY3
-rwxr-xr-xaudio-libs/suil-0/DETAILS7
-rw-r--r--audio-libs/suil-0/HISTORY3
-rwxr-xr-xaudio-plugins/calf-plugins/DETAILS9
-rw-r--r--audio-plugins/calf-plugins/HISTORY3
-rwxr-xr-xaudio-soft/lilv-util/DETAILS7
-rw-r--r--audio-soft/lilv-util/HISTORY3
-rwxr-xr-xcrypto/cryptcat/CONFLICTS3
-rw-r--r--crypto/cryptcat/HISTORY3
-rwxr-xr-xcrypto/gsasl/DETAILS2
-rw-r--r--crypto/gsasl/HISTORY3
-rwxr-xr-xcrypto/qca-gnupg/BUILD7
-rwxr-xr-xcrypto/qca-gnupg/CONFLICTS1
-rwxr-xr-xcrypto/qca-gnupg/DEPENDS2
-rwxr-xr-xcrypto/qca-gnupg/DETAILS17
-rwxr-xr-xcrypto/qca-gnupg/DOWNLOAD1
-rw-r--r--crypto/qca-gnupg/HISTORY6
-rwxr-xr-xcrypto/qca-gnupg/INSTALL1
-rwxr-xr-xcrypto/qca-gnupg/PRE_BUILD1
-rwxr-xr-xcrypto/qca-gnupg/UP_TRIGGERS1
-rwxr-xr-xcrypto/qca-openssl/BUILD7
-rwxr-xr-xcrypto/qca-openssl/CONFLICTS1
-rwxr-xr-xcrypto/qca-openssl/DEPENDS2
-rwxr-xr-xcrypto/qca-openssl/DETAILS17
-rwxr-xr-xcrypto/qca-openssl/DOWNLOAD1
-rw-r--r--crypto/qca-openssl/HISTORY37
-rwxr-xr-xcrypto/qca-openssl/INSTALL1
-rwxr-xr-xcrypto/qca-openssl/PRE_BUILD4
-rwxr-xr-xcrypto/qca-openssl/UP_TRIGGERS1
-rw-r--r--crypto/qca-openssl/qca-ossl-openssl.patch29
-rwxr-xr-xcrypto/qca-pkcs11/BUILD6
-rwxr-xr-xcrypto/qca-pkcs11/CONFLICTS1
-rwxr-xr-xcrypto/qca-pkcs11/DEPENDS4
-rwxr-xr-xcrypto/qca-pkcs11/DETAILS18
-rwxr-xr-xcrypto/qca-pkcs11/DOWNLOAD1
-rw-r--r--crypto/qca-pkcs11/HISTORY12
-rwxr-xr-xcrypto/qca-pkcs11/INSTALL1
-rwxr-xr-xcrypto/qca-pkcs11/PRE_BUILD1
-rwxr-xr-xcrypto/qca-pkcs11/UP_TRIGGERS1
-rwxr-xr-xcrypto/qca2/BUILD9
-rwxr-xr-xcrypto/qca2/CONFLICTS3
-rwxr-xr-xcrypto/qca2/DEPENDS12
-rwxr-xr-xcrypto/qca2/DETAILS6
-rw-r--r--crypto/qca2/HISTORY6
-rwxr-xr-xdatabase/db/BUILD2
-rwxr-xr-xdatabase/db/DETAILS5
-rw-r--r--database/db/HISTORY4
-rwxr-xr-xdevel/astyle/DETAILS4
-rw-r--r--devel/astyle/HISTORY3
-rwxr-xr-xdevel/binutils/DETAILS2
-rw-r--r--devel/binutils/HISTORY3
-rwxr-xr-xdevel/cbp2make/BUILD2
-rwxr-xr-xdevel/cbp2make/DETAILS13
-rw-r--r--devel/cbp2make/HISTORY2
-rwxr-xr-xdevel/cbp2make/INSTALL2
-rwxr-xr-xdevel/diffutils/DEPENDS1
-rw-r--r--devel/diffutils/HISTORY3
-rwxr-xr-xdevel/doxygen/DETAILS5
-rw-r--r--devel/doxygen/HISTORY4
-rw-r--r--devel/doxygen/doxygen-1.8.2.src.tar.gz.sigbin287 -> 0 bytes
-rwxr-xr-xdevel/m4/DEPENDS1
-rw-r--r--devel/m4/HISTORY3
-rwxr-xr-xdevel/pcc/DETAILS12
-rw-r--r--devel/pcc/HISTORY4
-rwxr-xr-xdevel/pcc/PREPARE2
-rwxr-xr-xdisk/avfs/DETAILS2
-rw-r--r--disk/avfs/HISTORY7
-rwxr-xr-xeditors/gawk/DEPENDS1
-rw-r--r--editors/gawk/HISTORY3
-rwxr-xr-xemacs-lisp/FUNCTIONS44
-rwxr-xr-xemacs-lisp/haskell-mode/DEPENDS1
-rwxr-xr-xemacs-lisp/haskell-mode/DETAILS15
-rw-r--r--emacs-lisp/haskell-mode/HISTORY2
-rwxr-xr-xgnome2-libs/libaccounts-glib/BUILD2
-rwxr-xr-xgnome2-libs/libaccounts-glib/DEPENDS6
-rwxr-xr-xgnome2-libs/libaccounts-glib/DETAILS17
-rw-r--r--gnome2-libs/libaccounts-glib/HISTORY4
-rwxr-xr-xgraphics-libs/cimg/DETAILS4
-rw-r--r--graphics-libs/cimg/HISTORY3
-rwxr-xr-xgraphics-libs/libpgf/DEPENDS6
-rwxr-xr-xgraphics-libs/libpgf/DETAILS22
-rw-r--r--graphics-libs/libpgf/HISTORY4
-rwxr-xr-xgraphics-libs/libpgf/PRE_BUILD6
-rwxr-xr-xgraphics-libs/opencv/DETAILS4
-rw-r--r--graphics-libs/opencv/HISTORY3
-rwxr-xr-xgraphics/libgphoto2/DETAILS4
-rw-r--r--graphics/libgphoto2/HISTORY3
-rwxr-xr-xhttp/firefox/DEPENDS2
-rw-r--r--http/firefox/HISTORY3
-rwxr-xr-xhttp/links-twibright/DETAILS4
-rw-r--r--http/links-twibright/HISTORY3
-rwxr-xr-xjava/crimson-apache/DETAILS10
-rw-r--r--java/crimson-apache/HISTORY3
-rwxr-xr-xjava/crimson-apache/INSTALL6
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-beanutils/DETAILS11
-rw-r--r--java/jakarta-commons-beanutils/HISTORY3
-rwxr-xr-xjava/jakarta-commons-beanutils/INSTALL6
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-collections/DETAILS11
-rw-r--r--java/jakarta-commons-collections/HISTORY3
-rwxr-xr-xjava/jakarta-commons-collections/INSTALL8
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-daemon/DETAILS11
-rw-r--r--java/jakarta-commons-daemon/HISTORY3
-rwxr-xr-xjava/jakarta-commons-daemon/INSTALL6
-rwxr-xr-xjava/jakarta-commons-dbcp/BUILD4
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-dbcp/DETAILS13
-rw-r--r--java/jakarta-commons-dbcp/HISTORY4
-rwxr-xr-xjava/jakarta-commons-dbcp/INSTALL8
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-digester/DETAILS11
-rw-r--r--java/jakarta-commons-digester/HISTORY3
-rwxr-xr-xjava/jakarta-commons-digester/INSTALL6
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-fileupload/DETAILS11
-rw-r--r--java/jakarta-commons-fileupload/HISTORY3
-rwxr-xr-xjava/jakarta-commons-fileupload/INSTALL6
-rwxr-xr-xjava/jakarta-commons-lang/BUILD4
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-lang/DETAILS12
-rw-r--r--java/jakarta-commons-lang/HISTORY4
-rwxr-xr-xjava/jakarta-commons-lang/INSTALL8
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-logging/DETAILS13
-rw-r--r--java/jakarta-commons-logging/HISTORY3
-rwxr-xr-xjava/jakarta-commons-logging/INSTALL8
-rwxr-xr-xjava/jakarta-commons-modeler/BUILD4
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-modeler/DETAILS11
-rw-r--r--java/jakarta-commons-modeler/HISTORY4
-rwxr-xr-xjava/jakarta-commons-modeler/INSTALL8
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-pool/DETAILS12
-rw-r--r--java/jakarta-commons-pool/HISTORY3
-rwxr-xr-xjava/jakarta-commons-pool/INSTALL6
-rw-r--r--[-rwxr-xr-x]java/jakarta-log4j/DETAILS6
-rw-r--r--java/jakarta-log4j/HISTORY3
-rwxr-xr-xjava/jakarta-log4j/INSTALL4
-rw-r--r--[-rwxr-xr-x]java/jakarta-regexp/DETAILS6
-rw-r--r--java/jakarta-regexp/HISTORY3
-rwxr-xr-xjava/jakarta-regexp/INSTALL4
-rw-r--r--[-rwxr-xr-x]java/jakarta-struts-bin/DETAILS11
-rw-r--r--java/jakarta-struts-bin/HISTORY3
-rwxr-xr-xjava/jakarta-struts-bin/INSTALL4
-rw-r--r--[-rwxr-xr-x]java/jakarta-velocity/DETAILS12
-rw-r--r--java/jakarta-velocity/HISTORY3
-rwxr-xr-xjava/jakarta-velocity/INSTALL6
-rw-r--r--kernels/linux/HISTORY4
-rwxr-xr-xkernels/linux/info/patches/maintenance_patches_3/patch-3.18.15
-rw-r--r--kernels/linux/latest.defaults2
-rwxr-xr-xlibs/libgit2/DETAILS8
-rw-r--r--libs/libgit2/HISTORY4
-rw-r--r--libs/libsigsegv/HISTORY4
-rwxr-xr-xlibs/libsigsegv/UP_TRIGGERS10
-rwxr-xr-xlibs/libvirt/DEPENDS6
-rw-r--r--libs/libvirt/HISTORY5
-rwxr-xr-xlibs/sip/DETAILS4
-rw-r--r--libs/sip/HISTORY3
-rwxr-xr-xlibs/td_lib/BUILD3
-rwxr-xr-xlibs/td_lib/DETAILS18
-rw-r--r--libs/td_lib/HISTORY2
-rwxr-xr-xmail/msmtp/DETAILS6
-rw-r--r--mail/msmtp/HISTORY4
-rwxr-xr-xnet/ebtables/BUILD2
-rwxr-xr-xnet/ebtables/DETAILS27
-rw-r--r--net/ebtables/HISTORY3
-rwxr-xr-xnet/ebtables/INSTALL3
-rwxr-xr-xnet/ebtables/PRE_BUILD8
-rw-r--r--net/ebtables/ebtables-v2.0.10-4.tar.gz.sigbin0 -> 287 bytes
-rwxr-xr-xnet/ebtables/init.d/ebtables147
-rwxr-xr-xnet/libnftnl/DEPENDS1
-rwxr-xr-xnet/libnftnl/DETAILS20
-rw-r--r--net/libnftnl/HISTORY3
-rwxr-xr-xnet/libnftnl/PRE_BUILD8
-rwxr-xr-xnet/nc/CONFLICTS1
-rw-r--r--net/nc/HISTORY3
-rwxr-xr-xnet/netcat/CONFLICTS1
-rw-r--r--net/netcat/HISTORY3
-rwxr-xr-xnet/nftables/DEPENDS2
-rwxr-xr-xnet/nftables/DETAILS23
-rw-r--r--net/nftables/HISTORY3
-rwxr-xr-xnet/nftables/PRE_BUILD8
-rwxr-xr-xpython-pypi/argh/DEPENDS2
-rwxr-xr-xpython-pypi/argh/DETAILS4
-rw-r--r--python-pypi/argh/HISTORY4
-rwxr-xr-xpython-pypi/args/DEPENDS2
-rwxr-xr-xpython-pypi/args/DETAILS14
-rw-r--r--python-pypi/args/HISTORY2
-rwxr-xr-xpython-pypi/awesome-slugify/DEPENDS4
-rwxr-xr-xpython-pypi/awesome-slugify/DETAILS13
-rw-r--r--python-pypi/awesome-slugify/HISTORY2
-rwxr-xr-xpython-pypi/clint/DEPENDS5
-rwxr-xr-xpython-pypi/clint/DETAILS4
-rw-r--r--python-pypi/clint/HISTORY7
-rwxr-xr-xpython-pypi/feedgenerator/DETAILS4
-rw-r--r--python-pypi/feedgenerator/HISTORY3
-rwxr-xr-xpython-pypi/httplib2/DEPENDS3
-rwxr-xr-xpython-pypi/httplib2/DETAILS11
-rw-r--r--python-pypi/httplib2/HISTORY5
-rwxr-xr-xpython-pypi/isort/DETAILS4
-rw-r--r--python-pypi/isort/HISTORY3
-rwxr-xr-xpython-pypi/jinja2/DEPENDS4
-rw-r--r--python-pypi/jinja2/HISTORY3
-rwxr-xr-xpython-pypi/markupsafe/DETAILS10
-rw-r--r--python-pypi/markupsafe/HISTORY4
-rwxr-xr-xpython-pypi/pathtools/DEPENDS2
-rwxr-xr-xpython-pypi/pathtools/DETAILS14
-rw-r--r--python-pypi/pathtools/HISTORY2
-rwxr-xr-xpython-pypi/py/DEPENDS2
-rwxr-xr-xpython-pypi/py/DETAILS19
-rw-r--r--python-pypi/py/HISTORY2
-rwxr-xr-xpython-pypi/pytest/DEPENDS3
-rwxr-xr-xpython-pypi/pytest/DETAILS14
-rw-r--r--python-pypi/pytest/HISTORY2
-rwxr-xr-xpython-pypi/python-dateutil/DEPENDS4
-rwxr-xr-xpython-pypi/python-dateutil/DETAILS18
-rw-r--r--python-pypi/python-dateutil/HISTORY6
-rwxr-xr-xpython-pypi/python-dateutil/PREPARE3
-rw-r--r--python-pypi/python-dateutil/python-dateutil-1.5.tar.gz.sigbin543 -> 0 bytes
-rwxr-xr-xpython-pypi/python-markdown/DETAILS4
-rw-r--r--python-pypi/python-markdown/HISTORY3
-rwxr-xr-xpython-pypi/python-markdown2/DEPENDS2
-rwxr-xr-xpython-pypi/python-markdown2/DETAILS19
-rw-r--r--python-pypi/python-markdown2/HISTORY2
-rwxr-xr-xpython-pypi/python-textile/DEPENDS3
-rwxr-xr-xpython-pypi/python-textile/DETAILS16
-rw-r--r--python-pypi/python-textile/HISTORY2
-rwxr-xr-xpython-pypi/python-watchdog/DEPENDS5
-rwxr-xr-xpython-pypi/python-watchdog/DETAILS15
-rw-r--r--python-pypi/python-watchdog/HISTORY5
-rwxr-xr-xpython-pypi/pyyaml/DEPENDS4
-rwxr-xr-xpython-pypi/pyyaml/DETAILS4
-rw-r--r--python-pypi/pyyaml/HISTORY4
-rwxr-xr-xpython-pypi/ranger/DEPENDS1
-rwxr-xr-xpython-pypi/ranger/DETAILS24
-rw-r--r--python-pypi/ranger/HISTORY2
-rwxr-xr-xpython-pypi/regex/DEPENDS2
-rwxr-xr-xpython-pypi/regex/DETAILS17
-rw-r--r--python-pypi/regex/HISTORY2
-rwxr-xr-xpython-pypi/simplejson/DEPENDS2
-rwxr-xr-xpython-pypi/simplejson/DETAILS9
-rw-r--r--python-pypi/simplejson/HISTORY4
-rwxr-xr-xpython-pypi/trac-graphvizplugin/DETAILS9
-rw-r--r--python-pypi/trac-graphvizplugin/HISTORY3
-rwxr-xr-xpython-pypi/unidecode/DETAILS9
-rw-r--r--python-pypi/unidecode/HISTORY3
-rwxr-xr-xsecurity/gtk-systrace/DETAILS21
-rw-r--r--security/gtk-systrace/HISTORY3
-rwxr-xr-xsecurity/nmap/BUILD2
-rwxr-xr-xsecurity/nmap/CONFIGURE6
-rwxr-xr-xsecurity/nmap/CONFLICTS3
-rwxr-xr-xsecurity/nmap/DEPENDS5
-rw-r--r--security/nmap/HISTORY8
-rwxr-xr-xsecurity/nmap/INSTALL5
-rwxr-xr-xsecurity/nmap/PRE_SUB_DEPENDS5
-rwxr-xr-xsecurity/nmap/REPAIR^none^PRE_SUB_DEPENDS5
-rwxr-xr-xsecurity/nmap/SUB_DEPENDS11
-rwxr-xr-xshell-term-fm/ded/BUILD3
-rwxr-xr-xshell-term-fm/ded/DEPENDS1
-rwxr-xr-xshell-term-fm/ded/DETAILS15
-rw-r--r--shell-term-fm/ded/HISTORY2
-rwxr-xr-xutils/dos2unix/DETAILS22
-rw-r--r--utils/dos2unix/HISTORY6
-rw-r--r--utils/dos2unix/Makefile.patch37
-rwxr-xr-xutils/dos2unix/PRE_BUILD3
-rwxr-xr-xutils/puppet/DETAILS6
-rw-r--r--utils/puppet/HISTORY3
-rwxr-xr-xutils/qemu/BUILD1
-rwxr-xr-xutils/qemu/DEPENDS2
-rwxr-xr-xutils/qemu/DETAILS2
-rw-r--r--utils/qemu/HISTORY6
-rwxr-xr-xvideo-libs/gst-libav-1.0/DETAILS4
-rw-r--r--video-libs/gst-libav-1.0/HISTORY3
-rwxr-xr-xvideo-libs/gst-plugins-bad-1.0/DETAILS4
-rw-r--r--video-libs/gst-plugins-bad-1.0/HISTORY3
-rwxr-xr-xvideo-libs/gst-plugins-base-1.0/DETAILS4
-rw-r--r--video-libs/gst-plugins-base-1.0/HISTORY3
-rwxr-xr-xvideo-libs/gst-plugins-good-1.0/DETAILS4
-rw-r--r--video-libs/gst-plugins-good-1.0/HISTORY3
-rwxr-xr-xvideo-libs/gst-plugins-ugly-1.0/DETAILS5
-rw-r--r--video-libs/gst-plugins-ugly-1.0/HISTORY3
-rw-r--r--video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.2.2.tar.xz.sigbin287 -> 0 bytes
-rwxr-xr-xvideo-libs/gstreamer-1.0/DETAILS4
-rw-r--r--video-libs/gstreamer-1.0/HISTORY3
-rwxr-xr-xvideo/kodi/CONFLICTS1
-rwxr-xr-xvideo/kodi/DEPENDS137
-rwxr-xr-xvideo/kodi/DETAILS36
-rw-r--r--video/kodi/HISTORY2
-rwxr-xr-xvideo/kodi/PRE_BUILD3
-rwxr-xr-xvideo/xbmc/CONFLICTS1
-rw-r--r--video/xbmc/HISTORY3
294 files changed, 1526 insertions, 536 deletions
diff --git a/ChangeLog b/ChangeLog
index fe97b4db0e..895d00f9e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * net/ebtables,nftables,libnftnl: Added some Netfilter table user-space
+ programs and libraries.
+
+2014-12-29 Ismael Luceno <ismael@sourcemage.org>
+ * python-pypi/ranger: new spell, File manager with an ncurses frontend
+ * devel/cbp2make: new spell, Makefile generation tool for Code::Blocks IDE
+
+2014-12-28 Treeve Jelbert <treeve@sourcemage.org>
+ * gnome2-libs/libaccounts-glib: new spell, single-signon
+
+2014-12-26 Ismael Luceno <ismael@sourcemage.org>
+ * emacs-lisp/FUNCTIONS: Replaced loops
+ * emacs-lisp/FUNCTIONS: Update site-lisp's loaddefs.el
+ * emacs-lisp/FUNCTIONS: Install gzipped emacs-lisp files
+ * emacs-lisp/FUNCTIONS: Fixed production of info files
+
+2014-12-25 Ismael Luceno <ismael@sourcemage.org>
+ * emacs-lisp/haskell-mode: new spell, Emacs mode for Haskell
+
+2014-12-24 Ismael Luceno <ismael@sourcemage.org>
+ * libs/td_lib: new spell, Thomas Dickey's library
+ * shell-term-fm/ded: new spell, directory editor
+
+2014-12-24 Vlad Glagolev <stealth@sourcemage.org>
+ * python-pypi/watchdog -> python-pypi/python-watchdog: renamed spell
+
+2014-12-23 Pol Vinogradov <vin.public@gmail.com>
+ * video/kodi: new spell, a rebranded XBMC
+
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * python-pypi/args: new spell, argument parsing for humans
+ * python-pypi/python-markdown2: new spell, fast and complete Python
+ implementation of Markdown
+ * python-pypi/regex: new spell, alternative regular expression module,
+ to replace re
+ * python-pypi/python-textile: new spell, Textile processing for Python
+ * python-pypi/pathtools: new spell, file system general utilities
+ * python-pypi/watchdog: new spell, filesystem events monitoring
+ * python-pypi/py: new spell, library with cross-python path,
+ ini-parsing, io, code, log facilities
+ * python-pypi/pytest: new spell, simple powerful testing with Python
+ * python-pypi/awesome-slugify: new spell, Python flexible slugify
+ function
+
+2014-12-22 Treeve Jelbert <treeve@sourcemage.org>
+ * graphics-libs/libpgf: new spell, grpahics compression
+
2014-12-18 Treeve Jelbert <treeve@sourcemage.org>
* libs/libgit2: new spell, C implemation of git functions
diff --git a/archive/gzip/DEPENDS b/archive/gzip/DEPENDS
index 18594eb242..24de7f9cde 100755
--- a/archive/gzip/DEPENDS
+++ b/archive/gzip/DEPENDS
@@ -1,2 +1,3 @@
depends gnupg &&
+depends LZMA &&
depends smgl-fhs
diff --git a/archive/gzip/DETAILS b/archive/gzip/DETAILS
index 22c5bcbfde..226e4e30a4 100755
--- a/archive/gzip/DETAILS
+++ b/archive/gzip/DETAILS
@@ -1,7 +1,7 @@
SPELL=gzip
VERSION=1.6
SECURITY_PATCH=1
- SOURCE=$SPELL-${VERSION}.tar.gz
+ SOURCE=$SPELL-${VERSION}.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index bc838db2f9..b95f956f59 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,8 @@
+2014-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Don't use own compression for a compression utility
+ Switch to .xz, otherwise seems to fail with castfs
+ * DEPENDS: Depends on LZMA
+
2013-06-10 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.6
diff --git a/archive/xz-utils/DETAILS b/archive/xz-utils/DETAILS
index 1e63cf2d5f..1620468178 100755
--- a/archive/xz-utils/DETAILS
+++ b/archive/xz-utils/DETAILS
@@ -1,5 +1,5 @@
SPELL=xz-utils
- VERSION=5.0.5
+ VERSION=5.2.0
SOURCE=xz-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/xz-$VERSION"
diff --git a/archive/xz-utils/HISTORY b/archive/xz-utils/HISTORY
index abb8073c5b..3ec8226acb 100644
--- a/archive/xz-utils/HISTORY
+++ b/archive/xz-utils/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Pol Vinogradov <vin.public@gmail.com>
+ * DETAILS: version 5.2.0
+
2013-07-01 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 5.0.5
diff --git a/audio-drivers/oss/DETAILS b/audio-drivers/oss/DETAILS
index d5e77e1e88..108cf8c0cd 100755
--- a/audio-drivers/oss/DETAILS
+++ b/audio-drivers/oss/DETAILS
@@ -16,10 +16,10 @@ elif [[ $OSS_BRANCH == test ]]; then
SOURCE_HASH=sha512:44dce6c0176c6e7da61a254f526c5e86c7fc731e0b1311df2f6d9cee08a0151d16e51da7f62c3a63462b408ea7f34c646ce152b1fc3829e3f345dbededdd6936
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
else
- VERSION=v4.2-build2008
+ VERSION=v4.2-build2010
SOURCE=$SPELL-$VERSION-src-gpl.tar.bz2
SOURCE_URL[0]=http://www.4front-tech.com/developer/sources/stable/gpl/$SOURCE
- SOURCE_HASH=sha512:bb80a5b6943724a668888684e0d8ec2c5799530ed6943a50a0f68b4eea2d639579e0bbaba4a614267bad4792252d0b3a431d926ae7bf15b01df9442988118b07
+ SOURCE_HASH=sha512:25f39f8c052747ee59c5d57309ed4a3262be35db0c6679dd862cd171172e2b4ed22809b344eeb5a5868da48fbfa11a58f81bed58dbab786716355d3c2ee77ae1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src-gpl"
fi
WEB_SITE="http://www.opensound.com "
diff --git a/audio-drivers/oss/HISTORY b/audio-drivers/oss/HISTORY
index 720981f44c..4e6d9bd702 100644
--- a/audio-drivers/oss/HISTORY
+++ b/audio-drivers/oss/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated OSS_BRANCH=stable to v4.2-build2010
+
2014-01-24 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated OSS_BRANCH=stable to v4.2-build2008
diff --git a/audio-libs/lilv-0/DETAILS b/audio-libs/lilv-0/DETAILS
index 4d4bee1efe..c23f6b415d 100755
--- a/audio-libs/lilv-0/DETAILS
+++ b/audio-libs/lilv-0/DETAILS
@@ -1,14 +1,13 @@
# Trying to deal with multi-version install of library, as asked by upstream.
- SPELLBASE=lilv
- SPELL=$SPELLBASE-0
+ SPELL=lilv-0
VERSION=0.16.0
- SOURCE="${SPELLBASE}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL%-*}-${VERSION}.tar.bz2"
SOURCE2="$SOURCE.sig"
SOURCE_URL=http://download.drobilla.net/${SOURCE}
SOURCE2_URL="$SOURCE_URL.sig"
SOURCE2_IGNORE=signature
SOURCE_GPG=dave_robillard.gpg:$SOURCE2:UPSTREAM_KEY
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLBASE}-${VERSION}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL%-*}-${VERSION}"
WEB_SITE="http://drobilla.net/software/sord/"
LICENSE[0]="ISC"
KEYWORDS=""
diff --git a/audio-libs/lilv-0/HISTORY b/audio-libs/lilv-0/HISTORY
index 84d7695f65..f31d1e5556 100644
--- a/audio-libs/lilv-0/HISTORY
+++ b/audio-libs/lilv-0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Normalize SPELL field
+
2014-08-24 Thomas Orgis <sobukus@sourcemage.org>
* INSTALL: fail-safe cleanup of non-libraries
diff --git a/audio-libs/sratom-0/DETAILS b/audio-libs/sratom-0/DETAILS
index 13e3b33ddd..f770954b99 100755
--- a/audio-libs/sratom-0/DETAILS
+++ b/audio-libs/sratom-0/DETAILS
@@ -2,16 +2,15 @@
# we need to create separate spell that installs those and ensure
# that they don't end up here. Multiple library versions shall be
# installable in parallel.
- SPELLBASE=sratom
- SPELL=$SPELLBASE-0
+ SPELL=sratom-0
VERSION=0.4.2
- SOURCE="${SPELLBASE}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL%-*}-${VERSION}.tar.bz2"
SOURCE2="$SOURCE.sig"
SOURCE_URL=http://download.drobilla.net/${SOURCE}
SOURCE2_URL="$SOURCE_URL.sig"
SOURCE2_IGNORE=signature
SOURCE_GPG=dave_robillard.gpg:$SOURCE2:UPSTREAM_KEY
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLBASE}-${VERSION}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL%-*}-${VERSION}"
WEB_SITE="http://drobilla.net/software/sord/"
LICENSE[0]="ISC"
ENTERED=20111220
diff --git a/audio-libs/sratom-0/HISTORY b/audio-libs/sratom-0/HISTORY
index 07d457ff08..bfeb743e14 100644
--- a/audio-libs/sratom-0/HISTORY
+++ b/audio-libs/sratom-0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Normalize SPELL field
+
2013-10-23 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: created
diff --git a/audio-libs/suil-0/DETAILS b/audio-libs/suil-0/DETAILS
index aca018e144..ff2940b42d 100755
--- a/audio-libs/suil-0/DETAILS
+++ b/audio-libs/suil-0/DETAILS
@@ -1,14 +1,13 @@
# Trying to deal with multi-version install of library, as asked by upstream.
- SPELLBASE=suil
- SPELL=$SPELLBASE-0
+ SPELL=suil-0
VERSION=0.6.16
- SOURCE="${SPELLBASE}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL%-*}-${VERSION}.tar.bz2"
SOURCE2="$SOURCE.sig"
SOURCE_URL=http://download.drobilla.net/${SOURCE}
SOURCE2_URL="$SOURCE_URL.sig"
SOURCE2_IGNORE=signature
SOURCE_GPG=dave_robillard.gpg:$SOURCE2:UPSTREAM_KEY
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLBASE}-${VERSION}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL%-*}-${VERSION}"
WEB_SITE="http://drobilla.net/software/sord/"
LICENSE[0]="ISC"
KEYWORDS=""
diff --git a/audio-libs/suil-0/HISTORY b/audio-libs/suil-0/HISTORY
index 07d457ff08..bfeb743e14 100644
--- a/audio-libs/suil-0/HISTORY
+++ b/audio-libs/suil-0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Normalize SPELL field
+
2013-10-23 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: created
diff --git a/audio-plugins/calf-plugins/DETAILS b/audio-plugins/calf-plugins/DETAILS
index cb99bb1e27..489c385c35 100755
--- a/audio-plugins/calf-plugins/DETAILS
+++ b/audio-plugins/calf-plugins/DETAILS
@@ -1,10 +1,9 @@
- XSPELL=calf
- SPELL=$XSPELL-plugins
+ SPELL=calf-plugins
VERSION=0.0.19
- SOURCE="${XSPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/project/${XSPELL}/${XSPELL}/${VERSION}/${SOURCE}
+ SOURCE="${SPELL%-*}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL%-*}/${SPELL%-*}/${VERSION}/${SOURCE}
SOURCE_HASH=sha512:b924552b7f3d1f48974ca46d02ba907e55a30fb22cdb13dac33ba7dacccfd3ff4909563e9fcc5bb99f331c463170c6929dfdb8a589e50ab5a0ae23f58f7cb5a6
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${XSPELL}-${VERSION}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL%-*}-${VERSION}"
WEB_SITE="http://calf.sourceforge.net/index.html"
LICENSE[0]=LGPL
ENTERED=20140324
diff --git a/audio-plugins/calf-plugins/HISTORY b/audio-plugins/calf-plugins/HISTORY
index 4f7f9c7d15..043b257b22 100644
--- a/audio-plugins/calf-plugins/HISTORY
+++ b/audio-plugins/calf-plugins/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Normalize SPELL field
+
2014-03-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/audio-soft/lilv-util/DETAILS b/audio-soft/lilv-util/DETAILS
index 43808f6fd1..50acac3f96 100755
--- a/audio-soft/lilv-util/DETAILS
+++ b/audio-soft/lilv-util/DETAILS
@@ -1,15 +1,14 @@
# Trying to deal with multi-version install of library, as asked by upstream.
# This is the tools package to the freshest lib.
- SPELLBASE=lilv
- SPELL=$SPELLBASE-util
+ SPELL=lilv-util
VERSION=0.16.0
- SOURCE="${SPELLBASE}-${VERSION}.tar.bz2"
+ SOURCE="${SPELL%-*}-${VERSION}.tar.bz2"
SOURCE2="$SOURCE.sig"
SOURCE_URL=http://download.drobilla.net/${SOURCE}
SOURCE2_URL="$SOURCE_URL.sig"
SOURCE2_IGNORE=signature
SOURCE_GPG=dave_robillard.gpg:$SOURCE2:UPSTREAM_KEY
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLBASE}-${VERSION}"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL%-*}-${VERSION}"
WEB_SITE="http://drobilla.net/software/sord/"
LICENSE[0]="ISC"
KEYWORDS=""
diff --git a/audio-soft/lilv-util/HISTORY b/audio-soft/lilv-util/HISTORY
index 07d457ff08..bfeb743e14 100644
--- a/audio-soft/lilv-util/HISTORY
+++ b/audio-soft/lilv-util/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Normalize SPELL field
+
2013-10-23 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL: created
diff --git a/crypto/cryptcat/CONFLICTS b/crypto/cryptcat/CONFLICTS
index c1f0747cec..6ce94a887e 100755
--- a/crypto/cryptcat/CONFLICTS
+++ b/crypto/cryptcat/CONFLICTS
@@ -1,2 +1,3 @@
conflicts netcat &&
-conflicts nc
+conflicts nc &&
+conflicts nmap
diff --git a/crypto/cryptcat/HISTORY b/crypto/cryptcat/HISTORY
index 0e53e5276d..706e744206 100644
--- a/crypto/cryptcat/HISTORY
+++ b/crypto/cryptcat/HISTORY
@@ -1,2 +1,5 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not selected)
+
2013-01-07 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL, CONFIGURE, CONFLICTS: spell created
diff --git a/crypto/gsasl/DETAILS b/crypto/gsasl/DETAILS
index 2075206edf..f796404fe5 100755
--- a/crypto/gsasl/DETAILS
+++ b/crypto/gsasl/DETAILS
@@ -1,5 +1,5 @@
SPELL=gsasl
- VERSION=1.6.1
+ VERSION=1.8.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/crypto/gsasl/HISTORY b/crypto/gsasl/HISTORY
index 46478004cf..7969a5b382 100644
--- a/crypto/gsasl/HISTORY
+++ b/crypto/gsasl/HISTORY
@@ -1,3 +1,6 @@
+2014-12-24 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated spell to 1.8.0
+
2011-08-20 Bor Kraljič <pyrobor@ver.si>
* DETAILS: added SOURCE2_IGNORE=signature
diff --git a/crypto/qca-gnupg/BUILD b/crypto/qca-gnupg/BUILD
index 6472954e99..27ba77ddaf 100755
--- a/crypto/qca-gnupg/BUILD
+++ b/crypto/qca-gnupg/BUILD
@@ -1,6 +1 @@
-QTDIR=/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-./configure $OPTS &&
-make_single &&
-make &&
-make_normal
+true
diff --git a/crypto/qca-gnupg/CONFLICTS b/crypto/qca-gnupg/CONFLICTS
new file mode 100755
index 0000000000..636129508a
--- /dev/null
+++ b/crypto/qca-gnupg/CONFLICTS
@@ -0,0 +1 @@
+conflicts qca-gnupg y
diff --git a/crypto/qca-gnupg/DEPENDS b/crypto/qca-gnupg/DEPENDS
deleted file mode 100755
index 8bd7ce9e97..0000000000
--- a/crypto/qca-gnupg/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends qca2 &&
-depends gnupg
diff --git a/crypto/qca-gnupg/DETAILS b/crypto/qca-gnupg/DETAILS
index d2e5420367..23abfa4928 100755
--- a/crypto/qca-gnupg/DETAILS
+++ b/crypto/qca-gnupg/DETAILS
@@ -1,15 +1,8 @@
SPELL=qca-gnupg
- VERSION=2.0.0-beta3
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/plugins/$SOURCE
- SOURCE_HASH=sha512:b9e0591e861a57c10accbdf91ba6ff5f3cd272254bcd1425a44cdce2689cb626fbf9d62f2657724f293f5ca60dfb4bc5aa7ada850b768f6cba6bb388b97bbdc7
- LICENSE[0]=GPL
- WEB_SITE=http://delta.affinix.com/qca
- ENTERED=20050101
- KEYWORDS="qt crypto"
- SHORT="Qt Cryptographic Architecture"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-QCA aims to provide a straightforward and cross-platform crypto API,
-using Qt datatypes and conventions.
+deprecated spell [replaced by qca2]
EOF
+
diff --git a/crypto/qca-gnupg/DOWNLOAD b/crypto/qca-gnupg/DOWNLOAD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-gnupg/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-gnupg/HISTORY b/crypto/qca-gnupg/HISTORY
index 3ec2ad067f..4995ad988b 100644
--- a/crypto/qca-gnupg/HISTORY
+++ b/crypto/qca-gnupg/HISTORY
@@ -1,2 +1,4 @@
-2009-01-04 George Sherwood <gsherwood@sourcemage.org>
- * DETAILS, BUILD, DEPENDS: Added this spell
+2014-12-29 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by qca2]
diff --git a/crypto/qca-gnupg/INSTALL b/crypto/qca-gnupg/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-gnupg/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-gnupg/PRE_BUILD b/crypto/qca-gnupg/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-gnupg/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-gnupg/UP_TRIGGERS b/crypto/qca-gnupg/UP_TRIGGERS
new file mode 100755
index 0000000000..a36be46d0e
--- /dev/null
+++ b/crypto/qca-gnupg/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger qca2 cast_self
diff --git a/crypto/qca-openssl/BUILD b/crypto/qca-openssl/BUILD
index 6472954e99..27ba77ddaf 100755
--- a/crypto/qca-openssl/BUILD
+++ b/crypto/qca-openssl/BUILD
@@ -1,6 +1 @@
-QTDIR=/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-./configure $OPTS &&
-make_single &&
-make &&
-make_normal
+true
diff --git a/crypto/qca-openssl/CONFLICTS b/crypto/qca-openssl/CONFLICTS
new file mode 100755
index 0000000000..8230f839c5
--- /dev/null
+++ b/crypto/qca-openssl/CONFLICTS
@@ -0,0 +1 @@
+conflicts qca-openssl y
diff --git a/crypto/qca-openssl/DEPENDS b/crypto/qca-openssl/DEPENDS
deleted file mode 100755
index b5a469d73b..0000000000
--- a/crypto/qca-openssl/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends qca2 &&
-depends SSL
diff --git a/crypto/qca-openssl/DETAILS b/crypto/qca-openssl/DETAILS
index bb4fd01d59..9affa3babc 100755
--- a/crypto/qca-openssl/DETAILS
+++ b/crypto/qca-openssl/DETAILS
@@ -1,15 +1,8 @@
SPELL=qca-openssl
- VERSION=2.0.0-beta3
- SOURCE=qca-ossl-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-ossl-$VERSION
- SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/plugins/$SOURCE
- SOURCE_HASH=sha512:17b30099c1bc8650757d71fd9e7824831b132cedc920f59832cb5a8096b90932834e05f3f77ed34e213fdadf881625710e1311ae4fcc4c0919a1684adb4525b8
- LICENSE[0]=GPL
- WEB_SITE=http://delta.affinix.com/qca
- ENTERED=20050101
- KEYWORDS="qt crypto"
- SHORT="Qt Cryptographic Architecture"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-QCA aims to provide a straightforward and cross-platform crypto API,
-using Qt datatypes and conventions.
+deprecated spell [replaced by qca2]
EOF
+
diff --git a/crypto/qca-openssl/DOWNLOAD b/crypto/qca-openssl/DOWNLOAD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-openssl/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-openssl/HISTORY b/crypto/qca-openssl/HISTORY
index 92fb13fb1b..4995ad988b 100644
--- a/crypto/qca-openssl/HISTORY
+++ b/crypto/qca-openssl/HISTORY
@@ -1,33 +1,4 @@
-2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
- * DEPENDS: openssl => SSL
-
-2009-01-04 George Sherwood <george@beernabeer.com>
- * DETAILS: Updated to version 2.0.0-beta3
- * PRE_BUILD: Updated patch name
- * qca-ossl-openssl.patch: Added gentoo patch to fix compile issue.
-
-2007-11-04 George Sherwood <george@beernabeer.com>
- * DETAILS: Updated to version 2.0.0-beta1.
- * BUILD: Added code to detect qt4.
- * PRE_BUILD: Added to apply patch.
- * qca-ossl_fix.patch: Added to fix compilation problem.
-
-2007-05-13 George Sherwood <george@beernabeer.com>
- * DETAILS: Updated to version 0.1-20070508
-
-2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
- * DETAILS: [automated] Removed UPDATED.
-
-2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
- * DETAILS: [automated] Removed BUILD_API=2.
-
-2006-04-09 George Sherwood <george@beernabeer.com>
- * DETAILS: Updated to beta2
- * BUILD: Removed debug option
-
-2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org>
- * DETAILS: (automated) Add KEYWORDS
-
-2006-03-02 George Sherwood <george@beernabeer.com>
- * ALL: Added this spell
-
+2014-12-29 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by qca2]
diff --git a/crypto/qca-openssl/INSTALL b/crypto/qca-openssl/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-openssl/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-openssl/PRE_BUILD b/crypto/qca-openssl/PRE_BUILD
index 27a7d8e6aa..27ba77ddaf 100755
--- a/crypto/qca-openssl/PRE_BUILD
+++ b/crypto/qca-openssl/PRE_BUILD
@@ -1,3 +1 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/qca-ossl-openssl.patch
+true
diff --git a/crypto/qca-openssl/UP_TRIGGERS b/crypto/qca-openssl/UP_TRIGGERS
new file mode 100755
index 0000000000..a36be46d0e
--- /dev/null
+++ b/crypto/qca-openssl/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger qca2 cast_self
diff --git a/crypto/qca-openssl/qca-ossl-openssl.patch b/crypto/qca-openssl/qca-ossl-openssl.patch
deleted file mode 100644
index 0d171a0aa2..0000000000
--- a/crypto/qca-openssl/qca-ossl-openssl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://websvn.kde.org/trunk/kdesupport/qca/plugins/qca-ossl/qca-ossl.cpp?r1=848615&r2=864423&view=patch
-
---- qca-ossl.cpp 2008/08/18 09:08:51 848615
-+++ qca-ossl.cpp 2008/09/24 19:22:26 864423
-@@ -6616,9 +6616,11 @@
- #ifdef SHA512_DIGEST_LENGTH
- list += "sha512";
- #endif
-+/*
- #ifdef OBJ_whirlpool
- list += "whirlpool";
- #endif
-+*/
- return list;
- }
-
-@@ -6863,10 +6865,12 @@
- else if ( type == "sha512" )
- return new opensslHashContext( EVP_sha512(), this, type);
- #endif
-+/*
- #ifdef OBJ_whirlpool
- else if ( type == "whirlpool" )
- return new opensslHashContext( EVP_whirlpool(), this, type);
- #endif
-+*/
- else if ( type == "pbkdf1(sha1)" )
- return new opensslPbkdf1Context( EVP_sha1(), this, type );
- else if ( type == "pbkdf1(md2)" )
diff --git a/crypto/qca-pkcs11/BUILD b/crypto/qca-pkcs11/BUILD
index 3b76e02f17..27ba77ddaf 100755
--- a/crypto/qca-pkcs11/BUILD
+++ b/crypto/qca-pkcs11/BUILD
@@ -1,5 +1 @@
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
-PATH="$QTDIR/bin/qt4:$PATH" &&
-./configure --qtdir=$QTDIR &&
-make
-
+true
diff --git a/crypto/qca-pkcs11/CONFLICTS b/crypto/qca-pkcs11/CONFLICTS
new file mode 100755
index 0000000000..8b697e032f
--- /dev/null
+++ b/crypto/qca-pkcs11/CONFLICTS
@@ -0,0 +1 @@
+conflicts qca-pkcs11 y
diff --git a/crypto/qca-pkcs11/DEPENDS b/crypto/qca-pkcs11/DEPENDS
deleted file mode 100755
index 5ea954807c..0000000000
--- a/crypto/qca-pkcs11/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends -sub CXX gcc &&
-depends qca2 &&
-depends pkcs11-helper
-
diff --git a/crypto/qca-pkcs11/DETAILS b/crypto/qca-pkcs11/DETAILS
index f0afb5867b..875be4551b 100755
--- a/crypto/qca-pkcs11/DETAILS
+++ b/crypto/qca-pkcs11/DETAILS
@@ -1,16 +1,8 @@
SPELL=qca-pkcs11
- VERSION=2.0.0-beta2
- SOURCE_HASH=sha512:55510ecf2479aec2c76b5805ddda8d4fafa74c5c84f0febc3bd8e79009f6e900e5f23f8f5a12069d95d4268d3b4596ce57c690b3e483ead670c7f91f02404e3a
- SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- WEB_SITE=http://delta.affinix.com/qca/
-#http://delta.affinix.com/download/qca/2.0/plugins/qca-pkcs11-2.0.0-beta2.tar.bz2
- SOURCE_URL[0]=$WEB_SITE/2.0/plugins/$SOURCE
- LICENSE[0]=GPL
- ENTERED=20090317
- KEYWORDS="crypto"
- SHORT="PKCS#11 (for smart cards) plugin for qca2"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
-PKCS#11 (for smart cards) plugin for qca2
+deprecated spell [replaced by qca2]
EOF
+
diff --git a/crypto/qca-pkcs11/DOWNLOAD b/crypto/qca-pkcs11/DOWNLOAD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-pkcs11/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-pkcs11/HISTORY b/crypto/qca-pkcs11/HISTORY
index fce37d5713..4995ad988b 100644
--- a/crypto/qca-pkcs11/HISTORY
+++ b/crypto/qca-pkcs11/HISTORY
@@ -1,8 +1,4 @@
-2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
- * DEPENDS: changed dependency on g++ to dependency on gcc with
- sub-depends on CXX (scripted)
-
-2009-03-16 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 2.0.0-beta2
- spell created
-
+2014-12-29 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by qca2]
diff --git a/crypto/qca-pkcs11/INSTALL b/crypto/qca-pkcs11/INSTALL
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-pkcs11/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-pkcs11/PRE_BUILD b/crypto/qca-pkcs11/PRE_BUILD
new file mode 100755
index 0000000000..27ba77ddaf
--- /dev/null
+++ b/crypto/qca-pkcs11/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/crypto/qca-pkcs11/UP_TRIGGERS b/crypto/qca-pkcs11/UP_TRIGGERS
new file mode 100755
index 0000000000..a36be46d0e
--- /dev/null
+++ b/crypto/qca-pkcs11/UP_TRIGGERS
@@ -0,0 +1 @@
+up_trigger qca2 cast_self
diff --git a/crypto/qca2/BUILD b/crypto/qca2/BUILD
index 8cacd51efa..432d717f34 100755
--- a/crypto/qca2/BUILD
+++ b/crypto/qca2/BUILD
@@ -1,6 +1,3 @@
-QTDIR=/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-export QTDIR=/usr &&
-./configure --prefix=/usr $OPTS &&
-qmake qca.pro &&
-make
+OPTS+=' -DBUILD_TESTS=0' &&
+OPTS+=" -DQT4_BUILD=1" &&
+qt4_cmake_build
diff --git a/crypto/qca2/CONFLICTS b/crypto/qca2/CONFLICTS
index 24b1c644ce..38cf4dcc85 100755
--- a/crypto/qca2/CONFLICTS
+++ b/crypto/qca2/CONFLICTS
@@ -1 +1,4 @@
conflicts qca2 y
+conflicts qca-gnupg y
+conflicts qca-openssl y
+conflicts qca-pkcs11 y
diff --git a/crypto/qca2/DEPENDS b/crypto/qca2/DEPENDS
index 69117422f2..63c38b683b 100755
--- a/crypto/qca2/DEPENDS
+++ b/crypto/qca2/DEPENDS
@@ -1,2 +1,10 @@
-depends qt4 &&
-optional_depends ca-certificates
+depends cmake &&
+depends qt4 &&
+optional_depends SSL '' '' 'OpenSSL plugin' &&
+optional_depends LIBSASL '' '' 'Sasl2 plugin' &&
+optional_depends botan '' '' 'Botan plugin' &&
+optional_depends nss ' '' 'NSS plugin' &&
+optional_depends GNUPG '' '' 'GPG plugin' &&
+optional_depends libgcrypt '' '' 'GCrypt plugin' &&
+optional_depends pkcs11-helper '' '' 'pkcs11 plugin' &&
+optional_depends ca-certificates '' '' ''
diff --git a/crypto/qca2/DETAILS b/crypto/qca2/DETAILS
index 2535d9938d..83897f959d 100755
--- a/crypto/qca2/DETAILS
+++ b/crypto/qca2/DETAILS
@@ -1,7 +1,7 @@
SPELL=qca2
- VERSION=2.0.3
- SOURCE_HASH=sha512:c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb
- SOURCE=qca-$VERSION.tar.bz2
+ VERSION=2.1.0
+ SOURCE_HASH=sha512:cf2f76fec4b75952ed06874dfe161f4979ece8c51b1d6f91b041f77fb644fcbe96fc7f00efe3b49b5981ef127c87dd929d9847cdab7844db0ac02645262670fb
+ SOURCE=qca-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qca-$VERSION
SOURCE_URL[0]=http://delta.affinix.com/download/qca/2.0/$SOURCE
LICENSE[0]=GPL
diff --git a/crypto/qca2/HISTORY b/crypto/qca2/HISTORY
index 88cfb4db13..5847fc10ef 100644
--- a/crypto/qca2/HISTORY
+++ b/crypto/qca2/HISTORY
@@ -1,3 +1,9 @@
+2014-12-29 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: 2.1.0
+ * DEPENDS: several depends for plugins, cmake
+ * BUILD: use qt4_cmake_build
+ * CONFLICTS: added, the plugins are now included
+
2012-05-07 Ladislav Hagara <hgr@vabo.cz>
* PRE_BUILD: added to compile with gcc 4.7
diff --git a/database/db/BUILD b/database/db/BUILD
index 2f33b2338c..caad726424 100755
--- a/database/db/BUILD
+++ b/database/db/BUILD
@@ -1,7 +1,7 @@
patch -p1 < $SCRIPT_DIRECTORY/javafix.diff &&
sedit 's|\(docdir\w*=\w*[^/]*\)/docs|\1/share/doc/db|' dist/Makefile.in &&
-OPTS="$OPTS $DB_JSUP $TESTS" &&
+OPTS="$OPTS $DB_JSUP $DB_TESTS" &&
if [ "$DB_JSUP" == "--enable-java" ]; then
if [ -f $INSTALL_ROOT/etc/profile.d/java.sh ]; then
diff --git a/database/db/DETAILS b/database/db/DETAILS
index f2899d0278..6351e3aaab 100755
--- a/database/db/DETAILS
+++ b/database/db/DETAILS
@@ -1,7 +1,6 @@
SPELL=db
- VERSION=5.3.21
- PATCHLEVEL=0
- SOURCE_HASH=sha512:e09a08002b723a056b7a53dea275794a9df104296e7733ec1d7023888f23466095b38614f3ab1acbbb095d10cca70cc14c35c3519a41800eadd6863beb85e3a9
+ VERSION=5.3.28
+ SOURCE_HASH=sha512:e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.oracle.com/berkeley-db/$SOURCE
diff --git a/database/db/HISTORY b/database/db/HISTORY
index 65b7bce350..650f5eff73 100644
--- a/database/db/HISTORY
+++ b/database/db/HISTORY
@@ -1,3 +1,7 @@
+2014-12-26 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated spell to 5.3.28
+ * BUILD: $TESTS -> $DB_TESTS
+
2014-02-11 Tommy Boatman <tboatman@sourcemage.org>
* DEPENDS: switch uudeview to UUDECODE - sharutils and gmime both work
diff --git a/devel/astyle/DETAILS b/devel/astyle/DETAILS
index 199cd185d0..a19e746e6e 100755
--- a/devel/astyle/DETAILS
+++ b/devel/astyle/DETAILS
@@ -1,6 +1,6 @@
SPELL=astyle
- VERSION=2.04
- SOURCE_HASH=sha512:bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd
+ VERSION=2.05.1
+ SOURCE_HASH=sha512:853bf84cb196f2300ca00fb7f18fe336764f1205ae0674a75c1a019bf734495d8fb3d9b6aca0ea258b6632921fb268906128c1afb80596532489749cd2cbe495
SOURCE=${SPELL}_${VERSION}_linux.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/devel/astyle/HISTORY b/devel/astyle/HISTORY
index faf7b2271f..e4a2f4130f 100644
--- a/devel/astyle/HISTORY
+++ b/devel/astyle/HISTORY
@@ -1,3 +1,6 @@
+2014-12-28 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.05.1
+
2013-11-02 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.04
diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index f07b0b5eb1..541c5c08e4 100755
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,5 +1,5 @@
SPELL=binutils
- VERSION=2.24
+ VERSION=2.25
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index c2362b1fef..2dc4c5375e 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,6 @@
+2014-12-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: 2.25
+
2014-03-21 Remko van der Vossen <wich@sourcemage.org>
* BUILD: remove temporary workaround, 2.24 fixed the build failure
diff --git a/devel/cbp2make/BUILD b/devel/cbp2make/BUILD
new file mode 100755
index 0000000000..ee5caa5921
--- /dev/null
+++ b/devel/cbp2make/BUILD
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+make -f cbp2make.cbp.mak.unix release
diff --git a/devel/cbp2make/DETAILS b/devel/cbp2make/DETAILS
new file mode 100755
index 0000000000..da7e81090f
--- /dev/null
+++ b/devel/cbp2make/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=cbp2make
+ VERSION=147
+ SOURCE="$SPELL-stl-rev$VERSION.tar.gz"
+ SOURCE_URL[0]="$SOURCEFORGE_URL/project/$SPELL/$SOURCE"
+ SOURCE_HASH=sha512:01928abfd364cae3dd1d048d1f0badd562e8c31a9fc13b1956cc4683d1e2383b51aba33fc8a78257f9986eac0b7e452ee9b2ec9ae998ff91e7120d110f1f6343
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-stl-rev$VERSION"
+ WEB_SITE="http://sourceforge.net/projects/cbp2make/"
+ LICENSE[0]="GPLv3"
+ ENTERED=20141229
+ KEYWORDS=""
+ SHORT="Makefile generation tool for Code::Blocks IDE"
+cat << EOF
+EOF
diff --git a/devel/cbp2make/HISTORY b/devel/cbp2make/HISTORY
new file mode 100644
index 0000000000..bb34aae350
--- /dev/null
+++ b/devel/cbp2make/HISTORY
@@ -0,0 +1,2 @@
+2014-12-29 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, INSTALL, DETAILS: spell created
diff --git a/devel/cbp2make/INSTALL b/devel/cbp2make/INSTALL
new file mode 100755
index 0000000000..4b1638a1a7
--- /dev/null
+++ b/devel/cbp2make/INSTALL
@@ -0,0 +1,2 @@
+cd "$SOURCE_DIRECTORY" &&
+install -m755 bin/Release/cbp2make /usr/bin
diff --git a/devel/diffutils/DEPENDS b/devel/diffutils/DEPENDS
index 4ca02af998..88089b6974 100755
--- a/devel/diffutils/DEPENDS
+++ b/devel/diffutils/DEPENDS
@@ -1,6 +1,7 @@
depends gnupg &&
depends smgl-fhs &&
+optional_depends libsigsegv '' '' 'for page fault handling support' &&
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
diff --git a/devel/diffutils/HISTORY b/devel/diffutils/HISTORY
index 43c9f7b87e..65cc85f068 100644
--- a/devel/diffutils/HISTORY
+++ b/devel/diffutils/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Optionally depends on libsigsegv. Issue #186
+
2013-04-06 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.3
* PRE_BUILD, glibc215.patch: deleted
diff --git a/devel/doxygen/DETAILS b/devel/doxygen/DETAILS
index a1706ff109..76096a7ac6 100755
--- a/devel/doxygen/DETAILS
+++ b/devel/doxygen/DETAILS
@@ -1,9 +1,10 @@
SPELL=doxygen
- VERSION=1.8.2
+ VERSION=1.8.9
+ SOURCE_HASH=sha512:e5469385ad78fa33e4961ff80f45a54ab29cd0bee2eb60008eaa8ad56caf9c5d5ba1014aa9ebc9bc16a830e6bf07a37a1a73edef3360e7470d620ed43f0b418e
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.stack.nl/pub/users/dimitri/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.doxygen.org/
LICENSE[0]=GPL
ENTERED=20020310
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index 0edda8d794..ac7d147a6d 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,6 @@
+2014-12-28 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.8.9
+
2012-08-19 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.8.2
@@ -50,7 +53,6 @@
2009-08-28 Ladislav Hagara <hgr@vabo.cz>
* doxygen-qt4.patch: updated to new version
-
2009-08-25 George Sherwood <gsherwood@sourcemage.org>
* DETAILS: Updated to version 1.6.1
diff --git a/devel/doxygen/doxygen-1.8.2.src.tar.gz.sig b/devel/doxygen/doxygen-1.8.2.src.tar.gz.sig
deleted file mode 100644
index 8fec1cf35e..0000000000
--- a/devel/doxygen/doxygen-1.8.2.src.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/devel/m4/DEPENDS b/devel/m4/DEPENDS
index 3017f10393..5ee166f66c 100755
--- a/devel/m4/DEPENDS
+++ b/devel/m4/DEPENDS
@@ -1,4 +1,5 @@
depends gnupg &&
depends smgl-fhs &&
+optional_depends libsigsegv '' '' 'for page fault handling support' &&
optional_depends texinfo "" "" "to build info files"
diff --git a/devel/m4/HISTORY b/devel/m4/HISTORY
index cefe52770f..77190f71a0 100644
--- a/devel/m4/HISTORY
+++ b/devel/m4/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Optionally depends on libsigsegv. Issue #187
+
2014-10-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.17
* glibc215.patch, PRE_BUILD: deleted - builds with glibc-2.20
diff --git a/devel/pcc/DETAILS b/devel/pcc/DETAILS
index 207c7bb9ed..ae1c0d8eec 100755
--- a/devel/pcc/DETAILS
+++ b/devel/pcc/DETAILS
@@ -1,8 +1,16 @@
SPELL=pcc
- VERSION=20141103
+if [[ "$PCC_BRANCH" = snapshot ]]; then
+ VERSION=20141228
SOURCE="$SPELL-$VERSION.tgz"
SOURCE_URL[0]=http://$SPELL.ludd.ltu.se/ftp/pub/$SPELL/$SOURCE
- SOURCE_HASH=sha512:edf21d26247beaa66d3b17fb1d7f3095e927328f854ea3c63e60b901eeb5ce5947a843e0d3231569baa68ef4100dedf3a139b28a11e872113bdf43b45cf093bc
+ SOURCE_HASH=sha512:882882ca51e44481574717f8ea92005ca8a6d8d4a09aa59e7196de5859a36bbc6700d3591340b006abab059ee81ffcbaa505cd99b4ddd79ab9632cde69f43957
+else
+ VERSION=1.1.0
+ SOURCE="$SPELL-$VERSION.tgz"
+ SOURCE_URL[0]=http://$SPELL.ludd.ltu.se/ftp/pub/$SPELL-releases/$SOURCE
+ SOURCE_URL[1]=http://www.sourcemage.ru/mirror/$SPELL/
+ SOURCE_HASH=sha512:5bd2b59fbb323016d215023ce77793ae66766e8e8192b44bf0707ee444658022e1645669c13eea8c81bc55c161eea3b0271d6b3098b8a7d51ce67eb86c7527b4
+fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://pcc.ludd.ltu.se/"
LICENSE[0]="BSD"
diff --git a/devel/pcc/HISTORY b/devel/pcc/HISTORY
index d6e6c2c82b..ce75e2104b 100644
--- a/devel/pcc/HISTORY
+++ b/devel/pcc/HISTORY
@@ -1,3 +1,7 @@
+2014-12-28 Ismael Luceno <ismael@sourcemage.org>
+ * PREPARE: Added branch selection
+ * DETAILS: Updated to snapshot 20141228, added release 1.1.0
+
2014-11-02 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: spell created
diff --git a/devel/pcc/PREPARE b/devel/pcc/PREPARE
new file mode 100755
index 0000000000..c35fa8aeef
--- /dev/null
+++ b/devel/pcc/PREPARE
@@ -0,0 +1,2 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch snapshot release
diff --git a/disk/avfs/DETAILS b/disk/avfs/DETAILS
index da335a8e86..489a0f2c03 100755
--- a/disk/avfs/DETAILS
+++ b/disk/avfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=avfs
- VERSION=1.0.1
+ VERSION=1.0.2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/avf/$SOURCE
diff --git a/disk/avfs/HISTORY b/disk/avfs/HISTORY
index d7866152ff..a9c8ac8b88 100644
--- a/disk/avfs/HISTORY
+++ b/disk/avfs/HISTORY
@@ -1,5 +1,8 @@
-2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
- * DEPENDS: openssl => SSL
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.0.2
+
+2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: openssl => SSL
2012-07-15 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.0.1; quoting paths
diff --git a/editors/gawk/DEPENDS b/editors/gawk/DEPENDS
index 666b64a30b..ea5b442369 100755
--- a/editors/gawk/DEPENDS
+++ b/editors/gawk/DEPENDS
@@ -3,6 +3,7 @@ depends gnupg &&
depends mpfr &&
depends smgl-fhs &&
+optional_depends libsigsegv '' '' 'for page fault handling support' &&
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY
index bb49c1b7ad..3bf4c3309a 100644
--- a/editors/gawk/HISTORY
+++ b/editors/gawk/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Optionally depends on libsigsegv. Issue #185
+
2014-09-09 Remko van der Vossen <wich@sourcemage.org>
* DEPENDS: gmp, mpfr
diff --git a/emacs-lisp/FUNCTIONS b/emacs-lisp/FUNCTIONS
index 437521227f..6d51acc382 100755
--- a/emacs-lisp/FUNCTIONS
+++ b/emacs-lisp/FUNCTIONS
@@ -11,19 +11,15 @@ function emacs_lisp_install() {
#-------------------------------------------------------------------------
function default_build_emacs_lisp() {
[ $# = 0 ] && set -- "$SOURCE_DIRECTORY"
- shopt -s nullglob
- local texi_files
-
- while [ $# -gt 0 ]; do
- emacs -Q -L "$1" -batch -f batch-byte-compile "$1"/*.el &&
- texi_files=("$1"/*.texi)
- if [ ${#texi_files[@]} -gt 0 ]
- then
- makeinfo "${texi_files[@]}" &&
- gzip -9 "$1"/*.info
- fi
- shift
+ find "$@" -maxdepth 1 -name \*.el \
+ -execdir emacs -Q -L . --batch -f batch-byte-compile {} + \
+ -execdir gzip -9 {} + \
+ -o -name \*.texi -print |
+ while read file; do
+ local t=$(mktemp -p "$SOURCE_DIRECTORY")
+ makeinfo -o - "$file" | gzip -9 > "$t" &&
+ mv "$t" "${file%.texi}.info.gz"
done
}
@@ -32,24 +28,20 @@ function default_build_emacs_lisp() {
#-------------------------------------------------------------------------
function default_install_emacs_lisp() {
[ $# = 0 ] && set -- "$SOURCE_DIRECTORY"
- shopt -s nullglob
local dir="$INSTALL_ROOT/usr/share/emacs/site-lisp/$SPELL"
local info_dir="$INSTALL_ROOT/usr/share/info"
- local info_files
-
- while [ $# -gt 0 ]; do
- install -d -m755 "$dir" &&
- install -m644 "$1"/*.el "$1"/*.elc "$dir" &&
- info_files=("$1"/*.info.gz)
- if [ ${#info_files[@]} -gt 0 ]
- then
- install -m644 "${info_files[@]}" "$info_dir" &&
- install-info --info-dir="$info_dir" "${info_files[@]/#*\//$info_dir/}"
- fi
- shift
- done
+ install -d -m755 "$dir" &&
+ find "$@" -maxdepth 1 \( -name \*.el.gz -o -name \*.elc \) \
+ -exec install -m644 -t "$dir" {} + \
+ -o -name \*.info.gz \
+ -exec install -m644 -t "$info_dir" {} \; -print0 |
+ sed -z "s@.*/@$info_dir/@" | xargs -r0 install-info --info-dir="$info_dir" &&
+ emacs -Q --batch --eval '
+ (let ((generated-autoload-file (car argv)))
+ (update-directory-autoloads (elt argv 1)))
+ ' "$dir/../loaddefs.el" "$dir"
}
function default_build() {
diff --git a/emacs-lisp/haskell-mode/DEPENDS b/emacs-lisp/haskell-mode/DEPENDS
new file mode 100755
index 0000000000..3e19255456
--- /dev/null
+++ b/emacs-lisp/haskell-mode/DEPENDS
@@ -0,0 +1 @@
+depends EMACS
diff --git a/emacs-lisp/haskell-mode/DETAILS b/emacs-lisp/haskell-mode/DETAILS
new file mode 100755
index 0000000000..d6f5e9a348
--- /dev/null
+++ b/emacs-lisp/haskell-mode/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=haskell-mode
+ VERSION=13.10
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]="https://github.com/haskell/$SPELL/archive/v$VERSION.tar.gz"
+ SOURCE_HASH=sha512:bb8e871d5149b067c9568c9e984a9279c2104eedd4f41501101d91ee6482f5208b933b54dfbf70051fb833d258f968d797504bca3398612203cfa046c470f9ab
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="https://github.com/haskell/haskell-mode/wiki"
+ LICENSE[0]="GPLv3+"
+ ENTERED=20141225
+ KEYWORDS=""
+ SHORT="Emacs mode for Haskell"
+cat << EOF
+This is a package for developing Haskell in Emacs. It features a wide a range
+of tooling, from basic editing to building packages and interactive evaluation.
+EOF
diff --git a/emacs-lisp/haskell-mode/HISTORY b/emacs-lisp/haskell-mode/HISTORY
new file mode 100644
index 0000000000..de0396f2fb
--- /dev/null
+++ b/emacs-lisp/haskell-mode/HISTORY
@@ -0,0 +1,2 @@
+2014-12-25 Ismael Luceno <ismael@sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/gnome2-libs/libaccounts-glib/BUILD b/gnome2-libs/libaccounts-glib/BUILD
new file mode 100755
index 0000000000..142f4fcf15
--- /dev/null
+++ b/gnome2-libs/libaccounts-glib/BUILD
@@ -0,0 +1,2 @@
+CFLAGS+=" -Wno-error" &&
+default_build
diff --git a/gnome2-libs/libaccounts-glib/DEPENDS b/gnome2-libs/libaccounts-glib/DEPENDS
new file mode 100755
index 0000000000..716f25dfaf
--- /dev/null
+++ b/gnome2-libs/libaccounts-glib/DEPENDS
@@ -0,0 +1,6 @@
+depends glib2 &&
+depends libxslt &&
+depends libxml2 &&
+depends pkgconfig &&
+optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' 'build documentation'
+
diff --git a/gnome2-libs/libaccounts-glib/DETAILS b/gnome2-libs/libaccounts-glib/DETAILS
new file mode 100755
index 0000000000..f31238e6ff
--- /dev/null
+++ b/gnome2-libs/libaccounts-glib/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libaccounts-glib
+ SPELLX=accounts-sso
+ VERSION=1.16
+ SOURCE_HASH=sha512:714021e87786c79d120af25aa1d3586c43796c341557925a503200fd47c6ffb1e6ba52f8d9f3fa17f8b55024bc32258c46f8e1274c4915cff3a7b39c011b6801
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ WEB_SITE=http://code.google.com/p/accounts-sso
+ SOURCE_URL[0]=http://$SPELLX.googlecode.com/files/$SOURCE
+ LICENSE[0]=LGPL
+ ENTERED=20141102
+ KEYWORDS=""
+ SHORT=""
+cat << EOF
+The Accounts & SSO framework consists of a set of components and libraries which implement an account
+manager for a user's online accounts and a single-sign-on daemon which handles the authentication to the
+remote services on behalf of the client applications.
+EOF
diff --git a/gnome2-libs/libaccounts-glib/HISTORY b/gnome2-libs/libaccounts-glib/HISTORY
new file mode 100644
index 0000000000..7fd9a546d0
--- /dev/null
+++ b/gnome2-libs/libaccounts-glib/HISTORY
@@ -0,0 +1,4 @@
+2014-11-02 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.16
+ spell created
+
diff --git a/graphics-libs/cimg/DETAILS b/graphics-libs/cimg/DETAILS
index 723f2c5e0b..5bfd139661 100755
--- a/graphics-libs/cimg/DETAILS
+++ b/graphics-libs/cimg/DETAILS
@@ -1,6 +1,6 @@
SPELL=cimg
- VERSION=1.5.7
- SOURCE_HASH=sha512:52147d435ea7990e305abcbd3a1263ce114a5cf515742de631abedcd15435a0da1453f283e7e46548fee3f953249d20520e486113e9f3adf62810289a56880f1
+ VERSION=1.5.9
+ SOURCE_HASH=sha512:0d55bdab26fda86c3a84fc2fefbfc3fde875693f7f63b2285ce41ade3b46d9c6030ffabd1fcd481e57dacb0448730fa2a33cd6a0d9889f54090860e18f838051
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 9bbd636400..8814768a58 100644
--- a/graphics-libs/cimg/HISTORY
+++ b/graphics-libs/cimg/HISTORY
@@ -1,3 +1,6 @@
+2014-12-23 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.5.9
+
2013-12-20 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.5.7
diff --git a/graphics-libs/libpgf/DEPENDS b/graphics-libs/libpgf/DEPENDS
new file mode 100755
index 0000000000..b38f1fe3e2
--- /dev/null
+++ b/graphics-libs/libpgf/DEPENDS
@@ -0,0 +1,6 @@
+depends autoconf &&
+depends automake &&
+depends libtool &&
+depends dos2unix &&
+optional_depends doxygen '' '' 'build documentation'
+
diff --git a/graphics-libs/libpgf/DETAILS b/graphics-libs/libpgf/DETAILS
new file mode 100755
index 0000000000..f8cd7b8e70
--- /dev/null
+++ b/graphics-libs/libpgf/DETAILS
@@ -0,0 +1,22 @@
+ SPELL=libpgf
+ VERSION=6.14.12
+ SOURCE_HASH=sha512:1fb2377deb86cea65ab28704a5c438a6e8586c37fb73a208800341214c0b09c9ae61c30a70e839b0238223b31da9825db2aeb2275e06c7a3ff6ff5b43cf72972
+ SOURCE=$SPELL-src-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ WEB_SITE=http://www.libpgf.org
+ LICENSE[0]=LGPL
+ ENTERED=20141221
+ KEYWORDS=""
+ SHORT=""
+cat << EOF
+WHAT IS PGF?
+
+A popular image file format
+Based on discrete, fast wavelet transform with progressive coding features
+Lossless and lossy compression
+Small C++ codec without any dependencies
+Easy codec usage
+Best for natural and aerial images with a better compression efficiency than JPEG
+PGF is one of the best image compression algorithms for natural images
+EOF
diff --git a/graphics-libs/libpgf/HISTORY b/graphics-libs/libpgf/HISTORY
new file mode 100644
index 0000000000..986f08e3b2
--- /dev/null
+++ b/graphics-libs/libpgf/HISTORY
@@ -0,0 +1,4 @@
+2014-12-21 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 6.14.12
+ spell created
+
diff --git a/graphics-libs/libpgf/PRE_BUILD b/graphics-libs/libpgf/PRE_BUILD
new file mode 100755
index 0000000000..53de1b4a2e
--- /dev/null
+++ b/graphics-libs/libpgf/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+touch NEWS AUTHORS &&
+# the tarball has bad line-endings
+dos2unix * src/* include/* &&
+autoreconf -f -i --symlink
diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index 501384d2e8..cb1132f263 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,9 +1,9 @@
SPELL=opencv
VERSION=2.4.9
SOURCE_HASH=sha512:a24b4bc0f7e58246e55370cdacd161f54b282d71a4ffbd654dd4b158031c9f8f93b8cb5a171f8266d4a776375573eff6b6b88793a812df99b3f516176e7a55b1
- SOURCE=$VERSION.tar.gz
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
- SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$SOURCE
+ SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$VERSION.tar.gz
TMPFS=off
WEB_SITE=http://opencv.org
LICENSE[0]=BSD
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 5d87fecde9..5a58d808c0 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,6 @@
+2014-12-26 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Fix SOURCE to make it a proper tarball name
+
2014-07-22 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.4.9
* PRE_BUILD, pkgconfig.patch: patch from Arch added
diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index df40f2e9f3..671bb655fa 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,6 +1,6 @@
SPELL=libgphoto2
- VERSION=2.5.5.1
- SOURCE_HASH=sha512:a274bb553abed2f498b28388b2e2bc1810b4f57823744e7461248020818f1b79430198d81091aaa8ddc18a2a2acc5acf4fce5800e80da5e7ba534f0c094c749a
+ VERSION=2.5.6
+ SOURCE_HASH=sha512:4e71cc5b1b10d4202e5359036ada768ed70d401e924aefa95fdbc5170b131c0df636b0cfb95b3013ea54ac14c0379e9ed914c7a68bf86848dfd46396668367f5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index d612ec947e..7cf3eb8636 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 2.5.6
+
2014-11-03 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.5.5
* DEPENDS: add libxml2 and possibly icu.1
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index d94f09556a..f45b97a0bc 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -14,7 +14,7 @@ depends libxt &&
depends pango '--enable-pango' &&
depends libxft '--enable-xft --disable-freetype2' &&
-depends cairo '--enable-system-cairo --enable-default-toolkit=cairo-gtk2' &&
+depends -sub TEE cairo '--enable-system-cairo --enable-default-toolkit=cairo-gtk2' &&
depends gdk-pixbuf2 &&
depends JPEG '--with-system-jpeg' &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index ab4db6987d..af35fc0cda 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2014-12-19 Ismael Luceno <ismael@sourcemage.org>
+ * DEPENDS: Depends on cairo's tee backend
+
2014-12-02 Pol Vinogradov <vin.public@gmail.com>
* DETAILS: version 34.0.5
* DEPENDS, mozconfig: reorganized both files, added icu,
diff --git a/http/links-twibright/DETAILS b/http/links-twibright/DETAILS
index 54ba8ef825..a8f0c605a2 100755
--- a/http/links-twibright/DETAILS
+++ b/http/links-twibright/DETAILS
@@ -1,10 +1,10 @@
SPELL=links-twibright
- VERSION=2.8
+ VERSION=2.9
SOURCE_NAME=links
SOURCE=$SOURCE_NAME-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SOURCE_NAME-$VERSION
SOURCE_URL[0]=http://links.twibright.com/download/$SOURCE
- SOURCE_HASH=sha512:e6325be0bb81a9f4dc602f9c05150ebc3c4e16373767c284c02a87bd6b89b9a28ff409c175695542277faa361b71151c5c619135f36a59a04558fc3426c4b30a
+ SOURCE_HASH=sha512:386f53e8a8eac78b5f1a85277d449f2cc23e96dbc505c776fa5123c3c4ee34916c9da867766849fb71ff7701df161bd1906a34468bd9c31183abdce1d03819a7
LICENSE[0]=GPL
WEB_SITE=http://links.twibright.com/
ENTERED=20011027
diff --git a/http/links-twibright/HISTORY b/http/links-twibright/HISTORY
index 368a64b31c..673b5535e4 100644
--- a/http/links-twibright/HISTORY
+++ b/http/links-twibright/HISTORY
@@ -1,3 +1,6 @@
+2014-12-25 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 2.9
+
2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: openssl => SSL
diff --git a/java/crimson-apache/DETAILS b/java/crimson-apache/DETAILS
index e50d440f14..02de9936b7 100755
--- a/java/crimson-apache/DETAILS
+++ b/java/crimson-apache/DETAILS
@@ -1,10 +1,8 @@
- SPELL_NAME=crimson
- PKG_NAME=${SPELL_NAME}
- SPELL=${SPELL_NAME}-apache
+ SPELL=crimson-apache
VERSION=1.1.3
- SOURCE=${SPELL_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL_NAME}-${VERSION}
- SOURCE_URL[0]=http://xml.apache.org/dist/${SPELL_NAME}/$SOURCE
+ SOURCE=${SPELL%-*}-$VERSION-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL%-*}-${VERSION}
+ SOURCE_URL[0]=http://xml.apache.org/dist/${SPELL%-*}/$SOURCE
SOURCE_HASH=sha512:d54af330871dae8601e4d371b10b1c32a5a1033b464c83a55d3db70996777132af7c6cf51d81da91ed0c86b9c1c87a1535116d204dfa03c2349b486b5d4d6a7a
LICENSE[0]=APACHE
KEYWORDS="parser java xml"
diff --git a/java/crimson-apache/HISTORY b/java/crimson-apache/HISTORY
index e1abccd975..b8dd334c87 100644
--- a/java/crimson-apache/HISTORY
+++ b/java/crimson-apache/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
Shortened SHORT
diff --git a/java/crimson-apache/INSTALL b/java/crimson-apache/INSTALL
index 306243a7ca..adf18e7485 100755
--- a/java/crimson-apache/INSTALL
+++ b/java/crimson-apache/INSTALL
@@ -1,3 +1,3 @@
-extract_jakarta_dist ${PKG_NAME} ${PKG_NAME}-${VERSION} \
- build/${PKG_NAME}-${VERSION}-bin.tar.gz &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/crimson.jar crimson.jar
+extract_jakarta_dist ${SPELL##*-} ${SPELL##*-}-${VERSION} \
+ build/${SPELL##*-}-${VERSION}-bin.tar.gz &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/crimson.jar crimson.jar
diff --git a/java/jakarta-commons-beanutils/DETAILS b/java/jakarta-commons-beanutils/DETAILS
index 5a8636a936..9bb3f31365 100755..100644
--- a/java/jakarta-commons-beanutils/DETAILS
+++ b/java/jakarta-commons-beanutils/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=beanutils
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-beanutils
VERSION=1.6.1
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-${VERSION}-src.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
SOURCE_HASH=sha512:2b2da28f598d5cb52a07d59e5fdc14dc1a41b66a906a530e61aee0555afb46084c750778ec1b38a4cb70866406afe5957b0b9b81a8bf107c3f6bd08d49c0ab40
LICENSE[0]=APACHE
KEYWORDS="java"
diff --git a/java/jakarta-commons-beanutils/HISTORY b/java/jakarta-commons-beanutils/HISTORY
index 76c9dfb765..42a4f48d8d 100644
--- a/java/jakarta-commons-beanutils/HISTORY
+++ b/java/jakarta-commons-beanutils/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-beanutils/INSTALL b/java/jakarta-commons-beanutils/INSTALL
index ca18510652..a1c0468d7e 100755
--- a/java/jakarta-commons-beanutils/INSTALL
+++ b/java/jakarta-commons-beanutils/INSTALL
@@ -1,6 +1,6 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} $SOURCE_DIRECTORY &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-beanutils.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-beanutils.jar \
commons-beanutils.jar
diff --git a/java/jakarta-commons-collections/DETAILS b/java/jakarta-commons-collections/DETAILS
index 7d2d7cb10f..8e8796f59b 100755..100644
--- a/java/jakarta-commons-collections/DETAILS
+++ b/java/jakarta-commons-collections/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=collections
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-collections
VERSION=2.1
- SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
SOURCE_HASH=sha512:c99f63790cdc59a5d753b20bd0f5b15b4090fe822c26ccc3634bd1e6983a38e689e8291573ba88602930e709c28e34665411813bd156786748477edb73d69b8f
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/collections.html
diff --git a/java/jakarta-commons-collections/HISTORY b/java/jakarta-commons-collections/HISTORY
index 0172fd59ea..1391834b8d 100644
--- a/java/jakarta-commons-collections/HISTORY
+++ b/java/jakarta-commons-collections/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-collections/INSTALL b/java/jakarta-commons-collections/INSTALL
index 0409870f98..a0b05ef8b5 100755
--- a/java/jakarta-commons-collections/INSTALL
+++ b/java/jakarta-commons-collections/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_dist ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- dist/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}.tar.gz &&
+extract_jakarta_dist ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ dist/${SPELL#*-}-${VERSION}.tar.gz &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-collections.jar \
+ ${SPELL#*-}-${VERSION}/commons-collections.jar \
commons-collections.jar
diff --git a/java/jakarta-commons-daemon/DETAILS b/java/jakarta-commons-daemon/DETAILS
index 529112a20a..92b25f7437 100755..100644
--- a/java/jakarta-commons-daemon/DETAILS
+++ b/java/jakarta-commons-daemon/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=daemon
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-daemon
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
- SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+ SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}
SOURCE_HASH=sha512:9328bacd966b07eb7877ffb68075b80c8ecd534e526725f8d16a28b8da658d99725498fb817417fb0db6e5985810a1b2ad78e62857d82860f6d7d0cb57723c80
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/sandbox/daemon/index.html
diff --git a/java/jakarta-commons-daemon/HISTORY b/java/jakarta-commons-daemon/HISTORY
index 12fd9ea951..f7a3ae508a 100644
--- a/java/jakarta-commons-daemon/HISTORY
+++ b/java/jakarta-commons-daemon/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-daemon/INSTALL b/java/jakarta-commons-daemon/INSTALL
index dbbc6a8bc8..e21c915355 100755
--- a/java/jakarta-commons-daemon/INSTALL
+++ b/java/jakarta-commons-daemon/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-daemon.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-daemon.jar \
commons-daemon.jar
diff --git a/java/jakarta-commons-dbcp/BUILD b/java/jakarta-commons-dbcp/BUILD
index 4c737be300..747f84df4b 100755
--- a/java/jakarta-commons-dbcp/BUILD
+++ b/java/jakarta-commons-dbcp/BUILD
@@ -6,7 +6,7 @@ set_ant_env &&
export CLASSPATH="${JAVA_HOME}/lib/tools.jar:${JAVA_HOME}/lib/classes.zip:${ANT_HOME}/lib/ant.jar"
# create build.properties
-cat > $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src/build.properties <<EOF
+cat > $SOURCE_DIRECTORY/${SPELL#*-}-${VERSION}-src/build.properties <<EOF
base.path=${SM_JAKARTA_HOME}
commons-collections.home=\${base.path}/commons-collections
commons-collections.jar=\${commons-collections.home}/commons-collections.jar
@@ -25,6 +25,6 @@ jndi.lib=\${jndi.home}/lib
jndi.jar=\${jndi.lib}/jndi.jar
EOF
-cd ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src &&
+cd ${SPELL#*-}-${VERSION}-src &&
cp LICENSE.txt ../LICENSE &&
ant dist
diff --git a/java/jakarta-commons-dbcp/DETAILS b/java/jakarta-commons-dbcp/DETAILS
index 210854db9b..fc57a6fa91 100755..100644
--- a/java/jakarta-commons-dbcp/DETAILS
+++ b/java/jakarta-commons-dbcp/DETAILS
@@ -1,12 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=dbcp
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-dbcp
VERSION=1.0
- SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
- SOURCE_URL[1]=http://archive.apache.org/dist/${PKG_SUBPRJ}/${PKG_NAME}/source/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src.tar.gz
+ SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
+ SOURCE_URL[1]=http://archive.apache.org/dist/commons/${SPELL##*-}/source/${SPELL#*-}-${VERSION}-src.tar.gz
SOURCE_HASH=sha512:d5d8e2bf44277d9a309b8a4bf04505bce11a82d79e88cb4b3694a0da346df745d8c4466121cdcb5f65bfc99dd5e2875a772e88447dad75c3ee029c0792adcd3c
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/dbcp/
diff --git a/java/jakarta-commons-dbcp/HISTORY b/java/jakarta-commons-dbcp/HISTORY
index 509eecdcaf..c7b60b2e89 100644
--- a/java/jakarta-commons-dbcp/HISTORY
+++ b/java/jakarta-commons-dbcp/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+ variables
+
2010-10-30 Bor Kraljič <pyrobor@ver.si>
* DETAILS: added SOURCE_URL[1]
diff --git a/java/jakarta-commons-dbcp/INSTALL b/java/jakarta-commons-dbcp/INSTALL
index a9651a4eeb..473428fcba 100755
--- a/java/jakarta-commons-dbcp/INSTALL
+++ b/java/jakarta-commons-dbcp/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ $SOURCE_DIRECTORY/${SPELL#*-}-${VERSION}-src &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-dbcp.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-dbcp.jar \
commons-dbcp.jar
diff --git a/java/jakarta-commons-digester/DETAILS b/java/jakarta-commons-digester/DETAILS
index 38989b6831..e74eeadc3e 100755..100644
--- a/java/jakarta-commons-digester/DETAILS
+++ b/java/jakarta-commons-digester/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=digester
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-digester
VERSION=1.4.1
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
SOURCE_HASH=sha512:51dc72c4360e8c36da68bcfa79cc28f941d916fc5d22f1171cd6e942f60e39caf1533d67b79ff563bbf256e5f5cccce1a79a73251d3af3956270284422d3cda1
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/digester.html
diff --git a/java/jakarta-commons-digester/HISTORY b/java/jakarta-commons-digester/HISTORY
index 0172fd59ea..1391834b8d 100644
--- a/java/jakarta-commons-digester/HISTORY
+++ b/java/jakarta-commons-digester/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-digester/INSTALL b/java/jakarta-commons-digester/INSTALL
index af614a7015..110bd3b0c6 100755
--- a/java/jakarta-commons-digester/INSTALL
+++ b/java/jakarta-commons-digester/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-digester.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-digester.jar \
commons-digester.jar
diff --git a/java/jakarta-commons-fileupload/DETAILS b/java/jakarta-commons-fileupload/DETAILS
index ed2298f16b..63fbf17a5c 100755..100644
--- a/java/jakarta-commons-fileupload/DETAILS
+++ b/java/jakarta-commons-fileupload/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=fileupload
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-fileupload
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
- SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+ SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}
SOURCE_HASH=sha512:e52de83a9fd64601970e4f4df7dbbf6a033985b780cf081fa233af512d816ba6dfc9d301246faf6e466df4de14b67a08c810a68c89482205ba8a47a195d406dd
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/fileupload/
diff --git a/java/jakarta-commons-fileupload/HISTORY b/java/jakarta-commons-fileupload/HISTORY
index c378f4fffb..8bbecbc7fb 100644
--- a/java/jakarta-commons-fileupload/HISTORY
+++ b/java/jakarta-commons-fileupload/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-fileupload/INSTALL b/java/jakarta-commons-fileupload/INSTALL
index 0a62410139..885e8b6336 100755
--- a/java/jakarta-commons-fileupload/INSTALL
+++ b/java/jakarta-commons-fileupload/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-fileupload-1.0-dev.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-fileupload-1.0-dev.jar \
commons-fileupload.jar
diff --git a/java/jakarta-commons-lang/BUILD b/java/jakarta-commons-lang/BUILD
index 5e9c6c0fdd..8b38220599 100755
--- a/java/jakarta-commons-lang/BUILD
+++ b/java/jakarta-commons-lang/BUILD
@@ -3,13 +3,13 @@
set_ant_env &&
# create build.properties
-cat > $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}/build.properties <<EOF
+cat > $SOURCE_DIRECTORY/${SPELL#*-}/build.properties <<EOF
base.path=${SM_JAKARTA_HOME}
commons-collections.home=\${base.path}/commons-collections
commons-collections.jar=\${commons-collections.home}/commons-collections.jar
junit.jar=${SM_IBM_HOME}/lib/junit.jar
EOF
-cd ${PKG_SUBPRJ}-${PKG_NAME} &&
+cd ${SPELL#*-} &&
cp LICENSE.txt ../LICENSE &&
ant dist
diff --git a/java/jakarta-commons-lang/DETAILS b/java/jakarta-commons-lang/DETAILS
index 08f3b40bfc..fe12d5d66c 100755..100644
--- a/java/jakarta-commons-lang/DETAILS
+++ b/java/jakarta-commons-lang/DETAILS
@@ -1,12 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=lang
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-lang
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
- SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
- #http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+ SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}
SOURCE_HASH=sha512:1e659d231bbd71527fcba668e3d9ecbd811668e9c95f291b8f1f64aafa9a70c398661e33dd87b251cc21e4dc56dfb073fd697baf85907c753fa04493338f5991
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/lang.html
diff --git a/java/jakarta-commons-lang/HISTORY b/java/jakarta-commons-lang/HISTORY
index 6c79061cb6..407bc7ea14 100644
--- a/java/jakarta-commons-lang/HISTORY
+++ b/java/jakarta-commons-lang/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+ variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=2, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-lang/INSTALL b/java/jakarta-commons-lang/INSTALL
index 89dec51cb6..c5860341df 100755
--- a/java/jakarta-commons-lang/INSTALL
+++ b/java/jakarta-commons-lang/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME} &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ $SOURCE_DIRECTORY/${SPELL#*-} &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-lang-2.0-dev.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-lang-2.0-dev.jar \
commons-lang.jar
diff --git a/java/jakarta-commons-logging/DETAILS b/java/jakarta-commons-logging/DETAILS
index 8c079267e9..e027bc406c 100755..100644
--- a/java/jakarta-commons-logging/DETAILS
+++ b/java/jakarta-commons-logging/DETAILS
@@ -1,12 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=logging
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-logging
VERSION=1.0.2
- SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
- SOURCE_URL[1]=http://archive.apache.org/dist/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
+ SOURCE_URL[1]=http://archive.apache.org/dist/commons/${SPELL##*-}/source/$SOURCE
SOURCE_HASH=sha512:acabf10b27965cffc71bc920e6643fb66d555b827bd4387c65c8d6c08a9ea79644041321958935da310583567212d46691c925ef2d1879629a8bc473148cf1b2
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/logging.html
diff --git a/java/jakarta-commons-logging/HISTORY b/java/jakarta-commons-logging/HISTORY
index 19eb83ee1d..4ad6ca6c32 100644
--- a/java/jakarta-commons-logging/HISTORY
+++ b/java/jakarta-commons-logging/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/java/jakarta-commons-logging/INSTALL b/java/jakarta-commons-logging/INSTALL
index 814e61e18f..7f408405b6 100755
--- a/java/jakarta-commons-logging/INSTALL
+++ b/java/jakarta-commons-logging/INSTALL
@@ -1,10 +1,10 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY/logging/dist &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-logging-api.jar \
+ ${SPELL#*-}-${VERSION}/commons-logging-api.jar \
commons-logging-api.jar &&
-register_jakarta_jar ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-logging.jar \
+register_jakarta_jar ${SPELL#*-}-${VERSION}/commons-logging.jar \
commons-logging.jar
diff --git a/java/jakarta-commons-modeler/BUILD b/java/jakarta-commons-modeler/BUILD
index e3f3ce0d17..1bf4201e9c 100755
--- a/java/jakarta-commons-modeler/BUILD
+++ b/java/jakarta-commons-modeler/BUILD
@@ -5,7 +5,7 @@ set_ant_env &&
export CLASSPATH="${JAVA_HOME}/lib/tools.jar:${JAVA_HOME}/lib/classes.zip:${ANT_HOME}/lib/ant.jar" &&
# create build.properties
-cat > $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}/build.properties <<EOF
+cat > $SOURCE_DIRECTORY/${SPELL#*-}/build.properties <<EOF
commons.home=${SM_JAKARTA_HOME}/
sandbox.home=${SM_JAKARTA_HOME}/commons-sandbox
jaxp.home=${SM_SUN_HOME}/java_xml_pack/jaxp-1.2_01
@@ -27,7 +27,7 @@ jaxp.xalan.jar=${SM_JAKARTA_HOME}/lib/xalan.jar
junit.jar=\${junit.home}/junit.jar
EOF
-cd ${PKG_SUBPRJ}-${PKG_NAME} &&
+cd ${SPELL#*-} &&
cp LICENSE.txt ../LICENSE &&
ant dist
diff --git a/java/jakarta-commons-modeler/DETAILS b/java/jakarta-commons-modeler/DETAILS
index 7997336559..4a626d5d8c 100755..100644
--- a/java/jakarta-commons-modeler/DETAILS
+++ b/java/jakarta-commons-modeler/DETAILS
@@ -1,11 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=modeler
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-modeler
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.zip
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
- SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/$SOURCE
+ SOURCE=${SPELL#*-}-src-${VERSION}.zip
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+ SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/$SOURCE
SOURCE_HASH=sha512:4f947d092f0ed503f073ee1e5cd7c8df2bbcb4078563cc87effb9b57177061ba422977d6ab19fac055e05d4642a399855113706a9e6cd808e515baedbd03b81d
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/modeler.html
diff --git a/java/jakarta-commons-modeler/HISTORY b/java/jakarta-commons-modeler/HISTORY
index b2229ea949..1c0e01ee31 100644
--- a/java/jakarta-commons-modeler/HISTORY
+++ b/java/jakarta-commons-modeler/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+ variables
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/java/jakarta-commons-modeler/INSTALL b/java/jakarta-commons-modeler/INSTALL
index 976d1efc24..cd879b3c88 100755
--- a/java/jakarta-commons-modeler/INSTALL
+++ b/java/jakarta-commons-modeler/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME} &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ $SOURCE_DIRECTORY/${SPELL#*-} &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-modeler.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-modeler.jar \
commons-modeler.jar
diff --git a/java/jakarta-commons-pool/DETAILS b/java/jakarta-commons-pool/DETAILS
index 46b7b57430..a4b9422cd9 100755..100644
--- a/java/jakarta-commons-pool/DETAILS
+++ b/java/jakarta-commons-pool/DETAILS
@@ -1,12 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=pool
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-pool
VERSION=20030402
- SOURCE=${PKG_SUBPRJ}-${PKG_NAME}-src-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}
- SOURCE_URL[0]=http://cvs.apache.org/builds/${PKG_PROJECT}-${PKG_SUBPRJ}/nightly/${PKG_SUBPRJ}-${PKG_NAME}/${SOURCE}
- #http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+ SOURCE=${SPELL#*-}-src-${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}
+ SOURCE_URL[0]=http://cvs.apache.org/builds/${SPELL%-*}/nightly/${SPELL#*-}/${SOURCE}
SOURCE_HASH=sha512:928605af91feaa0e6f26401ec0921953176193d31bfc82309455e28a4ee5ee7eb983b9cc218f66545f97a677035d95e8e06d3a63e276ef3c3c1756dfcf3a5d57
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/pool/
diff --git a/java/jakarta-commons-pool/HISTORY b/java/jakarta-commons-pool/HISTORY
index 12fd9ea951..f7a3ae508a 100644
--- a/java/jakarta-commons-pool/HISTORY
+++ b/java/jakarta-commons-pool/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-commons-pool/INSTALL b/java/jakarta-commons-pool/INSTALL
index ac23530e74..3ff19e74d8 100755
--- a/java/jakarta-commons-pool/INSTALL
+++ b/java/jakarta-commons-pool/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
$SOURCE_DIRECTORY &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-pool.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-pool.jar \
commons-pool.jar
diff --git a/java/jakarta-log4j/DETAILS b/java/jakarta-log4j/DETAILS
index ff68f6edad..2aecd4e8c8 100755..100644
--- a/java/jakarta-log4j/DETAILS
+++ b/java/jakarta-log4j/DETAILS
@@ -1,10 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_NAME=log4j
- SPELL=${PKG_PROJECT}-${PKG_NAME}
+ SPELL=jakarta-log4j
VERSION=1.2.8
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://jakarta.apache.org/${PKG_NAME}/${SOURCE}
+ SOURCE_URL[0]=http://jakarta.apache.org/${SPELL#*-}/$SOURCE
SOURCE_HASH=sha512:b76c7644c474db145b6848db5b4e9293b6bd93dd20a3558d36cd27b4be4f9443a6f48a4d3bef55ba865d50922959060fd952317082c1a82a1f96b93f1446188d
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/log4j/docs/index.html
diff --git a/java/jakarta-log4j/HISTORY b/java/jakarta-log4j/HISTORY
index ff37f40e87..c937d1d8f6 100644
--- a/java/jakarta-log4j/HISTORY
+++ b/java/jakarta-log4j/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2007-08-29 Eric Sandall <sandalle@sourcemage.org>
* DEPENDS: Fixed missing parameters for depending on z-rejected
diff --git a/java/jakarta-log4j/INSTALL b/java/jakarta-log4j/INSTALL
index 89200097d3..b036dbab42 100755
--- a/java/jakarta-log4j/INSTALL
+++ b/java/jakarta-log4j/INSTALL
@@ -1,2 +1,2 @@
-extract_jakarta_src ${PKG_NAME} ${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/lib/log4j-1.2.8.jar log4j.jar
+extract_jakarta_src ${SPELL##*-} ${SPELL##*-}-${VERSION} $SOURCE_DIRECTORY &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/lib/log4j-1.2.8.jar log4j.jar
diff --git a/java/jakarta-regexp/DETAILS b/java/jakarta-regexp/DETAILS
index 6b7e413852..3f6d4557b9 100755..100644
--- a/java/jakarta-regexp/DETAILS
+++ b/java/jakarta-regexp/DETAILS
@@ -1,10 +1,8 @@
- PKG_PROJECT=jakarta
- PKG_NAME=regexp
- SPELL=${PKG_PROJECT}-${PKG_NAME}
+ SPELL=jakarta-regexp
VERSION=1.2
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_NAME}/source/${SOURCE}
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL%-*}/${SPELL#*-}/source/${SOURCE}
SOURCE_HASH=sha512:94192a4f1dc2831debdff69e920d3d684df724cfd9d88a8f7a9a9c4753c9c3a43441b8f9048f77ece2ea690e473cac09338f007ed84331369d7d7160ff41a8b9
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/regexp/index.html
diff --git a/java/jakarta-regexp/HISTORY b/java/jakarta-regexp/HISTORY
index 5e3d098208..6f3ee42a3b 100644
--- a/java/jakarta-regexp/HISTORY
+++ b/java/jakarta-regexp/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2011-10-14 Bor Kraljič <pyrobor@ver.si>
* DETAILS: fixed long description wrap (scripted)
diff --git a/java/jakarta-regexp/INSTALL b/java/jakarta-regexp/INSTALL
index bbd1610137..1d061015b3 100755
--- a/java/jakarta-regexp/INSTALL
+++ b/java/jakarta-regexp/INSTALL
@@ -1,3 +1,3 @@
-extract_jakarta_src ${PKG_NAME} ${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/jakarta-regexp-1.2.jar \
+extract_jakarta_src ${SPELL##*-} ${SPELL##*-}-${VERSION} $SOURCE_DIRECTORY &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/jakarta-regexp-1.2.jar \
jakarta-regexp.jar
diff --git a/java/jakarta-struts-bin/DETAILS b/java/jakarta-struts-bin/DETAILS
index cbd89b1ac6..d6853e5e0d 100755..100644
--- a/java/jakarta-struts-bin/DETAILS
+++ b/java/jakarta-struts-bin/DETAILS
@@ -1,10 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_NAME=struts
- SPELL=${PKG_PROJECT}-${PKG_NAME}-bin
+ SPELL=jakarta-struts-bin
+ SPELLX=${SPELL%-bin}
VERSION=1.1-rc1
- SOURCE=${PKG_PROJECT}-${PKG_NAME}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_PROJECT}-${PKG_NAME}-${VERSION}
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_NAME}/binaries/${SOURCE}
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELLX/-/\/}/binaries/$SOURCE
SOURCE_HASH=sha512:901d24bcc799d170cd03ddb8a4fe731b98a6ec4de7223864cafc02f5414a0c2f3976b48fd2886f4eabfe4869ecb835c2896b72752e4fc2efe5f68ec2859616c7
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/struts/index.html
diff --git a/java/jakarta-struts-bin/HISTORY b/java/jakarta-struts-bin/HISTORY
index 0517372302..210e089c1a 100644
--- a/java/jakarta-struts-bin/HISTORY
+++ b/java/jakarta-struts-bin/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.
diff --git a/java/jakarta-struts-bin/INSTALL b/java/jakarta-struts-bin/INSTALL
index 6a991189f0..4f387d4722 100755
--- a/java/jakarta-struts-bin/INSTALL
+++ b/java/jakarta-struts-bin/INSTALL
@@ -1,4 +1,4 @@
. $SECTION_DIRECTORY/java-functions &&
-extract_jakarta_src ${PKG_NAME} ${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/lib/struts.jar struts.jar
+extract_jakarta_src ${SPELL##*-} ${SPELL##*-}-${VERSION} $SOURCE_DIRECTORY &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/lib/struts.jar struts.jar
diff --git a/java/jakarta-velocity/DETAILS b/java/jakarta-velocity/DETAILS
index 6d1ac18ca0..869c820eb1 100755..100644
--- a/java/jakarta-velocity/DETAILS
+++ b/java/jakarta-velocity/DETAILS
@@ -1,11 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_NAME=velocity
- SPELL=${PKG_PROJECT}-${PKG_NAME}
+ SPELL=jakarta-velocity
VERSION=1.3.1
- SOURCE=${PKG_NAME}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_NAME}-${VERSION}
- SOURCE_URL[0]=http://jakarta.apache.org/builds/$SPELL/release/v1.3.1/${SOURCE}
- SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/${SOURCE}
+ SOURCE=${SPELL#*-}-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-$VERSION
+ SOURCE_URL[0]=http://jakarta.apache.org/builds/$SPELL/release/v$VERSION/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE
SOURCE_HASH=sha512:14780e79a72b67953388132b23eed6e41491e1247b3b9ed4fa6b2c409efa5ace0a3ba1c6b94ea138b3c502575ecbfa89be5710ff841968118e7ab7229c981a9a
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/velocity/index.html
diff --git a/java/jakarta-velocity/HISTORY b/java/jakarta-velocity/HISTORY
index 58d18cb3e5..910b13b4bd 100644
--- a/java/jakarta-velocity/HISTORY
+++ b/java/jakarta-velocity/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-06-29 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
* BUILD: Converted to build_api 2
diff --git a/java/jakarta-velocity/INSTALL b/java/jakarta-velocity/INSTALL
index 914261a88c..91b079b3b7 100755
--- a/java/jakarta-velocity/INSTALL
+++ b/java/jakarta-velocity/INSTALL
@@ -1,5 +1,5 @@
-extract_jakarta_dist ${PKG_NAME} ${PKG_NAME}-${VERSION} ${SOURCE} &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/velocity-1.3.1-rc2.jar \
+extract_jakarta_dist ${SPELL##*-} ${SPELL##*-}-${VERSION} ${SOURCE} &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/velocity-1.3.1-rc2.jar \
velocity.jar &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/velocity-dep-1.3.1-rc2.jar \
+register_jakarta_jar ${SPELL##*-}-${VERSION}/velocity-dep-1.3.1-rc2.jar \
velocity-dep.jar
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 489354211b..ecfa9940c9 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2014-12-20 Ladislav Hagara <hgr@vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.18.1
+ * info/patches/maintenance_patches_3/patch-3.18.1: added
+
2014-12-08 Ladislav Hagara <hgr@vabo.cz>
* latest.defaults: LATEST_maintenance_patches_3=3.18, LATEST_3=3.18
* info/kernels/3.18: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.18.1 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.18.1
new file mode 100755
index 0000000000..b66eae3147
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.18.1
@@ -0,0 +1,5 @@
+appliedkernels="3.18"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="85436cd73903042d21c1dffcd6c682772ba2d3ed"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 0f82bb060b..f533c503c5 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.18
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.18
+LATEST_maintenance_patches_3=patch-3.18.1
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/libgit2/DETAILS b/libs/libgit2/DETAILS
index ce3a682349..6c4b89d801 100755
--- a/libs/libgit2/DETAILS
+++ b/libs/libgit2/DETAILS
@@ -1,10 +1,10 @@
SPELL=libgit2
VERSION=0.21.3
- SOURCE_HASH=sha512:399e16c9ca9d5a9e95ac929d7bd327038ba0e590e37ceee2aab062472f28a32905e90b5ee59990dad428d04c1c0d3f388381e3e44f775dfaafe37b21dbd7c892
- SOURCE=v${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-${VERSION}
+ SOURCE_HASH=sha512:399e16c9ca9d5a9e95ac929d7bd327038ba0e590e37ceee2aab062472f28a32905e90b5ee59990dad428d04c1c0d3f388381e3e44f775dfaafe37b21dbd7c892
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/libgit2
- SOURCE_URL=$WEB_SITE/$SPELL/archive/$SOURCE
+ SOURCE_URL=$WEB_SITE/$SPELL/archive/v$VERSION.tar.gz
ENTERED=20130123
LICENSE[0]=GPL
KEYWORDS="disk"
diff --git a/libs/libgit2/HISTORY b/libs/libgit2/HISTORY
index 7c544f0ce8..d6903c07c8 100644
--- a/libs/libgit2/HISTORY
+++ b/libs/libgit2/HISTORY
@@ -1,3 +1,6 @@
+2014-12-26 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Fixed SOURCE to make it a proper tarball name
+
2014-12-19 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.21.3
@@ -10,4 +13,3 @@
2013-01-23 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version master
-
diff --git a/libs/libsigsegv/HISTORY b/libs/libsigsegv/HISTORY
index f13a58e10a..00a7cb1eb1 100644
--- a/libs/libsigsegv/HISTORY
+++ b/libs/libsigsegv/HISTORY
@@ -1,3 +1,7 @@
+2014-12-30 Eric Sandall <sandalle@sourcemage.org>
+ * UP_TRIGGERS: Trigger dependent spells on upgrade
+ Bug #185, Bug #186, and Bug #187
+
2011-04-05 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 2.10, WEB_SITE updated
diff --git a/libs/libsigsegv/UP_TRIGGERS b/libs/libsigsegv/UP_TRIGGERS
new file mode 100755
index 0000000000..c37f788ad2
--- /dev/null
+++ b/libs/libsigsegv/UP_TRIGGERS
@@ -0,0 +1,10 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+
+if [ "${VERSION:0:4}" != "${OLD_SPELL_VERSION:0:4}" ]; then
+ message "${MESSAGE_COLOR}This is a possibly incompatible update of ${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
+ message "${MESSAGE_COLOR}Figuring out what spells need to be recast, this may take a while.${DEFAULT_COLOR}"
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index ff5ba9e4b6..ea9b7de3ca 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -81,9 +81,9 @@ optional_depends 'fuse' \
'--without-fuse' \
'for FUSE filesystem support for lxc' &&
-suggest_depends nc '' '' 'for remote SSH tunneling' &&
+suggest_depends -sub 'NMAP_NCAT NMAP_NC_SYMLINK' nmap '' '' 'for remote SSH tunneling' &&
suggest_depends 'bridge-utils' '' '' 'for creating TUN/TAP bridges' &&
suggest_depends 'iproute2' '' '' 'for routing between TUN/TAP interfaces' &&
suggest_depends 'dnsmasq' '' '' 'for providing DHCP on virtual networks' &&
-suggest_depends QEMU '' '' "for QEMU (use ${SPELL_COLOR}kvm${DEFAULT_COLOR} for QEMU/KVM) binaries?"
-
+suggest_depends QEMU '' '' "for QEMU (use ${SPELL_COLOR}kvm${DEFAULT_COLOR} for QEMU/KVM) binaries?" &&
+suggest_depends 'ebtables' '' '' 'for firewall/NAT support'
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 2099ac41c0..0bb714f86d 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * DEPENDS: Uses ebtables for firewall/NAT
+
2014-12-04 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 1.2.9
* DEPENDS: Python is still optional, but ./configure no longer has flags
@@ -6,7 +9,7 @@
* DETAILS: Updated to 1.1.1
* DEPENDS: --*-libssh2 -> --*-ssh2
-2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: udev => UDEV
2013-04-11 Ladislav Hagara <hgr@vabo.cz>
diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 3dfd3686c2..e7de2570ea 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,6 +1,6 @@
SPELL=sip
- VERSION=4.16.4
- SOURCE_HASH=sha512:0c17222f9c54feca87c4d4a237a06a2b792a16990d80de511a90a762eed683f22326492bc437b1942ebd2db80816668a094b199fa5cfbcc6e70717842bba4e14
+ VERSION=4.16.5
+ SOURCE_HASH=sha512:730578deb289ee94dab4d333e331de8ef68319758e4351e37605a43932c1e4db28de727a76f7a9e9ef610b7287f4eea155765a16dbdb61ac220c371d739a6f99
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/pyqt/$SPELL/$SPELL-$VERSION/$SOURCE
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index e1e39b49a5..eb9b2c9d1a 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2014-12-28 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.16.5
+
2014-11-28 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 4.16.4
diff --git a/libs/td_lib/BUILD b/libs/td_lib/BUILD
new file mode 100755
index 0000000000..d22e99fd61
--- /dev/null
+++ b/libs/td_lib/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/libs/td_lib/DETAILS b/libs/td_lib/DETAILS
new file mode 100755
index 0000000000..88e2a6d9df
--- /dev/null
+++ b/libs/td_lib/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=td_lib
+ VERSION=20140722
+ SOURCE="$SPELL-$VERSION.tgz"
+ SOURCE_URL[0]=ftp://invisible-island.net/ded/$SOURCE
+ SOURCE_HASH=sha512:1eff2a057e6a30ea6ac9839c8a1754a55b87edfd73cdb2b39765049616b65d2a0d66475c4dcc9423587f6fe94bacd2687fc07bd37100568dbf9cfbd980ecd517
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://invisible-island.net/ded/ded.html"
+ LICENSE[0]="BSD"
+ ENTERED=20141224
+ KEYWORDS=""
+ SHORT="Thomas Dickey's library"
+cat << EOF
+This development library is used to build several related packages:
+ ded - directory editor
+ cm_tools - configuration management tools for RCS
+ sccs_tools - configuration management tools for SSCS
+ copyrite - utility for adding copyright notices
+EOF
diff --git a/libs/td_lib/HISTORY b/libs/td_lib/HISTORY
new file mode 100644
index 0000000000..a612a87ac9
--- /dev/null
+++ b/libs/td_lib/HISTORY
@@ -0,0 +1,2 @@
+2014-12-24 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DETAILS: spell created
diff --git a/mail/msmtp/DETAILS b/mail/msmtp/DETAILS
index 7a112a0955..d73437786b 100755
--- a/mail/msmtp/DETAILS
+++ b/mail/msmtp/DETAILS
@@ -1,10 +1,10 @@
SPELL=msmtp
- VERSION=1.4.31
+ VERSION=1.6.0rc3
SECURITY_PATCH=1
- SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_HASH=sha512:aec12bd9479342d826e7c838116c1771a17dc2b53c220c7fdf4d3fa4cb53eb76041bb64be7417637887e6f0109f65d97155e9c74d60633c280edb0613417a136
+ SOURCE_HASH=sha512:2101fc714de7fa3d2b09b2ee2124bbbc5e8541978efeb7ca0e98ee0ea35c4acfd126fcb6e39f69b591d3031c8d9c0b237797be647a12d1539875958f9ff09685
WEB_SITE=http://msmtp.sourceforge.net/
ENTERED=20040412
LICENSE[0]=GPL
diff --git a/mail/msmtp/HISTORY b/mail/msmtp/HISTORY
index 977946b8bb..683aa4ac63 100644
--- a/mail/msmtp/HISTORY
+++ b/mail/msmtp/HISTORY
@@ -1,3 +1,7 @@
+2014-12-24 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated spell to 1.6.0rc2
+ updated spell to 1.6.0rc3
+
2014-08-19 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: openssl => SSL
diff --git a/net/ebtables/BUILD b/net/ebtables/BUILD
new file mode 100755
index 0000000000..1e007c9968
--- /dev/null
+++ b/net/ebtables/BUILD
@@ -0,0 +1,2 @@
+sedit "s!CFLAGS:=.*!CFLAGS=${CFLAGS}!" ${SOURCE_DIRECTORY}/Makefile &&
+default_build_make
diff --git a/net/ebtables/DETAILS b/net/ebtables/DETAILS
new file mode 100755
index 0000000000..dec5f314bd
--- /dev/null
+++ b/net/ebtables/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=ebtables
+ VERSION=2.0.10-4
+ SOURCE=$SPELL-v$VERSION.tar.gz
+ SOURCE_URL[0]=ftp://ftp.netfilter.org/pub/${SPELL}/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-v${VERSION}"
+ WEB_SITE=http://ebtables.netfilter.org/
+ ENTERED=20141229
+ LICENSE[0]=GPLv2
+ KEYWORDS="net"
+ SHORT='ebtables is a filtering tool for a bridging firewall'
+cat << EOF
+The ebtables program is a filtering tool for a Linux-based bridging firewall.
+It enables transparent filtering of network traffic passing through a Linux
+bridge. The filtering possibilities are limited to link layer filtering and
+some basic filtering on higher network layers. Advanced logging, MAC DNAT/SNAT
+and brouter facilities are also included.
+
+The ebtables tool can be combined with the other Linux filtering tools
+(iptables, ip6tables and arptables) to make a bridging firewall that is also
+capable of filtering these higher network layers. This is enabled through the
+bridge-netfilter architecture which is a part of the standard Linux kernel.
+
+The ebtables and arptables codebase is maintained by the netfilter developers,
+who were so kind to take over maintenance of the software. This website is kept
+mainly as a documentation reference.
+EOF
diff --git a/net/ebtables/HISTORY b/net/ebtables/HISTORY
new file mode 100644
index 0000000000..c66f725bbe
--- /dev/null
+++ b/net/ebtables/HISTORY
@@ -0,0 +1,3 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * Created
+
diff --git a/net/ebtables/INSTALL b/net/ebtables/INSTALL
new file mode 100755
index 0000000000..ab5f0591f6
--- /dev/null
+++ b/net/ebtables/INSTALL
@@ -0,0 +1,3 @@
+make install \
+ MANDIR=${INSTALL_ROOT}/usr/share/man \
+ BINDIR=${INSTALL_ROOT}/sbin
diff --git a/net/ebtables/PRE_BUILD b/net/ebtables/PRE_BUILD
new file mode 100755
index 0000000000..da7fbce53f
--- /dev/null
+++ b/net/ebtables/PRE_BUILD
@@ -0,0 +1,8 @@
+if [[ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "y" &&
+ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
+ "CONFIG_BRIDGE_NF_EBTABLES module/built-in${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+default_pre_build
diff --git a/net/ebtables/ebtables-v2.0.10-4.tar.gz.sig b/net/ebtables/ebtables-v2.0.10-4.tar.gz.sig
new file mode 100644
index 0000000000..90a605ba45
--- /dev/null
+++ b/net/ebtables/ebtables-v2.0.10-4.tar.gz.sig
Binary files differ
diff --git a/net/ebtables/init.d/ebtables b/net/ebtables/init.d/ebtables
new file mode 100755
index 0000000000..b79c82993e
--- /dev/null
+++ b/net/ebtables/init.d/ebtables
@@ -0,0 +1,147 @@
+#!/bin/bash
+#
+# init script for the Ethernet Bridge filter tables
+#
+# Written by Dag Wieers <dag@wieers.com>
+# Modified by Rok Papez <rok.papez@arnes.si>
+# Bart De Schuymer <bdschuym@pandora.be>
+# Eric Sandall <sandalle@sourcemage.org> for SMGL simpleinit-msb
+#
+# chkconfig: - 15 85
+# description: Ethernet Bridge filtering tables
+#
+# config: /etc/sysconfig/ebtables (text)
+# /etc/sysconfig/ebtables.<table> (binary)
+
+PROGRAM=/sbin/ebtables
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+
+umask 0077
+
+#default configuration
+EBTABLES_TEXT_FORMAT="yes"
+EBTABLES_BINARY_FORMAT="yes"
+EBTABLES_MODULES_UNLOAD="yes"
+EBTABLES_SAVE_ON_STOP="no"
+EBTABLES_SAVE_ON_RESTART="no"
+EBTABLES_SAVE_COUNTER="no"
+
+config=/etc/sysconfig/ebtables-config
+[ -f "$config" ] && . "$config"
+
+[ -x ${PROGRAM} ] || exit 1
+[ -x ${PROGRAM}-save ] || exit 1
+[ -x ${PROGRAM}-restore ] || exit 1
+
+RETVAL=0
+desc="Ethernet bridge filtering"
+umask 0077
+
+start() {
+ echo -n $"Starting $desc (ebtables): "
+ if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
+ for table in $(ls /etc/sysconfig/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do
+ ${PROGRAM} -t $table --atomic-file /etc/sysconfig/ebtables.$table --atomic-commit || RETVAL=1
+ done
+ else
+ ${PROGRAM}-restore < /etc/sysconfig/ebtables || RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
+ print_status success
+ rm -f /var/lock/subsys/ebtables
+ else
+ print_status failure
+ fi
+ echo
+}
+
+stop() {
+ echo -n $"Stopping $desc (ebtables): "
+ for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
+ ${PROGRAM} -t $table --init-table || RETVAL=1
+ done
+
+ if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then
+ for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do
+ rmmod $mod 2> /dev/null
+ done
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
+ print_status success
+ rm -f /var/lock/subsys/ebtables
+ else
+ print_status failure
+ fi
+ echo
+}
+
+restart() {
+ stop
+ start
+}
+
+save() {
+ echo -n $"Saving $desc (ebtables): "
+ if [ "$EBTABLES_TEXT_FORMAT" = "yes" ]; then
+ if [ -e /etc/sysconfig/ebtables ]; then
+ chmod 0600 /etc/sysconfig/ebtables
+ mv -f /etc/sysconfig/ebtables /etc/sysconfig/ebtables.save
+ fi
+ ${PROGRAM}-save > /etc/sysconfig/ebtables || RETVAL=1
+ fi
+ if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
+ rm -f /etc/sysconfig/ebtables.*.save
+ for oldtable in $(ls /etc/sysconfig/ebtables.* 2>/dev/null | grep -vF 'ebtables.save'); do
+ chmod 0600 $oldtable
+ mv -f $oldtable $oldtable.save
+ done
+ for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
+ ${PROGRAM} -t $table --atomic-file /etc/sysconfig/ebtables.$table --atomic-save || RETVAL=1
+ if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
+ ${PROGRAM} -t $table --atomic-file /etc/sysconfig/ebtables.$table -Z || RETVAL=1
+ fi
+ done
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
+ print_status success
+ else
+ print_status failure
+ fi
+ echo
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
+ stop
+ ;;
+ restart|reload)
+ [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
+ restart
+ ;;
+ condrestart)
+ [ -e /var/lock/subsys/ebtables ] && restart
+ RETVAL=$?
+ ;;
+ save)
+ save
+ ;;
+ status)
+ ${PROGRAM}-save
+ RETVAL=$?
+ ;;
+ *)
+ echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
+ RETVAL=1
+esac
+
+exit $RETVAL
diff --git a/net/libnftnl/DEPENDS b/net/libnftnl/DEPENDS
new file mode 100755
index 0000000000..aa49cf1cc4
--- /dev/null
+++ b/net/libnftnl/DEPENDS
@@ -0,0 +1 @@
+depends libmnl
diff --git a/net/libnftnl/DETAILS b/net/libnftnl/DETAILS
new file mode 100755
index 0000000000..7353fb4cd4
--- /dev/null
+++ b/net/libnftnl/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=libnftnl
+ VERSION=1.0.3
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE_GPG=netfilter.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.netfilter.org/projects/${SPELL}/index.html
+ ENTERED=20141229
+ LICENSE[0]=GPLv2
+ KEYWORDS="net"
+ SHORT='libnftnl is a low-level userspace library to nf_tables'
+cat << EOF
+libnftnl is a userspace library providing a low-level netlink programming
+interface (API) to the in-kernel nf_tables subsystem. The library libnftnl has
+been previously known as libnftables. This library is currently used by
+nftables.
+EOF
diff --git a/net/libnftnl/HISTORY b/net/libnftnl/HISTORY
new file mode 100644
index 0000000000..c66f725bbe
--- /dev/null
+++ b/net/libnftnl/HISTORY
@@ -0,0 +1,3 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * Created
+
diff --git a/net/libnftnl/PRE_BUILD b/net/libnftnl/PRE_BUILD
new file mode 100755
index 0000000000..139bcd8fa1
--- /dev/null
+++ b/net/libnftnl/PRE_BUILD
@@ -0,0 +1,8 @@
+if [[ "$(get_kernel_config CONFIG_NF_TABLES)" != "y" &&
+ "$(get_kernel_config CONFIG_NF_TABLES)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
+ "CONFIG_NF_TABLES module/built-in${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+default_pre_build
diff --git a/net/nc/CONFLICTS b/net/nc/CONFLICTS
index bc7c602397..27928de0a3 100755
--- a/net/nc/CONFLICTS
+++ b/net/nc/CONFLICTS
@@ -1,2 +1,3 @@
conflicts netcat &&
+conflicts nmap &&
conflicts cryptcat
diff --git a/net/nc/HISTORY b/net/nc/HISTORY
index 24ee9345dd..f867055452 100644
--- a/net/nc/HISTORY
+++ b/net/nc/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not selected)
+
2013-01-07 Vlad Glagolev <stealth@sourcemage.org>
* BUILD: fixed multijob build
* CONFLICTS: conflicts cryptcat
diff --git a/net/netcat/CONFLICTS b/net/netcat/CONFLICTS
index 30f1f19daa..ed5223e966 100755
--- a/net/netcat/CONFLICTS
+++ b/net/netcat/CONFLICTS
@@ -1,2 +1,3 @@
conflicts nc &&
+conflicts nmap &&
conflicts cryptcat
diff --git a/net/netcat/HISTORY b/net/netcat/HISTORY
index 3062dd11e2..13738b1265 100644
--- a/net/netcat/HISTORY
+++ b/net/netcat/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not selected)
+
2013-01-07 Vlad Glagolev <stealth@sourcemage.org>
* CONFLICTS: conflicts cryptcat
diff --git a/net/nftables/DEPENDS b/net/nftables/DEPENDS
new file mode 100755
index 0000000000..4e3cb28bbc
--- /dev/null
+++ b/net/nftables/DEPENDS
@@ -0,0 +1,2 @@
+depends libmnl &&
+depends libnftnl
diff --git a/net/nftables/DETAILS b/net/nftables/DETAILS
new file mode 100755
index 0000000000..008b79fd58
--- /dev/null
+++ b/net/nftables/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=nftables
+ VERSION=0.4
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE_GPG=netfilter.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.netfilter.org/projects/${SPELL}/index.html
+ ENTERED=20141229
+ LICENSE[0]=GPLv2
+ KEYWORDS="net"
+ SHORT='nftables is a user-space utility for {ip,ip6,arp,eb}tables'
+cat << EOF
+nftables is the project that aims to replace the existing {ip,ip6,arp,eb}tables
+framework. Basically, this project provides a new packet filtering framework, a
+new userspace utility and also a compatibility layer for {ip,ip6}tables.
+
+nftables is built upon the building blocks of the Netfilter infrastructure such
+as the existing hooks, the connection tracking system, the userspace queueing
+component and the logging subsystem.
+EOF
diff --git a/net/nftables/HISTORY b/net/nftables/HISTORY
new file mode 100644
index 0000000000..c66f725bbe
--- /dev/null
+++ b/net/nftables/HISTORY
@@ -0,0 +1,3 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * Created
+
diff --git a/net/nftables/PRE_BUILD b/net/nftables/PRE_BUILD
new file mode 100755
index 0000000000..da7fbce53f
--- /dev/null
+++ b/net/nftables/PRE_BUILD
@@ -0,0 +1,8 @@
+if [[ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "y" &&
+ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
+ "CONFIG_BRIDGE_NF_EBTABLES module/built-in${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+default_pre_build
diff --git a/python-pypi/argh/DEPENDS b/python-pypi/argh/DEPENDS
index 503782e3b0..e440941643 100755
--- a/python-pypi/argh/DEPENDS
+++ b/python-pypi/argh/DEPENDS
@@ -1,2 +1,2 @@
-depends python &&
+depends PYTHON &&
depends SETUPTOOLS
diff --git a/python-pypi/argh/DETAILS b/python-pypi/argh/DETAILS
index 9fa0ff78d1..0970536640 100755
--- a/python-pypi/argh/DETAILS
+++ b/python-pypi/argh/DETAILS
@@ -1,8 +1,8 @@
SPELL=argh
- VERSION=0.23.2
+ VERSION=0.26.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://pypi.python.org/packages/source/a/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:886b8a629e8ac5dd58f690c8664c30158a6ad6f1d05a835edf83095116ce43665ff96fd150d68c1efa8dc220abba06e2c652a782388ccf94b84ceda721a92d3a
+ SOURCE_HASH=sha512:8c286434b13fe72eca7c35313581921f49ab8934e0c791bd230ed775067507dc492b73b76c9ec521161395aeb8d1cfedc71e3251bba8f68d2227c3cf56c326bf
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://bitbucket.org/neithere/argh/"
LICENSE[0]=LGPL
diff --git a/python-pypi/argh/HISTORY b/python-pypi/argh/HISTORY
index 95ce1c7887..d4f85a3d9f 100644
--- a/python-pypi/argh/HISTORY
+++ b/python-pypi/argh/HISTORY
@@ -1,3 +1,7 @@
+2014-12-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.26.1
+ * DEPENDS: python3 supported
+
2013-08-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/python-pypi/args/DEPENDS b/python-pypi/args/DEPENDS
new file mode 100755
index 0000000000..503782e3b0
--- /dev/null
+++ b/python-pypi/args/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends SETUPTOOLS
diff --git a/python-pypi/args/DETAILS b/python-pypi/args/DETAILS
new file mode 100755
index 0000000000..38dd1c3a0c
--- /dev/null
+++ b/python-pypi/args/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=args
+ VERSION=0.1.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/a/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:664d33386af2ac0b9d30344db5fb5cea4210f600df28708ada19266afec237d6e6d9d57f03c8b64cfdbb6a17eff05f633a2cc4ddbfedc320dd133be246aee033
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://github.com/kennethreitz/args
+ LICENSE[0]=BSD
+ ENTERED=20141222
+ SHORT="argument parsing for humans"
+cat << EOF
+This simple module gives you an elegant interface for your command line
+arguments.
+EOF
diff --git a/python-pypi/args/HISTORY b/python-pypi/args/HISTORY
new file mode 100644
index 0000000000..9f1696b3ef
--- /dev/null
+++ b/python-pypi/args/HISTORY
@@ -0,0 +1,2 @@
+2014-12-21 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 0.1.0
diff --git a/python-pypi/awesome-slugify/DEPENDS b/python-pypi/awesome-slugify/DEPENDS
new file mode 100755
index 0000000000..1fa2290977
--- /dev/null
+++ b/python-pypi/awesome-slugify/DEPENDS
@@ -0,0 +1,4 @@
+depends PYTHON &&
+depends SETUPTOOLS &&
+depends regex &&
+depends unidecode
diff --git a/python-pypi/awesome-slugify/DETAILS b/python-pypi/awesome-slugify/DETAILS
new file mode 100755
index 0000000000..8c46ddaa0e
--- /dev/null
+++ b/python-pypi/awesome-slugify/DETAILS
@@ -0,0 +1,13 @@
+ SPELL=awesome-slugify
+ VERSION=1.6
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/a/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:3e11545f3930bbf938022139e7cba39997d4cf38274a217fdeb1a8b1be45049502ae6547e6c6d57430bd5b62a4dc75448b3880402aa31f6bb8d3ba1846af6dfa
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://github.com/dimka665/awesome-slugify
+ LICENSE[0]=GPL
+ ENTERED=20141222
+ SHORT="Python flexible slugify function"
+cat << EOF
+Python flexible slugify function.
+EOF
diff --git a/python-pypi/awesome-slugify/HISTORY b/python-pypi/awesome-slugify/HISTORY
new file mode 100644
index 0000000000..3b2f569620
--- /dev/null
+++ b/python-pypi/awesome-slugify/HISTORY
@@ -0,0 +1,2 @@
+2014-12-21 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 1.6
diff --git a/python-pypi/clint/DEPENDS b/python-pypi/clint/DEPENDS
index 503782e3b0..9e572ff5e0 100755
--- a/python-pypi/clint/DEPENDS
+++ b/python-pypi/clint/DEPENDS
@@ -1,2 +1,3 @@
-depends python &&
-depends SETUPTOOLS
+depends PYTHON &&
+depends SETUPTOOLS &&
+depends args
diff --git a/python-pypi/clint/DETAILS b/python-pypi/clint/DETAILS
index bc875b5359..0aba842975 100755
--- a/python-pypi/clint/DETAILS
+++ b/python-pypi/clint/DETAILS
@@ -1,8 +1,8 @@
SPELL=clint
- VERSION=0.3.1
+ VERSION=0.4.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://pypi.python.org/packages/source/c/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:1e200b3c07b374df680d0f5697ea99e01e020a9354ee98a44bf187aa26ad78ed5605f93d076ddb8facc62de6a456a7cbb38197a47e6ac81af4324631d36b0465
+ SOURCE_HASH=sha512:9ba3ac8b312566c79ec5185769685f1f7a1f33f3dbf5692a6f3113d505829c2669c3d7d5418c67fab4c095aaf56ff83330befe6dca98ef8be82c09ff18589650
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://github.com/kennethreitz/clint"
LICENSE[0]=ISC
diff --git a/python-pypi/clint/HISTORY b/python-pypi/clint/HISTORY
index 8d61c39033..e06cc249d1 100644
--- a/python-pypi/clint/HISTORY
+++ b/python-pypi/clint/HISTORY
@@ -1,3 +1,10 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: added missing args req dep
+
+2014-12-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.4.1
+ * DEPENDS: python3 supported
+
2013-08-12 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: spell created
diff --git a/python-pypi/feedgenerator/DETAILS b/python-pypi/feedgenerator/DETAILS
index 09f4e25895..4a82df336f 100755
--- a/python-pypi/feedgenerator/DETAILS
+++ b/python-pypi/feedgenerator/DETAILS
@@ -1,8 +1,8 @@
SPELL=feedgenerator
- VERSION=1.6
+ VERSION=1.7
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://pypi.python.org/packages/source/f/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:6b96094209ae206be75909f2ad9a9420a06e1fa47b8a5e28db4da16c5b157014f9f8d1677edc8a7347384fe0f0a91aa4f664257adfa994a46b6dc49d9349472b
+ SOURCE_HASH=sha512:359e584af7766b1a67c752df88ad67f06f9b2a6677d2e858484286b079e33b47192a5cf141fc86eb5590d86175e24d3fa1e87506773c28f6a35b2dc545520044
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://pypi.python.org/pypi/feedgenerator"
LICENSE[0]=BSD
diff --git a/python-pypi/feedgenerator/HISTORY b/python-pypi/feedgenerator/HISTORY
index 2d62c491cb..04a98cf711 100644
--- a/python-pypi/feedgenerator/HISTORY
+++ b/python-pypi/feedgenerator/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.7
+
2013-07-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/python-pypi/httplib2/DEPENDS b/python-pypi/httplib2/DEPENDS
index e4ea57a3b8..e440941643 100755
--- a/python-pypi/httplib2/DEPENDS
+++ b/python-pypi/httplib2/DEPENDS
@@ -1 +1,2 @@
-depends PYTHON
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/httplib2/DETAILS b/python-pypi/httplib2/DETAILS
index e2d0f20cee..e162eb0168 100755
--- a/python-pypi/httplib2/DETAILS
+++ b/python-pypi/httplib2/DETAILS
@@ -1,10 +1,11 @@
SPELL=httplib2
- VERSION=0.7.7
+ VERSION=0.9
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_URL[0]=http://httplib2.googlecode.com/files/$SOURCE
- SOURCE_HASH=sha512:686400092bdc3f5aa1ee809ebb1c3ea52995523eb58926c26401dcdadef3de6bd17241531e1fdc01f649a07b92071bd3d136e50aa9f9c8aa6fa4fdd8cdc31ab4
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://code.google.com/p/httplib2/
+ SOURCE_URL[0]=https://github.com/jcgregorio/${SPELL}/archive/v${VERSION}.tar.gz
+ SOURCE_HASH=sha512:e103137cd1bee26be6984128718ecaacccb85461b2fa2ca5e1360588182b565472111abea4179a14ff2a398930b08e2439b2b6a4c60b78aece769c56018a6caf
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ DOC_DIRS=""
+ WEB_SITE=https://github.com/jcgregorio/httplib2
LICENSE[0]=MIT
ENTERED=20061110
SHORT="comprehensive HTTP client library"
diff --git a/python-pypi/httplib2/HISTORY b/python-pypi/httplib2/HISTORY
index 6c6a98288e..56196b247d 100644
--- a/python-pypi/httplib2/HISTORY
+++ b/python-pypi/httplib2/HISTORY
@@ -1,3 +1,8 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.9; updated website, source url; quoting
+ paths; don't gather useless docs from doc dir
+ * DEPENDS: added missing SETUPTOOLS
+
2013-01-20 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 0.7.7
* DEPENDS: include Python 3 support
diff --git a/python-pypi/isort/DETAILS b/python-pypi/isort/DETAILS
index 30448c876e..d5d47bcf68 100755
--- a/python-pypi/isort/DETAILS
+++ b/python-pypi/isort/DETAILS
@@ -1,6 +1,6 @@
SPELL=isort
- VERSION=3.8.0
- SOURCE_HASH=sha512:5ea46f160144183ae0b0b0ca3aab011355644ed057186b01f9d996e2f77c321d35607eb0268b57a24701e00c51a1a607e7bb8351c727942a7360f2c337d42eb4
+ VERSION=3.9.3
+ SOURCE_HASH=sha512:0bf307f36acaab1b95a39ada8e1f3bf4d4bf50e6168b8fcf3932f76d6ff13879e9acd117c034d964cc2befaff6f4518ffba0d6293aaa1fc6e0d99d2157be31f3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/isort/HISTORY b/python-pypi/isort/HISTORY
index e26d559233..89bfa8ca4b 100644
--- a/python-pypi/isort/HISTORY
+++ b/python-pypi/isort/HISTORY
@@ -1,3 +1,6 @@
+2014-12-26 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 3.9.3
+
2014-05-04 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.8.0
diff --git a/python-pypi/jinja2/DEPENDS b/python-pypi/jinja2/DEPENDS
index 6a1ccfd456..76dab75b9d 100755
--- a/python-pypi/jinja2/DEPENDS
+++ b/python-pypi/jinja2/DEPENDS
@@ -1,3 +1,5 @@
. $SECTION_DIRECTORY/PY_DEPENDS &&
-suggest_depends markupsafe "" "" "to use system markupsafe module" &&
+
+depends markupsafe &&
+
suggest_depends babel "" "" "for comment support"
diff --git a/python-pypi/jinja2/HISTORY b/python-pypi/jinja2/HISTORY
index 06722f1974..5a79db8f8a 100644
--- a/python-pypi/jinja2/HISTORY
+++ b/python-pypi/jinja2/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: markupsafe becomes required from 2.7
+
2014-07-23 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 2.7.3
diff --git a/python-pypi/markupsafe/DETAILS b/python-pypi/markupsafe/DETAILS
index 42838aea52..f40c53a13b 100755
--- a/python-pypi/markupsafe/DETAILS
+++ b/python-pypi/markupsafe/DETAILS
@@ -1,15 +1,15 @@
SPELL=markupsafe
SPELLX=MarkupSafe
- VERSION=0.19
- SOURCE_HASH=sha512:3fa91de4967394c16a948a401fc7ee024c5e617bd90f0b41c47021656a57087169a9d0ac8af34656c00e6696dc20c3501041eee03a49686034bb611ef6eba45d
+ VERSION=0.23
SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE_HASH=sha512:4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28
SOURCE_URL[0]=http://pypi.python.org/packages/source/M/$SPELLX/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- WEB_SITE=http://pypi.python.org/pypi/$SPELLX
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE=https://github.com/mitsuhiko/markupsafe
LICENSE[0]=PYTHON
UPDATED=20100916
KEYWORDS="python devel"
SHORT="XML/HTML/XHTML Markup safe string for Python"
cat << EOF
-implements a XML/HTML/XHTML Markup safe string for Python
+Implements a unicode subclass that supports HTML strings.
EOF
diff --git a/python-pypi/markupsafe/HISTORY b/python-pypi/markupsafe/HISTORY
index 85351b0216..77007eea4a 100644
--- a/python-pypi/markupsafe/HISTORY
+++ b/python-pypi/markupsafe/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.23; updated website, description; quoting
+ paths
+
2014-03-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 0.19
diff --git a/python-pypi/pathtools/DEPENDS b/python-pypi/pathtools/DEPENDS
new file mode 100755
index 0000000000..503782e3b0
--- /dev/null
+++ b/python-pypi/pathtools/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends SETUPTOOLS
diff --git a/python-pypi/pathtools/DETAILS b/python-pypi/pathtools/DETAILS
new file mode 100755
index 0000000000..44a102b31a
--- /dev/null
+++ b/python-pypi/pathtools/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=pathtools
+ VERSION=0.1.2
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE_HASH=sha512:e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
+ WEB_SITE=http://github.com/gorakhargosh/pathtools
+ LICENSE[0]=MIT
+ ENTERED=20141222
+ KEYWORDS="python"
+ SHORT="file system general utilities"
+cat << EOF
+Pattern matching and various utilities for file systems paths.
+EOF
diff --git a/python-pypi/pathtools/HISTORY b/python-pypi/pathtools/HISTORY
new file mode 100644
index 0000000000..fac69bf9aa
--- /dev/null
+++ b/python-pypi/pathtools/HISTORY
@@ -0,0 +1,2 @@
+2014-12-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 0.1.2
diff --git a/python-pypi/py/DEPENDS b/python-pypi/py/DEPENDS
new file mode 100755
index 0000000000..e440941643
--- /dev/null
+++ b/python-pypi/py/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/py/DETAILS b/python-pypi/py/DETAILS
new file mode 100755
index 0000000000..1662732d71
--- /dev/null
+++ b/python-pypi/py/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=py
+ VERSION=1.4.26
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:5772893d754e4f3fee5de9fdb0eca2c654ac5288eba5c89dac88fd4d9acb2c0795bae61e0c43b37a14471536a1649c9138ac1c4374cd5697307e74062e9813f3
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://bitbucket.org/hpk42/py/
+ LICENSE[0]=MIT
+ ENTERED=20141221
+ SHORT="library with cross-python path, ini-parsing, io, code, log facilities"
+cat << EOF
+The py lib is a Python development support library featuring the following tools
+and modules:
+
+py.path: uniform local and svn path objects
+py.apipkg: explicit API control and lazy-importing
+py.iniconfig: easy parsing of .ini files
+py.code: dynamic code generation and introspection
+EOF
diff --git a/python-pypi/py/HISTORY b/python-pypi/py/HISTORY
new file mode 100644
index 0000000000..b321e4b44c
--- /dev/null
+++ b/python-pypi/py/HISTORY
@@ -0,0 +1,2 @@
+2014-12-21 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 1.4.26
diff --git a/python-pypi/pytest/DEPENDS b/python-pypi/pytest/DEPENDS
new file mode 100755
index 0000000000..1897db576c
--- /dev/null
+++ b/python-pypi/pytest/DEPENDS
@@ -0,0 +1,3 @@
+depends PYTHON &&
+depends SETUPTOOLS &&
+depends py
diff --git a/python-pypi/pytest/DETAILS b/python-pypi/pytest/DETAILS
new file mode 100755
index 0000000000..1ee1bb8d29
--- /dev/null
+++ b/python-pypi/pytest/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=pytest
+ VERSION=2.6.4
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:b17f79b0f3c0f6051bedb0d7acadc5d569b3b90b2fce2eddda06a21b654f6077f934aaa9617152d6b2f8babb95c37494f18e050841af601f7f37de25c15b32fd
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=http://pytest.org/
+ LICENSE[0]=MIT
+ ENTERED=20141222
+ SHORT="simple powerful testing with Python"
+cat << EOF
+pytest is a mature full-featured Python testing tool that helps you write better
+programs.
+EOF
diff --git a/python-pypi/pytest/HISTORY b/python-pypi/pytest/HISTORY
new file mode 100644
index 0000000000..94eb2eb1fe
--- /dev/null
+++ b/python-pypi/pytest/HISTORY
@@ -0,0 +1,2 @@
+2014-12-21 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 2.6.4
diff --git a/python-pypi/python-dateutil/DEPENDS b/python-pypi/python-dateutil/DEPENDS
index 48d8ddc44d..44933459ca 100755
--- a/python-pypi/python-dateutil/DEPENDS
+++ b/python-pypi/python-dateutil/DEPENDS
@@ -1 +1,3 @@
-. $SECTION_DIRECTORY/PY_DEPENDS
+. $SECTION_DIRECTORY/PY_DEPENDS &&
+
+depends six
diff --git a/python-pypi/python-dateutil/DETAILS b/python-pypi/python-dateutil/DETAILS
index e35f463a56..0a25f54271 100755
--- a/python-pypi/python-dateutil/DETAILS
+++ b/python-pypi/python-dateutil/DETAILS
@@ -1,19 +1,13 @@
SPELL=python-dateutil
-if [ "$PYTHON_DATEUTIL_BRANCH" == "python2" ]; then
- VERSION=1.5
+ VERSION=2.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-else
- VERSION=2.0
- SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_HASH=sha512:49571d2244fbfb8c3f5e9746f20ec7272ff7fb5d2d738403382d5aee063b88b64440084ab5c311973072e2d7f6cf5c6557990eed9ba20cf0c4321cf72c8a05a5
-fi
- SOURCE_URL[0]=http://labix.org/download/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:3fa0bcd06216daae4ab22288f850ce875c2456965bf3ca5b243b705324fe283ca2c0a176d37ee26394ea2bc1248ee1b399dd04629b113b5b93ba3247952013c5
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/p/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://labix.org/python-dateutil"
- LICENSE[0]=PYTHON
+ WEB_SITE=https://dateutil.readthedocs.org/
+ LICENSE[0]=BSD
ENTERED=20090313
- SHORT="The dateutil module provides powerful extensions to the standard datetime module"
+ SHORT="extensions to the standard Python datetime module"
cat << EOF
The dateutil module provides powerful extensions to the standard datetime
module, available in Python 2.3+. Computing of relative deltas (next month,
diff --git a/python-pypi/python-dateutil/HISTORY b/python-pypi/python-dateutil/HISTORY
index c6f31aa3cc..8e1551fd5e 100644
--- a/python-pypi/python-dateutil/HISTORY
+++ b/python-pypi/python-dateutil/HISTORY
@@ -1,3 +1,9 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.3; updated license, website, short desc,
+ source url
+ * DEPENDS: added six required dep
+ * PREPARE: dropped multi-branching (not needed anymore)
+
2013-04-29 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: imporve python3 depends
diff --git a/python-pypi/python-dateutil/PREPARE b/python-pypi/python-dateutil/PREPARE
deleted file mode 100755
index c306a1568d..0000000000
--- a/python-pypi/python-dateutil/PREPARE
+++ /dev/null
@@ -1,3 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch python2 python3
-
diff --git a/python-pypi/python-dateutil/python-dateutil-1.5.tar.gz.sig b/python-pypi/python-dateutil/python-dateutil-1.5.tar.gz.sig
deleted file mode 100644
index edde002116..0000000000
--- a/python-pypi/python-dateutil/python-dateutil-1.5.tar.gz.sig
+++ /dev/null
Binary files differ
diff --git a/python-pypi/python-markdown/DETAILS b/python-pypi/python-markdown/DETAILS
index 06978a5521..02b88c6755 100755
--- a/python-pypi/python-markdown/DETAILS
+++ b/python-pypi/python-markdown/DETAILS
@@ -1,9 +1,9 @@
SPELL=python-markdown
SPELLX=Markdown
- VERSION=2.3.1
- SOURCE_HASH=sha512:4ceb0405825fb20f4432134b7904d402b41b1d95c18e10e484a71011a1429ae83804437ed94ce60315fb48664f096a8f5d8d9e0111cab332fe5c978d62d569a6
+ VERSION=2.5.2
SOURCE=${SPELLX}-${VERSION}.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/M/${SPELLX}/${SOURCE}
+ SOURCE_HASH=sha512:603853586fa61dec7665a4e5ef21549adb0aa4309b0f67aea804bf749ba76ea94b09b17c24a37e25d409575ee149d3baaaf77c3dd4dcf74793c8106830fae28d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="https://pypi.python.org/pypi/Markdown"
LICENSE[0]=BSD
diff --git a/python-pypi/python-markdown/HISTORY b/python-pypi/python-markdown/HISTORY
index 73ad6706d7..37200e3478 100644
--- a/python-pypi/python-markdown/HISTORY
+++ b/python-pypi/python-markdown/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.5.2
+
2013-05-08 Treeve Jelbert <treeve@sourcemage.oge>
* DETAILS: version 2.3.1
new website
diff --git a/python-pypi/python-markdown2/DEPENDS b/python-pypi/python-markdown2/DEPENDS
new file mode 100755
index 0000000000..e440941643
--- /dev/null
+++ b/python-pypi/python-markdown2/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/python-markdown2/DETAILS b/python-pypi/python-markdown2/DETAILS
new file mode 100755
index 0000000000..11b7919c64
--- /dev/null
+++ b/python-pypi/python-markdown2/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=python-markdown2
+ SPELLX=markdown2
+ VERSION=2.3.0
+ SOURCE_HASH=sha512:48bf8e26b34c48c0c12fc0f110b09d3232ea3394db3325d50639adf5cefb603344ee97b116e09b574f7c7414ab4a8293ddc37ca6706e41baaa14e399fa467d5f
+ SOURCE=${SPELLX}-${VERSION}.zip
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/m/${SPELLX}/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE="https://github.com/trentm/python-markdown2"
+ LICENSE[0]=MIT
+ ENTERED=20141222
+ SHORT="fast and complete Python implementation of Markdown"
+cat << EOF
+Markdown is a text-to-HTML filter; it translates an easy-to-read / easy-to-write
+structured text format into HTML. Markdown's text format is most similar to that
+of plain text email, and supports features such as headers, emphasis, code
+blocks, blockquotes, and links. -- http://daringfireball.net/projects/markdown/
+
+This is a fast and complete Python implementation of the Markdown spec.
+EOF
diff --git a/python-pypi/python-markdown2/HISTORY b/python-pypi/python-markdown2/HISTORY
new file mode 100644
index 0000000000..d8761363ef
--- /dev/null
+++ b/python-pypi/python-markdown2/HISTORY
@@ -0,0 +1,2 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 2.3.0
diff --git a/python-pypi/python-textile/DEPENDS b/python-pypi/python-textile/DEPENDS
new file mode 100755
index 0000000000..8d5973a887
--- /dev/null
+++ b/python-pypi/python-textile/DEPENDS
@@ -0,0 +1,3 @@
+depends PYTHON &&
+depends SETUPTOOLS &&
+depends regex
diff --git a/python-pypi/python-textile/DETAILS b/python-pypi/python-textile/DETAILS
new file mode 100755
index 0000000000..ce8369b1a2
--- /dev/null
+++ b/python-pypi/python-textile/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=python-textile
+ SPELLX=textile
+ VERSION=2.2.1
+ SOURCE="${SPELLX}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/t/${SPELLX}/${SOURCE}
+ SOURCE_HASH=sha512:81d044deaa765693078d949672affa787a4e15882cc2928fd19c3abe69256ffbeec1308b303ee694a80787ad7574b57ab4b256f111d9874e72440809236f6b93
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE=http://github.com/textile/python-textile
+ LICENSE[0]=BSD
+ KEYWORDS="textile text"
+ ENTERED=20141222
+ SHORT="Textile processing for Python"
+cat << EOF
+python-textile is a Python port of Textile, Dean Allen's humane web text
+generator.
+EOF
diff --git a/python-pypi/python-textile/HISTORY b/python-pypi/python-textile/HISTORY
new file mode 100644
index 0000000000..37cef2bac6
--- /dev/null
+++ b/python-pypi/python-textile/HISTORY
@@ -0,0 +1,2 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 2.2.1
diff --git a/python-pypi/python-watchdog/DEPENDS b/python-pypi/python-watchdog/DEPENDS
new file mode 100755
index 0000000000..cb794d5685
--- /dev/null
+++ b/python-pypi/python-watchdog/DEPENDS
@@ -0,0 +1,5 @@
+depends PYTHON &&
+depends SETUPTOOLS &&
+depends pyyaml &&
+depends argh &&
+depends pathtools
diff --git a/python-pypi/python-watchdog/DETAILS b/python-pypi/python-watchdog/DETAILS
new file mode 100755
index 0000000000..66fd96deb1
--- /dev/null
+++ b/python-pypi/python-watchdog/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=python-watchdog
+ SPELLX=watchdog
+ VERSION=0.8.2
+ SOURCE=$SPELLX-$VERSION.tar.gz
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/w/$SPELLX/$SOURCE
+ SOURCE_HASH=sha512:96f1fcd0d6898ce950c8768000be2f619c9a28c9d96cb1d7323f04371b065e50b38692179949255bb13fa4e3c72e6f656dbc02b4d7f77b7fb3aacdf08600cb71
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ WEB_SITE=http://github.com/gorakhargosh/watchdog
+ LICENSE[0]=APACHE
+ ENTERED=20141222
+ KEYWORDS="python"
+ SHORT="filesystem events monitoring"
+cat << EOF
+Python API and shell utilities to monitor file system events.
+EOF
diff --git a/python-pypi/python-watchdog/HISTORY b/python-pypi/python-watchdog/HISTORY
new file mode 100644
index 0000000000..d8e261b4ce
--- /dev/null
+++ b/python-pypi/python-watchdog/HISTORY
@@ -0,0 +1,5 @@
+2014-12-24 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: renamed spell to avoid duplication
+
+2014-12-20 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 0.8.2
diff --git a/python-pypi/pyyaml/DEPENDS b/python-pypi/pyyaml/DEPENDS
index a86d429d69..3770db417b 100755
--- a/python-pypi/pyyaml/DEPENDS
+++ b/python-pypi/pyyaml/DEPENDS
@@ -1 +1,3 @@
-depends python
+depends PYTHON &&
+
+optional_depends libyaml "" "" "to build LibYAML bindings"
diff --git a/python-pypi/pyyaml/DETAILS b/python-pypi/pyyaml/DETAILS
index f5af68e59c..2429aeef71 100755
--- a/python-pypi/pyyaml/DETAILS
+++ b/python-pypi/pyyaml/DETAILS
@@ -1,8 +1,8 @@
SPELL=pyyaml
- VERSION=3.10
+ VERSION=3.11
SOURCE="PyYAML-${VERSION}.tar.gz"
SOURCE_URL[0]=http://pyyaml.org/download/${SPELL}/${SOURCE}
- SOURCE_HASH=sha512:57536fd9e5515916189c37487e0da583c8e9f79dd52dedb18342f65aefb6c063c4f141326ae7b49411d0cfdfd493bb0516f5c53737c76a69c7050a74a2834a33
+ SOURCE_HASH=sha512:76de005f59e1842108399af53178cfac2c08ee5cc996cc38ab6ec8b046c6b894422c461a1f1ed1df91abf96f154d41170227912cae7336cff88adfd3c0e8d783
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/PyYAML-${VERSION}"
WEB_SITE=http://pyyaml.org/
LICENSE[0]=MIT
diff --git a/python-pypi/pyyaml/HISTORY b/python-pypi/pyyaml/HISTORY
index 5e2d4408f8..62a213b361 100644
--- a/python-pypi/pyyaml/HISTORY
+++ b/python-pypi/pyyaml/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.11
+ * DEPENDS: python3 supported; added libyaml opt dep
+
2011-08-18 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 3.10; corrected descriptions
diff --git a/python-pypi/ranger/DEPENDS b/python-pypi/ranger/DEPENDS
new file mode 100755
index 0000000000..e4ea57a3b8
--- /dev/null
+++ b/python-pypi/ranger/DEPENDS
@@ -0,0 +1 @@
+depends PYTHON
diff --git a/python-pypi/ranger/DETAILS b/python-pypi/ranger/DETAILS
new file mode 100755
index 0000000000..acd7cd1ebe
--- /dev/null
+++ b/python-pypi/ranger/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=ranger
+ VERSION=1.6.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://${SPELL}.nongnu.org/${SOURCE}
+ SOURCE_HASH=sha512:7c9179c0ba000a01dc6fe97ed39332345269416d3156825e846019082bf94e9902cb1716576a94b87e106a2c2ccbcd3521050d3a7f13332e2880d5c8b99ee2b6
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://ranger.nongnu.org/"
+ LICENSE[0]="GPLv3"
+ ENTERED=20141229
+ KEYWORDS=""
+ SHORT="File manager with an ncurses frontend written in Python"
+cat << EOF
+Ranger is a free console file manager that gives you greater flexibility and
+a good overview of your files without having to leave your *nix console. It
+visualizes the directory tree in two dimensions: the directory hierarchy on
+one, lists of files on the other, with a preview to the right so you know
+where you'll be going.
+
+The default keys are similar to those of Vim, Emacs and Midnight Commander,
+though Ranger is easily controllable with just the arrow keys or the mouse.
+
+The program is written in Python and uses curses for the text-based user
+interface.
+EOF
diff --git a/python-pypi/ranger/HISTORY b/python-pypi/ranger/HISTORY
new file mode 100644
index 0000000000..5827446f01
--- /dev/null
+++ b/python-pypi/ranger/HISTORY
@@ -0,0 +1,2 @@
+2014-12-29 Ismael Luceno <ismael@sourcemage.org>
+ * DEPENDS, DETAILS: spell created
diff --git a/python-pypi/regex/DEPENDS b/python-pypi/regex/DEPENDS
new file mode 100755
index 0000000000..e440941643
--- /dev/null
+++ b/python-pypi/regex/DEPENDS
@@ -0,0 +1,2 @@
+depends PYTHON &&
+depends SETUPTOOLS
diff --git a/python-pypi/regex/DETAILS b/python-pypi/regex/DETAILS
new file mode 100755
index 0000000000..f6bfea71ea
--- /dev/null
+++ b/python-pypi/regex/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=regex
+ VERSION=2014.12.15
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/r/${SPELL}/${SOURCE}
+ SOURCE_HASH=sha512:fd138f5b8fd2020cbf9623578a7f2ea9b2748796280aef46222d0e0be0b31d1250c50f27af227381d8cfc7b3df0ff134bd103bc81503f9148e45cb0d5347a61c
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://code.google.com/p/mrab-regex-hg/
+ LICENSE[0]=GPL
+ ENTERED=20141221
+ SHORT="alternative regular expression module, to replace re"
+cat << EOF
+This new regex implementation is intended eventually to replace Python's current
+re module implementation.
+
+For testing and comparison with the current 're' module the new implementation
+is in the form of a module called 'regex'.
+EOF
diff --git a/python-pypi/regex/HISTORY b/python-pypi/regex/HISTORY
new file mode 100644
index 0000000000..8d64e442c6
--- /dev/null
+++ b/python-pypi/regex/HISTORY
@@ -0,0 +1,2 @@
+2014-12-21 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS, DEPENDS: created spell, version 2014.12.15
diff --git a/python-pypi/simplejson/DEPENDS b/python-pypi/simplejson/DEPENDS
index 503782e3b0..e440941643 100755
--- a/python-pypi/simplejson/DEPENDS
+++ b/python-pypi/simplejson/DEPENDS
@@ -1,2 +1,2 @@
-depends python &&
+depends PYTHON &&
depends SETUPTOOLS
diff --git a/python-pypi/simplejson/DETAILS b/python-pypi/simplejson/DETAILS
index c859da3ea1..d0be130af3 100755
--- a/python-pypi/simplejson/DETAILS
+++ b/python-pypi/simplejson/DETAILS
@@ -1,11 +1,12 @@
SPELL=simplejson
- VERSION=2.1.1
- SOURCE_HASH=sha512:4c5db7b6a29b1cf2d6f1c086f2c9b869e247aa9082b7b56ff2a1bbb97dd995b6a8042e7b4ad1ce68ebd356839bc70efe335355663793248c64aec96b88a45aaf
+ VERSION=3.6.5
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELL/$SOURCE
- WEB_SITE=http://undefined.org/python/#simplejson
+ SOURCE_HASH=sha512:caa31badef5fdf550cea0dd7d9cfd80b210bb3be6a933fbca7b4d76e726e1b615817c4d203f887100933bb41476728e84f043419d8a721e002f8f08f142f3428
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://github.com/simplejson/simplejson
LICENSE[0]=MIT
+ LICENSE[1]=AFL
ENTERED=20070614
KEYWORDS="json python"
SHORT="simple, fast, extensible JSON encoder/decoder for Python"
diff --git a/python-pypi/simplejson/HISTORY b/python-pypi/simplejson/HISTORY
index 87903ceb80..bed9c5e32c 100644
--- a/python-pypi/simplejson/HISTORY
+++ b/python-pypi/simplejson/HISTORY
@@ -1,3 +1,7 @@
+2014-11-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.6.5; updated website; added AFL license
+ * DEPENDS: python3 supported
+
2011-05-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/python-pypi/trac-graphvizplugin/DETAILS b/python-pypi/trac-graphvizplugin/DETAILS
index edd5487e88..72d8e604c1 100755
--- a/python-pypi/trac-graphvizplugin/DETAILS
+++ b/python-pypi/trac-graphvizplugin/DETAILS
@@ -1,16 +1,15 @@
- TRAC_PLUGIN=graphvizplugin
- SPELL=trac-$TRAC_PLUGIN
+ SPELL=trac-graphvizplugin
if [[ "$TRAC_GRAPHVIZPLUGIN_CVS_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=cvs
fi
SOURCE_IGNORE='volatile'
- SOURCE="$TRAC_PLUGIN-cvs.tar.bz2"
+ SOURCE="${SPELL#*-}-cvs.tar.bz2"
TRAC_VERSION=0.9
- SOURCE_URL[0]="svn://trac-hacks.org/svn/$TRAC_PLUGIN/$TRAC_VERSION/:$SPELL-$VERSION"
+ SOURCE_URL[0]="svn://trac-hacks.org/svn/${SPELL#*-}/$TRAC_VERSION/:$SPELL-$VERSION"
SOURCE_HINTS=old_svn_compat
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$TRAC_PLUGIN-$VERSION"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL#*-}-$VERSION"
WEB_SITE='http://trac-hacks.org/wiki/GraphvizPlugin'
LICENSE[0]='?'
UPDATED=20051215
diff --git a/python-pypi/trac-graphvizplugin/HISTORY b/python-pypi/trac-graphvizplugin/HISTORY
index b1ba4eeb3a..9553aca669 100644
--- a/python-pypi/trac-graphvizplugin/HISTORY
+++ b/python-pypi/trac-graphvizplugin/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, HISTORY: Normalize SPELL field
+
2011-05-23 Sukneet Basuta <sukneet@sourcemage.org>
* DEPENDS: updated setuptools dependency to SETUPTOOLS provider
diff --git a/python-pypi/unidecode/DETAILS b/python-pypi/unidecode/DETAILS
index a4bf1d34e2..6f2dac7381 100755
--- a/python-pypi/unidecode/DETAILS
+++ b/python-pypi/unidecode/DETAILS
@@ -1,9 +1,10 @@
SPELL=unidecode
- VERSION=0.04.13
+ SPELLX=Unidecode
+ VERSION=0.04.17
SOURCE="Unidecode-${VERSION}.tar.gz"
- SOURCE_URL[0]=https://pypi.python.org/packages/source/U/Unidecode/${SOURCE}
- SOURCE_HASH=sha512:3df6059f8c32c987ced684b8a09dcb44d6d3b6b22a5876e14c8bde1ca61dc0d04ce6c2f8ed8cf03853c928584838dd779c903885fc6a657ce54dc29ace70665e
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Unidecode-${VERSION}"
+ SOURCE_URL[0]=https://pypi.python.org/packages/source/U/${SPELLX}/${SOURCE}
+ SOURCE_HASH=sha512:297f411ab09f42cfb455279bb0accafe278d480acf6087b6596dbf4b4d4de89d45d389c5418a2dc4fe8c8f61026c92b3036e08f625e7f434abce9db335682be2
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
WEB_SITE="https://pypi.python.org/pypi/Unidecode"
LICENSE[0]=GPL
ENTERED=20130702
diff --git a/python-pypi/unidecode/HISTORY b/python-pypi/unidecode/HISTORY
index 2d62c491cb..1fdfa937e2 100644
--- a/python-pypi/unidecode/HISTORY
+++ b/python-pypi/unidecode/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 0.04.17; use SPELLX
+
2013-07-02 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created
diff --git a/security/gtk-systrace/DETAILS b/security/gtk-systrace/DETAILS
index f0b70685b4..fe4222c586 100755
--- a/security/gtk-systrace/DETAILS
+++ b/security/gtk-systrace/DETAILS
@@ -1,10 +1,8 @@
- PKG_NAME=systrace
- SPELL=gtk-${PKG_NAME}
+ SPELL=gtk-systrace
VERSION=2003-06-23
- PKG_VER=0.1
- SOURCE=${SPELL}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/notification-${PKG_VER}
- SOURCE_URL[0]=http://www.citi.umich.edu/u/provos/${PKG_NAME}/${SOURCE}
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/notification-0.1
+ SOURCE_URL[0]=http://www.citi.umich.edu/u/provos/${SPELL#*-}/$SOURCE
SOURCE_HASH=sha512:08f6ab0dd23ab71a4bb2980e97f8b078faf972e58c8b14926c54d2fa07b9ab57cfd490b72d0b3fab5b1034776761966d7387e83391631b189fa06aa4037090cc
LICENSE[0]=BSD
ENTERED=20030728
@@ -13,10 +11,9 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/notification-${PKG_VER}
BUILD_API=1
SHORT="Current snapshot of GTK Systrace front end invoked by systrace."
cat << EOF
-Systrace enforces system call policies for applications by
-constraining the application's access to the system. The
-policy is generated interactively. Operations not covered
-by the policy raise an alarm, allowing an user to refine
-the currently configured policy.
-(See home page for more info about systrace userland utilities)
+Systrace enforces system call policies for applications by constraining the
+application's access to the system. The policy is generated interactively.
+Operations not covered by the policy raise an alarm, allowing an user to refine
+the currently configured policy. (See home page for more info about systrace
+userland utilities)
EOF
diff --git a/security/gtk-systrace/HISTORY b/security/gtk-systrace/HISTORY
index bdc3436c83..78f6be31ad 100644
--- a/security/gtk-systrace/HISTORY
+++ b/security/gtk-systrace/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, HISTORY: Normalize SPELL field
+
2006-10-26 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* BUILD: use TRACK_ROOT when linking #9163
diff --git a/security/nmap/BUILD b/security/nmap/BUILD
index 6f4c9ff7b5..feecaf61cc 100755
--- a/security/nmap/BUILD
+++ b/security/nmap/BUILD
@@ -1,4 +1,4 @@
LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
-OPTS="$NMAP_OPTS $OPTS" &&
+OPTS="$NMAP_OPTS --with-libdnet=included $OPTS" &&
default_build
diff --git a/security/nmap/CONFIGURE b/security/nmap/CONFIGURE
index 681f66fafd..6e6e626540 100755
--- a/security/nmap/CONFIGURE
+++ b/security/nmap/CONFIGURE
@@ -8,4 +8,8 @@ config_query_option NMAP_OPTS "Build Nping utility?" y \
config_query_option NMAP_OPTS "Build Ncat utility?" y \
"--with-ncat" \
- "--without-ncat"
+ "--without-ncat" &&
+
+if list_find "$NMAP_OPTS" '--with-ncat'; then
+ config_query NMAP_NC_SYMLINK "Symlink nc to ncat?" n
+fi
diff --git a/security/nmap/CONFLICTS b/security/nmap/CONFLICTS
new file mode 100755
index 0000000000..3b918f51f2
--- /dev/null
+++ b/security/nmap/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts nc &&
+conflicts netcat &&
+conflicts cryptcat
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index 22833ec10d..f21f4ab6bb 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -29,11 +29,6 @@ optional_depends pcre \
"--with-libpcre=included" \
"use external PCRE lib?" &&
-optional_depends libdnet \
- "--with-libdnet=$INSTALL_ROOT/usr" \
- "--with-libdnet=included" \
- "use external dnet lib?" &&
-
optional_depends LUA \
"--with-liblua=$INSTALL_ROOT/usr" \
"--with-liblua=included" \
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 90d103a0a9..40a4524e6b 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,11 @@
+2014-12-29 Eric Sandall <sandalle@sourcemage.org>
+ * BUILD, DEPENDS: Remove libdnet, the latest (from 2005) version is not
+ compatible with this version of nmap.
+ nmap.cc:166:45: fatal error: libdnet-stripped/include/config.h: No such file or directory
+ * CONFIGURE: Add option for nc -> ncat symlink
+ * INSTALL, CONFLICTS: Conflict with nc/netcat (even if `nc` symlink option is not selected)
+ * *SUB_DEPENDS: Allow forcing ncat utility and nc symlink
+
2014-10-24 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: use SSL provider
diff --git a/security/nmap/INSTALL b/security/nmap/INSTALL
new file mode 100755
index 0000000000..5183e4081d
--- /dev/null
+++ b/security/nmap/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+if [[ "x$NMAP_NC_SYMLINK" == "xy" ]]; then
+ message "${MESSAGE_COLOR}Setting /usr/bin/nc -> /usr/bin/ncat${DEFAULT_COLOR}" &&
+ ln -sf "${INSTALL_ROOT}"/usr/bin/ncat "${INSTALL_ROOT}"/usr/bin/nc
+fi
diff --git a/security/nmap/PRE_SUB_DEPENDS b/security/nmap/PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..ec57b5eb02
--- /dev/null
+++ b/security/nmap/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ NMAP_NCAT) list_find "NMAP_OPTS" '--with-ncat' && return 0 ;;
+ NMAP_NC_SYMLINK) [[ "x$NMAP_NC_SYMLINK" == "xy" ]] && return 0 ;;
+ *) echo "Unknown sub-depends!"; return 1;;
+esac
diff --git a/security/nmap/REPAIR^none^PRE_SUB_DEPENDS b/security/nmap/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000000..ec57b5eb02
--- /dev/null
+++ b/security/nmap/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ NMAP_NCAT) list_find "NMAP_OPTS" '--with-ncat' && return 0 ;;
+ NMAP_NC_SYMLINK) [[ "x$NMAP_NC_SYMLINK" == "xy" ]] && return 0 ;;
+ *) echo "Unknown sub-depends!"; return 1;;
+esac
diff --git a/security/nmap/SUB_DEPENDS b/security/nmap/SUB_DEPENDS
new file mode 100755
index 0000000000..d2918dc1e1
--- /dev/null
+++ b/security/nmap/SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+ NMAP_NCAT) message "${MESSAGE_COLOR}ncat utility requested, forcing it.${DEFAULT_COLOR}" &&
+ list_remove "NMAP_OPTS" '--without-ncat' &&
+ list_add "NMAP_OPTS" '--with-ncat'
+ ;;
+ NMAP_NC_SYMLINK) message "${MESSAGE_COLOR}nc -> ncat symlink requested, forcing it.${DEFAULT_COLOR}" &&
+ persistent_add NMAP_NC_SYMLINK &&
+ NMAP_NC_SYMLINK="y"
+ ;;
+ *) message "${WARNING_COLOR}Unknown sub-depends!${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/shell-term-fm/ded/BUILD b/shell-term-fm/ded/BUILD
new file mode 100755
index 0000000000..d22e99fd61
--- /dev/null
+++ b/shell-term-fm/ded/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/shell-term-fm/ded/DEPENDS b/shell-term-fm/ded/DEPENDS
new file mode 100755
index 0000000000..e87653588e
--- /dev/null
+++ b/shell-term-fm/ded/DEPENDS
@@ -0,0 +1 @@
+depends td_lib
diff --git a/shell-term-fm/ded/DETAILS b/shell-term-fm/ded/DETAILS
new file mode 100755
index 0000000000..a9004b4b09
--- /dev/null
+++ b/shell-term-fm/ded/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=ded
+ VERSION=20140722
+ SOURCE="$SPELL-$VERSION.tgz"
+ SOURCE_URL[0]=ftp://invisible-island.net/$SPELL/$SOURCE
+ SOURCE_HASH=sha512:53d77d2c66bebb0d347e0b3c09b83e936c8393ae5b33581703f5da8668d6340a597e52958304f364110e87e37ec3d8b67e7afeb7da6c4fcba519967e6da533ee
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE="http://invisible-island.net/ded/"
+ LICENSE[0]="BSD"
+ ENTERED=20141224
+ KEYWORDS=""
+ SHORT="directory editor"
+cat << EOF
+A directory editor for UNIX systems, DED has special functions to manage RCS
+and SCCS files.
+EOF
diff --git a/shell-term-fm/ded/HISTORY b/shell-term-fm/ded/HISTORY
new file mode 100644
index 0000000000..97f3411f97
--- /dev/null
+++ b/shell-term-fm/ded/HISTORY
@@ -0,0 +1,2 @@
+2014-12-24 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: spell created
diff --git a/utils/dos2unix/DETAILS b/utils/dos2unix/DETAILS
index b45614d989..626305048b 100755
--- a/utils/dos2unix/DETAILS
+++ b/utils/dos2unix/DETAILS
@@ -1,14 +1,16 @@
- SPELL=dos2unix
- VERSION=3.1
- VERSION2=2.2
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=unix2dos-$VERSION2.src.tar.gz
+ SPELL=dos2unix
+ SPELL2=unix2dos
+ VERSION=7.1
+ VERSION2=4.1.2
+ SOURCE_HASH=sha512:fe4feaff6c2cc851d596c9a440d0863c89353b434e85a7ffaa2538da56f44488476c2674f372ba256d215421af2290c98ab78da019b4f6a0150d1d15d041a54e
+ SOURCE2_HASH=sha512:a3ccef727aa75c8030719490fa52c06def4dcc1ce7584d2d44e8a6923d101866764555a9b746c82925d1c51fc52a844cf3b8bec68155da2dad64ad1818f68277
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SPELL2-$VERSION2.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_HASH=sha512:537880cb22d20cdd67e66d9cfb834b8f880e452097a3ed02cc6574643ecb2c388f8c912c52e0cb0390e8e33594ffd8868feea5001b8d81eccc055336883f286c
- SOURCE2_HASH=sha512:ffc1f677c21a2feee361b7c87fa3124dd292b1f0fad88f1185dfef9b284d1014c2bf654f9733fd754cf228175c4f6c0c21b9e9af4fadd48243e58c9b76ab56fb
- SOURCE_URL[0]=http://download.sourcemage.org/mirror/$SOURCE
- SOURCE2_URL[0]=http://download.sourcemage.org/mirror/$SOURCE2
- WEB_SITE=http://www.sourcemage.org/
+ URL=http://sourceforge.net/projects/dos2unix/files
+SOURCE_URL[0]=$URL/$SPELL/$VERSION/$SOURCE
+ SOURCE2_URL[0]=$URL/$SPELL2/$VERSION2/$SOURCE2
+ WEB_SITE=http://sourceforge.net/projects/dos2unix
ENTERED=20050609
ARCHIVE="off"
KEYWORDS="utils"
diff --git a/utils/dos2unix/HISTORY b/utils/dos2unix/HISTORY
index e22b797b94..4545c565ad 100644
--- a/utils/dos2unix/HISTORY
+++ b/utils/dos2unix/HISTORY
@@ -1,3 +1,9 @@
+2014-12-22 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS version .1/4.1.2
+ new website & url = sourceforge
+ * Makefile.patch: deleted
+ * PRE_BUILD: adjust
+
2006-10-03 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/utils/dos2unix/Makefile.patch b/utils/dos2unix/Makefile.patch
deleted file mode 100644
index 02e9ad69e6..0000000000
--- a/utils/dos2unix/Makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile.old 1998-11-19 04:09:38.000000000 -0800
-+++ Makefile 2005-06-09 15:53:11.000000000 -0700
-@@ -1,22 +1,24 @@
--default: dos2unix
-+all: unix2dos dos2unix link
-
--all: dos2unix link install
-
-+dos2unix: dos2unix.c
-+ $(CC) $(LDFLAGS) -o $@ $^
-
--dos2unix:
-- gcc -O dos2unix.c -o dos2unix
--
-+unix2dos: unix2dos.c
-+ $(CC) $(LDFLAGS) -o $@ $^
-
- link:
- ln -s dos2unix mac2unix
- ln -s dos2unix.1 mac2unix.1
-
- clean:
-- rm dos2unix
-+ $(RM) dos2unix unix2dos mac2unix mac2unix.1
-
- install:
-- install -m 755 dos2unix /usr/local/bin
-- install -m 644 dos2unix.1 /usr/local/man/man1
-- install -m 755 mac2unix /usr/local/bin
-- install -m 644 mac2unix.1 /usr/local/man/man1
-+ install -m 755 dos2unix /usr/bin
-+ install -m 644 dos2unix.1 /usr/share/man/man1
-+ install -m 755 unix2dos /usr/bin
-+ install -m 644 unix2dos.1 /usr/share/man/man1
-+ install -m 755 mac2unix /usr/bin
-+ install -m 644 mac2unix.1 /usr/share/man/man1
-
diff --git a/utils/dos2unix/PRE_BUILD b/utils/dos2unix/PRE_BUILD
index c525b109e3..3a5c8da674 100755
--- a/utils/dos2unix/PRE_BUILD
+++ b/utils/dos2unix/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-unpack_file 2 &&
-patch -p0 <$SCRIPT_DIRECTORY/Makefile.patch
+unpack_file 2
diff --git a/utils/puppet/DETAILS b/utils/puppet/DETAILS
index a74f600bab..17e0596164 100755
--- a/utils/puppet/DETAILS
+++ b/utils/puppet/DETAILS
@@ -1,10 +1,10 @@
SPELL=puppet
VERSION=3.7.3
- SOURCE="${VERSION}.tar.gz"
- SOURCE_URL[0]=https://github.com/puppetlabs/${SPELL}/archive/${SOURCE}
+ SOURCE="$SPELL-$VERSION.tar.gz"
+ SOURCE_URL[0]=https://github.com/puppetlabs/$SPELL/archive/$VERSION.tar.gz
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
# SOURCE_HASH=sha512:a563421f57e30eb09dc0596f4769ccaa45e9f9c6f29aa4072f370cc95cb50aab00b9ec3450289ea20b7383bb184c491a2ddbe003845beb7d01d328083f3dbad7
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/puppet-${VERSION}"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://puppetlabs.com/"
LICENSE[0]=GPL
ENTERED=20100617
diff --git a/utils/puppet/HISTORY b/utils/puppet/HISTORY
index 54d12906db..51e39b0b5d 100644
--- a/utils/puppet/HISTORY
+++ b/utils/puppet/HISTORY
@@ -1,3 +1,6 @@
+2014-12-26 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: Fix SOURCE to make it a proper tarball name
+
2014-12-04 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 3.7.3
SOURCE_URL updated
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 4b746714c9..6c75315139 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -6,6 +6,7 @@ cd "${SOURCE_DIRECTORY}" &&
--sysconfdir="$INSTALL_ROOT/etc" \
--target-list="$QEMU_ARCHS" \
--audio-drv-list="$QEMU_AUDIO" \
+ --python=python2 \
$QEMU_KVM \
$QEMU_VNC \
$QEMU_TPM \
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 13283cb611..5a2eb19982 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -1,3 +1,5 @@
+depends python &&
+
if list_find "alsa" $QEMU_AUDIO; then
depends alsa-lib
fi &&
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 04537232c8..4d1c140d57 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,5 +1,5 @@
SPELL=qemu
- VERSION=2.1.2
+ VERSION=2.2.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index f95b399b7c..7c3ea37dc7 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,9 @@
+2014-12-25 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS: updated spell to 2.2.0
+
+2014-12-24 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DEPENDS: Depends on python 2.x
+
2014-12-04 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 2.1.2
* qemu.gpg: Add F108B584 (see
diff --git a/video-libs/gst-libav-1.0/DETAILS b/video-libs/gst-libav-1.0/DETAILS
index 5b4089c1bd..a2531d5e7c 100755
--- a/video-libs/gst-libav-1.0/DETAILS
+++ b/video-libs/gst-libav-1.0/DETAILS
@@ -1,6 +1,6 @@
SPELL=gst-libav-1.0
- VERSION=1.4.3
- SOURCE_HASH=sha512:687a2a00a076a246104fd6ca90d0f16ced5d86eea3d2b6603f3525db1735ffcc94887895a5b4a93bd0bbdbb9743e185f0b447353f6dd6819cfa299c0b38b44f4
+ VERSION=1.4.5
+ SOURCE_HASH=sha512:a2f9250a51440358d205ef160119498d52cf4944fe810e736e4561f2cdbb8dabad6220d6e4da507f013c42bea69ce72acc373982642278de0a03605bbcd4f75f
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-libav-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-libav-$VERSION
diff --git a/video-libs/gst-libav-1.0/HISTORY b/video-libs/gst-libav-1.0/HISTORY
index 5b0dacff26..f31659a58b 100644
--- a/video-libs/gst-libav-1.0/HISTORY
+++ b/video-libs/gst-libav-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.5
+
2014-10-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.3
* DEPENDS: add LIBAVCODEC
diff --git a/video-libs/gst-plugins-bad-1.0/DETAILS b/video-libs/gst-plugins-bad-1.0/DETAILS
index 7b0cd8f6cd..eb44c5ea9b 100755
--- a/video-libs/gst-plugins-bad-1.0/DETAILS
+++ b/video-libs/gst-plugins-bad-1.0/DETAILS
@@ -1,6 +1,6 @@
SPELL=gst-plugins-bad-1.0
- VERSION=1.4.3
- SOURCE_HASH=sha512:5a5de7df2af09580bf502325c397f82a36e72b7ab1de04aa2254490299e90cdd4262d9de60de2a9be8eb044c406b469be7bedd236cc362e5b5ee46f517629ade
+ VERSION=1.4.5
+ SOURCE_HASH=sha512:65d6be58957b1329420611b8e6f1eb9869420745d9165047631cdf9e45083605f37dcfaf68a288fe4252f1b3543f7f70ded9c12eab2e0ac4ac9f4c4ce9eaac7a
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-plugins-bad-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-bad-$VERSION
diff --git a/video-libs/gst-plugins-bad-1.0/HISTORY b/video-libs/gst-plugins-bad-1.0/HISTORY
index fb603aa5d5..cbc24cfd77 100644
--- a/video-libs/gst-plugins-bad-1.0/HISTORY
+++ b/video-libs/gst-plugins-bad-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.5
+
2014-10-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.3
diff --git a/video-libs/gst-plugins-base-1.0/DETAILS b/video-libs/gst-plugins-base-1.0/DETAILS
index 71cc4aa4d8..cc7dcf2a2b 100755
--- a/video-libs/gst-plugins-base-1.0/DETAILS
+++ b/video-libs/gst-plugins-base-1.0/DETAILS
@@ -1,6 +1,6 @@
SPELL=gst-plugins-base-1.0
- VERSION=1.4.3
- SOURCE_HASH=sha512:9ec8b48a8e6a31923d7f3786ef79145bc1465a28bc5ee4853f40f2dd79f71b7a244039c706fe3c8879084dc4a32a8112d4163e537aab9bad48471af83758c300
+ VERSION=1.4.5
+ SOURCE_HASH=sha512:63d3c531de736ad8a64d6962c0af75857d3b016d7f8e85d1884e8de50e64576902bb1161161b74130ab5dfb1d453eb995e374d8a958eac6e44ae5272eeaaf8b6
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-plugins-base-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-base-$VERSION
diff --git a/video-libs/gst-plugins-base-1.0/HISTORY b/video-libs/gst-plugins-base-1.0/HISTORY
index 08dc074166..8f2095a1be 100644
--- a/video-libs/gst-plugins-base-1.0/HISTORY
+++ b/video-libs/gst-plugins-base-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.5
+
2014-10-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.3
diff --git a/video-libs/gst-plugins-good-1.0/DETAILS b/video-libs/gst-plugins-good-1.0/DETAILS
index 6524a0859f..91285e09d3 100755
--- a/video-libs/gst-plugins-good-1.0/DETAILS
+++ b/video-libs/gst-plugins-good-1.0/DETAILS
@@ -1,6 +1,6 @@
SPELL=gst-plugins-good-1.0
- VERSION=1.4.3
- SOURCE_HASH=sha512:6689613e1282809b7821c20063ff9daf5eb5d52f668a771701e052227b03a05196bb4dcae097e52244daeb6444c675971ca72b862c2fced224b8cdaa5a8d2d0c
+ VERSION=1.4.5
+ SOURCE_HASH=sha512:0cf880af21956138e127508f6020fdc10f6ed01b765b0d3364d038c8e104947486c83c157c7b957193b82d59f724e342a6d12900b6a97abe6e2f3dac65d71be0
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE=gst-plugins-good-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gst-plugins-good-$VERSION"
diff --git a/video-libs/gst-plugins-good-1.0/HISTORY b/video-libs/gst-plugins-good-1.0/HISTORY
index 4b60a02da1..3a7af5bd2c 100644
--- a/video-libs/gst-plugins-good-1.0/HISTORY
+++ b/video-libs/gst-plugins-good-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.5
+
2014-10-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.3
diff --git a/video-libs/gst-plugins-ugly-1.0/DETAILS b/video-libs/gst-plugins-ugly-1.0/DETAILS
index b0373ae379..1d2e306fb0 100755
--- a/video-libs/gst-plugins-ugly-1.0/DETAILS
+++ b/video-libs/gst-plugins-ugly-1.0/DETAILS
@@ -1,9 +1,10 @@
SPELL=gst-plugins-ugly-1.0
- VERSION=1.2.2
+ VERSION=1.4.5
+ SOURCE_HASH=sha512:9353a5b9492758d8255fcab23c0eb170ec31e884774c22915b57cc4a2ed56bad61643d7bd44fcdb919e7ad9b2023d1d0fab23f9c9fda1cb2b9883c92ec6b6fc0
SOURCE=gst-plugins-ugly-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/gst-plugins-ugly-$VERSION
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
+# SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
LICENSE[0]=LGPL
WEB_SITE=http://gstreamer.freedesktop.org
ENTERED=20121005
diff --git a/video-libs/gst-plugins-ugly-1.0/HISTORY b/video-libs/gst-plugins-ugly-1.0/HISTORY
index fa87482091..5c30f4acb8 100644
--- a/video-libs/gst-plugins-ugly-1.0/HISTORY
+++ b/video-libs/gst-plugins-ugly-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.5
+
2013-12-28 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.2.2
diff --git a/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.2.2.tar.xz.sig b/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.2.2.tar.xz.sig
deleted file mode 100644
index fbb6ea54eb..0000000000
--- a/video-libs/gst-plugins-ugly-1.0/gst-plugins-ugly-1.2.2.tar.xz.sig
+++ /dev/null
Binary files differ
diff --git a/video-libs/gstreamer-1.0/DETAILS b/video-libs/gstreamer-1.0/DETAILS
index a7baf8eb76..3193cb0ff8 100755
--- a/video-libs/gstreamer-1.0/DETAILS
+++ b/video-libs/gstreamer-1.0/DETAILS
@@ -1,6 +1,6 @@
SPELL=gstreamer-1.0
- VERSION=1.4.3
- SOURCE_HASH=sha512:804a497ffbf4a69739dc302eebabdc3044dfc9aff277e5d5c776ca8d181fd37655ac0f9444899986dca98762dfe7619279e7c9b8a8abe6914d071268f4c9b345
+ VERSION=1.4.5
+ SOURCE_HASH=sha512:ed7b371f99b7da4ec462e34cd8e02062a0faaad7498a87cfc1ef39f8740db9bca0cc5bfe17ae5ff24abe0bd4a6771e732da193c01ca0e2d835b6c5d9f0d41403
SOURCE=gstreamer-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/gstreamer-$VERSION"
SOURCE_URL[0]=http://gstreamer.freedesktop.org/src/gstreamer/$SOURCE
diff --git a/video-libs/gstreamer-1.0/HISTORY b/video-libs/gstreamer-1.0/HISTORY
index a7fcd11af6..8bbc8b192d 100644
--- a/video-libs/gstreamer-1.0/HISTORY
+++ b/video-libs/gstreamer-1.0/HISTORY
@@ -1,3 +1,6 @@
+2014-12-30 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 1.4.5
+
2014-10-01 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 1.4.3
diff --git a/video/kodi/CONFLICTS b/video/kodi/CONFLICTS
new file mode 100755
index 0000000000..f370022656
--- /dev/null
+++ b/video/kodi/CONFLICTS
@@ -0,0 +1 @@
+conflicts xbmc y
diff --git a/video/kodi/DEPENDS b/video/kodi/DEPENDS
new file mode 100755
index 0000000000..40885afc8d
--- /dev/null
+++ b/video/kodi/DEPENDS
@@ -0,0 +1,137 @@
+depends -sub CXX gcc &&
+depends automake &&
+depends autoconf &&
+depends unzip &&
+depends boost &&
+depends cmake &&
+depends swig &&
+depends yajl &&
+depends tinyxml &&
+depends taglib &&
+depends JAVA &&
+optional_depends glew \
+ "--enable-gl" \
+ "--disable-gl" \
+ "for OpenGL rendering" &&
+optional_depends libvdpau \
+ "--enable-vdpau" \
+ "--disable-vdpau" \
+ "for VDPAU decoding" &&
+depends libmad &&
+depends JPEG &&
+depends libsamplerate &&
+depends libogg &&
+depends libvorbis &&
+depends freetype2 &&
+depends fontconfig &&
+depends bzip2 &&
+depends sqlite &&
+optional_depends alsa-lib \
+ "--enable-alsa" \
+ "--disable-alsa" \
+ "for ALSA support" &&
+depends libpng &&
+depends pcre &&
+depends lzo &&
+depends libcdio &&
+depends sdl &&
+depends sdl_image &&
+depends sdl_mixer &&
+depends enca &&
+depends jasper &&
+depends libxt &&
+depends libxtst &&
+depends libxmu &&
+depends libxinerama &&
+depends curl &&
+depends dbus &&
+depends fribidi &&
+optional_depends MYSQL \
+ "--enable-mysql" \
+ "--disable-mysql" \
+ "for mysql support" &&
+optional_depends hal \
+ "--enable-hal" \
+ "--disable-hal" \
+ "for HAL support" &&
+optional_depends pulseaudio \
+ "--enable-pulse" \
+ "--disable-pulse" \
+ "for PulseAudio support" &&
+optional_depends avahi \
+ "--enable-avahi" \
+ "--disable-avahi" \
+ "for Avahi support" &&
+optional_depends libxrandr \
+ "--enable-xrandr" \
+ "--disable-xrandr" \
+ "for XRandR support" &&
+optional_depends ffmpeg \
+ "--enable-external-ffmpeg" \
+ "--disable-external-ffmpeg" \
+ "use system ffmpeg" &&
+optional_depends goom \
+ "--enable-goom" \
+ "--disable-goom" \
+ "for GOOM visualization" &&
+optional_depends rtmpdump \
+ "--enable-rtmp" \
+ "--disable-rtmp" \
+ "RTMP support via librtmp" &&
+optional_depends faac \
+ "--enable-faac" \
+ "--disable-faac" \
+ "for faac support" &&
+optional_depends libdvdcss \
+ "--enable-dvdcss" \
+ "--disable-dvdcss" \
+ "for DVDCSS support" &&
+optional_depends libbluray \
+ "--enable-libbluray" \
+ "" \
+ "for libbluray support" &&
+optional_depends a52dec \
+ "--enable-external-liba52" \
+ "--disable-external-liba52" \
+ "use system liba52" &&
+optional_depends libdca \
+ "--enable-external-libdts" \
+ "--disable-external-libdts" \
+ "use system libdts" &&
+depends faad2 &&
+depends libmpeg2 &&
+depends libass &&
+depends flac &&
+depends wavpack &&
+depends AWK &&
+depends gperf &&
+depends nasm &&
+optional_depends cwiid \
+ "" \
+ "" \
+ "for wiimote support" &&
+optional_depends BLUEZ \
+ "" \
+ "" \
+ "for bluetooth support" &&
+depends zlib &&
+depends libmms &&
+optional_depends samba \
+ "--enable-samba" \
+ "--disable-samba" \
+ "for samba support" &&
+depends tiff &&
+depends SSL &&
+optional_depends libmicrohttpd \
+ "--enable-webserver" \
+ "--disable-webserver" \
+ "for webserver support" &&
+depends libmodplug &&
+depends libssh &&
+depends gettext &&
+depends cvs &&
+depends libtool &&
+optional_depends libusb \
+ "--enable-libusb" \
+ "--disable-libusb" \
+ "for libusb support"
diff --git a/video/kodi/DETAILS b/video/kodi/DETAILS
new file mode 100755
index 0000000000..ae8ee9b36b
--- /dev/null
+++ b/video/kodi/DETAILS
@@ -0,0 +1,36 @@
+ SPELL=kodi
+ VERSION=14.0
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://mirrors.${SPELL}.tv/releases/source/${VERSION}-Helix.tar.gz
+ SOURCE_HASH=sha512:74faa65615f84329827c2fdbc9218636d0245ef451bd9995a9ddb3242794b49b0fd61d028d2f5adf0d6f816ef7225295eb8d7203e61ee5c59cfeccfa87360e07
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xbmc-${VERSION}-Helix"
+ WEB_SITE="http://kodi.tv"
+ LICENSE[0]=GPL
+ ENTERED=20141223
+ SHORT="a software media player and entertainment hub (former XBMC)"
+cat << EOF
+KODI is an award-winning free and open source (GPL) software media player
+and entertainment hub for digital media. KODI is available for Linux, OSX,
+Windows, and the original Xbox. Created in 2003 by a group of like minded
+programmers, KODI is a non-profit project run and developed by volunteers
+located around the world. More than 50 software developers have contributed
+to KODI, and 100-plus translators have worked to expand its reach, making
+it available in more than 30 languages.
+
+While KODI functions very well as a standard media player application for
+your computer, it has been designed to be the perfect companion for your HTPC.
+Supporting an almost endless range of remote controls, and combined with its
+beautiful interface and powerful skinning engine, KODI feels very natural
+to use from the couch and is the ideal solution for your home theater.
+
+Currently KODI can be used to play almost all popular audio and video formats
+around. It was designed for network playback, so you can stream your multimedia
+from anywhere in the house or directly from the internet using practically any
+protocol available. Use your media as-is: KODI can play CDs and DVDs directly
+from the disk or image file, almost all popular archive formats from your
+hard drive, and even files inside ZIP and RAR archives. It will even scan
+all of your media and automatically create a personalized library complete
+with box covers, descriptions, and fanart. There are playlist and slideshow
+functions, a weather forecast feature and many audio visualizations. Once
+installed, your computer will become a fully functional multimedia jukebox.
+EOF
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
new file mode 100644
index 0000000000..028a1d0196
--- /dev/null
+++ b/video/kodi/HISTORY
@@ -0,0 +1,2 @@
+2014-12-23 Pol Vinogradov <vin.public@gmail.com>
+ * CONFLICTS, DEPENDS, DETAILS, PRE_BUILD: spell created
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
new file mode 100755
index 0000000000..2be2900672
--- /dev/null
+++ b/video/kodi/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+./bootstrap
diff --git a/video/xbmc/CONFLICTS b/video/xbmc/CONFLICTS
new file mode 100755
index 0000000000..3ab7a0732d
--- /dev/null
+++ b/video/xbmc/CONFLICTS
@@ -0,0 +1 @@
+conflicts kodi y
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
index a64d4e8aca..41a6abf9be 100644
--- a/video/xbmc/HISTORY
+++ b/video/xbmc/HISTORY
@@ -1,3 +1,6 @@
+2014-12-23 Pol Vinogradov <vin.public@gmail.com>
+ * CONFLICTS: added for kodi
+
2014-09-14 Pol Vinogradov <vin.public@gmail.com>
* DETAILS: updated to 13.2