gentoo resync : 04.05.2021

12 files changed, 189 insertions, 99 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 28bf8c5e5be8..9e42be8e5e17 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index 841bcdb79e90..015a4f60b708 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST gedit-plugins-3.38.1.tar.xz 957616 BLAKE2B 9cf5fe5343b513bd841add5d4e85f8fe2e8f62524af7c124bdfc41b81e653a41d1a7417f8cc06f764cca730927f471598cae914a1581c5cd3712b89c464a075d SHA512 d5cc3e82ac6a488f5ab06eaf4eb5ad32bdbe50b74f2f215e114b5cb3bb0a089da00caa3815d6638a679c1c902983a0754a16ef88e15ff88d8321a247288ad237
 DIST gedit-plugins-40.0.tar.xz 950560 BLAKE2B 783803dd4913a2b384a714c7564f18686b6ecf7da2f10d421322b6421e9b10271f97dcbf819e3212c97a0e4ba2b54dcb12ba5efc392396caafe705844e2cd407 SHA512 660e82dc1a1187262afd921196074dd2808a400b5acbc88ab36f522c50f1b9d221ff1821c2e8c0c066c7556862779e8d277f52a758070c59b17e6b53791ff39d
+DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3
 EBUILD gedit-plugins-3.38.1.ebuild 2720 BLAKE2B f90c19d1c5ab039c3ec9797a643db60bc449dbe61710fa32c98bcf3961742adea05d21f1c824da5ffd27133f71b3c9e1f8e2949d068f4ce2f5aece114d8662db SHA512 432e71c98caf77e46e87080685f96e580a410ab9016922539e762a0ce18142dcc2cb5e532d7ed57042eece3d095cf1b3801cf0f5f2b6d7f05bf5a05b4e37d5f3
 EBUILD gedit-plugins-40.0.ebuild 2715 BLAKE2B a155f67ecead8da85a437a06b49a411bf41052ee5af4d2457b23cdd14459502b0caa8162d13e3f48929d51915824f989ca14bc426965d97a0f82013ffa1ee4de SHA512 91eabb78e3860d8d4ae91ce92428bbc692e5f4be3befb689b4300bbcf83cf430223edcff3a3166925e2b34fc059a86aa06b873e74a6dc0ae1af29e44220e120b
+EBUILD gedit-plugins-40.1.ebuild 2715 BLAKE2B a155f67ecead8da85a437a06b49a411bf41052ee5af4d2457b23cdd14459502b0caa8162d13e3f48929d51915824f989ca14bc426965d97a0f82013ffa1ee4de SHA512 91eabb78e3860d8d4ae91ce92428bbc692e5f4be3befb689b4300bbcf83cf430223edcff3a3166925e2b34fc059a86aa06b873e74a6dc0ae1af29e44220e120b
 MISC metadata.xml 480 BLAKE2B 5584c44a255c0d13a2b93342a860388799ab1f86565bb8325a5a37e839ef01c2030b2d45ef491fc420bbbe5c113b6d9ad169352138ea09067d93e23d0bf200bf SHA512 9162def76b0460099da66501b6c0dcad1daf1f5e9e85d5cb19c6076aaafd946dc6d4d92965c66ccbbb19b13b48e9e957f65b7f33abd15e28678b7d8da258fac3
diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
new file mode 100644
index 000000000000..615262ea716c
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+IUSE="charmap git +python terminal vala"
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=app-editors/gedit-40.0
+
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-4.0.2:4
+
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-editors/gedit[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[python] )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplugin_bookmarks=true
+		$(meson_use python plugin_bracketcompletion)
+		$(meson_use charmap plugin_charmap)
+		$(meson_use python plugin_codecomment)
+		$(meson_use python plugin_colorpicker)
+		$(meson_use python plugin_colorschemer)
+		$(meson_use python plugin_commander)
+		-Dplugin_drawspaces=true
+		$(meson_use vala plugin_findinfiles)
+		$(meson_use git plugin_git)
+		$(meson_use python plugin_joinlines)
+		$(meson_use python plugin_multiedit)
+		$(meson_use python plugin_sessionsaver)
+		$(meson_use python plugin_smartspaces)
+		$(meson_use python plugin_synctex)
+		$(meson_use terminal plugin_terminal)
+		$(meson_use python plugin_textsize)
+		$(meson_use python plugin_translate)
+		-Dplugin_wordcompletion=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 58c838eb1df9..16ba240e3453 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,10 +1,8 @@
 DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
-DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056
 DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
