Merge remote branch 'nutyx-attapu/master'

8 files changed, 17 insertions, 234 deletions

diff --git a/base/eina/.footprint b/base/eina/.footprint
index bb31836ff..f7ea6b74b 100644
--- a/base/eina/.footprint
+++ b/base/eina/.footprint
@@ -22,11 +22,9 @@ drwxr-xr-x	root/root	usr/include/eina-0/eina/
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_fp.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_hash.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_list.x
--rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_log.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_mempool.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_rbtree.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_rectangle.x
--rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_str.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_stringshare.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_tiler.x
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_inline_trash.x
@@ -40,22 +38,27 @@ drwxr-xr-x	root/root	usr/include/eina-0/eina/
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_matrixsparse.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_mempool.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_module.h
--rw-r--r--	root/root	usr/include/eina-0/eina/eina_quadtree.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_rbtree.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_rectangle.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_safety_checks.h
--rw-r--r--	root/root	usr/include/eina-0/eina/eina_str.h
--rw-r--r--	root/root	usr/include/eina-0/eina/eina_strbuf.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_stringshare.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_tiler.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_trash.h
 -rw-r--r--	root/root	usr/include/eina-0/eina/eina_types.h
 -rw-r--r--	root/root	usr/include/eina-0/eina_config.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libeina-ver-pre-svn-05.so.0 -> libeina-ver-pre-svn-05.so.0.9.9
--rwxr-xr-x	root/root	usr/lib/libeina-ver-pre-svn-05.so.0.9.9
+drwxr-xr-x	root/root	usr/lib/eina/
+drwxr-xr-x	root/root	usr/lib/eina/mp/
+-rwxr-xr-x	root/root	usr/lib/eina/mp/eina_chained_mempool.la
+-rwxr-xr-x	root/root	usr/lib/eina/mp/eina_chained_mempool.so
+-rwxr-xr-x	root/root	usr/lib/eina/mp/eina_fixed_bitmap.la
+-rwxr-xr-x	root/root	usr/lib/eina/mp/eina_fixed_bitmap.so
+-rwxr-xr-x	root/root	usr/lib/eina/mp/eina_pass_through.la
+-rwxr-xr-x	root/root	usr/lib/eina/mp/eina_pass_through.so
+lrwxrwxrwx	root/root	usr/lib/libeina-ver-svn-05.so.0 -> libeina-ver-svn-05.so.0.9.9
+-rwxr-xr-x	root/root	usr/lib/libeina-ver-svn-05.so.0.9.9
 -rw-r--r--	root/root	usr/lib/libeina.a
 -rwxr-xr-x	root/root	usr/lib/libeina.la
-lrwxrwxrwx	root/root	usr/lib/libeina.so -> libeina-ver-pre-svn-05.so.0.9.9
+lrwxrwxrwx	root/root	usr/lib/libeina.so -> libeina-ver-svn-05.so.0.9.9
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/eina-0.pc
diff --git a/base/eina/.md5sum b/base/eina/.md5sum
index 380992060..ce387be1e 100644
--- a/base/eina/.md5sum
+++ b/base/eina/.md5sum
@@ -1 +1 @@
-37e1e9bb2107ad9a89a2e727a46ccb23  eina-svn-48737.tar.bz2
+1289ac1d6b1a7a578158f9ff24301f3f  eina-0.9.9.063.tar.bz2
diff --git a/base/eina/Pkgfile b/base/eina/Pkgfile
index bc3d614fb..827245a86 100644
--- a/base/eina/Pkgfile
+++ b/base/eina/Pkgfile
@@ -2,17 +2,17 @@
 # URL: http://www.enlightenment.org/
 # Maintainer: NuTyX core team
 # Packager: A DEFINIR
-# Depends on:  
 
 name=eina
-version=svn-48737
+version=0.9.9.063
 release=1
