summaryrefslogtreecommitdiff
path: root/app-editors
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/Manifest.gzbin13575 -> 13582 bytes
-rw-r--r--app-editors/focuswriter/Manifest3
-rw-r--r--app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch26
-rw-r--r--app-editors/focuswriter/focuswriter-1.7.5.ebuild49
-rw-r--r--app-editors/gedit-plugins/Manifest4
-rw-r--r--app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild95
-rw-r--r--app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild2
-rw-r--r--app-editors/gedit/Manifest5
-rw-r--r--app-editors/gedit/files/3.32.2-fix-parallel-build.patch49
-rw-r--r--app-editors/gedit/gedit-3.32.2-r1.ebuild102
-rw-r--r--app-editors/gedit/gedit-3.34.1.ebuild2
-rw-r--r--app-editors/gnome-latex/Manifest4
-rw-r--r--app-editors/gnome-latex/gnome-latex-3.28.1.ebuild49
-rw-r--r--app-editors/gnome-latex/gnome-latex-3.32.0.ebuild2
-rw-r--r--app-editors/neovim/Manifest2
-rw-r--r--app-editors/neovim/metadata.xml8
-rw-r--r--app-editors/scite/Manifest2
-rw-r--r--app-editors/scite/scite-4.3.2.ebuild113
-rw-r--r--app-editors/xemacs/Manifest3
-rw-r--r--app-editors/xemacs/files/xemacs-21.5.34-ar.patch74
-rw-r--r--app-editors/xemacs/xemacs-21.5.34-r5.ebuild1
21 files changed, 277 insertions, 318 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 386664073f13..96decf418a6a 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
Binary files differ
diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest
index ea5bf6fbb325..4e5c38b28d3c 100644
--- a/app-editors/focuswriter/Manifest
+++ b/app-editors/focuswriter/Manifest
@@ -1,4 +1,7 @@
AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19
+AUX focuswriter-1.7.5-qt-5.15-build.patch 617 BLAKE2B 447181cde3df87ab181982afd45f1f2472440324d0dfe58de81f37cb07683923544943c755752e6562f0f566f273b2858bef17c0d787decd70431025b4613d29 SHA512 2426de757e0b26378c21032be5127fe9468e7fdeec2d287b2a0be3c830980c4d1087f1c297e7ecdc2863a5c407cb5f7ddae1293e1ad602d3726ea26ea5f02db0
DIST focuswriter-1.7.2-src.tar.bz2 10310759 BLAKE2B 92f0cd0ec2bb29c41f2c98e52dcb2187a70bc1c0641aed521b3d577302937cf6560f3adf422372019c8726ca29a9978b5b4d9e56e4c0c26a65fdc5d6aa0b7767 SHA512 195ddf6579aa00af120644ef1ddc88a6aaf0a6003feefb7b3dd3ca72c4bb17440553a171ad469f2d25d90416fc0e1a03f1b9d43e3b5790dac180f18b4ed657bf
+DIST focuswriter-1.7.5-src.tar.bz2 10311298 BLAKE2B c495aced12e2e4deea1b602a0d1e2f97adbf2c91edf94302978fbeca9e33807e20fc05db2758ee05fc4c54ee7281cca10b6c01b70f2859899a6b227235e7aed0 SHA512 b9b533180160c5395eee8b921cf05f56e13eb48db402d352359854b419bd5367f21bac1b07fb80d4bb59ab019a7051bb9aeb1321e35a8f9d250a9584475def8b
EBUILD focuswriter-1.7.2.ebuild 914 BLAKE2B cefbcd3addb8d18a80e419984d003275b16c3c6d5ba6bfd552687e540d846e7a075f7bb0f3d6fa6ff91bed484676c2370ce5275cde33fc0b6cc0030b477fdead SHA512 e835fa1bb106885f9abcf733363e4b463f60bd8d315b00b7f46b4c71bc6d2892e4630812209d471f8360e328f3a806b1b2c942bae49b1c511a9ec57138f6b5ea
+EBUILD focuswriter-1.7.5.ebuild 964 BLAKE2B 10be3ed8961f4c9fcc11e624dc263007c86c2831207adf6cefae23f992e237a0b54b4cb705740bb3c64aa00b43628161fddb098de086d3baade772cb573ddc81 SHA512 2c410cee655a68e181821018eb36e78a3bf76639920c310ec64e6f81d38535a5cb9e84a501ac82bde67a9d05e8e5fd627e902efe61918e5a817f9d1c40148d3c
MISC metadata.xml 392 BLAKE2B dcb98e8e1ba1c2a2aea89d380d6a2a1a1cfd5fd9773f133aa7603b88384c91911429832a7117026cea4c092c1c84dfe440a2c4da875ce56e1da7e8670aecf068 SHA512 beaf6206dfa83ffa8acbae3d5f8c5a9041974588a18de742fa049d4ff0b8d75bcb2f40ab081418cdd2987709566b678f7016b1be0acb02deeec480cd25ddf3cb
diff --git a/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch b/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch
new file mode 100644
index 000000000000..c59946f354fa
--- /dev/null
+++ b/app-editors/focuswriter/files/focuswriter-1.7.5-qt-5.15-build.patch
@@ -0,0 +1,26 @@
+From 026fb9b1fbfa8040815ac524b6002f93b6411d45 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Mon, 20 Apr 2020 22:58:48 +0300
+Subject: [PATCH] Fix build against Qt 5.15.
+
+Due to a change in Qt, 'QPainterPath' needs to be explicitly
+included.
+---
+ src/theme.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/theme.cpp b/src/theme.cpp
+index 4708338..59551ea 100644
+--- a/src/theme.cpp
++++ b/src/theme.cpp
+@@ -27,6 +27,7 @@
+ #include <QFile>
+ #include <QImageReader>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QSettings>
+ #include <QTextEdit>
+ #include <QUuid>
+--
+2.26.1
+
diff --git a/app-editors/focuswriter/focuswriter-1.7.5.ebuild b/app-editors/focuswriter/focuswriter-1.7.5.ebuild
new file mode 100644
index 000000000000..de11e6825890
--- /dev/null
+++ b/app-editors/focuswriter/focuswriter-1.7.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Fullscreen and distraction-free word processor"
+HOMEPAGE="https://gottcode.org/focuswriter/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+RDEPEND="
+ app-text/hunspell:=
+ >=dev-qt/qtcore-5.11:5
+ >=dev-qt/qtgui-5.11:5
+ >=dev-qt/qtmultimedia-5.11:5
+ >=dev-qt/qtprintsupport-5.11:5
+ dev-qt/qtsingleapplication[qt5(+),X]
+ >=dev-qt/qtwidgets-5.11:5
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtconcurrent:5
+"
+
+DOCS=( ChangeLog CREDITS README )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch"
+ "${FILESDIR}/${PN}-1.7.5-qt-5.15-build.patch"
+)
+
+src_configure() {
+ eqmake5 PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 77d1199ef5f7..f4c8195a9661 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST gedit-plugins-3.32.2.tar.xz 1474264 BLAKE2B feb116ec201b9eb9630570818cc288f0044ecfc174fc84c7d812aa6dfba5cc3748b4e2351ffa2be0d3a593a58b2318c4296b54b84476fc887195ee27f27bb597 SHA512 2767bc766daba5e1c81ef5a00bc3589a301c02e0286a6622cf11a03b5b391ecbcf9456187563dad4f2916610ee9ddca4414ff4beb639820954385ee3f8091d2a
DIST gedit-plugins-3.34.1.tar.xz 978800 BLAKE2B 03225ddc414e172f08179c64fbf12d0282c131b71855ca9dc20ceaa5750a5555c7bdde8c4ff1d95c721177b3d379edbcfc9af19ec22b96942df1913d13560303 SHA512 7fe31c2b0a1381a44362bd6066422d182b2246e3f903f8cd83cde0467b9853620a445bea7878d93e95a0a71ac5d5dd081a1930d602007cf2a6ef00b1a45bebfc
-EBUILD gedit-plugins-3.32.2-r1.ebuild 2381 BLAKE2B 1072087ebff2c06b5d27d5a3d60ed8565888626112e1670e58b800a5766733e1c6e946b80e08ed4e1a588be6898a6b8a5da2715d8759e7e1537830b90e23bcbe SHA512 7afac3fb1bd24594b7b8059561c5bd40ddcb9f5620030f6189a3014f62491584958ad52bd6175d74afb609bd3960d4596c8d2bf2e9f0a41f5c2575b1e38c8c39
-EBUILD gedit-plugins-3.34.1.ebuild 2752 BLAKE2B 0191fe5ca358372a4e495ebaa07accd4439617543ac1adf12d8b7243ae4565002f765adcde833fe1d407f280b5a69967b42f951232465d30f8cc6e64254a87bc SHA512 12b83fec16dadc5f01c5e0a8dfbe1e99b4dc11bdcb5e3b53b2f2c96e92d6ae3cbfa6f8c412b719f9fb164d055b0c1c6e313388d27496984a2faff16cb1a4eb7e
+EBUILD gedit-plugins-3.34.1.ebuild 2750 BLAKE2B 31b530c4ab8fa64b5f7c847a514667e60f150533aa7b7ee3d74f157beead02fc11d984fcc8132ca95150cefe68c155524bd336afc2f1850019aa277ecfdbc6e2 SHA512 8af5c9214f9f020af53b87289f56dac82934db2c59623466a1e220d262596c441fdf859c3b4107f9c821665e6d3b177e1d98f54fffa88b34a7b2866130111243
MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
deleted file mode 100644
index 163ff8c20947..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-3.32.2-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-VALA_MIN_API_VERSION="0.28"
-
-inherit eutils gnome2 multilib python-single-r1 vala
-
-DESCRIPTION="Official plugins for gedit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-IUSE_plugins="charmap git terminal vala"
-IUSE="+python ${IUSE_plugins}"
-# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
-REQUIRED_USE="
- charmap? ( python )
- git? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
- terminal? ( python )
-"
-
-RDEPEND="
- >=app-editors/gedit-3.16
- >=dev-libs/glib-2.32:2
- >=dev-libs/libpeas-1.7.0[gtk]
- >=x11-libs/gtk+-3.9:3
- >=x11-libs/gtksourceview-4.0.2:4
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=app-editors/gedit-3.16[introspection,python,${PYTHON_SINGLE_USEDEP}]
- dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
- >=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}]
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
- ')
- >=x11-libs/gtk+-3.9:3[introspection]
- >=x11-libs/gtksourceview-4.0.2:4[introspection]
- x11-libs/pango[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- )
- charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
- git? ( >=dev-libs/libgit2-glib-0.0.6 )
- terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
- vala? ( $(vala_depend) )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-pkg_setup() {
- use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable python) \
- $(use_enable vala)
-}
-
-src_install() {
- gnome2_src_install
-
- # FIXME: crazy !!!
- if use python; then
- find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
- find "${ED}"/usr/share/gedit -type d -empty -delete || die
- fi
-
- # FIXME: upstream made this automagic...
- clean_plugin charmap
- clean_plugin git
- clean_plugin terminal
-}
-
-clean_plugin() {
- if use !${1} ; then
- rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
- rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
- fi
-}
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild
index ea062bc54710..e6a56fa52f6d 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.34.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
IUSE="charmap git +python terminal vala"
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 67b6d6f26fb6..6ef49f61835b 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,7 +1,4 @@
-AUX 3.32.2-fix-parallel-build.patch 5216 BLAKE2B ad6a307be458d828c19bb6981717479a7a9ff3d5405b0abd2b1235a06b78935932104f10b10993fb6672b0c749f525f3192aedadaafb90edecdc663e22dcaaea SHA512 7b408f750e055b68b019301dbd771b309068be6dd599b830679fae89ebf3f15acc95b798e30876664abfc14bfe535eaf8dc4ce6f3b2bd87230a1f2018a37af29
AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
-DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
-EBUILD gedit-3.32.2-r1.ebuild 2351 BLAKE2B c6707e3c092e18b5ed1b7169d2e0532f74567a8328fda40aa410d37c5d6651c9a95d0cd288da521e0635232169f369e6ddc08fa597678c20af601cbf48a00e65 SHA512 546a55c48633bfd7146d4e557c42435e8b81f6d427a1ccdc20f0f9766a07bf2cd17bff489fe0475b06795d16d239841de8a52959d9c5fd36e7b72223580a7b98
-EBUILD gedit-3.34.1.ebuild 2261 BLAKE2B bd90e10893143cbeaf98ae784cb74daf72c5691a8ad810dbe8cfdd75bafba9e184656e77b1784562d5257a67c13cfd969dfcc448a7242799ac304ee96df7f614 SHA512 db0e66515990b45831f07e77a472e82351b8aef07344b4a56095ea487154cbfb3f5df95e71e750a805e3b3468c9a8a41673c004c3ffc268f9fe9e3c4651f745d
+EBUILD gedit-3.34.1.ebuild 2259 BLAKE2B 9d4db7c46cdafbdbc5e1da53062659df961febf00e8e7c625a38f28d2da054ea4ffabafed1f6df3175a8b3b2531a55736f25910df137f09eef43dac84ffc3b5d SHA512 b3c4127b204c99a8c350662c5dfa09ad2498d890723051458a5633a92aeec349c53a9665ee92b0f67f8d1d9eb168b5e6ca0f6a2158b152b2d1aed600cf3151a3
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.32.2-fix-parallel-build.patch b/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
deleted file mode 100644
index b3a52a0cdc9c..000000000000
--- a/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 79ff20c4123fb674b467f78b542f048f07516652 Mon Sep 17 00:00:00 2001
-From: Will Thompson <wjt@endlessm.com>
-Date: Wed, 17 Apr 2019 06:29:27 +0100
-Subject: [PATCH] filebrowser: fix build order for enum-types.h
-
-On Endless's package build server, building gedit on x86_64 failed as
-follows:
-
- [ 194s] [97/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_gedit-tool-merge.pl_cd41154a78cf16ac2c5a9a58261cb6418b36427a.dat
- [ 195s] [98/147] /usr/bin/msgfmt --desktop --keyword=Name --keyword=Description --template=../plugins/externaltools/externaltools.plugin.desktop.in -d /usr/src/packages/BUILD/po --output=plugins/externaltools/externaltools.plugin
- [ 195s] [99/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_glib-mkenums_ea0cb1ece8d7fa2e9a3e7c5a57f45df212823d0f.dat
- [ 195s] [100/147] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
- [ 195s] FAILED: plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o
- [ 195s] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
- [ 195s] ../plugins/filebrowser/gedit-file-browser-plugin.c:35:10: fatal error: gedit-file-browser-enum-types.h: No such file or directory
- [ 195s] #include "gedit-file-browser-enum-types.h"
- [ 195s] ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- [ 195s] compilation terminated.
-
-I couldn't reproduce this locally, perhaps because I have the wrong number
-of cores. However, exploring the build graph with:
-
- ninja -t browse plugins/filebrowser/5f8d977@@filebrowser@sha/libfilebrowser.so.symbols
-
-showed that there was no dependency between
-gedit-file-browser-plugin.c.o and gedit-file-browser-enum-types.h.
-Adding the generated gedit-file-browser-enum-types.h to the sources for
-this shared_library() causes an (order-only) dependency to be added,
-ensuring that gedit-file-browser-enum-types.h is generated before
-gedit-file-browser-plugin.c is compiled.
----
- plugins/filebrowser/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
-index 708f7f1d4..94a4ab0a6 100644
---- a/plugins/filebrowser/meson.build
-+++ b/plugins/filebrowser/meson.build
-@@ -59,6 +59,7 @@ libfilebrowser_enums_c = custom_target('libfilebrowser_enums_c',
-
- libfilebrowser_sources += [
- libfilebrowser_enums_c,
-+ libfilebrowser_type_enums.get(1),
- ]
-
- subdir('resources')
---
-2.20.1
-
diff --git a/app-editors/gedit/gedit-3.32.2-r1.ebuild b/app-editors/gedit/gedit-3.32.2-r1.ebuild
deleted file mode 100644
index 1a70aeb7e31a..000000000000
--- a/app-editors/gedit/gedit-3.32.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-DEPEND="
- >=dev-libs/glib-2.44:2
- >=x11-libs/gtk+-3.22.0:3[introspection?]
- >=x11-libs/gtksourceview-4.0.2:4[introspection?]
- >=dev-libs/libpeas-1.14.1[gtk]
- >=dev-libs/libxml2-2.5.0:2
- >=net-libs/libsoup-2.60:2.4
- x11-libs/libX11
-
- spell? ( >=app-text/gspell-0.2.5:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygobject-3:3[cairo,${PYTHON_MULTI_USEDEP}]
- dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
- ')
- )
-"
-RDEPEND="${DEPEND}
- x11-themes/adwaita-icon-theme
- gnome-base/gsettings-desktop-schemas
- gnome-base/gvfs
-"
-BDEPEND="
- ${vala_depend}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1 )
- dev-util/itstool
- >=sys-devel/gettext-0.18
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${PV}-make-spell-optional.patch
- "${FILESDIR}"/${PV}-fix-parallel-build.patch # parallel build failure fix, included in 3.34
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use introspection)
- $(meson_use vala vapi)
- $(meson_use python plugins)
- $(meson_use gtk-doc documentation)
- -Denable-gvfs-metadata=yes
- $(meson_use spell)
- )
- meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
- meson_src_install
- if use python; then
- python_optimize
- python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-3.34.1.ebuild
index bfc2b463f7dc..751718b3cf62 100644
--- a/app-editors/gedit/gedit-3.34.1.ebuild
+++ b/app-editors/gedit/gedit-3.34.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
IUSE="+introspection +python gtk-doc spell vala"
REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# X libs are not needed for OSX (aqua)
DEPEND="
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index 61023ab62312..e4174833a4d2 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-latex-3.28.1.tar.xz 1082708 BLAKE2B 3b0a341278838b37fb1a54f4f746af4fc6ccf4dd37f6b919f53523acfdcbeb6a8974217260db4d8186b8acd3ba782cbc1ddf1dce20735d70d01c88ed3c1fb90f SHA512 fe5c2456839757237d422d0f0629f11a43a8ca5b3cd86ce94b37ee26f68165f111940d5c3c47adba7be05532c413a97a867219c498abec3fd064122516e0c470
DIST gnome-latex-3.32.0.tar.xz 1145836 BLAKE2B 3ea44981b90fe258abd05c91c6f7425c73159ce0d3d108659c6be38a4612d5dbdd699cf20fa63b8dd2b2727a00baf6ae6a2b4504c0124e0a756ee7de6130750f SHA512 6b67302327318ccd9d307f271fd84e4cd550883f322d4b0e47b6425d9dd509c96dddeb0e690cca4fffddc1d5ebbc3dfd3e38cbe9985eda520110d9a768ef83d0
-EBUILD gnome-latex-3.28.1.ebuild 1081 BLAKE2B 5aa3a45f7ac589c90d6be2e9ac812b74e99eca0992adcdc6b0d6e7eaa905f9c73e1258b08979ed084ad7661d0e116093e69bf047731e3b803775ca02ce6a9982 SHA512 3327ed208e9b74061ef604906248314bc5449f955e77a842703131329c7aabc3b122b21c7fa013204e205a798c9d02d42c2303207242843f192b6d61754051c7
-EBUILD gnome-latex-3.32.0.ebuild 1136 BLAKE2B 63a3cb2f605e63dc26e199e9e9c7157225fb80f58d6daa7a159754d504fa27f9becbae2508edc6f497b278a4cf7ab1535af8f1f5cb3fdf29ee4c743574e55b10 SHA512 07ee3a4fdfdb451135f54737c3984044bfff968b9a7b0993e4a1ff9e5816b871b83e579f2cfec511502591f73518fba7e6955c02999bb24d38d244a39022f00d
+EBUILD gnome-latex-3.32.0.ebuild 1134 BLAKE2B d339878e8113de26c5f8bab86e471f5aea90bd294d6aeac745c70547089ed96a70f59354f28b29f5838508370d32f3458e21aa4aaf2b70c3a382f443db84d102 SHA512 d1b8e7bb41903bf47c7a87543c3dab4566a19fc51ce9edf1be7e90af2aa17bdfa3a43bdde308f33918941f022122897269718895ebb32bd4b182c934495f7400
MISC metadata.xml 464 BLAKE2B 8d70a6283779236162f7d0838ca7e97ae90ae5641cfb2fa551426238ce06b64a22f368ddec6a13fea472b2aa038a7854a7c53fc3bdf5c0a13cc9cbefa042fe39 SHA512 2015c3aac4abb5275c45db624fb6ee841e55ca1fd4e976d60528b04b5084a0cbae7fc625369d03e2ca2ee3ee16719df1740246a06208b10e5a99ea3c6612a0b1
diff --git a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild b/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
deleted file mode 100644
index b62f1edfdf10..000000000000
--- a/app-editors/gnome-latex/gnome-latex-3.28.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection +latexmk rubber"
-
-COMMON_DEPEND="
- app-text/enchant:0
- >=app-text/gspell-1.0:0=
- >=dev-libs/glib-2.56:2
- >=dev-libs/libgee-0.10:0.8=
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/gtk+-3.22:3
- >=x11-libs/gtksourceview-4.0:4
- >=gui-libs/tepl-4.0:4
- x11-libs/gdk-pixbuf:2
- x11-libs/pango
- introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
- gnome-base/dconf
-"
-RDEPEND="${COMMON_DEPEND}
- virtual/latex-base
- x11-themes/hicolor-icon-theme
- latexmk? ( dev-tex/latexmk )
- rubber? ( dev-tex/rubber )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.50.1
- dev-util/itstool
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable introspection) \
- --enable-dconf_migration
-}
diff --git a/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild
index 69da54f2a141..61b5330ceff7 100644
--- a/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection +latexmk rubber"
COMMON_DEPEND="
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 880205f6156a..609a8bc70082 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,4 +2,4 @@ AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07f
DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
EBUILD neovim-0.4.3.ebuild 1837 BLAKE2B c044e3eddc1a7c9bcb5f1d8ed804a0def40a84c0d6cb4175f4a6f41f44e16d8b2aff35452ceee322c444326fb9b923d4110a00bece8fe24abd422e7e24748f98 SHA512 9ee9af220071426b9977b9a49f433b62e8aca089d989c659cc27b13b3344e278303017c74c4cf391a117a7da4bfc09c4caedc55bd90ec3b6d29d540a0529acc5
EBUILD neovim-9999.ebuild 1861 BLAKE2B 7eb5a5509a102b044cb69b056965b31a92e92aa04adb4b506102f19a7175fe654f498ddc1904805e99c0abc161aeda6c3a420dd5fe4576c95db1723c393fe24d SHA512 c6d6f456c6ee4ac41970e635e90d95eb32866f2a463b729f2624dadca7b727ced783e0081af0140c5b9fcf6e6b510adfb70551bae639f0831e35894730568ff1
-MISC metadata.xml 713 BLAKE2B 2a16bd4220ee68336467dfeb68d452bdec9e31ab230a55345e232553a245de0fe5aca04754e855d087fb2cb164a0f3e23aae7f3b8065e04804bcd1a5e8c47a54 SHA512 9cb453f34498a5c72fee2f3ff40e7fa58a6612a3de870e087d0c8b35674f83c0be1ca377f023adba516d10db6b7998359aac76bfa116cd36c28df94508a23498
+MISC metadata.xml 469 BLAKE2B d0ddf9873870f4578e59c5473cb4cbd1a1aa105d704dabe52f29ff4db51eb988174a3d258b9575a876669716de46f217fb23978a9c4bbe1adfd8a84d4e082399 SHA512 11ee9fc96bcbc2cf131737a4f274d4dae5620d8ff9a27cf9fc6765b7dada8750e220e79ac305161313496c3d1cd499c34d28aaa5f63d6b4776cb8aa4f8af8c1a
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index 15cd5ba1c97d..73806d95e8a1 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>bernardo@standard.ai</email>
- <name>Bernardo Meurer</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Gentoo Proxy Maintainers Project</name>
- </maintainer>
<maintainer type="project">
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 556cff91e8b3..ae99d2254e5d 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,7 +1,9 @@
DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f37a9b19d2af7d558698eb3073a33fcdd0900abb549aa9ed65981a9f217dc1dae4b21be919c380d20d4ee8f SHA512 875dd44785e9c96a264df9061830c7ab51296061da7765084ec4445d7f529dabecebcfadc5a1d8cab9074ffd588903ca056ed5de0ae974d60a5c57b13d61550d
DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
+DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
EBUILD scite-4.2.1.ebuild 2939 BLAKE2B b1068efcac9794f133bcb5b059f030d8d804c501d229525b8985112f2c245be60a0b3a49e3a46dae901d37790f669784ba542005fe266aae99eb4240a64965e1 SHA512 921c777969f1f7a307eba9b073d151691c4b11faeec2e84c88ecb0cf5b6c7965109b1a35924e3a59859878976da842345a0042d5667e03672bf2a439f619de47
+EBUILD scite-4.3.2.ebuild 2823 BLAKE2B a02e1ca319d0b1b5e60ab1ba28266cce1458cb1b01e314b3eb6ca06f70a065a26c20c965852d0d56f1c44da0745f92ea2d9b6ba8b21d3bed26b0f72c7bbae887 SHA512 e234e7259d0f93c32c9b487f0eef966746d84989d44d81b5234b8728a907453beef39ee43e7f67d4ac934cc8c32441589b1a0438ec565784acf7c9a96ede65a0
MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.3.2.ebuild b/app-editors/scite/scite-4.3.2.ebuild
new file mode 100644
index 000000000000..e34188a5587f
--- /dev/null
+++ b/app-editors/scite/scite-4.3.2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="http://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"
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/pango
+ lua? ( >=dev-lang/lua-5:= )"
+
+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
+}
+
+src_prepare() {
+ # 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++#CC = ${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++#CC = ${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.prperties"
+
+ # 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}/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
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index f5330f9275e7..20b3481e5cc6 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -3,6 +3,7 @@ AUX xemacs-21.4.19-db.patch 3157 BLAKE2B f5615179665395f36df25eedd51c1f351aaefa8
AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb7cabf05b5957cafb95c890e9fd4e106c20de97edac0ea7959053eb5cd20a26698713670b3957b097e101e818207 SHA512 1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749
AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b
AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3
+AUX xemacs-21.5.34-ar.patch 2238 BLAKE2B 2bcf0ebcec74fcf6c2c10755da8cf5975efd39e4c746f61bf70e914e44787aea27ba4aace239ae93e37865e959d6f832e208ad7700772d1e8da64f07d98791e1 SHA512 f297b854277fab85539ab70814bc0827345ad6e098138f55296d23935a6e5a23bc1d04bade23b4f5202735246ebe86ea82b0f3e4a50df5360761b6d922589d10
AUX xemacs-21.5.34-as-needed.patch 921 BLAKE2B 18b67b2330cda62bb08fccdba8f71d0213f463aeb7e360b8b7f8cd791718cf89f44999858dea9b51a4c1f94b47b6774addd5a1ab9c36d65036f3890925847bb1 SHA512 3b55683346e6a0cac0b0b21ce21f3bc0ca4d2734307a20ce556cdea084e821d9c9be3c69db329ec1546bc249bfa5cae136e393e858bd53105db9152627514285
AUX xemacs-21.5.34-configure-libc-version.patch 957 BLAKE2B ae69bc6a5d3858571fec40d65bd097c65909fdccb282dbc05fe7014e654f73736f742c68ac24b8118c209b05dc399e2d1cc6109f288ae049e48bfee140d71d1f SHA512 e41b6fd7601dbd59c775e62f390e17c194eab9360cce2ae3d03e1b5f4f7fc59080ecd76401eab5211c2f0ab4fea4baf9746e10675ba00f05115067008cce5a6f
AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
@@ -16,5 +17,5 @@ EBUILD xemacs-21.4.24-r1.ebuild 6739 BLAKE2B 2008106ac11ca5535f39f7616f76027e3a0
EBUILD xemacs-21.4.24-r2.ebuild 7085 BLAKE2B 1e799def26063041aa0b65cb96f9f22a33d87370d26a6ab7faa311862a9a653de8fdf2b446355489bcb8733c746cbbe16fc047a72036edba16b389625a07c299 SHA512 2217a71aead967aafc089089a95bf638fe13ad5293939de35ed0feac6b655ca73a9efc90aebf555e65bb59e4aa12e9ddae08a3dfaf26414ac39c784a5e27761d
EBUILD xemacs-21.4.24.ebuild 6781 BLAKE2B 69cd6a5b314a8a578e20ca7e4e7128d2f6077187594508b29de679d6f47087b8b01a83d3665f64cf56a8c6bb5eded514a6cd7acf14ed97e3794f005a6a3ce5d1 SHA512 fb58d55a58c80135465835e10937bfb618b6f1e6fd57eb4673608cbe186840577f02e746369ee7723bb17f3117aff8d87aa3b94f213635fb3cbf1b6a7671d186
EBUILD xemacs-21.5.34-r4.ebuild 7214 BLAKE2B 80d3dc85284f4d5da88cbcf6b1ca3a9b1eca2a062398992a5354d479a3ab9115ef20b6134bbfefcbc1d178c645738ec257e9c90caf2213baea64b4e2a7eb482d SHA512 cce030edc1eeedd97a2da7eb91f59aa0d23d8145f69082170f2743dc29d77ec11f0138341dd274615a854d42e75dae08d2c8e12235d8c9ce0395d38a1b761d44
-EBUILD xemacs-21.5.34-r5.ebuild 7311 BLAKE2B 67810b578f75a440df11a75ad20660b928db6d1c6535c2677af9175d4eb9caa1dd1ecbf71465e0a6fb4d7a8a471c27ae5b4cfb21924734f51afe9fc72cf24f29 SHA512 32a2dc82de8d93d9edd950548946549a4cf0fcafb7902e8d84e0dc75fd2643718c8bec10566fcfbdca380dc5466ff4c3e8c95dc65477fe47275c7afba0252b98
+EBUILD xemacs-21.5.34-r5.ebuild 7347 BLAKE2B 37cbdbddeb0f4609c714970f17f5ec5b32e32acb6191be0e7625ece1bef06266cf4621024aeab1f1d1b0f0443ebb0aeeab8fc7c2680eb41dad4862ab2a35dbaf SHA512 b68abd3d69128022037db816b1fa03241238579bf9086263724687a717138a8599f9cd997c9fc93b3e5f039e3d5a944769c47cba8284af6ca4f403450b192e5b
MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
new file mode 100644
index 000000000000..fff6f5578733
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
@@ -0,0 +1,74 @@
+diff -r 3ca291c0f7e3 configure
+--- a/configure Sun Jul 28 10:17:08 2019 +0100
++++ b/configure Sun Apr 19 18:46:45 2020 +0200
+@@ -778,6 +778,5 @@
+ INSTALL_SCRIPT
+ INSTALL_PROGRAM
+ RANLIB
+-AR
+ lib_gcc
+ ld
+@@ -10296,47 +10307,6 @@
+ fi
+
+
+-# Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_AR+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$AR"; then
+- ac_cv_prog_AR="$AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_AR="ar"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found"
+-fi
+-fi
+-AR=$ac_cv_prog_AR
+-if test -n "$AR"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+-$as_echo "$AR" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test "$AR" = "not_found"; then
+- { echo "Error:" "ar not found -- is PATH set correctly?" >&2; exit 1; }
+-fi
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+diff -r 3ca291c0f7e3 configure.ac
+--- a/configure.ac Sun Jul 28 10:17:08 2019 +0100
++++ b/configure.ac Sun Apr 19 18:46:45 2020 +0200
+@@ -2557,12 +2557,6 @@
+ dnl should make an entry in src/config.h, do not forget to add an
+ dnl #undef clause to src/config.h.in for autoconf to modify.
+
+-dnl Sun likes to hide these utilities. Steve Baur asked that we make
+-dnl the failure occur at configure time, not at use time.
+-AC_CHECK_PROG(AR,ar,ar,not_found)
+-if test "$AR" = "not_found"; then
+- XE_DIE(["ar not found -- is PATH set correctly?"])
+-fi
+ dnl These tests don't necessarily check that the program exists.
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index de468834210d..6e6d7958c4e1 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-glibc-macro.patch"
eapply "${FILESDIR}/${P}-as-needed.patch"
eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+ eapply "${FILESDIR}/${P}-ar.patch"
eapply_user