From 1080371936888c292efd85b1ee6362ce16a2bb3f Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 18 May 2008 06:11:56 +0000
Subject: Create file for backwards compatibility only if obsolete files were
 found.

svn path=/emacs-overlay/; revision=1069
---
 eclass/elisp-common.eclass | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'eclass/elisp-common.eclass')

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index ee4db83..3fe6c9a 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -395,26 +395,27 @@ for greater flexibility, users can load individual package-specific
 initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/.
 EOF
 		echo
-
-		if [ "${obsolete}" ]; then
-			while read line; do ewarn "${line}"; done <<-EOF
-			Site-initialisation files of Emacs packages are now installed in
-			/usr/share/emacs/site-lisp/site-gentoo.d/. You may consider using
-			/usr/sbin/emacs-updater to rebuild the installed Emacs packages.
-			However, the old location is still supported.
-			EOF
-			echo
-		fi
 	fi
 
-	# Kludge for backwards compatibility: During pkg_postrm, old versions
-	# of this eclass (saved in the VDB) won't find packages' site-init files
-	# in the new location. So we copy them to an auxiliary file that is
-	# visible to old eclass versions.
-	for sf in "${sflist[@]}"; do
-		[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
-			&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
-	done
+
+	if [ "${obsolete}" ]; then
+		while read line; do ewarn "${line}"; done <<-EOF
+		Site-initialisation files of Emacs packages are now installed in
+		/usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend
+		that you use /usr/sbin/emacs-updater to rebuild the installed
+		Emacs packages.
+		EOF
+		echo
+
+		# Kludge for backwards compatibility: During pkg_postrm, old versions
+		# of this eclass (saved in the VDB) won't find packages' site-init
+		# files in the new location. So we copy them to an auxiliary file
+		# that is visible to old eclass versions.
+		for sf in "${sflist[@]}"; do
+			[ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \
+				&& cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el
+		done
+	fi
 
 	# cleanup
 	rm -f "${tmpdir}"/site-{gentoo,start}.el
-- 
cgit v1.2.3-65-gdbad