# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1508923305 -7200
# Node ID 12c16b0d3df165af5a8979540e3edd5310c777ca
# Parent  6b9ba3a24c777fe67d886fa2475755c41aa80743
Up emacs (2.53)

diff -r 6b9ba3a24c77 -r 12c16b0d3df1 emacs-help/receipt
--- a/emacs-help/receipt	Wed Oct 25 11:19:15 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="emacs-help"
-VERSION="24.3"
-CATEGORY="development"
-SHORT_DESC="The GNU Emacs editor - Help files"
-MAINTAINER="domcox@slitaz.org"
-LICENSE="GPL3"
-WEB_SITE="http://www.gnu.org/software/emacs/"
-WANTED="emacs"
-
-DEPENDS="emacs"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	# Help files
-	echo -n "Copying info files"
-	mkdir -p $fs/usr/share/info && \
-	cp -a $install/usr/share/info/* $fs/usr/share/info && \
-	status
-	# Tutorial
-	echo -n "Copying tutorial files"
-	mkdir -p $fs/usr/share/emacs/$VERSION/etc && \
-	cp -a $install/usr/share/emacs/$VERSION/etc/tutorials \
-		$fs/usr/share/emacs/$VERSION/etc
-	status
-	# refcards
-	echo -n "Copying refcards"
-	mkdir -p $fs/usr/share/emacs/$VERSION/etc/refcards && \
-	cp -a  $install/usr/share/emacs/$VERSION/etc/refcards/*pdf \
-		$fs/usr/share/emacs/$VERSION/etc/refcards
-	status
-	# Doc
-	echo -n "Copying doc files"
-	DOC_FILES="COOKIES DOC-$VERSION.1 DEVEL.HUMOR ERC-NEWS ETAGS.EBNF \
-GNUS-NEWS HELLO INTERVIEW JOKES LINUX-GNU MH-E-NEWS MORE.STUFF MOTIVATION \
-NEWS.* NXML-NEWS ORG-NEWS PROBLEMS TERMS THE-GNU-PROJECT WHY-FREE \
-compilation.txt gnus-tut.txt grep.txt"
-	for file in $DOC_FILES; do
-		cp -a $install/usr/share/emacs/$VERSION/etc/$file \
-			$fs/usr/share/emacs/$VERSION/etc
-	done
-	status
-}
-
diff -r 6b9ba3a24c77 -r 12c16b0d3df1 emacs-lisp-sources/receipt
--- a/emacs-lisp-sources/receipt	Wed Oct 25 11:19:15 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="emacs-lisp-sources"
-VERSION="24.3"
-CATEGORY="development"
-SHORT_DESC="The GNU Emacs editor - Lisp source files"
-MAINTAINER="domcox@slitaz.org"
-LICENSE="GPL3"
-WEB_SITE="http://www.gnu.org/software/emacs/"
-WANTED="emacs"
-
-DEPENDS="emacs"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	# lisp files
-	LISP_DIR="lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede \
-lisp/cedet/semantic lisp/cedet/semantic/analyze lisp/cedet/semantic/bovine \
-lisp/cedet/semantic/decorate lisp/cedet/semantic/symref lisp/cedet/srecode \
-lisp/cedet/semantic/wisent lisp/emacs-lisp lisp/emulation lisp/erc lisp/eshell \
-lisp/gnus lisp/international lisp/language lisp/mail lisp/mh-e lisp/net \
-lisp/nxml lisp/obsolete lisp/org lisp/play lisp/progmodes lisp/textmodes \
-lisp/url lisp/vc"
-
-	for dir in $LISP_DIR; do
-		echo -n "Copying $dir sources"
-		mkdir -p $fs/usr/share/$WANTED/$VERSION/$dir && \
-		cp -a $install/usr/share/$WANTED/$VERSION/$dir/*.el.gz \
-			$fs/usr/share/$WANTED/$VERSION/$dir
-		status
-	done
-	# Use linux term only
-	LINUX_TERM="rxvt.el.gz tty-colors.el.gz vt100.el.gz xterm.el.gz"
-	echo -n "Copying lisp/term sources"
-	mkdir -p $fs/usr/share/$WANTED/$VERSION/lisp/term && \
-	for file in $LINUX_TERM; do
-		cp -a $install/usr/share/$WANTED/$VERSION/lisp/term/$file \
-			$fs/usr/share/$WANTED/$VERSION/lisp/term
-	done
-	status
-	# leim files
-	LEIM_FILES="leim/ja-dic leim/quail"
-	for dir in $LEIM_FILES; do
-		echo -n "Copying $dir sources"
-		mkdir -p $fs/usr/share/$WANTED/$VERSION/$dir && \
-		cp -a $install/usr/share/$WANTED/$VERSION/$dir/*.el.gz \
-			$fs/usr/share/$WANTED/$VERSION/$dir && \
-		status
-	done
-	# refcards
-	echo -n "Copying refcards sources"
-	mkdir -p $fs/usr/share/$WANTED/$VERSION/etc/refcards
-	cp -a $install/usr/share/$WANTED/$VERSION/etc/refcards/*tex \
-		$fs/usr/share/$WANTED/$VERSION/etc/refcards
-	status
-	# Doc
-	echo -n "Copying doc files"
-	DOC_FILES="CONTRIBUTE DEBUG MACHINES MAILINGLISTS TODO"
-	for file in $DOC_FILES; do
-		cp -a $install/usr/share/emacs/$VERSION/etc/$file \
-			$fs/usr/share/emacs/$VERSION/etc
-	done
-	status
-}
diff -r 6b9ba3a24c77 -r 12c16b0d3df1 emacs/receipt
--- a/emacs/receipt	Wed Oct 25 11:19:15 2017 +0200
+++ b/emacs/receipt	Wed Oct 25 11:21:45 2017 +0200
@@ -1,33 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="emacs"
-VERSION="24.3"
+VERSION="25.3"
 CATEGORY="editors"
 SHORT_DESC="The GNU Emacs editor"
 MAINTAINER="domcox@slitaz.org"
 LICENSE="GPL3"
-SUGGESTED="alsa-lib"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.gnu.org/software/emacs/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="atk cairo dbus expat freetype fontconfig giflib glib gnutls gtk+ jpeg \
-libpng librsvg util-linux-uuid ncurses pango tiff xorg-server zlib \
-librsvg libgsf libgnutls harfbuzz"
 BUILD_DEPENDS="atk-dev cairo-dev expat-dev dbus-dev freetype-dev \
 fontconfig-dev glib-dev gnutls-dev gtk+-dev jpeg-dev \
 libpng-dev librsvg-dev ncurses-dev pango-dev pkg-config tiff-dev xorg-dev \
 xorg-dev-proto" # giflib-dev: version 4 needed, add --with-gif=no)
+SPLIT="emacs-help emacs-lisp-sources"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Gzip workaround in busybox
-	sed -i 's/${GZIP_PROG} -9n/${GZIP_PROG}/g' Makefile.in
-	sed -i 's/${GZIP_PROG} -9n/${GZIP_PROG}/g' leim/Makefile.in
-	# Configure (with GCC 4.5.0 workaround)
-	CFLAGS="-g -O2 -fno-optimize-sibling-calls" ./configure $CONFIGURE_ARGS \
+	./configure $CONFIGURE_ARGS \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--without-makeinfo \
@@ -48,150 +40,195 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	# Binary files
-	BIN_FILES="ctags ebrowse emacs-$VERSION emacsclient etags grep-changelog"
-	echo -n "Copying emacs binary files"
-	mkdir -p $fs/usr/bin && \
-	for file in $BIN_FILES; do
-		cp -a $install/usr/bin/$file $fs/usr/bin
-	done
-	status
-	# Lib files
-	echo -n "Copying emacs lib files"
-	cp -a $install/usr/lib $fs/usr
-	status
-	strip -s $fs/usr/lib/$PACKAGE/$VERSION/i486-pc-linux-gnu/* 2> /dev/null
-	# lisp files
-	LISP_DIR="lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede \
+	case $PACKAGE in
+	emacs)
+		SUGGESTED="alsa-lib"
+		TAGS="text-editor"
+		DEPENDS="atk cairo dbus expat freetype fontconfig giflib glib \
+			gnutls gtk+ jpeg libpng librsvg util-linux-uuid \
+			ncurses pango tiff xorg-server zlib librsvg libgsf \
+			libgnutls harfbuzz"
+		# Binary files
+		BIN_FILES="ctags ebrowse emacs-$VERSION emacsclient etags"
+		echo -n "Copying emacs binary files"
+		mkdir -p $fs/usr/bin && \
+		for file in $BIN_FILES; do
+			cp -a $install/usr/bin/$file $fs/usr/bin
+		done
+		status
+		# Lib files
+		echo -n "Copying emacs lib files"
+		cp -a $install/usr/lib $fs/usr
+		status
+		strip -s $fs/usr/lib/$PACKAGE/$VERSION/i486-pc-linux-gnu/* 2> /dev/null
+		# lisp files
+		LISP_DIR="lisp lisp/calc lisp/calendar lisp/cedet lisp/cedet/ede \
 lisp/cedet/semantic lisp/cedet/semantic/analyze lisp/cedet/semantic/bovine \
 lisp/cedet/semantic/decorate lisp/cedet/semantic/symref lisp/cedet/srecode \
 lisp/cedet/semantic/wisent lisp/emacs-lisp lisp/emulation lisp/erc lisp/eshell \
 lisp/gnus lisp/international lisp/language lisp/mail lisp/mh-e lisp/net \
 lisp/nxml lisp/obsolete lisp/org lisp/play lisp/progmodes lisp/textmodes \
 lisp/url lisp/vc"
-	for dir in $LISP_DIR; do
-		echo -n "Copying $dir files"
-		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
-		cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/*.elc \
-			$fs/usr/share/$PACKAGE/$VERSION/$dir
-		if [ $(ls $install/usr/share/$PACKAGE/$VERSION/$dir/ | \
-grep -c \.el$) -gt 0 ]; then
-			cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/*.el \
+		for dir in $LISP_DIR; do
+			echo -n "Copying $dir files"
+			mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
+			cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/*.elc \
 				$fs/usr/share/$PACKAGE/$VERSION/$dir
-		fi
-		for file in COPYING README TODO; do
-			if [ -e $install/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
-				cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/$file \
+			if [ $(ls $install/usr/share/$PACKAGE/$VERSION/$dir/ | \
+					grep -c \.el$) -gt 0 ]; then
+				cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/*.el \
 					$fs/usr/share/$PACKAGE/$VERSION/$dir
 			fi
+			for file in COPYING README TODO; do
+				if [ -e $install/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
+					cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/$file \
+						$fs/usr/share/$PACKAGE/$VERSION/$dir
+				fi
+			done
+			status
+		done
+		# Use linux term only
+		LINUX_TERM="README linux.e* rxvt.elc tty-colors.elc vt100.elc xterm.elc"
+		echo -n "Copying lisp/term files (linux only)"
+		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/lisp/term && \
+		for file in $LINUX_TERM; do
+			cp -a $install/usr/share/$PACKAGE/$VERSION/lisp/term/$file \
+				$fs/usr/share/$PACKAGE/$VERSION/lisp/term
 		done
 		status
-	done
-	# Use linux term only
-	LINUX_TERM="README linux.e* rxvt.elc tty-colors.elc vt100.elc xterm.elc"
-	echo -n "Copying lisp/term files (linux only)"
-	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/lisp/term && \
-	for file in $LINUX_TERM; do
-		cp -a $install/usr/share/$PACKAGE/$VERSION/lisp/term/$file \
-			$fs/usr/share/$PACKAGE/$VERSION/lisp/term
-	done
-	status
-	# leim files
-	echo -n "Copying leim files"
-	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/leim && \
-	cp -a $install/usr/share/$PACKAGE/$VERSION/leim/*.el \
-		$fs/usr/share/$PACKAGE/$VERSION/leim
-	status
-	LEIM_FILES="leim/ja-dic leim/quail"
-	for dir in $LEIM_FILES; do
-		echo -n "Copying $dir files"
-		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/$dir && \
-		cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/*.elc \
-			$fs/usr/share/$PACKAGE/$VERSION/$dir && \
-		for file in COPYING README TODO; do
-			if [ -e $install/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
-				cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/$file \
-					$fs/usr/share/$PACKAGE/$VERSION/$dir
-			fi
+		LEIM_FILES="leim/ja-dic leim/quail"
+		for dir in $LEIM_FILES; do
+			echo -n "Copying $dir files"
+			mkdir -p $fs/usr/share/$PACKAGE/$VERSION/lisp/$dir && \
+			cp -a $install/usr/share/$PACKAGE/$VERSION/lisp/$dir/*.elc \
+				$fs/usr/share/$PACKAGE/$VERSION/lisp/$dir && \
+			status
+		done
+		# Conf files
+		echo -n "Copying conf files"
+		CONF_FILES="ETAGS.README charsets e enriched.txt edt-user.el forms \
+emacs-buffer.gdb gnus nxml org schema srecode ps-prin0.ps \
+ps-prin1.ps ses-example.ses spook.lines themes yow.lines"
+		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc && \
+		for file in $CONF_FILES; do
+			cp -a $install/usr/share/$PACKAGE/$VERSION/etc/$file \
+				$fs/usr/share/$PACKAGE/$VERSION/etc
 		done
 		status
-	done
-	# Conf files
-	echo -n "Copying conf files"
-	CONF_FILES="ETAGS.README charsets e enriched.doc edt-user.el forms \
-emacs-buffer.gdb gnus nxml org schema srecode ps-prin0.ps \
-ps-prin1.ps ses-example.ses spook.lines themes yow.lines"
-	mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc && \
-	for file in $CONF_FILES; do
-		cp -a $install/usr/share/$PACKAGE/$VERSION/etc/$file \
-			$fs/usr/share/$PACKAGE/$VERSION/etc
-	done
-	status
-	# Pixmaps files
-	XPM_DIR="images images/custom images/ezimage images/gnus images/gud \
+		# Pixmaps files
+		XPM_DIR="images images/custom images/ezimage images/gnus images/gud \
 images/icons/allout-widgets/*-bg images/low-color images/mail images/mpc \
 images/newsticker images/smilies images/smilies/grayscale \
 images/smilies/medium images/tree-widget/default images/tree-widget/folder"
-	for dir in $XPM_DIR; do
-		echo -n "Copying $dir xpm files"
-		mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
-		cp -a $install/usr/share/$PACKAGE/$VERSION/etc/$dir/*.xpm \
-			$fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
-		for file in COPYING README TODO; do
-			if [ -e $install/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
-				cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/$file \
-					$fs/usr/share/$PACKAGE/$VERSION/$dir
-			fi
+		for dir in $XPM_DIR; do
+			echo -n "Copying $dir xpm files"
+			mkdir -p $fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
+			cp -a $install/usr/share/$PACKAGE/$VERSION/etc/$dir/*.xpm \
+				$fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
+			for file in COPYING README TODO; do
+				if [ -e $install/usr/share/$PACKAGE/$VERSION/$dir/$file ]; then
+					cp -a $install/usr/share/$PACKAGE/$VERSION/$dir/$file \
+						$fs/usr/share/$PACKAGE/$VERSION/$dir
+				fi
+			done
+			status
+		done
+		echo -n "Copying png files"
+		( cd $install/usr/share/$PACKAGE/$VERSION/etc
+		  find -type f -name '*.png' | cpio -o -H newc ) |
+		( cd $fs/usr/share/$PACKAGE/$VERSION/etc ; cpio -id )
+		status
+		# Licence
+		GNU_FILES="AUTHORS CENSORSHIP COPYING DISTRIB FTP GNU ORDERS README"
+		echo -n "Copying License files"
+		for file in $GNU_FILES; do
+			cp -a $install/usr/share/$PACKAGE/$VERSION/etc/$file \
+				$fs/usr/share/$PACKAGE/$VERSION/etc
 		done
 		status
-	done
-	PNG_DIR="images images/gnus images/icons/allout-widgets/*-bg \
-images/tree-widget/default images/tree-widget/folder"
-	for dir in $PNG_DIR; do
-		echo -n "Copying $dir png files"
-		cp -a $install/usr/share/$PACKAGE/$VERSION/etc/$dir/*.png \
-			$fs/usr/share/$PACKAGE/$VERSION/etc/$dir && \
+		# Install specific site file
+		echo -n "Installing specific SliTaz file"
+		cp -a $install/usr/share/$PACKAGE/$VERSION/site-lisp \
+			$fs/usr/share/$PACKAGE && \
+		mkdir -p $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \
+		cp -a $stuff/default.el $stuff/site-start.el \
+			$fs/usr/share/$PACKAGE/site-lisp && \
+		cp -a $stuff/90-slitaz.el \
+			$fs/usr/share/$PACKAGE/site-lisp/site-start.d && \
 		status
-	done
-	# Licence
-	GNU_FILES="AUTHORS CENSORSHIP COPYING DISTRIB FTP GNU ORDERS README \
-SERVICE copying.paper"
-	echo -n "Copying License files"
-	for file in $GNU_FILES; do
-		cp -a $install/usr/share/$PACKAGE/$VERSION/etc/$file \
-			$fs/usr/share/$PACKAGE/$VERSION/etc
-	done
-	status
-	# Install specific site file
-	echo -n "Installing specific SliTaz file"
-	cp -a $install/usr/share/$PACKAGE/$VERSION/site-lisp \
-		$fs/usr/share/$PACKAGE && \
-	mkdir -p $fs/usr/share/$PACKAGE/site-lisp/site-start.d && \
-	cp -a $stuff/default.el $stuff/site-start.el \
-		$fs/usr/share/$PACKAGE/site-lisp && \
-	cp -a $stuff/90-slitaz.el \
-		$fs/usr/share/$PACKAGE/site-lisp/site-start.d && \
-	status
-	# Install desktop files for emacs
-	echo -n "Installing emacs menu"
-	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications && \
-	cp -a $install/usr/share/applications $fs/usr/share/ && \
-	cp -a $install/usr/share/icons/hicolor/32x32/apps/emacs.png \
-		$fs/usr/share/pixmaps
-	status
-	# Use default site-lisp
-	cd $fs/usr/share/$PACKAGE/$VERSION
-	ln -s ../site-lisp site-lisp
+		# Install desktop files for emacs
+		echo -n "Installing emacs menu"
+		mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications && \
+		cp -a $install/usr/share/applications $fs/usr/share/ && \
+		cp -a $install/usr/share/icons/hicolor/32x32/apps/emacs.png \
+			$fs/usr/share/pixmaps
+		status
+		# Use default site-lisp
+		cd $fs/usr/share/$PACKAGE/$VERSION
+		ln -s ../site-lisp site-lisp
+		;;
+	emacs-help)
+		CAT="development|The GNU Emacs editor - Help files"
+		DEPENDS="emacs"
+		# Help files
+		echo -n "Copying info files"
+		mkdir -p $fs/usr/share/info && \
+		cp -a $install/usr/share/info/* $fs/usr/share/info && \
+		status
+		# Tutorial
+		echo -n "Copying tutorial files"
+		mkdir -p $fs/usr/share/emacs/$VERSION/etc && \
+		cp -a $install/usr/share/emacs/$VERSION/etc/tutorials \
+			$fs/usr/share/emacs/$VERSION/etc
+		status
+		# refcards
+		echo -n "Copying refcards"
+		mkdir -p $fs/usr/share/emacs/$VERSION/etc/refcards && \
+		cp -a  $install/usr/share/emacs/$VERSION/etc/refcards/*pdf \
+			$fs/usr/share/emacs/$VERSION/etc/refcards
+		status
+		# Doc
+		echo -n "Copying doc files"
+		cp -a $install/usr/share/emacs/$VERSION/etc/[A-Z]* \
+			$fs/usr/share/emacs/$VERSION/etc
+		cp -a $install/usr/share/emacs/$VERSION/etc/*.txt \
+			$fs/usr/share/emacs/$VERSION/etc
+		status
+		;;
+	emacs-lisp-sources)
+		CAT="development|The GNU Emacs editor - Lisp source files"
+		DEPENDS="emacs"
+		# lisp files
+		echo -n "Copying sources"
+		( cd $install/usr/share/$PACKAGE/$VERSION/etc/lisp
+		  find -type f -name '*.el.gz' | cpio -o -H newc ) |
+		( cd $fs/usr/share/$PACKAGE/$VERSION/etc/list ; cpio -id )
+		# refcards
+		echo -n "Copying refcards sources"
+		mkdir -p $fs/usr/share/$WANTED/$VERSION/etc/refcards
+		cp -a $install/usr/share/$WANTED/$VERSION/etc/refcards/*tex \
+			$fs/usr/share/$WANTED/$VERSION/etc/refcards
+		status
+		# Doc
+		echo -n "Copying doc files"
+		DOC_FILES="DEBUG MACHINES TODO"
+		for file in $DOC_FILES; do
+			cp -a $install/usr/share/emacs/$VERSION/etc/$file \
+				$fs/usr/share/emacs/$VERSION/etc
+		done
+		status
+		;;
+	esac
 }
 
-post_install()
+post_install_emacs()
 {
 	# linking /usr/bin/emacs to new version
 	[ -h "$1/usr/bin/emacs" ] && rm -f "$1/usr/bin/emacs"
 	ln -s /usr/bin/emacs-$VERSION "$1/usr/bin/emacs"
 }
 
-post_remove()
+post_remove_emacs()
 {
 	rm -rf "$1/usr/share/emacs"
 	rm -rf "$1/usr/lib/emacs"