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

11 files changed, 175 insertions, 16 deletions

diff --git a/extra/gconf/Pkgfile b/extra/gconf/Pkgfile
index cc91d96a1..f168a2180 100644
--- a/extra/gconf/Pkgfile
+++ b/extra/gconf/Pkgfile
@@ -2,8 +2,8 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: orbit2, polkit, glib, gtk, libldap
-# Run on: glib,pcre,dbus-glib,orbit2
+# Depends on: orbit2, polkit, dbus-glib, gtk, libldap
+# Run on: dbus-glib,orbit,libldap2
 
 name=gconf
 version=2.32.1
@@ -17,16 +17,15 @@ build() {
 	cd GConf-$version
 	patch -Np1 -i ../GConf-$ver_lfs-sysconfdir-1.patch
 
-	./configure --prefix=$GNOME_PREFIX\
+	./configure --prefix=/usr \
 	            --sysconfdir=/etc \
 		    --disable-static \
  		    --enable-defaults-service \
-            	    --libexecdir=$GNOME_PREFIX/lib/GConf \
-            	    --mandir=$GNOME_PREFIX/share/man
+            	    --libexecdir=/usr/lib/GConf \
+            	    --mandir=/usr/share/man
 	make
 	make DESTDIR=$PKG install
-	rm -r $PKG/$GNOME_PREFIX/share/gtk-doc
+	rm -r $PKG/usr/share/gtk-doc
 	install -v -m755 -d $PKG/etc/gconf/gconf.xml.system
 
 }