-DIST nano-5.6.tar.gz 2956090 BLAKE2B 753c49e67403577ac272438b2a577f29978f621cb1823f3ccc4fb5df229b805c72a7123d5e5632cb9e1d4b50c7cf90675d748e7e88709703be44126e11231974 SHA512 fff8a558b435b9f372f19306e63c3bad34a60b4b1979ddf2a5724f96ca69fd7fd5850e841f714fad2e382ffc8e5c3f5085f6a6e965ff30f44bf12b8ac865fe6b
+DIST nano-5.7.tar.gz 2989413 BLAKE2B 604f3140bd963661bb7d13933b5bac867bcfd90635287dc8f160e4bda094641c20f2fe2157fe1b5eda28842f78c4e651a354ed6edcafe67b4f2bf6c9eda0051c SHA512 f6d580918c488b15a5f8f77b4b52ea3e86535c251fe32dd978bae014bcadd543a5696f7741018ffd05b6271c1defe6a67687577f3cfe059ed2b4d3e422b2a694
 EBUILD nano-5.3-r1.ebuild 2430 BLAKE2B 33487afb23e1b01280d6f6fe3f4ffc1008ca820a3e100919fa3c89cc874d80287befc979d3d3848b00cdcdad3954a43eb6fa2d8625320a6e1c9d83b49ad01312 SHA512 98ac275e4a54bee9500d5bd5d71a84e37ac1ce941a4ae5e827d1ae19209fa9d4bd3840e640d6017776f6fcd32df5ae08425f1ba5d2bce0b8e8a5e3ea2fd958d7
-EBUILD nano-5.5.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
-EBUILD nano-5.6.1.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
-EBUILD nano-5.6.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
+EBUILD nano-5.6.1.ebuild 2288 BLAKE2B 20b38eab68cebdaf26c8fa73017c1fc3d592510259ed6c6581c52bc670f607a174b032c2874a484c1f1c2592b6e60d8d30c62537f3055ded03c63bc8779e82f7 SHA512 2a043e656039c3af4b60b3c6c0d269a4d8924b45926bdd343e43fb2fcc381ce4b317290327ccaea895ba7d7e83a49327107a566189c65db75d1a922a3030e9f3
+EBUILD nano-5.7.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
 EBUILD nano-9999.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.6.1.ebuild b/app-editors/nano/nano-5.6.1.ebuild
index aaa4c8829842..977773d0f564 100644
--- a/app-editors/nano/nano-5.6.1.ebuild
+++ b/app-editors/nano/nano-5.6.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-5.6.ebuild b/app-editors/nano/nano-5.6.ebuild
deleted file mode 100644
index aaa4c8829842..000000000000
--- a/app-editors/nano/nano-5.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
-	sys-libs/ncurses:0=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-5.5.ebuild b/app-editors/nano/nano-5.7.ebuild
index aaa4c8829842..aaa4c8829842 100644
--- a/app-editors/nano/nano-5.5.ebuild
+++ b/app-editors/nano/nano-5.7.ebuild
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index c09d54d59d86..334916d432d7 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -17,5 +17,5 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r2.ebuild 7125 BLAKE2B 929ec8036ea1a05852199eca6b717ab8c0d390d7f33063cfb220f055aa45e6ea51324edccd73d65a4b9bebf6072f07e65d40d1471d10abefd57f6c915bb27921 SHA512 f0a76a418850c782730766d3fed0e04ec7c9350b7d2c5150348e6e44d0548c4f6ba8837fb8f97c6448deb866f7384b09038a93bfe9a7579f7f41b918b8d02d5f
-EBUILD xemacs-21.5.34-r5.ebuild 7423 BLAKE2B 998381d0defa89226834b2777ff69127c7416a9156050b1cc9650e37bd8d0663e2285406019f21c87244d2291c308e7c508eb06543b23e1d61e860d61b1a2e89 SHA512 80107e97cc4bc79ec720981c10b0b69bafaafde1d8e4b63bccd0c1d1151a34f05f2590813b2def7001ac585c36f8f956fbbd7e10db05ab3577aad91c19ef9a7f
+EBUILD xemacs-21.5.34-r5.ebuild 7366 BLAKE2B 1d57025f6063c61d68bd585611f4aa999ce8148d1c949c09d2d932742ad55dd838481ef85a5d8f6dc81312111c8d61d0249c912c4f3719d68bac9595caecba8b SHA512 e021ee82f0d451edce59867aaa62ec15ec7952b720b17679792966eabde1731030a2fe13aa41f5b88b96eb5a1f44896c2d214d2e5a8cf9a44907f7ed5d9f5fee
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index 51534cc420ba..bcf39ec31bbd 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -16,7 +16,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"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -24,8 +24,7 @@ RDEPEND="
 	berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 )
 	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
 	>=sys-libs/zlib-1.1.4
