Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

10 files changed, 201 insertions, 135 deletions

diff --git a/extra/lxml/.footprint.i686 b/extra/lxml/.footprint.i686
index d9f699fad..a1f9f1b66 100644
--- a/extra/lxml/.footprint.i686
+++ b/extra/lxml/.footprint.i686
@@ -1,53 +1,71 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python3.1/
-drwxr-xr-x	root/root	usr/lib/python3.1/site-packages/
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml-2.2.4-py3.1.egg-info
-drwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/ElementInclude.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/ElementInclude.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/__init__.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/__init__.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/_elementpath.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/_elementpath.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/builder.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/builder.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/cssselect.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/cssselect.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/doctestcompare.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/doctestcompare.pyc
--rwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/etree.so
-drwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/html/
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/ElementSoup.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/ElementSoup.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/__init__.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/__init__.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_dictmixin.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_dictmixin.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_diffcommand.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_html5builder.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_setmixin.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_setmixin.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/builder.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/builder.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/clean.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/clean.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/defs.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/defs.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/diff.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/diff.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/formfill.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/formfill.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/html5parser.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/html5parser.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/soupparser.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/soupparser.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/usedoctest.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/usedoctest.pyc
--rwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/objectify.so
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/pyclasslookup.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/pyclasslookup.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/sax.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/sax.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/usedoctest.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/usedoctest.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml-2.3-py2.7.egg-info
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/ElementInclude.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/ElementInclude.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/_elementpath.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/_elementpath.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/builder.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/builder.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/cssselect.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/cssselect.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/doctestcompare.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/doctestcompare.pyc
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/etree.so
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/html/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/ElementSoup.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/ElementSoup.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_dictmixin.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_dictmixin.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_diffcommand.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_diffcommand.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_html5builder.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_html5builder.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_setmixin.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_setmixin.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/builder.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/builder.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/clean.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/clean.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/defs.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/defs.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/diff.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/diff.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/formfill.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/formfill.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/html5parser.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/html5parser.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/soupparser.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/soupparser.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/usedoctest.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/usedoctest.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/__init__.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/rng/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/objectify.so
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/pyclasslookup.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/pyclasslookup.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/sax.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/sax.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/usedoctest.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/usedoctest.pyc
diff --git a/extra/lxml/.footprint.x86_64 b/extra/lxml/.footprint.x86_64
index d9f699fad..a1f9f1b66 100644
--- a/extra/lxml/.footprint.x86_64
+++ b/extra/lxml/.footprint.x86_64
@@ -1,53 +1,71 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python3.1/
-drwxr-xr-x	root/root	usr/lib/python3.1/site-packages/
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml-2.2.4-py3.1.egg-info
-drwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/ElementInclude.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/ElementInclude.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/__init__.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/__init__.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/_elementpath.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/_elementpath.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/builder.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/builder.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/cssselect.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/cssselect.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/doctestcompare.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/doctestcompare.pyc
--rwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/etree.so
-drwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/html/
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/ElementSoup.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/ElementSoup.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/__init__.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/__init__.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_dictmixin.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_dictmixin.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_diffcommand.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_html5builder.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_setmixin.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/_setmixin.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/builder.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/builder.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/clean.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/clean.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/defs.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/defs.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/diff.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/diff.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/formfill.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/formfill.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/html5parser.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/html5parser.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/soupparser.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/soupparser.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/usedoctest.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/html/usedoctest.pyc
--rwxr-xr-x	root/root	usr/lib/python3.1/site-packages/lxml/objectify.so
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/pyclasslookup.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/pyclasslookup.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/sax.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/sax.pyc
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/usedoctest.py
--rw-r--r--	root/root	usr/lib/python3.1/site-packages/lxml/usedoctest.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml-2.3-py2.7.egg-info
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/ElementInclude.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/ElementInclude.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/_elementpath.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/_elementpath.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/builder.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/builder.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/cssselect.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/cssselect.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/doctestcompare.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/doctestcompare.pyc
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/etree.so
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/html/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/ElementSoup.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/ElementSoup.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_dictmixin.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_dictmixin.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_diffcommand.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_diffcommand.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_html5builder.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_html5builder.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_setmixin.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/_setmixin.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/builder.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/builder.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/clean.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/clean.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/defs.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/defs.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/diff.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/diff.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/formfill.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/formfill.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/html5parser.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/html5parser.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/soupparser.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/soupparser.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/usedoctest.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/html/usedoctest.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/__init__.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/rng/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/lxml/objectify.so
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/pyclasslookup.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/pyclasslookup.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/sax.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/sax.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/usedoctest.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/lxml/usedoctest.pyc
diff --git a/extra/lxml/.md5sum.i686 b/extra/lxml/.md5sum.i686
index f445352ef..94878204f 100644
--- a/extra/lxml/.md5sum.i686
+++ b/extra/lxml/.md5sum.i686
@@ -1 +1 @@
-077841e74ee728e7746b65d8483274be  lxml-2.2.4.tar.gz
+a245a015fd59b63e220005f263e1682a  lxml-2.3.tar.gz
diff --git a/extra/lxml/.md5sum.x86_64 b/extra/lxml/.md5sum.x86_64
index f445352ef..94878204f 100644
--- a/extra/lxml/.md5sum.x86_64
+++ b/extra/lxml/.md5sum.x86_64
@@ -1 +1 @@
-077841e74ee728e7746b65d8483274be  lxml-2.2.4.tar.gz
+a245a015fd59b63e220005f263e1682a  lxml-2.3.tar.gz
diff --git a/extra/lxml/Pkgfile b/extra/lxml/Pkgfile
index 8e8f8c4fe..525c2c2a4 100644
--- a/extra/lxml/Pkgfile
+++ b/extra/lxml/Pkgfile
@@ -6,12 +6,12 @@
 # Run on: libxml2,libxslt
 
 name=lxml
