Fix infinite loop if Emacs lacks permission to remove backup, bug #189627.

(Portage version: 2.1.3.6)

12 files changed, 289 insertions, 50 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 6d86f90162ab..4f1e03ae4fb6 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.171 2007/08/21 22:57:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.172 2007/08/24 07:25:28 ulm Exp $
+
+*emacs-22.1-r1 (24 Aug 2007)
+
+  24 Aug 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-22.1-backup-buffer.patch, +emacs-22.1-r1.ebuild:
+  Fix infinite loop if Emacs lacks permission to remove backup, bug #189627.
+  Thanks to Martin von Gagern <Martin.vGagern@gmx.net>.
+
+  23 Aug 2007; Ulrich Mueller <ulm@gentoo.org> -files/emacs-21.desktop,
+  -files/60emacs-21.envd, -files/emacs-subdirs-el-gentoo.diff,
+  emacs-21.4-r4.ebuild, emacs-21.4-r8.ebuild:
+  Put remaining files for Emacs 21 on Gentoo mirrors.
 
   21 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1.ebuild:
   Generate score files in pkg_postinst.
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index 2ce1df3f32fc..9cd8c9eab457 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.27 2007/06/25 07:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.28 2007/08/24 07:25:28 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -125,6 +125,7 @@ src_compile() {
 
 	einfo "Recompiling patched lisp files..."
 	(cd lisp; emake recompile) || die
+	rm etc/DOC-*
 	emake CC="$(tc-getCC)" || die
 }
 
diff --git a/app-editors/emacs/emacs-21.4-r4.ebuild b/app-editors/emacs/emacs-21.4-r4.ebuild
index 038e8caef355..590e66995e05 100644
--- a/app-editors/emacs/emacs-21.4-r4.ebuild
+++ b/app-editors/emacs/emacs-21.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.16 2007/06/25 07:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.17 2007/08/24 07:25:28 ulm Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -8,6 +8,7 @@ DESCRIPTION="An incredibly powerful, extensible text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 	mirror://gentoo/emacs-21-patches.tar.bz2
+	mirror://gentoo/emacs-21-files.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -57,7 +58,7 @@ src_unpack() {
 	epatch "${WORKDIR}/emacs-21.2-sh.patch"
 	use ppc64 && epatch "${WORKDIR}/emacs-21.3-ppc64.patch"
 
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+	epatch "${WORKDIR}/emacs-subdirs-el-gentoo.diff"
 
 	# This will need to be updated for X-Compilation
 	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
