From 2dd66b54b4c8f7396ef3149dae9f43f475da23c7 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Wed, 27 Mar 2013 16:01:44 +0000 Subject: Fall back to the installsources dir for find-function-C-source-directory if that feature is enabled. (Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) --- app-editors/emacs/ChangeLog | 7 ++++++- app-editors/emacs/emacs-23.4-r5.ebuild | 18 ++++++++++-------- app-editors/emacs/emacs-24.3.ebuild | 18 ++++++++++-------- 3 files changed, 26 insertions(+), 17 deletions(-) (limited to 'app-editors/emacs') diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 47f59e0ac1c9..d20b4821dab8 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.566 2013/03/22 16:34:00 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.567 2013/03/27 16:01:44 ulm Exp $ + + 27 Mar 2013; Ulrich Müller emacs-23.4-r5.ebuild, + emacs-24.3.ebuild: + Fall back to the installsources dir for find-function-C-source-directory if + that feature is enabled. 19 Mar 2013; Ulrich Müller emacs-23.4-r5.ebuild, emacs-24.3.ebuild: diff --git a/app-editors/emacs/emacs-23.4-r5.ebuild b/app-editors/emacs/emacs-23.4-r5.ebuild index 55bea525d838..8e7f43172b24 100644 --- a/app-editors/emacs/emacs-23.4-r5.ebuild +++ b/app-editors/emacs/emacs-23.4-r5.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/emacs-23.4-r5.ebuild,v 1.15 2013/03/19 21:35:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v 1.16 2013/03/27 16:01:44 ulm Exp $ EAPI=4 WANT_AUTOMAKE="none" @@ -164,7 +164,7 @@ src_configure() { myconf="${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="${myconf} --with-ns --disable-ns-self-contained" myconf="${myconf} --without-x" else @@ -230,25 +230,27 @@ src_install () { # remove unused /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} doins -r src/{m,s} rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README - 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\\\\>")) diff --git a/app-editors/emacs/emacs-24.3.ebuild b/app-editors/emacs/emacs-24.3.ebuild index 573fa557f672..e857deb8a52e 100644 --- a/app-editors/emacs/emacs-24.3.ebuild +++ b/app-editors/emacs/emacs-24.3.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/emacs-24.3.ebuild,v 1.3 2013/03/19 21:35:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild,v 1.4 2013/03/27 16:01:44 ulm Exp $ EAPI=5 @@ -174,7 +174,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 @@ -239,22 +239,24 @@ src_install () { # remove unused /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\\\\>")) -- cgit v1.2.3-65-gdbad