Kill of generation of CDEPEND for binary and installed packages.

Patch by solar.

svn path=/main/trunk/; revision=2321

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 80d915a4bb481fabb4b6e5e90bcc57db4580fb28..d6609722320ebfe7ad8ae99c2057cb78e4aec588 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -922,7 +922,6 @@ dyn_compile() {
        echo "$CATEGORY"       > CATEGORY
        echo "$CBUILD"         > CBUILD
        echo "$CC"             > CC
-       echo "$CDEPEND"        > CDEPEND
        echo "$CFLAGS"         > CFLAGS
        echo "$CHOST"          > CHOST
        echo "$CTARGET"        > CTARGET
@@ -1500,7 +1499,6 @@ inherit() {
        local B_IUSE
        local B_DEPEND
        local B_RDEPEND
-       local B_CDEPEND
        local B_PDEPEND
        while [ "$1" ]; do
                location="${ECLASSDIR}/${1}.eclass"
@@ -1537,13 +1535,12 @@ inherit() {
                set -f
 
                # Retain the old data and restore it later.
-               unset B_IUSE B_DEPEND B_RDEPEND B_CDEPEND B_PDEPEND
+               unset B_IUSE B_DEPEND B_RDEPEND B_PDEPEND
                [ "${IUSE-unset}"    != "unset" ] && B_IUSE="${IUSE}"
                [ "${DEPEND-unset}"  != "unset" ] && B_DEPEND="${DEPEND}"
                [ "${RDEPEND-unset}" != "unset" ] && B_RDEPEND="${RDEPEND}"
-               [ "${CDEPEND-unset}" != "unset" ] && B_CDEPEND="${CDEPEND}"
                [ "${PDEPEND-unset}" != "unset" ] && B_PDEPEND="${PDEPEND}"
-               unset   IUSE   DEPEND   RDEPEND   CDEPEND   PDEPEND
+               unset IUSE DEPEND RDEPEND PDEPEND
                #turn on glob expansion
                set +f
                
@@ -1558,7 +1555,6 @@ inherit() {
                [ "${IUSE-unset}"    != "unset" ] && export E_IUSE="${E_IUSE} ${IUSE}"
                [ "${DEPEND-unset}"  != "unset" ] && export E_DEPEND="${E_DEPEND} ${DEPEND}"
                [ "${RDEPEND-unset}" != "unset" ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}"
-               [ "${CDEPEND-unset}" != "unset" ] && export E_CDEPEND="${E_CDEPEND} ${CDEPEND}"
                [ "${PDEPEND-unset}" != "unset" ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}"
 
                [ "${B_IUSE-unset}"    != "unset" ] && IUSE="${B_IUSE}"
@@ -1570,9 +1566,6 @@ inherit() {
                [ "${B_RDEPEND-unset}" != "unset" ] && RDEPEND="${B_RDEPEND}"
                [ "${B_RDEPEND-unset}" != "unset" ] || unset RDEPEND
 
-               [ "${B_CDEPEND-unset}" != "unset" ] && CDEPEND="${B_CDEPEND}"
-               [ "${B_CDEPEND-unset}" != "unset" ] || unset CDEPEND
-
                [ "${B_PDEPEND-unset}" != "unset" ] && PDEPEND="${B_PDEPEND}"
                [ "${B_PDEPEND-unset}" != "unset" ] || unset PDEPEND
 
@@ -1640,11 +1633,6 @@ newrdepend() {
        do_newdepend RDEPEND $1
 }
 
-newcdepend() {
-       debug-print-function newcdepend $*
-       do_newdepend CDEPEND $1
-}
-
 newpdepend() {
        debug-print-function newpdepend $*
        do_newdepend PDEPEND $1
@@ -1759,7 +1747,7 @@ fi # "$*"!="depend" && "$*"!="clean" && "$*" != "setup"
 export SANDBOX_ON="1"
 export S=${WORKDIR}/${P}
 
-unset E_IUSE E_DEPEND E_RDEPEND E_CDEPEND E_PDEPEND
+unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
 
 for x in T P PN PV PVR PR A EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do
        [[ ${!x-UNSET_VAR} != UNSET_VAR ]] && declare -r ${x}
@@ -1848,15 +1836,14 @@ fi
 IUSE="$IUSE $E_IUSE"
 DEPEND="$DEPEND $E_DEPEND"
 RDEPEND="$RDEPEND $E_RDEPEND"
-CDEPEND="$CDEPEND $E_CDEPEND"
 PDEPEND="$PDEPEND $E_PDEPEND"
 
-unset E_IUSE E_DEPEND E_RDEPEND E_CDEPEND E_PDEPEND
+unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND
 
 if [ "${EBUILD_PHASE}" != "depend" ]; then
        # Lock the dbkey variables after the global phase
        declare -r DEPEND RDEPEND SLOT SRC_URI RESTRICT HOMEPAGE LICENSE DESCRIPTION
-       declare -r KEYWORDS INHERITED IUSE CDEPEND PDEPEND PROVIDE
+       declare -r KEYWORDS INHERITED IUSE PDEPEND PROVIDE
 fi
 
 set +f
@@ -1949,7 +1936,7 @@ for myarg in $*; do
                echo `echo "$KEYWORDS"`    >> $dbkey
                echo `echo "$INHERITED"`   >> $dbkey
                echo `echo "$IUSE"`        >> $dbkey
-               echo `echo "$CDEPEND"`     >> $dbkey
+               echo                       >> $dbkey
                echo `echo "$PDEPEND"`     >> $dbkey
                echo `echo "$PROVIDE"`     >> $dbkey
                echo `echo "${EAPI:-0}"`   >> $dbkey

diff --git a/bin/portageq b/bin/portageq
index d01282a437504a9b5d698bf3eadfe8178876c4d9..9b1d682fc1166669da783b714e747e1341a71824 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -239,7 +239,7 @@ def usage(argv):
 
 def main():
        if (len(sys.argv) < 2):
-               usage()
+               usage(sys.argv)
                sys.exit()
        
        cmd = sys.argv[1]