[gentoo-commits] repo/gentoo:master commit in: app-editors/bluefish/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     7202f433d3ad4bebb6005cf76c91508cdb260255
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 20:13:49 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 20:18:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7202f433

app-editors/bluefish: Drop IUSE=gtk3

Closes: https://bugs.gentoo.org/769020
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-editors/bluefish/bluefish-2.2.12.ebuild | 25 +++++++------------------
 app-editors/bluefish/metadata.xml           |  9 ++++-----
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.12.ebuild
index 5e884616586..625cc993be5 100644
--- a/app-editors/bluefish/bluefish-2.2.12.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.12.ebuild
@@ -5,9 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools python-single-r1 xdg
-
 MY_P=${P/_/-}
+inherit autotools python-single-r1 xdg
 
 DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
 HOMEPAGE="http://bluefish.openoffice.nl/"
@@ -16,16 +15,13 @@ SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
-IUSE="+gtk3 gucharmap nls python spell"
+IUSE="gucharmap nls python spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-libs/zlib
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? (
-		x11-libs/gtk+:3
-		gucharmap? ( gnome-extra/gucharmap:2.90 )
-	)
+	x11-libs/gtk+:3
+	gucharmap? ( gnome-extra/gucharmap:2.90 )
 	python? ( ${PYTHON_DEPS} )
 	spell? ( >=app-text/enchant-1.4:0 )"
 DEPEND="${RDEPEND}
@@ -44,17 +40,10 @@ S="${WORKDIR}/${MY_P}"
 RESTRICT="test"
 
 pkg_setup() {
-	if ! use gtk3 && use gucharmap ; then
-		ewarn "gucharmap USE flag requires the gtk3 USE flag being enabled."
-		ewarn "Disabling charmap plugin."
-	fi
-
 	use python && python-single-r1_pkg_setup
 }
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.9-charmap_configure.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
 
 # eautoreconf seems to no longer kill translation files.
 src_prepare() {
@@ -68,8 +57,8 @@ src_configure() {
 		--disable-update-databases \
 		--disable-xml-catalog-update \
 		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
-		$(use_with !gtk3 gtk2) \
-		$(usex gtk3 "$(use_with gucharmap charmap)" '--without-charmap') \
+		--without-gtk2 \
+		$(use_with gucharmap charmap) \
 		$(use_enable nls) \
 		$(use_enable spell spell-check) \
 		$(use_enable python)

diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 52c7b254214..56419257845 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 	<use>
-	<flag name="gtk3">Enable GTK3 interface (default)</flag>
-	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
-	<flag name="spell">Enable spell checking capabilities via enchant library</flag>
-</use>
+		<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
+		<flag name="spell">Enable spell checking capabilities via enchant library</flag>
+	</use>
 </pkgmetadata>