diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2013-03-25 12:13:07 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2013-03-25 12:13:07 +0000 |
| commit | 391195614176e218e125538be15057f70a7060b0 (patch) | |
| tree | 5f7704d04461889d6d51dc48838a761da4edc94c /app-editors/emacs-vcs | |
| parent | Add app-emulation/libguestfs-appliance, thanks to slepnoga (diff) | |
| download | historical-391195614176e218e125538be15057f70a7060b0.tar.gz historical-391195614176e218e125538be15057f70a7060b0.tar.bz2 historical-391195614176e218e125538be15057f70a7060b0.zip | |
Use installsources dir for find-function-C-source-directory if that feature is enabled. From Emacs overlay.
Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors/emacs-vcs')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 24 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild | 18 |
3 files changed, 27 insertions, 21 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/Manifest b/app-editors/emacs-vcs/Manifest index 628f0d1f30ca..dfad219707c5 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,20 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD emacs-vcs-24.3.9999.ebuild 11129 SHA256 ef258629638eb014322f8d946aa89132d694a844038a8143619740c6f8fa77f2 SHA512 ea0aa21e2a3e7c6e1927325ff6ab1bca5d49e6932afc2fadedb9fcfb400af2d0328a9640d61fa0344af4073bbc9a6907960c2cb19e4b166f29b1190cb84f93bc WHIRLPOOL 6bcbafba367d5b9c51a86e644c043b59e88c7b8d5bc9d01833ec5e225e93241f0e67de73a8603af22088c2309ca18d600de444f727a0537faeaf25c94a70af2a -MISC ChangeLog 72266 SHA256 d161b1d10213ebf338fa300a9f8ccb8293baaf9c524667221ba4bde4c0c648fa SHA512 d2dff2dbfeda6e9f2ee330e34b62c5b9ec04cf320d2488ab15ce1cc307c104d6be491e08a619317e2cb426e2d8d8d0c6f41b639611545736ec131584ae4a1ec0 WHIRLPOOL b4bc129f43fa396fb0359eccd894d0296e8b52923309d8ae413acee9c773f5e42feb385e1652fb4da5cc34183bd02f90cdc4ffd454840d09513a8120f9413bf1 +EBUILD emacs-vcs-24.3.9999.ebuild 11241 SHA256 6c68cd5d341a2cedf2ed0027b73b012079bf21f60e81eac9e12040d2bbd3e29e SHA512 e0290d3ba2b446b1298fa65e5b6f5e374d046d6ef1e46755a438685d6931cf168952c1bdfc4d5ff50529f425fa92cb83b16863165ba6451e451202061c6fc3ff WHIRLPOOL c4eec8212fa21b2ed9cedc9656320bcb6cf7b1aee85aeffe8d1a939bc638e83f4c4a985f381a9220a74eba4ed9d48d4227d037e488d645daeb4426838c0fd1e6 +MISC ChangeLog 72454 SHA256 1513c6fa312590817171dfd5f4960290cfbb4847c28fe43ffd02eb8ec1647402 SHA512 3eb1b327295b16e94368887f0ddc09a4f4ea72c03768d5fb2c9b47d5366948b3f985208ddb0a75d98bd7b088629dd5120c8f59eefde9790b1ffcb79a0ac0db42 WHIRLPOOL d2749a3efbfdb5c147369b328624ff74e59014583baccc17982f6262c27ec3a13fb230b4ca5e2a64759a5d3f7c41a58e765bd3341d6589f1889a9d11cc822fca MISC metadata.xml 2431 SHA256 f5b0a24ab6e525de4d80cffb7a635260e47c88552e7c2b3fe694b76b130d36f1 SHA512 9345b4871208b2cdc7b1ef4d1981cad54aae6da91ba3fe2aa482df8a242b87d7d1c1288f132ed70ef2cab0372418275a50754c7249bb06adc7f5a17403a40fe7 WHIRLPOOL 73f2ce2c94b5e0b83cd1d06ce975b83004d54f51d573f3330450d60c2e7c5220c4bf92ca0af403a322ed9a67806b3cb11190f81f93e135bf1f8e0d8dee0cf220 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQGcBAEBCAAGBQJRS0rfAAoJEJQzkH1pP7W4FN4L/2s60RUspqmAMz4j9gTMDUG5 -TnzD0xe9ijTeq6bUWhG19TwaxtGbWrNGQ98BaCRLOJnrkCtDrprGUL/qNTipWpjI -6Epj3f74nlNGNnEmaxyQp0t5TzHcn2FoEhEY3XuX1PvSyR2/u3bUDh6Pv+kv/o+O -MlekUSRf2CZA7LDSdGY0jT5csRa0ZLwHD/hhnazLAbUa0HKdPFJzWs9WfIVf2zk4 -p5So1rEO87kYcPq5rqHXKF9gNQoQV33Pff5A1jyEC9ZZbTZmdSJ9g40jZaxJo2kp -wD++mpHdjk/hmAkq4IDoZnBEiZDACsHp5EQUY5D3CyXK9kjUFE/TaWbwKladk99L -jLSMERNvnfhKErxRQTebieParLwDs5DzAqGMnsaKZAL1tJ/VoMxYS479RqVi6rZ4 -6pyVTlEnpkrzHp4qar/sjFH/qnIZzF+DT6h4Kn4f7pbln757ZBgZcyAo/MljQ1IC -LQ80Owznd6F6aR724OOUSAcbSv6RuRCD78lHjxwZew== -=NNHc +iQGcBAEBCAAGBQJRUD9lAAoJEJQzkH1pP7W4JQMMAJrqo1wf+TzNer09HhJ+APJA +hfL2vrulZbgd9vqOXig9lCB7u7PSVouuc2qm4kjbru73HdCgsEJp+T4NwpV1dXzL +y+YK7/GSx9MyoCMr9NYicmSzc/6R6G6ZWe4Ze1xFbqNPfODupTP6qinHwV3dahpd +5ZsJunPy/tgxADUC1vVTF03/BXgjvqet3Bva0/XKKwE89E8loELvQjWzhU8ZAMLn +HbSKHSQtSKA+6Woos0ZaYexvfbiHiQKNaib1OyCFKy9ZETreMnfluR73VeacE9Mg +kWBIsWqPOVhkoDcJD9F3Wd0JdPCtJHuN8CYypydvOFoAhJTyXX0eDE+/IZc2XKe/ +viyjouhhslXWdvsUyJ2VftNXFbf4Gix7m6GjwIjvzMpivWA3lvxOdFjiZreCoGB+ +h1HgXNAjV8o90kUEHpmUEPykbrAE74cgxL/6OvEgv4/iCMC3w8XPIEAJU0eoDLZi +E6nKrTdRSCYLdU/wgSXNO8dNCHqbkHs4W6p2SQlt3Q== +=K0TO -----END PGP SIGNATURE----- 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\\\\>")) |