commit: f4a882af160c1df9e7a8d0eec54b298e51f62837
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 22 08:26:52 2021 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 08:35:10 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a882af
app-emacs/emacs-common: Renamed from app-emacs/emacs-common-gentoo
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-editors/emacs/emacs-23.4-r20.ebuild | 2 +-
app-editors/emacs/emacs-24.5-r10.ebuild | 2 +-
app-editors/emacs/emacs-25.3-r9.ebuild | 2 +-
app-editors/emacs/emacs-26.3-r4.ebuild | 2 +-
app-editors/emacs/emacs-27.1-r4.ebuild | 2 +-
app-editors/emacs/emacs-27.1.91-r1.ebuild | 2 +-
app-editors/emacs/emacs-27.1.9999-r1.ebuild | 2 +-
app-editors/emacs/emacs-27.2_rc1.ebuild | 2 +-
app-editors/emacs/emacs-28.0.9999.ebuild | 2 +-
app-emacs/{emacs-common-gentoo => emacs-common}/Manifest | 0
.../emacs-common-1.6-r4.ebuild} | 4 +++-
.../emacs-common-1.7.ebuild} | 4 +++-
app-emacs/{emacs-common-gentoo => emacs-common}/metadata.xml | 0
eclass/elisp-common.eclass | 2 +-
profiles/updates/1Q-2021 | 1 +
15 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild
b/app-editors/emacs/emacs-23.4-r20.ebuild
index 9c7889a4cad..0d973f9bfa6 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc
x86 ~amd64-linux ~
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos
livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft
+xpm"
RDEPEND="acct-group/mail
- app-emacs/emacs-common-gentoo[games?,gui(-)?]
+ app-emacs/emacs-common[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
kerberos? ( virtual/krb5 )
diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild
b/app-editors/emacs/emacs-24.5-r10.ebuild
index e6ae1eab8ca..29a79f9eda9 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64
~sparc x86 ~amd64-linux
IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui
gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png
selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm
zlib"
RDEPEND="acct-group/mail
- app-emacs/emacs-common-gentoo[games?,gui(-)?]
+ app-emacs/emacs-common[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
acl? ( virtual/acl )
diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild
b/app-editors/emacs/emacs-25.3-r9.ebuild
index 4ddb30fb97a..046d2d03a3a 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc
ppc64 sparc x86 ~a
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd
m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars
wide-int Xaw3d xft +xpm zlib"
RDEPEND="acct-group/mail
- app-emacs/emacs-common-gentoo[games?,gui(-)?]
+ app-emacs/emacs-common[games?,gui(-)?]
net-libs/liblockfile
sys-libs/ncurses:0=
acl? ( virtual/acl )
diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild
b/app-editors/emacs/emacs-26.3-r4.ebuild
index 45b6320edc9..f8e6373953e 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -14,7 +14,7 @@ SLOT="26"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2
livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd
+threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild
b/app-editors/emacs/emacs-27.1-r4.ebuild
index c8649ab9c57..84733a91bbc 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
+gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source
ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm
xwidgets zlib"
RESTRICT="test"
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
diff --git a/app-editors/emacs/emacs-27.1.91-r1.ebuild
b/app-editors/emacs/emacs-27.1.91-r1.ebuild
index acd274cb4f4..d7bfdd69550 100644
--- a/app-editors/emacs/emacs-27.1.91-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.91-r1.ebuild
@@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
+gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source
ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm
xwidgets zlib"
RESTRICT="test"
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
index d9b809b079f..cf4fb3cdad1 100644
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild
@@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
+gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source
ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm
xwidgets zlib"
RESTRICT="test"
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
diff --git a/app-editors/emacs/emacs-27.2_rc1.ebuild
b/app-editors/emacs/emacs-27.2_rc1.ebuild
index acd274cb4f4..d7bfdd69550 100644
--- a/app-editors/emacs/emacs-27.2_rc1.ebuild
+++ b/app-editors/emacs/emacs-27.2_rc1.ebuild
@@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
+gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source
ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm
xwidgets zlib"
RESTRICT="test"
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild
b/app-editors/emacs/emacs-28.0.9999.ebuild
index 037b3fce29b..f29bffb7c8c 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -43,7 +43,7 @@ LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
+gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json
kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl
svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets
zlib"
RESTRICT="test"
-RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
diff --git a/app-emacs/emacs-common-gentoo/Manifest
b/app-emacs/emacs-common/Manifest
similarity index 100%
rename from app-emacs/emacs-common-gentoo/Manifest
rename to app-emacs/emacs-common/Manifest
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild
b/app-emacs/emacs-common/emacs-common-1.6-r4.ebuild
similarity index 96%
rename from app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild
rename to app-emacs/emacs-common/emacs-common-1.6-r4.ebuild
index c4365debbdf..ebc8a1b9774 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r4.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.6-r4.ebuild
@@ -5,9 +5,11 @@ EAPI=7
inherit elisp-common desktop xdg-utils readme.gentoo-r1
+MY_P="emacs-common-gentoo-${PV}"
DESCRIPTION="Common files needed by all GNU Emacs versions"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz";
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz";
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild
b/app-emacs/emacs-common/emacs-common-1.7.ebuild
similarity index 96%
rename from app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild
rename to app-emacs/emacs-common/emacs-common-1.7.ebuild
index 314ea5c739a..58894d6ef7f 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.7.ebuild
@@ -5,9 +5,11 @@ EAPI=7
inherit elisp-common desktop xdg-utils readme.gentoo-r1
+MY_P="emacs-common-gentoo-${PV}"
DESCRIPTION="Common files needed by all GNU Emacs versions"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs";
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz";
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz";
+S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml
b/app-emacs/emacs-common/metadata.xml
similarity index 100%
rename from app-emacs/emacs-common-gentoo/metadata.xml
rename to app-emacs/emacs-common/metadata.xml
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index be8d0fa3b30..832fc19e467 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -494,7 +494,7 @@ elisp-site-regen() {
mv "${T}"/site-gentoo.el "${sitelisp}"/site-gentoo.el
eend $? "elisp-site-regen: Replacing site-gentoo.el failed" ||
die
case ${#sflist[@]} in
- 0) [[ ${PN} = emacs-common-gentoo ]] \
+ 0) [[ ${PN} = emacs-common ]] \
|| ewarn "... Huh? No site initialisation files
found." ;;
1) einfo "... ${#sflist[@]} site initialisation file
included." ;;
*) einfo "... ${#sflist[@]} site initialisation files
included." ;;
diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021
index 64bf7fa2ee6..eafd8b3d4d8 100644
--- a/profiles/updates/1Q-2021
+++ b/profiles/updates/1Q-2021
@@ -2,3 +2,4 @@ slotmove >=sys-auth/libfprint-1.90 0 2
move app-emulation/libpod app-emulation/podman
move app-laptop/radeontool sys-apps/radeontool
move x11-libs/gdk-pixbuf-loader-webp gui-libs/gdk-pixbuf-loader-webp
+move app-emacs/emacs-common-gentoo app-emacs/emacs-common