@@ -135,7 +136,7 @@ src_install() {
 	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
 	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
 
-	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
+	newenvd "${WORKDIR}/60emacs-${SLOT}.envd" 60emacs-${SLOT}
 
 	einfo "Fixing manpages..."
 	for m in ${D}/usr/share/man/man1/* ; do
@@ -152,7 +153,7 @@ src_install() {
 	dodoc BUGS ChangeLog README
 
 	insinto /usr/share/applications
-	doins ${FILESDIR}/${DFILE}
+	doins "${WORKDIR}/${DFILE}"
 }
 
 update-alternatives() {
diff --git a/app-editors/emacs/emacs-21.4-r8.ebuild b/app-editors/emacs/emacs-21.4-r8.ebuild
index 2063915f7529..148b2766c7ab 100644
--- a/app-editors/emacs/emacs-21.4-r8.ebuild
+++ b/app-editors/emacs/emacs-21.4-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r8.ebuild,v 1.4 2007/06/25 07:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r8.ebuild,v 1.5 2007/08/24 07:25:28 ulm Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -8,6 +8,7 @@ DESCRIPTION="An incredibly powerful, extensible text editor"
 HOMEPAGE="http://www.gnu.org/software/emacs"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 	mirror://gentoo/emacs-21-patches.tar.bz2
+	mirror://gentoo/emacs-21-files.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
 LICENSE="GPL-2"
@@ -139,7 +140,7 @@ src_install() {
 	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
 	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
 
-	newenvd "${FILESDIR}/60emacs-${SLOT}.envd" "60emacs-${SLOT}"
+	newenvd "${WORKDIR}/60emacs-${SLOT}.envd" "60emacs-${SLOT}"
 
 	einfo "Fixing manpages..."
 	for m in "${D}"/usr/share/man/man1/* ; do
@@ -159,7 +160,7 @@ src_install() {
 	dodoc BUGS ChangeLog README
 
 	insinto /usr/share/applications
-	doins "${FILESDIR}/${DFILE}"
+	doins "${WORKDIR}/${DFILE}"
 }
 
 update-alternatives() {
diff --git a/app-editors/emacs/emacs-22.1-r1.ebuild b/app-editors/emacs/emacs-22.1-r1.ebuild
new file mode 100644
index 000000000000..d8ffbd9ccc57
--- /dev/null
+++ b/app-editors/emacs/emacs-22.1-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r1.ebuild,v 1.1 2007/08/24 07:25:28 ulm Exp $
+
+WANT_AUTOCONF="2.61"
+WANT_AUTOMAKE="latest"
+
+inherit autotools elisp-common eutils flag-o-matic
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="22"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="alsa gif gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+RESTRICT="strip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
+
+RDEPEND="!<app-editors/emacs-cvs-22.1
+	sys-libs/ncurses
+	>=app-admin/eselect-emacs-0.7-r1
+	sys-libs/zlib
+	hesiod? ( net-dns/hesiod )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-sound/alsa-headers )
+	X? (
+		$X_DEPEND
+		x11-misc/emacs-desktop
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		xpm? ( x11-libs/libXpm )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				motif? ( virtual/motif )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	gzip-el? ( app-arch/gzip )"
+
+PROVIDE="virtual/editor"
+
+# FULL_VERSION keeps the full version number, which is needed in order to
+# determine some path information correctly for copy/move operations later on
+FULL_VERSION="${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
+		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
+	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
+	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
+	epatch "${FILESDIR}/${P}-backup-buffer.patch"
+	# ALSA is detected and used even if not requested by the USE=alsa flag.
+	# So remove the automagic check
+	use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=""
+	strip-flags
+	unset LDFLAGS
+	replace-flags -O[3-9] -O2
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_with xpm)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			echo
+			einfo "Configuring to build with GTK support, disabling all other toolkits"
+			echo
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+			myconf="${myconf} --with-x-toolkit=athena"
+			myconf="${myconf} --without-gtk"
+		elif use motif; then
+			einfo "Configuring to build with motif toolkit support"
+			myconf="${myconf} --with-x-toolkit=motif"
+			myconf="${myconf} --without-gtk"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+			myconf="${myconf} --without-gtk"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	myconf="${myconf} $(use_with hesiod)"
+
+	econf \
+		--program-suffix=-emacs-${SLOT} \
+		--infodir=/usr/share/info/emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	emake CC="$(tc-getCC)" || die "emake failed"
+
+	einfo "Recompiling patched lisp files..."
+	(cd lisp; emake recompile) || die "emake recompile failed"
+	rm etc/DOC-*
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+		|| die "moving Emacs executable failed"
+
+	# move info documentation to the correct place
+	einfo "Fixing info documentation ..."
+	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
+		mv ${i} ${i}.info || die "mv info failed"
+	done
+
+	# move man pages to the correct place
+	einfo "Fixing manpages ..."
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed"
+	done
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs/
+
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.[ch]
+		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
+		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+		X    (setq find-function-C-source-directory
+		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
+		EOF
+		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
+	fi
+
+	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f ${ROOT}${infodir}/dir{,.*}
+	for f in ${ROOT}${infodir}/*.info*; do
+		[[ ${f##*/} == *[0-9].info* ]] \
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+	done
+	echo
+}
+
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	local f
+	for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do
+		test -e ${f} || touch ${f}
+	done
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+
+	if [[ "$(readlink ${ROOT}/usr/bin/emacs)" == emacs.emacs-${SLOT}* ]]; then
+		# transition from pre-eselect revision
+		eselect emacs set emacs-${SLOT}
+	else
+		eselect emacs update --if-unset
+	fi
+
+	if use X; then
+		elog "You need to install some fonts for Emacs. Under monolithic"
+		elog "XFree86/Xorg you typically had such fonts installed by default."
+		elog "With modular Xorg, you will have to perform this step yourself."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+	fi
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module. Man and info pages are automatically"
+	elog "redirected, so you may have several installed Emacs versions at the"
+	elog "same time. \"man emacs.eselect\" for details."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs/files/60emacs-21.envd b/app-editors/emacs/files/60emacs-21.envd
deleted file mode 100644
index ebb2bd3a660a..000000000000
--- a/app-editors/emacs/files/60emacs-21.envd
+++ /dev/null
@@ -1 +0,0 @@
-INFOPATH=/usr/share/info/emacs-21
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r4 b/app-editors/emacs/files/digest-emacs-21.4-r4
index 24df8a280bd3..90b82ba60dc1 100644
--- a/app-editors/emacs/files/digest-emacs-21.4-r4
+++ b/app-editors/emacs/files/digest-emacs-21.4-r4
@@ -1,3 +1,6 @@
+MD5 a72cc753e258ddbb9bd952016121a8bf emacs-21-files.tar.bz2 900
+RMD160 71b4a7b6d6b2f47a087fdb54381513b82fb97411 emacs-21-files.tar.bz2 900
+SHA256 3d7c5b2ca8b11d3cd2dd9ea22b90867471de34552e4d1bae11206d18031f6ab2 emacs-21-files.tar.bz2 900
 MD5 c3394d805e6ed999c4ac7d197091f1e3 emacs-21-patches.tar.bz2 8891
 RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f emacs-21-patches.tar.bz2 8891
 SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914 emacs-21-patches.tar.bz2 8891
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r8 b/app-editors/emacs/files/digest-emacs-21.4-r8
index 24df8a280bd3..90b82ba60dc1 100644
--- a/app-editors/emacs/files/digest-emacs-21.4-r8
+++ b/app-editors/emacs/files/digest-emacs-21.4-r8
@@ -1,3 +1,6 @@
+MD5 a72cc753e258ddbb9bd952016121a8bf emacs-21-files.tar.bz2 900
+RMD160 71b4a7b6d6b2f47a087fdb54381513b82fb97411 emacs-21-files.tar.bz2 900
+SHA256 3d7c5b2ca8b11d3cd2dd9ea22b90867471de34552e4d1bae11206d18031f6ab2 emacs-21-files.tar.bz2 900
 MD5 c3394d805e6ed999c4ac7d197091f1e3 emacs-21-patches.tar.bz2 8891
 RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f emacs-21-patches.tar.bz2 8891
 SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914 emacs-21-patches.tar.bz2 8891
