gentoo auto-resync : 24:12:2022 - 14:02:21

6 files changed, 30 insertions, 43 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 34fbc2882424..333107b84dfb 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index e99c69aa004a..e9d6778f14f0 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,5 +1,6 @@
 AUX bvi-1.4.1-prototypes.patch 1185 BLAKE2B 8000d4cadb056f1f568c61a3f6d674ae5e8303b5cb562ce02c0d2326169c31c49f2e6678bc10480be991081b9f910ee9221bc3384f475a91a045e6fc518f84c7 SHA512 7214f0ab69bd3be349e527b40deb65c1855ba3d468b4f799c5762e14c8a60e9d9d1137600982b5e21ab5bccae68d98ef55a70b1c3b0901f181ba25955410f1a8
 DIST bvi-1.4.1.src.tar.gz 143181 BLAKE2B ad4ae885b1b85ebfc4fc842e0b072383b6755eeaf1d8a71ffb461c5caf0c4c97d1906a7762b66ae4a5ede9ac8a204543bc0aed8630a3ea52ca452e8c645ad616 SHA512 f7a3f07e6bcefe566a101c4db85192f0d2e3580be0ab10bc297e6c0192e79d29061a7c9f1a57cf5a628f03962deb8c2ed52e33effc1d5198d458627d70d882e6
 EBUILD bvi-1.4.1-r1.ebuild 579 BLAKE2B abd5a53d851d896d0ec174dc5626f75774f9e55caaaa08d89788d7b5f71399e85043abef48f7459017569af9aa99aced06931c5391a76e60c38f34ebcddebfae SHA512 a8e4bc794bfbfc2eba700fd4320747f48ef8b9dd118832ed6fbc0e7effc6e57f6048df4f2c624c4111f38bb9d0253070cacafe1ed6bf26995e270e6d18267cfd
+EBUILD bvi-1.4.1-r2.ebuild 622 BLAKE2B f4e5aeb6a288c6b95c64722bcd59501a3acc18fc9951d2c74bed655091f3337e33c73165be8668aaaf485e02fb48b387dbe9ac59e47405d870855dd0c21fe747 SHA512 c946234f34b0cef817d269c7e4dc328bd7252aa3e56a3ab6ebfbe5e450b254267ef5daaa6c8463cb99f1afc3249da6481aab63c6821d2ff904cd69ef7093532f
 EBUILD bvi-1.4.1.ebuild 485 BLAKE2B 81f7bee4e6ab083460f5fdfa4ae66443591bbbfb96877f3ef6901dd3a4f458bf872691f6e34bbda37705af59c354326cb82be70b6dec0b79752b403484b4ba15 SHA512 f8716421677b9a578f562be3e9cd50fe83a957a066803fe8d389c237ba5dbc88abaae3404e1ff62c3e0b73d0d7270b78dda22cc6bcaab62b6dd6437f9d9f7a23
 MISC metadata.xml 466 BLAKE2B 750a6358ba1ad7ca4922205cd97e1f71845969f49c85bc7ca5e8e6d695224fbd1ef31105a61f6bc8b74e9fdbd551ff32dca7d185947d055105820470f3c08051 SHA512 a36b0f9b68ab8041139c66ff95c742c596589ad5b491672b3f0f60e5a96f50561709d4ccb73336f8e767cd348d171611a6aa27f09f210eff09aca918f1ce7809
diff --git a/app-editors/bvi/bvi-1.4.1-r2.ebuild b/app-editors/bvi/bvi-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..65616724b31d
--- /dev/null
+++ b/app-editors/bvi/bvi-1.4.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-prototypes.patch" )
+
+src_configure() {
+	append-cflags -DANSI -std=gnu89
+	default
+}
diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest
index 5de0f1638ec7..7be0029b9ec4 100644
--- a/app-editors/featherpad/Manifest
+++ b/app-editors/featherpad/Manifest
@@ -1,7 +1,5 @@
-DIST featherpad-1.1.0.tar.gz 1061070 BLAKE2B 78c7ddf0b7961a300fe2e425876bfaf32a1186eb88c2619202cb2f07a780aed3c2f8d1ced0e963b1868c94e890d1d809baae534fe1f3d06b3f3036aeeccf7414 SHA512 c734619ea8eda2709ccfa4d1b3c2ac541f32d52f31f0896ddf3c1c5733f175da9d955458a62a34221400a73003970cf796f59cf574b499831267b6f4d1a28d21
-DIST featherpad-1.2.0.tar.gz 1091776 BLAKE2B f63ddcc8bf02b3f9ad5f6ad2b56b8f99cc8566f70351a293fbe339930b41542e9ba27888afabfcf98a04ec6a1087dd77aa35006ea33526e1a7d6c45f5fe3b7d9 SHA512 cf21ed9394444920fcf3a8ce3a8338814d69322389c4652e79f0754fe67ee61260f81604c91adf0a864fb1441307706c60ee1bd29efd2e617ab8e1f5fc254cdd
 DIST featherpad-1.3.1.tar.gz 1096886 BLAKE2B 360940f0fe781676baa89a99f3d0a7c8ff8219da05fc5757b2e96654ab6c937534e2ef1cd216a3df73fd417353a3285716d09198b27626183c58d031abed363e SHA512 d17eb4691c759a7e97f24bf149152d104141162bef9f819cb09ecdd440916d1f5aa1a56252e64b859220237ea078a072c75308ec7b2e131078df938a171f506f
