subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-editors\/emacs\/"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-07-05 Thread Ulrich Müller

commit: 7a588173f5bfd99412785114aea353da31410fe0
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jul  5 11:53:12 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jul  5 12:01:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a588173

app-editors/emacs: Don't call eautoreconf for pretest version

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.1.90.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs/emacs-28.1.90.ebuild 
b/app-editors/emacs/emacs-28.1.90.ebuild
index a3ba699d12bc..7875c15c2dcd 100644
--- a/app-editors/emacs/emacs-28.1.90.ebuild
+++ b/app-editors/emacs/emacs-28.1.90.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
 
 if [[ ${PV##*.} =  ]]; then
inherit git-r3
@@ -165,7 +165,7 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
-   AT_M4DIR=m4 eautoreconf
+   #AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-06-30 Thread Ulrich Müller

commit: b8242ef29febceffa7a81b90329be809f97882c4
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Jun 30 14:31:51 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Jun 30 14:35:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8242ef2

app-editors/emacs: New pretest version 28.1.90

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 +
 app-editors/emacs/emacs-28.1.90.ebuild | 449 +
 2 files changed, 450 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index df1648ff9fc4..88e0ec4061f2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,4 +10,5 @@ DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B 
f5dc9d041ea8a07549a817a2b18f84c8a7
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
+DIST emacs-28.1.90.tar.xz 47712688 BLAKE2B 
00aa886946de3247954ad3b113d8f5861ffe4d46757ff4d33f4a88d688e9ffa86733316ae73809dd3017d4f8c3fe755bca658a752975a4c1ca716dcc4c206528
 SHA512 
50452ad29919f63d11b751ac4bc082e877e5792dc53f27ff90c22924f2b504f1049d138a8a31072cab0542bb552f9ecb356a04a570fd7754f285cfe494c0bea2
 DIST emacs-28.1.tar.xz 47699512 BLAKE2B 
42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7
 SHA512 
c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9

diff --git a/app-editors/emacs/emacs-28.1.90.ebuild 
b/app-editors/emacs/emacs-28.1.90.ebuild
new file mode 100644
index ..fb9a507f39e2
--- /dev/null
+++ b/app-editors/emacs/emacs-28.1.90.ebuild
@@ -0,0 +1,449 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} =  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git;
+   EGIT_BRANCH="emacs-28"
+   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.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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
+   fi
+   SLOT="${PV%%.*}"
+   [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 gfile gif +gmp gpm 
gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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[games?,gui(-)?]
+   sys-libs/ncurses:0=
+   acl? ( virtual/acl )
+   alsa? ( media-libs/alsa-lib )
+   dbus? ( sys-apps/dbus )
+   games? (

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-06-27 Thread Ulrich Müller

commit: 294459c6dc375715073f4f04886945da2da4f0c9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jun 27 10:36:30 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jun 27 10:37:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=294459c6

app-editors/emacs: Fix a compiler warning in 18.59

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest   | 2 +-
 app-editors/emacs/emacs-18.59-r14.ebuild | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 6238df99aa37..df1648ff9fc4 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,4 +1,4 @@
-DIST emacs-18.59-patches-13.tar.xz 33532 BLAKE2B 
17682fb03c3606794743e702f8389a9476fe09a8c0cc970828aa515a5fc2b1d2df620cdc168d4727635492b38da81ab525c05e20cb77c86d5ae691976deb8d94
 SHA512 
912afbb4e42efb9e42df4e06c21bcf1d7e2f203d35edb2b410b80c9e25f2e4b37dbb28e6fa36691ce44c53da9f3eb57518da164ecca1599147072219244a8b35
+DIST emacs-18.59-patches-14.tar.xz 33760 BLAKE2B 
9235d720e1218e9b1912c6968ba22e0971e3cc8ef1b3ea5023f1970499874c145fb03f883d37455ebdc83a0a3091f054f42fc63f1d5f75ca9ba5f4f66364e6d1
 SHA512 
74cc19cce1b65c01f5d2f7c1aa674e3923f68e52a61108d4140c41c7fac90d32833fc457eccbe4fb551e0453d1c01f12fcf760fda394a5c34668675c52a24459
 DIST emacs-18.59.tar.gz 2962652 BLAKE2B 
d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b
 SHA512 
03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 
941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855
 SHA512 
83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 
33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d
 SHA512 
def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296

diff --git a/app-editors/emacs/emacs-18.59-r14.ebuild 
b/app-editors/emacs/emacs-18.59-r14.ebuild
index 913e0ff38994..1cbf3f94a44c 100644
--- a/app-editors/emacs/emacs-18.59-r14.ebuild
+++ b/app-editors/emacs/emacs-18.59-r14.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic multilib
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/;
 SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-   https://dev.gentoo.org/~ulm/emacs/${P}-patches-13.tar.xz;
+   https://dev.gentoo.org/~ulm/emacs/${P}-patches-14.tar.xz;
 
 LICENSE="GPL-1+ GPL-2+ BSD HPND"
 SLOT="18"
@@ -76,11 +76,11 @@ src_configure() {
src/s-linux.h || die
 
# -O3 and -finline-functions cause segmentation faults at run time.
-   # -Wno-implicit will quieten GCC 5; feel free to submit a patch
-   # adding all those missing prototypes.
+   # -Wno-implicit and -Wno-return-type will quieten newer versions of GCC;
+   # feel free to submit a patch adding all those missing prototypes.
strip-flags
filter-flags -finline-functions -fpie
-   append-flags -Wno-implicit -fno-strict-aliasing
+   append-flags -fno-strict-aliasing -Wno-implicit -Wno-return-type
append-ldflags $(test-flags -no-pie)#639562
replace-flags -O[3-9] -O2
 }

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-06-26 Thread Ulrich Müller

commit: f32b8cd1cdedb9e74ecbd8a07244eaf5250a9e04
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jun 26 10:33:19 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jun 26 10:34:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32b8cd1

app-editors/emacs: Compile Emacs 18 with -fno-strict-aliasing

Bug: https://bugs.gentoo.org/854360
Suggested-by: Sam James  gentoo.org>
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-18.59-r14.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs/emacs-18.59-r14.ebuild 
b/app-editors/emacs/emacs-18.59-r14.ebuild
index 053a862305ea..913e0ff38994 100644
--- a/app-editors/emacs/emacs-18.59-r14.ebuild
+++ b/app-editors/emacs/emacs-18.59-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -80,7 +80,7 @@ src_configure() {
# adding all those missing prototypes.
strip-flags
filter-flags -finline-functions -fpie
-   append-flags -Wno-implicit
+   append-flags -Wno-implicit -fno-strict-aliasing
append-ldflags $(test-flags -no-pie)#639562
replace-flags -O[3-9] -O2
 }

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-06-07 Thread Ulrich Müller

commit: 4ca8019087aab182e0f3f1211f235f128d537b8a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Jun  7 06:42:26 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Jun  7 06:44:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca80190

app-editors/emacs: Leave CFLAGS alone in Emacs 27 and newer

Closes: https://bugs.gentoo.org/839405
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-27.2-r5.ebuild | 11 +--
 app-editors/emacs/emacs-28.1.ebuild| 11 +--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild 
b/app-editors/emacs/emacs-27.2-r5.ebuild
index 50165a4c30ce..18395bf3a2ec 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
 
 if [[ ${PV##*.} =  ]]; then
inherit git-r3
@@ -159,15 +159,6 @@ src_prepare() {
 }
 
 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

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index c1f2773fb0b4..69b2645dfb9b 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs #autotools
+inherit elisp-common readme.gentoo-r1 toolchain-funcs #autotools
 
 if [[ ${PV##*.} =  ]]; then
inherit git-r3
@@ -169,15 +169,6 @@ src_prepare() {
 }
 
 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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-19 Thread Agostino Sarubbo

commit: 68c3ab65e7857b94150508c808d4998d23495e7c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 19 07:47:31 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 19 07:47:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c3ab65

app-editors/emacs: arm stable wrt bug #844181

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/emacs/emacs-28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index a30e4466a829..c1f2773fb0b4 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 
~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-16 Thread Arthur Zamarin

commit: 92acdf56be8fef8391e9942e4307940fa74d40c7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 16 19:41:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 16 19:41:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92acdf56

app-editors/emacs: Stabilize 28.1 ppc, #844181

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/emacs/emacs-28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index d981ddf600ec..a30e4466a829 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 
~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-16 Thread Arthur Zamarin

commit: d1a9f01a0de67ea8bbcdb5179e9cf90fce29edce
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 16 19:38:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 16 19:38:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a9f01a

app-editors/emacs: Stabilize 28.1 arm64, #844181

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/emacs/emacs-28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index b44210bd428a..d981ddf600ec 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 
~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-15 Thread Jakov Smolić

commit: 9dc05761668ccd809fe7f73a3b92f34fd07a933e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun May 15 08:13:42 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun May 15 08:14:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc05761

app-editors/emacs: Stabilize 28.1 ppc64, #844181

Signed-off-by: Jakov Smolić  gentoo.org>

 app-editors/emacs/emacs-28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index 97790dcd0008..b44210bd428a 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-14 Thread Jakov Smolić

commit: 764b67caf36fe58da4af0d19b6a2619badc87927
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May 14 22:16:16 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May 14 22:16:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764b67ca

app-editors/emacs: Stabilize 28.1 sparc, #844181

Signed-off-by: Jakov Smolić  gentoo.org>

 app-editors/emacs/emacs-28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index 6c32c87830d3..97790dcd0008 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-14 Thread Jakov Smolić

commit: 0d0517a2a6f4042f56c73e44c5ae09639b578c08
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May 14 21:49:13 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May 14 21:49:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0517a2

app-editors/emacs: Stabilize 28.1 amd64, #844181

Signed-off-by: Jakov Smolić  gentoo.org>

 app-editors/emacs/emacs-28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index d304d33f2d1f..6e12602afb9c 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-14 Thread Jakov Smolić

commit: d985463e9471c6bfe28c6f9dd58144eee2e0ce20
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May 14 21:49:42 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May 14 21:49:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d985463e

app-editors/emacs: Stabilize 28.1 x86, #844181

Signed-off-by: Jakov Smolić  gentoo.org>

 app-editors/emacs/emacs-28.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index 6e12602afb9c..6c32c87830d3 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -33,7 +33,7 @@ else
fi
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-07 Thread Ulrich Müller

commit: d407d23695734b87b42447139e9f2c6ba9096bfc
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat May  7 06:12:01 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat May  7 06:12:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d407d236

app-editors/emacs: Update dependency on jpeg

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-23.4-r21.ebuild  | 2 +-
 app-editors/emacs/emacs-24.5-r11.ebuild  | 2 +-
 app-editors/emacs/emacs-25.3-r11.ebuild  | 2 +-
 app-editors/emacs/emacs-26.3-r7.ebuild   | 2 +-
 app-editors/emacs/emacs-27.2-r5.ebuild   | 2 +-
 app-editors/emacs/emacs-28.1..ebuild | 2 +-
 app-editors/emacs/emacs-28.1.ebuild  | 2 +-
 app-editors/emacs/emacs-29.0..ebuild | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-editors/emacs/emacs-23.4-r21.ebuild 
b/app-editors/emacs/emacs-23.4-r21.ebuild
index 8a55f68e94af..697eed5582e2 100644
--- a/app-editors/emacs/emacs-23.4-r21.ebuild
+++ b/app-editors/emacs/emacs-23.4-r21.ebuild
@@ -32,7 +32,7 @@ RDEPEND="acct-group/mail
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gif? ( media-libs/giflib:0= )
-   jpeg? ( virtual/jpeg:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )

diff --git a/app-editors/emacs/emacs-24.5-r11.ebuild 
b/app-editors/emacs/emacs-24.5-r11.ebuild
index 2324de08efdf..1ae3f49b3d60 100644
--- a/app-editors/emacs/emacs-24.5-r11.ebuild
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild
@@ -40,7 +40,7 @@ RDEPEND="acct-group/mail
x11-misc/xbitmaps
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib:0= )
-   jpeg? ( virtual/jpeg:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index 41e239215c92..8d376484b764 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -42,7 +42,7 @@ RDEPEND="acct-group/mail
x11-misc/xbitmaps
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib:0= )
-   jpeg? ( virtual/jpeg:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index 659e76262f29..493f4237b43a 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.ebuild
@@ -44,7 +44,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
x11-misc/xbitmaps
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib:0= )
-   jpeg? ( virtual/jpeg:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )

diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild 
b/app-editors/emacs/emacs-27.2-r5.ebuild
index c5f1133679ba..50165a4c30ce 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -77,7 +77,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
x11-misc/xbitmaps
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib:0= )
-   jpeg? ( virtual/jpeg:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )

diff --git a/app-editors/emacs/emacs-28.1..ebuild 
b/app-editors/emacs/emacs-28.1..ebuild
index c4be1b55a5a9..fb9a507f39e2 100644
--- a/app-editors/emacs/emacs-28.1..ebuild
+++ b/app-editors/emacs/emacs-28.1..ebuild
@@ -75,7 +75,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
x11-misc/xbitmaps
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib:0= )
-   jpeg? ( virtual/jpeg:0= )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff:0 )

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index 135fab7e795b..d304d33f2d1f 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -75,7

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-07 Thread Ulrich Müller

commit: ea95f0712988dd1c4747a7c2e9b43b6ea448eda3
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat May  7 05:58:32 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat May  7 05:58:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea95f071

app-editors/emacs: Remove 26.3-r6

Bug: https://bugs.gentoo.org/739354
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 -
 app-editors/emacs/emacs-26.3-r6.ebuild | 376 -
 2 files changed, 377 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8eac7d76703d..6238df99aa37 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,7 +6,6 @@ DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 
3e097f9cdf96a8b0255ce69770f79259a
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B 
aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355
 SHA512 
89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 
9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154
 SHA512 
fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 
1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682
 SHA512 
0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
 DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B 
f5dc9d041ea8a07549a817a2b18f84c8a75dce1d53e8de7c6751d48e71e27ee5a3626688252e079917b50473d6b3963f191383050799d199223cdd594be24dbe
 SHA512 
33c91a138e2c9ba3146e66dc03cf05a4baef48019b1ca5c487a56b15f561bf208d58b0f2dc7d250682b86437dce1ce5b050887c4a5ef44194c46fbb7a7346d16
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
deleted file mode 100644
index d196a1b19509..
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ /dev/null
@@ -1,376 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/;
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-   https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.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 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[games?,gui(-)?]
-   sys-libs/ncurses:0=
-   acl? ( virtual/acl )
-   alsa? ( media-libs/alsa-lib )
-   dbus? ( sys-apps/dbus )
-   games? ( acct-group/gamestat )
-   gpm? ( sys-libs/gpm )
-   !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-   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
-

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-06 Thread Ulrich Müller

commit: 0a50630e742ac67e0ef362c84bcc2e11dc8a17a9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri May  6 21:27:57 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri May  6 21:31:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a50630e

app-editors/emacs: Don't rename configure.in

eautoconf does this for us in EAPI 8.

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-23.4-r21.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-editors/emacs/emacs-23.4-r21.ebuild 
b/app-editors/emacs/emacs-23.4-r21.ebuild
index e491036d0785..8a55f68e94af 100644
--- a/app-editors/emacs/emacs-23.4-r21.ebuild
+++ b/app-editors/emacs/emacs-23.4-r21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -112,7 +112,6 @@ src_prepare() {
|| die "unable to sed configure.in"
fi
 
-   mv configure.in configure.ac || die
eautoreconf
touch src/stamp-h.in || die
 }

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-06 Thread Arthur Zamarin

commit: 4d3ad5ec82627e35fff6634d23baddac88071f57
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  6 20:02:17 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  6 20:02:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3ad5ec

app-editors/emacs: Stabilize 26.3-r7 hppa, #841821

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/emacs/emacs-26.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index 131c41f26106..659e76262f29 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.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"
+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 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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-05-03 Thread Arthur Zamarin

commit: 8a923359be531515532a68f2ef9a91391281f506
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue May  3 18:47:44 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue May  3 18:47:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a923359

app-editors/emacs: Stabilize 26.3-r7 sparc, #841821

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/emacs/emacs-26.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index ef47cdc50bde..80f588eaa6f7 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.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"
+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 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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-30 Thread Sam James

commit: cba0fd368332c7d55b42623cd3b7066eff0d2201
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 30 19:09:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 30 19:09:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba0fd36

app-editors/emacs: Stabilize 26.3-r7 ppc64, #841821

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-26.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index 8bec9e821160..ef47cdc50bde 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.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"
+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 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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-30 Thread Sam James

commit: 524473b7d6292615549bd544c51b5a321c4adf5d
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 30 19:09:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 30 19:09:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524473b7

app-editors/emacs: Stabilize 26.3-r7 ppc, #841821

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-26.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index fc80885287bc..8bec9e821160 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.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"
+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 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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-30 Thread Sam James

commit: b2ddfee538f81cf11c2317ba2360327d7589fa4d
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 30 19:08:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 30 19:09:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ddfee5

app-editors/emacs: Stabilize 26.3-r7 x86, #841821

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-26.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index 144c1f63fbbc..39cccf5ce988 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.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"
+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 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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-30 Thread Sam James

commit: e8f1a03b6496740dfe439c3afcdaf24fc0333a59
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 30 19:08:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 30 19:09:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f1a03b

app-editors/emacs: Stabilize 26.3-r7 amd64, #841821

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-26.3-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index 39cccf5ce988..fc80885287bc 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.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"
+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 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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-20 Thread Ulrich Müller

commit: c4c1e3895b04e46c97682d74653d75f9110346af
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Apr 20 12:24:24 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Apr 20 12:24:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c1e389

app-editors/emacs: Leave CFLAGS alone in live ebuilds

Bug: https://bugs.gentoo.org/839405
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.1..ebuild | 11 +--
 app-editors/emacs/emacs-29.0..ebuild | 11 +--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/app-editors/emacs/emacs-28.1..ebuild 
b/app-editors/emacs/emacs-28.1..ebuild
index 4c1a544cb35f..c4be1b55a5a9 100644
--- a/app-editors/emacs/emacs-28.1..ebuild
+++ b/app-editors/emacs/emacs-28.1..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} =  ]]; then
inherit git-r3
@@ -169,15 +169,6 @@ src_prepare() {
 }
 
 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

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index 0de26a675244..077062bddd56 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs
 
 if [[ ${PV##*.} =  ]]; then
inherit git-r3
@@ -191,15 +191,6 @@ src_prepare() {
 }
 
 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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-11 Thread Ulrich Müller

commit: 1cf5b2461c512ac556571f15968a826b5aa130b6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Apr 11 06:42:29 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Apr 11 06:44:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf5b246

app-editors/emacs: Enable jit workaround also with distcc

Thanks to Maciej S. Szmigiero for the fix.

Closes: https://bugs.gentoo.org/837506
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.1..ebuild | 4 ++--
 app-editors/emacs/emacs-28.1.ebuild  | 4 ++--
 app-editors/emacs/emacs-29.0..ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-editors/emacs/emacs-28.1..ebuild 
b/app-editors/emacs/emacs-28.1..ebuild
index 9130393b32fa..4c1a544cb35f 100644
--- a/app-editors/emacs/emacs-28.1..ebuild
+++ b/app-editors/emacs/emacs-28.1..ebuild
@@ -153,9 +153,9 @@ src_prepare() {
# for live ebuilds FULL_VERSION doesn't exist in global scope

QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
 
-   # gccjit doesn't play well with ccache #801580
+   # gccjit doesn't play well with ccache or distcc #801580
# For now, work around the problem with an explicit LIBRARY_PATH
-   has ccache ${FEATURES} && tc-is-gcc \
+   has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
&& export LIBRARY_PATH=$("$(tc-getCC)" 
-print-search-dirs \
| sed -n '/^libraries:/{s:^[^/]*::;p}')
fi

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
index 85368109ec31..135fab7e795b 100644
--- a/app-editors/emacs/emacs-28.1.ebuild
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -153,9 +153,9 @@ src_prepare() {
# for live ebuilds FULL_VERSION doesn't exist in global scope

QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
 
-   # gccjit doesn't play well with ccache #801580
+   # gccjit doesn't play well with ccache or distcc #801580
# For now, work around the problem with an explicit LIBRARY_PATH
-   has ccache ${FEATURES} && tc-is-gcc \
+   has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
&& export LIBRARY_PATH=$("$(tc-getCC)" 
-print-search-dirs \
| sed -n '/^libraries:/{s:^[^/]*::;p}')
fi

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index 41b8333bd0ab..0de26a675244 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..ebuild
@@ -175,9 +175,9 @@ src_prepare() {
# for live ebuilds FULL_VERSION doesn't exist in global scope

QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
 
-   # gccjit doesn't play well with ccache #801580
+   # gccjit doesn't play well with ccache or distcc #801580
# For now, work around the problem with an explicit LIBRARY_PATH
-   has ccache ${FEATURES} && tc-is-gcc \
+   has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \
&& export LIBRARY_PATH=$("$(tc-getCC)" 
-print-search-dirs \
| sed -n '/^libraries:/{s:^[^/]*::;p}')
fi

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-04 Thread Ulrich Müller

commit: 049171693021d74b06af8987e17f8385ce6d1329
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Apr  4 12:37:23 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Apr  4 12:43:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04917169

app-editors/emacs: Version bump to 28.1

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest  |   1 +
 app-editors/emacs/emacs-28.1.ebuild | 458 
 2 files changed, 459 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index cdeec7589400..7dc3c6449053 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,3 +12,4 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.0.92.tar.xz 47692892 BLAKE2B 
3a0a1e6cec79dd56c36d7f3227654f10e1d0d1a7b933a269e25bdd0da6bcec6653500ee0775b70bafdb09bb59d0976474535b82316eee592fafc8fa9e4d7c0e7
 SHA512 
5e6800baf2ee5a8127956517578cbddcc8fe71fdd9925a04e53ae645b455bc49300c72604d4401c837a733eaeb54fa4ab43ed3bc2bc68e31d4c33ced6e6c9a33
+DIST emacs-28.1.tar.xz 47699512 BLAKE2B 
42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7
 SHA512 
c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9

diff --git a/app-editors/emacs/emacs-28.1.ebuild 
b/app-editors/emacs/emacs-28.1.ebuild
new file mode 100644
index ..85368109ec31
--- /dev/null
+++ b/app-editors/emacs/emacs-28.1.ebuild
@@ -0,0 +1,458 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs #autotools
+
+if [[ ${PV##*.} =  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git;
+   EGIT_BRANCH="emacs-28"
+   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.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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
+   fi
+   SLOT="${PV%%.*}"
+   [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 gfile gif +gmp gpm 
gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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[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 ) )
+   jit? ( sys-devel/gcc:=[jit(-)] )
+   json? ( dev-libs/jansson:= )
+   kerberos? ( virtual/krb5 )
+   lcms? ( media-libs/lcms:2 )
+   libxml2? (

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-04 Thread Ulrich Müller

commit: ce056a4fc4f3937eabc2b0f0bc948f219c0eafc7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Apr  4 12:39:55 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Apr  4 12:43:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce056a4f

app-editors/emacs: Update version for Emacs 28 live ebuild

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/{emacs-28.0.-r1.ebuild => emacs-28.1..ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-editors/emacs/emacs-28.0.-r1.ebuild 
b/app-editors/emacs/emacs-28.1..ebuild
similarity index 100%
rename from app-editors/emacs/emacs-28.0.-r1.ebuild
rename to app-editors/emacs/emacs-28.1..ebuild

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-04-04 Thread Ulrich Müller

commit: 33168c48c3369d2c83532823280359d7cc3355a6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Apr  4 12:40:42 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Apr  4 12:43:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33168c48

app-editors/emacs: Remove pretest snapshot

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 -
 app-editors/emacs/emacs-28.0.92.ebuild | 458 -
 2 files changed, 459 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7dc3c6449053..8eac7d76703d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,5 +11,4 @@ DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B 
f5dc9d041ea8a07549a817a2b18f84c8a7
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.0.92.tar.xz 47692892 BLAKE2B 
3a0a1e6cec79dd56c36d7f3227654f10e1d0d1a7b933a269e25bdd0da6bcec6653500ee0775b70bafdb09bb59d0976474535b82316eee592fafc8fa9e4d7c0e7
 SHA512 
5e6800baf2ee5a8127956517578cbddcc8fe71fdd9925a04e53ae645b455bc49300c72604d4401c837a733eaeb54fa4ab43ed3bc2bc68e31d4c33ced6e6c9a33
 DIST emacs-28.1.tar.xz 47699512 BLAKE2B 
42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7
 SHA512 
c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9

diff --git a/app-editors/emacs/emacs-28.0.92.ebuild 
b/app-editors/emacs/emacs-28.0.92.ebuild
deleted file mode 100644
index 5bd030d164a3..
--- a/app-editors/emacs/emacs-28.0.92.ebuild
+++ /dev/null
@@ -1,458 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} =  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git;
-   EGIT_BRANCH="emacs-28"
-   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.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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
-   fi
-   SLOT="${PV%%.*}"
-   [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 gfile gif +gmp gpm 
gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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[games?,gui(-)?]
-   sys-libs/ncurses:0=
-   acl? ( virtual/acl )
-   alsa? ( media-libs/alsa-lib )
-   dbus? ( sys-apps/dbus )
-   games? (

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-03-31 Thread Ulrich Müller

commit: cb72646a816c38af5816dfa6a47475fccd68d762
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Mar 31 11:35:25 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Mar 31 11:38:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb72646a

app-editors/emacs: Remove old

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 -
 app-editors/emacs/emacs-28.0.91.ebuild | 459 -
 2 files changed, 460 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5301c1866c17..cdeec7589400 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,5 +11,4 @@ DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B 
f5dc9d041ea8a07549a817a2b18f84c8a7
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
-DIST emacs-28.0.91.tar.xz 47651228 BLAKE2B 
94cfd907cb602ab698ffaa5c29aa1db2ff1b8538e1d6a0e20aa72ac1cb77e3c07759cf28cbe47027b155a08ce305c9c6ae01a6b82eb3468b2f4d4b49d51a3430
 SHA512 
bc325b685c3bb783cae03209107572980197a4278a45b1546e1528d593a476556f227c979d6d6a55ab44f2ca0535ed912a284b89258157bd6c995ab555445133
 DIST emacs-28.0.92.tar.xz 47692892 BLAKE2B 
3a0a1e6cec79dd56c36d7f3227654f10e1d0d1a7b933a269e25bdd0da6bcec6653500ee0775b70bafdb09bb59d0976474535b82316eee592fafc8fa9e4d7c0e7
 SHA512 
5e6800baf2ee5a8127956517578cbddcc8fe71fdd9925a04e53ae645b455bc49300c72604d4401c837a733eaeb54fa4ab43ed3bc2bc68e31d4c33ced6e6c9a33

diff --git a/app-editors/emacs/emacs-28.0.91.ebuild 
b/app-editors/emacs/emacs-28.0.91.ebuild
deleted file mode 100644
index 89ae30752e40..
--- a/app-editors/emacs/emacs-28.0.91.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} =  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git;
-   EGIT_BRANCH="emacs-28"
-   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.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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
-   fi
-   SLOT="${PV%%.*}"
-   [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 gui gzip-el harfbuzz imagemagick +inotify jit 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[games?,gui(-)?]
-   sys-libs/ncurses:0=
-   acl? ( virtual/acl )
-   alsa? ( media-libs/alsa-lib )
-   dbus? ( sys-apps/dbus )
-   games? (

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-03-31 Thread Ulrich Müller

commit: 8869e768fd6087c9284c4b2c2f6f99f5c256a675
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Mar 31 11:37:31 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Mar 31 11:38:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8869e768

app-editors/emacs: Drop emacs-vcs blocker

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-27.2-r5.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild 
b/app-editors/emacs/emacs-27.2-r5.ebuild
index c38f02ec1b8e..c5f1133679ba 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -133,8 +133,7 @@ BDEPEND="sys-apps/texinfo
 
 IDEPEND="app-eselect/eselect-emacs"
 
-RDEPEND+=" ${IDEPEND}
-   !app-editors/emacs-vcs:27"
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-03-31 Thread Ulrich Müller

commit: 5d2d231650439bba3024233c4405bcbeff99bec7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Mar 31 11:34:03 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Mar 31 11:38:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2d2316

app-editors/emacs: Drop deprecated dependency on gnome-base/gconf

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-24.5-r11.ebuild | 7 +++
 app-editors/emacs/emacs-25.3-r11.ebuild | 7 +++
 app-editors/emacs/emacs-26.3-r7.ebuild  | 5 ++---
 app-editors/emacs/emacs-27.2-r5.ebuild  | 5 ++---
 app-editors/emacs/emacs-28.0.92.ebuild  | 5 ++---
 app-editors/emacs/emacs-28.0.-r1.ebuild | 5 ++---
 app-editors/emacs/emacs-29.0..ebuild| 7 +++
 7 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/app-editors/emacs/emacs-24.5-r11.ebuild 
b/app-editors/emacs/emacs-24.5-r11.ebuild
index 3f9cc7860442..2324de08efdf 100644
--- a/app-editors/emacs/emacs-24.5-r11.ebuild
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 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 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[games?,gui(-)?]
@@ -38,7 +38,6 @@ RDEPEND="acct-group/mail
x11-libs/libXinerama
x11-libs/libXrandr
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= )
@@ -143,7 +142,7 @@ src_configure() {
myconf+=" --without-x"
else
myconf+=" --with-x --without-ns"
-   myconf+=" $(use_with gconf)"
+   myconf+=" --without-gconf"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
myconf+=" $(use_with gif)"

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index 00a361aa4b9e..41e239215c92 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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 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 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[games?,gui(-)?]
@@ -40,7 +40,6 @@ RDEPEND="acct-group/mail
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= )
@@ -145,7 +144,7 @@ src_configure() {
myconf+=" --without-x"
else
myconf+=" --with-x --without-ns"
-   myconf+=" $(use_with gconf)"
+   myconf+=" --without-gconf"
myconf+=" $(use_with gsettings)"
myconf+=" $(use_with toolkit-scroll-bars)"
myconf+=" $(use_with gif)"

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
index abf8fbc494ed..144c1f63fbbc 100644
--- a/app-editors/emacs/emacs-26.3-r7.ebuild
+++ b/app-editors/emacs/emacs-26.3-r7.ebuild
@@ -13,7 +13,7 @@

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-03-30 Thread Ulrich Müller

commit: badb974e4774dc877ff652fc712114c9d1b5f6d9
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Mar 30 07:17:27 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Mar 30 07:18:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=badb974e

app-editors/emacs: Always enable toolkit-scroll-bars with pure GTK

Closes: https://bugs.gentoo.org/836392
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-29.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index b26146f171bc..bb9b91c9c741 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..ebuild
@@ -232,9 +232,9 @@ src_configure() {
elif use gtk && ! use X; then
einfo "Configuring to build with pure GTK (without X11) support"
myconf+=" --with-pgtk --without-x --without-ns"
+   myconf+=" --with-toolkit-scroll-bars" #836392
myconf+=" $(use_with gconf)"
myconf+=" $(use_with gsettings)"
-   myconf+=" $(use_with toolkit-scroll-bars)"
myconf+=" $(use_with harfbuzz)"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-03-26 Thread Ulrich Müller

commit: 66d765c893fdb716fb2166a1a67e1a451ef1ae1e
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Mar 26 21:29:41 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Mar 26 21:34:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d765c8

app-editors/emacs: Backport WebKit sandboxing patch to slot 26

Bug: https://bugs.gentoo.org/739354
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 +
 app-editors/emacs/emacs-26.3-r7.ebuild | 376 +
 2 files changed, 377 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 3af078c832bb..5301c1866c17 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,6 +7,7 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B 
aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 
9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154
 SHA512 
fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 
1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682
 SHA512 
0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
+DIST emacs-26.3-patches-2.tar.xz 1780 BLAKE2B 
f5dc9d041ea8a07549a817a2b18f84c8a75dce1d53e8de7c6751d48e71e27ee5a3626688252e079917b50473d6b3963f191383050799d199223cdd594be24dbe
 SHA512 
33c91a138e2c9ba3146e66dc03cf05a4baef48019b1ca5c487a56b15f561bf208d58b0f2dc7d250682b86437dce1ce5b050887c4a5ef44194c46fbb7a7346d16
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild 
b/app-editors/emacs/emacs-26.3-r7.ebuild
new file mode 100644
index ..abf8fbc494ed
--- /dev/null
+++ b/app-editors/emacs/emacs-26.3-r7.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp-common flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/;
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz
+   https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.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 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[games?,gui(-)?]
+   sys-libs/ncurses:0=
+   acl? ( virtual/acl )
+   alsa? ( media-libs/alsa-lib )
+   dbus? ( sys-apps/dbus )
+   games? ( acct-group/gamestat )
+   gpm? ( sys-libs/gpm )
+   !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+   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
+

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-03-13 Thread Ulrich Müller

commit: 10e8f28e2cc5bd52626d03cb4475259c36da132d
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Mar 13 18:21:20 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Mar 13 18:21:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e8f28e

app-editors/emacs: New pretest version 28.0.92

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 +
 app-editors/emacs/emacs-28.0.92.ebuild | 459 +
 2 files changed, 460 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5084420e0512..3af078c832bb 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,3 +11,4 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
 DIST emacs-28.0.91.tar.xz 47651228 BLAKE2B 
94cfd907cb602ab698ffaa5c29aa1db2ff1b8538e1d6a0e20aa72ac1cb77e3c07759cf28cbe47027b155a08ce305c9c6ae01a6b82eb3468b2f4d4b49d51a3430
 SHA512 
bc325b685c3bb783cae03209107572980197a4278a45b1546e1528d593a476556f227c979d6d6a55ab44f2ca0535ed912a284b89258157bd6c995ab555445133
+DIST emacs-28.0.92.tar.xz 47692892 BLAKE2B 
3a0a1e6cec79dd56c36d7f3227654f10e1d0d1a7b933a269e25bdd0da6bcec6653500ee0775b70bafdb09bb59d0976474535b82316eee592fafc8fa9e4d7c0e7
 SHA512 
5e6800baf2ee5a8127956517578cbddcc8fe71fdd9925a04e53ae645b455bc49300c72604d4401c837a733eaeb54fa4ab43ed3bc2bc68e31d4c33ced6e6c9a33

diff --git a/app-editors/emacs/emacs-28.0.92.ebuild 
b/app-editors/emacs/emacs-28.0.92.ebuild
new file mode 100644
index ..89ae30752e40
--- /dev/null
+++ b/app-editors/emacs/emacs-28.0.92.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} =  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git;
+   EGIT_BRANCH="emacs-28"
+   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.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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
+   fi
+   SLOT="${PV%%.*}"
+   [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 gui gzip-el harfbuzz imagemagick +inotify jit 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[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 ) )
+   jit? ( sys-devel/gcc:=[jit(-)] )
+   json? ( dev-libs/jansson:= )
+   kerberos? ( virtual/krb5 )
+

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-02-13 Thread Ulrich Müller

commit: 5db9ee362650dba8dfda305c0299c5e308fb970d
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Feb 13 23:00:52 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Feb 13 23:01:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db9ee36

app-editors/emacs: Add sqlite flag and dependency

Reported-by: Sam James  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-29.0..ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index 52f966bf8a7d..b26146f171bc 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..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 gui gzip-el harfbuzz imagemagick +inotify jit jpeg json 
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source 
ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X 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 jit jpeg json 
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source 
sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d 
xft +xpm xwidgets zlib"
 RESTRICT="test"
 
 X_DEPEND="x11-libs/libICE
@@ -110,6 +110,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
mailutils? ( net-mail/mailutils[clients] )
!mailutils? ( acct-group/mail net-libs/liblockfile )
selinux? ( sys-libs/libselinux )
+   sqlite? ( dev-db/sqlite:3 )
ssl? ( net-libs/gnutls:0= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
@@ -347,6 +348,7 @@ src_configure() {
$(use_with libxml2 xml2) \
$(use_with mailutils) \
$(use_with selinux) \
+   $(use_with sqlite sqlite3) \
$(use_with ssl gnutls) \
$(use_with systemd libsystemd) \
$(use_with threads) \

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-15 Thread Ulrich Müller

commit: e6710a14b9aa2ea8a7b31ce22ac8a048bb165322
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan 15 17:57:57 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan 15 17:58:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6710a14

app-editors/emacs: Fix pgtk conditional

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-29.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index 69582b7f2ff4..52f966bf8a7d 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..ebuild
@@ -228,7 +228,7 @@ src_configure() {
einfo "Configuring to build with Nextstep (Macintosh Cocoa) 
support"
myconf+=" --with-ns --disable-ns-self-contained"
myconf+=" --without-x --without-pgtk"
-   elif use gtk || ! use X; then
+   elif use gtk && ! use X; then
einfo "Configuring to build with pure GTK (without X11) support"
myconf+=" --with-pgtk --without-x --without-ns"
myconf+=" $(use_with gconf)"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-15 Thread Ulrich Müller

commit: 031730462aad0a547bd1fc1a2561ad576801c32c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan 15 17:37:53 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan 15 17:46:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03173046

app-editors/emacs: Add webp flag for libwebp support

Refactor dependencies and logic for image format USE flags, because they
apply to all GUIs.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-29.0..ebuild | 114 +--
 1 file changed, 61 insertions(+), 53 deletions(-)

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index 1a8fed50e60a..d1f2256d067f 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..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 gui gzip-el harfbuzz imagemagick +inotify jit 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 jit jpeg json 
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source 
ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int Xaw3d xft +xpm 
xwidgets zlib"
 RESTRICT="test"
 
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -63,65 +63,68 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
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 )
+   gui? (
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 )
+   webp? ( media-libs/libwebp:0= )
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? (
-   x11-libs/gtk+:3
-   xwidgets? (
-   net-libs/webkit-gtk:4=
-   x11-libs/libXcomposite
+   !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 )
+   xpm? ( x11-libs/libXpm )
+   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? (
-   motif? (
-   >=x11-libs/motif-2.3:0
-   x11-libs/libXpm
-   x11-libs/libXmu
-

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-15 Thread Ulrich Müller

commit: 9be8b8749d0f24885ab167cef881dba5b885a233
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan 15 17:45:55 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan 15 17:46:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be8b874

app-editors/emacs: Support pure GTK

Emacs 29 will support window systems X11, pure GTK (without X11), or
Nextstep (Aqua/Cocoa). The ebuild selects these as follows:
  "aqua" -> Nextstep
  "gtk -X" -> pure GTK
  otherwise -> X11

Closes: https://bugs.gentoo.org/831154
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-29.0..ebuild | 134 ---
 1 file changed, 87 insertions(+), 47 deletions(-)

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index d1f2256d067f..69582b7f2ff4 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..ebuild
@@ -40,9 +40,59 @@ 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 gui gzip-el harfbuzz imagemagick +inotify jit jpeg json 
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source 
ssl svg systemd +threads tiff toolkit-scroll-bars webp 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 jit jpeg json 
kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source 
ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft 
+xpm xwidgets zlib"
 RESTRICT="test"
 
+X_DEPEND="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
+   xpm? ( x11-libs/libXpm )
+   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? (
+   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
+   ) )
+   )
+   )"
+
 RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
sys-libs/ncurses:0=
acl? ( virtual/acl )
@@ -72,62 +122,30 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
webp? ( media-libs/libwebp:0= )
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
!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 )
-   xpm? ( x11-libs/libXpm )
-   xft? (
+   gtk? ( !X? (
media-libs/fontconfig
media-libs/freetype
-   x11-libs/libXft
-   x11-libs/libXrender
-   cairo? ( >=x11-libs/cairo-1.12.18 )
+   >=x11-libs/cairo-1.12.18
+   x11-libs/gtk+:3
harfbuzz? ( media-libs/harfbuzz:0= )
m17n-lib? (
>=dev-libs/libotf-0.9.4

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-15 Thread Ulrich Müller

commit: 52ef53c09c72a3a0ba0a24c9f248abe957631bfe
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan 15 13:41:49 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan 15 13:42:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ef53c0

app-editors/emacs: Restore Motif support for emacs-28 and master

Following upstream.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.0.91.ebuild  | 37 -
 app-editors/emacs/emacs-28.0.-r1.ebuild | 37 -
 app-editors/emacs/emacs-29.0..ebuild| 37 -
 3 files changed, 78 insertions(+), 33 deletions(-)

diff --git a/app-editors/emacs/emacs-28.0.91.ebuild 
b/app-editors/emacs/emacs-28.0.91.ebuild
index bf16d7665b2c..89ae30752e40 100644
--- a/app-editors/emacs/emacs-28.0.91.ebuild
+++ b/app-editors/emacs/emacs-28.0.91.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 gui gzip-el harfbuzz imagemagick +inotify jit 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"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif 
+gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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[games?,gui(-)?]
@@ -102,16 +102,24 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
)
)
!gtk? (
-   Xaw3d? (
-   x11-libs/libXaw3d
+   motif? (
+   >=x11-libs/motif-2.3:0
+   x11-libs/libXpm
x11-libs/libXmu
x11-libs/libXt
)
-   !Xaw3d? ( athena? (
-   x11-libs/libXaw
-   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
+   ) )
+   )
)
) )"
 
@@ -227,14 +235,21 @@ src_configure() {
See 
 and

.
If you intend to use more than one display, 
then it is strongly
-   recommended that you compile Emacs with the 
Athena/Lucid
-   toolkit instead.
+   recommended that you compile Emacs with the 
Athena/Lucid or the
+   Motif toolkit instead.
EOF
myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-   for f in Xaw3d athena; do
+   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)"

diff --git a/app-editors/emacs/emacs-28.0.-r1.ebuild 
b/app-editors/emacs/emacs-28.0.-r1.ebuild
index d6dd658ed162..cc2cbac4abcc 100644
--- a/app-editors/emacs/emacs-28.0.-r1.ebuild
+++

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-15 Thread Ulrich Müller

commit: e9a6afccb18a7c2bb00e881ac2ad2e6a023be9df
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan 15 13:03:02 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan 15 13:03:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a6afcc

app-editors/emacs: Sync live ebuilds from 28.0.91 pretest version

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.0.-r1.ebuild | 7 +--
 app-editors/emacs/emacs-29.0..ebuild| 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-editors/emacs/emacs-28.0.-r1.ebuild 
b/app-editors/emacs/emacs-28.0.-r1.ebuild
index 156f7ef44d15..d6dd658ed162 100644
--- a/app-editors/emacs/emacs-28.0.-r1.ebuild
+++ b/app-editors/emacs/emacs-28.0.-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ 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 ~m68k ~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"
@@ -253,6 +253,9 @@ src_configure() {
popd >/dev/null || die
# Don't try to execute the binary for dumping during the build
myconf+=" --with-dumping=none"
+   elif use m68k; then
+   # Workaround for https://debbugs.gnu.org/44531
+   myconf+=" --with-dumping=unexec"
else
myconf+=" --with-dumping=pdumper"
fi

diff --git a/app-editors/emacs/emacs-29.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
index cc1da333c7fd..9018d1a13b21 100644
--- a/app-editors/emacs/emacs-29.0..ebuild
+++ b/app-editors/emacs/emacs-29.0..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ 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 ~m68k ~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"
@@ -253,6 +253,9 @@ src_configure() {
popd >/dev/null || die
# Don't try to execute the binary for dumping during the build
myconf+=" --with-dumping=none"
+   elif use m68k; then
+   # Workaround for https://debbugs.gnu.org/44531
+   myconf+=" --with-dumping=unexec"
else
myconf+=" --with-dumping=pdumper"
fi

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-15 Thread Ulrich Müller

commit: ec9157b85e38e4369bd2c8a2b2d05e3c69372e6a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan 15 12:58:36 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan 15 13:00:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9157b8

app-editors/emacs: Remove live ebuild for emacs-27 branch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-27.2..ebuild | 443 ---
 1 file changed, 443 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
deleted file mode 100644
index 9dd86d34a32b..
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV##*.} =  ]]; 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.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="https://alpha.gnu.org/gnu/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 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[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
-

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-15 Thread Ulrich Müller

commit: 0c2d510268c0e4080e7b703cc2f7640f2f013808
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jan 15 12:57:48 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jan 15 13:00:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2d5102

app-editors/emacs: Pretest version 28.0.91

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 +
 app-editors/emacs/emacs-28.0.91.ebuild | 444 +
 2 files changed, 445 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f7a1257f643e..5084420e0512 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,3 +10,4 @@ DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 
1218c9a69deae0e3a55e061bd0cd2ab2b7
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9
+DIST emacs-28.0.91.tar.xz 47651228 BLAKE2B 
94cfd907cb602ab698ffaa5c29aa1db2ff1b8538e1d6a0e20aa72ac1cb77e3c07759cf28cbe47027b155a08ce305c9c6ae01a6b82eb3468b2f4d4b49d51a3430
 SHA512 
bc325b685c3bb783cae03209107572980197a4278a45b1546e1528d593a476556f227c979d6d6a55ab44f2ca0535ed912a284b89258157bd6c995ab555445133

diff --git a/app-editors/emacs/emacs-28.0.91.ebuild 
b/app-editors/emacs/emacs-28.0.91.ebuild
new file mode 100644
index ..bf16d7665b2c
--- /dev/null
+++ b/app-editors/emacs/emacs-28.0.91.ebuild
@@ -0,0 +1,444 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} =  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git;
+   EGIT_BRANCH="emacs-28"
+   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.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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
+   fi
+   SLOT="${PV%%.*}"
+   [[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 gui gzip-el harfbuzz imagemagick +inotify jit 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[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 ) )
+   jit? ( sys-devel/gcc:=[jit(-)] )
+   json? ( dev-libs/jansson:= )
+   kerberos? ( virtual/krb5 )
+   lcms? (

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2022-01-01 Thread James Le Cuirot

commit: 8523c3faa98a21e8675d70e8fefa3f8a2c16309f
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  1 10:47:39 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  1 10:51:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8523c3fa

app-editors/emacs: Keyword 27.2-r5 for ~m68k

It needs --with-dumping=unexec to work around https://debbugs.gnu.org/44531.

Signed-off-by: James Le Cuirot  gentoo.org>

 app-editors/emacs/emacs-27.2-r5.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild 
b/app-editors/emacs/emacs-27.2-r5.ebuild
index e2efcba31d59..d6c4a74eb424 100644
--- a/app-editors/emacs/emacs-27.2-r5.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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 ~m68k ~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"
@@ -259,6 +259,9 @@ src_configure() {
popd >/dev/null || die
# Don't try to execute the binary for dumping during the build
myconf+=" --with-dumping=none"
+   elif use m68k; then
+   # Workaround for https://debbugs.gnu.org/44531
+   myconf+=" --with-dumping=unexec"
else
myconf+=" --with-dumping=pdumper"
fi

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-10-01 Thread Ulrich Müller

commit: 699caca3e8ccc933bad8530df038556d2fa27d36
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Oct  1 16:42:49 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Oct  1 16:54:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699caca3

app-editors/emacs: Upstream has branched for release.

28.0.-r1 is the live ebuild for the emacs-27 branch.
29.0. is the live ebuild for master.

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/{emacs-28.0..ebuild => emacs-28.0.-r1.ebuild} | 2 +-
 app-editors/emacs/{emacs-28.0..ebuild => emacs-29.0..ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0.-r1.ebuild
similarity index 99%
copy from app-editors/emacs/emacs-28.0..ebuild
copy to app-editors/emacs/emacs-28.0.-r1.ebuild
index cc1da333c7f..156f7ef44d1 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0.-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools elisp-common flag-o-matic readme.gentoo-r1 
toolchain-funcs
 if [[ ${PV##*.} =  ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git;
-   EGIT_BRANCH="master"
+   EGIT_BRANCH="emacs-28"
EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
S="${EGIT_CHECKOUT_DIR}"
SLOT="${PV%%.*}-vcs"

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-29.0..ebuild
similarity index 100%
rename from app-editors/emacs/emacs-28.0..ebuild
rename to app-editors/emacs/emacs-29.0..ebuild

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-09-25 Thread Sam James

commit: d4b7b590052ed4e3e1b9b0b6f33fa30466689b94
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 25 18:59:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 25 19:08:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b7b590

app-editors/emacs: add libjansson subslot dep

Earlier versions of libjansson lacked symbol versioning, causing crashes.

Bug: https://bugs.gentoo.org/812119
Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/{emacs-27.2-r4.ebuild => emacs-27.2-r5.ebuild} | 2 +-
 app-editors/emacs/emacs-27.2..ebuild | 2 +-
 app-editors/emacs/emacs-28.0..ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r5.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-27.2-r4.ebuild
rename to app-editors/emacs/emacs-27.2-r5.ebuild
index e0f01a2c321..e2efcba31d5 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -55,7 +55,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gmp? ( dev-libs/gmp:0= )
gpm? ( sys-libs/gpm )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-   json? ( dev-libs/jansson )
+   json? ( dev-libs/jansson:= )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
index d3ca04ad9dd..9dd86d34a32 100644
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ b/app-editors/emacs/emacs-27.2..ebuild
@@ -52,7 +52,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gmp? ( dev-libs/gmp:0= )
gpm? ( sys-libs/gpm )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-   json? ( dev-libs/jansson )
+   json? ( dev-libs/jansson:= )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index 9050791f1d9..cc1da333c7f 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -53,7 +53,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gpm? ( sys-libs/gpm )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
jit? ( sys-devel/gcc:=[jit(-)] )
-   json? ( dev-libs/jansson )
+   json? ( dev-libs/jansson:= )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-26 Thread Ulrich Müller

commit: 2b4cf0b5e80fed9c66e390b043f4e275a5826ed1
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Aug 26 16:24:42 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Aug 26 16:24:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b4cf0b5

app-editors/emacs: Remove old

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest  |   3 -
 app-editors/emacs/emacs-25.3-r10.ebuild | 356 -
 app-editors/emacs/emacs-26.3-r5.ebuild  | 374 --
 app-editors/emacs/emacs-27.1-r4.ebuild  | 444 ---
 app-editors/emacs/emacs-27.2-r3.ebuild  | 446 
 5 files changed, 1623 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 023ec2a16e9..f7a1257f643 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -4,12 +4,9 @@ DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 
941d939d1a66af162016eb7f4a34a3a6
 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 
33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d
 SHA512 
def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
 DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 
3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66
 SHA512 
fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B 
aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355
 SHA512 
89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
-DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 
93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf
 SHA512 
f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
 DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 
9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154
 SHA512 
fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 
1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682
 SHA512 
0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
-DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
-DIST emacs-27.2-patches-2.tar.xz 7448 BLAKE2B 
4335438a43ba88f6638082bf034c77331808f3fbfee9b746d82bfcb6de5c6b6563c358e92d0296357e3b76c67a58e2b748c3234770a6cbff60170bf91eb1b8af
 SHA512 
b62498a8a26bf7b0939102d37508eb7ea0213f69a2e803cff3346dab70da03b3c63e1df2683cedd6fb85afb928bb1fb0072bfde8da326f4cabfd950457d2d368
 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-25.3-r10.ebuild 
b/app-editors/emacs/emacs-25.3-r10.ebuild
deleted file mode 100644
index 301dd19e48a..000
---

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-26 Thread Sam James

commit: 93245d35e06c1fcc0e4d496d2794a03c0e08e7b6
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 26 14:49:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 26 14:49:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93245d35

app-editors/emacs: Stabilize 26.3-r6 arm64, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-26.3-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
index a000cf096dc..d196a1b1950 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.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"
+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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-26 Thread Sam James

commit: 47cf5efa428295cb3aa8a9c86b82234803140e72
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 26 14:49:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 26 14:49:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47cf5efa

app-editors/emacs: Stabilize 27.2-r4 arm64, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
index ed16b4af7f7..1fdeb87ee15 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-26 Thread Sam James

commit: b46986f40a71f8c3967e4acfdd2e6d81441aa9f9
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 26 14:49:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 26 14:49:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46986f4

app-editors/emacs: Stabilize 25.3-r11 arm64, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-25.3-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index 5d17753253e..00a361aa4b9 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.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="25"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-24 Thread Sam James

commit: 742b73778541a5c0a46716603cb4f44bcd026e1b
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 24 23:23:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 24 23:23:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742b7377

app-editors/emacs: Stabilize 26.3-r6 arm, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-26.3-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
index 93b464b0dfb..a000cf096dc 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.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"
+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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-24 Thread Sam James

commit: e358f02836d3aaacc09fe6ffe3dc2355082ef8b5
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 24 23:23:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 24 23:23:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e358f028

app-editors/emacs: Stabilize 27.2-r4 arm, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
index 8d3b643e00f..ed16b4af7f7 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-24 Thread Sam James

commit: 2fbca18aa4158919061c4a17235d1955d177c9f0
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 24 23:23:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 24 23:23:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbca18a

app-editors/emacs: Stabilize 25.3-r11 arm, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-25.3-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index e9579f43ee1..5d17753253e 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.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="25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-23 Thread Agostino Sarubbo

commit: c9d1d080fd064cfc1830d75140e8064227d810d9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 23 22:15:07 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 23 22:15:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9d1d080

app-editors/emacs: x86 stable wrt bug #809677

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/emacs/emacs-25.3-r11.ebuild | 2 +-
 app-editors/emacs/emacs-26.3-r6.ebuild  | 2 +-
 app-editors/emacs/emacs-27.2-r4.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index ad367e92f28..e9579f43ee1 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.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="25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
index fd5564f9708..93b464b0dfb 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.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"
+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[games?,gui(-)?]

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
index 4491dddacad..8d3b643e00f 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-23 Thread Agostino Sarubbo

commit: c15e507c01c3f9955b87376daac839cd203f1310
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 23 10:48:01 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 23 10:48:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15e507c

app-editors/emacs: sparc stable wrt bug #809677

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/emacs/emacs-25.3-r11.ebuild | 2 +-
 app-editors/emacs/emacs-26.3-r6.ebuild  | 2 +-
 app-editors/emacs/emacs-27.2-r4.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index 753b43b2070..ad367e92f28 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.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="25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
index 1db39ff678f..fd5564f9708 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.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"
+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[games?,gui(-)?]

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
index 9e28707a990..4491dddacad 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-23 Thread Agostino Sarubbo

commit: 8539b6671984872098e2036a541dbb33ea073931
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 23 10:47:18 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 23 10:47:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8539b667

app-editors/emacs: ppc64 stable wrt bug #809677

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/emacs/emacs-25.3-r11.ebuild | 2 +-
 app-editors/emacs/emacs-26.3-r6.ebuild  | 2 +-
 app-editors/emacs/emacs-27.2-r4.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index 451ea13dfed..753b43b2070 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.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="25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
index cf8e65fe158..1db39ff678f 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.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"
+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[games?,gui(-)?]

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
index df3cdc6c3db..9e28707a990 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-23 Thread Agostino Sarubbo

commit: c39919f609dc47c5e25efca9238581f1c243711b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 23 10:46:05 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 23 10:46:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39919f6

app-editors/emacs: ppc stable wrt bug #809677

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/emacs/emacs-25.3-r11.ebuild | 2 +-
 app-editors/emacs/emacs-26.3-r6.ebuild  | 2 +-
 app-editors/emacs/emacs-27.2-r4.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index 16422db61b8..451ea13dfed 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.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="25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
index b8a4f9432dc..cf8e65fe158 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.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"
+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[games?,gui(-)?]

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
index 5efd075355d..df3cdc6c3db 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-22 Thread Sam James

commit: ba4ffc20e00d03202a7255e9326549fb12909eb2
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 23 05:34:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 23 05:35:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4ffc20

app-editors/emacs: Stabilize 26.3-r6 amd64, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-26.3-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild 
b/app-editors/emacs/emacs-26.3-r6.ebuild
index 7601f81ee0e..b8a4f9432dc 100644
--- a/app-editors/emacs/emacs-26.3-r6.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.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"
+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[games?,gui(-)?]

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-22 Thread Sam James

commit: 52d73a586891a1f91ce84dba96eb732cd1fdb0d0
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 23 05:34:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 23 05:35:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52d73a58

app-editors/emacs: Stabilize 25.3-r11 amd64, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-25.3-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
index 1b851ec3138..16422db61b8 100644
--- a/app-editors/emacs/emacs-25.3-r11.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.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="25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-08-22 Thread Sam James

commit: 3580a44c765cd76bdd5c32c6ab95340459ec4268
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 23 05:34:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 23 05:35:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3580a44c

app-editors/emacs: Stabilize 27.2-r4 amd64, #809677

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.2-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild 
b/app-editors/emacs/emacs-27.2-r4.ebuild
index f1c41cc33a9..5efd075355d 100644
--- a/app-editors/emacs/emacs-27.2-r4.ebuild
+++ b/app-editors/emacs/emacs-27.2-r4.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-24 Thread Ulrich Müller

commit: 019d5f364c36a027f2a262dc4918e710a41b42ad
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul 24 19:36:31 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Jul 24 19:37:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019d5f36

app-editors/emacs: Fix compilation with glibc-2.34

Closes: https://bugs.gentoo.org/803644
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest  |   3 +
 app-editors/emacs/emacs-25.3-r11.ebuild | 356 +
 app-editors/emacs/emacs-26.3-r6.ebuild  | 376 +++
 app-editors/emacs/emacs-27.2-r4.ebuild  | 446 
 4 files changed, 1181 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 98a01d3a490..023ec2a16e9 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,8 +5,11 @@ DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 
33dac5d27a63b7aab6b4053964a0ecf7f7939c7
 DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 
3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66
 SHA512 
fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B 
aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355
 SHA512 
89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 
93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf
 SHA512 
f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
+DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 
9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154
 SHA512 
fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
+DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 
1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682
 SHA512 
0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 DIST emacs-27.2-patches-2.tar.xz 7448 BLAKE2B 
4335438a43ba88f6638082bf034c77331808f3fbfee9b746d82bfcb6de5c6b6563c358e92d0296357e3b76c67a58e2b748c3234770a6cbff60170bf91eb1b8af
 SHA512 
b62498a8a26bf7b0939102d37508eb7ea0213f69a2e803cff3346dab70da03b3c63e1df2683cedd6fb85afb928bb1fb0072bfde8da326f4cabfd950457d2d368
+DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B 
c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e
 SHA512 
a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild 
b/app-editors/emacs/emacs-25.3-r11.ebuild
new file mode 100644
index 000..1b851ec3138
--- /dev/null
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-18 Thread Ulrich Müller

commit: 7c100c03b83a047e52ef7caf4ae50642287e9dd6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul 18 08:56:30 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul 18 09:05:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c100c03

app-editors/emacs: Mark 27.2-r3 as stable

The EAPI 8 bump updated only metadata variables, therefore stabilise
without arch testing.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-27.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2-r3.ebuild 
b/app-editors/emacs/emacs-27.2-r3.ebuild
index 8ddc3b04d18..413825937aa 100644
--- a/app-editors/emacs/emacs-27.2-r3.ebuild
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild
@@ -36,7 +36,7 @@ else
PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-18 Thread Ulrich Müller

commit: 08e8b994cf2e5910ad022c7b9f1c68fe9b2991e6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul 18 08:59:13 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul 18 09:05:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e8b994

app-editors/emacs: Bump remaining slots to EAPI 8

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../{emacs-18.59-r13.ebuild => emacs-18.59-r14.ebuild}   | 16 
 .../{emacs-23.4-r20.ebuild => emacs-23.4-r21.ebuild} | 10 +-
 .../{emacs-24.5-r10.ebuild => emacs-24.5-r11.ebuild} | 10 +-
 .../{emacs-25.3-r9.ebuild => emacs-25.3-r10.ebuild}  | 10 +-
 .../emacs/{emacs-26.3-r4.ebuild => emacs-26.3-r5.ebuild} | 11 +--
 5 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild 
b/app-editors/emacs/emacs-18.59-r14.ebuild
similarity index 93%
rename from app-editors/emacs/emacs-18.59-r13.ebuild
rename to app-editors/emacs/emacs-18.59-r14.ebuild
index 105fc78984d..053a862305e 100644
--- a/app-editors/emacs/emacs-18.59-r13.ebuild
+++ b/app-editors/emacs/emacs-18.59-r14.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs flag-o-matic multilib eapi8-dosym
+inherit toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="The extensible self-documenting text editor"
 HOMEPAGE="https://www.gnu.org/software/emacs/;
@@ -28,11 +28,11 @@ DEPEND="${RDEPEND}
x11-misc/xbitmaps
)"
 
-BDEPEND="app-eselect/eselect-emacs
-   virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
-RDEPEND="${RDEPEND}
-   app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 PATCHES=("${WORKDIR}/patch")
 
@@ -123,7 +123,7 @@ src_install() {
yow env server
do
mv "${D}"${basedir}/etc/${i} 
"${D}"/usr/libexec/emacs/${PV}/${i} || die
-   dosym8 -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
+   dosym -r /usr/libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
done
for i in test-distrib make-docfile; do
rm "${D}"${basedir}/etc/${i} || die
@@ -135,7 +135,7 @@ src_install() {
# move Info files
dodir /usr/share/info
mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-   dosym8 -r /usr/share/info/emacs-${SLOT} ${basedir}/info
+   dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info
docompress -x /usr/share/info
 
# move Info dir to avoid collisions with the dir file generated by 
portage

diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild 
b/app-editors/emacs/emacs-23.4-r21.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-23.4-r20.ebuild
rename to app-editors/emacs/emacs-23.4-r21.ebuild
index 834facf2604..e491036d078 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 WANT_AUTOMAKE="none"
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
@@ -76,12 +76,12 @@ RDEPEND="acct-group/mail
 DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-   virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-   app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild 
b/app-editors/emacs/emacs-24.5-r11.ebuild
similarity index 98%
rename from app-editors/emacs/emacs-24.5-r10.ebuild
rename to app-editors/emacs/emacs-24.5-r11.ebuild
index 5720b4449dc..3f9cc786044 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1
 
@@ -83,12 +83,12 @@ RDEPEND="acct-group/mail
 DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-   virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-   app-eselect/eselect-emacs"
+IDEPEND="app-eselect/eselect-emacs"
+
+RDEPEND+=" ${IDEPEND}"
 
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild 
b/app-editors/emacs/emacs-25.3-r10.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-25.3-r9.ebuild
rename to app-editors/emacs/emacs-25.3-r10.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-18 Thread Ulrich Müller

commit: d5d96abc8fdba35bba9534936835309da2799dba
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul 18 08:57:47 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul 18 09:05:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d96abc

app-editors/emacs: Remove old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-27.2-r2.ebuild | 446 -
 1 file changed, 446 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2-r2.ebuild 
b/app-editors/emacs/emacs-27.2-r2.ebuild
deleted file mode 100644
index c86c316c8f2..000
--- a/app-editors/emacs/emacs-27.2-r2.ebuild
+++ /dev/null
@@ -1,446 +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 toolchain-funcs
-
-if [[ ${PV##*.} =  ]]; 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.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="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
-   fi
-   # Patchset from proj/emacs-patches.git
-   SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz;
-   PATCHES=("${WORKDIR}/patch")
-   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 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[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? (
-

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-18 Thread Ulrich Müller

commit: a7d0a9a90433a2977a632e05f4df770d9e213e79
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul 18 08:53:01 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul 18 09:05:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7d0a9a9

app-editors/emacs: Simplify IDEPEND/RDEPEND assignment

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-27.2-r3.ebuild   | 7 +++
 app-editors/emacs/emacs-27.2..ebuild | 7 +++
 app-editors/emacs/emacs-28.0..ebuild | 5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2-r3.ebuild 
b/app-editors/emacs/emacs-27.2-r3.ebuild
index 0245ab3cc2d..8ddc3b04d18 100644
--- a/app-editors/emacs/emacs-27.2-r3.ebuild
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild
@@ -132,12 +132,11 @@ BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-   !app-editors/emacs-vcs:27
-   app-eselect/eselect-emacs"
-
 IDEPEND="app-eselect/eselect-emacs"
 
+RDEPEND+=" ${IDEPEND}
+   !app-editors/emacs-vcs:27"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
index 6e936382b21..d3ca04ad9dd 100644
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ b/app-editors/emacs/emacs-27.2..ebuild
@@ -129,12 +129,11 @@ BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-   !app-editors/emacs-vcs:27
-   app-eselect/eselect-emacs"
-
 IDEPEND="app-eselect/eselect-emacs"
 
+RDEPEND+=" ${IDEPEND}
+   !app-editors/emacs-vcs:27"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index f5a41b7f06e..9050791f1d9 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -122,11 +122,10 @@ BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
-RDEPEND="${RDEPEND}
-   app-eselect/eselect-emacs"
-
 IDEPEND="app-eselect/eselect-emacs"
 
+RDEPEND+=" ${IDEPEND}"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-12 Thread Ulrich Müller

commit: 6937b367c618f82930e200f8f72efbf42c8126da
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jul 12 14:45:30 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jul 12 14:52:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6937b367

app-editors/emacs: Bump to EAPI 8

Move app-eselect/eselect-emacs from BDEPEND to IDEPEND.

Closes: https://bugs.gentoo.org/716334
Suggested-by: David Michael  gmail.com>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../emacs/{emacs-27.2..ebuild => emacs-27.2-r3.ebuild}   | 12 
 app-editors/emacs/emacs-27.2..ebuild |  7 ---
 app-editors/emacs/emacs-28.0..ebuild |  7 ---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2-r3.ebuild
similarity index 98%
copy from app-editors/emacs/emacs-27.2..ebuild
copy to app-editors/emacs/emacs-27.2-r3.ebuild
index 7089e4a9a73..0245ab3cc2d 100644
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ b/app-editors/emacs/emacs-27.2-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
@@ -31,6 +31,9 @@ else
elif [[ ${PV//[0-9]} != "." ]]; then

SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
fi
+   # Patchset from proj/emacs-patches.git
+   SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz;
+   PATCHES=("${WORKDIR}/patch")
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"
@@ -125,8 +128,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-   sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
@@ -134,6 +136,8 @@ RDEPEND="${RDEPEND}
!app-editors/emacs-vcs:27
app-eselect/eselect-emacs"
 
+IDEPEND="app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 
@@ -154,7 +158,7 @@ src_prepare() {
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 
-   AT_M4DIR=m4 eautoreconf
+   #AT_M4DIR=m4 eautoreconf
 }
 
 src_configure() {

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
index 7089e4a9a73..6e936382b21 100644
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ b/app-editors/emacs/emacs-27.2..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
@@ -125,8 +125,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-   sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
@@ -134,6 +133,8 @@ RDEPEND="${RDEPEND}
!app-editors/emacs-vcs:27
app-eselect/eselect-emacs"
 
+IDEPEND="app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index e3586a88f10..f5a41b7f06e 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 
@@ -118,14 +118,15 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
 DEPEND="${RDEPEND}
gui? ( !aqua? ( x11-base/xorg-proto ) )"
 
-BDEPEND="app-eselect/eselect-emacs
-   sys-apps/texinfo
+BDEPEND="sys-apps/texinfo
virtual/pkgconfig
gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
app-eselect/eselect-emacs"
 
+IDEPEND="app-eselect/eselect-emacs"
+
 EMACS_SUFFIX="emacs-${SLOT}"
 SITEFILE="20${EMACS_SUFFIX}-gentoo.el"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-12 Thread Ulrich Müller

commit: 07eaa92245ec0d73522a721eddbb40514a049159
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Jul 12 11:24:08 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Jul 12 11:49:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07eaa922

app-editors/emacs: Check for gcc in jit workaround

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index 682e0651a36..e3586a88f10 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -148,7 +148,7 @@ src_prepare() {
 
# gccjit doesn't play well with ccache #801580
# For now, work around the problem with an explicit LIBRARY_PATH
-   has ccache ${FEATURES} \
+   has ccache ${FEATURES} && tc-is-gcc \
&& export LIBRARY_PATH=$("$(tc-getCC)" 
-print-search-dirs \
| sed -n '/^libraries:/{s:^[^/]*::;p}')
fi

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-11 Thread Ulrich Müller

commit: e9c9bb65fa5b39932c7651c424295f262a4e8060
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul 11 18:48:58 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul 11 18:48:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c9bb65

app-editors/emacs: Whitespace fix

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.0..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index 4a6795ce801..682e0651a36 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -145,6 +145,7 @@ src_prepare() {
# These files ignore LDFLAGS. We assign the variable here, 
because
# for live ebuilds FULL_VERSION doesn't exist in global scope

QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
# gccjit doesn't play well with ccache #801580
# For now, work around the problem with an explicit LIBRARY_PATH
has ccache ${FEATURES} \

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-11 Thread Ulrich Müller

commit: 5bd9495d157f02609a2942992e42cf08121ea15a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul 11 18:45:12 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul 11 18:45:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd9495d

app-editors/emacs: Work around jit not working with ccache

Bug: https://bugs.gentoo.org/801580
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.0..ebuild | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index aeefea10ed8..4a6795ce801 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -141,9 +141,16 @@ src_prepare() {
|| die "Upstream version number changed to 
${FULL_VERSION}"
fi
 
-   # These files ignore LDFLAGS. We assign the variable here, because
-   # for live ebuilds FULL_VERSION doesn't exist in global scope
-   use jit && 
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+   if use jit; then
+   # These files ignore LDFLAGS. We assign the variable here, 
because
+   # for live ebuilds FULL_VERSION doesn't exist in global scope
+   
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+   # gccjit doesn't play well with ccache #801580
+   # For now, work around the problem with an explicit LIBRARY_PATH
+   has ccache ${FEATURES} \
+   && export LIBRARY_PATH=$("$(tc-getCC)" 
-print-search-dirs \
+   | sed -n '/^libraries:/{s:^[^/]*::;p}')
+   fi
 
default

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-07-04 Thread Ulrich Müller

commit: 835822dd3001d0b438f13fdb99329c636f8a2733
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Jul  4 07:24:51 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul  4 07:27:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835822dd

app-editors/emacs: Update IRC patch for 27.2

Patch taken from upstream emacs-27 branch.

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest   | 2 +-
 app-editors/emacs/{emacs-27.2-r1.ebuild => emacs-27.2-r2.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 0b714e2dba5..98a01d3a490 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,5 +8,5 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 
93c6a18e7f729a5b4d299974581c99835e
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
-DIST emacs-27.2-patches-1.tar.xz 1544 BLAKE2B 
a93348607338c1b9c0cda669669dc3421f1a172a5946142f7da8f8548e47bc83274ec42d1c47ffb07633a3a451611a0a94b863c0fc1ea19617b00217bcf85617
 SHA512 
a69d8000dc57de6399d97f0e512ebc7d46acec98d967c19c980d7f6e6f5708bd2b5ff25baea9d09e83a484085cdbbe12239cf518f28d333ddc76fa852a94
+DIST emacs-27.2-patches-2.tar.xz 7448 BLAKE2B 
4335438a43ba88f6638082bf034c77331808f3fbfee9b746d82bfcb6de5c6b6563c358e92d0296357e3b76c67a58e2b748c3234770a6cbff60170bf91eb1b8af
 SHA512 
b62498a8a26bf7b0939102d37508eb7ea0213f69a2e803cff3346dab70da03b3c63e1df2683cedd6fb85afb928bb1fb0072bfde8da326f4cabfd950457d2d368
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-27.2-r1.ebuild 
b/app-editors/emacs/emacs-27.2-r2.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-27.2-r1.ebuild
rename to app-editors/emacs/emacs-27.2-r2.ebuild
index b70bb5b2af1..c86c316c8f2 100644
--- a/app-editors/emacs/emacs-27.2-r1.ebuild
+++ b/app-editors/emacs/emacs-27.2-r2.ebuild
@@ -32,7 +32,7 @@ else

SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
fi
# Patchset from proj/emacs-patches.git
-   SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz;
+   SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz;
PATCHES=("${WORKDIR}/patch")
SLOT="${PV%%.*}"
[[ ${PV} == *.*.* ]] && SLOT+="-vcs"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-06-16 Thread Ulrich Müller

commit: 2549a151f87321e6ff5103646f829e32ea9b5fbb
Author: Ulrich Müller  gentoo  org>
AuthorDate: Wed Jun 16 10:38:38 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed Jun 16 10:40:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2549a151

app-editors/emacs: Add Libera.Chat to ERC services

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest| 1 +
 app-editors/emacs/{emacs-27.2.ebuild => emacs-27.2-r1.ebuild} | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ae632526eeb..0b714e2dba5 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,4 +8,5 @@ DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 
93c6a18e7f729a5b4d299974581c99835e
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
+DIST emacs-27.2-patches-1.tar.xz 1544 BLAKE2B 
a93348607338c1b9c0cda669669dc3421f1a172a5946142f7da8f8548e47bc83274ec42d1c47ffb07633a3a451611a0a94b863c0fc1ea19617b00217bcf85617
 SHA512 
a69d8000dc57de6399d97f0e512ebc7d46acec98d967c19c980d7f6e6f5708bd2b5ff25baea9d09e83a484085cdbbe12239cf518f28d333ddc76fa852a94
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2-r1.ebuild
similarity index 99%
rename from app-editors/emacs/emacs-27.2.ebuild
rename to app-editors/emacs/emacs-27.2-r1.ebuild
index 271469e3625..b70bb5b2af1 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2-r1.ebuild
@@ -31,6 +31,9 @@ else
elif [[ ${PV//[0-9]} != "." ]]; then

SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz;
fi
+   # Patchset from proj/emacs-patches.git
+   SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz;
+   PATCHES=("${WORKDIR}/patch")
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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-06-07 Thread Sergei Trofimovich

commit: 5e1317901abcf308b0085cc040f34f2961375770
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jun  7 06:22:17 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun  7 06:25:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e131790

app-editors/emacs: stable 27.2 for ppc

stable wrt bug #793113

Package-Manager: Portage-3.0.19, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-editors/emacs/emacs-27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index b5355a44356..271469e3625 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-06-03 Thread Sam James

commit: f56610d7eff3cc85833f9a23b2fd6bfdc4c8f3fd
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  3 16:24:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  3 16:26:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56610d7

app-editors/emacs: Stabilize 27.2 arm64, #793113

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index 34b8dd062d8..b5355a44356 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-06-03 Thread Sam James

commit: 792241443c976a162a53f61174a3813648c4b128
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  3 08:19:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  3 08:21:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79224144

app-editors/emacs: Stabilize 27.2 x86, #793113

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index b787eaefed2..34b8dd062d8 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-06-02 Thread Sam James

commit: 7a265a58457fd82427c047bf498932909e88336d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  2 16:42:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  2 16:42:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a265a58

app-editors/emacs: Stabilize 27.2 amd64, #793113

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index 4e3b1793cbd..b787eaefed2 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-06-01 Thread Agostino Sarubbo

commit: eb8a95c013695c52cd109ffb2e8f5838ec5a2a27
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  1 06:57:00 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  1 06:57:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8a95c0

app-editors/emacs: sparc stable wrt bug #793113

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/emacs/emacs-27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index acc3746167b..4e3b1793cbd 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-06-01 Thread Agostino Sarubbo

commit: adc18ca2c6bff29c2e00c025e17797260bf4b5f1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  1 06:35:42 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  1 06:35:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc18ca2

app-editors/emacs: ppc64 stable wrt bug #793113

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/emacs/emacs-27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index b170f83ea59..acc3746167b 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-05-31 Thread Sam James

commit: a9d01a5fa99046005741980ed289850c07e095cc
Author: Sam James  gentoo  org>
AuthorDate: Mon May 31 07:55:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 31 07:55:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d01a5f

app-editors/emacs: Stabilize 27.2 arm, #793113

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index e8a61860e0c..b170f83ea59 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-05-30 Thread Ulrich Müller

commit: c9212800c9d3ecbcca2150dd68fc57c4b85fd29a
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon May 31 05:26:28 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon May 31 05:41:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9212800

app-editors/emacs: Clean up cleanup in src_install

Upstream doesn't install /usr/share/appdata since some time.

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-26.3-r4.ebuild   | 2 +-
 app-editors/emacs/emacs-27.1-r4.ebuild   | 2 +-
 app-editors/emacs/emacs-27.2..ebuild | 2 +-
 app-editors/emacs/emacs-27.2.ebuild  | 2 +-
 app-editors/emacs/emacs-28.0..ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild 
b/app-editors/emacs/emacs-26.3-r4.ebuild
index fe5c125a481..17aae4994de 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -262,7 +262,7 @@ src_install() {
 
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-   rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+   rm -rf "${ED}"/usr/share/{applications,icons} || die
rm -rf "${ED}/usr/$(get_libdir)" || die
rm -rf "${ED}"/var || die
 

diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild 
b/app-editors/emacs/emacs-27.1-r4.ebuild
index 86cf0e3326d..e465593dcfc 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -326,7 +326,7 @@ src_install() {
 
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-   rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+   rm -rf "${ED}"/usr/share/{applications,icons} || die
rm -rf "${ED}/usr/$(get_libdir)" || die
rm -rf "${ED}"/var || die
 

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
index 1efba0ded78..7089e4a9a73 100644
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ b/app-editors/emacs/emacs-27.2..ebuild
@@ -325,7 +325,7 @@ src_install() {
 
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-   rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+   rm -rf "${ED}"/usr/share/{applications,icons} || die
rm -rf "${ED}/usr/$(get_libdir)" || die
rm -rf "${ED}"/var || die
 

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
index 4c0d1595de9..e8a61860e0c 100644
--- a/app-editors/emacs/emacs-27.2.ebuild
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -325,7 +325,7 @@ src_install() {
 
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-   rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+   rm -rf "${ED}"/usr/share/{applications,icons} || die
rm -rf "${ED}/usr/$(get_libdir)" || die
rm -rf "${ED}"/var || die
 

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index 67f83fec1f1..aeefea10ed8 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -315,7 +315,7 @@ src_install() {
 
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
-   rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
+   rm -rf "${ED}"/usr/share/{applications,icons} || die
rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
rm -rf "${ED}"/var || die

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-05-30 Thread Georgy Yakovlev

commit: a675866ddfdf4ea157af9f3771327d0b760ee9d8
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun May 30 23:07:53 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun May 30 23:13:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a675866d

app-editors/emacs: upstream renamed appdata.xml -> metainfo.xml

fixes src_install()

Signed-off-by: Georgy Yakovlev  gentoo.org>

 app-editors/emacs/emacs-28.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index 68c27b5b493..67f83fec1f1 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -300,7 +300,7 @@ src_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
+   mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-05-26 Thread Ulrich Müller

commit: 04d9a90c8f5b90c903557033a4059a0e5981b619
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue May 25 14:45:09 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed May 26 08:13:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d9a90c

app-editors/emacs: Make PATCHES an array

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-18.59-r13.ebuild | 4 ++--
 app-editors/emacs/emacs-23.4-r20.ebuild  | 4 ++--
 app-editors/emacs/emacs-24.5-r10.ebuild  | 4 ++--
 app-editors/emacs/emacs-25.3-r9.ebuild   | 4 ++--
 app-editors/emacs/emacs-26.3-r4.ebuild   | 3 +--
 app-editors/emacs/emacs-27.1-r4.ebuild   | 2 +-
 app-editors/emacs/emacs-27.2..ebuild | 2 +-
 app-editors/emacs/emacs-27.2.ebuild  | 2 +-
 app-editors/emacs/emacs-28.0..ebuild | 2 +-
 9 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild 
b/app-editors/emacs/emacs-18.59-r13.ebuild
index 8b1d8fc4bd2..105fc78984d 100644
--- a/app-editors/emacs/emacs-18.59-r13.ebuild
+++ b/app-editors/emacs/emacs-18.59-r13.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
@@ -34,7 +34,7 @@ BDEPEND="app-eselect/eselect-emacs
 RDEPEND="${RDEPEND}
app-eselect/eselect-emacs"
 
-PATCHES="../patch"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
default

diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild 
b/app-editors/emacs/emacs-23.4-r20.ebuild
index f46ce1b68c8..834facf2604 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -90,10 +90,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
-   eapply ../patch
-   eapply_user
+   default
 
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|| die "unable to sed ctags.1"

diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild 
b/app-editors/emacs/emacs-24.5-r10.ebuild
index c9d98111c2b..5720b4449dc 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -97,10 +97,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
-   eapply ../patch
-   eapply_user
+   default
 
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild 
b/app-editors/emacs/emacs-25.3-r9.ebuild
index b7a2c457507..0995daeae65 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -100,10 +100,10 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
 # operations later on
 FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
 
 src_prepare() {
-   eapply ../patch
-   eapply_user
+   default
 
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \

diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild 
b/app-editors/emacs/emacs-26.3-r4.ebuild
index 4dc17e9bd91..fe5c125a481 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -110,8 +110,7 @@ FULL_VERSION="${PV%%_*}"
 S="${WORKDIR}/emacs-${FULL_VERSION}"
 
 src_prepare() {
-   #eapply ../patch
-   eapply_user
+   default
 
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die

diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild 
b/app-editors/emacs/emacs-27.1-r4.ebuild
index a296afd19d0..86cf0e3326d 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -150,7 +150,7 @@ src_prepare() {
|| die "Upstream version number changed to 
${FULL_VERSION}"
fi
 
-   eapply_user
+   default
 
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
index d565c8aad9a..1efba0ded78 100644
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ b/app-editors/emacs/emacs-27.2..ebuild
@@ -149,7 +149,7 @@ src_prepare() {
|| die "Upstream version number changed to 
${FULL_VERSION}"
fi
 
-   eapply_user
+   default
 
# Fix filename reference in redirected man page
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die

diff --git a/app-editors/emacs/emacs-27.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-05-16 Thread Ulrich Müller

commit: 1dc9ddc63ed66854bd981378c9d2f0b523694837
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun May 16 09:27:29 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon May 17 04:57:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc9ddc6

app-editors/emacs: add gccjit support to version 28

Landed upstream in 289000eee729689b0cf362a21baa40ac7f9506f6
requires gcc built with USE=jit

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev  gentoo.org>
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.0..ebuild | 10 --
 app-editors/emacs/metadata.xml   |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index d1f8dc79560..e37d8033bea 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..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 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"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif 
+gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit 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[games?,gui(-)?]
@@ -52,6 +52,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gmp? ( dev-libs/gmp:0= )
gpm? ( sys-libs/gpm )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+   jit? ( sys-devel/gcc:=[jit(-)] )
json? ( dev-libs/jansson )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
@@ -140,6 +141,10 @@ src_prepare() {
|| die "Upstream version number changed to 
${FULL_VERSION}"
fi
 
+   # These files ignore LDFLAGS. We assign the variable here, because
+   # for live ebuilds FULL_VERSION doesn't exist in global scope
+   use jit && 
QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
eapply_user
 
# Fix filename reference in redirected man page
@@ -261,6 +266,7 @@ src_configure() {
$(use_with games gameuser ":gamestat") \
$(use_with gmp libgmp) \
$(use_with gpm) \
+   $(use_with jit native-compilation) \
$(use_with json) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with lcms lcms2) \
@@ -310,7 +316,7 @@ src_install() {
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
-   rm -rf "${ED}/usr/$(get_libdir)" || die
+   rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
rm -rf "${ED}"/var || die
 
# remove unused /site-lisp dir

diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 62697703545..48f1ffacb83 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -38,6 +38,8 @@
 engine
   Use media-gfx/imagemagick for image
 processing
+  Compile with Emacs Lisp native compiler support via
+libgccjit
   Compile with native JSON support using
 dev-libs/jansson
   Use dev-libs/libxml2 to parse XML instead

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-05-16 Thread Ulrich Müller

commit: c84fe1a9f1f351895a8069b8d92fae892150b08d
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun May 16 07:17:16 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun May 16 07:30:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84fe1a9

app-editors/emacs: Add some die statements after rm commands

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-23.4-r20.ebuild  | 16 
 app-editors/emacs/emacs-24.5-r10.ebuild  | 12 ++--
 app-editors/emacs/emacs-25.3-r9.ebuild   | 12 ++--
 app-editors/emacs/emacs-26.3-r4.ebuild   | 14 +++---
 app-editors/emacs/emacs-27.1-r4.ebuild   | 14 +++---
 app-editors/emacs/emacs-27.2..ebuild | 14 +++---
 app-editors/emacs/emacs-27.2.ebuild  | 14 +++---
 app-editors/emacs/emacs-28.0..ebuild | 14 +++---
 8 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild 
b/app-editors/emacs/emacs-23.4-r20.ebuild
index 245667931c0..f46ce1b68c8 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -255,15 +255,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 
# avoid collision between slots, see bug #169033 e.g.
-   rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-   rm -rf "${ED}"/usr/share/{applications,icons}
-   rm -rf "${ED}"/var
+   rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+   rm -rf "${ED}"/usr/share/{applications,icons} || die
+   rm -rf "${ED}"/var || die
 
# remove unused /site-lisp dir
-   rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+   rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
 
# remove COPYING file (except for etc/COPYING used by describe-copying)
-   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
 
local cdir
if use source; then
@@ -273,8 +273,8 @@ src_install() {
# C source you might find via find-function
doins src/*.{c,h,m}
doins -r src/{m,s}
-   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
-   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die
+   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README || 
die
elif has installsources ${FEATURES}; then
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
@@ -303,7 +303,7 @@ src_install() {
 
if use gui && use aqua; then
dodir /Applications/Gentoo
-   rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+   rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi

diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild 
b/app-editors/emacs/emacs-24.5-r10.ebuild
index 3358010308c..c9d98111c2b 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -244,15 +244,15 @@ src_install() {
fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
 
# avoid collision between slots, see bug #169033 e.g.
-   rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-   rm -rf "${ED}"/usr/share/{applications,icons}
-   rm -rf "${ED}"/var
+   rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
+   rm -rf "${ED}"/usr/share/{applications,icons} || die
+   rm -rf "${ED}"/var || die
 
# remove unused /site-lisp dir
-   rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+   rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die
 
# remove COPYING file (except for etc/COPYING used by describe-copying)
-   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+   rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die
 
if use gzip-el; then
# compress .el files when a corresponding .elc exists
@@ -296,7 +296,7 @@ src_install() {
 
if use gui && use aqua; then
dodir /Applications/Gentoo
-   rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+   rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
mv nextstep/Emacs.app \
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
fi

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild 
b/app-editors/emacs/emacs-25.3-r9.ebuild
index 2ef65527eee..c41040407de 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -253,15 +253,15 @@

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-05-16 Thread Ulrich Müller

commit: 58604526b17f882d5702fa3cbe2fb6eb53ae51b6
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun May 16 07:29:55 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun May 16 07:30:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58604526

app-editors/emacs: Remove old blocker against emacs-vcs

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-25.3-r9.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild 
b/app-editors/emacs/emacs-25.3-r9.ebuild
index c41040407de..b7a2c457507 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -91,7 +91,6 @@ BDEPEND="app-eselect/eselect-emacs
gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-   !

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-04-11 Thread Ulrich Müller

commit: 79230d7997e8f3960cc6c95223eddeb92aa12590
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sun Apr 11 11:59:14 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Apr 11 11:59:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79230d79

app-editors/emacs: Remove compatibility code in pkg_postinst

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-23.4-r20.ebuild  | 3 ---
 app-editors/emacs/emacs-24.5-r10.ebuild  | 3 ---
 app-editors/emacs/emacs-25.3-r9.ebuild   | 3 ---
 app-editors/emacs/emacs-26.3-r4.ebuild   | 3 ---
 app-editors/emacs/emacs-27.1-r4.ebuild   | 3 ---
 app-editors/emacs/emacs-27.2..ebuild | 3 ---
 app-editors/emacs/emacs-27.2.ebuild  | 3 ---
 app-editors/emacs/emacs-28.0..ebuild | 3 ---
 8 files changed, 24 deletions(-)

diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild 
b/app-editors/emacs/emacs-23.4-r20.ebuild
index 0d973f9bfa6..245667931c0 100644
--- a/app-editors/emacs/emacs-23.4-r20.ebuild
+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
@@ -344,9 +344,6 @@ pkg_postinst() {
# 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

diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild 
b/app-editors/emacs/emacs-24.5-r10.ebuild
index 29a79f9eda9..3358010308c 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
@@ -336,9 +336,6 @@ pkg_postinst() {
# 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

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild 
b/app-editors/emacs/emacs-25.3-r9.ebuild
index 046d2d03a3a..2ef65527eee 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
@@ -346,9 +346,6 @@ pkg_postinst() {
# 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

diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild 
b/app-editors/emacs/emacs-26.3-r4.ebuild
index f8e6373953e..34237af4f67 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -365,9 +365,6 @@ pkg_postinst() {
# 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

diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild 
b/app-editors/emacs/emacs-27.1-r4.ebuild
index 84733a91bbc..f7ad194e0ef 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -433,9 +433,6 @@ pkg_postinst() {
# 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

diff --git a/app-editors/emacs/emacs-27.2..ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
index cf4fb3cdad1..7f3c223e9ed 100644
--- a/app-editors/emacs/emacs-27.2..ebuild
+++ b/app-editors/emacs/emacs-27.2..ebuild
@@ -432,9 +432,6 @@ pkg_postinst() {
# 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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-03-26 Thread Ulrich Müller

commit: 5dd766d536f596a8e1c3b605fcf5bfc341e74778
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Mar 26 15:40:55 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Mar 26 17:49:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd766d5

app-editors/emacs: Remove prerelease versions

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest|   2 -
 app-editors/emacs/emacs-27.1.91-r1.ebuild | 446 --
 app-editors/emacs/emacs-27.2_rc1.ebuild   | 446 --
 3 files changed, 894 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a5bb624f443..ae632526eeb 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,7 +7,5 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B 
aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 
93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf
 SHA512 
f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
-DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 
50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd
 SHA512 
37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
-DIST emacs-27.2-rc1.tar.xz 44630360 BLAKE2B 
aec7da38f23c440dbea4205ad22b90a61d3abae4e40c65185b250d3cadcf8f39e626f0ef09e032a897ffe6d40afd5a1ac192246332f1384745454bcaa91bb077
 SHA512 
9c6f337fb593594a92df5024fa47a28abbc59e4d2c06d807ecc1bed33cfb94df46d1e8a04e3f4aa4ca82e8fdd64d1e82b5a0423dc22cb6b1dd4571dca22ea4a8
 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-27.1.91-r1.ebuild 
b/app-editors/emacs/emacs-27.1.91-r1.ebuild
deleted file mode 100644
index d7bfdd69550..000
--- a/app-editors/emacs/emacs-27.1.91-r1.ebuild
+++ /dev/null
@@ -1,446 +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 toolchain-funcs
-
-if [[ ${PV##*.} =  ]]; 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.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="https://alpha.gnu.org/gnu/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

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-03-26 Thread Ulrich Müller

commit: c0d4dcceff5c1787b878bf521513f55b71fcd4c2
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Mar 26 15:38:34 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Mar 26 17:49:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d4dcce

app-editors/emacs: Version bump to 27.2

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest  |   1 +
 app-editors/emacs/emacs-27.2.ebuild | 446 
 2 files changed, 447 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 418ba56455f..a5bb624f443 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,3 +10,4 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee7
 DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 
50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd
 SHA512 
37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
 DIST emacs-27.2-rc1.tar.xz 44630360 BLAKE2B 
aec7da38f23c440dbea4205ad22b90a61d3abae4e40c65185b250d3cadcf8f39e626f0ef09e032a897ffe6d40afd5a1ac192246332f1384745454bcaa91bb077
 SHA512 
9c6f337fb593594a92df5024fa47a28abbc59e4d2c06d807ecc1bed33cfb94df46d1e8a04e3f4aa4ca82e8fdd64d1e82b5a0423dc22cb6b1dd4571dca22ea4a8
+DIST emacs-27.2.tar.xz 44624480 BLAKE2B 
245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156
 SHA512 
0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9

diff --git a/app-editors/emacs/emacs-27.2.ebuild 
b/app-editors/emacs/emacs-27.2.ebuild
new file mode 100644
index 000..d7bfdd69550
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2.ebuild
@@ -0,0 +1,446 @@
+# 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 toolchain-funcs
+
+if [[ ${PV##*.} =  ]]; 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.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="https://alpha.gnu.org/gnu/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 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[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 )
+

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-03-26 Thread Ulrich Müller

commit: 99bc8ee8b6af75035ed7e3955578136be5c0e004
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Mar 26 17:49:28 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Mar 26 17:49:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99bc8ee8

app-editors/emacs: Update version for Emacs 27 live ebuild

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/{emacs-27.1.-r1.ebuild => emacs-27.2..ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-editors/emacs/emacs-27.1.-r1.ebuild 
b/app-editors/emacs/emacs-27.2..ebuild
similarity index 100%
rename from app-editors/emacs/emacs-27.1.-r1.ebuild
rename to app-editors/emacs/emacs-27.2..ebuild

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-03-18 Thread Ulrich Müller

commit: b7c979d25123a15fcafa1ab8da709a10af74760d
Author: Ulrich Müller  gentoo  org>
AuthorDate: Thu Mar 18 16:33:13 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Thu Mar 18 16:33:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c979d2

app-editors/emacs: Version bump to 27.2_rc1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest  |   1 +
 app-editors/emacs/emacs-27.2_rc1.ebuild | 446 
 2 files changed, 447 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7ceb9dd079b..418ba56455f 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,3 +9,4 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 
50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd
 SHA512 
37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
+DIST emacs-27.2-rc1.tar.xz 44630360 BLAKE2B 
aec7da38f23c440dbea4205ad22b90a61d3abae4e40c65185b250d3cadcf8f39e626f0ef09e032a897ffe6d40afd5a1ac192246332f1384745454bcaa91bb077
 SHA512 
9c6f337fb593594a92df5024fa47a28abbc59e4d2c06d807ecc1bed33cfb94df46d1e8a04e3f4aa4ca82e8fdd64d1e82b5a0423dc22cb6b1dd4571dca22ea4a8

diff --git a/app-editors/emacs/emacs-27.2_rc1.ebuild 
b/app-editors/emacs/emacs-27.2_rc1.ebuild
new file mode 100644
index 000..acd274cb4f4
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2_rc1.ebuild
@@ -0,0 +1,446 @@
+# 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 toolchain-funcs
+
+if [[ ${PV##*.} =  ]]; 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.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="https://alpha.gnu.org/gnu/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 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? (

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-15 Thread Ulrich Müller

commit: 14b7d84a6941f550514ad78adb1abf519333d6e0
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Feb 15 09:28:54 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb 15 09:30:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b7d84a

app-editors/emacs: More specific description for the global gmp flag

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/metadata.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index b3d9de5e45e..62697703545 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -29,6 +29,8 @@
 font name
   Use gfile (dev-libs/glib) for file
 notification
+  Use the GNU multiple precision arithmetic library
+(dev-libs/gmp) instead of the bundled mini-gmp subset
   Use gsettings (dev-libs/glib) to read the
 system font name
   Compress bundled Emacs Lisp source

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-13 Thread Ulrich Müller

commit: 01be3fb010098329cb41d9d941209d217548e430
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb 13 10:18:08 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb 13 10:36:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01be3fb0

app-editors/emacs: Add -Q option to command line in README.gentoo

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 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.-r1.ebuild | 2 +-
 app-editors/emacs/emacs-28.0..ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild 
b/app-editors/emacs/emacs-27.1-r4.ebuild
index e585ef414e3..a202aba0d2f 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -413,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-r1.ebuild 
b/app-editors/emacs/emacs-27.1.91-r1.ebuild
index f158a3cfe91..50a0f78c3c6 100644
--- a/app-editors/emacs/emacs-27.1.91-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.91-r1.ebuild
@@ -412,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.-r1.ebuild 
b/app-editors/emacs/emacs-27.1.-r1.ebuild
index 6ffdda65f73..4b787936fc9 100644
--- a/app-editors/emacs/emacs-27.1.-r1.ebuild
+++ b/app-editors/emacs/emacs-27.1.-r1.ebuild
@@ -412,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..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index e0903a5c2b0..af22d98f030 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..ebuild
@@ -396,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
 }

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-13 Thread Ulrich Müller

commit: cd3d4a41cb71f1b85daae8cd989938bf53df5090
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb 13 10:29:49 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb 13 10:36:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3d4a41

app-editors/emacs: Remove old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-24.5-r9.ebuild | 355 -
 app-editors/emacs/emacs-25.3-r8.ebuild | 365 --
 app-editors/emacs/emacs-26.3-r3.ebuild | 392 
 app-editors/emacs/emacs-27.1-r3.ebuild | 460 -
 app-editors/emacs/metadata.xml |   2 -
 5 files changed, 1574 deletions(-)

diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild 
b/app-editors/emacs/emacs-24.5-r9.ebuild
deleted file mode 100644
index 56490c31b21..000
--- a/app-editors/emacs/emacs-24.5-r9.ebuild
+++ /dev/null
@@ -1,355 +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
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/;
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-   https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.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"
-
-RDEPEND="acct-group/mail
-   app-emacs/emacs-common-gentoo[games?,gui(-)?]
-   net-libs/liblockfile
-   sys-libs/ncurses:0=
-   acl? ( virtual/acl )
-   alsa? ( media-libs/alsa-lib )
-   dbus? ( sys-apps/dbus )
-   games? ( acct-group/gamestat )
-   gpm? ( sys-libs/gpm )
-   !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-   kerberos? ( virtual/krb5 )
-   libxml2? ( >=dev-libs/libxml2-2.2.0 )
-   selinux? ( sys-libs/libselinux )
-   ssl? ( net-libs/gnutls:0= )
-   zlib? ( sys-libs/zlib )
-   gui? ( !aqua? (
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   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
-   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 )
-   )
-   !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
-   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
-# order to determine some path information correctly for copy/move
-# operations

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-13 Thread Ulrich Müller

commit: daf67e84f368acea23539bf1188e1c8075e9e7d5
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb 13 10:25:18 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb 13 10:36:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daf67e84

app-editors/emacs: Stable amd64, arm, arm64, ppc, ppc64, sparc, x86

Only change in stable candidates was removal of the gtk2 USE flag.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 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 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild 
b/app-editors/emacs/emacs-24.5-r10.ebuild
index e67fbd411cb..e6ae1eab8ca 100644
--- a/app-editors/emacs/emacs-24.5-r10.ebuild
+++ b/app-editors/emacs/emacs-24.5-r10.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="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild 
b/app-editors/emacs/emacs-25.3-r9.ebuild
index 95929b38fad..4ddb30fb97a 100644
--- a/app-editors/emacs/emacs-25.3-r9.ebuild
+++ b/app-editors/emacs/emacs-25.3-r9.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="25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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 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

diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild 
b/app-editors/emacs/emacs-26.3-r4.ebuild
index 41f63edeeb4..45b6320edc9 100644
--- a/app-editors/emacs/emacs-26.3-r4.ebuild
+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
@@ -11,7 +11,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"
+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(-)?]

diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild 
b/app-editors/emacs/emacs-27.1-r4.ebuild
index a202aba0d2f..216c3c4521b 100644
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-12 Thread Ulrich Müller

commit: fb3eeb740bddfd0a4b265fb8f021d07ea2e0b71d
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Feb 12 15:21:35 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Feb 12 15:21:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3eeb74

app-editors/emacs: Drop motif flag

Following upstream removal of Motif support.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-28.0..ebuild | 37 ++--
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/app-editors/emacs/emacs-28.0..ebuild 
b/app-editors/emacs/emacs-28.0..ebuild
index c82a42541a8..e0903a5c2b0 100644
--- a/app-editors/emacs/emacs-28.0..ebuild
+++ b/app-editors/emacs/emacs-28.0..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 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(-)?]
@@ -101,24 +101,16 @@ RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
)
)
!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,20 +214,13 @@ src_configure() {
See 
 and

.
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
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."
-   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."
+   "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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-08 Thread Ulrich Müller

commit: f411db0621fca6028431b8d98db02d3cbfa0
Author: Ulrich Müller  gentoo  org>
AuthorDate: Mon Feb  8 09:51:24 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Mon Feb  8 09:52:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f411db06

app-editors/emacs: Keep Emacs 23 with GTK+ support for now

Most likely slot 23 will be gone at the time GTK+ 2 leaves the tree.

Bug: https://bugs.gentoo.org/769023
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-23.4-r21.ebuild | 345 
 1 file changed, 345 deletions(-)

diff --git a/app-editors/emacs/emacs-23.4-r21.ebuild 
b/app-editors/emacs/emacs-23.4-r21.ebuild
deleted file mode 100644
index d9c732a605e..000
--- a/app-editors/emacs/emacs-23.4-r21.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/;
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
-   https://dev.gentoo.org/~ulm/emacs/${P}-patches-23.tar.xz;
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm 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(-)?]
-   net-libs/liblockfile
-   sys-libs/ncurses:0=
-   kerberos? ( virtual/krb5 )
-   alsa? ( media-libs/alsa-lib )
-   games? ( acct-group/gamestat )
-   gpm? ( sys-libs/gpm )
-   dbus? ( sys-apps/dbus )
-   gui? ( !aqua? (
-   x11-libs/libICE
-   x11-libs/libSM
-   x11-libs/libX11
-   x11-misc/xbitmaps
-   gconf? ( >=gnome-base/gconf-2.26.2 )
-   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 )
-   xft? (
-   media-libs/fontconfig
-   media-libs/freetype
-   x11-libs/libXft
-   x11-libs/libXrender
-   m17n-lib? (
-   >=dev-libs/libotf-0.9.4
-   >=dev-libs/m17n-lib-1.5.1
-   )
-   )
-   motif? (
-   >=x11-libs/motif-2.3:0
-   x11-libs/libXpm
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXt
-   )
-   !motif? (
-   Xaw3d? (
-   x11-libs/libXaw3d
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXt
-   )
-   !Xaw3d? ( athena? (
-   x11-libs/libXaw
-   x11-libs/libXext
-   x11-libs/libXmu
-   x11-libs/libXt
-   ) )
-   )
-   ) )"
-
-DEPEND="${RDEPEND}
-   gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-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
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-   eapply ../patch
-   eapply_user
-
-   sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-   || die "unable to sed ctags.1"
-
-   if ! use alsa; then
-   # ALSA is detected even if not requested by its USE flag.
-   # Suppress it by supplying pkg-config with a wrong library name.
-   sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-   || die "unable to sed configure.in"
-   fi
-   if ! use gzip-el; then
-   # Emacs' build system automatically detects the gzip binary and
-   # compresses el files. We don't want that so confuse it with a
-   # wrong binary name
-   sed -i

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-06 Thread Ulrich Müller

commit: a3a600ac892843967407b86cad2234abe234c843
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb  6 22:21:40 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb  6 23:00:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3a600ac

app-editors/emacs: Update GTK+ bug reference in README.gentoo

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-24.5-r9.ebuild  | 3 ++-
 app-editors/emacs/emacs-25.3-r8.ebuild  | 3 ++-
 app-editors/emacs/emacs-26.3-r3.ebuild  | 3 ++-
 app-editors/emacs/emacs-27.1-r3.ebuild  | 3 ++-
 app-editors/emacs/emacs-27.1.91.ebuild  | 3 ++-
 app-editors/emacs/emacs-27.1.-r1.ebuild | 3 ++-
 app-editors/emacs/emacs-28.0..ebuild| 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild 
b/app-editors/emacs/emacs-24.5-r9.ebuild
index 62c7cd0a20a..56490c31b21 100644
--- a/app-editors/emacs/emacs-24.5-r9.ebuild
+++ b/app-editors/emacs/emacs-24.5-r9.ebuild
@@ -175,7 +175,8 @@ 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 
.
+   See 
 and
+   
.
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.

diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild 
b/app-editors/emacs/emacs-25.3-r8.ebuild
index e43700a2f21..c2026007bfb 100644
--- a/app-editors/emacs/emacs-25.3-r8.ebuild
+++ b/app-editors/emacs/emacs-25.3-r8.ebuild
@@ -182,7 +182,8 @@ 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 
.
+   See 
 and
+   
.
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.

diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild 
b/app-editors/emacs/emacs-26.3-r3.ebuild
index 60641dd7a88..fb901b73ff1 100644
--- a/app-editors/emacs/emacs-26.3-r3.ebuild
+++ b/app-editors/emacs/emacs-26.3-r3.ebuild
@@ -184,7 +184,8 @@ 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 
.
+   See 
 and
+   
.
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.

diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild 
b/app-editors/emacs/emacs-27.1-r3.ebuild
index cec5c774b5e..35b541f8883 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -224,7 +224,8 @@ 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 
.
+   See 
 and
+   
.
If you intend to use more than one display, 
then it is strongly
recommended that

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-06 Thread Ulrich Müller

commit: 2d6765e58fc94e13dbc937d0c7dc59e49fe3f49f
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Feb  6 22:54:47 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat Feb  6 23:00:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6765e5

app-editors/emacs: Drop conditional gtk+:2 dependency

For slot 23, this means dropping GTK+ support entirely.
All later slots can be built with GTK+ 3.

Closes: https://bugs.gentoo.org/769023
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-23.4-r21.ebuild| 345 +
 ...macs-28.0..ebuild => emacs-24.5-r10.ebuild} | 188 +++
 ...emacs-28.0..ebuild => emacs-25.3-r9.ebuild} | 170 +++---
 .../{emacs-27.1.91.ebuild => emacs-26.3-r4.ebuild} | 122 ++--
 .../{emacs-27.1.91.ebuild => emacs-27.1-r4.ebuild} |  30 +-
 ...macs-27.1.91.ebuild => emacs-27.1.91-r1.ebuild} |  29 +-
 app-editors/emacs/emacs-27.1.-r1.ebuild|  29 +-
 app-editors/emacs/emacs-28.0..ebuild   |  29 +-
 8 files changed, 475 insertions(+), 467 deletions(-)

diff --git a/app-editors/emacs/emacs-23.4-r21.ebuild 
b/app-editors/emacs/emacs-23.4-r21.ebuild
new file mode 100644
index 000..d9c732a605e
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r21.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/;
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+   https://dev.gentoo.org/~ulm/emacs/${P}-patches-23.tar.xz;
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alsa aqua athena dbus games gconf gif gpm 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(-)?]
+   net-libs/liblockfile
+   sys-libs/ncurses:0=
+   kerberos? ( virtual/krb5 )
+   alsa? ( media-libs/alsa-lib )
+   games? ( acct-group/gamestat )
+   gpm? ( sys-libs/gpm )
+   dbus? ( sys-apps/dbus )
+   gui? ( !aqua? (
+   x11-libs/libICE
+   x11-libs/libSM
+   x11-libs/libX11
+   x11-misc/xbitmaps
+   gconf? ( >=gnome-base/gconf-2.26.2 )
+   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 )
+   xft? (
+   media-libs/fontconfig
+   media-libs/freetype
+   x11-libs/libXft
+   x11-libs/libXrender
+   m17n-lib? (
+   >=dev-libs/libotf-0.9.4
+   >=dev-libs/m17n-lib-1.5.1
+   )
+   )
+   motif? (
+   >=x11-libs/motif-2.3:0
+   x11-libs/libXpm
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXt
+   )
+   !motif? (
+   Xaw3d? (
+   x11-libs/libXaw3d
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXt
+   )
+   !Xaw3d? ( athena? (
+   x11-libs/libXaw
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXt
+   ) )
+   )
+   ) )"
+
+DEPEND="${RDEPEND}
+   gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+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
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+   eapply ../patch
+   eapply_user
+
+   sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+   || die "unable to sed ctags.1"
+
+   if ! use alsa; then
+   # ALSA is detected even if not requested by

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-05 Thread Ulrich Müller

commit: b8fec210be3410847b4715c0bc596b4c661aa872
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Feb  5 21:34:32 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Feb  5 21:34:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fec210

app-editors/emacs: Remove old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/emacs-27.1-r2.ebuild | 434 -
 1 file changed, 434 deletions(-)

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 b78766488d2..000
--- 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##*.} =  ]]; 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.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? (
-

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-05 Thread Sam James

commit: eba2ec8c1fe974cccb0bb171e7d1e690c1304f75
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb  5 12:28:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 12:28:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eba2ec8c

app-editors/emacs: Stabilize 27.1-r3 ppc, #767361

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild 
b/app-editors/emacs/emacs-27.1-r3.ebuild
index bd35ed1d7cd..cec5c774b5e 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-02-02 Thread Sam James

commit: 0869a69dcae053fc2b75722e9ff4c796c7074f7b
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  2 23:44:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  2 23:44:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0869a69d

app-editors/emacs: Stabilize 27.1-r3 x86, #767361

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild 
b/app-editors/emacs/emacs-27.1-r3.ebuild
index 3a5e0446356..bd35ed1d7cd 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-01-31 Thread Sam James

commit: c90b7bd02085351f54aef592aa7c7cc75f5a6983
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  1 04:44:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  1 04:44:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90b7bd0

app-editors/emacs: Stabilize 27.1-r3 arm, #767361

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild 
b/app-editors/emacs/emacs-27.1-r3.ebuild
index a73497960d2..3a5e0446356 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-01-30 Thread Sam James

commit: 85ee985875c672d078970b35051170c3d8cc13d2
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 30 18:39:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 30 18:39:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ee9858

app-editors/emacs: Stabilize 27.1-r3 sparc, #767361

Signed-off-by: Sam James  gentoo.org>

 app-editors/emacs/emacs-27.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild 
b/app-editors/emacs/emacs-27.1-r3.ebuild
index 09d1cb0f7ce..a73497960d2 100644
--- a/app-editors/emacs/emacs-27.1-r3.ebuild
+++ b/app-editors/emacs/emacs-27.1-r3.ebuild
@@ -33,7 +33,7 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

2021-01-29 Thread Ulrich Müller

commit: 7ba1e9af2fe2e643892332536389cdeb2388a128
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Jan 29 14:02:39 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Jan 29 14:03:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba1e9af

app-editors/emacs: Pretest version 27.1.91

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/emacs/Manifest |   1 +
 app-editors/emacs/emacs-27.1.91.ebuild | 458 +
 2 files changed, 459 insertions(+)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 2814ce630ed..7ceb9dd079b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,4 +7,5 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B 
aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 
93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf
 SHA512 
f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 
4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23
 SHA512 
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B 
aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3
 SHA512 
4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
+DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 
50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd
 SHA512 
37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 
433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057
 SHA512 
dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064

diff --git a/app-editors/emacs/emacs-27.1.91.ebuild 
b/app-editors/emacs/emacs-27.1.91.ebuild
new file mode 100644
index 000..71b3f312c1d
--- /dev/null
+++ b/app-editors/emacs/emacs-27.1.91.ebuild
@@ -0,0 +1,458 @@
+# 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 toolchain-funcs
+
+if [[ ${PV##*.} =  ]]; 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.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?

< 1 2 3 4 5 6 7 8 >

301 - 400 of 758 matches

Mail list logo