gentoo resync : 30.10.2021

4 files changed, 16 insertions, 95 deletions

diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index c61bb960dda8..8c6fe17751a5 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,11 +1,6 @@
 AUX joe-4.3-tinfo.patch 1063 BLAKE2B 574f78a31200df60dab81fea278bb238fbfe0a2b3f70f1f9a2ed78f3ae7a6e7a5d979fec61ad3ed9934aece27ce7836730e7f9755a7f25225dd74928c5454694 SHA512 93db2de58d2a03412cae7dc2b2769103f3ad275b68e22d6e3379871155656c8d4d4f29fbf014c6c8eb5b70ec234189af52a6b6b6826bfde46d6ee93b92f55bcd
 AUX joe-4.6-db.patch 392 BLAKE2B 8ca4d25a1e1be76b87e581720903064f4a54b928c6c7a91991d6ae6227df00e4b13c6c9fa3ac47563f5924c5e9aa18a86f1cb471155d8ca8fccc67e151f7bada SHA512 47eeffc203879ae7a644ef3875bda41c7bd776a51fcf7f6e9d4a30a5e5f0209d1067b516efcd5faac3ecf2fb204e0105eb9cc453df5c853413a613cfdb6e4fc6
-DIST joe-4.2.tar.gz 1341048 BLAKE2B 112163e67311051dad8714e19cdee1a11ff3bbe297341c89a4023f7d68fac7eecde57d1d522f72407b0a77c227c7af424ce20567c0c47dea6c14ac41f2f2301b SHA512 7c34f4467d89330ac195cfa76481d9ede4ee3764d0b1b24d091d1e6325bff451d2a9bc9f86a73404c9909587bcbe3e0c14511b739ec121edb7595ea1fcba028f
-DIST joe-4.3.tar.gz 1270523 BLAKE2B 442e05dd29a0a8d4a26500c89a2cafee88bf2d1ed00a4cb539d940e2e849456e6c4c5bf347b4803ee02ab38311b225cc8034177a1e0b7a1967a2629fd283b7e2 SHA512 a711ce129518863856b8f581ac7acdd7661f5e571cb77c5411317e0db0344c9ba44e73ec2ca9a307e639170a7914d53352eebcd00a33c9270809551f12376e69
-DIST joe-4.4.tar.gz 1350062 BLAKE2B eb58117e313ef4abc31026a2800f2b9258c12d0d865c768138ec42a97c1f7fedcd8e397f7aaf13f8bb3776f2571d5a85e27ea7f9a6fbd6710d935a2b80afcd1f SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d
 DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
