diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-06-04 10:22:33 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-06-04 10:22:33 +0000 |
| commit | 18415daffdd3c105289f107ca0b0432131aa52b1 (patch) | |
| tree | 768aeb14a8122d9fec83515757170c447373f7b0 /eclass | |
| parent | Add pypi to remote-id in metadata.xml (diff) | |
| download | historical-18415daffdd3c105289f107ca0b0432131aa52b1.tar.gz historical-18415daffdd3c105289f107ca0b0432131aa52b1.tar.bz2 historical-18415daffdd3c105289f107ca0b0432131aa52b1.zip | |
Fix homepage url for license registration, #538284; do a precheck instead fo using nonfatal, #551156
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/intel-sdp.eclass | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1c67c3580801..6aaa1981f295 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1637 2015/06/03 22:36:30 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1638 2015/06/04 10:22:33 jlec Exp $ + + 04 Jun 2015; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass: + Fix homepage url for license registration, #538284; do a precheck instead fo + using nonfatal, #551156 03 Jun 2015; Manuel Rüger <mrueg@gentoo.org> kde4-base.eclass: Sync verbosely with overlay. Add support for kde4 localization package diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index f3e76755928e..1f3c1026722a 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.19 2015/01/31 10:16:12 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.20 2015/06/04 10:22:33 jlec Exp $ # @ECLASS: intel-sdp.eclass # @MAINTAINER: @@ -214,7 +214,7 @@ _isdp_big-warning() { echo "" ewarn "Make sure you have received an Intel license." ewarn "To receive a non-commercial license, you need to register at:" - ewarn "http://software.intel.com/en-us/articles/non-commercial-software-development/" + ewarn "https://software.intel.com/en-us/qualify-for-free-software" ewarn "Install the license file into ${INTEL_SDP_EDIR}/licenses/" case ${1} in @@ -445,11 +445,12 @@ intel-sdp_src_install() { fi if [[ -d "${INTEL_SDP_DIR}"/man ]]; then - nonfatal doman "${INTEL_SDP_DIR}"/man/en_US/man1/* - nonfatal doman "${INTEL_SDP_DIR}"/man/man1/* - if has linguas_ja ${IUSE} && use linguas_ja; then + ls "${INTEL_SDP_DIR}"/man/en_US/man1/* &> /dev/null && + doman "${INTEL_SDP_DIR}"/man/en_US/man1/* + ls "${INTEL_SDP_DIR}"/man/man1/* &> /dev/null && + doman "${INTEL_SDP_DIR}"/man/man1/* + has linguas_ja ${IUSE} && use linguas_ja && \ doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/* - fi find "${INTEL_SDP_DIR}"/man -delete || die fi |