# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1548423439 -7200
# Node ID 29128929e4f9f5cf30e2fc35803190c17f8652fd
# Parent  34bf9f28c37dc21b5db7ee6d36aa170f8c22d7dd
Small updates.

diff -r 34bf9f28c37d -r 29128929e4f9 LibreOffice/receipt
--- a/LibreOffice/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/LibreOffice/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -89,7 +89,7 @@
 		LibreOffice)
 			copy @std *.inc @rm
 			DEPENDS="atk libcairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
-			glib gpgme gst1-plugins-base gstreamer1 gtk2 icu lcms2 libassuan \
+			glib gpgme gst1-plugins-base gstreamer1 gtk2 icu liblcms2 libassuan \
 			libcomerr libcups libcurl libepoxy libgpg-error libicu libkrb5 \
 			libsqlite3 libxml2 libxslt neon nspr nss pango perl python \
 			libice libsm libx11 libxext libxinerama \
diff -r 34bf9f28c37d -r 29128929e4f9 alsa-lib/receipt
--- a/alsa-lib/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/alsa-lib/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="alsa-lib"
-VERSION="1.1.7"
+VERSION="1.1.8"
 CATEGORY="multimedia"
 SHORT_DESC="ALSA sound libraries"
 MAINTAINER="devel@slitaz.org"
@@ -11,7 +11,7 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/lib/$TARBALL"
-TARBALL_SHA1="eca62790517220297ec82ba8a5258bcb6e708866"
+TARBALL_SHA1="018523741f0b78ad5aa928202c11e6694a8c10c2"
 
 SPLIT="$PACKAGE-dev"
 
diff -r 34bf9f28c37d -r 29128929e4f9 alsa-utils/receipt
--- a/alsa-utils/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/alsa-utils/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="alsa-utils"
-VERSION="1.1.7"
+VERSION="1.1.8"
 CATEGORY="multimedia"
 SHORT_DESC="Command line utilities for the ALSA project"
 MAINTAINER="devel@slitaz.org"
@@ -11,7 +11,7 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/utils/$TARBALL"
-TARBALL_SHA1="5c9d6bee351c06baa645d89153d492199a60e66b"
+TARBALL_SHA1="36859b70c6b09458f9f28ae63d4fc3bf754b86b8"
 
 BUILD_DEPENDS="alsa-lib-dev ncurses-dev gettext-dev eudev-dev"
 SPLIT="$PACKAGE-test alsa-info $PACKAGE"
diff -r 34bf9f28c37d -r 29128929e4f9 argon2/receipt
--- a/argon2/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/argon2/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -1,7 +1,8 @@
 # SliTaz package receipt v2.
 
 PACKAGE="argon2"
-VERSION="20171227"
+COMMIT="6c8653c"
+VERSION="20181109"
 CATEGORY="security"
 SHORT_DESC="Password-hashing function (reference C implementation)"
 MAINTAINER="al.bobylev@gmail.com"
@@ -9,16 +10,19 @@
 WEB_SITE="https://github.com/P-H-C/phc-winner-argon2"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://github.com/P-H-C/phc-winner-argon2/archive/$VERSION/$TARBALL"
-TARBALL_SHA1="c398df55c8fffe70c9a952dd3f696115437234d8"
+WGET_URL="https://github.com/P-H-C/phc-winner-argon2/archive/$COMMIT.tar.gz"
+TARBALL_SHA1="48637563137fd0a3491637cae7571fe37b92d714"
 
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Make pkg-config file
-	sed "s|@VERSION@|$VERSION|" $stuff/libargon2.pc >libargon2.pc
+	sed -i "s|/@HOST_MULTIARCH@||; s|@UPSTREAM_VER@|$VERSION|" $src/libargon2.pc
 
 	make OPTTARGET=none &&
 	make OPTTARGET=none DESTDIR=$install install &&
-	install -Dm644 libargon2.pc $install/usr/lib/pkgconfig/libargon2.pc
+	install -Dm644 libargon2.pc $install/usr/lib/pkgconfig/libargon2.pc || return 1
+
+	cook_pick_manpages man/argon2.1
+	cook_pick_docs README.md argon2-specs.pdf
 }
