From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- app-editors/emacs/Manifest | 18 +- app-editors/emacs/emacs-23.4-r18.ebuild | 4 +- app-editors/emacs/emacs-24.5-r7.ebuild | 4 +- app-editors/emacs/emacs-25.3-r6.ebuild | 4 +- app-editors/emacs/emacs-26.3-r1.ebuild | 4 +- app-editors/emacs/emacs-27.0.50_pre20191223.ebuild | 4 +- app-editors/emacs/emacs-27.0.90.ebuild | 4 +- app-editors/emacs/emacs-27.0.91.ebuild | 412 +++++++++++++++++++++ app-editors/emacs/emacs-27.0.9999-r1.ebuild | 4 +- app-editors/emacs/emacs-28.0.9999.ebuild | 4 +- 10 files changed, 430 insertions(+), 32 deletions(-) create mode 100644 app-editors/emacs/emacs-27.0.91.ebuild (limited to 'app-editors/emacs') diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index fe4e90b6f560..95589b3e2503 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -10,13 +10,15 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9 DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6 DIST emacs-27.0.90.tar.xz 43706980 BLAKE2B 87f9b621305711d7083307fbf921a32e7a878c6eef7939100511f669fdf052d88d8aea3c46a2c9fb9e9383c47c4066ec580443b2b24e510a6894d59caf9825ec SHA512 1a6f319e964f20ad35574eb2d2e18ae8c86d9d2ab9ae038334f0f468c40602d1f9b20880cfa704ea2067bdd7a3952ea3e6b565d5bb3d6d304922ad1d98c1c76b +DIST emacs-27.0.91.tar.xz 43730296 BLAKE2B 9ed0f425539cd22b84e3c1e2973d6a66d983e6b6de5fff30c1db2ca3fb1d761cf2c4de566b28dcffff858d032ff996a528e14daaecc45eb71aa07c3f3a6e4a74 SHA512 fcae087c7d153ce45640dc5785e0829e85b14400eec70f833e1f7ee7d3903f1e4adb469d812596fc6e7ff792ccaeda3fde5fa1c37b609ab83e8432d9f63be36a EBUILD emacs-18.59-r12.ebuild 4461 BLAKE2B 894572f7e472d2f79ffa2baef17602763072c0b4fe20e511208a346dbe8a655e6674be680c96a96a9d1312d84eaed8647d8c194037c990869c954f5791ac4f30 SHA512 c5b153cc299fdb5568301794aea6943cd39be2a7b3dafa5d39c8d3debd6a3a48279592b9bd116f8079335105e691b52a3dfe10f94f8777b4a404af4678088d1a -EBUILD emacs-23.4-r18.ebuild 11035 BLAKE2B c88cf75a853e0ef158a1382fe082178fa5e052613e4729dfffb1f8e81926da07975051041b5fc59a5ab96349b9c675e0f1fbaaca74e1fff16524a8a4848fda9e SHA512 558cddc98b2a1e903d39c5855bf369e6556ff387c5377960f2b650753a9ab029e01f8e751c73c3e7a10198ccaaa192602e153df5cfa5717541ceba2c024e8179 -EBUILD emacs-24.5-r7.ebuild 10822 BLAKE2B a968ee520850bb7fe6e140476dc04f03effc5733fa1069230719b3359f444be7738ef42f27792c6fc55f4313426773dc7668da68d55d7457f72f0193177a461e SHA512 032ae02be12bd7489839c83ff48c53736fde63019e07beacab834ba037a2f9383356c075e780ea725548e6323ac2218c9e83e42a591c5d75f34f381cbfcae36f -EBUILD emacs-25.3-r6.ebuild 11158 BLAKE2B 458250d53c4f22da85f3850a5b1de63773002784442d78f8febcb196191feb27e2646dc4745030729f77f8fadf8013b98c5e9624c795c6c58c980ba0b944e5a8 SHA512 a2baddb434128159a4e2a95e3861cbdf678fb7b69f9315955537515a0af66b5d3e4d8205dbc14eb2e61326768f2b7832bfc9211934c835efe437912b5563bfb6 -EBUILD emacs-26.3-r1.ebuild 11945 BLAKE2B 4e4c5e2a74eb95738f85b481c3d771e497c35a304114b5b44900cf42c7d5df8993ecef706f14caf124a2792df8baeacccf064476992816320fe4ab7c7ae1d130 SHA512 463b93533bee88ccb08b289ff1dc53446ca21018af27dff471a54675e57f50e64ba2f46be137f03c834bb29319aab1d574a8aca5dfe2b119b067e7a02ce985c8 -EBUILD emacs-27.0.50_pre20191223.ebuild 12956 BLAKE2B 63180b750ed4db9f6b5ec5a4bc908b60cc2afb89698c114a0f5f75ae40c813cc164c06a9473d959354796d4431dfbe196a8f8828e77a654a6ab9e0171a4608ac SHA512 5fd6f8d8f2ceec6c0ef52536ca83e64dda2448b69ed74970f4f393f5074a590596258f1959ad4f3fff38d8aff045391a6fc49228e675920a12d0502b040d0ad2 -EBUILD emacs-27.0.90.ebuild 12958 BLAKE2B 8b33bc95e85307a5a6a8a8f844951631c20134be938865eac1464eacc9d464ad50b94ff971b3836dd31be44f00a2ab7148f79244c8f122499f1ebe0263f96107 SHA512 1a606c4e1912e6aced6a2d86161759335d8220f953226c0e35dd11f3c064adfc5bef66ca9fefc001132dc8ab43fdeb4e11f93830263c8a2a1f5fe727dfe4f934 -EBUILD emacs-27.0.9999-r1.ebuild 12958 BLAKE2B 8b33bc95e85307a5a6a8a8f844951631c20134be938865eac1464eacc9d464ad50b94ff971b3836dd31be44f00a2ab7148f79244c8f122499f1ebe0263f96107 SHA512 1a606c4e1912e6aced6a2d86161759335d8220f953226c0e35dd11f3c064adfc5bef66ca9fefc001132dc8ab43fdeb4e11f93830263c8a2a1f5fe727dfe4f934 -EBUILD emacs-28.0.9999.ebuild 12929 BLAKE2B 6098f27a63351b97ecee5ce0b76923a1445cf5f6e2982720012cf3f64e421d5ada12d8acea84d5e5b12ab29179cd6dce2faffef82f041689416d86f51dbb5fb6 SHA512 ec729a9f22a13674abe295fd7a0b3f8d541334ab2241e528c9492f4552a5c2fddbc5cd682edf923b69896f2f7cced00b468e9f2f98010da6872d1fb4ed393c6b +EBUILD emacs-23.4-r18.ebuild 10977 BLAKE2B 8e44c5f9f219081485ad0e923400e31cac34f76eea114f7e1d1619e884383680bfa2926966664c3a298bdf75dbb85f3b90dfc94b51f1b7c7669978c7e630dabc SHA512 e1ae3906e405d95e724ca3b79655a7e27eb4881d7a5589a7df383caf96a24f26f275f043ce54c0478130a711b0e1d06108c3943613088969f976883ab5fd9e5c +EBUILD emacs-24.5-r7.ebuild 10764 BLAKE2B bb9a3be1061b105c1c4eee45ce983e80b0a914dd3848951bac2ae4ace4b7b7a830741169d1e75ea85753247310eae94066a739da76dfeb0bcf6c43b7b1418a3e SHA512 5079762e2e811379dfa5ab124b0574d93aa2c2a01998426e92bec83ed2fcae5b11a7efd49ffb23f95ed3dad5ee5b8d2cd60261c716ee4bce4082499acadcf273 +EBUILD emacs-25.3-r6.ebuild 11100 BLAKE2B 18140ddfd34e3434632cb6953a64764df34950024b08f459e57846886b456769d1a0467342ac5bb0797502a589600777aa5d9659d98e7db68f3aec3b8d6db6b9 SHA512 72d7d3cc11214324da56dbb4d2c57750b73bb085feb1e353f5d690066fd0b06e3ecbe617c4778a42078ef45de3745628e9b406bcaa6c4bf1d6ead2f0a19106c6 +EBUILD emacs-26.3-r1.ebuild 11887 BLAKE2B c598a530fcb8c470d8f8d4d3a1106bd8acddb2d03e660be00282fa173d87c68585ca7cf171d64c3d11bdf0cdb5e3ef7e2b54db67fb93af03e66f9575802d5032 SHA512 40e57173380373d8855f6f599d25417dc468da51483109054d1df4b8eea85a53f10e85f958e405d8bf7948bc61e19afa412da7a51755f7ea3c907bd598aa7359 +EBUILD emacs-27.0.50_pre20191223.ebuild 12898 BLAKE2B ebeef6a8ea281e8549fe6eafaeac049e66f24a18c4bc65358afc8a5ea89b8cac9b51d554f4b2e4881ae43a8b41b8bb02bf37a719c03e1b3bd4d0a5740662308b SHA512 89ec7e4c0f2e4ee776e28d8da10666e712b076817a7c34a31f74d9c9173f6ec4a9857016c4c2b6a8b3bace442bd49b8ecfb1814cf49f8479f1bafc4370f15261 +EBUILD emacs-27.0.90.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe +EBUILD emacs-27.0.91.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe +EBUILD emacs-27.0.9999-r1.ebuild 12900 BLAKE2B 5cb7f15d0abb5b1a1cdfb748ea9e6b4236cecd1c5e0c5577d8c8028e16c328aa14b449157f5c6d7a907dc6eead27e0917e940da80f27cf8ed331d88e5ba8cd91 SHA512 e135aa8e6a841a5a8e1d2bf9f306f9b2cd5a1b92b9244d27dc12a8833531fc910697d28cd4aea7f38b64052e2aeb9da1b0bab190d73dfc24c88f8d7b16cbdabe +EBUILD emacs-28.0.9999.ebuild 12871 BLAKE2B 7aa3322befb032b60349d2b5ba2311429b3110428130cd0552bb2397dfd7c89ebad55f8f6f9fc576287c1af162e7d43145393be3e693c27e3fdfad00102e37bf SHA512 11d00e05d8053659dc025755262f46c9d8e4b37aba4492b366f9bda19edc5e9a46932a543410377c9dc6d17a01495b36592bb9f163f5d3fa968aa16e5ba27b03 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild index ea117e496500..a84fad2f8d3a 100644 --- a/app-editors/emacs/emacs-23.4-r18.ebuild +++ b/app-editors/emacs/emacs-23.4-r18.ebuild @@ -125,9 +125,7 @@ src_configure() { append-flags $(test-flags -fno-strict-aliasing) append-ldflags $(test-flags -no-pie) #639568 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild index 7393476a40c2..e82a60ec1c26 100644 --- a/app-editors/emacs/emacs-24.5-r7.ebuild +++ b/app-editors/emacs/emacs-24.5-r7.ebuild @@ -118,9 +118,7 @@ src_configure() { filter-flags -pie #526948 append-ldflags $(test-flags -no-pie) #639570 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild index 72d0e9f62796..18e79d8a04ad 100644 --- a/app-editors/emacs/emacs-25.3-r6.ebuild +++ b/app-editors/emacs/emacs-25.3-r6.ebuild @@ -121,9 +121,7 @@ src_configure() { strip-flags filter-flags -pie #526948 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild index 22c804c1e050..2d976a0d1f76 100644 --- a/app-editors/emacs/emacs-26.3-r1.ebuild +++ b/app-editors/emacs/emacs-26.3-r1.ebuild @@ -127,9 +127,7 @@ src_configure() { strip-flags filter-flags -pie #526948 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild index c6db7de6525f..b16211b43e36 100644 --- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild +++ b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild @@ -153,9 +153,7 @@ src_configure() { strip-flags filter-flags -pie #526948 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 diff --git a/app-editors/emacs/emacs-27.0.90.ebuild b/app-editors/emacs/emacs-27.0.90.ebuild index b006e62dabae..6b20eefd9d28 100644 --- a/app-editors/emacs/emacs-27.0.90.ebuild +++ b/app-editors/emacs/emacs-27.0.90.ebuild @@ -153,9 +153,7 @@ src_configure() { strip-flags filter-flags -pie #526948 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 diff --git a/app-editors/emacs/emacs-27.0.91.ebuild b/app-editors/emacs/emacs-27.0.91.ebuild new file mode 100644 index 000000000000..6b20eefd9d28 --- /dev/null +++ b/app-editors/emacs/emacs-27.0.91.ebuild @@ -0,0 +1,412 @@ +# Copyright 1999-2020 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}" +else + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz + mirror://gnu-alpha/emacs/pretest/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + # 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%%_*}" + S="${WORKDIR}/emacs-${FULL_VERSION}" + [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" +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" +SLOT="27-vcs" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 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 X Xaw3d xft +xpm xwidgets zlib" +REQUIRED_USE="?? ( aqua X )" +RESTRICT="test" + +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 ) + 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? ( net-libs/liblockfile ) + selinux? ( sys-libs/libselinux ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + X? ( + 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} + X? ( x11-base/xorg-proto )" + +BDEPEND="app-eselect/eselect-emacs + sys-apps/texinfo + virtual/pkgconfig + gzip-el? ( app-arch/gzip )" + +RDEPEND="${RDEPEND} + !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 X; then + 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 . + 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 + elif use aqua; then + einfo "Configuring to build with Nextstep (Cocoa) support" + myconf+=" --with-ns --disable-ns-self-contained" + myconf+=" --without-x" + else + myconf+=" --without-x --without-ns" + 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 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 + + # 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 /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 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 Emacs version 24.2 or earlier, then it is + strongly recommended that you use app-admin/emacs-updater to rebuild + all byte-compiled elisp files of the installed Emacs packages." + use X && 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." + 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.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild index b006e62dabae..6b20eefd9d28 100644 --- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild @@ -153,9 +153,7 @@ src_configure() { strip-flags filter-flags -pie #526948 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index 462168b70483..fbe5d94d188c 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -152,9 +152,7 @@ src_configure() { strip-flags filter-flags -pie #526948 - if use sh; then - replace-flags "-O[1-9]" -O0 #262359 - elif use ia64; then + if use ia64; then replace-flags "-O[2-9]" -O1 #325373 else replace-flags "-O[3-9]" -O2 -- cgit v1.2.3