From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1142079-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 46582138351
for <garchives@archives.gentoo.org>; Sun, 2 Feb 2020 10:58:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 47E54E0809;
Sun, 2 Feb 2020 10:58:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E63A8E0809
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Feb 2020 10:58:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0DE1634E476
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Feb 2020 10:58:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CA49D7
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Feb 2020 10:58:10 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1580641085.c17c75b84bb3f4d3857c6430a8b02461f9671c3c.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/gtkdialog/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild x11-misc/gtkdialog/gtkdialog-99999.ebuild
X-VCS-Directories: x11-misc/gtkdialog/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: c17c75b84bb3f4d3857c6430a8b02461f9671c3c
X-VCS-Branch: master
Date: Sun, 2 Feb 2020 10:58:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a18fcf68-5ef6-443f-a91e-71fce681d6d1
X-Archives-Hash: fc5f4afcd2f459d18332fc9a6b69c858
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
+}