# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1483056267 -7200
# Node ID f1752c8b2a2a6329eb9cb500b6f571e0e4f85e68
# Parent  f7d9f142f79da19a1da0448bd482868ce59318a7
Up: eudev, man-db (added), vim. Extra up: ncurses, tk, python, cacerts.

diff -r f7d9f142f79d -r f1752c8b2a2a cacerts/receipt
--- a/cacerts/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/cacerts/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="cacerts"
-VERSION="20161124"
+VERSION="20161227"
 CATEGORY="security"
 SHORT_DESC="Certificate Authority Certificates"
 MAINTAINER="al.bobylev@gmail.com"
diff -r f7d9f142f79d -r f1752c8b2a2a eudev-dev/receipt
--- a/eudev-dev/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/eudev-dev/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -1,24 +1,20 @@
 # SliTaz package receipt.
 
 PACKAGE="eudev-dev"
-VERSION="1.9"
+VERSION="3.2"
 CATEGORY="development"
-SHORT_DESC="Eudev devel file (libudev)."
+SHORT_DESC="Programs for dynamic creation of device nodes (development files)"
 MAINTAINER="tcg.thegamer@gmail.com"
 LICENSE="GPL2"
-WANTED="eudev"
-WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+WEB_SITE="http://dev.gentoo.org/~blueness/eudev/"
 HOST_ARCH="i486 arm"
 PROVIDE="udev-dev"
 
+WANTED="eudev"
 DEPENDS="eudev pkg-config"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/usr/lib/pkgconfig $fs/usr/include
