jlec 15/06/04 10:22:33 Modified: ChangeLog intel-sdp.eclass Log: Fix homepage url for license registration, #538284; do a precheck instead fo using nonfatal, #551156
Revision Changes Path 1.1638 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1638&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1638&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1637&r2=1.1638 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1637 retrieving revision 1.1638 diff -u -r1.1637 -r1.1638 --- ChangeLog 3 Jun 2015 22:36:30 -0000 1.1637 +++ ChangeLog 4 Jun 2015 10:22:33 -0000 1.1638 @@ -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 <[email protected]> intel-sdp.eclass: + Fix homepage url for license registration, #538284; do a precheck instead fo + using nonfatal, #551156 03 Jun 2015; Manuel Rüger <[email protected]> kde4-base.eclass: Sync verbosely with overlay. Add support for kde4 localization package 1.20 eclass/intel-sdp.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.20&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.20&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.19&r2=1.20 Index: intel-sdp.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- intel-sdp.eclass 31 Jan 2015 10:16:12 -0000 1.19 +++ intel-sdp.eclass 4 Jun 2015 10:22:33 -0000 1.20 @@ -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 @@ 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 @@ 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
