gentoo resync : 25.04.2020

7 files changed, 3 insertions, 610 deletions

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 9d41b0ef05dc..1f87017c94e4 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,11 +1,4 @@
 AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8c594fd768c43ef4042fc10093eb608f6c6f7f71d3fadbebf41e98ab1045303b3e921b20aa453467c314132807fb285aab5560bd SHA512 49897e68b7617e429fc98cee9bc6dc47b60f2e526563ab7b3a58fe4aa8c04bec522ad357225ff5d75378a551c8eee4374382c25381ca368769137b045fbbae6b
-DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
-DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
-DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
 DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
-EBUILD geany-plugins-1.30.ebuild 3486 BLAKE2B 780841b267551815696d4f15fa15c8677355e8ca14b69a8a9865ff5284036ef1086d61577678dd8d1c32af1580ed224a7baf991d928acd48f63aec071dc57d49 SHA512 35c7282e23cac683a215f35144f7c988fed8ff4f2b556617540dc752138f7e3d126816da7113cfd63d02605f1a7a95d08fcde777bb0ee56daa0faf3202828cda
-EBUILD geany-plugins-1.34-r1.ebuild 3391 BLAKE2B 0c2731c639d829e496038aea52907828d54bad2d00c444bfabd7122463eff5209551990b232cb7e0ab8c2c3aa456e20815b5e3b5dbea969b1b186cfa21854c86 SHA512 7a5cc59f1e02dba2adc6e5fabd735d84a50cf11246d5d7530b02ff35a41b6ff7d727f37bcc498d3f1fce37806d318f109a67a5e70216138c39fa515f60c8cb17
-EBUILD geany-plugins-1.35.ebuild 3358 BLAKE2B 917d11c0797871d74e4db1a08264f7ee539b32a4cd78d523b51a45b89621dd1011e47e262f9c5170168e62c55246cc92608273a0f9df8bbc9e952f8bfffa076e SHA512 7c77e1266185fc4569f10c56fc6d1dfc11dbe7ff7bb199ace577a0483a89e3f4426c84390f761407c56d379da098592c7fb5519ff144b910bb64f5834cfcc2a4
-EBUILD geany-plugins-1.36-r1.ebuild 3474 BLAKE2B c1f3bd654e32bdbf9a3fe518651b398cad4680b23ad9c43a61d2ac921c988319370b9b442cc6f669ff4165087e9300771f31ff07546545ffd0c31725e124754d SHA512 c5ccf6304578171e26e3b754196f381782928fb6c27a62238e7f6c346281744a1268c610f48579a2295e70486597a86ba401e6ec58e3b69fee478952eb71ecfb
-EBUILD geany-plugins-1.36-r2.ebuild 3039 BLAKE2B 1672a7b1921cfbf0dfef9f9a0399f6d8a083b2d0da9f62549e13fd9eefb6fa0ba8ae55613179520f0dae0789854eb9c4f14a3fe868e1f2998fe8c57a7ee3e8f7 SHA512 bc9a48b7723e652686a3bbb08f9d1999d422e075a60f5cd197b34740ea49bb35f4ac901b6e194a5419ff951b4e031fa8a79ccbd227c0aca5b51d1ce17ee21768
-MISC metadata.xml 1647 BLAKE2B b46873a3918b3506a6331aecf522f78467c4ab88e3d9f1b3caa300afbb83986f377d193ed2da43246eacb3ea104396989569f3e8ea663ee766c580d6b96abac5 SHA512 0030c7fb50c9ed0da05c34ef122762c86a5b9f8345403e80cd2cdff0447a62980608ca7ee484520eb097907bc6d9dfe4b390b0d4888775e3b4125d3ccd198d94
+EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
+MISC metadata.xml 1224 BLAKE2B e4c6548dff83825d2a2a7fcc0b0996f49aef25bf89468e6f333a5c524b09fc536854a0e3096e08a0026651fbaae70af1c9e09bba8a35fd4fd44cdd3a08a3217c SHA512 f8f2e26977703798922688da150a4dfd397ab06e0e35b28d7b84634a7bd1c2fe96937b586a83ead23a701feed2d3b4e75951d28529a2be980992f8c23565bfba
diff --git a/dev-util/geany-plugins/geany-plugins-1.30.ebuild b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
deleted file mode 100644
index 2c40f13fccf9..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.30.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils ltprune python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
-
-IUSE="gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-GTK_COMMON_DEPEND="
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-"
-COMMON_DEPEND="
-	>=dev-util/geany-1.26[gtk3=]
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	autoclose? ( ${GTK_COMMON_DEPEND} )
-	commander? ( ${GTK_COMMON_DEPEND} )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	defineformat? ( ${GTK_COMMON_DEPEND} )
-	enchant? ( app-text/enchant:0 )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		x11-libs/gtk+:2
-		>=x11-libs/vte-0.28:0
-		)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# bundled lib buster
-	rm markdown/peg-markdown/markdown_lib.c || die
-	# devhelp plugin bundles devhelp
-
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable !gtk3 geanydoc)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# peg-markdown is bundled, use app-text/discount instead
-		--disable-peg-markdown
-		--enable-addons
-		--enable-codenav
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanylatex
-		--enable-geanymacro
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-pretty-printer
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-xmlsnippets
-		$(use_enable autoclose)
-		$(use_enable automark)
-		$(use_enable commander)
-		$(use_enable ctags geanyctags)
-		$(use_enable debugger)
-		$(use_enable defineformat)
-		$(use_enable enchant spellcheck)
-		$(use_enable git gitchangebar)
-		$(use_enable gpg geanypg)
-		$(use_enable gtkspell)
-		$(use_enable multiterm)
-		$(use_enable lua geanylua)
-		$(use_enable nls)
-		$(use_enable overview)
-		$(use_enable python geanypy)
-		$(use_enable scope)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable soup geniuspaste)
-		# Relies on obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --modules
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
-		rm -r "${D}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
deleted file mode 100644
index f9ec3ba2ff8b..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sparc x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.34[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.35.ebuild b/dev-util/geany-plugins/geany-plugins-1.35.ebuild
deleted file mode 100644
index dd3e32e86691..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.35.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.35[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
deleted file mode 100644
index d893f9de3ae9..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup workbench"
-REQUIRED_USE="
-	gtk3? ( !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.35[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-		')
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-libgit2-0.99.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
index 9c2a97394909..854fb5782672 100644
--- a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="!gtk3? ( !markdown )"
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index 682ca11a03c8..6a11d0ae3243 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -11,18 +11,12 @@
 	</maintainer>
 	<use>
 		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
-		<flag name="autoclose">Enable the autoclose plugin.</flag>
-		<flag name="automark">Enable the automark plugin</flag>
-		<flag name="commander">Enable the commander plugin which provides a command panel for rapid access to any action.</flag>
 		<flag name="ctags">Enable ctags plugin</flag>
 		<flag name="debugger">Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
-		<flag name="defineformat">Enable the defineformat plugin.</flag>
 		<flag name="enchant">Enable spell checking using enchant</flag>
 		<flag name="gpg">Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
 		<flag name="gtkspell">Use gtkspell for dictionary support in GeanyVC</flag>
 		<flag name="markdown">Enable the markdown plugin</flag>
-		<flag name="multiterm">Enable the multiterm plugin</flag>
-		<flag name="overview">Enable overview plugin</flag>
 		<flag name="pretty-printer">Enable pretty-printer plugin</flag>
 		<flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag>
 		<flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>