diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-03-25 12:13:01 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-03-25 12:13:01 +0000 |
| commit | 793d90900481f33222eae511e29bca541e077cc6 (patch) | |
| tree | 1330450753c894d19271cd7ba790e134b9c3de0b /app-editors/emacs-vcs | |
| parent | Add app-emulation/libguestfs-appliance, thanks to slepnoga (diff) | |
| download | gentoo-2-793d90900481f33222eae511e29bca541e077cc6.tar.gz gentoo-2-793d90900481f33222eae511e29bca541e077cc6.tar.bz2 gentoo-2-793d90900481f33222eae511e29bca541e077cc6.zip | |
Use installsources dir for find-function-C-source-directory if that feature is enabled. From Emacs overlay.
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors/emacs-vcs')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 79a21beabaa5..affc2d991865 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.129 2013/03/21 17:59:56 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.130 2013/03/25 12:13:01 ulm Exp $ + + 25 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild: + Use installsources dir for find-function-C-source-directory if that feature + is enabled. From Emacs overlay. 21 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.3.9999.ebuild, metadata.xml: diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild index d72daa0261df..f4d82f25bca5 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.8 2013/03/21 17:59:56 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.9 2013/03/25 12:13:01 ulm Exp $ EAPI=5 @@ -193,7 +193,7 @@ src_configure() { myconf+=" --with-x-toolkit=no" fi elif use aqua; then - einfo "Configuring to build with Cocoa support" + einfo "Configuring to build with Nextstep (Cocoa) support" myconf+=" --with-ns --disable-ns-self-contained" myconf+=" --without-x" else @@ -255,22 +255,24 @@ src_install () { # remove unused <version>/site-lisp dir rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - local c=";;" + local cdir if use source; then - insinto /usr/share/emacs/${FULL_VERSION}/src + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" # This is not meant to install all the source -- just the # C source you might find via find-function doins src/*.{c,h,m} - c="" + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" fi - sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF X ;;; ${PN}-${SLOT} site-lisp configuration X (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - X ${c}(setq find-function-C-source-directory - X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src") + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") X (let ((path (getenv "INFOPATH")) X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |