gentoo resync : 03.09.2021

9 files changed, 63 insertions, 30 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e8bd280e1604..dcee91c08adc 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index a81502217027..bcd5f2af7e46 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,3 +1,5 @@
 DIST featherpad-0.18.0.tar.gz 967643 BLAKE2B a8a84fa71232bdd9448ec4a9c921f8f452212dfb52ec518c3f340e9b600858a9cfca2d7729a0f58c9d1465b77bd28c836de78026c58ff94297de704e7bf670d8 SHA512 3e0d008792dd55bc5e57654f9b032f0a66a60c682499c684cfc3b182fdc57a654bb5fb195b458af66ddd8db929b31e7bfa789bd9bdf33d32454fbbcb090bcd91
+DIST featherpad-1.0.0.tar.gz 1010200 BLAKE2B 22a11a0655ed57f7a7d53949e59c3b989a304b7c3db1f7308af0a52cc00a151cee505b02c19ece286da1be37e76c8874cee4102db3d881ef2c4ad48ecbb2f20a SHA512 9f7e24fa5e89e269693bc0a37f79d987e4914dde2d2b46bd0385886383dab8b35556fbc0f5c5b7b9a2c3a41694174ffa8532c48def87d2972fbc73c1e9c38bf3
 EBUILD featherpad-0.18.0.ebuild 636 BLAKE2B e5b1a37e4cc813f7f502f39468a97046f143c753a8b285c32b6ac9ea820fdd6dd36c3e731d09658a94a88c1ea3f7b103258a1d6423d31cf9b56543d9c028c549 SHA512 07330a8f3d99a19145711256bc3372af4fe52ef5ce42f379d0c1d2a52a09886c2c12d022faf9656da82afff682c5e3ba8934219d3bcd18c6797e34e2a1a4f5da
