From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-859814-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id DD31258973
for <garchives@archives.gentoo.org>; Tue, 26 Jan 2016 13:23:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BE191E087C;
Tue, 26 Jan 2016 13:23:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5CD0EE087C
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jan 2016 13:23:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 46BFD34074E
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jan 2016 13:23:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id EA3F4CF7
for <gentoo-commits@lists.gentoo.org>; Tue, 26 Jan 2016 13:23:38 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1453814350.a2bc47560788d337ca67c6d31981670885fa3a4a.kensington@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
X-VCS-Repository: proj/kde
X-VCS-Files: eclass/kde5.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: a2bc47560788d337ca67c6d31981670885fa3a4a
X-VCS-Branch: master
Date: Tue, 26 Jan 2016 13:23:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2c2493fe-1278-4f90-ac25-39978e404302
X-Archives-Hash: 2b212948c890b15d362874e6d062181c
commit: a2bc47560788d337ca67c6d31981670885fa3a4a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 13:19:10 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 13:19:10 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2bc4756
kde5.eclass: comment_add_subdirectory -> cmake_comment_add_subdirectory
eclass/kde5.eclass | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 27bebb4..2bee51d 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -453,12 +453,12 @@ kde5_src_prepare() {
# only build examples when required
if ! use_if_iuse examples || ! use examples ; then
- comment_add_subdirectory examples
+ cmake_comment_add_subdirectory examples
fi
# only enable handbook when required
if ! use_if_iuse handbook ; then
- comment_add_subdirectory ${KDE_DOC_DIR}
+ cmake_comment_add_subdirectory ${KDE_DOC_DIR}
if [[ ${KDE_HANDBOOK} = forceoptional ]] ; then
punt_bogus_dep KF5 DocTools
@@ -476,7 +476,7 @@ kde5_src_prepare() {
rm -rf ${lang}
fi
if [[ -e CMakeLists.txt ]] ; then
- comment_add_subdirectory ${lang}
+ cmake_comment_add_subdirectory ${lang}
fi
fi
done
@@ -487,7 +487,7 @@ kde5_src_prepare() {
pushd ${KDE_DOC_DIR} > /dev/null || die
for lang in *; do
if ! has ${lang} ${LINGUAS} ; then
- comment_add_subdirectory ${lang}
+ cmake_comment_add_subdirectory ${lang}
fi
done
popd > /dev/null || die
@@ -498,7 +498,7 @@ kde5_src_prepare() {
# in frameworks, tests = manual tests so never build them
if [[ ${CATEGORY} = kde-frameworks ]]; then
- comment_add_subdirectory tests
+ cmake_comment_add_subdirectory tests
fi
case ${KDE_PUNT_BOGUS_DEPS} in
@@ -518,13 +518,13 @@ kde5_src_prepare() {
if [[ ${KDE_TEST} = forceoptional ]] ; then
punt_bogus_dep Qt5 Test
# if forceoptional, also cover non-kde categories
- comment_add_subdirectory autotests
- comment_add_subdirectory test
- comment_add_subdirectory tests
+ cmake_comment_add_subdirectory autotests
+ cmake_comment_add_subdirectory test
+ cmake_comment_add_subdirectory tests
elif [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma || ${CATEGORY} = kde-apps ]] ; then
- comment_add_subdirectory autotests
- comment_add_subdirectory test
- comment_add_subdirectory tests
+ cmake_comment_add_subdirectory autotests
+ cmake_comment_add_subdirectory test
+ cmake_comment_add_subdirectory tests
fi
fi
}