-  
diff --git a/extra/gvfs/.footprint b/extra/gvfs/.footprint
new file mode 100644
index 000000000..3fca8628b
--- /dev/null
+++ b/extra/gvfs/.footprint
@@ -0,0 +1,97 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/profile.d/
+-rw-r--r--	root/root	etc/profile.d/gvfs-bash-completion.sh
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/gvfs-cat
+-rwxr-xr-x	root/root	usr/bin/gvfs-copy
+-rwxr-xr-x	root/root	usr/bin/gvfs-info
+-rwxr-xr-x	root/root	usr/bin/gvfs-less
+-rwxr-xr-x	root/root	usr/bin/gvfs-ls
+-rwxr-xr-x	root/root	usr/bin/gvfs-mkdir
+-rwxr-xr-x	root/root	usr/bin/gvfs-monitor-dir
+-rwxr-xr-x	root/root	usr/bin/gvfs-monitor-file
+-rwxr-xr-x	root/root	usr/bin/gvfs-mount
+-rwxr-xr-x	root/root	usr/bin/gvfs-move
+-rwxr-xr-x	root/root	usr/bin/gvfs-open
+-rwxr-xr-x	root/root	usr/bin/gvfs-rename
+-rwxr-xr-x	root/root	usr/bin/gvfs-rm
+-rwxr-xr-x	root/root	usr/bin/gvfs-save
+-rwxr-xr-x	root/root	usr/bin/gvfs-set-attribute
+-rwxr-xr-x	root/root	usr/bin/gvfs-trash
+-rwxr-xr-x	root/root	usr/bin/gvfs-tree
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/gvfs-client/
+drwxr-xr-x	root/root	usr/include/gvfs-client/gvfs/
+-rw-r--r--	root/root	usr/include/gvfs-client/gvfs/gvfsurimapper.h
+-rw-r--r--	root/root	usr/include/gvfs-client/gvfs/gvfsuriutils.h
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/gio/
+drwxr-xr-x	root/root	usr/lib/gio/modules/
+-rwxr-xr-x	root/root	usr/lib/gio/modules/libgiogconf.la
+-rwxr-xr-x	root/root	usr/lib/gio/modules/libgiogconf.so
+-rwxr-xr-x	root/root	usr/lib/gio/modules/libgioremote-volume-monitor.la
+-rwxr-xr-x	root/root	usr/lib/gio/modules/libgioremote-volume-monitor.so
+-rwxr-xr-x	root/root	usr/lib/gio/modules/libgvfsdbus.la
+-rwxr-xr-x	root/root	usr/lib/gio/modules/libgvfsdbus.so
+drwxr-xr-x	root/root	usr/lib/gvfs/
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfs-fuse-daemon
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfs-gphoto2-volume-monitor
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfs-hal-volume-monitor
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-archive
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-burn
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-cdda
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-computer
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-dav
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-dnssd
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-ftp
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-gphoto2
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-http
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-localtest
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-metadata
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-network
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-sftp
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-smb
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-smb-browse
+-rwxr-xr-x	root/root	usr/lib/gvfs/gvfsd-trash
+-rwxr-xr-x	root/root	usr/lib/libgvfscommon-dnssd.la
+lrwxrwxrwx	root/root	usr/lib/libgvfscommon-dnssd.so -> libgvfscommon-dnssd.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libgvfscommon-dnssd.so.0 -> libgvfscommon-dnssd.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libgvfscommon-dnssd.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libgvfscommon.la
+lrwxrwxrwx	root/root	usr/lib/libgvfscommon.so -> libgvfscommon.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libgvfscommon.so.0 -> libgvfscommon.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libgvfscommon.so.0.0.0
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/dbus-1/
+drwxr-xr-x	root/root	usr/share/dbus-1/services/
+-rw-r--r--	root/root	usr/share/dbus-1/services/gvfs-daemon.service
+-rw-r--r--	root/root	usr/share/dbus-1/services/gvfs-metadata.service
+-rw-r--r--	root/root	usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
+-rw-r--r--	root/root	usr/share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
+drwxr-xr-x	root/root	usr/share/gvfs/
+drwxr-xr-x	root/root	usr/share/gvfs/mounts/
+-rw-r--r--	root/root	usr/share/gvfs/mounts/archive.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/burn.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/cdda.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/computer.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/dav+sd.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/dav.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/dns-sd.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/ftp.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/gphoto2.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/http.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/localtest.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/network.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/sftp.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/smb-browse.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/smb.mount
+-rw-r--r--	root/root	usr/share/gvfs/mounts/trash.mount
+drwxr-xr-x	root/root	usr/share/gvfs/remote-volume-monitors/
+-rw-r--r--	root/root	usr/share/gvfs/remote-volume-monitors/gphoto2.monitor
+-rw-r--r--	root/root	usr/share/gvfs/remote-volume-monitors/hal.monitor
+drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/fr/
+drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/gvfs.mo
diff --git a/extra/gvfs/.md5sum b/extra/gvfs/.md5sum
new file mode 100644
index 000000000..8da0fb1b3
--- /dev/null
+++ b/extra/gvfs/.md5sum
@@ -0,0 +1 @@
+e8a48cbcfd0ed4c2dd3d32b84fd0d09e  gvfs-1.7.1.tar.bz2
diff --git a/extra/gvfs/Pkgfile b/extra/gvfs/Pkgfile
new file mode 100644
index 000000000..4f6132be2
--- /dev/null
+++ b/extra/gvfs/Pkgfile
@@ -0,0 +1,20 @@
+# Description: A userspace virtual filesystem designed to work with gio
+# URL: http://www.gnome.org/
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: fuse, libsoup, libgphoto2, samba3, libcdio, libgnome-keyring
+# Run on: fuse,libsoup,libgphoto2,samba3,libcdio,libgnome-keyring
+
+name=gvfs
+version=1.7.1
+release=1
+source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
+build() {
+	cd $name-$version
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--libexecdir=/usr/lib/gvfs
+	make
+	make DESTDIR=$PKG install
+}
+
diff --git a/extra/libgnome-keyring/.footprint b/extra/libgnome-keyring/.footprint
new file mode 100644
index 000000000..b40a085d4
--- /dev/null
+++ b/extra/libgnome-keyring/.footprint
@@ -0,0 +1,18 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/gnome-keyring-1/
+-rw-r--r--	root/root	usr/include/gnome-keyring-1/gnome-keyring-memory.h
+-rw-r--r--	root/root	usr/include/gnome-keyring-1/gnome-keyring-result.h
+-rw-r--r--	root/root	usr/include/gnome-keyring-1/gnome-keyring.h
+drwxr-xr-x	root/root	usr/lib/
+-rwxr-xr-x	root/root	usr/lib/libgnome-keyring.la
+lrwxrwxrwx	root/root	usr/lib/libgnome-keyring.so -> libgnome-keyring.so.0.1.1
+lrwxrwxrwx	root/root	usr/lib/libgnome-keyring.so.0 -> libgnome-keyring.so.0.1.1
+-rwxr-xr-x	root/root	usr/lib/libgnome-keyring.so.0.1.1
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/gnome-keyring-1.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/fr/
+drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/libgnome-keyring.mo
diff --git a/extra/libgnome-keyring/.md5sum b/extra/libgnome-keyring/.md5sum
new file mode 100644
index 000000000..a91fbb884
--- /dev/null
+++ b/extra/libgnome-keyring/.md5sum
@@ -0,0 +1 @@
+c42b2ca66204835d901d3dbfc1fa5ae6  libgnome-keyring-2.32.0.tar.bz2
diff --git a/extra/libgnome-keyring/Pkgfile b/extra/libgnome-keyring/Pkgfile
new file mode 100644
index 000000000..4775a0e42
--- /dev/null
+++ b/extra/libgnome-keyring/Pkgfile
@@ -0,0 +1,22 @@
+# Description: Librairie gnome libgnome-keyring
+# URL: http://www.gnome.org/
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: dbus,intltool,gtk-doc
+# Run on: dbus,libcrypt
+
+name=libgnome-keyring
+version=2.32.0
+release=1
+source=( http://ftp.gnome.org/pub/gnome/sources/$name/2.32/$name-$version.tar.bz2)
+
+build() {
+	cd $name-$version
+		./configure --prefix=$GNOME_PREFIX \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--mandir=$GNOME_PREFIX/share/man
+	make
+	make DESTDIR=$PKG install
+	rm -r $PKG/$GNOME_PREFIX/share/gtk-doc
+}
diff --git a/extra/libproxy/Pkgfile b/extra/libproxy/Pkgfile
index 30713fea1..67d63c307 100755
--- a/extra/libproxy/Pkgfile
+++ b/extra/libproxy/Pkgfile
@@ -1,4 +1,4 @@
-# Description: Librairie permettant de découvrir le proxy 
+# Description: Librairie permettant de découvrir le proxy 
 # URL: http://code.google.com/p/libproxy
 # Maintainer: NutyX core team
 # Packager: thierryn1 at hispeed dot ch
diff --git a/extra/orbit2/.md5sum b/extra/orbit2/.md5sum
index 7ec7bdd41..93fa1f1de 100644
--- a/extra/orbit2/.md5sum
+++ b/extra/orbit2/.md5sum
@@ -1 +1 @@
-3e80596171b1ea652707219c7144ff53  ORBit2-2.14.18.tar.bz2
+7082d317a9573ab338302243082d10d1  ORBit2-2.14.19.tar.bz2
diff --git a/extra/orbit2/Pkgfile b/extra/orbit2/Pkgfile
index d802dca95..0453207a5 100644
--- a/extra/orbit2/Pkgfile
+++ b/extra/orbit2/Pkgfile
@@ -2,21 +2,21 @@
 # URL: http://www.gnome.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libidl glib xorg
-# Run on: libidl,glib
+# Depends on: libidl
+# Run on: libidl
 
 name=orbit2
-version=2.14.18
+version=2.14.19
 release=1
 source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-$version.tar.bz2)
 
 build() {
 	cd ORBit2-$version
-	./configure --prefix=$GNOME_PREFIX \
+	./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--disable-static
 	make
 	make DESTDIR=$PKG install
-	rm -r $PKG/$GNOME_PREFIX/share/gtk-doc/
+	rm -r $PKG/usr/share/gtk-doc/
 }
   
diff --git a/extra/wicd/Pkgfile b/extra/wicd/Pkgfile
index a6d847a8d..187da6065 100644
--- a/extra/wicd/Pkgfile
+++ b/extra/wicd/Pkgfile
@@ -7,7 +7,7 @@
 
 name=wicd
 version=1.7.0
-release=7
+release=8
 source=(http://downloads.sourceforge.net/$name/wicd-$version.tar.gz \
 	http://nutyx.meticul.eu/files/patchs/$name/{wicd_in_usr.patch,wicd-locale.patch,wicd.desktop} 
 	wicd-1.7.0-python-2.7.patch
@@ -22,7 +22,8 @@ build() {
 
 	python2 setup.py configure --no-install-init \
 			--resume=/usr/share/wicd/scripts/ \
-			--suspend=/usr/share/wicd/scripts --verbose
+			--suspend=/usr/share/wicd/scripts --verbose \
+			--python=/usr/bin/python2
 	python2 setup.py install --root=$PKG
 
   	# Add custom rc.d script