gentoo resync : 20.03.2021

7 files changed, 5 insertions, 445 deletions

diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 99c242990e17..2d8da91a6f0a 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,9 +1,4 @@
-AUX geany-plugins-1.36-libgit2-0.99.patch 2345 BLAKE2B 8cbaf858dd62c692279b863a8c594fd768c43ef4042fc10093eb608f6c6f7f71d3fadbebf41e98ab1045303b3e921b20aa453467c314132807fb285aab5560bd SHA512 49897e68b7617e429fc98cee9bc6dc47b60f2e526563ab7b3a58fe4aa8c04bec522ad357225ff5d75378a551c8eee4374382c25381ca368769137b045fbbae6b
 AUX geany-plugins-1.37_use-stdbool.patch 1392 BLAKE2B ff3e64bb921b01cd35943d9fcb0a860d65ac71eb70298456c36c84713e71431838cb05823886faaa1d93050b759090625513dd263187649b89120cc3217a202d SHA512 9fa5960d9eb6418de7acb8efe94f9148deae1cb72864c149abc4ae1b22e23f53bd6905f72a901e052f33a445d31d8c5c0cd3dd8efe535ee58910585e759b0dbd
-DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
 DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
-EBUILD geany-plugins-1.36-r2.ebuild 3041 BLAKE2B e25759bbd4f9a48e3fbafb3c4b90ea1e8b648ed137d226976003796df82b769da8f9752e573b6276d940235bd1c8993329b2a56a0ad34c5f2eee99e6ecb98f55 SHA512 51ae6f610441056d9572133c18e61d7f01f7c1cd6258e8e18e4828525cbe05d8e2dc5129291ae23aef52a45d7c75e70ba47a5e98a153a80c900c8913723ca516
-EBUILD geany-plugins-1.37-r100.ebuild 3055 BLAKE2B 9983e26e9c6321b54e88e8258044983df16416982b9f64fe4285900e6fdae9f8775e63fbbf1c6314038c37ffec84ca825ecc72e5899418387f23daba6050c2e5 SHA512 2191e647cb73b6fad45127943109194fe7d6042032b6d3444fe7f09814e71a579da87e471347eac4a17532db77c6f1ba41efb8bea0b64c25203d4090aa28f8d1
-EBUILD geany-plugins-1.37-r101.ebuild 2961 BLAKE2B a297d54487b57a38ac1ab4ff323bffdfafe1f983555b62e2e399fb88ea718a1f5c2f6e7ab785bf49629048df2cbf0b01c88e7158086d25832d7f01ffbaf54d26 SHA512 d038947715bd19eb7df1db3a6f731eb7fd1b18f47a6dc809ebdf38f785f25e5b3480c0902faaf2e08b1fe88abdc01ad7206b601cef3de0b3f7233ca752571794
-EBUILD geany-plugins-1.37.ebuild 2992 BLAKE2B 0c9d6f96df55650387d8077e6da25367f4077445ed77071199e8f2e21ccdf10419fd656ed7aa34177b498c9748c2bb77adbf27c956854fccafe642564997945c SHA512 48402ae37f4eb61a1b437d36235e97b95e775a8b8ee0b458454f11c4265bfae3528c5e25dc82958ef4638d08415078419b71f9b49a3305081268ec6420cc24e4
-MISC metadata.xml 1278 BLAKE2B d7069dbc82acd4fae0939c09f867e557a1b214d4ebe48add0cb483aeeec073ae362d35033c0017117e614793de109790c0c17c399327ac4e823f378948301e8f SHA512 5effdf6d8adbb1d63835c55d9a5e97a5596c59027b7c250dbdd6e0d88c7bedc6c1a4c1d8150cd00da538d40bcceb7b819c50080262737255eb2e5463904a4eb3
+EBUILD geany-plugins-1.37-r101.ebuild 2959 BLAKE2B 47de3cee422c58a9a6c7e311b0e63f6ce48eeea824ec9c728a503212022e230d0fa48de5ec67ec3cef9c7d98713138ba69253a01009a8a7d480ec557fb0cf66c SHA512 a70bd981c05c18e174e4943b91dbe39828b17aabe93e44b2c8f76adb675de304f91eada551ff8763edcfd1e954003efc6940732a3e5364a6e77006d55403ae20
+MISC metadata.xml 1200 BLAKE2B 60891abe35d87180eac8f9bc6a9377f3b3152b7bb3d5862cca5f31d423371302a9ba8556827e5db0e893ab82d73efdf4bf3c89c16b0c751ebc4d0e827c7a44a9 SHA512 ce72297d075ebb4ad7397116466706c35f767a60d5ed15e4642f27e0ec81bae20a1f6acb1154f3b8e92f8d83b480923890529219ef3f8b743e01b0a1928aa5dc
diff --git a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch b/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
deleted file mode 100644
index 25e5ac4ea28e..000000000000
--- a/dev-util/geany-plugins/files/geany-plugins-1.36-libgit2-0.99.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9497d829e1b207eb83575dc6f617feecfb89bc16 Mon Sep 17 00:00:00 2001
-From: Dominik Schmidt <dominik@schm1dt.ch>
-Date: Sun, 23 Feb 2020 19:15:30 +0100
-Subject: [PATCH] Make libgit2 version preprocessor conditionals compatible
- with libgit2-0.99
-
-LIBGIT2_SOVERSION is defined as string literal, e.g. "0.99",
-from libgit2-0.99 and beyond. Arithmetic checks against this
-variable whill hence fail. This patch switches the checks to
-compare against the LIBGIT2_VER_* family, which should be more stable.
----
- git-changebar/src/gcb-plugin.c | 6 +++---
- workbench/src/plugin_main.c    | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/git-changebar/src/gcb-plugin.c b/git-changebar/src/gcb-plugin.c
-index b7083199..a911815f 100644
---- a/git-changebar/src/gcb-plugin.c
-+++ b/git-changebar/src/gcb-plugin.c
-@@ -32,11 +32,11 @@
- #include <geany.h>
- #include <document.h>
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) )
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 23
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) )
- /* 0.23 added @p binary_cb */
- # define git_diff_buffers(old_buffer, old_len, old_as_path, \
-                           new_buffer, new_len, new_as_path, options, \
-@@ -45,7 +45,7 @@
-                     new_buffer, new_len, new_as_path, options, \
-                     file_cb, hunk_cb, line_cb, payload)
- #endif
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 28
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) )
- # define git_buf_dispose  git_buf_free
- # define git_error_last   giterr_last
- #endif
-diff --git a/workbench/src/plugin_main.c b/workbench/src/plugin_main.c
-index 6fa6fc84..25ecdf6d 100644
---- a/workbench/src/plugin_main.c
-+++ b/workbench/src/plugin_main.c
-@@ -36,7 +36,7 @@
- #include "tm_control.h"
- 
- 
--#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 22
-+#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22))
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
deleted file mode 100644
index 854fb5782672..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.36-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ppc64 ~sparc x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="!gtk3? ( !markdown )"
-
-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
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	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 )
-
-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 soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(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
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	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.37-r100.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
deleted file mode 100644
index a7b45aeecd51..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit lua-single
-
-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 ppc64 ~sparc x86"
-
-IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="gtk2? ( !markdown ) lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.37[gtk2=]
-	!gtk2? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		!gtk2? ( app-text/gtkspell:3= )
-		gtk2? ( app-text/gtkspell:2 )
-		)
-	lua? ( ${LUA_DEPS} )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( 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 )
-"
-
-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 gtk2 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(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
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	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.37-r101.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
index 7512e75d44a1..6d06c1275d7d 100644
--- a/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/geany-plugins/geany-plugins-1.37.ebuild b/dev-util/geany-plugins/geany-plugins-1.37.ebuild
deleted file mode 100644
index a1018068f128..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.37.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ppc64 ~sparc ~x86"
-
-IUSE="gtk2 ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
-REQUIRED_USE="gtk2? ( !markdown )"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.37[gtk2=]
-	!gtk2? ( x11-libs/gtk+:3 )
-	gtk2? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		!gtk2? ( app-text/gtkspell:3= )
-		gtk2? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	scope? (
-		!gtk2? ( x11-libs/vte:2.91 )
-		gtk2? ( 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 )
-"
-
-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 gtk2 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(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
-		# GTK 2 only
-		--disable-geanypy
-		--disable-multiterm
-	)
-
-	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/metadata.xml b/dev-util/geany-plugins/metadata.xml
index db5b9d2b0d41..979845bc227d 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aklhfex@gmail.com</email>
 		<name>Chris Mayo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk2">Use GTK+2 instead of GTK+3</flag>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</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="enchant">Enable spell checking using enchant</flag>