From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41EBE138335 for ; Sun, 25 Nov 2018 14:06:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3767EE0973; Sun, 25 Nov 2018 14:06:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B682E0973 for ; Sun, 25 Nov 2018 14:06:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6807335D54 for ; Sun, 25 Nov 2018 14:06:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 667E24B6 for ; Sun, 25 Nov 2018 14:06:05 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1543154753.b2966c22b62cf3e79522a1bc8fc958e9d647d9a2.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs-vcs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild X-VCS-Directories: app-editors/emacs-vcs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: b2966c22b62cf3e79522a1bc8fc958e9d647d9a2 X-VCS-Branch: master Date: Sun, 25 Nov 2018 14:06:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b4f6ff74-ebbe-44a9-b27c-8376ef719dd9 X-Archives-Hash: f15ccd840e44e7b07b65fa9a5a125811 commit: b2966c22b62cf3e79522a1bc8fc958e9d647d9a2 Author: Ulrich Müller gentoo org> AuthorDate: Sun Nov 25 13:16:22 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Nov 25 14:05:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2966c22 app-editors/emacs-vcs: Avoid file collision in /usr/include. 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 gentoo.org> 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 f2a9bef0754..8c8c1e0e0c8 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 2862235ef56..5450edeeb08 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}" \