diff -r 34bf9f28c37d -r 29128929e4f9 argon2/stuff/libargon2.pc
--- a/argon2/stuff/libargon2.pc	Thu Jan 24 14:52:33 2019 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libargon2
-Description: Development libraries for libargon2
-Version: @VERSION@
-Libs: -L${libdir} -largon2 -lrt -ldl
-Cflags:
-URL: https://github.com/P-H-C/phc-winner-argon2
diff -r 34bf9f28c37d -r 29128929e4f9 argon2/stuff/patches/README.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/argon2/stuff/patches/README.patch	Fri Jan 25 15:37:19 2019 +0200
@@ -0,0 +1,22 @@
+--- a/README.md
++++ b/README.md
+@@ -53,6 +53,7 @@
+ `argon2` is a command-line utility to test specific Argon2 instances
+ on your system. To show usage instructions, run
+ `./argon2 -h` as
++
+ ```
+ Usage:  ./argon2 [-h] salt [-i|-d|-id] [-t iterations] [-m memory] [-p parallelism] [-l hash length] [-e|-r] [-v (10|13)]
+         Password is read from stdin
+@@ -70,9 +71,11 @@
+         -v (10|13)      Argon2 version (defaults to the most recent version, currently 13)
+         -h              Print argon2 usage
+ ```
++
+ For example, to hash "password" using "somesalt" as a salt and doing 2
+ iterations, consuming 64 MiB, using four parallel threads and an output hash
+ of 24 bytes
++
+ ```
+ $ echo -n "password" | ./argon2 somesalt -t 2 -m 16 -p 4 -l 24
+ Type:           Argon2i
diff -r 34bf9f28c37d -r 29128929e4f9 argon2/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/argon2/stuff/patches/series	Fri Jan 25 15:37:19 2019 +0200
@@ -0,0 +1,2 @@
+# fix markdown
+README.patch
diff -r 34bf9f28c37d -r 29128929e4f9 blender/receipt
--- a/blender/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/blender/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -48,7 +48,7 @@
 	LOCALE="fr de pt_BR es ru zh_CN"
 	copy @std
 	DEPENDS="python3 mesa sdl libsamplerate libdrm jpeg glu openjpeg \
-	ffmpeg lcms openexr desktop-file-utils libgomp libtiff libpng freeglut \
+	ffmpeg liblcms openexr desktop-file-utils libgomp libtiff libpng freeglut \
 	freetype openal zlib librsvg glew boost-filesystem boost-regex \
 	boost-thread boost-date-time boost-dev" #boost-dev?
 	SUGGESTED="nvidia"
diff -r 34bf9f28c37d -r 29128929e4f9 cdparanoia/receipt
--- a/cdparanoia/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/cdparanoia/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -24,5 +24,5 @@
 	make -j1 &&
 	make install || return 1
 
-	find $install -type f \( -name '*.so*' -o -name '*.a' \) -exec chmod a+x '{}' \; # 644->755
+	find $install -type f -name '*.so*' -exec chmod a+x '{}' \; # 644->755
 }
diff -r 34bf9f28c37d -r 29128929e4f9 cinepaint-stable/receipt
--- a/cinepaint-stable/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/cinepaint-stable/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -33,7 +33,7 @@
 		cinepaint-stable)
 			copy @std
 			DEPENDS="atk libbzip2 libcairo fltk fontconfig freetype gdk-pixbuf glib \
-			gtk2 ilmbase lcms libffi libharfbuzz libjpeg-turbo liblzma \
+			gtk2 ilmbase liblcms libffi libharfbuzz libjpeg-turbo liblzma \
 			libpng libxml2 openexr pango pcre libtiff util-linux-blkid \
 			util-linux-mount util-linux-uuid libice libsm \
 			libx11 libxau libxdmcp libxext libxfixes \
diff -r 34bf9f28c37d -r 29128929e4f9 cinepaint/receipt
--- a/cinepaint/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/cinepaint/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="desktop-file-utils gtk2 lcms libtiff jpeg fltk ftgl libxmu \
+	DEPENDS="desktop-file-utils gtk2 liblcms libtiff jpeg fltk ftgl libxmu \
 	libxpm gutenprint zlib mesa jbigkit openexr"
 }
diff -r 34bf9f28c37d -r 29128929e4f9 claws-mail/receipt
--- a/claws-mail/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/claws-mail/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -127,7 +127,7 @@
 		*-pdfviewer)
 			copy pdf_viewer.so
 			CAT="mail|PDF viewer"
-			DEPENDS="claws-mail lcms2 libjpeg-turbo libpoppler libtiff"
+			DEPENDS="claws-mail liblcms2 libjpeg-turbo libpoppler libtiff"
 			;;
 		*-perl)
 			copy perl.so
diff -r 34bf9f28c37d -r 29128929e4f9 colord/receipt
--- a/colord/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/colord/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,12 +11,16 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.freedesktop.org/software/colord/releases/$TARBALL"
+TARBALL_SHA1="a845fb51a54dda936d1a9696e30cc3d947bfa628"
 
 BUILD_DEPENDS="meson ninja glib-dev lcms2-dev sqlite3-dev libgusb-dev \
 libgudev-dev vala polkit-dev gobject-introspection-dev gettext-dev \
 docbook-utils libxml2-tools gtk-doc dbus-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="eudev glib liblcms2 libgudev libgusb libsqlite3 polkit"
+DEPENDS_dev="$PACKAGE eudev-dev glib-dev lcms2-dev libgusb-dev"
+
 compile_rules() {
 	if ! grep -q colord "/etc/passwd"; then
 		addgroup -g 71 colord
@@ -43,19 +47,6 @@
 	# https://bugs.freedesktop.org/show_bug.cgi?id=106288 : unresolved
 }
 
-genpkg_rules() {
-	case $PACKAGE in
-		colord)
-			copy @std
-			DEPENDS="eudev glib lcms2 libgudev libgusb libsqlite3 polkit"
-			;;
-		colord-dev)
-			copy @dev
-			DEPENDS="colord eudev-dev glib-dev lcms2-dev libgusb-dev"
-			;;
-	esac
-}
-
 post_install_colord() {
 	if ! grep -q colord "$1/etc/group"; then
 		chroot "$1/" /usr/sbin/addgroup -g 71 colord
diff -r 34bf9f28c37d -r 29128929e4f9 cups-filters/receipt
--- a/cups-filters/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/cups-filters/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -33,7 +33,7 @@
 	case $PACKAGE in
 		cups-filters)
 			copy @std
-			DEPENDS="cups dbus fontconfig freetype glib ijs lcms2 libcups \
+			DEPENDS="cups dbus fontconfig freetype glib ijs liblcms2 libcups \
 			libgnutls libjpeg-turbo libpng libpoppler qpdf libtiff zlib"
 			;;
 		*-dev)
diff -r 34bf9f28c37d -r 29128929e4f9 desktop-file-utils/receipt
--- a/desktop-file-utils/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/desktop-file-utils/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -10,10 +10,22 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.freedesktop.org/software/desktop-file-utils/releases/$TARBALL"
+TARBALL_SHA1="10e9df65fdf2b896ce4d5f16616ea0df7c01d8f8"
 
 BUILD_DEPENDS="glib-dev glib-static"
 SPLIT="desktop-file-validate-static $PACKAGE-extra"
 
+COPY_std="bin/update-desktop-database"
+COPY_desktop_file_validate_static="sbin/"
+COPY_extra="@std @rm"
+
+CAT_desktop_file_validate_static="system tools|static desktop-file-validate"
+CAT_extra="system-tools|extra utils"
+
+DEPENDS_std="glib"
+DEPENDS_desktop_file_validate_static=" "
+DEPENDS_extra="glib"
+
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
@@ -27,23 +39,3 @@
 	make &&
 	make bin_PROGRAMS=desktop-file-validate LN_S=echo install
 }
-
-genpkg_rules() {
-	val='desktop-file-validate'
-	case $PACKAGE in
-		desktop-file-utils)
-			copy bin/update-desktop-database
-			DEPENDS="glib"
-			;;
-		*-static)
-			copy sbin/
-			CAT="system tools|static desktop-file-validate"
-			DEPENDS=" "
-			;;
-		*-extra)
-			copy @std @rm
-			CAT="system-tools|extra utils"
-			DEPENDS="glib"
-			;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 emacs/receipt
--- a/emacs/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/emacs/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -27,7 +27,7 @@
 DEPENDS_help="emacs"
 DEPENDS_lisp_sources="emacs"
 DEPENDS_std="$PACKAGE-common dbus fontconfig freetype gdk-pixbuf glib gtk2 \
-lcms2 libgnutls libice libpng librsvg libsm libx11 libxaw libxcb libxext \
+liblcms2 libgnutls libice libpng librsvg libsm libx11 libxaw libxcb libxext \
 libxfixes libxft libxinerama libxml2 libxmu libxpm libxrandr libxrender libxt \
 ncurses libtiff zlib"
 DEPENDS_common=" "
diff -r 34bf9f28c37d -r 29128929e4f9 eom/receipt
--- a/eom/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/eom/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -18,7 +18,7 @@
 SPLIT="$PACKAGE-dev"
 
 DEPENDS_std="atk libcairo dbus-glib exempi gdk-pixbuf glib gobject-introspection \
-gtk3 lcms2 libexif libjpeg-turbo libpeas libpeas-gtk librsvg libxml2 \
+gtk3 liblcms2 libexif libjpeg-turbo libpeas libpeas-gtk librsvg libxml2 \
 mate-desktop libx11 zlib"
 DEPENDS_dev="eom glib-dev gtk3-dev"
 
diff -r 34bf9f28c37d -r 29128929e4f9 evince/receipt
--- a/evince/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/evince/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -16,7 +16,7 @@
 poppler-dev tiff-dev dbus-glib-dev xorg-dev lcms2-dev"
 SPLIT="$PACKAGE-dev"
 
-DEPENDS_std="lcms libpoppler libtiff dbus-glib glib util-linux-uuid"
+DEPENDS_std="liblcms libpoppler libtiff dbus-glib glib util-linux-uuid"
 TAGS_std="viewer pdf tiff ps postscript dvi"
 
 compile_rules() {
diff -r 34bf9f28c37d -r 29128929e4f9 faad2/receipt
--- a/faad2/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/faad2/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -10,8 +10,13 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/faac/$TARBALL"
+TARBALL_SHA1="0d49c516d4a83c39053a9bd214fddba72cbc34ad"
 
-SPLIT="$PACKAGE-dev"
+SPLIT="$PACKAGE-dev $PACKAGE"
+
+COPY_dev="@dev *.so"
+
+TAGS_std="AAC decoder MP44 MPEG"
 
 compile_rules() {
 	./configure \
@@ -21,15 +26,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		faad2)
-			copy @std
-			TAGS="AAC decoder MP44 MPEG"
-			;;
-		*-dev)
-			copy @dev
-			;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 file/receipt
--- a/file/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/file/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,10 +11,29 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/file/file/archive/FILE${VERSION/./_}.tar.gz"
+TARBALL_SHA1="2a00782750d015cf654ace2e53239e02d28c09e9"
 
 BUILD_DEPENDS="automake libtool zlib-dev python python3"
 SPLIT="libmagic libmagic-dev python-magic python3-magic"
 
+COPY_std="file"
+COPY_libmagic="*.so.* magic.mgc"
+COPY_libmagic_dev="@dev *.so"
+COPY_python_magic="python2*/"
+COPY_python3_magic="python3*/"
+
+DEPENDS_std="libmagic"
+DEPENDS_libmagic="zlib"
+DEPENDS_libmagic_dev="libmagic"
+DEPENDS_python_magic="$PACKAGE python"
+DEPENDS_python3_magic="$PACKAGE python"
+
+CAT_libmagic="libs|shared library"
+CAT_python_magic="development|Python2 bindings"
+CAT_python3_magic="development|Python3 bindings"
+
+TAGS_std="LFS"
+
 compile_rules() {
 	autoreconf -f -i &&
 	./configure \
@@ -39,32 +58,3 @@
 testsuite() {
 	readelf -h $install/usr/bin/file
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		file)
-			copy file magic.mgc
-			DEPENDS="libmagic"
-			TAGS="LFS"
-			;;
-		libmagic)
-			copy *.so*
-			CAT="libs|library"
-			DEPENDS="zlib"
-			;;
-		libmagic-dev)
-			copy @dev
-			DEPENDS="libmagic"
-			;;
-		python-magic)
-			copy python2*/
-			CAT="development|Python bindings"
-			DEPENDS="file python"
-			;;
-		python3-magic)
-			copy python3*/
-			CAT="development|Python bindings"
-			DEPENDS="file python"
-			;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 flac/.icon.png
Binary file flac/.icon.png has changed
diff -r 34bf9f28c37d -r 29128929e4f9 flac/receipt
--- a/flac/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/flac/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -10,29 +10,23 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://downloads.xiph.org/releases/flac/$TARBALL"
+TARBALL_SHA1="2bdbb56b128a780a5d998e230f2f4f6eb98f33ee"
 TARBALL_SHA256="91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f"
 
 BUILD_DEPENDS="libogg-dev"
 SPLIT="$PACKAGE-dev"
 
+COPY_std="bin/ *.so.*"
+COPY_dev="@dev *.so"
+
+DEPENDS_std="libogg"
+DEPENDS_dev="$PACKAGE libogg-dev"
+
+TAGS_std="codec audio"
+
 compile_rules() {
-	# gcc4 fix: http://bugs.gentoo.org/199579
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		flac)
-			copy @std
-			DEPENDS="libogg"
-			TAGS="codec audio"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="flac libogg-dev"
-			;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 fribidi/receipt
--- a/fribidi/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/fribidi/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,20 +11,17 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://github.com/fribidi/fribidi/releases/download/v$VERSION/$TARBALL"
+TARBALL_SHA1="39d2bcb3ef93365222e7cdaf648cd167785ec3bf"
 
 BUILD_DEPENDS="glib-dev"
 SPLIT="$PACKAGE-dev"
 
+COPY_std="fribidi *.so.*"
+COPY_dev="@dev *.so"
+
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		fribidi) copy @std;;
-		*-dev)   copy @dev;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 galculator/receipt
--- a/galculator/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/galculator/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -10,10 +10,10 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://galculator.mnim.org/downloads/$TARBALL"
+TARBALL_SHA1="7e4c46192e78fec9d7e55c91b3945d212aa13434"
 
 BUILD_DEPENDS="gtk2-dev flex intltool"
-
-COOKOPTS="!pixmaps !menus"
+DEPENDS="glib gtk2 pango"
 
 compile_rules() {
 	./configure \
@@ -23,15 +23,5 @@
 	make &&
 	make install || return 1
 
-	sed -i 's|Icon=.*|Icon=accessories-calculator|;
-		s|Categories=.*|Categories=Utility;Calculator;|' \
-		$install/usr/share/applications/galculator.desktop
+	rm -r $install/usr/share/pixmaps
 }
-
-genpkg_rules() {
-	copy @std
-	rm -r $fs/usr/share/pixmaps
-	find $fs -name '*gtk3*' -delete
-	sed -i 's|^[ ]*||g' $fs/usr/share/galculator/ui/*
-	DEPENDS="glib gtk2 pango"
-}
diff -r 34bf9f28c37d -r 29128929e4f9 galculator/stuff/patches/galculator.desktop.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/galculator/stuff/patches/galculator.desktop.patch	Fri Jan 25 15:37:19 2019 +0200
@@ -0,0 +1,8 @@
+--- a/galculator.desktop.in
++++ b/galculator.desktop.in
+@@ -7,4 +7,4 @@
+ Terminal=false
+ Type=Application
+-Categories=Utility;
++Categories=Utility;Calculator;
+ StartupNotify=true
diff -r 34bf9f28c37d -r 29128929e4f9 galculator/stuff/patches/no-gtk3-ui.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/galculator/stuff/patches/no-gtk3-ui.patch	Fri Jan 25 15:37:19 2019 +0200
@@ -0,0 +1,23 @@
+--- a/ui/Makefile.in
++++ b/ui/Makefile.in
+@@ -298,20 +298,14 @@
+ uidir = $(datadir)/galculator/ui
+ ui_DATA = about.ui \
+ 		prefs_gtk2.ui \
+-		prefs_gtk3.ui \
+ 		prefs-ume.ui \
+ 		main_frame.ui \
+ 		main_frame_hildon.ui \
+ 		scientific_buttons_gtk2.ui \
+-		scientific_buttons_gtk3.ui \
+ 		basic_buttons_gtk2.ui \
+-		basic_buttons_gtk3.ui \
+ 		dispctrl_bottom_gtk2.ui \
+-		dispctrl_bottom_gtk3.ui \
+ 		dispctrl_right_gtk2.ui \
+-		dispctrl_right_gtk3.ui \
+ 		dispctrl_right_vertical_gtk2.ui \
+-		dispctrl_right_vertical_gtk3.ui \
+ 		classic_view.ui \
+ 		paper_view.ui
+ 
diff -r 34bf9f28c37d -r 29128929e4f9 galculator/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/galculator/stuff/patches/series	Fri Jan 25 15:37:19 2019 +0200
@@ -0,0 +1,2 @@
+galculator.desktop.patch
+no-gtk3-ui.patch
diff -r 34bf9f28c37d -r 29128929e4f9 gambas2/receipt
--- a/gambas2/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gambas2/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpoppler util-linux-uuid lcms2 libtiff jpeg libpng"
+	DEPENDS="libpoppler util-linux-uuid liblcms2 libtiff jpeg libpng"
 	TAGS="interpreter basic"
 }
diff -r 34bf9f28c37d -r 29128929e4f9 gawk/receipt
--- a/gawk/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gawk/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,10 +11,14 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+TARBALL_SHA1="3b0bf6beeaa2171bcd2413c906f32432653bcecf"
 
 BUILD_DEPENDS="readline-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
+DEPENDS_std="readline"
+TAGS_std="LFS"
+
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
@@ -22,14 +26,3 @@
 
 	cook_pick_docs doc/awkforai.txt doc/*.eps doc/*.pdf doc/*.jpg
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		gawk)
-			copy @std
-			DEPENDS="readline"
-			TAGS="LFS"
-			;;
-		*-dev) copy @dev;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 gcolor2/receipt
--- a/gcolor2/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gcolor2/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -3,15 +3,18 @@
 PACKAGE="gcolor2"
 VERSION="0.4"
 CATEGORY="graphics"
-SHORT_DESC="Light and simple color selector"
+SHORT_DESC="GTK+2 color selector"
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcolor2.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+TARBALL_SHA1="7cfa173825d486c54a5358b6f41e679d8a2cd5b6"
 
 BUILD_DEPENDS="gfortran intltool perl-xml-parser gtk2-dev file"
+DEPENDS="atk gdk-pixbuf glib gtk2"
+SUGGESTED="rgb"
 
 compile_rules() {
 	cp $stuff/*.po* $src/po
@@ -20,12 +23,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$install install
+	make DESTDIR=$install install || return 1
+
+	rm -r $install/usr/share/pixmaps/ # patched, so pixmaps no more required
 }
-
-genpkg_rules() {
-	COOKOPTS="!pixmaps"
-	copy bin/
-	DEPENDS="atk gdk-pixbuf glib gtk2"
-	SUGGESTED="rgb"
-}
diff -r 34bf9f28c37d -r 29128929e4f9 gcr/receipt
--- a/gcr/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gcr/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="gcr"
-VERSION="3.28.0"
+VERSION="3.28.1"
 CATEGORY="security"
 SHORT_DESC="Displaying certificates and accessing key stores"
 MAINTAINER="al.bobylev@gmail.com"
@@ -11,10 +11,21 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gcr/${VERSION%.*}/$TARBALL"
+TARBALL_SHA1="947ca5958d20f9d648e82210f056ff5ed63d9ccc"
 
 BUILD_DEPENDS="intltool gtk-doc gobject-introspection-dev gtk3-dev vala \
 p11-kit-dev libgcrypt-dev"
-SPLIT="$PACKAGE-base $PACKAGE $PACKAGE-dev"
+SPLIT="$PACKAGE-base $PACKAGE-dev $PACKAGE"
+
+COPY_base="libgcr-base-3.so.* libgck-1.so.*"
+COPY_dev="@dev *.so"
+COPY_std="@std @rm *.mo @ico"
+
+DEPENDS_base="glib libgcrypt libp11-kit"
+DEPENDS_std="$PACKAGE-base gdk-pixbuf glib gtk3 libcairo libgcrypt pango"
+DEPENDS_dev="$PACKAGE $PACKAGE-base glib-dev gtk3-dev p11-kit-dev"
+
+CAT_base="security|base files"
 
 compile_rules() {
 	sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml
@@ -24,22 +35,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		gcr-base)
-			copy libgcr-base-3.so* libgck-1.so*
-			DEPENDS="glib libgcrypt libp11-kit"
-			CAT="security|base files"
-			;;
-		gcr)
-			copy @std @rm *.mo @ico
-			DEPENDS="libcairo gcr-base gdk-pixbuf glib gtk3 libgcrypt pango"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="gcr gcr-base \
-			glib-dev gtk3-dev p11-kit-dev"
-			;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 gdk-pixbuf/receipt
--- a/gdk-pixbuf/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gdk-pixbuf/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,12 +11,19 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
+TARBALL_SHA1="6e6bef71a1f06ecd1cd282d074ae068f89867144"
 
 BUILD_DEPENDS="meson ninja glib-dev shared-mime-info-dev libpng-dev \
-libjpeg-turbo-dev tiff-dev gobject-introspection-dev libx11-dev \
-gettext-dev libxslt docbook-xsl libxml2-tools"
+libjpeg-turbo-dev tiff-dev gobject-introspection-dev libx11-dev gettext-dev \
+libxslt docbook-xsl libxml2-tools"
 SPLIT="$PACKAGE-dev $PACKAGE"
 
+COPY_dev="@dev gdk-pixbuf-csource libgdk_pixbuf-2.0.so libgdk_pixbuf_xlib-2.0.so"
+
+DEPENDS_std="glib libjpeg-turbo libpng libtiff libx11"
+DEPENDS_dev="$PACKAGE glib-dev shared-mime-info-dev libx11-dev"
+# gdk-pixbuf-csource use shared-mime-info to detect the image file format
+
 compile_rules() {
 	mkdir build
 	cd    build
@@ -30,20 +37,6 @@
 	touch $install/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 }
 
-genpkg_rules() {
-	case $PACKAGE in
-		*-dev)
-			copy @dev gdk-pixbuf-csource
-			DEPENDS="gdk-pixbuf glib-dev shared-mime-info-dev libx11-dev"
-			# gdk-pixbuf-csource use shared-mime-info to detect the image file format
-			;;
-		*)
-			copy @std @rm
-			DEPENDS="glib libjpeg-turbo libpng libtiff libx11"
-			;;
-	esac
-}
-
 # Updating gdk pixbuf loaders cache file...
 post_install_gdk_pixbuf() {
 	chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders > /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
diff -r 34bf9f28c37d -r 29128929e4f9 geeqie/receipt
--- a/geeqie/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/geeqie/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk libcairo fontconfig freetype gdk-pixbuf glib gtk2 lcms2 \
+	DEPENDS="atk libcairo fontconfig freetype gdk-pixbuf glib gtk2 liblcms2 \
 	libjpeg-turbo pango libtiff"
 }
diff -r 34bf9f28c37d -r 29128929e4f9 gegl/receipt
--- a/gegl/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gegl/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -43,7 +43,7 @@
 			;;
 		*-extra)
 			copy @std @rm
-			DEPENDS="babl libcairo ffmpeg gdk-pixbuf gegl glib jasper lcms2 \
+			DEPENDS="babl libcairo ffmpeg gdk-pixbuf gegl glib jasper liblcms2 \
 			liblua libraw librsvg sdl libwebp openexr pango libtiff"
 			CAT="system-tools|extra plugins"
 			;;
diff -r 34bf9f28c37d -r 29128929e4f9 giflib/receipt
--- a/giflib/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/giflib/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,8 +11,11 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/giflib/$TARBALL"
+TARBALL_SHA1="5f1157cfc377916280849e247b8e34fa0446513f"
 
-SPLIT="$PACKAGE-dev"
+SPLIT="$PACKAGE-dev $PACKAGE"
+
+COPY_dev="@dev *.so"
 
 compile_rules() {
 	./configure \
@@ -22,10 +25,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		giflib) copy @std;;
-		*-dev)  copy @dev;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 gimp/receipt
--- a/gimp/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gimp/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -46,7 +46,7 @@
 			copy bin/gimp-console*
 			CAT="graphics|console"
 			DEPENDS="babl libcairo fontconfig freetype gdk-pixbuf gegl gexiv2 \
-			gimp glib lcms2 libharfbuzz libmypaint pango zlib"
+			gimp glib liblcms2 libharfbuzz libmypaint pango zlib"
 			;;
 		*-dev)
 			copy @dev
@@ -59,14 +59,14 @@
 				-o -name screenshot \) -delete # -> main package
 			CAT="graphics|plug-ins suite for advanced users"
 			DEPENDS="aalib babl libbzip2 libcairo gdk-pixbuf gegl gexiv2 gimp glib \
-			gtk2 ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng \
+			gtk2 ilmbase liblcms2 libheif libjpeg-turbo liblzma libmng libpng \
 			librsvg libwebp libwmf openexr openjpeg2 pango libpoppler libtiff \
 			libx11 libxcursor libxpm zlib"
 			;;
 		gimp)
 			copy @std @rm # all the rest
 			DEPENDS="babl libcairo fontconfig freetype gdk-pixbuf gegl gexiv2 \
-			glib gtk2 lcms2 libgudev libharfbuzz libjpeg-turbo libmypaint \
+			glib gtk2 liblcms2 libgudev libharfbuzz libjpeg-turbo libmypaint \
 			libpng pango libx11 libxext libxfixes libxmu \
 			zlib"
 			SUGGESTED="gimp-plug-ins gimp-brushes gimp-console \
diff -r 34bf9f28c37d -r 29128929e4f9 gnome-online-accounts/receipt
--- a/gnome-online-accounts/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gnome-online-accounts/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="gnome-online-accounts"
-VERSION="3.30.0"
+VERSION="3.30.1"
 CATEGORY="network"
 SHORT_DESC="Client for GNOME web services"
 MAINTAINER="al.bobylev@gmail.com"
@@ -10,12 +10,18 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
+TARBALL_SHA1="211d5130f30ea9c90064c21b4b0f2de3b3e107d2"
 
 BUILD_DEPENDS="glib-dev libxslt gobject-introspection-dev vala gtk3-dev \
 webkit2gtk-dev json-glib-dev rest-dev libsecret-dev krb5-dev gettext-dev \
 docbook-xsl"
 SPLIT="$PACKAGE-dev"
 
+COPY_std="@std @ico"
+
+DEPENDS_std="glib gtk3 json-glib libsecret libsoup libxml2 rest webkit2gtk"
+DEPENDS_dev="$PACKAGE glib-dev gtk3-dev"
+
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -26,17 +32,3 @@
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		gnome-online-accounts)
-			copy @std @ico
-			DEPENDS="glib gtk3 json-glib libsecret libsoup libxml2 rest \
-			webkit2gtk"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="gnome-online-accounts glib-dev gtk3-dev"
-			;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 gnupg/receipt
--- a/gnupg/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/gnupg/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="gnupg"
-VERSION="2.2.10"
+VERSION="2.2.12"
 CATEGORY="security"
 SHORT_DESC="Free implementation of the OpenPGP"
 MAINTAINER="devel@slitaz.org"
@@ -11,14 +11,19 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/gnupg/$TARBALL"
+TARBALL_SHA1="2aeccc35ea8034306ff7a1072b84abbaa79619c3"
 # https://www.gnupg.org/download/integrity_check.html
-TARBALL_SHA1="3e87504e2ca317718aa9b6299947ebf7e906b54e"
 
 BUILD_DEPENDS="libgpg-error-dev libassuan-dev libgcrypt-dev libksba-dev \
 npth-dev perl libusb-dev sqlite3-dev gettext-dev zlib-dev bzip2-dev \
 readline-dev texinfo gnutls-dev openldap-dev"
+DEPENDS="libassuan libbzip2 libgcrypt libgnutls libgpg-error libksba libldap \
+libsqlite3 libusb npth readline zlib   pinentry"
 
 compile_rules() {
+	sed -e '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' \
+		-i tools/Makefile.in # to build gpg-zip
+
 	./configure \
 		--enable-symcryptrun \
 		--enable-maintainer-mode \
@@ -28,26 +33,8 @@
 	makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi &&
 	make install || return 1
 
-	# FIXME.
-	# Looks like functions install-exec-hook() from g10/Makefile work in
-	# an unexpected manner. It required to spend too many time in debugging, so
-	# better I'll apply here "fast and dirty hack" that will make the same:
-	install -m755 g10/gpg  $install/usr/bin/gpg2
-	install -m755 g10/gpgv $install/usr/bin/gpgv2
-	# The same "hack" for doc/Makefile
-	cook_pick_manpages doc/gpg.1 doc/gpgv.1
-
-	docdir="$install/usr/share/doc/gnupg-$VERSION"
+	docdir="$install/usr/share/doc/$PACKAGE-$VERSION"
 	install -v -m755 -d $docdir/html
 	install -v -m644    doc/gnupg_nochunks.html  $docdir/html/gnupg.html
 	install -v -m644    doc/*.texi doc/gnupg.txt $docdir
-
-	ln -svf gpg2  $install/usr/bin/gpg
-	ln -svf gpgv2 $install/usr/bin/gpgv
 }
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="libbzip2 libassuan libgcrypt libgnutls libgpg-error libksba libldap \
-	libsqlite3 libusb npth readline zlib   pinentry"
-}
diff -r 34bf9f28c37d -r 29128929e4f9 hicolor-icon-theme/receipt
--- a/hicolor-icon-theme/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/hicolor-icon-theme/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,13 +11,12 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://icon-theme.freedesktop.org/releases/$TARBALL"
+TARBALL_SHA1="192d95efc13adf1fd35442d086733df25826cf2c"
+
+COPY="index.theme 16x16/"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	copy index.theme 16x16/
-}
diff -r 34bf9f28c37d -r 29128929e4f9 imagemagick/receipt
--- a/imagemagick/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/imagemagick/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -59,7 +59,7 @@
   <policy domain="coder" rights="none" pattern="WIN" />
   <policy domain="coder" rights="none" pattern="PLT" />
 EOT
-			DEPENDS="libbzip2 libcairo fftw fontconfig freetype glib lcms2 libgomp \
+			DEPENDS="libbzip2 libcairo fftw fontconfig freetype glib liblcms2 libgomp \
 			libjpeg-turbo libltdl liblzma libpng librsvg libxml2 openexr \
 			pango libtiff libx11 libxext zlib"
 			TAGS="image photo toolkit"
diff -r 34bf9f28c37d -r 29128929e4f9 imagemagick6/receipt
--- a/imagemagick6/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/imagemagick6/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -50,7 +50,7 @@
   <policy domain="coder" rights="none" pattern="WIN" />
   <policy domain="coder" rights="none" pattern="PLT" />
 EOT
-			DEPENDS="libbzip2 libcairo fftw fontconfig freetype glib lcms2 libgomp \
+			DEPENDS="libbzip2 libcairo fftw fontconfig freetype glib liblcms2 libgomp \
 			libjpeg-turbo libltdl liblzma libpng libxml2 openexr pango libtiff \
 			libx11 libxext zlib"
 			TAGS="image photo toolkit"
diff -r 34bf9f28c37d -r 29128929e4f9 indent/receipt
--- a/indent/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/indent/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -4,12 +4,13 @@
 VERSION="2.2.12"
 CATEGORY="utilities"
 SHORT_DESC="A tool for formatting C code"
-MAINTAINER="lufeng369@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/indent/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+TARBALL_SHA1="eecb3d7e78516d846af70e7bc86aabac9b92399c"
 
 BUILD_DEPENDS="gettext-dev texi2html texinfo"
 
@@ -20,7 +21,3 @@
 		docdir=/usr/share/doc/$PACKAGE-$VERSION \
 		install
 }
-
-genpkg_rules() {
-	copy @std
-}
diff -r 34bf9f28c37d -r 29128929e4f9 inkscape/receipt
--- a/inkscape/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/inkscape/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -57,7 +57,7 @@
 			copy @std @rm
 			DEPENDS="aspell atk atkmm libcairo cairomm fontconfig freetype gc \
 			gdk-pixbuf glib glibmm gnome-vfs gsl gtk2 gtkmm gtkspell \
-			imagemagick6 lcms2 libcdr libgiomm libgomp libjpeg-turbo libpng \
+			imagemagick6 liblcms2 libcdr libgiomm libgomp libjpeg-turbo libpng \
 			librevenge libsigc++ libvisio libwpg libxml2 libxslt pango pangomm \
 			perl libpoppler popt potrace python libx11 zlib"
 			TAGS="image vector editor svg"
diff -r 34bf9f28c37d -r 29128929e4f9 intltool/receipt
--- a/intltool/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/intltool/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -12,6 +12,7 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://launchpad.net/intltool/trunk/$VERSION/+download/$TARBALL"
+TARBALL_SHA1="a0c3bcb99d1bcfc5db70f8d848232a47c47da090"
 
 BUILD_DEPENDS="perl perl-xml-parser"
 
diff -r 34bf9f28c37d -r 29128929e4f9 iso-codes/receipt
--- a/iso-codes/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/iso-codes/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -12,6 +12,7 @@
 
 TARBALL="iso-codes-iso-codes-$VERSION.tar.gz"
 WGET_URL="https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/iso-codes-$VERSION/$TARBALL"
+TARBALL_SHA1="615314cb26815ed2f86cd7d109b7677aec5ebdf3"
 
 BUILD_DEPENDS="gettext-dev python3"
 SPLIT="$PACKAGE-dev"
diff -r 34bf9f28c37d -r 29128929e4f9 json-c/receipt
--- a/json-c/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/json-c/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,10 +11,14 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://s3.amazonaws.com/json-c_releases/releases/$TARBALL"
+TARBALL_SHA1="00e049ffc9878b9c2e3c3dcb6b58c4ce9e65024b"
 
 BUILD_DEPENDS="automake"
 SPLIT="$PACKAGE-dev"
 
+COPY_std="*.so.*"
+COPY_dev="@dev *.so"
+
 compile_rules() {
 	./configure \
 		--disable-static \
@@ -23,10 +27,3 @@
 	make -j1 &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		json-c) copy @std;;
-		*-dev)  copy @dev;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 kbd/receipt
--- a/kbd/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/kbd/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,10 +11,42 @@
 
 TARBALL="kbd-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
+TARBALL_SHA1="9aeac5556b827a9f13ccdb25257a1ac4b0243387"
 
 BUILD_DEPENDS="check-dev bison flex gettext-dev patch pam-dev busybox"
 SPLIT="$PACKAGE-base $PACKAGE-vlock $PACKAGE-busybox $PACKAGE"
 
+COPY_base="loadkeys setfont \
+be-latin1.map*    fr-latin1.map*  dvorak.map*       dvorak-r.map*  \
+dvorak-l.map*     br-abnt2.map*   cf.map*           cz-lat2.map*   \
+dk-latin1.map*    qwerty/es.map*  fi.map*           gr.map*        \
+gr-pc.map*        it.map*         is-latin1.map*    jp106.map*     \
+nl2.map*          no-latin1.map*  pl2.map*          pt-latin1.map* \
+ru.map*           se-lat6.map*    tr_q-latin5.map*  trq.map*       \
+uk.map*           us-acentos.map* us.map*           croat.map*     \
+de_CH-latin1.map* de-latin1.map*  fr_CH-latin1.map* hu.map*        \
+sg-latin1.map*    slovene.map*    hr.map* \
+\
+azerty-layout.inc compose.inc euro1.inc euro1.map.gz euro2.map.gz \
+linux-keys-bare.inc linux-with-alt-and-altgr.inc \
+linux-with-two-alt-keys.inc qwerty-layout.inc qwertz-layout.inc \
+compose.latin1"
+COPY_vlock="vlock"
+COPY_busybox="*.kmap"
+COPY_std="bin/ kbd/ @rm"
+
+DEPENDS_base=" "
+DEPENDS_vlock="pam"
+DEPENDS_busybox="busybox"
+DEPENDS_std="$PACKAGE-base"
+
+CAT_base="base-system|loadkeys and setfont utilities"
+CAT_vlock="system-tools|vlock - Virtual Console lock program"
+CAT_busybox="base-system|mappings for busybox"
+
+TAGS_vlock="console"
+TAGS_std="LFS keyboard"
+
 compile_rules() {
 	sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure
 	sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in
@@ -48,8 +80,9 @@
 	mkdir -p $install/usr/share/kmap
 	for i in $(find $install/usr/share/kbd/keymaps/i386 -name '*.map.gz' | grep -v 'include'); do
 		j=$(basename $i .map.gz)
-		echo $j
+		action "Making $j.kmap..."
 		$install/usr/bin/loadkeys -ub $i > $install/usr/share/kmap/$j.kmap
+		status
 	done
 }
 
@@ -58,45 +91,3 @@
 	readelf -h $install/usr/bin/loadkeys
 	readelf -h $install/usr/bin/setfont
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		kbd-base)
-			copy loadkeys setfont \
-			\
-			be-latin1.map*    fr-latin1.map*  dvorak.map*       dvorak-r.map*  \
-			dvorak-l.map*     br-abnt2.map*   cf.map*           cz-lat2.map*   \
-			dk-latin1.map*    es.map*         fi.map*           gr.map*        \
-			gr-pc.map*        it.map*         is-latin1.map*    jp106.map*     \
-			nl2.map*          no-latin1.map*  pl2.map*          pt-latin1.map* \
-			ru.map*           se-lat6.map*    tr_q-latin5.map*  trq.map*       \
-			uk.map*           us-acentos.map* us.map*           croat.map*     \
-			de_CH-latin1.map* de-latin1.map*  fr_CH-latin1.map* hu.map*        \
-			sg-latin1.map*    slovene.map*    hr.map* \
-			\
-			azerty-layout.inc compose.inc euro1.inc euro1.map.gz euro2.map.gz \
-			linux-keys-bare.inc linux-with-alt-and-altgr.inc \
-			linux-with-two-alt-keys.inc qwerty-layout.inc qwertz-layout.inc \
-			compose.latin1
-			rm -rf $fs/usr/share/kbd/keymaps/i386/olpc
-			DEPENDS=" "
-			CAT="base-system|loadkeys and setfont utilities"
-			;;
-		kbd-vlock)
-			copy vlock
-			CAT="system-tools|vlock - Virtual Console lock program"
-			DEPENDS="pam"
-			TAGS="console"
-			;;
-		kbd-busybox)
-			copy *.kmap
-			DEPENDS="busybox"
-			CAT="base-system|mappings for busybox"
-			;;
-		kbd)
-			copy bin/ kbd/ @rm
-			DEPENDS="kbd-base"
-			TAGS="LFS keyboard"
-			;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 kmod/receipt
--- a/kmod/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/kmod/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,9 +11,19 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE$TARBALL"
+TARBALL_SHA1="761ee76bc31f5db10d470dad607a5f9d68acef68"
 
 BUILD_DEPENDS="zlib-dev xz-dev tar"
-SPLIT="$PACKAGE-dev"
+SPLIT="$PACKAGE-dev $PACKAGE"
+
+COPY_dev="@dev *.so"
+
+# please keep glibc-base here because kmod used in the post-install
+# of linux-* packages and will not work instead
+DEPENDS_std="glibc-base zlib liblzma"
+DEPENDS_dev="$PACKAGE xz-dev"
+
+TAGS_std="LFS"
 
 compile_rules() {
 	./configure \
@@ -35,19 +45,4 @@
 	ln -s kmod $install/bin/lsmod
 }
 
-genpkg_rules() {
-	case $PACKAGE in
-		kmod)
-			copy @std
-			PROVIDE="modules-init-tools depmod"
-			# please keep glibc-base here because kmod used in the post-install
-			# of linux-* packages and will not work instead
-			DEPENDS="glibc-base zlib liblzma"
-			TAGS="LFS"
-			;;
-		*-dev)
-			copy @dev
-			DEPENDS="kmod xz-dev"
-			;;
-	esac
-}
+PROVIDE_std="modules-init-tools depmod"
diff -r 34bf9f28c37d -r 29128929e4f9 lcms/receipt
--- a/lcms/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/lcms/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -3,7 +3,7 @@
 PACKAGE="lcms"
 VERSION="1.19"
 CATEGORY="graphics"
-SHORT_DESC="A free color management engine in 100K"
+SHORT_DESC="A free color management engine"
 MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.littlecms.com/"
@@ -11,9 +11,19 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+TARBALL_SHA1="d5b075ccffc0068015f74f78e4bc39138bcfe2d4"
 
 BUILD_DEPENDS="tiff-dev libjpeg-turbo-dev zlib-dev gfortran xz-dev"
-SPLIT="$PACKAGE-dev $PACKAGE-apps"
+SPLIT="lib$PACKAGE $PACKAGE-dev $PACKAGE"
+
+COPY_liblcms="*.so.*"
+COPY_dev="@dev *.so"
+
+CAT_liblcms="graphics|shared library"
+
+DEPENDS_liblcms=" "
+DEPENDS_std="lib$PACKAGE libjpeg-turbo libtiff"
+DEPENDS_dev="$PACKAGE"
 
 compile_rules() {
 	./configure \
@@ -25,17 +35,3 @@
 
 	cook_pick_docs README.1ST doc/*
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		lcms)
-			copy *.so*
-			;;
-		lcms-apps)
-			copy bin/
-			CAT="development|applications"
-			DEPENDS="lcms libjpeg-turbo libtiff"
-			;;
-		*-dev) copy @dev;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 lcms2/receipt
--- a/lcms2/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/lcms2/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,29 +11,25 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lcms/$TARBALL"
+TARBALL_SHA1="60bea9875e017dd1c466e988c2ad98f8766e4e55"
 
 BUILD_DEPENDS="libjpeg-turbo-dev zlib-dev tiff-dev"
-SPLIT="$PACKAGE-apps $PACKAGE-dev"
+SPLIT="lib$PACKAGE $PACKAGE-static $PACKAGE-dev $PACKAGE"
+
+COPY_liblcms2="*.so.*"
+COPY_static="*.a"
+COPY_dev="@dev @rm *.so"
+
+CAT_liblcms="graphics|shared library"
+CAT_static="development|static library"
+
+DEPENDS_liblcms2=" "
+DEPENDS_static=" "
+DEPENDS_std="lib$PACKAGE libjpeg-turbo libtiff"
 
 compile_rules() {
-	# don't use --disable-static: optipng-static require such lib
-
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make install
 }
-
-genpkg_rules() {
-	case $PACKAGE in
-		lcms2)
-			copy *.so*
-			;;
-		lcms2-apps)
-			copy bin/
-			CAT="graphics|applications"
-			DEPENDS="lcms2 libjpeg-turbo libtiff"
-			;;
-		*-dev) copy @dev;;
-	esac
-}
diff -r 34bf9f28c37d -r 29128929e4f9 libcdr/receipt
--- a/libcdr/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/libcdr/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		libcdr)
 			copy @std
-			DEPENDS="icu lcms2 libicu librevenge zlib"
+			DEPENDS="icu liblcms2 libicu librevenge zlib"
 			;;
 		*-dev)
 			copy @dev
diff -r 34bf9f28c37d -r 29128929e4f9 libmng/receipt
--- a/libmng/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/libmng/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		libmng) copy @std; DEPENDS="lcms2 libjpeg-turbo zlib";;
+		libmng) copy @std; DEPENDS="liblcms2 libjpeg-turbo zlib";;
 		*-dev)  copy @dev; DEPENDS="libmng lcms2-dev libjpeg-turbo-dev zlib-dev";;
 	esac
 }
diff -r 34bf9f28c37d -r 29128929e4f9 libraw/receipt
--- a/libraw/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/libraw/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -32,7 +32,7 @@
 	case $PACKAGE in
 		libraw)
 			copy @std
-			DEPENDS="jasper lcms2 libgomp libjpeg-turbo"
+			DEPENDS="jasper liblcms2 libgomp libjpeg-turbo"
 			;;
 		*-dev)
 			copy @dev
diff -r 34bf9f28c37d -r 29128929e4f9 libvips/receipt
--- a/libvips/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/libvips/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		libvips)
 			copy @std
-			DEPENDS="fftw lcms pango libpng jpeg imagemagick libtiff zlib \
+			DEPENDS="fftw liblcms pango libpng jpeg imagemagick libtiff zlib \
 			glib libexif openexr liboil"
 			TAGS="image"
 			;;
diff -r 34bf9f28c37d -r 29128929e4f9 mtpaint/receipt
--- a/mtpaint/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/mtpaint/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -38,6 +38,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk libcairo fontconfig freetype gdk-pixbuf glib gtk2 lcms \
+	DEPENDS="atk libcairo fontconfig freetype gdk-pixbuf glib gtk2 liblcms \
 	libjpeg-turbo libpng pango libtiff libx11 zlib"
 }
diff -r 34bf9f28c37d -r 29128929e4f9 openjpeg/receipt
--- a/openjpeg/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/openjpeg/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -34,7 +34,7 @@
 		*-tools)
 			copy bin/
 			CAT="graphics|applications"
-			DEPENDS="openjpeg lcms2 libpng libtiff"
+			DEPENDS="openjpeg liblcms2 libpng libtiff"
 			;;
 		*-dev)
 			copy @dev
diff -r 34bf9f28c37d -r 29128929e4f9 openjpeg2/receipt
--- a/openjpeg2/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/openjpeg2/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -37,7 +37,7 @@
 		openjpeg2-tools)
 			copy bin/
 			CAT="graphics|applications"
-			DEPENDS="openjpeg2 lcms2 libpng libtiff"
+			DEPENDS="openjpeg2 liblcms2 libpng libtiff"
 			;;
 		*-dev)
 			copy @dev
diff -r 34bf9f28c37d -r 29128929e4f9 pngquant/receipt
--- a/pngquant/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/pngquant/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -16,7 +16,7 @@
 BUILD_DEPENDS="git lcms2-dev libpng-dev zlib-dev zlib-static"
 SPLIT="$PACKAGE-static:static"
 
-DEPENDS_std="lcms2 libpng"
+DEPENDS_std="liblcms2 libpng"
 DEPENDS_static=" "
 
 COPY_static="@std"
diff -r 34bf9f28c37d -r 29128929e4f9 poppler/receipt
--- a/poppler/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/poppler/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -20,9 +20,9 @@
 
 CAT_libpoppler="libs|shared library"
 
-DEPENDS_libpoppler="libcairo fontconfig freetype glib lcms2 libcurl libjpeg-turbo \
+DEPENDS_libpoppler="libcairo fontconfig freetype glib liblcms2 libcurl libjpeg-turbo \
 libpng nspr nss openjpeg2 libtiff zlib"
-DEPENDS_std="lib$PACKAGE libcairo freetype lcms2"
+DEPENDS_std="lib$PACKAGE libcairo freetype liblcms2"
 DEPENDS_dev="$PACKAGE lib$PACKAGE cairo-dev glib-dev"
 
 compile_rules() {
diff -r 34bf9f28c37d -r 29128929e4f9 python-pil/receipt
--- a/python-pil/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/python-pil/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -31,5 +31,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="python freetype lcms libjpeg-turbo tcl tk zlib"
+	DEPENDS="python freetype liblcms libjpeg-turbo tcl tk zlib"
 }
diff -r 34bf9f28c37d -r 29128929e4f9 rawstudio/receipt
--- a/rawstudio/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/rawstudio/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://rawstudio.org/files/release/$TARBALL"
 
-DEPENDS="desktop-file-utils dbus exiv2 gconf gtk2 lcms jpeg libjpeg libtiff libxml2"
+DEPENDS="desktop-file-utils dbus exiv2 gconf gtk2 liblcms jpeg libjpeg libtiff libxml2"
 BUILD_DEPENDS="exiv2-dev gconf-dev gtk2-dev dbus-dev lcms-dev jpeg-dev tiff-dev libxml2-dev"
 
 compile_rules() {
diff -r 34bf9f28c37d -r 29128929e4f9 scribus/receipt
--- a/scribus/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/scribus/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -32,6 +32,6 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/mimelnk $fs/usr/share
 	cp -a $stuff/* $fs
-	DEPENDS="ghostscript libQtGui libQtXml libQtNetwork cups lcms libxml2 \
+	DEPENDS="ghostscript libQtGui libQtXml libQtNetwork cups liblcms libxml2 \
 	gcc-lib-base aspell python krb5 podofo"
 }
diff -r 34bf9f28c37d -r 29128929e4f9 ufraw/receipt
--- a/ufraw/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/ufraw/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		ufraw)
 			copy bin/ *.desktop
-			DEPENDS="gtk2 exiv2 lcms libtiff libgtkimageview libgomp bzip2"
+			DEPENDS="gtk2 exiv2 liblcms libtiff libgtkimageview libgomp bzip2"
 			SUGGESTED="ufraw-locales gimp-plugin-ufraw"
 			;;
 		gimp-plugin-ufraw)
diff -r 34bf9f28c37d -r 29128929e4f9 wine-rt/receipt
--- a/wine-rt/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/wine-rt/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -53,7 +53,7 @@
 			cp -a $install/usr/share/applications $fs/usr/share
 			cp -a $install/usr/lib/lib* $fs/usr/lib
 			cp -a $install/usr/lib/wine/*.so $fs/usr/lib/wine
-			DEPENDS="alsa-lib libxml2 libxslt mesa glu xorg-dev lcms \
+			DEPENDS="alsa-lib libxml2 libxslt mesa glu xorg-dev liblcms \
 			freetype jpeg libpng libtiff"
 			PROVIDE="wine"
 			TAGS="windows"
diff -r 34bf9f28c37d -r 29128929e4f9 wine/receipt
--- a/wine/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/wine/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -28,7 +28,7 @@
 			cp -a $install/usr/bin $fs/usr
 			cp -a $install/usr/lib $fs/usr
 			cp -a $install/usr/share/wine $fs/usr/share
-			DEPENDS="alsa-lib libxml2 libxslt mesa glu lcms freetype"
+			DEPENDS="alsa-lib libxml2 libxslt mesa glu liblcms freetype"
 			TAGS="windows"
 			;;
 		*-dev)
diff -r 34bf9f28c37d -r 29128929e4f9 xsane/receipt
--- a/xsane/receipt	Thu Jan 24 14:52:33 2019 +0100
+++ b/xsane/receipt	Fri Jan 25 15:37:19 2019 +0200
@@ -31,5 +31,5 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/sane $fs/usr/share
 	rm -rf $fs/usr/share/sane/xsane/doc
-	DEPENDS="sane-backends gtk2 libtiff libxdamage lcms v4l-utils libltdl"
+	DEPENDS="sane-backends gtk2 libtiff libxdamage liblcms v4l-utils libltdl"
 }