summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/aee/metadata.xml2
-rw-r--r--app-editors/bluefish/metadata.xml2
-rw-r--r--app-editors/bvi/metadata.xml2
-rw-r--r--app-editors/curses-hexedit/metadata.xml2
-rw-r--r--app-editors/dav/metadata.xml2
-rw-r--r--app-editors/dhex/metadata.xml2
-rw-r--r--app-editors/diakonos/metadata.xml2
-rw-r--r--app-editors/e3/metadata.xml2
-rw-r--r--app-editors/ee/metadata.xml2
-rw-r--r--app-editors/elvis/metadata.xml2
-rw-r--r--app-editors/emacs/Manifest6
-rw-r--r--app-editors/emacs/emacs-25.3-r11.ebuild (renamed from app-editors/emacs/emacs-25.3-r10.ebuild)4
-rw-r--r--app-editors/emacs/emacs-26.3-r6.ebuild (renamed from app-editors/emacs/emacs-26.3-r5.ebuild)4
-rw-r--r--app-editors/emacs/emacs-27.1-r4.ebuild444
-rw-r--r--app-editors/emacs/emacs-27.2-r5.ebuild (renamed from app-editors/emacs/emacs-27.2-r3.ebuild)6
-rw-r--r--app-editors/emacs/emacs-27.2.9999.ebuild2
-rw-r--r--app-editors/emacs/emacs-28.0.9999.ebuild2
-rw-r--r--app-editors/emacs/metadata.xml2
-rw-r--r--app-editors/emact/metadata.xml2
-rw-r--r--app-editors/ersatz-emacs/metadata.xml2
-rw-r--r--app-editors/fe/metadata.xml2
-rw-r--r--app-editors/featherpad/Manifest1
-rw-r--r--app-editors/featherpad/featherpad-1.0.0.ebuild37
-rw-r--r--app-editors/featherpad/metadata.xml8
-rw-r--r--app-editors/focuswriter/metadata.xml2
-rw-r--r--app-editors/fte/metadata.xml2
-rw-r--r--app-editors/gedit-plugins/metadata.xml2
-rw-r--r--app-editors/gedit/metadata.xml2
-rw-r--r--app-editors/ghex/metadata.xml2
-rw-r--r--app-editors/ghostwriter/Manifest2
-rw-r--r--app-editors/ghostwriter/ghostwriter-2.0.2.ebuild (renamed from app-editors/ghostwriter/ghostwriter-2.0.1.ebuild)0
-rw-r--r--app-editors/ghostwriter/metadata.xml2
-rw-r--r--app-editors/gnome-latex/metadata.xml2
-rw-r--r--app-editors/gummi/metadata.xml2
-rw-r--r--app-editors/gvim/metadata.xml2
-rw-r--r--app-editors/hexcurse/metadata.xml2
-rw-r--r--app-editors/hexedit/metadata.xml2
-rw-r--r--app-editors/hteditor/metadata.xml7
-rw-r--r--app-editors/jasspa-microemacs/metadata.xml2
-rw-r--r--app-editors/jed/metadata.xml2
-rw-r--r--app-editors/jedit/metadata.xml2
-rw-r--r--app-editors/jext/Manifest1
-rw-r--r--app-editors/jext/files/jext-5.0-enum-as-keyword.patch173
-rw-r--r--app-editors/jext/files/jext-pre91
-rw-r--r--app-editors/jext/jext-5.0-r2.ebuild65
-rw-r--r--app-editors/jext/metadata.xml11
-rw-r--r--app-editors/joe/metadata.xml2
-rw-r--r--app-editors/jove/metadata.xml2
-rw-r--r--app-editors/juffed/Manifest2
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch71
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch11
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch28
-rw-r--r--app-editors/juffed/juffed-0.10_p20200103.ebuild (renamed from app-editors/juffed/juffed-0.10_p20160323-r1.ebuild)24
-rw-r--r--app-editors/juffed/metadata.xml3
-rw-r--r--app-editors/jupp/metadata.xml2
-rw-r--r--app-editors/kakoune/Manifest2
-rw-r--r--app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch15
-rw-r--r--app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch11
-rw-r--r--app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch13
-rw-r--r--app-editors/kakoune/kakoune-2021.08.28.ebuild (renamed from app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild)11
-rw-r--r--app-editors/kakoune/metadata.xml17
-rw-r--r--app-editors/kile/metadata.xml2
-rw-r--r--app-editors/le/metadata.xml2
-rw-r--r--app-editors/leafpad/metadata.xml2
-rw-r--r--app-editors/levee/metadata.xml2
-rw-r--r--app-editors/lpe/metadata.xml2
-rw-r--r--app-editors/metadata.xml2
-rw-r--r--app-editors/mg/Manifest2
-rw-r--r--app-editors/mg/metadata.xml2
-rw-r--r--app-editors/mg/mg-20210314-r1.ebuild (renamed from app-editors/mg/mg-20200723.ebuild)4
-rw-r--r--app-editors/mg/mg-20210609-r1.ebuild (renamed from app-editors/mg/mg-20210314.ebuild)13
-rw-r--r--app-editors/micro/Manifest3
-rw-r--r--app-editors/micro/metadata.xml2
-rw-r--r--app-editors/micro/micro-2.0.10.ebuild132
-rw-r--r--app-editors/moe/metadata.xml2
-rw-r--r--app-editors/mousepad/Manifest3
-rw-r--r--app-editors/mousepad/metadata.xml2
-rw-r--r--app-editors/mousepad/mousepad-0.5.6.ebuild (renamed from app-editors/mousepad/mousepad-0.5.5.ebuild)0
-rw-r--r--app-editors/mousepad/mousepad-0.5.7.ebuild42
-rw-r--r--app-editors/nano/metadata.xml2
-rw-r--r--app-editors/ne/metadata.xml2
-rw-r--r--app-editors/nedit/metadata.xml2
-rw-r--r--app-editors/neovim/metadata.xml2
-rw-r--r--app-editors/neovim/neovim-0.4.4-r101.ebuild (renamed from app-editors/neovim/neovim-0.4.4-r100.ebuild)2
-rw-r--r--app-editors/ng/metadata.xml2
-rw-r--r--app-editors/notepadqq/metadata.xml2
-rw-r--r--app-editors/okteta/metadata.xml5
-rw-r--r--app-editors/padre/metadata.xml2
-rw-r--r--app-editors/pluma/metadata.xml2
-rw-r--r--app-editors/pluma/pluma-1.24.1.ebuild2
-rw-r--r--app-editors/pluma/pluma-1.24.2.ebuild4
-rw-r--r--app-editors/pyvim/metadata.xml2
-rw-r--r--app-editors/qemacs/metadata.xml2
-rw-r--r--app-editors/qhexedit2/metadata.xml2
-rw-r--r--app-editors/qxmledit/metadata.xml2
-rw-r--r--app-editors/retext/metadata.xml2
-rw-r--r--app-editors/sandy/metadata.xml2
-rw-r--r--app-editors/scite/Manifest1
-rw-r--r--app-editors/scite/metadata.xml2
-rw-r--r--app-editors/scite/scite-5.1.1.ebuild115
-rw-r--r--app-editors/shed/metadata.xml2
-rw-r--r--app-editors/sublime-text/metadata.xml3
-rw-r--r--app-editors/tea/metadata.xml2
-rw-r--r--app-editors/teco/metadata.xml2
-rw-r--r--app-editors/ted/metadata.xml2
-rw-r--r--app-editors/texworks/metadata.xml2
-rw-r--r--app-editors/uemacs-pk/metadata.xml2
-rw-r--r--app-editors/vile/metadata.xml2
-rw-r--r--app-editors/vim-core/metadata.xml2
-rw-r--r--app-editors/vim-core/vim-core-8.2.0814.ebuild2
-rw-r--r--app-editors/vim/metadata.xml2
-rw-r--r--app-editors/vim/vim-8.2.0814-r100.ebuild2
-rw-r--r--app-editors/vis/metadata.xml2
-rw-r--r--app-editors/vscode/Manifest9
-rw-r--r--app-editors/vscode/files/vscode-url-handler-wayland.desktop12
-rw-r--r--app-editors/vscode/files/vscode-url-handler.desktop4
-rw-r--r--app-editors/vscode/files/vscode-wayland.desktop18
-rw-r--r--app-editors/vscode/files/vscode.desktop4
-rw-r--r--app-editors/vscode/metadata.xml2
-rw-r--r--app-editors/vscode/vscode-1.59.1.ebuild (renamed from app-editors/vscode/vscode-1.57.1.ebuild)4
-rw-r--r--app-editors/vscode/vscode-1.60.1.ebuild121
-rw-r--r--app-editors/vscodium/Manifest9
-rw-r--r--app-editors/vscodium/files/vscodium-url-handler-wayland.desktop12
-rw-r--r--app-editors/vscodium/files/vscodium-url-handler.desktop2
-rw-r--r--app-editors/vscodium/files/vscodium-wayland.desktop18
-rw-r--r--app-editors/vscodium/files/vscodium.desktop2
-rw-r--r--app-editors/vscodium/metadata.xml2
-rw-r--r--app-editors/vscodium/vscodium-1.59.1.ebuild (renamed from app-editors/vscodium/vscodium-1.57.1.ebuild)4
-rw-r--r--app-editors/vscodium/vscodium-1.60.1.ebuild113
-rw-r--r--app-editors/wily/metadata.xml2
-rw-r--r--app-editors/wxhexeditor/metadata.xml2
-rw-r--r--app-editors/xemacs/metadata.xml2
-rw-r--r--app-editors/xemacs/xemacs-21.5.34-r6.ebuild2
-rw-r--r--app-editors/xmlcopyeditor/metadata.xml2
-rw-r--r--app-editors/xvile/metadata.xml2
-rw-r--r--app-editors/yudit/metadata.xml2
-rw-r--r--app-editors/zile/metadata.xml2
137 files changed, 813 insertions, 1078 deletions
diff --git a/app-editors/aee/metadata.xml b/app-editors/aee/metadata.xml
index 21dc8fdf43ff..9a97f3478d31 100644
--- a/app-editors/aee/metadata.xml
+++ b/app-editors/aee/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 56419257845e..1b7846505de4 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<use>
diff --git a/app-editors/bvi/metadata.xml b/app-editors/bvi/metadata.xml
index 4233deb11b8e..58a61b869628 100644
--- a/app-editors/bvi/metadata.xml
+++ b/app-editors/bvi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>bugs@chead.ca</email>
diff --git a/app-editors/curses-hexedit/metadata.xml b/app-editors/curses-hexedit/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/curses-hexedit/metadata.xml
+++ b/app-editors/curses-hexedit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/dav/metadata.xml b/app-editors/dav/metadata.xml
index d9948d999a74..3e5986cf560b 100644
--- a/app-editors/dav/metadata.xml
+++ b/app-editors/dav/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-editors/dhex/metadata.xml b/app-editors/dhex/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/dhex/metadata.xml
+++ b/app-editors/dhex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/diakonos/metadata.xml b/app-editors/diakonos/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/diakonos/metadata.xml
+++ b/app-editors/diakonos/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/e3/metadata.xml b/app-editors/e3/metadata.xml
index e38b0be62252..e78f64d3504c 100644
--- a/app-editors/e3/metadata.xml
+++ b/app-editors/e3/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/ee/metadata.xml b/app-editors/ee/metadata.xml
index 21dc8fdf43ff..9a97f3478d31 100644
--- a/app-editors/ee/metadata.xml
+++ b/app-editors/ee/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
diff --git a/app-editors/elvis/metadata.xml b/app-editors/elvis/metadata.xml
index f1abc6411341..6be55e0ac363 100644
--- a/app-editors/elvis/metadata.xml
+++ b/app-editors/elvis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 98a01d3a4903..f7a1257f643e 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -4,9 +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-r11.ebuild
index 301dd19e48aa..00a361aa4b9e 100644
--- a/app-editors/emacs/emacs-25.3-r10.ebuild
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild
@@ -8,11 +8,11 @@ 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-2.tar.xz"
+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.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-r5.ebuild b/app-editors/emacs/emacs-26.3-r6.ebuild
index 276dd16e17fc..d196a1b19509 100644
--- a/app-editors/emacs/emacs-26.3-r5.ebuild
+++ b/app-editors/emacs/emacs-26.3-r6.ebuild
@@ -7,7 +7,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"
+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"
@@ -107,6 +108,7 @@ SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
# operations later on
FULL_VERSION="${PV%%_*}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
+PATCHES=("${WORKDIR}/patch")
src_prepare() {
default
diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
deleted file mode 100644
index e465593dcfc0..000000000000
--- a/app-editors/emacs/emacs-27.1-r4.ebuild
+++ /dev/null
@@ -1,444 +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##*.} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
- EGIT_BRANCH="emacs-27"
- EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
- S="${EGIT_CHECKOUT_DIR}"
- SLOT="${PV%%.*}-vcs"
-else
- # FULL_VERSION keeps the full version number, which is needed in
- # order to determine some path information correctly for copy/move
- # operations later on
- FULL_VERSION="${PV%%_*}"
- SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
- S="${WORKDIR}/emacs-${FULL_VERSION}"
- # PV can be in any of the following formats:
- # 27.1 released version (slot 27)
- # 27.1_rc1 upstream release candidate (27)
- # 27.0.9999 live ebuild (slot 27-vcs)
- # 27.0.90 upstream prerelease snapshot (27-vcs)
- # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs)
- if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
- S="${WORKDIR}/emacs"
- elif [[ ${PV//[0-9]} != "." ]]; then
- SRC_URI="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
- )
- )
- 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
- ) )
- )
- )
- ) )"
-
-DEPEND="${RDEPEND}
- gui? ( !aqua? ( x11-base/xorg-proto ) )"
-
-BDEPEND="app-eselect/eselect-emacs
- sys-apps/texinfo
- virtual/pkgconfig
- gzip-el? ( app-arch/gzip )"
-
-RDEPEND="${RDEPEND}
- !<=app-editors/emacs-27.1.9999-r0:27-vcs
- !app-editors/emacs-vcs:27
- app-eselect/eselect-emacs"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
-
-src_prepare() {
- if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
- configure.ac)
- [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
- einfo "Emacs branch: ${EGIT_BRANCH}"
- einfo "Commit: ${EGIT_VERSION}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- fi
-
- default
-
- # Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
- #AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
- filter-flags -pie #526948
-
- if use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa; then
- use sound || ewarn \
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
- myconf+=" --with-sound=alsa"
- else
- myconf+=" --with-sound=$(usex sound oss)"
- fi
-
- if ! use gui; then
- einfo "Configuring to build without window system support"
- myconf+=" --without-x --without-ns"
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --with-x --without-ns"
- myconf+=" $(use_with gconf)"
- myconf+=" $(use_with gsettings)"
- myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
- myconf+=" $(use_with xpm)"
- myconf+=" $(use_with imagemagick)"
-
- if use xft; then
- myconf+=" --with-xft"
- myconf+=" $(use_with cairo)"
- myconf+=" $(use_with harfbuzz)"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- myconf+=" --without-xft"
- myconf+=" --without-cairo"
- myconf+=" --without-libotf --without-m17n-flt"
- use cairo && ewarn \
- "USE flag \"cairo\" has no effect if \"xft\" is not set."
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
- fi
-
- local f line
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- while read line; do ewarn "${line}"; done <<-EOF
- Your version of GTK+ will have problems with closing open
- displays. This is no problem if you just use one display, but
- if you use more than one and close one of them Emacs may crash.
- See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
- <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
- If you intend to use more than one display, then it is strongly
- recommended that you compile Emacs with the Athena/Lucid or the
- Motif toolkit instead.
- EOF
- myconf+=" --with-x-toolkit=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."
- done
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
- ! use gtk && use xwidgets && ewarn \
- "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
- fi
-
- if tc-is-cross-compiler; then
- # Configure a CBUILD directory when cross-compiling to make tools
- mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
- ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
- popd >/dev/null || die
- # Don't try to execute the binary for dumping during the build
- myconf+=" --with-dumping=none"
- else
- myconf+=" --with-dumping=pdumper"
- fi
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --localstatedir="${EPREFIX}"/var \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --without-compress-install \
- --without-hesiod \
- --without-pop \
- --with-file-notification=$(usev inotify || usev gfile || echo no) \
- --with-pdumper \
- $(use_enable acl) \
- $(use_with dbus) \
- $(use_with dynamic-loading modules) \
- $(use_with games gameuser ":gamestat") \
- $(use_with gmp libgmp) \
- $(use_with gpm) \
- $(use_with json) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with lcms lcms2) \
- $(use_with libxml2 xml2) \
- $(use_with mailutils) \
- $(use_with selinux) \
- $(use_with ssl gnutls) \
- $(use_with systemd libsystemd) \
- $(use_with threads) \
- $(use_with wide-int) \
- $(use_with zlib) \
- ${myconf}
-}
-
-src_compile() {
- if tc-is-cross-compiler; then
- # Build native tools for compiling lisp etc.
- emake -C "${S}-build" src
- emake lib # Cross-compile dependencies first for timestamps
- # Save native build tools in the cross-directory
- cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
- # Specify the native Emacs to compile lisp
- emake -C lisp all EMACS="${S}-build/src/emacs"
- fi
-
- emake
-}
-
-src_install() {
- emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
- mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # movemail must be setgid mail
- if ! use mailutils; then
- fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
- fi
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
- rm -rf "${ED}"/usr/share/{applications,icons} || die
- rm -rf "${ED}/usr/$(get_libdir)" || die
- rm -rf "${ED}"/var || die
-
- # remove unused <version>/site-lisp dir
- 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 || die
-
- if use systemd; then
- insinto /usr/lib/systemd/user
- sed -e "/^##/d" \
- -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
- -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
- etc/emacs.service | newins - ${EMACS_SUFFIX}.service
- assert
- fi
-
- if use gzip-el; then
- # compress .el files when a corresponding .elc exists
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
- assert "gzip .el failed"
- fi
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
- X
- ;;; ${EMACS_SUFFIX} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS CONTRIBUTE
-
- if use gui && use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
- fi
-
- local DOC_CONTENTS="You can set the version to be started by
- /usr/bin/emacs through the Emacs eselect module, which also
- redirects man and info pages. Therefore, several Emacs versions can
- be installed at the same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from a previous major version of Emacs, then
- it is strongly recommended that you use app-admin/emacs-updater
- to rebuild all byte-compiled elisp files of the installed Emacs
- packages."
- if use gui; then
- DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or
- symlink it into /Applications by yourself."
- fi
- 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 -Q --eval='(dump-emacs-portable
- \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d ${ED}/usr/share/info ]]; then
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-27.2-r3.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild
index 413825937aaf..e2efcba31d59 100644
--- a/app-editors/emacs/emacs-27.2-r3.ebuild
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild
@@ -32,11 +32,11 @@ 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-2.tar.xz"
+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.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"
+ 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"
@@ -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.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
index d3ca04ad9dd8..9dd86d34a32b 100644
--- a/app-editors/emacs/emacs-27.2.9999.ebuild
+++ b/app-editors/emacs/emacs-27.2.9999.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.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index 9050791f1d9d..cc1da333c7fd 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.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 )
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 48f1ffacb83d..aca16631d5e5 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
diff --git a/app-editors/emact/metadata.xml b/app-editors/emact/metadata.xml
index d94e6b286818..e4ee2b00aa68 100644
--- a/app-editors/emact/metadata.xml
+++ b/app-editors/emact/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/ersatz-emacs/metadata.xml b/app-editors/ersatz-emacs/metadata.xml
index 047063ba435e..0b806169ae6d 100644
--- a/app-editors/ersatz-emacs/metadata.xml
+++ b/app-editors/ersatz-emacs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/fe/metadata.xml b/app-editors/fe/metadata.xml
index 5020c7020a74..7c4bfb4c4358 100644
--- a/app-editors/fe/metadata.xml
+++ b/app-editors/fe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 78475bb25f5f..4c7622319098 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1 +1,2 @@
DIST featherpad-0.18.0.tar.gz 967643 BLAKE2B a8a84fa71232bdd9448ec4a9c921f8f452212dfb52ec518c3f340e9b600858a9cfca2d7729a0f58c9d1465b77bd28c836de78026c58ff94297de704e7bf670d8 SHA512 3e0d008792dd55bc5e57654f9b032f0a66a60c682499c684cfc3b182fdc57a654bb5fb195b458af66ddd8db929b31e7bfa789bd9bdf33d32454fbbcb090bcd91
+DIST featherpad-1.0.0.tar.gz 1010200 BLAKE2B 22a11a0655ed57f7a7d53949e59c3b989a304b7c3db1f7308af0a52cc00a151cee505b02c19ece286da1be37e76c8874cee4102db3d881ef2c4ad48ecbb2f20a SHA512 9f7e24fa5e89e269693bc0a37f79d987e4914dde2d2b46bd0385886383dab8b35556fbc0f5c5b7b9a2c3a41694174ffa8532c48def87d2972fbc73c1e9c38bf3
diff --git a/app-editors/featherpad/featherpad-1.0.0.ebuild b/app-editors/featherpad/featherpad-1.0.0.ebuild
new file mode 100644
index 000000000000..dc209562867b
--- /dev/null
+++ b/app-editors/featherpad/featherpad-1.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux"
+HOMEPAGE="https://github.com/tsujan/FeatherPad"
+SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/FeatherPad-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+X"
+
+RDEPEND="app-text/hunspell:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITHOUT_X11=$(usex !X)
+ )
+ cmake_src_configure
+}
diff --git a/app-editors/featherpad/metadata.xml b/app-editors/featherpad/metadata.xml
index 3fd6253bfc08..e0685038b115 100644
--- a/app-editors/featherpad/metadata.xml
+++ b/app-editors/featherpad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hansfn@gmail.com</email>
@@ -14,6 +14,12 @@
plain-text editor for Linux. It is independent of any desktop
environment.
</longdescription>
+ <use>
+ <flag name="X">
+ Link application against X11 libraries which adds
+ support for virtual desktop awareness and tab DND
+ </flag>
+ </use>
<upstream>
<remote-id type="github">tsujan/FeatherPad</remote-id>
</upstream>
diff --git a/app-editors/focuswriter/metadata.xml b/app-editors/focuswriter/metadata.xml
index d79d623beff3..1af3afbebbe7 100644
--- a/app-editors/focuswriter/metadata.xml
+++ b/app-editors/focuswriter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
diff --git a/app-editors/fte/metadata.xml b/app-editors/fte/metadata.xml
index 182929f87cc3..1a3b29f46396 100644
--- a/app-editors/fte/metadata.xml
+++ b/app-editors/fte/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index 40b4aba4be42..eb35a3df50f2 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index 39980802b1da..7b343b06be8a 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml
index 39980802b1da..7b343b06be8a 100644
--- a/app-editors/ghex/metadata.xml
+++ b/app-editors/ghex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest
index cd141eddf2b2..a6bed456afc1 100644
--- a/app-editors/ghostwriter/Manifest
+++ b/app-editors/ghostwriter/Manifest
@@ -1,2 +1,2 @@
DIST ghostwriter-1.8.1.tar.gz 1220000 BLAKE2B 3fa3d95ed819bc8f7b76b396e6634658a8bda23e9100cbb298d301fc382db451430a4a31fbd092326af198825c83d2c998172c90a7e318aeb57ef7799751995a SHA512 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521
-DIST ghostwriter-2.0.1.tar.gz 7802864 BLAKE2B 387ce3b0fe58171d6c195b51bd5dfbdcd6f7cbe023aaba4962d311e4dd6c08066b4292467f4cf2941b9a28540b639d498057a66a4ca194e35ca32e17399d7d75 SHA512 e91631d51110a884ab68621ee2fe0f1c013d0c2413f0ee58135821f2539285e88dcdfca0f9d80e0313bdab4c02700faa87eae32d525e51eea82163bb1a6d5b1b
+DIST ghostwriter-2.0.2.tar.gz 7802654 BLAKE2B a52a96ba6aecb8c6b8ff565bd9b3b7622d15ae68af5e393da4f1e1c8dae70a8053228e302e87e2530c907be825df5e7eebc7de14bb23e0e46f4b4308b9ae6e63 SHA512 1e51b86b8afae41c47e5e7ec96752d356dd9dca8a44d1aab6a541e1ce188cb40add52f96a52da7a689df47a2e7a9a1dc7211f480c3456f4a11c81f80e2779a7e
diff --git a/app-editors/ghostwriter/ghostwriter-2.0.1.ebuild b/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
index 9f9908a37a0f..9f9908a37a0f 100644
--- a/app-editors/ghostwriter/ghostwriter-2.0.1.ebuild
+++ b/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
diff --git a/app-editors/ghostwriter/metadata.xml b/app-editors/ghostwriter/metadata.xml
index 0687ee5fbd1f..6e74fad5a416 100644
--- a/app-editors/ghostwriter/metadata.xml
+++ b/app-editors/ghostwriter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>reagentoo@gmail.com</email>
diff --git a/app-editors/gnome-latex/metadata.xml b/app-editors/gnome-latex/metadata.xml
index d886385e009e..6c684e071d5f 100644
--- a/app-editors/gnome-latex/metadata.xml
+++ b/app-editors/gnome-latex/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
index 4da0c7ca0e09..3ae2c6df49ea 100644
--- a/app-editors/gummi/metadata.xml
+++ b/app-editors/gummi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>christian.tietz@mailbox.org</email>
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index be92dc54342a..eb9f0418416e 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/hexcurse/metadata.xml b/app-editors/hexcurse/metadata.xml
index e089782a1081..7a31ccaa5d39 100644
--- a/app-editors/hexcurse/metadata.xml
+++ b/app-editors/hexcurse/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/app-editors/hexedit/metadata.xml b/app-editors/hexedit/metadata.xml
index 4e80019694b1..001997549c54 100644
--- a/app-editors/hexedit/metadata.xml
+++ b/app-editors/hexedit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>tomjbe@gentoo.org</email>
diff --git a/app-editors/hteditor/metadata.xml b/app-editors/hteditor/metadata.xml
index ec0e241f14ae..3f845187fef1 100644
--- a/app-editors/hteditor/metadata.xml
+++ b/app-editors/hteditor/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>slyfox@gentoo.org</email>
- <name>Sergei Trofimovich</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">hte</remote-id>
<bugs-to>https://github.com/sebastianbiallas/ht/issues</bugs-to>
diff --git a/app-editors/jasspa-microemacs/metadata.xml b/app-editors/jasspa-microemacs/metadata.xml
index ab5b22e79f36..1a02f2a6e7d7 100644
--- a/app-editors/jasspa-microemacs/metadata.xml
+++ b/app-editors/jasspa-microemacs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/jed/metadata.xml b/app-editors/jed/metadata.xml
index a3f50195b266..aff74631c869 100644
--- a/app-editors/jed/metadata.xml
+++ b/app-editors/jed/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/jedit/metadata.xml b/app-editors/jedit/metadata.xml
index 8c0bf782641b..1522960c2247 100644
--- a/app-editors/jedit/metadata.xml
+++ b/app-editors/jedit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
diff --git a/app-editors/jext/Manifest b/app-editors/jext/Manifest
deleted file mode 100644
index 8780b631e4c9..000000000000
--- a/app-editors/jext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jext-sources-5.0.tar.gz 1029772 BLAKE2B 632fca6aa3ff55979f1dee9fefd1505e0e19b38ca1ee0530472edd9fee95157df9cba56abb4ce4790807766d318a6d0ce29decb9b4a73d103bfe8127886fdf9d SHA512 ac66babfca05d112541e40b0aa8ebde33a69a3a97f42966be24a28232d3c100b9fe8007e26618909fd78111d3eb4ddecc2258599bff40e0e1959ea6632f43682
diff --git a/app-editors/jext/files/jext-5.0-enum-as-keyword.patch b/app-editors/jext/files/jext-5.0-enum-as-keyword.patch
deleted file mode 100644
index c773e571d182..000000000000
--- a/app-editors/jext/files/jext-5.0-enum-as-keyword.patch
+++ /dev/null
@@ -1,173 +0,0 @@
---- src/lib/org/gjt/sp/jedit/textarea/InputHandler.java.orig 2015-07-03 17:52:13.843000000 +0000
-+++ src/lib/org/gjt/sp/jedit/textarea/InputHandler.java 2015-07-03 17:52:59.746000000 +0000
-@@ -141,10 +141,10 @@
- */
- public static String getActionName(ActionListener listener)
- {
-- Enumeration enum = getActions();
-- while(enum.hasMoreElements())
-+ Enumeration myEnum = getActions();
-+ while(myEnum.hasMoreElements())
- {
-- String name = (String)enum.nextElement();
-+ String name = (String)myEnum.nextElement();
- ActionListener _listener = getAction(name);
- if(_listener == listener)
- return name;
---- src/lib/org/jext/options/OptionsDialog.java.orig 2015-07-03 17:54:19.179000000 +0000
-+++ src/lib/org/jext/options/OptionsDialog.java 2015-07-03 17:54:33.377000000 +0000
-@@ -297,11 +297,11 @@
-
- private void addOptionGroup(OptionGroup child, OptionGroup parent)
- {
-- ArrayList enum = child.getMembers();
-+ ArrayList myEnum = child.getMembers();
-
-- for (int i = 0; i < enum.size(); i++)
-+ for (int i = 0; i < myEnum.size(); i++)
- {
-- Object elem = enum.get(i);
-+ Object elem = myEnum.get(i);
-
- if (elem instanceof OptionPane)
- {
-@@ -669,4 +669,4 @@
-
- }
-
--// End of OptionsDialog.java
-\ No newline at end of file
-+// End of OptionsDialog.java
---- src/lib/org/jext/misc/VirtualFolders.java.orig 2015-07-03 17:49:57.731000000 +0000
-+++ src/lib/org/jext/misc/VirtualFolders.java 2015-07-03 17:51:11.418000000 +0000
-@@ -233,10 +233,10 @@
- ret.append(crlf).append("<folderlist>");
- }
-
-- Enumeration enum = parent.children();
-- while (enum.hasMoreElements())
-+ Enumeration myEnum = parent.children();
-+ while (myEnum.hasMoreElements())
- {
-- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
-+ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
- ret.append(toXML(child, depth + 1));
- }
-
-@@ -317,20 +317,20 @@
-
- private void fixVisible()
- {
-- Enumeration enum = root.depthFirstEnumeration();
-+ Enumeration myEnum = root.depthFirstEnumeration();
- VirtualFolderNode node = null;
-- while (enum.hasMoreElements())
-+ while (myEnum.hasMoreElements())
- {
-
-- node = (VirtualFolderNode)enum.nextElement();
-+ node = (VirtualFolderNode)myEnum.nextElement();
- TreePath path = new TreePath(node.getPath());
- tree.collapsePath(path);
- }
-
-- enum = root.depthFirstEnumeration();
-- while (enum.hasMoreElements())
-+ myEnum = root.depthFirstEnumeration();
-+ while (myEnum.hasMoreElements())
- {
-- node = (VirtualFolderNode)enum.nextElement();
-+ node = (VirtualFolderNode)myEnum.nextElement();
- if (node.shouldBeVisible())
- {
- TreePath path = new TreePath(((VirtualFolderNode)node.getParent()).getPath());
-@@ -392,10 +392,10 @@
- public static boolean folderExists(VirtualFolderNode parent, String name)
- {
- boolean exists = false;
-- Enumeration enum = parent.children();
-- while ((enum.hasMoreElements()) && !exists)
-+ Enumeration myEnum = parent.children();
-+ while ((myEnum.hasMoreElements()) && !exists)
- {
-- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
-+ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
- exists = child.toString().equals(name);
- }
- return exists;
-@@ -526,10 +526,10 @@
- } else {
- if (fromMenu)
- {
-- Enumeration enum = node.children();
-- while (enum.hasMoreElements())
-+ Enumeration myEnum = node.children();
-+ while (myEnum.hasMoreElements())
- {
-- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement();
-+ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement();
- openNode(child, fromMenu);
- }
- }
---- src/lib/com/microstar/xml/XmlParser.java.orig 2015-07-03 17:41:23.209000000 +0000
-+++ src/lib/com/microstar/xml/XmlParser.java 2015-07-03 17:46:30.296000000 +0000
-@@ -1346,7 +1346,7 @@
- {
- String name;
- int type;
-- String enum = null;
-+ String myEnum = null;
-
- // Read the attribute name.
- name = readNmtoken(true);
-@@ -1358,12 +1358,12 @@
- // Get the string of enumerated values
- // if necessary.
- if (type == ATTRIBUTE_ENUMERATED || type == ATTRIBUTE_NOTATION) {
-- enum = dataBufferToString();
-+ myEnum = dataBufferToString();
- }
-
- // Read the default value.
- requireWhitespace();
-- parseDefault(elementName, name, type, enum);
-+ parseDefault(elementName, name, type, myEnum);
- }
-
-
-@@ -1451,7 +1451,7 @@
- * Parse the default value for an attribute.
- * [62] Default ::= '#REQUIRED' | '#IMPLIED' | ((%'#FIXED' S)? %AttValue
- */
-- void parseDefault (String elementName, String name, int type, String enum)
-+ void parseDefault (String elementName, String name, int type, String myEnum)
- throws java.lang.Exception
- {
- int valueType = ATTRIBUTE_DEFAULT_SPECIFIED;
-@@ -1477,7 +1477,7 @@
- value = readLiteral(LIT_CHAR_REF);
- context = CONTEXT_DTD;
- }
-- setAttribute(elementName, name, type, enum, value, valueType);
-+ setAttribute(elementName, name, type, myEnum, value, valueType);
- }
-
-
-@@ -2714,7 +2714,7 @@
- * - int value type
- * *TODO: do something with attribute types.
- */
-- void setAttribute (String elName, String name, int type, String enumeration,
-+ void setAttribute (String elName, String name, int type, String myEnum,
- String value, int valueType)
- throws java.lang.Exception
- {
-@@ -2736,7 +2736,7 @@
- attribute[0] = new Integer(type);
- attribute[1] = value;
- attribute[2] = new Integer(valueType);
-- attribute[3] = enumeration;
-+ attribute[3] = myEnum;
- attribute[4] = null;
- attlist.put(name.intern(), attribute);
-
diff --git a/app-editors/jext/files/jext-pre b/app-editors/jext/files/jext-pre
deleted file mode 100644
index 5a02d4b71db8..000000000000
--- a/app-editors/jext/files/jext-pre
+++ /dev/null
@@ -1,91 +0,0 @@
-# This script launches Jext, the Java text editor.
-# It checks for a $HOME/.jext directory and eventually creates it.
-# Next it checks for a /etc/jextrc and $JEXT_CONFFILE (~/.jext/variables) files which define the JEXT_HOME JAVA_CMD JAVA_OPT CLASSPATH and ToShow variables. The first is system wide(used in RPM install mainly), the second is per user.
-# If this file doesn't exist the script creates it by asking the options to the user.
-
-# Sharpshooter 23/02/2002
-# Blaisorblade 18/11/2002
-
-#For special cases about different config files(for developers with working
-#copy and an unstable one to be tested).
-if [ "$JEXT_CONFFILE" = "" ]
-then
- JEXT_CONFFILE=~/.jext/variables
-fi
-
-# Help
-if [ "$1" = "--help" -o "$1" = "-h" ]
-then
- echo "This script launch Jext the Java text editor."
- echo "Usage : $0 [--reconf] [files]"
- echo "--reconf doesn't start jext but clears the"
- echo " $JEXT_CONFFILE file with the settings to start jext"
- echo " (jext & java location and jext options)."
- exit 0
-fi
-
-if [ "$1" = "--reconf" ]
-then
- echo "Clearing $JEXT_CONFFILE, you'll have to reenter jext & java \
-interpreter location"
- rm -f "$JEXT_CONFFILE"
- exit 0
-fi
-
-
-# Check for the user's ~/.jext directory.
-if ! [ -d ~/.jext ]
-then
- echo "It seems you don't have a .jext directory in your home dir."
- echo "I create it."
- echo
- mkdir -p ~/.jext/xinsert
-fi
-
-
-
-# Check for the $HOME/.jext/variables file.
-if ! [ -f $JEXT_CONFFILE -o -f /etc/jextrc ]
-then
- #Let's add some explaination in the config file.
- cat >$JEXT_CONFFILE <<EOM
-#This is included when launching Jext. It is a normal shell script \
-used to define env vars
-#Meanings of settings:
-#JEXT_HOME The home dir of jext(under which it finds the lib and so on dirs)
-#JAVA_CMD The complete path for the java command
-#JAVA_OPT The options to be passed to the java command(not to Jext itself!)
-#CLASSPATH The extra classpath to be specified(for cases such as AntWork plugin)
-#ToShow If this is set to y the output is not redirected to /dev/null;
-# Mainly for developers who want to trace Jext output(you could also use
-# the DickTracy plugin).
-EOM
-#----
- JEXT_HOME="/usr/share/jext/lib"
- echo "JEXT_HOME="$JEXT_HOME >> $JEXT_CONFFILE
-#----
- ToShow=
- echo "ToShow="$ToShow>>$JEXT_CONFFILE
-fi
-
-# Extract the contents of the $JEXT_CONFFILE file.
-[ -f /etc/jextrc ] && source /etc/jextrc
-[ -f $JEXT_CONFFILE ] && source $JEXT_CONFFILE
-
-#Needed to make Jext find his plugins(it searches them in `pwd`/plugins)
-for i in $@
-do
- if [ "${i:0:1}" != "/" -a "${i:0:1}" != "-" ]; then #If the first char of $i is not a / then
- files="$files `pwd`/$i" #it is a relative path so we must make it absolute.
- elif [ "$i" != "-" ]; then
- files="$files $i"
- else
- case "$i" in
- --reconf|--help|-h)
- ;;
- *)
- files="$files $i"
- ;;
- esac
- fi
-done
diff --git a/app-editors/jext/jext-5.0-r2.ebuild b/app-editors/jext/jext-5.0-r2.ebuild
deleted file mode 100644
index bec3821aed57..000000000000
--- a/app-editors/jext/jext-5.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A text editor written in Java"
-HOMEPAGE="https://sourceforge.net/projects/jext/"
-MY_PV="${PV/_}"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-sources-${MY_PV}.tar.gz"
-LICENSE="|| ( GPL-2 JPython )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/jython:2.7
- dev-java/jgoodies-looks:1.2
- dev-java/gnu-regexp:1"
-DEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-S="${WORKDIR}/${PN}-src-${MY_PV}"
-
-# Necessary otherwise it chokes on compiling with jdk-1.8
-# due to unmappable characters.
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-java_prepare() {
- # bundles some com.microstar.xml who knows what's that
- # also com.jgoodies.uif_lite which is apparently some jgoodies-looks
- # example code which we don't package and there is probably no point
- rm -v "${S}"/extplugins/Admin/*.jar || die
- rm -rf src/lib/gnu || die
-
- # Fix "enum as a keyword" error.
- epatch "${FILESDIR}"/"${P}"-enum-as-keyword.patch
-}
-
-src_compile() {
- cd "${S}/src" || die
- eant jar $(use_doc javadocs) \
- -Dclasspath="$(java-pkg_getjars jython-2.7,jgoodies-looks-1.2,gnu-regexp-1)"
-}
-
-src_install() {
- java-pkg_newjar lib/${P}.jar
- java-pkg_dojar lib/dawn*.jar
-
- java-pkg_dolauncher ${PN} \
- --main org.jext.Jext \
- --java_args '-Dpython.path=$(java-config --classpath=jython-2.7)' \
- -pre "${FILESDIR}/${PN}-pre"
-
- if use doc; then
- java-pkg_dohtml -r docs/api
- fi
-}
-
-pkg_postinst() {
- elog "Plugins are currently not built/installed. Patches welcome."
-}
diff --git a/app-editors/jext/metadata.xml b/app-editors/jext/metadata.xml
deleted file mode 100644
index 1db813e89d5f..000000000000
--- a/app-editors/jext/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">jext</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-editors/joe/metadata.xml b/app-editors/joe/metadata.xml
index 9fd1399650ee..773ba43bc9e6 100644
--- a/app-editors/joe/metadata.xml
+++ b/app-editors/joe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>amynka@gentoo.org</email>
diff --git a/app-editors/jove/metadata.xml b/app-editors/jove/metadata.xml
index e18d3b3af8c5..7fc03da65063 100644
--- a/app-editors/jove/metadata.xml
+++ b/app-editors/jove/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index b159d5aa78fc..14a8eb65f878 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1 +1 @@
-DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
+DIST juffed-0.10_p20200103.tar.gz 1628731 BLAKE2B d49e6d8a9eab1edf8b4a74ec0dc9b2e4a4c7e99180c8faf1fdb73d406ee2055626623a72bf00e90f7af7e7380540f625bd9b5c53a662f5334edbebe298e40626 SHA512 6672dc68eb7e40d258dececc9b7389e8417709cad1346e1abb7cf97cf7f59394586c93bc40bb15096c2e5175256385595522dac8714ad5f37946e0bb7a3eb258
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
deleted file mode 100644
index f4a22957480d..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 49b6982336ad127b2b780d2ae7c1be1104d9dae5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 20:31:38 +0200
-Subject: [PATCH] Fix build with QScintilla-2.10.3
-
----
- src/app/qsci/lexers/qscilexerada.h | 3 ---
- src/app/qsci/lexers/qscilexerhaskell.h | 3 ---
- src/app/qsci/lexers/qscilexerlisp.h | 3 ---
- src/app/qsci/lexers/qscilexernsis.h | 3 ---
- 4 files changed, 12 deletions(-)
-
-diff --git a/src/app/qsci/lexers/qscilexerada.h b/src/app/qsci/lexers/qscilexerada.h
-index 984f97e..30c6646 100644
---- a/src/app/qsci/lexers/qscilexerada.h
-+++ b/src/app/qsci/lexers/qscilexerada.h
-@@ -3,9 +3,6 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_ADA 20
--
- #define SCE_ADA_DEFAULT 0
- #define SCE_ADA_WORD 1
- #define SCE_ADA_IDENTIFIER 2
-diff --git a/src/app/qsci/lexers/qscilexerhaskell.h b/src/app/qsci/lexers/qscilexerhaskell.h
-index 78c8978..56a3614 100644
---- a/src/app/qsci/lexers/qscilexerhaskell.h
-+++ b/src/app/qsci/lexers/qscilexerhaskell.h
-@@ -3,9 +3,6 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_HASKELL 68
--
- #define SCE_HA_DEFAULT 0
- #define SCE_HA_IDENTIFIER 1
- #define SCE_HA_KEYWORD 2
-diff --git a/src/app/qsci/lexers/qscilexerlisp.h b/src/app/qsci/lexers/qscilexerlisp.h
-index 5b43d74..6e5dc32 100644
---- a/src/app/qsci/lexers/qscilexerlisp.h
-+++ b/src/app/qsci/lexers/qscilexerlisp.h
-@@ -3,9 +3,6 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_LISP 21
--
- #define SCE_LISP_DEFAULT 0
- #define SCE_LISP_COMMENT 1
- #define SCE_LISP_NUMBER 2
-diff --git a/src/app/qsci/lexers/qscilexernsis.h b/src/app/qsci/lexers/qscilexernsis.h
-index 8b009ec..06efc40 100644
---- a/src/app/qsci/lexers/qscilexernsis.h
-+++ b/src/app/qsci/lexers/qscilexernsis.h
-@@ -3,9 +3,6 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_NSIS 43
--
- #define SCE_NSIS_DEFAULT 0
- #define SCE_NSIS_COMMENT 1
- #define SCE_NSIS_STRINGDQ 2
---
-2.17.0
-
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
deleted file mode 100644
index fcfab7f4072f..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/FindQScintilla2.cmake 2016-03-23 20:43:22.000000000 +0100
-+++ b/cmake/FindQScintilla2.cmake 2017-10-08 17:25:06.984464985 +0200
-@@ -52,7 +52,7 @@
- ENDIF()
- ENDFOREACH()
-
-- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qt5scintilla2 libqt5scintilla2 libqscintilla2-qt5 qscintilla2-qt5)
-+ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 libqscintilla2_qt5 qscintilla2_qt5)
- GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
- GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
-
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
deleted file mode 100644
index 4dfa7fae31f7..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 19:43:17 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- plugins/keybindings/KeysPage.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp
-index 6579e3e..e68b039 100644
---- a/plugins/keybindings/KeysPage.cpp
-+++ b/plugins/keybindings/KeysPage.cpp
-@@ -1,9 +1,10 @@
- #include "KeysPage.h"
-
--#include <QPushButton>
-+#include <QAction>
- #include <QHeaderView>
- #include <QKeyEvent>
- #include <QMessageBox>
-+#include <QPushButton>
-
- #include "KeySettings.h"
- #include "Log.h"
---
-2.17.0
-
diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20200103.ebuild
index 955c950bbf9e..a53f1c7ee35d 100644
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20200103.ebuild
@@ -1,42 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
+COMMIT=74ab7236a30be17351edc5b83eb3579affd96913
inherit cmake xdg
DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
-HOMEPAGE="http://juffed.com/en/"
-SRC_URI="https://github.com/Mezomish/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
+HOMEPAGE="http://juffed.com/en/ https://github.com/Mezomish/juffed"
+SRC_URI="https://github.com/Mezomish/juffed/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
RDEPEND="
app-i18n/enca
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5(+),X]
+ dev-qt/qtsingleapplication[X]
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+ x11-libs/qscintilla
"
DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
DOCS=( ChangeLog README )
-S="${WORKDIR}/Mezomish-${PN}-5ba17f9"
-
-PATCHES=(
- "${FILESDIR}/${P}-qscintilla-2.10.patch"
- "${FILESDIR}/${P}-qt-5.11.patch"
- "${FILESDIR}/${P}-qscintilla-2.10.3.patch"
-)
-
src_prepare() {
# Upstream version outdated/dysfunctional and CRLF terminated
cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die
@@ -53,6 +46,7 @@ src_configure() {
-DUSE_QT5=ON
-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-DLIB_SUFFIX=${libdir/lib/}
+ -DQSCINTILLA_NAMES="qscintilla2;libqscintilla2;qscintilla2_qt5;qscintilla2_qt5"
)
cmake_src_configure
}
diff --git a/app-editors/juffed/metadata.xml b/app-editors/juffed/metadata.xml
index 5d63c46383a4..a475b019c5cf 100644
--- a/app-editors/juffed/metadata.xml
+++ b/app-editors/juffed/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">juffed</remote-id>
+ <remote-id type="github">Mezomish/juffed</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-editors/jupp/metadata.xml b/app-editors/jupp/metadata.xml
index a1a37697cb80..a97cf26a9086 100644
--- a/app-editors/jupp/metadata.xml
+++ b/app-editors/jupp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index a71f3b22cf1e..0e6d7aafad9d 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1 +1 @@
-DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
+DIST kakoune-2021.08.28.tar.gz 654429 BLAKE2B 8cf769d2dea74fd8bab8261e4d79276af089d73753052fdd3776bff0adc72bc20c43f840350076e675c633de2175ad83960fa2ccf85fc852c7c81bd4888ced2b SHA512 1f4f0648959e94e45eb00f2398aa6897595457ef3ee4d1c6e18d494f3e68f8d3a0c4d0dbed88b6588fda61137a060c648ff635972731c0f29faef4cdc03c829f
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index 726968e0e8c6..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/rc/filetype/sh.kak b/rc/filetype/sh.kak
---- a/rc/filetype/sh.kak 2020-01-16 11:52:20.000000000 +0200
-+++ b/rc/filetype/sh.kak 2020-05-25 15:50:20.417809942 +0300
-@@ -2,6 +2,11 @@
- set-option buffer filetype sh
- }
-
-+hook global BufCreate .*\.ebuild %{
-+ set-option buffer filetype sh
-+}
-+
-+
- hook global WinSetOption filetype=sh %{
- require-module sh
- set-option window static_words %opt{sh_static_words}
diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
deleted file mode 100644
index d558c49347c1..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/787029
---- a/src/regex_impl.cc
-+++ b/src/regex_impl.cc
-@@ -12,6 +12,7 @@
-
- #include <cstdio>
- #include <cstring>
-+#include <limits>
-
- namespace Kakoune
- {
diff --git a/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch b/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch
new file mode 100644
index 000000000000..b4a7cc439f36
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
+index be03de9e..97bdbfe3 100644
+--- a/rc/filetype/php.kak
++++ b/rc/filetype/php.kak
+@@ -85,7 +85,7 @@ define-command -hidden php-indent-on-char %<
+ define-command -hidden php-insert-on-new-line %<
+ evaluate-commands -draft -itersel %<
+ # copy // comments or docblock * prefix and following white spaces
+- try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P
++ try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P }
+ # append " * " on lines starting a multiline /** or /* comment
+ try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> }
+ >
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild b/app-editors/kakoune/kakoune-2021.08.28.ebuild
index 21dafc2dd2c7..f44978e99739 100644
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
+++ b/app-editors/kakoune/kakoune-2021.08.28.ebuild
@@ -1,27 +1,22 @@
# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
DESCRIPTION="Modal editor inspired by vim"
HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
-SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
+SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Unlicense"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
- "${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
+ "${FILESDIR}"/${P}-php-filetype-fix.patch
)
src_prepare() {
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
index 9469b5728eda..88d5933eea22 100644
--- a/app-editors/kakoune/metadata.xml
+++ b/app-editors/kakoune/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="github">mawww/kakoune</remote-id>
- </upstream>
+ <maintainer type="person" proxied="yes">
+ <email>mujo@sdf.org</email>
+ <name>Ian Hixson</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mawww/kakoune</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-editors/kile/metadata.xml b/app-editors/kile/metadata.xml
index 56d53b857b49..84ab11c2e4b4 100644
--- a/app-editors/kile/metadata.xml
+++ b/app-editors/kile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/app-editors/le/metadata.xml b/app-editors/le/metadata.xml
index 4eaeb3fe378c..9eb3e811ea8e 100644
--- a/app-editors/le/metadata.xml
+++ b/app-editors/le/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>gentoo@schellstede.de</email>
diff --git a/app-editors/leafpad/metadata.xml b/app-editors/leafpad/metadata.xml
index 0a1791b8115a..29f6abd3c713 100644
--- a/app-editors/leafpad/metadata.xml
+++ b/app-editors/leafpad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<use>
diff --git a/app-editors/levee/metadata.xml b/app-editors/levee/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/levee/metadata.xml
+++ b/app-editors/levee/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/lpe/metadata.xml b/app-editors/lpe/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/lpe/metadata.xml
+++ b/app-editors/lpe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/metadata.xml b/app-editors/metadata.xml
index 7b797817cf0e..f6c1510ce357 100644
--- a/app-editors/metadata.xml
+++ b/app-editors/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The app-editors category contains text editors.
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index b2a757c194cf..bf42cdbcec07 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,2 +1,2 @@
-DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add
DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
+DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 156c5660d642..7a6f27c8ff88 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/mg/mg-20200723.ebuild b/app-editors/mg/mg-20210314-r1.ebuild
index a25f7051f9bf..59dc39a0a994 100644
--- a/app-editors/mg/mg-20200723.ebuild
+++ b/app-editors/mg/mg-20210314-r1.ebuild
@@ -11,10 +11,10 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86"
IUSE="livecd"
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/app-editors/mg/mg-20210314.ebuild b/app-editors/mg/mg-20210609-r1.ebuild
index a25f7051f9bf..8bc287431abc 100644
--- a/app-editors/mg/mg-20210314.ebuild
+++ b/app-editors/mg/mg-20210609-r1.ebuild
@@ -1,23 +1,24 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit toolchain-funcs
DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
-HOMEPAGE="https://homepage.boetes.org/software/mg/"
+HOMEPAGE="https://homepage.boetes.org/software/mg/
+ https://github.com/hboetes/mg"
SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="livecd"
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
!elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
src_prepare() {
# fix path to tutorial in man page
diff --git a/app-editors/micro/Manifest b/app-editors/micro/Manifest
index b28298589ad5..138eb4d8bb40 100644
--- a/app-editors/micro/Manifest
+++ b/app-editors/micro/Manifest
@@ -56,6 +56,8 @@ DIST github.com%2Fzyedidia%2Fjson5%2F@v%2Fv0.0.0-20200102012142-2da050b1a98d.mod
DIST github.com%2Fzyedidia%2Fjson5%2F@v%2Fv0.0.0-20200102012142-2da050b1a98d.zip 81515 BLAKE2B 17abd39f209386757e5d8e3edb912b6f71f5ecce3f1cee31f1cac2b46f254d14f07dd262f54fa6f0c6ded359c8d30798a99a2964e4d2ed0cf6372495d3512c66 SHA512 fa1b78d2b42eaa619bf950fa01973c8c5a21b6b647d73f2ee74f9687f473927f6bc0cf7c2a272d10b80a90cfd0d2b82a5f01aa639471b584d13cbfa13a899ea4
DIST github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.mod 34 BLAKE2B 22d6340dbabd18dd078d1ceba0ec6f17b15680007822b628a0bad52ac9388745cbb253661aef08d58c63850fa5a478a46b635a8e314a37286de505daf7c4eb35 SHA512 daf83940cc17a02565aa383103449e60cb06ad55c8e7bb42ea4374cf9d4783a8c1b4be8da2d38933c528bf4a558a75e6b96d9e09171c87128c3e650d68c74286
DIST github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.zip 25272 BLAKE2B 50eee92c460dfff99f8261c1b5bd45d8ddd029396fff85acb67afe0eb25e0120a683c575d8f331daeb2c9b74e829d418700cc937655fdd8545153e947b3034e8 SHA512 0234099663b08401480685679a73e322bd506791e058423516d0cd6670c6c1ac0999d613a442fa7b1f7846086df0f92d83659e116b713c17709f804003097fd1
+DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv1.1.15.mod 40 BLAKE2B aff997dcc39cacc15c2c70f9c55b59423e04a0d674c16f69650844da8eaef71d07407db21acbc90e4ca223007572a6d0cdafa8027f3392da97b682c040302eb3 SHA512 ac31a74f5618ad145697ab02ce101f6fab35ae2518ed3ba1f160024b370f9741ebf3fa2831527fe0fcf08b54d81b9793ef096b39a33992c8412ef514bdb0ced5
+DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv1.1.15.zip 24480 BLAKE2B c12522ff9844ba6cd151074d938f2be36d19c4e5cac4906ee0373116c7b8c3241dac349282c11c3c021c9f4416e3c36a8cd91418eeff29f8406bd8b4a8cb3ba9 SHA512 cd4a9dfd077afeda2c1c501c8d010ff7b51dad6c79354db10be3e869e665ae90f60992132f91d91a8754b8124cb902d91ecfdb5a9fc1aaf7df2d036c720c6023
DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.mod 31 BLAKE2B 0d0decd07c2ebd17e899f2c4032a6dab06ea54a764b90997442d29d5b7464bb993cbeb9a842b547424e8b187717895ad811e589784a213e4d00fabf0b8e28db8 SHA512 919c519a4fb1d1f3d13f1217f59f82aaaa202a65ac201c64ef0ebde46a4e5f6c977282b5afcd11778ad38d35b4591c1190bb94be66010a346a47253d1ee32db2
DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.zip 15796 BLAKE2B d4cb2490b6b8d1914f802e7e767e0d29be06b6946012c4d84f9e7a898a4a2d20d64b9cd84eb5ab729ff8c1d1925a8f3ccab78f56f249d56a7cc5feacadd82ea7 SHA512 a51787e01adcedd20ddbba543351904bdde3c25f44f9621cfe0ffa73ed28d0b21327aadbe529a73374ffbd315b91b4d0d0d7f2c9fcc033d67f21158ce486e2f1
DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.6.mod 348 BLAKE2B ea7eb55e01e85f76b88f072b02e36bbeb800eaec4ce39404f4acc409ac05af51e78c3e26d317cfdade2a3adb28bfddbd5233db60c300bc5f3a8e5eeb7f09eeac SHA512 b3db94f2a7c44d7350d89acb9a118c6f8d3c39530a1af23c5e1aa9f9fa842a06ec5e7f5af4e87901cb08c841e7f953b3f83a3ae6488f9f3d14d4ee063b53ffcb
@@ -85,4 +87,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.mod 109 BLAKE2B 08629b072202d338d461af7142fd4049b4db1c2df5997c995edfa9b12b2db2df0da8160db7032bc84215c742ad67021910b2fa3ec87c33c14fec309a137cb174 SHA512 b2ec68ffa8d8e747ebfc1f6103ec980c0e02d372a50d44c1ca289688cceb41006443c02c937975bf5847460a6a071d17f1f0c8ee7549fa1cf4eccdf848020ac2
DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.zip 36857 BLAKE2B c4ff2a1bbc2dc984fc24065f71b560cbdda220b78d88cff9ed5a91654984cd56c9e85b64a416c140e4b01bfda75734f7c77f882e3fb45a0227b3f47cc02781c8 SHA512 94b70a83a31acde7232223ca82d6588716b39d6463baf5f15d921a5bc24a7d9b98307b8d44d3bbc9a5a82f6e4111b2b9ba1c15ee313a3784a30d63fe5d198bd3
+DIST micro-2.0.10.tar.gz 814030 BLAKE2B 8becaf7caa167747443e1aa3af32e96588af275d2b921fa88fe9d55b4eec22622cf7a68d85d47834159042100414855c5bb3f8b9f7c8d934f762ec63f4d40435 SHA512 06796270a6d99578ac36f3313dffb6ba56c5e8963c6b59562b4ef9e65036ae2ed21ce602b39ee08d2f3c54c501089166fdecc5719a1ca535d84960b3b4b67f72
DIST micro-2.0.9.tar.gz 811560 BLAKE2B 2e461593e71fda69a6f75e5adfaedd7bcf052b8bda9899f03a1e25e3db3bb8071bec80716d14a0ff7a381728871f0705076ef69e4de58f40499a7501343b4063 SHA512 5dbf81deb734618ec0a8ccaffc65f972d8da1d28b761c31bf3f5433c02ad6daa2360b1ea825c0a2cfce2f8d31d6481d468bbe29b42e1c96083c7a941fe42bc3a
diff --git a/app-editors/micro/metadata.xml b/app-editors/micro/metadata.xml
index b33d29ab074e..7128365b1861 100644
--- a/app-editors/micro/metadata.xml
+++ b/app-editors/micro/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>telans@posteo.de</email>
diff --git a/app-editors/micro/micro-2.0.10.ebuild b/app-editors/micro/micro-2.0.10.ebuild
new file mode 100644
index 000000000000..330643ba0fac
--- /dev/null
+++ b/app-editors/micro/micro-2.0.10.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module optfeature desktop xdg
+
+# Building this list can be done by:
+# cd $(mktemp -d)
+# PV="2.0.10"
+# wget "https://github.com/zyedidia/micro/archive/v${PV}.tar.gz"
+# tar -xvzf "v${PV}.tar.gz"
+# sed -Ee 's/^(.+) h1:.+$/\t"\1"/g' "micro-${PV}/go.sum" > go.sum.out
+EGO_SUM=(
+ "github.com/blang/semver v3.5.1+incompatible"
+ "github.com/blang/semver v3.5.1+incompatible/go.mod"
+ "github.com/chzyer/logex v1.1.10/go.mod"
+ "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+ "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+ "github.com/davecgh/go-spew v1.1.0/go.mod"
+ "github.com/davecgh/go-spew v1.1.1"
+ "github.com/davecgh/go-spew v1.1.1/go.mod"
+ "github.com/dustin/go-humanize v1.0.0"
+ "github.com/dustin/go-humanize v1.0.0/go.mod"
+ "github.com/gdamore/encoding v1.0.0"
+ "github.com/gdamore/encoding v1.0.0/go.mod"
+ "github.com/go-errors/errors v1.0.1"
+ "github.com/go-errors/errors v1.0.1/go.mod"
+ "github.com/kr/pretty v0.1.0"
+ "github.com/kr/pretty v0.1.0/go.mod"
+ "github.com/kr/pty v1.1.1/go.mod"
+ "github.com/kr/text v0.1.0"
+ "github.com/kr/text v0.1.0/go.mod"
+ "github.com/lucasb-eyer/go-colorful v1.0.3"
+ "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+ "github.com/mattn/go-isatty v0.0.11"
+ "github.com/mattn/go-isatty v0.0.11/go.mod"
+ "github.com/mitchellh/go-homedir v1.1.0"
+ "github.com/mitchellh/go-homedir v1.1.0/go.mod"
+ "github.com/pmezard/go-difflib v1.0.0"
+ "github.com/pmezard/go-difflib v1.0.0/go.mod"
+ "github.com/rivo/uniseg v0.1.0"
+ "github.com/rivo/uniseg v0.1.0/go.mod"
+ "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff"
+ "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod"
+ "github.com/sergi/go-diff v1.1.0"
+ "github.com/sergi/go-diff v1.1.0/go.mod"
+ "github.com/stretchr/objx v0.1.0/go.mod"
+ "github.com/stretchr/testify v1.4.0"
+ "github.com/stretchr/testify v1.4.0/go.mod"
+ "github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8"
+ "github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8/go.mod"
+ "github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod"
+ "github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb"
+ "github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod"
+ "github.com/zyedidia/clipboard v1.0.3"
+ "github.com/zyedidia/clipboard v1.0.3/go.mod"
+ "github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3"
+ "github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod"
+ "github.com/zyedidia/go-runewidth v0.0.12"
+ "github.com/zyedidia/go-runewidth v0.0.12/go.mod"
+ "github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655"
+ "github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655/go.mod"
+ "github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5"
+ "github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5/go.mod"
+ "github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d"
+ "github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod"
+ "github.com/zyedidia/poller v1.0.1"
+ "github.com/zyedidia/poller v1.0.1/go.mod"
+ "github.com/zyedidia/pty v1.1.15"
+ "github.com/zyedidia/pty v1.1.15/go.mod"
+ "github.com/zyedidia/tcell/v2 v2.0.8"
+ "github.com/zyedidia/tcell/v2 v2.0.8/go.mod"
+ "github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415"
+ "github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod"
+ "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
+ "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+ "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+ "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+ "golang.org/x/text v0.3.0/go.mod"
+ "golang.org/x/text v0.3.2"
+ "golang.org/x/text v0.3.2/go.mod"
+ "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+ "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+ "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+ "gopkg.in/sourcemap.v1 v1.0.5"
+ "gopkg.in/sourcemap.v1 v1.0.5/go.mod"
+ "gopkg.in/yaml.v2 v2.2.2/go.mod"
+ "gopkg.in/yaml.v2 v2.2.4/go.mod"
+ "gopkg.in/yaml.v2 v2.2.7"
+ "gopkg.in/yaml.v2 v2.2.7/go.mod"
+ "layeh.com/gopher-luar v1.0.7"
+ "layeh.com/gopher-luar v1.0.7/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Modern and intuitive terminal-based text editor"
+HOMEPAGE="https://github.com/zyedidia/micro"
+SRC_URI="
+ https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}
+"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-vcs/git"
+
+src_compile() {
+ go build -v -work -x -o ${PN} -ldflags \
+ "-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${PV} -X github.com/zyedidia/micro/v2/internal/util.CompileDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+ ./cmd/micro || die
+}
+
+src_install() {
+ dobin ${PN}
+ doman ./assets/packaging/micro.1
+ domenu assets/packaging/micro.desktop
+ einstalldocs
+}
+
+pkg_postinst() {
+ # update desktop file mime cache
+ xdg_pkg_postinst
+
+ optfeature_header "Clipboard support with display servers:"
+ optfeature "Xorg" x11-misc/xsel x11-misc/xclip
+ optfeature "Wayland" gui-apps/wl-clipboard
+}
diff --git a/app-editors/moe/metadata.xml b/app-editors/moe/metadata.xml
index 6698a4ab7883..2c47fcf00594 100644
--- a/app-editors/moe/metadata.xml
+++ b/app-editors/moe/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zlogene@gentoo.org</email>
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 4fe301720c6c..5fe2ed4f8f04 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1 +1,2 @@
-DIST mousepad-0.5.5.tar.bz2 891263 BLAKE2B a75930385f9087f6294811c91b2a162d2e9ca2e945ec84efdfd932806211ee105d2ac2835122c2de4ea519b6728959478147d11df75ff3b00324c262983046a0 SHA512 5c6d6d048fe8a08c04ddeff7adb7d621d9beac631dd58fe5778cc8236e06ddb4ab50380eaebf4236c655b6d26058242024d5d3bbb1772607ab1f10744f8936f1
+DIST mousepad-0.5.6.tar.bz2 916738 BLAKE2B 59506a5eb362259889e580de52ed3135c339da4148dc1c99d7c7e6aee04d776f7ef67959a54aabfa29b7b174279f205cdaa0932199b407528019def24c4915c4 SHA512 24e974f793fd8660d39fc00156f8f8f07bae44133c6f58d705b1665f0b8d333f2248a6780b48794edb56e7faf7f206069a7866f76cbf91f6ce6b8b2ac7121f34
+DIST mousepad-0.5.7.tar.bz2 920371 BLAKE2B e019427316343a528786fc973b9aef4c63b5368140894212faea767311e6a18029aa093a9ac9f9ec831d637e0d8568bb76215a7c760162015309049b2ee10418 SHA512 0302fbf0d5e7ffe20a7f712dd0dc5878552572ec77798ed329b0e5688c0d4f80c5aa527f9fadb2de7452c8983bf1efd0e117ed7c170b0ca79e09006617f357ac
diff --git a/app-editors/mousepad/metadata.xml b/app-editors/mousepad/metadata.xml
index dce6704738a4..fb3a6777ad9f 100644
--- a/app-editors/mousepad/metadata.xml
+++ b/app-editors/mousepad/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>xfce@gentoo.org</email>
diff --git a/app-editors/mousepad/mousepad-0.5.5.ebuild b/app-editors/mousepad/mousepad-0.5.6.ebuild
index ea82a7eeeb5a..ea82a7eeeb5a 100644
--- a/app-editors/mousepad/mousepad-0.5.5.ebuild
+++ b/app-editors/mousepad/mousepad-0.5.6.ebuild
diff --git a/app-editors/mousepad/mousepad-0.5.7.ebuild b/app-editors/mousepad/mousepad-0.5.7.ebuild
new file mode 100644
index 000000000000..1dee543de886
--- /dev/null
+++ b/app-editors/mousepad/mousepad-0.5.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
+HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/glib-2.52
+ >=x11-libs/gtk+-3.22:3
+ >=x11-libs/gtksourceview-4.0.0:4"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_configure() {
+ local myconf=(
+ --enable-gtksourceview4
+ )
+ econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index add7f71937d3..6ec35ae205da 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>polynomial-c@gentoo.org</email>
diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
index f213fcf21705..a0a540cc2257 100644
--- a/app-editors/ne/metadata.xml
+++ b/app-editors/ne/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-editors/nedit/metadata.xml b/app-editors/nedit/metadata.xml
index ec930b3c0db0..8c2ceb3cc996 100644
--- a/app-editors/nedit/metadata.xml
+++ b/app-editors/nedit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>amynka@gentoo.org</email>
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index b263ac237703..555238c9fc17 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r101.ebuild
index f97ec4ad27ed..a87ddc4c40e5 100644
--- a/app-editors/neovim/neovim-0.4.4-r100.ebuild
+++ b/app-editors/neovim/neovim-0.4.4-r101.ebuild
@@ -50,7 +50,7 @@ DEPEND="${LUA_DEPS}
>=dev-libs/libvterm-0.1.2
dev-libs/msgpack:0=
!kernel_Darwin? (
- net-libs/libnsl
+ net-libs/libnsl:=
)
tui? (
dev-libs/libtermkey
diff --git a/app-editors/ng/metadata.xml b/app-editors/ng/metadata.xml
index c921b96adf6c..1d892a124fa3 100644
--- a/app-editors/ng/metadata.xml
+++ b/app-editors/ng/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
diff --git a/app-editors/notepadqq/metadata.xml b/app-editors/notepadqq/metadata.xml
index 778dcea02be0..959a5e4986fb 100644
--- a/app-editors/notepadqq/metadata.xml
+++ b/app-editors/notepadqq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>polynomial-c@gentoo.org</email>
diff --git a/app-editors/okteta/metadata.xml b/app-editors/okteta/metadata.xml
index a50ada50ef0e..0bc83685a440 100644
--- a/app-editors/okteta/metadata.xml
+++ b/app-editors/okteta/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/</bugs-to>
+ </upstream>
<use>
<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
</use>
diff --git a/app-editors/padre/metadata.xml b/app-editors/padre/metadata.xml
index 076d507391be..69e4c2c139ad 100644
--- a/app-editors/padre/metadata.xml
+++ b/app-editors/padre/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>perl@gentoo.org</email>
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
index 3daddb1815dc..c28d596be470 100644
--- a/app-editors/pluma/metadata.xml
+++ b/app-editors/pluma/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>mate@gentoo.org</email>
diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.24.1.ebuild
index a325cf16ed24..0757d29b3b3c 100644
--- a/app-editors/pluma/pluma-1.24.1.ebuild
+++ b/app-editors/pluma/pluma-1.24.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
inherit mate python-single-r1 virtualx
diff --git a/app-editors/pluma/pluma-1.24.2.ebuild b/app-editors/pluma/pluma-1.24.2.ebuild
index 061436117e9e..849ab407ba6e 100644
--- a/app-editors/pluma/pluma-1.24.2.ebuild
+++ b/app-editors/pluma/pluma-1.24.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} )
inherit mate python-single-r1 virtualx
@@ -73,7 +73,7 @@ src_configure() {
src_test() {
# FIXME: This should be handled at eclass level.
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+ "${EPREFIX%/}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
unset DBUS_SESSION_BUS_ADDRESS
diff --git a/app-editors/pyvim/metadata.xml b/app-editors/pyvim/metadata.xml
index 318dcc191ea8..fd901d010bd6 100644
--- a/app-editors/pyvim/metadata.xml
+++ b/app-editors/pyvim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
index a725e273d20d..fd4cdb06be09 100644
--- a/app-editors/qemacs/metadata.xml
+++ b/app-editors/qemacs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml
index 8b05dcbc4b5d..b21f150a2481 100644
--- a/app-editors/qhexedit2/metadata.xml
+++ b/app-editors/qhexedit2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>ktrace@yandex.ru</email>
diff --git a/app-editors/qxmledit/metadata.xml b/app-editors/qxmledit/metadata.xml
index 2f1d1de125cf..9608118110f3 100644
--- a/app-editors/qxmledit/metadata.xml
+++ b/app-editors/qxmledit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index 649a8288e502..b1491bfcc579 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<upstream>
diff --git a/app-editors/sandy/metadata.xml b/app-editors/sandy/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/sandy/metadata.xml
+++ b/app-editors/sandy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 23796f2da8a1..f1e5139c0844 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1 +1,2 @@
DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
+DIST scite-5.1.1.tgz 3374717 BLAKE2B b7a45a86008eb592adacc8fde90cb637cc7cac821f339bb65920aaf912ee10d52badde3ed2e71118a7ce4690a0536b298c5fe5f673b886902ad4634b3a1ffaa6 SHA512 4d6c9b3ca4caed4fcb70a6b1c86a2ace13b023241f16d6faa01b3f692bcbfa14e0ce186bb08776ee0cf62768b2b77c4ffcae610ddbb6b04dcb7584fd8b3f27bb
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
index 856d6746499b..7694337e8744 100644
--- a/app-editors/scite/metadata.xml
+++ b/app-editors/scite/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>ervin.peters@ervnet.de</email>
diff --git a/app-editors/scite/scite-5.1.1.ebuild b/app-editors/scite/scite-5.1.1.ebuild
new file mode 100644
index 000000000000..c3e280ecf802
--- /dev/null
+++ b/app-editors/scite/scite-5.1.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+
+inherit lua-single toolchain-funcs xdg
+
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="https://www.scintilla.org/SciTE.html"
+SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/atk
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango
+ lua? ( ${LUA_DEPS} )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig"
+
+DOCS=("../README")
+
+S="${WORKDIR}/${PN}/gtk"
+
+pkg_pretend() {
+ if tc-is-clang ; then
+ # need c++17 features
+ [[ "${MERGE_TYPE}" != "binary" &&
+ $(clang-major-version) -lt 5 ]] &&
+ die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
+ ($(clang-major-version))."
+
+ elif tc-is-gcc; then
+ # older gcc is not supported
+ [[ "${MERGE_TYPE}" != "binary" &&
+ $(gcc-major-version) -lt 7 ]] &&
+ die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
+ else
+ die "Either gcc or clang should be configured for building scite"
+ fi
+}
+
+pkg_setup() {
+ use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+ tc-export AR CC CXX RANLIB
+
+ # remove hardcoded CC, Optimizations and clang unknown flags
+ sed -i "${WORKDIR}/scintilla/gtk/makefile" \
+ -e "s#^CC = gcc#CC = ${CC}#" \
+ -e "s#^CC = clang#CC = ${CC}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
+ -e "s#-Os##" \
+ -e "s#-Wno-misleading-indentation##" \
+ || die "error patching /scintilla/gtk/makefile"
+
+ sed -i "${S}/makefile" \
+ -e "s#^CC = clang#CC = ${CC}#" \
+ -e "s#^CXX = clang++#CXX = ${CXX}#" \
+ -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+ -e "s#-Os##" \
+ || die "error patching gtk/makefile"
+
+ # repair and enhance the .desktop file
+ sed -i "${S}/SciTE.desktop" \
+ -e "s#text/plain#text/\*;application/xhtml+xml#" \
+ -e "s#^Categories=\(.*\)#Categories=Development;#" \
+ || die "error patching /scite/gtk/SciTe.desktop"
+
+ # add the ebuild suffix as shell type for working with ebuilds
+ sed -i "${WORKDIR}/scite/src/perl.properties" \
+ -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
+ || die "error patching /scite/src/perl.properties"
+
+ # it seems that pwd here is ${S}, but user patches are relative to ${workdir}
+ # Bug #576162
+
+ cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
+ eapply_user
+}
+
+src_compile() {
+ # prepare make options
+ local emake_pars=("GTK3=1")
+
+ tc-is-clang && emake_pars+=("CLANG=1")
+ use !lua && emake_pars+=("NO_LUA=1")
+
+ emake -C "${WORKDIR}/lexilla/src" "${emake_pars[@]}"
+ emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
+ emake "${emake_pars[@]}"
+}
+
+# want to use the base src_install() as base_src_install()
+
+src_install() {
+ default
+ dosym SciTE /usr/bin/scite
+}
diff --git a/app-editors/shed/metadata.xml b/app-editors/shed/metadata.xml
index d14e7209041c..8928a9fb2b53 100644
--- a/app-editors/shed/metadata.xml
+++ b/app-editors/shed/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>hattya@gentoo.org</email>
diff --git a/app-editors/sublime-text/metadata.xml b/app-editors/sublime-text/metadata.xml
index 3c5abf825aef..e306ca22e31b 100644
--- a/app-editors/sublime-text/metadata.xml
+++ b/app-editors/sublime-text/metadata.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>soap@gentoo.org</email>
+ <name>David Seifert</name>
</maintainer>
</pkgmetadata>
diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml
index a3b87502efe6..7bd9ca773d36 100644
--- a/app-editors/tea/metadata.xml
+++ b/app-editors/tea/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>qt@gentoo.org</email>
diff --git a/app-editors/teco/metadata.xml b/app-editors/teco/metadata.xml
index df81ef45c27c..2e545ee8b3f1 100644
--- a/app-editors/teco/metadata.xml
+++ b/app-editors/teco/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>ulm@gentoo.org</email>
diff --git a/app-editors/ted/metadata.xml b/app-editors/ted/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/ted/metadata.xml
+++ b/app-editors/ted/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/texworks/metadata.xml b/app-editors/texworks/metadata.xml
index 203fa55c746f..48d3ded01150 100644
--- a/app-editors/texworks/metadata.xml
+++ b/app-editors/texworks/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zlogene@gentoo.org</email>
diff --git a/app-editors/uemacs-pk/metadata.xml b/app-editors/uemacs-pk/metadata.xml
index 4f52d2d2e249..7514825f5986 100644
--- a/app-editors/uemacs-pk/metadata.xml
+++ b/app-editors/uemacs-pk/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>
diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml
index a69b95b1f467..5156eb857fef 100644
--- a/app-editors/vile/metadata.xml
+++ b/app-editors/vile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml
index 3979743b74bb..841e5550d72b 100644
--- a/app-editors/vim-core/metadata.xml
+++ b/app-editors/vim-core/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild
index 202875e760b9..7cccceadd8e4 100644
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="vim and gvim shared files"
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index bc092f380c09..cd2ce2b6d09e 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild
index c6cf07318e82..edd131772b0f 100644
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
else
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Vim, an improved vi-style text editor"
diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml
index cb954b0dc302..07e6ce2a8cbd 100644
--- a/app-editors/vis/metadata.xml
+++ b/app-editors/vis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>contact@hacktivis.me</email>
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 80d68100dfdb..94768e30ba8d 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -1,6 +1,9 @@
-DIST vscode-1.57.1-amd64.tar.gz 104850563 BLAKE2B b3690382adfa3f8414b38bb784a6a595409fd766d21da05960a4d39344be0dc80bcb99b8b7b7d0d7f4bf5244bb35227e301696a4c16b1e0f9665a4f1f244f15a SHA512 928664a24a65c85db53d74c07b29d5e8bb1c204481fdc9204b3e254dc7f82c1a3090ffac933d331c29c1c9c4a9417200aa0216170058249fc539529130e9dfbc
-DIST vscode-1.57.1-arm.tar.gz 95393169 BLAKE2B dd004a41ec92796d9c2235be032c2cd5a79464926b392fb3c6d73bf0a49265bfeb0c234fd383a267578553501ad23d3e21f8e2edba591e2cb6d7f8a4118dda26 SHA512 3df5f8c15b0622c0d4cb470f095280c817675ccc160b51caeb04ed5471ae41da5d72da8128d5dd689c33d82718433786bdddeb87cca82d80a5eb638094be18e9
-DIST vscode-1.57.1-arm64.tar.gz 110176471 BLAKE2B 40765526445565714c4e487327af4d34d8b83d2eda8cb74431df680a0ad212fa7b24312d07759be077bba30c0ab721af6ced24d31262863524bacd41e4fc5f82 SHA512 f20f22b2e524918bce1bd0d2e43e1f15a11bf40b54c6b8e55fd4dbe2f39c5eb724c3354ab6e8b00b6f8a81f01d0dfe2c6483fc81344a538ee782ae2c1e0ec5bc
DIST vscode-1.58.2-amd64.tar.gz 105591644 BLAKE2B bc130bfeab48f60f4149aa9d44aebbfba121cb629f1295acb23361a06e5071ddb2dc147c7d161b67f57d45fdb1337784a85bb4f08c6f82a48675c35be0037047 SHA512 00e4012d133e8755b13b1b0136078db872b7f202c59663ea46b137451338ca77f8020cc7fffa807ba5e5963105f0ce8ea0d2a0f29702078a64ace5743da6c83e
DIST vscode-1.58.2-arm.tar.gz 96167069 BLAKE2B 1c19cf29c9419663216e3ccf521314e0102efcd18a69b0e3668259f8172a377300f1ca900e2d0cda325619a855fdcd6def5db34ebab0e6f79bc0ffd1cb2eb609 SHA512 32c4011c0a10827b73388b469246c179fc3aa06e883c1264f215cd96695821945401b4d0bfc7cf324768977eeb0c785ab4948fdb50899b26b9ca469087ab3b45
DIST vscode-1.58.2-arm64.tar.gz 110942132 BLAKE2B 3fb2a83087789690ba930ae0910b931f8f2ed129049e536d172bd67be6d928afb2e17ba09756c1dd3f9c145354fa8eface31928f419f74df165bb0c60588dc57 SHA512 f1ae69955251b6e8e92eebf01edfd820cdbf06c887349ba1cb6db2ff8aee170183029a0f2b5075b8a07ed9a26e982b87d63fe0fe4a193fa71ff5ebb52fdf1221
+DIST vscode-1.59.1-amd64.tar.gz 106142213 BLAKE2B eed73d0e98ea0275ed005586f18e14b3671a4dea301f44f469798bae3c298d8eb7e819c896957f9a1cd3e978ce171ff9d3a7433ede540b0647cae735b2d53bcd SHA512 c7ae7417bd233498b6be0dbcbc67ee44283a14938bfecb3b61d224533a4edf31c291bebdb90e87d769cb52afb9ac17f2fb20ba64dab7773d1ce965aa9d7bfae6
+DIST vscode-1.59.1-arm.tar.gz 97705768 BLAKE2B daf2b56ecbf45b57d6b147e4b839000621e367caac66189151b9021ade6901941a8d641291a132d1c1bbdf40bb411bc65d8663743307e896670cfaf24d335feb SHA512 ade1499986a4cefad933cbcf9a073230e74b1a554248e41f1b58480d53b68f6ed0fa0e8faa6f52e59eebc94dcc5127bdbedf77deeab0b108ec7832c71cfd3f6f
+DIST vscode-1.59.1-arm64.tar.gz 111284699 BLAKE2B c349c47208a6caf868070f9bb5bb6b23ff6eaa11de8d754edf8bec8fdd6fdd81c0ff246829a7ef4a92697ecb6356b779456aa8c1781f50ca4c7891297788aa43 SHA512 27b8aeac5ed2bac8bc6dc502ca39cac94f7e8ea4ea6baedffaa3b44dea451738e798674976444268db5543b6a144d55cadd47ded755a66c484c4c05cd5d20ad8
+DIST vscode-1.60.1-amd64.tar.gz 105536833 BLAKE2B 40c5ac3a1289c7dd5ad186b780c50ac3290729b114a1ff425c3fe70cce7420b105e7b02f868eea979013e1ac169b9dd6f3ad59f7f3f1d24faef78a8f183f77ad SHA512 40734256793133b0f63655ec42ea39de7e91363152b6cc39705e1ffb1fead17fd3fd535d5446b7c94e07063414338c73de90321bda999470238ffaa4480edd6f
+DIST vscode-1.60.1-arm.tar.gz 94231965 BLAKE2B 7cfc7edfb7a632a4cbede205bd74c74884eb026ecfb3ee068ff71b887a4812399412b41d243053b3098375c907d1824502600463b486d8c2c802f090305f9321 SHA512 1df28940435d0e21c8617c0b501497cc2b92d67c7b09835287bbbe731d5264e77a7ae1ec48d45e0f0058f47b1d8228173cfaf398b5953378c9e8f1d85bd851e3
+DIST vscode-1.60.1-arm64.tar.gz 107824269 BLAKE2B 36bb6b9844ed865592686312953ba9ea86dbe15d5e48fc593ca0c9b4314d92a86cbdd21ca91875f0005f1bb5fe99ed335fb2efeaba1159e28a6a8e2c4f0eea72 SHA512 5100f1feebda2fcd977d8c5440a63bd3583488f39ef4fcc775125e449e2659fd21a0d41b4d3aad663d5f4dd4cb90e7d92a6e3626158ac35abd1b2db3ba61f390
diff --git a/app-editors/vscode/files/vscode-url-handler-wayland.desktop b/app-editors/vscode/files/vscode-url-handler-wayland.desktop
new file mode 100644
index 000000000000..a3214afa7d32
--- /dev/null
+++ b/app-editors/vscode/files/vscode-url-handler-wayland.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=VSCode - URL Handler
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --open-url %U
+Icon=vscode
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=x-scheme-handler/vscode;
+Keywords=vscode;code;
diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/vscode-url-handler.desktop
index ec5bb1732c38..73e3834801b4 100644
--- a/app-editors/vscode/files/vscode-url-handler.desktop
+++ b/app-editors/vscode/files/vscode-url-handler.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Visual Studio Code - URL Handler
+Name=VSCode - URL Handler
Comment=Editing evolved
GenericName=Code Editor
Exec=/usr/bin/vscode --open-url %U
@@ -9,4 +9,4 @@ NoDisplay=true
StartupNotify=true
Categories=Utility;TextEditor;Development;IDE;
MimeType=x-scheme-handler/vscode;
-Keywords=vscode;
+Keywords=vscode;code;
diff --git a/app-editors/vscode/files/vscode-wayland.desktop b/app-editors/vscode/files/vscode-wayland.desktop
new file mode 100644
index 000000000000..1c12a97ffd01
--- /dev/null
+++ b/app-editors/vscode/files/vscode-wayland.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=VSCode Wayland
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F
+Icon=vscode
+Type=Application
+StartupNotify=false
+StartupWMClass=Code
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-code-workspace;
+Actions=new-empty-window;
+Keywords=vscode;code;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --new-window %F
+Icon=vscode
diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/vscode.desktop
index 317112739991..d648416a26ca 100644
--- a/app-editors/vscode/files/vscode.desktop
+++ b/app-editors/vscode/files/vscode.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Visual Studio Code
+Name=VSCode
Comment=Editing evolved
GenericName=Code Editor
Exec=/usr/bin/vscode --unity-launch %F
@@ -10,7 +10,7 @@ StartupWMClass=Code
Categories=Utility;TextEditor;Development;IDE;
MimeType=text/plain;inode/directory;application/x-code-workspace;
Actions=new-empty-window;
-Keywords=vscode;
+Keywords=vscode;code;
[Desktop Action new-empty-window]
Name=New Empty Window
diff --git a/app-editors/vscode/metadata.xml b/app-editors/vscode/metadata.xml
index 9aea48978a99..70a9316b5281 100644
--- a/app-editors/vscode/metadata.xml
+++ b/app-editors/vscode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>adel.ks@zegrapher.com</email>
diff --git a/app-editors/vscode/vscode-1.57.1.ebuild b/app-editors/vscode/vscode-1.59.1.ebuild
index 044c01c33002..0004959b3c58 100644
--- a/app-editors/vscode/vscode-1.57.1.ebuild
+++ b/app-editors/vscode/vscode-1.59.1.ebuild
@@ -87,7 +87,9 @@ src_install() {
insinto "/opt/${PN}"
doins -r *
fperms +x /opt/${PN}/{,bin/}code
- fperms +x /opt/${PN}/chrome-sandbox
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
diff --git a/app-editors/vscode/vscode-1.60.1.ebuild b/app-editors/vscode/vscode-1.60.1.ebuild
new file mode 100644
index 000000000000..dbed711c205a
--- /dev/null
+++ b/app-editors/vscode/vscode-1.60.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+HOMEPAGE="https://code.visualstudio.com"
+SRC_URI="
+ amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
+ arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
+ arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
+"
+S="${WORKDIR}"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+ Apache-2.0
+ BSD
+ BSD-1
+ BSD-2
+ BSD-4
+ CC-BY-4.0
+ ISC
+ LGPL-2.1+
+ Microsoft-vscode
+ MIT
+ MPL-2.0
+ openssl
+ PYTHON
+ TextMate-bundle
+ Unlicense
+ UoI-NCSA
+ W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
+ app-crypt/libsecret[crypt]
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+QA_PREBUILT="
+ /opt/vscode/code
+ /opt/vscode/libEGL.so
+ /opt/vscode/libffmpeg.so
+ /opt/vscode/libGLESv2.so
+ /opt/vscode/libvulkan.so*
+ /opt/vscode/chrome-sandbox
+ /opt/vscode/libvk_swiftshader.so
+ /opt/vscode/swiftshader/libEGL.so
+ /opt/vscode/swiftshader/libGLESv2.so
+ /opt/vscode/resources/app/extensions/*
+ /opt/vscode/resources/app/node_modules.asar.unpacked/*
+"
+
+src_install() {
+ if use amd64; then
+ cd "${WORKDIR}/VSCode-linux-x64" || die
+ elif use arm; then
+ cd "${WORKDIR}/VSCode-linux-armhf" || die
+ elif use arm64; then
+ cd "${WORKDIR}/VSCode-linux-arm64" || die
+ else
+ die "Visual Studio Code only supports amd64, arm and arm64"
+ fi
+
+ # Cleanup
+ rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
+
+ # Install
+ pax-mark m code
+ insinto "/opt/${PN}"
+ doins -r *
+ fperms +x /opt/${PN}/{,bin/}code
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
+ fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+ fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+ dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+ dosym "../../opt/${PN}/bin/code" "usr/bin/code"
+ domenu "${FILESDIR}/vscode.desktop"
+ domenu "${FILESDIR}/vscode-url-handler.desktop"
+ domenu "${FILESDIR}/vscode-wayland.desktop"
+ domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+ newicon "resources/app/resources/linux/code.png" "vscode.png"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "You may want to install some additional utils, check in:"
+ elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
+}
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index 94641de34eaf..bd94177e0f86 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,6 +1,9 @@
-DIST vscodium-1.57.1-amd64.tar.gz 107747154 BLAKE2B 0a348d77616eb691b9a7ef7ded4a2f3b07cf6e44b0e37fdc4f93f0a2327d040aa8a5442f1b978d6c5086d188bcb1aedbefef5f449da05a3f772b1d029bf38e26 SHA512 f4560725d67e690a99b6c1911a1542f877a0caa44e5b6be1aa4a06e0c3c3b16454c06a1a3d881a6af43b4ab97619b9fa464dc979c99c2af0882fe2b2960499d6
-DIST vscodium-1.57.1-arm.tar.gz 96383568 BLAKE2B 13140773fe7442d0c947dba2e9b30ea80fda5f42bdf8557e214bca2741e92d99f8e11821e569fe69b1ade84cc277604a931422610cfdd8a35dfe05be30c9d20a SHA512 2d7e406674b22ce9ca12aee423147b31df8381e615e2a7341c3373509cd63146325dd276bacebd63221dac0cde8b6c0c3b9406c4a437612b46e2e55bf4bb6531
-DIST vscodium-1.57.1-arm64.tar.gz 113062013 BLAKE2B 8befda9f99183097963842fd86e5721563562aba540a4634c273de88fff344f4f3e0554329d5a964f610b5eef02e7f34fd3a2380a96abfa44debbcc7f250e3f2 SHA512 22254e07ea9527b4ecdc77b63aedd55a56b7ede719178a74eeea7134fadda0beab7b604549625c0a48dafe3d18e14c997111ffea261086a608faa9567af911b6
DIST vscodium-1.58.2-amd64.tar.gz 109733827 BLAKE2B 0ada13724f2d4255a9ce58d0fd47415f2f5b4adfed144dae884914888df1f9bb735472e378fc2d4dd74fd1168c3361ad4e945a48607aeb3e095658a7b3e0df2c SHA512 dd98dbd88e64e526f78624e2e42bd116a689174d801412f7750c895794b0658b20b9451d336d0837f4030c11ce35368fb3dd0ade078bac393ada813c912a9a8d
DIST vscodium-1.58.2-arm.tar.gz 98395232 BLAKE2B 74bb7a07f9d6a9f107cd74a1a593e7770d67d1f0b2e4b809dab420c8b17fe3902a05a26caf59e2474afdfd01a2d65b0889f2d4298cdf512cfa44df8321a8e65a SHA512 58a08f2a5be9c42410772b97d5456d75044454ace5de92e03ac5bd7ff2dcef284e1e747869752f548bb1237e248981e06a9f9a9b6be99f8e8a50cf52fe6dd2c4
DIST vscodium-1.58.2-arm64.tar.gz 115052512 BLAKE2B d1047b34bf6132f47b7423e35a7cb92b98cbac782db1a086c068d0bd60fcc59c16852f18451ac860c8e8940fce08e6e7671fed3db3e19f7c80e34411865c7b5b SHA512 d34b53f9679006c30f2f422a8311a336eea778995fc8dc7cb0c24ecc02c88bbb2cd442f426fa88afd78f7175c16ce6c9f912eaa900d76fa25081824f91cabe0f
+DIST vscodium-1.59.1-amd64.tar.gz 110191208 BLAKE2B e7cc44d690fb0f3c25e0ef39198784ac651bcdc13e84918d44fdfb99b48d918dae8a1c7b9129b482cbe34e98a26bd44d9eb47d5df5daf73fdcffae7b5482b506 SHA512 401df889b5dea5c045fccb3d93fa5f5bcfaeb162977e434498e7600f67efb877c64effac7371f29f51e297c713640df2cad1f4db9540797f7146608e4d8f530b
+DIST vscodium-1.59.1-arm.tar.gz 100781835 BLAKE2B 36f463f93b03afc9a191aebaf96cc6eb9c43feb0274a167cca6a983d85381821e10c9cdcba3f384a09d431bb3c4b55fcdd248b9ce93614ac3ddf2129c80f6f87 SHA512 3df672daa85b838bc45a4cb4da3e9001a008ff66ce469f6b9f25d066bdbfaad951f4e8e392cde59fa90024d3977f707b2c5d1d079797803caa538ddc56133b73
+DIST vscodium-1.59.1-arm64.tar.gz 115349031 BLAKE2B 9762a344b490ea0278cbb36e0f27a5d62417b8b356b08c62bc1577a4c959f5c65997676a4c8555832bd62ec6af4c3ce253a1c277881cf0430e0af15d56071201 SHA512 b47c2718889cc6bacb79fd73e3e4090a94078768992ca0bb2be77030266d547ad8c8d884deaa7d3925e4c94e74ed3bda8a5fca678459dfd6e64c3d2a752ee9c0
+DIST vscodium-1.60.1-amd64.tar.gz 106737649 BLAKE2B 9124dbcf9db63186f776604752ca618602711e590bb33ab17f058f1fcc6101a13941aa29698672fdc2b48e2f0ffc9f5db1785d18dda35afde25a54389c4d7b69 SHA512 b9f01df2790554e46528fc9c6e137fdd2a2da5a6b7c038ada1b09d0deb7bf6d0e82ca082a5f7f578293c5582bee9a0d6da9ef147ca053f8b82718335c66278bf
+DIST vscodium-1.60.1-arm.tar.gz 97328258 BLAKE2B be296fb491fa46312a0a20dd9a97d1a1b228b04ce31827e9a8a66c5e00b9e2ab941e0e035a2b636e95d9271ec552b9d528bf0e4953e6974960b941dbc52abffa SHA512 5b7a06b93e52f2b0a2ddc798dc412c91f04ba9ee80d1dbe2e4e6435b4176f1fdb3a92b0209a46483f87596dd77d2a9c61000e13b40fb3f778eef20c7a62ac33b
+DIST vscodium-1.60.1-arm64.tar.gz 111889367 BLAKE2B acb5a5db6d24dd8397c8fbf655abe24941d5b496f036852a9bb4d6945af93eaa5f4dc8643ddd6b59985cc9cdc59eba756cc55db1841df55283dc1ea3769a4af2 SHA512 006c97d2aa63abce2aa3765754944f273c13104514d7e8ffc6457263624a70a073c85946e65a29818cb2f94d45d711b8c1fd98a5d9012d590b04fcb0866d2ab7
diff --git a/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop b/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop
new file mode 100644
index 000000000000..d853f3e5c908
--- /dev/null
+++ b/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=VSCodium Wayland - URL Handler
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --open-url %U
+Icon=vscodium
+Type=Application
+NoDisplay=true
+StartupNotify=true
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=x-scheme-handler/vscodium;
+Keywords=vscode;vscodium;code;codium;
diff --git a/app-editors/vscodium/files/vscodium-url-handler.desktop b/app-editors/vscodium/files/vscodium-url-handler.desktop
index 780fb6d55584..48c7d3d369cb 100644
--- a/app-editors/vscodium/files/vscodium-url-handler.desktop
+++ b/app-editors/vscodium/files/vscodium-url-handler.desktop
@@ -9,4 +9,4 @@ NoDisplay=true
StartupNotify=true
Categories=Utility;TextEditor;Development;IDE;
MimeType=x-scheme-handler/vscodium;
-Keywords=vscode;
+Keywords=vscode;vscodium;code;codium;
diff --git a/app-editors/vscodium/files/vscodium-wayland.desktop b/app-editors/vscodium/files/vscodium-wayland.desktop
new file mode 100644
index 000000000000..7719bf19ad74
--- /dev/null
+++ b/app-editors/vscodium/files/vscodium-wayland.desktop
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=VSCodium Wayland
+Comment=Editing evolved
+GenericName=Code Editor
+Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F
+Icon=vscodium
+Type=Application
+StartupNotify=false
+StartupWMClass=VSCodium
+Categories=Utility;TextEditor;Development;IDE;
+MimeType=text/plain;inode/directory;application/x-code-workspace;
+Actions=new-empty-window;
+Keywords=vscode;vscodium;code;codium;
+
+[Desktop Action new-empty-window]
+Name=New Empty Window
+Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --new-window %F
+Icon=vscodium
diff --git a/app-editors/vscodium/files/vscodium.desktop b/app-editors/vscodium/files/vscodium.desktop
index bea1b284d393..f3557c1adf7e 100644
--- a/app-editors/vscodium/files/vscodium.desktop
+++ b/app-editors/vscodium/files/vscodium.desktop
@@ -10,7 +10,7 @@ StartupWMClass=VSCodium
Categories=Utility;TextEditor;Development;IDE;
MimeType=text/plain;inode/directory;application/x-code-workspace;
Actions=new-empty-window;
-Keywords=vscode;
+Keywords=vscode;vscodium;code;codium;
[Desktop Action new-empty-window]
Name=New Empty Window
diff --git a/app-editors/vscodium/metadata.xml b/app-editors/vscodium/metadata.xml
index facecf84a9fe..155628c5d905 100644
--- a/app-editors/vscodium/metadata.xml
+++ b/app-editors/vscodium/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>adel.ks@zegrapher.com</email>
diff --git a/app-editors/vscodium/vscodium-1.57.1.ebuild b/app-editors/vscodium/vscodium-1.59.1.ebuild
index e25a3967ed49..547387b61b8c 100644
--- a/app-editors/vscodium/vscodium-1.57.1.ebuild
+++ b/app-editors/vscodium/vscodium-1.59.1.ebuild
@@ -79,7 +79,9 @@ src_install() {
insinto "/opt/${PN}"
doins -r *
fperms +x /opt/${PN}/{,bin/}codium
- fperms +x /opt/${PN}/chrome-sandbox
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
diff --git a/app-editors/vscodium/vscodium-1.60.1.ebuild b/app-editors/vscodium/vscodium-1.60.1.ebuild
new file mode 100644
index 000000000000..1f66143c0bf3
--- /dev/null
+++ b/app-editors/vscodium/vscodium-1.60.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
+HOMEPAGE="https://vscodium.com/"
+SRC_URI="
+ amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz )
+ arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz )
+ arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz )
+"
+
+RESTRICT="mirror strip bindist"
+
+LICENSE="
+ Apache-2.0
+ BSD
+ BSD-1
+ BSD-2
+ BSD-4
+ CC-BY-4.0
+ ISC
+ LGPL-2.1+
+ MIT
+ MPL-2.0
+ openssl
+ PYTHON
+ TextMate-bundle
+ Unlicense
+ UoI-NCSA
+ W3C
+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2
+ app-crypt/libsecret[crypt]
+ dev-libs/atk
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/mesa
+ net-print/cups
+ sys-apps/dbus
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libxshmfence
+ x11-libs/pango
+"
+
+QA_PREBUILT="
+ /opt/vscodium/codium
+ /opt/vscodium/libEGL.so
+ /opt/vscodium/libffmpeg.so
+ /opt/vscodium/libGLESv2.so
+ /opt/vscodium/libvulkan.so*
+ /opt/vscodium/chrome-sandbox
+ /opt/vscodium/libvk_swiftshader.so
+ /opt/vscodium/swiftshader/libEGL.so
+ /opt/vscodium/swiftshader/libGLESv2.so
+ /opt/vscodium/resources/app/extensions/*
+ /opt/vscodium/resources/app/node_modules.asar.unpacked/*
+"
+
+S="${WORKDIR}"
+
+src_install() {
+ # Cleanup
+ rm "${S}/resources/app/LICENSE.txt" || die
+
+ # Install
+ pax-mark m codium
+ insinto "/opt/${PN}"
+ doins -r *
+ fperms +x /opt/${PN}/{,bin/}codium
+ fperms 4711 /opt/${PN}/chrome-sandbox
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+ fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
+ fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
+ fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
+ dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium"
+ dosym "../../opt/${PN}/bin/codium" "usr/bin/codium"
+ domenu "${FILESDIR}/vscodium.desktop"
+ domenu "${FILESDIR}/vscodium-url-handler.desktop"
+ domenu "${FILESDIR}/vscodium-wayland.desktop"
+ domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+ newicon "resources/app/resources/linux/code.png" "vscodium.png"
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ elog "When compared to the regular VSCode, VSCodium has a few quirks"
+ elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md"
+}
diff --git a/app-editors/wily/metadata.xml b/app-editors/wily/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/wily/metadata.xml
+++ b/app-editors/wily/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/wxhexeditor/metadata.xml b/app-editors/wxhexeditor/metadata.xml
index 9065be762a9d..3e5da8810f40 100644
--- a/app-editors/wxhexeditor/metadata.xml
+++ b/app-editors/wxhexeditor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>wxwidgets@gentoo.org</email>
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index 78bf15a9cc75..ae715cbedf7b 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>xemacs@gentoo.org</email>
diff --git a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
index 7e8c4188da85..b1ec1ecf51e1 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
index 9420dcd8b820..fbd10bb12980 100644
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!--maintainer-needed-->
<upstream>
diff --git a/app-editors/xvile/metadata.xml b/app-editors/xvile/metadata.xml
index a69b95b1f467..5156eb857fef 100644
--- a/app-editors/xvile/metadata.xml
+++ b/app-editors/xvile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
diff --git a/app-editors/yudit/metadata.xml b/app-editors/yudit/metadata.xml
index 6f49eba8f496..85e4ed814fa2 100644
--- a/app-editors/yudit/metadata.xml
+++ b/app-editors/yudit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
index 237d50416e4f..b55d67a17365 100644
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>emacs@gentoo.org</email>