-MISC metadata.xml 679 BLAKE2B d9eb7067d7febb55c25297bff56c1e053366d580b6c3b4ca25d59f61b7cea8027e8cca38f5a933f2f8eaa2ce73d5647e81f251cd24022242f25934c60ece1b74 SHA512 7ad579712dac1fa5db103e617523731400f4fc75287fb0118e801f4a28e8444ea05e9ff3e30ba1694b5cf451965359235693d8cc50f99482b1e0413fc184d956
+EBUILD featherpad-1.0.0.ebuild 751 BLAKE2B 1a9809f2b2fbfa5e5109b57456d2adfd39725ba614287613e5c9839d7306f3be721084c7dc098884efe58c389902c1fee48a629cc3f88fa06317510db66cbd05 SHA512 4f584e94a6aa7e23d1a5f19c951d2bb884ce426476a106eca8e14843f02064b16b958355f777344d5d5388893f16f8d40d17976716e93fc3e6be76db0087ec4b
+MISC metadata.xml 828 BLAKE2B 079237aef42fe29192d4dff32a906ebd6dc4506e9b1c9f810a9012520aa0b40085d4f0c5acf59a63b4cd24ad8fd4f2c35396a7d474c6456b4717c89253bf1873 SHA512 97784ba3be2918dccad22c7638a6aab757159b1d6dcedc29f62a0aaf6b9ac32f223342d63eb30e735c581a285cf3227e0eeedddc980dd88dce6203fc5bce0e66
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..864931c62401 100644
--- a/app-editors/featherpad/metadata.xml
+++ b/app-editors/featherpad/metadata.xml
@@ -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/kakoune/Manifest b/app-editors/kakoune/Manifest
index 700a7698869a..22aedd738734 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,5 +1,4 @@
-AUX kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch 282 BLAKE2B e7a8e8e79fc81b42ac5cfc987684a38d8b73a3cabf7ccf3b35324f0cc49d2176a7aae4daefff46957cf3407a0c50544ae838d07f04b650cf2e2947fa3523ec59 SHA512 245138d130e32ca61dfdc5325362dae67113a73642f82356ef3a0d33367361e51011a8cac5c9bfc134c5aa2dd6461a0a9bc98ff54921a3763e8752d8f1fb4921
-AUX kakoune-2020.09.01-gcc-11.patch 181 BLAKE2B b7d35b65a352012fc065aab8d912e1f2bbdfaa1c7d276e1c13c132a2f1202d637a05f082b3ff0d87b1ab4bc81f8f20e78d3f84e3d17c28da3a9ace0dd78d2f84 SHA512 77bb0a994fe22e8a6aab67780d6bb1dbcd00e42a6ac86462635afa7449354d08548e52176b94d99335cec199f16893f970fb84e0b8b9f904e3958366d5b8ec05
-DIST kakoune-2020.09.01.tar.gz 612970 BLAKE2B 64084c2a4ff1ccf348caad8db04df9425828378bda28d163ffa6d198b3bd80d6d078ac0095dfc5adbae505e4d4259cd86185718a8012740417056db531ea72ec SHA512 acd9edd6b2a68219a4b5f68aaf4d785aa8c430abfdf5ccc994764f5ece8acb655adf64334027525115d3cbe819591de8496c3e54e2d806ce40c494443789e126
-EBUILD kakoune-2020.09.01.ebuild 955 BLAKE2B e9e68960e0825839f40a167aa5604dca9e66ad6280935fdaab1495d0ecebdc0e96ed9cf44f0d47f2e9aecfffa19d72cda9b9aa4abb4917478760a0ebaf9258cf SHA512 bd8e52b290f30dc8e9972b27499c2b128b1e020347512598585221d4ce2877ff63362ecda440a9f0357b7fec6cdc9d8bf0f5dd41d5499b0bd3d1ff225e04fd19
+AUX kakoune-2021.08.28-php-filetype-fix.patch 738 BLAKE2B d9f940a06b03b65c3936120823c98412a303032804f31725edaa591c4dd02d204c64fb440f03b72c62e268f99c7333b8d6be345ce254ed5ffc1c36dbe942be88 SHA512 be24943903e4e2cc728234be29119b5e2f81aad80c8ba88d400d31daa008045e7a81aa4c89670293e0b7267ee0e6e79ab9ac1480ced41dadbcffd6f22c46dc90
+DIST kakoune-2021.08.28.tar.gz 654429 BLAKE2B 8cf769d2dea74fd8bab8261e4d79276af089d73753052fdd3776bff0adc72bc20c43f840350076e675c633de2175ad83960fa2ccf85fc852c7c81bd4888ced2b SHA512 1f4f0648959e94e45eb00f2398aa6897595457ef3ee4d1c6e18d494f3e68f8d3a0c4d0dbed88b6588fda61137a060c648ff635972731c0f29faef4cdc03c829f
+EBUILD kakoune-2021.08.28.ebuild 824 BLAKE2B 12458c9944844d80e0de4141772f4efceac95d50a3f7ef01f09e4f808ff99b9fe74f060246d7b8d6aec59bb39636bc0e67e027d3a37360de15cbde40cf4133a2 SHA512 f75555899e6d3a54f9a543a1a61520caaab162adbfef69e6112ed2785f20821c31bf12ebfc8dcec2ea505604b0684b95f3200bc8fd634760cbf43dfdf538514f
 MISC metadata.xml 511 BLAKE2B 5ec5bbd3388e02601c560810a04e95e02f2d03f53e0539e98123ac3736849d49867301ebf02686ccf7c5e00b09800f6e8503792c63ffb0170ca0c7eaaffafec3 SHA512 20224a1e244a69b7d2536393b4d8f131bd97450a4223d530033b0e6391752ff0856a5929ba33c6466ee4f581c569afe11fdee1e2474f94ef18aea96675baa773
diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index d7b9083a4281..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/rc/filetype/gentoo-linux.kak b/rc/filetype/gentoo-linux.kak
-new file mode 100644
-index 00000000..251dad16
---- /dev/null
-+++ b/rc/filetype/gentoo-linux.kak
-@@ -0,0 +1,4 @@
-+# portage ebuild file
-+hook global BufCreate .*\.ebuild %{
-+    set-option buffer filetype sh
-+}
diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
deleted file mode 100644
index d558c49347c1..000000000000
--- a/app-editors/kakoune/files/kakoune-2020.09.01-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.09.01.ebuild b/app-editors/kakoune/kakoune-2021.08.28.ebuild
index bf078a51afe2..f44978e99739 100644
--- a/app-editors/kakoune/kakoune-2020.09.01.ebuild
+++ b/app-editors/kakoune/kakoune-2021.08.28.ebuild
@@ -13,13 +13,10 @@ 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.09.01-enable-ebuild-syntax-highlight.patch
-	"${FILESDIR}"/${PN}-2020.09.01-gcc-11.patch
+	"${FILESDIR}"/${P}-php-filetype-fix.patch
 )
 
 src_prepare() {