* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2012-09-16 15:59 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2012-09-16 15:59 UTC (permalink / raw
To: gentoo-commits
jlec 12/09/16 15:59:43
Modified: ChangeLog intel-sdp.eclass
Log:
Add old license jingle until we have fixed the license situation generally
Revision Changes Path
1.401 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.401&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.401&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.400&r2=1.401
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -r1.400 -r1.401
--- ChangeLog 16 Sep 2012 15:08:12 -0000 1.400
+++ ChangeLog 16 Sep 2012 15:59:43 -0000 1.401
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.400 2012/09/16 15:08:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.401 2012/09/16 15:59:43 jlec Exp $
+
+ 16 Sep 2012; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Add old license jingle until we have fixed the license situation generally
16 Sep 2012; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
Added new intel-sdp.eclass
1.2 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.1&r2=1.2
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- intel-sdp.eclass 16 Sep 2012 14:24:40 -0000 1.1
+++ intel-sdp.eclass 16 Sep 2012 15:59:43 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.1 2012/09/16 14:24:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.2 2012/09/16 15:59:43 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -227,6 +227,11 @@
intel-sdp_pkg_postinst() {
+ elog "Make sure you have recieved the an Intel license."
+ elog "To receive a non-commercial license, you need to register at:"
+ elog "http://software.intel.com/en-us/articles/non-commercial-software-development/"
+ elog "Install the license file into ${EROOT}opt/intel/licenses."
+
# add product registry to intel "database"
local l r
for r in ${INTEL_RPMS}; do
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2012-12-05 19:41 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2012-12-05 19:41 UTC (permalink / raw
To: gentoo-commits
jlec 12/12/05 19:41:21
Modified: ChangeLog intel-sdp.eclass
Log:
Add EAPI=5 support; add check for presents of license; handle docs, examples and man page in a more sane way;sort functions and document eclass for man-pages; Drop Sebastion as maintainer
Revision Changes Path
1.544 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.544&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.544&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.543&r2=1.544
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -r1.543 -r1.544
--- ChangeLog 3 Dec 2012 12:05:51 -0000 1.543
+++ ChangeLog 5 Dec 2012 19:41:21 -0000 1.544
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.543 2012/12/03 12:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.544 2012/12/05 19:41:21 jlec Exp $
+
+ 05 Dec 2012; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Add EAPI=5 support; add check for presents of license; handle docs, examples
+ and man page in a more sane way;sort functions and document eclass for
+ man-pages; Drop Sebastion as maintainer
03 Dec 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass,
cmake-utils.eclass:
1.5 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.4&r2=1.5
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- intel-sdp.eclass 20 Sep 2012 13:54:56 -0000 1.4
+++ intel-sdp.eclass 5 Dec 2012 19:41:21 -0000 1.5
@@ -1,10 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.4 2012/09/20 13:54:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.5 2012/12/05 19:41:21 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
-# Sébastien Fabbro <bicatali@gentoo.org>
# Justin Lecher <jlec@gentoo.org>
# Sci Team <sci@gentoo.org>
# @BLURB: Handling of Intel's Software Development Products package management
@@ -76,6 +75,11 @@
#
# e.g. openmp
+# @ECLASS-VARIABLE: INTEL_SDP_DB
+# @DESCRIPTION:
+# Full path to intel registry db
+INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db
+
inherit check-reqs multilib versionator
_INTEL_PV1=$(get_version_component_range 1)
@@ -87,19 +91,19 @@
SRC_URI="
amd64? ( multilib? ( ${_INTEL_URI}_${INTEL_DPV}.tgz ) )
amd64? ( !multilib? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.tgz ) )
- x86? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.tgz )"
+ x86? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.tgz )"
LICENSE="Intel-SDP"
# Future work, #394411
#SLOT="${_INTEL_PV1}.${_INTEL_PV2}"
SLOT="0"
-IUSE="multilib"
+IUSE="examples multilib"
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
RESTRICT="mirror"
RDEPEND=""
-DEPEND=">=app-arch/rpm2targz-9.0.0.3g"
+DEPEND="app-arch/rpm2targz"
_INTEL_SDP_YEAR=${INTEL_DPV%_update*}
_INTEL_SDP_YEAR=${INTEL_DPV%_sp*}
@@ -108,25 +112,18 @@
# @DEFAULT_UNSET
# @DESCRIPTION:
# Full rootless path to installation dir
-
INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}-${_INTEL_SDP_YEAR:-${_INTEL_PV1}}.${_INTEL_PV3}.${_INTEL_PV4}"
# @ECLASS-VARIABLE: INTEL_SDP_EDIR
# @DEFAULT_UNSET
# @DESCRIPTION:
# Full rooted path to installation dir
-
INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}"
S="${WORKDIR}"
QA_PREBUILT="${INTEL_SDP_DIR}/*"
-intel-sdp_pkg_pretend() {
- : ${CHECKREQS_DISK_BUILD:=256M}
- check-reqs_pkg_pretend
-}
-
# @ECLASS-VARIABLE: INTEL_ARCH
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -134,8 +131,162 @@
#
# e.g. amd64-multilib -> INTEL_ARCH="intel64 ia32"
+# @FUNCTION: _isdp_link_eclipse_plugins
+# @INTERNAL
+# @DESCRIPTION:
+# Creating necessary links to use intel compiler with eclipse
+_isdp_link_eclipse_plugins() {
+ local c f
+ pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null
+ for c in cdt*; do
+ local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1))
+ if has_version "dev-util/eclipse-sdk:${ev}"; then
+ einfo "Linking eclipse (v${ev}) plugin cdt (v${cv})"
+ for f in cdt${cv}/eclipse/features/*; do
+ dodir /usr/$(get_libdir)/eclipse-${ev}/features
+ dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \
+ /usr/$(get_libdir)/eclipse-${ev}/features/ || die
+ done
+ for f in cdt${cv}/eclipse/plugins/*; do
+ dodir /usr/$(get_libdir)/eclipse-${ev}/plugins
+ dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \
+ /usr/$(get_libdir)/eclipse-${ev}/plugins/ || die
+ done
+ fi
+ done
+ popd > /dev/null
+}
+
+# @FUNCTION: _isdp_big-warning
+# @USAGE: [pre-check | test-failed]
+# @INTERNAL
+# @DESCRIPTION:
+# warn user that we really require a license
+_isdp_big-warning() {
+ case ${1} in
+ pre-check )
+ echo ""
+ ewarn "License file not found!"
+ ;;
+
+ test-failed )
+ echo
+ ewarn "Function test failed. Most probably due to an invalid license."
+ ewarn "This means you already tried to bypass the license check once."
+ ;;
+ esac
+
+ echo ""
+ ewarn "Make sure you have recieved the 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 "Install the license file into ${INTEL_SDP_EDIR}/licenses/"
+
+ case ${1} in
+ pre-check )
+ ewarn "before proceeding with installation of ${P}"
+ echo ""
+ ;;
+ * )
+ echo ""
+ ;;
+ esac
+}
+
+# @FUNCTION: _isdp_version_test
+# @INTERNAL
+# @DESCRIPTION:
+# Testing for valid license by asking for version information of the compiler
+_isdp_version_test() {
+ local comp comp_full arch warn
+ case ${PN} in
+ ifc )
+ debug-print "Testing ifort"
+ comp=ifort
+ ;;
+ icc )
+ debug-print "Testing icc"
+ comp=icc
+ ;;
+ *)
+ die "${PN} is not supported for testing"
+ ;;
+ esac
+
+ for arch in ${INTEL_ARCH}; do
+ case ${EBUILD_PHASE} in
+ install )
+ comp_full="${ED}/${INTEL_SDP_DIR}/bin/${arch}/${comp}"
+ ;;
+ postinst )
+ comp_full="${INTEL_SDP_EDIR}/bin/${arch}/${comp}"
+ ;;
+ * )
+ ewarn "Compile test not supported in ${EBUILD_PHASE}"
+ continue
+ ;;
+ esac
+
+ debug-print "LD_LIBRARY_PATH=\"${INTEL_SDP_EDIR}/bin/${arch}/\" \"${comp_full}\" -V"
+
+ LD_LIBRARY_PATH="${INTEL_SDP_EDIR}/bin/${arch}/" "${comp_full}" -V &>/dev/null
+ [[ $? -ne 0 ]] && warn=yes
+ done
+ [[ "${warn}" == "yes" ]] && _isdp_big-warning test-failed
+}
+
+# @FUNCTION: _isdp_run-test
+# @INTERNAL
+# Test if installed compiler is working
+_isdp_run-test() {
+ case ${PN} in
+ ifc | icc )
+ _isdp_version_test ;;
+ * )
+ debug-print "No test available for ${PN}"
+ ;;
+ esac
+}
+
+# @FUNCTION: intel-sdp_pkg_pretend
+# @DESCRIPTION:
+# @CODE
+# * Check that the user has a (valid) license file before going on.
+# * Check for space requirements being fullfilled
+# @CODE
+intel-sdp_pkg_pretend() {
+ local warn=1 dir dirs ret arch a p
+
+ : ${CHECKREQS_DISK_BUILD:=256M}
+ check-reqs_pkg_pretend
+
+ dirs=(
+ "${INTEL_SDP_EDIR}/licenses"
+ "${INTEL_SDP_EDIR}/Licenses"
+ "${EPREFIX}/opt/intel/licenses"
+ )
+ for dir in "${dirs[@]}" ; do
+ ebegin "Checking for a license in: ${dir}"
+ #maybe use nullglob or [[ $(echo ${dir/*lic) != "${dir}/*lic" ]]
+ [[ $( ls "${dir}"/*lic 2>/dev/null ) ]]; ret=$?
+ eend ${ret}
+ if [[ ${ret} == "0" ]]; then
+ warn=${ret}
+ break
+ fi
+ done
+ if [[ ${warn} == "1" ]]; then
+ _isdp_big-warning pre-check
+ die "Could not find license file"
+ fi
+}
+
+# @FUNCTION: intel-sdp_pkg_setup
+# @DESCRIPTION:
+# Setting up and sorting some internal variables
intel-sdp_pkg_setup() {
local arch a p
+
if use x86; then
arch=${INTEL_X86}
INTEL_ARCH="ia32"
@@ -150,11 +301,11 @@
INTEL_RPMS=""
for p in ${INTEL_BIN_RPMS}; do
for a in ${arch}; do
- INTEL_RPMS="${INTEL_RPMS} intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm"
+ INTEL_RPMS+=" intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm"
done
done
for p in ${INTEL_DAT_RPMS}; do
- INTEL_RPMS="${INTEL_RPMS} intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm"
+ INTEL_RPMS+=" intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm"
done
case "${EAPI:-0}" in
@@ -162,75 +313,91 @@
esac
}
+# @FUNCTION: intel-sdp_src_unpack
+# @DESCRIPTION:
+# Unpacking necessary rpms from tarball, extract them and rearrange the output.
intel-sdp_src_unpack() {
- local l r t rpmdir
+ local l r subdir rb t list=()
+
for t in ${A}; do
for r in ${INTEL_RPMS}; do
- # Find which subdirectory of the archive the rpm is in
- rpm_found="false"
for subdir in ${INTEL_RPMS_DIRS}; do
- [[ "${rpm_found}" == "true" ]] && continue
rpmdir=${t%%.*}/${subdir}
- l=.${r}_$(date +'%d%m%y_%H%M%S').log
- tar xf "${DISTDIR}"/${t} ${rpmdir}/${r} 2> /dev/null || continue
- einfo "Unpacking ${r}"
- rpm_found="true"
- rpm2tar -O "./${rpmdir}/${r}" | tar xvf - | sed -e \
- "s:^\.:${EROOT#/}:g" > ${l} || die "unpacking ${r} failed"
- mv ${l} opt/intel/ || die "failed moving extract log file"
+ list+=( ${rpmdir}/${r})
done
done
+ tar xf "${DISTDIR}"/${t} ${list[@]} 2> /dev/null || die
+ for r in ${list[@]}; do
+ rb=$(basename ${r})
+ l=.${rb}_$(date +'%d%m%y_%H%M%S').log
+ einfo "Unpacking ${rb}"
+ rpm2tar -O ${r} | tar xvf - | sed -e \
+ "s:^\.:${EROOT#/}:g" > ${l} || die "unpacking ${r} failed"
+ mv ${l} opt/intel/ || die "failed moving extract log file"
+ done
done
- mv -v opt/intel/* ${INTEL_SDP_DIR} || die "mv to INTEL_SDP_DIR failed"
-}
-intel_link_eclipse_plugins() {
- pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null
- local c f
- for c in cdt*; do
- local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1))
- if has_version "dev-util/eclipse-sdk:${ev}"; then
- einfo "Linking eclipse (v${ev}) plugin cdt (v${cv})"
- for f in cdt${cv}/eclipse/features/*; do
- dodir /usr/$(get_libdir)/eclipse-${ev}/features
- dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \
- /usr/$(get_libdir)/eclipse-${ev}/features/ || die
- done
- for f in cdt${cv}/eclipse/plugins/*; do
- dodir /usr/$(get_libdir)/eclipse-${ev}/plugins
- dosym "${INTEL_SDP_EDIR}"/eclipse_support/${f} \
- /usr/$(get_libdir)/eclipse-${ev}/plugins/ || die
- done
- fi
- done
- popd > /dev/null
+ mv opt/intel/* ${INTEL_SDP_DIR} || die "mv to INTEL_SDP_DIR failed"
}
+# @FUNCTION: intel-sdp_src_install
+# @DESCRIPTION:
+# Install everything
intel-sdp_src_install() {
- [[ -d ${INTEL_SDP_DIR}/eclipse_support ]] && \
- has eclipse ${IUSE} && \
- use eclipse && \
- intel_link_eclipse_plugins
- einfo "Tagging ${PN}"
+ if [[ -d "${INTEL_SDP_DIR}"/Documentation ]]; then
+ dodoc -r "${INTEL_SDP_DIR}"/Documentation/*
+
+ ebegin "Cleaning out documentation"
+ find "${INTEL_SDP_DIR}"/Documentation -delete || die
+ eend
+ fi
+
+ if [[ -d "${INTEL_SDP_DIR}"/Samples ]]; then
+ if use examples ; 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
+ fi
+
+ if [[ -d "${INTEL_SDP_DIR}"/eclipse_support ]]; then
+ if has eclipse ${IUSE} && use eclipse; then
+ _isdp_link_eclipse_plugins
+ else
+ ebegin "Cleaning out eclipse plugin"
+ find "${INTEL_SDP_DIR}"/eclipse_support -delete || die
+ eend
+ fi
+ fi
+
+ if [[ -d "${INTEL_SDP_DIR}"/man ]]; then
+ doman "${INTEL_SDP_DIR}"/man/en_US/man1/*
+ if has linguas_ja ${IUSE} && use linguas_ja; then
+ doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/*
+ fi
+
+ find "${INTEL_SDP_DIR}"/man -delete || die
+ fi
+
+ ebegin "Tagging ${PN}"
find opt -name \*sh -type f -exec sed -i \
-e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \
- '{}' \;
- mkdir -p "${ED:-${D}}"/ || die
- mv opt "${ED:-${D}}"/ || die "moving files failed"
-}
+ '{}' + || die
+ eend
+ [[ -d "${ED}" ]] || dodir /
+ mv opt "${ED}"/ || die "moving files failed"
-# @ECLASS-VARIABLE: INTEL_SDP_DB
-# @DESCRIPTION:
-# Full path to intel registry db
-INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db
+ dodir "${INTEL_SDP_EDIR}"/licenses
+ keepdir "${INTEL_SDP_EDIR}"/licenses
+}
+# @FUNCTION: intel-sdp_pkg_postinst
+# @DESCRIPTION:
+# Add things to intel database
intel-sdp_pkg_postinst() {
- elog "Make sure you have recieved the an Intel license."
- elog "To receive a non-commercial license, you need to register at:"
- elog "http://software.intel.com/en-us/articles/non-commercial-software-development/"
- elog "Install the license file into ${EROOT}opt/intel/licenses."
-
# add product registry to intel "database"
local l r
for r in ${INTEL_RPMS}; do
@@ -238,8 +405,12 @@
echo >> ${INTEL_SDP_DB} \
"<:${r%-${_INTEL_PV4}*}-${_INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>"
done
+ _isdp_run-test
}
+# @FUNCTION: intel-sdp_pkg_postrm
+# @DESCRIPTION:
+# Sanitize intel database
intel-sdp_pkg_postrm() {
# remove from intel "database"
if [[ -e ${INTEL_SDP_DB} ]]; then
@@ -255,6 +426,6 @@
EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm
case "${EAPI:-0}" in
0|1|2|3) ;;
- 4) EXPORT_FUNCTIONS pkg_pretend ;;
+ 4|5) EXPORT_FUNCTIONS pkg_pretend ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2013-02-14 8:17 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2013-02-14 8:17 UTC (permalink / raw
To: gentoo-commits
jlec 13/02/14 08:17:35
Modified: ChangeLog intel-sdp.eclass
Log:
Drop KEYWORDS from eclass, #342185
Revision Changes Path
1.676 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.676&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.676&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.675&r2=1.676
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -r1.675 -r1.676
--- ChangeLog 12 Feb 2013 12:59:45 -0000 1.675
+++ ChangeLog 14 Feb 2013 08:17:35 -0000 1.676
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.675 2013/02/12 12:59:45 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.676 2013/02/14 08:17:35 jlec Exp $
+
+ 14 Feb 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Drop KEYWORDS from eclass, #342185
12 Feb 2013; Michael Haubenwallner <haubi@gentoo.org>
ELT-patches/aixrtl/1.5.0-cmds-c:
1.10 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.9&r2=1.10
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- intel-sdp.eclass 23 Jan 2013 11:14:33 -0000 1.9
+++ intel-sdp.eclass 14 Feb 2013 08:17:35 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.9 2013/01/23 11:14:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.10 2013/02/14 08:17:35 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -98,7 +98,6 @@
#SLOT="${_INTEL_PV1}.${_INTEL_PV2}"
SLOT="0"
IUSE="examples multilib"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
RESTRICT="mirror"
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2013-02-14 16:29 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2013-02-14 16:29 UTC (permalink / raw
To: gentoo-commits
jlec 13/02/14 16:29:00
Modified: ChangeLog intel-sdp.eclass
Log:
Make it possible to bypass license check from ebuilds
Revision Changes Path
1.677 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.677&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.677&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.676&r2=1.677
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.676
retrieving revision 1.677
diff -u -r1.676 -r1.677
--- ChangeLog 14 Feb 2013 08:17:35 -0000 1.676
+++ ChangeLog 14 Feb 2013 16:29:00 -0000 1.677
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.676 2013/02/14 08:17:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.677 2013/02/14 16:29:00 jlec Exp $
+
+ 14 Feb 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Make it possible to bypass license check from ebuilds
14 Feb 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
Drop KEYWORDS from eclass, #342185
1.11 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.10&r2=1.11
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- intel-sdp.eclass 14 Feb 2013 08:17:35 -0000 1.10
+++ intel-sdp.eclass 14 Feb 2013 16:29:00 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.10 2013/02/14 08:17:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.11 2013/02/14 16:29:00 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -47,6 +47,12 @@
# The package sub-directory where it will end-up in /opt/intel
# To find out its value, you have to do a raw install from the Intel tar ball
+# @ECLASS-VARIABLE: INTEL_SKIP_LICENSE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Possibility to skip the mandatory check for licenses. Only set this if there
+# is really no fix.
+
# @ECLASS-VARIABLE: INTEL_RPMS_DIRS
# @DESCRIPTION:
# List of subdirectories in the main archive which contains the
@@ -238,13 +244,15 @@
# @INTERNAL
# Test if installed compiler is working
_isdp_run-test() {
- case ${PN} in
- ifc | icc )
- _isdp_version_test ;;
- * )
- debug-print "No test available for ${PN}"
- ;;
- esac
+ if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
+ case ${PN} in
+ ifc | icc )
+ _isdp_version_test ;;
+ * )
+ debug-print "No test available for ${PN}"
+ ;;
+ esac
+ fi
}
# @FUNCTION: intel-sdp_pkg_pretend
@@ -259,30 +267,35 @@
: ${CHECKREQS_DISK_BUILD:=256M}
check-reqs_pkg_pretend
- if echo ${INTEL_LICENSE_FILE} | grep -q @; then
- einfo "Looks like you are using following license server:"
- einfo " ${INTEL_LICENSE_FILE}"
- return 0
- fi
+ if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
+ if echo ${INTEL_LICENSE_FILE} | grep -q @; then
+ einfo "Looks like you are using following license server:"
+ einfo " ${INTEL_LICENSE_FILE}"
+ return 0
+ fi
- dirs=(
- "${INTEL_SDP_EDIR}/licenses"
- "${INTEL_SDP_EDIR}/Licenses"
- "${EPREFIX}/opt/intel/licenses"
- )
- for dir in "${dirs[@]}" ; do
- ebegin "Checking for a license in: ${dir}"
- #maybe use nullglob or [[ $(echo ${dir/*lic) != "${dir}/*lic" ]]
- [[ $( ls "${dir}"/*lic 2>/dev/null ) ]]; ret=$?
- eend ${ret}
- if [[ ${ret} == "0" ]]; then
- warn=${ret}
- break
+ dirs=(
+ "${INTEL_SDP_EDIR}/licenses"
+ "${INTEL_SDP_EDIR}/Licenses"
+ "${EPREFIX}/opt/intel/licenses"
+ )
+ for dir in "${dirs[@]}" ; do
+ ebegin "Checking for a license in: ${dir}"
+ #maybe use nullglob or [[ $(echo ${dir/*lic) != "${dir}/*lic" ]]
+ [[ $( ls "${dir}"/*lic 2>/dev/null ) ]]; ret=$?
+ eend ${ret}
+ if [[ ${ret} == "0" ]]; then
+ warn=${ret}
+ break
+ fi
+ done
+ if [[ ${warn} == "1" ]]; then
+ _isdp_big-warning pre-check
+ die "Could not find license file"
fi
- done
- if [[ ${warn} == "1" ]]; then
- _isdp_big-warning pre-check
- die "Could not find license file"
+ else
+ eqawarn "The ebuild doesn't check for a license!"
+ eqawarn "This shouldn't be done unless there is a serious reason."
fi
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2014-02-21 16:07 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2014-02-21 16:07 UTC (permalink / raw
To: gentoo-commits
jlec 14/02/21 16:07:25
Modified: ChangeLog intel-sdp.eclass
Log:
Make problems with man page installation nonfatal
Revision Changes Path
1.1143 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1143&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1143&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1142&r2=1.1143
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1142
retrieving revision 1.1143
diff -u -r1.1142 -r1.1143
--- ChangeLog 11 Feb 2014 21:14:20 -0000 1.1142
+++ ChangeLog 21 Feb 2014 16:07:25 -0000 1.1143
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1142 2014/02/11 21:14:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1143 2014/02/21 16:07:25 jlec Exp $
+
+ 21 Feb 2014; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Make problems with man page installation nonfatal
11 Feb 2014; Pacho Ramos <pacho@gentoo.org> gnome2.eclass:
Pass --docdir with proper directory, bug #482646
1.17 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.16&r2=1.17
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- intel-sdp.eclass 20 Feb 2014 09:47:09 -0000 1.16
+++ intel-sdp.eclass 21 Feb 2014 16:07:25 -0000 1.17
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.16 2014/02/20 09:47:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.17 2014/02/21 16:07:25 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -435,7 +435,8 @@
fi
if [[ -d "${INTEL_SDP_DIR}"/man ]]; then
- doman "${INTEL_SDP_DIR}"/man/en_US/man1/*
+ 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
doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/*
fi
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2014-09-15 17:54 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2014-09-15 17:54 UTC (permalink / raw
To: gentoo-commits
jlec 14/09/15 17:54:11
Modified: ChangeLog intel-sdp.eclass
Log:
Allow RPMS specified as array
Revision Changes Path
1.1369 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1369&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1369&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1368&r2=1.1369
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1368
retrieving revision 1.1369
diff -u -r1.1368 -r1.1369
--- ChangeLog 11 Sep 2014 22:10:35 -0000 1.1368
+++ ChangeLog 15 Sep 2014 17:54:11 -0000 1.1369
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1368 2014/09/11 22:10:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1369 2014/09/15 17:54:11 jlec Exp $
+
+ 15 Sep 2014; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Allow RPMS specified as array
11 Sep 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+mozconfig-v4.31.eclass, -mozconfig-v4.eclass:
1.18 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.17&r2=1.18
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- intel-sdp.eclass 21 Feb 2014 16:07:25 -0000 1.17
+++ intel-sdp.eclass 15 Sep 2014 17:54:11 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.17 2014/02/21 16:07:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.18 2014/09/15 17:54:11 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -348,7 +348,12 @@
fi
INTEL_RPMS=()
INTEL_RPMS_FULL=()
- for p in ${INTEL_BIN_RPMS}; do
+ if [[ $(declare -p INTEL_BIN_RPMS) = "declare -a "* ]] ; then
+ _INTEL_BIN_RPMS=( ${INTEL_BIN_RPMS[@]} )
+ else
+ read -r -d '' -a _INTEL_BIN_RPMS <<<"${INTEL_BIN_RPMS}"
+ fi
+ for p in "${_INTEL_BIN_RPMS[@]}"; do
for a in ${arch}; do
if [ ${p} == $(basename ${p}) ]; then
INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.${a}.rpm )
@@ -357,7 +362,12 @@
fi
done
done
- for p in ${INTEL_DAT_RPMS}; do
+ if [[ $(declare -p INTEL_DAT_RPMS) = "declare -a "* ]] ; then
+ _INTEL_DAT_RPMS=( ${INTEL_DAT_RPMS[@]} )
+ else
+ read -r -d '' -a _INTEL_DAT_RPMS <<<"${INTEL_DAT_RPMS}"
+ fi
+ for p in "${_INTEL_DAT_RPMS[@]}"; do
if [ ${p} == $(basename ${p}) ]; then
INTEL_RPMS+=( intel-${p}-${_INTEL_PV4}-${_INTEL_PV1}.${_INTEL_PV2}-${_INTEL_PV3}.noarch.rpm )
else
@@ -373,12 +383,12 @@
local l r subdir rb t list=() debug_list
for t in ${A}; do
- for r in ${INTEL_RPMS[@]}; do
+ for r in "${INTEL_RPMS[@]}"; do
rpmdir=${t%%.*}/${INTEL_RPMS_DIR}
list+=( ${rpmdir}/${r} )
done
- for r in ${INTEL_RPMS_FULL[@]}; do
+ for r in "${INTEL_RPMS_FULL[@]}"; do
list+=( ${t%%.*}/${r} )
done
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2015-01-31 10:16 Jeroen Roovers (jer)
0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers (jer) @ 2015-01-31 10:16 UTC (permalink / raw
To: gentoo-commits
jer 15/01/31 10:16:12
Modified: ChangeLog intel-sdp.eclass
Log:
Spelling.
Revision Changes Path
1.1519 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1519&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1519&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1518&r2=1.1519
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1518
retrieving revision 1.1519
diff -u -r1.1518 -r1.1519
--- ChangeLog 31 Jan 2015 02:49:39 -0000 1.1518
+++ ChangeLog 31 Jan 2015 10:16:12 -0000 1.1519
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1518 2015/01/31 02:49:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1519 2015/01/31 10:16:12 jer Exp $
+
+ 31 Jan 2015; Jeroen Roovers <jer@gentoo.org> intel-sdp.eclass:
+ Spelling.
31 Jan 2015; Patrick Lauer <patrick@gentoo.org> distutils-r1.eclass:
Fix for setuptools failures #534058 etc.
1.19 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.18&r2=1.19
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- intel-sdp.eclass 15 Sep 2014 17:54:11 -0000 1.18
+++ intel-sdp.eclass 31 Jan 2015 10:16:12 -0000 1.19
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.18 2014/09/15 17:54:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.19 2015/01/31 10:16:12 jer Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -212,7 +212,7 @@
esac
echo ""
- ewarn "Make sure you have recieved the an Intel license."
+ 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 "Install the license file into ${INTEL_SDP_EDIR}/licenses/"
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2015-06-04 10:22 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2015-06-04 10:22 UTC (permalink / raw
To: gentoo-commits
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 <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
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
@ 2015-06-15 19:09 Justin Lecher (jlec)
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher (jlec) @ 2015-06-15 19:09 UTC (permalink / raw
To: gentoo-commits
jlec 15/06/15 19:09:28
Modified: ChangeLog intel-sdp.eclass
Log:
Don't install uninstall informations, bug 551638; make use of path_exists()
Revision Changes Path
1.1664 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1664&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1664&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1663&r2=1.1664
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1663
retrieving revision 1.1664
diff -u -r1.1663 -r1.1664
--- ChangeLog 15 Jun 2015 14:04:44 -0000 1.1663
+++ ChangeLog 15 Jun 2015 19:09:28 -0000 1.1664
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1663 2015/06/15 14:04:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1664 2015/06/15 19:09:28 jlec Exp $
+
+ 15 Jun 2015; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
+ Don't install uninstall informations, bug 551638; make use of path_exists()
15 Jun 2015; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass:
Fix SRC_URI for 4.14.3
1.22 eclass/intel-sdp.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.21&r2=1.22
Index: intel-sdp.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- intel-sdp.eclass 4 Jun 2015 10:36:27 -0000 1.21
+++ intel-sdp.eclass 15 Jun 2015 19:09:28 -0000 1.22
@@ -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.21 2015/06/04 10:36:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.22 2015/06/15 19:09:28 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -416,7 +416,13 @@
# @DESCRIPTION:
# Install everything
intel-sdp_src_install() {
- if [[ -d "${INTEL_SDP_DIR}"/Documentation ]]; then
+ if path_exists "${INTEL_SDP_DIR}"/uninstall*; then
+ ebegin "Cleaning out uninstall information"
+ find "${INTEL_SDP_DIR}"/uninstall* -delete || die
+ eend
+ fi
+
+ if path_exists "${INTEL_SDP_DIR}"/Documentation; then
dodoc -r "${INTEL_SDP_DIR}"/Documentation/*
ebegin "Cleaning out documentation"
@@ -424,7 +430,7 @@
eend
fi
- if [[ -d "${INTEL_SDP_DIR}"/Samples ]]; then
+ if path_exists "${INTEL_SDP_DIR}"/Samples; then
if use examples ; then
insinto /usr/share/${P}/examples/
doins -r "${INTEL_SDP_DIR}"/Samples/*
@@ -434,7 +440,7 @@
eend
fi
- if [[ -d "${INTEL_SDP_DIR}"/eclipse_support ]]; then
+ if path_exists "${INTEL_SDP_DIR}"/eclipse_support; then
if has eclipse ${IUSE} && use eclipse; then
_isdp_link_eclipse_plugins
else
@@ -444,7 +450,7 @@
fi
fi
- if [[ -d "${INTEL_SDP_DIR}"/man ]]; then
+ if path_exists "${INTEL_SDP_DIR}"/man; then
path_exists "${INTEL_SDP_DIR}"/man/en_US/man1/* && \
doman "${INTEL_SDP_DIR}"/man/en_US/man1/*
path_exists "${INTEL_SDP_DIR}"/man/man1/* && \
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-06-15 19:09 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-16 15:59 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2012-12-05 19:41 Justin Lecher (jlec)
2013-02-14 8:17 Justin Lecher (jlec)
2013-02-14 16:29 Justin Lecher (jlec)
2014-02-21 16:07 Justin Lecher (jlec)
2014-09-15 17:54 Justin Lecher (jlec)
2015-01-31 10:16 Jeroen Roovers (jer)
2015-06-04 10:22 Justin Lecher (jlec)
2015-06-15 19:09 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox