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

[Jeroen Roovers]

commit:     c17c75b84bb3f4d3857c6430a8b02461f9671c3c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 10:20:32 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 10:58:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17c75b8

x11-misc/gtkdialog: Call xdg_icon_cache_update()

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 ...alog-99999.ebuild => gtkdialog-0.8.3-r3.ebuild} | 45 +++++++++++-----------
 x11-misc/gtkdialog/gtkdialog-99999.ebuild          | 12 +++++-
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
similarity index 54%
copy from x11-misc/gtkdialog/gtkdialog-99999.ebuild
copy to x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
index 0f60150b0f8..f6947de4958 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
@@ -1,52 +1,43 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools git-r3
+EAPI=7
+inherit autotools xdg-utils
 
 DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://github.com/oshazard/gtkdialog"
-EGIT_REPO_URI="https://github.com/oshazard/gtkdialog"
+HOMEPAGE="https://code.google.com/p/gtkdialog/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="gtk3"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="glade vte"
 
 RDEPEND="
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/vte:0=
-	)
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.91=
-	)
+	x11-libs/gtk+:2
+	glade? ( gnome-base/libglade )
+	vte? ( x11-libs/vte:0= )
 "
 DEPEND="
 	${RDEPEND}
-	sys-apps/texinfo
-	sys-devel/flex
 	virtual/pkgconfig
+	sys-devel/flex
 	virtual/yacc
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
 )
 
 src_prepare() {
+	mv configure.{in,ac} || die
 	default
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable gtk3)
-}
-
-src_compile() {
-	emake -C doc stamp-vti
-	default
+	econf $(use_with glade) $(use_with vte)
 }
 
 src_install() {
@@ -54,3 +45,11 @@ 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 0f60150b0f8..6a3b1eec8e2 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools git-r3
+EAPI=7
+inherit autotools git-r3 xdg-utils
 
 DESCRIPTION="A small utility for fast and easy GUI building"
 HOMEPAGE="https://github.com/oshazard/gtkdialog"
@@ -54,3 +54,11 @@ src_install() {
 	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}