# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1528720654 -10800
# Node ID dc626da69d4ed23b1305660dfa29082f296c9cf3
# Parent  0710f69d5d8caa3a0e47e2ce905ad9ae987c5496
alien: up (8.95), androguard: up (3.2.0), apache-mod-wsgi: up (4.6.4), apng2gif: up (1.8), apngdis: up (2.9), aqualung: up (1.0+20170926)

diff -r 0710f69d5d8c -r dc626da69d4e alien/receipt
--- a/alien/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/alien/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,30 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="alien"
-VERSION="8.89"
+VERSION="8.95"
 CATEGORY="misc"
-SHORT_DESC="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats."
+SHORT_DESC="Converts between the rpm, dpkg, stampede slp, and slackware tgz \
+file formats"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WEB_SITE="http://joeyh.name/code/alien/"
-WGET_URL="http://ftp.de.debian.org/debian/pool/main/${PACKAGE:0:1}/$PACKAGE/$TARBALL"
-#SUGGESTED="dpkg debhelper gcc make"
 
-DEPENDS="perl rpm4 cpio"
+TARBALL="${PACKAGE}_$VERSION.tar.xz"
+WGET_URL="$SF_MIRROR/alien-pkg-convert/$TARBALL"
+
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	perl Makefile.PL &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$DESTDIR install || return 1
+
+	find $install -type f -exec chmod u+w '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="perl rpm4 cpio"
 }
diff -r 0710f69d5d8c -r dc626da69d4e amule/.icon.png
Binary file amule/.icon.png has changed
diff -r 0710f69d5d8c -r dc626da69d4e amule/receipt
--- a/amule/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/amule/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,37 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="amule"
 VERSION="2.3.2"
 CATEGORY="network"
-SHORT_DESC="An eMule-like client for the eD2k and Kademlia networks."
+SHORT_DESC="An eMule-like client for the eD2k and Kademlia networks"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.amule.org/"
-SOURCE="aMule"
-TARBALL="$SOURCE-$VERSION.tar.xz"
+
+TARBALL="aMule-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="p2p peer-to-peer fileshare"
 
-DEPENDS="wxWidgets libupnp libbfd xorg-libXxf86vm cryptopp zlib"
-BUILD_DEPENDS="wxWidgets-dev libupnp-dev cryptopp zlib-dev"
+BUILD_DEPENDS="zlib-dev perl wxWidgets-dev libupnp-dev cryptopp gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
-		--prefix=/usr \
+		--enable-optimize \
+		--disable-debug \
 		$CONFIGURE_ARGS &&
-	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make &&
+	make install || return 1
+
+	rm $install/usr/share/pixmaps/amule.xpm
+	cp amule.png $install/usr/share/pixmaps/
 }
 
-# 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/amule $fs/usr/share
-	# Remove unused files in this base package.
-	rm $fs/usr/share/amule/skins/kde4.zip
-	rm $fs/usr/share/amule/skins/gnome.zip
+genpkg_rules() {
+	copy @std
+	DEPENDS="cryptopp libbfd libupnp wxWidgets zlib"
+	TAGS="p2p peer-to-peer fileshare"
 }
diff -r 0710f69d5d8c -r dc626da69d4e amule/stuff/amule.desktop
--- a/amule/stuff/amule.desktop	Sun Jun 10 16:17:43 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=aMule P2P Client
-Name[fr]=Client P2P aMule
-Name[ru]=Клиент P2P aMule
-Name[zh_CN]=aMule 电骡
-Exec=amule
-Icon=amule
-Terminal=false
-Categories=Network;P2P;
diff -r 0710f69d5d8c -r dc626da69d4e anacron/receipt
--- a/anacron/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/anacron/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,31 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="anacron"
 VERSION="2.3"
 CATEGORY="utilities"
-SHORT_DESC="Periodic command scheduler."
+SHORT_DESC="Periodic command scheduler"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://anacron.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
+compile_rules() {
+	sed -i 's|usr/man|usr/share/man|' Makefile
+	sed -i 's/const int isleap/int isleap/' gregor.c
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i "s|^PREFIX =.*|PREFIX = $DESTDIR|" Makefile
-	sed -i 's/const int isleap/int isleap/' gregor.c
-	make 2>&1 | grep -v Makefile:57 && make install
-
-	mkdir -p $install/usr/share
-	mv $install/usr/man $install/usr/share
+	make PREFIX=$install &&
+	make PREFIX=$install install || return 1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
 }
diff -r 0710f69d5d8c -r dc626da69d4e androguard/receipt
--- a/androguard/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/androguard/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,27 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="androguard"
-VERSION="1.5"
+VERSION="3.2.0"
 CATEGORY="development"
-SHORT_DESC="Reverse engineering tool for Android applications."
+SHORT_DESC="Reverse engineering, malware and goodware analysis of Android \
+applications and more"
 MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL3"
+LICENSE="Apache2"
+WEB_SITE="https://github.com/androguard/androguard/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://code.google.com/p/$PACKAGE"
-WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL"
+WGET_URL="https://github.com/androguard/androguard/releases/download/v$VERSION/$TARBALL"
 
