diff options
| -rw-r--r-- | app-editors/emacs/emacs-24.3-r8.ebuild | 4 | ||||
| -rw-r--r-- | app-emacs/emacs-common/emacs-common-9999.ebuild (renamed from app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild) | 2 | ||||
| -rw-r--r-- | app-emacs/emacs-common/metadata.xml (renamed from app-emacs/emacs-common-gentoo/metadata.xml) | 0 | ||||
| -rw-r--r-- | eclass/elisp-common.eclass | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app-editors/emacs/emacs-24.3-r8.ebuild b/app-editors/emacs/emacs-24.3-r8.ebuild index 2210ead..c61d069 100644 --- a/app-editors/emacs/emacs-24.3-r8.ebuild +++ b/app-editors/emacs/emacs-24.3-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ SLOT="24.3" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="alsa aqua athena dbus gconf gif gpm gsettings gtk gtk2 gui gzip-el imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm" -RDEPEND="app-emacs/emacs-common-gentoo[gui(-)?] +RDEPEND="app-emacs/emacs-common[gui(-)?] net-libs/liblockfile sys-libs/ncurses:0= alsa? ( media-libs/alsa-lib ) diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild b/app-emacs/emacs-common/emacs-common-9999.ebuild index 1824157..bb0b926 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild +++ b/app-emacs/emacs-common/emacs-common-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/emacs-tools.git" -EGIT_BRANCH="emacs-common" +EGIT_BRANCH="${PN}" EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}" inherit elisp-common desktop xdg-utils readme.gentoo-r1 git-r3 diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common/metadata.xml index c5a1a5b..c5a1a5b 100644 --- a/app-emacs/emacs-common-gentoo/metadata.xml +++ b/app-emacs/emacs-common/metadata.xml diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 66a3a32..ac5fc20 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: elisp-common.eclass @@ -492,7 +492,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." ;; |