From b2966c22b62cf3e79522a1bc8fc958e9d647d9a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sun, 25 Nov 2018 14:16:22 +0100 Subject: [PATCH] app-editors/emacs-vcs: Avoid file collision in /usr/include. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Emacs installs a file /usr/include/emacs-module.h now. Move it to /usr/include/${EMACS_SUFFIX}/. Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Ulrich Müller --- app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild | 3 ++- app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild index f2a9bef0754a..8c8c1e0e0c82 100644 --- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -251,6 +251,7 @@ src_configure() { econf \ --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --localstatedir="${EPREFIX}"/var \ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild index 2862235ef56e..5450edeeb08a 100644 --- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -253,6 +253,7 @@ src_configure() { econf \ --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --localstatedir="${EPREFIX}"/var \ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ -- 2.26.2