From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7731859CA5 for ; Thu, 24 Mar 2016 14:43:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 669E521C023; Thu, 24 Mar 2016 14:43:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C825221C023 for ; Thu, 24 Mar 2016 14:43:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED2C9340C21 for ; Thu, 24 Mar 2016 14:43:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A11D186E for ; Thu, 24 Mar 2016 14:43:06 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1458830566.ace84ab1f93c5e714d763211c011d49879a7efd3.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild X-VCS-Directories: app-i18n/kcm-fcitx/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: ace84ab1f93c5e714d763211c011d49879a7efd3 X-VCS-Branch: master Date: Thu, 24 Mar 2016 14:43:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9f43303-0507-4957-be03-df5bdce14094 X-Archives-Hash: d919649ede5953cdffdb62a1bdd3e6a6 commit: ace84ab1f93c5e714d763211c011d49879a7efd3 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Wed Mar 23 22:43:43 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 24 14:42:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace84ab1 app-i18n/kcm-fcitx: Minor fixes in 0.4.3. Use cmake-utils.eclass and xdg.eclass instead of kde4-base.eclass. Improve HOMEPAGE. Fix LICENSE. Add "minimal" USE flag to avoid collision of translations with app-i18n/kcm-fcitx:5. Fix dependencies. app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild | 41 +++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild index b930717..ce2cd50 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.4.3.ebuild @@ -2,20 +2,47 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -inherit kde4-base +EAPI="5" + +inherit cmake-utils xdg + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx" + EGIT_BRANCH="kde4" +fi DESCRIPTION="KDE configuration module for Fcitx" -HOMEPAGE="http://fcitx-im.org/" -SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi -LICENSE="GPL-3" +LICENSE="GPL-2+" SLOT="4" KEYWORDS="amd64 ~ppc ppc64 ~x86" -IUSE="" +IUSE="minimal" -RDEPEND=">=app-i18n/fcitx-4.2.8[qt4] +RDEPEND=">=app-i18n/fcitx-4.2.8[dbus,qt4] + dev-qt/qtcore:4 + dev-qt/qtdbus:4 + dev-qt/qtgui:4 + kde-base/kdelibs:4 + virtual/libintl + x11-libs/libX11 x11-libs/libxkbfile" DEPEND="${RDEPEND} + dev-util/automoc sys-devel/gettext virtual/pkgconfig" + +src_prepare() { + if use minimal; then + cmake_comment_add_subdirectory po + fi + + cmake-utils_src_prepare +}