diff --git a/app-editors/emacs/files/digest-emacs-22.1-r1 b/app-editors/emacs/files/digest-emacs-22.1-r1
new file mode 100644
index 000000000000..44943fdbcd94
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-22.1-r1
@@ -0,0 +1,3 @@
+MD5 6949df37caec2d7a2e0eee3f1b422726 emacs-22.1.tar.gz 38172226
+RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 emacs-22.1.tar.gz 38172226
+SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0 emacs-22.1.tar.gz 38172226
diff --git a/app-editors/emacs/files/emacs-21.desktop b/app-editors/emacs/files/emacs-21.desktop
deleted file mode 100644
index 1eec16af6d77..000000000000
--- a/app-editors/emacs/files/emacs-21.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=GNU Emacs 21
-Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
-Icon=gnome-emacs.png
-Terminal=0
-Type=Application
-Categories=Application;Development;
-Exec=/usr/bin/emacs.emacs-21
diff --git a/app-editors/emacs/files/emacs-22.1-backup-buffer.patch b/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
new file mode 100644
index 000000000000..0e53cef521f1
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
@@ -0,0 +1,14 @@
+--- emacs-22.1-orig/lisp/files.el	2007-05-25 14:43:31.000000000 +0200
++++ emacs-22.1/lisp/files.el	2007-08-21 08:26:36.000000000 +0200
+@@ -3119,9 +3119,8 @@
+ 	  (set-default-file-modes ?\700)
+ 	  (while (condition-case ()
+ 		     (progn
+-		       (condition-case nil
+-			   (delete-file to-name)
+-			 (file-error nil))
++		       (and (file-exists-p to-name)
++			    (delete-file to-name))
+ 		       (copy-file from-name to-name nil t)
+ 		       nil)
+ 		   (file-already-exists t))
diff --git a/app-editors/emacs/files/emacs-subdirs-el-gentoo.diff b/app-editors/emacs/files/emacs-subdirs-el-gentoo.diff
deleted file mode 100644
index c76aab71b771..000000000000
--- a/app-editors/emacs/files/emacs-subdirs-el-gentoo.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile.in	2002-10-19 10:21:01.000000000 +0900
-+++ Makefile.in.subdirs-el	2004-08-02 17:01:35.852417016 +0900
-@@ -387,18 +387,21 @@
- 	then true; \
- 	else \
- 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-+	   echo "    (normal-top-level-add-subdirs-to-load-path))"; \
-+	   echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \
-+	   echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
- 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
- 	    > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \
- 	fi
- 	chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el
--	-if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
--	then true; \
--	else \
--	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
--	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
--	    > ${datadir}/emacs/site-lisp/subdirs.el; \
--	fi
--	-chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
-+#	-if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
-+#	then true; \
-+#	else \
-+#	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-+#	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
-+#	    > ${datadir}/emacs/site-lisp/subdirs.el; \
-+#	fi
-+#	-chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
- 	-unset CDPATH; \
- 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
- 	then \