| 1 |
commit: 6937b367c618f82930e200f8f72efbf42c8126da |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 12 14:45:30 2021 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 12 14:52:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6937b367 |
| 7 |
|
| 8 |
app-editors/emacs: Bump to EAPI 8 |
| 9 |
|
| 10 |
Move app-eselect/eselect-emacs from BDEPEND to IDEPEND. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/716334 |
| 13 |
Suggested-by: David Michael <fedora.dm0 <AT> gmail.com> |
| 14 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 15 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 16 |
|
| 17 |
.../emacs/{emacs-27.2.9999.ebuild => emacs-27.2-r3.ebuild} | 12 ++++++++---- |
| 18 |
app-editors/emacs/emacs-27.2.9999.ebuild | 7 ++++--- |
| 19 |
app-editors/emacs/emacs-28.0.9999.ebuild | 7 ++++--- |
| 20 |
3 files changed, 16 insertions(+), 10 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2-r3.ebuild |
| 23 |
similarity index 98% |
| 24 |
copy from app-editors/emacs/emacs-27.2.9999.ebuild |
| 25 |
copy to app-editors/emacs/emacs-27.2-r3.ebuild |
| 26 |
index 7089e4a9a73..0245ab3cc2d 100644 |
| 27 |
--- a/app-editors/emacs/emacs-27.2.9999.ebuild |
| 28 |
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild |
| 29 |
@@ -1,7 +1,7 @@ |
| 30 |
# Copyright 1999-2021 Gentoo Authors |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
|
| 33 |
-EAPI=7 |
| 34 |
+EAPI=8 |
| 35 |
|
| 36 |
inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs |
| 37 |
|
| 38 |
@@ -31,6 +31,9 @@ else |
| 39 |
elif [[ ${PV//[0-9]} != "." ]]; then |
| 40 |
SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" |
| 41 |
fi |
| 42 |
+ # Patchset from proj/emacs-patches.git |
| 43 |
+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz" |
| 44 |
+ PATCHES=("${WORKDIR}/patch") |
| 45 |
SLOT="${PV%%.*}" |
| 46 |
[[ ${PV} == *.*.* ]] && SLOT+="-vcs" |
| 47 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 48 |
@@ -125,8 +128,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 49 |
DEPEND="${RDEPEND} |
| 50 |
gui? ( !aqua? ( x11-base/xorg-proto ) )" |
| 51 |
|
| 52 |
-BDEPEND="app-eselect/eselect-emacs |
| 53 |
- sys-apps/texinfo |
| 54 |
+BDEPEND="sys-apps/texinfo |
| 55 |
virtual/pkgconfig |
| 56 |
gzip-el? ( app-arch/gzip )" |
| 57 |
|
| 58 |
@@ -134,6 +136,8 @@ RDEPEND="${RDEPEND} |
| 59 |
!app-editors/emacs-vcs:27 |
| 60 |
app-eselect/eselect-emacs" |
| 61 |
|
| 62 |
+IDEPEND="app-eselect/eselect-emacs" |
| 63 |
+ |
| 64 |
EMACS_SUFFIX="emacs-${SLOT}" |
| 65 |
SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 66 |
|
| 67 |
@@ -154,7 +158,7 @@ src_prepare() { |
| 68 |
# Fix filename reference in redirected man page |
| 69 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die |
| 70 |
|
| 71 |
- AT_M4DIR=m4 eautoreconf |
| 72 |
+ #AT_M4DIR=m4 eautoreconf |
| 73 |
} |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
|
| 77 |
diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild |
| 78 |
index 7089e4a9a73..6e936382b21 100644 |
| 79 |
--- a/app-editors/emacs/emacs-27.2.9999.ebuild |
| 80 |
+++ b/app-editors/emacs/emacs-27.2.9999.ebuild |
| 81 |
@@ -1,7 +1,7 @@ |
| 82 |
# Copyright 1999-2021 Gentoo Authors |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
|
| 85 |
-EAPI=7 |
| 86 |
+EAPI=8 |
| 87 |
|
| 88 |
inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs |
| 89 |
|
| 90 |
@@ -125,8 +125,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 91 |
DEPEND="${RDEPEND} |
| 92 |
gui? ( !aqua? ( x11-base/xorg-proto ) )" |
| 93 |
|
| 94 |
-BDEPEND="app-eselect/eselect-emacs |
| 95 |
- sys-apps/texinfo |
| 96 |
+BDEPEND="sys-apps/texinfo |
| 97 |
virtual/pkgconfig |
| 98 |
gzip-el? ( app-arch/gzip )" |
| 99 |
|
| 100 |
@@ -134,6 +133,8 @@ RDEPEND="${RDEPEND} |
| 101 |
!app-editors/emacs-vcs:27 |
| 102 |
app-eselect/eselect-emacs" |
| 103 |
|
| 104 |
+IDEPEND="app-eselect/eselect-emacs" |
| 105 |
+ |
| 106 |
EMACS_SUFFIX="emacs-${SLOT}" |
| 107 |
SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
| 108 |
|
| 109 |
|
| 110 |
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild |
| 111 |
index e3586a88f10..f5a41b7f06e 100644 |
| 112 |
--- a/app-editors/emacs/emacs-28.0.9999.ebuild |
| 113 |
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild |
| 114 |
@@ -1,7 +1,7 @@ |
| 115 |
# Copyright 1999-2021 Gentoo Authors |
| 116 |
# Distributed under the terms of the GNU General Public License v2 |
| 117 |
|
| 118 |
-EAPI=7 |
| 119 |
+EAPI=8 |
| 120 |
|
| 121 |
inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs |
| 122 |
|
| 123 |
@@ -118,14 +118,15 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 124 |
DEPEND="${RDEPEND} |
| 125 |
gui? ( !aqua? ( x11-base/xorg-proto ) )" |
| 126 |
|
| 127 |
-BDEPEND="app-eselect/eselect-emacs |
| 128 |
- sys-apps/texinfo |
| 129 |
+BDEPEND="sys-apps/texinfo |
| 130 |
virtual/pkgconfig |
| 131 |
gzip-el? ( app-arch/gzip )" |
| 132 |
|
| 133 |
RDEPEND="${RDEPEND} |
| 134 |
app-eselect/eselect-emacs" |
| 135 |
|
| 136 |
+IDEPEND="app-eselect/eselect-emacs" |
| 137 |
+ |
| 138 |
EMACS_SUFFIX="emacs-${SLOT}" |
| 139 |
SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
Archives