summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2015-02-03 07:16:06 +0000
committerBen de Groot <yngwin@gentoo.org>2015-02-03 07:16:06 +0000
commit9ce5fa766fdcc2d09be596158fc8b5fae060451d (patch)
treede5c8db1cae6fe78dc121bd090d2f43a0475ceed /app-i18n/fcitx-libpinyin
parentRemove old (diff)
downloadgentoo-2-9ce5fa766fdcc2d09be596158fc8b5fae060451d.tar.gz
gentoo-2-9ce5fa766fdcc2d09be596158fc8b5fae060451d.tar.bz2
gentoo-2-9ce5fa766fdcc2d09be596158fc8b5fae060451d.zip
Fix build failure when Qt4 is not installed (bug 537228). This is made optional by toggling the dictmanager USE flag, which requires dev-qt/qtwebkit:4.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)
Diffstat (limited to 'app-i18n/fcitx-libpinyin')
-rw-r--r--app-i18n/fcitx-libpinyin/ChangeLog10
-rw-r--r--app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild17
-rw-r--r--app-i18n/fcitx-libpinyin/metadata.xml5
3 files changed, 26 insertions, 6 deletions
diff --git a/app-i18n/fcitx-libpinyin/ChangeLog b/app-i18n/fcitx-libpinyin/ChangeLog
index 64237c12e275..52ca572c99c3 100644
--- a/app-i18n/fcitx-libpinyin/ChangeLog
+++ b/app-i18n/fcitx-libpinyin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-i18n/fcitx-libpinyin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog,v 1.7 2014/06/01 20:55:58 naota Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog,v 1.8 2015/02/03 07:16:06 yngwin Exp $
+
+ 03 Feb 2015; Ben de Groot <yngwin@gentoo.org> fcitx-libpinyin-0.3.1.ebuild,
+ metadata.xml:
+ Fix build failure when Qt4 is not installed (bug 537228). This is made
+ optional by toggling the dictmanager USE flag, which requires dev-
+ qt/qtwebkit:4.
01 Jun 2014; Naohiro Aota <naota@gentoo.org> fcitx-libpinyin-0.2.1.ebuild:
Update libpinyin dependency #504162
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
index 493728345676..6ceab4f28654 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild,v 1.2 2014/03/08 12:03:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild,v 1.3 2015/02/03 07:16:06 yngwin Exp $
EAPI=5
inherit cmake-utils gnome2-utils
@@ -12,15 +12,24 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
-IUSE=""
+IUSE="dictmanager"
RDEPEND=">=app-i18n/fcitx-4.2.8
app-i18n/libpinyin
- dev-libs/glib:2"
+ dev-libs/glib:2
+ dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4]
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtwebkit:4 )"
DEPEND="${RDEPEND}
virtual/libintl
virtual/pkgconfig"
+src_configure() {
+ local mycmakeargs="$(cmake-utils_use_enable dictmanager QT)"
+ cmake-utils_src_configure
+}
+
pkg_postinst() {
gnome2_icon_cache_update
}
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index cb36a2fd8c76..c4a4afa65549 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -2,4 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
+ <use>
+ <flag name='dictmanager'>
+ Enable dictionary manager. Requires <pkg>dev-qt/qtwebkit</pkg>.
+ </flag>
+ </use>
</pkgmetadata>