Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/scim/
Date: Sat, 25 Aug 2018 20:37:13
Message-Id: 1535229422.a3bb3de8b35f81c239d2c3b85e6c7bbe335ebd50.mgorny@gentoo
1 commit: a3bb3de8b35f81c239d2c3b85e6c7bbe335ebd50
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 25 20:32:12 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 25 20:37:02 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3bb3de8
7
8 app-i18n/scim: Remove dep on removed qt4
9
10 app-i18n/scim/scim-1.4.17.ebuild | 9 ++-------
11 app-i18n/scim/scim-1.4.18.ebuild | 9 ++-------
12 2 files changed, 4 insertions(+), 14 deletions(-)
13
14 diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
15 index 86a88efe10b..e8653806f6b 100644
16 --- a/app-i18n/scim/scim-1.4.17.ebuild
17 +++ b/app-i18n/scim/scim-1.4.17.ebuild
18 @@ -11,16 +11,12 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
19 LICENSE="GPL-2"
20 SLOT="0"
21 KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
22 -IUSE="doc gtk3 qt4"
23 +IUSE="doc gtk3"
24
25 RDEPEND="x11-libs/libX11
26 dev-libs/glib:2
27 gtk3? ( x11-libs/gtk+:3 )
28 !gtk3? ( x11-libs/gtk+:2 )
29 - qt4? (
30 - dev-qt/qtcore:4
31 - dev-qt/qtgui:4
32 - )
33 >=dev-libs/atk-1
34 >=x11-libs/pango-1"
35 DEPEND="${RDEPEND}
36 @@ -50,8 +46,7 @@ src_configure() {
37 --enable-ld-version-script \
38 $(usex gtk3 --with-gtk-version={3,2}) \
39 --disable-qt3-immodule \
40 - $(use_enable qt4 qt4-immodule) \
41 - --with-qt4-moc="$(qt4_get_bindir)/moc"
42 + --disable-qt4-immodule
43 }
44
45 src_compile() {
46
47 diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
48 index cf10edfec8e..4279a7029e8 100644
49 --- a/app-i18n/scim/scim-1.4.18.ebuild
50 +++ b/app-i18n/scim/scim-1.4.18.ebuild
51 @@ -12,16 +12,12 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
52 LICENSE="GPL-2"
53 SLOT="0"
54 KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
55 -IUSE="doc gtk3 qt4"
56 +IUSE="doc gtk3"
57
58 RDEPEND="x11-libs/libX11
59 dev-libs/glib:2
60 gtk3? ( x11-libs/gtk+:3 )
61 !gtk3? ( x11-libs/gtk+:2 )
62 - qt4? (
63 - dev-qt/qtcore:4
64 - dev-qt/qtgui:4
65 - )
66 >=dev-libs/atk-1
67 >=x11-libs/pango-1"
68 DEPEND="${RDEPEND}
69 @@ -51,8 +47,7 @@ src_configure() {
70 --enable-ld-version-script \
71 $(usex gtk3 --with-gtk-version={3,2}) \
72 --disable-qt3-immodule \
73 - $(use_enable qt4 qt4-immodule) \
74 - --with-qt4-moc="$(qt4_get_bindir)/moc"
75 + --disable-qt4-immodule
76 }
77
78 src_compile() {