-	cp -a $install/lib/libudev*a $fs/lib
-	cp -a $install/lib/pkgconfig/libudev.pc $fs/usr/lib/pkgconfig
-	cp -a $install/usr/share/pkgconfig/* $fs/usr/lib/pkgconfig
-	cp -a $install/usr/include/libudev.h $fs/usr/include
+	cook_copy_files *.h *.la *.pc
 }
diff -r f7d9f142f79d -r f1752c8b2a2a eudev/receipt
--- a/eudev/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/eudev/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -1,35 +1,44 @@
 # SliTaz package receipt.
 
 PACKAGE="eudev"
-VERSION="1.9"
+VERSION="3.2"
 CATEGORY="base-system"
-SHORT_DESC="Fork of udev to avoid depending on systemd"
+SHORT_DESC="Programs for dynamic creation of device nodes"
 MAINTAINER="tcg.thegamer@gmail.com"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://dev.gentoo.org/~blueness/eudev"
-WGET_URL="${WEB_SITE}/${TARBALL}"
+WEB_SITE="http://dev.gentoo.org/~blueness/eudev/"
 PROVIDE="udev"
 
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="${WEB_SITE}$TARBALL"
+
 DEPENDS="dbus util-linux-blkid pciids usbids acl kmod"
-BUILD_DEPENDS="util-linux-blkid-dev util-linux-uuid-dev pcre-dev kmod-dev \
-dbus-dev gperf pkg-config acl-dev"
+BUILD_DEPENDS="gobject-introspection-dev util-linux-blkid-dev gperf"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	sed -r -i 's|/usr(/bin/test)|\1|' test/udev-test.pl
+	cat > config.cache <<"EOF"
+HAVE_BLKID=1
+BLKID_LIBS="-lblkid"
+BLKID_CFLAGS="-I/tools/include"
+EOF
+
 	./configure \
+		--bindir=/sbin \
+		--sbindir=/sbin \
+		--libdir=/usr/lib \
 		--sysconfdir=/etc \
-		--exec-prefix="" \
-		--with-rootprefix="" \
-		--disable-manpages \
-		--disable-introspection \
-		--disable-keymap \
-		--enable-floppy \
-		--enable-rule-generator \
+		--libexecdir=/lib \
+		--with-rootprefix= \
+		--with-rootlibdir=/lib \
+		--enable-manpages \
+		--disable-static \
+		--config-cache \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -39,7 +48,7 @@
 
 	cp -a $install/sbin $fs
 	cp -a $install/etc $fs
-	cp -a $install/lib/libgudev*so* $fs/lib
+	cp -a $install/lib/libudev.so* $fs/lib
 	cp -a $install/lib/udev $fs/lib
 
 	# Copy rules files to udev conf dir
diff -r f7d9f142f79d -r f1752c8b2a2a man-db/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/man-db/description.txt	Fri Dec 30 02:04:27 2016 +0200
@@ -0,0 +1,23 @@
+`man-db` is an implementation of the standard Unix documentation system
+accessed using the `man` command. It uses a Berkeley DB database in place of
+the traditional flat-text whatis databases. `man-db` is used by several
+popular GNU/Linux distributions.
+
+Package contents:
+
+  * `accessdb` - Dumps the `whatis` database contents in human-readable form
+  * `apropos` - Searches the `whatis` database and displays the short
+    descriptions of system commands that contain a given string
+  * `catman` - Creates or updates the pre-formatted manual pages
+  * `lexgrog` - Displays one-line summary information about a given manual
+    page
+  * `man` - Formats and displays the requested manual page
+  * `mandb` - Creates or updates the `whatis` database
+  * `manpath` - Displays the contents of $MANPATH or (if $MANPATH is not set)
+    a suitable search path based on the settings in man.conf and the user's
+    environment
+  * `whatis` - Searches the whatis database and displays the short
+    descriptions of system commands that contain the given keyword as a
+    separate word
+  * `libman` - Contains run-time support for man
+  * `libmandb` - Contains run-time support for man
diff -r f7d9f142f79d -r f1752c8b2a2a man-db/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/man-db/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -0,0 +1,39 @@
+# SliTaz package receipt.
+
+PACKAGE="man-db"
+VERSION="2.7.5"
+CATEGORY="system-tools"
+SHORT_DESC="The on-line manual database"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL2"
+WEB_SITE="http://www.nongnu.org/man-db/"
+
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WGET_URL="http://download.savannah.gnu.org/releases/man-db/$TARBALL"
+
+DEPENDS="gdbm libpipeline zlib"
+BUILD_DEPENDS="groff bzip2-dev xz-dev gettext libpipeline-dev gdbm-dev \
+zlib-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	./configure \
+		--docdir=/usr/share/doc/$PACKAGE-$VERSION \
+		--sysconfdir=/etc \
+		--disable-setuid \
+		--with-browser=/usr/bin/lynx \
+		--with-vgrind=/usr/bin/vgrind \
+		--with-grap=/usr/bin/grap \
+		$CONFIGURE_ARGS &&
+	make && make install
+
+	sed -i "s:man root:root root:g" $install/usr/lib/tmpfiles.d/man-db.conf
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders bin libexec sbin
+	cook_copy_files *.conf *.so*
+}
diff -r f7d9f142f79d -r f1752c8b2a2a ncurses/receipt
--- a/ncurses/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/ncurses/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -12,7 +12,6 @@
 WGET_URL="http://ftp.gnu.org/gnu/ncurses/$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS=""
 BUILD_DEPENDS="flex"
 SPLIT="ncurses-libform ncurses-libmenu ncurses-libpanel ncurses-extra \
 ncurses-dev"
diff -r f7d9f142f79d -r f1752c8b2a2a python-dev/receipt
--- a/python-dev/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/python-dev/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -6,11 +6,10 @@
 SHORT_DESC="The Python programming language devel files."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="PSL"
-WANTED="python"
-SOURCE="Python"
 WEB_SITE="http://www.python.org/"
 HOST_ARCH="i486 arm"
 
+WANTED="python"
 DEPENDS="python"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -24,4 +23,3 @@
 	python_version=${VERSION:0:3}
 	rm $fs/usr/include/${WANTED}$python_version/pyconfig.h
 }
-
diff -r f7d9f142f79d -r f1752c8b2a2a python-idle/stuff/python-idle.desktop
--- a/python-idle/stuff/python-idle.desktop	Thu Dec 29 07:31:53 2016 +0200
+++ b/python-idle/stuff/python-idle.desktop	Fri Dec 30 02:04:27 2016 +0200
@@ -1,8 +1,6 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Python IDLE
-Terminal=false
 Exec=idle
 Icon=python
-Type=Application
 Categories=Development;
diff -r f7d9f142f79d -r f1752c8b2a2a python/receipt
--- a/python/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/python/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -6,16 +6,17 @@
 SHORT_DESC="The Python programming language."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="PSL"
-SOURCE="Python"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.python.org/"
-WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL"
 HOST_ARCH="i486 arm"
+COOKOPTS="!menus"
 
-RELATED="python-dev python-idle" # version must match
-DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm libffi"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.bz2"
+
+DEPENDS="openssl bzlib readline sqlite zlib ncurses gdbm libffi"
 BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \
-ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev wget libffi-dev"
+ncurses-dev tcl-dev tk-dev db-dev gdbm-dev libffi-dev"
+SPLIT="python-idle"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -39,7 +40,7 @@
 			./configure CC=gcc \
 				--disable-ipv6 \
 				--build=i486-slitaz-linux \
-				--host=${BUILD_SYSTEM} && 
+				--host=${BUILD_SYSTEM} &&
 			make python Parser/pgen &&
 			mv python hostpython &&
 			mv Parser/pgen Parser/hostpgen || exit 1
@@ -68,14 +69,18 @@
 				CROSS_COMPILE_TARGET=yes \
 				HOSTARCH=${HOST_SYSTEM} \
 				BUILDARCH=${BUILD_SYSTEM} || exit 1
-			make DESTDIR=$DESTDIR install || exit 1 ;;
+			make DESTDIR=$DESTDIR install || exit 1
+			;;
 		i?86)
 			./configure \
 				--enable-shared \
 				--build=${HOST_SYSTEM} \
 				--host=${HOST_SYSTEM} &&
-				make &&	make DESTDIR=$DESTDIR install ;;
+				make && make DESTDIR=$DESTDIR install
+			;;
 	esac
+
+	cp -a $stuff/applications $install/usr/share
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r f7d9f142f79d -r f1752c8b2a2a python/stuff/applications/python.desktop
--- a/python/stuff/applications/python.desktop	Thu Dec 29 07:31:53 2016 +0200
+++ b/python/stuff/applications/python.desktop	Fri Dec 30 02:04:27 2016 +0200
@@ -4,6 +4,7 @@
 Name[fr]=Interpreteur Python
 Name[pt]=Interpretador Python
 Name[pt_BR]=Interpretador Python
+Name[ru]=Интерпретатор Python
 Terminal=false
 Exec=terminal -e python
 Icon=python
diff -r f7d9f142f79d -r f1752c8b2a2a tk-dev/receipt
--- a/tk-dev/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/tk-dev/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -6,12 +6,11 @@
 SHORT_DESC="The TCL gui toolkit dev files"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
-SOURCE="tk"
 WEB_SITE="http://tcl.sourceforge.net/"
-WANTED="tk"
 HOST_ARCH="i486 arm"
 
-DEPENDS="tcl tk"
+WANTED="tk"
+DEPENDS="tcl tk xorg-libX11-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r f7d9f142f79d -r f1752c8b2a2a tk/receipt
--- a/tk/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/tk/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -6,12 +6,13 @@
 SHORT_DESC="The TCL gui toolkit"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
-TARBALL="${PACKAGE}${VERSION}-src.tar.gz"
 WEB_SITE="http://tcl.sourceforge.net/"
-WGET_URL="$SF_MIRROR/tcl/$TARBALL"
 TAGS="programming language"
 HOST_ARCH="i486 arm"
 
+TARBALL="$PACKAGE$VERSION-src.tar.gz"
+WGET_URL="$SF_MIRROR/tcl/$TARBALL"
+
 DEPENDS="tcl expat fontconfig freetype xorg-libX11 xorg-libXau xorg-libXdmcp \
 xorg-libXft xorg-libXrender zlib xorg-libXss"
 BUILD_DEPENDS="tcl-dev xorg-libX11-dev"
diff -r f7d9f142f79d -r f1752c8b2a2a vim-tiny/receipt
--- a/vim-tiny/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/vim-tiny/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -1,76 +1,67 @@
 # SliTaz package receipt.
 
 PACKAGE="vim-tiny"
-VERSION="7.3"
+VERSION="7.4"
 CATEGORY="editors"
 SHORT_DESC="Advanced text editor with no GUI"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="other"
-SOURCE="vim"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.vim.org/"
-WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
 CONFIG_FILES="/etc/vim/vimrc"
 TAGS="text-editor"
 
+TARBALL="vim-$VERSION.tar.bz2"
+WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
+
 DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	export LDFLAGS="$LDFLAGS -ltinfo"
-
-	# define the place for the global vimrc file (set to /etc/vim/vimrc)
-	# (patch from Arch Linux PKGBUILD)
-	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
+	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 
 	./configure --prefix=/usr \
-		--cache-file=$PWD/config.cache \
-		--infodir=/usr/share/info \
 		--with-features=tiny \
-		--with-x=no \
+		--without-x \
 		--disable-gui \
 		--enable-multibyte \
 		--with-vim-name=$PACKAGE \
 		--disable-acl \
-		--disable-motif-check \
-		--disable-athena-check \
-		--mandir=/usr/share/man $CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
+	make && make install
 
-	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
-	make DESTDIR=$DESTDIR install
 	mkdir -p $DESTDIR/etc/vim
 	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
+
+	mkdir -p $install/usr/share/doc
+	mv $install/usr/share/vim/vim*/doc $install/usr/share/doc/$PACKAGE-$VERSION
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share $fs/etc
-
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/vim $fs/usr/share
-	cp -a $install/etc/vim $fs/etc
-	rm -f $fs/usr/bin/*tutor
+	cook_copy_folders etc bin vim
+	rm -f  $fs/usr/bin/*tutor
+	rm -rf $fs/usr/share/vim/vim*/tutor
 }
 
 post_install()
 {
 	cmd=$(readlink "$1/bin/vi")
 	if [ "$cmd" != '/usr/bin/vim' ]; then
-		echo ''
+		echo
 		echo "**** Actual VI link : $cmd"
-		echo ''
-		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
+		echo
+		echo -n 'Do you want vim  for /bin/vi (y/N)? : '; read -t 30 anser
 		if [ "$anser" == 'y' ]; then
-			echo ''
+			echo
 			action 'Removing vi link to make a new one pointing on /usr/bin/vim...'
 			rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
 			status
 		else
-			echo ''
-			echo "Leaving /bin/vi to : $cmd"
+			echo
+			echo "Leaving /bin/vi to $cmd"
 		fi
 	fi
 }
