[gentoo-commits] repo/gentoo:master commit in: x11-misc/gtkdialog/

[Matt Turner]

commit:     ee67f134bfab0dcdc05b564ec142b820a8846899
Author:     mazes_80 <1608580+mazes-80 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Oct 16 19:52:01 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 17:39:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee67f134

x11-misc/gtkdialog: Drop GTK+2 support

Closes: https://bugs.gentoo.org/769131
Closes: https://github.com/gentoo/gentoo/pull/27814
Signed-off-by: mazes_80 <1608580+mazes-80 <AT> users.noreply.github.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../gtkdialog/gtkdialog-0.8.3_p20200202.ebuild     | 28 +++++-----------------
 x11-misc/gtkdialog/gtkdialog-99999.ebuild          | 15 +++---------
 x11-misc/gtkdialog/metadata.xml                    |  3 ---
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index 98d5e081d8c8..9f5e5fba792a 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools xdg-utils
+EAPI=8
+inherit autotools xdg
 
 DESCRIPTION="A small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
@@ -11,17 +11,10 @@ SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="gtk2"
 
 RDEPEND="
-	gtk2? (
-		x11-libs/gtk+:2
-		x11-libs/vte:0=
-	)
-	!gtk2? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.91=
-	)
+	x11-libs/gtk+:3
+	x11-libs/vte:2.91=
 "
 DEPEND="
 	${RDEPEND}
@@ -41,8 +34,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(usex gtk2 --disable-gtk3  --enable-gtk3)
+	econf --enable-gtk3
 }
 
 src_compile() {
@@ -55,11 +47,3 @@ src_install() {
 	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index c23bccd2c836..471ce7d9bc93 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools git-r3 xdg-utils
+inherit autotools git-r3 xdg
 
 DESCRIPTION="Small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
@@ -12,7 +12,6 @@ EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
 RDEPEND="
 	x11-libs/gtk+:3
@@ -50,11 +49,3 @@ src_install() {
 	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 756afb6ff8d9..97441428731f 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -14,7 +14,4 @@
 	<upstream>
 		<remote-id type="github">oshazard/gtkdialog</remote-id>
 	</upstream>
-	<use>
-		<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
-	</use>
 </pkgmetadata>