-EBUILD featherpad-1.1.0.ebuild 763 BLAKE2B 53acb0884d81da49e51ef6012e8e64e9f8ba009117b6ac83aeeac3a0c8ae4e421d0f2ca73faa86e8379f4c1471daeaca417c8f38ab1495732a1e6d22607c892b SHA512 407e8dc0667213f8c6bad387fb4b0102047ac39b05768fcfe8a7ee5c58aa2dfe5e7b74a064c3a1a2f27172a41f423367becaa8412435a44c39cb352903b72fd8
-EBUILD featherpad-1.2.0.ebuild 770 BLAKE2B c7f29009e12a6f7d6db402ebb44539048425333d52d7f2a06f60825d2abbe1d664036b44abeada9d8630de90754d05736a3e1e407bd4931fbb34ef7f7611b11a SHA512 5e2e341eff0a90ae49cf1638c862711a628ccb6e59776e954cc0ba8f80c53094e325d3b19e240dbc4c15f19b036f660faf2c4924de75a340569993dbada0eb16
+DIST featherpad-1.3.4.tar.gz 1101191 BLAKE2B 6313e107373e10f7784f9c2f082896fdc7e56587d7c7abde088f8fe133fc1a80f52809d6f369adbbdfe590298b119167b6aa95271c138d964fc76d9583ef8c06 SHA512 81be35bd1f90be4657225f3d8a040882073ad0a600a78c00207bdf0d7e7666e0542c67e07107d4c610753d8deb48829f7b092ab93216c77487d1310ced066e0e
 EBUILD featherpad-1.3.1.ebuild 769 BLAKE2B 9c98e0d59766428dbb69da8d1c090a887ea9b5f0f463d2a83c526fbc0ba2175cd42554bf8ca4e765955abd8c6825f10a593d2424e01367cf1dc27269dcc0c6f9 SHA512 ea64429fc39da3a75ff8e8645267cc8b39e25d45d4dcc992081afdd0e0800b8a882f51e179f6d23e4c407dea850b1d4210d6e7823e3872ec8b2ccd5cf7030ee8
+EBUILD featherpad-1.3.4.ebuild 769 BLAKE2B 9c98e0d59766428dbb69da8d1c090a887ea9b5f0f463d2a83c526fbc0ba2175cd42554bf8ca4e765955abd8c6825f10a593d2424e01367cf1dc27269dcc0c6f9 SHA512 ea64429fc39da3a75ff8e8645267cc8b39e25d45d4dcc992081afdd0e0800b8a882f51e179f6d23e4c407dea850b1d4210d6e7823e3872ec8b2ccd5cf7030ee8
 MISC metadata.xml 829 BLAKE2B d6d60de9902f49b8f04e15818d2da71a30e9b54fa6c73245eabf33bdfcbbb193f017e0b3967512578bd538c7ac718b26276442e411fe934a75873fef05fd3a67 SHA512 218c520af75da8a59b2b75cf2d4dbaa3f67c63620afe69221c854c2e5815518dc1514cffe54e57e4bca29529d99b95ca83a7879713552b9e0635aa27069f500e
diff --git a/app-editors/featherpad/featherpad-1.1.0.ebuild b/app-editors/featherpad/featherpad-1.1.0.ebuild
deleted file mode 100644
index dd562f11fb34..000000000000
--- a/app-editors/featherpad/featherpad-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2022 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 ~riscv ~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/featherpad-1.2.0.ebuild b/app-editors/featherpad/featherpad-1.3.4.ebuild
index e82070d4a429..c456752a0f7c 100644
--- a/app-editors/featherpad/featherpad-1.2.0.ebuild
+++ b/app-editors/featherpad/featherpad-1.3.4.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="+X"
 
 RDEPEND="app-text/hunspell:=
-	>=dev-qt/qtcore-5.15.0
+	>=dev-qt/qtcore-5.15.0:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5