diff -r f7d9f142f79d -r f1752c8b2a2a vim/receipt
--- a/vim/receipt	Thu Dec 29 07:31:53 2016 +0200
+++ b/vim/receipt	Fri Dec 30 02:04:27 2016 +0200
@@ -1,72 +1,63 @@
 # SliTaz package receipt.
 
 PACKAGE="vim"
-VERSION="7.3"
+VERSION="7.4"
 CATEGORY="editors"
 SHORT_DESC="Advanced text editor"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="other"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.vim.org/"
-WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
 CONFIG_FILES="/etc/vim/vimrc"
 TAGS="text-editor"
 
-DEPENDS="ncurses acl diffutils"
-BUILD_DEPENDS="ncurses-dev acl-dev diffutils"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
+
+DEPENDS="ncurses acl attr diffutils"
+# python may be removed after "ncursesw problem" solved
+BUILD_DEPENDS="python ncurses-dev acl-dev diffutils gettext"
+SIBLINGS="vim-tiny"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	export LDFLAGS="$LDFLAGS -ltinfo"
-
-	# define the place for the global vimrc file (set to /etc/vim/vimrc)
-	# (patch from Arch Linux PKGBUILD)
-	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
+	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 
 	./configure \
-		--prefix=/usr \
-		--cache-file=$PWD/config.cache \
-		--infodir=/usr/share/info \
-		--with-features=normal \
-		--with-x=no \
+		--without-x \
 		--disable-gui \
 		--enable-multibyte \
