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

5 files changed, 33 insertions, 43 deletions

diff --git a/extra/cmake/.footprint b/extra/cmake/.footprint
index 4a467d0ca..ee75c3b89 100644
--- a/extra/cmake/.footprint
+++ b/extra/cmake/.footprint
@@ -2,12 +2,9 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ccmake
 -rwxr-xr-x	root/root	usr/bin/cmake
--rwxr-xr-x	root/root	usr/bin/cmake-gui
 -rwxr-xr-x	root/root	usr/bin/cpack
 -rwxr-xr-x	root/root	usr/bin/ctest
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/applications/CMake.desktop
 drwxr-xr-x	root/root	usr/share/cmake-2.8/
 drwxr-xr-x	root/root	usr/share/cmake-2.8/Modules/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Modules/.NoDartCoverage
@@ -540,17 +537,11 @@ drwxr-xr-x	root/root	usr/share/cmake-2.8/Templates/
 -rw-r--r--	root/root	usr/share/cmake-2.8/Templates/staticLibHeader.dsptemplate
 drwxr-xr-x	root/root	usr/share/cmake-2.8/include/
 -rw-r--r--	root/root	usr/share/cmake-2.8/include/cmCPluginAPI.h
-drwxr-xr-x	root/root	usr/share/mime/
-drwxr-xr-x	root/root	usr/share/mime/packages/
--rw-r--r--	root/root	usr/share/mime/packages/cmakecache.xml
-drwxr-xr-x	root/root	usr/share/pixmaps/
--rw-r--r--	root/root	usr/share/pixmaps/CMakeSetup32.png
 drwxr-xr-x	root/root	usr/usr/
 drwxr-xr-x	root/root	usr/usr/share/
 drwxr-xr-x	root/root	usr/usr/share/man/
 drwxr-xr-x	root/root	usr/usr/share/man/man1/
 -rw-r--r--	root/root	usr/usr/share/man/man1/ccmake.1.gz
--rw-r--r--	root/root	usr/usr/share/man/man1/cmake-gui.1.gz
 -rw-r--r--	root/root	usr/usr/share/man/man1/cmake.1.gz
 -rw-r--r--	root/root	usr/usr/share/man/man1/cmakecommands.1.gz
 -rw-r--r--	root/root	usr/usr/share/man/man1/cmakecompat.1.gz
diff --git a/extra/cmake/Pkgfile b/extra/cmake/Pkgfile
index d3678809b..3c5b72513 100755
--- a/extra/cmake/Pkgfile
+++ b/extra/cmake/Pkgfile
@@ -6,7 +6,7 @@
 
 name=cmake
 version=2.8.3
-release=1
+release=2
 source=(http://www.cmake.org/files/v2.8/$name-$version.tar.gz)
 
 build() {
@@ -14,7 +14,6 @@ build() {
 	./bootstrap --prefix=/usr \
 		--mandir=/usr/share/man \
 		--system-libs \
-		--qt-gui \
                 --parallel=2
 	make
 	make DESTDIR=$PKG install
diff --git a/gnome/gnome-doc-utils/.footprint b/gnome/gnome-doc-utils/.footprint
index ae159f413..b20fe0d88 100644
--- a/gnome/gnome-doc-utils/.footprint
+++ b/gnome/gnome-doc-utils/.footprint
@@ -4,34 +4,34 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gnome-doc-tool
 -rwxr-xr-x	root/root	usr/bin/xml2po
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python2.6/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/xml2po/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/__init__.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/__init__.pyo
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/xml2po/modes/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/__init__.py (EMPTY)
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/__init__.pyo
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/basic.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/basic.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/basic.pyo
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/docbook.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/docbook.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/docbook.pyo
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/gs.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/gs.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/gs.pyo
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/mallard.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/mallard.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/mallard.pyo
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/ubuntu.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/ubuntu.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/ubuntu.pyo
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/xhtml.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/xhtml.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/xml2po/modes/xhtml.pyo
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/xml2po/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/__init__.pyo
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/xml2po/modes/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/__init__.py (EMPTY)
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/__init__.pyo
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/basic.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/basic.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/basic.pyo
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/docbook.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/docbook.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/docbook.pyo
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/gs.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/gs.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/gs.pyo
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/mallard.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/mallard.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/mallard.pyo
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/ubuntu.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/ubuntu.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/ubuntu.pyo
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/xhtml.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/xhtml.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/xml2po/modes/xhtml.pyo
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/gnome-doc-utils.m4
diff --git a/gnome/gnome-doc-utils/.md5sum b/gnome/gnome-doc-utils/.md5sum
index 293004099..f29986368 100644
--- a/gnome/gnome-doc-utils/.md5sum
+++ b/gnome/gnome-doc-utils/.md5sum
@@ -1 +1 @@
-fb0e687e0270eff4bbeb6df7091f72b3  gnome-doc-utils-0.20.0.tar.bz2
+920914c13c57e67616c6ff8594579786  gnome-doc-utils-0.20.2.tar.bz2
diff --git a/gnome/gnome-doc-utils/Pkgfile b/gnome/gnome-doc-utils/Pkgfile
index be7068445..ee3d1ccd2 100644
--- a/gnome/gnome-doc-utils/Pkgfile
+++ b/gnome/gnome-doc-utils/Pkgfile
@@ -5,14 +5,14 @@
 # Depends on: intltool, libxslt, p5-xml-parser, rarian
 
 name=gnome-doc-utils
-version=0.20.0
+version=0.20.2
 release=1
 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	./configure --prefix=$GNOME_PREFIX \
-	--mandir=$GNOME_PREFIX/share/man \
+	PYTHON=/usr/bin/python2 ./configure --prefix=$GNOME_PREFIX \
+		--mandir=$GNOME_PREFIX/share/man \
 		--disable-scrollkeeper
 	make
 	make DESTDIR=$PKG install