emerge cleanup: Use portage_const vars instead of automake subst where possible,...

svn path=/main/branches/prefix/; revision=2371

diff --git a/bin/emerge b/bin/emerge
index a265ec3b636a31798b794e90e5a5e9e41f5d41f5..c411d92c03ecd9c594633a629c7f33f8e26ee327 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2053,7 +2053,7 @@ class depgraph:
                                                                                mynewargv += [myarg]
                                                                        else:
                                                                                mynewargv += [arg]
-                                                               os.execv("@PORTAGE_BASE@/bin/emerge", mynewargv)
+                                                               os.execv(portage_const.PORTAGE_BIN_PATH+"/emerge", mynewargv)
 
                        if ("--pretend" not in myopts) and ("--fetchonly" not in myopts) and ("--fetch-all-uri" not in myopts):
                                emergelog(" ::: completed emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[2]+" to "+x[1])
@@ -2905,7 +2905,7 @@ elif "info"==myaction:
                        print "[disabled]"
 
        myvars  = ["sys-devel/autoconf", "sys-devel/automake", "virtual/os-headers",
-                  "sys-devel/binutils", "sys-devel/libtool",  "dev-lang/python"]
+                  "sys-devel/binutils","sys-devel/odcctools" ,"sys-devel/libtool",  "dev-lang/python"]
        myvars += portage_util.grabfile(portage.settings["PORTDIR"]+"/profiles/info_pkgs")
        myvars  = portage_util.unique_array(myvars)
        myvars.sort()
@@ -2935,7 +2935,7 @@ elif "info"==myaction:
        else:
                myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
                          'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR',
-                         'PORTDIR_OVERLAY', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS',
+                         'PORTDIR_OVERLAY', 'PREFIX', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS',
                          'ACCEPT_KEYWORDS', 'SYNC', 'FEATURES']
 
                myvars.extend(portage_util.grabfile(portage.settings["PORTDIR"]+"/profiles/info_vars"))

diff --git a/bin/etc-update b/bin/etc-update
index f7a289ac943dcc9d5eb93de17d982884c52195a9..f1970628f01d1c530c834b80441644a4122483ab 100755 (executable)
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -12,6 +12,8 @@
 
 export PORTAGE_CALLER="etc-update"
 
+eval $(python -c 'import portage_const;print "export PREFIX="+portage_const.PREFIX;print "export PORTAGE_BIN_PATH="+portage_const.PORTAGE_BIN_PATH;')
+
 if type -p gsed >/dev/null ; then
        function sed() { gsed "$@"; }
 fi
@@ -22,7 +24,7 @@ function get_config() {
        # First strip off comment lines, then grab the configuration
        # item. If there's more than one of the same configuration item,
        # then allow the last setting to take precedence.
-       cut -d'#' -f1-1 /etc/etc-update.conf | \
+       cut -d'#' -f1-1 ${PREFIX}/etc/etc-update.conf | \
                sed -ne "s/^ *$item *= *\([\"']\{0,1\}\)\(.*\)\1/\2/p" |sed -e '$p;d'
 }
 
@@ -65,7 +67,7 @@ function scan() {
                                        if [ ! -e "${rpath}/${rfile}" ] || [ ! -e "${rpath}/${rfile:10}" ]; then
                                                MATCHES=0
                                        else
-                                               diff -Bbua ${rpath}/${rfile} ${rpath}/${rfile:10} | @EGREP@ '^[+-]' | @EGREP@ -v '^[+-][\t ]*#|^--- |^\+\+\+ ' | @EGREP@ -qv '^[-+][\t ]*$'
+                                               diff -Bbua ${rpath}/${rfile} ${rpath}/${rfile:10} | ${PREFIX}/bin/grep -E '^[+-]' | ${PREFIX}/bin/grep -E -v '^[+-][\t ]*#|^--- |^\+\+\+ ' | ${PREFIX}/bin/grep -E -qv '^[-+][\t ]*$'
                                                MATCHES=$?
                                        fi
                                elif [[ -z `diff -Nua ${rpath}/${rfile} ${rpath}/${rfile:10}|
@@ -372,15 +374,15 @@ scriptname=$(basename $0)
 
 trap die term
 
-export PORTAGE_TMPDIR=$(/usr/lib/portage/bin/portageq envvar PORTAGE_TMPDIR)
+export PORTAGE_TMPDIR=$(${PORTAGE_BIN_PATH}/portageq envvar PORTAGE_TMPDIR)
 
 TMP="${PORTAGE_TMPDIR}/$$"
 rm -rf ${TMP} 2> /dev/null
 mkdir ${TMP} || die "failed mkdir command!" 1
 
 # I need the CONFIG_PROTECT value
-CONFIG_PROTECT=$(@PORTAGE_BASE@/bin/portageq envvar CONFIG_PROTECT)
-CONFIG_PROTECT_MASK=$(@PORTAGE_BASE@/bin/portageq envvar CONFIG_PROTECT_MASK)
+CONFIG_PROTECT=$(${PORTAGE_BIN_PATH}/portageq envvar CONFIG_PROTECT)
+CONFIG_PROTECT_MASK=$(${PORTAGE_BIN_PATH}/portageq envvar CONFIG_PROTECT_MASK)
 
 # load etc-config's configuration
 EU_AUTOMERGE=`get_config eu_automerge`

diff --git a/pym/portage.py b/pym/portage.py
index ec237f2c4904a3b22557fc794efac8ece1b957fb..b3e7fecaf8d0d36f16f26038fb9580289067b519 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1598,7 +1598,7 @@ class config:
                                pass
 
                elif mykey == "CONFIG_PROTECT_MASK":
-                       match += " /etc/env.d"
+                       match += " "+portage_const.PREFIX+"/etc/env.d"
 
                return match
 

diff --git a/tarball.sh b/tarball.sh
index 4cbacd25c412ce57ea070de332e886a311710d8e..9236d179277f3aa9a916ef1bcff5e4b4f512926f 100755 (executable)
--- a/tarball.sh
+++ b/tarball.sh
@@ -47,6 +47,7 @@ rm -f ${PKG}-${V}/bin/emerge.py ${PKG}-${V}/bin/{pmake,sandbox} ${PKG}-${V}/{bin
 cd $TMP/${PKG}-${V}
 chmod a+x autogen.sh && ./autogen.sh
 rm -f AUTHORS NEWS autogen.sh make-man-tarball.sh tabcheck.py tarball.sh ChangeLog.000 COPYING
-tar cjvf ${TMP}/${PKG}-${V}.tar.bz2 ${TMP}/${PKG}-${V}
-#scp ${TMP}/${PKG}-${V}.tar.bz2 carpaski@twobit.net:/home/html/gentoo/portage/
+cd $TMP
+tar cjvf ${TMP}/${PKG}-${V}.tar.bz2 ${PKG}-${V}
+scp ${TMP}/${PKG}-${V}.tar.bz2 kito@dev.gentoo.org:~/public_html/distfiles/ 
 #scp ${TMP}/${PKG}-${V}.tar.bz2 carpaski@zarquon.twobit.net:/home/www/localhost/htdocs/gentoo/portage/