-		--disable-motif-check \
-		--disable-athena-check \
-		--mandir=/usr/share/man $CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
+	make && make install
 
-	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
-	make DESTDIR=$DESTDIR install
-	mkdir -p $DESTDIR/etc/vim
-	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
+	mkdir -p $install/etc/vim
+	cp -a $src/runtime/vimrc_example.vim $install/etc/vim/vimrc
+
+	mkdir -p $install/usr/share/doc
+	ln -s ../vim/vim*/doc $install/usr/share/doc/vim-$VERSION
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share $fs/etc
-	
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/vim $fs/usr/share
-	cp -a $install/etc/vim $fs/etc
+	cook_copy_folders etc bin vim
 }
 
 post_install()
 {
 	cmd=$(readlink "$1/bin/vi")
 	if [ "$cmd" != '/usr/bin/vim' ]; then
-		echo ''
+		echo
 		echo "**** Actual VI link : $cmd"
-		echo ''
-		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
+		echo
+		echo -n 'Do you want vim for /bin/vi (y/N)? : '; read -t 30 anser
 		if [ "$anser" == 'y' ]; then
-			echo ''
+			echo
 			echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...'
 			rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
 			status
 		else
-			echo ''
+			echo
 			echo "Leaving /bin/vi to : $cmd"
 		fi
 	fi
@@ -74,6 +65,5 @@
 
 post_remove()
 {
-	# restore previous symlink
 	ln -sf /bin/busybox "$1/bin/vi"
 }