| 1 |
ulm 13/03/27 16:01:44 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-24.3.ebuild emacs-23.4-r5.ebuild |
| 4 |
Log: |
| 5 |
Fall back to the installsources dir for find-function-C-source-directory if that feature is enabled. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.567 app-editors/emacs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.567&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.567&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.566&r2=1.567 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 19 |
retrieving revision 1.566 |
| 20 |
retrieving revision 1.567 |
| 21 |
diff -u -r1.566 -r1.567 |
| 22 |
--- ChangeLog 22 Mar 2013 16:34:00 -0000 1.566 |
| 23 |
+++ ChangeLog 27 Mar 2013 16:01:44 -0000 1.567 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for app-editors/emacs |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.566 2013/03/22 16:34:00 ulm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.567 2013/03/27 16:01:44 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 27 Mar 2013; Ulrich Müller <ulm@g.o> emacs-23.4-r5.ebuild, |
| 31 |
+ emacs-24.3.ebuild: |
| 32 |
+ Fall back to the installsources dir for find-function-C-source-directory if |
| 33 |
+ that feature is enabled. |
| 34 |
|
| 35 |
19 Mar 2013; Ulrich Müller <ulm@g.o> emacs-23.4-r5.ebuild, |
| 36 |
emacs-24.3.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 app-editors/emacs/emacs-24.3.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: emacs-24.3.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- emacs-24.3.ebuild 19 Mar 2013 21:35:54 -0000 1.3 |
| 53 |
+++ emacs-24.3.ebuild 27 Mar 2013 16:01:44 -0000 1.4 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2013 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild,v 1.3 2013/03/19 21:35:54 ulm Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild,v 1.4 2013/03/27 16:01:44 ulm Exp $ |
| 59 |
|
| 60 |
EAPI=5 |
| 61 |
|
| 62 |
@@ -174,7 +174,7 @@ |
| 63 |
myconf+=" --with-x-toolkit=no" |
| 64 |
fi |
| 65 |
elif use aqua; then |
| 66 |
- einfo "Configuring to build with Cocoa support" |
| 67 |
+ einfo "Configuring to build with Nextstep (Cocoa) support" |
| 68 |
myconf+=" --with-ns --disable-ns-self-contained" |
| 69 |
myconf+=" --without-x" |
| 70 |
else |
| 71 |
@@ -239,22 +239,24 @@ |
| 72 |
# remove unused <version>/site-lisp dir |
| 73 |
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
| 74 |
|
| 75 |
- local c=";;" |
| 76 |
+ local cdir |
| 77 |
if use source; then |
| 78 |
- insinto /usr/share/emacs/${FULL_VERSION}/src |
| 79 |
+ cdir="/usr/share/emacs/${FULL_VERSION}/src" |
| 80 |
+ insinto "${cdir}" |
| 81 |
# This is not meant to install all the source -- just the |
| 82 |
# C source you might find via find-function |
| 83 |
doins src/*.{c,h,m} |
| 84 |
- c="" |
| 85 |
+ elif has installsources ${FEATURES}; then |
| 86 |
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" |
| 87 |
fi |
| 88 |
|
| 89 |
- sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF |
| 90 |
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF |
| 91 |
X |
| 92 |
;;; ${PN}-${SLOT} site-lisp configuration |
| 93 |
X |
| 94 |
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
| 95 |
- X ${c}(setq find-function-C-source-directory |
| 96 |
- X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src") |
| 97 |
+ Y (setq find-function-C-source-directory |
| 98 |
+ Y "${EPREFIX}${cdir}") |
| 99 |
X (let ((path (getenv "INFOPATH")) |
| 100 |
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") |
| 101 |
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |
| 102 |
|
| 103 |
|
| 104 |
|
| 105 |
1.16 app-editors/emacs/emacs-23.4-r5.ebuild |
| 106 |
|
| 107 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild?rev=1.16&view=markup |
| 108 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild?rev=1.16&content-type=text/plain |
| 109 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild?r1=1.15&r2=1.16 |
| 110 |
|
| 111 |
Index: emacs-23.4-r5.ebuild |
| 112 |
=================================================================== |
| 113 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v |
| 114 |
retrieving revision 1.15 |
| 115 |
retrieving revision 1.16 |
| 116 |
diff -u -r1.15 -r1.16 |
| 117 |
--- emacs-23.4-r5.ebuild 19 Mar 2013 21:35:54 -0000 1.15 |
| 118 |
+++ emacs-23.4-r5.ebuild 27 Mar 2013 16:01:44 -0000 1.16 |
| 119 |
@@ -1,6 +1,6 @@ |
| 120 |
# Copyright 1999-2013 Gentoo Foundation |
| 121 |
# Distributed under the terms of the GNU General Public License v2 |
| 122 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v 1.15 2013/03/19 21:35:54 ulm Exp $ |
| 123 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v 1.16 2013/03/27 16:01:44 ulm Exp $ |
| 124 |
|
| 125 |
EAPI=4 |
| 126 |
WANT_AUTOMAKE="none" |
| 127 |
@@ -164,7 +164,7 @@ |
| 128 |
myconf="${myconf} --with-x-toolkit=no" |
| 129 |
fi |
| 130 |
elif use aqua; then |
| 131 |
- einfo "Configuring to build with Cocoa support" |
| 132 |
+ einfo "Configuring to build with Nextstep (Cocoa) support" |
| 133 |
myconf="${myconf} --with-ns --disable-ns-self-contained" |
| 134 |
myconf="${myconf} --without-x" |
| 135 |
else |
| 136 |
@@ -230,25 +230,27 @@ |
| 137 |
# remove unused <version>/site-lisp dir |
| 138 |
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
| 139 |
|
| 140 |
- local c=";;" |
| 141 |
+ local cdir |
| 142 |
if use source; then |
| 143 |
- insinto /usr/share/emacs/${FULL_VERSION}/src |
| 144 |
+ cdir="/usr/share/emacs/${FULL_VERSION}/src" |
| 145 |
+ insinto "${cdir}" |
| 146 |
# This is not meant to install all the source -- just the |
| 147 |
# C source you might find via find-function |
| 148 |
doins src/*.{c,h,m} |
| 149 |
doins -r src/{m,s} |
| 150 |
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c |
| 151 |
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README |
| 152 |
- c="" |
| 153 |
+ elif has installsources ${FEATURES}; then |
| 154 |
+ cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" |
| 155 |
fi |
| 156 |
|
| 157 |
- sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF |
| 158 |
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF |
| 159 |
X |
| 160 |
;;; ${PN}-${SLOT} site-lisp configuration |
| 161 |
X |
| 162 |
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) |
| 163 |
- X ${c}(setq find-function-C-source-directory |
| 164 |
- X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src") |
| 165 |
+ Y (setq find-function-C-source-directory |
| 166 |
+ Y "${EPREFIX}${cdir}") |
| 167 |
X (let ((path (getenv "INFOPATH")) |
| 168 |
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") |
| 169 |
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) |
Archives