commit: c0555385075e553f95dc7e9517aa614bc718f5f9
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 03:26:06 2016 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 03:28:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0555385
app-i18n/ibus-qt: don't get_libdir called in global scope
Gentoo-Bug: 593390
Package-Manager: portage-2.3.0
app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild | 8 ++++++--
app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild | 8 ++++++--
app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild | 8 ++++++--
3 files changed, 18 insertions(+), 6 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 407d4d1..c4d864b 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,11 @@ S="${WORKDIR}/${MY_P}"
DOCS="AUTHORS README TODO"
-mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=${EPREFIX}/usr/share/doc/${PF}
all"
+src_configure() {
+ local mycmakeargs=( -DLIBDIR=$(get_libdir)
-DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all )
+
+ cmake-utils_src_configure
+}
src_prepare() {
epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch" \
diff --git a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
b/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
index f3088c3..8088fdc 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,11 @@ S="${WORKDIR}/${MY_P}"
DOCS="AUTHORS README TODO"
-mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=${EPREFIX}/usr/share/doc/${PF}
all"
+src_configure() {
+ local mycmakeargs=( -DLIBDIR=$(get_libdir)
-DDOCDIR=${EPREFIX}/usr/share/doc/${PF} all )
+
+ cmake-utils_src_configure
+}
src_prepare() {
epatch "${FILESDIR}/${PN}-1.2.0.20091217-doc.patch"
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 cf130f7..4a7674e 100644
--- a/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -29,7 +29,11 @@ DOCS="AUTHORS README TODO"
PATCHES=( "${FILESDIR}"/${PN}-1.3-doc.patch )
-mycmakeargs="-DLIBDIR=$(get_libdir) all"
+src_configure() {
+ local mycmakeargs=( -DLIBDIR=$(get_libdir) all )
+
+ cmake-utils_src_configure
+}
src_compile() {
cmake-utils_src_compile