-EBUILD joe-4.2.ebuild 1147 BLAKE2B 8678ad20d1dccbff057cfd3a0848f8b31382b47d221ed289c9c85b18e81edce0f890432efacb081ee7fe470295efd72e7ca33c6d4e9deb733bf4b228a1a7f7e5 SHA512 c813ff926b3cd19ba57c0917c857f5482c78371f0c53fd5e7ca02103bc8a78307f590b10f06addc73c1a2a682434a35244b71048acdd2d2e0c7ebb25b6f6c4ac
-EBUILD joe-4.3-r1.ebuild 1280 BLAKE2B 57aebe95a494218e0594f3d842ba6fb126496f19b3ba9fae3d3976f981f21677a3765ba54bff15b006ac3e366f3af4a78ffb22ffcfce0223fa81a99b8fd48790 SHA512 7235c4fd3909e3dc2cf0d96051182eb2859c379f4b2dd7b95c8eeddb36deda8556bfc3a5a2b8932728734bc0b2e1accd7938f5f31a2e5feda5967f2cb85a00b7
-EBUILD joe-4.4.ebuild 1280 BLAKE2B 57aebe95a494218e0594f3d842ba6fb126496f19b3ba9fae3d3976f981f21677a3765ba54bff15b006ac3e366f3af4a78ffb22ffcfce0223fa81a99b8fd48790 SHA512 7235c4fd3909e3dc2cf0d96051182eb2859c379f4b2dd7b95c8eeddb36deda8556bfc3a5a2b8932728734bc0b2e1accd7938f5f31a2e5feda5967f2cb85a00b7
+EBUILD joe-4.6-r1.ebuild 1448 BLAKE2B 9f0ede46afb9fbdf35e7c6acc358e14bcde13c8e75af5d504365189f10089bad127035ae0b2db2014e4809ff1b8aa638de65f7513b1d20ce6093da7b46a4bbe9 SHA512 231336f2f5c7c3b6e33f38ebdfaff941b558789ba248b4d06dfc73946d2748be00f6ed00b8a4e4d7bd73be38963903109e4947d1fce5e174e0966891d5f4e8a8
 EBUILD joe-4.6.ebuild 1451 BLAKE2B 22ead97178fb10352f96dbd1626621d952a44de87425a9d7d3147b03c2863469209d7b320d0da3fbc2b2031e7737d78195121f3137afd30af8b60e53d933eca5 SHA512 593767e422cc2ac1c6d8e423919cd33b5b679192d2952594e3309fa7147cb2df395717bd2c34903a9aca517b764644e2518898155d7eb120d520e3fa4943e405
 MISC metadata.xml 915 BLAKE2B 550fe334d2253e6c3a707f75905b2af3082bea436348a48da9f55726ef5399f97a8b4efe29ae9b174576bde20cd89fbdc9ce88e13459d236a0cdc18592f9721f SHA512 b773c1fabafcf36ea1106610da0b3e9d10119352a663871f9b08dbac19f661f46c80e9a3cd5d4ab69079e8d07f4dc5e03f513b6ad82a5a879c2725ad88296d1c
diff --git a/app-editors/joe/joe-4.2.ebuild b/app-editors/joe/joe-4.2.ebuild
deleted file mode 100644
index 4a399380f488..000000000000
--- a/app-editors/joe/joe-4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-RDEPEND="xterm? ( >=x11-terms/xterm-239 )"
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		cd "${S}"/rc
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die "sed failed"
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild
deleted file mode 100644
index 6f21f2fe2ff1..000000000000
--- a/app-editors/joe/joe-4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
-
-LICENSE="GPL-1+ CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="xterm"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0="
-RDEPEND="${DEPEND}
-	xterm? ( >=x11-terms/xterm-239 )"
-
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
-
-PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" )
-
-src_prepare() {
-	default
-	# Enable xterm mouse support in the rc files
-	if use xterm; then
-		pushd "${S}"/rc &>/dev/null || die
-		local i
-		for i in *rc*.in; do
-			sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die
-		done
-		popd &>/dev/null
-	fi
-	eautoreconf
-}
-
-pkg_postinst() {
-	if use xterm; then
-		elog "To enable full xterm clipboard you need to set the allowWindowOps"
-		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
-		elog "This is false by default due to potential security problems on some"
-		elog "architectures (see bug #91453)."
-	fi
-}
diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.6-r1.ebuild
index 6f21f2fe2ff1..efcc6cef6153 100644
--- a/app-editors/joe/joe-4.3-r1.ebuild
+++ b/app-editors/joe/joe-4.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools
+inherit autotools xdg-utils
 
 DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
 HOMEPAGE="https://sourceforge.net/projects/joe-editor/"
@@ -11,16 +11,19 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1+ CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2:0="
 RDEPEND="${DEPEND}
 	xterm? ( >=x11-terms/xterm-239 )"
 
-DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-tinfo.patch"
+	"${FILESDIR}/${P}-db.patch"
+)
 
-PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" )
+DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
 
 src_prepare() {
 	default
@@ -37,6 +40,8 @@ src_prepare() {
 }
 
 pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 	if use xterm; then
 		elog "To enable full xterm clipboard you need to set the allowWindowOps"
 		elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm"
@@ -44,3 +49,8 @@ pkg_postinst() {
 		elog "architectures (see bug #91453)."
 	fi
 }
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}