yngwin 15/02/03 07:16:06 Modified: metadata.xml fcitx-libpinyin-0.3.1.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.2 app-i18n/fcitx-libpinyin/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 31 Jan 2013 12:54:37 -0000 1.1 +++ metadata.xml 3 Feb 2015 07:16:06 -0000 1.2 @@ -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> 1.3 app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild?r1=1.2&r2=1.3 Index: fcitx-libpinyin-0.3.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fcitx-libpinyin-0.3.1.ebuild 8 Mar 2014 12:03:53 -0000 1.2 +++ fcitx-libpinyin-0.3.1.ebuild 3 Feb 2015 07:16:06 -0000 1.3 @@ -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 @@ 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 } 1.8 app-i18n/fcitx-libpinyin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog?r1=1.7&r2=1.8 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 1 Jun 2014 20:55:58 -0000 1.7 +++ ChangeLog 3 Feb 2015 07:16:06 -0000 1.8 @@ -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 <[email protected]> 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 <[email protected]> fcitx-libpinyin-0.2.1.ebuild: Update libpinyin dependency #504162