-source=(http://kiao.no-ip.info/NuTyX/files/$name-$version.tar.bz2)
+source=(http://download.enlightenment.org/snapshots/LATEST/$name-$version.tar.bz2)
 
 build()
 {
-	cd $name*
-	./autogen.sh --prefix=/usr
+	cd $name-$version 
+	./configure --prefix=/usr
 	make
 	make install DESTDIR=$PKG
 }
+
diff --git a/base/nfs-utils/.footprint b/base/nfs-utils/.footprint
deleted file mode 100644
index a509c27ec..000000000
--- a/base/nfs-utils/.footprint
+++ /dev/null
@@ -1,68 +0,0 @@
-drwxr-xr-x	root/root	etc/
-drwxr-xr-x	root/root	etc/rc.d/
-drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr--	root/root	etc/rc.d/init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K48nfs-server -> ../init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K48nfs-server -> ../init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/K48nfs-server -> ../init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S24nfs-server -> ../init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S24nfs-server -> ../init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S24nfs-server -> ../init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K48nfs-server -> ../init.d/nfs-server
-drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
-drwxr-xr-x	root/root	etc/sysconfig/
--rw-r--r--	root/root	etc/sysconfig/nfs-server
-drwxr-xr-x	root/root	sbin/
--r-s--x--x	root/root	sbin/mount.nfs
-lrwxrwxrwx	root/root	sbin/mount.nfs4 -> mount.nfs
-lrwxrwxrwx	root/root	sbin/umount.nfs -> mount.nfs
-lrwxrwxrwx	root/root	sbin/umount.nfs4 -> mount.nfs
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/exportfs
--rwxr-xr-x	root/root	usr/sbin/nfsstat
--rwxr-xr-x	root/root	usr/sbin/rpc.mountd
--rwxr-xr-x	root/root	usr/sbin/rpc.nfsd
--rwxr-xr-x	root/root	usr/sbin/rpc.statd
--rwxr-xr-x	root/root	usr/sbin/rpcdebug
--rwxr-xr-x	root/root	usr/sbin/showmount
--rwxr-xr-x	root/root	usr/sbin/sm-notify
--rwxr-xr-x	root/root	usr/sbin/start-statd
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man5/
--rw-r--r--	root/root	usr/share/man/man5/exports.5.gz
--rw-r--r--	root/root	usr/share/man/man5/nfs.5.gz
-drwxr-xr-x	root/root	usr/share/man/man7/
--rw-r--r--	root/root	usr/share/man/man7/nfsd.7.gz
-drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/exportfs.8.gz
--rw-r--r--	root/root	usr/share/man/man8/mount.nfs.8.gz
--rw-r--r--	root/root	usr/share/man/man8/mountd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/nfsd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/nfsstat.8.gz
-lrwxrwxrwx	root/root	usr/share/man/man8/rpc.mountd.8.gz -> mountd.8.gz
-lrwxrwxrwx	root/root	usr/share/man/man8/rpc.nfsd.8.gz -> nfsd.8.gz
-lrwxrwxrwx	root/root	usr/share/man/man8/rpc.sm-notify.8.gz -> sm-notify.8.gz
-lrwxrwxrwx	root/root	usr/share/man/man8/rpc.statd.8.gz -> statd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/rpcdebug.8.gz
--rw-r--r--	root/root	usr/share/man/man8/showmount.8.gz
--rw-r--r--	root/root	usr/share/man/man8/sm-notify.8.gz
--rw-r--r--	root/root	usr/share/man/man8/statd.8.gz
--rw-r--r--	root/root	usr/share/man/man8/umount.nfs.8.gz
-drwxr-xr-x	root/root	var/
-drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/nfs/
--rw-r--r--	root/root	var/lib/nfs/etab (EMPTY)
--rw-r--r--	root/root	var/lib/nfs/rmtab (EMPTY)
-drwx------	nobody/root	var/lib/nfs/sm.bak/
-drwx------	nobody/root	var/lib/nfs/sm/
--rw-------	nobody/root	var/lib/nfs/state (EMPTY)
--rw-r--r--	root/root	var/lib/nfs/xtab (EMPTY)
diff --git a/base/nfs-utils/.md5sum b/base/nfs-utils/.md5sum
deleted file mode 100644
index 6cadbbf40..000000000
--- a/base/nfs-utils/.md5sum
+++ /dev/null
@@ -1,3 +0,0 @@
-da9a8cfaba0905f0de06eada1edceffc  nfs-server
-7871ab61ae98ba382afb55c35b02eeb4  nfs-server.sh
-4ab250f35979794de3d185e3c864e4d0  nfs-utils-1.2.0.tar.gz
diff --git a/base/nfs-utils/Pkgfile b/base/nfs-utils/Pkgfile
deleted file mode 100755
index 5cb1914fd..000000000
--- a/base/nfs-utils/Pkgfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Description: Utilitaires pour le système de fichiers nfs
-# URL: http://nfs.sourceforge.net
-# Maintainer: NuTyX core team
-# Packager: thierryn1 at hispeed dot ch
-
-name=nfs-utils
-version=1.2.0
-release=1
-source=(http://ftp.kernel.org/pub/linux/utils/nfs/$name-$version.tar.gz\
-        nfs-server nfs-server.sh)
-build() {
-source  /etc/blfs-bootscripts
-wget \
-http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
-tar xvf $scripts-$scriptsversion.tar.bz2 
-	# build package
-cd $name-$version
-sed -i 's/getkversion//' tools/Makefile.in
-./configure --prefix=/usr\
-	--sysconfdir=/etc\
-	--mandir=/usr/share/man\
-	--infodir=/usr/share/info\
-        --disable-nfsv4 \
-        --disable-gss
-make
-make DESTDIR=$PKG install
-cd ../$scripts-$scriptsversion
-make DESTDIR=$PKG install-nfs-server
-install -m 754 ../nfs-server.sh $PKG/etc/rc.d/init.d/nfs-server
-mkdir -p $PKG/etc/sysconfig
-install -m 644 ../nfs-server $PKG/etc/sysconfig/    
-}
diff --git a/base/nfs-utils/nfs-server b/base/nfs-utils/nfs-server
deleted file mode 100644
index c13747175..000000000
--- a/base/nfs-utils/nfs-server
+++ /dev/null
@@ -1,4 +0,0 @@
-PORT="2049"
-PROCESSES="8"
-QUOTAS="no"
-KILLDELAY="10"
diff --git a/base/nfs-utils/nfs-server.sh b/base/nfs-utils/nfs-server.sh
deleted file mode 100644
index dc48b387b..000000000
--- a/base/nfs-utils/nfs-server.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/nfs-server
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2006-09-10 19:41:47 -0500 (Sun, 10 Sep 2006) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-. /etc/sysconfig/nfs-server
-newuser=nobody
-newgroup=nogroup
-newid=99
-getent group $newgroup || /usr/bin/groupadd -g $newid $newgroup
-getent passwd $newuser || /usr/bin/useradd -c "Unprivileged Nobody" \
--g $newgroup -u $newid -d /dev/null -s /bin/false $newuser
-case "$1" in
-	start)
-		boot_mesg "Starting NFS mountd..."
-		loadproc /usr/sbin/rpc.mountd
-
-		boot_mesg "Starting NFS nfsd..."
-		loadproc /usr/sbin/rpc.nfsd -p $PORT $PROCESSES
-
-		boot_mesg "Starting NFS statd..."
-		loadproc /usr/sbin/rpc.statd
-
-		if [ "$QUOTAS" = "yes" ]; then
-			boot_mesg "Starting NFS rquotad..."
-			loadproc /usr/sbin/rpc.rquotad
-		fi
-
-		# NFSD support only in 2.6 kernel
-		/bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
-		if [ $? = 0 ]; then
-			boot_mesg "Mounting nfsd virtual filesystem..."
-			/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
-			evaluate_retval
-		fi
-
-		# Make ceratin that the list is refreshed on
-		# a restart.
-		boot_mesg "Exporting NFS Filesystems..."
-		/usr/sbin/exportfs -ra 2>&1 > /dev/null
-		evaluate_retval
-		;;
-
-	stop)
-		boot_mesg "Stopping NFS statd..."
-		killproc /usr/sbin/rpc.statd
-
-		boot_mesg "Stopping NFS nfsd..."
-		# nfsd needs HUP....
-		killproc nfsd HUP
-
-		boot_mesg "Stopping NFS mountd..."
-		killproc /usr/sbin/rpc.mountd
-
-		if [ "$QUOTAS" = "yes" ]; then
-			boot_mesg "Stopping NFS rquotad..."
-			killproc /usr/sbin/rpc.rquotad
-		fi
-
-		boot_mesg "Refreshing NFS Exported Filesystems..."
-		/usr/sbin/exportfs -au 2>&1 > /dev/null
-		evaluate_retval
-
-		# NFSD support only in 2.6 kernel
-                /bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
-                if [ $? = 0 ]; then
-			boot_mesg "Unmounting NFS Virtual Filesystem..."
-			/bin/umount /proc/fs/nfsd 2>&1 > /dev/null
-			evaluate_retval
-		fi
-
-		# Remove a pid file that isn't done automatically
-		boot_mesg "Removing the rpc.statd pid file if it exists"
-		if [ -f /var/run/rpc.statd.pid ]; then
-		    rm -f /var/run/rpc.statd.pid
-		fi
-		;;
-
-	reload)
-		boot_mesg "Reloading NFS Server..."
-		/usr/sbin/exportfs -ra
-		evaluate_retval
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	status)
-		statusproc /usr/sbin/rpc.mountd
-		## Special case for nfsd with no full path
-		statusproc nfsd
-		statusproc /usr/sbin/rpc.statd
-		if [ "$QUOTA" = "yes" ]; then
-			statusproc rpc.rquotad
-		fi
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|reload|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/nfs-server