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 1B125138202 for ; Tue, 27 Nov 2012 19:35:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8A0EE05B4; Tue, 27 Nov 2012 19:34:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62AC7E05B4 for ; Tue, 27 Nov 2012 19:34:02 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7279333D96D for ; Tue, 27 Nov 2012 19:33:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 19F56E5436 for ; Tue, 27 Nov 2012 19:33:53 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1354044740.aaf8c43554e77bc06aa9c2ba99777b9e787ad17d.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/intel-sdp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: aaf8c43554e77bc06aa9c2ba99777b9e787ad17d X-VCS-Branch: master Date: Tue, 27 Nov 2012 19:33:53 +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: 27926613-3b3c-43de-b90f-8c4ee24288e2 X-Archives-Hash: d0cc2410169ab337f0eaa5aa42ee8439 commit: aaf8c43554e77bc06aa9c2ba99777b9e787ad17d Author: Justin Lecher gentoo org> AuthorDate: Tue Nov 27 19:32:20 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Nov 27 19:32:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aaf8c435 Drop USE=doc and add static-libs support Implementing suggestion from g-dev review. * Dropping USE=doc and rely on FEATURES=nodoc * Use LINGUAS USE_EXAND for detection of japanese Signed-off-by: Justin Lecher gentoo.org> --- eclass/intel-sdp.eclass | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 71fe219..a3942ff 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -97,7 +97,7 @@ LICENSE="Intel-SDP" # Future work, #394411 #SLOT="${_INTEL_PV1}.${_INTEL_PV2}" SLOT="0" -IUSE="doc examples multilib" +IUSE="examples multilib static-libs" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" RESTRICT="mirror" @@ -326,16 +326,20 @@ intel-sdp_src_unpack() { # @DESCRIPTION: # Install everything intel-sdp_src_install() { - if ! use doc && [[ -d "${INTEL_SDP_DIR}"/Documentation ]]; then - ebegin "Cleaning out documentation" - find "${INTEL_SDP_DIR}"/Documentation -delete || die - eend - fi - if ! use examples && [[ -d "${INTEL_SDP_DIR}"/Samples ]]; then - ebegin "Cleaning out examples" - find "${INTEL_SDP_DIR}"/Samples -delete || die - eend + dodoc -r "${INTEL_SDP_DIR}"/Documentation/* + + ebegin "Cleaning out documentation" + find "${INTEL_SDP_DIR}"/Documentation -delete || die + eend + + if use examples && [[ -d "${INTEL_SDP_DIR}"/Samples ]]; then + insinto /usr/share/${P}/examples/ + doins -r "${INTEL_SDP_DIR}"/Samples/* fi + ebegin "Cleaning out examples" + find "${INTEL_SDP_DIR}"/Samples -delete || die + eend + if [[ -d "${INTEL_SDP_DIR}"/eclipse_support ]]; then if has eclipse ${IUSE} && use eclipse; then intel_link_eclipse_plugins @@ -348,16 +352,20 @@ intel-sdp_src_install() { if [[ -d "${INTEL_SDP_DIR}"/man ]]; then doman "${INTEL_SDP_DIR}"/man/en_US/man1/* - [[ ${LINGUAS} == "*ja_JP*" ]] && \ + use linguas_ja && \ doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/* find "${INTEL_SDP_DIR}"/man -delete || die fi - einfo "Tagging ${PN}" + use statc-libs || \ + find opt -type f -name "*.a" -delete || die + + ebegin "Tagging ${PN}" find opt -name \*sh -type f -exec sed -i \ -e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \ '{}' + || die + eend [[ -d "${ED}" ]] || dodir / mv opt "${ED}"/ || die "moving files failed"