-	!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-	libressl? ( dev-libs/libressl )
+	>=dev-libs/openssl-0.9.6:0
 	>=media-libs/audiofile-0.2.3
 	gpm? ( >=sys-libs/gpm-1.19.6 )
 	postgres? ( dev-db/postgresql:= )
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 230374da7cc7..6a3a7ef37613 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,4 +1,7 @@
 AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3
+AUX xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch 666 BLAKE2B 2c146a953110abfbf9a8b356ce90f1147d596962f6abff4ac8620a7ed80cade68e08abe75fa092cd57c19132d85efaf888cec318b83a516d42a6dbd130111e9f SHA512 7dbc87957f380c79e411e24f2676091bfc213725e0f1ac8fc12ad36777373e614020c8658d4f17ed7d79505d886776764648b6a0b068b161d37363dcc736e1de
 DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
+DIST xmlcopyeditor-1.3.0.0.tar.gz 4981894 BLAKE2B decaf8d08bcf6392624160f512e02c0e1b8924df1147d2fb19b744357077f9b23a99781c0f47c5800feffa600aea7b1fadb65282b5da438521be079aeb917de4 SHA512 5feebc56124601c1a8b7a3079b8f766c6282c256e39a2e34cdf64156ba910195a1b64fecea41d0a4022f00dcd3cd4f46f433fff3766acb6239ca70d7675b14c0
 EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 929 BLAKE2B e7cf454f41a7d9b4b8817b041356b9d8d6a99859fa8be27e7169bc64c13e25943fb982ebfca3888b6e7ff140dd0ec051db99f63469040ca81fc10e50453d22e9 SHA512 a0e4a5ea8048f4c8ab20764167ff36516135e01ab1c3faf4660acf98a36cf98e4dfb16f3c570cca613bff7474822558368dc9fae7634ce6d13952bbd2483d94c
+EBUILD xmlcopyeditor-1.3.0.0.ebuild 1042 BLAKE2B bc8a3f6b3b607cf19607b228cfbbd17c5dc17e1abbf268aafd78b2fd76686aebfb11ef5753de3760f98c6443e13c0d964070ca880ac71d51ab722425b07b154c SHA512 86fe5ab80d06b3739db39cfb5539f402831e07f9514567b4ed6b91d8c870ed92fa4742d8f2feb84f47bed48711c139c4c5b7f2f2beebe8ea5e0e5c79eb0aea65
 MISC metadata.xml 250 BLAKE2B 113a0d77e4ddd91ae5487bc89371d2973202f242a3c9a8899725295e62b51c0a64437ab158b40ba410c671f92fe3efb896b1446f7301e1f1e923baece1cb7e04 SHA512 20703a39d4150e2a8984fdaeb997da464e98e6abc363e5e07fee46954d5af19c861e40648fb238b763420349e3ebeaa4bf61a621ccff3ff77d6e629c61095bb0
diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch
new file mode 100644
index 000000000000..e07b90c5eafe
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index 30bdf60..034bb26 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -105,13 +105,9 @@ AC_LANG(C++)
+ AC_CHECK_HEADER(expat.h, ,
+ 	AC_MSG_ERROR([Expat headers not found]))
+ 
+-# Check enchant is available
+-PKG_CHECK_MODULES(ENCHANT, [enchant], [CXXFLAGS="$CXXFLAGS -DUSE_ENCHANT"], 
+-	# otherwise Check ASPELL is available
+-	  [AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
+-		AC_MSG_ERROR([Aspell headers not found]))]
+-)
+-
++# Check Aspell is available
++AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"],
++	AC_MSG_ERROR([Aspell headers not found]))
+ AC_SUBST(ASPELL_LIBS)
+ 
+ AC_MSG_CHECKING([the GTK version to use])
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild
new file mode 100644
index 000000000000..a4f5153d85c8
--- /dev/null
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit autotools wxwidgets xdg
+
+DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor"
+HOMEPAGE="http://xml-copy-editor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86 ~amd64-linux ~x86-linux"  # -ppc due SSE2 requirement
+IUSE="aqua nls"
+
+RDEPEND="
+	app-text/aspell
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/xerces-c[cpu_flags_x86_sse2,icu]
+	dev-libs/libpcre
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch )
+
+src_prepare() {
+	default
+
+	# bug #440744
+	sed -i  -e 's/ -Wall -g -fexceptions//g' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	setup-wxwidgets unicode
+	econf \
+		--with-gtk=3.0 \
+		--with-wx-config="${WX_CONFIG}" \
+		$(use_enable nls)
+}