From c55e891b44ad9297b7483c4b085830247eaf6e72 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Tue, 7 Apr 2020 11:41:16 +0200 Subject: app-editors/emacs: Move eselect-emacs from DEPEND to BDEPEND. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Strictly, we would need a CBUILD type install dependency (IDEPEND), which cannot be expressed in EAPI 7. Bug: https://bugs.gentoo.org/716334 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Ulrich Müller --- app-editors/emacs/emacs-18.59-r12.ebuild | 12 ++++++++---- app-editors/emacs/emacs-23.4-r18.ebuild | 11 +++++++---- app-editors/emacs/emacs-24.5-r7.ebuild | 11 +++++++---- app-editors/emacs/emacs-25.3-r6.ebuild | 11 ++++++----- app-editors/emacs/emacs-26.3-r1.ebuild | 11 ++++++----- app-editors/emacs/emacs-27.0.50_pre20191223.ebuild | 11 ++++++----- app-editors/emacs/emacs-27.0.90.ebuild | 11 ++++++----- app-editors/emacs/emacs-27.0.9999-r1.ebuild | 11 ++++++----- app-editors/emacs/emacs-28.0.9999.ebuild | 11 +++++++---- 9 files changed, 59 insertions(+), 41 deletions(-) (limited to 'app-editors') diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r12.ebuild index a159d3611901..964b14b1384e 100644 --- a/app-editors/emacs/emacs-18.59-r12.ebuild +++ b/app-editors/emacs/emacs-18.59-r12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,8 +16,7 @@ SLOT="18" KEYWORDS="amd64 x86" IUSE="abi_x86_x32 X" -RDEPEND=">=app-eselect/eselect-emacs-1.16 - sys-libs/ncurses:0= +RDEPEND="sys-libs/ncurses:0= amd64? ( abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) @@ -29,7 +28,12 @@ DEPEND="${RDEPEND} x11-base/xorg-proto x11-misc/xbitmaps )" -BDEPEND="virtual/pkgconfig" + +BDEPEND="app-eselect/eselect-emacs + virtual/pkgconfig" + +RDEPEND="${RDEPEND} + app-eselect/eselect-emacs" PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch" diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild index 4aab27ec79b5..ea117e496500 100644 --- a/app-editors/emacs/emacs-23.4-r18.ebuild +++ b/app-editors/emacs/emacs-23.4-r18.ebuild @@ -17,10 +17,9 @@ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~ IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" REQUIRED_USE="?? ( aqua X )" -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] +RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile + sys-libs/ncurses:0= kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) games? ( acct-group/gamestat ) @@ -77,11 +76,15 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="alsa? ( virtual/pkgconfig ) +BDEPEND="app-eselect/eselect-emacs + alsa? ( virtual/pkgconfig ) dbus? ( virtual/pkgconfig ) X? ( virtual/pkgconfig ) gzip-el? ( app-arch/gzip )" +RDEPEND="${RDEPEND} + app-eselect/eselect-emacs" + EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" # FULL_VERSION keeps the full version number, which is needed in diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild index 512842a73404..7393476a40c2 100644 --- a/app-editors/emacs/emacs-24.5-r7.ebuild +++ b/app-editors/emacs/emacs-24.5-r7.ebuild @@ -16,10 +16,9 @@ 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 gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" REQUIRED_USE="?? ( aqua X )" -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] +RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile + sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) @@ -87,9 +86,13 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig +BDEPEND="app-eselect/eselect-emacs + virtual/pkgconfig gzip-el? ( app-arch/gzip )" +RDEPEND="${RDEPEND} + app-eselect/eselect-emacs" + EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" # FULL_VERSION keeps the full version number, which is needed in diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild index 387511dfb19e..72d0e9f62796 100644 --- a/app-editors/emacs/emacs-25.3-r6.ebuild +++ b/app-editors/emacs/emacs-25.3-r6.ebuild @@ -16,10 +16,9 @@ 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 gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" REQUIRED_USE="?? ( aqua X )" -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] +RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile + sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) @@ -90,11 +89,13 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig +BDEPEND="app-eselect/eselect-emacs + virtual/pkgconfig gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} - !=app-emacs/emacs-common-gentoo-1.5[games?,X?] + sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) @@ -98,11 +97,13 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="virtual/pkgconfig +BDEPEND="app-eselect/eselect-emacs + virtual/pkgconfig gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} - !=app-emacs/emacs-common-gentoo-1.5[games?,X?] + sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) @@ -118,12 +117,14 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="sys-apps/texinfo +BDEPEND="app-eselect/eselect-emacs + sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} - !app-editors/emacs-vcs:27" + !app-editors/emacs-vcs:27 + app-eselect/eselect-emacs" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" diff --git a/app-editors/emacs/emacs-27.0.90.ebuild b/app-editors/emacs/emacs-27.0.90.ebuild index e186f82ec1a1..b006e62dabae 100644 --- a/app-editors/emacs/emacs-27.0.90.ebuild +++ b/app-editors/emacs/emacs-27.0.90.ebuild @@ -32,9 +32,8 @@ IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp REQUIRED_USE="?? ( aqua X )" RESTRICT="test" -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] +RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] + sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) @@ -118,12 +117,14 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="sys-apps/texinfo +BDEPEND="app-eselect/eselect-emacs + sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} - !app-editors/emacs-vcs:27" + !app-editors/emacs-vcs:27 + app-eselect/eselect-emacs" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild index e186f82ec1a1..b006e62dabae 100644 --- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild @@ -32,9 +32,8 @@ IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp REQUIRED_USE="?? ( aqua X )" RESTRICT="test" -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] +RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] + sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) @@ -118,12 +117,14 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="sys-apps/texinfo +BDEPEND="app-eselect/eselect-emacs + sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} - !app-editors/emacs-vcs:27" + !app-editors/emacs-vcs:27 + app-eselect/eselect-emacs" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index ee203156341d..462168b70483 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -32,9 +32,8 @@ IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp REQUIRED_USE="?? ( aqua X )" RESTRICT="test" -RDEPEND="sys-libs/ncurses:0= - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] +RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] + sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) @@ -118,10 +117,14 @@ RDEPEND="sys-libs/ncurses:0= DEPEND="${RDEPEND} X? ( x11-base/xorg-proto )" -BDEPEND="sys-apps/texinfo +BDEPEND="app-eselect/eselect-emacs + sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip )" +RDEPEND="${RDEPEND} + app-eselect/eselect-emacs" + EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" -- cgit v1.2.3-65-gdbad