-DEPENDS="python"
-BUILD_DEPENDS="python-dev"
+BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	python setup.py build &&
 	python setup.py install --root=$DESTDIR
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
diff -r 0710f69d5d8c -r dc626da69d4e antiword/receipt
--- a/antiword/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/antiword/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,29 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="antiword"
 VERSION="0.37"
 CATEGORY="office"
-SHORT_DESC="MS Word reader to plain text or PostScript."
+SHORT_DESC="MS Word reader to plain text or PostScript"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://www.winfield.demon.nl/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.antiword.org/"
-WGET_URL="${WEB_SITE}$TARBALL"
-TAGS="word reader convert"
+WGET_URL="http://www.winfield.demon.nl/linux/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR global_install
+	make \
+		DESTDIR=$DESTDIR \
+		GLOBAL_INSTALL_DIR=/usr/bin \
+		global_install || return 1
+
+	cook_pick_manpages Docs/antiword.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/share $fs/usr
-	cp -a $install/usr/local/bin/antiword $fs/usr/bin
+genpkg_rules() {
+	copy antiword antiword/
+	TAGS="word reader convert"
 }
-
diff -r 0710f69d5d8c -r dc626da69d4e apache-mod-perl/receipt
--- a/apache-mod-perl/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/apache-mod-perl/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -20,7 +20,9 @@
 		MP_APXS=/usr/bin/apxs \
 		MP_APR_CONFIG=/usr/bin/apr-1-config
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$DESTDIR install || return 1
+
+	find $install -type f -exec chmod u+w '{}' \;
 }
 
 genpkg_rules() {
diff -r 0710f69d5d8c -r dc626da69d4e apache-mod-wsgi/receipt
--- a/apache-mod-wsgi/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/apache-mod-wsgi/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,46 +1,42 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="apache-mod-wsgi"
-VERSION="3.4"
+VERSION="4.6.4"
 CATEGORY="network"
-SHORT_DESC="Python WSGI adapter module for Apache."
+SHORT_DESC="Python WSGI adapter module for Apache"
 MAINTAINER="erjo@slitaz.org"
-LICENSE="Apache"
-WEB_SITE="http://code.google.com/p/modwsgi/"
-SOURCE="mod_wsgi"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="http://modwsgi.googlecode.com/files/$TARBALL"
+LICENSE="Apache2"
+WEB_SITE="https://github.com/GrahamDumpleton/mod_wsgi"
 
-DEPENDS="apache python"
-BUILD_DEPENDS="apache apache-dev apr-dev apr-util-dev python-dev sed acl acl-dev"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://github.com/GrahamDumpleton/mod_wsgi/archive/$VERSION.tar.gz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure 
-	sed -i -e "s!^DESTDIR =!DESTDIR = $WOK/$PACKAGE/install! " Makefile
-	make && make install
+BUILD_DEPENDS="apache-dev perl apr-dev apr-util-dev python-dev"
+
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
+
+	install -Dm644 $stuff/httpd-mod-wsgi.conf \
+		$install/etc/apache/extra/httpd-mod-wsgi.conf
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/etc/apache/extra
-	cp -a $install/* $fs
-	cp $stuff/httpd-mod-wsgi.conf $fs/etc/apache/extra
+genpkg_rules() {
+	copy @std
+	DEPENDS="apache python"
 }
 
-post_install()
-{
-		# Enable WSGI module
-		echo "# Python WSGI module" >> "$1/etc/apache/httpd.conf"
-		echo "Include /etc/apache/extra/httpd-mod-wsgi.conf  " >> "$1/etc/apache/httpd.conf"
+post_install() {
+	# Enable WSGI module
+	cat >> "$1/etc/apache/httpd.conf" <<EOT
+# Python WSGI module
+Include /etc/apache/extra/httpd-mod-wsgi.conf
+EOT
 }
 
-post_remove()
-{
-		# Remove WSGI configuration
-		sed -i s/\# Python.*// "$1/etc/apache/httpd.conf"
-		sed -i s/.*httpd-mod-wsgi.conf// "$1/etc/apache/httpd.conf"
+post_remove() {
+	# Remove WSGI configuration
+	sed -i '/# Python WSGI module/d; /.*httpd-mod-wsgi.conf/d' \
+		"$1/etc/apache/httpd.conf"
 }
diff -r 0710f69d5d8c -r dc626da69d4e apng2gif/.icon.png
Binary file apng2gif/.icon.png has changed
diff -r 0710f69d5d8c -r dc626da69d4e apng2gif/receipt
--- a/apng2gif/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/apng2gif/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,7 +1,7 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="apng2gif"
-VERSION="1.7"
+VERSION="1.8"
 CATEGORY="utilities"
 SHORT_DESC="Convert APNG animations into animated GIF format"
 MAINTAINER="al.bobylev@gmail.com"
@@ -11,20 +11,16 @@
 TARBALL="$PACKAGE-$VERSION-src.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="zlib libpng16"
 BUILD_DEPENDS="zlib-dev libpng16-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
+compile_rules() {
+	make &&
+	install -Dm755 apng2gif $install/usr/bin/apng2gif
 
-	mkdir -p $install/usr/bin
-	cp -a $src/apng2gif $install/usr/bin
+	cook_pick_docs readme.txt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy apng2gif
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpng16 zlib"
 }
diff -r 0710f69d5d8c -r dc626da69d4e apngasm/.icon.png
Binary file apngasm/.icon.png has changed
diff -r 0710f69d5d8c -r dc626da69d4e apngasm/receipt
--- a/apngasm/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/apngasm/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="apngasm"
 VERSION="2.91"
@@ -11,20 +11,16 @@
 TARBALL="$PACKAGE-$VERSION-src.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libpng16"
 BUILD_DEPENDS="zlib-dev libpng16-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
+compile_rules() {
+	make &&
+	install -Dm755 apngasm $install/usr/bin/apngasm
 
-	mkdir -p $install/usr/bin
-	cp -a $src/apngasm $install/usr/bin
+	cook_pick_docs readme.txt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy apngasm
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpng16 zlib"
 }
diff -r 0710f69d5d8c -r dc626da69d4e apngdis/.icon.png
Binary file apngdis/.icon.png has changed
diff -r 0710f69d5d8c -r dc626da69d4e apngdis/receipt
--- a/apngdis/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/apngdis/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,7 +1,7 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="apngdis"
-VERSION="2.8"
+VERSION="2.9"
 CATEGORY="utilities"
 SHORT_DESC="Deconstruct APNG file into a sequence of PNG frames"
 MAINTAINER="al.bobylev@gmail.com"
@@ -11,20 +11,16 @@
 TARBALL="$PACKAGE-$VERSION-src.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="zlib libpng16"
 BUILD_DEPENDS="zlib-dev libpng16-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
+compile_rules() {
+	make &&
+	install -Dm755 apngdis $install/usr/bin/apngdis
 
-	mkdir -p $install/usr/bin
-	cp -a $src/apngdis $install/usr/bin
+	cook_pick_docs readme.txt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy apngdis
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpng16 zlib"
 }
diff -r 0710f69d5d8c -r dc626da69d4e apngopt/.icon.png
Binary file apngopt/.icon.png has changed
diff -r 0710f69d5d8c -r dc626da69d4e aqualung/.icon.png
Binary file aqualung/.icon.png has changed
diff -r 0710f69d5d8c -r dc626da69d4e aqualung/receipt
--- a/aqualung/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/aqualung/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -1,38 +1,41 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="aqualung"
-VERSION="0.9beta10"
+VERSION="1.0+20170926"
+COMMIT="beec3d9"
 CATEGORY="multimedia"
-SHORT_DESC="Aqualung audio player."
+SHORT_DESC="Advanced music player"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://aqualung.factorial.hu/"
+WEB_SITE="http://aqualung.jeremyevans.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="music audio player mp3 ogg"
+WGET_URL="https://github.com/jeremyevans/aqualung/archive/${COMMIT:-$VERSION}.tar.gz"
 
-DEPENDS="gtk+ alsa-lib libogg libvorbis flac lame libsamplerate libsndfile \
-libmodplug libcdio libmad bzlib"
-BUILD_DEPENDS="gtk+-dev alsa-lib-dev libogg-dev libvorbis-dev flac-dev \
-lame-dev libsamplerate-dev libmad-dev libsndfile-dev libxml2-dev bzip2-dev"
+BUILD_DEPENDS="automake gettext libxml2-dev glib-dev gtk+-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"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--with-lavc=no \
-		--with-jack=no &&
-	make && make install
+compile_rules() {
+	./autogen.sh &&
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
+
+	for i in 16 24 32 48 64; do
+		mkdir -p $install/usr/share/icons/hicolor/${i}x$i/apps/
+		ln -s /usr/share/aqualung/icon_$i.png \
+			$install/usr/share/icons/hicolor/${i}x$i/apps/aqualung.png
+	done
+	fix symlinks
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/pixmaps
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/aqualung $fs/usr/share
-	# Remove doc
-	rm -rf $fs/usr/share/aqualung/doc
-	cd $fs/usr/share/pixmaps
-	ln -s ../aqualung/general.png aqualung.png
+genpkg_rules() {
+	copy @std
+	DEPENDS="alsa-lib bzlib cairo flac gdk-pixbuf glib gtk+ lame libcddb \
+	libcdio libcdio-paranoia liblua libmodplug libogg libsamplerate libsndfile \
+	libvorbis libxml2 pango zlib"
+	TAGS="music audio player mp3 ogg"
 }
diff -r 0710f69d5d8c -r dc626da69d4e gif2apng/.icon.png
Binary file gif2apng/.icon.png has changed
diff -r 0710f69d5d8c -r dc626da69d4e gif2apng/receipt
--- a/gif2apng/receipt	Sun Jun 10 16:17:43 2018 +0300
+++ b/gif2apng/receipt	Mon Jun 11 15:37:34 2018 +0300
@@ -16,6 +16,8 @@
 compile_rules() {
 	make &&
 	install -Dm755 gif2apng $install/usr/bin/gif2apng
+
+	cook_pick_docs readme.txt
 }
 
 genpkg_rules() {