diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-11-28 22:44:11 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-11-28 22:44:11 +0000 |
commit | d318bca3b46ee2fcbd2ec5e9125ff4583d491d69 (patch) | |
tree | 6011e01d60772db6d4f9065ddea69a77dba37625 | |
parent | Cosmetic changes. (diff) | |
download | emacs-d318bca3b46ee2fcbd2ec5e9125ff4583d491d69.tar.gz emacs-d318bca3b46ee2fcbd2ec5e9125ff4583d491d69.tar.bz2 emacs-d318bca3b46ee2fcbd2ec5e9125ff4583d491d69.zip |
Simplify code for site file creation.
svn path=/emacs-overlay/; revision=1230
-rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 3 | ||||
-rw-r--r-- | app-editors/emacs-cvs/Manifest | 4 | ||||
-rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild | 15 |
3 files changed, 10 insertions, 12 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index fc38348..a7f2e76 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild: + Simplify code for site file creation. + 27 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild: Add site initialisation for Info, so that Emacs' own Info dir is always first in the list. This also helps to get the right documentation if Emacs diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index efeed6f..832f7b7 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -1,4 +1,4 @@ AUX emacs-cvs-freebsd-sparc-1.patch 448 RMD160 4f131b630ec09e1d9170374fc60a1620f0f718e9 SHA1 5bc71be91bb8008cec2473479184e250e5284c68 SHA256 e2c2e53e2995d4a505c480d17e0a7e5abff61ea96c4d3451a1e019c985a59cd8 -EBUILD emacs-cvs-23.0.9999.ebuild 8843 RMD160 17d4595c530784f7050e9a3aa8fac3bf820e7fa5 SHA1 d8df1e9b3baf2b050cccf8efa78b9d80d6f2997f SHA256 b36a0546d42caaf81295b8468b58f40c5213ccfebe5b81c26d05825941267887 -MISC ChangeLog 1472 RMD160 1b2003ddc5f75736bd20d339bb03597234eba710 SHA1 043bba7166e8d2791a7a653af53528c39d99ccd1 SHA256 4d9d5a1fba5fa99c897272ee24f3b483fbdab4fcce2a8de7da1ac81b4d369fa3 +EBUILD emacs-cvs-23.0.9999.ebuild 8761 RMD160 92d96cf90140c155a1c19db77477722771bf4701 SHA1 6588d041fa2c6c3200eec50e823bedebd5beb005 SHA256 fd0d59690a7e6d8ff238c1fbbf9aff3255a52797901d3c5b9f4746987cc84a8d +MISC ChangeLog 1588 RMD160 cb71da96ba79e439fee5db2fc89be1f4c9e65fd7 SHA1 06fc1cdd168b8e87a85146b5dd15536ed3a240ba SHA256 c9876e503b82f5d8b1967283b788a3c1d8b47766c7dbec8ace5950699186b839 MISC metadata.xml 1606 RMD160 f898da13dfc3bdb1636e9ff7bc241997d235498b SHA1 2dea9901bc80a1d91f38628707395d9b4ef0df70 SHA256 f4df95b7db6f7b3375bdd658024520a03a763e75f4ca846ab494609f6094c9bd diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild index f58ad18..7e34fb8 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild @@ -69,7 +69,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${ECVS_LOCALNAME}" EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE=20${PN}-${SLOT}-gentoo.el +SITEFILE="20${PN}-${SLOT}-gentoo.el" src_prepare() { # FULL_VERSION keeps the full version number, which is needed in @@ -190,7 +190,7 @@ src_compile() { } src_install () { - local i m + local i m c=";;" emake install DESTDIR="${D}" || die "make install failed" @@ -221,6 +221,7 @@ src_install () { # This is not meant to install all the source -- just the # C source you might find via find-function doins src/*.[ch] + c="" fi sed 's/^X//' >"${SITEFILE}" <<-EOF @@ -228,14 +229,8 @@ src_install () { ;;; ${PN}-${SLOT} site-lisp configuration X (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - EOF - if use source; then - sed 's/^X//' >>"${SITEFILE}" <<-EOF - X (setq find-function-C-source-directory - X "/usr/share/emacs/${FULL_VERSION}/src") - EOF - fi - sed 's/^X//' >>"${SITEFILE}" <<-EOF + X ${c}(setq find-function-C-source-directory + X ${c} "/usr/share/emacs/${FULL_VERSION}/src") X (let ((path (getenv "INFOPATH")) X (dir "/usr/share/info/${EMACS_SUFFIX}")) X (and path |