diff options
Diffstat (limited to 'app-editors/emacs')
| -rw-r--r-- | app-editors/emacs/Manifest | 17 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-24.5-r10.ebuild (renamed from app-editors/emacs/emacs-24.5-r9.ebuild) | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-25.3-r9.ebuild (renamed from app-editors/emacs/emacs-25.3-r8.ebuild) | 14 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-26.3-r4.ebuild (renamed from app-editors/emacs/emacs-26.3-r3.ebuild) | 32 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-27.1-r2.ebuild | 434 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-27.1-r4.ebuild (renamed from app-editors/emacs/emacs-27.1-r3.ebuild) | 36 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-27.1.91-r1.ebuild (renamed from app-editors/emacs/emacs-27.1.91.ebuild) | 34 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-27.1.9999-r1.ebuild | 34 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-28.0.9999.ebuild | 69 | ||||
| -rw-r--r-- | app-editors/emacs/metadata.xml | 2 |
10 files changed, 83 insertions, 603 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 531640963db9..6bd6122b969a 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -11,12 +11,11 @@ DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 50d4da099bb542a01f7a62d73ac33cf445fc6 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796 EBUILD emacs-23.4-r20.ebuild 11194 BLAKE2B 5a6ad012bc880a168592aaaa13ea478c40b33e3a4ab3e57e137be5e3ed6565263f406e75ee968c18b015524613ef8de9db1cbec990094c27220c22125d813297 SHA512 efbf5f07548f6e5faa5390322a06f05b40137994c0a85cadbdddc2f1359408fe16ec0a008734d0284119d78209e89894ac1904d3b27572b9878e747dc8d47be1 -EBUILD emacs-24.5-r9.ebuild 11064 BLAKE2B 230c4e7f4a42442abb9c5dd1b00e5d07c3c1809d00337b0772551f14978f8daa6b931d06b1a54a25880c9fdb94e1e331421d4980864cb7a327e43cc2338516fc SHA512 d31d44e5110c6bd0533697589ec8f0a54e254a55e0a9087bd11651184a4feedf067a7ea213f5c610836cf3e30c25ad8c56f8f72eb5d1256940aaa97ce9f9a366 -EBUILD emacs-25.3-r8.ebuild 11406 BLAKE2B 491e985bbef6ebb2b9fb59fb1c93934814439d6e01a7e1c96fe755f50974366afd86741b65743c36cd4f7cd5ba436768ff0ac6809a8ed4a53a9b8138df96b7e9 SHA512 6883b698c30ce51b5cc4aa65e001201567dc46182cc001ccbb6ae2fbec7d89689fa6a3c25ba9c93801dfb43073ceda4a83cfbe29261e3bfa620fd939b7669127 -EBUILD emacs-26.3-r3.ebuild 12224 BLAKE2B 0a6e7b4a2efa929000bebfd1a507d5862c5216b256719256bd5c63c4728d3b33204f7abf37108eb613fce89843ea283c51f8e07fb34dc671d6aa3cdfe3164256 SHA512 fb60f96f86d7b051cf0a8009365973e8275f14245e4b1bb1937f491b467c300405f3439c8c3c2eb5fefcc881f2b7fc726b090816711bec4094f8ea497c8bfec8 -EBUILD emacs-27.1-r2.ebuild 13769 BLAKE2B ea25627394cbdd0ba574631df460808dd13965846424a937f1cadcaa5345fea05b05820af6bbe4db5dd2478fed88d79002b60ce5a8a04de555a6e4b2e992e26d SHA512 1e73bf9d4ec1492654b007cf1211f0f2a9a5ee8fda0928fe18006b18c215f94d1c1e388a0607e8d1afb2608c6484b5978e444a7dfd6ff41537e93d698cebdad4 -EBUILD emacs-27.1-r3.ebuild 14748 BLAKE2B e179da1911c4b54cb5ed29d5e49a55b589d496a73bf01c2ab764d841d0f9297bbcdf6b153e4c658e188aaffff5cfd93b533fc39ebc9a87b9f447895709808904 SHA512 335ce4b318c0d2146f1189cf05cd3d80ef0dae775a5a82b66ede93ed035bd9a9251dcc95cbaa321b00f6f05633cb5dc1daffdf63745c34983985ec0e744af67b -EBUILD emacs-27.1.91.ebuild 14710 BLAKE2B c369d96259b7f1699916a82e795132d9b5ee382241d45a6fe55d6f86333a073e83b6976ae0525eefb2f5d1fa045783a6340095197dbc59b613d6903465cc2582 SHA512 2c044cdd45c21f330e31ecf114b7f82b0cf9e6d5a8108456a3ee47acc081f9737245894b66134f3956c152a20e407314bac0b4453dd3dbf1761f77e0b9606da5 -EBUILD emacs-27.1.9999-r1.ebuild 14709 BLAKE2B be4d4e9455f17dccd45d6684bc7df95256d4420c95818f504117cef09abee3d59498e92aaed141bdbe2e4343758425ec3fc9ecaf3cc6e3397c9ca06eebfd540a SHA512 b9bb10eac9c6cb4df462fbaa9884e73fd73f1bf69324380f27738a5644090d4df8d82228acc6ff6a945b34ec6ebff3e3a5728fbd725b451c177d2ece5fb842b9 -EBUILD emacs-28.0.9999.ebuild 14680 BLAKE2B 41e448cffe10be975b6a3d6efd8442870c355cc167fc39da0d85fcadd482f8f2e09536cd80db555d5fac1c03521e182a8ef26e72de93b129ed83364314c4d8bc SHA512 6a102ceab1d4636a01add3d4f778ef99257d7cc366340f6e3a4db15ceb4eff0ef6df05d7eb1ca989896d8775ac39212c9bb55ea8e8eb560f0f232c2462dc0fe2 -MISC metadata.xml 3000 BLAKE2B f580f25a92f18d36e29880184ddacfc3f59af8e86c9e9b5e0ab0deeff7fb367a79a0331db4d8d85f9c338feba342d683caa3294d06d11e2c1a3c715a5c2649b8 SHA512 ce622b330c89f3c545ccf0f899efd19795cb3279d15762b04248ebaed07e288b51f45f6f0776f5cf6f44f90500220b8026384016808d722085dad2cad020cb51 +EBUILD emacs-24.5-r10.ebuild 10959 BLAKE2B 9abbd5cd629f2b577a9ad4635b6579f69c98945a0e920f821ec84a92fbc916c40ebb9bae88b49aa691fc3145d3a6d8c6224d876f7df055da85d7c2f3b74d1dfa SHA512 eebf1fe7c54f5a812ee97da236f9a19cc2ea4af60f9eb23b6a46ac0ada41d0795363a536d7b524c067c1ee4cb698eae9508a3493e17498804863bd2418b4e4ee +EBUILD emacs-25.3-r9.ebuild 11301 BLAKE2B f0723b7c8efc6b6ce13648d365e544be55623eeb27f9a4f162da050ad17d6cd8164752f8b09caa96939b264b0c3e81c15aeebf360a4461b8a5e598829c8088f4 SHA512 f05e0a4ec7e585c5b750d8247f741d3f70a31efa8428e2af665ad751de8b2f6e01f621e517220fdcc86f9da2d614b76c5afb9eed60b22b5991ea48f1e740e1e1 +EBUILD emacs-26.3-r4.ebuild 11944 BLAKE2B 85880167c9e31ca96fbd8f3c1bc6966c5823d0a3381086a6457522de9b039d861c5b57cb2641c7b3a453a2f394ee2b207db8c9c53342fc644299eaedadb7467c SHA512 a3688ac6b7518fd2f0533fc40cbc388c5e1ced07b9677764456fd48fd6270cbaf954fcb43263407838d659d2daa06c4e881d02012cd16cd2a403125a2885d309 +EBUILD emacs-27.1-r4.ebuild 14468 BLAKE2B 290e754b87a3b237090c9d424bc68f2fab2a3b978bf6b320425599331b91cfc9e3279fffaae27f83d274cc55432722b98cb7ce53600090317a34e6494b9a94fa SHA512 3622fcc8e22f5b56441a1d3a2fa966b3c3fac7c85415c1f86af190c4e3705b8df74a783390e12e45f199b7262846a4b80793c25716f7e5588e53af378157833b +EBUILD emacs-27.1.91-r1.ebuild 14433 BLAKE2B cb065e9683580acaca7fc3e33a4698490efa18d19d29a6176227c35f5378c3209b48d73bf7617175889fbbc02ea351416c9fd2c8215bf28109c41480ee940698 SHA512 acdc77b1c0fdfd6d11671fc2a78190ced36a9c637fbfed904c59784b330867436a44b527674b6bb02180c16713dc7849b340f715c85b50a0f117b51c298f1a34 +EBUILD emacs-27.1.9999-r1.ebuild 14432 BLAKE2B 418ae441461b589c1aac6875e7db6998815a24be9275b8cf40e383c2cb150c8da81e0062c1d10ff83d5763397cd1f694c75c4cde399e4d2a8754ad476d9645a0 SHA512 90edb4db36c1eb5f1bbbe2df0ff1b3dc7e2c2f3fbc0212f8ba8fc02224c2151407612cf564e23d940f9ed10eeb38eaa0d273d74a4b14e704537a865924c0f5b9 +EBUILD emacs-28.0.9999.ebuild 14015 BLAKE2B d764afba3091370f99f9c1ee3ea38c13757934dbfc0f005026de14ccc4408f05784504caab5647a815641215a698856df40224e7a0765fe951ad5781622068ac SHA512 76dc16d820c4f64d913f6a6a637c6e8d66345089a2272784031003f92fc8b55206d56940b78d3aae25a1f60f47b3eb87d2b09528f957493122a9e0e8ed51fb0e +MISC metadata.xml 2892 BLAKE2B 4deeee5a7f1f8afb3d87e457d46ddbf4cd986939b81f782fbb7d11b76b12208229bdbc313ef004607ba0979e211ba289acf22f096548851f4607a9356ba61f51 SHA512 fca25f9574d686e91d2142a641eb3d736b5e9442f1edf849e0dd507fdc969218ff8bc2b1f1bcece027f82dcf1821dd7f04ed6d16372b7f04ab257f9dc2593764 diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild index 62c7cd0a20a5..e6ae1eab8caa 100644 --- a/app-editors/emacs/emacs-24.5-r9.ebuild +++ b/app-editors/emacs/emacs-24.5-r10.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 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" +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(-)?] @@ -57,10 +57,7 @@ RDEPEND="acct-group/mail >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -175,12 +172,13 @@ src_configure() { Your version of GTK+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)" + myconf+=" --with-x-toolkit=gtk3" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -199,8 +197,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." fi econf \ diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild index e43700a2f211..4ddb30fb97ab 100644 --- a/app-editors/emacs/emacs-25.3-r8.ebuild +++ b/app-editors/emacs/emacs-25.3-r9.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 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 gtk2 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" +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(-)?] @@ -60,10 +60,7 @@ RDEPEND="acct-group/mail >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) - ) + gtk? ( x11-libs/gtk+:3 ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -182,12 +179,13 @@ src_configure() { Your version of GTK+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)" + myconf+=" --with-x-toolkit=gtk3" myconf+=" --without-xwidgets" for f in motif Xaw3d athena; do use ${f} && ewarn \ @@ -207,8 +205,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - ! use gtk && use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." fi econf \ diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild index 60641dd7a88c..45b6320edc90 100644 --- a/app-editors/emacs/emacs-26.3-r3.ebuild +++ b/app-editors/emacs/emacs-26.3-r4.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" 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 gtk2 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" +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(-)?] sys-libs/ncurses:0= @@ -62,13 +62,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] ) ) gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite ) ) !gtk? ( @@ -184,18 +181,13 @@ src_configure() { Your version of GTK+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - if use gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - fi + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -214,12 +206,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi econf \ diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild deleted file mode 100644 index b78766488d2d..000000000000 --- a/app-editors/emacs/emacs-27.1-r2.ebuild +++ /dev/null @@ -1,434 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 - -if [[ ${PV##*.} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="emacs-27" - EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" - S="${EGIT_CHECKOUT_DIR}" - SLOT="${PV%%.*}-vcs" -else - # FULL_VERSION keeps the full version number, which is needed in - # order to determine some path information correctly for copy/move - # operations later on - FULL_VERSION="${PV%%_*}" - SRC_URI="mirror://gnu/emacs/${P}.tar.xz" - S="${WORKDIR}/emacs-${FULL_VERSION}" - # PV can be in any of the following formats: - # 27.1 released version (slot 27) - # 27.1_rc1 upstream release candidate (27) - # 27.0.9999 live ebuild (slot 27-vcs) - # 27.0.90 upstream prerelease snapshot (27-vcs) - # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) - if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" - S="${WORKDIR}/emacs" - elif [[ ${PV//[0-9]} != "." ]]; then - SRC_URI="mirror://gnu-alpha/emacs/pretest/${PN}-${PV/_/-}.tar.xz" - fi - SLOT="${PV%%.*}" - [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -fi - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" - -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 gtk2 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(-)?] - sys-libs/ncurses:0= - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - games? ( acct-group/gamestat ) - gmp? ( dev-libs/gmp:0= ) - gpm? ( sys-libs/gpm ) - !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - json? ( dev-libs/jansson ) - kerberos? ( virtual/krb5 ) - lcms? ( media-libs/lcms:2 ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - mailutils? ( net-mail/mailutils[clients] ) - !mailutils? ( acct-group/mail net-libs/liblockfile ) - selinux? ( sys-libs/libselinux ) - ssl? ( net-libs/gnutls:0= ) - systemd? ( sys-apps/systemd ) - zlib? ( sys-libs/zlib ) - gui? ( !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libxcb - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18 ) - harfbuzz? ( media-libs/harfbuzz:0= ) - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) - ) - ) - !gtk? ( - motif? ( - >=x11-libs/motif-2.3:0 - x11-libs/libXpm - x11-libs/libXmu - x11-libs/libXt - ) - !motif? ( - Xaw3d? ( - x11-libs/libXaw3d - x11-libs/libXmu - x11-libs/libXt - ) - !Xaw3d? ( athena? ( - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXt - ) ) - ) - ) - ) )" - -DEPEND="${RDEPEND} - gui? ( !aqua? ( x11-base/xorg-proto ) )" - -BDEPEND="app-eselect/eselect-emacs - sys-apps/texinfo - virtual/pkgconfig - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - !<=app-editors/emacs-27.1.9999-r0:27-vcs - !app-editors/emacs-vcs:27 - app-eselect/eselect-emacs" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${EMACS_SUFFIX}-gentoo.el" - -src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ - configure.ac) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EGIT_BRANCH}" - einfo "Commit: ${EGIT_VERSION}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - fi - - eapply_user - - # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die - - #AT_M4DIR=m4 eautoreconf -} - -src_configure() { - strip-flags - filter-flags -pie #526948 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - - local myconf - - if use alsa; then - use sound || ewarn \ - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" - else - myconf+=" --with-sound=$(usex sound oss)" - fi - - if ! use gui; then - einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" - elif use aqua; then - einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" - else - myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" - - if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with cairo)" - myconf+=" $(use_with harfbuzz)" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - else - myconf+=" --without-xft" - myconf+=" --without-cairo" - myconf+=" --without-libotf --without-m17n-flt" - use cairo && ewarn \ - "USE flag \"cairo\" has no effect if \"xft\" is not set." - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - local f line - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - while read line; do ewarn "${line}"; done <<-EOF - Your version of GTK+ will have problems with closing open - displays. This is no problem if you just use one display, but - if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. - If you intend to use more than one display, then it is strongly - recommended that you compile Emacs with the Athena/Lucid or the - Motif toolkit instead. - EOF - if use gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - fi - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - else - einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" - fi - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi - fi - - econf \ - --program-suffix="-${EMACS_SUFFIX}" \ - --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir="${EPREFIX}"/var \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --without-compress-install \ - --without-hesiod \ - --without-pop \ - --with-dumping=pdumper \ - --with-file-notification=$(usev inotify || usev gfile || echo no) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with dynamic-loading modules) \ - $(use_with games gameuser ":gamestat") \ - $(use_with gmp libgmp) \ - $(use_with gpm) \ - $(use_with json) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with lcms lcms2) \ - $(use_with libxml2 xml2) \ - $(use_with mailutils) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with systemd libsystemd) \ - $(use_with threads) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} -} - -#src_compile() { -# # Disable sandbox when dumping. For the unbelievers, see bug #131505 -# emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" -#} - -src_install() { - emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install - - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die - mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # movemail must be setgid mail - if ! use mailutils; then - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fi - - # avoid collision between slots, see bug #169033 e.g. - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el - rm -rf "${ED}"/usr/share/{appdata,applications,icons} - rm -rf "${ED}/usr/$(get_libdir)" - rm -rf "${ED}"/var - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING - - if use systemd; then - insinto /usr/lib/systemd/user - sed -e "/^##/d" \ - -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ - -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ - etc/emacs.service | newins - ${EMACS_SUFFIX}.service - assert - fi - - if use gzip-el; then - # compress .el files when a corresponding .elc exists - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el failed" - fi - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die - X - ;;; ${EMACS_SUFFIX} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS CONTRIBUTE - - if use gui && use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die - fi - - local DOC_CONTENTS="You can set the version to be started by - /usr/bin/emacs through the Emacs eselect module, which also - redirects man and info pages. Therefore, several Emacs versions can - be installed at the same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from a previous major version of Emacs, then - it is strongly recommended that you use app-admin/emacs-updater - to rebuild all byte-compiled elisp files of the installed Emacs - packages." - if use gui; then - DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or - symlink it into /Applications by yourself." - fi - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi -} - -pkg_postinst() { - elisp-site-regen - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then - # refresh symlinks in case any installed files have changed - eselect emacs set ${EMACS_SUFFIX} - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild index a73497960d23..216c3c4521b9 100644 --- a/app-editors/emacs/emacs-27.1-r3.ebuild +++ b/app-editors/emacs/emacs-27.1-r4.ebuild @@ -33,14 +33,14 @@ else fi SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" HOMEPAGE="https://www.gnu.org/software/emacs/" 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 gtk2 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" +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(-)?] @@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] ) ) gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite ) ) !gtk? ( @@ -224,18 +221,13 @@ src_configure() { Your version of GTK+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - if use gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - fi + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -254,12 +246,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then @@ -425,7 +413,7 @@ src_install() { tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write a portable dump file due to being cross-compiled. To create this file at run time, execute the following command: - \\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-27.1.91.ebuild b/app-editors/emacs/emacs-27.1.91-r1.ebuild index 71b3f312c1de..50a0f78c3c66 100644 --- a/app-editors/emacs/emacs-27.1.91.ebuild +++ b/app-editors/emacs/emacs-27.1.91-r1.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" 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 gtk2 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" +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(-)?] @@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] ) ) gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite ) ) !gtk? ( @@ -223,18 +220,13 @@ src_configure() { Your version of GTK+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - if use gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - fi + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -253,12 +245,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then @@ -424,7 +412,7 @@ src_install() { tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write a portable dump file due to being cross-compiled. To create this file at run time, execute the following command: - \\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild index f4d96c1f74fc..4b787936fc98 100644 --- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" 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 gtk2 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" +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(-)?] @@ -94,13 +94,10 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] ) ) gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite ) ) !gtk? ( @@ -223,18 +220,13 @@ src_configure() { Your version of GTK+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - if use gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - fi + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -253,12 +245,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then @@ -424,7 +412,7 @@ src_install() { tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write a portable dump file due to being cross-compiled. To create this file at run time, execute the following command: - \\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" readme.gentoo_create_doc } diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 57cb4bc23cf8..af22d98f0305 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" 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 gtk2 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" +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(-)?] @@ -94,34 +94,23 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] ) ) gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( - x11-libs/gtk+:3 - xwidgets? ( - net-libs/webkit-gtk:4= - x11-libs/libXcomposite - ) + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4= + x11-libs/libXcomposite ) ) !gtk? ( - motif? ( - >=x11-libs/motif-2.3:0 - x11-libs/libXpm + Xaw3d? ( + x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) - !motif? ( - Xaw3d? ( - x11-libs/libXaw3d - x11-libs/libXmu - x11-libs/libXt - ) - !Xaw3d? ( athena? ( - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXt - ) ) - ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) ) ) )" @@ -222,28 +211,16 @@ src_configure() { Your version of GTK+ will have problems with closing open displays. This is no problem if you just use one display, but if you use more than one and close one of them Emacs may crash. - See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly - recommended that you compile Emacs with the Athena/Lucid or the - Motif toolkit instead. + recommended that you compile Emacs with the Athena/Lucid + toolkit instead. EOF - if use gtk2; then - myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." - else - myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - fi - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" for f in Xaw3d athena; do use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." + "USE flag \"${f}\" has no effect if \"gtk\" is set." done elif use athena || use Xaw3d; then einfo "Configuring to build with Athena/Lucid toolkit" @@ -252,12 +229,8 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi - if ! use gtk; then - use gtk2 && ewarn \ - "USE flag \"gtk2\" has no effect if \"gtk\" is not set." - use xwidgets && ewarn \ - "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." - fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi if tc-is-cross-compiler; then @@ -423,7 +396,7 @@ src_install() { tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write a portable dump file due to being cross-compiled. To create this file at run time, execute the following command: - \\n${EMACS_SUFFIX} --batch --eval='(dump-emacs-portable + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" readme.gentoo_create_doc } diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index 1d93ee69f3e1..b3d9de5e45e7 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -31,8 +31,6 @@ notification</flag> <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the system font name</flag> - <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3 - (<pkg>x11-libs/gtk+</pkg>)</flag> <flag name="gzip-el">Compress bundled Emacs Lisp source</flag> <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping engine</flag> |