-version=2.2.4
+version=2.3
 release=1
 source=(http://pypi.python.org/packages/source/l/$name/$name-$version.tar.gz)
 
 build() {
-cd $name-$version
-	python setup.py install --root=$PKG
+	cd $name-$version
+	python2 setup.py install --root=$PKG
 }
   
diff --git a/extra/xmlsec/.footprint.i686 b/extra/xmlsec/.footprint.i686
index a0afdf0f6..bd5c705da 100644
--- a/extra/xmlsec/.footprint.i686
+++ b/extra/xmlsec/.footprint.i686
@@ -13,10 +13,15 @@ drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/dl.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/errors.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/exports.h
+drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/gcrypt/
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gcrypt/app.h
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gcrypt/crypto.h
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gcrypt/symbols.h
 drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/gnutls/
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/app.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/crypto.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/symbols.h
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/x509.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/io.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/keyinfo.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/keys.h
@@ -56,27 +61,33 @@ drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/private/
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/xmlsec.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/xmltree.h
 drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libxmlsec1-gcrypt.a
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-gcrypt.la
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gcrypt.so -> libxmlsec1-gcrypt.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gcrypt.so.1 -> libxmlsec1-gcrypt.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-gcrypt.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1-gnutls.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so -> libxmlsec1-gnutls.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so.1 -> libxmlsec1-gnutls.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so -> libxmlsec1-gnutls.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so.1 -> libxmlsec1-gnutls.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1-nss.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-nss.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so -> libxmlsec1-nss.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so.1 -> libxmlsec1-nss.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-nss.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so -> libxmlsec1-nss.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so.1 -> libxmlsec1-nss.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-nss.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1-openssl.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so -> libxmlsec1-openssl.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so.1 -> libxmlsec1-openssl.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so -> libxmlsec1-openssl.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so.1 -> libxmlsec1-openssl.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so -> libxmlsec1.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so.1 -> libxmlsec1.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so -> libxmlsec1.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so.1 -> libxmlsec1.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1.so.1.2.16
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-gcrypt.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-gnutls.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-nss.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-openssl.pc
@@ -121,6 +132,10 @@ drwxr-xr-x	root/root	usr/share/doc/xmlsec1/api/images/
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-examples-sign-template-file.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-examples-sign-x509.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-examples.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt-app.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt-crypto.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt-ref.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt.sgml
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls-app.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls-crypto.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls-ref.html
diff --git a/extra/xmlsec/.footprint.x86_64 b/extra/xmlsec/.footprint.x86_64
index a0afdf0f6..bd5c705da 100644
--- a/extra/xmlsec/.footprint.x86_64
+++ b/extra/xmlsec/.footprint.x86_64
@@ -13,10 +13,15 @@ drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/dl.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/errors.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/exports.h
+drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/gcrypt/
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gcrypt/app.h
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gcrypt/crypto.h
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gcrypt/symbols.h
 drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/gnutls/
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/app.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/crypto.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/symbols.h
+-rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/gnutls/x509.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/io.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/keyinfo.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/keys.h
@@ -56,27 +61,33 @@ drwxr-xr-x	root/root	usr/include/xmlsec1/xmlsec/private/
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/xmlsec.h
 -rw-r--r--	root/root	usr/include/xmlsec1/xmlsec/xmltree.h
 drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libxmlsec1-gcrypt.a
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-gcrypt.la
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gcrypt.so -> libxmlsec1-gcrypt.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gcrypt.so.1 -> libxmlsec1-gcrypt.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-gcrypt.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1-gnutls.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so -> libxmlsec1-gnutls.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so.1 -> libxmlsec1-gnutls.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so -> libxmlsec1-gnutls.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-gnutls.so.1 -> libxmlsec1-gnutls.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-gnutls.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1-nss.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-nss.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so -> libxmlsec1-nss.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so.1 -> libxmlsec1-nss.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-nss.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so -> libxmlsec1-nss.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-nss.so.1 -> libxmlsec1-nss.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-nss.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1-openssl.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so -> libxmlsec1-openssl.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so.1 -> libxmlsec1-openssl.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so -> libxmlsec1-openssl.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1-openssl.so.1 -> libxmlsec1-openssl.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1-openssl.so.1.2.16
 -rw-r--r--	root/root	usr/lib/libxmlsec1.a
 -rwxr-xr-x	root/root	usr/lib/libxmlsec1.la
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so -> libxmlsec1.so.1.2.14
-lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so.1 -> libxmlsec1.so.1.2.14
--rwxr-xr-x	root/root	usr/lib/libxmlsec1.so.1.2.14
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so -> libxmlsec1.so.1.2.16
+lrwxrwxrwx	root/root	usr/lib/libxmlsec1.so.1 -> libxmlsec1.so.1.2.16
+-rwxr-xr-x	root/root	usr/lib/libxmlsec1.so.1.2.16
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-gcrypt.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-gnutls.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-nss.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xmlsec1-openssl.pc
@@ -121,6 +132,10 @@ drwxr-xr-x	root/root	usr/share/doc/xmlsec1/api/images/
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-examples-sign-template-file.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-examples-sign-x509.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-examples.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt-app.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt-crypto.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt-ref.html
+-rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gcrypt.sgml
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls-app.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls-crypto.html
 -rw-r--r--	root/root	usr/share/doc/xmlsec1/api/xmlsec-gnutls-ref.html
diff --git a/extra/xmlsec/.md5sum.i686 b/extra/xmlsec/.md5sum.i686
index 08362db22..0ef5a8d81 100644
--- a/extra/xmlsec/.md5sum.i686
+++ b/extra/xmlsec/.md5sum.i686
@@ -1 +1 @@
-1f24ab1d39f4a51faf22244c94a6203f  xmlsec1-1.2.14.tar.gz
+17e8eb9a4ec4139b7689d139be4da133  xmlsec1-1.2.16.tar.gz
diff --git a/extra/xmlsec/.md5sum.x86_64 b/extra/xmlsec/.md5sum.x86_64
index 08362db22..0ef5a8d81 100644
--- a/extra/xmlsec/.md5sum.x86_64
+++ b/extra/xmlsec/.md5sum.x86_64
@@ -1 +1 @@
-1f24ab1d39f4a51faf22244c94a6203f  xmlsec1-1.2.14.tar.gz
+17e8eb9a4ec4139b7689d139be4da133  xmlsec1-1.2.16.tar.gz
diff --git a/extra/xmlsec/Pkgfile b/extra/xmlsec/Pkgfile
index 5498019ed..930062d16 100644
--- a/extra/xmlsec/Pkgfile
+++ b/extra/xmlsec/Pkgfile
@@ -6,8 +6,8 @@
 # Run on: libxml2,libxslt,gnutls,nss,libtasn1
 
 name=xmlsec
-version=1.2.14
-release=3
+version=1.2.16
+release=1
 source=(http://www.aleksey.com/xmlsec/download/xmlsec1-$version.tar.gz )
 
 build() {