# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1539697565 -10800
# Node ID f48456621a9dfa24a2fa91a9137ed4ef7339bbb0
# Parent  71ba95d2422e26e33dd44fab8a38db85583a6f13
Some maintenance

diff -r 71ba95d2422e -r f48456621a9d 0install/receipt
--- a/0install/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/0install/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -16,7 +16,7 @@
 # Can't build newer OCaml based version 2.13
 
 compile_rules() {
-	python setup.py install --root=$DESTDIR || return 1
+	python -B setup.py install --root=$DESTDIR || return 1
 
 	# move man pages into a right place
 	mv $install/usr/man $install/usr/share
diff -r 71ba95d2422e -r f48456621a9d LibreOffice/receipt
--- a/LibreOffice/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/LibreOffice/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -84,7 +84,7 @@
 		LibreOffice)
 			copy @std *.inc @rm
 			DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
-			glib gpgme gst1-plugins-base gstreamer1 gtk+ icu lcms2 libassuan \
+			glib gpgme gst1-plugins-base gstreamer1 gtk2 icu lcms2 libassuan \
 			libcomerr libcups libcurl libepoxy libgpg-error libicu libkrb5 \
 			libsqlite3 libxml2 libxslt neon nspr nss pango perl python \
 			xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXinerama \
diff -r 71ba95d2422e -r f48456621a9d Qt4-qca-ossl/receipt
--- a/Qt4-qca-ossl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# SliTaz package receipt.
-
-NAME="qca-ossl"
-PACKAGE="Qt4-$NAME"
-MAJORVERSION="2.0"
-VERSION="2.0.0-beta3"
-CATEGORY="development"
-SHORT_DESC="OpenSSL plug-in for the Qt Cryptographic Architecture (QCA)."
-MAINTAINER="ben@seawolfsanctuary.com"
-LICENSE="LGPL2.1"
-WEB_SITE="http://delta.affinix.com/$NAME"
-REPOLOGY="qca-ossl"
-
-TARBALL="$NAME-$VERSION.tar.bz2"
-WGET_URL="http://delta.affinix.com/download/qca/$MAJORVERSION/plugins/$TARBALL"
-
-DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
-libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
-libQtOpenGL libQtSql libQtWebkit qca openssl"
-BUILD_DEPENDS="qmake xorg-libX11-dev dbus-dev openssl-dev Qt4-dev qca-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	chmod +x configure
-	./configure \
-		--qtdir=/usr/lib/qt && \
-	make $MAKEFLAGS && 
-	make DESTDIR=$DESTDIR install 2>&1 | grep -v libqca-ossl.so.debug
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib/qt/plugins/crypto
-	cp -a $src/lib/* $fs/usr/lib/qt/plugins/crypto/
-
-	# Copy .desktop file:
-#	cp -a $stuff/* $fs/usr
-}
diff -r 71ba95d2422e -r f48456621a9d Qt4-qca-ossl/stuff/patches/qca-ossl-whirlpool.patch
--- a/Qt4-qca-ossl/stuff/patches/qca-ossl-whirlpool.patch	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- a/qca-ossl.cpp
-+++ b/qca-ossl.cpp
-@@ -330,1 +330,1 @@
--	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash");
-+	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash");
-
---- a/qca-ossl.cpp
-+++ b/qca-ossl.cpp
-@@ -6597,9 +6597,11 @@
- #ifdef SHA512_DIGEST_LENGTH
- 	list += "sha512";
- #endif
-+ /*
- #ifdef OBJ_whirlpool
- 	list += "whirlpool";
- #endif
-+ */
- 	return list;
- }
-
---- a/qca-ossl.cpp
-+++ b/qca-ossl.cpp
-@@ -6812,10 +6812,12 @@
- 		else if ( type == "sha512" )
- 			return new opensslHashContext( EVP_sha512(), this, type);
- #endif
-+/*
- #ifdef OBJ_whirlpool
- 		else if ( type == "whirlpool" )
- 			return new opensslHashContext( EVP_whirlpool(), this, type);
- #endif
-+*/
- 		else if ( type == "pbkdf1(sha1)" )
- 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
- 		else if ( type == "pbkdf1(md2)" )
diff -r 71ba95d2422e -r f48456621a9d Qt4-qca-ossl/stuff/patches/series
--- a/Qt4-qca-ossl/stuff/patches/series	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-qca-ossl-whirlpool.patch
diff -r 71ba95d2422e -r f48456621a9d SkypeFreak/description.txt
--- a/SkypeFreak/description.txt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-A Forensic Framework for Skype.
-Default run of the program produces the following output:
-
-8""""8                         
-8      e   e  e    e eeeee eeee
-8eeeee 8   8  8    8 8   8 8   
-    88 8eee8e 8eeee8 8eee8 8eee
-e   88 88   8   88   88    88  
-8eee88 88   8   88   88    88ee
-
-    8""""                         
-    8     eeeee  eeee eeeee e   e 
-    8eeee 8   8  8    8   8 8   8 
-    88    8eee8e 8eee 8eee8 8eee8e
-    88    88   8 88   88  8 88   8
-    88    88   8 88ee 88  8 88   8
-
-
-[*] A creation of Osanda Malith & contributors
-[*] Follow @OsandaMalith and @yasoobkhalid
-[*] URL: http://osandamalith.github.io/SkypeFreak/
-
-[~] What Do You Like to Investigate?
-1. Profile
-2. Contact
-3. Calls
-4. Messages
-5. Generate Full Report
-6. Print the list of contributors & exit
-7. Exit
-
-Select the option which you deem suitable for the given conditions. After that
-Skype Freak will perform the given task and will print the output to console
-and will ask you to write the extracted data to disk.
diff -r 71ba95d2422e -r f48456621a9d SkypeFreak/receipt
--- a/SkypeFreak/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="SkypeFreak"
-GITHASH="1efb36233858c580f0431a6e69be05030919f7cc"
-VERSION=${GITHASH:0:7}
-CATEGORY="network"
-SHORT_DESC="A cross platform forensic tool for Skype"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="GPL3"
-WEB_SITE="https://github.com/yasoob/SkypeFreak"
-REPOLOGY="skypefreak"
-
-TARBALL="$PACKAGE-$VERSION.zip"
-WGET_URL="https://github.com/yasoob/$PACKAGE/archive/$GITHASH.zip"
-
-DEPENDS="python"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin $fs/usr/share/applications
-	cp -a $src/source/SkypeFreak.py $fs/usr/bin
-	cp -a $stuff/*.desktop $fs/usr/share/applications
-
-	# fix bug with unicode strings (I'm not a pythonist, sorry)
-	sed -i 's|str(|unicode(|g' $fs/usr/bin/SkypeFreak.py
-}
diff -r 71ba95d2422e -r f48456621a9d SkypeFreak/stuff/skypefreak.desktop
--- a/SkypeFreak/stuff/skypefreak.desktop	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=SkypeFreak
-Comment=A Forensic Framework for Skype
-Exec=terminal -h -e "python /usr/bin/SkypeFreak.py"
-Icon=application-x-php
-Categories=ConsoleOnly;Network;
diff -r 71ba95d2422e -r f48456621a9d TeXmacs-windows-fonts/receipt
--- a/TeXmacs-windows-fonts/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="TeXmacs-windows-fonts"
-VERSION="1.0"
-CATEGORY="office"
-SHORT_DESC="Fonts for using TeXmacs without TeX"
-MAINTAINER="slitaz@leledy.fr"
-LICENSE="LPPL"
-WEB_SITE="http://www.texmacs.org"
-
-TARBALL="$PACKAGE-$VERSION-noarch.tar.gz"
-WGET_URL="ftp://ftp.texmacs.org/pub/TeXmacs/fonts/$TARBALL"
-
-compile_rules() {
-	mkdir -p $install/usr/share/TeXmacs/
-	cp -r $src $install/usr/share/TeXmacs/fonts
-	find $install -type f -exec chmod 644 '{}' \;
-}
-
-genpkg_rules() {
-	copy @std
-}
diff -r 71ba95d2422e -r f48456621a9d TeXmacs/receipt
--- a/TeXmacs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="TeXmacs"
-VERSION="1.0.7.18"
-CATEGORY="office"
-SHORT_DESC="The high quality of TeX with a wisiwyg editor"
-MAINTAINER="slitaz@leledy.fr"
-LICENSE="GPL"
-WEB_SITE="http://www.texmacs.org/"
-REPOLOGY="texmacs"
-
-TARBALL="$PACKAGE-$VERSION-src.tar.gz"
-WGET_URL="ftp://ftp.texmacs.org/pub/$PACKAGE/targz/$TARBALL"
-
-DEPENDS="ghostscript gmp guile freetype TeXmacs-windows-fonts"
-# freetype and TeXmacs-windows-fonts avoid depending on TeX which is a *huge* system
-BUILD_DEPENDS="xorg-libX11-dev gmp-dev guile-dev freetype-dev imlib2-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-     ./configure \
-         --with-imlib2 \
-	 --disable-qt \
-         --prefix=/usr \
-         --infodir=/usr/share/info \
-         --mandir=/usr/share/man \
-         --libexecdir=/usr/lib \
-         $CONFIGURE_ARGS &&
-     make && make DESTDIR=$DESTDIR install
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-     mkdir -p $fs/usr
-     cp -a $install/usr/bin $fs/usr
-     cp -a $install/usr/lib $fs/usr
-     cp -a $install/usr/share $fs/usr
-}
diff -r 71ba95d2422e -r f48456621a9d TiMidity++/receipt
--- a/TiMidity++/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="TiMidity++"
-VERSION="2.14.0"
-CATEGORY="multimedia"
-SHORT_DESC="TiMidity++ is an open source MIDI to WAVE converter and player"
-MAINTAINER="paul@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://timidity.sourceforge.net/"
-REPOLOGY="timidity++"
-
-TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="$SF_MIRROR/timidity/$TARBALL"
-
-BUILD_DEPENDS="alsa-lib-dev portaudio-dev jack-dev libao-dev libvorbis-dev \
-libogg-dev flac-dev speex-dev gtk+-dev xorg-libXaw-dev"
-
-compile_rules() {
-	./configure \
-		--enable-audio=alsa,portaudio,jack,ao,vorbis,flac,speex \
-		--enable-interface=gtk,xaw \
-		--enable-alsaseq \
-		--with-default-path=/etc/timidity++/ \
-		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install || return 1
-
-	install -Dm644 $stuff/timidity.cfg $install/etc/timidity++/timidity.cfg
-}
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="alsa-lib portaudio jack libao libvorbis libogg \
-	flac gtk+ xorg-libXaw"
-}
diff -r 71ba95d2422e -r f48456621a9d TiMidity++/stuff/patches/mfi.c.patch
--- a/TiMidity++/stuff/patches/mfi.c.patch	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- timidity/mfi.c	2004-02-17 17:02:18.000000000 +0100
-+++ timidity/mfi.c.new	2017-02-14 04:41:24.000000000 +0100
-@@ -344,7 +344,7 @@
- #define SEND_LASTNOTEINFO(lni, ch)				if (LASTNOTEINFO_HAS_DATA((lni)[ch])) SendLastNoteInfo(lni, ch);
- #define SEND_AND_CLEAR_LASTNOTEINFO(lni, ch)	if (LASTNOTEINFO_HAS_DATA((lni)[ch])) { SendLastNoteInfo(lni, ch); (lni)[ch].on = NO_LAST_NOTE_INFO; }
- 
--inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
-+static inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
- {
- 	info[channel].on = time;
- 	info[channel].off = time + duration;
-@@ -352,7 +352,7 @@
- 	info[channel].velocity = velocity;
- }
- 
--inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
-+static inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
- {
- 	NOTE_BUF_EV_DEBUGSTR(channel, info[channel].on, note_name[info[channel].note % 12], info[channel].note / 12, info[channel].velocity, info[channel].off);
- 	MIDIEVENT(info[channel].on, ME_NOTEON, channel, info[channel].note, info[channel].velocity);
diff -r 71ba95d2422e -r f48456621a9d TiMidity++/stuff/patches/series
--- a/TiMidity++/stuff/patches/series	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# from https://www.archlinux.org/packages/extra/x86_64/timidity++/
--p1|timidity-tk86.patch
--p1|timidity-jack.patch
-
-# https://bugs.gentoo.org/606894
--p0|mfi.c.patch
diff -r 71ba95d2422e -r f48456621a9d TiMidity++/stuff/patches/timidity-jack.patch
--- a/TiMidity++/stuff/patches/timidity-jack.patch	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -Naur TiMidity++-2.14.0-orig/timidity/jack_a.c TiMidity++-2.14.0/timidity/jack_a.c
---- TiMidity++-2.14.0-orig/timidity/jack_a.c	2014-09-26 22:08:51.531559553 -0400
-+++ TiMidity++-2.14.0/timidity/jack_a.c	2014-09-26 22:11:12.864659285 -0400
-@@ -508,6 +508,7 @@
- 				pthread_cond_wait(&ctx->cond, &ctx->lock);
- 		}
- 		/* fallthrough */
-+	case PM_REQ_PLAY_START:
- 	case PM_REQ_DISCARD:
- 		ctx->running = 0;
- 		ringbuf_clear(&ctx->rbuf);
diff -r 71ba95d2422e -r f48456621a9d TiMidity++/stuff/patches/timidity-tk86.patch
--- a/TiMidity++/stuff/patches/timidity-tk86.patch	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
---- a/interface/tk_c.c
-+++ b/interface/tk_c.c
-@@ -65,6 +65,9 @@
- #define TKPROGPATH PKGLIBDIR "/tkmidity.tcl"
- #endif /* TKPROGPATH */
- 
-+#if (TCL_MAJOR_VERSION < 8)
-+#define Tcl_GetStringResult(interp) (interp->result)
-+#endif
- 
- static void ctl_refresh(void);
- static void ctl_total_time(int tt);
-@@ -117,7 +120,7 @@
- 
- static void start_panel(void);
- 
--#define MAX_TK_MIDI_CHANNELS	16
-+#define MAX_TK_MIDI_CHANNELS	32
- 
- typedef struct {
- 	int reset_panel;
-@@ -933,7 +936,7 @@
- }
- 
- /* evaluate Tcl script */
--static char *v_eval(char *fmt, ...)
-+static const char *v_eval(char *fmt, ...)
- {
- 	char buf[256];
- 	va_list ap;
-@@ -941,7 +944,7 @@
- 	vsnprintf(buf, sizeof(buf), fmt, ap);
- 	Tcl_Eval(my_interp, buf);
- 	va_end(ap);
--	return my_interp->result;
-+	return Tcl_GetStringResult(my_interp);
- }
- 
- static const char *v_get2(const char *v1, const char *v2)
diff -r 71ba95d2422e -r f48456621a9d TiMidity++/stuff/timidity.cfg
--- a/TiMidity++/stuff/timidity.cfg	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# details on this file and other examples see here:
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/
-#----------------------------------------------------------------
-# SoundFont extension configuration
-#
-# soundfont <filename> [order={0|1}] [remove]
-#    <filename> is the path of SoundFont file.
-#    order: 0(preload) or 1(load after GUS).
-#    remove: disable specified soundfont.
-#
-# font exclude <tonebank> [<preset> [<keynote>]]
-# font order {0|1} <tonebank> [<preset> [<keynote>]]
-#    <tonebank>: 0-127
-#
-# font exclude 128 [<drumset> [<key>]]
-# font order {0|1} 128 [<drumset> [<key>]]
-#----------------------------------------------------------------
-
-# change the next line to point to a soundfont you have
-# soundfonts can be found e.g. here: http://www.hammersound.net/
-# soundfont /usr/share/soundfonts/DX7Piano.SF2
-
-# you can do manipulations of the soundfont you load like this:
-# e.g. removing drumset 99
-# font exclude 128 99
-
-# load drum samples after GUS patches
-# font order 1 128
diff -r 71ba95d2422e -r f48456621a9d Xdialog/receipt
--- a/Xdialog/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="Xdialog"
-VERSION="2.3.1"
-CATEGORY="x-window"
-SHORT_DESC="Like 'dialog' or 'cdialog', but for X using GTK+"
-MAINTAINER="rcx@zoominternet.net"
-LICENSE="GPL2"
-WEB_SITE="http://xdialog.free.fr/"
-REPOLOGY="xdialog"
-
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://xdialog.free.fr/$TARBALL"
-
-BUILD_DEPENDS="autoconf automake m4 gettext gtk+-dev"
-
-compile_rules() {
-	autoconf  &&
-	./configure \
-		--with-gtk2 \
-		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
-}
-
-genpkg_rules() {
-	copy @std
-	DEPENDS="glib gtk+"
-}
diff -r 71ba95d2422e -r f48456621a9d aalib/receipt
--- a/aalib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/aalib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="http://aa-project.sourceforge.net/aalib/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/aalib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/aalib.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/aa-project/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d abiword/receipt
--- a/abiword/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/abiword/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 LOCALES="ar ca cs da de el en es fa fi fr hr hu id is it ja nb nl nn pl pt ro \
 ru sl sv tr uk vi zh"
 
-BUILD_DEPENDS="gtk+3-dev python-pygobject-dev gobject-introspection-dev \
+BUILD_DEPENDS="gtk3-dev python-pygobject-dev gobject-introspection-dev \
 fribidi-dev libglade-dev popt-dev libxml2-dev libart_lgpl-dev \
 libgsf-dev enchant-dev wv-dev libcroco-dev boost-dev librsvg-dev gtk-doc \
 bison goffice-dev  intltool gettext xorg-dev zlib-dev libjpeg-turbo-dev"
@@ -51,7 +51,7 @@
 		abiword)
 			copy @std @rm
 			TAGS="word doc office"
-			DEPENDS="gtk+3 fribidi libglade popt libxml2 libart_lgpl \
+			DEPENDS="gtk3 fribidi libglade popt libxml2 libart_lgpl \
 			libgsf glib enchant wv xorg-libXdamage gcc-lib-base \
 			librsvg goffice glibc-locale libffi"
 			SUGGESTED="abiword-plugins"
diff -r 71ba95d2422e -r f48456621a9d adminer/receipt
--- a/adminer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/adminer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="adminer"
 VERSION="4.1.0"
 CATEGORY="misc"
-SHORT_DESC="Database management in a single PHP file."
+SHORT_DESC="Database management in a single PHP file"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 Apache"
+WEB_SITE="https://www.adminer.org/"
+
 TARBALL="$PACKAGE-$VERSION.zip"
-WEB_SITE="https://www.adminer.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="php"
 BUILD_DEPENDS="php-cli php-mysql php-pgsql php-sqlite"
-SUGGESTED="php-mysql php-pgsql php-sqlite"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	php compile.php 2>&1 | sed '/^PHP Warning/d'
+compile_rules() {
+	php compile.php
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www/$PACKAGE
 	cp $src/adminer-$VERSION.php $fs/var/www/$PACKAGE/index.php
+	DEPENDS="php"
+	SUGGESTED="php-mysql php-pgsql php-sqlite"
 }
diff -r 71ba95d2422e -r f48456621a9d adobe-air-sdk/receipt
--- a/adobe-air-sdk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/adobe-air-sdk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="nss gtk+ libxslt"
+	DEPENDS="nss gtk2 libxslt"
 }
 
 post_install() {
diff -r 71ba95d2422e -r f48456621a9d afio/receipt
--- a/afio/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/afio/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,9 +14,9 @@
 compile_rules() {
 	make || return 1
 
-	install -Dm755 $src/afio $install/usr/bin/afio
+	install -Dm755 afio $install/usr/bin/afio
 
-	cook_pick_manpages $src/afio.1
+	cook_pick_manpages afio.1
 }
 
 genpkg_rules() {
diff -r 71ba95d2422e -r f48456621a9d aiksaurus/receipt
--- a/aiksaurus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/aiksaurus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev patch expat-dev xorg-libXau-dev glib-dev"
+BUILD_DEPENDS="gtk2-dev patch expat-dev xorg-libXau-dev glib-dev"
 SPLIT="aiksaurus-dev"
 
 compile_rules() {
@@ -27,11 +27,11 @@
 	case $PACKAGE in
 		aiksaurus)
 			copy @std
-			DEPENDS="glib gtk+"
+			DEPENDS="glib gtk2"
 			;;
 		aiksaurus-dev)
 			copy @dev
-			DEPENDS="aiksaurus gtk+-dev"
+			DEPENDS="aiksaurus gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d airoscript-ng/receipt
--- a/airoscript-ng/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/airoscript-ng/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="airoscript-ng"
 VERSION="1.2rc3"
@@ -8,23 +8,24 @@
 LICENSE="GPL2"
 #WEB_SITE="https://code.google.com/archive/p/airoscript/"
 WEB_SITE="http://airoscript.aircrack-ng.org/"
+
 TARBALL="$PACKAGE-${VERSION%rc3}-3.tar.gz"
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/airoscript/$TARBALL"
 
-DEPENDS="bash"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Remove broken install parts
 	sed -i '/install-docs \\/ d' Makefile-Linux
 	sed -i '/install-locale \\/ d' Makefile-Linux
 	sed -i '/install-desktop \\/ d' Makefile-Linux
-	make -j1 DESTDIR=$DESTDIR \
+
+	make -j1 \
+		DESTDIR=$DESTDIR \
 		prefix=usr \
 		picdir=$DESTDIR/usr/share/pixmaps/ \
 		appdir=$DESTDIR/usr/share/applications/ \
-		etcdir=$DESTDIR/etc/$PACKAGE install
+		etcdir=$DESTDIR/etc/$PACKAGE \
+		install || return 1
+
 	# Patch config - replace "usr/local" by "usr"
 	sed -i 's/usr\/local/usr/g' $DESTDIR/etc/$PACKAGE/airoscript-ng_advanced.conf
 
@@ -34,11 +35,10 @@
 	cook_pick_manpages $src/src/airoscript-ng.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/share/airoscript-ng $fs/usr/share
 	cp -a $install/etc $fs
+	DEPENDS="bash"
 }
diff -r 71ba95d2422e -r f48456621a9d airpwn/receipt
--- a/airpwn/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/airpwn/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,22 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="airpwn"
 VERSION="1.4"
 CATEGORY="network"
-SHORT_DESC="Airpwn is a tool for generic packet injection on an 802.11 network."
+SHORT_DESC="A tool for generic packet injection on an 802.11 network"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://airpwn.sourceforge.net"
+WEB_SITE="http://airpwn.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libnet libpcap libpcre lorcon openssl python   wireless_tools"
 BUILD_DEPENDS="pcre-dev libpcap-dev openssl-dev lorcon-dev \
 wireless_tools-dev libnet-dev libnet python python-dev autoconf automake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Fix airpwn files so we can use it with a Python version other than 2.4.
 	PYTHON_VERSION1=$(python -c 'import sys; print sys.version[:3]')
 	PYTHON_VERSION2=$(echo $PYTHON_VERSION1 | tr . _)
@@ -27,17 +25,13 @@
 
 	autoreconf
 	automake --add-missing
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
+	DEPENDS="libnet libpcap libpcre lorcon openssl python   wireless_tools"
 }
diff -r 71ba95d2422e -r f48456621a9d airsnort/receipt
--- a/airsnort/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/airsnort/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,32 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="airsnort"
 VERSION="0.2.7e"
 CATEGORY="network"
-SHORT_DESC="A wireless LAN (WLAN) tool which recovers encryption keys."
+SHORT_DESC="A wireless LAN (WLAN) tool which recovers encryption keys"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://airsnort.shmoo.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ libpcap"
-BUILD_DEPENDS="gtk+-dev libpcap-dev"
+BUILD_DEPENDS="gtk2-dev libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 libpcap"
 }
diff -r 71ba95d2422e -r f48456621a9d airstrike/receipt
--- a/airstrike/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/airstrike/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,34 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="airstrike"
 VERSION="pre6a"
 CATEGORY="games"
-SHORT_DESC="Juego batalla aerea."
+SHORT_DESC="Incredibly addictive 2D dogfight game"
 MAINTAINER="arca2@hotmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://icculus.org/airstrike/"
+
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="http://offload1.icculus.org:9090/$PACKAGE/$TARBALL"
 
-DEPENDS="libsdl-image libsdl"
 BUILD_DEPENDS="libsdl-image-dev libsdl-dev"
 
 # Packaging for SliTaz by Rene Rivero.
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/-lSDL_image/& -lm/' src/Makefile
 	sed -i 's|"airstrikerc"|"/usr/share/airstrike/airstrikerc"|' src/config.h
 	sed -i 's|"data/|"/usr/share/airstrike/data/|g' src/airstrike.c
-	make
+
+	make || return 1
 
 	cook_pick_manpages $src/doc/airstrike.6
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/airstrike $fs/usr/share/applications
 	cp $src/airstrike $fs/usr/bin
 	cp -ar $src/data $src/airstrikerc $fs/usr/share/airstrike
@@ -36,4 +33,5 @@
 	mkdir -p $fs/usr/share/applications
 	cp $stuff/airstrike.desktop $fs/usr/share/applications
 	chown -R root.root $fs
+	DEPENDS="libsdl-image libsdl"
 }
diff -r 71ba95d2422e -r f48456621a9d aisleriot/receipt
--- a/aisleriot/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/aisleriot/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="pysolfc glib-dev librsvg-dev desktop-file-utils-extra \
-intltool guile-dev gtk+3-dev libcanberra-dev gconf-dev itstool gmp-dev"
+intltool guile-dev gtk3-dev libcanberra-dev gconf-dev itstool gmp-dev"
 
 compile_rules() {
 	./configure \
@@ -28,7 +28,7 @@
 genpkg_rules() {
 	copy @std
 	rm -r $fs/usr/share/help/
-	DEPENDS="atk cairo gconf gdk-pixbuf glib gtk+3 guile libcanberra \
+	DEPENDS="atk cairo gconf gdk-pixbuf glib gtk3 guile libcanberra \
 	libcanberra-gtk3 librsvg"
 	SUGGEST="pysolfc-cardsets pysolfc-cardsets-extra"
 }
diff -r 71ba95d2422e -r f48456621a9d alarm-clock-applet/receipt
--- a/alarm-clock-applet/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alarm-clock-applet/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/alarm-clock/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="libxml2-dev gtk+-dev gstreamer1-dev gconf-dev gnome-icon-theme \
+BUILD_DEPENDS="libxml2-dev gtk2-dev gstreamer1-dev gconf-dev gnome-icon-theme \
 libnotify-dev libunique-dev intltool"
 
 compile_rules() {
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std @ico 22x22/ 24x24/
-	DEPENDS="gconf glib gstreamer1 gtk+ libnotify libunique libxml2   \
+	DEPENDS="gconf glib gstreamer1 gtk2 libnotify libunique libxml2   \
 	notification-daemon-gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d alarm-clock/receipt
--- a/alarm-clock/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alarm-clock/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 #WGET_URL="http://www.alarm-clock.pl/files/$TARBALL"
 WGET_URL="http://mirror.slitaz.org/sources/packages/a/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libunique-dev libnotify-dev gstreamer0-dev intltool"
+BUILD_DEPENDS="gtk2-dev libunique-dev libnotify-dev gstreamer0-dev intltool"
 
 compile_rules() {
 	sed -i 's/.*= notify_notification_new_with_status_icon/#define notify_notification_new_with_status_icon(a,b,c,d) notify_notification_new(a,b,gtk_status_icon_get_icon_name(c))\n&/' \
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gstreamer0 gtk+ libnotify libunique"
+	DEPENDS="gdk-pixbuf glib gstreamer0 gtk2 libnotify libunique"
 	TAGS="clock reminder"
 }
diff -r 71ba95d2422e -r f48456621a9d alsa-firmware/receipt
--- a/alsa-firmware/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alsa-firmware/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.alsa-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-firmware.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-firmware.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/firmware/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d alsa-lib/receipt
--- a/alsa-lib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alsa-lib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.alsa-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-lib.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/lib/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d alsa-oss/receipt
--- a/alsa-oss/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alsa-oss/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.alsa-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-oss.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-oss.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/oss-lib/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d alsa-plugins/receipt
--- a/alsa-plugins/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alsa-plugins/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.alsa-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-plugins.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-plugins.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/plugins/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d alsa-tools/receipt
--- a/alsa-tools/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alsa-tools/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.alsa-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-tools.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-tools.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/tools/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib-dev gtk+-dev fltk-dev autoconf automake gtk+3-dev"
+BUILD_DEPENDS="alsa-lib-dev gtk2-dev fltk-dev autoconf automake gtk3-dev"
 at='alsa-tools'
 # skip qlo10k1: it requre old Qt
 # skip hdajacksensetest: sysfs-pin-configs.h: No such file or directory
@@ -53,12 +53,12 @@
 		*-echomixer)
 			copy echomixer echomixer.desktop echomixer.png
 			CAT="multimedia|control all the features of any Echoaudio soundcard"
-			DEPENDS="alsa-lib glib gtk+"
+			DEPENDS="alsa-lib glib gtk2"
 			;;
 		*-envy24control)
 			copy envy24control envy24control.desktop envy24control.png
 			CAT="multimedia|control tool for Envy24 (ice1712) based soundcards"
-			DEPENDS="alsa-lib glib gtk+"
+			DEPENDS="alsa-lib glib gtk2"
 			;;
 		*-hda-verb)
 			copy hda-verb
@@ -68,7 +68,7 @@
 		*-hdajack)
 			copy hdajackretask hdajacksensetest hdajackretask.desktop hdajackretask.png
 			CAT="multimedia|HDA Intel tools"
-			DEPENDS="glib gtk+3"
+			DEPENDS="glib gtk3"
 			;;
 		*-hdsp)
 			copy hdspconf hdspconf.desktop hdspconf.png \
@@ -106,7 +106,7 @@
 		*-rmedigicontrol)
 			copy rmedigicontrol rmedigicontrol.desktop
 			CAT="multimedia|control tool for RME Digi32 and RME Digi96 soundcards"
-			DEPENDS="alsa-lib glib gtk+"
+			DEPENDS="alsa-lib glib gtk2"
 			;;
 		*-sb16_csp)
 			copy cspctl
diff -r 71ba95d2422e -r f48456621a9d alsa-utils/receipt
--- a/alsa-utils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alsa-utils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.alsa-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-utils.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-utils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/utils/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d alsaplayer/receipt
--- a/alsaplayer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/alsaplayer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/alsaplayer/alsaplayer/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="intltool automake libtool libmad-dev libid3tag-dev flac-dev \
-libmikmod-dev libogg-dev libvorbis-dev mesa-dev glib-dev gtk+-dev pango-dev \
+libmikmod-dev libogg-dev libvorbis-dev mesa-dev glib-dev gtk2-dev pango-dev \
 libsndfile-dev alsa-lib-dev "
 SPLIT="alsaplayer-scopes-gl alsaplayer-scopes alsaplayer-mod alsaplayer \
 alsaplayer-dev"
@@ -54,7 +54,7 @@
 		alsaplayer-scopes)
 			copy scopes2/*.so @rm
 			CAT="multimedia|visualisations"
-			DEPENDS="glib gtk+   alsaplayer"
+			DEPENDS="glib gtk2   alsaplayer"
 			;;
 		alsaplayer-mod)
 			copy libmod.so
@@ -63,7 +63,7 @@
 			;;
 		alsaplayer)
 			copy @std @rm
-			DEPENDS="alsa-lib flac gdk-pixbuf glib gtk+ libmad libsndfile \
+			DEPENDS="alsa-lib flac gdk-pixbuf glib gtk2 libmad libsndfile \
 			libvorbis pango"
 			TAGS="music audio player mp3 ogg flac"
 			SUGGESTED="alsaplayer-scopes libid3tag"
diff -r 71ba95d2422e -r f48456621a9d apache-ant/receipt
--- a/apache-ant/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/apache-ant/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,27 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="apache-ant"
 VERSION="1.9.4"
 CATEGORY="development"
-SHORT_DESC="A Java-based build tool."
+SHORT_DESC="A Java-based build tool"
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="Apache"
-SUGGESTED=""
+WEB_SITE="http://ant.apache.org/"
+
 TARBALL="$PACKAGE-$VERSION-bin.tar.bz2"
-WEB_SITE="http://ant.apache.org/"
 WGET_URL="http://www.apache.org/dist/ant/binaries/$TARBALL"
 
-DEPENDS="jdk"
-#DEPENDS="java-jdk"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# The only binaries that would built are Java binaries (not native binaries)
 	# Thus, to help with bootstrapping, use the binary ant release
-	cd $src
-	
 	mkdir -p $DESTDIR/usr/bin
 	cp -f $src/bin/*.pl $DESTDIR/usr/bin
 	cp -f $src/bin/*.py $DESTDIR/usr/bin
@@ -29,16 +21,16 @@
 	cp -f $src/bin/antRun $DESTDIR/usr/bin
 
 	cp -a $src/etc $DESTDIR
-	
+
 	mkdir -p $DESTDIR/usr/lib
 	cp -f $src/lib/*.jar $DESTDIR/usr/lib
 	cp -f $src/lib/*.pom $DESTDIR/usr/lib
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p  $fs
 	cp -a $install/usr $fs
 	cp -a $install/etc $fs
+	DEPENDS="jdk"
+	#DEPENDS="java-jdk"
 }
diff -r 71ba95d2422e -r f48456621a9d appstream-glib/receipt
--- a/appstream-glib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/appstream-glib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="https://people.freedesktop.org/~hughsient/appstream-glib/releases/$TARBALL"
 
 BUILD_DEPENDS="meson ninja util-linux-uuid-dev glib-dev libarchive-dev \
-libsoup-dev json-glib-dev gdk-pixbuf-dev gtk+3-dev yaml-dev gperf \
+libsoup-dev json-glib-dev gdk-pixbuf-dev gtk3-dev yaml-dev gperf \
 gobject-introspection-dev gettext libxslt docbook-xsl"
 SPLIT="$PACKAGE-dev"
 
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		appstream-glib)
 			copy bin/ *.so*
-			DEPENDS="cairo fontconfig freetype gdk-pixbuf glib gtk+3 json-glib \
+			DEPENDS="cairo fontconfig freetype gdk-pixbuf glib gtk3 json-glib \
 			libarchive libsoup pango util-linux-uuid yaml"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d apr-util/receipt
--- a/apr-util/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/apr-util/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="lehswe@gmail.com"
 LICENSE="Apache"
 WEB_SITE="http://apr.apache.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/apr-util.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/apr-util.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://archive.apache.org/dist/apr/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d aqualung/receipt
--- a/aqualung/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/aqualung/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/jeremyevans/aqualung/archive/${COMMIT:-$VERSION}.tar.gz"
 
-BUILD_DEPENDS="automake gettext libxml2-dev glib-dev gtk+-dev   alsa-lib-dev \
+BUILD_DEPENDS="automake gettext libxml2-dev glib-dev gtk2-dev   alsa-lib-dev \
 flac-dev lame-dev libmodplug-dev libsndfile-dev libogg-dev speex-dev \
 libvorbis-dev libsamplerate-dev libcdio-dev libcdio-paranoia-dev libcddb-dev \
 lua-dev"
@@ -34,7 +34,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib bzlib cairo flac gdk-pixbuf glib gtk+ lame libcddb \
+	DEPENDS="alsa-lib bzlib cairo flac gdk-pixbuf glib gtk2 lame libcddb \
 	libcdio libcdio-paranoia liblua libmodplug libogg libsamplerate libsndfile \
 	libvorbis libxml2 pango zlib"
 	TAGS="music audio player mp3 ogg"
diff -r 71ba95d2422e -r f48456621a9d ardour/receipt
--- a/ardour/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ardour/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -46,7 +46,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="alsa-lib atk atkmm python-aubio cairo cairomm dbus fftw flac fontconfig \
-	freetype gdk-pixbuf glib glibmm gtk+ gtkmm libarchive libcurl libgiomm \
+	freetype gdk-pixbuf glib glibmm gtk2 gtkmm libarchive libcurl libgiomm \
 	liblo liblrdf libogg libsamplerate libsigc++ libsndfile libusb libxml2 \
 	lilv pango pangomm readline rubberband serd sord sratom taglib \
 	vamp-plugin-sdk xorg-libX11"
diff -r 71ba95d2422e -r f48456621a9d ario/receipt
--- a/ario/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ario/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/ario-player/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext glib-dev intltool gtk+3-dev \
+BUILD_DEPENDS="automake libtool gettext glib-dev intltool gtk3-dev \
 libxml2-dev curl-dev libmpdclient-dev taglib-dev"
 
 compile_rules() {
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std @ico
-	DEPENDS="gdk-pixbuf glib gtk+3 libcurl libmpdclient libxml2 pango taglib"
+	DEPENDS="gdk-pixbuf glib gtk3 libcurl libmpdclient libxml2 pango taglib"
 	TAGS="music audio player mp3 ogg"
 }
diff -r 71ba95d2422e -r f48456621a9d aspell-dicts/receipt
--- a/aspell-dicts/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/aspell-dicts/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/aspell.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/aspell.html"
 
 TARBALL="$PACKAGE-$VERSION.html"
 WGET_URL="https://ftp.gnu.org/gnu/aspell/dict/0index.html"
diff -r 71ba95d2422e -r f48456621a9d aspell/receipt
--- a/aspell/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/aspell/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="paul@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://aspell.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/aspell.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/aspell.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/aspell/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d asterisk-sound/receipt
--- a/asterisk-sound/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/asterisk-sound/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="asterisk-sound"
 VERSION="1.4.16"
 CATEGORY="misc"
-SHORT_DESC="Open Source PBX and telephony toolkit sound files (en)."
+SHORT_DESC="Open Source PBX and telephony toolkit sound files (en)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="CCPL"
 WEB_SITE="http://www.asterisk.org/"
@@ -14,18 +14,14 @@
 
 DEPENDS="asterisk"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ ! -d $DESTDIR/var ] &&
 	cd $src &&
 	mkdir -p $DESTDIR/var/lib/asterisk/sounds &&
 	mv * $DESTDIR/var/lib/asterisk/sounds
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	chown -R root:root $fs
 }
diff -r 71ba95d2422e -r f48456621a9d asterisk/receipt
--- a/asterisk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/asterisk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 EXTRA_SOURCE_FILES="rfc3951.txt"
 
-BUILD_DEPENDS="gtk+-dev libxml2-dev postgresql-dev libsdl-dev ncurses-dev \
+BUILD_DEPENDS="gtk2-dev libxml2-dev postgresql-dev libsdl-dev ncurses-dev \
 gmime gmime-dev unixODBC-dev unixODBC openldap-dev openldap \
 dahdi-linux dahdi-tools dahdi-dev \
 newt-dev mysql-dev nbs-dev popt-dev neon-dev neon postgresql sqlite3-dev \
diff -r 71ba95d2422e -r f48456621a9d asunder/receipt
--- a/asunder/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/asunder/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/releases/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev alsa-lib-dev libcddb-dev cdparanoia-III-dev \
+BUILD_DEPENDS="gtk2-dev alsa-lib-dev libcddb-dev cdparanoia-III-dev \
 xorg-libXdamage-dev intltool"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk gdk-pixbuf glib gtk+ libcddb   cdparanoia-III"
+	DEPENDS="atk gdk-pixbuf glib gtk2 libcddb   cdparanoia-III"
 	SUGGESTED="lame flac"
 	TAGS="audio rip"
 }
diff -r 71ba95d2422e -r f48456621a9d atkmm/receipt
--- a/atkmm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/atkmm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/atkmm/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/atkmm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/atkmm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d atomix/receipt
--- a/atomix/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/atomix/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja gtk+3-dev libgnome-games-support-dev gettext"
+BUILD_DEPENDS="meson ninja gtk3-dev libgnome-games-support-dev gettext"
 
 compile_rules() {
 	mkdir build
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk+3 libgnome-games-support"
+	DEPENDS="gdk-pixbuf glib gtk3 libgnome-games-support"
 }
diff -r 71ba95d2422e -r f48456621a9d atril/receipt
--- a/atril/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/atril/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://pub.mate-desktop.org/releases/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk+3-dev libsecret-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk3-dev libsecret-dev \
 caja-dev gobject-introspection-dev poppler-dev libspectre-dev tiff-dev \
 djvulibre-dev webkit2gtk-dev itstool xorg-libSM-dev"
 SPLIT="atril-caja atril-comics atril-djvu atril-epub atril-pdf atril-psd \
@@ -42,17 +42,17 @@
 		*-caja)
 			copy caja/extensions-2.0/*.so
 			CAT="office|Caja extension"
-			DEPENDS="atril caja glib gtk+3"
+			DEPENDS="atril caja glib gtk3"
 			;;
 		*-comics)
 			copy comicsdocument.atril-backend libcomicsdocument.so
 			CAT="office|comix book backend"
-			DEPENDS="atril gdk-pixbuf glib gtk+3"
+			DEPENDS="atril gdk-pixbuf glib gtk3"
 			;;
 		*-djvu)
 			copy djvudocument.atril-backend libdjvudocument.so
 			CAT="office|DjVu backend"
-			DEPENDS="atril cairo djvulibre gdk-pixbuf glib gtk+3"
+			DEPENDS="atril cairo djvulibre gdk-pixbuf glib gtk3"
 			;;
 		*-epub)
 			copy epubdocument.atril-backend libepubdocument.so
@@ -62,7 +62,7 @@
 		*-pdf)
 			copy pdfdocument.atril-backend libpdfdocument.so
 			CAT="office|PDF backend"
-			DEPENDS="atril cairo gdk-pixbuf glib gtk+3 libxml2 pango poppler"
+			DEPENDS="atril cairo gdk-pixbuf glib gtk3 libxml2 pango poppler"
 			;;
 		*-psd)
 			copy psdocument.atril-backend libpsdocument.so
@@ -76,13 +76,13 @@
 			;;
 		atril)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libsecret libxml2 pango \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libsecret libxml2 pango \
 			xorg-libICE xorg-libSM zlib"
 			TAGS="MATE pdf djvu"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="${SPLIT/$PACKAGE/} glib-dev gtk+3-dev"
+			DEPENDS="${SPLIT/$PACKAGE/} glib-dev gtk3-dev"
 			TAGS="MATE"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d audacious-plugins/receipt
--- a/audacious-plugins/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/audacious-plugins/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://distfiles.audacious-media-player.org/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk+-dev gettext audacious-dev libcdio-dev \
+BUILD_DEPENDS="glib-dev gtk2-dev gettext audacious-dev libcdio-dev \
 libcdio-paranoia-dev libcddb-dev flac-dev libogg-dev libvorbis-dev \
 fluidsynth-dev mpg123-dev faad2-dev wavpack-dev libsndfile-dev libmodplug-dev \
 libsamplerate-dev alsa-lib-dev jack-dev pulseaudio-dev neon-dev libmms-dev \
@@ -56,7 +56,7 @@
 			notify.so playlist-manager.so search-tool.so skins.so \
 			statusicon.so
 			DEPENDS="audacious-plugins-common audacious \
-			cairo gdk-pixbuf glib gtk+ libnotify pango xorg-libX11 \
+			cairo gdk-pixbuf glib gtk2 libnotify pango xorg-libX11 \
 			xorg-libXcomposite xorg-libXrender"
 			CAT="multimedia|GTK+2 based plugins"
 			;;
@@ -64,7 +64,7 @@
 			copy ladspa.so alarm.so gnomeshortcuts.so lyricwiki.so \
 			amidi-plug.so vtx.so blur_scope.so cairo-spectrum.so gl-spectrum.so
 			DEPENDS="audacious-plugins-common-extra audacious \
-			cairo dbus-glib fluidsynth gdk-pixbuf glib gtk+ libxml2 mesa \
+			cairo dbus-glib fluidsynth gdk-pixbuf glib gtk2 libxml2 mesa \
 			pango xorg-libX11"
 			CAT="multimedia|GTK+2 based extra plugins"
 			;;
diff -r 71ba95d2422e -r f48456621a9d audacious/receipt
--- a/audacious/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/audacious/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://distfiles.audacious-media-player.org/$TARBALL"
 
-BUILD_DEPENDS="glib-dev qt5-dev gettext gtk+-dev"
+BUILD_DEPENDS="glib-dev qt5-dev gettext gtk2-dev"
 SPLIT="audacious audacious-qt:qt audacious-common \
 audacious-dev audacious-qt-dev:qt"
 COOKOPTS="!menus"
@@ -37,7 +37,7 @@
 	case $PACKAGE in
 		audacious)
 			copy audacious libaudcore.so* libaudgui.so*
-			DEPENDS="audacious-common cairo gdk-pixbuf gtk+ pango"
+			DEPENDS="audacious-common cairo gdk-pixbuf gtk2 pango"
 			CAT="multimedia|GTK+2 GUI"
 			TAGS="music audio player"
 			;;
diff -r 71ba95d2422e -r f48456621a9d audacity/receipt
--- a/audacity/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/audacity/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib expat gdk-pixbuf glib gtk+ libmad libogg libsndfile \
+	DEPENDS="alsa-lib expat gdk-pixbuf glib gtk2 libmad libogg libsndfile \
 	libvorbis wxWidgets zlib"
 	TAGS="sound audio recorder editor"
 }
diff -r 71ba95d2422e -r f48456621a9d autoconf213/receipt
--- a/autoconf213/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/autoconf213/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/autoconf/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/autoconf213.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/autoconf213.html"
 
 TARBALL="autoconf-$VERSION.tar.gz"
 WGET_URL="http://ftpmirror.gnu.org/autoconf/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d autofs/receipt
--- a/autofs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/autofs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.kernel.org/pub/linux/daemons/autofs/v5"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/autofs.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/autofs.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d awn-extras/receipt
--- a/awn-extras/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/awn-extras/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk awn cairo dbus dbus-glib gconf gdk-pixbuf glib gtk+ \
+	DEPENDS="atk awn cairo dbus dbus-glib gconf gdk-pixbuf glib gtk2 \
 	libdesktop-agnostic libgtop libnotify libwnck2 python vte-gtk2 xorg-libX11 \
 	xorg-libXcomposite xorg-libXrender   python notify-python"
 }
diff -r 71ba95d2422e -r f48456621a9d awn/receipt
--- a/awn/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/awn/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 TARBALL="avant-window-navigator-${COMMIT:-$VERSION}.tar.gz"
 WGET_URL="https://github.com/p12tic/awn/archive/${COMMIT:-v$VERSION}.tar.gz"
 
-BUILD_DEPENDS="intltool gtk-doc libtool automake python-dev gtk+-dev \
+BUILD_DEPENDS="intltool gtk-doc libtool automake python-dev gtk2-dev \
 python-pycairo-dev python-pygtk-dev vala python-pyxdg glibmm-dev libdesktop-agnostic-dev \
 gtkmm-dev dbus-glib-dev xorg-libXcomposite-dev libwnck2-dev libgtop-dev"
 SPLIT="awn-dev"
@@ -36,7 +36,7 @@
 	case $PACKAGE in
 		awn)
 			copy @std
-			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+ \
+			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 \
 			libdesktop-agnostic libgtop libwnck2 pango python xorg-libX11 \
 			xorg-libXext"
 			TAGS="panel"
@@ -44,7 +44,7 @@
 			;;
 		awn-dev)
 			copy @dev
-			DEPENDS="awn dbus-glib-dev glib-dev glibmm-dev gtk+-dev gtkmm-dev \
+			DEPENDS="awn dbus-glib-dev glib-dev glibmm-dev gtk2-dev gtkmm-dev \
 			libdesktop-agnostic-dev"
 			PROVIDE="avant-window-navigator-dev"
 			;;
diff -r 71ba95d2422e -r f48456621a9d awstats/receipt
--- a/awstats/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/awstats/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,7 +9,7 @@
 WEB_SITE="http://awstats.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://prdownloads.sourceforge.net/awstats/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
 	mkdir -p \
diff -r 71ba95d2422e -r f48456621a9d ayttm/receipt
--- a/ayttm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ayttm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev zlib-dev audiofile-dev xorg-xcb-util-dev openssl10-dev \
+BUILD_DEPENDS="gtk2-dev zlib-dev audiofile-dev xorg-xcb-util-dev openssl10-dev \
 flex enchant-dev xorg-libXpm-dev libtool gettext"
 
 compile_rules() {
@@ -40,7 +40,7 @@
 genpkg_rules() {
 	copy @std
 	rm -r $fs/usr/share/applnk/ $fs/usr/share/gnome/
-	DEPENDS="enchant gdk-pixbuf glib gtk+ libltdl openssl10 pango xorg-libX11 \
+	DEPENDS="enchant gdk-pixbuf glib gtk2 libltdl openssl10 pango xorg-libX11 \
 	xorg-libXpm"
 	CONFIG_FILES="/etc/ayttmrc"
 }
diff -r 71ba95d2422e -r f48456621a9d babl/receipt
--- a/babl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/babl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="http://gegl.org/babl/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/babl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/babl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.gimp.org/pub/babl/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d beaver/receipt
--- a/beaver/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/beaver/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/beaver-editor/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev"
+BUILD_DEPENDS="intltool gtk2-dev"
 SPLIT="beaver-plugins"
 
 compile_rules() {
@@ -31,7 +31,7 @@
 		beaver)
 			copy beaver resource/ @ico
 			COOKOPTS="!pixmaps"
-			DEPENDS="cairo gdk-pixbuf glib gtk+ pango"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 pango"
 			TAGS="text-editor"
 			;;
 		*-plugins)
diff -r 71ba95d2422e -r f48456621a9d beneath-a-steel-sky/receipt
--- a/beneath-a-steel-sky/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/beneath-a-steel-sky/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,22 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="beneath-a-steel-sky"
 VERSION="1.2"
 CATEGORY="games"
-SHORT_DESC="Beneath A Steel Sky is a 2D point-and-click science fiction thriller."
+SHORT_DESC="Beneath A Steel Sky is a 2D point-and-click science fiction thriller"
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="other"
-DEPENDS="scummvm"
-SOURCE="bass-cd"
-TARBALL="$SOURCE-$VERSION.zip"
 WEB_SITE="https://revolution.co.uk/games/beneath-a-steel-sky/"
-WGET_URL="http://downloads.sourceforge.net/scummvm/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+TARBALL="bass-cd-$VERSION.zip"
+WGET_URL="$SF_MIRROR/scummvm/$TARBALL"
+
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications $fs/usr/games/bass
 	cp -a $src/sky* $fs/usr/games/bass
 	cp -a $stuff/*.desktop $fs/usr/share/applications
+	DEPENDS="scummvm"
 }
-
diff -r 71ba95d2422e -r f48456621a9d bluefish/receipt
--- a/bluefish/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/bluefish/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.bennewitz.com/bluefish/stable/source/${TARBALL}"
 
-BUILD_DEPENDS="gtk+-dev pcre-dev intltool libxml2-dev expat-dev"
+BUILD_DEPENDS="gtk2-dev pcre-dev intltool libxml2-dev expat-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,7 +22,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ libxml2 pango python   aspell \
+	DEPENDS="cairo gdk-pixbuf glib gtk2 libxml2 pango python   aspell \
 	shared-mime-info"
 	TAGS="text-editor language HTML programming scripting"
 }
diff -r 71ba95d2422e -r f48456621a9d bluez/receipt
--- a/bluez/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/bluez/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.bluez.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/bluez.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.kernel.org/pub/linux/bluetooth/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d boost/receipt
--- a/boost/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/boost/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="chadi.elahmad@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.boost.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/boost.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/boost.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://dl.bintray.com/boostorg/release/$VERSION/source/${PACKAGE}_${VERSION//./_}.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d brasero2/receipt
--- a/brasero2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/brasero2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/brasero/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev gnome-doc-utils gstreamer0-dev gst0-plugins-base-dev \
-libunique-dev gconf-dev xorg-libSM-dev gtk+-dev libcanberra-dev libburn-dev \
+libunique-dev gconf-dev xorg-libSM-dev gtk2-dev libcanberra-dev libburn-dev \
 libisofs-dev gobject-introspection-dev intltool xorg-libICE-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -38,13 +38,13 @@
 	case $PACKAGE in
 		brasero2)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gst0-plugins-base gstreamer0 gtk+ \
+			DEPENDS="cairo gdk-pixbuf glib gst0-plugins-base gstreamer0 gtk2 \
 			libburn libcanberra-gtk2 libisofs libunique libxml2 pango \
 			xorg-libICE xorg-libSM"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="brasero2 glib-dev gtk+-dev"
+			DEPENDS="brasero2 glib-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d brisk-menu/receipt
--- a/brisk-menu/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/brisk-menu/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-v$VERSION.tar.xz"
 WGET_URL="https://github.com/solus-project/brisk-menu/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="meson ninja gtk+3-dev mate-panel-dev mate-menus-dev \
+BUILD_DEPENDS="meson ninja gtk3-dev mate-panel-dev mate-menus-dev \
 libnotify-dev gettext"
 
 compile_rules() {
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="glib gtk+3 mate-menus mate-panel xorg-libX11"
+	DEPENDS="glib gtk3 mate-menus mate-panel xorg-libX11"
 	TAGS="MATE Solus menu GUI"
 }
diff -r 71ba95d2422e -r f48456621a9d btanks/receipt
--- a/btanks/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/btanks/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="btanks"
 VERSION="0.9.8083"
 CATEGORY="games"
-SHORT_DESC="A fast 2d tank arcade game with multiplayer and split-screen modes."
+SHORT_DESC="A fast 2d tank arcade game with multiplayer and split-screen modes"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://btanks.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="expat mesa libsigc++ libvorbis lua5.1 openal libsdl libsdl-image libsmpeg"
 BUILD_DEPENDS="expat-dev mesa-dev libsigc++-dev libvorbis libvorbis-dev libogg \
 libogg-dev lua5.1-dev openal-dev libsdl-dev libsdl-image-dev libsmpeg-dev scons2 \
 chrpath libsmpeg-dev lua5.1 zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/#define *NULL.*/#define NULL 0/g' engine/sl08/sl08.h
 	scons
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/bin \
 		$fs/usr/lib/btanks \
@@ -61,4 +56,5 @@
 	touch $SETTINGS
 	chgrp 100 $SETTINGS
 	chmod 664 $SETTINGS
+	DEPENDS="expat mesa libsigc++ libvorbis lua5.1 openal libsdl libsdl-image libsmpeg"
 }
diff -r 71ba95d2422e -r f48456621a9d btrfs-progs/receipt
--- a/btrfs-progs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/btrfs-progs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://btrfs.wiki.kernel.org/index.php/Main_Page"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/btrfs-progs.html"
 
 TARBALL="$PACKAGE-v$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/$TARBALL"
@@ -15,11 +16,8 @@
 acl-dev util-linux-blkid-dev lzo-dev" #autoconf automake"
 SPLIT="btrfs-mkfs btrfs-progs btrfs-libs btrfs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/btrfs-progs.html
-	sed -i '1,106 s/\.gz//g' Documentation/Makefile.in &&
+compile_rules() {
+	sed -i '1,106 s/\.gz//g' Documentation/Makefile.in
 
 	./configure \
 		--prefix=/usr \
@@ -28,17 +26,15 @@
 		--disable-documentation \
 		$CONFIGURE_ARGS &&
 	make &&
-	make install &&
+	make install || return 1
 
-	mkdir -p $install/usr/lib/ &&
+	mkdir -p $install/usr/lib/
 	ln -sfv ../../lib/$(readlink $install/lib/libbtrfs.so) \
-		$install/usr/lib/libbtrfs.so &&
+		$install/usr/lib/libbtrfs.so
 	rm -v $install/lib/libbtrfs.a $install/lib/libbtrfs.so
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		btrfs-mkfs)
 			copy mkfs.btrfs
diff -r 71ba95d2422e -r f48456621a9d bygfoot/receipt
--- a/bygfoot/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/bygfoot/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="bygfoot"
 VERSION="2.2.1"
@@ -6,19 +6,16 @@
 SHORT_DESC="Manage your own football (soccer) team in a league season"
 MAINTAINER="ben@seawolfsanctuary.com"
 LICENSE="GPL2"
+WEB_SITE="http://www.bygfoot.com/"
+
 TARBALL="$PACKAGE-$VERSION-source.zip"
-WEB_SITE="http://www.bygfoot.com/"
-WGET_URL="http://downloads.sourceforge.net/project/$PACKAGE/$PACKAGE/$PACKAGE-$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev glib-dev pango pango-dev atk-dev freetype-dev"
-DEPENDS="gtk+ glib pango atk freetype acl"
+BUILD_DEPENDS="gtk2-dev glib-dev pango pango-dev atk-dev freetype-dev"
 
-compile_rules()
-{
+compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
-	
-	cd $src
 
 	chmod +x configure
 	sed -i 's/^top_srcdir/top_builddir = @top_builddir@\n&/' po/Makefile.in.in
@@ -27,15 +24,15 @@
 		--bindir=/usr/games \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
+	make $MAKEFLAGS &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/
 	cp -a $install/usr $fs/
 
 	# Copy .desktop file:
 	cp -a $stuff/* $fs/usr
+	DEPENDS="gtk2 glib pango atk freetype acl"
 }
diff -r 71ba95d2422e -r f48456621a9d c-ares/receipt
--- a/c-ares/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/c-ares/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://c-ares.haxx.se/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/c-ares.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/c-ares.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://c-ares.haxx.se/download/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d cairo-clock/receipt
--- a/cairo-clock/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cairo-clock/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 #WGET_URL="http://macslow.thepimp.net/projects/cairo-clock/$TARBALL"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/c/$PACKAGE/${PACKAGE}_$VERSION.orig.tar.gz"
 
-BUILD_DEPENDS="intltool glib-dev gtk+-dev cairo-dev libglade-dev librsvg-dev"
+BUILD_DEPENDS="intltool glib-dev gtk2-dev cairo-dev libglade-dev librsvg-dev"
 SPLIT="cairo-clock-themes cairo-clock"
 
 compile_rules() {
@@ -32,7 +32,7 @@
 			;;
 		cairo-clock)
 			copy @std @rm
-			DEPENDS="cairo gdk-pixbuf glib gtk+ libglade librsvg"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 libglade librsvg"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d cairo-compmgr/receipt
--- a/cairo-compmgr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cairo-compmgr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://download.tuxfamily.org/ccm/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
-xorg-libXi-dev xorg-libSM-dev cairo-dev xorg-pixman-dev gtk+-dev vala \
+xorg-libXi-dev xorg-libSM-dev cairo-dev xorg-pixman-dev gtk2-dev vala \
 xorg-libICE-dev xorg-libX11-dev util-linux-uuid-dev intltool"
 SPLIT="cairo-compmgr-dev"
 
@@ -38,14 +38,14 @@
 	case $PACKAGE in
 		cairo-compmgr)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk+ pango vala xorg-libICE \
+			DEPENDS="cairo gdk-pixbuf glib gtk2 pango vala xorg-libICE \
 			xorg-libSM xorg-libX11 xorg-libXcomposite xorg-libXdamage \
 			xorg-libXext xorg-libXfixes xorg-libXi xorg-pixman"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="cairo-compmgr \
-			gconf-dev cairo-dev gtk+-dev"
+			gconf-dev cairo-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d cairo-dock-plugins/receipt
--- a/cairo-dock-plugins/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cairo-dock-plugins/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -52,7 +52,7 @@
 			;;
 		*)
 			copy @std @rm
-			DEPENDS="alsa-lib cairo dbus-glib fftw gdk-pixbuf glib gtk+3 \
+			DEPENDS="alsa-lib cairo dbus-glib fftw gdk-pixbuf glib gtk3 \
 			libdbusmenu-gtk3 libetpan libexif libical libindicator-gtk3 \
 			librsvg libxklavier libxml2 libzeitgeist lm-sensors mesa pango \
 			pulseaudio upower vte xorg-libX11 xorg-libXrandr xorg-libXxf86vm"
diff -r 71ba95d2422e -r f48456621a9d cairo-dock/receipt
--- a/cairo-dock/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cairo-dock/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cmake glib-dev cairo-dev librsvg-dev dbus-dev dbus-glib-dev \
 libxml2-dev mesa-dev glu-dev curl-dev xorg-libXtst-dev xorg-libXcomposite-dev \
-xorg-libXrandr-dev gtk+3-dev gettext"
+xorg-libXrandr-dev gtk3-dev gettext"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -32,7 +32,7 @@
 	case $PACKAGE in
 		cairo-dock)
 			copy @std
-			DEPENDS="cairo dbus-glib gdk-pixbuf glib glu gtk+3 libcurl librsvg \
+			DEPENDS="cairo dbus-glib gdk-pixbuf glib glu gtk3 libcurl librsvg \
 			libxml2 mesa pango xorg-libX11 xorg-libXcomposite xorg-libXinerama \
 			xorg-libXrandr xorg-libXrender xorg-libXtst   bash" # xorg-xcompmgr
 			SUGGESTED="cairo-dock-plugins"
@@ -41,7 +41,7 @@
 			copy @dev
 			DEPENDS="cairo-dock \
 			cairo-dev curl-dev dbus-dev dbus-glib-dev glib-dev glu-dev \
-			gtk+3-dev librsvg-dev libxml2-dev mesa-dev wayland-dev \
+			gtk3-dev librsvg-dev libxml2-dev mesa-dev wayland-dev \
 			xorg-libX11-dev xorg-libXcomposite-dev xorg-libXrandr-dev \
 			xorg-libXrender-dev xorg-libXtst-dev"
 			;;
diff -r 71ba95d2422e -r f48456621a9d cairo/receipt
--- a/cairo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cairo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,14 +7,14 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MPL LGPL2.1"
 WEB_SITE="https://www.cairographics.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/cairo.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/cairo.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev xorg-libX11-dev xorg-libXext-dev xorg-libICE-dev \
 xorg-libXrender-dev xorg-libxcb-dev libpng16-dev freetype-dev fontconfig-dev \
-libspectre-dev poppler-dev librsvg-dev gtk+-dev xorg-pixman-dev"
+libspectre-dev poppler-dev librsvg-dev gtk2-dev xorg-pixman-dev"
 SPLIT="cairo cairo-tools cairo-dev"
 
 # use --nogl to disable building cairo-gl* packages
@@ -26,10 +26,6 @@
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib";;
-	esac
-
 	case "$SET" in
 		gl) SET_ARGS='--enable-gl';;
 		*)  SET_ARGS='--disable-gl';;
diff -r 71ba95d2422e -r f48456621a9d cairomm/receipt
--- a/cairomm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cairomm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.cairographics.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/cairomm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/cairomm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://cairographics.org/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d caja-dropbox/receipt
--- a/caja-dropbox/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/caja-dropbox/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		caja-dropbox)
 			copy @std
-			DEPENDS="caja glib gtk+3"
+			DEPENDS="caja glib gtk3"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d caja-extensions/receipt
--- a/caja-extensions/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/caja-extensions/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -27,11 +27,11 @@
 	case $PACKAGE in
 		caja-extensions)
 			copy @std
-			DEPENDS="caja dbus-glib gdk-pixbuf glib gtk+3 gupnp mate-desktop"
+			DEPENDS="caja dbus-glib gdk-pixbuf glib gtk3 gupnp mate-desktop"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="caja-extensions glib-dev gtk+3-dev"
+			DEPENDS="caja-extensions glib-dev gtk3-dev"
 			;;
 	esac
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d caja/receipt
--- a/caja/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/caja/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://pub.mate-desktop.org/releases/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev mate-desktop-dev \
-pango-dev gtk+3-dev libnotify-dev libexif-dev exempi-dev xorg-libSM-dev"
+pango-dev gtk3-dev libnotify-dev libexif-dev exempi-dev xorg-libSM-dev"
 SPLIT="caja-dev"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		caja)
 			copy @std
-			DEPENDS="atk cairo exempi gdk-pixbuf glib gtk+3 libexif \
+			DEPENDS="atk cairo exempi gdk-pixbuf glib gtk3 libexif \
 			libnotify libxml2 mate-desktop pango xorg-libICE xorg-libSM \
 			xorg-libX11   shared-mime-info"
 			SUGGESTED="gvfs-smb"
@@ -38,7 +38,7 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="caja glib-dev gtk+3-dev"
+			DEPENDS="caja glib-dev gtk3-dev"
 			TAGS="MATE"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d cbrpager/receipt
--- a/cbrpager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cbrpager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 
 DEPENDS="libgnome-keyring libgnomeui p7zip-full rar unzip"
 BUILD_DEPENDS="gettext libgnomeui-dev libgnome-dev libbonoboui-dev \
-libgnomecanvas-dev libgnome-keyring-dev gtk+-dev"
+libgnomecanvas-dev libgnome-keyring-dev gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d celestia/receipt
--- a/celestia/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/celestia/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext mesa-dev glu-dev gtk+-dev gtkglext-dev \
+BUILD_DEPENDS="automake libtool gettext mesa-dev glu-dev gtk2-dev gtkglext-dev \
 lua5.1-dev libjpeg-turbo-dev   libtheora-dev"
 
 compile_rules() {
@@ -37,6 +37,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib glu gtk+ gtkglext libjpeg-turbo libogg \
+	DEPENDS="cairo gdk-pixbuf glib glu gtk2 gtkglext libjpeg-turbo libogg \
 	libpng16 libtheora mesa pango"
 }
diff -r 71ba95d2422e -r f48456621a9d cellwriter/receipt
--- a/cellwriter/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cellwriter/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/risujin/cellwriter/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk+-dev xorg-libXtst-dev"
+BUILD_DEPENDS="gtk2-dev xorg-libXtst-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ pango xorg-libX11 xorg-libXtst"
+	DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11 xorg-libXtst"
 }
diff -r 71ba95d2422e -r f48456621a9d cgoban/receipt
--- a/cgoban/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cgoban/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="$SF_MIRROR/cgoban1/$TARBALL"
 SUGGESTED="gnugo"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="gtk+-dev xorg-dev"
+DEPENDS="gtk2"
+BUILD_DEPENDS="gtk2-dev xorg-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d chemtool/receipt
--- a/chemtool/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/chemtool/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-BUILD_DEPENDS="gettext gtk+-dev xorg-libX11-dev xorg-libICE-dev"
+BUILD_DEPENDS="gettext gtk2-dev xorg-libX11-dev xorg-libICE-dev"
 
 compile_rules() {
 	./configure \
@@ -33,7 +33,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
 	xorg-libX11   shared-mime-info"
 	TAGS="chemistry"
 }
diff -r 71ba95d2422e -r f48456621a9d cinepaint-stable/receipt
--- a/cinepaint-stable/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cinepaint-stable/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,10 +12,10 @@
 TARBALL="cinepaint-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/cinepaint/$TARBALL"
 
-BUILD_DEPENDS="patch gtk+-dev gettext tiff-dev openexr-dev ilmbase-dev \
+BUILD_DEPENDS="patch gtk2-dev gettext tiff-dev openexr-dev ilmbase-dev \
 libjpeg-turbo-dev zlib-dev libpng16-dev lcms-dev xorg-libXmu-dev fltk-dev \
 python"
-SPLIT="cinepaint-stable-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	chmod a+x ./install-sh
@@ -33,7 +33,7 @@
 		cinepaint-stable)
 			copy @std
 			DEPENDS="atk bzlib cairo fltk fontconfig freetype gdk-pixbuf glib \
-			gtk+ ilmbase lcms libffi libharfbuzz libjpeg-turbo liblzma \
+			gtk2 ilmbase lcms libffi libharfbuzz libjpeg-turbo liblzma \
 			libpng16 libxml2 openexr pango pcre tiff util-linux-blkid \
 			util-linux-mount util-linux-uuid xorg-libICE xorg-libSM \
 			xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXextxorg-libXfixes \
diff -r 71ba95d2422e -r f48456621a9d cinepaint/receipt
--- a/cinepaint/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cinepaint/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="python coreutils-file-summarize coreutils-file-special gettext \
 xorg-xorgproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev mesa-dev \
-ilmbase-dev xorg-libXpm-dev gtk+-dev libpng16-dev bash automake autoconf libtool \
+ilmbase-dev xorg-libXpm-dev gtk2-dev libpng16-dev bash automake autoconf libtool \
 python-dev glu-dev xorg-libXmu-dev xorg-libXext-dev" # libpng12-dev
 
 compile_rules() {
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="desktop-file-utils gtk+ lcms tiff jpeg fltk ftgl xorg-libXmu \
+	DEPENDS="desktop-file-utils gtk2 lcms tiff jpeg fltk ftgl xorg-libXmu \
 	xorg-libXpm gutenprint zlib mesa jbigkit openexr"
 }
diff -r 71ba95d2422e -r f48456621a9d claws-mail/receipt
--- a/claws-mail/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/claws-mail/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.claws-mail.org/releases/$TARBALL"
 
-BUILD_DEPENDS="gettext xorg-libSM-dev glib-dev gnutls-dev gtk+-dev enchant-dev \
+BUILD_DEPENDS="gettext xorg-libSM-dev glib-dev gnutls-dev gtk2-dev enchant-dev \
 startup-notification-dev dbus-dev dbus-glib-dev openldap-dev librsvg-dev \
 libetpan-dev curl-dev expat-dev webkitgtk-dev libsoup-dev libarchive-dev \
 libical-dev poppler-dev gpgme-dev python-dev python-pygtk-dev libcanberra-dev \
@@ -40,7 +40,7 @@
 			copy bin/ icons/
 			CAT="mail|the user-friendly, lightweight and fast email client"
 			DEPENDS="atk bzlib cairo dbus dbus-glib enchant fontconfig \
-			freetype gdk-pixbuf glib gmp gtk+ libcroco openssl libetpan \
+			freetype gdk-pixbuf glib gmp gtk2 libcroco openssl libetpan \
 			libffi libgnutls libharfbuzz libidn libldap liblzma libpng16 \
 			librsvg libtasn1 libunistring libxml2 nettle p11-kit pango \
 			pcre startup-notification util-linux-blkid util-linux-mount \
@@ -179,7 +179,7 @@
 			acl-dev atk-dev attr-dev bzip2-dev cairo-dev \
 			curl-dev enchant-dev expat-dev fontconfig-dev freetype-dev \
 			gdk-pixbuf-dev glib-dev gpgme-dev gst1-plugins-base-dev \
-			gstreamer1-dev gtk+-dev harfbuzz-dev harfbuzz-icu-dev icu-dev \
+			gstreamer1-dev gtk2-dev harfbuzz-dev harfbuzz-icu-dev icu-dev \
 			libjpeg-turbo-dev lcms2-dev libarchive-dev libassuan-dev \
 			libcanberra-dev libetpan-dev libffi-dev libgcrypt-dev \
 			libgpg-error-dev libical-dev libidn2-dev libnotify-dev libogg-dev \
diff -r 71ba95d2422e -r f48456621a9d clearlooks/receipt
--- a/clearlooks/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/clearlooks/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="file gtk+-dev"
+BUILD_DEPENDS="file gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -23,5 +23,5 @@
 genpkg_rules() {
 	copy @std
 	rm -rf $fs/usr/share/icons
-	DEPENDS="gtk+ xorg-libXdamage"
+	DEPENDS="gtk2 xorg-libXdamage"
 }
diff -r 71ba95d2422e -r f48456621a9d clipit/receipt
--- a/clipit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/clipit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/CristianHenzel/ClipIt/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="gettext intltool automake glib-dev gtk+-dev"
+BUILD_DEPENDS="gettext intltool automake glib-dev gtk2-dev"
 
 compile_rules() {
 	# fix subcategory for cascade menu
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk+ pango xorg-libX11"
+	DEPENDS="glib gtk2 pango xorg-libX11"
 }
diff -r 71ba95d2422e -r f48456621a9d clonezilla/receipt
--- a/clonezilla/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/clonezilla/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="clonezilla"
 VERSION="3.3.10"
@@ -6,28 +6,23 @@
 SHORT_DESC="The Free and Open Source Software for Disk Imaging and Cloning"
 MAINTAINER="shann@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://clonezilla.org"
+WEB_SITE="http://clonezilla.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://free.nchc.org.tw/drbl-core/src/stable/$TARBALL"
 
-DEPENDS="bash drbl partclone ntfsprogs ntfs-3g partimage sshfs-fuse \
-coreutils-disk coreutils-redirection util-linux-setterm parted"
-BUILD_DEPENDS=""
+compile_rules() {
+	sed -i "s/SHELL/#SHELL/" Makefile
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	sed -i "s/SHELL/#SHELL/" Makefile
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs/
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/share $fs/usr
+	DEPENDS="bash drbl partclone ntfsprogs ntfs-3g partimage sshfs-fuse \
+	coreutils-disk coreutils-redirection util-linux-setterm parted"
 }
diff -r 71ba95d2422e -r f48456621a9d clutter-gst/receipt
--- a/clutter-gst/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/clutter-gst/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/clutter-gst/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/clutter-gst.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/clutter-gst.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d clutter-gtk/receipt
--- a/clutter-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/clutter-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://clutter-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/clutter-gtk.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/clutter-gtk.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="clutter-dev gtk+3-dev gettext gobject-introspection-dev"
+BUILD_DEPENDS="clutter-dev gtk3-dev gettext gobject-introspection-dev"
 SPLIT="clutter-gtk-dev"
 
 compile_rules() {
@@ -26,11 +26,11 @@
 	case $PACKAGE in
 		clutter-gtk)
 			copy @std
-			DEPENDS="cairo clutter cogl gdk-pixbuf glib gtk+3"
+			DEPENDS="cairo clutter cogl gdk-pixbuf glib gtk3"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="clutter-gtk clutter-dev gtk+3-dev"
+			DEPENDS="clutter-gtk clutter-dev gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d clutter/receipt
--- a/clutter/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/clutter/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/clutter/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/clutter.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/clutter.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d cndrvcups-common/receipt
--- a/cndrvcups-common/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cndrvcups-common/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="ufr2linuxv180.zip"
 WGET_URL="http://www.service.canon.com.au/drivers/files/$TARBALL"
 
-BUILD_DEPENDS="autoconf automake cairo-dev gtk+-dev cups-dev libtool"
+BUILD_DEPENDS="autoconf automake cairo-dev gtk2-dev cups-dev libtool"
 SPLIT="cndrvcups-common-dev"
 
 compile_rules() {
@@ -79,7 +79,7 @@
 
 			ln -sf libcanonc3pl.so.1.0.0 libcanonc3pl.so.1
 			ln -sf libcanonc3pl.so.1.0.0 libcanonc3pl.so
-			DEPENDS="cups cairo gtk+"
+			DEPENDS="cups cairo gtk2"
 			TAGS="printer driver"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d cogl/receipt
--- a/cogl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cogl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/cogl/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/cogl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/cogl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d colord-gtk/receipt
--- a/colord-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/colord-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.freedesktop.org/software/colord/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/colord-gtk.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/colord-gtk.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.freedesktop.org/software/colord/releases/$TARBALL"
 
-BUILD_DEPENDS="gobject-introspection-dev intltool libxslt gtk+3-dev colord-dev \
+BUILD_DEPENDS="gobject-introspection-dev intltool libxslt gtk3-dev colord-dev \
 vala"
 SPLIT="colord-gtk-dev"
 
@@ -30,11 +30,11 @@
 	case $PACKAGE in
 		colord-gtk)
 			copy @std
-			DEPENDS="cairo colord glib gtk+3"
+			DEPENDS="cairo colord glib gtk3"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="colord-gtk colord-dev gtk+3-dev"
+			DEPENDS="colord-gtk colord-dev gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d compiz-plugins-extra/receipt
--- a/compiz-plugins-extra/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/compiz-plugins-extra/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,10 +14,10 @@
 EXTRA_SOURCE_FILES="$PACKAGE-0b2a652.u"
 
 BUILD_DEPENDS="xorg-dev compiz-core-dev compiz-libcompizconfig-dev cmake \
-libxslt-dev startup-notification-dev mesa-dev gtk+-dev intltool librsvg-dev \
+libxslt-dev startup-notification-dev mesa-dev gtk2-dev intltool librsvg-dev \
 libnotify-dev compiz-bcop util-linux-uuid-dev compiz-plugins-main-dev libtool \
 util-linux-getopt xorg-libxshmfence-dev glu-dev expat-dev xorg-xcb-util-dev"
-SPLIT="compiz-plugins-extra-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	[ -s $SRC/$EXTRA_SOURCE_FILES ] ||
@@ -34,7 +34,7 @@
 	case $PACKAGE in
 		compiz-plugins-extra)
 			copy @std
-			DEPENDS="xorg-libX11 compiz-core compiz-libcompizconfig gtk+ \
+			DEPENDS="xorg-libX11 compiz-core compiz-libcompizconfig gtk2 \
 			librsvg libnotify compiz-plugins-main"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d compiz-plugins-main/receipt
--- a/compiz-plugins-main/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/compiz-plugins-main/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/$PACKAGE/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="xorg-dev compiz-core-dev libnotify-dev libxslt-dev \
-startup-notification-dev mesa-dev gtk+-dev intltool librsvg-dev \
+startup-notification-dev mesa-dev gtk2-dev intltool librsvg-dev \
 compiz-libcompizconfig compiz-libcompizconfig-dev compiz-bcop glu-dev \
 util-linux-uuid-dev libtool util-linux-getopt xorg-libxshmfence-dev expat-dev \
 xorg-xcb-util-dev"
diff -r 71ba95d2422e -r f48456621a9d compiz-plugins-unsupported/receipt
--- a/compiz-plugins-unsupported/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/compiz-plugins-unsupported/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,11 +12,11 @@
 WGET_URL="$WEB_SITE/compiz-plugins-experimental/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="xorg-dev compiz-core-dev compiz-libcompizconfig-dev cmake \
-libxslt-dev startup-notification-dev mesa-dev gtk+-dev intltool librsvg-dev \
+libxslt-dev startup-notification-dev mesa-dev gtk2-dev intltool librsvg-dev \
 libnotify-dev compiz-bcop util-linux-uuid-dev compiz-plugins-main-dev \
 compiz-plugins-extra compiz-plugins-extra-dev libtool util-linux-getopt \
 xorg-libxshmfence-dev glu-dev expat-dev xorg-xcb-util-dev"
-SPLIT="compiz-plugins-unsupported-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		compiz-plugins-unsupported)
 			copy @std
-			DEPENDS="xorg-libX11 compiz-core compiz-libcompizconfig gtk+ \
+			DEPENDS="xorg-libX11 compiz-core compiz-libcompizconfig gtk2 \
 			librsvg libnotify compiz-plugins-main"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d connman-ui/receipt
--- a/connman-ui/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/connman-ui/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,23 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="connman-ui"
-GITHASH="e4a8ddcca0870eb2ece5a7e3ea0296de9c86e5b2"
-VERSION=${GITHASH:0:7}
+VERSION="git20150622"
+COMMIT="fce0af9"
 CATEGORY="network"
 SHORT_DESC="A full-featured GTK based trayicon UI for ConnMan"
 MAINTAINER="domcox@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/tbursztyka/connman-ui"
-TARBALL="$PACKAGE-$VERSION.zip"
-WGET_URL="https://github.com/tbursztyka/connman-ui/archive/$GITHASH.zip"
 
-DEPENDS="connman dbus gtk+3"
-BUILD_DEPENDS="autoconf automake libtool connman-dev gtk+3-dev dbus-dev \
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://github.com/tbursztyka/connman-ui/archive/$COMMIT.tar.gz"
+
+BUILD_DEPENDS="autoconf automake libtool connman-dev gtk3-dev dbus-dev \
 libxml2-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh &&
 	./configure $CONFIGURE_ARGS &&
 	# remove Exite menu
@@ -28,8 +26,7 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="connman dbus gtk3"
 }
diff -r 71ba95d2422e -r f48456621a9d consolekit2/receipt
--- a/consolekit2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/consolekit2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/Consolekit2/ConsoleKit2"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/consolekit.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/consolekit.html"
 REPOLOGY="consolekit"
 
 TARBALL="ConsoleKit2-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d consonance/receipt
--- a/consonance/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/consonance/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="libao-dev taglib taglib-dev libmad-dev sqlite3-dev dbus-glib-dev \
 libnotify-dev flac-dev libsndfile-dev libvorbis-dev curl-dev libmodplug-dev \
 libcdio-dev libcddb-dev libidn-dev libidn libao libsndfile libmodplug libcdio \
-alsa-lib-dev libogg-dev gtk+-dev libcdio-paranoia-dev"
+alsa-lib-dev libogg-dev gtk2-dev libcdio-paranoia-dev"
 
 compile_rules() {
 	sed -i 's|cdio/cdda.h|cdio/paranoia/cdda.h|' src/cdda.h
diff -r 71ba95d2422e -r f48456621a9d cpio/receipt
--- a/cpio/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cpio/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/cpio/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/cpio.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/cpio.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d cream/receipt
--- a/cream/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cream/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/cream-browser/$TARBALL"
 
-BUILD_DEPENDS="webkitgtk-dev libsoup-dev gtk+-dev gettext-tools"
+BUILD_DEPENDS="webkitgtk-dev libsoup-dev gtk2-dev gettext-tools"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ gcc-lib-base webkitgtk libtasn1"
+	DEPENDS="gtk2 gcc-lib-base webkitgtk libtasn1"
 	TAGS="web-browser"
 }
diff -r 71ba95d2422e -r f48456621a9d cryptkeeper/receipt
--- a/cryptkeeper/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cryptkeeper/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/tomm/cryptkeeper/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="gtk+-dev gconf-dev xorg-libX11-dev"
+BUILD_DEPENDS="gtk2-dev gconf-dev xorg-libX11-dev"
 
 compile_rules() {
 	mv po/ru_RU.gmo po/ru.gmo
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy usr/
-	DEPENDS="gtk+ gconf encfs"
+	DEPENDS="gtk2 gconf encfs"
 }
diff -r 71ba95d2422e -r f48456621a9d cssed/receipt
--- a/cssed/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/cssed/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="cssed"
 VERSION="0.4.0"
@@ -6,27 +6,23 @@
 SHORT_DESC="CSS editor for web developers"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://cssed.sourceforge.net"
+WEB_SITE="http://cssed.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="gtk+-dev libxml2-dev"
+BUILD_DEPENDS="gtk2-dev libxml2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i "s/char\* o = 0;/const char\* o = 0;/" $src/scintilla/src/LexCaml.cxx
+
 	./configure $CONFIGURE_ARGS &&
 	sed -i 's/^cssed_LDADD.*/\0 -lgmodule-2.0/' $src/src/Makefile &&
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/share/$PACKAGE $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d ctorrent-dnh/receipt
--- a/ctorrent-dnh/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ctorrent-dnh/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ctorrent-dnh"
 VERSION="3.3.2"
 CATEGORY="network"
-SHORT_DESC="Command line Bittorrent client."
+SHORT_DESC="Command line Bittorrent client"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.rahul.net/dholmes/ctorrent/"
+
 TARBALL="${PACKAGE}$VERSION.tar.gz"
-WEB_SITE="http://www.rahul.net/dholmes/ctorrent/"
 WGET_URL="$SF_MIRROR/dtorrent/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mv ${PACKAGE}$VERSION $PACKAGE-$VERSION 2>/dev/null
 	cd $src
 	./configure \
 		--prefix=/usr \
 		--with-ssl=no \
-		$CONFIGURE_ARGS
-	make
+		$CONFIGURE_ARGS &&
+	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	# Torrentbox
diff -r 71ba95d2422e -r f48456621a9d dahdi-tools/receipt
--- a/dahdi-tools/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/dahdi-tools/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://downloads.asterisk.org/pub/telephony/$PACKAGE/releases/$TARBALL"
 
-BUILD_DEPENDS="dahdi-linux-dev ppp-dev newt-dev libpri-dev gtk+-dev file"
+BUILD_DEPENDS="dahdi-linux-dev ppp-dev newt-dev libpri-dev gtk2-dev file"
 SPLIT="dahdi-man dahdi-perl dahdi-ppp dahdi-dev dahdi-tools"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d dconf/receipt
--- a/dconf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/dconf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Projects/dconf"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/dconf.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/dconf.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d deadbeef/receipt
--- a/deadbeef/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/deadbeef/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext intltool yasm zlib-dev jansson-dev gtk+-dev \
+BUILD_DEPENDS="gettext intltool yasm zlib-dev jansson-dev gtk2-dev \
 alsa-lib-dev dbus-dev curl-dev libmad-dev libvorbis-dev libogg-dev flac-dev \
 libsndfile-dev libcdio-dev libcddb-dev cdparanoia-III-dev xorg-libX11-dev \
 imlib2-dev libjpeg-turbo-dev libpng16-dev libsamplerate-dev faad2-dev "
@@ -31,7 +31,7 @@
 			copy bin/ applications/ pixmaps/ \
 			alsa.so ddb_gui_GTK2.so hotkeys.so m3u.so mms.so mp3.so notify.so \
 			supereq.so vorbis.so @ico
-			DEPENDS="alsa-lib atk cairo dbus gdk-pixbuf glib gtk+ jansson \
+			DEPENDS="alsa-lib atk cairo dbus gdk-pixbuf glib gtk2 jansson \
 			libmad libvorbis pango xorg-libX11"
 			SUGGESTED="deadbeef-plugins"
 			TAGS="music audio player mp3 ogg ape"
@@ -40,7 +40,7 @@
 			copy @std @rm; rm -r $fs/usr/share
 			CAT="multimedia|extra plugins"
 			DEPENDS="deadbeef atk cdparanoia-III faad2 flac gdk-pixbuf glib \
-			gtk+ imlib2 libcddb libcdio libcurl libogg libsamplerate \
+			gtk2 imlib2 libcddb libcdio libcurl libogg libsamplerate \
 			libsndfile zlib"
 			TAGS="music audio player mp3 ogg ape"
 			;;
diff -r 71ba95d2422e -r f48456621a9d devilspie/receipt
--- a/devilspie/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/devilspie/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,36 +1,33 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="devilspie"
 VERSION="0.22"
 CATEGORY="x-window"
-SHORT_DESC="Windows matching utility."
+SHORT_DESC="Windows matching utility"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.burtonini.com/blog/tag/devilspie.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.burtonini.com/blog/tag/devilspie.html"
 WGET_URL="http://burtonini.com/computing/$TARBALL"
 
-DEPENDS="libwnck2 expat gtk+ xorg-libX11 xorg-libXau xorg-libXcomposite \
-xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
-xorg-libXrandr xorg-libXrender xorg-libXdamage"
 BUILD_DEPENDS="intltool libwnck2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
-	sed -i \
-	  -e 's/gdk_display/GDK_DISPLAY_XDISPLAY(gdk_display_get_default())/' \
-	  -e 's/GDK_DISPLAY(/gdk_display_get_default(/' \
-		src/xutils.c src/actions.c
-	./configure $CONFIGURE_ARGS && 
-	make && make install
+	sed \
+		-e 's/gdk_display/GDK_DISPLAY_XDISPLAY(gdk_display_get_default())/' \
+		-e 's/GDK_DISPLAY(/gdk_display_get_default(/' \
+		-i src/xutils.c src/actions.c
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libwnck2 expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
+	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
+	xorg-libXrandr xorg-libXrender xorg-libXdamage"
 }
diff -r 71ba95d2422e -r f48456621a9d dia/receipt
--- a/dia/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/dia/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libxml2-dev freetype-dev intltool \
+BUILD_DEPENDS="gtk2-dev libxml2-dev freetype-dev intltool \
 fontconfig-dev glib-dev atk-dev pango-dev python-pyxml zlib-dev libxslt \
 libart_lgpl-dev libart_lgpl python-pygtk file libxslt-dev expat-dev python-dev \
 docbook-xsl docbook-xml cairo-dev pango-dev librsvg-dev"
@@ -33,7 +33,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ libxml2 freetype fontconfig glib atk pango zlib libart_lgpl \
+	DEPENDS="gtk2 libxml2 freetype fontconfig glib atk pango zlib libart_lgpl \
 	libxslt popt xorg-libXdamage librsvg"
 	TAGS="office diagram creator editor visio"
 }
diff -r 71ba95d2422e -r f48456621a9d distcc/receipt
--- a/distcc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/distcc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/distcc/distcc/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="popt-dev lzo-dev python-dev gtk+-dev libgnome-dev \
+BUILD_DEPENDS="popt-dev lzo-dev python-dev gtk2-dev libgnome-dev \
 libgnomeui-dev libbonoboui-dev libgnomecanvas-dev libgnome-keyring-dev"
 SPLIT="distcc distccmon-gui"
 
@@ -43,7 +43,7 @@
 			;;
 		distccmon-gui)
 			CAT="development|GUI monitor"
-			DEPENDS="gtk+ distcc"
+			DEPENDS="gtk2 distcc"
 			mkdir -p $fs/usr/bin \
 				$fs/usr/share/applications \
 				$fs/usr/share/pixmaps
diff -r 71ba95d2422e -r f48456621a9d dtach/receipt
--- a/dtach/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/dtach/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dtach"
 VERSION="0.8"
 CATEGORY="system-tools"
-SHORT_DESC="Emulates the detach feature of screen."
+SHORT_DESC="Emulates the detach feature of screen"
 MAINTAINER="christophe.paris@free.fr"
 LICENSE="GPL2"
+WEB_SITE="http://dtach.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://dtach.sourceforge.net/"
-WGET_URL="http://downloads.sourceforge.net/dtach/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
 	make || return 1
-	# no install rules, let's do it by hand
-	mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/man/man1
-	cp dtach $DESTDIR/usr/bin
-	cp dtach.1 $DESTDIR/usr/share/man/man1
+
+	install -Dm755 dtach $install/usr/bin/dtach
+	cook_pick_manpages dtach.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r 71ba95d2422e -r f48456621a9d dvgrab/receipt
--- a/dvgrab/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/dvgrab/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dvgrab"
 VERSION="3.5"
@@ -7,26 +7,23 @@
 LICENSE="GPL2"
 SHORT_DESC="Saves audio and video data from an IEEE (FireWire) digital source"
 WEB_SITE="http://www.kinodv.org"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://downloads.sourceforge.net/kino/$TARBALL"
-TAGS="firewire video"
+WGET_URL="$SF_MIRROR/kino/$TARBALL"
 
-DEPENDS="libdv libavc1394 jpeg libiec61883 gcc-lib-base jpeg"
 BUILD_DEPENDS="libdv-dev libraw1394-dev libavc1394-dev libiec61883-dev jpeg-dev"
 
-# Rules to configure and make the package.
+compile_rules() {
+	sed -i 's/, 0xff/, -1/' iec13818-1.h
 
-compile_rules()
-{
-	sed -i 's/, 0xff/, -1/' iec13818-1.h
-	./configure --prefix=/usr &&
+	./configure \
+		--prefix=/usr &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr	
+
+genpkg_rules() {
+	copy @std
+	DEPENDS="libdv libavc1394 jpeg libiec61883 gcc-lib-base jpeg"
+	TAGS="firewire video"
 }
diff -r 71ba95d2422e -r f48456621a9d eboard/receipt
--- a/eboard/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/eboard/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,25 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="eboard"
 VERSION="1.1.1"
 CATEGORY="games"
-SHORT_DESC="Chess board interface."
+SHORT_DESC="Chess board interface"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.bergo.eng.fr/eboard/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.bergo.eng.fr/eboard/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-SUGGESTED="gnuchess"
-TAGS="chess"
 
-DEPENDS="gtk+ gcc-lib-base"
-BUILD_DEPENDS="gtk+-dev perl zlib-dev"
+BUILD_DEPENDS="gtk2-dev perl zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/pngp->//g' cimg.cc
 	sed -i 's/strchr(text/strchr((char *)text/' ntext.cc
+
 	./configure \
 		--prefix=/usr \
 		--man-prefix=/usr/share/man \
@@ -29,11 +26,12 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $install/usr/share $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp $src/r18.xpm $fs/usr/share/pixmaps/eboard.xpm
+	DEPENDS="gtk2 gcc-lib-base"
+	SUGGESTED="gnuchess"
+	TAGS="chess"
 }
diff -r 71ba95d2422e -r f48456621a9d ebtables/receipt
--- a/ebtables/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ebtables/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,32 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ebtables"
 VERSION="v2.0.10-4"
 CATEGORY="network"
-SHORT_DESC="Filtering tool for a Linux-based bridging firewall."
+SHORT_DESC="Filtering tool for a Linux-based bridging firewall"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://ebtables.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://ebtables.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="firewall"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/), ret = 0/), ret = ret - ret/' communication.c
 	mkdir -p $DESTDIR/etc/rc.d/init.d/ $DESTDIR/etc/sysconfig/
-	make && make DESTDIR=$DESTDIR -j1 install
+
+	make &&
+	make DESTDIR=$DESTDIR -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc
 	cp -a $install/etc/ethertypes $fs/etc
 	cp -a $install/etc/sysconfig $fs/etc
 	cp -a $install/usr/local/sbin $fs/usr
 	cp -a $install/usr/lib $fs/usr
+	TAGS="firewall"
 }
-
diff -r 71ba95d2422e -r f48456621a9d ekiga/receipt
--- a/ekiga/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ekiga/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev gnome-icon-theme boost-dev boost-signals \
+BUILD_DEPENDS="intltool gtk2-dev gnome-icon-theme boost-dev boost-signals \
 gconf-dev libnotify-dev xorg-libXv-dev dbus-dev dbus-glib-dev ptlib-dev \
 opal-dev"
 COOKOPTS="skip-log-errors"
@@ -30,7 +30,7 @@
 
 genpkg_rules() {
 	copy @std @ico
-	DEPENDS="atk boost-signals dbus-glib gconf gdk-pixbuf glib gtk+ libnotify \
+	DEPENDS="atk boost-signals dbus-glib gconf gdk-pixbuf glib gtk2 libnotify \
 	libxml2 opal pango ptlib xorg-libX11 xorg-libXext xorg-libXv"
 	TAGS="telephony"
 }
diff -r 71ba95d2422e -r f48456621a9d electricsheep/receipt
--- a/electricsheep/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/electricsheep/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://community.electricsheep.org/"
 WGET_URL="http://147.52.159.12/mirrors/ftp.kernel.org/pub/dist/vectorlinux/VL64-7.0/sourceAbs/$PACKAGE/$TARBALL"
 
-DEPENDS="curl expat flam3 ffmpeg mplayer libglade gtk+"
-BUILD_DEPENDS="curl-dev expat-dev ffmpeg-dev libglade-dev gtk+-dev flam3-dev"
+DEPENDS="curl expat flam3 ffmpeg mplayer libglade gtk2"
+BUILD_DEPENDS="curl-dev expat-dev ffmpeg-dev libglade-dev gtk2-dev flam3-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d emacs/receipt
--- a/emacs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/emacs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev \
-fontconfig-dev glib-dev gnutls-dev gtk+-dev jpeg-dev \
+fontconfig-dev glib-dev gnutls-dev gtk2-dev jpeg-dev \
 libpng16-dev librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev \
 xorg-dev-proto" # giflib-dev: version 4 needed, add --with-gif=no)
 SPLIT="emacs-help emacs-lisp-sources emacs"
@@ -72,7 +72,7 @@
 			copy @std @dev @rm
 			strip -s $fs/usr/lib/emacs/$VERSION/i486-pc-linux-gnu/* 2>/dev/null
 			DEPENDS="atk cairo dbus expat freetype fontconfig giflib glib \
-			gnutls gtk+ jpeg libpng16 librsvg util-linux-uuid \
+			gnutls gtk2 jpeg libpng16 librsvg util-linux-uuid \
 			ncurses pango tiff xorg-server zlib librsvg libgsf \
 			libgnutls harfbuzz"
 			SUGGESTED="alsa-lib"
diff -r 71ba95d2422e -r f48456621a9d emelfm2/receipt
--- a/emelfm2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/emelfm2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="emelfm2"
 VERSION="0.9.1"
@@ -6,35 +6,33 @@
 SHORT_DESC="GTK powerfull file manager."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://web.archive.org/web/20171213042310/http://emelfm2.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://web.archive.org/web/20171213042310/http://emelfm2.net/"
 WGET_URL="http://emelfm2.net/rel/$TARBALL" # FIXME
-TAGS="file-manager"
 
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev xorg-xorgproto libmagic-dev \
+BUILD_DEPENDS="gtk2-dev xorg-xorgproto libmagic-dev \
 coreutils-operations gettext-tools"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|xpdf|epdfview|g' src/e2_filetype.c
 	sed -i 's|gview|viewnior|g' src/e2_filetype.c
 	sed -i 's|totem|xine|g' src/e2_filetype.c
 	sed -i 's|Totem|Xine|g' src/e2_filetype.c
+
 	make PREFIX=/usr &&
 	make i18n PREFIX=/usr &&
 	make install PREFIX=$DESTDIR/usr &&
 	make install_i18n PREFIX=$DESTDIR/usr
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cd $fs/usr/share/pixmaps
 	ln -s emelfm2/emelfm2_32.png emelfm2.png
+	DEPENDS="gtk2 xorg-libXdamage"
+	TAGS="file-manager"
 }
diff -r 71ba95d2422e -r f48456621a9d emerald-themes/receipt
--- a/emerald-themes/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/emerald-themes/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 WGET_URL="$WEB_SITE/$PACKAGE/releases/download/v$VERSION/$TARBALL"
 
 DEPENDS="xorg-libX11 emerald"
-BUILD_DEPENDS="xorg-dev gtk+-dev autoconf automake libtool"
+BUILD_DEPENDS="xorg-dev gtk2-dev autoconf automake libtool"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d emerald/receipt
--- a/emerald/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/emerald/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE/$PACKAGE/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-dev gtk+-dev libwnck2-dev compiz-core-dev \
+BUILD_DEPENDS="xorg-dev gtk2-dev libwnck2-dev compiz-core-dev \
 libtool autoconf automake intltool"
 
 compile_rules() {
@@ -42,5 +42,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xorg-libX11 gtk+ libwnck2 compiz-core"
+	DEPENDS="xorg-libX11 gtk2 libwnck2 compiz-core"
 }
diff -r 71ba95d2422e -r f48456621a9d enchant/receipt
--- a/enchant/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/enchant/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://abiword.github.io/enchant/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/enchant.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/enchant.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/AbiWord/enchant/releases/download/enchant-${VERSION//./-}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev hunspell-dev aspell-dev"
-SPLIT="enchant-aspell enchant-hunspell enchant enchant-dev"
+SPLIT="$PACKAGE-aspell $PACKAGE-hunspell $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -24,12 +24,12 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		enchant-aspell)
+		*-aspell)
 			copy libenchant_aspell.so
 			CAT="text|aspell backend"
 			DEPENDS="aspell enchant glib"
 			;;
-		enchant-hunspell)
+		*-hunspell)
 			copy libenchant_myspell.so
 			CAT="text|hunspell backend"
 			DEPENDS="enchant glib hunspell"
@@ -40,7 +40,7 @@
 			SUGGESTED="aspell"
 			TAGS="spell check"
 			;;
-		enchant-dev)
+		*-dev)
 			copy @dev *.la
 			DEPENDS="enchant enchant-aspell enchant-hunspell glib-dev"
 			;;
diff -r 71ba95d2422e -r f48456621a9d engrampa/receipt
--- a/engrampa/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/engrampa/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/engrampa/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk+3-dev caja-dev json-glib-dev itstool \
+BUILD_DEPENDS="mate-common yelp-tools gtk3-dev caja-dev json-glib-dev itstool \
 xorg-libSM-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo caja gdk-pixbuf glib gtk+3 json-glib pango"
+	DEPENDS="cairo caja gdk-pixbuf glib gtk3 json-glib pango"
 	SUGGESTED="unrar unace p7zip zip"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d eom/receipt
--- a/eom/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/eom/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common yelp-tools gtk-doc itstool \
 gobject-introspection-dev libexif-dev lcms2-dev exempi-dev libjpeg-turbo-dev \
-dbus-glib-dev librsvg-dev gtk+3-dev mate-desktop-dev gdk-pixbuf-dev \
+dbus-glib-dev librsvg-dev gtk3-dev mate-desktop-dev gdk-pixbuf-dev \
 shared-mime-info-dev libpeas-dev"
 SPLIT="eom-dev"
 
@@ -30,12 +30,12 @@
 		eom)
 			copy @std
 			DEPENDS="atk cairo dbus-glib exempi gdk-pixbuf glib \
-			gobject-introspection gtk+3 lcms2 libexif libjpeg-turbo libpeas \
+			gobject-introspection gtk3 lcms2 libexif libjpeg-turbo libpeas \
 			libpeas-gtk librsvg libxml2 mate-desktop xorg-libX11 zlib"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="eom glib-dev gtk+3-dev"
+			DEPENDS="eom glib-dev gtk3-dev"
 			;;
 	esac
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d epdfview-cups/receipt
--- a/epdfview-cups/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/epdfview-cups/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,8 +13,8 @@
 WGET_URL="${WEB_SITE}archive/$VERSION.tar.gz"
 PROVIDE="epdfview:cups"
 
-DEPENDS="gtk+ poppler glib libpng16 cups xorg-libXdamage gcc-lib-base libcomerr3"
-BUILD_DEPENDS="gtk+-dev poppler-dev poppler cups cups-dev"
+DEPENDS="gtk2 poppler glib libpng16 cups xorg-libXdamage gcc-lib-base libcomerr3"
+BUILD_DEPENDS="gtk2-dev poppler-dev poppler cups cups-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d epdfview/receipt
--- a/epdfview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/epdfview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,22 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="epdfview"
 VERSION="0.1.8"
 CATEGORY="office"
-SHORT_DESC="Lightweight PDF document viewer using Poppler."
+SHORT_DESC="Lightweight PDF document viewer using Poppler"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/jristz/epdfview"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/jristz/epdfview"
 WGET_URL="https://github.com/jristz/epdfview/archive/$VERSION.tar.gz"
-TAGS="pdf viewer"
 
-DEPENDS="gtk+ poppler glib libpng16 xorg-libXdamage gcc-lib-base"
-BUILD_DEPENDS="gtk+-dev poppler-dev poppler cairo-dev"
+BUILD_DEPENDS="gtk2-dev poppler-dev poppler cairo-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/FORMAT_RGB24/FORMAT_ARGB32/g' src/PDFDocument.cxx
 	sed -i 's/firefox/browser/g' src/Config.cxx
 	sed -i 's/<config.h>/&\n#include <stdio.h>\n#define g_fopen fopen/' \
@@ -26,15 +23,17 @@
 	./configure \
 		--without-cups \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install || return 1
+
 	cp -f $stuff/*.desktop $install/usr/share/applications
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy epdfview *.desktop *.xml
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
 	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
 		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
+	DEPENDS="gtk2 poppler glib libpng16 xorg-libXdamage gcc-lib-base"
+	TAGS="pdf viewer"
 }
diff -r 71ba95d2422e -r f48456621a9d etherape/receipt
--- a/etherape/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/etherape/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gcc glib-dev glibc-dev libglade-dev libgnome-dev gtk+-dev \
+BUILD_DEPENDS="gcc glib-dev glibc-dev libglade-dev libgnome-dev gtk2-dev \
 libgnomeui-dev libpcap-dev gnome-doc-utils openssl-dev libxslt-dev \
 ossp-uuid-dev"
 
@@ -33,7 +33,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ libglade libgnome libpcap libgnomeui libltdl \
+	DEPENDS="gtk2 libglade libgnome libpcap libgnomeui libltdl \
 	openssl libxslt libgnome-keyring util-linux-uuid"
 	TAGS="ip monitoring network tcp vlan wlan"
 }
diff -r 71ba95d2422e -r f48456621a9d evilvte/receipt
--- a/evilvte/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/evilvte/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="evilvte"
 VERSION="0.5.2~pre1"
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev ncurses-dev vte-gtk2-dev"
+BUILD_DEPENDS="gtk2-dev ncurses-dev vte-gtk2-dev"
 
 compile_rules() {
 	./configure --prefix=/usr &&
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std @ico
-	DEPENDS="gtk+ ncurses vte-gtk2"
+	DEPENDS="gtk2 ncurses vte-gtk2"
 	TAGS="terminal"
 }
diff -r 71ba95d2422e -r f48456621a9d evince/receipt
--- a/evince/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/evince/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
 BUILD_DEPENDS="gnome-doc-utils docbook-xml libxml2-dev \
-gnome-icon-theme gtk+-dev intltool lcms-dev util-linux-uuid-dev \
+gnome-icon-theme gtk2-dev intltool lcms-dev util-linux-uuid-dev \
 poppler-dev tiff-dev dbus-glib-dev xorg-dev lcms2-dev"
 SPLIT="evince-dev"
 
diff -r 71ba95d2422e -r f48456621a9d evolution-data-server/receipt
--- a/evolution-data-server/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/evolution-data-server/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="libglade-dev libsoup-dev gtk+-dev orbit2-dev libbonobo-dev \
+BUILD_DEPENDS="libglade-dev libsoup-dev gtk2-dev orbit2-dev libbonobo-dev \
 gconf-dev libical-dev firefox-dev db-dev xorg-libxcb-dev popt-dev bison flex \
 glib-dev sqlite3-dev"
 SPLIT="evolution-data-server-dev"
diff -r 71ba95d2422e -r f48456621a9d exempi/receipt
--- a/exempi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/exempi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 SHORT_DESC="An implementation of XMP (Adobe's Extensible Metadata Platform)"
 MAINTAINER="yuripourre@gmail.com"
 WEB_SITE="https://libopenraw.freedesktop.org/wiki/Exempi/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/exempi.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/exempi.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://libopenraw.freedesktop.org/download/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d exiv2/receipt
--- a/exiv2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/exiv2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.exiv2.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/exiv2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/exiv2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.exiv2.org/builds/exiv2-$VERSION-trunk.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d exo/receipt
--- a/exo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/exo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/exo/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev libxfce4util-dev libxfce4ui-dev"
+BUILD_DEPENDS="intltool gtk2-dev libxfce4util-dev libxfce4ui-dev"
 SPLIT="exo-tools exo-dev"
 
 compile_rules() {
@@ -29,17 +29,17 @@
 		exo)
 			COOKOPTS="!menus !pixmaps"
 			copy *.so*
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ libxfce4util pango \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libxfce4util pango \
 			xorg-libX11"
 			;;
 		*-tools)
 			copy @std @rm
-			DEPENDS="atk exo gdk-pixbuf glib gtk+ libxfce4ui libxfce4util pango"
+			DEPENDS="atk exo gdk-pixbuf glib gtk2 libxfce4ui libxfce4util pango"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="exo exo-tools \
-			gtk+-dev libxfce4util-dev"
+			gtk2-dev libxfce4util-dev"
 			;;
 	esac
 	TAGS="Xfce"
diff -r 71ba95d2422e -r f48456621a9d extra-cmake-modules/receipt
--- a/extra-cmake-modules/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/extra-cmake-modules/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://github.com/KDE/extra-cmake-modules"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/kde/extra-cmake-modules.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/kde/extra-cmake-modules.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d extrema/receipt
--- a/extrema/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/extrema/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev wxWidgets28-dev"
+BUILD_DEPENDS="gtk2-dev wxWidgets28-dev"
 
 compile_rules() {
 	sed -i "s|^pkgdatadir = |&$DESTDIR|" src/Makefile*
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ wxWidgets28 xorg-libXxf86vm libxml2"
+	DEPENDS="gtk2 wxWidgets28 xorg-libXxf86vm libxml2"
 	TAGS="data visualization analysis"
 }
diff -r 71ba95d2422e -r f48456621a9d faac/receipt
--- a/faac/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/faac/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.audiocoding.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/faac.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/faac.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/faac/$TARBALL"
 
-SPLIT="faac-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/obj-type/d; /Long Term/d' frontend/main.c
@@ -28,7 +28,12 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		faac)  copy @std; TAGS="mp4 mpeg encoder";;
-		*-dev) copy @dev;;
+		faac)
+			copy @std
+			TAGS="mp4 mpeg encoder"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d fbpanel/receipt
--- a/fbpanel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fbpanel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://fbpanel.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="gtk+-dev"
+DEPENDS="gtk2"
+BUILD_DEPENDS="gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d fbreader/receipt
--- a/fbreader/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fbreader/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,36 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fbreader"
 VERSION="0.12.10"
 CATEGORY="utilities"
-SHORT_DESC="E-Book Reader. Supports many e-book formats."
+SHORT_DESC="E-Book Reader supporting many e-book formats"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL3"
+WEB_SITE="http://www.fbreader.org/"
+
 TARBALL="$PACKAGE-sources-$VERSION.tgz"
-WEB_SITE="http://www.fbreader.org/"
 WGET_URL="http://www.fbreader.org/$TARBALL"
 
 BUILD_DEPENDS="expat-dev liblinebreak-dev curl-dev fribidi-dev bzip2-dev \
-sqlite3-dev gtk+-dev xorg-dev glib-dev gettext intltool"
-DEPENDS="expat liblinebreak curl fribidi bzip2 sqlite3 gtk+"
+sqlite3-dev gtk2-dev xorg-dev glib-dev gettext intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	# GCC 4.5.0 fix
 	sed -i 's/Library::Library /Library /' fbreader/src/library/Library.cpp
 	echo "UI_TYPE = gtk" >> makefiles/target.mk
 	echo "TARGET_STATUS = release" >> makefiles/target.mk
+
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="expat liblinebreak curl fribidi bzip2 sqlite3 gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d fbxkb/receipt
--- a/fbxkb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fbxkb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev xorg-libXmu-dev"
+BUILD_DEPENDS="gtk2-dev xorg-libXmu-dev"
 
 compile_rules() {
 	./configure &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ xorg-libXmu"
+	DEPENDS="gtk2 xorg-libXmu"
 }
diff -r 71ba95d2422e -r f48456621a9d fceux/receipt
--- a/fceux/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fceux/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fceux"
 VERSION="2.2.3"
@@ -6,26 +6,23 @@
 SHORT_DESC="A fast and ultra-compatible NES/Famicom emulator with SDL, OpenGL and SVGALIB support"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://fceux.com/web/home.html"
+
 TARBALL="$PACKAGE-$VERSION.src.tar.gz"
-WEB_SITE="http://fceux.com/web/home.html"
 WGET_URL="$SF_MIRROR/fceultra/Source%20Code/$VERSION%20src/$TARBALL"
-TAGS="emulator nes"
 
-DEPENDS="libsdl lua gtk+"
-BUILD_DEPENDS="scons2 mesa-dev libsdl-dev lua-dev gtk+-dev zlib-dev \
+BUILD_DEPENDS="scons2 mesa-dev libsdl-dev lua-dev gtk2-dev zlib-dev \
 elfutils-dev glu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	scons
 	sed -i "s|/usr/local|$DESTDIR/usr|" SConstruct
 	scons install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libsdl lua gtk2"
+	TAGS="emulator nes"
 }
diff -r 71ba95d2422e -r f48456621a9d fcitx-configtool/receipt
--- a/fcitx-configtool/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fcitx-configtool/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="https://fcitx-im.org/wiki/Configtool"
 WGET_URL="https://download.fcitx-im.org/$PACKAGE/$TARBALL"
 
-DEPENDS="fcitx gtk+"
-BUILD_DEPENDS="fcitx libunique-dev gtk+-dev cmake intltool xorg-libXrender-dev \
+DEPENDS="fcitx gtk2"
+BUILD_DEPENDS="fcitx libunique-dev gtk2-dev cmake intltool xorg-libXrender-dev \
 cairo-dev pango-dev fcitx-dev file"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d fcitx-googlepinyin/receipt
--- a/fcitx-googlepinyin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fcitx-googlepinyin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fcitx-googlepinyin"
 VERSION="0.1.3"
@@ -6,30 +6,26 @@
 SHORT_DESC="Googlepinyin Wrapper for Fcitx"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://fcitx-im.org/wiki/Googlepinyin"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://fcitx-im.org/wiki/Googlepinyin"
 WGET_URL="https://download.fcitx-im.org/$PACKAGE/$TARBALL"
 
-DEPENDS="fcitx libgooglepinyin"
-BUILD_DEPENDS="cairo-dev pango-dev intltool cmake gtk+-dev gcc fcitx fcitx-dev libgooglepinyin-dev"
+BUILD_DEPENDS="cairo-dev pango-dev intltool cmake gtk2-dev fcitx-dev libgooglepinyin-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $src/build
-	cd $src/build
+compile_rules() {
+	mkdir build
+	cd    build
 	cmake $src -DCMAKE_INSTALL_PREFIX=/usr || return 1
 	cd $src
 	make -C build || return 1
 	make install/fast -C build DESTDIR=$DESTDIR
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/fcitx/ $fs/usr/lib/fcitx/
 	cp -a $install/usr/share/fcitx/addon/ $fs/usr/share/fcitx/
 	cp -a $install/usr/share/fcitx/configdesc/ $fs/usr/share/fcitx/
 	cp -a $install/usr/lib/fcitx/fcitx-googlepinyin* $fs/usr/lib/fcitx/
+	DEPENDS="fcitx libgooglepinyin"
 }
-
diff -r 71ba95d2422e -r f48456621a9d fcitx/receipt
--- a/fcitx/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fcitx/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,7 +10,7 @@
 WEB_SITE="https://fcitx-im.org/wiki/Fcitx"
 WGET_URL="https://download.fcitx-im.org/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="cmake intltool cairo-dev pango-dev gtk+-dev dbus-dev opencc-dev"
+BUILD_DEPENDS="cmake intltool cairo-dev pango-dev gtk2-dev dbus-dev opencc-dev"
 SPLIT="fcitx-dev fcitx-skin-classic fcitx-skin-dark fcitx-skin-default \
 fcitx-tools libfcitx"
 
@@ -35,7 +35,7 @@
 {
 	case $PACKAGE in
 	fcitx)
-		DEPENDS="libfcitx fcitx-skin-default gtk+"
+		DEPENDS="libfcitx fcitx-skin-default gtk2"
 		mkdir -p $fs/usr/bin/ $fs/usr/share/fcitx/ $fs/usr/share/applications/
 		cp -a $install/usr/bin/fcitx $fs/usr/bin/
 		cp -a $install/usr/bin/fcitx-configtool $fs/usr/bin/
diff -r 71ba95d2422e -r f48456621a9d ffmpeg/receipt
--- a/ffmpeg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ffmpeg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://ffmpeg.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/ffmpeg.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/ffmpeg.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d fftw/receipt
--- a/fftw/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fftw/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.fftw.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/fftw.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/fftw.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.fftw.org/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d firefox-official/receipt
--- a/firefox-official/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/firefox-official/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -89,8 +89,8 @@
 	esac
 	CAT="network|$lang language"
 	cp -a $install/* $fs
-	DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf glib gtk+ \
-	gtk+3 pango xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXext \
+	DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf glib gtk2 \
+	gtk3 pango xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXext \
 	xorg-libXfixes xorg-libXrender xorg-libXt xorg-libxcb"
 	TAGS="web-browser"
 }
diff -r 71ba95d2422e -r f48456621a9d firefox/receipt
--- a/firefox/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/firefox/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,11 +11,11 @@
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
 TAGS="web-browser"
 
-DEPENDS="gtk+ sqlite3 dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \
+DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \
 alsa-lib xorg-libXt libevent libvpx pango nss libfirefox"
 BUILD_DEPENDS="zip libidl coreutils findutils wireless_tools-dev \
 perl python yasm alsa-lib-dev mesa-dev libevent-dev libvpx-dev dbus-dev \
-dbus-glib-dev gtk+-dev glib-dev pango-dev nss-dev sqlite3-dev tar gzip"
+dbus-glib-dev gtk2-dev glib-dev pango-dev nss-dev sqlite3-dev tar gzip"
 SPLIT="firefox firefox-dev libfirefox"
 
 # Rules to configure and make the package.
@@ -149,7 +149,7 @@
 		;;
 	libfirefox)
 		CAT="network|firefox/thunderbird common files"
-		DEPENDS="gtk+ sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
+		DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
 			xorg-libXdamage alsa-lib xorg-libXt"
 		# dictionaries/en-US.aff
 		# dictionaries/en-US.dic
diff -r 71ba95d2422e -r f48456621a9d florence-gtk2/receipt
--- a/florence-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/florence-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,8 +13,8 @@
 WGET_URL="$SF_MIRROR/florence/$TARBALL"
 
 BUILD_DEPENDS="intltool gconf-dev xorg-libX11-dev glib-dev cairo-dev \
-librsvg-dev libxml2-dev gtk+-dev gstreamer0-dev xorg-libXtst-dev \
-at-spi2-core-dev at-spi2-atk-dev gtk+-dev"
+librsvg-dev libxml2-dev gtk2-dev gstreamer0-dev xorg-libXtst-dev \
+at-spi2-core-dev at-spi2-atk-dev gtk2-dev"
 
 compile_rules() {
 	./configure \
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="gconf at-spi2-core cairo gdk-pixbuf glib gstreamer0 gtk+ librsvg \
+	DEPENDS="gconf at-spi2-core cairo gdk-pixbuf glib gstreamer0 gtk2 librsvg \
 	libxml2 pango xorg-libX11 xorg-libXtst"
 	PROVIDE="florence"
 }
diff -r 71ba95d2422e -r f48456621a9d florence/receipt
--- a/florence/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/florence/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="intltool glib-dev xorg-libXext-dev cairo-dev librsvg-dev \
-libxml2-dev gstreamer1-dev gtk+3-dev xorg-libXtst-dev"
+libxml2-dev gstreamer1-dev gtk3-dev xorg-libXtst-dev"
 SPLIT="florence-dev"
 
 compile_rules() {
@@ -34,7 +34,7 @@
 	case $PACKAGE in
 		florence)
 			copy @std *.mo
-			DEPENDS="cairo gdk-pixbuf glib gstreamer1 gtk+3 librsvg libxml2 \
+			DEPENDS="cairo gdk-pixbuf glib gstreamer1 gtk3 librsvg libxml2 \
 			pango xorg-libX11 xorg-libXext xorg-libXtst"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d fltk/receipt
--- a/fltk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fltk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://www.fltk.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/fltk.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/fltk.html"
 
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="http://fltk.org/pub/fltk/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d font-manager/receipt
--- a/font-manager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/font-manager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/FontManager/master/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="vala gettext intltool freetype-dev fontconfig-dev json-glib-dev \
-cairo-dev gtk+3-dev libgee-dev gucharmap3-dev sqlite3-dev yelp-tools itstool \
+cairo-dev gtk3-dev libgee-dev gucharmap3-dev sqlite3-dev yelp-tools itstool \
 file gobject-introspection-dev"
 
 compile_rules() {
@@ -26,6 +26,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo fontconfig freetype glib gtk+3 gucharmap3 json-glib libgee \
+	DEPENDS="cairo fontconfig freetype glib gtk3 gucharmap3 json-glib libgee \
 	libsqlite3 libxml2 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d fontforge/receipt
--- a/fontforge/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fontforge/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="libtool perl-dev tar autoconf automake bash coreutils-line \
 xorg-libX11-dev xorg-libICE-dev zlib-dev freetype-dev libjpeg-turbo-dev \
 libpng16-dev tiff-dev readline-dev cairo-dev pango-dev xorg-libXft-dev \
-gtk+-dev python-dev libuninameslist-dev libspiro-dev util-linux-uuid-dev \
+gtk2-dev python-dev libuninameslist-dev libspiro-dev util-linux-uuid-dev \
 xorg-libSM-dev gettext"
 SPLIT="fontforge-fonts fontforge-dev"
 
@@ -36,7 +36,7 @@
 		fontforge)
 			copy @std *.mo
 			rm $fs/usr/share/fontforge/pixmaps/*.ttf
-			DEPENDS="gtk+ libuninameslist python libspiro libltdl xorg-libSM"
+			DEPENDS="gtk2 libuninameslist python libspiro libltdl xorg-libSM"
 			TAGS="editor font"
 			;;
 		*-fonts)
diff -r 71ba95d2422e -r f48456621a9d four-in-a-row/receipt
--- a/four-in-a-row/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/four-in-a-row/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk+3-dev librsvg-dev libcanberra-dev gettext \
+BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev gettext \
 itstool"
 
 compile_rules() {
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+3 libcanberra libcanberra-gtk3"
+	DEPENDS="cairo gdk-pixbuf glib gtk3 libcanberra libcanberra-gtk3"
 }
diff -r 71ba95d2422e -r f48456621a9d fpm2/receipt
--- a/fpm2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fpm2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,10 +10,10 @@
 WEB_SITE="https://als.regnet.cz/fpm2/"
 WGET_URL="https://als.regnet.cz/fpm2/download/$TARBALL"
 
-DEPENDS="expat gtk+ libxml2 xorg-libX11 xorg-libXau xorg-libXcomposite \
+DEPENDS="expat gtk2 libxml2 xorg-libX11 xorg-libXau xorg-libXcomposite \
 xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
 xorg-libXrandr xorg-libXrender xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev libxml2-dev"
+BUILD_DEPENDS="gtk2-dev libxml2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d freeciv/receipt
--- a/freeciv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/freeciv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev ncurses-dev readline-dev gtk+-dev gettext \
+BUILD_DEPENDS="zlib-dev ncurses-dev readline-dev gtk2-dev gettext \
 libsdl-mixer-dev glibc-locale bzip2-dev expat-dev"
 
 compile_rules() {
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="zlib ncurses readline gtk+ gettext-base xorg-libXdamage \
+	DEPENDS="zlib ncurses readline gtk2 gettext-base xorg-libXdamage \
 	libsdl-mixer bzip2"
 	TAGS="strategy"
 }
diff -r 71ba95d2422e -r f48456621a9d freepats/receipt
--- a/freepats/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/freepats/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,37 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="freepats"
 VERSION="20060219"
 CATEGORY="multimedia"
-SHORT_DESC="Free and open set of instrument patches."
+SHORT_DESC="Free and open set of instrument patches"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://freepats.zenvoid.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://freepats.zenvoid.org/"
 WGET_URL="http://freepats.zenvoid.org/$TARBALL"
 
-DEPENDS="TiMidity++"
-BUILD_DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/timidity
 	cp -a $src $fs/usr/share/timidity/freepats
 	chown -R root.root $fs/usr/share/timidity/freepats
+	DEPENDS="timidity++"
 }
 
-post_install()
-{
+post_install() {
 	# Update timidity.cfg
 		cat >> "$1/usr/share/timidity/timidity.cfg" <<EOF
-# freepats 
+# freepats
 dir /usr/share/timidity/freepats
 source /usr/share/timidity/freepats/freepats.cfg
 EOF
 }
 
-post_remove()
-{
+post_remove() {
 	sed -i '/freepats/d' "$1/usr/share/timidity/timidity.cfg"
 }
diff -r 71ba95d2422e -r f48456621a9d freetuxtv/receipt
--- a/freetuxtv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/freetuxtv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,33 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="freetuxtv"
 VERSION="0.6.5"
 CATEGORY="network"
-SHORT_DESC="FreetuxTV is a free GTK+ WebTV and Web Radio player for Linux."
+SHORT_DESC="FreetuxTV is a free GTK+ WebTV and Web Radio player for Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://code.google.com/p/freetuxtv/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://freetuxtv.googlecode.com/files/$TARBALL"
 
-DEPENDS="gtk+ glib dbus-glib libsqlite3 libvlc libcurl libnotify"
-BUILD_DEPENDS="gtk+-dev glib-dev dbus-glib-dev libsqlite3 sqlite3-dev \
+BUILD_DEPENDS="gtk2-dev glib-dev dbus-glib-dev libsqlite3 sqlite3-dev \
 libvlc-dev libvlc curl-dev libnotify-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/* $fs
 	cp $stuff/freetuxtv.desktop $fs/usr/share/applications
+	DEPENDS="gtk2 glib dbus-glib libsqlite3 libvlc libcurl libnotify"
 }
diff -r 71ba95d2422e -r f48456621a9d fsthost/receipt
--- a/fsthost/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fsthost/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fsthost"
 VERSION="1.4.0"
@@ -6,21 +6,18 @@
 SHORT_DESC="FSTHost is VST host for Jack with GTK interface"
 MAINTAINER="xj@wp.pl"
 LICENSE="GPL2"
-WEB_SITE="http://fsthost.sourceforge.net"
+WEB_SITE="http://fsthost.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="http://downloads.sourceforge.net/project/$PACKAGE/$PACKAGE-$VERSION.tar.xz"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="wine gtk+ libxml2 jack"
-BUILD_DEPENDS="gtk+-dev libxml2-dev wine-rt-dev jack-dev"
+BUILD_DEPENDS="gtk2-dev libxml2-dev wine-rt-dev jack-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make LIB_INST_PATH=/usr/lib DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules()n{
 	cp -a $install/* $fs
+	DEPENDS="wine gtk2 libxml2 jack"
 }
diff -r 71ba95d2422e -r f48456621a9d fuse-emulator/receipt
--- a/fuse-emulator/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fuse-emulator/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 TARBALL="fuse-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/fuse-emulator/$TARBALL"
 
-BUILD_DEPENDS="perl libspectrum-dev xorg-libX11-dev xorg-libICE-dev gtk+-dev \
-gtk+3-dev alsa-lib-dev libsdl-dev libgcrypt-dev"
+BUILD_DEPENDS="perl libspectrum-dev xorg-libX11-dev xorg-libICE-dev gtk2-dev \
+gtk3-dev alsa-lib-dev libsdl-dev libgcrypt-dev"
 SPLIT="fuse-emulator-gtk3:gtk3"
 
 compile_rules() {
@@ -31,13 +31,13 @@
 	case $PACKAGE in
 		fuse-emulator)
 			copy @std @ico # only 16 and 48
-			DEPENDS="alsa-lib gdk-pixbuf glib gtk+ libpng16 libsdl libspectrum \
+			DEPENDS="alsa-lib gdk-pixbuf glib gtk2 libpng16 libsdl libspectrum \
 			libxml2 pango xorg-libX11 zlib"
 			;;
 		fuse-emulator-gtk3)
 			copy @std @ico # only 16 and 48
 			CAT="games|with GTK+3 interface"
-			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk+3 libpng16 libsdl \
+			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk3 libpng16 libsdl \
 			libspectrum libxml2 pango xorg-libX11 zlib"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d fuse2/receipt
--- a/fuse2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/fuse2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/libfuse/libfuse"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/fuse2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/fuse2.html"
 REPOLOGY="fuse"
 
 TARBALL="fuse-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d gadmin-antivirus/receipt
--- a/gadmin-antivirus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-antivirus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ clamav"
+	DEPENDS="gtk2 clamav"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-bind/receipt
--- a/gadmin-bind/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-bind/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ bind"
+	DEPENDS="gtk2 bind"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-dhcpd/receipt
--- a/gadmin-dhcpd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-dhcpd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ dhcp"
+	DEPENDS="gtk2 dhcp"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-httpd/receipt
--- a/gadmin-httpd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-httpd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ apache"
+	DEPENDS="gtk2 apache"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-openvpn-client/receipt
--- a/gadmin-openvpn-client/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-openvpn-client/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/gadmin-openvpn/client/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ openvpn"
+	DEPENDS="gtk2 openvpn"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-openvpn-server/receipt
--- a/gadmin-openvpn-server/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-openvpn-server/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/gadmin-openvpn/server/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ openvpn"
+	DEPENDS="gtk2 openvpn"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-proftpd/receipt
--- a/gadmin-proftpd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-proftpd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ proftpd"
+	DEPENDS="gtk2 proftpd"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-rsync/receipt
--- a/gadmin-rsync/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-rsync/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ rsync"
+	DEPENDS="gtk2 rsync"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-samba/receipt
--- a/gadmin-samba/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-samba/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ samba"
+	DEPENDS="gtk2 samba"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-sendmail/receipt
--- a/gadmin-sendmail/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-sendmail/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ sendmail"
+	DEPENDS="gtk2 sendmail"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-squid/receipt
--- a/gadmin-squid/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-squid/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ squid"
+	DEPENDS="gtk2 squid"
 }
diff -r 71ba95d2422e -r f48456621a9d gadmin-sshd/receipt
--- a/gadmin-sshd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gadmin-sshd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dalalven.dtdns.net/linux/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ openssh"
+	DEPENDS="gtk2 openssh"
 	TAGS="ssh"
 }
diff -r 71ba95d2422e -r f48456621a9d galculator/receipt
--- a/galculator/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/galculator/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://galculator.mnim.org/downloads/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev flex intltool"
+BUILD_DEPENDS="gtk2-dev flex intltool"
 
 COOKOPTS="!pixmaps !menus"
 
@@ -33,5 +33,5 @@
 	rm -r $fs/usr/share/pixmaps
 	find $fs -name '*gtk3*' -delete
 	sed -i 's|^[ ]*||g' $fs/usr/share/galculator/ui/*
-	DEPENDS="glib gtk+ pango"
+	DEPENDS="glib gtk2 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d gamin/receipt
--- a/gamin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gamin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 CROSS_BUGS="error: cannot run test program while cross compiling"
 
-BUILD_DEPENDS="glib-dev gtk+-dev"
+BUILD_DEPENDS="glib-dev gtk2-dev"
 SPLIT="gamin-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d garcon/receipt
--- a/garcon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/garcon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool libxfce4util-dev gtk+-dev libxfce4ui-dev \
+BUILD_DEPENDS="intltool libxfce4util-dev gtk2-dev libxfce4ui-dev \
 xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
 SPLIT="garcon-dev"
 
@@ -29,12 +29,12 @@
 	case $PACKAGE in
 		garcon)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk+ libxfce4ui libxfce4util"
+			DEPENDS="gdk-pixbuf glib gtk2 libxfce4ui libxfce4util"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="garcon \
-			glib-dev gtk+-dev libxfce4ui-dev"
+			glib-dev gtk2-dev libxfce4ui-dev"
 			;;
 	esac
 	TAGS="Xfce"
diff -r 71ba95d2422e -r f48456621a9d gcc+gcj/receipt
--- a/gcc+gcj/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gcc+gcj/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -20,12 +20,12 @@
 TAGS="compiler C C++ objective-C java"
 
 DEPENDS="glibc-base glib gcc-lib-base util-linux-uuid zlib libgomp gmp mpfr python \
-gtk+ atk cairo expat fontconfig freetype pango xorg-pixman libpng16 xorg-libxcb xorg-xcb-util \
+gtk2 atk cairo expat fontconfig freetype pango xorg-pixman libpng16 xorg-libxcb xorg-xcb-util \
 xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
 xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
 xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst alsa-lib elfutils"
 BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev mpc-library \
-expat-dev zlib-dev fastjar gtk+-dev libart_lgpl-dev xorg-dev xorg-xorgproto \
+expat-dev zlib-dev fastjar gtk2-dev libart_lgpl-dev xorg-dev xorg-xorgproto \
 xorg-libXtst \
 elfutils elfutils-dev util-linux-uuid-dev"
 
diff -r 71ba95d2422e -r f48456621a9d gcolor2/receipt
--- a/gcolor2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gcolor2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gfortran intltool perl-xml-parser gtk+-dev file"
+BUILD_DEPENDS="gfortran intltool perl-xml-parser gtk2-dev file"
 
 compile_rules() {
 	cp $stuff/*.po* $src/po
@@ -26,6 +26,6 @@
 genpkg_rules() {
 	COOKOPTS="!pixmaps"
 	copy bin/
-	DEPENDS="atk gdk-pixbuf glib gtk+"
+	DEPENDS="atk gdk-pixbuf glib gtk2"
 	SUGGESTED="xorg-rgb"
 }
diff -r 71ba95d2422e -r f48456621a9d gcr/receipt
--- a/gcr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gcr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gcr/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk-doc gobject-introspection-dev gtk+3-dev vala \
+BUILD_DEPENDS="intltool gtk-doc gobject-introspection-dev gtk3-dev vala \
 p11-kit-dev libgcrypt-dev"
 SPLIT="gcr-base gcr gcr-dev"
 
@@ -34,12 +34,12 @@
 			;;
 		gcr)
 			copy @std @rm *.mo @ico
-			DEPENDS="cairo gcr-base gdk-pixbuf glib gtk+3 libgcrypt pango"
+			DEPENDS="cairo gcr-base gdk-pixbuf glib gtk3 libgcrypt pango"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="gcr gcr-base \
-			glib-dev gtk+3-dev p11-kit-dev"
+			glib-dev gtk3-dev p11-kit-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d geany-plugins/receipt
--- a/geany-plugins/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/geany-plugins/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS_arm="gtkspell-dev geany-dev lua-dev libxml2-dev"
-BUILD_DEPENDS="intltool geany-dev gtk+-dev check-dev vte-gtk2-dev \
+BUILD_DEPENDS="intltool geany-dev gtk2-dev check-dev vte-gtk2-dev \
 python-dev python-pygtk-dev gtkspell-dev" # lua5.1-dev but produces error
 
 compile_rules() {
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="geany atk cairo enchant fontconfig freetype gdk-pixbuf glib gtk+ \
+	DEPENDS="geany atk cairo enchant fontconfig freetype gdk-pixbuf glib gtk2 \
 	gtkspell libxml2 pango python vte-gtk2 xorg-libX11 xorg-libXext"
 }
diff -r 71ba95d2422e -r f48456621a9d geany/receipt
--- a/geany/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/geany/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.geany.org/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-dev expat-dev gtk+-dev atk-dev pango-dev cairo-dev \
+BUILD_DEPENDS_arm="glib-dev expat-dev gtk2-dev atk-dev pango-dev cairo-dev \
 xorg-pixman-dev libpng16-dev freetype-dev fontconfig-dev xorg-libXrender-dev \
 xorg-libX11-dev xorg-xorgproto xorg-libXau-dev \
 xorg-libXdmcp-dev libxml2-dev"
-BUILD_DEPENDS="gtk+-dev intltool python-lxml python-docutils"
+BUILD_DEPENDS="gtk2-dev intltool python-lxml python-docutils"
 SPLIT="geany-doc geany-dev"
 
 compile_rules() {
@@ -36,7 +36,7 @@
 	case $PACKAGE in
 		geany)
 			copy @std @ico
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ pango python"
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango python"
 			SUGGESTED="geany-plugins vte"
 			TAGS="text-editor"
 			;;
@@ -46,7 +46,7 @@
 			;;
 		geany-dev)
 			copy @dev
-			DEPENDS="geany glib-dev gtk+-dev"
+			DEPENDS="geany glib-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d geeqie/receipt
--- a/geeqie/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/geeqie/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,16 +11,17 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.geeqie.org/$TARBALL"
 
-BUILD_DEPENDS="automake gettext intltool lcms2-dev gtk+-dev"
+BUILD_DEPENDS="automake gettext intltool lcms2-dev gtk2-dev"
 
 compile_rules() {
 	./autogen.sh \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ lcms2 \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 lcms2 \
 	libjpeg-turbo pango tiff"
 }
diff -r 71ba95d2422e -r f48456621a9d gegl/receipt
--- a/gegl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gegl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://gegl.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gegl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gegl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.gimp.org/pub/gegl/${VERSION%.*}/$TARBALL"
@@ -17,7 +17,7 @@
 gdk-pixbuf-dev lensfun-dev librsvg-dev v4l-utils-dev openexr-dev ilmbase-dev \
 libsdl-dev libraw-dev jasper-dev lua-dev ffmpeg-dev lcms-dev libspiro-dev \
 exiv2-dev tiff-dev libwebp-dev gdb"
-SPLIT="gegl gegl-extra gegl-dev"
+SPLIT="$PACKAGE $PACKAGE-extra $PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -41,7 +41,7 @@
 			transformops.so libgegl*.so*
 			DEPENDS="babl gexiv2 glib json-glib libjpeg-turbo libpng16 libspiro"
 			;;
-		gegl-extra)
+		*-extra)
 			copy @std @rm
 			DEPENDS="babl cairo ffmpeg gdk-pixbuf gegl glib jasper lcms2 \
 			liblua libraw librsvg libsdl libwebp openexr pango tiff"
diff -r 71ba95d2422e -r f48456621a9d gejengel/receipt
--- a/gejengel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gejengel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,26 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gejengel"
 VERSION="0.1.4"
 CATEGORY="network"
-SHORT_DESC="A simple, light and clean audio player."
+SHORT_DESC="A simple, light and clean audio player"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://code.google.com/p/gejengel/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://code.google.com/p/gejengel/"
 WGET_URL="http://gejengel.googlecode.com/files/$TARBALL"
 
-DEPENDS="glibmm cairomm gtkmm libsigc++ taglib imagemagick libxdg-basedir \
-alsa-lib flac ffmpeg sqlite3"
 BUILD_DEPENDS="glibmm-dev cairomm-dev gtkmm-dev libsigc++-dev taglib-dev \
 imagemagick-dev imagemagick libxdg-basedir-dev alsa-lib-dev flac-dev \
 ffmpeg-dev lcms-dev fftw-dev openexr-dev ilmbase-dev graphviz-dev \
-util-linux-uuid-dev libogg-dev intltool libcroco sqlite3-dev gtk+-dev libtool"
+util-linux-uuid-dev libogg-dev intltool libcroco sqlite3-dev gtk2-dev libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i	-e 's/CODEC_TYPE_AUDIO/AVMEDIA_TYPE_AUDIO/' \
+compile_rules() {
+	sed \
+		-e 's/CODEC_TYPE_AUDIO/AVMEDIA_TYPE_AUDIO/' \
 		-e 's/SAMPLE_FMT_S16/AV_&/' -e 's/SAMPLE_FMT_U8/AV_&/' \
 		-e 's/SAMPLE_FMT_S32/AV_&/' \
 		-e 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' \
@@ -28,15 +26,21 @@
 		-e 's/avcodec_open(\([^)]*\)/avcodec_open2(\1, NULL/' \
 		-e 's/av_close_input_file(/avformat_close_input(\&/' \
 		-e 's/av_\(find_stream_info(m_pFormatContext\)/avformat_\1,NULL/' \
-			src/AudioDecoder/ffmpegdecoder.cpp
+		-i src/AudioDecoder/ffmpegdecoder.cpp
 	find . -name '*.h' -o -name '*.c*' | xargs sed -i 's|glibmm/i18n|glib/gi18n|'
-	./configure --enable-alsa --enable-ffmpeg --enable-flac \
-		$CONFIGURE_ARGS && make && make install
+
+	./configure \
+		--enable-alsa \
+		--enable-ffmpeg \
+		--enable-flac \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="glibmm cairomm gtkmm libsigc++ taglib imagemagick libxdg-basedir \
+	alsa-lib flac ffmpeg sqlite3"
 }
diff -r 71ba95d2422e -r f48456621a9d gens-gs/receipt
--- a/gens-gs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gens-gs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 TARBALL="Gens-${_VERSION}.tar.gz"
 WGET_URL="http://segaretro.org/images/6/6d/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libsdl libsdl-dev nasm autoconf automake"
+BUILD_DEPENDS="gtk2-dev libsdl libsdl-dev nasm autoconf automake"
 
 compile_rules() {
 	chmod +x install-sh
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ libsdl glu"
+	DEPENDS="gtk2 libsdl glu"
 	TAGS="emulator sega"
 }
diff -r 71ba95d2422e -r f48456621a9d gftp/receipt
--- a/gftp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gftp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.gftp.org/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gettext"
+BUILD_DEPENDS="gtk2-dev gettext"
 
 compile_rules() {
 	./configure \
@@ -27,5 +27,5 @@
 	cp -r $stuff/gftp $fs/usr/share/
 	cd $fs/usr/share/gftp
 	rm COPYING gftp.xpm gftp-*.png gftp-*.svg
-	DEPENDS="glib gtk+"
+	DEPENDS="glib gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d ghex/receipt
--- a/ghex/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ghex/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.acc.umu.se/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gnome-doc-utils libgnomeui-dev libbonoboui-dev \
+BUILD_DEPENDS="gtk2-dev gnome-doc-utils libgnomeui-dev libbonoboui-dev \
 libgnome-dev libbonobo-dev libbonoboui-dev libgnome-keyring-dev \
 libgnomeprintui-dev intltool"
 
@@ -29,5 +29,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ libgnomeui libgnomeprintui libgnome-keyring"
+	DEPENDS="gtk2 libgnomeui libgnomeprintui libgnome-keyring"
 }
diff -r 71ba95d2422e -r f48456621a9d ghostscript/receipt
--- a/ghostscript/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ghostscript/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${VERSION/./}/$TARBALL"
 
-# build depends are optional ; ghostscripts still build but does not compile in cups support
-BUILD_DEPENDS="cairo-dev gtk+-dev expat-dev fontconfig-dev freetype-dev \
+# build depends are optional; ghostscripts still build but does not compile in cups support
+BUILD_DEPENDS="cairo-dev gtk2-dev expat-dev fontconfig-dev freetype-dev \
 gnutls-dev libgcrypt-dev libgpg-error-dev libpng16-dev tiff-dev \
 zlib-dev cups-dev jbig2dec jasper-dev libjpeg-turbo-dev"
-SPLIT="ghostscript ghostscript-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# force it to use system-libs
@@ -48,7 +48,7 @@
 			rm -rf $fs/usr/bin/gs
 			ln -s gsc $fs/usr/bin/gs
 
-			DEPENDS="atk cairo cups fontconfig freetype gdk-pixbuf glib gtk+ \
+			DEPENDS="atk cairo cups fontconfig freetype gdk-pixbuf glib gtk2 \
 			libcups libgnutls libidn libjpeg-turbo libpng16 pango tiff zlib"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d giflib/receipt
--- a/giflib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/giflib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="MIT"
 WEB_SITE="https://sourceforge.net/projects/giflib/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/giflib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/giflib.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/giflib/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d gigolo/receipt
--- a/gigolo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gigolo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="xfce4-dev-tools gtk+-dev xorg-libX11-dev"
+BUILD_DEPENDS="xfce4-dev-tools gtk2-dev xorg-libX11-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk+ xorg-libX11"
+	DEPENDS="glib gtk2 xorg-libX11"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d gimp/receipt
--- a/gimp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gimp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -3,7 +3,7 @@
 PACKAGE="gimp"
 VERSION="2.10.2"
 CATEGORY="graphics"
-SHORT_DESC="GNU Image Manipulation Program (GIMP)"
+SHORT_DESC="GNU Image Manipulation Program"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gimp.org/"
@@ -12,13 +12,13 @@
 WGET_URL="https://download.gimp.org/pub/gimp/v${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool iso-codes-dev babl-dev gegl-dev atk-dev glib-dev \
-glib-networking xorg-libX11-dev xorg-libICE-dev gtk+-dev gexiv2-dev \
+glib-networking xorg-libX11-dev xorg-libICE-dev gtk2-dev gexiv2-dev \
 xorg-libXmu-dev xorg-libXfixes-dev ghostscript-dev libmng-dev aalib-dev \
 xorg-libXpm-dev openexr-dev ilmbase-dev libwebp-dev libheif-dev libmypaint-dev \
 mypaint-brushes-dev librsvg-dev poppler-dev poppler-data libwmf-dev \
 openjpeg2-dev xorg-libXcursor-dev libgudev-dev xdg-utils libxslt \
 shared-mime-info-dev desktop-file-utils-extra gtk-doc"
-SPLIT="gimp-brushes gimp-console gimp-dev gimp-plug-ins gimp"
+SPLIT="$PACKAGE-brushes $PACKAGE-console $PACKAGE-dev $PACKAGE-plug-ins $PACKAGE"
 
 compile_rules() {
 	./configure \
@@ -35,37 +35,37 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		gimp-brushes)
+		*-brushes)
 			copy gimp/2.0/brushes/
 			rm -r $fs/usr/share/gimp/2.0/brushes/Basic/ # -> main package
 			CAT="graphics|brushes set"
 			DEPENDS="gimp"
 			;;
-		gimp-console)
+		*-console)
 			copy bin/gimp-console*
 			CAT="graphics|console"
 			DEPENDS="babl cairo fontconfig freetype gdk-pixbuf gegl gexiv2 \
 			gimp glib lcms2 libharfbuzz libmypaint pango zlib"
 			;;
-		gimp-dev)
+		*-dev)
 			copy @dev
 			DEPENDS="gimp gimp-brushes gimp-console gimp-plug-ins \
-			cairo-dev gdk-pixbuf-dev gegl-dev gtk+-dev"
+			cairo-dev gdk-pixbuf-dev gegl-dev gtk2-dev"
 			;;
-		gimp-plug-ins)
+		*-plug-ins)
 			copy gimp/2.0/plug-ins/
 			find $fs \( -name file-jpeg -o -name file-png -o -name pixelize \
 				-o -name screenshot \) -delete # -> main package
 			CAT="graphics|plug-ins suite for advanced users"
 			DEPENDS="aalib babl bzlib cairo gdk-pixbuf gegl gexiv2 gimp glib \
-			gtk+ ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng16 \
+			gtk2 ilmbase lcms2 libheif libjpeg-turbo liblzma libmng libpng16 \
 			librsvg libwebp libwmf openexr openjpeg2 pango poppler tiff \
 			xorg-libX11 xorg-libXcursor xorg-libXpm zlib"
 			;;
 		gimp)
 			copy @std @rm # all the rest
 			DEPENDS="babl cairo fontconfig freetype gdk-pixbuf gegl gexiv2 \
-			glib gtk+ lcms2 libgudev libharfbuzz libjpeg-turbo libmypaint \
+			glib gtk2 lcms2 libgudev libharfbuzz libjpeg-turbo libmypaint \
 			libpng16 pango xorg-libX11 xorg-libXext xorg-libXfixes xorg-libXmu \
 			zlib"
 			SUGGESTED="gimp-plug-ins gimp-brushes gimp-console \
diff -r 71ba95d2422e -r f48456621a9d gitmail/receipt
--- a/gitmail/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gitmail/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 COOKOPTS="skip-log-errors"
 
@@ -29,5 +29,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ xorg-libXdamage"
+	DEPENDS="gtk2 xorg-libXdamage"
 }
diff -r 71ba95d2422e -r f48456621a9d gkII/receipt
--- a/gkII/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gkII/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.jwm-art.net/gkII/$TARBALL"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="gtk+-dev"
+DEPENDS="gtk2"
+BUILD_DEPENDS="gtk2-dev"
 
 # Rules to configure and make the package.
 #
diff -r 71ba95d2422e -r f48456621a9d glade3/receipt
--- a/glade3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/glade3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk-doc gtk+-dev python-pygtk-dev python-dev itstool"
+BUILD_DEPENDS="intltool gtk-doc gtk2-dev python-pygtk-dev python-dev itstool"
 SPLIT="glade3-python glade3 glade3-dev"
 
 compile_rules() {
@@ -31,12 +31,12 @@
 			;;
 		glade3)
 			copy @std @rm
-			DEPENDS="cairo gdk-pixbuf glib gtk+ libxml2 pango"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 libxml2 pango"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="glade3 glade3-python \
-			gtk+-dev libxml2-dev"
+			gtk2-dev libxml2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d glib/receipt
--- a/glib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/glib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/glib/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/glib2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/glib2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="automake libtool zlib-dev libffi-dev gettext \
 util-linux-mount-dev pcre-dev glib-dev   elfutils-dev gtk-doc libxslt \
 docbook-xsl dbus-dev"
-SPLIT="glib-static glib-dev"
+SPLIT="$PACKAGE-static $PACKAGE-dev"
 
 # glib require glib to be built.
 # And if glib failed to build and not present on the mirror, you will catch
@@ -44,12 +44,12 @@
 			rm -r $fs/usr/share
 			DEPENDS="elfutils libffi libpcre util-linux-mount zlib"
 			;;
-		glib-static)
+		*-static)
 			copy *.a
 			DEPENDS=" "
 			CAT="development|static libraries"
 			;;
-		glib-dev)
+		*-dev)
 			copy @std @dev @rm
 			DEPENDS="glib libffi-dev pcre-dev python util-linux-mount-dev \
 			zlib-dev   perl"
diff -r 71ba95d2422e -r f48456621a9d gliv/receipt
--- a/gliv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gliv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/files/$TARBALL"
 
-DEPENDS="gtk+ gtkglext gettext-base pangox-compat"
-BUILD_DEPENDS="gtk+-dev gtkglext gtkglext-dev bison mesa-dev pangox-compat-dev \
+DEPENDS="gtk2 gtkglext gettext-base pangox-compat"
+BUILD_DEPENDS="gtk2-dev gtkglext gtkglext-dev bison mesa-dev pangox-compat-dev \
 glu-dev"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d glu/receipt
--- a/glu/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/glu/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.mesa3d.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/glu.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/glu.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/glu/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d gmerlin/receipt
--- a/gmerlin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gmerlin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="texinfo libxml2-dev expat-dev gavl-dev gtk+-dev alsa-lib-dev \
+BUILD_DEPENDS="texinfo libxml2-dev expat-dev gavl-dev gtk2-dev alsa-lib-dev \
 libpng16-dev mesa-dev xorg-libxshmfence-dev gettext"
 COOKOPTS="skip-log-errors"
 
@@ -21,16 +21,18 @@
 
 	./configure \
 		--without-doxygen \
-		$CONFIGURE_ARGS &&
-	fix libtool &&
+		$CONFIGURE_ARGS || return 1
+
+	fix libtool
 	sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' \
-		apps/*/Makefile lib/Makefile tests/Makefile &&
-	sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile &&
+		apps/*/Makefile lib/Makefile tests/Makefile
+	sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile
+
 	make &&
-	make -j 1 install
+	make -j1 install
 }
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libxml2 expat gavl gtk+ alsa-lib libpng16"
+	DEPENDS="libxml2 expat gavl gtk2 alsa-lib libpng16"
 }
diff -r 71ba95d2422e -r f48456621a9d gmime/receipt
--- a/gmime/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gmime/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="allan316@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="http://spruce.sourceforge.net/gmime/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gmime.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gmime.html"
 REPOLOGY="gmime2"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
diff -r 71ba95d2422e -r f48456621a9d gmime3/receipt
--- a/gmime3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gmime3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -8,7 +8,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/jstedfast/gmime"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gmime3.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gmime3.html"
 REPOLOGY="gmime"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -16,7 +16,7 @@
 
 BUILD_DEPENDS="libtool gtk-doc glib-dev gpgme-dev libidn-dev \
 gobject-introspection-dev vala libgpg-error-dev"
-SPLIT="gmime3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r 71ba95d2422e -r f48456621a9d gmrun/receipt
--- a/gmrun/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gmrun/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://sourceforge.net/projects/gmrun"
 WGET_URL="$SF_MIRROR/gmrun/$TARBALL"
 
-DEPENDS="gtk+ gcc-lib-base popt"
-BUILD_DEPENDS="gtk+-dev popt-dev"
+DEPENDS="gtk2 gcc-lib-base popt"
+BUILD_DEPENDS="gtk2-dev popt-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gmtk/receipt
--- a/gmtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gmtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kdekorte/gmtk/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="gettext intltool xorg-libX11-dev gtk+3-dev gtk+-dev glib-dev \
+BUILD_DEPENDS="gettext intltool xorg-libX11-dev gtk3-dev gtk2-dev glib-dev \
 gconf-dev alsa-lib-dev pulseaudio-dev"
 SPLIT="gmlib gmtk gmtk3 gmtk-dev"
 
@@ -73,12 +73,12 @@
 			;;
 		gmtk)
 			copy libgmtk.so*
-			DEPENDS="alsa-lib cairo glib gmlib gtk+ pulseaudio pulseaudio-glib"
+			DEPENDS="alsa-lib cairo glib gmlib gtk2 pulseaudio pulseaudio-glib"
 			CAT="libs|GTK2 libs"
 			;;
 		gmtk3)
 			copy libgmtk3.so*
-			DEPENDS="alsa-lib cairo glib gmlib gtk+3 pulseaudio pulseaudio-glib"
+			DEPENDS="alsa-lib cairo glib gmlib gtk3 pulseaudio pulseaudio-glib"
 			CAT="libs|GTK3 libs"
 			;;
 		gmtk-dev)
diff -r 71ba95d2422e -r f48456621a9d gmtp/receipt
--- a/gmtp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gmtp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gconf-dev libmtp-dev flac-dev libid3tag-dev \
+BUILD_DEPENDS="gtk2-dev gconf-dev libmtp-dev flac-dev libid3tag-dev \
 libvorbis-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d gnaughty/receipt
--- a/gnaughty/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnaughty/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="curl-dev gtk+-dev glib-dev pcre-dev libglade-dev gconf-dev"
+BUILD_DEPENDS="curl-dev gtk2-dev glib-dev pcre-dev libglade-dev gconf-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lgthread-2.0"
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="curl gtk+ glib pcre libglade gconf"
+	DEPENDS="curl gtk2 glib pcre libglade gconf"
 }
diff -r 71ba95d2422e -r f48456621a9d gnomad2/receipt
--- a/gnomad2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnomad2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -6,10 +6,10 @@
 SHORT_DESC="GTK+ music manager and swiss army knife for the Creative Labs NOMAD and Zen range"
 MAINTAINER="keupont@no-log.org"
 LICENSE="GPL2"
-DEPENDS="libusb-compat libnjb libid3tag taglib freetype gtk+ glibc dbus-glib hal \
+DEPENDS="libusb-compat libnjb libid3tag taglib freetype gtk2 glibc dbus-glib hal \
 libmtp"
 BUILD_DEPENDS="intltool libnjb-dev libid3tag-dev taglib-dev libmtp-dev \
-hal-dev libusb-compat-dev gtk+-dev glib-dev"
+hal-dev libusb-compat-dev gtk2-dev glib-dev"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://gnomad2.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d gnome-alsamixer/receipt
--- a/gnome-alsamixer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-alsamixer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 WGET_URL="http://http.debian.net/debian/pool/main/g/$PACKAGE/$TARBALL"
 EXTRA_URL="${WGET_URL/.orig/-5.debian}"
 
-DEPENDS="gtk+ libgnomeui libgnome-keyring"
+DEPENDS="gtk2 libgnomeui libgnome-keyring"
 BUILD_DEPENDS="automake autoconf glib dbus-dev libgnomeui-dev libgnome-dev \
 gconf-dev alsa-lib-dev"
 
diff -r 71ba95d2422e -r f48456621a9d gnome-commander/receipt
--- a/gnome-commander/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-commander/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="itstool docbook-xml glib-dev gettext gtk+-dev libgnome-dev \
+BUILD_DEPENDS="itstool docbook-xml glib-dev gettext gtk2-dev libgnome-dev \
 libgnomeui-dev libunique-dev exiv2-dev taglib-dev chmlib-dev libgsf-dev \
 poppler-dev"
 
@@ -34,6 +34,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="exiv2 gdk-pixbuf glib gnome-vfs gtk+ libgnome libgnomeui libgsf \
+	DEPENDS="exiv2 gdk-pixbuf glib gnome-vfs gtk2 libgnome libgnomeui libgsf \
 	libunique pango poppler taglib"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-desktop2/receipt
--- a/gnome-desktop2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-desktop2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/gnome-desktop/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev \
-xorg-libXrandr-dev gdk-pixbuf-dev gtk+-dev glib-dev gconf-dev gnome-doc-utils \
+xorg-libXrandr-dev gdk-pixbuf-dev gtk2-dev glib-dev gconf-dev gnome-doc-utils \
 rarian-dev"
 SPLIT="$PACKAGE-about $PACKAGE $PACKAGE-dev"
 
@@ -35,12 +35,12 @@
 			;;
 		gnome-desktop2)
 			copy @std @rm
-			DEPENDS="cairo gconf gdk-pixbuf glib gtk+ startup-notification \
+			DEPENDS="cairo gconf gdk-pixbuf glib gtk2 startup-notification \
 			xorg-libX11 xorg-libXrandr"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gnome-desktop2 gtk+-dev startup-notification-dev"
+			DEPENDS="gnome-desktop2 gtk2-dev startup-notification-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-games/receipt
--- a/gnome-games/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-games/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool vala glib-dev grilo-dev gtk+3-dev libmanette-dev \
+BUILD_DEPENDS="intltool vala glib-dev grilo-dev gtk3-dev libmanette-dev \
 librsvg-dev libsoup-dev libxml2-dev retro-gtk-dev sqlite3-dev tracker-dev"
 SPLIT="gnome-games-dev"
 
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		gnome-games)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib grilo gtk+3 libmanette librsvg \
+			DEPENDS="cairo gdk-pixbuf glib grilo gtk3 libmanette librsvg \
 			libsoup libsqlite3 libxml2 retro-gtk tracker"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d gnome-hearts/receipt
--- a/gnome-hearts/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-hearts/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,34 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gnome-hearts"
 VERSION="0.3.1"
 CATEGORY="games"
 LICENSE="GPL3"
-SHORT_DESC="GNOME hearts card game."
+SHORT_DESC="GNOME hearts card game"
 MAINTAINER="yuripourre@gmail.com"
+WEB_SITE="https://web.archive.org/web/20131231235520/http://www.jejik.com/gnome-hearts"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://web.archive.org/web/20131231235520/http://www.jejik.com/gnome-hearts"
 WGET_URL="http://www.jejik.com/files/gnome-hearts/$TARBALL"
 
-DEPENDS="gtk+ libglade python libgnomeui libgnome-keyring librsvg"
-BUILD_DEPENDS="gtk+-dev libglade-dev python-dev libgnome-dev \
+BUILD_DEPENDS="gtk2-dev libglade-dev python-dev libgnome-dev \
 libgnomeui-dev glib-dev itstool rarian-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure  \
+compile_rules() {
+	./configure \
 		--disable-scrollkeeper \
 		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/pixmaps $fs/usr/share
-	cp -a $install/usr/share/$PACKAGE $fs/usr/share
-	cp -a $install/usr/share/applications $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 libglade python libgnomeui libgnome-keyring librsvg"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-icon-theme/receipt
--- a/gnome-icon-theme/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-icon-theme/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -3,7 +3,7 @@
 PACKAGE="gnome-icon-theme"
 VERSION="3.12.0"
 CATEGORY="customization"
-SHORT_DESC="Default GNOME icon theme."
+SHORT_DESC="Default GNOME icon theme"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://www.gnome.org/"
@@ -11,19 +11,17 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="icon-naming-utils intltool gtk+"
+BUILD_DEPENDS="icon-naming-utils intltool gtk2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr
-	make
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		&&
+	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/usr/lib
 	cp -a $install/usr/share/icons $fs/usr/share
 	# pkgconfig in /usr/lib
diff -r 71ba95d2422e -r f48456621a9d gnome-keyring/receipt
--- a/gnome-keyring/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-keyring/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="libgcrypt-dev libtasn1-dev python-dev dbus-dev intltool gtk+-dev"
-SPLIT="gnome-keyring-dev"
+BUILD_DEPENDS="libgcrypt-dev libtasn1-dev python-dev dbus-dev intltool gtk2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i	-e 's|<glib.h>|&\n#include <libtasn1.h>|' \
@@ -32,7 +32,7 @@
 	case $PACKAGE in
 		gnome-keyring)
 			copy @std
-			DEPENDS="libgcrypt libtasn1 python dbus gtk+"
+			DEPENDS="libgcrypt libtasn1 python dbus gtk2"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d gnome-keyring3/receipt
--- a/gnome-keyring3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-keyring3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Projects/GnomeKeyring"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/gnome-keyring.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/gnome-keyring.html"
 REPOLOGY="gnome-keyring"
 
 TARBALL="gnome-keyring-$VERSION.tar.xz"
diff -r 71ba95d2422e -r f48456621a9d gnome-klotski/receipt
--- a/gnome-klotski/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-klotski/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev libgee-dev gtk+3-dev libgnome-games-support-dev \
+BUILD_DEPENDS="vala glib-dev libgee-dev gtk3-dev libgnome-games-support-dev \
 librsvg-dev intltool itstool"
 
 compile_rules() {
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo glib gtk+3 libgee libgnome-games-support librsvg"
+	DEPENDS="cairo glib gtk3 libgee libgnome-games-support librsvg"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-mahjongg/receipt
--- a/gnome-mahjongg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-mahjongg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk+3-dev librsvg-dev intltool itstool"
+BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev intltool itstool"
 
 compile_rules() {
 	# In order to shrink its size, patch svg icon to fix compressor errors like:
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+3 librsvg"
+	DEPENDS="cairo gdk-pixbuf glib gtk3 librsvg"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-mplayer/receipt
--- a/gnome-mplayer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-mplayer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/$TARBALL"
 
-BUILD_DEPENDS="gettext xorg-libX11-dev gtk+3-dev gtk+-dev glib-dev gmtk-dev   \
+BUILD_DEPENDS="gettext xorg-libX11-dev gtk3-dev gtk2-dev glib-dev gmtk-dev   \
 dbus-dev dbus-glib-dev xorg-libXScrnSaver-dev alsa-lib-dev pulseaudio-dev \
 libnotify-dev libgpod-dev"
 SPLIT="gnome-mplayer-gtk3:gtk3"
@@ -42,14 +42,14 @@
 	case $PACKAGE in
 		gnome-mplayer)
 			copy @std
-			DEPENDS="alsa-lib dbus dbus-glib gdk-pixbuf glib gmlib gmtk gtk+ \
+			DEPENDS="alsa-lib dbus dbus-glib gdk-pixbuf glib gmlib gmtk gtk2 \
 			libgpod libnotify xorg-libX11 xorg-libXScrnSaver   mplayer"
 			CAT="multimedia|with GTK2"
 			;;
 		gnome-mplayer-gtk3)
 			copy @std
 			DEPENDS="alsa-lib cairo dbus dbus-glib gdk-pixbuf glib gmlib gmtk3 \
-			gtk+3 libgpod libnotify xorg-libX11 xorg-libXScrnSaver   mplayer"
+			gtk3 libgpod libnotify xorg-libX11 xorg-libXScrnSaver   mplayer"
 			CAT="multimedia|with GTK3"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d gnome-nibbles/receipt
--- a/gnome-nibbles/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-nibbles/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev clutter-dev clutter-gtk-dev libgee-dev gtk+3-dev \
+BUILD_DEPENDS="vala glib-dev clutter-dev clutter-gtk-dev libgee-dev gtk3-dev \
 libcanberra-dev libgnome-games-support-dev intltool itstool"
 
 compile_rules() {
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="clutter clutter-gtk gdk-pixbuf glib gtk+3 libcanberra-gtk3 libgee \
+	DEPENDS="clutter clutter-gtk gdk-pixbuf glib gtk3 libcanberra-gtk3 libgee \
 	libgnome-games-support pango"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-python-desktop/receipt
--- a/gnome-python-desktop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-python-desktop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -50,7 +50,7 @@
 	case $PACKAGE in
 		gnome-python-desktop)
 			copy @std
-			DEPENDS="glib gtk+ libgnome-keyring librsvg libwnck2 python   \
+			DEPENDS="glib gtk2 libgnome-keyring librsvg libwnck2 python   \
 			gnome-python"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d gnome-robots/receipt
--- a/gnome-robots/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-robots/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk+3-dev librsvg-dev libcanberra-dev \
+BUILD_DEPENDS="glib-dev gtk3-dev librsvg-dev libcanberra-dev \
 libgnome-games-support-dev intltool itstool"
 
 compile_rules() {
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+3 libcanberra libcanberra-gtk3 \
+	DEPENDS="cairo gdk-pixbuf glib gtk3 libcanberra libcanberra-gtk3 \
 	libgnome-games-support librsvg"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-tetravex/receipt
--- a/gnome-tetravex/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-tetravex/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk+3-dev intltool itstool"
+BUILD_DEPENDS="vala glib-dev gtk3-dev intltool itstool"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo glib gtk+3"
+	DEPENDS="cairo glib gtk3"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-themes-standard/receipt
--- a/gnome-themes-standard/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-themes-standard/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/GNOME/gnome-themes-extra"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gnome-themes-standard.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gnome-themes-standard.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
-BUILD_DEPENDS="automake glib-dev intltool gtk+3-dev librsvg-dev gtk+-dev"
+BUILD_DEPENDS="automake glib-dev intltool gtk3-dev librsvg-dev gtk2-dev"
 
 compile_rules() {
 	aclocal
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gnome-vfs/receipt
--- a/gnome-vfs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnome-vfs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev dbus-glib-dev gconf-dev bzip2-dev shared-mime-info \
+BUILD_DEPENDS="gtk2-dev dbus-glib-dev gconf-dev bzip2-dev shared-mime-info \
 gnome-mime-data-dev libxml2-dev zlib-dev intltool gnutls-dev libgcrypt-dev \
 libtool gtk-doc automake"
 SPLIT="gnome-vfs gnome-vfs-dev gnome-vfs-i18n"
diff -r 71ba95d2422e -r f48456621a9d gnubg/receipt
--- a/gnubg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnubg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://files.gnubg.org/media/sources/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake bison flex libtool \
-glib-dev libpng16-dev freetype-dev gtk+-dev cairo-dev libcanberra-dev \
+glib-dev libpng16-dev freetype-dev gtk2-dev cairo-dev libcanberra-dev \
 gtkglext-dev readline-dev python sqlite3-dev gmp-dev"
 
 compile_rules() {
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ libcanberra ncurses python gmp libvorbis libltdl"
+	DEPENDS="gtk2 libcanberra ncurses python gmp libvorbis libltdl"
 }
diff -r 71ba95d2422e -r f48456621a9d gnucash/receipt
--- a/gnucash/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnucash/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk+-dev goffice-dev guile-dev libgnomecanvas-dev \
+BUILD_DEPENDS="glib-dev gtk2-dev goffice-dev guile-dev libgnomecanvas-dev \
 libofx-dev webkitgtk-dev libxml2-dev libxslt-dev perl slib zlib-dev intltool \
 util-linux-uuid-dev libtool"
 
@@ -34,6 +34,6 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="glib gtk+ goffice guile libgnomecanvas libofx webkitgtk libxml2 \
+	DEPENDS="glib gtk2 goffice guile libgnomecanvas libofx webkitgtk libxml2 \
 	libxslt perl slib zlib util-linux-uuid"
 }
diff -r 71ba95d2422e -r f48456621a9d gnugo/receipt
--- a/gnugo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnugo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,23 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gnugo"
 VERSION="3.8"
 CATEGORY="games"
-SHORT_DESC="A free program that plays the game of Go."
+SHORT_DESC="A free program that plays the game of Go"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/gnugo/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/gnugo/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
-SUGGESTED="quarry"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
@@ -28,9 +24,9 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses"
+	SUGGESTED="quarry"
 }
diff -r 71ba95d2422e -r f48456621a9d gnumeric/receipt
--- a/gnumeric/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gnumeric/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk-doc bison goffice-dev gtk+3-dev intltool gettext \
+BUILD_DEPENDS="gtk-doc bison goffice-dev gtk3-dev intltool gettext \
 xorg-dev zlib-dev"
 
 compile_rules() {
@@ -28,6 +28,6 @@
 genpkg_rules() {
 	copy @std
 	find $fs/usr/share/pixmaps -name '*.ico' -delete
-	DEPENDS="atk cairo gdk-pixbuf glib goffice gtk+3 libgsf libxml2 pango zlib \
+	DEPENDS="atk cairo gdk-pixbuf glib goffice gtk3 libgsf libxml2 pango zlib \
 	   dconf"
 }
diff -r 71ba95d2422e -r f48456621a9d gobby/receipt
--- a/gobby/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gobby/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,10 +10,10 @@
 WEB_SITE="http://gobby.0x539.de/trac/"
 WGET_URL="http://releases.0x539.de/gobby/$TARBALL"
 
-DEPENDS="gnutls libgpg-error libgcrypt gtk+ cairomm glibmm gtkmm gtksourceview \
+DEPENDS="gnutls libgpg-error libgcrypt gtk2 cairomm glibmm gtkmm gtksourceview \
 libsigc++ libxml++ net6 obby xorg-libXdamage gcc-lib-base libtasn1"
 BUILD_DEPENDS="intltool libxml++-dev cairomm-dev glibmm-dev gtkmm-dev net6-dev \
-obby-dev gtksourceview-dev gnutls-dev libsigc++-dev gtk+-dev"
+obby-dev gtksourceview-dev gnutls-dev libsigc++-dev gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gobject-introspection/receipt
--- a/gobject-introspection/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gobject-introspection/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2 MIT"
 WEB_SITE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gobject-introspection.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gobject-introspection.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d goffice/receipt
--- a/goffice/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/goffice/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="cairo-dev gtk+3-dev libgsf-dev librsvg-dev libxslt-dev gtk-doc \
+BUILD_DEPENDS="cairo-dev gtk3-dev libgsf-dev librsvg-dev libxslt-dev gtk-doc \
 intltool"
 SPLIT="goffice-dev"
 
@@ -26,12 +26,12 @@
 	case $PACKAGE in
 		goffice)
 			copy @std
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libgsf librsvg libxml2 \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libgsf librsvg libxml2 \
 			libxslt pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="goffice cairo-dev glib-dev gtk+3-dev libgsf-dev \
+			DEPENDS="goffice cairo-dev glib-dev gtk3-dev libgsf-dev \
 			librsvg-dev libxml2-dev libxslt-dev pango-dev"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d goocanvas/receipt
--- a/goocanvas/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/goocanvas/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gettext"
+BUILD_DEPENDS="gtk2-dev gettext"
 SPLIT="goocanvas-dev"
 
 compile_rules() {
@@ -25,11 +25,11 @@
 	case $PACKAGE in
 		goocanvas)
 			copy @std
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ pango"
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="goocanvas cairo-dev gtk+-dev"
+			DEPENDS="goocanvas cairo-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d goocanvas2/receipt
--- a/goocanvas2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/goocanvas2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="goocanvas-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/goocanvas/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+3-dev gettext"
+BUILD_DEPENDS="gtk3-dev gettext"
 SPLIT="goocanvas2-dev"
 
 compile_rules() {
@@ -26,11 +26,11 @@
 	case $PACKAGE in
 		goocanvas2)
 			copy @std
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 pango"
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="goocanvas2 cairo-dev gtk+3-dev"
+			DEPENDS="goocanvas2 cairo-dev gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d gpa/receipt
--- a/gpa/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gpa/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 # Integrity check: https://www.gnupg.org/download/integrity_check.html
 TARBALL_SHA1="c629348725c1bf5dafd57f8a70187dc89815ce60"
 
-BUILD_DEPENDS="gtk+-dev libgpg-error-dev libassuan-dev gpgme-dev"
+BUILD_DEPENDS="gtk2-dev libgpg-error-dev libassuan-dev gpgme-dev"
 SPLIT="gpa-langpack"
 
 compile_rules() {
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		gpa)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gpgme gtk+ libassuan libgpg-error zlib   \
+			DEPENDS="gdk-pixbuf glib gpgme gtk2 libassuan libgpg-error zlib   \
 			pinentry-gtk"
 			;;
 		gpa-langpack)
diff -r 71ba95d2422e -r f48456621a9d gparted/receipt
--- a/gparted/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gparted/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://gparted.sourceforge.io/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/xsoft/gparted.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/xsoft/gparted.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libsigc++-dev glibmm-dev gtkmm-dev parted-dev \
+BUILD_DEPENDS="gtk2-dev libsigc++-dev glibmm-dev gtkmm-dev parted-dev \
 cairomm-dev pangomm-dev glibmm-dev intltool util-linux-uuid-dev"
 
 CROSS="error: cannot run test program while cross compiling"
@@ -37,7 +37,7 @@
 
 genpkg_rules() {
 	copy gparted gpartedbin
-	DEPENDS="atkmm glib glibmm gtk+ gtkmm libsigc++ pangomm parted \
+	DEPENDS="atkmm glib glibmm gtk2 gtkmm libsigc++ pangomm parted \
 	util-linux-uuid"
 	SUGGESTED="e2fsprogs dosfstools mtools ntfs-3g ntfsprogs jfsutils xfsprogs \
 	reiserfsprogs reiser4progs btrfs-progs f2fs-tools hfsutils hfsprogs \
diff -r 71ba95d2422e -r f48456621a9d gperiodic/receipt
--- a/gperiodic/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gperiodic/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.frantz.fi/software/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gettext-tools"
+BUILD_DEPENDS="gtk2-dev gettext-tools"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -24,5 +24,5 @@
 genpkg_rules()
 {
 	copy @std *.mo
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d gpgme/receipt
--- a/gpgme/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gpgme/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.gnupg.org/related_software/gpgme/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/gpgme.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/gpgme.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/gpgme/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d gpick/receipt
--- a/gpick/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gpick/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,9 +10,9 @@
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="gtk+"
+DEPENDS="gtk2"
 SUGGESTED="lua"
-BUILD_DEPENDS="scons gettext lemon flex gtk+-dev expat-dev boost-dev \
+BUILD_DEPENDS="scons gettext lemon flex gtk2-dev expat-dev boost-dev \
 dbus-glib-dev lua-dev"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d gpicview/receipt
--- a/gpicview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gpicview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/GPicView"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/gpicview.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/gpicview.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev libjpeg-turbo-dev"
+BUILD_DEPENDS="intltool gtk2-dev libjpeg-turbo-dev"
 
 compile_rules() {
 	sed -i 's|Utility;||' gpicview.desktop.in
@@ -26,6 +26,6 @@
 genpkg_rules() {
 	# skip pixmaps and icons (found in the icon theme)
 	copy bin/ *.desktop *.ui
-	DEPENDS="cairo gdk-pixbuf glib gtk+ libjpeg-turbo xorg-libX11"
+	DEPENDS="cairo gdk-pixbuf glib gtk2 libjpeg-turbo xorg-libX11"
 	TAGS="LXDE"
 }
diff -r 71ba95d2422e -r f48456621a9d gqview/receipt
--- a/gqview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gqview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://gqview.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev gettext-tools"
+DEPENDS="gtk2 xorg-libXdamage"
+BUILD_DEPENDS="gtk2-dev gettext-tools"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d grantlee/receipt
--- a/grantlee/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/grantlee/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/steveire/grantlee"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/grantlee.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/grantlee.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://downloads.grantlee.org/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d graphviz/receipt
--- a/graphviz/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/graphviz/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="Eclipse"
 WEB_SITE="http://www.graphviz.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/graphviz.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/graphviz.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://graphviz.org/pub/graphviz/stable/SOURCES/$TARBALL"
@@ -16,8 +16,8 @@
 libjpeg-turbo-dev libgd-dev swig ocaml python-dev tcl-dev tk-dev librsvg-dev \
 ruby-dev libcroco-dev util-linux-uuid-dev pango-dev libxml2-dev gdk-pixbuf-dev \
 guile-dev gmp-dev pcre-dev perl-dev libtool" # php-dev lua-dev
-SPLIT="graphviz-dev graphviz-doc graphviz-demo graphviz-guile graphviz-ocaml \
-graphviz-perl graphviz-python graphviz-ruby graphviz-tcl graphviz"
+SPLIT="$PACKAGE-dev $PACKAGE-doc $PACKAGE-demo $PACKAGE-guile $PACKAGE-ocaml \
+$PACKAGE-perl $PACKAGE-python $PACKAGE-ruby $PACKAGE-tcl $PACKAGE"
 COOKOPTS="skip-log-errors"
 
 # FIXME: PHP and Lua support is temporarily disabled
diff -r 71ba95d2422e -r f48456621a9d graveman/receipt
--- a/graveman/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/graveman/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="graveman"
 VERSION="0.3.12-5"
@@ -6,31 +6,29 @@
 SHORT_DESC="Frontend for cd-burning tools"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://graveman.tuxfamily.org"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://graveman.tuxfamily.org"
 WGET_URL="$WEB_SITE/sources/$TARBALL"
 
-DEPENDS="readom dvd+rw-tools dvd+rw-media-tools sox cdrdao libao libid3tag libmad lame libvorbis libogg flac libglade libmng"
-BUILD_DEPENDS="intltool libglade-dev flac-dev lame-dev libao-dev libmng-dev libogg-dev libmad-dev libvorbis-dev"
+BUILD_DEPENDS="intltool libglade-dev flac-dev lame-dev libao-dev libmng-dev \
+libogg-dev libmad-dev libvorbis-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
-		--prefix=/usr  $CONFIGURE_ARGS &&
-		make &&
-		make DESTDIR=$DESTDIR install
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/locale
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/applications $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cp -a $install/usr/share/graveman $fs/usr/share
 	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
+	DEPENDS="readom dvd+rw-tools dvd+rw-media-tools sox cdrdao libao libid3tag \
+	libmad lame libvorbis libogg flac libglade libmng"
 }
-
diff -r 71ba95d2422e -r f48456621a9d gringotts/receipt
--- a/gringotts/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gringotts/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://gringotts.shlomifish.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE.berlios/$TARBALL"
 
-DEPENDS="gtk+ libgringotts popt"
-BUILD_DEPENDS="gtk+-dev libgringotts-dev popt-dev libmcrypt-dev"
+DEPENDS="gtk2 libgringotts popt"
+BUILD_DEPENDS="gtk2-dev libgringotts-dev popt-dev libmcrypt-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d grisbi/receipt
--- a/grisbi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/grisbi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libxml2 gtk+-dev glib-dev libofx-dev \
+BUILD_DEPENDS="libxml2 gtk2-dev glib-dev libofx-dev \
 opensp-dev openssl-dev intltool"
 
 compile_rules() {
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ xorg-libXdamage libofx libofx openssl"
+	DEPENDS="gtk2 xorg-libXdamage libofx libofx openssl"
 }
diff -r 71ba95d2422e -r f48456621a9d grsync/receipt
--- a/grsync/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/grsync/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,24 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="grsync"
 VERSION="1.2.2"
 CATEGORY="network"
-SHORT_DESC="GTK+ intuitive interface to rsync."
+SHORT_DESC="GTK+ intuitive interface to rsync"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.opbyte.it/grsync/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.opbyte.it/grsync/"
 WGET_URL="http://www.opbyte.it/release/$TARBALL"
 
-DEPENDS="gtk+ rsync xorg-libXdamage acl"
-BUILD_DEPENDS="gtk+-dev xorg-xorgproto perl-xml-parser intltool"
+BUILD_DEPENDS="gtk2-dev xorg-xorgproto perl-xml-parser intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
-	cd $src
+
 	chmod +x install-sh
 	./configure \
 		--prefix=/usr \
@@ -30,13 +28,11 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    	mkdir -p $fs/usr/share
-    	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	mkdir -p $fs/usr/share
+	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/grsync $fs/usr/share
-    	sed -i s'|#!/bin/bash|#!/bin/sh|' $fs/usr/bin/grsync-batch
+	sed -i s'|#!/bin/bash|#!/bin/sh|' $fs/usr/bin/grsync-batch
 	chmod +x $fs/usr/bin/*
+	DEPENDS="gtk2 rsync xorg-libXdamage acl"
 }
-
diff -r 71ba95d2422e -r f48456621a9d gsl/receipt
--- a/gsl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gsl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gsl/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gsl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gsl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d gsmartcontrol/receipt
--- a/gsmartcontrol/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gsmartcontrol/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="pcre-dev glib-dev gtk+-dev cairomm-dev gtkmm-dev"
+BUILD_DEPENDS="pcre-dev glib-dev gtk2-dev cairomm-dev gtkmm-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std @ico
-	DEPENDS="atkmm glib glibmm gtk+ gtkmm libpcre libsigc++ pangomm \
+	DEPENDS="atkmm glib glibmm gtk2 gtkmm libpcre libsigc++ pangomm \
 	   smartmontools"
 }
diff -r 71ba95d2422e -r f48456621a9d gssdp/receipt
--- a/gssdp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gssdp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev libsoup-dev gtk+3-dev gobject-introspection-dev \
+BUILD_DEPENDS="glib-dev libsoup-dev gtk3-dev gobject-introspection-dev \
 gtk-doc vala"
 SPLIT="gssdp-bin gssdp gssdp-dev"
 
@@ -27,7 +27,7 @@
 		*-bin)
 			copy bin/ *.ui
 			CAT="network|device sniffer"
-			DEPENDS="glib gssdp gtk+3 libsoup"
+			DEPENDS="glib gssdp gtk3 libsoup"
 			;;
 		gssdp)
 			copy *.so*
diff -r 71ba95d2422e -r f48456621a9d gst0-plugins-good/receipt
--- a/gst0-plugins-good/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gst0-plugins-good/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 WGET_URL="$GNOME_MIRROR/gst-plugins-good/0.10/$TARBALL"
 
 BUILD_DEPENDS="gettext gconf-dev gtk-doc python glib-dev orc-dev \
-gstreamer0-dev gst0-plugins-base-dev gtk+-dev libgudev-dev v4l-utils-dev \
+gstreamer0-dev gst0-plugins-base-dev gtk2-dev libgudev-dev v4l-utils-dev \
 xorg-libXfixes-dev xorg-libXdamage-dev aalib-dev flac-dev gdk-pixbuf-dev \
 jack2-dev libcaca-dev libdv-dev libraw1394-dev libiec61883-dev libavc1394-dev \
 libshout-dev libsoup-dev speex-dev taglib-dev wavpack-dev libjpeg-turbo-dev \
diff -r 71ba95d2422e -r f48456621a9d gsynaptics/receipt
--- a/gsynaptics/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gsynaptics/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2F$PACKAGE%2F38463%2F$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libglade-dev gconf-dev gnome-doc-utils intltool"
+BUILD_DEPENDS="gtk2-dev libglade-dev gconf-dev gnome-doc-utils intltool"
 
 compile_rules() {
 	./configure \
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gconf gtk+ libglade orbit2"
+	DEPENDS="gconf gtk2 libglade orbit2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtick/receipt
--- a/gtick/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtick/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://www.antcom.de/gtick/"
 WGET_URL="http://www.antcom.de/gtick/download/$TARBALL"
 
-DEPENDS="gtk+ xorg-libXdamage libsndfile libogg"
-BUILD_DEPENDS="gtk+-dev xorg-xorgproto"
+DEPENDS="gtk2 xorg-libXdamage libsndfile libogg"
+BUILD_DEPENDS="gtk2-dev xorg-xorgproto"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gtk+/receipt
--- a/gtk+/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="gtk+"
-VERSION="2.24.31"
-CATEGORY="x-window"
-SHORT_DESC="The GIMP Toolkit"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="https://www.gtk.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtk2.html"
-REPOLOGY="gtk2"
-
-TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
-
-BUILD_DEPENDS_arm="atk-dev pango-dev gdk-pixbuf-dev dbus-dev dbus-glib-dev \
-xorg-xorgproto xorg-libxcb-dev fontconfig-dev freetype-dev xorg-pixman-dev libxml2-dev \
-libpng16-dev libffi-dev harfbuzz-dev faenza-icon-theme optipng \
-xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev automake"
-BUILD_DEPENDS="paper-icon-theme rsvg-convert optipng-static pngquant-static \
-symlinks \
-glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
-gobject-introspection-dev gtk-doc automake gettext xorg-libXinerama-dev"
-BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
-gobject-introspection-dev gtk-doc gettext xorg-libXinerama-dev \
-shared-mime-info-dev"
-SPLIT="gtk+-demo gtk+ gtk+-dev"
-
-compile_rules() {
-	case "$ARCH" in
-		arm*)
-			BUILD_DEPENDS=$BUILD_DEPENDS_arm
-			ARCH_ARGS="--enable-introspection=no --disable-glibtest --disable-cups \
-			--disable-papi --with-gdktarget=x11 --with-xinput gio_can_sniff=yes"
-			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
-			export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include"
-			export LIBTOOL=${HOST_SYSTEM}-libtool
-			;;
-	esac
-
-#	. $stuff/replace-icons-paper; cd $src
-
-#	find $src -type f -name 'Makefile.in' -exec sed -i 's|1.15|1.15.1|' '{}' \;
-# or
-#	autoreconf -fi && # fix 'version mismatch' between 1.15 and 1.15.1
-	./configure \
-		--enable-debug=no \
-		$CONFIGURE_ARGS $ARCH_ARGS &&
-	fix libtool &&
-	make $MAKEFLAGS $LIBTOOL &&
-	make install || return 1
-
-	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
-		$install/etc/gtk-2.0/gdk-pixbuf.loaders
-
-	mkdir -p $install/usr/share/applications
-	cp $stuff/*.desktop $install/usr/share/applications
-}
-
-genpkg_rules() {
-	case $PACKAGE in
-		gtk+-demo)
-			copy gtk-demo demo/ *.desktop
-			CAT="development|example code and demo"
-			DEPENDS="cairo gdk-pixbuf glib gtk+ pango"
-			;;
-		gtk+)
-			COOKOPTS="!menus"
-			copy @std @rm
-			DEPENDS="atk cairo fontconfig gdk-pixbuf glib libcups pango \
-			xorg-libX11 xorg-libXext xorg-libXinerama xorg-libXrender"
-			CONFIG_FILES="/etc/gtk-2.0/im-multipress.conf"
-			SUGGESTED="cups gnutls libgcrypt libgpg-error"
-			;;
-		gtk+-dev)
-			copy @dev
-			DEPENDS="gtk+ \
-			atk-dev cairo-dev gdk-pixbuf-dev glib-dev pango-dev"
-			;;
-	esac
-}
-
-post_install_gtk_() {
-	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache
-}
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/document-revert-rtl.png
Binary file gtk+/stuff/16/document-revert-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/edit-redo-rtl.png
Binary file gtk+/stuff/16/edit-redo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/edit-undo-rtl.png
Binary file gtk+/stuff/16/edit-undo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/format-indent-less-rtl.png
Binary file gtk+/stuff/16/format-indent-less-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/format-indent-more-rtl.png
Binary file gtk+/stuff/16/format-indent-more-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/go-jump-rtl.png
Binary file gtk+/stuff/16/go-jump-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/media-playback-start-rtl.png
Binary file gtk+/stuff/16/media-playback-start-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/media-seek-backward-ltr.png
Binary file gtk+/stuff/16/media-seek-backward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/16/media-seek-forward-ltr.png
Binary file gtk+/stuff/16/media-seek-forward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/20/gtk-apply.png
Binary file gtk+/stuff/20/gtk-apply.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/20/gtk-cancel.png
Binary file gtk+/stuff/20/gtk-cancel.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/20/gtk-no.png
Binary file gtk+/stuff/20/gtk-no.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/20/gtk-ok.png
Binary file gtk+/stuff/20/gtk-ok.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/20/gtk-yes.png
Binary file gtk+/stuff/20/gtk-yes.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/20/window-close.png
Binary file gtk+/stuff/20/window-close.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/document-revert-rtl.png
Binary file gtk+/stuff/24/document-revert-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/edit-redo-rtl.png
Binary file gtk+/stuff/24/edit-redo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/edit-undo-rtl.png
Binary file gtk+/stuff/24/edit-undo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/format-indent-less-rtl.png
Binary file gtk+/stuff/24/format-indent-less-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/format-indent-more-rtl.png
Binary file gtk+/stuff/24/format-indent-more-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/go-jump-rtl.png
Binary file gtk+/stuff/24/go-jump-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/media-playback-start-rtl.png
Binary file gtk+/stuff/24/media-playback-start-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/media-seek-backward-ltr.png
Binary file gtk+/stuff/24/media-seek-backward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/24/media-seek-forward-ltr.png
Binary file gtk+/stuff/24/media-seek-forward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/gtk+-demo.desktop
--- a/gtk+/stuff/gtk+-demo.desktop	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GTK+ Code demo
-Exec=gtk-demo
-Icon=gtk
-Categories=GTK;Development;
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/patches/series
--- a/gtk+/stuff/patches/series	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-#undo_link_icons.patch
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/patches/undo_link_icons.patch
--- a/gtk+/stuff/patches/undo_link_icons.patch	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1409,34 +1409,7 @@
- 	  done;								\
- 	  chmod -R u+w stock-icons;					\
-         fi &&								\
--	for i in 16 24; do						\
--	   (cd stock-icons/$$i						\
--	   && $(RM) document-save.png 					\
--	   && $(LN_S) media-floppy.png document-save.png 		\
--	   && $(RM) folder-remote.png 					\
--	   && $(LN_S) folder.png folder-remote.png 			\
--	   && $(RM) go-first-rtl.png 					\
--	   && $(LN_S) go-last-ltr.png go-first-rtl.png 			\
--	   && $(RM) go-last-rtl.png 					\
--	   && $(LN_S) go-first-ltr.png go-last-rtl.png 			\
--	   && $(RM) go-next-rtl.png 					\
--	   && $(LN_S) go-previous-ltr.png go-next-rtl.png 		\
--	   && $(RM) go-previous-rtl.png 				\
--	   && $(LN_S) go-next-ltr.png go-previous-rtl.png 		\
--	   && $(RM) media-seek-backward-rtl.png 			\
--	   && $(LN_S) media-seek-forward-ltr.png media-seek-backward-rtl.png \
--	   && $(RM) media-seek-forward-rtl.png 				\
--	   && $(LN_S) media-seek-backward-ltr.png media-seek-forward-rtl.png \
--	   && $(RM) media-skip-backward-rtl.png 			\
--	   && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \
--	   && $(RM) media-skip-forward-rtl.png 				\
--	   && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \
--	   && $(RM) user-desktop.png 					\
--	   && $(LN_S) folder.png user-desktop.png 			\
--	   && $(RM) user-home.png 					\
--	   && $(LN_S) folder.png user-home.png 				\
--	) done 								\
--	&& touch stamp-icons
-+	touch stamp-icons
- 
- if CROSS_COMPILING
- gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/replace-icons
--- a/gtk+/stuff/replace-icons	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-# Replace GTK+ stock icons by Faenza icons
-# in order to strip icon theme and save some space.
-
-echo -n "Replacing icons... "
-
-F=/usr/share/icons/Faenza
-
-Ac16=$F/actions/16
-De16=$F/devices/16
-Pl16=$F/places/16
-St16=$F/stock/16
-Mi16=$F/mimetypes/16
-Ca16=$F/categories/16
-Sa16=$F/status/16
-
-
-cd $src/gtk/stock-icons/16
-
-cp -f $Ac16/application-exit.png .
-cp -f $Ac16/gtk-info.png ./dialog-information.png
-cp -f $Ac16/document-new.png .
-cp -f $Ac16/document-open.png .
-cp -f $Ac16/document-open-recent.png .
-cp -f $Ac16/document-print.png .
-cp -f $Ac16/document-print-preview.png .
-cp -f $Ac16/document-properties.png .
-cp -f $Ac16/document-revert.png ./document-revert-ltr.png
-cp -f $stuff/16/document-revert-rtl.png .
-cp -f $Ac16/document-save.png .
-cp -f $Ac16/document-save-as.png .
-cp -f $De16/drive-harddisk.png .
-cp -f $Ac16/edit-clear.png .
-cp -f $Ac16/edit-copy.png .
-cp -f $Ac16/edit-cut.png .
-ln -fs list-remove.png ./edit-delete.png
-cp -f $Ac16/edit-find.png .
-cp -f $Ac16/edit-find-replace.png .
-cp -f $Ac16/edit-paste.png .
-cp -f $Ac16/edit-redo.png ./edit-redo-ltr.png
-cp -f $stuff/16/edit-redo-rtl.png .
-cp -f $Ac16/edit-select-all.png .
-cp -f $Ac16/edit-undo.png ./edit-undo-ltr.png
-cp -f $stuff/16/edit-undo-rtl.png .
-cp -f $Pl16/folder.png .
-cp -f $Pl16/folder-remote.png .
-cp -f $Ac16/format-indent-less.png ./format-indent-less-ltr.png
-cp -f $stuff/16/format-indent-less-rtl.png .
-cp -f $Ac16/format-indent-more.png ./format-indent-more-ltr.png
-cp -f $stuff/16/format-indent-more-rtl.png .
-cp -f $Ac16/format-justify-center.png .
-cp -f $Ac16/format-justify-fill.png .
-cp -f $Ac16/format-justify-left.png .
-cp -f $Ac16/format-justify-right.png .
-cp -f $Ac16/format-text-bold.png .
-cp -f $Ac16/format-text-italic.png .
-cp -f $Ac16/format-text-strikethrough.png .
-cp -f $Ac16/format-text-underline.png .
-cp -f $Ac16/go-bottom.png .
-cp -f $Ac16/go-down.png .
-cp -f $Ac16/go-first.png ./go-first-ltr.png
-ln -fs go-last-ltr.png ./go-first-rtl.png
-cp -f $Ac16/go-home.png .
-cp -f $Ac16/go-jump.png ./go-jump-ltr.png
-cp -f $stuff/16/go-jump-rtl.png .
-cp -f $Ac16/go-last.png ./go-last-ltr.png
-ln -fs go-first-ltr.png ./go-last-rtl.png
-cp -f $Ac16/go-next.png ./go-next-ltr.png
-ln -fs go-previous-ltr.png ./go-next-rtl.png
-cp -f $Ac16/go-previous.png ./go-previous-ltr.png
-ln -fs go-next-ltr.png ./go-previous-rtl.png
-cp -f $Ac16/go-top.png .
-cp -f $Ac16/go-up.png .
-#gtk-caps-lock-warning.png
-#gtk-color-picker.png
-cp -f $St16/stock_connect.png ./gtk-connect.png
-#gtk-convert.png
-cp -f $St16/stock_disconnect.png ./gtk-disconnect.png
-cp -f $Ac16/gtk-edit.png .
-cp -f $Mi16/font-x-generic.png ./gtk-font.png
-#gtk-index.png
-#gtk-orientation-landscape.png
-#gtk-orientation-portrait.png
-#gtk-orientation-reverse-landscape.png
-#gtk-orientation-reverse-portrait.png
-cp -f $Ac16/document-page-setup.png ./gtk-page-setup.png
-cp -f $Ca16/preferences-desktop.png ./gtk-preferences.png
-#gtk-select-color.png
-ln -fs gtk-font.png ./gtk-select-font.png
-#gtk-undelete-ltr.png
-#gtk-undelete-rtl.png
-cp -f $Ac16/help-about.png .
-cp -f $Ac16/help-contents.png .
-cp -f $Sa16/image-missing.png .
-cp -f $Ac16/list-add.png .
-cp -f $Ac16/list-remove.png .
-cp -f $De16/media-floppy.png .
-cp -f $De16/media-optical.png .
-cp -f $Ac16/media-playback-pause.png .
-cp -f $Ac16/media-playback-start.png ./media-playback-start-ltr.png
-cp -f $stuff/16/media-playback-start-rtl.png .
-cp -f $Ac16/media-playback-stop.png .
-cp -f $Ac16/media-record.png .
-cp -f $stuff/16/media-seek-backward-ltr.png .
-ln -fs media-seek-forward-ltr.png ./media-seek-backward-rtl.png
-cp -f $stuff/16/media-seek-forward-ltr.png .
-ln -fs media-seek-backward-ltr.png ./media-seek-forward-rtl.png
-cp -f $Ac16/media-skip-backward.png ./media-skip-backward-ltr.png
-ln -fs media-skip-forward-ltr.png ./media-skip-backward-rtl.png
-cp -f $Ac16/media-skip-forward.png ./media-skip-forward-ltr.png
-ln -fs media-skip-backward-ltr.png ./media-skip-forward-rtl.png
-cp -f $Sa16/network-idle.png .
-#printer-error.png
-#printer-info.png
-#printer-paused.png
-#printer-warning.png
-cp -f $Ac16/process-stop.png .
-cp -f $Ac16/system-run.png .
-cp -f $Mi16/text-plain.png ./text-x-generic.png
-cp -f $Ac16/tools-check-spelling.png .
-cp -f $Pl16/user-desktop.png .
-cp -f $Pl16/user-home.png .
-cp -f $Ac16/view-fullscreen.png .
-cp -f $Ac16/view-refresh.png .
-cp -f $Ac16/view-restore.png .
-cp -f $Ac16/view-sort-ascending.png .
-cp -f $Ac16/view-sort-descending.png .
-cp -f $Ac16/window-close.png .
-cp -f $Ac16/zoom-fit.png zoom-fit-best.png
-cp -f $Ac16/zoom-in.png .
-cp -f $Ac16/zoom-original.png .
-cp -f $Ac16/zoom-out.png .
-
-
-cd $src/gtk/stock-icons/20
-
-for icon in gtk-apply gtk-cancel gtk-no gtk-ok gtk-yes window-close; do
-	cp -f $stuff/20/$icon.png .
-done
-
-
-Ac24=$F/actions/24
-De24=$F/devices/24
-Pl24=$F/places/24
-St24=$F/stock/24
-Sa24=$F/status/24
-Mi24=$F/mimetypes/24
-Ca24=$F/categories/24
-
-
-cd $src/gtk/stock-icons/24
-
-cp -f $Ac24/application-exit.png .
-cp -f $Sa24/audio-volume-high.png .
-cp -f $Sa24/audio-volume-low.png .
-cp -f $Sa24/audio-volume-medium.png .
-cp -f $Sa24/audio-volume-muted.png .
-cp -f $Ac24/gtk-info.png ./dialog-information.png
-cp -f $Ac24/document-new.png .
-cp -f $Ac24/document-open.png .
-cp -f $Ac24/document-open-recent.png .
-cp -f $Ac24/document-print.png .
-cp -f $Ac24/document-print-preview.png .
-cp -f $Ac24/document-properties.png .
-cp -f $Ac24/document-revert.png ./document-revert-ltr.png
-cp -f $stuff/24/document-revert-rtl.png .
-cp -f $Ac24/document-save.png .
-cp -f $Ac24/document-save-as.png .
-cp -f $De24/drive-harddisk.png .
-cp -f $Ac24/edit-clear.png .
-cp -f $Ac24/edit-copy.png .
-cp -f $Ac24/edit-cut.png .
-ln -fs list-remove.png ./edit-delete.png
-cp -f $Ac24/edit-find.png .
-cp -f $Ac24/edit-find-replace.png .
-cp -f $Ac24/edit-paste.png .
-cp -f $Ac24/edit-redo.png ./edit-redo-ltr.png
-cp -f $stuff/24/edit-redo-rtl.png .
-cp -f $Ac24/edit-select-all.png .
-cp -f $Ac24/edit-undo.png ./edit-undo-ltr.png
-cp -f $stuff/24/edit-undo-rtl.png .
-cp -f $Pl24/folder.png .
-cp -f $Pl24/folder-remote.png .
-cp -f $Ac24/format-indent-less.png ./format-indent-less-ltr.png
-cp -f $stuff/24/format-indent-less-rtl.png .
-cp -f $Ac24/format-indent-more.png ./format-indent-more-ltr.png
-cp -f $stuff/24/format-indent-more-rtl.png .
-cp -f $Ac24/format-justify-center.png .
-cp -f $Ac24/format-justify-fill.png .
-cp -f $Ac24/format-justify-left.png .
-cp -f $Ac24/format-justify-right.png .
-cp -f $Ac24/format-text-bold.png .
-cp -f $Ac24/format-text-italic.png .
-cp -f $Ac24/format-text-strikethrough.png .
-cp -f $Ac24/format-text-underline.png .
-cp -f $Ac24/go-bottom.png .
-cp -f $Ac24/go-down.png .
-cp -f $Ac24/go-first.png ./go-first-ltr.png
-ln -fs go-last-ltr.png ./go-first-rtl.png
-cp -f $Ac24/go-home.png .
-cp -f $Ac24/go-jump.png ./go-jump-ltr.png
-cp -f $stuff/24/go-jump-rtl.png .
-cp -f $Ac24/go-last.png ./go-last-ltr.png
-ln -fs go-first-ltr.png ./go-last-rtl.png
-cp -f $Ac24/go-next.png ./go-next-ltr.png
-ln -fs go-previous-ltr.png ./go-next-rtl.png
-cp -f $Ac24/go-previous.png ./go-previous-ltr.png
-ln -fs go-next-ltr.png ./go-previous-rtl.png
-cp -f $Ac24/go-top.png .
-cp -f $Ac24/go-up.png .
-#gtk-caps-lock-warning.png
-#gtk-color-picker.png
-cp -f $St24/stock_connect.png ./gtk-connect.png
-#gtk-convert.png
-cp -f $St24/stock_disconnect.png ./gtk-disconnect.png
-cp -f $Ac24/gtk-edit.png .
-cp -f $Mi24/font-x-generic.png ./gtk-font.png
-#gtk-index.png
-#gtk-orientation-landscape.png
-#gtk-orientation-portrait.png
-#gtk-orientation-reverse-landscape.png
-#gtk-orientation-reverse-portrait.png
-cp -f $Ac24/document-page-setup.png ./gtk-page-setup.png
-cp -f $Ca24/preferences-desktop.png ./gtk-preferences.png
-#gtk-select-color.png
-ln -fs gtk-font.png ./gtk-select-font.png
-#gtk-undelete-ltr.png
-#gtk-undelete-rtl.png
-cp -f $Ac24/help-about.png .
-cp -f $Ac24/help-contents.png .
-cp -f $Sa24/image-missing.png .
-cp -f $Ac24/list-add.png .
-cp -f $Ac24/list-remove.png .
-cp -f $De24/media-floppy.png .
-cp -f $De24/media-optical.png .
-cp -f $Ac24/media-playback-pause.png .
-cp -f $Ac24/media-playback-start.png ./media-playback-start-ltr.png
-cp -f $stuff/24/media-playback-start-rtl.png .
-cp -f $Ac24/media-playback-stop.png .
-cp -f $Ac24/media-record.png .
-cp -f $stuff/24/media-seek-backward-ltr.png .
-ln -fs media-seek-forward-ltr.png ./media-seek-backward-rtl.png
-cp -f $stuff/24/media-seek-forward-ltr.png .
-ln -fs media-seek-backward-ltr.png ./media-seek-forward-rtl.png
-cp -f $Ac24/media-skip-backward.png ./media-skip-backward-ltr.png
-ln -fs media-skip-forward-ltr.png ./media-skip-backward-rtl.png
-cp -f $Ac24/media-skip-forward.png ./media-skip-forward-ltr.png
-ln -fs media-skip-backward-ltr.png ./media-skip-forward-rtl.png
-cp -f $Sa24/network-idle.png .
-#printer-error.png
-#printer-info.png
-#printer-paused.png
-#printer-warning.png
-cp -f $Ac24/process-stop.png .
-cp -f $Ac24/system-run.png .
-cp -f $Mi24/text-plain.png ./text-x-generic.png
-cp -f $Ac24/tools-check-spelling.png .
-cp -f $Pl24/user-desktop.png .
-cp -f $Pl24/user-home.png .
-cp -f $Ac24/view-fullscreen.png .
-cp -f $Ac24/view-refresh.png .
-cp -f $Ac24/view-restore.png .
-cp -f $Ac24/view-sort-ascending.png .
-cp -f $Ac24/view-sort-descending.png .
-cp -f $Ac24/window-close.png .
-cp -f $Ac24/zoom-fit.png zoom-fit-best.png
-cp -f $Ac24/zoom-in.png .
-cp -f $Ac24/zoom-original.png .
-cp -f $Ac24/zoom-out.png .
-
-
-cd $src/gtk/stock-icons/32
-
-#gtk-dnd-multiple.png
-#gtk-dnd.png
-
-
-St48=$F/status/48
-
-cd $src/gtk/stock-icons/48
-
-cp -f $St48/dialog-error.png .
-cp -f $St48/dialog-information.png .
-cp -f $St48/dialog-password.png .
-cp -f $St48/dialog-question.png .
-cp -f $St48/dialog-warning.png .
-
-echo "Done"
-
-for folder in 16 20 24 32 48; do
-	echo -n "Optimizing folder icons $folder... "
-	cd $src/gtk/stock-icons/$folder
-	optipng -quiet -o7 -zm1-9 ./*
-	echo "Done"
-done
diff -r 71ba95d2422e -r f48456621a9d gtk+/stuff/replace-icons-paper
--- a/gtk+/stuff/replace-icons-paper	Mon Oct 15 16:44:45 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-# Replace GTK+ stock icons by Paper icons
-# in order to strip icon theme and save some space.
-
-
-# Return shortest line
-shortest_line() {
-	S=$1; shift
-	for L in $@; do
-		[ "${#L}" -lt "${#S}" ] && S="$L"
-	done
-	echo "$S"
-}
-
-# Replace the same files by symlinks, $@ - list of identical files
-make_symlinks() {
-	S=$(shortest_line $@)
-	for file in $@; do
-		[ "$S" != "$file" ] && ln -sf $S $file
-	done
-}
-
-
-echo -n "Replacing icons... "
-
-F=/usr/share/icons/Paper
-
-# copy icon
-ci() {
-	icon=$(basename $1 .png)
-	size="$2"
-	sub=''
-	case $icon in
-		*-ltr) sub=${icon%-*};;
-		*-rtl)
-			case ${icon%-*} in
-				edit-redo)				sub='edit-undo';;
-				edit-undo)				sub='edit-redo';;
-				format-indent-less)		sub='format-indent-more';;
-				format-indent-more)		sub='format-indent-less';;
-				go-first)				sub='go-last';;
-				go-last)				sub='go-first';;
-				go-next)				sub='go-previous';;
-				go-previous)			sub='go-next';;
-				media-seek-backward)	sub='media-seek-forward';;
-				media-seek-forward)		sub='media-seek-backward';;
-				media-skip-backward)	sub='media-skip-forward';;
-				media-skip-forward)		sub='media-skip-backward';;
-			esac
-			sub="$sub $sub-ltr"
-			;;
-		gtk-caps-lock-warning)		sub='dialog-warning';;
-		gtk-color-picker)			sub='color-picker';;
-		gtk-connect)				sub='network-transmit-receive';;
-		gtk-disconnect)				sub='network-offline';;
-		gtk-edit)					sub='edit';;
-		gtk-font)					sub='font-x-generic';;
-		gtk-page-setup)				sub='document-page-setup';;
-		gtk-preferences)			sub='preferences-desktop';;
-		gtk-select-color)			sub='color-select';;
-		gtk-select-font)			sub='font-select';;
-		gtk-apply)					sub='object-select';;
-		gtk-no)						sub='emblem-unreadable';;
-		gtk-yes)					sub='emblem-default';;
-		gtk-ok)						sub='object-select';;
-	esac
-
-	found=''
-	for i in png svg; do
-		for j in actions apps categories devices emblems emotes mimetypes places status; do
-			for k in $icon $sub; do
-				if [ -f "$F/$size/$j/$k.$i" ]; then
-					found="$F/$size/$j/$k.$i"
-					break 3
-				fi
-			done
-		done
-	done
-	case $found in
-		*.png) cp -f $found $1;;
-		*.svg) rm $1; rsvg-convert $found -o $1;;
-	esac
-}
-
-cd $src/gtk/stock-icons/16; for a in $(ls); do ci $a 16x16; done
-cd $src/gtk/stock-icons/20; for a in $(ls); do ci $a 16x16; done # yes, using 16x16 for 20
-cd $src/gtk/stock-icons/24; for a in $(ls); do ci $a 16x16; done # too
-cd $src/gtk/stock-icons/32; for a in $(ls); do ci $a 32x32; done
-cd $src/gtk/stock-icons/48; for a in $(ls); do ci $a 48x48; done
-
-echo "Done"
-
-for folder in 16 20 24 32 48; do
-	echo -n "Optimizing folder icons $folder... "
-	cd $src/gtk/stock-icons/$folder
-	for icon in ./*.png; do
-		pngquant -f --skip-if-larger --ext .png --speed 1 "$icon"
-		optipng -quiet -o7 -zm1-9 "$icon"
-	done
-	echo "Done"
-done
-
-
-# replace the same icons by symlinks
-
-MD5FILE=$(mktemp)
-find $src/gtk/stock-icons -type f -exec md5sum '{}' \; | sort > $MD5FILE
-for md in $(uniq -d -w32 $MD5FILE | cut -c1-32); do
-	make_symlinks $(grep $md $MD5FILE | cut -c35-)
-done
-rm "$MD5FILE"
-# make all symlinks relative
-symlinks -crs $src/gtk/stock-icons >/dev/null 2>&1
-
-
-
-# missing icons:
-# 16, 24
-# ==============================================================================
-# gtk-convert
-# gtk-index
-# gtk-orientation-landscape
-# gtk-orientation-portrait
-# gtk-orientation-reverse-landscape
-# gtk-orientation-reverse-portrait
-# gtk-undelete-ltr
-# gtk-undelete-rtl
-# printer-paused
-# printer-warning
-# 32
-# ==============================================================================
-# gtk-dnd
-# gtk-dnd-multiple
diff -r 71ba95d2422e -r f48456621a9d gtk-doc/receipt
--- a/gtk-doc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-doc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gtk.org/gtk-doc/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/gtk-doc.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gtk-doc.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d gtk-engine-rezlooks/receipt
--- a/gtk-engine-rezlooks/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-engine-rezlooks/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="39179-rezlooks-0.6.tar.gz"
 WGET_URL="http://GNOME-Look.org/CONTENT/content-files/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	sed -i 's|<glib/gtimer.h>|<glib.h>|' src/animation.c
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk-engines/receipt
--- a/gtk-engines/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-engines/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
-BUILD_DEPENDS="file gtk+-dev intltool"
+BUILD_DEPENDS="file gtk2-dev intltool"
 SPLIT="gtk-clearlooks gtk-engines gtk-engines-dev"
 
 compile_rules() {
@@ -27,12 +27,12 @@
 			copy libclearlooks.so Clearlooks/ clearlooks.xml
 			sed -i '/xml:lang=/d' $fs/usr/share/gtk-engines/*.xml
 			CAT="x-window|default gtk-engine, with ajustable colors"
-			DEPENDS="gtk+"
+			DEPENDS="gtk2"
 			;;
 		gtk-engines)
 			copy @std @rm
 			sed -i '/xml:lang=/d' $fs/usr/share/gtk-engines/*.xml
-			DEPENDS="gtk+ xorg-libXdamage"
+			DEPENDS="gtk2 xorg-libXdamage"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d gtk-girepository/receipt
--- a/gtk-girepository/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-girepository/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,17 +9,14 @@
 LICENSE="GPL2"
 REPOLOGY="-"
 
-DEPENDS="gtk+ gobject-introspection"
-BUILD_DEPENDS="pango-dev gtk+-dev gdk-pixbuf-dev atk-dev"
+DEPENDS="gtk2 gobject-introspection"
+BUILD_DEPENDS="pango-dev gtk2-dev gdk-pixbuf-dev atk-dev"
 
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/lib
 	cp -a /usr/lib/girepository-1.0 $install/usr/lib
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r 71ba95d2422e -r f48456621a9d gtk-gnutella/receipt
--- a/gtk-gnutella/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-gnutella/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,11 +10,11 @@
 WEB_SITE="http://gtk-gnutella.sourceforge.net"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gnutls libgcrypt libgpg-error expat gtk+  libxml2 \
+DEPENDS="gnutls libgcrypt libgpg-error expat gtk2 libxml2 \
 xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdmcp \
 xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
 xorg-libXdamage libtasn1"
-BUILD_DEPENDS="zlib-dev gtk+-dev libxml2-dev glib-dev xorg-dev"
+BUILD_DEPENDS="zlib-dev gtk2-dev libxml2-dev glib-dev xorg-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gtk-nodoka-engine/receipt
--- a/gtk-nodoka-engine/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-nodoka-engine/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://fedorahosted.org/released/nodoka/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk-screenshot/receipt
--- a/gtk-screenshot/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-screenshot/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libxml2-dev automake autoconf xorg-libXext-dev intltool"
+BUILD_DEPENDS="gtk2-dev libxml2-dev automake autoconf xorg-libXext-dev intltool"
 
 compile_rules() {
 	cp $stuff/ru.po $src/po
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 	TAGS="gtk2 screenshot"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk-sharp/receipt
--- a/gtk-sharp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-sharp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,11 +12,13 @@
 SERIES=${VERSION%.*}
 WGET_URL="http://download.mono-project.com/sources/gtk-sharp${SERIES//./}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev mono-dev libglade-dev"
-SPLIT="gtk-sharp-dev"
+BUILD_DEPENDS="gtk2-dev mono-dev libglade-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
@@ -24,7 +26,7 @@
 		gtk-sharp)
 			copy *.so *.dll *.config
 			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib \
-			glibc-base gtk+ harfbuzz libffi libglade libpng16 xorg-libxcb \
+			glibc-base gtk2 harfbuzz libffi libglade libpng16 xorg-libxcb \
 			libxml2 pango pcre xorg-pixman xorg-libX11 xorg-libXau \
 			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
 			xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr \
diff -r 71ba95d2422e -r f48456621a9d gtk-theme-arc/receipt
--- a/gtk-theme-arc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-theme-arc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtk-theme-arc"
 VERSION="20170302"
@@ -7,15 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/horst3180/arc-theme"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-DEPENDS="gtk2-engine-murrine"
-BUILD_DEPENDS="autoconf automake gtk+3-dev"
+BUILD_DEPENDS="autoconf automake gtk3-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh \
 		--prefix=/usr \
 		--disable-cinnamon \
@@ -24,8 +22,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2-engine-murrine"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk-theme-switch/receipt
--- a/gtk-theme-switch/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-theme-switch/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="${PACKAGE}_${VERSION}.orig.tar.gz"
 WGET_URL="http://ftp.debian.org/debian/pool/main/g/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	make &&
@@ -20,5 +20,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk-theme-vertex/receipt
--- a/gtk-theme-vertex/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-theme-vertex/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtk-theme-vertex"
 VERSION="20170128"
@@ -7,15 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/horst3180/vertex-theme"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-DEPENDS="gtk2-engine-murrine"
-BUILD_DEPENDS="autoconf automake gtk+3-dev"
+BUILD_DEPENDS="autoconf automake gtk3-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh \
 		--prefix=/usr \
 		--disable-cinnamon \
@@ -24,8 +22,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2-engine-murrine"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk-vnc/receipt
--- a/gtk-vnc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-vnc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,12 +11,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gnutls-dev libgpg-error-dev gtk+-dev cyrus-sasl cyrus-sasl-dev \
+BUILD_DEPENDS="gnutls-dev libgpg-error-dev gtk2-dev cyrus-sasl cyrus-sasl-dev \
 intltool python-pygtk-dev python-pygobject2-dev libffi-dev python-dev \
 libgcrypt-dev zlib-dev expat-dev libtasn1-dev perl-text-csv libffi expat \
 pulseaudio-dev util-linux-uuid-dev json-c-dev libsndfile-dev flac-dev \
 libvorbis-dev dbus-dev"
-SPLIT="gtk-vnc-dev gtk-vnc-python"
+SPLIT="$PACKAGE-dev $PACKAGE-python"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		gtk-vnc-python)
+		*-python)
 			copy python2.7/
 			CAT="development|Python bindings"
 			DEPENDS="gtk-vnc python"
@@ -34,7 +34,7 @@
 		gtk-vnc)
 			copy @std @rm
 			SUGGESTED="gtk-vnc-python"
-			DEPENDS="gnutls libgpg-error gtk+ python-pygtk cyrus-sasl libtasn1 \
+			DEPENDS="gnutls libgpg-error gtk2 python-pygtk cyrus-sasl libtasn1 \
 			pulseaudio util-linux-uuid json-c libsndfile flac \
 			libvorbis"
 			TAGS="vnc remote-desktop"
diff -r 71ba95d2422e -r f48456621a9d gtk-xfce-engine/receipt
--- a/gtk-xfce-engine/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk-xfce-engine/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure \
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo glib gtk+"
+	DEPENDS="cairo glib gtk2"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk2-engine-murrine/receipt
--- a/gtk2-engine-murrine/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk2-engine-murrine/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="murrine-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/murrine/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libxml2-dev intltool"
+BUILD_DEPENDS="gtk2-dev libxml2-dev intltool"
 
 compile_rules() {
 	./configure \
@@ -27,5 +27,5 @@
 genpkg_rules() {
 	copy @std
 	TAGS="gtk2"
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk2/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,69 @@
+# SliTaz package receipt v2.
+
+PACKAGE="gtk2"
+VERSION="2.24.31"
+CATEGORY="x-window"
+SHORT_DESC="The GIMP Toolkit"
+MAINTAINER="pankso@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://www.gtk.org/"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gtk2.html"
+
+TARBALL="gtk+-$VERSION.tar.xz"
+WGET_URL="$GNOME_MIRROR/gtk+/${VERSION:0:4}/$TARBALL"
+
+BUILD_DEPENDS="paper-icon-theme rsvg-convert optipng-static pngquant-static \
+symlinks \
+glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
+gobject-introspection-dev gtk-doc automake gettext xorg-libXinerama-dev"
+BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
+gobject-introspection-dev gtk-doc gettext xorg-libXinerama-dev \
+shared-mime-info-dev"
+SPLIT="$PACKAGE-demo $PACKAGE $PACKAGE-dev"
+
+compile_rules() {
+#	. $stuff/replace-icons-paper; cd $src
+
+#	find $src -type f -name 'Makefile.in' -exec sed -i 's|1.15|1.15.1|' '{}' \;
+# or
+#	autoreconf -fi && # fix 'version mismatch' between 1.15 and 1.15.1
+	./configure \
+		--enable-debug=no \
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	make $MAKEFLAGS $LIBTOOL &&
+	make install || return 1
+
+	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
+		$install/etc/gtk-2.0/gdk-pixbuf.loaders
+
+	mkdir -p $install/usr/share/applications
+	cp $stuff/*.desktop $install/usr/share/applications
+}
+
+genpkg_rules() {
+	case $PACKAGE in
+		*-demo)
+			copy gtk-demo demo/ *.desktop
+			CAT="development|example code and demo"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 pango"
+			;;
+		gtk2)
+			COOKOPTS="!menus"
+			copy @std @rm
+			DEPENDS="atk cairo fontconfig gdk-pixbuf glib libcups pango \
+			xorg-libX11 xorg-libXext xorg-libXinerama xorg-libXrender"
+			CONFIG_FILES="/etc/gtk-2.0/im-multipress.conf"
+			SUGGESTED="cups gnutls libgcrypt libgpg-error"
+			;;
+		*-dev)
+			copy @dev
+			DEPENDS="gtk2 \
+			atk-dev cairo-dev gdk-pixbuf-dev glib-dev pango-dev"
+			;;
+	esac
+}
+
+post_install_gtk_() {
+	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 --update-cache
+}
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/document-revert-rtl.png
Binary file gtk2/stuff/16/document-revert-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/edit-redo-rtl.png
Binary file gtk2/stuff/16/edit-redo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/edit-undo-rtl.png
Binary file gtk2/stuff/16/edit-undo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/format-indent-less-rtl.png
Binary file gtk2/stuff/16/format-indent-less-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/format-indent-more-rtl.png
Binary file gtk2/stuff/16/format-indent-more-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/go-jump-rtl.png
Binary file gtk2/stuff/16/go-jump-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/media-playback-start-rtl.png
Binary file gtk2/stuff/16/media-playback-start-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/media-seek-backward-ltr.png
Binary file gtk2/stuff/16/media-seek-backward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/16/media-seek-forward-ltr.png
Binary file gtk2/stuff/16/media-seek-forward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/20/gtk-apply.png
Binary file gtk2/stuff/20/gtk-apply.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/20/gtk-cancel.png
Binary file gtk2/stuff/20/gtk-cancel.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/20/gtk-no.png
Binary file gtk2/stuff/20/gtk-no.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/20/gtk-ok.png
Binary file gtk2/stuff/20/gtk-ok.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/20/gtk-yes.png
Binary file gtk2/stuff/20/gtk-yes.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/20/window-close.png
Binary file gtk2/stuff/20/window-close.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/document-revert-rtl.png
Binary file gtk2/stuff/24/document-revert-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/edit-redo-rtl.png
Binary file gtk2/stuff/24/edit-redo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/edit-undo-rtl.png
Binary file gtk2/stuff/24/edit-undo-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/format-indent-less-rtl.png
Binary file gtk2/stuff/24/format-indent-less-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/format-indent-more-rtl.png
Binary file gtk2/stuff/24/format-indent-more-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/go-jump-rtl.png
Binary file gtk2/stuff/24/go-jump-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/media-playback-start-rtl.png
Binary file gtk2/stuff/24/media-playback-start-rtl.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/media-seek-backward-ltr.png
Binary file gtk2/stuff/24/media-seek-backward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/24/media-seek-forward-ltr.png
Binary file gtk2/stuff/24/media-seek-forward-ltr.png has changed
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/gtk+-demo.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/stuff/gtk+-demo.desktop	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=GTK+ Code demo
+Exec=gtk-demo
+Icon=gtk
+Categories=GTK;Development;
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/stuff/patches/series	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,1 @@
+#undo_link_icons.patch
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/patches/undo_link_icons.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/stuff/patches/undo_link_icons.patch	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,38 @@
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1409,34 +1409,7 @@
+ 	  done;								\
+ 	  chmod -R u+w stock-icons;					\
+         fi &&								\
+-	for i in 16 24; do						\
+-	   (cd stock-icons/$$i						\
+-	   && $(RM) document-save.png 					\
+-	   && $(LN_S) media-floppy.png document-save.png 		\
+-	   && $(RM) folder-remote.png 					\
+-	   && $(LN_S) folder.png folder-remote.png 			\
+-	   && $(RM) go-first-rtl.png 					\
+-	   && $(LN_S) go-last-ltr.png go-first-rtl.png 			\
+-	   && $(RM) go-last-rtl.png 					\
+-	   && $(LN_S) go-first-ltr.png go-last-rtl.png 			\
+-	   && $(RM) go-next-rtl.png 					\
+-	   && $(LN_S) go-previous-ltr.png go-next-rtl.png 		\
+-	   && $(RM) go-previous-rtl.png 				\
+-	   && $(LN_S) go-next-ltr.png go-previous-rtl.png 		\
+-	   && $(RM) media-seek-backward-rtl.png 			\
+-	   && $(LN_S) media-seek-forward-ltr.png media-seek-backward-rtl.png \
+-	   && $(RM) media-seek-forward-rtl.png 				\
+-	   && $(LN_S) media-seek-backward-ltr.png media-seek-forward-rtl.png \
+-	   && $(RM) media-skip-backward-rtl.png 			\
+-	   && $(LN_S) media-skip-forward-ltr.png media-skip-backward-rtl.png \
+-	   && $(RM) media-skip-forward-rtl.png 				\
+-	   && $(LN_S) media-skip-backward-ltr.png media-skip-forward-rtl.png \
+-	   && $(RM) user-desktop.png 					\
+-	   && $(LN_S) folder.png user-desktop.png 			\
+-	   && $(RM) user-home.png 					\
+-	   && $(LN_S) folder.png user-home.png 				\
+-	) done 								\
+-	&& touch stamp-icons
++	touch stamp-icons
+ 
+ if CROSS_COMPILING
+ gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/replace-icons
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/stuff/replace-icons	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,294 @@
+# Replace GTK+ stock icons by Faenza icons
+# in order to strip icon theme and save some space.
+
+echo -n "Replacing icons... "
+
+F=/usr/share/icons/Faenza
+
+Ac16=$F/actions/16
+De16=$F/devices/16
+Pl16=$F/places/16
+St16=$F/stock/16
+Mi16=$F/mimetypes/16
+Ca16=$F/categories/16
+Sa16=$F/status/16
+
+
+cd $src/gtk/stock-icons/16
+
+cp -f $Ac16/application-exit.png .
+cp -f $Ac16/gtk-info.png ./dialog-information.png
+cp -f $Ac16/document-new.png .
+cp -f $Ac16/document-open.png .
+cp -f $Ac16/document-open-recent.png .
+cp -f $Ac16/document-print.png .
+cp -f $Ac16/document-print-preview.png .
+cp -f $Ac16/document-properties.png .
+cp -f $Ac16/document-revert.png ./document-revert-ltr.png
+cp -f $stuff/16/document-revert-rtl.png .
+cp -f $Ac16/document-save.png .
+cp -f $Ac16/document-save-as.png .
+cp -f $De16/drive-harddisk.png .
+cp -f $Ac16/edit-clear.png .
+cp -f $Ac16/edit-copy.png .
+cp -f $Ac16/edit-cut.png .
+ln -fs list-remove.png ./edit-delete.png
+cp -f $Ac16/edit-find.png .
+cp -f $Ac16/edit-find-replace.png .
+cp -f $Ac16/edit-paste.png .
+cp -f $Ac16/edit-redo.png ./edit-redo-ltr.png
+cp -f $stuff/16/edit-redo-rtl.png .
+cp -f $Ac16/edit-select-all.png .
+cp -f $Ac16/edit-undo.png ./edit-undo-ltr.png
+cp -f $stuff/16/edit-undo-rtl.png .
+cp -f $Pl16/folder.png .
+cp -f $Pl16/folder-remote.png .
+cp -f $Ac16/format-indent-less.png ./format-indent-less-ltr.png
+cp -f $stuff/16/format-indent-less-rtl.png .
+cp -f $Ac16/format-indent-more.png ./format-indent-more-ltr.png
+cp -f $stuff/16/format-indent-more-rtl.png .
+cp -f $Ac16/format-justify-center.png .
+cp -f $Ac16/format-justify-fill.png .
+cp -f $Ac16/format-justify-left.png .
+cp -f $Ac16/format-justify-right.png .
+cp -f $Ac16/format-text-bold.png .
+cp -f $Ac16/format-text-italic.png .
+cp -f $Ac16/format-text-strikethrough.png .
+cp -f $Ac16/format-text-underline.png .
+cp -f $Ac16/go-bottom.png .
+cp -f $Ac16/go-down.png .
+cp -f $Ac16/go-first.png ./go-first-ltr.png
+ln -fs go-last-ltr.png ./go-first-rtl.png
+cp -f $Ac16/go-home.png .
+cp -f $Ac16/go-jump.png ./go-jump-ltr.png
+cp -f $stuff/16/go-jump-rtl.png .
+cp -f $Ac16/go-last.png ./go-last-ltr.png
+ln -fs go-first-ltr.png ./go-last-rtl.png
+cp -f $Ac16/go-next.png ./go-next-ltr.png
+ln -fs go-previous-ltr.png ./go-next-rtl.png
+cp -f $Ac16/go-previous.png ./go-previous-ltr.png
+ln -fs go-next-ltr.png ./go-previous-rtl.png
+cp -f $Ac16/go-top.png .
+cp -f $Ac16/go-up.png .
+#gtk-caps-lock-warning.png
+#gtk-color-picker.png
+cp -f $St16/stock_connect.png ./gtk-connect.png
+#gtk-convert.png
+cp -f $St16/stock_disconnect.png ./gtk-disconnect.png
+cp -f $Ac16/gtk-edit.png .
+cp -f $Mi16/font-x-generic.png ./gtk-font.png
+#gtk-index.png
+#gtk-orientation-landscape.png
+#gtk-orientation-portrait.png
+#gtk-orientation-reverse-landscape.png
+#gtk-orientation-reverse-portrait.png
+cp -f $Ac16/document-page-setup.png ./gtk-page-setup.png
+cp -f $Ca16/preferences-desktop.png ./gtk-preferences.png
+#gtk-select-color.png
+ln -fs gtk-font.png ./gtk-select-font.png
+#gtk-undelete-ltr.png
+#gtk-undelete-rtl.png
+cp -f $Ac16/help-about.png .
+cp -f $Ac16/help-contents.png .
+cp -f $Sa16/image-missing.png .
+cp -f $Ac16/list-add.png .
+cp -f $Ac16/list-remove.png .
+cp -f $De16/media-floppy.png .
+cp -f $De16/media-optical.png .
+cp -f $Ac16/media-playback-pause.png .
+cp -f $Ac16/media-playback-start.png ./media-playback-start-ltr.png
+cp -f $stuff/16/media-playback-start-rtl.png .
+cp -f $Ac16/media-playback-stop.png .
+cp -f $Ac16/media-record.png .
+cp -f $stuff/16/media-seek-backward-ltr.png .
+ln -fs media-seek-forward-ltr.png ./media-seek-backward-rtl.png
+cp -f $stuff/16/media-seek-forward-ltr.png .
+ln -fs media-seek-backward-ltr.png ./media-seek-forward-rtl.png
+cp -f $Ac16/media-skip-backward.png ./media-skip-backward-ltr.png
+ln -fs media-skip-forward-ltr.png ./media-skip-backward-rtl.png
+cp -f $Ac16/media-skip-forward.png ./media-skip-forward-ltr.png
+ln -fs media-skip-backward-ltr.png ./media-skip-forward-rtl.png
+cp -f $Sa16/network-idle.png .
+#printer-error.png
+#printer-info.png
+#printer-paused.png
+#printer-warning.png
+cp -f $Ac16/process-stop.png .
+cp -f $Ac16/system-run.png .
+cp -f $Mi16/text-plain.png ./text-x-generic.png
+cp -f $Ac16/tools-check-spelling.png .
+cp -f $Pl16/user-desktop.png .
+cp -f $Pl16/user-home.png .
+cp -f $Ac16/view-fullscreen.png .
+cp -f $Ac16/view-refresh.png .
+cp -f $Ac16/view-restore.png .
+cp -f $Ac16/view-sort-ascending.png .
+cp -f $Ac16/view-sort-descending.png .
+cp -f $Ac16/window-close.png .
+cp -f $Ac16/zoom-fit.png zoom-fit-best.png
+cp -f $Ac16/zoom-in.png .
+cp -f $Ac16/zoom-original.png .
+cp -f $Ac16/zoom-out.png .
+
+
+cd $src/gtk/stock-icons/20
+
+for icon in gtk-apply gtk-cancel gtk-no gtk-ok gtk-yes window-close; do
+	cp -f $stuff/20/$icon.png .
+done
+
+
+Ac24=$F/actions/24
+De24=$F/devices/24
+Pl24=$F/places/24
+St24=$F/stock/24
+Sa24=$F/status/24
+Mi24=$F/mimetypes/24
+Ca24=$F/categories/24
+
+
+cd $src/gtk/stock-icons/24
+
+cp -f $Ac24/application-exit.png .
+cp -f $Sa24/audio-volume-high.png .
+cp -f $Sa24/audio-volume-low.png .
+cp -f $Sa24/audio-volume-medium.png .
+cp -f $Sa24/audio-volume-muted.png .
+cp -f $Ac24/gtk-info.png ./dialog-information.png
+cp -f $Ac24/document-new.png .
+cp -f $Ac24/document-open.png .
+cp -f $Ac24/document-open-recent.png .
+cp -f $Ac24/document-print.png .
+cp -f $Ac24/document-print-preview.png .
+cp -f $Ac24/document-properties.png .
+cp -f $Ac24/document-revert.png ./document-revert-ltr.png
+cp -f $stuff/24/document-revert-rtl.png .
+cp -f $Ac24/document-save.png .
+cp -f $Ac24/document-save-as.png .
+cp -f $De24/drive-harddisk.png .
+cp -f $Ac24/edit-clear.png .
+cp -f $Ac24/edit-copy.png .
+cp -f $Ac24/edit-cut.png .
+ln -fs list-remove.png ./edit-delete.png
+cp -f $Ac24/edit-find.png .
+cp -f $Ac24/edit-find-replace.png .
+cp -f $Ac24/edit-paste.png .
+cp -f $Ac24/edit-redo.png ./edit-redo-ltr.png
+cp -f $stuff/24/edit-redo-rtl.png .
+cp -f $Ac24/edit-select-all.png .
+cp -f $Ac24/edit-undo.png ./edit-undo-ltr.png
+cp -f $stuff/24/edit-undo-rtl.png .
+cp -f $Pl24/folder.png .
+cp -f $Pl24/folder-remote.png .
+cp -f $Ac24/format-indent-less.png ./format-indent-less-ltr.png
+cp -f $stuff/24/format-indent-less-rtl.png .
+cp -f $Ac24/format-indent-more.png ./format-indent-more-ltr.png
+cp -f $stuff/24/format-indent-more-rtl.png .
+cp -f $Ac24/format-justify-center.png .
+cp -f $Ac24/format-justify-fill.png .
+cp -f $Ac24/format-justify-left.png .
+cp -f $Ac24/format-justify-right.png .
+cp -f $Ac24/format-text-bold.png .
+cp -f $Ac24/format-text-italic.png .
+cp -f $Ac24/format-text-strikethrough.png .
+cp -f $Ac24/format-text-underline.png .
+cp -f $Ac24/go-bottom.png .
+cp -f $Ac24/go-down.png .
+cp -f $Ac24/go-first.png ./go-first-ltr.png
+ln -fs go-last-ltr.png ./go-first-rtl.png
+cp -f $Ac24/go-home.png .
+cp -f $Ac24/go-jump.png ./go-jump-ltr.png
+cp -f $stuff/24/go-jump-rtl.png .
+cp -f $Ac24/go-last.png ./go-last-ltr.png
+ln -fs go-first-ltr.png ./go-last-rtl.png
+cp -f $Ac24/go-next.png ./go-next-ltr.png
+ln -fs go-previous-ltr.png ./go-next-rtl.png
+cp -f $Ac24/go-previous.png ./go-previous-ltr.png
+ln -fs go-next-ltr.png ./go-previous-rtl.png
+cp -f $Ac24/go-top.png .
+cp -f $Ac24/go-up.png .
+#gtk-caps-lock-warning.png
+#gtk-color-picker.png
+cp -f $St24/stock_connect.png ./gtk-connect.png
+#gtk-convert.png
+cp -f $St24/stock_disconnect.png ./gtk-disconnect.png
+cp -f $Ac24/gtk-edit.png .
+cp -f $Mi24/font-x-generic.png ./gtk-font.png
+#gtk-index.png
+#gtk-orientation-landscape.png
+#gtk-orientation-portrait.png
+#gtk-orientation-reverse-landscape.png
+#gtk-orientation-reverse-portrait.png
+cp -f $Ac24/document-page-setup.png ./gtk-page-setup.png
+cp -f $Ca24/preferences-desktop.png ./gtk-preferences.png
+#gtk-select-color.png
+ln -fs gtk-font.png ./gtk-select-font.png
+#gtk-undelete-ltr.png
+#gtk-undelete-rtl.png
+cp -f $Ac24/help-about.png .
+cp -f $Ac24/help-contents.png .
+cp -f $Sa24/image-missing.png .
+cp -f $Ac24/list-add.png .
+cp -f $Ac24/list-remove.png .
+cp -f $De24/media-floppy.png .
+cp -f $De24/media-optical.png .
+cp -f $Ac24/media-playback-pause.png .
+cp -f $Ac24/media-playback-start.png ./media-playback-start-ltr.png
+cp -f $stuff/24/media-playback-start-rtl.png .
+cp -f $Ac24/media-playback-stop.png .
+cp -f $Ac24/media-record.png .
+cp -f $stuff/24/media-seek-backward-ltr.png .
+ln -fs media-seek-forward-ltr.png ./media-seek-backward-rtl.png
+cp -f $stuff/24/media-seek-forward-ltr.png .
+ln -fs media-seek-backward-ltr.png ./media-seek-forward-rtl.png
+cp -f $Ac24/media-skip-backward.png ./media-skip-backward-ltr.png
+ln -fs media-skip-forward-ltr.png ./media-skip-backward-rtl.png
+cp -f $Ac24/media-skip-forward.png ./media-skip-forward-ltr.png
+ln -fs media-skip-backward-ltr.png ./media-skip-forward-rtl.png
+cp -f $Sa24/network-idle.png .
+#printer-error.png
+#printer-info.png
+#printer-paused.png
+#printer-warning.png
+cp -f $Ac24/process-stop.png .
+cp -f $Ac24/system-run.png .
+cp -f $Mi24/text-plain.png ./text-x-generic.png
+cp -f $Ac24/tools-check-spelling.png .
+cp -f $Pl24/user-desktop.png .
+cp -f $Pl24/user-home.png .
+cp -f $Ac24/view-fullscreen.png .
+cp -f $Ac24/view-refresh.png .
+cp -f $Ac24/view-restore.png .
+cp -f $Ac24/view-sort-ascending.png .
+cp -f $Ac24/view-sort-descending.png .
+cp -f $Ac24/window-close.png .
+cp -f $Ac24/zoom-fit.png zoom-fit-best.png
+cp -f $Ac24/zoom-in.png .
+cp -f $Ac24/zoom-original.png .
+cp -f $Ac24/zoom-out.png .
+
+
+cd $src/gtk/stock-icons/32
+
+#gtk-dnd-multiple.png
+#gtk-dnd.png
+
+
+St48=$F/status/48
+
+cd $src/gtk/stock-icons/48
+
+cp -f $St48/dialog-error.png .
+cp -f $St48/dialog-information.png .
+cp -f $St48/dialog-password.png .
+cp -f $St48/dialog-question.png .
+cp -f $St48/dialog-warning.png .
+
+echo "Done"
+
+for folder in 16 20 24 32 48; do
+	echo -n "Optimizing folder icons $folder... "
+	cd $src/gtk/stock-icons/$folder
+	optipng -quiet -o7 -zm1-9 ./*
+	echo "Done"
+done
diff -r 71ba95d2422e -r f48456621a9d gtk2/stuff/replace-icons-paper
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk2/stuff/replace-icons-paper	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,132 @@
+# Replace GTK+ stock icons by Paper icons
+# in order to strip icon theme and save some space.
+
+
+# Return shortest line
+shortest_line() {
+	S=$1; shift
+	for L in $@; do
+		[ "${#L}" -lt "${#S}" ] && S="$L"
+	done
+	echo "$S"
+}
+
+# Replace the same files by symlinks, $@ - list of identical files
+make_symlinks() {
+	S=$(shortest_line $@)
+	for file in $@; do
+		[ "$S" != "$file" ] && ln -sf $S $file
+	done
+}
+
+
+echo -n "Replacing icons... "
+
+F=/usr/share/icons/Paper
+
+# copy icon
+ci() {
+	icon=$(basename $1 .png)
+	size="$2"
+	sub=''
+	case $icon in
+		*-ltr) sub=${icon%-*};;
+		*-rtl)
+			case ${icon%-*} in
+				edit-redo)				sub='edit-undo';;
+				edit-undo)				sub='edit-redo';;
+				format-indent-less)		sub='format-indent-more';;
+				format-indent-more)		sub='format-indent-less';;
+				go-first)				sub='go-last';;
+				go-last)				sub='go-first';;
+				go-next)				sub='go-previous';;
+				go-previous)			sub='go-next';;
+				media-seek-backward)	sub='media-seek-forward';;
+				media-seek-forward)		sub='media-seek-backward';;
+				media-skip-backward)	sub='media-skip-forward';;
+				media-skip-forward)		sub='media-skip-backward';;
+			esac
+			sub="$sub $sub-ltr"
+			;;
+		gtk-caps-lock-warning)		sub='dialog-warning';;
+		gtk-color-picker)			sub='color-picker';;
+		gtk-connect)				sub='network-transmit-receive';;
+		gtk-disconnect)				sub='network-offline';;
+		gtk-edit)					sub='edit';;
+		gtk-font)					sub='font-x-generic';;
+		gtk-page-setup)				sub='document-page-setup';;
+		gtk-preferences)			sub='preferences-desktop';;
+		gtk-select-color)			sub='color-select';;
+		gtk-select-font)			sub='font-select';;
+		gtk-apply)					sub='object-select';;
+		gtk-no)						sub='emblem-unreadable';;
+		gtk-yes)					sub='emblem-default';;
+		gtk-ok)						sub='object-select';;
+	esac
+
+	found=''
+	for i in png svg; do
+		for j in actions apps categories devices emblems emotes mimetypes places status; do
+			for k in $icon $sub; do
+				if [ -f "$F/$size/$j/$k.$i" ]; then
+					found="$F/$size/$j/$k.$i"
+					break 3
+				fi
+			done
+		done
+	done
+	case $found in
+		*.png) cp -f $found $1;;
+		*.svg) rm $1; rsvg-convert $found -o $1;;
+	esac
+}
+
+cd $src/gtk/stock-icons/16; for a in $(ls); do ci $a 16x16; done
+cd $src/gtk/stock-icons/20; for a in $(ls); do ci $a 16x16; done # yes, using 16x16 for 20
+cd $src/gtk/stock-icons/24; for a in $(ls); do ci $a 16x16; done # too
+cd $src/gtk/stock-icons/32; for a in $(ls); do ci $a 32x32; done
+cd $src/gtk/stock-icons/48; for a in $(ls); do ci $a 48x48; done
+
+echo "Done"
+
+for folder in 16 20 24 32 48; do
+	echo -n "Optimizing folder icons $folder... "
+	cd $src/gtk/stock-icons/$folder
+	for icon in ./*.png; do
+		pngquant -f --skip-if-larger --ext .png --speed 1 "$icon"
+		optipng -quiet -o7 -zm1-9 "$icon"
+	done
+	echo "Done"
+done
+
+
+# replace the same icons by symlinks
+
+MD5FILE=$(mktemp)
+find $src/gtk/stock-icons -type f -exec md5sum '{}' \; | sort > $MD5FILE
+for md in $(uniq -d -w32 $MD5FILE | cut -c1-32); do
+	make_symlinks $(grep $md $MD5FILE | cut -c35-)
+done
+rm "$MD5FILE"
+# make all symlinks relative
+symlinks -crs $src/gtk/stock-icons >/dev/null 2>&1
+
+
+
+# missing icons:
+# 16, 24
+# ==============================================================================
+# gtk-convert
+# gtk-index
+# gtk-orientation-landscape
+# gtk-orientation-portrait
+# gtk-orientation-reverse-landscape
+# gtk-orientation-reverse-portrait
+# gtk-undelete-ltr
+# gtk-undelete-rtl
+# printer-paused
+# printer-warning
+# 32
+# ==============================================================================
+# gtk-dnd
+# gtk-dnd-multiple
diff -r 71ba95d2422e -r f48456621a9d gtk3-engine-solidity/receipt
--- a/gtk3-engine-solidity/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk3-engine-solidity/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://gnome-look.org/CONTENT/content-files/142331-solidity-$VERSION.tar.bz2"
 
-BUILD_DEPENDS="vala glib-dev gtk+3-dev"
+BUILD_DEPENDS="vala glib-dev gtk3-dev"
 
 compile_rules() {
 	cd $src/source/gtk3
@@ -31,6 +31,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+3"
+	DEPENDS="gtk3"
 	TAGS="gtk3"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk3-engine-unico/receipt
--- a/gtk3-engine-unico/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk3-engine-unico/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="unico-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/unico/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="gtk+3-dev libxml2-dev"
+BUILD_DEPENDS="gtk3-dev libxml2-dev"
 
 compile_rules() {
 	./configure \
@@ -26,6 +26,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+3"
+	DEPENDS="gtk3"
 	TAGS="gtk3"
 }
diff -r 71ba95d2422e -r f48456621a9d gtk3/receipt
--- a/gtk3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtk3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -56,20 +56,17 @@
 			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
 			CAT="development|example code and demo"
 			DEPENDS="cairo gdk-pixbuf glib gtk3 libepoxy libharfbuzz pango"
-			PROVIDE="gtk+3-demo"
 			;;
 		*-widget-factory)
 			copy gtk3-widget*
 			rm -r $fs/usr/share/gtk-doc $fs/usr/share/man
 			CAT="development|widget factory"
 			DEPENDS="atk cairo gdk-pixbuf glib gtk3"
-			PROVIDE="gtk+3-widget-factory"
 			;;
 		*-icon-browser)
 			copy gtk3-icon-browser gtk3-icon-browser.desktop
 			CAT="development|icon browser"
 			DEPENDS="glib gtk3"
-			PROVIDE="gtk+3-icon-browser"
 			;;
 		*-broadwayd)
 			copy broadwayd
@@ -85,7 +82,6 @@
 			xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
 			xorg-libXfixes-dev xorg-libXi-dev xorg-libXinerama-dev \
 			xorg-libXrandr-dev"
-			PROVIDE="gtk+3-dev"
 			;;
 		*)
 			COOKOPTS="!menus"
@@ -95,7 +91,6 @@
 			libxkbcommon mesa-libwayland-egl pango rest wayland xorg-libX11 \
 			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
 			xorg-libXi xorg-libXinerama xorg-libXrandr"
-			PROVIDE="gtk+3"
 			CONFIG_FILES="/etc/gtk-3.0/settings.ini"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d gtkballs/receipt
--- a/gtkballs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkballs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://gtkballs.antex.ru/dist/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 SPLIT="gtkballs-themes gtkballs"
 
 compile_rules() {
@@ -48,7 +48,7 @@
 			;;
 		gtkballs)
 			copy @std @rm
-			DEPENDS="gtk+ xorg-libXdamage"
+			DEPENDS="gtk2 xorg-libXdamage"
 			SUGGESTED="gtkballs-themes"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d gtkdatabox/receipt
--- a/gtkdatabox/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkdatabox/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libffi gtk+-dev"
-SPLIT="gtkdatabox-dev"
+BUILD_DEPENDS="libffi gtk2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lm"
@@ -36,7 +36,7 @@
 	case $PACKAGE in
 		gtkdatabox)
 			copy @std
-			DEPENDS="gtk+"
+			DEPENDS="gtk2"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d gtkdialog/receipt
--- a/gtkdialog/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkdialog/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gtkdialog/$TARBALL"
 
-BUILD_DEPENDS="automake gtk+-dev libglade-dev vte-gtk2-dev texinfo"
+BUILD_DEPENDS="automake gtk2-dev libglade-dev vte-gtk2-dev texinfo"
 
 compile_rules() {
 	./autogen.sh \
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std icons/
-	DEPENDS="gdk-pixbuf glib gtk+ libglade vte-gtk2"
+	DEPENDS="gdk-pixbuf glib gtk2 libglade vte-gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtkglext/receipt
--- a/gtkglext/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkglext/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev glu glu-dev mesa-dev \
+BUILD_DEPENDS="gtk2-dev glu glu-dev mesa-dev \
 util-linux-uuid-dev autoconf pangox-compat-dev expat-dev xorg-libxshmfence-dev"
 SPLIT="gtkglext-dev"
 
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		gtkglext)
 			copy @std
-			DEPENDS="gtk+ mesa glu pangox-compat"
+			DEPENDS="gtk2 mesa glu pangox-compat"
 			SUGGESTED="nvidia"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d gtkhotkey/receipt
--- a/gtkhotkey/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkhotkey/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk+-dev intltool"
+BUILD_DEPENDS="glib-dev gtk2-dev intltool"
 SPLIT="gtkhotkey-dev"
 
 compile_rules() {
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		gtkhotkey)
 			copy @std
-			DEPENDS="glib gtk+"
+			DEPENDS="glib gtk2"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d gtklife/receipt
--- a/gtklife/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtklife/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,38 +1,35 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtklife"
 VERSION="5.1"
 CATEGORY="games"
-SHORT_DESC="Fast, featureful, open-source Conway's Life program."
+SHORT_DESC="Fast, featureful, open-source Conway's Life program"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://ironphoenix.org/tril/gtklife/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://ironphoenix.org/tril/gtklife/"
 WGET_URL="http://ironphoenix.org/tril/gtklife/$TARBALL"
 
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
+
 	./configure \
 		--prefix=/usr \
 		--bindir=/usr/games \
 		--with-gtk2 \
 		$CONFIGURE_ARGS &&
 	make || return 1
+
 	mkdir -p $DESTDIR/usr/games $DESTDIR/usr/share/gtklife
 	cp -a graphics $DESTDIR/usr/share/gtklife
 	cp -a patterns $DESTDIR/usr/share/gtklife
 	cp gtklife $DESTDIR/usr/games
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 xorg-libXdamage"
 }
-
diff -r 71ba95d2422e -r f48456621a9d gtklp/receipt
--- a/gtklp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtklp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="cups-dev gtk+-dev autoconf automake libtool gettext-tools"
+BUILD_DEPENDS="cups-dev gtk2-dev autoconf automake libtool gettext-tools"
 
 compile_rules() {
 	sed -i 's/^gettextize .*/autopoint -f/' autogen.sh
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cups gtk+"
+	DEPENDS="cups gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtkmm/receipt
--- a/gtkmm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkmm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
-BUILD_DEPENDS="doxygen gtk+-dev atkmm-dev glibmm-dev cairomm-dev libsigc++-dev \
+BUILD_DEPENDS="doxygen gtk2-dev atkmm-dev glibmm-dev cairomm-dev libsigc++-dev \
 pangomm-dev glibmm-dev mm-common"
 SPLIT="gtkmm-dev"
 
@@ -29,12 +29,12 @@
 	case $PACKAGE in
 		gtkmm)
 			copy @std
-			DEPENDS="gtk+ atkmm glibmm cairomm libsigc++ xorg-libXdamage \
+			DEPENDS="gtk2 atkmm glibmm cairomm libsigc++ xorg-libXdamage \
 			libgiomm pangomm gcc-lib-base"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtkmm gtk+-dev atkmm-dev glibmm-dev libgiomm-dev \
+			DEPENDS="gtkmm gtk2-dev atkmm-dev glibmm-dev libgiomm-dev \
 			pangomm-dev"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d gtkmm3/receipt
--- a/gtkmm3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkmm3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.gtkmm.org/en/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtkmm3.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gtkmm3.html"
 
 TARBALL="gtkmm-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gtkmm/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+3-dev libgiomm-dev pangomm-dev cairomm-dev glibmm-dev \
+BUILD_DEPENDS="gtk3-dev libgiomm-dev pangomm-dev cairomm-dev glibmm-dev \
 atkmm-dev"
 SPLIT="gtkmm3-dev"
 
@@ -29,14 +29,14 @@
 	case $PACKAGE in
 		gtkmm3)
 			copy @std
-			DEPENDS="atkmm cairomm gdk-pixbuf glib glibmm gtk+3 libgiomm \
+			DEPENDS="atkmm cairomm gdk-pixbuf glib glibmm gtk3 libgiomm \
 			libsigc++ pangomm"
 			PROVIDE="gtk3mm"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="gtkmm3 atkmm-dev cairomm-dev gdk-pixbuf-dev glibmm-dev \
-			gtk+3-dev pangomm-dev"
+			gtk3-dev pangomm-dev"
 			PROVIDE="gtk3mm-dev"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d gtkperf/receipt
--- a/gtkperf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkperf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="${PACKAGE}_${VERSION}.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gettext autoconf"
+BUILD_DEPENDS="gtk2-dev gettext autoconf"
 
 COOKOPTS="skip-log-errors"
 
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d gtksourceview/receipt
--- a/gtksourceview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtksourceview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev libxml2-dev expat-dev"
+BUILD_DEPENDS="intltool gtk2-dev libxml2-dev expat-dev"
 SPLIT="gtksourceview-dev"
 
 compile_rules() {
@@ -26,11 +26,11 @@
 	case $PACKAGE in
 		gtksourceview)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk+ libxml2 pango python"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 libxml2 pango python"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtksourceview gtk+-dev libxml2-dev"
+			DEPENDS="gtksourceview gtk2-dev libxml2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d gtksourceview3/receipt
--- a/gtksourceview3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtksourceview3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/GtkSourceView"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/gtksourceview.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gtksourceview.html"
 
 TARBALL="gtksourceview-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gtksourceview/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev itstool gtk+3-dev libxml2-dev gettext gtk-doc vala \
+BUILD_DEPENDS="glib-dev itstool gtk3-dev libxml2-dev gettext gtk-doc vala \
 gobject-introspection-dev"
 SPLIT="gtksourceview3-dev"
 
@@ -27,11 +27,11 @@
 	case $PACKAGE in
 		gtksourceview3)
 			copy @std
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libxml2 pango"
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libxml2 pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtksourceview3 glib-dev gtk+3-dev libxml2-dev"
+			DEPENDS="gtksourceview3 glib-dev gtk3-dev libxml2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d gtkspell/receipt
--- a/gtkspell/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkspell/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev enchant-dev intltool"
+BUILD_DEPENDS="gtk2-dev enchant-dev intltool"
 SPLIT="gtkspell-dev"
 
 compile_rules() {
@@ -26,11 +26,11 @@
 	case $PACKAGE in
 		gtkspell)
 			copy @std
-			DEPENDS="enchant glib gtk+"
+			DEPENDS="enchant glib gtk2"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtkspell enchant-dev gtk+-dev"
+			DEPENDS="gtkspell enchant-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d gtkspell3/receipt
--- a/gtkspell3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtkspell3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/gtkspell/$TARBALL"
 
-BUILD_DEPENDS="gobject-introspection vala intltool gtk+3-dev enchant-dev \
+BUILD_DEPENDS="gobject-introspection vala intltool gtk3-dev enchant-dev \
 gtk-doc"
 SPLIT="gtkspell3-dev"
 
@@ -26,11 +26,11 @@
 	case $PACKAGE in
 		gtkspell3)
 			copy @std *.mo
-			DEPENDS="enchant glib gtk+3"
+			DEPENDS="enchant glib gtk3"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtkspell3 enchant-dev glib-dev gtk+3-dev"
+			DEPENDS="gtkspell3 enchant-dev glib-dev gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d gtktetris/receipt
--- a/gtktetris/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gtktetris/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="https://sourceforge.net/projects/gtktetris/"
 WGET_URL="http://mirror.slitaz.org/sources/packages/g/$TARBALL"
 
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev"
+DEPENDS="gtk2 xorg-libXdamage"
+BUILD_DEPENDS="gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gucharmap/receipt
--- a/gucharmap/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gucharmap/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="itstool libxml2-tools glib-dev gtk+-dev intltool"
+BUILD_DEPENDS="itstool libxml2-tools glib-dev gtk2-dev intltool"
 SPLIT="gucharmap-dev gucharmap-i18n"
 
 compile_rules() {
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		gucharmap)
 			copy @std
-			DEPENDS="gtk+ xorg-libXdamage"
+			DEPENDS="gtk2 xorg-libXdamage"
 			;;
 		gucharmap-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d gucharmap3/receipt
--- a/gucharmap3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gucharmap3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,14 +7,14 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://wiki.gnome.org/Apps/Gucharmap"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/gucharmap.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/gucharmap.html"
 REPOLOGY="gucharmap"
 
 TARBALL="gucharmap-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gucharmap/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gtk-doc automake gettext libtool gobject-introspection-dev \
-intltool yelp-tools itstool gtk+3-dev desktop-file-utils-extra wget \
+intltool yelp-tools itstool gtk3-dev desktop-file-utils-extra wget \
 coreutils-file-summarize unzip vala"
 SPLIT="gucharmap3-i18n gucharmap-gnome gucharmap3 gucharmap3-dev"
 
@@ -43,11 +43,11 @@
 			;;
 		gucharmap3)
 			copy @std @rm
-			DEPENDS="atk cairo glib gtk+3 pango"
+			DEPENDS="atk cairo glib gtk3 pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="${SPLIT/$PACKAGE/} glib-dev gtk+3-dev"
+			DEPENDS="${SPLIT/$PACKAGE/} glib-dev gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d guile/receipt
--- a/guile/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/guile/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://www.gnu.org/software/guile/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/guile.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/guile.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d gummi/receipt
--- a/gummi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gummi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="https://github.com/alexandervdm/gummi"
 WGET_URL="http://dev.midnightcoding.org/attachments/download/239/$TARBALL"
 
-DEPENDS="gtk+ gtksourceview gtkspell poppler"
-BUILD_DEPENDS="gtk+-dev gtksourceview-dev gtkspell-dev intltool poppler-dev glib"
+DEPENDS="gtk2 gtksourceview gtkspell poppler"
+BUILD_DEPENDS="gtk2-dev gtksourceview-dev gtkspell-dev intltool poppler-dev glib"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gutenprint/receipt
--- a/gutenprint/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gutenprint/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -32,7 +32,7 @@
 		gutenprint)
 			copy @std
 			rm -rf $fs/usr/share/$PACKAGE/doc # Remove docs
-			DEPENDS="gnutls readline gtk+ cups libtasn1 gmp"
+			DEPENDS="gnutls readline gtk2 cups libtasn1 gmp"
 			;;
 		gutenprint-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d gutenpy/receipt
--- a/gutenpy/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gutenpy/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gutenpy"
 VERSION="0.3.0"
 CATEGORY="office"
-SHORT_DESC="A text reader and catalog browser for project Gutenburg."
+SHORT_DESC="A text reader and catalog browser for project Gutenburg"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://gutenpy.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://gutenpy.sourceforge.net/"
-WGET_URL="http://prdownloads.sourceforge.net/gutenpy/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="python python-pygtk"
 BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Fix missing .desktop file
-	sed -i '/share\/applications/d' setup.py
-	sed -i '/gutenpy.desktop/d' setup.py
-	python setup.py install --root=$DESTDIR
+	sed -i '/share\/applications/d; /gutenpy.desktop/d' setup.py
+
+	python -B setup.py install --root=$DESTDIR
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	# Add gutenpy.desktop file
 	cp -a stuff/* $fs
+	DEPENDS="python python-pygtk"
 }
diff -r 71ba95d2422e -r f48456621a9d guvcview/receipt
--- a/guvcview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/guvcview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="intltool v4l-utils-dev eudev-dev libusb-dev ffmpeg-dev \
-libpng16-dev libsdl2-dev gsl-dev portaudio-dev gtk+3-dev"
+libpng16-dev libsdl2-dev gsl-dev portaudio-dev gtk3-dev"
 SPLIT="guvcview-dev"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		guvcview)
 			copy @std *.mo
-			DEPENDS="eudev ffmpeg glib gsl gtk+3 libpng16 libsdl2 libusb \
+			DEPENDS="eudev ffmpeg glib gsl gtk3 libpng16 libsdl2 libusb \
 			portaudio v4l-utils"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d gv/receipt
--- a/gv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,22 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gv"
 VERSION="3.7.4"
 CATEGORY="office"
-SHORT_DESC="X11 user interface for Ghostscript."
+SHORT_DESC="X11 user interface for Ghostscript"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/gv/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/gv/"
 WGET_URL="http://ftp.gnu.org/gnu/gv/$TARBALL"
 
-DEPENDS="ghostscript xorg-libXaw3d xorg-libXinerama"
 BUILD_DEPENDS="xorg-libXaw3d-dev xorg-libXinerama-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
@@ -24,9 +21,8 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	rm -rf $fs/usr/share/man
+	DEPENDS="ghostscript xorg-libXaw3d xorg-libXinerama"
 }
diff -r 71ba95d2422e -r f48456621a9d gvfb/receipt
--- a/gvfb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gvfb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://www.minigui.org/"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="cmake gtk+-dev"
+DEPENDS="gtk2"
+BUILD_DEPENDS="cmake gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gvfs/receipt
--- a/gvfs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gvfs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="meson ninja shared-mime-info libxslt glib-dev gtk-doc dbus-dev \
 gcr-dev gettext polkit-dev libcap-dev libgphoto2-dev libarchive-dev \
-libsoup-dev libcdio-paranoia-dev libmtp-dev fuse2-dev udisks2-dev gtk+3-dev \
+libsoup-dev libcdio-paranoia-dev libmtp-dev fuse2-dev udisks2-dev gtk3-dev \
 libbluray-dev libgudev-dev libsecret-dev libxml2-dev openssh samba-dev \
 dbus-glib-dev libnfs-dev libgdata-dev gnome-online-accounts-dev"
 SPLIT="gvfs-admin gvfs-afp gvfs-archive gvfs-cdda gvfs-fuse gvfs-goa \
@@ -127,7 +127,7 @@
 		gvfs-gtk)
 			copy gvfsd-recent recent.mount
 			CAT="system-tools|recent files support (GTK+3) - recent:///"
-			DEPENDS="glib gvfs" # + gtk+3 ?
+			DEPENDS="glib gvfs" # + gtk3 ?
 			;;
 		gvfs-http)
 			copy \
diff -r 71ba95d2422e -r f48456621a9d gvim/receipt
--- a/gvim/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gvim/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gvim"
 VERSION="7.3"
 CATEGORY="editors"
-SHORT_DESC="Advanced text editor, with gtk+ GUI"
+SHORT_DESC="Advanced text editor with GTK+ GUI"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.vim.org/"
@@ -12,15 +12,10 @@
 SOURCE="vim"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
-CONFIG_FILES="/etc/vim/vimrc"
-TAGS="text-editor"
 
-DEPENDS="ncurses gtk+ xorg-libXt xorg-libXau xorg-libXdmcp"
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# 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
@@ -39,16 +34,17 @@
 		--disable-athena-check \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
+	make \
+		VIMRCLOC=/etc/vim \
+		VIMRUNTIMEDIR=/usr/share/vim/vim73 \
+		MAKE="make -e" &&
+	make DESTDIR=$DESTDIR install || return 1
 
-	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
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons/hicolor/16x16/apps $fs/usr/share/applications $fs/etc
 
 	cp -a $install/usr/bin $fs/usr
@@ -56,10 +52,12 @@
 	cp -a $src/runtime/vim16x16.png $fs/usr/share/icons/hicolor/16x16/apps/gvim.png
 	cp -a stuff/gvim.desktop $fs/usr/share/applications
 	cp -a $install/etc/vim $fs/etc
+	DEPENDS="ncurses gtk2 xorg-libXt xorg-libXau xorg-libXdmcp"
+	CONFIG_FILES="/etc/vim/vimrc"
+	TAGS="text-editor"
 }
 
-post_install()
-{
+post_install() {
 	cmd=$(readlink "$1/bin/vi")
 	if [ ! "$cmd" == '/usr/bin/vim' ]; then
 		echo ""
@@ -78,8 +76,7 @@
 	fi
 }
 
-post_remove()
-{
+post_remove() {
 	# restore previous symlink
 	ln -sf busybox "$1/bin/vi"
 }
diff -r 71ba95d2422e -r f48456621a9d gvolwheel/receipt
--- a/gvolwheel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gvolwheel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib-dev gtk+-dev intltool"
+BUILD_DEPENDS="alsa-lib-dev gtk2-dev intltool"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lX11"
@@ -26,7 +26,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base gdk-pixbuf \
-	glib glibc-base gtk+ libffi libpng16 xorg-libxcb pango xorg-pixman \
+	glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango xorg-pixman \
 	xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
 	xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr \
 	xorg-libXrender zlib"
diff -r 71ba95d2422e -r f48456621a9d gweled/receipt
--- a/gweled/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gweled/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="https://launchpad.net/$PACKAGE"
 WGET_URL="$WEB_SITE/trunk/$VERSION/+download/$TARBALL"
 
-DEPENDS="gtk+ librsvg libmikmod"
-BUILD_DEPENDS="wget intltool gtk+-dev librsvg-dev libmikmod-dev"
+DEPENDS="gtk2 librsvg libmikmod"
+BUILD_DEPENDS="wget intltool gtk2-dev librsvg-dev libmikmod-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d gxine/receipt
--- a/gxine/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gxine/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://switch.dl.sourceforge.net/sourceforge/xine/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info spidermonkey-dev xine-lib-dev xorg-dev \
-dbus-dev gtk+-dev xorg-libXinerama-dev xorg-libXext-dev perl \
+dbus-dev gtk2-dev xorg-libXinerama-dev xorg-libXext-dev perl \
 xorg-libXv-dev xorg-xorgproto"
 
 compile_rules() {
@@ -38,5 +38,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="xine-lib libvorbis gtk+ spidermonkey dbus"
+	DEPENDS="xine-lib libvorbis gtk2 spidermonkey dbus"
 }
diff -r 71ba95d2422e -r f48456621a9d gxmessage/receipt
--- a/gxmessage/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gxmessage/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://homepages.ihug.co.nz/~trmusson/stuff/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	./configure --prefix=/usr $CONFIGURE_ARGS &&
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ expat xorg-libXdamage"
+	DEPENDS="gtk2 expat xorg-libXdamage"
 }
diff -r 71ba95d2422e -r f48456621a9d gyrus/receipt
--- a/gyrus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/gyrus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev glib-dev gconf-dev"
+BUILD_DEPENDS="intltool gtk2-dev glib-dev gconf-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gconf gdk-pixbuf glib gtk+ pango"
+	DEPENDS="cairo gconf gdk-pixbuf glib gtk2 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d hardinfo/receipt
--- a/hardinfo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/hardinfo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://hardinfo.berlios.de/"
 WGET_URL="http://download.berlios.de/hardinfo/$TARBALL"
 
-DEPENDS="gtk+ pciutils xorg-libXdamage"
-BUILD_DEPENDS="gtk+ gtk+-dev"
+DEPENDS="gtk2 pciutils xorg-libXdamage"
+BUILD_DEPENDS="gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d hexchat/receipt
--- a/hexchat/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/hexchat/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://dl.hexchat.net/hexchat/$TARBALL"
 
-BUILD_DEPENDS="automake autoconf-archive libtool intltool gtk+-dev perl-dev \
+BUILD_DEPENDS="automake autoconf-archive libtool intltool gtk2-dev perl-dev \
 python-dev openssl-dev pciutils-dev dbus-glib-dev libnotify-dev \
 libcanberra-dev iso-codes" # libproxy-dev
 SPLIT="hexchat-plugin-perl hexchat-plugin-python hexchat hexchat-dev"
@@ -40,7 +40,7 @@
 		hexchat)
 			copy @std @rm
 			rm -r $fs/usr/share/appdata/
-			DEPENDS="dbus-glib gdk-pixbuf glib gtk+ libcanberra libnotify \
+			DEPENDS="dbus-glib gdk-pixbuf glib gtk2 libcanberra libnotify \
 			openssl pango pciutils"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d hitori/receipt
--- a/hitori/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/hitori/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gettext itstool libxml2-tools gtk+3-dev cairo-dev \
+BUILD_DEPENDS="glib-dev gettext itstool libxml2-tools gtk3-dev cairo-dev \
 desktop-file-utils-extra"
 
 compile_rules() {
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo glib gtk+3 pango"
+	DEPENDS="cairo glib gtk3 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d homebank/receipt
--- a/homebank/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/homebank/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="http://homebank.free.fr/public/$TARBALL"
 TAGS="office finance"
 
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="intltool gtk+-dev"
+DEPENDS="gtk2 xorg-libXdamage"
+BUILD_DEPENDS="intltool gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d httrack/receipt
--- a/httrack/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/httrack/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="httrack"
 VERSION="3.45.4"
 CATEGORY="system-tools"
-SHORT_DESC="An easy-to-use offline browser utility."
+SHORT_DESC="An easy-to-use offline browser utility"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://www.httrack.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.httrack.com/$TARBALL"
 
-DEPENDS="bash zlib"
 BUILD_DEPENDS="zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure $CONFIGURE_ARGS && make -j1 && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make -j1 &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/httrack
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
@@ -30,4 +27,5 @@
 	cp -a $install/usr/share $fs/usr
 	rm -rf $fs/usr/share/man
 	rm -rf $fs/usr/share/doc
+	DEPENDS="bash zlib"
 }
diff -r 71ba95d2422e -r f48456621a9d hydra/receipt
--- a/hydra/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/hydra/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,9 +10,9 @@
 WEB_SITE="https://github.com/vanhauser-thc/thc-hydra"
 WGET_URL="http://freeworld.thc.org/releases/$TARBALL"
 
-DEPENDS="gtk+ openssl xorg-libXdamage apr libssh libmysqlclient \
+DEPENDS="gtk2 openssl xorg-libXdamage apr libssh libmysqlclient \
 libidn libpostgresqlclient libsvn"
-BUILD_DEPENDS="openssl-dev apr-dev gtk+-dev libssh-dev libmysqlclient \
+BUILD_DEPENDS="openssl-dev apr-dev gtk2-dev libssh-dev libmysqlclient \
 postgresql-dev subversion-dev libidn-dev mysql-dev"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d iagno/receipt
--- a/iagno/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/iagno/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk+3-dev librsvg-dev libcanberra-dev gettext \
+BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev gettext \
 itstool"
 
 compile_rules() {
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+3 libcanberra libcanberra-gtk3 librsvg"
+	DEPENDS="cairo gdk-pixbuf glib gtk3 libcanberra libcanberra-gtk3 librsvg"
 }
diff -r 71ba95d2422e -r f48456621a9d ibus/receipt
--- a/ibus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ibus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ibus.googlecode.com/files/$TARBALL" # FIXME
 
-BUILD_DEPENDS="gtk+-dev gconf-dev python-dev python-dbus-dev dbus-glib-dev \
+BUILD_DEPENDS="gtk2-dev gconf-dev python-dev python-dbus-dev dbus-glib-dev \
 intltool gettext perl iso-codes-dev"
 SPLIT="ibus-dev"
 
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		ibus)
 			copy @std
-			DEPENDS="gconf glib gtk+ pango python xorg-libX11"
+			DEPENDS="gconf glib gtk2 pango python xorg-libX11"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/icedtea6-jdk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -4,7 +4,7 @@
 SOURCE="icedtea6"
 VERSION="1.9.9"
 CATEGORY="development"
-SHORT_DESC="A Free Software harness for OpenJDK."
+SHORT_DESC="A Free Software harness for OpenJDK"
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="GPL2"
 WEB_SITE="http://www.iced-tea.org/"
@@ -16,10 +16,10 @@
 BUILD_DEPENDS="gcc+gcj autoconf automake m4 diffutils gawk cups-dev cpio \
 coreutils-file-special coreutils-file-summarize alsa-lib-dev file patch perl \
 zip unzip findutils  bzip2 tar glib-dev fastjar rhino ecj apache-ant jpeg-dev \
-xalan-xerces-j gtk+-dev giflib-dev libpng16-dev xorg-dev xorg-libXtst-dev \
+xalan-xerces-j gtk2-dev giflib-dev libpng16-dev xorg-dev xorg-libXtst-dev \
 xorg-libXp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
 openjdk-6-src"
-SPLIT="icedtea6-jdk icedtea6-jre java-jdk java-jre"
+SPLIT="$PACKAGE icedtea6-jre java-jdk java-jre"
 
 # Note to icedtea6 updaters,
 # You should check version into receipts:
@@ -34,9 +34,7 @@
 jdk6-jaxp-$openjdk_version.zip jdk6-jaf-$openjdk_version.zip \
 openjdk-6-src-$openjdk_version-$openjdk_date.tar.gz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Limit memory usage
 	ulimit -v $(awk '/MemTotal/ { print int(($2*80)/100) }' < /proc/meminfo)
 
@@ -152,48 +150,43 @@
 	fi
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	icedtea6-jdk)
-		DEPENDS="icedtea6-jre xorg xorg-libXtst xorg-libXp cups"
-		mkdir -p $fs/usr/lib/jvm/java-icedtea
-		cp -a $install/usr/lib/jvm/java-icedtea/bin $fs/usr/lib/jvm/java-icedtea
-		cp -a $install/usr/lib/jvm/java-icedtea/lib $fs/usr/lib/jvm/java-icedtea
-		;;
-	icedtea6-jre)
-		CAT="development|A Free Software harness for OpenJDK JRE."
-		DEPENDS="glibc-base gcc-lib-base util-linux-uuid alsa-lib \
+		icedtea6-jdk)
+			mkdir -p $fs/usr/lib/jvm/java-icedtea
+			cp -a $install/usr/lib/jvm/java-icedtea/bin $fs/usr/lib/jvm/java-icedtea
+			cp -a $install/usr/lib/jvm/java-icedtea/lib $fs/usr/lib/jvm/java-icedtea
+			DEPENDS="icedtea6-jre xorg xorg-libXtst xorg-libXp cups"
+			;;
+		icedtea6-jre)
+			mkdir -p $fs/usr/lib/jvm/java-icedtea
+			cp -a $install/usr/lib/jvm/java-icedtea/jre $fs/usr/lib/jvm/java-icedtea
+			CAT="development|JRE"
+			DEPENDS="glibc-base gcc-lib-base util-linux-uuid alsa-lib \
 			freetype giflib libjpeg libpng16 zlib xorg-libICE \
 			xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
 			xorg-libXext xorg-libXi xorg-libXrender xorg-libXtst"
-		mkdir -p $fs/usr/lib/jvm/java-icedtea
-		cp -a $install/usr/lib/jvm/java-icedtea/jre $fs/usr/lib/jvm/java-icedtea
-		;;
-	java-jdk)
-		CAT="development|Symlinks for the default Java Development Kit (icedtea6)."
-		TAGS="java"
-		DEPENDS="icedtea6-jdk"
-		mkdir -p $fs/usr
-		cp -a $install/usr/jdk-bin $fs/usr/bin
-		;;
-	java-jre)
-		CAT="development|Symlinks for the default Java Runtime Environment (icedtea6)."
-		DEPENDS="icedtea6-jre"
-		mkdir -p $fs/usr
-		cp -a $install/usr/jre-bin $fs/usr/bin
-		;;
+			;;
+		java-jdk)
+			mkdir -p $fs/usr
+			cp -a $install/usr/jdk-bin $fs/usr/bin
+			CAT="development|symlinks for the default Java Development Kit (icedtea6)"
+			TAGS="java"
+			DEPENDS="icedtea6-jdk"
+			;;
+		java-jre)
+			mkdir -p $fs/usr
+			cp -a $install/usr/jre-bin $fs/usr/bin
+			CAT="development|symlinks for the default Java Runtime Environment (icedtea6)"
+			DEPENDS="icedtea6-jre"
+			;;
 	esac
 }
 
-# Post install/remove commands for Tazpkg.
-post_install_icedtea6_jre()
-{
+post_install_icedtea6_jre() {
 	ln -sf /usr/lib/jvm/java-icedtea/bin/java "$1/usr/bin/java"
 }
 
-post_remove_icedtea6_jre()
-{
+post_remove_icedtea6_jre() {
 	rm -f "$1/usr/bin/java"
 }
diff -r 71ba95d2422e -r f48456621a9d icu/receipt
--- a/icu/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/icu/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://site.icu-project.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/icu.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/icu.html"
 
 # We need to get sources from SVN in order to customize ICU and shrink its size.
 # http://userguide.icu-project.org/icudata#TOC-Customizing-ICU-s-Data-Library
diff -r 71ba95d2422e -r f48456621a9d imagemagick/receipt
--- a/imagemagick/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/imagemagick/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="https://www.imagemagick.org/script/index.php"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/imagemagick.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/imagemagick.html"
 
 TARBALL="ImageMagick-$VERSION.tar.xz"
 WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d imagemagick6/receipt
--- a/imagemagick6/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/imagemagick6/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="https://www.imagemagick.org/script/index.php"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/imagemagick6.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/imagemagick6.html"
 
 TARBALL="ImageMagick-$VERSION.tar.xz"
 #WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"	# not available here now
diff -r 71ba95d2422e -r f48456621a9d imagination/receipt
--- a/imagination/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/imagination/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="intltool ffmpeg gtk+-dev"
+BUILD_DEPENDS="intltool ffmpeg gtk2-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lgmodule-2.0"
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ ffmpeg"
+	DEPENDS="gtk2 ffmpeg"
 	TAGS="slideshow photo"
 }
diff -r 71ba95d2422e -r f48456621a9d inkscape/receipt
--- a/inkscape/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/inkscape/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,21 +7,21 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://inkscape.org/en/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/xsoft/inkscape.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/xsoft/inkscape.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/inkscape/inkscape/repository/INKSCAPE_${VERSION//./_}/archive.tar.bz2"
 
 BUILD_DEPENDS="cmake gtest pango-dev fontconfig-dev glib-dev gsl-dev \
 gnome-vfs-dev lcms2-dev gc-dev poppler-dev libwpg-dev libvisio-dev libcdr-dev \
-libwpd-dev popt-dev potrace-dev gtkmm-dev gtk+-dev gtkspell-dev boost-dev \
+libwpd-dev popt-dev potrace-dev gtkmm-dev gtk2-dev gtkspell-dev boost-dev \
 aspell-dev libxslt-dev imagemagick6-dev gettext dbus-dev"
 COOKOPTS="!svgz" # don't process svg or they will be broken
-SPLIT="inkscape-examples inkscape-tutorials inkscape"
+SPLIT="$PACKAGE-examples $PACKAGE-tutorials $PACKAGE"
 
 compile_rules() {
-	mkdir -p build
-	cd       build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -55,7 +55,7 @@
 		inkscape)
 			copy @std @rm
 			DEPENDS="aspell atk atkmm cairo cairomm fontconfig freetype gc \
-			gdk-pixbuf glib glibmm gnome-vfs gsl gtk+ gtkmm gtkspell \
+			gdk-pixbuf glib glibmm gnome-vfs gsl gtk2 gtkmm gtkspell \
 			imagemagick6 lcms2 libcdr libgiomm libgomp libjpeg-turbo libpng16 \
 			librevenge libsigc++ libvisio libwpg libxml2 libxslt pango pangomm \
 			perl poppler popt potrace python xorg-libX11 zlib"
diff -r 71ba95d2422e -r f48456621a9d iperf/receipt
--- a/iperf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/iperf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iperf"
 VERSION="2.0.5"
 CATEGORY="network"
-SHORT_DESC="Measure network performance."
+SHORT_DESC="Measure network performance"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://iperf.fr/"
+
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
-WEB_SITE="http://iperf.fr/"
 WGET_URL="${WEB_SITE}download/${PACKAGE}_$VERSION/$TARBALL"
 
-DEPENDS="gcc-lib-base"
-BUILD_DEPENDS=""
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure prefix=/usr &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="gcc-lib-base"
 }
-
diff -r 71ba95d2422e -r f48456621a9d iptables/receipt
--- a/iptables/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/iptables/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -8,7 +8,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.netfilter.org/projects/iptables/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/iptables.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/iptables.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.netfilter.org/projects/iptables/files/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d iptraf/receipt
--- a/iptraf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/iptraf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,44 +1,40 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iptraf"
 VERSION="3.0.0"
 CATEGORY="network"
-SHORT_DESC="IP Network Monitoring Software."
+SHORT_DESC="IP Network Monitoring Software"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://$PACKAGE.seul.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.seul.org/"
-WGET_URL="ftp://$PACKAGE.seul.org/pub/$PACKAGE/$TARBALL"
-CONFIG_FILES="/var/iptraf/iptraf.cfg"
+WGET_URL="ftp://iptraf.seul.org/pub/$PACKAGE/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
 	mkdir -p $DESTDIR/usr/bin 2> /dev/null
 	sed -i 's/ARPHRD_PPP:$/& case ARPHRD_NONE:/' packet.c
 	sed -i 's|/local/|/|' Makefile
+
 	make clean &&
 	make &&
 	cp rvnamed rawtime iptraf $DESTDIR/usr/bin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/iptraf $fs/var/log/iptraf
 	cp -a $install/* $fs
+	DEPENDS="ncurses"
+	CONFIG_FILES="/var/iptraf/iptraf.cfg"
 }
 
-post_install()
-{
+post_install() {
 	mkdir -p "$1/var/run/iptraf"
 }
 
-post_remove()
-{
+post_remove() {
 	rm -r "$1/var/run/iptraf"
 }
diff -r 71ba95d2422e -r f48456621a9d iso-codes/receipt
--- a/iso-codes/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/iso-codes/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://salsa.debian.org/debian/iso-codes"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/iso-codes.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/iso-codes.html"
 
 TARBALL="$PACKAGE-upstream-$VERSION.tar.bz2"
 WGET_URL="https://salsa.debian.org/debian/iso-codes/-/archive/upstream/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d isomaster/receipt
--- a/isomaster/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/isomaster/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://littlesvr.ca/isomaster/releases/$TARBALL"
 
-BUILD_DEPENDS="gettext gtk+-dev iniparser-dev"
+BUILD_DEPENDS="gettext gtk2-dev iniparser-dev"
 
 compile_rules() {
 	rm -r iniparser-4.1/
@@ -38,6 +38,6 @@
 
 genpkg_rules() {
 	copy @std hicolor/
-	DEPENDS="gdk-pixbuf glib gtk+ iniparser"
+	DEPENDS="gdk-pixbuf glib gtk2 iniparser"
 	TAGS="iso editor"
 }
diff -r 71ba95d2422e -r f48456621a9d jasper/receipt
--- a/jasper/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/jasper/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.ece.uvic.ca/~frodo/jasper/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/jasper.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/jasper.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.ece.uvic.ca/~frodo/jasper/software/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d jfsutils/receipt
--- a/jfsutils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/jfsutils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,24 +7,22 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://jfs.sourceforge.net/"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/jfsutils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}project/pub/$TARBALL"
 
 BUILD_DEPENDS="util-linux-uuid-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/jfsutils.html
-	sed "s@<unistd.h>@&\n#include <sys/types.h>@g" -i fscklog/extract.c &&
+compile_rules() {
+	sed "s@<unistd.h>@&\n#include <sys/types.h>@g" -i fscklog/extract.c
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="util-linux-uuid"
 	TAGS="filesystem"
diff -r 71ba95d2422e -r f48456621a9d jpilot/receipt
--- a/jpilot/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/jpilot/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gettext pilot-link-dev intltool"
+BUILD_DEPENDS="gtk2-dev gettext pilot-link-dev intltool"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -29,7 +29,7 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="gtk+ gettext pilot-link"
+	DEPENDS="gtk2 gettext pilot-link"
 }
 
 post_install(){
diff -r 71ba95d2422e -r f48456621a9d js/receipt
--- a/js/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/js/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MPL2"
 WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/js38.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/js38.html"
 
 TARBALL="mozjs-$VERSION.rc0.tar.bz2"
 #WGET_URL="https://people.mozilla.org/~sstangl/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d js185/receipt
--- a/js185/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/js185/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MPL2"
 WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/js38.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/js38.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.mozilla.org/pub/js/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d json-glib/receipt
--- a/json-glib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/json-glib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Projects/JsonGlib"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/json-glib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/json-glib.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d jwm/receipt
--- a/jwm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/jwm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -6,7 +6,7 @@
 SHORT_DESC="JWM is a light Window Manager for the X window system"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.joewing.net/programs/jwm/"
+WEB_SITE="http://joewing.net/programs/jwm/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.joewing.net/programs/jwm/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d kazehakase/receipt
--- a/kazehakase/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/kazehakase/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 PATCH_URL="http://http.debian.net/debian/pool/main/k/kazehakase/kazehakase_0.5.8-4.diff.gz"
 
 BUILD_DEPENDS="libtool automake autoconf intltool \
-gtk+-dev dbus-glib-dev webkitgtk-dev gnutls-dev xorg-libSM-dev zlib-dev \
+gtk2-dev dbus-glib-dev webkitgtk-dev gnutls-dev xorg-libSM-dev zlib-dev \
 util-linux-uuid-dev libxslt-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d keybinder/receipt
--- a/keybinder/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/keybinder/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kupferlauncher/keybinder/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gobject-introspection-dev xorg-libXext-dev python-dev \
+BUILD_DEPENDS="gtk2-dev gobject-introspection-dev xorg-libXext-dev python-dev \
 python-pygtk-dev python-pygobject2-dev automake autoconf libtool"
 SPLIT="keybinder-python keybinder-dev"
 
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		keybinder)
 			copy libkeybinder.so*
-			DEPENDS="glib gtk+ xorg-libX11"
+			DEPENDS="glib gtk2 xorg-libX11"
 			;;
 		keybinder-python)
 			copy @std @rm
@@ -37,7 +37,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="keybinder keybinder-python \
-			gtk+-dev"
+			gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d keybinder3/receipt
--- a/keybinder3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/keybinder3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v$VERSION/keybinder-3.0-$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk+3-dev gobject-introspection-dev xorg-libXext-dev \
+BUILD_DEPENDS="gtk3-dev gobject-introspection-dev xorg-libXext-dev \
 xorg-libXrender-dev"
 SPLIT="keybinder3-dev"
 
@@ -27,11 +27,11 @@
 	case $PACKAGE in
 		keybinder3)
 			copy @std
-			DEPENDS="glib gtk+3 xorg-libX11"
+			DEPENDS="glib gtk3 xorg-libX11"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="keybinder3 gtk+3-dev"
+			DEPENDS="keybinder3 gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d kguiaddons/receipt
--- a/kguiaddons/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/kguiaddons/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/kguiaddons"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-kguiaddons.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-kguiaddons.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d kidletime/receipt
--- a/kidletime/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/kidletime/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/kidletime"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-kidletime.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-kidletime.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
@@ -16,7 +16,8 @@
 SPLIT="kidletime-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r 71ba95d2422e -r f48456621a9d kino/receipt
--- a/kino/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/kino/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="intltool libdv perl xorg-dev xorg-dev-proto gtk+-dev libglade-dev \
+BUILD_DEPENDS="intltool libdv perl xorg-dev xorg-dev-proto gtk2-dev libglade-dev \
 libdv-dev libraw1394-dev libavc1394-dev libsamplerate-dev xorg-libXv-dev \
 libiec61883-dev libxml2-dev bash libpng16-dev freetype-dev fontconfig-dev \
 libiec61883 ffmpeg-dev xorg-libXv libsamplerate util-linux-uuid-dev \
@@ -35,7 +35,7 @@
 	copy @std
 	# Remove Help files
 	rm -rf $fs/usr/share/kino/help
-	DEPENDS="gtk+ libglade libdv libraw1394 libavc1394 libsamplerate alsa-lib \
+	DEPENDS="gtk2 libglade libdv libraw1394 libavc1394 libsamplerate alsa-lib \
 	libiec61883 xorg-libXv linux-firewire xorg-libXdamage ffmpeg"
 	SUGGESTED="lame vorbis-tools mjpegtools dvdauthor"
 	TAGS="video editor"
diff -r 71ba95d2422e -r f48456621a9d kkedit/receipt
--- a/kkedit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/kkedit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://khapplications.darktech.org/zips/kkedit/KKEdit-$VERSION.tar.gz"
 
-DEPENDS="gtk+ gtksourceview libunique"
-BUILD_DEPENDS="automake autoconf gtk+-dev gtksourceview-dev libunique-dev \
+DEPENDS="gtk2 gtksourceview libunique"
+BUILD_DEPENDS="automake autoconf gtk2-dev gtksourceview-dev libunique-dev \
 ctags libxml2-dev libtool"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d klavaro/receipt
--- a/klavaro/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/klavaro/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 TAGS="typing"
 
-DEPENDS="gtk+ xorg-libXdamage gtkdatabox libcurl libsexy"
-BUILD_DEPENDS="$DEPENDS gtk+-dev xorg-xorgproto gtkdatabox-dev \
+DEPENDS="gtk2 xorg-libXdamage gtkdatabox libcurl libsexy"
+BUILD_DEPENDS="$DEPENDS gtk2-dev xorg-xorgproto gtkdatabox-dev \
 curl-dev libsexy-dev"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d kwayland/receipt
--- a/kwayland/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/kwayland/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/kwayland"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-kwayland.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-kwayland.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d kwindowsystem/receipt
--- a/kwindowsystem/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/kwindowsystem/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/kwindowsystem"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-kwindowsystem.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-kwindowsystem.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d l3afpad/receipt
--- a/l3afpad/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/l3afpad/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/stevenhoneyman/l3afpad/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="automake gtk+3-dev intltool"
+BUILD_DEPENDS="automake gtk3-dev intltool"
 
 compile_rules() {
 	./autogen.sh &&
@@ -23,6 +23,6 @@
 genpkg_rules() {
 	copy @std @ico
 	rm -r $fs/usr/share/pixmaps/
-	DEPENDS="cairo glib gtk+3 pango"
+	DEPENDS="cairo glib gtk3 pango"
 	TAGS="text-editor"
 }
diff -r 71ba95d2422e -r f48456621a9d labyrinth/receipt
--- a/labyrinth/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/labyrinth/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://github.com/labyrinth-team/labyrinth"
 
-BUILD_DEPENDS="bzip2 git python-dev python-pygtk-dev gtk+-dev python-pycairo-dev \
+BUILD_DEPENDS="bzip2 git python-dev python-pygtk-dev gtk2-dev python-pycairo-dev \
 python-pygobject2-dev gettext"
 
 compile_rules() {
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="python python-pygtk gtk+ python-pyxdg python-pycairo python-pygobject2 \
+	DEPENDS="python python-pygtk gtk2 python-pyxdg python-pycairo python-pygobject2 \
 	python-gconf"
 }
diff -r 71ba95d2422e -r f48456621a9d lame/receipt
--- a/lame/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lame/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://lame.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/lame.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lazarus/receipt
--- a/lazarus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lazarus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TAGS="lazarus ide pascal"
 
 DEPENDS="fpc fpc-src gdb make"
-BUILD_DEPENDS="gtk+-dev fpc fpc-src"
+BUILD_DEPENDS="gtk2-dev fpc fpc-src"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d lbreakout2/receipt
--- a/lbreakout2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lbreakout2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,34 +1,36 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="lbreakout2"
 VERSION="2.6.5"
 CATEGORY="games"
-SHORT_DESC="Breakout clone."
+SHORT_DESC="Breakout clone"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://lgames.sourceforge.net/index.php?project=LBreakout2"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://lgames.sourceforge.net/index.php?project=LBreakout2"
-WGET_URL="http://prdownloads.sourceforge.net/lgames/$TARBALL"
+WGET_URL="$SF_MIRROR/lgames/$TARBALL"
 
-DEPENDS="libpng16 libsdl libsdl-mixer zlib"
 BUILD_DEPENDS="libpng16-dev libsdl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/usr/doc|/usr/share/doc|' configure*
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--disable-sdltest --mandir=/usr/share/man $CONFIGURE_ARGS &&
+
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--disable-sdltest \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	rm -rf $fs/usr/share/doc
 	cp -a stuff/* $fs
+	DEPENDS="libpng16 libsdl libsdl-mixer zlib"
 }
diff -r 71ba95d2422e -r f48456621a9d lcms/receipt
--- a/lcms/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lcms/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.littlecms.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/lcms.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lcms.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lcms2/receipt
--- a/lcms2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lcms2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="http://www.littlecms.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/lcms2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lcms2.html"
 HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d ldns/receipt
--- a/ldns/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ldns/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://www.nlnetlabs.nl/projects/ldns/about/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/ldns.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/ldns.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.nlnetlabs.nl/downloads/ldns/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d leafpad/receipt
--- a/leafpad/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/leafpad/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev xorg-libXrender-dev xorg-xorgproto intltool"
+BUILD_DEPENDS="gtk2-dev xorg-libXrender-dev xorg-xorgproto intltool"
 
 COOKOPTS="!pixmaps"
 
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy leafpad
-	DEPENDS="gtk+ xorg-libXdamage"
+	DEPENDS="gtk2 xorg-libXdamage"
 	TAGS="text-editor"
 }
diff -r 71ba95d2422e -r f48456621a9d leocad/receipt
--- a/leocad/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/leocad/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,11 +11,11 @@
 WGET_URL="http://leocad.googlecode.com/files/$TARBALL" # FIXME
 
 DEPENDS="glibc-base gcc-lib-base glib expat zlib leocad-pieces \
-gtk+ atk cairo xorg-pixman pango jpeg libpng16 fontconfig freetype xorg-libxcb xorg-xcb-util \
+gtk2 atk cairo xorg-pixman pango jpeg libpng16 fontconfig freetype xorg-libxcb xorg-xcb-util \
 xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
 xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXft xorg-libXinerama \
 xorg-libXrender mesa glu"
-BUILD_DEPENDS="mesa-dev gtk+-dev glib-dev"
+BUILD_DEPENDS="mesa-dev gtk2-dev glib-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d libappindicator-gtk2/receipt
--- a/libappindicator-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libappindicator-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,9 +12,9 @@
 TARBALL="libappindicator-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/libappindicator/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk-doc gtk+-dev libindicator-gtk2-dev \
+BUILD_DEPENDS="glib-dev gtk-doc gtk2-dev libindicator-gtk2-dev \
 libdbusmenu-gtk2-dev dbus-glib-dev gobject-introspection-dev vala python-dev \
-python-pygtk-dev python-pygobject2-dev gtk+3-dev libindicator-gtk3-dev libdbusmenu-gtk3-dev"
+python-pygtk-dev python-pygobject2-dev gtk3-dev libindicator-gtk3-dev libdbusmenu-gtk3-dev"
 SPLIT="libappindicator-gtk2 libappindicator-gtk2-python \
 libappindicator-gtk2-dev libappindicator-gtk3:3 libappindicator-gtk3-dev:3"
 
@@ -39,7 +39,7 @@
 		libappindicator-gtk2)
 			copy libappindicator.so*
 			CAT="x-window|GTK+2"
-			DEPENDS="glib gtk+ libdbusmenu-gtk2 libindicator-gtk2"
+			DEPENDS="glib gtk2 libdbusmenu-gtk2 libindicator-gtk2"
 			;;
 		libappindicator-gtk2-python)
 			copy @std @rm
@@ -49,18 +49,18 @@
 		libappindicator-gtk2-dev)
 			copy @dev
 			DEPENDS="libappindicator-gtk2 libappindicator-gtk2-python \
-			gtk+-dev libdbusmenu-gtk2-dev"
+			gtk2-dev libdbusmenu-gtk2-dev"
 			;;
 
 		libappindicator-gtk3)
 			copy @std
 			CAT="x-window|GTK+3"
-			DEPENDS="glib gtk+3 libdbusmenu-gtk3 libindicator-gtk3"
+			DEPENDS="glib gtk3 libdbusmenu-gtk3 libindicator-gtk3"
 			;;
 		libappindicator-gtk3-dev)
 			copy @dev
 			DEPENDS="libappindicator-gtk3 \
-			gtk+3-dev libdbusmenu-gtk3-dev"
+			gtk3-dev libdbusmenu-gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libass/receipt
--- a/libass/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libass/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://github.com/libass/libass"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libass.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libass.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/libass/libass/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libassuan/receipt
--- a/libassuan/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libassuan/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnupg.org/related_software/libassuan/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libassuan.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libassuan.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libassuan/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libatasmart/receipt
--- a/libatasmart/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libatasmart/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://0pointer.de/blog/projects/being-smart.html"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libatasmart.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://0pointer.de/public/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libbonoboui/receipt
--- a/libbonoboui/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libbonoboui/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev pangox-compat-dev xorg-libICE-dev popt-dev \
+BUILD_DEPENDS="intltool gtk2-dev pangox-compat-dev xorg-libICE-dev popt-dev \
 libgnomecanvas-dev libbonobo-dev libgnome-dev gconf-dev libglade-dev \
 xorg-libSM-dev libgcrypt-dev"
 SPLIT="libbonoboui-dev"
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		libbonoboui)
 			copy @std
-			DEPENDS="atk gconf gdk-pixbuf glib gtk+ libart_lgpl libbonobo \
+			DEPENDS="atk gconf gdk-pixbuf glib gtk2 libart_lgpl libbonobo \
 			libglade libgnome libgnomecanvas libxml2 orbit2 popt xorg-libX11"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d libcanberra/receipt
--- a/libcanberra/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libcanberra/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="devl547@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="http://0pointer.de/lennart/projects/libcanberra/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libcanberra.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libcanberra.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="libtool gtk+-dev libvorbis-dev alsa-lib-dev eudev-dev \
-gstreamer1-dev gtk+3-dev"
+BUILD_DEPENDS="libtool gtk2-dev libvorbis-dev alsa-lib-dev eudev-dev \
+gstreamer1-dev gtk3-dev"
 SPLIT="libcanberra-gnome libcanberra-gstreamer1 libcanberra-gtk2 \
 libcanberra-gtk3 libcanberra libcanberra-dev"
 
@@ -42,12 +42,12 @@
 		*-gtk2)
 			copy gtk-2.0/modules/*.so libcanberra-gtk.so*
 			CAT="sound|GTK+2 integration"
-			DEPENDS="glib gtk+ libcanberra xorg-libX11"
+			DEPENDS="glib gtk2 libcanberra xorg-libX11"
 			;;
 		*-gtk3)
 			copy gtk-3.0/modules/*.so libcanberra-gtk3.so* canberra-gtk-play
 			CAT="sound|GTK+3 integration"
-			DEPENDS="glib gtk+3 libcanberra xorg-libX11"
+			DEPENDS="glib gtk3 libcanberra xorg-libX11"
 			;;
 		libcanberra)
 			copy @std @rm
@@ -56,7 +56,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="${SPLIT/$PACKAGE/} \
-			gtk+-dev gtk+3-dev xorg-libX11-dev"
+			gtk2-dev gtk3-dev xorg-libX11-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libcddb/receipt
--- a/libcddb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libcddb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://libcddb.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libcddb.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libcddb.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libcdio/receipt
--- a/libcdio/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libcdio/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="rj.rohit@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/libcdio/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libcdio.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libcdio.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://ftp.gnu.org/gnu/libcdio/$TARBALL"
 
 BUILD_DEPENDS="perl libcddb-dev ncurses-dev"
-SPLIT="libcdio-utils libcdio-dev"
+SPLIT="$PACKAGE-utils $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -24,8 +24,15 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		libcdio) copy *.so*;;
-		*-utils) copy bin/; DEPENDS="libcdio libcddb ncurses";;
-		*-dev)   copy @dev;;
+		libcdio)
+			copy *.so*
+			;;
+		*-utils)
+			copy bin/
+			DEPENDS="libcdio libcddb ncurses"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libcroco/receipt
--- a/libcroco/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libcroco/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://developer.gnome.org/libcroco/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libcroco.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libcroco.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev glib-dev zlib-dev gtk-doc"
-SPLIT="libcroco-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r 71ba95d2422e -r f48456621a9d libdaemon/receipt
--- a/libdaemon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libdaemon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="http://0pointer.de/lennart/projects/libdaemon/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libdaemon.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libdaemon.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://0pointer.de/lennart/projects/libdaemon/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libdbusmenu-qt/receipt
--- a/libdbusmenu-qt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libdbusmenu-qt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://launchpad.net/libdbusmenu-qt"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/kde/libdbusmenu-qt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/kde/libdbusmenu-qt.html"
 
 TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 WGET_URL="http://launchpad.net/ubuntu/+archive/primary/+files/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libdbusmenu/receipt
--- a/libdbusmenu/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libdbusmenu/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/libdbusmenu/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk-doc gtk+3-dev gtk+-dev json-glib-dev vala \
+BUILD_DEPENDS="intltool gtk-doc gtk3-dev gtk2-dev json-glib-dev vala \
 gobject-introspection-dev"
 SPLIT="libdbusmenu-gtk2-apps libdbusmenu-gtk2 libdbusmenu-gtk2-dev \
 libdbusmenu-gtk3-apps:3 libdbusmenu-gtk3:3 libdbusmenu-gtk3-dev:3"
@@ -34,35 +34,35 @@
 	case $PACKAGE in
 		libdbusmenu-gtk2-apps)
 			copy libexec/
-			DEPENDS="glib gtk+ json-glib libdbusmenu-gtk2 xorg-libX11"
+			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk2 xorg-libX11"
 			CAT="development|GTK+2 applications"
 			;;
 		libdbusmenu-gtk2)
 			copy @std @rm
-			DEPENDS="atk gdk-pixbuf glib gtk+ json-glib pango"
+			DEPENDS="atk gdk-pixbuf glib gtk2 json-glib pango"
 			CAT="x-window|GTK+2"
 			;;
 		libdbusmenu-gtk2-dev)
 			copy @dev
 			DEPENDS="libdbusmenu-gtk2-apps libdbusmenu-gtk2 \
-			gdk-pixbuf-dev gtk+-dev json-glib-dev"
+			gdk-pixbuf-dev gtk2-dev json-glib-dev"
 			CAT="development|GTK+2 development files"
 			;;
 
 		libdbusmenu-gtk3-apps)
-			copy libexec/ # note "gtk+" in depends
-			DEPENDS="glib gtk+ json-glib libdbusmenu-gtk3 xorg-libX11"
+			copy libexec/ # note "gtk2" in depends
+			DEPENDS="glib gtk2 json-glib libdbusmenu-gtk3 xorg-libX11"
 			CAT="development|GTK+3 applications"
 			;;
 		libdbusmenu-gtk3)
 			copy @std @rm
-			DEPENDS="atk gdk-pixbuf glib gtk+3 json-glib pango"
+			DEPENDS="atk gdk-pixbuf glib gtk3 json-glib pango"
 			CAT="x-window|GTK+3"
 			;;
 		libdbusmenu-gtk3-dev)
 			copy @dev
 			DEPENDS="libdbusmenu-gtk3-apps libdbusmenu-gtk3 \
-			gdk-pixbuf-dev gtk+3-dev json-glib-dev"
+			gdk-pixbuf-dev gtk3-dev json-glib-dev"
 			CAT="development|GTK+3 development files"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d libdesktop-agnostic/receipt
--- a/libdesktop-agnostic/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libdesktop-agnostic/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="libdesktop-agnostic-${COMMIT:-$VERSION}.tar.gz"
 WGET_URL="https://github.com/p12tic/libdesktop-agnostic/archive/${COMMIT:-v$VERSION}.tar.gz"
 
-BUILD_DEPENDS="python-dev vala gettext intltool gtk+-dev gconf-dev \
+BUILD_DEPENDS="python-dev vala gettext intltool gtk2-dev gconf-dev \
 gobject-introspection-dev python-pygobject2-dev python-pygtk-dev"
 SPLIT="libdesktop-agnostic-dev"
 
@@ -34,12 +34,12 @@
 	case $PACKAGE in
 		libdesktop-agnostic)
 			copy @std
-			DEPENDS="gconf atk cairo fontconfig freetype gdk-pixbuf glib gtk+ \
+			DEPENDS="gconf atk cairo fontconfig freetype gdk-pixbuf glib gtk2 \
 			pango python"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libdesktop-agnostic glib-dev gtk+-dev"
+			DEPENDS="libdesktop-agnostic glib-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libdv/receipt
--- a/libdv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libdv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libdv.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libdv.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libdv.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libesmtp/receipt
--- a/libesmtp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libesmtp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="http://brianstafford.info/libesmtp/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libesmtp.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libesmtp.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://brianstafford.info/libesmtp/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libevdev/receipt
--- a/libevdev/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libevdev/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/libevdev/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7driver.html#libevdev"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7driver.html#libevdev"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.freedesktop.org/software/libevdev/$TARBALL"
 
 BUILD_DEPENDS="check-dev python" # doxygen
-SPLIT="libevdev-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r 71ba95d2422e -r f48456621a9d libevent/receipt
--- a/libevent/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libevent/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="0dddba11@googlemail.com"
 LICENSE="BSD"
 WEB_SITE="http://libevent.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/libevent.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libevent.html"
 
 TARBALL="$PACKAGE-$VERSION-stable.tar.gz"
 WGET_URL="https://github.com/libevent/libevent/releases/download/release-$VERSION-stable/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libexif/receipt
--- a/libexif/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libexif/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libexif.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libexif.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libexif.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libffi/receipt
--- a/libffi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libffi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="MIT"
 WEB_SITE="https://sourceware.org/libffi/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libffi.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libffi.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://sourceware.org/ftp/libffi/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libfm-extra/receipt
--- a/libfm-extra/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libfm-extra/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/Libfm"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/libfm-extra.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/libfm-extra.html"
 REPOLOGY="libfm"
 
 TARBALL="libfm-$VERSION.tar.xz"
diff -r 71ba95d2422e -r f48456621a9d libfm-qt/receipt
--- a/libfm-qt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libfm-qt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/libfm-qt"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/libfm-qt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/libfm-qt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/libfm-qt/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libfm/receipt
--- a/libfm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libfm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,17 +7,14 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/Libfm"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/libfm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/libfm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 #WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL" # SF download problems
 WGET_URL="https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=snapshot;h=$VERSION;sf=txz"
 
-BUILD_DEPENDS_arm="gtk+-dev dbus-glib-dev dbus-dev startup-notification-dev \
-xorg-libxcb-dev xorg-xcb-util-dev menu-cache-dev expat-dev glib-dev \
-shared-mime-info-dev"
 BUILD_DEPENDS="automake gtk-doc libtool gettext glib-dev intltool vala \
-gtk+-dev pango-dev cairo-dev menu-cache-dev libexif-dev"
+gtk2-dev pango-dev cairo-dev menu-cache-dev libexif-dev"
 SIBLINGS="libfm-extra"
 SPLIT="libfm-gtk libfm-dev"
 
@@ -58,13 +55,13 @@
 		libfm-gtk)
 			copy bin/ applications/ images/ ui/ libfm-gtk.so* gtk*.so
 			CAT="system-tools|GTK+2 GUI library"
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ libfm menu-cache pango"
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libfm menu-cache pango"
 			PROVIDE="lxshortcut"
 			;;
 		libfm-dev)
 			copy @dev
 			DEPENDS="libfm libfm-gtk libfm-extra-dev \
-			glib-dev gtk+-dev"
+			glib-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libgcrypt/receipt
--- a/libgcrypt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgcrypt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.gnupg.org/related_software/libgcrypt/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libgcrypt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgcrypt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libglade/receipt
--- a/libglade/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libglade/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 SPLIT="libglade-dev"
 
 compile_rules() {
@@ -30,11 +30,11 @@
 	case $PACKAGE in
 		libglade)
 			copy @std
-			DEPENDS="atk gdk-pixbuf glib gtk+ libxml2 pango"
+			DEPENDS="atk gdk-pixbuf glib gtk2 libxml2 pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libglade gtk+-dev libxml2-dev"
+			DEPENDS="libglade gtk2-dev libxml2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libgnome-games-support/receipt
--- a/libgnome-games-support/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgnome-games-support/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala libgee-dev gtk+3-dev gettext"
+BUILD_DEPENDS="vala libgee-dev gtk3-dev gettext"
 SPLIT="libgnome-games-support-dev"
 
 compile_rules() {
@@ -25,11 +25,11 @@
 	case $PACKAGE in
 		libgnome-games-support)
 			copy @std
-			DEPENDS="glib gtk+3 libgee"
+			DEPENDS="glib gtk3 libgee"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libgnome-games-support glib-dev gtk+3-dev libgee-dev"
+			DEPENDS="libgnome-games-support glib-dev gtk3-dev libgee-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libgnomecanvas/receipt
--- a/libgnomecanvas/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgnomecanvas/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libglade-dev libart_lgpl-dev xorg-libXcursor-dev \
+BUILD_DEPENDS="gtk2-dev libglade-dev libart_lgpl-dev xorg-libXcursor-dev \
 intltool"
 SPLIT="libgnomecanvas-dev"
 
@@ -29,11 +29,11 @@
 	case $PACKAGE in
 		libgnomecanvas)
 			copy @std
-			DEPENDS="atk gdk-pixbuf glib gtk+ libart_lgpl libglade pango"
+			DEPENDS="atk gdk-pixbuf glib gtk2 libart_lgpl libglade pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libgnomecanvas gtk+-dev libart_lgpl-dev pango-dev"
+			DEPENDS="libgnomecanvas gtk2-dev libart_lgpl-dev pango-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libgnomeprintui/receipt
--- a/libgnomeprintui/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgnomeprintui/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		libgnomeprintui)
 			copy @std
-			DEPENDS="atk gdk-pixbuf glib gtk+ libart_lgpl libgnomecanvas \
+			DEPENDS="atk gdk-pixbuf glib gtk2 libart_lgpl libgnomecanvas \
 			libgnomeprint"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d libgnomeui/receipt
--- a/libgnomeui/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgnomeui/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -15,7 +15,7 @@
 libgnome-keyring-dev libbonoboui-dev util-linux-uuid-dev libgcrypt-dev \
 dbus-glib-dev esound-dev audiofile-dev libglade-dev intltool xorg-libICE-dev \
 xorg-libSM-dev"
-SPLIT="libgnomeui-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -30,14 +30,14 @@
 	case $PACKAGE in
 		libgnomeui)
 			copy @std
-			DEPENDS="gconf atk gdk-pixbuf glib gnome-vfs gtk+ libart_lgpl \
+			DEPENDS="gconf atk gdk-pixbuf glib gnome-vfs gtk2 libart_lgpl \
 			libbonoboui libglade libgnome libgnome-keyring libgnomecanvas \
 			pango xorg-libICE xorg-libSM"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="libgnomeui gconf-dev gdk-pixbuf-dev gnome-vfs-dev \
-			gtk+-dev libart_lgpl-dev libbonoboui-dev libgnome-dev \
+			gtk2-dev libart_lgpl-dev libbonoboui-dev libgnome-dev \
 			libgnome-keyring-dev libgnomecanvas-dev xorg-libICE-dev \
 			xorg-libSM-dev"
 			;;
diff -r 71ba95d2422e -r f48456621a9d libgsf/receipt
--- a/libgsf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgsf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/gsf/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libgsf.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgsf.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libgtkhtml/receipt
--- a/libgtkhtml/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgtkhtml/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="libxml2-dev gtk+-dev xorg-libXdamage-dev expat-dev"
+BUILD_DEPENDS="libxml2-dev gtk2-dev xorg-libXdamage-dev expat-dev"
 SPLIT="libgtkhtml-dev"
 
 compile_rules() {
@@ -26,7 +26,7 @@
 	case $PACKAGE in
 		libgtkhtml)
 			copy @std
-			DEPENDS="glibc-base glib expat libxml2 zlib gtk+ cairo atk \
+			DEPENDS="glibc-base glib expat libxml2 zlib gtk2 cairo atk \
 			fontconfig freetype pango xorg-pixman libpng16 xorg-libX11 \
 			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXcursor \
 			xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
diff -r 71ba95d2422e -r f48456621a9d libgtkimageview/receipt
--- a/libgtkimageview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgtkimageview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="gtkimageview-$VERSION.tar.gz"
 WGET_URL="http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/$TARBALL?format=raw" # FIXME
 
-BUILD_DEPENDS="gtk+-dev expat-dev"
+BUILD_DEPENDS="gtk2-dev expat-dev"
 SPLIT="libgtkimageview-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		libgtkimageview)
 			copy @std
-			DEPENDS="gtk+"
+			DEPENDS="gtk2"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d libgtop/receipt
--- a/libgtop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgtop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/libgtop/stable/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/libgtop.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/libgtop.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libgudev/receipt
--- a/libgudev/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgudev/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/libgudev"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libgudev.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgudev.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libgusb/receipt
--- a/libgusb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libgusb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/hughsie/libgusb"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libgusb.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgusb.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://people.freedesktop.org/~hughsient/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libical/receipt
--- a/libical/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libical/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="MPL LGPL2.1"
 WEB_SITE="https://github.com/libical"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libical.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libical.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/libical/libical/releases/download/v$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libid3tag/receipt
--- a/libid3tag/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libid3tag/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,10 +9,10 @@
 WEB_SITE="http://www.underbit.com/products/mad/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://downloads.sourceforge.net/mad/$TARBALL"
+WGET_URL="$SF_MIRROR/mad/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev gfortran"
-SPLIT="libid3tag-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 71ba95d2422e -r f48456621a9d libidn/receipt
--- a/libidn/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libidn/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3 LGPL2.1"
 WEB_SITE="https://www.gnu.org/software/libidn/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libidn.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libidn.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gettext"
-SPLIT="libidn-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r 71ba95d2422e -r f48456621a9d libindicator-gtk2/receipt
--- a/libindicator-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libindicator-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="libindicator-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/libindicator/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev glib-dev automake libtool"
+BUILD_DEPENDS="gtk2-dev glib-dev automake libtool"
 SPLIT="libindicator-gtk2-dev"
 SIBLINGS="libindicator-gtk3"
 
@@ -37,11 +37,11 @@
 		libindicator-gtk2)
 			copy @std
 			rm -r $fs/usr/share
-			DEPENDS="gdk-pixbuf glib gtk+"
+			DEPENDS="gdk-pixbuf glib gtk2"
 			;;
 		*-dev)
 			copy @dev 80indicator-debugging
-			DEPENDS="libindicator-gtk2 gtk+-dev"
+			DEPENDS="libindicator-gtk2 gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libindicator-gtk3/receipt
--- a/libindicator-gtk3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libindicator-gtk3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="libindicator-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/libindicator/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="gtk+3-dev glib-dev automake libtool"
+BUILD_DEPENDS="gtk3-dev glib-dev automake libtool"
 SPLIT="libindicator-gtk3-dev"
 SIBLINGS="libindicator-gtk2"
 
@@ -37,11 +37,11 @@
 		libindicator-gtk3)
 			copy @std
 			rm -r $fs/usr/share
-			DEPENDS="gdk-pixbuf glib gtk+3"
+			DEPENDS="gdk-pixbuf glib gtk3"
 			;;
 		*-dev)
 			copy @dev 80indicator-debugging
-			DEPENDS="libindicator-gtk3 gtk+3-dev"
+			DEPENDS="libindicator-gtk3 gtk3-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libiodbc/receipt
--- a/libiodbc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libiodbc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.iodbc.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libiodbc.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libiodbc.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/iodbc/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev chrpath"
+BUILD_DEPENDS="gtk2-dev chrpath"
 SPLIT="libiodbc-gui libiodbc libiodbc-dev"
 
 compile_rules() {
@@ -34,7 +34,7 @@
 	case $PACKAGE in
 		libiodbc-gui)
 			copy iodbcadm-gtk libdrvproxy.so* libiodbcadm.so*
-			DEPENDS="glib gtk+ libiodbc"
+			DEPENDS="glib gtk2 libiodbc"
 			;;
 		libiodbc)
 			copy @std @rm
diff -r 71ba95d2422e -r f48456621a9d libksba/receipt
--- a/libksba/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libksba/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnupg.org/related_software/libksba/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libksba.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libksba.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/libksba/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libkscreen/receipt
--- a/libkscreen/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libkscreen/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/KDE/libkscreen"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-libkscreen.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-libkscreen.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.kde.org/stable/plasma/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d liblinear/receipt
--- a/liblinear/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/liblinear/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://github.com/cjlin1/liblinear/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/liblinear.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/liblinear.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/cjlin1/liblinear/archive/v$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d liblxqt/receipt
--- a/liblxqt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/liblxqt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/liblxqt"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/liblxqt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/liblxqt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/liblxqt/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libmatekbd/receipt
--- a/libmatekbd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libmatekbd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/libmatekbd/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gobject-introspection-dev gtk+3-dev libxklavier-dev"
+BUILD_DEPENDS="mate-common gobject-introspection-dev gtk3-dev libxklavier-dev"
 SPLIT="libmatekbd-dev"
 
 compile_rules() {
@@ -25,11 +25,11 @@
 	case $PACKAGE in
 		libmatekbd)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk+3 libxklavier pango xorg-libX11"
+			DEPENDS="cairo gdk-pixbuf glib gtk3 libxklavier pango xorg-libX11"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libmatekbd glib-dev gtk+3-dev libxklavier-dev"
+			DEPENDS="libmatekbd glib-dev gtk3-dev libxklavier-dev"
 			;;
 	esac
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d libmateweather/receipt
--- a/libmateweather/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libmateweather/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/libmateweather/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk-doc gtk+3-dev libsoup-dev tzdata"
+BUILD_DEPENDS="mate-common gtk-doc gtk3-dev libsoup-dev tzdata"
 SPLIT="libmateweather-misc-icons libmateweather-misc-locales libmateweather-dev"
 
 compile_rules() {
@@ -37,7 +37,7 @@
 				cp $install/usr/share/libmateweather/Locations.$i.xml.gz \
 				        $fs/usr/share/libmateweather
 			done
-			DEPENDS="gdk-pixbuf glib gtk+3 libsoup libxml2"
+			DEPENDS="gdk-pixbuf glib gtk3 libsoup libxml2"
 			;;
 		libmateweather-misc-icons)
 			copy icons/mate/ @rm
@@ -51,7 +51,7 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="${SPLIT/$PACKAGE/} gdk-pixbuf-dev glib-dev gtk+3-dev \
+			DEPENDS="${SPLIT/$PACKAGE/} gdk-pixbuf-dev glib-dev gtk3-dev \
 			libsoup-dev libxml2-dev"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d libmng/receipt
--- a/libmng/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libmng/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="allan316@gmail.com"
 LICENSE="zlib/libpng"
 WEB_SITE="http://libmng.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libmng.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libmng.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libmpeg2/receipt
--- a/libmpeg2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libmpeg2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://libmpeg2.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libmpeg2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libmpeg2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://libmpeg2.sourceforge.net/files/$TARBALL" # no $SF_MIRROR
diff -r 71ba95d2422e -r f48456621a9d libndp/receipt
--- a/libndp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libndp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libndp.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/libndp.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libndp.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://libndp.org/files/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libnl/receipt
--- a/libnl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libnl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.infradead.org/~tgr/libnl/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/libnl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libnl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/thom311/libnl/releases/download/libnl${VERSION//./_}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libnotify/receipt
--- a/libnotify/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libnotify/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="dbus-dev gtk+-dev dbus-glib dbus-glib-dev expat-dev"
-BUILD_DEPENDS="gdk-pixbuf-dev glib-dev gtk+-dev gobject-introspection-dev \
+BUILD_DEPENDS="gdk-pixbuf-dev glib-dev gtk2-dev gobject-introspection-dev \
 gtk-doc xmlto"
 SPLIT="libnotify-dev"
 
diff -r 71ba95d2422e -r f48456621a9d libnsl/receipt
--- a/libnsl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libnsl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/thkukuk/libnsl/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/libnsl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libnsl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/thkukuk/libnsl/archive/v$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libpaper/receipt
--- a/libpaper/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libpaper/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://packages.debian.org/unstable/source/libpaper"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libpaper.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libpaper.html"
 
 TARBALL="libpaper_$VERSION.tar.gz"
 WGET_URL="http://ftp.debian.org/debian/pool/main/libp/libpaper/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libpeas/receipt
--- a/libpeas/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libpeas/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,14 +7,14 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/Libpeas"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/libpeas.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/libpeas.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/libpeas/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gobject-introspection-dev gtk+3-dev python-dev \
+BUILD_DEPENDS="intltool gobject-introspection-dev gtk3-dev python-dev \
 python-pygobject-dev gtk-doc"
-SPLIT="libpeas-gtk libpeas-python libpeas-dev libpeas-demo"
+SPLIT="$PACKAGE-gtk $PACKAGE-python $PACKAGE-dev $PACKAGE-demo"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -31,7 +31,7 @@
 			;;
 		*-gtk)
 			copy libpeas-gtk-1.0.so*
-			DEPENDS="glib gobject-introspection gtk+3 libpeas"
+			DEPENDS="glib gobject-introspection gtk3 libpeas"
 			;;
 		*-python)
 			copy libpythonloader.so
@@ -40,12 +40,12 @@
 		*-dev)
 			copy @dev
 			DEPENDS="${SPLIT/$PACKAGE/} glib-dev gobject-introspection-dev \
-			gtk+3-dev"
+			gtk3-dev"
 			;;
 		*-demo)
 			copy peas-demo peas-demo/ hicolor/ @rm
 			find $fs -name '*.la' -delete
-			DEPENDS="glib gobject-introspection gtk+3 libpeas libpeas-gtk"
+			DEPENDS="glib gobject-introspection gtk3 libpeas libpeas-gtk"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libproxy/receipt
--- a/libproxy/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libproxy/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/libproxy/libproxy/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="cmake webkitgtk-dev python-dev perl gtk+-dev"
+BUILD_DEPENDS="cmake webkitgtk-dev python-dev perl gtk2-dev"
 SPLIT="libproxy-dev"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		libproxy)
 			copy @std
-			DEPENDS="glib gtk+ xorg-libXmu webkitgtk libtasn1"
+			DEPENDS="glib gtk2 xorg-libXmu webkitgtk libtasn1"
 			SUGGESTED="python icu libcurl libxslt"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d libqmi/receipt
--- a/libqmi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libqmi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/libqmi/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libqmi.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libqmi.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.freedesktop.org/software/libqmi/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libqtxdg/receipt
--- a/libqtxdg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libqtxdg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/libqtxdg"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/libqtxdg.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/libqtxdg.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/libqtxdg/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libquicktime/receipt
--- a/libquicktime/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libquicktime/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev ffmpeg-dev alsa-lib-dev xorg-libXv-dev xorg-libXaw-dev \
+BUILD_DEPENDS="gtk2-dev ffmpeg-dev alsa-lib-dev xorg-libXv-dev xorg-libXaw-dev \
 x264-dev zlib-dev mesa-dev"
 SPLIT="libquicktime-dev"
 
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		libquicktime)
 			copy @std
-			DEPENDS="gtk+ ffmpeg alsa-lib xorg-libXv mesa xorg-libXaw x264"
+			DEPENDS="gtk2 ffmpeg alsa-lib xorg-libXv mesa xorg-libXaw x264"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d libraw/receipt
--- a/libraw/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libraw/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.libraw.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libraw.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libraw.html"
 
 TARBALL="LibRaw-$VERSION.tar.gz"
 WGET_URL="http://www.libraw.org/data/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d librep/receipt
--- a/librep/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/librep/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://librep.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/librep.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/librep.html"
 
 TARBALL="librep_$VERSION.tar.xz"
 WGET_URL="http://download.tuxfamily.org/librep/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d librsvg/receipt
--- a/librsvg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/librsvg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/LibRsvg"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/librsvg.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/librsvg.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev gdk-pixbuf-dev libxml2-dev pango-dev libcroco-dev \
-gtk-doc gobject-introspection-dev vala gtk+3-dev rust"
+gtk-doc gobject-introspection-dev vala gtk3-dev rust"
 SPLIT="rsvg-convert rsvg-view librsvg-dev"
 
 compile_rules() {
@@ -41,7 +41,7 @@
 		rsvg-view)
 			copy rsvg-view*
 			CAT="graphics|viewer"
-			DEPENDS="cairo glib gtk+3 librsvg"
+			DEPENDS="cairo glib gtk3 librsvg"
 			;;
 		librsvg-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d libsamplerate/receipt
--- a/libsamplerate/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsamplerate/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mega-nerd.com/SRC/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libsamplerate.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libsamplerate.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.mega-nerd.com/SRC/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libsde-utils-gtk/receipt
--- a/libsde-utils-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsde-utils-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/libsde-utils-gtk/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool glib-dev gtk+-dev gdk-pixbuf-dev \
+BUILD_DEPENDS="automake libtool glib-dev gtk2-dev gdk-pixbuf-dev \
 libsde-utils-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		libsde-utils-gtk)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk+ libsde-utils pango"
+			DEPENDS="gdk-pixbuf glib gtk2 libsde-utils pango"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d libsde-utils-jansson/receipt
--- a/libsde-utils-jansson/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsde-utils-jansson/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/libsde-utils-jansson/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool glib-dev gtk+-dev jansson-dev libsde-utils-dev \
+BUILD_DEPENDS="automake libtool glib-dev gtk2-dev jansson-dev libsde-utils-dev \
 libsde-utils-gtk-dev"
 SPLIT="$PACKAGE-dev"
 
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		libsde-utils-jansson)
 			copy @std
-			DEPENDS="glib gtk+ jansson libsde-utils-gtk"
+			DEPENDS="glib gtk2 jansson libsde-utils-gtk"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d libsdl/receipt
--- a/libsdl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsdl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/sdl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/sdl.html"
 REPOLOGY="sdl"
 
 TARBALL="SDL-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d libsdl2/receipt
--- a/libsdl2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsdl2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="tcg.thegamer@gmail.com"
 LICENSE="zlib/libpng"
 WEB_SITE="http://libsdl.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/sdl2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/sdl2.html"
 REPOLOGY="sdl2"
 
 TARBALL="SDL2-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d libseccomp/receipt
--- a/libseccomp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libseccomp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/seccomp/libseccomp/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libseccomp.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libseccomp.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/seccomp/libseccomp/releases/download/v$VERSION/$TARBALL"
 
-SPLIT="libseccomp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r 71ba95d2422e -r f48456621a9d libsexy/receipt
--- a/libsexy/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsexy/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://releases.chipx86.com/libsexy/libsexy/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev xorg-xorgproto libxml2-dev"
+BUILD_DEPENDS="gtk2-dev xorg-xorgproto libxml2-dev"
 SPLIT="libsexy-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		libsexy)
 			copy @std
-			DEPENDS="gtk+ xorg-libXdamage"
+			DEPENDS="gtk2 xorg-libXdamage"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d libsexymm/receipt
--- a/libsexymm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsexymm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://releases.chipx86.com/libsexy/libsexymm/$TARBALL"
 
 BUILD_DEPENDS="glibmm-dev libgiomm-dev cairomm-dev gtkmm-dev libsexy-dev \
-libsigc++-dev libxml2-dev gtk+-dev"
+libsigc++-dev libxml2-dev gtk2-dev"
 SPLIT="libsexymm-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d libsigc++/receipt
--- a/libsigc++/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsigc++/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/libsigc++/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libsigc.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libsigc.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="m4 perl"
-SPLIT="libsigc++-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -e "/^libdocdir =/ s/\$(book_name)/libsigc++-$VERSION/" -i \
diff -r 71ba95d2422e -r f48456621a9d libsigsegv/receipt
--- a/libsigsegv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsigsegv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/libsigsegv/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libsigsegv.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libsigsegv.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libsmfm-gtk/receipt
--- a/libsmfm-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsmfm-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/sde-gui/libsmfm-gtk/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="automake gtk-doc libtool gettext shared-mime-info \
-libsmfm-core-dev intltool pango-dev gtk+-dev menu-cache-dev"
+libsmfm-core-dev intltool pango-dev gtk2-dev menu-cache-dev"
 SPLIT="$PACKAGE-dev"
 
 # WARNING: custom actions support isn't ready yet (as for git20170110 version)
@@ -35,12 +35,12 @@
 	case $PACKAGE in
 		libsmfm-gtk)
 			copy @std
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ libsmfm-core menu-cache \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libsmfm-core menu-cache \
 			pango"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libsmfm-gtk glib-dev gtk+-dev libsmfm-core-dev"
+			DEPENDS="libsmfm-gtk glib-dev gtk2-dev libsmfm-core-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libsmpeg/receipt
--- a/libsmpeg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libsmpeg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,12 +13,13 @@
 BRANCH="$VERSION"
 WGET_URL="subversion|svn://svn.icculus.org/smpeg/trunk"
 
-BUILD_DEPENDS="libsdl libsdl-dev gtk+-dev autoconf automake m4 subversion tar"
-SPLIT="libsmpeg-dev"
+BUILD_DEPENDS="libsdl libsdl-dev gtk2-dev autoconf automake m4 subversion tar"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/ 0-1/(unsigned int)&/g' audio/hufftable.cpp
 	chmod +x install-sh
+
 	./autogen.sh
 	./configure \
 		--disable-gtk-player \
diff -r 71ba95d2422e -r f48456621a9d libstatgrab/receipt
--- a/libstatgrab/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libstatgrab/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.i-scream.org/libstatgrab/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libstatgrab.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libstatgrab.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libtasn1/receipt
--- a/libtasn1/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libtasn1/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3 LGPL2.1"
 WEB_SITE="https://www.gnu.org/software/libtasn1/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libtasn1.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libtasn1.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libunique/receipt
--- a/libunique/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libunique/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,16 +7,15 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Attic/LibUnique"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libunique.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libunique.html"
 REPOLOGY="unique"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="cairo-dev gtk+-dev glib-dev expat-dev"
-BUILD_DEPENDS="patch automake glib-dev gettext libtool gtk+-dev \
+BUILD_DEPENDS="patch automake glib-dev gettext libtool gtk2-dev \
 xorg-libICE-dev gobject-introspection-dev gtk-doc"
-SPLIT="libunique-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi &&
@@ -34,11 +33,11 @@
 	case $PACKAGE in
 		libunique)
 			copy @std
-			DEPENDS="glib gtk+ xorg-libX11"
+			DEPENDS="glib gtk2 xorg-libX11"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libunique gtk+-dev"
+			DEPENDS="libunique gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libusb-compat/receipt
--- a/libusb-compat/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libusb-compat/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://libusb.info/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libusb-compat.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libusb-compat.html"
 
 #TARBALL="$PACKAGE-$VERSION.tar.bz2"
 #WGET_URL="$SF_MIRROR/libusb/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libvpx/receipt
--- a/libvpx/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libvpx/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://www.webmproject.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libvpx.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libvpx.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/webmproject/libvpx/archive/v$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libwebp/receipt
--- a/libwebp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libwebp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="devl547@gmail.com"
 LICENSE="Apache2"
 WEB_SITE="https://developers.google.com/speed/webp/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libwebp.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libwebp.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libwmf/receipt
--- a/libwmf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libwmf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/wvware/$TARBALL"
 
 BUILD_DEPENDS="gfortran xorg-libXt-dev expat-dev libxml2-dev freetype-dev \
-libjpeg-turbo-dev libgd-dev gdk-pixbuf-dev gtk+-dev"
+libjpeg-turbo-dev libgd-dev gdk-pixbuf-dev gtk2-dev"
 SPLIT="libwmf-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d libwnck2/receipt
--- a/libwnck2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libwnck2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="libwnck-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/libwnck/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev gtk+-dev \
+BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev gtk2-dev \
 gobject-introspection-dev xorg-xcb-util-dev"
 SPLIT="libwnck2-dev"
 
@@ -27,13 +27,13 @@
 		libwnck2)
 			copy @std
 			PROVIDE="libwnck"
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ pango startup-notification \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango startup-notification \
 			xorg-libX11"
 			;;
 		*-dev)
 			copy @dev
 			PROVIDE="libwnck-dev"
-			DEPENDS="libwnck2 cairo-dev glib-dev gtk+-dev pango-dev \
+			DEPENDS="libwnck2 cairo-dev glib-dev gtk2-dev pango-dev \
 			startup-notification-dev xorg-libX11-dev"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d libwnck3/receipt
--- a/libwnck3/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libwnck3/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="https://developer.gnome.org/libwnck/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/libwnck.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/libwnck.html"
 
 TARBALL="libwnck-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/libwnck/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext startup-notification-dev xorg-libX11-dev gtk+3-dev \
+BUILD_DEPENDS="gettext startup-notification-dev xorg-libX11-dev gtk3-dev \
 xorg-libXres-dev gtk-doc xorg-xcb-util-dev"
 SPLIT="libwnck3-dev"
 
@@ -27,12 +27,12 @@
 	case $PACKAGE in
 		libwnck3)
 			copy @std
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 pango \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango \
 			startup-notification xorg-libX11 xorg-libXrender xorg-libXres"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="libwnck3 cairo-dev glib-dev gtk+3-dev pango-dev \
+			DEPENDS="libwnck3 cairo-dev glib-dev gtk3-dev pango-dev \
 			startup-notification-dev xorg-libX11-dev xorg-libXres-dev"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d libxfce4ui/receipt
--- a/libxfce4ui/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libxfce4ui/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
-gtk+-dev libxfce4util-dev startup-notification-dev xfconf-dev glade3-dev \
+gtk2-dev libxfce4util-dev startup-notification-dev xfconf-dev glade3-dev \
 xorg-xcb-util-dev"
 SPLIT="libxfce4ui-dev libxfce4ui-glade3 libxfce4ui"
 
@@ -31,17 +31,17 @@
 		*-dev)
 			copy @dev
 			DEPENDS="libxfce4ui libxfce4ui-glade3 \
-			gtk+-dev libxfce4util-dev xfconf-dev"
+			gtk2-dev libxfce4util-dev xfconf-dev"
 			;;
 		*-glade3)
 			copy glade3/ @rm
 			find $fs -name '*.la' -delete
-			DEPENDS="glade3 glib gtk+ libxfce4ui"
+			DEPENDS="glade3 glib gtk2 libxfce4ui"
 			CAT="x-window|Glade3 module"
 			;;
 		libxfce4ui)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ libxfce4util pango \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 libxfce4util pango \
 			startup-notification xfconf xorg-libICE xorg-libSM xorg-libX11"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d libxfcegui4/receipt
--- a/libxfcegui4/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libxfcegui4/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libxfce4util-dev xfconf-dev startup-notification-dev \
+BUILD_DEPENDS="gtk2-dev libxfce4util-dev xfconf-dev startup-notification-dev \
 libglade-dev xorg-xcb-util-dev intltool util-linux-uuid-dev"
 SPLIT="libxfcegui4-dev"
 
@@ -32,12 +32,12 @@
 	case $PACKAGE in
 		libxfcegui4)
 			copy @std
-			DEPENDS="gtk+ libxfce4util xfconf startup-notification dbus-glib \
+			DEPENDS="gtk2 libxfce4util xfconf startup-notification dbus-glib \
 			libglade"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtk+ libxfcegui4 libxfce4util-dev"
+			DEPENDS="gtk2 libxfcegui4 libxfce4util-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d libxkbcommon/receipt
--- a/libxkbcommon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libxkbcommon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="custom"
 WEB_SITE="https://xkbcommon.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libxkbcommon.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libxkbcommon.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://xkbcommon.org/download/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libxklavier/receipt
--- a/libxklavier/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libxklavier/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://freedesktop.org/wiki/Software/LibXklavier/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libxklavier.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libxklavier.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://people.freedesktop.org/~svu/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d libxslt/receipt
--- a/libxslt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/libxslt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.xmlsoft.org/XSLT/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libxslt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://xmlsoft.org/sources/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d liferea/receipt
--- a/liferea/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/liferea/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev glib-dev pango-dev gconf-dev orbit2-dev \
+BUILD_DEPENDS="gtk2-dev glib-dev pango-dev gconf-dev orbit2-dev \
 libunique-dev libxml2-dev libxslt-dev sqlite3-dev libsoup-dev webkitgtk-dev \
 libnotify-dev gnutls-dev json-glib-dev intltool"
 
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="gtk+ glib pango gconf libunique libxml2 libxslt sqlite3 libsoup \
+	DEPENDS="gtk2 glib pango gconf libunique libxml2 libxslt sqlite3 libsoup \
 	webkitgtk libnotify gnutls json-glib" #intltool?
 }
diff -r 71ba95d2422e -r f48456621a9d lightdm-gtk2-greeter/receipt
--- a/lightdm-gtk2-greeter/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lightdm-gtk2-greeter/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="lightdm-gtk-greeter-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/lightdm-gtk-greeter/1.6/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="gobject-introspection-dev gtk+-dev gtk+3-dev lightdm-dev \
+BUILD_DEPENDS="gobject-introspection-dev gtk2-dev gtk3-dev lightdm-dev \
 libxklavier-dev intltool"
 SPLIT="lightdm-gtk3-greeter:gtk3"
 
@@ -47,7 +47,7 @@
 				[ -d $langf ] && cp -a $langf $fs/usr/share/locale
 			done
 			CAT="x-window|GTK+2"
-			DEPENDS="gtk+ lightdm"
+			DEPENDS="gtk2 lightdm"
 			;;
 		lightdm-gtk3-greeter)
 			mkdir -p $fs/usr/share/locale
@@ -62,7 +62,7 @@
 				[ -d $langf ] && cp -a $langf $fs/usr/share/locale
 			done
 			CAT="x-window|GTK+3"
-			DEPENDS="gtk+3 lightdm"
+			DEPENDS="gtk3 lightdm"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d lingot/receipt
--- a/lingot/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lingot/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.savannah.gnu.org/releases/lingot/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev alsa-lib-dev jack-dev \
+BUILD_DEPENDS="gtk2-dev alsa-lib-dev jack-dev \
 libglade-dev intltool"
 
 compile_rules() {
@@ -27,5 +27,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ alsa-lib jack libglade"
+	DEPENDS="gtk2 alsa-lib jack libglade"
 }
diff -r 71ba95d2422e -r f48456621a9d links/receipt
--- a/links/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/links/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://links.twibright.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/links.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/links.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://links.twibright.com/download/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d linphone/receipt
--- a/linphone/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/linphone/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://download-mirror.savannah.gnu.org/releases/linphone/${VERSION%.*}.x/sources/$TARBALL"
 
 BUILD_DEPENDS="intltool libsdl-dev ffmpeg-dev osip-dev exosip-dev speex-dev \
-xorg-libXv-dev v4l-utils-dev libglade-dev gtk+-dev glib-dev speex-dev"
+xorg-libXv-dev v4l-utils-dev libglade-dev gtk2-dev glib-dev speex-dev"
 SPLIT="linphone-dev"
 
 COOKOPTS="skip-log-errors"
@@ -42,7 +42,7 @@
 	case $PACKAGE in
 		linphone)
 			copy @std
-			DEPENDS="osip exosip speex ffmpeg xorg-libXv v4l-utils libglade gtk+ \
+			DEPENDS="osip exosip speex ffmpeg xorg-libXv v4l-utils libglade gtk2 \
 			glib"
 			TAGS="softphone telephony"
 			;;
diff -r 71ba95d2422e -r f48456621a9d linuxdcpp/receipt
--- a/linuxdcpp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/linuxdcpp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="linuxdcpp"
 VERSION="1.0.3"
 CATEGORY="network"
-SHORT_DESC="Direct Connect client based on DC++."
+SHORT_DESC="Direct Connect client based on DC++"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-DEPENDS="gtk+ libglade openssl gcc-lib-base bzlib"
-BUILD_DEPENDS="gtk+-dev libglade-dev openssl-dev scons2 libglade bzlib bzip2-dev"
+WEB_SITE="https://launchpad.net/linuxdcpp"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://launchpad.net/linuxdcpp"
 WGET_URL="http://mirror.slitaz.org/sources/packages/l/$TARBALL"
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+
+BUILD_DEPENDS="gtk2-dev libglade-dev openssl-dev scons2 libglade bzlib bzip2-dev"
+
+compile_rules() {
 	mkdir -p $DESTDIR/usr
 	scons PREFIX=/usr &&
 	scons PREFIX=$DESTDIR/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/linuxdcpp $fs/usr/share
 	cd $fs/usr/share/pixmaps
 	ln -s ../linuxdcpp/pixmaps/linuxdcpp.png .
+	DEPENDS="gtk2 libglade openssl gcc-lib-base bzlib"
 }
diff -r 71ba95d2422e -r f48456621a9d listpatron/receipt
--- a/listpatron/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/listpatron/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,22 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="listpatron"
 VERSION="0.1.1"
 CATEGORY="office"
-SHORT_DESC="GTK+2 application for maintaining lists of information.."
+SHORT_DESC="GTK+2 application for maintaining lists of information"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.electricmonk.nl/Programmings/ListPatron"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.electricmonk.nl/Programmings/ListPatron"
 WGET_URL="http://projects.electricmonk.nl/projects/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/$PACKAGE \
@@ -25,15 +22,13 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr/share/applications
-    cp -a $stuff/listpatron.desktop $fs/usr/share/applications
-    cp -a $install/usr/bin $fs/usr
-    cp -a $install/usr/share/pixmaps $fs/usr/share
-    cp -a $install/usr/share/xml $fs/usr/share
-    cd $fs/usr/share/pixmaps
-    ln -s listpatron/icons/listpatron-col-add.png listpatron.png
+genpkg_rules() {
+	mkdir -p $fs/usr/share/applications
+	cp -a $stuff/listpatron.desktop $fs/usr/share/applications
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/share/pixmaps $fs/usr/share
+	cp -a $install/usr/share/xml $fs/usr/share
+	cd $fs/usr/share/pixmaps
+	ln -s listpatron/icons/listpatron-col-add.png listpatron.png
+	DEPENDS="gtk2 xorg-libXdamage"
 }
-
diff -r 71ba95d2422e -r f48456621a9d lives/receipt
--- a/lives/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lives/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="LiVES-$VERSION.tar.bz2"
 WGET_URL="http://lives-video.com/releases/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib alsa-lib-dev libpng16-dev gtk+-dev procps expat-dev \
+BUILD_DEPENDS="alsa-lib alsa-lib-dev libpng16-dev gtk2-dev procps expat-dev \
 perl gettext-tools"
 
 compile_rules() {
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib libpng16 gtk+ sox mjpegtools libavc1394 liboil libtheora"
+	DEPENDS="alsa-lib libpng16 gtk2 sox mjpegtools libavc1394 liboil libtheora"
 }
diff -r 71ba95d2422e -r f48456621a9d lm-sensors/receipt
--- a/lm-sensors/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lm-sensors/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/groeck/lm-sensors/issues/3"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/lm_sensors.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lm_sensors.html"
 
 TARBALL="lm_sensors-$VERSION.tar.bz2"
 WGET_URL="https://ftp.gwdg.de/pub/linux/misc/lm-sensors/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d log4c/receipt
--- a/log4c/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/log4c/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,9 +9,9 @@
 WEB_SITE="http://log4c.sourceforge.net"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://prdownloads.sourceforge.net/log4c/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="log4c-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 71ba95d2422e -r f48456621a9d logrotate/receipt
--- a/logrotate/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/logrotate/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/logrotate/logrotate"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/logrotate.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/logrotate.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/logrotate/logrotate/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d loqui/receipt
--- a/loqui/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/loqui/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://launchpadlibrarian.net/85404437/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lgthread-2.0"
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+"
+	DEPENDS="gtk2"
 }
diff -r 71ba95d2422e -r f48456621a9d lostirc/receipt
--- a/lostirc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lostirc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dfn.dl.sourceforge.net/sourceforge/lostirc/$TARBALL"
 
-BUILD_DEPENDS="glibmm-dev cairomm-dev gtkmm-dev libsigc++-dev gtk+-dev"
+BUILD_DEPENDS="glibmm-dev cairomm-dev gtkmm-dev libsigc++-dev gtk2-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 71ba95d2422e -r f48456621a9d lsb-release/receipt
--- a/lsb-release/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lsb-release/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,34 +7,26 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="OSI"
 WEB_SITE="https://sourceforge.net/projects/lsb/"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/lsb-release.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lsb/$TARBALL"
 
 BUILD_DEPENDS="help2man"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/lsb-release.html
+compile_rules() {
 	sed -i "s|n/a|unavailable|" lsb_release
 	./help2man -N \
 		--include ./lsb_release.examples \
 		--alt_version_key=program_version \
 		./lsb_release > lsb_release.1
 
-	mkdir -p $install/usr/share/man/man1/
-	install -v -m644 lsb_release.1 $install/usr/share/man/man1/
+	install -Dm755 lsb_release        $install/usr/bin/lsb_release
+	install -Dm644 $stuff/lsb-release $install/etc/lsb-release
 
-	mkdir -p $install/usr/bin/
-	install -v -m755 lsb_release   $install/usr/bin/
-
-	mkdir -p $install/etc/
-	cp $stuff/lsb-release $install/etc/
+	cook_pick_manpages lsb_release.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r 71ba95d2422e -r f48456621a9d lsof/receipt
--- a/lsof/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lsof/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://people.freebsd.org/~abe/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/lsof.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lsof.html"
 
 TARBALL="${PACKAGE}_$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lua/receipt
--- a/lua/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lua/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.lua.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/lua.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lua.html"
 REPOLOGY="lua53"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -16,15 +16,12 @@
 TARBALL_SHA1="79790cfd40e09ba796b01a571d4d63b52b1cd950"
 
 BUILD_DEPENDS="readline-dev"
-SPLIT="liblua lua-dev"
+SPLIT="liblua $PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/#define LUA_ROOT/ s:/usr/local/:/usr/:' src/luaconf.h
 
 	case "$ARCH" in
-		arm)
-			make CC=${HOST_SYSTEM}-gcc posix
-			;;
 		i486)
 			sed -i "s|-O2|-Os -march=$ARCH|" src/Makefile
 			make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux
diff -r 71ba95d2422e -r f48456621a9d lxappearance-obconf/receipt
--- a/lxappearance-obconf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxappearance-obconf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,11 +7,11 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://lxde.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxappearance-obconf.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxappearance-obconf.html"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool openbox-dev gtk+-dev lxappearance-dev \
+BUILD_DEPENDS="intltool openbox-dev gtk2-dev lxappearance-dev \
 xorg-libXrandr-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d lxappearance/receipt
--- a/lxappearance/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxappearance/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXAppearance"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxappearance.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxappearance.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev gtk+-dev dbus-dev dbus-glib-dev"
+BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev dbus-dev dbus-glib-dev"
 SPLIT="lxappearance-dev"
 
 compile_rules() {
@@ -32,11 +32,11 @@
 		lxappearance)
 			copy @std
 			DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
-			glib gtk+ pango xorg-libX11"
+			glib gtk2 pango xorg-libX11"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="lxappearance glib-dev gtk+-dev"
+			DEPENDS="lxappearance glib-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d lxde-common/receipt
--- a/lxde-common/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxde-common/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL3"
 WEB_SITE="http://www.lxde.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxde-common.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxde-common.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxde-icon-theme/receipt
--- a/lxde-icon-theme/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxde-icon-theme/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL3"
 WEB_SITE="http://www.lxde.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/lxde-icon-theme.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/lxde-icon-theme.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxde/receipt
--- a/lxde/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxde/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -20,7 +20,7 @@
 
 	TAGS="LXDE window-manager desktop"
 	SUGGESTED="lxterminal lxdm lxshortcut xarchiver"
-	DEPENDS="xorg-libX11 gtk+ lxpanel lxtask lxappearance lxsession pcmanfm \
+	DEPENDS="xorg-libX11 gtk2 lxpanel lxtask lxappearance lxsession pcmanfm \
 	lxrandr lxinput openbox obconf gpicview leafpad slitaz-configs \
 	slitaz-tools-boxes"
 }
diff -r 71ba95d2422e -r f48456621a9d lxdm/receipt
--- a/lxdm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxdm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev gtk+-dev   iso-codes" # + consolekit2-dev
+BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev   iso-codes" # + consolekit2-dev
 SPLIT="lxdm-dev"
 
 compile_rules() {
@@ -36,7 +36,7 @@
 	case $PACKAGE in
 		lxdm)
 			copy @std
-			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango \
+			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
 			xorg-libX11 xorg-libxcb"
 			SUGGESTED="iso-codes"
 			CONFIG_FILES="/etc/lxdm/LoginReady /etc/lxdm/PostLogin \
@@ -47,7 +47,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="lxdm atk-dev cairo-dev fontconfig-dev freetype-dev \
-			gdk-pixbuf-dev glib-dev gtk+-dev pango-dev"
+			gdk-pixbuf-dev glib-dev gtk2-dev pango-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d lximage-qt/receipt
--- a/lximage-qt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lximage-qt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/lxde/lximage-qt"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lximage-qt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lximage-qt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lximage-qt/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxinput/receipt
--- a/lxinput/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxinput/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="lxinput"
 VERSION="0.3.5"
@@ -7,17 +7,14 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://lxde.org/"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxinput.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev"
+BUILD_DEPENDS="intltool gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxinput.html
-
+compile_rules() {
 	sed -i 's|^Icon=.*$|Icon=preferences-desktop-keyboard|' \
 		data/lxinput.desktop.in
 
@@ -26,12 +23,10 @@
 	make && make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	# skip icons (found in the icon theme)
 	copy bin/ *.ui
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
 	xorg-libX11   xorg-xset"
 	TAGS="LXDE keyboard mouse"
 }
diff -r 71ba95d2422e -r f48456621a9d lxlauncher/receipt
--- a/lxlauncher/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxlauncher/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev gtk+-dev gnome-menus gnome-menus-dev \
+BUILD_DEPENDS="xorg-libX11-dev gtk2-dev gnome-menus gnome-menus-dev \
 menu-cache-dev startup-notification-dev startup-notification xorg-libxcb-dev \
 intltool"
 
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ menu-cache startup-notification \
+	DEPENDS="cairo gdk-pixbuf glib gtk2 menu-cache startup-notification \
 	xorg-libX11   gnome-menus"
 	TAGS="LXDE netbook"
 }
diff -r 71ba95d2422e -r f48456621a9d lxmenu-data/receipt
--- a/lxmenu-data/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxmenu-data/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,17 +7,17 @@
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="GPL2"
 WEB_SITE="https://lxde.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxmenu-data.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxmenu-data.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="gettext intltool"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 71ba95d2422e -r f48456621a9d lxpanel/receipt
--- a/lxpanel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxpanel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=snapshot;h=$COMMIT;sf=txz"
 
-BUILD_DEPENDS_arm="gtk+-dev menu-cache-dev alsa-lib-dev wireless_tools-dev \
+BUILD_DEPENDS_arm="gtk2-dev menu-cache-dev alsa-lib-dev wireless_tools-dev \
 libxml2-dev lxmenu-data"
-BUILD_DEPENDS="automake libtool intltool gtk+-dev menu-cache-dev alsa-lib-dev \
+BUILD_DEPENDS="automake libtool intltool gtk2-dev menu-cache-dev alsa-lib-dev \
 wireless_tools-dev libxml2-dev lxmenu-data libwnck2-dev libfm-dev \
 keybinder-dev"
 SPLIT="lxpanel-extra lxpanel lxpanel-dev"
@@ -47,11 +47,11 @@
 			stock_volume.png volume-*.png window-manager.png
 			CAT="x-window|extra files and plugins"
 			TAGS="LXDE"
-			DEPENDS="glib gtk+ lxpanel xorg-libX11"
+			DEPENDS="glib gtk2 lxpanel xorg-libX11"
 			;;
 		lxpanel)
 			copy @std @rm
-			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk+ libfm libfm-gtk \
+			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk2 libfm libfm-gtk \
 			keybinder libwnck2 libxml2 menu-cache pango wireless_tools \
 			xorg-libX11    slitaz-menus"
 			#CONFIG_FILES="/etc/xdg/lxpanel/default/"
@@ -61,7 +61,7 @@
 		lxpanel-dev)
 			copy @dev
 			DEPENDS="lxpanel lxpanel-extra \
-			gtk+-dev libfm-dev"
+			gtk2-dev libfm-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d lxpolkit/receipt
--- a/lxpolkit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxpolkit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev polkit-dev intltool"
+BUILD_DEPENDS="gtk2-dev polkit-dev intltool"
 
 compile_rules() {
 	./configure \
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ polkit"
+	DEPENDS="gtk2 polkit"
 	TAGS="LXDE"
 }
diff -r 71ba95d2422e -r f48456621a9d lxqt-about/receipt
--- a/lxqt-about/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-about/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-about"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-about.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-about.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-about/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-admin/receipt
--- a/lxqt-admin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-admin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-admin"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-admin.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-admin.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-admin/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-build-tools/receipt
--- a/lxqt-build-tools/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-build-tools/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-build-tools"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-build-tools.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-build-tools.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-build-tools/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-config/receipt
--- a/lxqt-config/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-config/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-config"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-config.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-config.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-config/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-globalkeys/receipt
--- a/lxqt-globalkeys/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-globalkeys/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-globalkeys"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-globalkeys.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-globalkeys.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-globalkeys/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-l10n/receipt
--- a/lxqt-l10n/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-l10n/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-l10n"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-l10n.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-l10n.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-l10n/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-notificationd/receipt
--- a/lxqt-notificationd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-notificationd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-notificationd"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-notificationd.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-notificationd.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-notificationd/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-panel/receipt
--- a/lxqt-panel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-panel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-panel"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-panel.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-panel.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d lxqt-policykit/receipt
--- a/lxqt-policykit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-policykit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-policykit"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-policykit.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-policykit.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-policykit/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-powermanagement/receipt
--- a/lxqt-powermanagement/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-powermanagement/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-powermanagement"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-powermanagement.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-powermanagement.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-powermanagement/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-qtplugin/receipt
--- a/lxqt-qtplugin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-qtplugin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-qtplugin"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-qtplugin.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-qtplugin.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-qtplugin/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-runner/receipt
--- a/lxqt-runner/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-runner/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-runner"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-runner.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-runner.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-runner/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxqt-session/receipt
--- a/lxqt-session/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxqt-session/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-session"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-session.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-session.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/lxqt-session/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d lxrandr/receipt
--- a/lxrandr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxrandr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,17 +7,14 @@
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXRandR"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxrandr.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev"
+BUILD_DEPENDS="intltool gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxrandr.html
-
+compile_rules() {
 	# change icon and remove keywords from desktop file
 	sed -i 's|^Icon=.*$|Icon=preferences-desktop-display|;
 		/^_Keywords=/d' data/lxrandr.desktop.in
@@ -27,10 +24,8 @@
 	make && make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango"
 	TAGS="LXDE"
 }
diff -r 71ba95d2422e -r f48456621a9d lxsession/receipt
--- a/lxsession/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxsession/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXSession"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxsession.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxsession.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
 BUILD_DEPENDS="intltool xorg-libX11-dev polkit-dev vala libxslt docbook-xsl \
-automake gtk+-dev"
+automake gtk2-dev"
 
 compile_rules() {
 	# https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/lxsession
@@ -54,7 +54,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango polkit \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango polkit \
 	xorg-libX11   dbus-glib lsb-release"
 	CONFIG_FILES="/etc/xdg/lxsession/LXDE/desktop.conf \
 	/etc/xdg/lxsession/LXDE/conffiles.conf"
diff -r 71ba95d2422e -r f48456621a9d lxtask/receipt
--- a/lxtask/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxtask/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,27 +7,24 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXTask"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxtask.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev intltool"
+BUILD_DEPENDS="gtk2-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxtask.html
-
+compile_rules() {
 	# remove keywords from desktop file
 	sed -i '/^_Keywords=/d' data/lxtask.desktop.in
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango"
 	TAGS="LXDE"
 }
diff -r 71ba95d2422e -r f48456621a9d lxterminal/receipt
--- a/lxterminal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lxterminal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,18 +7,20 @@
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXTerminal"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/lxterminal.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxterminal.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev vte-gtk2-dev"
+BUILD_DEPENDS="intltool gtk2-dev vte-gtk2-dev"
 SPLIT="lxterminal-locales"
 
 compile_rules() {
 	sed -i '/_Keywords=/d; /TryExec=/d' $src/data/lxterminal.desktop.in
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
@@ -26,7 +28,7 @@
 		lxterminal)
 			copy @std
 			rm -r $fs/usr/share/icons
-			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango \
+			DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
 			vte-gtk2 xorg-libX11 xorg-libXext"
 			SUGGESTED="lxterminal-locales"
 			TAGS="LXDE terminal"
diff -r 71ba95d2422e -r f48456621a9d lzo/receipt
--- a/lzo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/lzo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.oberhumer.com/opensource/lzo/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/lzo.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lzo.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.oberhumer.com/opensource/lzo/download/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d magnifier/receipt
--- a/magnifier/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/magnifier/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="magnifier"
 VERSION="3.5"
@@ -6,28 +6,22 @@
 SHORT_DESC="Virtual magnifying glass"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-SOURCE="magnifier-linux"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://magnifier.sourceforge.net/"
-WGET_URL="http://downloads.sourceforge.net/magnifier/$TARBALL"
 
-DEPENDS="expat gtk+ xorg-libX11 xorg-libXau xorg-libXcomposite \
-xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
-xorg-libXrandr xorg-libXrender xorg-libXdamage"
+TARBALL="magnifier-linux-$VERSION.tar.bz2"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src
 	./install.sh DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	cp $install/usr/share/magnifier/icon3.ico $fs/usr/share/pixmaps/icon3.png
+	DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
+	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
+	xorg-libXrandr xorg-libXrender xorg-libXdamage"
 }
-
diff -r 71ba95d2422e -r f48456621a9d marco/receipt
--- a/marco/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/marco/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/marco/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk+3-dev startup-notification-dev \
+BUILD_DEPENDS="mate-common yelp-tools gtk3-dev startup-notification-dev \
 xorg-libXcursor-dev libgtop-dev libcanberra-dev zenity itstool \
 xorg-xcb-util-dev"
 SPLIT="marco-dev"
@@ -28,14 +28,14 @@
 	case $PACKAGE in
 		marco)
 			copy @std
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libcanberra \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libcanberra \
 			libcanberra-gtk3 libgtop pango startup-notification xorg-libX11 \
 			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
 			xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="marco gtk+3-dev"
+			DEPENDS="marco gtk3-dev"
 			;;
 	esac
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d matchbox-config-gtk/receipt
--- a/matchbox-config-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/matchbox-config-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-config-gtk/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake gtk+3-dev gconf-dev"
+BUILD_DEPENDS="automake gtk3-dev gconf-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gconf glib gtk+3"
+	DEPENDS="gconf glib gtk3"
 	TAGS="matchbox"
 }
diff -r 71ba95d2422e -r f48456621a9d matchbox-desktop-2/receipt
--- a/matchbox-desktop-2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/matchbox-desktop-2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-desktop-2/snapshot/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev dbus-dev dbus-glib-dev util-linux-uuid-dev"
-BUILD_DEPENDS="automake glib-dev gtk+3-dev xorg-libX11-dev"
+BUILD_DEPENDS="gtk2-dev dbus-dev dbus-glib-dev util-linux-uuid-dev"
+BUILD_DEPENDS="automake glib-dev gtk3-dev xorg-libX11-dev"
 
 compile_rules() {
 	mkdir m4
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk gdk-pixbuf glib gtk+3 pango xorg-libX11"
+	DEPENDS="atk gdk-pixbuf glib gtk3 pango xorg-libX11"
 	TAGS="matchbox"
 }
diff -r 71ba95d2422e -r f48456621a9d matchbox-panel-2/receipt
--- a/matchbox-panel-2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/matchbox-panel-2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-panel-2/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext xorg-libX11-dev gtk+3-dev dbus-glib-dev"
+BUILD_DEPENDS="automake libtool gettext xorg-libX11-dev gtk3-dev dbus-glib-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk+3 xorg-libX11"
+	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk3 xorg-libX11"
 	TAGS="matchbox"
 }
diff -r 71ba95d2422e -r f48456621a9d matchbox-panel-manager/receipt
--- a/matchbox-panel-manager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/matchbox-panel-manager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel-manager/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk+ xorg-libX11"
+	DEPENDS="gdk-pixbuf glib gtk2 xorg-libX11"
 	TAGS="matchbox"
 }
diff -r 71ba95d2422e -r f48456621a9d matchbox-terminal/receipt
--- a/matchbox-terminal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/matchbox-terminal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-terminal/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake glib-dev gtk+3-dev vte-dev"
+BUILD_DEPENDS="automake glib-dev gtk3-dev vte-dev"
 
 compile_rules() {
 	mkdir m4
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk+3 vte"
+	DEPENDS="glib gtk3 vte"
 	TAGS="matchbox"
 }
diff -r 71ba95d2422e -r f48456621a9d matchbox-window-manager-2/receipt
--- a/matchbox-window-manager-2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/matchbox-window-manager-2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-window-manager-2/snapshot/matchbox-window-manager-2-$HASH.tar.bz2"
 
-BUILD_DEPENDS="automake libtool xorg-libX11-dev pango-dev gtk+-dev \
+BUILD_DEPENDS="automake libtool xorg-libX11-dev pango-dev gtk2-dev \
 libpng12-dev xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXcursor-dev \
 expat-dev"
 
@@ -41,6 +41,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="expat glib gtk+ libpng16 pango xorg-libX11 xorg-libXcomposite \
+	DEPENDS="expat glib gtk2 libpng16 pango xorg-libX11 xorg-libXcomposite \
 	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXft xorg-libXrender"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-applets/receipt
--- a/mate-applets/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-applets/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-applets/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools xorg-libX11-dev python-dev gtk+3-dev \
+BUILD_DEPENDS="mate-common yelp-tools xorg-libX11-dev python-dev gtk3-dev \
 mate-panel-dev libgtop-dev libwnck3-dev libnotify-dev dbus-glib-dev \
 polkit-dev upower-dev gucharmap3-dev python-pygobject-dev itstool libmateweather-dev \
 gtksourceview3-dev wireless_tools-dev" # + cpufrequtils-dev + libcpupower(absent)
@@ -31,7 +31,7 @@
 }
 
 genpkg_rules() {
-	deps="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+3 libffi \
+	deps="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk3 libffi \
 	libharfbuzz liblzma libpng16 libxml2 mate-panel pango pcre \
 	util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 xorg-libXau \
 	xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman zlib"
diff -r 71ba95d2422e -r f48456621a9d mate-calc/receipt
--- a/mate-calc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-calc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-calc/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk+3-dev itstool"
+BUILD_DEPENDS="mate-common yelp-tools gtk3-dev itstool"
 
 compile_rules() {
 	./autogen.sh \
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libxml2 pango"
+	DEPENDS="atk cairo gdk-pixbuf glib gtk3 libxml2 pango"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-control-center/receipt
--- a/mate-control-center/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-control-center/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common yelp-tools itstool xorg-libX11-dev \
 xorg-libXScrnSaver-dev xorg-libXext-dev libcanberra-dev xorg-libXxf86misc-dev \
-xorg-xorgproto gtk+3-dev mate-desktop-dev mate-menus-dev dbus-glib-dev marco-dev \
+xorg-xorgproto gtk3-dev mate-desktop-dev mate-menus-dev dbus-glib-dev marco-dev \
 librsvg-dev mate-settings-daemon-dev libappindicator-gtk3-dev \
 desktop-file-utils xorg-libXcursor-dev libmatekbd-dev libxklavier-dev"
 SPLIT="mate-control-center-dev"
@@ -33,14 +33,14 @@
 			copy @std
 			rm $fs/usr/share/applications/mimeinfo.cache
 			DEPENDS="atk cairo dbus-glib dconf fontconfig freetype gdk-pixbuf \
-			glib gtk+3 libappindicator-gtk3 libcanberra libcanberra-gtk3 \
+			glib gtk3 libappindicator-gtk3 libcanberra libcanberra-gtk3 \
 			libmatekbd librsvg libxklavier libxml2 marco mate-desktop \
 			mate-menus pango xorg-libX11 xorg-libXScrnSaver xorg-libXcursor \
 			xorg-libXi"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="mate-control-center glib-dev gtk+3-dev librsvg-dev \
+			DEPENDS="mate-control-center glib-dev gtk3-dev librsvg-dev \
 			mate-desktop-dev mate-menus-dev"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d mate-desktop/receipt
--- a/mate-desktop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-desktop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev dconf-dev \
 startup-notification-dev xorg-libX11-dev xorg-libXrandr-dev gdk-pixbuf-dev \
-gtk+3-dev xorg-xcb-util-dev"
+gtk3-dev xorg-xcb-util-dev"
 SPLIT="mate-desktop-dev"
 
 compile_rules() {
@@ -28,12 +28,12 @@
 	case $PACKAGE in
 		mate-desktop)
 			copy @std @ico # only 16 and 48 icons
-			DEPENDS="atk cairo dconf gdk-pixbuf glib gtk+3 pango \
+			DEPENDS="atk cairo dconf gdk-pixbuf glib gtk3 pango \
 			startup-notification xorg-libX11 xorg-libXrandr"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="mate-desktop dconf-dev gtk+3-dev startup-notification-dev"
+			DEPENDS="mate-desktop dconf-dev gtk3-dev startup-notification-dev"
 			;;
 	esac
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d mate-indicator-applet/receipt
--- a/mate-indicator-applet/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-indicator-applet/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-indicator-applet/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk+3-dev xorg-libX11-dev mate-panel-dev \
+BUILD_DEPENDS="mate-common gtk3-dev xorg-libX11-dev mate-panel-dev \
 libindicator-gtk3-dev"
 
 compile_rules() {
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk glib gtk+3 libindicator-gtk3 mate-panel xorg-libX11"
+	DEPENDS="atk glib gtk3 libindicator-gtk3 mate-panel xorg-libX11"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-media/receipt
--- a/mate-media/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-media/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-media/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk+3-dev libcanberra-dev mate-desktop-dev \
+BUILD_DEPENDS="mate-common gtk3-dev libcanberra-dev mate-desktop-dev \
 libmatemixer-dev"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo glib gtk+3 libcanberra libcanberra-gtk3 libmatemixer \
+	DEPENDS="cairo glib gtk3 libcanberra libcanberra-gtk3 libmatemixer \
 	libxml2 mate-desktop pango"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-netbook/receipt
--- a/mate-netbook/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-netbook/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-netbook/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk+3-dev libwnck3-dev xorg-libXtst-dev \
+BUILD_DEPENDS="mate-common gtk3-dev libwnck3-dev xorg-libXtst-dev \
 libfakekey-dev mate-panel-dev"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libfakekey libwnck3 mate-panel \
+	DEPENDS="atk cairo gdk-pixbuf glib gtk3 libfakekey libwnck3 mate-panel \
 	pango xorg-libX11"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-notification-daemon-gtk2/receipt
--- a/mate-notification-daemon-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-notification-daemon-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 TARBALL="mate-notification-daemon-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="autoconf automake libtool gtk+-dev dbus-dev dbus-glib-dev \
+BUILD_DEPENDS="autoconf automake libtool gtk2-dev dbus-dev dbus-glib-dev \
 libcanberra-dev libwnck2-dev libnotify-dev intltool"
 
 compile_rules() {
@@ -31,7 +31,7 @@
 
 genpkg_rules() {
 	copy @std @ico # only 16 and 48 icons
-	DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk+ libcanberra-gtk2 \
+	DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 libcanberra-gtk2 \
 	libnotify libwnck2 xorg-libX11"
 	PROVIDE="notification-daemon"
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d mate-notification-daemon/receipt
--- a/mate-notification-daemon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-notification-daemon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-notification-daemon/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk+3-dev dbus-glib-dev libcanberra-dev \
+BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev libcanberra-dev \
 libwnck3-dev libnotify-dev"
 SPLIT="mate-notification-daemon-dev"
 
@@ -27,9 +27,9 @@
 	case $PACKAGE in
 		mate-notification-daemon)
 			copy @std @ico # only 16 and 48 icons
-			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk+3 \
+			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk3 \
 			libcanberra-gtk3 libnotify libwnck3 pango xorg-libX11"
-			PROVIDE="gtk+3:notification-daemon"
+			PROVIDE="gtk3:notification-daemon"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d mate-panel/receipt
--- a/mate-panel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-panel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-panel/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gtk-doc yelp-tools gobject-introspection-dev \
-xorg-libICE-dev xorg-libSM-dev gtk+3-dev mate-desktop-dev mate-menus-dev \
+xorg-libICE-dev xorg-libSM-dev gtk3-dev mate-desktop-dev mate-menus-dev \
 dbus-glib-dev libwnck3-dev librsvg-dev libmateweather-dev itstool"
 SPLIT="mate-panel-dev"
 
@@ -29,13 +29,13 @@
 	case $PACKAGE in
 		mate-panel)
 			copy @std
-			DEPENDS="atk cairo dbus-glib gdk-pixbuf glib gtk+3 libmateweather \
+			DEPENDS="atk cairo dbus-glib gdk-pixbuf glib gtk3 libmateweather \
 			librsvg libwnck3 mate-desktop mate-menus pango xorg-libICE \
 			xorg-libSM xorg-libX11 xorg-libXrandr"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="mate-panel glib-dev gtk+3-dev"
+			DEPENDS="mate-panel glib-dev gtk3-dev"
 			;;
 	esac
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d mate-polkit/receipt
--- a/mate-polkit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-polkit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://pub.mate-desktop.org/releases/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="mate-common gtk-doc gtk+3-dev polkit-dev \
+BUILD_DEPENDS="mate-common gtk-doc gtk3-dev polkit-dev \
 gobject-introspection-dev"
 
 compile_rules() {
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk+3 polkit"
+	DEPENDS="gdk-pixbuf glib gtk3 polkit"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-power-manager/receipt
--- a/mate-power-manager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-power-manager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+3 libcanberra \
+	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libcanberra \
 	libcanberra-gtk3 libgnome-keyring3 libnotify mate-panel pango upower \
 	xorg-libX11 xorg-libXext xorg-libXrandr"
 	TAGS="MATE"
diff -r 71ba95d2422e -r f48456621a9d mate-screensaver/receipt
--- a/mate-screensaver/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-screensaver/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-screensaver/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common xorg-libX11-dev xorg-libXScrnSaver-dev gtk+3-dev \
+BUILD_DEPENDS="mate-common xorg-libX11-dev xorg-libXScrnSaver-dev gtk3-dev \
 dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto xorg-libXext-dev \
 mesa-dev libmatekbd-dev libnotify-dev expat-dev xorg-libxshmfence-dev"
 SPLIT="mate-screensaver-dev"
@@ -28,7 +28,7 @@
 	case $PACKAGE in
 		mate-screensaver)
 			copy @std
-			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+3 libmatekbd \
+			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 libmatekbd \
 			libnotify libxklavier mate-desktop mate-menus mesa pango \
 			xorg-libX11 xorg-libXScrnSaver xorg-libXext xorg-libXxf86vm"
 			;;
diff -r 71ba95d2422e -r f48456621a9d mate-sensors-applet/receipt
--- a/mate-sensors-applet/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-sensors-applet/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-sensors-applet/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk+3-dev mate-panel-dev dbus-glib-dev \
+BUILD_DEPENDS="mate-common yelp-tools gtk3-dev mate-panel-dev dbus-glib-dev \
 libatasmart-dev libnotify-dev lm-sensors-dev libxslt-dev itstool"
 SPLIT="mate-sensors-applet-dev"
 
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		mate-sensors-applet)
 			copy @std
-			DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk+3 libatasmart \
+			DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk3 libatasmart \
 			libnotify lm-sensors mate-panel"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d mate-session-manager/receipt
--- a/mate-session-manager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-session-manager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-session-manager/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk+3-dev dbus-glib-dev xorg-libXtst-dev xmlto \
+BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev xorg-libXtst-dev xmlto \
 libxslt-dev libwrap-dev docbook-xsl xorg-libSM-dev xorg-xtrans"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std @ico # only 16 and 48 icons
-	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+3 xorg-libICE xorg-libSM \
+	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk3 xorg-libICE xorg-libSM \
 	xorg-libX11 xorg-libXau xorg-libXext xorg-libXrender xorg-libXtst"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-settings-daemon/receipt
--- a/mate-settings-daemon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-settings-daemon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-settings-daemon/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk+3-dev dbus-glib-dev dconf-dev mate-desktop-dev \
+BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev dconf-dev mate-desktop-dev \
 libnotify-dev xorg-libXxf86misc-dev libmatekbd-dev libcanberra-dev \
 libmatemixer-dev nss-dev polkit-dev pulseaudio-dev"
 SPLIT="mate-settings-daemon-dev"
@@ -30,7 +30,7 @@
 		mate-settings-daemon)
 			copy @std
 			DEPENDS="cairo dbus dbus-glib dconf fontconfig gdk-pixbuf glib \
-			gtk+3 libcanberra-gtk3 libmatekbd libmatemixer libnotify \
+			gtk3 libcanberra-gtk3 libmatekbd libmatemixer libnotify \
 			libxklavier mate-desktop nspr nss polkit pulseaudio xorg-libX11 \
 			xorg-libXi xorg-libXxf86misc"
 			;;
diff -r 71ba95d2422e -r f48456621a9d mate-system-monitor/receipt
--- a/mate-system-monitor/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-system-monitor/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-system-monitor/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools libgtop-dev libwnck3-dev gtk+3-dev \
+BUILD_DEPENDS="mate-common yelp-tools libgtop-dev libwnck3-dev gtk3-dev \
 gtkmm3-dev librsvg-dev glibmm-dev libgiomm-dev itstool"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib glibmm gtk+3 gtkmm3 libgiomm libgtop \
+	DEPENDS="cairo gdk-pixbuf glib glibmm gtk3 gtkmm3 libgiomm libgtop \
 	librsvg libsigc++ libwnck3 libxml2 pango"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-terminal/receipt
--- a/mate-terminal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-terminal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-terminal/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools vte-dev gtk+3-dev dconf-dev \
+BUILD_DEPENDS="mate-common yelp-tools vte-dev gtk3-dev dconf-dev \
 xorg-libX11-dev itstool xorg-libSM-dev"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk dconf gdk-pixbuf glib gtk+3 pango vte xorg-libICE xorg-libSM \
+	DEPENDS="atk dconf gdk-pixbuf glib gtk3 pango vte xorg-libICE xorg-libSM \
 	xorg-libX11"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-themes/receipt
--- a/mate-themes/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-themes/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-themes/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk+-dev"
+BUILD_DEPENDS="mate-common gtk2-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -25,6 +25,6 @@
 
 genpkg_rules() {
 	copy @std
-	SUGGESTED="gtk2-engine-murrine gtk+3"
+	SUGGESTED="gtk2-engine-murrine gtk3"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mate-utils/receipt
--- a/mate-utils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mate-utils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-utils/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk-doc gtk+3-dev mate-panel-dev \
+BUILD_DEPENDS="mate-common yelp-tools gtk-doc gtk3-dev mate-panel-dev \
 libgtop-dev libcanberra-dev itstool xorg-libSM-dev"
 SPLIT="mate-utils-dev"
 
@@ -26,13 +26,13 @@
 	case $PACKAGE in
 		mate-utils)
 			copy @std @ico # only 16 and 48 icons
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libcanberra \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libcanberra \
 			libcanberra-gtk3 libgtop mate-panel pango xorg-libICE xorg-libSM \
 			xorg-libX11 xorg-libXext zlib"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="mate-utils gtk+3-dev"
+			DEPENDS="mate-utils gtk3-dev"
 	esac
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d matplotlib/receipt
--- a/matplotlib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/matplotlib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,7 +10,7 @@
 WEB_SITE="http://matplotlib.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="python zlib libpng16 freetype python-numpy gtk+ expat xorg-libXau \
+DEPENDS="python zlib libpng16 freetype python-numpy gtk2 expat xorg-libXau \
 xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes \
 xorg-libXinerama xorg-libXrandr xorg-libXrender python-pygtk gcc-lib-base"
 BUILD_DEPENDS="python python-dev zlib-dev libpng16-dev freetype-dev python-numpy \
diff -r 71ba95d2422e -r f48456621a9d mb-applet-volume/receipt
--- a/mb-applet-volume/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mb-applet-volume/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://matchbox-project.org/"
 WGET_URL="${WEB_SITE}sources/$PACKAGE/$VERSION/$TARBALL"
 
-DEPENDS="gtk+ libmatchbox"
-BUILD_DEPENDS="gtk+-dev libmatchbox-dev"
+DEPENDS="gtk2 libmatchbox"
+BUILD_DEPENDS="gtk2-dev libmatchbox-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d mcrypt/receipt
--- a/mcrypt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mcrypt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,7 +9,7 @@
 WEB_SITE="http://mcrypt.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://downloads.sourceforge.net/project/mcrypt/MCrypt/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libmcrypt-dev mhash-dev zlib-dev"
 COOKOPTS="skip-log-errors"
diff -r 71ba95d2422e -r f48456621a9d mediainfo-gui/receipt
--- a/mediainfo-gui/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mediainfo-gui/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,7 +10,7 @@
 TARBALL="MediaInfo_GUI_${VERSION}_GNU_FromSource.tar.xz"
 WGET_URL="http://mediaarea.net/download/binary/$PACKAGE/$VERSION/$TARBALL"
 
-DEPENDS="wxWidgets gtk+"
+DEPENDS="wxWidgets gtk2"
 BUILD_DEPENDS="wxWidgets-dev"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d menu-cache/receipt
--- a/menu-cache/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/menu-cache/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/lxde/menu-cache"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/menu-cache.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/menu-cache.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz" # (.xz from SF)
 #WGET_URL="$SF_MIRROR/lxde/$TARBALL" # SF download problems
diff -r 71ba95d2422e -r f48456621a9d mercurial/receipt
--- a/mercurial/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mercurial/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.mercurial-scm.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/mercurial.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/mercurial.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://www.mercurial-scm.org/release/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d mesa/receipt
--- a/mesa/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mesa/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.mesa3d.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/mesa.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/mesa.html"
 
 TARBALL="mesa-$VERSION.tar.xz"
 WGET_URL="https://mesa.freedesktop.org/archive/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d metacity/receipt
--- a/metacity/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/metacity/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gsettings-desktop-schemas glib-dev gtk+-dev \
+BUILD_DEPENDS="gsettings-desktop-schemas glib-dev gtk2-dev \
 xorg-libXcomposite-dev xorg-libXdamage-dev zenity-gtk2 xorg-libXinerama-dev \
 xorg-libXrandr-dev xorg-libXcursor-dev libcanberra-dev libltdl libvorbis-dev \
 libogg-dev libtool gnome-doc-utils gconf-dev util-linux-uuid-dev intltool"
@@ -29,7 +29,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gsettings-desktop-schemas glib gtk+ xorg-libXcomposite \
+	DEPENDS="gsettings-desktop-schemas glib gtk2 xorg-libXcomposite \
 	xorg-libXdamage zenity-gtk2 xorg-libXinerama xorg-libXrandr xorg-libXcursor \
 	libcanberra libltdl libvorbis libogg gconf"
 }
diff -r 71ba95d2422e -r f48456621a9d mhwaveedit/receipt
--- a/mhwaveedit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mhwaveedit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mhwaveedit"
 VERSION="1.4.23"
@@ -6,19 +6,14 @@
 SHORT_DESC="Lightweight sound files editor, recorder and player."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/magnush/mhwaveedit/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/magnush/mhwaveedit/"
 WGET_URL="http://download.gna.org/mhwaveedit/$TARBALL" # FIXME
 
-DEPENDS="alsa-lib libxml2 expat gtk+ xorg-libX11 xorg-libXau \
-xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
-xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
-xorg-libXdamage"
-BUILD_DEPENDS="alsa-lib-dev libxml2-dev xorg-libX11-dev gtk+-dev"
+BUILD_DEPENDS="alsa-lib-dev libxml2-dev xorg-libX11-dev gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	chmod +x install-sh
 	./configure \
 		--prefix=/usr \
@@ -32,11 +27,13 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc
 	cp -a $install/usr/bin $fs/usr
 	cp -a $stuff/skel $fs/etc
 	chown -R 0.0 $fs
+	DEPENDS="alsa-lib libxml2 expat gtk2 xorg-libX11 xorg-libXau \
+	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
+	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
+	xorg-libXdamage"
 }
diff -r 71ba95d2422e -r f48456621a9d miau/receipt
--- a/miau/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/miau/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,7 +9,7 @@
 WEB_SITE="http://miau.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://downloads.sourceforge.net/miau/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 71ba95d2422e -r f48456621a9d midori/receipt
--- a/midori/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/midori/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="https://midori-browser.org/downloads/$TARBALL"
 TARBALL_SHA1="64c86935028feb5f89d799c2acacaad67764da6f"
 
-BUILD_DEPENDS_arm="glib-dev libnotify-dev gtk+-dev xorg-libXScrnSaver-dev \
+BUILD_DEPENDS_arm="glib-dev libnotify-dev gtk2-dev xorg-libXScrnSaver-dev \
 webkitgtk-dev libunique-dev libsoup-dev libxslt-dev gettext intltool"
 BUILD_DEPENDS="cmake vala sqlite3-dev libsoup-dev shared-mime-info gcr-dev \
 webkitgtk-dev gettext rsvg-convert intltool"
@@ -29,7 +29,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gcr-base gdk-pixbuf glib gtk+ \
+	DEPENDS="atk cairo fontconfig freetype gcr-base gdk-pixbuf glib gtk2 \
 	libsoup libsoup-gnome libsqlite3 libxml2 p11-kit pango webkitgtk   \
 	gsettings-desktop-schemas"
 	TAGS="web-browser web webkit"
diff -r 71ba95d2422e -r f48456621a9d mikmod/receipt
--- a/mikmod/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mikmod/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mikmod"
 VERSION="3.2.5"
 CATEGORY="multimedia"
-SHORT_DESC="Mikmod module player."
+SHORT_DESC="Mikmod module player"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://mikmod.shlomifish.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://mikmod.shlomifish.org/"
-WGET_URL="http://downloads.sourceforge.net/project/mikmod/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="ncurses libmikmod"
 BUILD_DEPENDS="ncurses-dev libmikmod-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/mikmod $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses libmikmod"
 }
diff -r 71ba95d2422e -r f48456621a9d mjpegtools/receipt
--- a/mjpegtools/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mjpegtools/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,14 +11,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/mjpeg/$TARBALL"
 
-BUILD_DEPENDS="libdv expat gtk+ jpeg libsdl libsdl-gfx xorg-libX11 xorg-libXau \
+BUILD_DEPENDS="libdv expat gtk2 jpeg libsdl libsdl-gfx xorg-libX11 xorg-libXau \
 xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes \
 xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXdamage gcc-lib-base \
 libdv-dev libsdl-gfx-dev jpeg-dev"
 SPLIT="mjpegtools-dev"
 
 BUILD_DEPENDS="libjpeg-turbo-dev libpng16-dev libdv-dev xorg-libX11-dev \
-xorg-libICE-dev xorg-libXxf86dga-dev gtk+-dev libsdl-dev"
+xorg-libICE-dev xorg-libXxf86dga-dev gtk2-dev libsdl-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		mjpegtools)
 			copy @std
-			DEPENDS="glib gtk+ libdv libjpeg-turbo libpng16 libsdl"
+			DEPENDS="glib gtk2 libdv libjpeg-turbo libpng16 libsdl"
 			TAGS="mpeg mjpeg video"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d mlt/receipt
--- a/mlt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mlt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		mlt)
 			copy @std
-			DEPENDS="libsdl-image libsamplerate libdv qt4 sox libxml2 gtk+ \
+			DEPENDS="libsdl-image libsamplerate libdv qt4 sox libxml2 gtk2 \
 			ffmpeg frei0r-plugins"
 			TAGS="multimedia"
 			;;
diff -r 71ba95d2422e -r f48456621a9d modem-manager/receipt
--- a/modem-manager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/modem-manager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/ModemManager.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/ModemManager.html"
 
 TARBALL="ModemManager-$VERSION.tar.xz"
 WGET_URL="https://www.freedesktop.org/software/ModemManager/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d moserial/receipt
--- a/moserial/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/moserial/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gconf-dev gnome-doc-utils intltool vala gtk+-dev"
+BUILD_DEPENDS="gconf-dev gnome-doc-utils intltool vala gtk2-dev"
 
 compile_rules() {
 	./configure \
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="gconf gtk+"
+	DEPENDS="gconf gtk2"
 	TAGS="serial console"
 }
diff -r 71ba95d2422e -r f48456621a9d mousepad/receipt
--- a/mousepad/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mousepad/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/mousepad.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mousepad.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev gtksourceview-dev dbus-glib-dev"
+BUILD_DEPENDS="intltool gtk2-dev gtksourceview-dev dbus-glib-dev"
 
 compile_rules() {
 	./configure \
@@ -25,6 +25,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="dbus dbus-glib glib gtk+ gtksourceview pango"
+	DEPENDS="dbus dbus-glib glib gtk2 gtksourceview pango"
 	TAGS="Xfce text-editor"
 }
diff -r 71ba95d2422e -r f48456621a9d mozo/receipt
--- a/mozo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mozo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="python   mate-menus gtk+3-dev python-pygobject"
+	DEPENDS="python   mate-menus gtk3-dev python-pygobject"
 	TAGS="MATE"
 }
diff -r 71ba95d2422e -r f48456621a9d mp/receipt
--- a/mp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="http://triptico.com/download/mp/$TARBALL"
 TAGS="text-editor"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="gtk+-dev"
+DEPENDS="gtk2"
+BUILD_DEPENDS="gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d mp3info/receipt
--- a/mp3info/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mp3info/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://ibiblio.org/mp3info/"
 WGET_URL="ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/$TARBALL"
 
-DEPENDS="ncurses gtk+"
-BUILD_DEPENDS="ncurses-dev gtk+-dev"
+DEPENDS="ncurses gtk2"
+BUILD_DEPENDS="ncurses-dev gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d mplayer-svn/receipt
--- a/mplayer-svn/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mplayer-svn/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,9 +14,9 @@
 BRANCH="$VERSION"
 SUGGESTED="v4l-utils"
 
-DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv libtheora lame giflib \
+DEPENDS="gtk2 cdparanoia-III libmad xorg-libXv libtheora lame giflib \
 xorg-libXScrnSaver xorg-libXxf86vm alsa-lib bzlib x264 libass"
-BUILD_DEPENDS="alsa-lib-dev gtk+-dev cdparanoia-III-dev libmad-dev xorg-libXv-dev libtheora-dev subversion yasm"
+BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-III-dev libmad-dev xorg-libXv-dev libtheora-dev subversion yasm"
 
 # Rules to configure and make the package.
 #
diff -r 71ba95d2422e -r f48456621a9d mplayer/receipt
--- a/mplayer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mplayer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,11 +11,7 @@
 TARBALL="MPlayer-$VERSION.tar.xz"
 WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
 
-BUILD_DEPENDS_arm="gtk+-dev libmad-dev xorg-libXv-dev libtheora-dev \
-alsa-lib-dev ncurses-dev lame-dev xorg-libXdamage-dev giflib-dev \
-xorg-libXxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \
-xvidcore-dev zlib-dev xorg-xorgproto pkg-config yasm libsdl-dev"
-BUILD_DEPENDS="gtk+-dev libmad-dev xorg-libXv-dev libtheora-dev \
+BUILD_DEPENDS="gtk2-dev libmad-dev xorg-libXv-dev libtheora-dev \
 alsa-lib-dev ncurses-dev lame-dev xorg-libXdamage-dev giflib-dev \
 xorg-libXxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \
 xvidcore-dev zlib-dev xorg-xorgproto yasm cdparanoia-III-dev \
@@ -28,10 +24,6 @@
 		i?86)
 			ARCH_ARGS="--target=i386-linux --disable-sdl --enable-runtime-cpudetection"
 			;;
-		arm*)
-			export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH
-			ARCH_ARGS="--target=arm-linux --enable-cross-compile --enable-sdl"
-			;;
 	esac
 
 	./configure \
@@ -53,7 +45,7 @@
 		--disable-speex \
 		${ARCH_ARGS} &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install | sed '/install: strip: .*/'d
+	make DESTDIR=$DESTDIR install
 }
 
 genpkg_rules() {
@@ -73,24 +65,12 @@
 			tar xjf $stuff/productive-1.0.tar.bz2 -C $fs/usr/share/mplayer/skins
 			cd $fs/usr/share/mplayer/skins && ln -s productive default
 			# Font
-			cd .. && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
-			# Xv support dont work for ARM and gmplayer symlink not created
-			case "$ARCH" in
-				arm*)
-					cp -f $stuff/mplayer-arm.conf $fs/etc/mplayer/mplayer.conf 
-					cd $fs/usr/bin && ln -s mplayer gmplayer ;;
-			esac
-			DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv libtheora alsa-lib \
+			cd ..
+			ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
+			DEPENDS="gtk2 cdparanoia-III libmad xorg-libXv libtheora alsa-lib \
 			ncurses lame xorg-libXdamage giflib enca lirc xorg-libXxf86vm \
 			esound libmng audiofile libvorbis libogg zlib xvidcore x264 \
 			xorg-libXScrnSaver"
-			# Handle arch package install. Less deps and no GTK gui for ARM
-			case "$SLITAZ_ARCH" in
-				arm*)
-					DEPENDS="alsa-lib zlib libmad xorg-libXv xorg-libXxf86vm \
-					libogg libvorbis libtheora libsdl xvidcore lame esound gtk+"
-					;;
-			esac
 			;;
 		mencoder)
 			copy /usr/bin/mencoder
@@ -98,13 +78,6 @@
 			DEPENDS="libtheora alsa-lib cdparanoia-III expat libogg libvorbis \
 			fontconfig freetype x264 xvidcore jpeg libmad ncurses zlib lame \
 			libpng16 giflib enca lirc"
-			# Handle arch package install
-			case "$SLITAZ_ARCH" in
-				arm*)
-					DEPENDS="alsa-lib zlib libmad xorg-libXv xorg-libXxf86vm \
-					libogg libvorbis libtheora xvidcore lame esound"
-					;;
-			esac
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d mplayerplug-in/receipt
--- a/mplayerplug-in/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mplayerplug-in/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,29 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mplayerplug-in"
 VERSION="3.55"
 CATEGORY="multimedia"
-SHORT_DESC="a browser plugin that uses mplayer to play videos from websites"
+SHORT_DESC="A browser plugin that uses mplayer to play videos from websites"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://mplayerplug-in.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://mplayerplug-in.sourceforge.net/"
-WGET_URL="http://downloads.sourceforge.net/mplayerplug-in/$TARBALL"
-TAGS="player audio video browser"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="mplayer xorg-libXpm gtk+ gcc-lib-base"
-BUILD_DEPENDS="mplayer gtk+-dev xorg-libXpm-dev firefox-dev libIDL gettext \
+BUILD_DEPENDS="mplayer gtk2-dev xorg-libXpm-dev firefox-dev libIDL gettext \
 nspr-dev"
 
-get_firefox_version()
-{
-	FIREFOX_VER=$(cat "$1/var/lib/tazpkg/installed/firefox/receipt" | \
-		grep VERSION= | cut -d \" -f 2)
-}
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/npupp\.h/npfunctions.h/' */np*
 	sed -i 's|char [\* ]*NP*_GetMIMEDescription(|const &|' \
 		plugingate/np_entry.cpp Source/plugin.cpp
@@ -34,7 +25,7 @@
 
 	make distclean
 	touch install.sh
-	get_firefox_version
+	FIREFOX_VER=$(. /var/lib/tazpkg/installed/firefox/receipt; echo $VERSION)
 	./configure \
 		--enable-x \
 		--enable-wmp \
@@ -49,25 +40,24 @@
 	make DESTDIR=$DESTDIR install
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $install/etc $fs
 	cp -a $install/usr/lib/mozilla $fs/usr/lib		
 	# change the default video output to xv,x11
 	sed -i "s/#vo=xv,x11/vo=xv,x11/" $fs/etc/$PACKAGE.conf
+	DEPENDS="mplayer xorg-libXpm gtk2 gcc-lib-base"
+	TAGS="player audio video browser"
 }
 
-post_install()
-{
-	get_firefox_version "$1"
+post_install() {
+	FIREFOX_VER=$(. "$1/var/lib/tazpkg/installed/firefox/receipt"; echo $VERSION)
 	cd "$1/"
 	for i in usr/lib/mozilla/plugins/$PACKAGE*.so ; do
 		ln -s "/$i" "$1/usr/lib/firefox-$FIREFOX_VER/plugins"
 	done
 }
 
-post_remove()
-{
+post_remove() {
 	rm -f /usr/lib/firefox*/plugins/$PACKAGE*.so
 }
diff -r 71ba95d2422e -r f48456621a9d mtdev/receipt
--- a/mtdev/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mtdev/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="mojo@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://bitmath.org/code/mtdev/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/mtdev.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/mtdev.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d mtpaint/receipt
--- a/mtpaint/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mtpaint/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/wjaguar/mtPaint/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="gtk+-dev libpng16-dev lcms-dev zlib-dev gettext \
+BUILD_DEPENDS="gtk2-dev libpng16-dev lcms-dev zlib-dev gettext \
 libjpeg-turbo-dev tiff-dev"
 
 compile_rules() {
@@ -39,6 +39,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ lcms \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 lcms \
 	libjpeg-turbo libpng16 pango tiff xorg-libX11 zlib"
 }
diff -r 71ba95d2422e -r f48456621a9d mupen64plus/receipt
--- a/mupen64plus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/mupen64plus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-bundle-src-$VERSION.tar.gz"
 WGET_URL="https://github.com/mupen64plus/mupen64plus-core/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev boost-dev boost-filesystem glu-dev \
+BUILD_DEPENDS="gtk2-dev boost-dev boost-filesystem glu-dev \
 libsamplerate-dev libsdl-dev libsdl-ttf-dev mesa-dev speex-dev yasm zlib-dev \
 speexdsp-dev"
 
diff -r 71ba95d2422e -r f48456621a9d nabi/receipt
--- a/nabi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nabi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://kldp.net/frs/download.php/5287/$TARBALL"
 
-BUILD_DEPENDS="libhangul libhangul-dev gtk+-dev cairo-dev"
+BUILD_DEPENDS="libhangul libhangul-dev gtk2-dev cairo-dev"
 
 compile_rules() {
 	./configure \
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libhangul gtk+ cairo xorg-libSM xorg-libICE"
+	DEPENDS="libhangul gtk2 cairo xorg-libSM xorg-libICE"
 }
diff -r 71ba95d2422e -r f48456621a9d nagios-nsca/receipt
--- a/nagios-nsca/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nagios-nsca/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,8 +9,7 @@
 WEB_SITE="https://www.nagios.org/"
 
 TARBALL="nsca-$VERSION.tar.gz"
-#WGET_URL="$SF_MIRROR/nagios/$TARBALL"
-WGET_URL="http://prdownloads.sourceforge.net/sourceforge/nagios/$TARBALL"
+WGET_URL="$SF_MIRROR/nagios/$TARBALL"
 
 BUILD_DEPENDS="libmcrypt-dev perl libwrap-dev"
 
diff -r 71ba95d2422e -r f48456621a9d nasm/receipt
--- a/nasm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nasm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.nasm.us/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/nasm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/nasm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.nasm.us/pub/nasm/releasebuilds/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d nathive/receipt
--- a/nathive/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nathive/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,15 +11,16 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="${WEB_SITE}dl/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev python-dev coreutils-operations"
+BUILD_DEPENDS="gtk2-dev python-dev coreutils-operations"
 
 compile_rules() {
 	sed -i "s|^BASE.*|BASE = $DESTDIR/usr/|;s|nathive.sh|nathive.py|" makefile
+
 	make install
 }
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ python"
+	DEPENDS="gtk2 python"
 	TAGS="image photo editor"
 }
diff -r 71ba95d2422e -r f48456621a9d navit/receipt
--- a/navit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/navit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="mesa-dev freeglut-dev quesoglc-dev freeimage-dev \
-imagemagick-dev xorg-libXpm-dev xorg-libXmu-dev gtk+-dev libsdl-dev \
+imagemagick-dev xorg-libXpm-dev xorg-libXmu-dev gtk2-dev libsdl-dev \
 libsdl-image-dev freetype-dev fribidi-dev imlib2-dev postgresql-dev \
 xorg-libXi-dev openssl-dev"
 
diff -r 71ba95d2422e -r f48456621a9d neon/receipt
--- a/neon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/neon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="lehswe@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20170928175008/http://www.webdav.org/neon/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/neon.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/neon.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://fossies.org/linux/www/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d netsurf/receipt
--- a/netsurf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/netsurf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
 
 BUILD_DEPENDS="bison flex perl expat-dev gperf libjpeg-turbo-dev curl-dev \
-openssl-dev libpng16-dev librsvg-dev gtk+-dev check-dev perl-html-parser"
+openssl-dev libpng16-dev librsvg-dev gtk2-dev check-dev perl-html-parser"
 # libharu-dev gstreamer0-dev
 
 compile_rules() {
@@ -56,7 +56,7 @@
 	copy @std
 	# Remove files to save some space
 	rm -rf $fs/usr/share/netsurf/*.xpm
-	DEPENDS="cairo expat gdk-pixbuf glib gtk+ libcurl libjpeg-turbo libpng16 \
+	DEPENDS="cairo expat gdk-pixbuf glib gtk2 libcurl libjpeg-turbo libpng16 \
 	librsvg openssl pango zlib"
 	TAGS="web-browser"
 }
diff -r 71ba95d2422e -r f48456621a9d network-manager/receipt
--- a/network-manager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/network-manager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="NetworkManager-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/NetworkManager/${VERSION%.*.*}/$TARBALL"
 
-BUILD_DEPENDS="dbus-dev dbus-glib-dev gtk+-dev wireless_tools-dev libgudev-dev \
+BUILD_DEPENDS="dbus-dev dbus-glib-dev gtk2-dev wireless_tools-dev libgudev-dev \
 libnl-dev nss-dev ppp-dev iptables-dev util-linux-uuid-dev dhcp-client \
 intltool eudev-dev"
 SPLIT="network-manager-dev"
@@ -35,7 +35,7 @@
 	case $PACKAGE in
 		network-manager)
 			copy @std
-			DEPENDS="dbus dbus-glib gtk+ wireless_tools libgudev libnl nss ppp \
+			DEPENDS="dbus dbus-glib gtk2 wireless_tools libgudev libnl nss ppp \
 			iptables dhcp-client"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d newt/receipt
--- a/newt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/newt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://pagure.io/newt"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/newt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/newt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://releases.pagure.org/newt/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d nghttp2/receipt
--- a/nghttp2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nghttp2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://nghttp2.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/nghttp2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/nghttp2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/nghttp2/nghttp2/releases/download/v$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d nicotine+/receipt
--- a/nicotine+/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nicotine+/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std *.mo
-	DEPENDS="gtk+ python python-pygtk"
+	DEPENDS="gtk2 python python-pygtk"
 	TAGS="fileshare p2p peer-to-peer"
 }
diff -r 71ba95d2422e -r f48456621a9d nitrogen/receipt
--- a/nitrogen/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nitrogen/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/l3ib/nitrogen/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk+-dev gtkmm-dev gettext xorg-libXinerama-dev"
+BUILD_DEPENDS="glib-dev gtk2-dev gtkmm-dev gettext xorg-libXinerama-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -21,7 +21,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atkmm glib glibmm gtk+ gtkmm libgiomm libsigc++ pangomm \
+	DEPENDS="atkmm glib glibmm gtk2 gtkmm libgiomm libsigc++ pangomm \
 	xorg-libX11 xorg-libXinerama"
 	TAGS="wallpaper"
 }
diff -r 71ba95d2422e -r f48456621a9d nmap/receipt
--- a/nmap/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nmap/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://nmap.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/nmap.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/nmap.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://nmap.org/dist/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d node/receipt
--- a/node/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/node/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://nodejs.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/nodejs.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/nodejs.html"
 REPOLOGY="nodejs"
 
 TARBALL="$PACKAGE-v$VERSION.tar.xz"
diff -r 71ba95d2422e -r f48456621a9d notecase/receipt
--- a/notecase/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/notecase/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-${VERSION}_src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev xorg-pixman-dev gtksourceview-dev gnome-vfs-dev \
+BUILD_DEPENDS="gtk2-dev xorg-pixman-dev gtksourceview-dev gnome-vfs-dev \
 gconf-dev gettext-tools libgcrypt-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d notification-daemon-gtk2/receipt
--- a/notification-daemon-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/notification-daemon-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,23 +11,24 @@
 TARBALL="notification-daemon-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/notification-daemon/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev dbus-dev dbus-glib-dev libcanberra-dev \
+BUILD_DEPENDS="intltool gtk2-dev dbus-dev dbus-glib-dev libcanberra-dev \
 gconf-dev libwnck2-dev libnotify-dev"
-SPLIT="notification-daemon-gtk2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lgmodule-2.0"
 
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		notification-daemon-gtk2)
 			copy @std @ico # only 16 and 48 icons
-			DEPENDS="gconf atk cairo dbus dbus-glib gdk-pixbuf glib gtk+ \
+			DEPENDS="gconf atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 \
 			libcanberra-gtk2 libnotify libwnck2 xorg-libX11"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d notification-daemon/receipt
--- a/notification-daemon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/notification-daemon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext gtk+3-dev glib-dev xorg-libX11-dev"
+BUILD_DEPENDS="gettext gtk3-dev glib-dev xorg-libX11-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,5 +22,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo gdk-pixbuf glib gtk+3 pango xorg-libX11"
+	DEPENDS="atk cairo gdk-pixbuf glib gtk3 pango xorg-libX11"
 }
diff -r 71ba95d2422e -r f48456621a9d npapi-sdk/receipt
--- a/npapi-sdk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/npapi-sdk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MPL"
 WEB_SITE="https://bitbucket.org/mgorny/npapi-sdk/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/npapi-sdk.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/npapi-sdk.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://bitbucket.org/mgorny/npapi-sdk/downloads/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d ntfs-3g/receipt
--- a/ntfs-3g/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ntfs-3g/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2 LGPL2"
 WEB_SITE="https://www.tuxera.com/community/open-source-ntfs-3g/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/ntfs-3g.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/ntfs-3g.html"
 
 TARBALL="ntfs-3g_ntfsprogs-$VERSION.tgz"
 WGET_URL="https://tuxera.com/opensource/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d nvidia-173xx/receipt
--- a/nvidia-173xx/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nvidia-173xx/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -17,7 +17,7 @@
 TAGS="driver graphic video"
 PROVIDE="nvidia mesa"
 
-DEPENDS="linux xorg-server gtk+ cairo linux-agp xorg-libXv"
+DEPENDS="linux xorg-server gtk2 cairo linux-agp xorg-libXv"
 BUILD_DEPENDS="linux-module-headers coreutils-file-summarize xz"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d nvidia-96xx/receipt
--- a/nvidia-96xx/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/nvidia-96xx/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -60,7 +60,7 @@
 		mv -f $i ${i//./-.-}
 	done
 
-	DEPENDS="linux xorg-server gtk+ cairo linux-agp linux-drm"
+	DEPENDS="linux xorg-server gtk2 cairo linux-agp linux-drm"
 	PROVIDE="mesa"
 	TAGS="drivers graphic video"
 }
diff -r 71ba95d2422e -r f48456621a9d obconf/receipt
--- a/obconf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/obconf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://openbox.org/dist/obconf/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libglade-dev openbox-dev gdk-pixbuf-dev \
+BUILD_DEPENDS="gtk2-dev libglade-dev openbox-dev gdk-pixbuf-dev \
 startup-notification-dev xorg-libXft-dev"
 
 compile_rules() {
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="openbox gtk+ libglade shared-mime-info xorg-libXdamage \
+	DEPENDS="openbox gtk2 libglade shared-mime-info xorg-libXdamage \
 	startup-notification slitaz-boot-scripts desktop-file-utils"
 	TAGS="openbox"
 }
diff -r 71ba95d2422e -r f48456621a9d obex-data-server/receipt
--- a/obex-data-server/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/obex-data-server/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://tadas.dailyda.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/obex-data-server.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/obex-data-server.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://tadas.dailyda.com/software/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d obmenu/receipt
--- a/obmenu/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/obmenu/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,13 +9,13 @@
 WEB_SITE="http://obmenu.sourceforge.net/index.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://downloads.sourceforge.net/obmenu/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="python python-dev"
+BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$DESTDIR
 }
 
 genpkg_rules() {
diff -r 71ba95d2422e -r f48456621a9d obshutdown/receipt
--- a/obshutdown/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/obshutdown/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="${PACKAGE}-${VERSION}.tar.gz"
 WGET_URL="https://github.com/downloads/panjandrum/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev cairo-dev"
+BUILD_DEPENDS="gtk2-dev cairo-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ cairo openbox"
+	DEPENDS="gtk2 cairo openbox"
 }
 
 post_install() {
diff -r 71ba95d2422e -r f48456621a9d opal/receipt
--- a/opal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/opal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MPL"
 WEB_SITE="https://www.ekiga.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/opal.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/opal.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d opencv/receipt
--- a/opencv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/opencv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://opencv.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/opencv.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/opencv.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/opencv/opencv/archive/$VERSION.tar.gz"
@@ -19,7 +19,7 @@
 
 BUILD_DEPENDS="cmake python-dev python-numpy zlib-dev \
 libjpeg-turbo-dev tiff-dev libpng16-dev libwebp-dev jasper-dev openexr-dev \
-ilmbase-dev gtk+-dev glib-dev gstreamer1-dev gst1-plugins-base-dev \
+ilmbase-dev gtk2-dev glib-dev gstreamer1-dev gst1-plugins-base-dev \
 libgphoto2-dev shared-mime-info xine-lib-dev protobuf-dev " # lapack-dev
 SPLIT="opencv opencv-dev"
 
@@ -69,7 +69,7 @@
 	case $PACKAGE in
 		opencv)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gst1-plugins-base gstreamer1 gtk+ \
+			DEPENDS="cairo gdk-pixbuf glib gst1-plugins-base gstreamer1 gtk2 \
 			jasper libgphoto2 libjpeg-turbo libpng16 libwebp openexr tiff \
 			xine-lib zlib"
 			;;
diff -r 71ba95d2422e -r f48456621a9d openjpeg/receipt
--- a/openjpeg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/openjpeg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="BSD"
 WEB_SITE="http://www.openjpeg.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/openjpeg.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/openjpeg.html"
 REPOLOGY="openjpeg15"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d openjpeg2/receipt
--- a/openjpeg2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/openjpeg2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="http://www.openjpeg.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/openjpeg2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/openjpeg2.html"
 REPOLOGY="openjpeg"
 
 TARBALL="openjpeg-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d openobex/receipt
--- a/openobex/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/openobex/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="https://gitlab.com/openobex/mainline"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/openobex.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/openobex.html"
 
 TARBALL="openobex-$VERSION-Source.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d openssh/receipt
--- a/openssh/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/openssh/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.openssh.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/openssh.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/openssh.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d openssl/receipt
--- a/openssl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/openssl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.openssl.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/openssl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/openssl.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://www.openssl.org/source/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d openssl10/receipt
--- a/openssl10/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/openssl10/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.openssl.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/openssl10.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/openssl10.html"
 REPOLOGY="openssl"
 
 TARBALL="openssl-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d openvas-client/receipt
--- a/openvas-client/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/openvas-client/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://wald.intevation.org/frs/download.php/757/$TARBALL"
 
 BUILD_DEPENDS="libgd-dev libpng16-dev glib-dev openvas-libraries-dev \
-gnutls-dev gtk+-dev"
+gnutls-dev gtk2-dev"
 
 compile_rules() {
 	cp -a $stuff/libopenvas-config /usr/bin
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="openvas-libraries gtk+"
+	DEPENDS="openvas-libraries gtk2"
 	CONFIG_FILES="/etc/openvas/"
 }
diff -r 71ba95d2422e -r f48456621a9d ophcrack/receipt
--- a/ophcrack/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ophcrack/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ophcrack"
 VERSION="3.5.0"
@@ -6,26 +6,23 @@
 SHORT_DESC="Windows password cracker"
 MAINTAINER="slitaz@objectif-securite.ch"
 LICENSE="GPL2"
+WEB_SITE="http://ophcrack.sourceforge.net"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://ophcrack.sourceforge.net"
-WGET_URL="http://downloads.sourceforge.net/ophcrack/$TARBALL"
-TAGS="password windows"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libQtCore libQtGui libqwt5-qt4 openssl expat gcc-lib-base"
 BUILD_DEPENDS="Qt4-dev qmake libqwt5-qt4-dev openssl-dev expat-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/src/ophcrack $fs/usr/bin
+	DEPENDS="libQtCore libQtGui libqwt5-qt4 openssl expat gcc-lib-base"
+	TAGS="password windows"
 }
-
diff -r 71ba95d2422e -r f48456621a9d opus/receipt
--- a/opus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/opus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://opus-codec.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/opus.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/opus.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://archive.mozilla.org/pub/opus/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d orage/receipt
--- a/orage/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/orage/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev xfce4-panel-dev libical-dev db-dev \
+BUILD_DEPENDS="intltool gtk2-dev xfce4-panel-dev libical-dev db-dev \
 dbus-glib-dev libnotify-dev popt-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="dbus dbus-glib gdk-pixbuf glib gtk+ libical libnotify \
+	DEPENDS="dbus dbus-glib gdk-pixbuf glib gtk2 libical libnotify \
 	libxfce4util pango popt xfce4-panel xorg-libX11"
 	TAGS="Xfce office"
 }
diff -r 71ba95d2422e -r f48456621a9d osmo/receipt
--- a/osmo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/osmo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/osmo-pim/$TARBALL"
 
-BUILD_DEPENDS="gettext gtk+3-dev libarchive-dev libical-dev gtkspell3-dev \
+BUILD_DEPENDS="gettext gtk3-dev libarchive-dev libical-dev gtkspell3-dev \
 libnotify-dev webkit2gtk-dev"
 
 compile_rules() {
@@ -20,7 +20,7 @@
 
 genpkg_rules() {
 	copy @std *.mo @ico # only 16 and 48 icons
-	DEPENDS="atk cairo enchant gdk-pixbuf glib gtk+3 gtkspell3 libarchive \
+	DEPENDS="atk cairo enchant gdk-pixbuf glib gtk3 gtkspell3 libarchive \
 	libical liblzma libnotify libsoup libxml2 pango webkit2gtk zlib"
 	TAGS="office"
 }
diff -r 71ba95d2422e -r f48456621a9d oxine/receipt
--- a/oxine/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/oxine/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,30 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="oxine"
 VERSION="0.7.1"
 CATEGORY="multimedia"
-SHORT_DESC="oxine is a lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems."
+SHORT_DESC="Lightweight, purely OSD based xine frontend for set-top boxes and home entertainment systems"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://oxine.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://oxine.sourceforge.net/"
-WGET_URL="http://downloads.sourceforge.net/project/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libcdio xine-lib curl"
 BUILD_DEPENDS="shared-mime-info libcdio-dev xine-lib-dev curl-dev \
 xorg-libX11-dev xorg-libXtst-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make &&	make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/ $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libcdio xine-lib curl"
 }
diff -r 71ba95d2422e -r f48456621a9d oxygen-gtk/receipt
--- a/oxygen-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/oxygen-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 BRANCH="$VERSION"
 WGET_URL="git|git://anongit.kde.org/oxygen-gtk"
 
-BUILD_DEPENDS="git cmake xorg-libX11-dev gtk+-dev"
+BUILD_DEPENDS="git cmake xorg-libX11-dev gtk2-dev"
 
 compile_rules() {
 	mkdir build
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ pango xorg-libX11"
+	DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11"
 }
diff -r 71ba95d2422e -r f48456621a9d p11-kit/receipt
--- a/p11-kit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/p11-kit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://p11-glue.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/p11-kit.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/p11-kit.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/p11-glue/p11-kit/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d p7zip/receipt
--- a/p7zip/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/p7zip/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -8,17 +8,16 @@
 LICENSE="LGPL2.1"
 #WEB_SITE="http://p7zip.sourceforge.net/"
 WEB_SITE="https://sourceforge.net/projects/sevenzip/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/p7zip.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/p7zip.html"
 
 TARBALL="${PACKAGE}_${VERSION}_src_all.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="nasm yasm"
-SPLIT="p7zip p7zip-full"
+SPLIT="$PACKAGE-full"
 
 compile_rules() {
 	case $ARCH in
-		arm)    cp makefile.linux_cross_arm       makefile.machine;;
 		i?86)   cp makefile.linux_x86_asm_gcc_4.X makefile.machine;;
 		x86_64) cp makefile.linux_amd64_asm       makefile.machine;;
 	esac
@@ -38,7 +37,7 @@
 			copy 7zr
 			CAT="utilities|supports only 7z archives"
 			;;
-		p7zip-full)
+		*-full)
 			copy @std @rm
 			CAT="utilities|full version with restricted codecs"
 			DEPENDS="p7zip"
diff -r 71ba95d2422e -r f48456621a9d palemoon/receipt
--- a/palemoon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/palemoon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,8 +12,8 @@
 TAGS="browser web-browser"
 PROVIDE="browser-html5"
 
-DEPENDS="gtk+"
-BUILD_DEPENDS="autoconf213 gtk+-dev yasm zip unzip iw dbus-dev dbus-glib-dev \
+DEPENDS="gtk2"
+BUILD_DEPENDS="autoconf213 gtk2-dev yasm zip unzip iw dbus-dev dbus-glib-dev \
 iw libpng16-dev gstreamer0 gstreamer0-dev gst0-plugins-base-dev gst0-plugins-base \
 libvpx-dev mesa-dev virtualenv zlib-dev bzip2-dev python-dev \
 xorg-pixman xorg-pixman-dev libffi libffi-dev libjpeg-turbo-dev \
diff -r 71ba95d2422e -r f48456621a9d pan/receipt
--- a/pan/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pan/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://pan.rebelbase.com"
 WGET_URL="$WEB_SITE/download/releases/$VERSION/source/$TARBALL"
 
-DEPENDS="pcre gmime gtkspell gtk+ cairo gcc-lib-base glibc-base"
-BUILD_DEPENDS="intltool gmime-dev glib-dev gtk+-dev"
+DEPENDS="pcre gmime gtkspell gtk2 cairo gcc-lib-base glibc-base"
+BUILD_DEPENDS="intltool gmime-dev glib-dev gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d pangomm/receipt
--- a/pangomm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pangomm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/pangomm/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/pangomm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/pangomm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d parcellite/receipt
--- a/parcellite/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/parcellite/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://parcellite.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ xorg-libX11 xorg-libXdamage"
-BUILD_DEPENDS="xorg-libX11-dev gtk+-dev intltool"
+DEPENDS="gtk2 xorg-libX11 xorg-libXdamage"
+BUILD_DEPENDS="xorg-libX11-dev gtk2-dev intltool"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d parole/receipt
--- a/parole/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/parole/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -30,7 +30,7 @@
 		parole)
 			copy @std
 			DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gst0-plugins-base \
-			gstreamer0 gtk+ libnotify libxfce4ui libxfce4util taglib xfconf \
+			gstreamer0 gtk2 libnotify libxfce4ui libxfce4util taglib xfconf \
 			xorg-libX11"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d parted/receipt
--- a/parted/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/parted/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.gnu.org/software/parted/index.shtml"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/parted.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/parted.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d pavucontrol/receipt
--- a/pavucontrol/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pavucontrol/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="pavucontrol"
-VERSION="3.0+23" # 23 commits since latest release 3.0 (2015-03-24)
+VERSION="3.0postgit20150324"
 COMMIT="335c26c57c18d95cc7d4ca693a75ef94fe919e1d" # https://cgit.freedesktop.org/pulseaudio/pavucontrol/
 CATEGORY="multimedia"
 SHORT_DESC="A GTK volume control for PulseAudio"
@@ -30,6 +30,6 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="atk atkmm cairo cairomm fontconfig freetype gdk-pixbuf glib \
-	glibmm gtk+ gtkmm libcanberra libgiomm libsigc++ pango pangomm pulseaudio \
+	glibmm gtk2 gtkmm libcanberra libgiomm libsigc++ pango pangomm pulseaudio \
 	pulseaudio-glib xorg-libX11"
 }
diff -r 71ba95d2422e -r f48456621a9d pax/receipt
--- a/pax/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pax/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://sourceforge.net/projects/heirloom/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pax.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pax.html"
 
 TARBALL="heirloom-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/heirloom/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d pciutils/receipt
--- a/pciutils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pciutils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://mj.ucw.cz/sw/pciutils/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pciutils.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pciutils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/software/utils/pciutils/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d pcmanfm-legacy/receipt
--- a/pcmanfm-legacy/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pcmanfm-legacy/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="pcmanfm-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gamin-dev gamin shared-mime-info intltool hal-dev \
+BUILD_DEPENDS="gtk2-dev gamin-dev gamin shared-mime-info intltool hal-dev \
 dbus-glib-dev dbus-dev startup-notification-dev xorg-libxcb-dev xorg-xcb-util-dev \
 xorg-xcb-util xorg-libX11-dev xorg-libXt-dev"
 
@@ -34,7 +34,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo dbus dbus-glib gamin gdk-pixbuf glib gtk+ hal pango \
+	DEPENDS="cairo dbus dbus-glib gamin gdk-pixbuf glib gtk2 hal pango \
 	startup-notification xorg-libX11   hicolor-icon-theme shared-mime-info"
 	TAGS="file-manager"
 }
diff -r 71ba95d2422e -r f48456621a9d pcmanfm-qt/receipt
--- a/pcmanfm-qt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pcmanfm-qt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/pcmanfm-qt"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/pcmanfm-qt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/pcmanfm-qt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/pcmanfm-qt/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d pcmanfm/receipt
--- a/pcmanfm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pcmanfm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,16 +7,16 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/PCManFM"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxde/pcmanfm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/pcmanfm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 #WGET_URL="$SF_MIRROR/$PACKAGE/files/$TARBALL" # SF download problems
 WGET_URL="http://git.lxde.org/gitweb/?p=lxde/pcmanfm.git;a=snapshot;h=$VERSION;sf=txz"
 
-BUILD_DEPENDS_arm="gtk+-dev dbus-glib-dev dbus-dev startup-notification-dev \
+BUILD_DEPENDS_arm="gtk2-dev dbus-glib-dev dbus-dev startup-notification-dev \
 xorg-libxcb-dev xorg-xcb-util-dev libfm-dev menu-cache-dev expat-dev libfm-gtk \
 gtk-doc libtool"
-BUILD_DEPENDS="intltool xorg-libX11-dev pango-dev libfm-dev gtk+-dev automake"
+BUILD_DEPENDS="intltool xorg-libX11-dev pango-dev libfm-dev gtk2-dev automake"
 
 compile_rules() {
 	# tarball from git.lxde.org requires this step
@@ -42,7 +42,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo gdk-pixbuf glib gtk+ libfm libfm-gtk pango xorg-libX11"
+	DEPENDS="atk cairo gdk-pixbuf glib gtk2 libfm libfm-gtk pango xorg-libX11"
 	SUGGESTED="gvfs"
 	TAGS="file-manager"
 }
diff -r 71ba95d2422e -r f48456621a9d pcre2/receipt
--- a/pcre2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pcre2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="http://www.pcre.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pcre2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pcre2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/pcre/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d pcsxr-svn/receipt
--- a/pcsxr-svn/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pcsxr-svn/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -15,7 +15,7 @@
 TAGS="emulator playstation"
 
 DEPENDS="libcdio libglade xorg-libXtst xorg-libXv mesa libsdl"
-BUILD_DEPENDS="glib-dev libcdio libcdio-dev libglade-dev gtk+-dev xorg-libXtst xorg-libXtst-dev xorg-libXv xorg-libXv-dev mesa-dev \
+BUILD_DEPENDS="glib-dev libcdio libcdio-dev libglade-dev gtk2-dev xorg-libXtst xorg-libXtst-dev xorg-libXv xorg-libXv-dev mesa-dev \
 zlib-dev libsdl libsdl-dev subversion nasm gettext intltool sed lzma \
 autoconf automake libtool expat-dev xorg-libxshmfence-dev"
 
diff -r 71ba95d2422e -r f48456621a9d peazip/receipt
--- a/peazip/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/peazip/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -81,7 +81,7 @@
 			;;
 		peazip)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ pango xorg-libX11   \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 pango xorg-libX11   \
 			busybox desktop-file-utils gmp libcurl ncurses upx zpaq xdg-utils"
 			SUGGESTED="aescrypt gnupg"
 			TAGS="archiver bzip2 encryption gzip rar split tar unrar xz zip 7zip"
diff -r 71ba95d2422e -r f48456621a9d perl-algorithm-permute/receipt
--- a/perl-algorithm-permute/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-algorithm-permute/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-algorithm-permute"
 VERSION="0.16"
@@ -13,20 +13,16 @@
 TARBALL="Algorithm-Permute-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SL/SLOYD/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-apache-dbi/receipt
--- a/perl-apache-dbi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-apache-dbi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-apache-dbi"
 VERSION="1.12"
@@ -12,20 +12,16 @@
 TARBALL="Apache-DBI-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PH/PHRED/$TARBALL"
 
-DEPENDS="perl-dbi perl-digest-sha1"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-dbi perl-digest-sha1"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="$BUILD_DEPENDS"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-appconfig/receipt
--- a/perl-appconfig/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-appconfig/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-appconfig"
 VERSION="1.71"
@@ -13,20 +13,16 @@
 TARBALL="AppConfig-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/N/NE/NEILB/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-b-hooks-endofscope/receipt
--- a/perl-b-hooks-endofscope/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-b-hooks-endofscope/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-b-hooks-endofscope"
 VERSION="0.24"
@@ -13,20 +13,17 @@
 TARBALL="B-Hooks-EndOfScope-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL"
 
-DEPENDS="perl-module-implementation perl-sub-exporter-progressive"
-BUILD_DEPENDS="$DEPENDS perl-dev perl-variable-magic"
+BUILD_DEPENDS="perl-module-implementation perl-sub-exporter-progressive \
+perl-dev perl-variable-magic"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-module-implementation perl-sub-exporter-progressive"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-berkeleydb/receipt
--- a/perl-berkeleydb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-berkeleydb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-berkeleydb"
 VERSION="0.55"
@@ -12,20 +12,16 @@
 TARBALL="BerkeleyDB-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PM/PMQS/$TARBALL"
 
-DEPENDS="perl db"
 BUILD_DEPENDS="perl-dev db-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl db"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-bit-vector/receipt
--- a/perl-bit-vector/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-bit-vector/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-bit-vector"
 VERSION="7.4"
@@ -13,20 +13,16 @@
 TARBALL="Bit-Vector-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/ST/STBEY/$TARBALL"
 
-DEPENDS="perl-carp-clan"
-BUILD_DEPENDS="$DEPENDS perl-dev"
+BUILD_DEPENDS="perl-carp-clan perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-carp-clan"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-cairo/receipt
--- a/perl-cairo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-cairo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-cairo"
 VERSION="1.106"
@@ -12,20 +12,17 @@
 TARBALL="Cairo-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$TARBALL"
 
-DEPENDS="cairo freetype perl-extutils-depends perl-extutils-pkgconfig"
-BUILD_DEPENDS="$DEPENDS perl-dev cairo-dev"
+BUILD_DEPENDS="cairo freetype perl-extutils-depends perl-extutils-pkgconfig \
+perl-dev cairo-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std *.h
+	DEPENDS="cairo freetype perl-extutils-depends perl-extutils-pkgconfig"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-carp-clan/receipt
--- a/perl-carp-clan/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-carp-clan/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-carp-clan"
 VERSION="6.06"
@@ -13,20 +13,16 @@
 TARBALL="Carp-Clan-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/$TARBALL"
 
-DEPENDS="perl-test-exception"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-test-exception"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-test-exception"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-cgi-session/receipt
--- a/perl-cgi-session/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-cgi-session/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-cgi-session"
 VERSION="4.48"
@@ -12,20 +12,16 @@
 TARBALL="CGI-Session-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MA/MARKSTOS/$TARBALL"
 
-DEPENDS="perl-cgi"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-cgi"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-cgi"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-class-accessor/receipt
--- a/perl-class-accessor/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-class-accessor/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-class-accessor"
 VERSION="0.51"
@@ -12,20 +12,16 @@
 TARBALL="Class-Accessor-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/K/KA/KASEI/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-class-data-inheritable/receipt
--- a/perl-class-data-inheritable/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-class-data-inheritable/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-class-data-inheritable"
 VERSION="0.08"
@@ -12,20 +12,16 @@
 TARBALL="Class-Data-Inheritable-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TM/TMTM/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
 	make && make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r 71ba95d2422e -r f48456621a9d perl-gtk2-trayicon/receipt
--- a/perl-gtk2-trayicon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-gtk2-trayicon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 
 DEPENDS="perl-gtk2"
 BUILD_DEPENDS="$DEPENDS perl-dev perl-extutils-depends perl-extutils-pkgconfig \
-gtk+-dev"
+gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d perl-gtk2/receipt
--- a/perl-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,9 +13,9 @@
 WGET_URL="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$TARBALL"
 
 DEPENDS="perl-glib perl-pango atk cairo fontconfig freetype gdk-pixbuf glib \
-gtk+ pango"
+gtk2 pango"
 BUILD_DEPENDS="perl-dev perl-glib perl-pango perl-extutils-depends \
-perl-extutils-pkgconfig gtk+-dev"
+perl-extutils-pkgconfig gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d perl-sgmlspm/receipt
--- a/perl-sgmlspm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/perl-sgmlspm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,8 +7,8 @@
 parsers"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
-WEB_SITE="http://www.linuxfromscratch.org/blfs/view/stable/general/perl-modules.html#perl-sgmlspm"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/perl-modules.html#perl-sgmlspm"
+WEB_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/perl-modules.html#perl-sgmlspm"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/perl-modules.html#perl-sgmlspm"
 REPOLOGY="perl:sgmlspm"
 
 TARBALL="SGMLSpm-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d pgadmin/receipt
--- a/pgadmin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pgadmin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 WEB_SITE="http://www.pgadmin.org"
 WGET_URL="ftp://ftp.ch.postgresql.org/mirror/postgresql/pgadmin3/release/v$VERSION/src/$TARBALL"
 
-DEPENDS="postgresql wxWidgets28 gtk+ libxslt libcomerr3 libkrb5 xorg-libXxf86vm"
+DEPENDS="postgresql wxWidgets28 gtk2 libxslt libcomerr3 libkrb5 xorg-libXxf86vm"
 BUILD_DEPENDS="openssl postgresql postgresql-dev libxslt-dev libxml2-dev \
 wxWidgets28-dev"
 
diff -r 71ba95d2422e -r f48456621a9d pidgin-facebookchat/receipt
--- a/pidgin-facebookchat/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pidgin-facebookchat/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,30 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pidgin-facebookchat"
 VERSION="1.69"
 CATEGORY="network"
-SHORT_DESC="Facebook chat plugin for Pidgin and libpurple messengers."
+SHORT_DESC="Facebook chat plugin for Pidgin and libpurple messengers"
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="GPL3"
+WEB_SITE="https://github.com/dequis/purple-facebook"
+
 TARBALL="$PACKAGE-source-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/dequis/purple-facebook"
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="pidgin zip json-glib"
 BUILD_DEPENDS="libpurple-dev json-glib-dev zlib-dev unzip"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	mv Makefile Makefile.orig
 	sed -e 's/i686-pc-linux-gnu-gcc/gcc/' < Makefile.orig > Makefile
+
 	make libfacebook.so
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/purple-2
 	cp -a $src/libfacebook.so $fs/usr/lib/purple-2
 	
@@ -35,5 +31,5 @@
 	cp -a $stuff/facebook_16x16.png $fs/usr/share/pixmaps/pidgin/protocols/16x16/facebook.png
 	cp -a $stuff/facebook_22x22.png $fs/usr/share/pixmaps/pidgin/protocols/22x22/facebook.png
 	cp -a $stuff/facebook_48x48.png $fs/usr/share/pixmaps/pidgin/protocols/48x48/facebook.png
+	DEPENDS="pidgin zip json-glib"
 }
-
diff -r 71ba95d2422e -r f48456621a9d pidgin-libnotify/receipt
--- a/pidgin-libnotify/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pidgin-libnotify/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,29 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pidgin-libnotify"
 VERSION="0.14"
 CATEGORY="network"
-SHORT_DESC="Notification interface for Pidgin."
+SHORT_DESC="Notification interface for Pidgin"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://gaim-libnotify.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://gaim-libnotify.sourceforge.net/"
-WGET_URL="http://downloads.sourceforge.net/project/gaim-libnotify/$PACKAGE/$PACKAGE-$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/gaim-libnotify/$PACKAGE/$PACKAGE-$VERSION/$TARBALL"
 
-DEPENDS="pidgin libnotify"
-BUILD_DEPENDS="intltool libpurple-dev libnotify-dev pidgin-dev libffi gtk+-dev"
+BUILD_DEPENDS="intltool libpurple-dev libnotify-dev pidgin-dev libffi gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i '/notify_notification_new/s/, NULL,/,/' src/pidgin-libnotify.c
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/purple-2
 	cp -a $install/usr/lib/purple-2/*.so $fs/usr/lib/purple-2
+	DEPENDS="pidgin libnotify"
 }
-
diff -r 71ba95d2422e -r f48456621a9d pidgin-musictracker/receipt
--- a/pidgin-musictracker/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pidgin-musictracker/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,32 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pidgin-musictracker"
 VERSION="0.4.22"
 CATEGORY="network"
-SHORT_DESC="A Pidgin 'now playing' plugin to publicise the songs you are listening to."
+SHORT_DESC="A Pidgin 'now playing' plugin to publicise the songs you are listening to"
 MAINTAINER="ben@seawolfsanctuary.com"
 LICENSE="GPL2"
+WEB_SITE="http://pidgin-musictracker.googlecode.com"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://pidgin-musictracker.googlecode.com"
 WGET_URL="$WEB_SITE/files/$TARBALL"
 
-DEPENDS="pidgin pcre"
 BUILD_DEPENDS="pidgin-dev gettext libpurple-dev pcre-dev dbus-glib-dev \
-gtk+-dev glib-dev libffi"
+gtk2-dev glib-dev libffi"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i  -e 's/g_value_array_free/g_array_unref/' -e 's/GValueArray/GArray/' \
+compile_rules() {
+	sed \
+		-e 's/g_value_array_free/g_array_unref/' \
+		-e 's/GValueArray/GArray/' \
 		-e '/g_value_array_get_nth/{N;s/GValue.*/status = g_array_index(sigstruct, gint, 0);/}' \
-			src/mpris.c
+		-i src/mpris.c
+
 	./configure $CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs
-	cp -a $install/usr $fs/
+genpkg_rules() {
+	copy @std
+	DEPENDS="pidgin pcre"
 }
diff -r 71ba95d2422e -r f48456621a9d pidgin-otr/receipt
--- a/pidgin-otr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pidgin-otr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 WGET_URL="$WEB_SITE$TARBALL"
 
 DEPENDS="pidgin libotr"
-BUILD_DEPENDS="libgpg-error-dev libgcrypt-dev libotr-dev glib-dev gtk+-dev \
+BUILD_DEPENDS="libgpg-error-dev libgcrypt-dev libotr-dev glib-dev gtk2-dev \
 pidgin-dev libpurple-dev intltool"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d pidgin/receipt
--- a/pidgin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pidgin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libgcrypt-dev gnutls-dev \
+BUILD_DEPENDS="gtk2-dev libgcrypt-dev gnutls-dev \
 startup-notification-dev libgpg-error-dev libxml2-dev xorg-libxcb-dev \
 libidn-dev libtasn1-dev intltool expat-dev nss-dev \
 ncurses-dev xorg-xcb-util-dev gmp-dev"
@@ -23,6 +23,7 @@
 
 	# Pidgin doesn't explicitly link to libm
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
+
 	./configure \
 		--disable-perl \
 		--disable-screensaver \
@@ -41,7 +42,7 @@
 		--disable-sm \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make -j 4 &&
+	make -j4 &&
 	make install
 }
 
@@ -58,7 +59,7 @@
 			;;
 		pidgin)
 			copy @std @rm
-			DEPENDS="gtk+ gnutls libgcrypt libgpg-error libpurple \
+			DEPENDS="gtk2 gnutls libgcrypt libgpg-error libpurple \
 			startup-notification gmp xorg-libXdamage libxml2 \
 			xorg-libxcb xorg-xcb-util libidn ncurses libtasn1 nss"
 			PROVIDE="purple"
diff -r 71ba95d2422e -r f48456621a9d pinentry/receipt
--- a/pinentry/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pinentry/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnupg.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pinentry.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pinentry.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/pinentry/$TARBALL"
@@ -15,9 +15,9 @@
 TARBALL_SHA1="693bdf9f48dfb3e040d92f50b1bb464e268b9fb0"
 
 BUILD_DEPENDS="libassuan-dev libgpg-error-dev ncurses-dev libcap-dev \
-libsecret-dev libgcrypt-dev shared-mime-info gtk+-dev gtk+3-dev gcr-dev \
+libsecret-dev libgcrypt-dev shared-mime-info gtk2-dev gtk3-dev gcr-dev \
 fltk-dev"
-SPLIT="pinentry-gtk pinentry-gnome3 pinentry-fltk"
+SPLIT="$PACKAGE-gtk $PACKAGE-gnome3 $PACKAGE-fltk"
 
 compile_rules() {
 	./configure \
@@ -43,19 +43,19 @@
 			DEPENDS="glib libassuan libcap libgpg-error libsecret ncurses"
 			CAT="security|for console"
 			;;
-		pinentry-gtk)
+		*-gtk)
 			copy pinentry-gtk-2
-			DEPENDS="glib gtk+ libassuan libcap libgpg-error libsecret \
+			DEPENDS="glib gtk2 libassuan libcap libgpg-error libsecret \
 			ncurses   pinentry"
 			CAT="security|for GTK+ 2"
 			;;
-		pinentry-gnome3)
+		*-gnome3)
 			copy pinentry-gnome3
 			DEPENDS="gcr-base glib libassuan libcap libgpg-error libsecret \
 			ncurses   pinentry"
 			CAT="security|for GNOME 3"
 			;;
-		pinentry-fltk)
+		*-fltk)
 			copy pinentry-fltk
 			DEPENDS="fltk glib libassuan libcap libgpg-error libsecret \
 			ncurses   pinentry"
diff -r 71ba95d2422e -r f48456621a9d plotdrop/receipt
--- a/plotdrop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/plotdrop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="plotdrop"
 VERSION="0.5.3"
 CATEGORY="graphics"
-SHORT_DESC="A minimal GTK frontend to GNUPlot."
+SHORT_DESC="A minimal GTK frontend to GNUPlot"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://plotdrop.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://plotdrop.sourceforge.net/"
 WGET_URL="$SF_MIRROR/project/$PACKAGE/$TARBALL"
 
-DEPENDS="gnuplot gtk+ libxml2 expat xorg-libX11 libglade"
 BUILD_DEPENDS="libglade-dev glib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make PREFIX=/usr &&
 	make PREFIX=/usr DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	rm $fs/usr/share/$PACKAGE/*.png
+	DEPENDS="gnuplot gtk2 libxml2 expat xorg-libX11 libglade"
 }
diff -r 71ba95d2422e -r f48456621a9d pluma/receipt
--- a/pluma/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pluma/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/pluma/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common yelp-tools gtk-doc gobject-introspection-dev \
-enchant-dev iso-codes-dev gtk+3-dev gtksourceview3-dev libpeas-dev itstool \
+enchant-dev iso-codes-dev gtk3-dev gtksourceview3-dev libpeas-dev itstool \
 xorg-libSM-dev"
 SPLIT="pluma-dev pluma-plugins pluma"
 
@@ -33,14 +33,14 @@
 		*-plugins)
 			copy plugins/ @rm
 			find $fs -name '*.la' -delete
-			DEPENDS="pluma enchant gdk-pixbuf glib gtk+3 gtksourceview3 \
+			DEPENDS="pluma enchant gdk-pixbuf glib gtk3 gtksourceview3 \
 			libpeas libpeas-gtk libxml2 pango python"
 			CAT="text|plugins"
 			;;
 		pluma)
 			copy @std @rm
 			rm -r $fs/usr/lib # -> plugins
-			DEPENDS="atk cairo gdk-pixbuf glib gobject-introspection gtk+3 \
+			DEPENDS="atk cairo gdk-pixbuf glib gobject-introspection gtk3 \
 			gtksourceview3 libpeas libpeas-gtk pango xorg-libICE xorg-libSM \
 			xorg-libX11"
 			;;
diff -r 71ba95d2422e -r f48456621a9d plymouth/receipt
--- a/plymouth/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/plymouth/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.freedesktop.org/software/plymouth/releases/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev pango-dev gtk+-dev xorg-libpciaccess-dev libdrm-dev"
+BUILD_DEPENDS="libpng16-dev pango-dev gtk2-dev xorg-libpciaccess-dev libdrm-dev"
 
 compile_rules() {
 	./configure \
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpng16 pango gtk+ xorg-libpciaccess libdrm"
+	DEPENDS="libpng16 pango gtk2 xorg-libpciaccess libdrm"
 }
diff -r 71ba95d2422e -r f48456621a9d pm-utils/receipt
--- a/pm-utils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pm-utils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="domcox@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://pm-utils.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pm-utils.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pm-utils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://pm-utils.freedesktop.org/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d pnm2ppa/receipt
--- a/pnm2ppa/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pnm2ppa/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,37 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pnm2ppa"
-VERSION="1.12" 
+VERSION="1.12"
 CATEGORY="system-tools"
 SHORT_DESC="Ghostscript print filter and color driver for some HP DeskJet printers"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://pnm2ppa.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://pnm2ppa.sourceforge.net/"
-WGET_URL="http://downloads.sourceforge.net/pnm2ppa/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="ghostscript cups foomatic-filters"
 BUILD_DEPENDS="ghostscript-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make BINDIR="/usr/bin" CONFDIR="/etc" &&
 	make BINDIR=$DESTDIR/usr/bin  CONFDIR=$DESTDIR/etc install
-	
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p  $fs/usr/share
-	
+
 	cp -a $install/etc   $fs
 	cp -a $install/usr/bin $fs/usr
-	
+
 	# Still needs ppd file download for the specific printer from 
 	# http://www.linuxprinting.org/show_driver.cgi?driver=pnm2ppa&fromprinter=HP-DeskJet_710C
-		
+
+	DEPENDS="ghostscript cups foomatic-filters"
 }
-
diff -r 71ba95d2422e -r f48456621a9d pnmixer/receipt
--- a/pnmixer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pnmixer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pnmixer"
 VERSION="0.5.1"
@@ -7,27 +7,27 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/nicklan/pnmixer/wiki"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://cloud.github.com/downloads/nicklan/$PACKAGE/$TARBALL"
 
-DEPENDS="alsa-lib atk bzlib cairo expat fontconfig freetype gcc-lib-base \
-gdk-pixbuf glib glibc-base gtk+ libffi libpng16 xorg-libxcb pango xorg-pixman \
-xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
-xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr \
-xorg-libXrender zlib"
-BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext xorg-libX11-dev gtk+-dev"
+BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext xorg-libX11-dev gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cp $stuff/ru.po $src/po; echo "ru" >> $src/po/LINGUAS
 	sed -i 's|\(ALL_LINGUAS="de fr\)"|\1 ru"|' $src/configure.in
-	cd $src
-	./autogen.sh $CONFIGURE_ARGS && make && make install
+
+	./autogen.sh \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="alsa-lib atk bzlib cairo expat fontconfig freetype gcc-lib-base \
+	gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
+	xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
+	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama \
+	xorg-libXrandr xorg-libXrender zlib"
 }
diff -r 71ba95d2422e -r f48456621a9d polkit-qt/receipt
--- a/polkit-qt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/polkit-qt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/polkit-qt-1"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/kde/polkit-qt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/kde/polkit-qt.html"
 
 TARBALL="polkit-qt-1-$VERSION.tar.bz2"
 WGET_URL="http://download.kde.org/stable/apps/KDE4.x/admin/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d polkit/receipt
--- a/polkit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/polkit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/polkit/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/polkit.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/polkit.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.freedesktop.org/software/polkit/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d polkit105/receipt
--- a/polkit105/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/polkit105/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,7 +9,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/polkit/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/polkit.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/polkit.html"
 REPOLOGY="polkit"
 
 TARBALL="polkit-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d poppler-data/receipt
--- a/poppler-data/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/poppler-data/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="rocky@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://poppler.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/poppler.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/poppler.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://poppler.freedesktop.org/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d poppler/receipt
--- a/poppler/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/poppler/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,15 +7,15 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://poppler.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/poppler.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/poppler.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://poppler.freedesktop.org/$TARBALL"
 
 BUILD_DEPENDS="cmake freetype-dev fontconfig-dev libjpeg-turbo-dev zlib-dev \
-libpng16-dev tiff-dev nss-dev cairo-dev gobject-introspection-dev gtk+3-dev \
+libpng16-dev tiff-dev nss-dev cairo-dev gobject-introspection-dev gtk3-dev \
 gdk-pixbuf-dev openjpeg2-dev lcms2-dev curl-dev poppler-data"
-SPLIT="poppler-apps poppler-dev"
+SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
 compile_rules() {
 	fix math
@@ -42,12 +42,12 @@
 			DEPENDS="cairo fontconfig freetype glib lcms2 libcurl \
 			libjpeg-turbo libpng16 nspr nss openjpeg2 tiff zlib"
 			;;
-		poppler-apps)
+		*-apps)
 			copy bin/
 			CAT="office|utilities to manipulate PDF file"
 			DEPENDS="cairo freetype lcms2 poppler"
 			;;
-		poppler-dev)
+		*-dev)
 			copy @dev @rm
 			DEPENDS="poppler poppler-apps cairo-dev glib-dev"
 			;;
diff -r 71ba95d2422e -r f48456621a9d popt/receipt
--- a/popt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/popt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://directory.fsf.org/wiki/Popt"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/popt.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/popt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://rpm5.org/files/popt/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d postgis/receipt
--- a/postgis/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/postgis/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://download.osgeo.org/postgis/source/$TARBALL"
 
 BUILD_DEPENDS="postgresql-dev geos-dev proj-dev libxml2-dev \
-gtk+-dev gdal-dev jasper-dev curl-dev libpostgresqlclient tiff"
+gtk2-dev gdal-dev jasper-dev curl-dev libpostgresqlclient tiff"
 SPLIT="postgis-gui postgis"
 
 compile_rules() {
@@ -31,7 +31,7 @@
 		postgis-gui)
 			copy shp2pgsql-gui
 			CAT="misc|GUI"
-			DEPENDS="gtk+ postgis"
+			DEPENDS="gtk2 postgis"
 			;;
 		postgis)
 			copy @std @rm
diff -r 71ba95d2422e -r f48456621a9d potamus/receipt
--- a/potamus/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/potamus/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="http://offog.org/files/$TARBALL"
 TAGS="music audio player mp3 ogg flac"
 
-DEPENDS="gtk+ libglade alsa-lib libmad libogg libvorbis libsamplerate" 
-BUILD_DEPENDS="gtk+-dev libglade-dev alsa-lib-dev libmad-dev \
+DEPENDS="gtk2 libglade alsa-lib libmad libogg libvorbis libsamplerate"
+BUILD_DEPENDS="gtk2-dev libglade-dev alsa-lib-dev libmad-dev \
 libogg-dev libvorbis-dev libsamplerate-dev"
 
 # Handle arch install
diff -r 71ba95d2422e -r f48456621a9d potrace/receipt
--- a/potrace/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/potrace/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
 WEB_SITE="http://potrace.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/potrace.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/potrace.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/potrace/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d privoxy/receipt
--- a/privoxy/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/privoxy/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,7 +9,7 @@
 WEB_SITE="http://www.privoxy.org/"
 
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
-WGET_URL="http://downloads.sourceforge.net/ijbswa/$TARBALL"
+WGET_URL="$SF_MIRROR/ijbswa/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev autoconf perl m4 coreutils"
 
diff -r 71ba95d2422e -r f48456621a9d pth/receipt
--- a/pth/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pth/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="fraazz@altern.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.gnu.org/software/pth/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pth.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pth.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d ptlib/receipt
--- a/ptlib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ptlib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MPL"
 WEB_SITE="https://www.ekiga.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/ptlib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/ptlib.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d pulse/receipt
--- a/pulse/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pulse/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/DoMiNeLa10/pulse/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 compile_rules() {
 	make || return 1
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d pulseaudio/receipt
--- a/pulseaudio/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pulseaudio/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1 GPL2 MIT AGPL3 BSD Sun"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/pulseaudio.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/pulseaudio.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.freedesktop.org/software/pulseaudio/releases/$TARBALL"
 
 BUILD_DEPENDS="intltool libtool xorg-libxcb-dev xorg-libICE-dev xorg-libSM-dev \
-xorg-libXtst-dev libcap-dev check-dev libsndfile-dev alsa-lib-dev gtk+3-dev \
+xorg-libXtst-dev libcap-dev check-dev libsndfile-dev alsa-lib-dev gtk3-dev \
 dbus-dev eudev-dev openssl-dev speexdsp-dev"
 SPLIT="pulseaudio-alsa pulseaudio-cli pulseaudio-esound pulseaudio-glib \
 pulseaudio-http pulseaudio-native pulseaudio-rtp pulseaudio-simple pulseaudio \
diff -r 71ba95d2422e -r f48456621a9d puppet/receipt
--- a/puppet/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/puppet/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,22 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="puppet"
 VERSION="2.7.19"
 CATEGORY="system-tools"
-SHORT_DESC="A system for automating system administration tasks."
+SHORT_DESC="A system for automating system administration tasks"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="Apache"
+WEB_SITE="http://www.puppetlabs.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.puppetlabs.com/"
 WGET_URL="http://downloads.puppetlabs.com/puppet/$TARBALL"
 
-DEPENDS="ruby ruby-facter"
 BUILD_DEPENDS="ruby-dev ruby-facter"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	ruby ./install.rb \
 		--destdir=$DESTDIR \
 		--bindir=/usr/bin \
@@ -24,12 +21,11 @@
 		--mandir=/usr/share/man
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs
 	cp -a $install/usr/*bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cd $fs/usr/bin && mv pi puppet-pi
+	DEPENDS="ruby ruby-facter"
 }
diff -r 71ba95d2422e -r f48456621a9d putty/receipt
--- a/putty/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/putty/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://the.earth.li/~sgtatham/putty/latest/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev gtk+3-dev krb5-dev"
+BUILD_DEPENDS="gtk2-dev gtk3-dev krb5-dev"
 SPLIT="putty putty-gtk3:gtk3"
 
 compile_rules() {
@@ -34,12 +34,12 @@
 	case $PACKAGE in
 		putty)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk+ pango xorg-libX11   krb5"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 pango xorg-libX11   krb5"
 			CAT="utilities|using GTK+2"
 			;;
 		putty-gtk3)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk+3 pango xorg-libX11   krb5"
+			DEPENDS="cairo gdk-pixbuf glib gtk3 pango xorg-libX11   krb5"
 			CAT="utilities|using GTK+3"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d puzzles/receipt
--- a/puzzles/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/puzzles/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="gtk+ cairo xorg-libxcb xorg-libXrandr"
-BUILD_DEPENDS="gtk+-dev"
+DEPENDS="gtk2 cairo xorg-libxcb xorg-libXrandr"
+BUILD_DEPENDS="gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d pygtksourceview/receipt
--- a/pygtksourceview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pygtksourceview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="python-dev python-pygtk-dev gtksourceview-dev python-pygobject2-dev libxml2-dev"
-SPLIT="pygtksourceview-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	CFLAGS="$CFLAGS $(pkg-config --cflags pygtk-2.0 gtksourceview-2.0)"
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		pygtksourceview)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk+ gtksourceview   python python-pygtk python-pygobject2"
+			DEPENDS="gdk-pixbuf glib gtk2 gtksourceview   python python-pygtk python-pygobject2"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d python-caja/receipt
--- a/python-caja/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/python-caja/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		python-caja)
 			copy @std
-			DEPENDS="caja glib gtk+3 python"
+			DEPENDS="caja glib gtk3 python"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d python-pygtk/receipt
--- a/python-pygtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/python-pygtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -16,7 +16,7 @@
 
 # using Python3 produce errors
 BUILD_DEPENDS="python-dev python-pygobject2-dev python-pycairo-dev \
-python-numpy glib-dev atk-dev pango-dev gtk+-dev libglade-dev"
+python-numpy glib-dev atk-dev pango-dev gtk2-dev libglade-dev"
 SPLIT="$PACKAGE-demos $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
@@ -39,11 +39,11 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="python-pygtk gtk+-dev python-pygobject2-dev"
+			DEPENDS="python-pygtk gtk2-dev python-pygobject2-dev"
 			;;
 		*)
 			copy @std @rm
-			DEPENDS="python atk cairo gdk-pixbuf glib gtk+ libglade pango"
+			DEPENDS="python atk cairo gdk-pixbuf glib gtk2 libglade pango"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d python-wxpython/receipt
--- a/python-wxpython/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/python-wxpython/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,10 +10,10 @@
 REPOLOGY="python:wxpython"
 
 BUILD_DEPENDS="python python-six python-pypubsub zlib-dev libpng16-dev \
-libjpeg-turbo-dev tiff-dev expat-dev gtk+3-dev glib-dev xorg-libXxf86vm-dev \
+libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev xorg-libXxf86vm-dev \
 xorg-libSM-dev mesa-dev glu-dev libsdl-dev webkit2gtk-dev gstreamer1-dev"
 BUILD_DEPENDS_x86_64="python python-six python-pypubsub zlib-dev libpng16-dev \
-libjpeg-turbo-dev tiff-dev expat-dev gtk+3-dev glib-dev xorg-libXxf86vm-dev \
+libjpeg-turbo-dev tiff-dev expat-dev gtk3-dev glib-dev xorg-libXxf86vm-dev \
 xorg-libSM-dev mesa-dev glu-dev libsdl-dev gstreamer1-dev \
 gst1-plugins-base-dev libnotify-dev cppunit-dev"
 SPLIT="$PACKAGE-dev"
diff -r 71ba95d2422e -r f48456621a9d python/receipt
--- a/python/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/python/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="https://www.python.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/python2.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/python2.html"
 REPOLOGY="python2"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
diff -r 71ba95d2422e -r f48456621a9d pywebkitgtk/receipt
--- a/pywebkitgtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/pywebkitgtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -27,7 +27,7 @@
 		pywebkitgtk)
 			copy @std
 			DEPENDS="atk bzlib cairo enchant fontconfig freetype gdk-pixbuf \
-			glib gst1-plugins-base gstreamer1 gtk+ icu libatomic libffi \
+			glib gst1-plugins-base gstreamer1 gtk2 icu libatomic libffi \
 			libgcrypt libgpg-error libharfbuzz libharfbuzz-icu libicu \
 			libjpeg-turbo liblzma libpng16 libsecret libsoup libsqlite3 \
 			libwebp libxml2 libxslt orc pango pcre python util-linux-blkid \
@@ -39,7 +39,7 @@
 			copy @dev
 			DEPENDS="pywebkitgtk atk-dev bzip2-dev cairo-dev enchant-dev \
 			fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev \
-			gst1-plugins-base-dev gstreamer1-dev gtk+-dev harfbuzz-dev \
+			gst1-plugins-base-dev gstreamer1-dev gtk2-dev harfbuzz-dev \
 			harfbuzz-icu-dev icu-dev libjpeg-turbo-dev libffi-dev \
 			libgcrypt-dev libgpg-error-dev libpng16-dev libsecret-dev \
 			libsoup-dev libwebp-dev libxml2-dev libxslt-dev orc-dev pango-dev \
diff -r 71ba95d2422e -r f48456621a9d qca-ossl/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qca-ossl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,33 @@
+# SliTaz package receipt v2.
+
+PACKAGE="qca-ossl"
+VERSION="2.0.0-beta3"
+CATEGORY="development"
+SHORT_DESC="OpenSSL plug-in for the Qt Cryptographic Architecture (QCA)"
+MAINTAINER="ben@seawolfsanctuary.com"
+LICENSE="LGPL2.1"
+WEB_SITE="http://delta.affinix.com/qca-ossl"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="http://delta.affinix.com/download/qca/2.0/plugins/$TARBALL"
+
+BUILD_DEPENDS="qmake xorg-libX11-dev dbus-dev openssl-dev Qt4-dev qca-dev"
+
+compile_rules() {
+	chmod +x configure
+	./configure \
+		--qtdir=/usr/lib/qt &&
+	make $MAKEFLAGS &&
+	make DESTDIR=$DESTDIR install
+}
+
+genpkg_rules() {
+	mkdir -p $fs/usr/lib/qt/plugins/crypto
+	cp -a $src/lib/* $fs/usr/lib/qt/plugins/crypto/
+
+	# Copy .desktop file:
+#	cp -a $stuff/* $fs/usr
+	DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
+	libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
+	libQtOpenGL libQtSql libQtWebkit qca openssl"
+}
diff -r 71ba95d2422e -r f48456621a9d qca-ossl/stuff/patches/qca-ossl-whirlpool.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qca-ossl/stuff/patches/qca-ossl-whirlpool.patch	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,35 @@
+--- a/qca-ossl.cpp
++++ b/qca-ossl.cpp
+@@ -330,1 +330,1 @@
+-	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, "hash");
++	X509_EXTENSION *ex = X509V3_EXT_conf_nid(NULL, &ctx, NID_subject_key_identifier, (char *)"hash");
+
+--- a/qca-ossl.cpp
++++ b/qca-ossl.cpp
+@@ -6597,9 +6597,11 @@
+ #ifdef SHA512_DIGEST_LENGTH
+ 	list += "sha512";
+ #endif
++ /*
+ #ifdef OBJ_whirlpool
+ 	list += "whirlpool";
+ #endif
++ */
+ 	return list;
+ }
+
+--- a/qca-ossl.cpp
++++ b/qca-ossl.cpp
+@@ -6812,10 +6812,12 @@
+ 		else if ( type == "sha512" )
+ 			return new opensslHashContext( EVP_sha512(), this, type);
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ 		else if ( type == "whirlpool" )
+ 			return new opensslHashContext( EVP_whirlpool(), this, type);
+ #endif
++*/
+ 		else if ( type == "pbkdf1(sha1)" )
+ 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
+ 		else if ( type == "pbkdf1(md2)" )
diff -r 71ba95d2422e -r f48456621a9d qca-ossl/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qca-ossl/stuff/patches/series	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,1 @@
+qca-ossl-whirlpool.patch
diff -r 71ba95d2422e -r f48456621a9d qiv/receipt
--- a/qiv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qiv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev imlib2-dev"
+BUILD_DEPENDS="gtk2-dev imlib2-dev"
 
 compile_rules() {
 	sed -i 's/MAGIC = -DHAVE_MAGIC/# MAGIC = -DHAVE_MAGIC/' Makefile
@@ -21,5 +21,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ imlib2"
+	DEPENDS="gtk2 imlib2"
 }
diff -r 71ba95d2422e -r f48456621a9d qpdf/receipt
--- a/qpdf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qpdf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="mojo@slitaz.org"
 LICENSE="Artistic-2.0"
 WEB_SITE="http://qpdf.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/qpdf.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/qpdf.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d qt4-base/receipt
--- a/qt4-base/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qt4-base/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -20,7 +20,7 @@
 freetype-dev gettext glib-dev jpeg-dev libIDL libcap-dev libpng16-dev libtool \
 libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
 pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
-tiff-dev xorg-dev-proto xorg-dev zip unzip gtk+-dev alsa-lib-dev \
+tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev \
 sqlite3-dev libQtClucene wayland-dev"
 SPLIT="qt-base libQtWebkit qtconfig"
 
diff -r 71ba95d2422e -r f48456621a9d qt4/receipt
--- a/qt4/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qt4/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -20,7 +20,7 @@
 freetype-dev gettext glib-dev jpeg-dev libIDL libcap-dev libpng16-dev libtool \
 libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
 pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
-tiff-dev xorg-dev-proto xorg-dev zip unzip gtk+-dev alsa-lib-dev \
+tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev \
 sqlite3-dev glu-dev glw-dev wayland-dev"
 SPLIT="qt4 libQt3Support libQtClucene libQtCore libQtDBus libQtDeclarative \
 libQtDesigner libQtGui libQtHelp libQtMultimedia libQtNetwork libQtOpenGL \
diff -r 71ba95d2422e -r f48456621a9d qt5/receipt
--- a/qt5/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qt5/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL3 GPL3"
 WEB_SITE="https://www.qt.io/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/qt5.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/qt5.html"
 
 TARBALL="qt-everywhere-src-$VERSION.tar.xz"
 WGET_URL="https://download.qt.io/archive/qt/${VERSION%.*}/$VERSION/single/$TARBALL"
@@ -19,7 +19,7 @@
 openssl-dev sqlite3-dev xorg-libxcb-dev mesa-dev freetype-dev fontconfig-dev \
 libinput-dev harfbuzz-dev libjpeg-turbo-dev libpng16-dev tslib-dev \
 xorg-libX11-dev libxkbcommon-dev xorg-libXrender-dev cups-dev \
-xorg-libXcomposite-dev alsa-lib-dev gst1-plugins-base-dev gtk+3-dev"
+xorg-libXcomposite-dev alsa-lib-dev gst1-plugins-base-dev gtk3-dev"
 # Name split packages according to sources structure, for example:
 # $src/qtgamepad/ -> qt5-gamepad
 SPLIT="qt5-3d        qt5-base             qt5-base-gtk3        \
@@ -186,7 +186,7 @@
 		qt5-base-gtk3)
 			copy libqgtk3.so
 			CAT="development|GTK+3 theme support"
-			DEPENDS="qt5-base atk cairo gdk-pixbuf glib gtk+3 mesa pango \
+			DEPENDS="qt5-base atk cairo gdk-pixbuf glib gtk3 mesa pango \
 			xorg-libX11 xorg-libXext";;
 		qt5-base-egl)
 			copy libQt5Egl*so*
diff -r 71ba95d2422e -r f48456621a9d qterminal/receipt
--- a/qterminal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qterminal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/qterminal/qterminal"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/qterminal.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/qterminal.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/qterminal/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d qtermwidget/receipt
--- a/qtermwidget/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qtermwidget/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/lxde/qtermwidget"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/qtermwidget.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/qtermwidget.html"
 
 # release 0.7.1 tarball missed in GitHub
 #TARBALL="$PACKAGE-$VERSION.tar.xz"
diff -r 71ba95d2422e -r f48456621a9d qtstyleplugins/receipt
--- a/qtstyleplugins/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qtstyleplugins/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,10 +10,10 @@
 WEB_SITE="https://github.com/qt/qtstyleplugins/"
 WGET_URL="${WEB_SITE}archive/${TARBALL/*-}"
 
-DEPENDS="qt5-base gtk+"
+DEPENDS="qt5-base gtk2"
 BUILD_DEPENDS="qt5-dev cmake bison flex gperf ruby-dev xorg-dev mesa-dev \
 freetype-dev fontconfig-dev sqlite3-dev libpng16-dev libjpeg-turbo-dev icu-dev \
-glib-dev zlib-dev libxslt-python libxslt-dev gtk+-dev"
+glib-dev zlib-dev libxslt-python libxslt-dev gtk2-dev"
 
 compile_rules()
 {
diff -r 71ba95d2422e -r f48456621a9d quadrapassel/receipt
--- a/quadrapassel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/quadrapassel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk+3-dev librsvg-dev libcanberra-dev clutter-dev \
+BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev clutter-dev \
 clutter-gtk-dev intltool itstool"
 
 compile_rules() {
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo clutter clutter-gtk glib gtk+3 libcanberra-gtk3 pango"
+	DEPENDS="cairo clutter clutter-gtk glib gtk3 libcanberra-gtk3 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d quarry/receipt
--- a/quarry/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/quarry/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,23 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="quarry"
 VERSION="0.2.0"
 CATEGORY="games"
-SHORT_DESC="Multi-purpose GUI for Go, Amazons and Reversi."
+SHORT_DESC="Multi-purpose GUI for Go, Amazons and Reversi"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://home.gna.org/quarry/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://home.gna.org/quarry/"
 WGET_URL="http://download.gna.org/$PACKAGE/$TARBALL"
-SUGGESTED="gnugo"
 
-DEPENDS="gtk+ librsvg libgsf xorg-xcb-util"
-BUILD_DEPENDS="gtk+-dev librsvg-dev libgsf"
+BUILD_DEPENDS="gtk2-dev librsvg-dev libgsf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/mozilla/firefox/' src/gui-gtk/gtk-help.c
+
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
@@ -29,10 +27,8 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/quarry $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 librsvg libgsf xorg-xcb-util"
+	SUGGESTED="gnugo"
 }
diff -r 71ba95d2422e -r f48456621a9d quodlibet/receipt
--- a/quodlibet/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/quodlibet/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -16,7 +16,7 @@
 gst0-plugins-ugly mutagen python-pygtk gstreamer0"
 BUILD_DEPENDS="python-dbus-dev gst0-python-dev gst0-plugins-base-dev \
 gst0-plugins-good gstreamer0-dev gst0-plugins-ugly python-pygtk-dev intltool \
-gettext gtk+-dev python-dev file"
+gettext gtk2-dev python-dev file"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d qutim/receipt
--- a/qutim/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/qutim/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,7 +10,7 @@
 WEB_SITE="http://qutim.org"
 WGET_URL="$WEB_SITE/dwnl/40/$TARBALL"
 
-DEPENDS="qt4 qca qt4-phonon xorg-libXScrnSaver libjreen Qt4-qca-ossl"
+DEPENDS="qt4 qca qt4-phonon xorg-libXScrnSaver libjreen qca-ossl"
 BUILD_DEPENDS="Qt4-dev qmake cmake qca-dev xorg-libXScrnSaver-dev dbus-dev libjreen-dev mesa-dev"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d rainbow-cm/receipt
--- a/rainbow-cm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rainbow-cm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/rainbow-cm/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake gettext intltool gtk+-dev"
+BUILD_DEPENDS="automake gettext intltool gtk2-dev"
 
 compile_rules() {
 	./autogen.sh &&
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk+ pango xorg-libX11"
+	DEPENDS="glib gtk2 pango xorg-libX11"
 }
diff -r 71ba95d2422e -r f48456621a9d rarian/receipt
--- a/rarian/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rarian/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -8,7 +8,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://rarian.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/rarian.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/rarian.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d rasqal/receipt
--- a/rasqal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rasqal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://librdf.org/rasqal/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/rasqal.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/rasqal.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.librdf.org/source/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d rawstudio/receipt
--- a/rawstudio/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rawstudio/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://rawstudio.org/"
 WGET_URL="http://rawstudio.org/files/release/$TARBALL"
 
-DEPENDS="desktop-file-utils dbus exiv2 gconf gtk+ lcms jpeg libjpeg tiff libxml2"
-BUILD_DEPENDS="exiv2-dev gconf-dev gtk+-dev dbus-dev lcms-dev jpeg-dev tiff-dev libxml2-dev"
+DEPENDS="desktop-file-utils dbus exiv2 gconf gtk2 lcms jpeg libjpeg tiff libxml2"
+BUILD_DEPENDS="exiv2-dev gconf-dev gtk2-dev dbus-dev lcms-dev jpeg-dev tiff-dev libxml2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d realvnc-viewer/receipt
--- a/realvnc-viewer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/realvnc-viewer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="realvnc-viewer"
 VERSION="4.1.1"
 CATEGORY="x-window"
-SHORT_DESC="VNC viewer (graphical remote control)."
+SHORT_DESC="VNC viewer (graphical remote control)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.realvnc.com/"
@@ -12,34 +12,34 @@
 TARBALL="vnc4_${VERSION}+X4.3.0.orig.tar.gz"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/v/vnc4/$TARBALL"
 
-DEPENDS="gcc-lib-base xorg-libXdmcp xorg-libXau xorg-libX11 xorg-libXext \
-xorg-libICE xorg-libSM util-linux-uuid"
 BUILD_DEPENDS="xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev \
 xorg-libXdmcp-dev xorg-libXmu-dev xorg-xorgproto xorg-libXtst-dev"
 
-PROVIDE="vncviewer"
-TAGS="remote-desktop vnc"
+compile_rules() {
+	mv vnc4* $src 2> /dev/null
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mv vnc4* $src 2> /dev/null
 	cd $src
 	for i in unix/tx/TXImage.cxx unix/x0vncserver/Image.cxx \
 		 common/network/TcpSocket.cxx ; do
 		grep -q stdlib $i || sed -i '1i#include <stdlib.h>' $i
 	done
+
 	cd unix
 	export CXXFLAGS="-Wno-narrowing"
-	./configure --prefix=/usr $CONFIGURE_ARGS
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share
-	
+
 	cp -a $src/unix/vncviewer/vncviewer $fs/usr/bin
 	cp -a $stuff/* $fs/usr/share
+	DEPENDS="gcc-lib-base xorg-libXdmcp xorg-libXau xorg-libX11 xorg-libXext \
+	xorg-libICE xorg-libSM util-linux-uuid"
+	PROVIDE="vncviewer"
+	TAGS="remote-desktop vnc"
 }
diff -r 71ba95d2422e -r f48456621a9d redland/receipt
--- a/redland/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/redland/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://librdf.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/redland.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/redland.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.librdf.org/source/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d reiserfsprogs/receipt
--- a/reiserfsprogs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/reiserfsprogs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.sfr-fresh.com/linux/misc/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/reiserfs.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/reiserfs.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d remmina/receipt
--- a/remmina/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/remmina/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -6,43 +6,44 @@
 SHORT_DESC="Remote desktop client written in GTK+"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://$PACKAGE.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
 WGET_URL="https://github.com/FreeRDP/Remmina/archive/v$VERSION.tar.gz"
-PROVIDE="remmina-plugins"
-TAGS="rdp vnc nx xdmcp"
 
-DEPENDS="gtk+ libgcrypt libssh vte freerdp"
-BUILD_DEPENDS="gtk+-dev intltool cmake libgcrypt-dev libssh-dev vte-dev \
+BUILD_DEPENDS="gtk2-dev intltool cmake libgcrypt-dev libssh-dev vte-dev \
 freerdp-dev libvncserver-dev libgnome-keyring-dev gettext telepathy-glib-dev \
 libappindicator-gtk3-dev xorg-libxkbfile-dev"
-SPLIT="remmina-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Here `sed -i '/external_tools/d' ...` because cmake (make install)
 	# produce error trying to install "external tools" to
 	# "$install/root/.remmina/external_tools/"
 	mkdir build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TELEPATHY=OFF \
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DWITH_TELEPATHY=OFF \
 		-DWITH_AVAHI=OFF &&
-	make &&
-	sed -i '/external_tools/d' $src/remmina/cmake_install.cmake &&
-	make DESTDIR=$DESTDIR install
+	make || return 1
+
+	sed -i '/external_tools/d' $src/remmina/cmake_install.cmake
+	make DESTDIR=$DESTDIR install || return 1
+
 	cp -a remmina/include $DESTDIR/usr
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	remmina)
-		cp -a $install/* $fs
-		;;
-	remmina-dev)
-		mkdir -p $fs/usr
-		cp -a $install/usr/include $fs/usr
-		;;
+		remmina)
+			copy @std
+			DEPENDS="gtk2 libgcrypt libssh vte freerdp"
+			PROVIDE="remmina-plugins"
+			TAGS="rdp vnc nx xdmcp"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d rep-gtk/receipt
--- a/rep-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rep-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,12 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://rep-gtk.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/rep-gtk.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/rep-gtk.html"
 
 TARBALL="rep-gtk_$VERSION.tar.xz"
 WGET_URL="http://download.tuxfamily.org/librep/rep-gtk/$TARBALL"
 
-BUILD_DEPENDS="automake libtool librep-dev glib-dev gtk+-dev"
+BUILD_DEPENDS="automake libtool librep-dev glib-dev gtk2-dev"
 SPLIT="rep-gtk-dev"
 
 compile_rules() {
@@ -27,11 +27,11 @@
 	case $PACKAGE in
 		rep-gtk)
 			copy @std
-			DEPENDS="atk gdk-pixbuf glib gtk+"
+			DEPENDS="atk gdk-pixbuf glib gtk2"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="rep-gtk gdk-pixbuf-dev gtk+-dev librep-dev"
+			DEPENDS="rep-gtk gdk-pixbuf-dev gtk2-dev librep-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d retro-gtk/receipt
--- a/retro-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/retro-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja libepoxy-dev glib-dev gtk+3-dev pulseaudio-dev \
+BUILD_DEPENDS="meson ninja libepoxy-dev glib-dev gtk3-dev pulseaudio-dev \
 gobject-introspection-dev vala"
 SPLIT="retro-gtk-dev"
 
@@ -25,7 +25,7 @@
 	case $PACKAGE in
 		retro-gtk)
 			copy @std
-			DEPENDS="cairo gdk-pixbuf glib gtk+3 libepoxy pulseaudio"
+			DEPENDS="cairo gdk-pixbuf glib gtk3 libepoxy pulseaudio"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d rhythmcat2/receipt
--- a/rhythmcat2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rhythmcat2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$COMMIT.tar.gz"
 WGET_URL="$WEB_SITE/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev gtk+3-dev curl-dev \
+BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev gtk3-dev curl-dev \
 intltool"
 
 compile_rules() {
@@ -30,5 +30,5 @@
 
 genpkg_rules() {
 	copy RhythmCat2 *.so* *.PNG *.desktop *.mo
-	DEPENDS="gst0-plugins-base gtk+3 xorg-libXdamage"
+	DEPENDS="gst0-plugins-base gtk3 xorg-libXdamage"
 }
diff -r 71ba95d2422e -r f48456621a9d ristretto/receipt
--- a/ristretto/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ristretto/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool libexif-dev gtk+-dev dbus-glib-dev libxfce4util-dev \
+BUILD_DEPENDS="intltool libexif-dev gtk2-dev dbus-glib-dev libxfce4util-dev \
 libxfce4ui-dev libmagic-dev"
 
 compile_rules() {
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk+ libexif libmagic libxfce4ui \
+	DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk2 libexif libmagic libxfce4ui \
 	libxfce4util pango xfconf xorg-libX11"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d rox-filer-locales/receipt
--- a/rox-filer-locales/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rox-filer-locales/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rox-filer-locales"
 VERSION="2.8"
 CATEGORY="localization"
-SHORT_DESC="locales for the rox-filer."
+SHORT_DESC="Locales for the rox-filer"
 MAINTAINER="sygne@ombres.eu"
 LICENSE="GPL2"
 WEB_SITE="http://rox.sourceforge.net/desktop/"
@@ -11,26 +11,17 @@
 
 SOURCE="rox-filer"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WGET_URL="http://downloads.sourceforge.net/rox/$TARBALL"
+WGET_URL="$SF_MIRROR/rox/$TARBALL"
 
-DEPENDS="rox-filer"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	
+compile_rules() {
 	mkdir -p $DESTDIR
 	cp -r $src/ROX-Filer/Messages $DESTDIR/
-	
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/rox-filer
 	cp -r $install/* $fs/usr/share/rox-filer/
-	
+
 	strip -s $fs/usr/share/rox-filer/* || true
+	DEPENDS="rox-filer"
 }
-
diff -r 71ba95d2422e -r f48456621a9d rox-filer/receipt
--- a/rox-filer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rox-filer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="$SF_MIRROR/rox/$TARBALL"
 TAGS="file-manager"
 
-DEPENDS="gtk+ libglade libxml2 xorg-libXdamage shared-mime-info xorg-libSM"
-BUILD_DEPENDS="libglade-dev libxml2-dev gtk+-dev shared-mime-info-dev \
+DEPENDS="gtk2 libglade libxml2 xorg-libXdamage shared-mime-info xorg-libSM"
+BUILD_DEPENDS="libglade-dev libxml2-dev gtk2-dev shared-mime-info-dev \
 xorg-libSM-dev"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d rp-pppoe/receipt
--- a/rp-pppoe/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rp-pppoe/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -16,7 +16,9 @@
 
 compile_rules() {
 	cd $src/src
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 71ba95d2422e -r f48456621a9d rpcsvc-proto/receipt
--- a/rpcsvc-proto/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rpcsvc-proto/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD3"
 WEB_SITE="https://github.com/thkukuk/rpcsvc-proto"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/rpcsvc-proto.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/rpcsvc-proto.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/thkukuk/rpcsvc-proto/archive/v$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d ruby-gtk2/receipt
--- a/ruby-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ruby-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 WGET_URL="https://rubygems.org/downloads/$TARBALL"
 
 BUILD_DEPENDS="ruby-dev ruby-glib2-dev ruby-cairo-dev ruby-cairo-gobject-dev \
-gtk+-dev ruby-gobject-introspection-dev ruby-pango-dev"
+gtk2-dev ruby-gobject-introspection-dev ruby-pango-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -31,12 +31,12 @@
 	case $PACKAGE in
 		*-dev)
 			copy @ruby-dev
-			DEPENDS="ruby-gtk2 gtk+-dev"
+			DEPENDS="ruby-gtk2 gtk2-dev"
 			;;
 		*)
 			copy @ruby
 			DEPENDS="ruby ruby-atk ruby-gdk_pixbuf2 ruby-pango cairo \
-			gdk-pixbuf glib gtk+ pango xorg-libX11"
+			gdk-pixbuf glib gtk2 pango xorg-libX11"
 			TAGS="ruby programming gtk development"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d rust/receipt
--- a/rust/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/rust/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT Apache BSD"
 WEB_SITE="https://www.rust-lang.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/rust.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/rust.html"
 HOST_ARCH="i486 x86_64"
 
 TARBALL="rust-$VERSION-${ARCH/i486/i686}-unknown-linux-gnu.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d sakura-gtk2/receipt
--- a/sakura-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sakura-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="sakura-gtk2"
-VERSION="2.4.2" # last sakura with gtk+2 is 2.4.2
+VERSION="2.4.2" # last sakura with gtk2 is 2.4.2
 CATEGORY="utilities"
 SHORT_DESC="Simple GTK+2 and VTE-based terminal emulator"
 MAINTAINER="pankso@slitaz.org"
@@ -11,8 +11,7 @@
 TARBALL="sakura-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS_arm="gtk+-dev vte-dev xorg-libXdamage-dev xorg-libXi-dev"
-BUILD_DEPENDS="cmake glib-dev gtk+-dev vte-gtk2-dev gettext"
+BUILD_DEPENDS="cmake glib-dev gtk2-dev vte-gtk2-dev gettext"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -37,7 +36,7 @@
 {
 	copy @std
 	TAGS="terminal"
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango vte-gtk2 \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango vte-gtk2 \
 	xorg-libX11 xorg-libXext"
 	PROVIDE="sakura"
 }
diff -r 71ba95d2422e -r f48456621a9d sakura/receipt
--- a/sakura/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sakura/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="sakura-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="cmake glib-dev gtk+3-dev vte-dev gettext"
+BUILD_DEPENDS="cmake glib-dev gtk3-dev vte-dev gettext"
 
 compile_rules() {
 	sed -i '/TryExec/d; s|Icon=.*|Icon=utilities-terminal|' sakura.desktop
@@ -29,5 +29,5 @@
 genpkg_rules() {
 	copy @std
 	TAGS="terminal"
-	DEPENDS="glib gtk+3 pango vte"
+	DEPENDS="glib gtk3 pango vte"
 }
diff -r 71ba95d2422e -r f48456621a9d samba/receipt
--- a/samba/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/samba/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.samba.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/samba.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/samba.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://download.samba.org/pub/samba/stable/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d sbxkb/receipt
--- a/sbxkb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sbxkb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,11 +11,11 @@
 WGET_URL="$SF_MIRROR/staybox/$TARBALL"
 
 DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base \
-gdk-pixbuf glib glibc-base gtk+ libffi libpng16 xorg-libxcb pango \
+gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
 xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
 xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
 xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d scim-pinyin/receipt
--- a/scim-pinyin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/scim-pinyin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -32,7 +32,7 @@
 	case $PACKAGE in
 		scim-pinyin)
 			copy @std
-			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ \
+			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk2 \
 			harfbuzz libffi libltdl liblzma libpng16 xorg-libxcb libxml2 pango \
 			pcre xorg-pixman scim xorg-libX11 xorg-libXau xorg-libXdmcp \
 			xorg-libXext xorg-libXrender zlib"
@@ -40,7 +40,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \
-			gdk-pixbuf-dev glib-dev glibc-dev gtk+-dev harfbuzz-dev libffi-dev \
+			gdk-pixbuf-dev glib-dev glibc-dev gtk2-dev harfbuzz-dev libffi-dev \
 			xz-dev libpng16-dev libtool xorg-libxcb-dev libxml2-dev \
 			pango-dev pcre-dev xorg-pixman-dev scim-dev xorg-libX11-dev \
 			xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
diff -r 71ba95d2422e -r f48456621a9d scim/receipt
--- a/scim/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/scim/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/scim-im/scim/archive/$TARBALL"
 
 BUILD_DEPENDS="gettext automake intltool libtool doxygen coreutils-path \
-libxslt docbook-xsl gtk+-dev xorg-libX11-dev"
+libxslt docbook-xsl gtk2-dev xorg-libX11-dev"
 SPLIT="scim-dev"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		scim)
 			copy @std
-			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ \
+			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk2 \
 			harfbuzz libffi libltdl liblzma libpng16 xorg-libxcb libxml2 pango \
 			pcre xorg-pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \
 			xorg-libXrender zlib"
@@ -39,7 +39,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="scim atk-dev bzip2-dev cairo-dev fontconfig-dev \
-			freetype-dev gdk-pixbuf-dev glib-dev glibc-dev gtk+-dev \
+			freetype-dev gdk-pixbuf-dev glib-dev glibc-dev gtk2-dev \
 			harfbuzz-dev libffi-dev xz-dev libpng16-dev libtool \
 			xorg-libxcb-dev libxml2-dev pango-dev pcre-dev xorg-pixman-dev \
 			xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \
diff -r 71ba95d2422e -r f48456621a9d scite/receipt
--- a/scite/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/scite/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="scite"
 VERSION="4.0.1"
@@ -6,17 +6,14 @@
 SHORT_DESC="Editor with syntax highlighting and source code editing features."
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="PSL"
+WEB_SITE="https://www.scintilla.org/"
+
 TARBALL="${PACKAGE}${VERSION//./}.tgz"
-WEB_SITE="https://www.scintilla.org/"
 WGET_URL="$SF_MIRROR/scintilla/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="gtk+ xorg-libXdamage gcc-lib-base"
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Build scintilla
 	cd $src/scintilla/gtk
 	make GTK2=1 prefix=/usr
@@ -24,20 +21,20 @@
 	# Build SciTE
 	cd $src/scite/gtk
 	make GTK2=1 prefix=/usr &&
-	make prefix=/usr install && {
-		# Desktop file and icon
-		mkdir -p $DESTDIR/usr/share/applications $DESTDIR/usr/share/pixmaps
-		cp SciTE.desktop $DESTDIR/usr/share/applications
-		cp Sci48M.png $DESTDIR/usr/share/pixmaps
-	}
+	make prefix=/usr install || return 1
+
+	# Desktop file and icon
+	mkdir -p $DESTDIR/usr/share/applications $DESTDIR/usr/share/pixmaps
+	cp SciTE.desktop $DESTDIR/usr/share/applications
+	cp Sci48M.png $DESTDIR/usr/share/pixmaps
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications $fs/usr/share/pixmaps
 	cp -a $install/usr $fs
 	# Save space ~100kb
 	rm $fs/usr/share/scite/*.html
 	rm $fs/usr/share/scite/*.png
+	DEPENDS="gtk2 xorg-libXdamage gcc-lib-base"
+	TAGS="text-editor"
 }
diff -r 71ba95d2422e -r f48456621a9d scons/receipt
--- a/scons/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/scons/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="chadi.elahmad@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://scons.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/scons.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/scons.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d scons2/receipt
--- a/scons2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/scons2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://scons.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/scons.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/scons.html"
 REPOLOGY="scons"
 
 TARBALL="scons-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d screen/receipt
--- a/screen/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/screen/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/screen"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/screen.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/screen.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d screentest/receipt
--- a/screentest/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/screentest/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/TobiX/screentest/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk+-dev libglade-dev automake autoconf libtool"
+BUILD_DEPENDS="gtk2-dev libglade-dev automake autoconf libtool"
 
 compile_rules() {
 	sed -i 's/prune , -name/prune -or -name/' autogen.sh
@@ -25,6 +25,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ libglade"
+	DEPENDS="gtk2 libglade"
 	TAGS="test diagnostic screen"
 }
diff -r 71ba95d2422e -r f48456621a9d sddm/receipt
--- a/sddm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sddm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,14 +7,14 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-3"
 WEB_SITE="https://github.com/sddm/sddm"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/sddm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/sddm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/sddm/sddm/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake extra-cmake-modules xorg-libxcb-dev qt5-dev mesa-dev \
 python-docutils"
-SPLIT="sddm-theme-elarun sddm-theme-maldives sddm-theme-maya sddm"
+SPLIT="$PACKAGE-theme-elarun $PACKAGE-theme-maldives $PACKAGE-theme-maya $PACKAGE"
 
 compile_rules() {
 	sed -i '/UPOWER_SERVICE)/ s|^|//|' src/daemon/PowerManager.cpp
@@ -31,7 +31,8 @@
 	adduser  -g "SDDM Daemon"   -h /var/lib/sddm   -u 64   -G sddm \
 		-s /bin/false   -D   sddm
 
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -50,15 +51,15 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		sddm-theme-elarun)
+		*-theme-elarun)
 			copy elarun/
 			CAT="customization|theme Elarun"
 			;;
-		sddm-theme-maldives)
+		*-theme-maldives)
 			copy maldives/
 			CAT="customization|theme Maldives"
 			;;
-		sddm-theme-maya)
+		*-theme-maya)
 			copy maya/
 			CAT="customization|theme Maya"
 			;;
diff -r 71ba95d2422e -r f48456621a9d seamonkey/receipt
--- a/seamonkey/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/seamonkey/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,9 +11,9 @@
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$VERSION/source/$TARBALL"
 TAGS="web-browser"
 
-DEPENDS="gtk+ glib jpeg xorg-libX11 libIDL alsa-lib xorg-libXt curl libnotify \
+DEPENDS="gtk2 glib jpeg xorg-libX11 libIDL alsa-lib xorg-libXt curl libnotify \
 libevent libvpx"
-BUILD_DEPENDS="gtk+-dev zip libIDL coreutils xorg-libXft-dev libevent-dev \
+BUILD_DEPENDS="gtk2-dev zip libIDL coreutils xorg-libXft-dev libevent-dev \
 libvpx-dev perl alsa-lib alsa-lib-dev findutils python python-dev \
 wireless_tools-dev mesa-dev yasm libnotify-dev curl-dev hunspell-dev"
 
diff -r 71ba95d2422e -r f48456621a9d searchmonkey/receipt
--- a/searchmonkey/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/searchmonkey/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,31 +1,25 @@
-# SliTaz package receipt
+# SliTaz package receipt v2.
 
 PACKAGE="searchmonkey"
 VERSION="0.8.1"
 CATEGORY="utilities"
-SHORT_DESC="A fast real-time search engine using GTK+."
+SHORT_DESC="A fast real-time search engine using GTK+"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="LGPL2.1"
+WEB_SITE="http://searchmonkey.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://searchmonkey.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ libglade xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev libglade-dev xorg-libXdamage-dev"
+BUILD_DEPENDS="gtk2-dev libglade-dev xorg-libXdamage-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{	
-	cd $src
-	./configure && 
+compile_rules() {
+	./configure &&
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 libglade xorg-libXdamage"
 }
-
diff -r 71ba95d2422e -r f48456621a9d seed/receipt
--- a/seed/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/seed/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -30,14 +30,14 @@
 		seed)
 			copy @std
 			DEPENDS="atk cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
-			glib gmp gobject-introspection gtk+ libffi libsqlite3 webkitgtk \
+			glib gmp gobject-introspection gtk2 libffi libsqlite3 webkitgtk \
 			libxml2 mpfr ncurses pango readline"
 			;;
 		seed-dev)
 			copy @dev
 			DEPENDS="seed atk-dev bzip2-dev cairo-dev dbus-dev dbus-glib-dev \
 			fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev gmp-dev \
-			gobject-introspection-dev gtk+-dev harfbuzz-dev icu-dev libffi-dev \
+			gobject-introspection-dev gtk2-dev harfbuzz-dev icu-dev libffi-dev \
 			libpng16-dev webkitgtk-dev libxml2-dev mpfr-dev pango-dev pcre-dev \
 			readline-dev sqlite3-dev util-linux-blkid-dev util-linux-mount-dev \
 			util-linux-uuid-dev xorg-libX11-dev xorg-libXau-dev \
diff -r 71ba95d2422e -r f48456621a9d serf/receipt
--- a/serf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/serf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="Apache"
 WEB_SITE="https://serf.apache.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/serf.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/serf.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://archive.apache.org/dist/serf/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d sg3_utils/receipt
--- a/sg3_utils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sg3_utils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,13 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL BSD"
 WEB_SITE="http://sg.danny.cz/sg/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/sg3_utils.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/sg3_utils.html"
 REPOLOGY="sg3-utils"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://sg.danny.cz/sg/p/$TARBALL"
 
-SPLIT="libsgutils2 sg3_utils sg3_utils-dev"
+SPLIT="libsgutils2 $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r 71ba95d2422e -r f48456621a9d sharutils/receipt
--- a/sharutils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sharutils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/sharutils/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/sharutils.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/sharutils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d skypefreak/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skypefreak/description.txt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,34 @@
+A Forensic Framework for Skype.
+Default run of the program produces the following output:
+
+8""""8                         
+8      e   e  e    e eeeee eeee
+8eeeee 8   8  8    8 8   8 8   
+    88 8eee8e 8eeee8 8eee8 8eee
+e   88 88   8   88   88    88  
+8eee88 88   8   88   88    88ee
+
+    8""""                         
+    8     eeeee  eeee eeeee e   e 
+    8eeee 8   8  8    8   8 8   8 
+    88    8eee8e 8eee 8eee8 8eee8e
+    88    88   8 88   88  8 88   8
+    88    88   8 88ee 88  8 88   8
+
+
+[*] A creation of Osanda Malith & contributors
+[*] Follow @OsandaMalith and @yasoobkhalid
+[*] URL: http://osandamalith.github.io/SkypeFreak/
+
+[~] What Do You Like to Investigate?
+1. Profile
+2. Contact
+3. Calls
+4. Messages
+5. Generate Full Report
+6. Print the list of contributors & exit
+7. Exit
+
+Select the option which you deem suitable for the given conditions. After that
+Skype Freak will perform the given task and will print the output to console
+and will ask you to write the extracted data to disk.
diff -r 71ba95d2422e -r f48456621a9d skypefreak/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skypefreak/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,23 @@
+# SliTaz package receipt v2.
+
+PACKAGE="skypefreak"
+GITHASH="1efb36233858c580f0431a6e69be05030919f7cc"
+VERSION=${GITHASH:0:7}
+CATEGORY="network"
+SHORT_DESC="A cross platform forensic tool for Skype"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL3"
+WEB_SITE="https://github.com/yasoob/SkypeFreak"
+
+TARBALL="SkypeFreak-$VERSION.zip"
+WGET_URL="https://github.com/yasoob/SkypeFreak/archive/$GITHASH.zip"
+
+genpkg_rules() {
+	mkdir -p $fs/usr/bin $fs/usr/share/applications
+	cp -a $src/source/SkypeFreak.py $fs/usr/bin
+	cp -a $stuff/*.desktop $fs/usr/share/applications
+
+	# fix bug with unicode strings (I'm not a pythonist, sorry)
+	sed -i 's|str(|unicode(|g' $fs/usr/bin/SkypeFreak.py
+	DEPENDS="python"
+}
diff -r 71ba95d2422e -r f48456621a9d skypefreak/stuff/skypefreak.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skypefreak/stuff/skypefreak.desktop	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=SkypeFreak
+Comment=A Forensic Framework for Skype
+Exec=terminal -h -e "python /usr/bin/SkypeFreak.py"
+Icon=application-x-php
+Categories=ConsoleOnly;Network;
diff -r 71ba95d2422e -r f48456621a9d slang/receipt
--- a/slang/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/slang/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.jedsoft.org/slang/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/slang.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/slang.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.jedsoft.org/releases/slang/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d slitaz-dev-pkgs/receipt
--- a/slitaz-dev-pkgs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/slitaz-dev-pkgs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-dev-pkgs"
 VERSION="1.2"
@@ -9,16 +9,13 @@
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="binutils linux-api-headers gcc make bzip2-dev coreutils bash bison \
-flex libtool gettext m4 perl perl-xml-parser perl-xml-simple ncurses-dev \
-pcre-dev libcap-dev sqlite3-dev zlib-dev pkg-config fontconfig-dev freetype-dev \
-glibc-dev libpng16-dev jpeg-dev tiff-dev libxml2-dev xorg-dev-proto xorg-dev \
-pango-dev atk-dev cairo-dev expat-dev glib-dev gtk+-dev libIDL zip poppler-dev \
-python patch openssl mercurial rsync wget xorg-pixman-dev \
-autoconf automake"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir $fs/var
+	DEPENDS="binutils linux-api-headers gcc make bzip2-dev coreutils bash \
+	bison flex libtool gettext m4 perl perl-xml-parser perl-xml-simple \
+	ncurses-dev pcre-dev libcap-dev sqlite3-dev zlib-dev pkg-config \
+	fontconfig-dev freetype-dev glibc-dev libpng16-dev jpeg-dev tiff-dev \
+	libxml2-dev xorg-dev-proto xorg-dev pango-dev atk-dev cairo-dev expat-dev \
+	glib-dev gtk2-dev libIDL zip poppler-dev python patch openssl mercurial \
+	rsync wget xorg-pixman-dev autoconf automake"
 }
diff -r 71ba95d2422e -r f48456621a9d slsnif/receipt
--- a/slsnif/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/slsnif/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,29 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slsnif"
 VERSION="0.4.4"
 CATEGORY="system-tools"
-SHORT_DESC="Serial line sniffer."
+SHORT_DESC="Serial line sniffer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://slsnif.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://slsnif.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
diff -r 71ba95d2422e -r f48456621a9d solid/receipt
--- a/solid/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/solid/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/solid"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/lxqt/lxqt-solid.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/lxqt-solid.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d sonata/receipt
--- a/sonata/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sonata/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 
 DEPENDS="python-pygtk python-mpd python-dbus mpd libffi"
 BUILD_DEPENDS="python-pygtk-dev python-dbus-dev python-pygobject2-dev gettext \
-acl libcroco python-dev gtk+-dev libffi-dev"
+acl libcroco python-dev gtk2-dev libffi-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d songwrite/receipt
--- a/songwrite/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/songwrite/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -21,6 +21,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="python editobj gtk+ python-pycairo"
-	SUGGESTED="TiMidity++ evince"
+	DEPENDS="python editobj gtk2 python-pycairo"
+	SUGGESTED="timidity++ evince"
 }
diff -r 71ba95d2422e -r f48456621a9d spacefm/receipt
--- a/spacefm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/spacefm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/IgnorantGuru/spacefm/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="intltool gtk+-dev gtk+3-dev startup-notification-dev eudev-dev \
+BUILD_DEPENDS="intltool gtk2-dev gtk3-dev startup-notification-dev eudev-dev \
 ffmpegthumbnailer-dev"
 SPLIT="spacefm spacefm-gtk2:gtk2 spacefm-gtk3:gtk3"
 
@@ -50,14 +50,14 @@
 		spacefm-gtk2)
 			copy @std @ico
 			CAT="system-tools|with GTK+2 interface"
-			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk+ pango \
+			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk2 pango \
 			startup-notification xorg-libX11   bash"
 			TAGS="file-manager"
 			;;
 		spacefm-gtk3)
 			copy @std @ico
 			CAT="system-tools|with GTK+3 interface"
-			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk+3 pango \
+			DEPENDS="cairo eudev ffmpegthumbnailer gdk-pixbuf glib gtk3 pango \
 			startup-notification xorg-libX11   bash"
 			TAGS="file-manager"
 			;;
diff -r 71ba95d2422e -r f48456621a9d speakup-utils/receipt
--- a/speakup-utils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/speakup-utils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -6,17 +6,15 @@
 SHORT_DESC="Tiny utilities for controlling the Speakup screenreader"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
-SOURCE="speakup"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://linux-speakup.org/"
+
+TARBALL="speakup-$VERSION.tar.bz2"
 WGET_URL="ftp://linux-speakup.org/pub/speakup/$TARBALL"
 
-DEPENDS="linux-speakup"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cd $src/tools
 	install -D -m755 speakupconf "$fs/usr/bin/speakupconf" || return 1
 	install -D -m755 talkwith "$fs/usr/sbin/talkwith" || return 1
+	DEPENDS="linux-speakup"
 }
diff -r 71ba95d2422e -r f48456621a9d speex/receipt
--- a/speex/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/speex/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.speex.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/speex.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/speex.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://downloads.xiph.org/releases/speex/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d speexdsp/receipt
--- a/speexdsp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/speexdsp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://www.speex.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/speex.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/speex.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://downloads.xiph.org/releases/speex/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d spicview/receipt
--- a/spicview/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/spicview/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/spicview/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool gettext glib-dev intltool gtk+-dev \
+BUILD_DEPENDS="automake libtool gettext glib-dev intltool gtk2-dev \
 gdk-pixbuf-dev libjpeg-turbo-dev libsmfm-gtk-dev libsmfm-core-dev"
 
 compile_rules() {
@@ -29,6 +29,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ libjpeg-turbo libsmfm-core libsmfm-gtk \
+	DEPENDS="cairo gdk-pixbuf glib gtk2 libjpeg-turbo libsmfm-core libsmfm-gtk \
 	pango"
 }
diff -r 71ba95d2422e -r f48456621a9d splix/receipt
--- a/splix/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/splix/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="splix"
 VERSION="2.0.0"
@@ -7,30 +7,27 @@
 LICENSE="GPL2"
 SHORT_DESC="CUPS drivers for SPL (Samsung Printer Language) printers"
 WEB_SITE="http://splix.ap2c.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://downloads.sourceforge.net/splix/$TARBALL"
-TAGS=""
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="cups gcc gcc-lib-base"
-BUILD_DEPENDS="cups cups-dev jbigkit"
-
-# Rules to configure and make the package.
+BUILD_DEPENDS="cups-dev jbigkit"
 
 compile_rules() {
-	  cd $src
-	  sed -i 's/Value::Value &val/Value \&val/' src/ppdfile.cpp
-	  make &&
-	  make  CUPSFILTER=/`cups-config --serverbin`/filter \
-			CUPSPPD=/`cups-config --datadir`/model \
-			install
+	sed -i 's/Value::Value &val/Value \&val/' src/ppdfile.cpp
+
+	make &&
+	make \
+		CUPSFILTER=/$(cups-config --serverbin)/filter \
+		CUPSPPD=/$(cups-config --datadir)/model \
+		install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	mkdir -p $fs/usr/lib $fs/usr/share
 	cp -a $install/usr/lib/cups $fs/usr/lib/
 	cp -a $install/usr/share/cups $fs/usr/share		
 	# gzip all ppd files
 	find $fs/usr/share/cups/model -name "*.ppd" | xargs gzip -n9
+	DEPENDS="cups"
 }
diff -r 71ba95d2422e -r f48456621a9d stardict/receipt
--- a/stardict/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/stardict/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://stardict-3.googlecode.com/files/$TARBALL"
 
-BUILD_DEPENDS="bzip2 enchant-dev tar intltool popt libsigc++-dev gtk+-dev \
+BUILD_DEPENDS="bzip2 enchant-dev tar intltool popt libsigc++-dev gtk2-dev \
 xorg-libSM-dev zlib-dev util-linux-uuid-dev libffi"
 
 compile_rules() {
@@ -35,5 +35,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="enchant libsigc++ gtk+ xorg-libSM"
+	DEPENDS="enchant libsigc++ gtk2 xorg-libSM"
 }
diff -r 71ba95d2422e -r f48456621a9d steadyflow/receipt
--- a/steadyflow/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/steadyflow/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="https://launchpad.net/$PACKAGE/trunk/$VERSION/+download/$TARBALL"
 TAGS="gtk3"
 
-DEPENDS="gtk+3 libgee libnotify"
-BUILD_DEPENDS="cmake vala gtk+3-dev glib-dev libgee-dev libnotify-dev"
+DEPENDS="gtk3 libgee libnotify"
+BUILD_DEPENDS="cmake vala gtk3-dev glib-dev libgee-dev libnotify-dev"
 
 BUGS="Not able to download anything. Gnome-VFS error?"
 
diff -r 71ba95d2422e -r f48456621a9d stjerm-terminal/receipt
--- a/stjerm-terminal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/stjerm-terminal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -15,7 +15,7 @@
 TAGS="terminal"
 
 DEPENDS="vte-gtk2"
-BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk+-dev automake"
+BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk2-dev automake"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d streamripper/receipt
--- a/streamripper/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/streamripper/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://streamripper.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ libmad libvorbis faad2 glibc-base"
-BUILD_DEPENDS="gtk+-dev libmad-dev"
+DEPENDS="gtk2 libmad libvorbis faad2 glibc-base"
+BUILD_DEPENDS="gtk2-dev libmad-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d stuurman-desktop/receipt
--- a/stuurman-desktop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/stuurman-desktop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/sde-gui/stuurman-desktop/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="automake libtool gettext glib-dev intltool xorg-libX11-dev \
-libsde-utils-x11-dev pango-dev shared-mime-info libsmfm-core-dev gtk+-dev \
+libsde-utils-x11-dev pango-dev shared-mime-info libsmfm-core-dev gtk2-dev \
 libsmfm-gtk-dev"
 
 compile_rules() {
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ libsde-utils-x11 libsmfm-core \
+	DEPENDS="cairo gdk-pixbuf glib gtk2 libsde-utils-x11 libsmfm-core \
 	libsmfm-gtk pango xorg-libX11"
 }
diff -r 71ba95d2422e -r f48456621a9d stuurman/receipt
--- a/stuurman/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/stuurman/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/sde-gui/stuurman/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="automake libtool gettext glib-dev intltool xorg-libX11-dev \
-pango-dev shared-mime-info libsmfm-core-dev gtk+-dev libsmfm-gtk-dev"
+pango-dev shared-mime-info libsmfm-core-dev gtk2-dev libsmfm-gtk-dev"
 
 compile_rules() {
 	# hardcoded to use automake-1.11 ... 1.15, but we have automake-1.16 only
@@ -28,5 +28,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk+ libsmfm-core libsmfm-gtk"
+	DEPENDS="glib gtk2 libsmfm-core libsmfm-gtk"
 }
diff -r 71ba95d2422e -r f48456621a9d subversion/receipt
--- a/subversion/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/subversion/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="lehswe@gmail.com"
 LICENSE="Apache"
 WEB_SITE="http://subversion.apache.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/subversion.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/subversion.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://archive.apache.org/dist/subversion/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d sudoku-savant/receipt
--- a/sudoku-savant/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sudoku-savant/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,10 +10,10 @@
 WEB_SITE="https://sourceforge.net/projects/sudoku-savant/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="expat gtk+ xorg-libX11 xorg-libXau xorg-libXcomposite \
+DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
 xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXrandr \
 xorg-libXrender xorg-libXinerama xorg-libXdamage gcc-lib-base"
-BUILD_DEPENDS="gtk+-dev libpthread-stubs desktop-file-utils-extra \
+BUILD_DEPENDS="gtk2-dev libpthread-stubs desktop-file-utils-extra \
 coreutils-operations"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d superswitcher/receipt
--- a/superswitcher/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/superswitcher/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL"
 
-BUILD_DEPENDS="perl-xml-parser intltool glib-dev gtk+-dev libwnck2-dev \
+BUILD_DEPENDS="perl-xml-parser intltool glib-dev gtk2-dev libwnck2-dev \
 xorg-libXcomposite-dev xorg-libXrender-dev autoconf automake"
 
 compile_rules() {
@@ -33,5 +33,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ libwnck2 gconf"
+	DEPENDS="gtk2 libwnck2 gconf"
 }
diff -r 71ba95d2422e -r f48456621a9d surf/receipt
--- a/surf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/surf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://dl.suckless.org/surf/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev webkitgtk-dev"
+BUILD_DEPENDS="gtk2-dev webkitgtk-dev"
 
 compile_rules() {
 	sed -i 's|/usr/local|/usr|' config.mk
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libsoup pango \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libsoup pango \
 	webkitgtk xorg-libX11"
 	SUGGESTED="dmenu"
 	TAGS="web-browser"
diff -r 71ba95d2422e -r f48456621a9d surf2/receipt
--- a/surf2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/surf2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="surf-$VERSION.tar.gz"
 WGET_URL="https://dl.suckless.org/surf/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev webkit2gtk-dev"
+BUILD_DEPENDS="gtk2-dev webkit2gtk-dev"
 
 compile_rules() {
 	sed -i 's|/usr/local|/usr|' config.mk
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libsoup pango webkit2gtk \
+	DEPENDS="atk cairo gdk-pixbuf glib gtk3 libsoup pango webkit2gtk \
 	xorg-libX11"
 	SUGGESTED="dmenu"
 	PROVIDE="webkit2gtk:surf"
diff -r 71ba95d2422e -r f48456621a9d swell-foop/receipt
--- a/swell-foop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/swell-foop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk+3-dev clutter-dev clutter-gtk-dev gettext \
+BUILD_DEPENDS="vala glib-dev gtk3-dev clutter-dev clutter-gtk-dev gettext \
 itstool"
 
 compile_rules() {
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="clutter clutter-gtk gdk-pixbuf glib gtk+3"
+	DEPENDS="clutter clutter-gtk gdk-pixbuf glib gtk3"
 }
diff -r 71ba95d2422e -r f48456621a9d swfdec/receipt
--- a/swfdec/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/swfdec/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://swfdec.freedesktop.org/download/swfdec/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev liboil-dev pango-dev gtk+-dev libsoup-dev \
+BUILD_DEPENDS="glib-dev liboil-dev pango-dev gtk2-dev libsoup-dev \
 cairo-dev alsa-lib-dev gstreamer0-dev gst0-plugins-base-dev sqlite3-dev"
 SPLIT="swfdec-dev"
 
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 		swfdec)
 			copy @std
-			DEPENDS="glib liboil pango gtk+ libsoup cairo alsa-lib gstreamer0 \
+			DEPENDS="glib liboil pango gtk2 libsoup cairo alsa-lib gstreamer0 \
 			gst0-plugins-base"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d swig/receipt
--- a/swig/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/swig/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -8,7 +8,7 @@
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.swig.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/swig.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/swig.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d sylpheed-full/receipt
--- a/sylpheed-full/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sylpheed-full/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="sylpheed-$VERSION.tar.bz2"
 WGET_URL="http://sylpheed.sraoss.jp/sylpheed/v${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev openssl-dev libgpg-error-dev gtkspell-dev \
+BUILD_DEPENDS="gtk2-dev openssl-dev libgpg-error-dev gtkspell-dev \
 enchant-dev openldap-dev gpgme-dev"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ openssl gnupg gpgme libgpg-error gtkspell enchant libldap"
+	DEPENDS="gtk2 openssl gnupg gpgme libgpg-error gtkspell enchant libldap"
 	PROVIDE="sylpheed"
 	TAGS="mail internet"
 }
diff -r 71ba95d2422e -r f48456621a9d sylpheed/receipt
--- a/sylpheed/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sylpheed/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://sylpheed.sraoss.jp/sylpheed/v${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev openssl-dev"
-SPLIT="sylpheed-dev"
+BUILD_DEPENDS="gtk2-dev openssl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -34,12 +34,12 @@
 			rm -r \
 				$fs/usr/share/sylpheed/faq/ \
 				$fs/usr/share/sylpheed/manual/
-			DEPENDS="gtk+ openssl libffi"
+			DEPENDS="gtk2 openssl libffi"
 			TAGS="mail internet"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtk+ openssl gpgme gnupg xorg-libXdamage"
+			DEPENDS="gtk2 openssl gpgme gnupg xorg-libXdamage"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d sysstat/receipt
--- a/sysstat/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/sysstat/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://sebastien.godard.pagesperso-orange.fr/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/sysstat.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/sysstat.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://perso.wanadoo.fr/sebastien.godard/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d tali/receipt
--- a/tali/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tali/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk+3-dev librsvg-dev intltool itstool"
+BUILD_DEPENDS="glib-dev gtk3-dev librsvg-dev intltool itstool"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -23,5 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk gdk-pixbuf glib gtk+3 pango"
+	DEPENDS="atk gdk-pixbuf glib gtk3 pango"
 }
diff -r 71ba95d2422e -r f48456621a9d talloc/receipt
--- a/talloc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/talloc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="LGPL"
 WEB_SITE="https://talloc.samba.org/talloc/doc/html/index.html"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/talloc.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/talloc.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://www.samba.org/ftp/talloc/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d tazdrop/receipt
--- a/tazdrop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tazdrop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tazdrop"
 VERSION="1024"
@@ -12,21 +12,17 @@
 TARBALL="slitaz-tools-$VERSION.tar.gz"
 WGET_URL="http://hg.slitaz.org/slitaz-tools/archive/$VERSION.tar.gz"
 
-DEPENDS="gtk+ yad"
 BUILD_DEPENDS="gettext"
 SIBLINGS="slitaz-tools slitaz-tools-boxes"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make msgfmt
 	cd $src/tazdrop
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
+	DEPENDS="gtk2 yad"
 }
diff -r 71ba95d2422e -r f48456621a9d tazweb/receipt
--- a/tazweb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tazweb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="glib-dev gtk+-dev libsoup-dev webkitgtk-dev libxslt-dev gettext"
+BUILD_DEPENDS="glib-dev gtk2-dev libsoup-dev webkitgtk-dev libxslt-dev gettext"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -31,6 +31,6 @@
 genpkg_rules()
 {
 	copy @std
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libsoup pango \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libsoup pango \
 	webkitgtk   gsettings-desktop-schemas"
 }
diff -r 71ba95d2422e -r f48456621a9d tcl/receipt
--- a/tcl/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tcl/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://tcl.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/tcl.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/tcl.html"
 
 TARBALL="$PACKAGE$VERSION-src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d texmacs-windows-fonts/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/texmacs-windows-fonts/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,22 @@
+# SliTaz package receipt v2.
+
+PACKAGE="texmacs-windows-fonts"
+VERSION="1.0"
+CATEGORY="office"
+SHORT_DESC="Fonts for using TeXmacs without TeX"
+MAINTAINER="slitaz@leledy.fr"
+LICENSE="LPPL"
+WEB_SITE="http://www.texmacs.org/"
+
+TARBALL="TeXmacs-windows-fonts-$VERSION-noarch.tar.gz"
+WGET_URL="ftp://ftp.texmacs.org/pub/TeXmacs/fonts/$TARBALL"
+
+compile_rules() {
+	mkdir -p $install/usr/share/TeXmacs/
+	cp -r $src $install/usr/share/TeXmacs/fonts
+	find $install -type f -exec chmod 644 '{}' \;
+}
+
+genpkg_rules() {
+	copy @std
+}
diff -r 71ba95d2422e -r f48456621a9d texmacs/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/texmacs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,36 @@
+# SliTaz package receipt v2.
+
+PACKAGE="texmacs"
+VERSION="1.0.7.18"
+CATEGORY="office"
+SHORT_DESC="The high quality of TeX with a WYSIWYG editor"
+MAINTAINER="slitaz@leledy.fr"
+LICENSE="GPL"
+WEB_SITE="http://www.texmacs.org/"
+
+TARBALL="$PACKAGE-$VERSION-src.tar.gz"
+WGET_URL="ftp://ftp.texmacs.org/pub/$PACKAGE/targz/$TARBALL"
+
+BUILD_DEPENDS="xorg-libX11-dev gmp-dev guile-dev freetype-dev imlib2-dev"
+
+compile_rules() {
+	./configure \
+		--with-imlib2 \
+		--disable-qt \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--libexecdir=/usr/lib \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
+}
+
+genpkg_rules() {
+	mkdir -p $fs/usr
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib $fs/usr
+	cp -a $install/usr/share $fs/usr
+	# freetype and TeXmacs-windows-fonts avoid depending on TeX which is a *huge* system
+	DEPENDS="ghostscript gmp guile freetype texmacs-windows-fonts"
+}
diff -r 71ba95d2422e -r f48456621a9d thunar-vfs/receipt
--- a/thunar-vfs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/thunar-vfs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -32,7 +32,7 @@
 	case $PACKAGE in
 		thunar-vfs)
 			copy @std
-			DEPENDS="dbus dbus-glib exo freetype gdk-pixbuf glib gtk+ hal \
+			DEPENDS="dbus dbus-glib exo freetype gdk-pixbuf glib gtk2 hal \
 			libjpeg-turbo libpng16 libxfce4util startup-notification \
 			xorg-libX11"
 			;;
diff -r 71ba95d2422e -r f48456621a9d thunar-volman/receipt
--- a/thunar-volman/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/thunar-volman/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="exo glib gtk+ libgudev libnotify libxfce4ui libxfce4util pango \
+	DEPENDS="exo glib gtk2 libgudev libnotify libxfce4ui libxfce4util pango \
 	xfconf   thunar"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d thunar/receipt
--- a/thunar/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/thunar/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -30,7 +30,7 @@
 	case $PACKAGE in
 		thunar)
 			copy @std
-			DEPENDS="atk cairo dbus dbus-glib exo gdk-pixbuf glib gtk+ libexif \
+			DEPENDS="atk cairo dbus dbus-glib exo gdk-pixbuf glib gtk2 libexif \
 			libgudev libnotify libpcre libxfce4ui libxfce4util pango \
 			xfce4-panel xfconf xorg-libICE xorg-libSM xorg-libX11"
 			TAGS="Xfce file-manager"
@@ -38,7 +38,7 @@
 		*-dev)
 			copy @dev
 			DEPENDS="thunar \
-			glib-dev gtk+-dev"
+			glib-dev gtk2-dev"
 			TAGS="Xfce"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d thunderbird/receipt
--- a/thunderbird/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/thunderbird/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,9 +10,9 @@
 WEB_SITE="http://www.mozilla.org/"
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$TARBALL"
 
-DEPENDS="alsa-lib gtk+ zip unzip libevent libvpx nspr nss sqlite3 \
+DEPENDS="alsa-lib gtk2 zip unzip libevent libvpx nspr nss sqlite3 \
 dbus dbus-glib glib libnotify libfirefox"
-BUILD_DEPENDS="alsa-lib-dev gtk+-dev bzip2 zip unzip coreutils \
+BUILD_DEPENDS="alsa-lib-dev gtk2-dev bzip2 zip unzip coreutils \
 libevent-dev libvpx-dev nspr-dev nss-dev yasm sqlite3-dev \
 dbus-dev dbus-glib-dev libnotify-dev freetype fontconfig tar gzip mesa-dev"
 TAGS="email pop imap smtp"
diff -r 71ba95d2422e -r f48456621a9d tidy-html5/receipt
--- a/tidy-html5/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tidy-html5/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="http://www.htacg.org/tidy-html5/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/tidy-html5.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/tidy-html5.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/htacg/tidy-html5/releases/download/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d tiff/receipt
--- a/tiff/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tiff/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.libtiff.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/libtiff.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libtiff.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.osgeo.org/libtiff/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d tilda/receipt
--- a/tilda/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tilda/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lanoxx/tilda/archive/$TARBALL"
 
-BUILD_DEPENDS="automake gettext gtk+3-dev vte-dev libconfuse"
+BUILD_DEPENDS="automake gettext gtk3-dev vte-dev libconfuse"
 
 compile_rules() {
 	./autogen.sh \
@@ -23,6 +23,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk+3 pango vte xorg-libX11"
+	DEPENDS="gdk-pixbuf glib gtk3 pango vte xorg-libX11"
 	TAGS="terminal"
 }
diff -r 71ba95d2422e -r f48456621a9d time/receipt
--- a/time/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/time/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/time/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/time.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/time.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://ftp.gnu.org/gnu/time/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d timidity++/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/timidity++/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,34 @@
+# SliTaz package receipt v2.
+
+PACKAGE="timidity++"
+VERSION="2.14.0"
+CATEGORY="multimedia"
+SHORT_DESC="TiMidity++ is an open source MIDI to WAVE converter and player"
+MAINTAINER="paul@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="http://timidity.sourceforge.net/"
+
+TARBALL="TiMidity++-$VERSION.tar.xz"
+WGET_URL="$SF_MIRROR/timidity/$TARBALL"
+
+BUILD_DEPENDS="alsa-lib-dev portaudio-dev jack-dev libao-dev libvorbis-dev \
+libogg-dev flac-dev speex-dev gtk2-dev xorg-libXaw-dev"
+
+compile_rules() {
+	./configure \
+		--enable-audio=alsa,portaudio,jack,ao,vorbis,flac,speex \
+		--enable-interface=gtk,xaw \
+		--enable-alsaseq \
+		--with-default-path=/etc/timidity++/ \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install || return 1
+
+	install -Dm644 $stuff/timidity.cfg $install/etc/timidity++/timidity.cfg
+}
+
+genpkg_rules() {
+	copy @std
+	DEPENDS="alsa-lib portaudio jack libao libvorbis libogg \
+	flac gtk2 xorg-libXaw"
+}
diff -r 71ba95d2422e -r f48456621a9d timidity++/stuff/patches/mfi.c.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/timidity++/stuff/patches/mfi.c.patch	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,20 @@
+--- timidity/mfi.c	2004-02-17 17:02:18.000000000 +0100
++++ timidity/mfi.c.new	2017-02-14 04:41:24.000000000 +0100
+@@ -344,7 +344,7 @@
+ #define SEND_LASTNOTEINFO(lni, ch)				if (LASTNOTEINFO_HAS_DATA((lni)[ch])) SendLastNoteInfo(lni, ch);
+ #define SEND_AND_CLEAR_LASTNOTEINFO(lni, ch)	if (LASTNOTEINFO_HAS_DATA((lni)[ch])) { SendLastNoteInfo(lni, ch); (lni)[ch].on = NO_LAST_NOTE_INFO; }
+ 
+-inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
++static inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
+ {
+ 	info[channel].on = time;
+ 	info[channel].off = time + duration;
+@@ -352,7 +352,7 @@
+ 	info[channel].velocity = velocity;
+ }
+ 
+-inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
++static inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
+ {
+ 	NOTE_BUF_EV_DEBUGSTR(channel, info[channel].on, note_name[info[channel].note % 12], info[channel].note / 12, info[channel].velocity, info[channel].off);
+ 	MIDIEVENT(info[channel].on, ME_NOTEON, channel, info[channel].note, info[channel].velocity);
diff -r 71ba95d2422e -r f48456621a9d timidity++/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/timidity++/stuff/patches/series	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,6 @@
+# from https://www.archlinux.org/packages/extra/x86_64/timidity++/
+-p1|timidity-tk86.patch
+-p1|timidity-jack.patch
+
+# https://bugs.gentoo.org/606894
+-p0|mfi.c.patch
diff -r 71ba95d2422e -r f48456621a9d timidity++/stuff/patches/timidity-jack.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/timidity++/stuff/patches/timidity-jack.patch	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,11 @@
+diff -Naur TiMidity++-2.14.0-orig/timidity/jack_a.c TiMidity++-2.14.0/timidity/jack_a.c
+--- TiMidity++-2.14.0-orig/timidity/jack_a.c	2014-09-26 22:08:51.531559553 -0400
++++ TiMidity++-2.14.0/timidity/jack_a.c	2014-09-26 22:11:12.864659285 -0400
+@@ -508,6 +508,7 @@
+ 				pthread_cond_wait(&ctx->cond, &ctx->lock);
+ 		}
+ 		/* fallthrough */
++	case PM_REQ_PLAY_START:
+ 	case PM_REQ_DISCARD:
+ 		ctx->running = 0;
+ 		ringbuf_clear(&ctx->rbuf);
diff -r 71ba95d2422e -r f48456621a9d timidity++/stuff/patches/timidity-tk86.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/timidity++/stuff/patches/timidity-tk86.patch	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,39 @@
+--- a/interface/tk_c.c
++++ b/interface/tk_c.c
+@@ -65,6 +65,9 @@
+ #define TKPROGPATH PKGLIBDIR "/tkmidity.tcl"
+ #endif /* TKPROGPATH */
+ 
++#if (TCL_MAJOR_VERSION < 8)
++#define Tcl_GetStringResult(interp) (interp->result)
++#endif
+ 
+ static void ctl_refresh(void);
+ static void ctl_total_time(int tt);
+@@ -117,7 +120,7 @@
+ 
+ static void start_panel(void);
+ 
+-#define MAX_TK_MIDI_CHANNELS	16
++#define MAX_TK_MIDI_CHANNELS	32
+ 
+ typedef struct {
+ 	int reset_panel;
+@@ -933,7 +936,7 @@
+ }
+ 
+ /* evaluate Tcl script */
+-static char *v_eval(char *fmt, ...)
++static const char *v_eval(char *fmt, ...)
+ {
+ 	char buf[256];
+ 	va_list ap;
+@@ -941,7 +944,7 @@
+ 	vsnprintf(buf, sizeof(buf), fmt, ap);
+ 	Tcl_Eval(my_interp, buf);
+ 	va_end(ap);
+-	return my_interp->result;
++	return Tcl_GetStringResult(my_interp);
+ }
+ 
+ static const char *v_get2(const char *v1, const char *v2)
diff -r 71ba95d2422e -r f48456621a9d timidity++/stuff/timidity.cfg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/timidity++/stuff/timidity.cfg	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,29 @@
+# details on this file and other examples see here:
+# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
+# http://www.onicos.com/staff/iz/timidity/dist/cfg/
+#----------------------------------------------------------------
+# SoundFont extension configuration
+#
+# soundfont <filename> [order={0|1}] [remove]
+#    <filename> is the path of SoundFont file.
+#    order: 0(preload) or 1(load after GUS).
+#    remove: disable specified soundfont.
+#
+# font exclude <tonebank> [<preset> [<keynote>]]
+# font order {0|1} <tonebank> [<preset> [<keynote>]]
+#    <tonebank>: 0-127
+#
+# font exclude 128 [<drumset> [<key>]]
+# font order {0|1} 128 [<drumset> [<key>]]
+#----------------------------------------------------------------
+
+# change the next line to point to a soundfont you have
+# soundfonts can be found e.g. here: http://www.hammersound.net/
+# soundfont /usr/share/soundfonts/DX7Piano.SF2
+
+# you can do manipulations of the soundfont you load like this:
+# e.g. removing drumset 99
+# font exclude 128 99
+
+# load drum samples after GUS patches
+# font order 1 128
diff -r 71ba95d2422e -r f48456621a9d tint2/receipt
--- a/tint2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tint2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="cmake xorg-libX11-dev xorg-libXcomposite-dev \
 xorg-libXdamage-dev xorg-libXinerama-dev xorg-libXext-dev xorg-libXrender-dev \
 xorg-libXrandr-dev pango-dev imlib2-dev librsvg-dev startup-notification-dev \
-gtk+-dev gettext"
+gtk2-dev gettext"
 
 compile_rules() {
 	mkdir build
@@ -38,7 +38,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ imlib2 librsvg pango \
+	DEPENDS="cairo gdk-pixbuf glib gtk2 imlib2 librsvg pango \
 	startup-notification xorg-libX11 xorg-libXcomposite xorg-libXdamage \
 	xorg-libXext xorg-libXinerama xorg-libXrandr xorg-libXrender"
 	CONFIG_FILES="/etc/xdg/tint2/tint2rc"
diff -r 71ba95d2422e -r f48456621a9d tk/receipt
--- a/tk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://tcl.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/tk.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/tk.html"
 
 TARBALL="$PACKAGE$VERSION-src.tar.gz"
 WGET_URL="$SF_MIRROR/tcl/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d totem-pl-parser/receipt
--- a/totem-pl-parser/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/totem-pl-parser/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/totem-pl-parser/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/totem-pl-parser.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/totem-pl-parser.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d tramys/stuff/mo.list
--- a/tramys/stuff/mo.list	Mon Oct 15 16:44:45 2018 +0300
+++ b/tramys/stuff/mo.list	Tue Oct 16 16:46:05 2018 +0300
@@ -235,7 +235,7 @@
 gstreamer	af az be bg ca cs el en_GB eo eu fi gl hu ja lt nb nl pl ro rw sk sl sq sr sv tr uk vi zh_TW	$P-0.10
 gsynaptics	ar el es fr hu ja nb pl ru zh_CN zh_TW
 gtick	af ca cs da de en@boldquot en@quot es eu fi fr ga it ko nl pl pt_BR ro ru sk sv uk vi zh_CN
-gtk+3	af am ang ar as ast az_IR az be@latin be bg bn_IN bn br bs ca ca@valencia crh cs cy da de dz el en_CA en_GB en en@shaw eo es et eu fa fi fr ga gl gu he hi hr hu hy ia id io is it ja ka kg kk kn ko ku lg li lt lv mai mi mk ml mn mr ms my nb nds ne nl nn nso oc or pa pl ps pt_BR pt ro ru rw si sk sl sq sr@ije sr@latin sr sv ta te th tk tr tt ug uk ur uz@cyrillic uz vi wa xh yi zh_CN zh_HK zh_TW	gtk30 gtk30-properties
+gtk3	af am ang ar as ast az_IR az be@latin be bg bn_IN bn br bs ca ca@valencia crh cs cy da de dz el en_CA en_GB en en@shaw eo es et eu fa fi fr ga gl gu he hi hr hu hy ia id io is it ja ka kg kk kn ko ku lg li lt lv mai mi mk ml mn mr ms my nb nds ne nl nn nso oc or pa pl ps pt_BR pt ro ru rw si sk sl sq sr@ije sr@latin sr sv ta te th tk tr tt ug uk ur uz@cyrillic uz vi wa xh yi zh_CN zh_HK zh_TW	gtk30 gtk30-properties
 gtkballs	de fr pl ru
 gtk+	af am ang ar as ast az_IR az be@latin be bg bn_IN bn br bs ca ca@valencia crh cs cy da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu hy ia id io is it ja ka kk kn ko ku li lt lv mai mi mk ml mn mr ms my nb nds ne nl nn nso oc or pa pl ps pt_BR pt ro ru rw si sk sl sq sr@ije sr@latin sr sv ta te th tk tr tt ug uk ur uz@cyrillic uz vi wa xh yi zh_CN zh_HK zh_TW	gtk20 gtk20-properties
 gtklp	ca_ES ca chs cht cz de dk en es fr hu it ja nl pl pt_BR ru uk_UA zh_CN zh_TW
@@ -662,7 +662,7 @@
 xchat	be ca cs de el es fi fr gl hu it ja kn ko lt mk nl pa pl pt ru sq sr sv th uk vi zh_CN zh_TW
 xchat-plugin	be ca cs de el es fi fr gl hu it ja kn ko lt mk nl pa pl pt ru sq sr sv th uk vi zh_CN zh_TW	xchat
 xchm	be bg cs de es fr hu it lv pl pt_BR pt_PT ro ru sk sv uk zh_CN zh_TW
-Xdialog	ca de es fr hu id it nl no_NO pl pt_BR ru sv_SE
+xdialog	ca de es fr hu id it nl no_NO pl pt_BR ru sv_SE
 xfburn	ar ast bg ca cs da de el en_AU en_GB en es et eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl nn oc pa pl pt_BR pt ru si sk sq sr sv th tr ug uk ur ur_PK vi zh_CN zh_TW
 xfce4-appfinder	am ar ast be bg bn ca cs da de el en_AU en_GB eo es et eu fi fr gl he hr hu id is it ja kk ko lt lv ms nb nl nn oc pa pl pt_BR pt ro ru si sk sl sq sr sv te th tr ug uk ur ur_PK vi zh_CN zh_HK zh_TW
 xfce4-mixer	am ar ast bg ca cs da de el en_GB es eu fi fr gl he hr hu id is it ja kk ko lt lv nb nl nn pl pt_BR pt ro ru si sk sr sv tr ug uk ur ur_PK vi zh_CN zh_TW
diff -r 71ba95d2422e -r f48456621a9d transmission-remote-gtk/receipt
--- a/transmission-remote-gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/transmission-remote-gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://transmission-remote-gtk.googlecode.com/files/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev json-glib-dev curl-dev libnotify-dev \
+BUILD_DEPENDS="gtk2-dev json-glib-dev curl-dev libnotify-dev \
 libunique-dev intltool gettext-tools"
 
 compile_rules() {
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gtk+ json-glib curl libnotify libunique"
+	DEPENDS="gtk2 json-glib curl libnotify libunique"
 }
diff -r 71ba95d2422e -r f48456621a9d transmission/receipt
--- a/transmission/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/transmission/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/transmission/transmission-releases/raw/master/$TARBALL"
 TARBALL_SHA256="8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"
 
-BUILD_DEPENDS="curl-dev libevent-dev intltool gtk+3-dev"
+BUILD_DEPENDS="curl-dev libevent-dev intltool gtk3-dev"
 SPLIT="transmission-cli transmission-daemon transmission-web"
 
 COOKOPTS="skip-log-errors !pixmaps"
@@ -38,7 +38,7 @@
 	case $PACKAGE in
 		transmission)
 			copy transmission-gtk @ico
-			DEPENDS="gdk-pixbuf glib gtk+3 libcurl libevent openssl pango zlib"
+			DEPENDS="gdk-pixbuf glib gtk3 libcurl libevent openssl pango zlib"
 			TAGS="torrent"
 			SUGGESTED="transmission-web transmission-cli transmission-daemon"
 			;;
diff -r 71ba95d2422e -r f48456621a9d tree/receipt
--- a/tree/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tree/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="MikeDSmith25@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://mama.indstate.edu/users/ice/tree/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/tree.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/tree.html"
 
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://mama.indstate.edu/users/ice/tree/src/$TARBALL"
@@ -17,7 +17,7 @@
 	make \
 		BINDIR=$install/usr/bin \
 		MANDIR=$install/usr/share/man/man1 \
-		install || return 1
+		install
 }
 
 genpkg_rules() {
diff -r 71ba95d2422e -r f48456621a9d tsclient/receipt
--- a/tsclient/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/tsclient/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 TAGS="remote-desktop"
 
-DEPENDS="gtk+ rdesktop xorg-libXdamage"
-BUILD_DEPENDS="gtk+ gtk+-dev perl-xml-parser gettext-tools"
+DEPENDS="gtk2 rdesktop xorg-libXdamage"
+BUILD_DEPENDS="gtk2-dev perl-xml-parser gettext-tools"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d udisks/receipt
--- a/udisks/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/udisks/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.freedesktop.org/wiki/Software/udisks"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/udisks.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/udisks.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://hal.freedesktop.org/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d ufr2/receipt
--- a/ufr2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ufr2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ufr2"
 VERSION="2.20"
@@ -6,98 +6,93 @@
 SHORT_DESC="Canon URF2 driver with support for LBP, iR and MF series printers"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.canon.com.au/pps/colour/imagepress_c1_drivers.aspx"
+
 SOURCE="UFR_II_Printer_Driver_for_Linux_V220_uk_EN"
 TARBALL="${SOURCE}.tar.gz"
-WEB_SITE="https://www.canon.com.au/pps/colour/imagepress_c1_drivers.aspx"
 WGET_URL="http://gdlp01.c-wss.com/gds/8/0100002708/03/$TARBALL"
-TAGS="printing printer driver"
 
-DEPENDS="cups cairo cndrvcups-common cups"
-BUILD_DEPENDS="autoconf automake cairo-dev gtk+-dev cndrvcups-common-dev cups-dev"
+BUILD_DEPENDS="autoconf automake cairo-dev gtk2-dev cndrvcups-common-dev cups-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{	
+compile_rules() {
 	#src="$WOK/$PACKAGE/$SOURCE/Sources"
-    cd $src
-   
-    [ -d cndrvcups-lb-$VERSION ] || tar xzf Sources/cndrvcups-lb-${VERSION}-1.tar.gz 
-    
-    cd $src/cndrvcups-lb-$VERSION/ppd &&     
-    ./autogen.sh \
+	cd $src
+
+	[ -d cndrvcups-lb-$VERSION ] || tar xzf Sources/cndrvcups-lb-${VERSION}-1.tar.gz
+
+	cd $src/cndrvcups-lb-$VERSION/ppd &&
+	./autogen.sh \
 		--prefix=/usr \
 		--enable-shared \
 		--disable-static \
 		--program-suffix="" \
-		--program-prefix="" &&  
-    make $MAKEFLAGS &&
-    make DESTDIR=$DESTDIR install 
-    
-    cd $src/cndrvcups-lb-$VERSION/pstoufr2cpca     
+		--program-prefix="" &&
+	make $MAKEFLAGS &&
+	make DESTDIR=$DESTDIR install
+
+	cd $src/cndrvcups-lb-$VERSION/pstoufr2cpca
 	./autogen.sh \
-		--prefix=/usr   \
+		--prefix=/usr \
 		--enable-progpath=/usr/bin \
 		--libdir=/usr/lib \
 		--program-suffix="" \
-		--program-prefix="" &&  
+		--program-prefix="" &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install 	
+	make DESTDIR=$DESTDIR install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/lib \
 		$fs/usr/share/caepcm \
 		$fs/usr/share/licenses/$PACKAGE \
 		$fs/usr/lib/cups/filter
-	
+
 	cp -a $src/cndrvcups-lb-$VERSION/libs/*.so* $fs/usr/lib	
 	cp -a $src/cndrvcups-lb-$VERSION/data/C* $fs/usr/share/caepcm
 	cp -a $install/usr/share/*  $fs/usr/share/
 	cp -a $install/usr/lib/cups/filter $fs/usr/lib/cups/filter
-	
+
 	# gzip all ppd files
 	find $fs/usr/share/cups/model -name "*.ppd" | xargs gzip -n9
 
 	# non-free license
 	cp -a $src/Documents/LICENSE-ufr2drv*.txt $fs/usr/share/licenses/$PACKAGE
-	
+
 	cd $fs/usr/lib
 	ln -sf libcanonufr2.so.1.0.0  liblibcanonufr2.so.1
 	ln -sf libcanonufr2.so.1.0.0  libcanonufr2.so
 	ln -sf libufr2filter.so.1.0.0 libufr2filter.so.1
 	ln -sf libufr2filter.so.1.0.0  libufr2filter.so 
+	DEPENDS="cups cairo cndrvcups-common cups"
+	TAGS="printing printer driver"
 }
 
-pre_install()
-{
+pre_install() {
 	echo ""
 	echo -e "\033[1m PROPRIETARY LICENSE:\033[0m $2"
 	echo "================================================================================"
 	echo "You are installing a package with proprietary license."
 	echo "You must accept the license."
-    echo "================================================================================"
-    echo ""
+	echo "================================================================================"
+	echo ""
 }
 
-post_install()
-{
+post_install() {
 	echo ""
 	echo -e "\033[1m CANON PRINTING LICENSE INFORMATION:\033[0m $2"
 	echo "================================================================================"
 	echo "For installing this package, you have to accept the $PACKAGE license."
-    echo "The license is stored in /usr/share/licenses/$PACKAGE "    
-    echo -n "Would you like to read the license (y/N) : "; read anser
-    if [ "$anser" = "y" ]; then
-		cat "$1/usr/share/licenses/$PACKAGE/LICENSE" | more	
-		echo "" 		
+	echo "The license is stored in /usr/share/licenses/$PACKAGE "
+	echo -n "Would you like to read the license (y/N) : "; read anser
+	if [ "$anser" = "y" ]; then
+		cat "$1/usr/share/licenses/$PACKAGE/LICENSE" | more
+		echo ""
 	fi
 	echo "================================================================================"
-	 echo -n "Do you accept the license (y/N) : "; read anser
-    if [ "$anser" = "N" ]; then
-		echo "You did not accept the license, Removing the pkg."	
-		chroot "$1/" tazpkg remove "$PACKAGE"		
+	echo -n "Do you accept the license (y/N) : "; read anser
+	if [ "$anser" = "N" ]; then
+		echo "You did not accept the license, Removing the pkg."
+		chroot "$1/" tazpkg remove "$PACKAGE"
 	fi
 }
diff -r 71ba95d2422e -r f48456621a9d ufraw/receipt
--- a/ufraw/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/ufraw/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,7 +10,7 @@
 WEB_SITE="http://ufraw.sourceforge.net/"
 WGET_URL="$SF_MIRROR/project/ufraw/ufraw/ufraw-$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gimp gimp-dev lcms-dev tiff-dev exiv2-dev gtk+-dev \
+BUILD_DEPENDS="gimp gimp-dev lcms-dev tiff-dev exiv2-dev gtk2-dev \
 libgtkimageview-dev bzip2-dev gettext-tools"
 SPLIT="ufraw gimp-plugin-ufraw ufraw-locales"
 
@@ -29,7 +29,7 @@
 	case $PACKAGE in
 	ufraw)
 		SUGGESTED="ufraw-locales gimp-plugin-ufraw"
-		DEPENDS="gtk+ exiv2 lcms tiff libgtkimageview libgomp bzip2"
+		DEPENDS="gtk2 exiv2 lcms tiff libgtkimageview libgomp bzip2"
 		mkdir -p $fs/usr/share/applications
 		cp -a $install/usr/bin $fs/usr
 		cp -a $src/ufraw.desktop $fs/usr/share/applications
diff -r 71ba95d2422e -r f48456621a9d uget/receipt
--- a/uget/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/uget/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -3,7 +3,7 @@
 PACKAGE="uget"
 VERSION="1.10.4"
 CATEGORY="network"
-SHORT_DESC="Download manager using gtk+ and libcurl"
+SHORT_DESC="Download manager using GTK+ and libcurl"
 MAINTAINER="devl547@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="http://urlget.sourceforge.net/"
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/urlget/$TARBALL"
 
-BUILD_DEPENDS="pcre-dev glib-dev curl-dev gtk+3-dev intltool"
+BUILD_DEPENDS="pcre-dev glib-dev curl-dev gtk3-dev intltool"
 
 compile_rules() {
 	./configure \
@@ -26,5 +26,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+3 libcurl pango"
+	DEPENDS="cairo gdk-pixbuf glib gtk3 libcurl pango"
 }
diff -r 71ba95d2422e -r f48456621a9d unixODBC/receipt
--- a/unixODBC/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/unixODBC/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.unixodbc.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/unixodbc.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/unixodbc.html"
 REPOLOGY="unixodbc"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d unrar/receipt
--- a/unrar/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/unrar/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="freeware"
 WEB_SITE="https://www.rarlab.com/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/unrar.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/unrar.html"
 
 TARBALL="unrarsrc-$VERSION.tar.gz"
 WGET_URL="http://www.rarlab.com/rar/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d unzip/receipt
--- a/unzip/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/unzip/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.info-zip.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/unzip.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/unzip.html"
 
 TARBALL="$PACKAGE${VERSION//./}.tar.gz"
 WGET_URL="$SF_MIRROR/infozip/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d upower/receipt
--- a/upower/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/upower/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://upower.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/upower.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/upower.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://upower.freedesktop.org/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d upx391/receipt
--- a/upx391/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/upx391/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -16,7 +16,7 @@
 
 TARBALL="upx-$VERSION.tar.gz"
 WGET_URL="https://github.com/upx/upx/archive/v$VERSION.tar.gz"
-WGET_URL2="http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2"
+WGET_URL2="$SF_MIRROR/sevenzip/lzma465.tar.bz2"
 
 BUILD_DEPENDS="ucl-dev zlib-dev perl"
 
diff -r 71ba95d2422e -r f48456621a9d usbutils/receipt
--- a/usbutils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/usbutils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://linux-usb.sourceforge.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/usbutils.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/usbutils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/usb/usbutils/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d utox/receipt
--- a/utox/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/utox/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,7 +10,7 @@
 WEB_SITE="https://tox.im/"
 WGET_URL="https://jenkins.libtoxcore.so/job/uTox_linux_i686/lastSuccessfulBuild/artifact/utox/utox_linux_i686.tar.xz"
 
-DEPENDS="dbus bzlib xorg-libX11 gtk+"
+DEPENDS="dbus bzlib xorg-libX11 gtk2"
 BUILD_DEPENDS="wget"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 71ba95d2422e -r f48456621a9d valgrind/receipt
--- a/valgrind/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/valgrind/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://valgrind.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/valgrind.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/valgrind.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://sourceware.org/ftp/valgrind/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d varka/receipt
--- a/varka/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/varka/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$BRANCH.tar.bz2"
 WGET_URL="bzr|lp:varka"
 
-BUILD_DEPENDS="bzr cmake gobject-introspection-dev gtk+3-dev glib-dev vala \
+BUILD_DEPENDS="bzr cmake gobject-introspection-dev gtk3-dev glib-dev vala \
 gettext-tools"
 SPLIT="varka-dev"
 
@@ -31,7 +31,7 @@
 	case $PACKAGE in
 		varka)
 			copy @std
-			DEPENDS="gtk+3"
+			DEPENDS="gtk3"
 			;;
 		*-dev)
 			copy @dev
diff -r 71ba95d2422e -r f48456621a9d verbiste/receipt
--- a/verbiste/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/verbiste/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://perso.b2b2c.ca/sarrazip/dev/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev libxml2-dev perl-xml-parser"
+BUILD_DEPENDS="gtk2-dev libxml2-dev perl-xml-parser"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -26,5 +26,5 @@
 genpkg_rules() {
 	copy @std
 	rm $fs/usr/share/verbiste-*/COPYING
-	DEPENDS="gtk+ libxml2"
+	DEPENDS="gtk2 libxml2"
 }
diff -r 71ba95d2422e -r f48456621a9d vice/receipt
--- a/vice/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/vice/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="automake xa gettext ffmpeg-dev alsa-lib-dev lame-dev \
 libvorbis-dev flac-dev pciutils-dev readline-dev libpng16-dev giflib-dev \
-libjpeg-turbo-dev portaudio-dev mpg123-dev xorg-libICE-dev gtk+-dev \
+libjpeg-turbo-dev portaudio-dev mpg123-dev xorg-libICE-dev gtk2-dev \
 vte-gtk2-dev gtkglext-dev mesa-dev xorg-libXxf86vm-dev xorg-libXrandr-dev \
 xorg-bdftopcf xorg-mkfontdir" # pulseaudio-dev
 
@@ -41,7 +41,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="alsa-lib cairo flac gdk-pixbuf giflib glib gtk+ gtkglext \
+	DEPENDS="alsa-lib cairo flac gdk-pixbuf giflib glib gtk2 gtkglext \
 	libjpeg-turbo libogg libpng16 libvorbis mesa mpg123 pango pciutils \
 	portaudio readline vte-gtk2 xorg-libX11 xorg-libXrandr xorg-libXxf86vm zlib"
 }
diff -r 71ba95d2422e -r f48456621a9d viewnior/receipt
--- a/viewnior/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/viewnior/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/xsisqox/Viewnior/archive/$TARBALL"
 
-BUILD_DEPENDS_arm="automake libtool gtk+-dev exiv2-dev intltool"
-BUILD_DEPENDS="automake libtool gtk+-dev exiv2-dev intltool \
+BUILD_DEPENDS_arm="automake libtool gtk2-dev exiv2-dev intltool"
+BUILD_DEPENDS="automake libtool gtk2-dev exiv2-dev intltool \
 shared-mime-info-dev curl-dev libssh-dev"
 
 compile_rules() {
@@ -26,6 +26,6 @@
 
 genpkg_rules() {
 	copy viewnior *.ui @ico
-	DEPENDS="exiv2 gdk-pixbuf glib gtk+"
+	DEPENDS="exiv2 gdk-pixbuf glib gtk2"
 	TAGS="image photo viewer"
 }
diff -r 71ba95d2422e -r f48456621a9d visualboyadvance/receipt
--- a/visualboyadvance/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/visualboyadvance/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,11 +9,11 @@
 WEB_SITE="http://vba.ngemu.com/"
 
 TARBALL="VisualBoyAdvance-src-$VERSION.tar.gz"
-WGET_URL="http://downloads.sourceforge.net/sourceforge/vba/$TARBALL"
+WGET_URL="$SF_MIRROR/vba/$TARBALL"
 
-BUILD_DEPENDS="libglademm-dev libglademm libsdl-dev patch nasm gtk+-dev gtkmm-dev \
+BUILD_DEPENDS="libglademm-dev libglademm libsdl-dev patch nasm gtk2-dev gtkmm-dev \
 cairomm-dev libglade-dev libxml2-dev zlib-dev bison flex"
-SPLIT="visualboyadvance-gtk visualboyadvance"
+SPLIT="$PACKAGE-gtk $PACKAGE"
 
 compile_rules() {
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/Util.cpp
diff -r 71ba95d2422e -r f48456621a9d visualnqc/receipt
--- a/visualnqc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/visualnqc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="visualnqc"
 VERSION="1.0-1"
 CATEGORY="development"
-SHORT_DESC="An iconic language for the Lego Mindstorms RCX."
+SHORT_DESC="An iconic language for the Lego Mindstorms RCX"
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="MPL"
 WEB_SITE="http://funsoftware.sourceforge.net/"
@@ -11,20 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
 
-DEPENDS="nqc"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	mkdir -p $DESTDIR
 	cp -a $src/usr $DESTDIR
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
+	DEPENDS="nqc"
 }
diff -r 71ba95d2422e -r f48456621a9d vivaldi/receipt
--- a/vivaldi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/vivaldi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -39,7 +39,7 @@
 genpkg_rules() {
 	copy opt/ usr/
 	DEPENDS="gconf alsa-lib atk cairo dbus expat fontconfig gdk-pixbuf glib \
-	gtk+3 libcups nspr nss pango xorg-libX11 xorg-libXScrnSaver \
+	gtk3 libcups nspr nss pango xorg-libX11 xorg-libXScrnSaver \
 	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXext \
 	xorg-libXfixes xorg-libXi xorg-libXrandr xorg-libXrender xorg-libXtst \
 	xorg-libxcb   bash mesa"
diff -r 71ba95d2422e -r f48456621a9d vlc-plugin/receipt
--- a/vlc-plugin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/vlc-plugin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://download.videolan.org/pub/videolan/vlc/$VERSION/$TARBALL"
 
 DEPENDS="libvlc dbus"
-BUILD_DEPENDS="firefox-dev libvlc-dev dbus-dev gtk+-dev util-linux-uuid-dev"
+BUILD_DEPENDS="firefox-dev libvlc-dev dbus-dev gtk2-dev util-linux-uuid-dev"
 TAGS="browser plug-in"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d vmware-view-open-client/receipt
--- a/vmware-view-open-client/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/vmware-view-open-client/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WEB_SITE="http://code.google.com/p/$PACKAGE/"
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL"
 
-DEPENDS="gtk+ openssl libxml2 curl boost-signals icu bzlib"
-BUILD_DEPENDS="gtk+-dev openssl-dev libxml2-dev curl-dev boost-dev \
+DEPENDS="gtk2 openssl libxml2 curl boost-signals icu bzlib"
+BUILD_DEPENDS="gtk2-dev openssl-dev libxml2-dev curl-dev boost-dev \
 boost-signals icu-dev icu intltool"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d volumeicon/receipt
--- a/volumeicon/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/volumeicon/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://softwarebakery.com/maato/files/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ alsa-lib libnotify"
-BUILD_DEPENDS="gtk+-dev alsa-lib-dev libnotify-dev"
+DEPENDS="gtk2 alsa-lib libnotify"
+BUILD_DEPENDS="gtk2-dev alsa-lib-dev libnotify-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d vte-gtk2/receipt
--- a/vte-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/vte-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,25 +7,19 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html" # (for gtk+3 version)
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/vte.html" # (for gtk3 version)
 
 TARBALL="vte-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/vte/0.28/$TARBALL"
 
-BUILD_DEPENDS_arm="gtk+-dev ncurses-dev"
-BUILD_DEPENDS="intltool gtk+-dev python-dev gobject-introspection-dev \
+BUILD_DEPENDS="intltool gtk2-dev python-dev gobject-introspection-dev \
 python-pygtk-dev"
-SPLIT="vte-gtk2-terminal vte-gtk2-python vte-gtk2 vte-gtk2-dev"
+SPLIT="$PACKAGE-terminal $PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) ARCH_ARGS="--enable-introspection=no";;
-		*)    ARCH_ARGS="--enable-introspection=yes";;
-	esac
-
 	./configure \
 		--disable-static \
-		$ARCH_ARGS \
+		--enable-introspection \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
@@ -37,25 +31,25 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		vte-gtk2-terminal)
+		*-terminal)
 			copy bin/
 			CAT="development|X Terminal"
-			DEPENDS="glib gtk+ pango vte-gtk2"
+			DEPENDS="glib gtk2 pango vte-gtk2"
 			;;
-		vte-gtk2-python)
+		*-python)
 			copy vtemodule.so vte.defs
 			CAT="development|Python bindings"
-			DEPENDS="gdk-pixbuf glib gtk+ pango vte-gtk2   python"
+			DEPENDS="gdk-pixbuf glib gtk2 pango vte-gtk2   python"
 			PROVIDE="python-vte"
 			;;
 		vte-gtk2)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+ ncurses pango xorg-libX11"
+			DEPENDS="atk cairo gdk-pixbuf glib gtk2 ncurses pango xorg-libX11"
 			;;
-		vte-gtk2-dev)
+		*-dev)
 			copy @dev
 			DEPENDS="vte-gtk2 vte-gtk2-terminal vte-gtk2-python \
-			cairo-dev glib-dev gtk+-dev pango-dev xorg-libX11-dev"
+			cairo-dev glib-dev gtk2-dev pango-dev xorg-libX11-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d vte/receipt
--- a/vte/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/vte/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,26 +7,20 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/vte.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="gtk+-dev ncurses-dev"
-BUILD_DEPENDS="intltool pango-dev gtk+3-dev pcre2-dev gnutls-dev \
+BUILD_DEPENDS="intltool pango-dev gtk3-dev pcre2-dev gnutls-dev \
 gobject-introspection-dev vala gperf"
 
-SPLIT="vte-terminal vte vte-dev"
+SPLIT="$PACKAGE-terminal $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) ARCH_ARGS="--enable-introspection=no";;
-		*)    ARCH_ARGS="--enable-introspection=yes";;
-	esac
-
 	./configure \
 		--disable-static \
-		$ARCH_ARGS \
+		--enable-introspection \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
@@ -43,19 +37,19 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		vte-terminal)
+		*-terminal)
 			copy bin/
 			CAT="development|X Terminal"
-			DEPENDS="glib gtk+3 pango vte"
+			DEPENDS="glib gtk3 pango vte"
 			;;
 		vte)
 			copy @std @rm
-			DEPENDS="atk cairo glib gtk+3 libgnutls libpcre2-8 pango zlib"
+			DEPENDS="atk cairo glib gtk3 libgnutls libpcre2-8 pango zlib"
 			;;
-		vte-dev)
+		*-dev)
 			copy @dev
 			DEPENDS="vte vte-terminal \
-			glib-dev gnutls-dev gtk+3-dev pango-dev pcre2-dev zlib-dev"
+			glib-dev gnutls-dev gtk3-dev pango-dev pcre2-dev zlib-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d waterline-plugin-multiload/receipt
--- a/waterline-plugin-multiload/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/waterline-plugin-multiload/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/waterline-plugin-multiload/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake glib-dev gtk+-dev libtool intltool libgtop-dev \
+BUILD_DEPENDS="automake glib-dev gtk2-dev libtool intltool libgtop-dev \
 waterline-dev libsde-utils-jansson-dev" # lxpanel-dev
 # SPLIT="lxpanel-plugin-multiload"
 # WARNING: not compatible with LXPanel now
@@ -31,11 +31,11 @@
 	case $PACKAGE in
 		waterline-plugin-multiload)
 			copy waterline/plugins/*.so
-			DEPENDS="cairo glib gtk+ libgtop libsde-utils-jansson   waterline"
+			DEPENDS="cairo glib gtk2 libgtop libsde-utils-jansson   waterline"
 			;;
 		lxpanel-plugin-multiload)
 			copy lxpanel/plugins/*.so
-			DEPENDS="cairo glib gtk+ libgtop libsde-utils-jansson   lxpanel"
+			DEPENDS="cairo glib gtk2 libgtop libsde-utils-jansson   lxpanel"
 			;;
 	esac
 	TAGS="desktop panel"
diff -r 71ba95d2422e -r f48456621a9d waterline/receipt
--- a/waterline/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/waterline/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/waterline/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake gettext intltool libtool gtk+-dev glib-dev jansson-dev \
+BUILD_DEPENDS="automake gettext intltool libtool gtk2-dev glib-dev jansson-dev \
 libsde-utils-dev libsde-utils-x11-dev libsde-utils-jansson-dev \
 libsde-utils-gtk-dev xorg-libXcomposite-dev menu-cache-dev alsa-lib-dev"
 SPLIT="$PACKAGE-dev"
@@ -36,7 +36,7 @@
 	case $PACKAGE in
 		waterline)
 			copy @std
-			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk+ jansson libsde-utils \
+			DEPENDS="alsa-lib cairo gdk-pixbuf glib gtk2 jansson libsde-utils \
 			libsde-utils-gtk libsde-utils-jansson libsde-utils-x11 menu-cache \
 			pango xorg-libX11 xorg-libXcomposite"
 			TAGS="desktop panel taskbar"
diff -r 71ba95d2422e -r f48456621a9d wayland-protocols/receipt
--- a/wayland-protocols/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wayland-protocols/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wayland.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/wayland-protocols.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/wayland-protocols.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://wayland.freedesktop.org/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d wayland/receipt
--- a/wayland/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wayland/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://wayland.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/wayland.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/wayland.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://wayland.freedesktop.org/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d wbar2/receipt
--- a/wbar2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wbar2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,14 +12,9 @@
 TARBALL="wbar-$VERSION.tgz"
 WGET_URL="http://wbar.googlecode.com/files/$TARBALL"
 
-BUILD_DEPENDS_arm="imlib2-dev gtk+-dev libglade-dev xorg-libX11-dev"
-BUILD_DEPENDS="imlib2-dev gtk+-dev libglade-dev xorg-libX11-dev intltool file"
+BUILD_DEPENDS="imlib2-dev gtk2-dev libglade-dev xorg-libX11-dev intltool file"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) ARCH_ARGS="--disable-wbar-config";;
-	esac
-
 	./configure \
 		CXXFLAGS="-Wno-error=literal-suffix" \
 		--exec-prefix=/usr \
@@ -30,15 +25,12 @@
 	mkdir -p $install/usr/share/applications/
 	mv $install/etc/wbar.d/wbar.desktop $install/usr/share/applications/
 
-	case "$ARCH" in
-		arm*) cp $stuff/wbar-arm.cfg $install/etc/wbar.d/wbar.cfg;;
-		*)    cp $stuff/wbar.cfg     $install/etc/wbar.d/wbar.cfg;;
-	esac
+	cp $stuff/wbar.cfg $install/etc/wbar.d/wbar.cfg
 }
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="ttf-dejavu imlib2 gtk+ libglade"
+	DEPENDS="ttf-dejavu imlib2 gtk2 libglade"
 	CONFIG_FILES="/etc/default/wbar/wbar.cfg"
 	TAGS="desktop launchbar"
 }
diff -r 71ba95d2422e -r f48456621a9d webian-shell/receipt
--- a/webian-shell/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/webian-shell/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,34 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="webian-shell"
 VERSION="0.1"
 CATEGORY="network"
-SHORT_DESC="A full screen web browser."
+SHORT_DESC="A full screen web browser"
 MAINTAINER="hackdorte@sapo.pt"
 LICENSE="MPL2"
 WEB_SITE="http://webian.org/shell/"
+
 GITHUB="https://cloud.github.com/downloads"
 TARBALL="${PACKAGE/-/_}_$VERSION-linux_32.tar.gz"
 WGET_URL="$GITHUB/webianproject/shell/$TARBALL"
 
-DEPENDS="gtk+ nss"
+DEPENDS="gtk2 nss"
 
-compile_rules()
-{
+compile_rules() {
+	mkdir -p $install/usr/share/applications
+	mkdir -p $install/usr/share/pixmaps
+	mkdir -p $install/usr/lib/webian-shell
 
-mkdir -p $install/usr/share/applications
-mkdir -p $install/usr/share/pixmaps
-mkdir -p $install/usr/lib/webian-shell
-
-cp -a $src/xulrunner/chrome/icons/default/default32.png $install/usr/share/pixmaps/webian-shell.png
-cp -a $src/* $install/usr/lib/webian-shell
-
+	cp -a $src/xulrunner/chrome/icons/default/default32.png $install/usr/share/pixmaps/webian-shell.png
+	cp -a $src/* $install/usr/lib/webian-shell
 }
 
-genpkg_rules()
-{
-
-cat > $install/usr/share/applications/webian-shell.desktop <<EOT
+genpkg_rules() {
+	cat > $install/usr/share/applications/webian-shell.desktop <<EOT
 [Desktop Entry]
 Type=Application
 Name=Webian Shell
@@ -39,16 +35,13 @@
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 EOT
 
-cp -a $install/* $fs
-
+	cp -a $install/* $fs
 }
 
-post_install()
-{
+post_install() {
 	ln -s /usr/lib/webian-shell/Webian\ Shell $1/usr/bin/webian-shell
 }
 
-post_remove()
-{
+post_remove() {
 	rm -rf $1/usr/bin/webian-shell
 }
diff -r 71ba95d2422e -r f48456621a9d webkit2gtk/receipt
--- a/webkit2gtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/webkit2gtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,15 +7,15 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="custom"
 WEB_SITE="https://webkitgtk.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/webkitgtk.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html"
 REPOLOGY="webkitgtk"
 
 TARBALL="webkitgtk-$VERSION.tar.xz"
 WGET_URL="http://webkitgtk.org/releases/$TARBALL"
 
-BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk+3-dev \
+BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk3-dev \
 harfbuzz-icu-dev libjpeg-turbo-dev libsoup-dev libxslt-dev libsecret-dev \
-libwebp-dev mesa-dev gtk+-dev enchant-dev gst1-plugins-base-dev \
+libwebp-dev mesa-dev gtk2-dev enchant-dev gst1-plugins-base-dev \
 libnotify-dev gettext sqlite3-dev xorg-libXt-dev"
 SPLIT="webkit2gtk-dev"
 
@@ -60,7 +60,7 @@
 		webkit2gtk)
 			copy @std
 			DEPENDS="atk cairo enchant fontconfig freetype gdk-pixbuf glib \
-			gst1-plugins-base gstreamer1 gtk+ gtk+3 icu libgcrypt libharfbuzz \
+			gst1-plugins-base gstreamer1 gtk2 gtk3 icu libgcrypt libharfbuzz \
 			libharfbuzz-icu libicu libjpeg-turbo libnotify libpng16 libsecret \
 			libsoup libsqlite3 libwebp libxml2 libxslt mesa mesa-libegl pango \
 			xorg-libX11 xorg-libXcomposite xorg-libXdamage xorg-libXrender \
@@ -68,7 +68,7 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="webkit2gtk glib-dev gtk+3-dev libsoup-dev"
+			DEPENDS="webkit2gtk glib-dev gtk3-dev libsoup-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d webkitgtk/receipt
--- a/webkitgtk/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/webkitgtk/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,14 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://webkitgtk.org/releases/$TARBALL"
 
-BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk+3-dev \
+BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk3-dev \
 harfbuzz-icu-dev libjpeg-turbo-dev libsoup-dev libxslt-dev libsecret-dev \
-libwebp-dev mesa-dev gtk+-dev enchant-dev gst1-plugins-base-dev \
+libwebp-dev mesa-dev gtk2-dev enchant-dev gst1-plugins-base-dev \
 libnotify-dev gettext"
 SPLIT="webkitgtk-dev"
 
 BUILD_DEPENDS="perl python ruby-dev gperf libjpeg-turbo-dev libpng16-dev \
-libwebp-dev glib-dev icu-dev libxml2-dev pango-dev enchant-dev gtk+-dev \
+libwebp-dev glib-dev icu-dev libxml2-dev pango-dev enchant-dev gtk2-dev \
 xorg-libXt-dev gobject-introspection-dev libsoup-dev libsecret-dev \
 harfbuzz-icu-dev libxslt-dev gst1-plugins-base-dev gettext \
 autoconf automake libtool"
@@ -51,13 +51,13 @@
 		webkitgtk)
 			copy @std
 			DEPENDS="atk cairo enchant fontconfig freetype gdk-pixbuf glib \
-			gst1-plugins-base gstreamer1 gtk+ icu libharfbuzz libharfbuzz-icu \
+			gst1-plugins-base gstreamer1 gtk2 icu libharfbuzz libharfbuzz-icu \
 			libicu libjpeg-turbo libpng16 libsecret libsoup libsqlite3 libwebp \
 			libxml2 libxslt pango xorg-libX11 xorg-libXrender xorg-libXt zlib"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="webkitgtk glib-dev gtk+-dev libsoup-dev"
+			DEPENDS="webkitgtk glib-dev gtk2-dev libsoup-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d which/receipt
--- a/which/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/which/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://savannah.gnu.org/projects/which/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/which.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/which.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d wireshark/receipt
--- a/wireshark/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wireshark/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://1.eu.dl.wireshark.org/src/$TARBALL"
 
-BUILD_DEPENDS="gnutls-dev libgpg-error-dev libcap-dev libpcap-dev gtk+-dev \
+BUILD_DEPENDS="gnutls-dev libgpg-error-dev libcap-dev libpcap-dev gtk2-dev \
 libgcrypt-dev flex libtasn1-dev bison perl"
 
 compile_rules() {
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ libcap libgcrypt libgnutls libpcap \
+	DEPENDS="cairo gdk-pixbuf glib gtk2 libcap libgcrypt libgnutls libpcap \
 	libxml2 pango zlib   libgpg-error xorg-libXdamage libcomerr3 attr \
 	portaudio libkrb5"
 	TAGS="network analysis"
diff -r 71ba95d2422e -r f48456621a9d wordwarvi/receipt
--- a/wordwarvi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wordwarvi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libvorbis-dev libogg-dev portaudio portaudio-dev gtk+-dev \
+BUILD_DEPENDS="libvorbis-dev libogg-dev portaudio portaudio-dev gtk2-dev \
 xorg-libXrender-dev xorg-xorgproto xorg-pixman-dev \
 glib-dev"
 
@@ -23,7 +23,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="portaudio expat gtk+ libvorbis xorg-libX11 xorg-libXau \
+	DEPENDS="portaudio expat gtk2 libvorbis xorg-libX11 xorg-libXau \
 	xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
 	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
 	xorg-libXdamage"
diff -r 71ba95d2422e -r f48456621a9d wpa_supplicant/receipt
--- a/wpa_supplicant/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wpa_supplicant/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="0dddba11@googlemail.com"
 LICENSE="GPL2"
 WEB_SITE="http://w1.fi/wpa_supplicant/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/basicnet/wpa_supplicant.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/wpa_supplicant.html"
 REPOLOGY="wpa-supplicant"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
diff -r 71ba95d2422e -r f48456621a9d wv/receipt
--- a/wv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.abisource.com/projects/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/wv.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/wv.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.abisource.com/downloads/wv/$VERSION/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d wxWidgets/receipt
--- a/wxWidgets/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wxWidgets/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev expat-dev zlib-dev \
+BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
 xorg-dev xorg-xorgproto glu mesa-dev libpng16-dev tiff-dev \
 jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
 SPLIT="wxWidgets-dev"
@@ -44,7 +44,7 @@
 			# Remove devel files.
 			rm -rf $fs/usr/lib/wx/include
 			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
-			gtk+ cairo fontconfig freetype jpeg libpng16 tiff pango \
+			gtk2 cairo fontconfig freetype jpeg libpng16 tiff pango \
 			xorg-pixman util-linux-uuid xorg-libSM xorg-libICE xorg-libX11 \
 			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
 			xorg-libXdmcp xorg-libXext glu xorg-libXfixes \
@@ -59,7 +59,7 @@
 
 			cp -a $install/usr/share $fs/usr
 			rm -r $fs/usr/share/locale
-			DEPENDS="wxWidgets gtk+-dev xorg-libXinerama-dev xorg-libSM-dev \
+			DEPENDS="wxWidgets gtk2-dev xorg-libXinerama-dev xorg-libSM-dev \
 			xorg-libICE-dev expat zlib"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d wxWidgets28/receipt
--- a/wxWidgets28/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/wxWidgets28/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="wxPython-src-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/wxwindows/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev expat-dev zlib-dev \
+BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
 xorg-dev xorg-xorgproto glu mesa-dev libpng12-dev tiff-dev \
 jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
 SPLIT="wxWidgets28-dev"
@@ -49,7 +49,7 @@
 			# Remove devel files.
 			rm -rf $fs/usr/lib/wx/include
 			DEPENDS="glib glibc-base gcc-lib-base expat zlib atk \
-			gtk+ cairo fontconfig freetype jpeg libpng12 tiff pango \
+			gtk2 cairo fontconfig freetype jpeg libpng12 tiff pango \
 			xorg-pixman util-linux-uuid xorg-libSM xorg-libICE xorg-libX11 \
 			xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
 			xorg-libXdmcp xorg-libXext glu xorg-libXfixes \
@@ -64,7 +64,7 @@
 
 			cp -a $install/usr/share $fs/usr
 			rm -r $fs/usr/share/locale
-			DEPENDS="wxWidgets28 gtk+-dev xorg-libXinerama-dev xorg-libSM-dev \
+			DEPENDS="wxWidgets28 gtk2-dev xorg-libXinerama-dev xorg-libSM-dev \
 			xorg-libICE-dev expat zlib"
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d xalan-xerces-j/receipt
--- a/xalan-xerces-j/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xalan-xerces-j/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xalan-xerces-j"
 VERSION="2.7.1"
 CATEGORY="development"
-SHORT_DESC="A validating XML parser and an XSLT processor written in Java."
+SHORT_DESC="A validating XML parser and an XSLT processor written in Java"
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="Apache"
 WEB_SITE="http://xalan.apache.org/"
@@ -13,23 +13,18 @@
 TARBALL="${SOURCE}_2_7_1-bin-2jars.tar.gz"
 WGET_URL="http://www.apache.org/dist/xml/xalan-j/binaries/$TARBALL"
 
-DEPENDS=""
-SUGGESTED="java-jre"
 BUILD_DEPENDS="tar"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ -d ${SOURCE}_2_7_1 ] && mv ${SOURCE}_2_7_1  $src
 	cd $src
-	
+
 	mkdir -p $DESTDIR/usr/share/java &&
 	cp -f $src/*.jar $DESTDIR/usr/share/java
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs
+	SUGGESTED="java-jre"
 }
diff -r 71ba95d2422e -r f48456621a9d xapian/receipt
--- a/xapian/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xapian/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://xapian.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/xapian.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/xapian.html"
 REPOLOGY="xapian-core"
 
 TARBALL="xapian-core-$VERSION.tar.xz"
diff -r 71ba95d2422e -r f48456621a9d xarchive/receipt
--- a/xarchive/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xarchive/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,35 +1,34 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xarchive"
 VERSION="0.2.8-6"
 CATEGORY="x-window"
-SHORT_DESC="A GTK+ front-end for command line archiving tools."
+SHORT_DESC="A GTK+ front-end for command line archiving tools"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://xarchive.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-SUGGESTED="zip rar unace arj lha p7zip lzop linux-squashfs cromfs cabextract \
-xz lrzip"
-WEB_SITE="http://xarchive.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+ xorg-libXdamage"
-BUILD_DEPENDS="gtk+-dev"
+BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.ls sr	
-compile_rules()
-{
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
-
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/xarchive/wrappers
 	cp -a $install/usr/bin $fs/usr
 	sed -i 's|#!\s*/bin/bash|#!/bin/sh|' $install/usr/lib/xarchive/wrappers/*
 	cp $stuff/slitaz-wrap.sh $fs/usr/lib/xarchive/wrappers
+	DEPENDS="gtk2 xorg-libXdamage"
+	SUGGESTED="zip rar unace arj lha p7zip lzop linux-squashfs cromfs \
+	cabextract xz lrzip"
 }
diff -r 71ba95d2422e -r f48456621a9d xarchiver/receipt
--- a/xarchiver/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xarchiver/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/ib/xarchiver/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="gtk+-dev intltool libxslt"
+BUILD_DEPENDS="gtk2-dev intltool libxslt"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -31,7 +31,7 @@
 genpkg_rules() {
 	copy @std @ico
 	rm -r $fs/usr/share/pixmaps/
-	DEPENDS="gdk-pixbuf glib gtk+"
+	DEPENDS="gdk-pixbuf glib gtk2"
 	# binutils for ar; busybox also contains gzip & cpio; rar is get-rar;
 	# gtar is absent
 	SUGGESTED="arj binutils bzip2 cpio gzip lha lzma lzop p7zip-full rar xz zip"
diff -r 71ba95d2422e -r f48456621a9d xbill/receipt
--- a/xbill/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xbill/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -10,8 +10,8 @@
 WEB_SITE="http://www.xbill.org/"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-DEPENDS="gtk+ xorg-libXaw lesstif"
-BUILD_DEPENDS="gtk+-dev xorg-libXaw-dev lesstif-dev"
+DEPENDS="gtk2 xorg-libXaw lesstif"
+BUILD_DEPENDS="gtk2-dev xorg-libXaw-dev lesstif-dev"
 
 # Rules to configure and make the package.
 compile_rules()
diff -r 71ba95d2422e -r f48456621a9d xchat/receipt
--- a/xchat/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xchat/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+-dev dbus-dev openssl10-dev shared-mime-info \
+BUILD_DEPENDS="gtk2-dev dbus-dev openssl10-dev shared-mime-info \
 gettext-tools perl-dev"
 SPLIT="xchat-plugin:plugin"
 
@@ -46,11 +46,11 @@
 	case $PACKAGE in
 		xchat)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk+ openssl10 pango perl-core xorg-libX11"
+			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core xorg-libX11"
 			;;
 		xchat-plugin)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk+ openssl10 pango perl-core xorg-libX11"
+			DEPENDS="gdk-pixbuf glib gtk2 openssl10 pango perl-core xorg-libX11"
 			PROVIDE="xchat"
 			CAT="network|with plugins support"
 			;;
diff -r 71ba95d2422e -r f48456621a9d xdg-user-dirs/receipt
--- a/xdg-user-dirs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xdg-user-dirs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 SHORT_DESC="Tool to help manage user directories"
 MAINTAINER="yuripourre@gmail.com"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/xdg-user-dirs.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/xdg-user-dirs.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://user-dirs.freedesktop.org/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d xdialog/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xdialog/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -0,0 +1,28 @@
+# SliTaz package receipt v2.
+
+PACKAGE="xdialog"
+VERSION="2.3.1"
+CATEGORY="x-window"
+SHORT_DESC="Like 'dialog' or 'cdialog', but for X using GTK+"
+MAINTAINER="rcx@zoominternet.net"
+LICENSE="GPL2"
+WEB_SITE="http://xdialog.free.fr/"
+
+TARBALL="Xdialog-$VERSION.tar.bz2"
+WGET_URL="http://xdialog.free.fr/$TARBALL"
+
+BUILD_DEPENDS="autoconf automake m4 gettext gtk2-dev"
+
+compile_rules() {
+	autoconf &&
+	./configure \
+		--with-gtk2 \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
+}
+
+genpkg_rules() {
+	copy @std
+	DEPENDS="glib gtk2"
+}
diff -r 71ba95d2422e -r f48456621a9d xfburn/receipt
--- a/xfburn/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfburn/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool libburn-dev libisofs-dev gtk+-dev libxfce4ui-dev \
+BUILD_DEPENDS="intltool libburn-dev libisofs-dev gtk2-dev libxfce4ui-dev \
 exo-dev libgudev-dev gstreamer1-dev gst1-plugins-base-dev"
 COOKOPTS="!uiz" # headers of the *.ui disappeared
 
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="exo gdk-pixbuf glib gst1-plugins-base gstreamer1 gtk+ libburn \
+	DEPENDS="exo gdk-pixbuf glib gst1-plugins-base gstreamer1 gtk2 libburn \
 	libgudev libisofs libxfce4ui libxfce4util"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-appfinder/receipt
--- a/xfce4-appfinder/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-appfinder/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -24,5 +24,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="garcon gdk-pixbuf glib gtk+ libxfce4ui libxfce4util xfconf"
+	DEPENDS="garcon gdk-pixbuf glib gtk2 libxfce4ui libxfce4util xfconf"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-battery-plugin/receipt
--- a/xfce4-battery-plugin/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-battery-plugin/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/panel-plugins/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev libxfce4util-dev libxfce4ui-dev \
+BUILD_DEPENDS="intltool gtk2-dev libxfce4util-dev libxfce4ui-dev \
 xfce4-panel-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
 
 compile_rules() {
@@ -25,6 +25,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk+ libxfce4ui libxfce4util xfce4-panel"
+	DEPENDS="glib gtk2 libxfce4ui libxfce4util xfce4-panel"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-dict/receipt
--- a/xfce4-dict/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-dict/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev libxfce4ui-dev xfce4-panel-dev xorg-libSM-dev \
+BUILD_DEPENDS="intltool gtk2-dev libxfce4ui-dev xfce4-panel-dev xorg-libSM-dev \
 startup-notification-dev xorg-xcb-util-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk+ libxfce4ui libxfce4util pango xfce4-panel \
+	DEPENDS="gdk-pixbuf glib gtk2 libxfce4ui libxfce4util pango xfce4-panel \
 	xorg-libX11"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-mixer/receipt
--- a/xfce4-mixer/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-mixer/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool dbus-glib-dev gst0-plugins-base-dev gtk+-dev \
+BUILD_DEPENDS="intltool dbus-glib-dev gst0-plugins-base-dev gtk2-dev \
 libunique-dev libxfce4util-dev libxfce4ui-dev xfce4-panel-dev keybinder-dev \
 startup-notification-dev xorg-xcb-util-dev"
 
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo dbus-glib gdk-pixbuf glib gst0-plugins-base gstreamer0 gtk+ \
+	DEPENDS="cairo dbus-glib gdk-pixbuf glib gst0-plugins-base gstreamer0 gtk2 \
 	keybinder libunique libxfce4ui libxfce4util xfce4-panel xfconf"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-notifyd/receipt
--- a/xfce4-notifyd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-notifyd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -26,7 +26,7 @@
 genpkg_rules() {
 	# */bin/*-config usually a dev file, but not in this case
 	copy @std xfce4-notifyd-config
-	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+ libnotify libxfce4ui \
+	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 libnotify libxfce4ui \
 	libxfce4util xfconf xorg-libX11"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-panel/receipt
--- a/xfce4-panel/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-panel/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -29,14 +29,14 @@
 	case $PACKAGE in
 		xfce4-panel)
 			copy @std
-			DEPENDS="atk cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk+ \
+			DEPENDS="atk cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk2 \
 			libwnck2 libxfce4ui libxfce4util pango xfconf xorg-libX11 \
 			xorg-libXext"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="xfce4-panel \
-			glib-dev gtk+-dev libxfce4util-dev"
+			glib-dev gtk2-dev libxfce4util-dev"
 			;;
 	esac
 	TAGS="Xfce"
diff -r 71ba95d2422e -r f48456621a9d xfce4-power-manager/receipt
--- a/xfce4-power-manager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-power-manager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev dbus-dev dbus-glib-dev xfconf-dev \
+BUILD_DEPENDS="intltool gtk2-dev dbus-dev dbus-glib-dev xfconf-dev \
 libxfce4ui-dev libnotify-dev upower-dev xorg-libXrandr-dev xfce4-panel-dev \
 xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
 
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+ libnotify libxfce4ui \
+	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk2 libnotify libxfce4ui \
 	libxfce4util pango upower xfce4-panel xfconf xorg-libX11 xorg-libXext \
 	xorg-libXrandr"
 	TAGS="Xfce"
diff -r 71ba95d2422e -r f48456621a9d xfce4-screenshooter/receipt
--- a/xfce4-screenshooter/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-screenshooter/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -26,7 +26,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo exo gdk-pixbuf glib gtk+ libsoup libxfce4ui libxfce4util \
+	DEPENDS="cairo exo gdk-pixbuf glib gtk2 libsoup libxfce4ui libxfce4util \
 	libxml2 xfce4-panel xorg-libX11 xorg-libXext xorg-libXfixes"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-session/receipt
--- a/xfce4-session/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-session/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool xorg-libX11-dev libxfce4util-dev libxfce4ui-dev \
 libwnck2-dev polkit-dev upower-dev xorg-iceauth xorg-libSM-dev"
-SPLIT="xfce4-session-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	touch libtoolT
@@ -33,7 +33,7 @@
 	case $PACKAGE in
 		xfce4-session)
 			copy @std
-			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk+ libwnck2 \
+			DEPENDS="atk cairo dbus dbus-glib gdk-pixbuf glib gtk2 libwnck2 \
 			libxfce4ui libxfce4util pango polkit xfconf xorg-libICE xorg-libSM \
 			xorg-libX11   xorg-iceauth"
 			;;
diff -r 71ba95d2422e -r f48456621a9d xfce4-settings/receipt
--- a/xfce4-settings/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-settings/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std hicolor/ # only 128 icons here
-	DEPENDS="cairo dbus dbus-glib exo fontconfig garcon gdk-pixbuf glib gtk+ \
+	DEPENDS="cairo dbus dbus-glib exo fontconfig garcon gdk-pixbuf glib gtk2 \
 	libnotify libxfce4ui libxfce4util libxklavier pango upower xfconf \
 	xorg-libX11 xorg-libXcursor xorg-libXi xorg-libXrandr"
 	TAGS="Xfce"
diff -r 71ba95d2422e -r f48456621a9d xfce4-taskmanager/receipt
--- a/xfce4-taskmanager/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-taskmanager/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gtk+-dev libwnck2-dev"
+BUILD_DEPENDS="intltool gtk2-dev libwnck2-dev"
 
 compile_rules(){
 	./configure \
@@ -24,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="cairo gdk-pixbuf glib gtk+ libwnck2"
+	DEPENDS="cairo gdk-pixbuf glib gtk2 libwnck2"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-terminal/receipt
--- a/xfce4-terminal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-terminal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk+-dev vte-gtk2-dev \
+BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk2-dev vte-gtk2-dev \
 libxfce4ui-dev xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
 
 compile_rules(){
@@ -28,7 +28,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="atk gdk-pixbuf glib gtk+ libxfce4ui libxfce4util pango vte-gtk2 \
+	DEPENDS="atk gdk-pixbuf glib gtk2 libxfce4ui libxfce4util pango vte-gtk2 \
 	xorg-libX11"
 	TAGS="Xfce terminal"
 }
diff -r 71ba95d2422e -r f48456621a9d xfce4-volumed/receipt
--- a/xfce4-volumed/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfce4-volumed/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -22,7 +22,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gst0-plugins-base gstreamer0 gtk+ keybinder libnotify \
+	DEPENDS="glib gst0-plugins-base gstreamer0 gtk2 keybinder libnotify \
 	xfconf"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfdesktop/receipt
--- a/xfdesktop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfdesktop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
-dbus-glib-dev gtk+-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev exo-dev \
+dbus-glib-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev exo-dev \
 thunar-dev garcon-dev libnotify-dev"
 SPLIT="xfdesktop-extras xfdesktop"
 
@@ -33,7 +33,7 @@
 			;;
 		xfdesktop)
 			copy @std @rm
-			DEPENDS="cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk+ \
+			DEPENDS="cairo dbus dbus-glib exo garcon gdk-pixbuf glib gtk2 \
 			libnotify libwnck2 libxfce4ui libxfce4util pango thunar xfconf \
 			xorg-libX11"
 			;;
diff -r 71ba95d2422e -r f48456621a9d xfig/receipt
--- a/xfig/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfig/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -3,46 +3,48 @@
 PACKAGE="xfig"
 VERSION="3.2.6a"
 CATEGORY="x-window"
-SHORT_DESC="Vector graphics editor for X."
+SHORT_DESC="Vector graphics editor for X"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://www.xfig.org/"
+
 TARBALL="$PACKAGE-full-$VERSION.tar.xz"
-WEB_SITE="http://www.xfig.org/"
-WGET_URL="https://downloads.sourceforge.net/mcj/files/$TARBALL"
+WGET_URL="$SF_MIRROR/mcj/$TARBALL"
 
 BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-gccmakedep jpeg-dev \
 libpng16-dev xorg-libXp xorg-libX11-dev xorg-libXt-dev xorg-libXpm-dev \
 xorg-libXmu-dev xorg-libXaw-dev xorg-libXaw3d-dev xorg-libXt-dev"
 SPLIT="transfig"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/$PACKAGE-$VERSION
-	./configure --prefix=/usr \
+
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR/xfig install
+	make DESTDIR=$DESTDIR/xfig install || return 1
+
 	cd $src/fig2dev-$VERSION
-	./configure --prefix=/usr \
+
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR/transfig install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	xfig)
-		SUGGESTED="transfig"
-		DEPENDS="jpeg libpng16 xorg xorg-libXp"
-		cp -a $install/xfig/* $fs
-		;;
-	transfig)
-		CAT="x-window|Utilities for converting XFig figure files."
-		DEPENDS="xorg xorg-libXpm libpng16 zlib"
-		cp -a $install/transfig/* $fs
-		;;
+		xfig)
+			cp -a $install/xfig/* $fs
+			SUGGESTED="transfig"
+			DEPENDS="jpeg libpng16 xorg xorg-libXp"
+			;;
+		transfig)
+			cp -a $install/transfig/* $fs
+			SHORT_DESC="Utilities for converting XFig figure files"
+			DEPENDS="xorg xorg-libXpm libpng16 zlib"
+			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d xfmedia/receipt
--- a/xfmedia/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfmedia/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -32,7 +32,7 @@
 genpkg_rules() {
 	copy @std
 	rm -r $fs/usr/share/xfmedia/doc/
-	DEPENDS="exo gdk-pixbuf glib gtk+ libxfce4util libxfcegui4 pango xine-lib \
+	DEPENDS="exo gdk-pixbuf glib gtk2 libxfce4util libxfcegui4 pango xine-lib \
 	xorg-libX11 xorg-libXext xorg-libXtst"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfmpc/receipt
--- a/xfmpc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfmpc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk+-dev \
+BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk2-dev \
 libxfce4ui-dev libmpd-dev xorg-libSM-dev startup-notification-dev \
 xorg-xcb-util-dev"
 
@@ -28,6 +28,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="gdk-pixbuf glib gtk+ libmpd libxfce4ui libxfce4util pango"
+	DEPENDS="gdk-pixbuf glib gtk2 libmpd libxfce4ui libxfce4util pango"
 	TAGS="Xfce"
 }
diff -r 71ba95d2422e -r f48456621a9d xfprint/receipt
--- a/xfprint/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfprint/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/xfce/$VERSION/src/$TARBALL"
 
 BUILD_DEPENDS="libxfcegui4-dev libxfce4util-dev cups-dev intltool xfconf-dev \
-dbus-glib-dev startup-notification-dev util-linux-uuid-dev gtk+-dev \
+dbus-glib-dev startup-notification-dev util-linux-uuid-dev gtk2-dev \
 xorg-xcb-util-dev"
 SPLIT="xfprint-dev"
 
@@ -33,7 +33,7 @@
 			copy @std
 			# Remove SVG icons
 			rm -rf $fs/usr/share/icons/hicolor/scalable
-			DEPENDS="gdk-pixbuf glib gtk+ libcups libxfce4util libxfcegui4 \
+			DEPENDS="gdk-pixbuf glib gtk2 libcups libxfce4util libxfcegui4 \
 			xfconf xorg-libX11"
 			;;
 		*-dev)
diff -r 71ba95d2422e -r f48456621a9d xfsprogs/receipt
--- a/xfsprogs/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfsprogs/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="patel@math.uga.edu"
 LICENSE="GPL3"
 WEB_SITE="http://oss.sgi.com/projects/xfs/"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/xfsprogs.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/$TARBALL"
@@ -15,7 +16,6 @@
 SPLIT="xfsprogs-dev"
 
 compile_rules() {
-	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/xfsprogs.html
 	rm /bin/rpm # busybox rpm useless here
 
 	fix libtool &&
diff -r 71ba95d2422e -r f48456621a9d xfwm4/receipt
--- a/xfwm4/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xfwm4/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
-xorg-libXext-dev gtk+-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev \
+xorg-libXext-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev \
 libdrm-dev xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXfixes-dev \
 xorg-libXdamage-dev"
 SPLIT="xfwm4-themes xfwm4"
@@ -34,7 +34,7 @@
 			;;
 		xfwm4)
 			copy @std @rm
-			DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk+ libwnck2 libxfce4ui \
+			DEPENDS="cairo dbus-glib gdk-pixbuf glib gtk2 libwnck2 libxfce4ui \
 			libxfce4util pango startup-notification xfconf xorg-libX11 \
 			xorg-libXcomposite xorg-libXdamage xorg-libXext xorg-libXfixes \
 			xorg-libXrandr xorg-libXrender"
diff -r 71ba95d2422e -r f48456621a9d xine-lib/receipt
--- a/xine-lib/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xine-lib/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -9,23 +9,17 @@
 WEB_SITE="http://www.xine-project.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="http://downloads.sourceforge.net/project/xine/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/xine/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXvMC-dev xorg-libXv-dev xorg-xorgproto \
 alsa-lib-dev libogg-dev libvorbis-dev libtheora-dev freetype-dev perl \
 util-linux-uuid-dev xorg-libxcb-dev libcaca-dev ffmpeg-dev file \
 libmodplug-dev xorg-libXinerama-dev speex-dev gettext-tools"
-SPLIT="xine-fonts xine-lib xine-lib-dev"
+SPLIT="xine-fonts $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
-			export LIBTOOL=${HOST_SYSTEM}-libtool 
-			ARCH_ARGS="--disable-xinerama" ;;
-	esac
+	sed -i 's/grep -x/grep/' configure
 
-	sed -i 's/grep -x/grep/' configure
 	CPPFLAGS="$CPPFLAGS -DHAVE_NANO_SLEEP" \
 	./configure \
 		--with-freetype \
@@ -41,9 +35,10 @@
 		--without-esound \
 		--disable-vcd \
 		--disable-musepack \
-		$CONFIGURE_ARGS $ARCH_ARGS &&
+		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
@@ -60,7 +55,7 @@
 			xorg-libxcb ffmpeg libmodplug"
 			SUGGESTED="xine-fonts faad2"
 			;;
-		xine-lib-dev)
+		*-dev)
 			copy @dev
 			;;
 	esac
diff -r 71ba95d2422e -r f48456621a9d xmlto/receipt
--- a/xmlto/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xmlto/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 SHORT_DESC="Tool for converting XML files to various formats"
 MAINTAINER="yuripourre@gmail.com"
 WEB_SITE="http://cyberelk.net/tim/software/xmlto/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/pst/xmlto.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/pst/xmlto.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://releases.pagure.org/xmlto/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d xombrero/receipt
--- a/xombrero/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xombrero/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -14,7 +14,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/conformal/xombrero/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="glib-dev gtk+-dev webkitgtk-dev libsoup-dev gnutls-dev \
+BUILD_DEPENDS="glib-dev gtk2-dev webkitgtk-dev libsoup-dev gnutls-dev \
 libbsd-dev perl mdocml" # groff absent yet, so we use mdocml and patch
 
 compile_rules() {
@@ -41,7 +41,7 @@
 genpkg_rules() {
 	copy @std
 	CONFIG_FILES="/etc/xombrero.conf"
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libbsd \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libbsd \
 	libgnutls libsoup pango webkitgtk xorg-libX11"
 	TAGS="web-browser"
 }
diff -r 71ba95d2422e -r f48456621a9d xorg-encodings/receipt
--- a/xorg-encodings/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-encodings/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="PublicDomain"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="encodings"
 
 TARBALL="encodings-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-adobe-utopia-type1/receipt
--- a/xorg-font-adobe-utopia-type1/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-adobe-utopia-type1/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="fonts:adobe-utopia-type1"
 
 TARBALL="font-adobe-utopia-type1-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-alias/receipt
--- a/xorg-font-alias/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-alias/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="font-alias"
 
 TARBALL="font-alias-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-bh-ttf/receipt
--- a/xorg-font-bh-ttf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-bh-ttf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="font-bh-ttf"
 
 TARBALL="font-bh-ttf-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-bh-type1/receipt
--- a/xorg-font-bh-type1/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-bh-type1/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="fonts:bh-type1"
 
 TARBALL="font-bh-type1-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-ibm-type1/receipt
--- a/xorg-font-ibm-type1/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-ibm-type1/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="fonts:ibm-type1"
 
 TARBALL="font-ibm-type1-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-misc-ethiopic/receipt
--- a/xorg-font-misc-ethiopic/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-misc-ethiopic/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="font-misc-ethiopic"
 
 TARBALL="font-misc-ethiopic-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-util/receipt
--- a/xorg-font-util/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-util/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="font-util"
 
 TARBALL="font-util-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-font-xfree86-type1/receipt
--- a/xorg-font-xfree86-type1/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-font-xfree86-type1/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7font.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7font.html"
 REPOLOGY="fonts:xfree86-type1"
 
 TARBALL="font-xfree86-type1-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-iceauth/receipt
--- a/xorg-iceauth/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-iceauth/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="iceauth"
 
 TARBALL="iceauth-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libICE/receipt
--- a/xorg-libICE/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libICE/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libice"
 
 TARBALL="libICE-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libSM/receipt
--- a/xorg-libSM/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libSM/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libsm"
 
 TARBALL="libSM-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libX11/receipt
--- a/xorg-libX11/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libX11/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libx11"
 
 TARBALL="libX11-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXScrnSaver/receipt
--- a/xorg-libXScrnSaver/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXScrnSaver/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxscrnsaver"
 
 TARBALL="libXScrnSaver-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXau/receipt
--- a/xorg-libXau/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXau/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libXau.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libXau.html"
 REPOLOGY="libxau"
 
 TARBALL="libXau-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXaw/receipt
--- a/xorg-libXaw/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXaw/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxaw"
 
 TARBALL="libXaw-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXcomposite/receipt
--- a/xorg-libXcomposite/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXcomposite/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxcomposite"
 
 TARBALL="libXcomposite-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXcursor/receipt
--- a/xorg-libXcursor/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXcursor/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,14 +7,14 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxcursor"
 
 TARBALL="libXcursor-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXrender-dev xorg-libXfixes-dev"
-SPLIT="xorg-libXcursor-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 71ba95d2422e -r f48456621a9d xorg-libXdamage/receipt
--- a/xorg-libXdamage/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXdamage/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxdamage"
 
 TARBALL="libXdamage-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXdmcp/receipt
--- a/xorg-libXdmcp/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXdmcp/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libXdmcp.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libXdmcp.html"
 REPOLOGY="libxdmcp"
 
 TARBALL="libXdmcp-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXext/receipt
--- a/xorg-libXext/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXext/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxext"
 
 TARBALL="libXext-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXfixes/receipt
--- a/xorg-libXfixes/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXfixes/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxfixes"
 
 TARBALL="libXfixes-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXfont2/receipt
--- a/xorg-libXfont2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXfont2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxfont2"
 
 TARBALL="libXfont2-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXft/receipt
--- a/xorg-libXft/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXft/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxft"
 
 TARBALL="libXft-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXi/receipt
--- a/xorg-libXi/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXi/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxi"
 
 TARBALL="libXi-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXinerama/receipt
--- a/xorg-libXinerama/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXinerama/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxinerama"
 
 TARBALL="libXinerama-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXmu/receipt
--- a/xorg-libXmu/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXmu/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxmu"
 
 TARBALL="libXmu-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXpm/receipt
--- a/xorg-libXpm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXpm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxpm"
 
 TARBALL="libXpm-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXrandr/receipt
--- a/xorg-libXrandr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXrandr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/libraries/libxrandr/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxrandr"
 
 TARBALL="libXrandr-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXrender/receipt
--- a/xorg-libXrender/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXrender/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxrender"
 
 TARBALL="libXrender-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXres/receipt
--- a/xorg-libXres/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXres/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxres"
 
 TARBALL="libXres-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXt/receipt
--- a/xorg-libXt/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXt/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxt"
 
 TARBALL="libXt-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXtst/receipt
--- a/xorg-libXtst/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXtst/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxtst"
 
 TARBALL="libXtst-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXv/receipt
--- a/xorg-libXv/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXv/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxv"
 
 TARBALL="libXv-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXvMC/receipt
--- a/xorg-libXvMC/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXvMC/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxvmc"
 
 TARBALL="libXvMC-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libXxf86dga/receipt
--- a/xorg-libXxf86dga/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXxf86dga/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxxf86dga"
 
 TARBALL="libXxf86dga-$VERSION.tar.bz2"
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xorgproto \
 xorg-libXext-dev"
-SPLIT="xorg-libXxf86dga-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r 71ba95d2422e -r f48456621a9d xorg-libXxf86vm/receipt
--- a/xorg-libXxf86vm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libXxf86vm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxxf86vm"
 
 TARBALL="libXxf86vm-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libdmx/receipt
--- a/xorg-libdmx/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libdmx/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libdmx"
 
 TARBALL="libdmx-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libfontenc/receipt
--- a/xorg-libfontenc/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libfontenc/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libfontenc"
 
 TARBALL="libfontenc-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libpciaccess/receipt
--- a/xorg-libpciaccess/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libpciaccess/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libpciaccess"
 
 TARBALL="libpciaccess-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libxcb/receipt
--- a/xorg-libxcb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libxcb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/libxcb.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libxcb.html"
 REPOLOGY="libxcb"
 
 TARBALL="libxcb-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libxkbfile/receipt
--- a/xorg-libxkbfile/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libxkbfile/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxkbfile"
 
 TARBALL="libxkbfile-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-libxshmfence/receipt
--- a/xorg-libxshmfence/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-libxshmfence/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="libxshmfence"
 
 TARBALL="libxshmfence-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-luit/receipt
--- a/xorg-luit/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-luit/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="luit"
 
 TARBALL="luit-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-mkfontdir/receipt
--- a/xorg-mkfontdir/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-mkfontdir/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="mkfontdir"
 
 TARBALL="mkfontdir-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-mkfontscale/receipt
--- a/xorg-mkfontscale/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-mkfontscale/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="mkfontscale"
 
 TARBALL="mkfontscale-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-pixman/receipt
--- a/xorg-pixman/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-pixman/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.cairographics.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/pixman.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pixman.html"
 REPOLOGY="pixman"
 
 TARBALL="pixman-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-sessreg/receipt
--- a/xorg-sessreg/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-sessreg/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="sessreg"
 
 TARBALL="sessreg-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-setxkbmap/receipt
--- a/xorg-setxkbmap/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-setxkbmap/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="setxkbmap"
 
 TARBALL="setxkbmap-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-smproxy/receipt
--- a/xorg-smproxy/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-smproxy/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="smproxy"
 
 TARBALL="smproxy-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-util-macros/receipt
--- a/xorg-util-macros/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-util-macros/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="gokhlayeh@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/util-macros.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/util-macros.html"
 REPOLOGY="util-macros"
 
 TARBALL="util-macros-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-x11perf/receipt
--- a/xorg-x11perf/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-x11perf/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="x11perf"
 
 TARBALL="x11perf-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xauth/receipt
--- a/xorg-xauth/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xauth/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,13 +7,12 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xauth"
 
 TARBALL="xauth-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
-BUILD_DEPENDS_arm="xorg-xorgproto xorg-libXau-dev"
 BUILD_DEPENDS="xorg-libXmu-dev"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d xorg-xbacklight/receipt
--- a/xorg-xbacklight/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xbacklight/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xbacklight"
 
 TARBALL="xbacklight-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xbitmaps/receipt
--- a/xorg-xbitmaps/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xbitmaps/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xbitmaps.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xbitmaps.html"
 REPOLOGY="xbitmaps"
 
 TARBALL="xbitmaps-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcb-util-cursor/receipt
--- a/xorg-xcb-util-cursor/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcb-util-cursor/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-cursor.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-cursor.html"
 REPOLOGY="xcb-util-cursor"
 
 TARBALL="xcb-util-cursor-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcb-util-image/receipt
--- a/xorg-xcb-util-image/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcb-util-image/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -8,7 +8,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-image.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-image.html"
 REPOLOGY="xcb-util-image"
 
 TARBALL="xcb-util-image-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcb-util-keysyms/receipt
--- a/xorg-xcb-util-keysyms/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcb-util-keysyms/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL"
 WEB_SITE="https://xcb.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-keysyms.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-keysyms.html"
 REPOLOGY="xcb-util-keysyms"
 
 TARBALL="xcb-util-keysyms-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcb-util-renderutil/receipt
--- a/xorg-xcb-util-renderutil/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcb-util-renderutil/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-renderutil.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-renderutil.html"
 REPOLOGY="xcb-util-renderutil"
 
 TARBALL="xcb-util-renderutil-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcb-util-wm/receipt
--- a/xorg-xcb-util-wm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcb-util-wm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -8,7 +8,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util-wm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-wm.html"
 REPOLOGY="xcb-util-wm"
 
 TARBALL="xcb-util-wm-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcb-util/receipt
--- a/xorg-xcb-util/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcb-util/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcb-util.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util.html"
 REPOLOGY="xcb-util"
 
 TARBALL="xcb-util-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcmsdb/receipt
--- a/xorg-xcmsdb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcmsdb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xcmsdb"
 
 TARBALL="xcmsdb-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcursor-themes/receipt
--- a/xorg-xcursor-themes/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcursor-themes/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xcursor-themes.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcursor-themes.html"
 REPOLOGY="xcursor-themes"
 
 TARBALL="xcursor-themes-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xcursorgen/receipt
--- a/xorg-xcursorgen/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xcursorgen/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xcursorgen"
 
 TARBALL="xcursorgen-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xdpyinfo/receipt
--- a/xorg-xdpyinfo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xdpyinfo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xdpyinfo"
 
 TARBALL="xdpyinfo-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xdriinfo/receipt
--- a/xorg-xdriinfo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xdriinfo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xdriinfo"
 
 TARBALL="xdriinfo-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xev/receipt
--- a/xorg-xev/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xev/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xev"
 
 TARBALL="xev-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xf86-input-evdev/receipt
--- a/xorg-xf86-input-evdev/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xf86-input-evdev/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7driver.html#xorg-evdev-driver"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7driver.html#xorg-evdev-driver"
 REPOLOGY="xdrv:evdev"
 
 TARBALL="xf86-input-evdev-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xgamma/receipt
--- a/xorg-xgamma/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xgamma/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xgamma"
 
 TARBALL="xgamma-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xhost/receipt
--- a/xorg-xhost/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xhost/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xhost"
 
 TARBALL="xhost-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xinput/receipt
--- a/xorg-xinput/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xinput/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xinput"
 
 TARBALL="xinput-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xkbevd/receipt
--- a/xorg-xkbevd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xkbevd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xkbevd"
 
 TARBALL="xkbevd-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xkbutils/receipt
--- a/xorg-xkbutils/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xkbutils/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xkbutils"
 
 TARBALL="xkbutils-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xkeyboard-config/receipt
--- a/xorg-xkeyboard-config/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xkeyboard-config/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/xkeyboard-config.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html"
 REPOLOGY="xkeyboard-config"
 
 TARBALL="xkeyboard-config-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xkill/receipt
--- a/xorg-xkill/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xkill/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xkill"
 
 TARBALL="xkill-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xlsatoms/receipt
--- a/xorg-xlsatoms/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xlsatoms/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xlsatoms"
 
 TARBALL="xlsatoms-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xlsclients/receipt
--- a/xorg-xlsclients/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xlsclients/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xlsclients"
 
 TARBALL="${PACKAGE#*-}-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xmessage/receipt
--- a/xorg-xmessage/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xmessage/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xmessage"
 
 TARBALL="xmessage-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xmodmap/receipt
--- a/xorg-xmodmap/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xmodmap/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xmodmap"
 
 TARBALL="xmodmap-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xpr/receipt
--- a/xorg-xpr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xpr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xpr"
 
 TARBALL="${PACKAGE#*-}-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xprop/receipt
--- a/xorg-xprop/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xprop/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xprop"
 
 TARBALL="xprop-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xrandr/receipt
--- a/xorg-xrandr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xrandr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xrandr"
 
 TARBALL="xrandr-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xrdb/receipt
--- a/xorg-xrdb/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xrdb/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="rocky@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xrdb"
 
 TARBALL="xrdb-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xrefresh/receipt
--- a/xorg-xrefresh/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xrefresh/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xrefresh"
 
 TARBALL="${PACKAGE#*-}-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xset/receipt
--- a/xorg-xset/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xset/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xset"
 
 TARBALL="xset-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xsetroot/receipt
--- a/xorg-xsetroot/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xsetroot/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xsetroot"
 
 TARBALL="xsetroot-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xtrans/receipt
--- a/xorg-xtrans/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xtrans/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7lib.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
 REPOLOGY="xtrans"
 
 TARBALL="xtrans-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xvinfo/receipt
--- a/xorg-xvinfo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xvinfo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xvinfo"
 
 TARBALL="xvinfo-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xwd/receipt
--- a/xorg-xwd/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xwd/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xwd"
 
 TARBALL="xwd-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xwininfo/receipt
--- a/xorg-xwininfo/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xwininfo/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xwininfo"
 
 TARBALL="xwininfo-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xorg-xwud/receipt
--- a/xorg-xwud/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xorg-xwud/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/x7app.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
 REPOLOGY="xwud"
 
 TARBALL="${PACKAGE#*-}-$VERSION.tar.bz2"
diff -r 71ba95d2422e -r f48456621a9d xournal/receipt
--- a/xournal/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xournal/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="autoconf automake gtk+-dev libgnomecanvas-dev poppler-dev \
+BUILD_DEPENDS="autoconf automake gtk2-dev libgnomecanvas-dev poppler-dev \
 zlib-dev libart_lgpl-dev gettext"
 
 compile_rules() {
@@ -26,7 +26,7 @@
 genpkg_rules() {
 	copy @std
 	rm -r $fs/usr/share/mimelnk/
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ libart_lgpl \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libart_lgpl \
 	libgnomecanvas pango poppler xorg-libX11 zlib" # poppler-apps?
 	SUGGESTED="ghostscript"
 }
diff -r 71ba95d2422e -r f48456621a9d xpad/receipt
--- a/xpad/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xpad/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="https://launchpad.net/xpad/trunk/$VERSION/+download/$TARBALL"
 HANDBOOK_URL="http://www.slitaz.org/doc/handbook/utilities.html#xpad"
 
-DEPENDS="gtk+ util-linux-uuid xorg-libICE xorg-libSM"
-BUILD_DEPENDS="gtk+-dev xorg-libSM-dev intltool"
+DEPENDS="gtk2 util-linux-uuid xorg-libICE xorg-libSM"
+BUILD_DEPENDS="gtk2-dev xorg-libSM-dev intltool"
 COOKOPTS="!pixmaps"
 
 # Rules to configure and make the package.
diff -r 71ba95d2422e -r f48456621a9d xpra/receipt
--- a/xpra/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xpra/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -27,7 +27,8 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="glib gtk+ libvpx python x264 x265 xorg-libX11 xorg-libXcomposite \
+
+	DEPENDS="glib gtk2 libvpx python x264 x265 xorg-libX11 xorg-libXcomposite \
 	xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi xorg-libXrandr \
 	xorg-libXtst xorg-libxkbfile   python-pygtk python-pygobject2" # maybe some other python-* too
 }
diff -r 71ba95d2422e -r f48456621a9d xsane/receipt
--- a/xsane/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xsane/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,22 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xsane"
 VERSION="0.998"
 CATEGORY="office"
-SHORT_DESC="XSane - graphical scanning frontend."
+SHORT_DESC="XSane - graphical scanning frontend"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.xsane.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.xsane.org/"
 WGET_URL="http://www.xsane.org/download/$TARBALL"
 
-DEPENDS="sane-backends gtk+ tiff xorg-libXdamage lcms v4l-utils libltdl"
-BUILD_DEPENDS="gtk+-dev sane-backends-dev lcms-dev eudev"
+BUILD_DEPENDS="gtk2-dev sane-backends-dev lcms-dev eudev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/xsane-save.c
+
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -26,11 +25,10 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr/share
-    cp -a $install/usr/bin $fs/usr
-    cp -a $install/usr/share/sane $fs/usr/share
-    rm -rf $fs/usr/share/sane/xsane/doc
+genpkg_rules() {
+	mkdir -p $fs/usr/share
+	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 tiff xorg-libXdamage lcms v4l-utils libltdl"
 }
diff -r 71ba95d2422e -r f48456621a9d xscreensaver/receipt
--- a/xscreensaver/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xscreensaver/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="bc xorg-libX11-dev xorg-libXmu-dev xorg-libXext-dev \
 xorg-libXinerama-dev xorg-libXi-dev xorg-libXxf86vm-dev xorg-libXrandr-dev \
-gtk+-dev libxml2-dev mesa-dev gdk-pixbuf-dev xorg-libXpm-dev jpeg-dev \
+gtk2-dev libxml2-dev mesa-dev gdk-pixbuf-dev xorg-libXpm-dev jpeg-dev \
 xorg-libXt-dev libglade-dev intltool"
 
 compile_rules() {
diff -r 71ba95d2422e -r f48456621a9d xtrkcad/receipt
--- a/xtrkcad/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xtrkcad/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -13,7 +13,7 @@
 WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
 
 BUILD_DEPENDS="cmake gettext zlib-dev \
-gtk+-dev libxml2-dev libgtkhtml-dev libgtkhtml doxygen \
+gtk2-dev libxml2-dev libgtkhtml-dev libgtkhtml doxygen \
 xorg-libX11-dev xorg-xorgproto xorg-libXau-dev \
 xorg-libXdmcp-dev"
 SPLIT="xtrkcad-doc xtrkcad"
@@ -51,7 +51,7 @@
 			;;
 		xtrkcad)
 			copy @std @rm
-			DEPENDS="menu-railroad glibc-base glib zlib expat libxml2 gtk+ \
+			DEPENDS="menu-railroad glibc-base glib zlib expat libxml2 gtk2 \
 			libgtkhtml fontconfig freetype atk cairo libpng16 pango \
 			xorg-pixman xorg-libxcb xorg-xcb-util xorg-libX11 xorg-libXau \
 			xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
diff -r 71ba95d2422e -r f48456621a9d xvidcore/receipt
--- a/xvidcore/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/xvidcore/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.xvid.org/"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/xvid.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://downloads.xvid.org/downloads/$TARBALL"
@@ -14,28 +15,24 @@
 BUILD_DEPENDS="yasm"
 SPLIT="xvidcore-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/multimedia/xvid.html
-	cd build/generic &&
-	sed -i 's/^LN_S=@LN_S@/& -f -v/' platform.inc.in &&
+compile_rules() {
+	cd build/generic
+	sed -i 's/^LN_S=@LN_S@/& -f -v/' platform.inc.in
+
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	sed -i '/libdir.*STATIC_LIB/ s/^/#/' Makefile &&
-	make DESTDIR=$install install &&
+	make DESTDIR=$install install || return 1
 
-	find $install/usr/lib/ -name 'libxvidcore.so.*' -type f -exec chmod -v 755 '{}' \; &&
+	find $install/usr/lib/ -name 'libxvidcore.so.*' -type f -exec chmod -v 755 '{}' \;
 
-	mkdir -p $install/usr/share/doc/xvidcore-$VERSION/examples &&
-	install -v -m644 ../../doc/* $install/usr/share/doc/xvidcore-$VERSION &&
+	mkdir -p $install/usr/share/doc/xvidcore-$VERSION/examples
+	install -v -m644 ../../doc/* $install/usr/share/doc/xvidcore-$VERSION
 	install -v -m644 ../../examples/* \
 		$install/usr/share/doc/xvidcore-$VERSION/examples
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		xvidcore) copy @std;;
 		*-dev)    copy *.h;;
diff -r 71ba95d2422e -r f48456621a9d yad/receipt
--- a/yad/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/yad/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/yad-dialog/$TARBALL"
 
-BUILD_DEPENDS="patch gtk+-dev gtk+3-dev webkitgtk-dev intltool"
+BUILD_DEPENDS="patch gtk2-dev gtk3-dev webkitgtk-dev intltool"
 SPLIT="yad-html:html yad-gtk3:gtk3"
 
 compile_rules() {
@@ -35,22 +35,22 @@
 		yad)
 			copy @std
 			CAT="utilities|GTK+2"
-			DEPENDS="cairo gdk-pixbuf glib gtk+ pango"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 pango"
 			TAGS="gtk2"
 			;;
 		yad-html)
 			copy @std
 			CAT="utilities|GTK+2, with HTML widget"
-			DEPENDS="cairo gdk-pixbuf glib gtk+ libsoup pango webkitgtk"
+			DEPENDS="cairo gdk-pixbuf glib gtk2 libsoup pango webkitgtk"
 			TAGS="gtk2"
 			PROVIDE="yad:webkitgtk"
 			;;
 		yad-gtk3)
 			copy @std
 			CAT="utilities|GTK+3"
-			DEPENDS="cairo gdk-pixbuf glib gtk+3 pango"
+			DEPENDS="cairo gdk-pixbuf glib gtk3 pango"
 			TAGS="gtk3"
-			PROVIDE="yad:gtk+3"
+			PROVIDE="yad:gtk3"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d yasm/receipt
--- a/yasm/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/yasm/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="jozee@slitaz.org"
 LICENSE="BSD GPL2 LGPL2"
 WEB_SITE="http://yasm.tortall.net/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/yasm.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/yasm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.tortall.net/projects/yasm/releases/$TARBALL"
diff -r 71ba95d2422e -r f48456621a9d yasr/receipt
--- a/yasr/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/yasr/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -1,42 +1,36 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="yasr"
 VERSION="0.6.9"
 CATEGORY="utilities"
-SHORT_DESC="General purpose console screen reader."
+SHORT_DESC="General purpose console screen reader"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://yasr.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://yasr.sourceforge.net/"
-WGET_URL="http://prdownloads.sourceforge.net/yasr/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="speech-dispatcher espeak bash"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
-		--prefix=/usr $CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/yasr $fs/usr/share
+	DEPENDS="speech-dispatcher espeak bash"
 }
 
-post_install()
-{
+post_install() {
 	# Enable speech-synthesizer in config file
-	echo -n "Enabling config file..."
-	cd "$1/usr/share/yasr"
-	sed -i 's/synthesizer=emacspeak/#synthesizer=emacspeak/; \
-	s/#synthesizer=speech/synthesizer=speech/; \
-	s/synthesizer port=|/#synthesizer port=|/; \
-	s/#synthesizer port=127./synthesizer port=127./' yasr.conf
-	status	
+	sed 's!synthesizer=emacspeak!#synthesizer=emacspeak!;
+		s!#synthesizer=speech!synthesizer=speech!;
+		s!synthesizer port=|!#synthesizer port=|!;
+		s!#synthesizer port=127.!synthesizer port=127.!' \
+		-i "$1/usr/share/yasr/yasr.conf"
 }
-
diff -r 71ba95d2422e -r f48456621a9d zbar/receipt
--- a/zbar/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/zbar/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="xmlto xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev \
-libjpeg-turbo-dev imagemagick6-dev gtk+-dev"
+libjpeg-turbo-dev imagemagick6-dev gtk2-dev"
 SPLIT="zbar-dev"
 
 compile_rules() {
@@ -32,12 +32,12 @@
 	case $PACKAGE in
 		zbar)
 			copy @std
-			DEPENDS="gdk-pixbuf glib gtk+ imagemagick6 libjpeg-turbo \
+			DEPENDS="gdk-pixbuf glib gtk2 imagemagick6 libjpeg-turbo \
 			xorg-libX11 xorg-libXv"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="zbar glib-dev gtk+-dev"
+			DEPENDS="zbar glib-dev gtk2-dev"
 			;;
 	esac
 }
diff -r 71ba95d2422e -r f48456621a9d zenity+webkit2/receipt
--- a/zenity+webkit2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/zenity+webkit2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="zenity-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/zenity/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+3-dev glib-dev libnotify-dev webkit2gtk-dev gettext \
+BUILD_DEPENDS="gtk3-dev glib-dev libnotify-dev webkit2gtk-dev gettext \
 itstool"
 SPLIT="zenity+webkit2-gnome zenity+webkit2"
 SIBLINGS="zenity"
@@ -29,7 +29,7 @@
 			;;
 		zenity+webkit2)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libnotify libsoup \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libnotify libsoup \
 			pango webkit2gtk xorg-libX11"
 			PROVIDE="webkit2gtk:zenity"
 			TAGS="dialogs"
diff -r 71ba95d2422e -r f48456621a9d zenity-gtk2/receipt
--- a/zenity-gtk2/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/zenity-gtk2/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="zenity-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/zenity/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gnome-doc-utils intltool gtk+-dev" # + libnotify-dev -> crash on build. FIXME
+BUILD_DEPENDS="gnome-doc-utils intltool gtk2-dev" # + libnotify-dev -> crash on build. FIXME
 
 compile_rules() {
 	./configure \
@@ -24,7 +24,7 @@
 genpkg_rules() {
 	copy @std
 	rm -r $fs/usr/share/gnome/ $fs/usr/share/omf/ # GNOME stuff. Just remove it
-	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango \
+	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango \
 	xorg-libX11"
 	TAGS="dialogs gui"
 }
diff -r 71ba95d2422e -r f48456621a9d zenity/receipt
--- a/zenity/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/zenity/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="zenity-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/zenity/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk+3-dev glib-dev libnotify-dev gettext itstool"
+BUILD_DEPENDS="gtk3-dev glib-dev libnotify-dev gettext itstool"
 SPLIT="zenity-gnome zenity"
 SIBLINGS="zenity+webkit2"
 
@@ -31,7 +31,7 @@
 			;;
 		zenity)
 			copy @std @rm
-			DEPENDS="atk cairo gdk-pixbuf glib gtk+3 libnotify pango \
+			DEPENDS="atk cairo gdk-pixbuf glib gtk3 libnotify pango \
 			xorg-libX11"
 			TAGS="dialogs"
 			;;
diff -r 71ba95d2422e -r f48456621a9d zip/receipt
--- a/zip/receipt	Mon Oct 15 16:44:45 2018 +0300
+++ b/zip/receipt	Tue Oct 16 16:46:05 2018 +0300
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.info-zip.org/"
-LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/zip.html"
+LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/zip.html"
 
 TARBALL="$PACKAGE${VERSION//./}.tar.gz"
 WGET_URL="$SF_MIRROR/infozip/$TARBALL"