/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.322 Revision 1.324
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.322 2009/12/11 20:31:34 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.324 2010/01/03 19:57:10 zmedico Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
395} 395}
396epatch_user() { 396epatch_user() {
397 [[ $# -ne 0 ]] && die "epatch_user takes no options" 397 [[ $# -ne 0 ]] && die "epatch_user takes no options"
398 398
399 # don't clobber any EPATCH vars that the parent might want 399 # don't clobber any EPATCH vars that the parent might want
400 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches 400 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
401 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do 401 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
402 EPATCH_SOURCE=${base}/${CTARGET}/${check} 402 EPATCH_SOURCE=${base}/${CTARGET}/${check}
403 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check} 403 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
404 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check} 404 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
405 if [[ -d ${EPATCH_SOURCE} ]] ; then 405 if [[ -d ${EPATCH_SOURCE} ]] ; then
1380 lic="${PWD}/${lic}" 1380 lic="${PWD}/${lic}"
1381 elif [ -e "${lic}" ] ; then 1381 elif [ -e "${lic}" ] ; then
1382 lic="${lic}" 1382 lic="${lic}"
1383 fi 1383 fi
1384 fi 1384 fi
1385 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1386 local l="`basename ${lic}`" 1385 local l="`basename ${lic}`"
1387 1386
1388 # here is where we check for the licenses the user already 1387 # here is where we check for the licenses the user already
1389 # accepted ... if we don't find a match, we make the user accept 1388 # accepted ... if we don't find a match, we make the user accept
1390 local alic 1389 local alic
1394 eshopts_pop 1393 eshopts_pop
1395 return 0 1394 return 0
1396 fi 1395 fi
1397 done 1396 done
1398 eshopts_pop 1397 eshopts_pop
1398 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1399 1399
1400 local licmsg=$(emktemp) 1400 local licmsg=$(emktemp)
1401 cat <<-EOF > ${licmsg} 1401 cat <<-EOF > ${licmsg}
1402 ********************************************************** 1402 **********************************************************
1403 The following license outlines the terms of use of this 1403 The following license outlines the terms of use of this

Legend:
Removed from v.1.322  
changed lines
  Added in v.1.324

  ViewVC Help
Powered by ViewVC 1.1.20