Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs-vcs/
Date: Sun, 25 Nov 2018 14:06:12
Message-Id: 1543154753.b2966c22b62cf3e79522a1bc8fc958e9d647d9a2.ulm@gentoo
1 commit: b2966c22b62cf3e79522a1bc8fc958e9d647d9a2
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 25 13:16:22 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 25 14:05:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2966c22
7
8 app-editors/emacs-vcs: Avoid file collision in /usr/include.
9
10 Emacs installs a file /usr/include/emacs-module.h now.
11 Move it to /usr/include/${EMACS_SUFFIX}/.
12
13 Package-Manager: Portage-2.3.51, Repoman-2.3.12
14 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
15
16 app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild | 3 ++-
17 app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 3 ++-
18 2 files changed, 4 insertions(+), 2 deletions(-)
19
20 diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
21 index f2a9bef0754..8c8c1e0e0c8 100644
22 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
23 +++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2018 Gentoo Foundation
26 +# Copyright 1999-2018 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=7
30 @@ -251,6 +251,7 @@ src_configure() {
31
32 econf \
33 --program-suffix="-${EMACS_SUFFIX}" \
34 + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
35 --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
36 --localstatedir="${EPREFIX}"/var \
37 --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
38
39 diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
40 index 2862235ef56..5450edeeb08 100644
41 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
42 +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
43 @@ -1,4 +1,4 @@
44 -# Copyright 1999-2018 Gentoo Foundation
45 +# Copyright 1999-2018 Gentoo Authors
46 # Distributed under the terms of the GNU General Public License v2
47
48 EAPI=7
49 @@ -253,6 +253,7 @@ src_configure() {
50
51 econf \
52 --program-suffix="-${EMACS_SUFFIX}" \
53 + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
54 --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
55 --localstatedir="${EPREFIX}"/var \
56 --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \