| 1 |
ulm 08/07/01 22:10:07 |
| 2 |
|
| 3 |
Modified: elisp-common.eclass |
| 4 |
Log: |
| 5 |
Sync eclasses from Emacs overlay (revision 1110). |
| 6 |
|
| 7 |
elisp-common.eclass: |
| 8 |
Create file for backwards compatibility only if obsolete files were found. |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.41 eclass/elisp-common.eclass |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.41&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?rev=1.41&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp-common.eclass?r1=1.40&r2=1.41 |
| 16 |
|
| 17 |
Index: elisp-common.eclass |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v |
| 20 |
retrieving revision 1.40 |
| 21 |
retrieving revision 1.41 |
| 22 |
diff -u -r1.40 -r1.41 |
| 23 |
--- elisp-common.eclass 18 May 2008 06:15:12 -0000 1.40 |
| 24 |
+++ elisp-common.eclass 1 Jul 2008 22:10:06 -0000 1.41 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2008 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.40 2008/05/18 06:15:12 ulm Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.41 2008/07/01 22:10:06 ulm Exp $ |
| 30 |
# |
| 31 |
# Copyright 2002-2004 Matthew Kennedy <mkennedy@g.o> |
| 32 |
# Copyright 2003 Jeremy Maitin-Shepard <jbms@×××××.com> |
| 33 |
@@ -317,7 +317,7 @@ |
| 34 |
|
| 35 |
einfon "Regenerating ${SITELISP}/site-gentoo.el ..." |
| 36 |
|
| 37 |
- # remove auxiliary file |
| 38 |
+ # remove any auxiliary file (from previous run) |
| 39 |
rm -f "${ROOT}${SITELISP}"/00site-gentoo.el |
| 40 |
|
| 41 |
# set nullglob option, there may be a directory without matching files |
| 42 |
@@ -395,26 +395,26 @@ |
| 43 |
initialisation files from /usr/share/emacs/site-lisp/site-gentoo.d/. |
| 44 |
EOF |
| 45 |
echo |
| 46 |
- |
| 47 |
- if [ "${obsolete}" ]; then |
| 48 |
- while read line; do ewarn "${line}"; done <<-EOF |
| 49 |
- Site-initialisation files of Emacs packages are now installed in |
| 50 |
- /usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend |
| 51 |
- that you use /usr/sbin/emacs-updater to rebuild the installed |
| 52 |
- Emacs packages. |
| 53 |
- EOF |
| 54 |
- echo |
| 55 |
- fi |
| 56 |
fi |
| 57 |
|
| 58 |
- # Kludge for backwards compatibility: During pkg_postrm, old versions |
| 59 |
- # of this eclass (saved in the VDB) won't find packages' site-init files |
| 60 |
- # in the new location. So we copy them to an auxiliary file that is |
| 61 |
- # visible to old eclass versions. |
| 62 |
- for sf in "${sflist[@]}"; do |
| 63 |
- [ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \ |
| 64 |
- && cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el |
| 65 |
- done |
| 66 |
+ if [ "${obsolete}" ]; then |
| 67 |
+ while read line; do ewarn "${line}"; done <<-EOF |
| 68 |
+ Site-initialisation files of Emacs packages are now installed in |
| 69 |
+ /usr/share/emacs/site-lisp/site-gentoo.d/. We strongly recommend |
| 70 |
+ that you use /usr/sbin/emacs-updater to rebuild the installed |
| 71 |
+ Emacs packages. |
| 72 |
+ EOF |
| 73 |
+ echo |
| 74 |
+ |
| 75 |
+ # Kludge for backwards compatibility: During pkg_postrm, old versions |
| 76 |
+ # of this eclass (saved in the VDB) won't find packages' site-init |
| 77 |
+ # files in the new location. So we copy them to an auxiliary file |
| 78 |
+ # that is visible to old eclass versions. |
| 79 |
+ for sf in "${sflist[@]}"; do |
| 80 |
+ [ "${sf%/*}" = "${ROOT}${SITELISP}/site-gentoo.d" ] \ |
| 81 |
+ && cat "${sf}" >>"${ROOT}${SITELISP}"/00site-gentoo.el |
| 82 |
+ done |
| 83 |
+ fi |
| 84 |
|
| 85 |
# cleanup |
| 86 |
rm -f "${tmpdir}"/site-{gentoo,start}.el |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
-- |
| 91 |
gentoo-commits@l.g.o mailing list |
Archives