Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/im-chooser/
Date: Tue, 02 Nov 2021 12:14:34
Message-Id: 1635855228.5b4b12bfdd97dee82006520679f9ca0845a17584.hattya@gentoo
1 commit: 5b4b12bfdd97dee82006520679f9ca0845a17584
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 2 12:09:49 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 2 12:13:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4b12bf
7
8 app-i18n/im-chooser: drop gtk2 USE flag
9
10 Closes: https://bugs.gentoo.org/769104
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
13
14 app-i18n/im-chooser/im-chooser-1.7.0.ebuild | 6 ++----
15 app-i18n/im-chooser/metadata.xml | 3 ---
16 2 files changed, 2 insertions(+), 7 deletions(-)
17
18 diff --git a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild b/app-i18n/im-chooser/im-chooser-1.7.0.ebuild
19 index 607c2537d1c..fd14fdca25d 100644
20 --- a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild
21 +++ b/app-i18n/im-chooser/im-chooser-1.7.0.ebuild
22 @@ -12,13 +12,12 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
23 LICENSE="GPL-2+ LGPL-2+"
24 SLOT="0"
25 KEYWORDS="amd64 ~x86"
26 -IUSE="gtk2 xfce"
27 +IUSE="xfce"
28
29 RDEPEND="app-i18n/imsettings
30 virtual/libintl
31 + x11-libs/gtk+:3
32 x11-libs/libSM
33 - gtk2? ( x11-libs/gtk+:2 )
34 - !gtk2? ( x11-libs/gtk+:3 )
35 xfce? ( xfce-base/libxfce4util )"
36 DEPEND="${RDEPEND}"
37 BDEPEND="dev-util/intltool
38 @@ -28,7 +27,6 @@ BDEPEND="dev-util/intltool
39
40 src_prepare() {
41 sed -i \
42 - -e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \
43 -e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \
44 -e "/^GNOME_/d" \
45 -e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
46
47 diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml
48 index 1ebdced7c5e..1e89d4e6c91 100644
49 --- a/app-i18n/im-chooser/metadata.xml
50 +++ b/app-i18n/im-chooser/metadata.xml
51 @@ -10,9 +10,6 @@
52 Method you want to use or disable it entirely on the desktop.
53 </longdescription>
54 <use>
55 - <flag name="gtk2">
56 - Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
57 - </flag>
58 <flag name="xfce">Enable support for XFCE panel</flag>
59 </use>
60 </pkgmetadata>