[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

[Ulrich Müller]

commit:     08e8b994cf2e5910ad022c7b9f1c68fe9b2991e6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 08:59:13 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 09:05:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e8b994

app-editors/emacs: Bump remaining slots to EAPI 8

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../{emacs-18.59-r13.ebuild => emacs-18.59-r14.ebuild}   | 16 ++++++++--------
 .../{emacs-23.4-r20.ebuild => emacs-23.4-r21.ebuild}     | 10 +++++-----
 .../{emacs-24.5-r10.ebuild => emacs-24.5-r11.ebuild}     | 10 +++++-----
 .../{emacs-25.3-r9.ebuild => emacs-25.3-r10.ebuild}      | 10 +++++-----
 .../emacs/{emacs-26.3-r4.ebuild => emacs-26.3-r5.ebuild} | 11 +++++------
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r14.ebuild
similarity index 93%
rename from app-editors/emacs/emacs-18.59-r13.ebuild
rename to app-editors/emacs/emacs-18.59-r14.ebuild
index 105fc78984d..053a862305e 100644
--- a/app-editors/emacs/emacs-18.59-r13.ebuild
+++ b/app-editors/emacs/emacs-18.59-r14.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs flag-o-matic multilib eapi8-dosym
+inherit toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/"
@@ -28,11 +28,11 @@ DEPEND="${RDEPEND}
 		x11-misc/xbitmaps
 	)"
 
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 PATCHES=("${WORKDIR}/patch")
 
@@ -123,7 +123,7 @@ src_install() {
 		yow env server
 	do
 		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym8 -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
+		dosym -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
 	done
 	for i in test-distrib make-docfile; do
 		rm "${D}"${basedir}/etc/${i} || die
@@ -135,7 +135,7 @@ src_install() {
 	# move Info files
 	dodir /usr/share/info
 	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym8 -r /usr/share/info/emacs-${SLOT} ${basedir}/info
+	dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info
 	docompress -x /usr/share/info
 
 	# move Info dir to avoid collisions with the dir file generated by portage

diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r21.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-23.4-r20.ebuild
rename to app-editors/emacs/emacs-23.4-r21.ebuild
index 834facf2604..e491036d078 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 WANT_AUTOMAKE="none"
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
@@ -76,12 +76,12 @@ RDEPEND="acct-group/mail
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r11.ebuild
similarity index 98%
rename from app-editors/emacs/emacs-24.5-r10.ebuild
rename to app-editors/emacs/emacs-24.5-r11.ebuild
index 5720b4449dc..3f9cc786044 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1
 
@@ -83,12 +83,12 @@ RDEPEND="acct-group/mail
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r10.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-25.3-r9.ebuild
rename to app-editors/emacs/emacs-25.3-r10.ebuild
index 0995daeae65..301dd19e48a 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1
 
@@ -86,12 +86,12 @@ RDEPEND="acct-group/mail
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-	app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r5.ebuild
similarity index 98%
rename from app-editors/emacs/emacs-26.3-r4.ebuild
rename to app-editors/emacs/emacs-26.3-r5.ebuild
index 17aae4994de..276dd16e17f 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1
 
@@ -93,13 +93,12 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
 	gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-	virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}
-	app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"