commit: 9aca2a1681207b1e96d49a233c4309cf777e9913
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 13:59:07 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 14:04:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aca2a16
app-i18n/ibus-qt: update to EAPI 6
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 49 +++++++++++++++++------------------
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 36 ++++++++++++-------------
app-i18n/ibus-qt/metadata.xml | 7 +++--
3 files changed, 44 insertions(+), 48 deletions(-)
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
index e83c2b1b568..848efda5893 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -1,10 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit cmake-utils eutils multilib
+EAPI="6"
+
+inherit cmake-utils
MY_P="${P}-Source"
+
DESCRIPTION="Qt IBus library and Qt input method plugin"
HOMEPAGE="https://github.com/ibus/ibus/wiki";
SRC_URI="https://ibus.googlecode.com/files/${MY_P}.tar.gz";
@@ -14,46 +16,43 @@ SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc"
-RDEPEND=">=app-i18n/ibus-1.3.7
- >=sys-apps/dbus-1.2
- x11-libs/libX11
- >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtdbus-4.5:4"
+RDEPEND="app-i18n/ibus
+ dev-libs/icu:=
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ sys-apps/dbus
+ x11-libs/libX11"
DEPEND="${RDEPEND}
- >=dev-libs/icu-4:=
- dev-util/cmake
virtual/pkgconfig
doc? ( app-doc/doxygen )"
-
S="${WORKDIR}/${MY_P}"
-DOCS="AUTHORS README TODO"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.0.20091217-doc.patch
+ "${FILESDIR}"/${P}-display-unset.patch
+ "${FILESDIR}"/${P}-gold.patch
+ "${FILESDIR}"/${P}-qvariant.patch
+)
src_configure() {
- local mycmakeargs=( -DLIBDIR=$(get_libdir)
-DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all )
-
+ local mycmakeargs=(
+ -DLIBDIR=$(get_libdir)
+ -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+ )
cmake-utils_src_configure
}
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch" \
- "${FILESDIR}"/${P}-display-unset.patch \
- "${FILESDIR}"/${P}-gold.patch \
- "${FILESDIR}"/${P}-qvariant.patch
-}
-
src_compile() {
cmake-utils_src_compile
- if use doc ; then
- cd "${CMAKE_BUILD_DIR}"
- emake docs || die
+ if use doc; then
+ emake -C "${BUILD_DIR}" docs
fi
}
src_install() {
- if use doc ; then
- HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*"
+ if use doc; then
+ HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
fi
cmake-utils_src_install
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
index d8f08b8ea1d..a990fbc5aab 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -1,51 +1,49 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit cmake-utils eutils multilib
+EAPI="6"
+
+inherit cmake-utils
DESCRIPTION="Qt IBus library and Qt input method plugin"
HOMEPAGE="https://github.com/ibus/ibus/wiki";
-SRC_URI="https://github.com/ibus/ibus-qt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ibus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
-RDEPEND=">=app-i18n/ibus-1.3.7
- >=sys-apps/dbus-1.2
- x11-libs/libX11
- >=dev-qt/qtcore-4.5:4
- >=dev-qt/qtdbus-4.5:4"
+RDEPEND="app-i18n/ibus
+ dev-libs/icu:=
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ sys-apps/dbus
+ x11-libs/libX11"
DEPEND="${RDEPEND}
- >=dev-libs/icu-4:=
- dev-util/cmake
virtual/pkgconfig
doc? ( app-doc/doxygen )"
-DOCS="AUTHORS README TODO"
-
PATCHES=( "${FILESDIR}"/${PN}-doc.patch )
src_configure() {
- local mycmakeargs=( -DLIBDIR=$(get_libdir) all )
-
+ local mycmakeargs=(
+ -DLIBDIR=$(get_libdir)
+ )
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
- if use doc ; then
- cd "${CMAKE_BUILD_DIR}"
- emake docs || die
+ if use doc; then
+ emake -C "${BUILD_DIR}" docs
fi
}
src_install() {
- if use doc ; then
- HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*"
+ if use doc; then
+ HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
fi
cmake-utils_src_install
diff --git a/app-i18n/ibus-qt/metadata.xml b/app-i18n/ibus-qt/metadata.xml
index 16d92f4e22c..4346ded0668 100644
--- a/app-i18n/ibus-qt/metadata.xml
+++ b/app-i18n/ibus-qt/metadata.xml
@@ -5,11 +5,10 @@
<email>c...@gentoo.org</email>
<name>Cjk</name>
</maintainer>
- <longdescription lang="en">IBus means Intelligent Input Bus. It is a new
input framework for Linux OS. It provides
-full featured and user friendly input method user interface. It also may help
-developers to develop input method easily.</longdescription>
+ <longdescription lang="en">
+ The Qt client for IBus. It provides a Qt immodule.
+ </longdescription>
<upstream>
- <remote-id type="google-code">ibus</remote-id>
<remote-id type="github">ibus/ibus-qt</remote-id>
</upstream>
</pkgmetadata>
