app-portage/repoman: fix EPREFIX support

Package-Manager: portage-2.3.0

diff --git a/app-portage/repoman/repoman-2.3.0.ebuild b/app-portage/repoman/repoman-2.3.0.ebuild
index fda70fdfc6ccc791da797f114f8737a948bd2c76..f14164af9a8df372a77b680e95aca088aa458e02 100644 (file)
--- a/app-portage/repoman/repoman-2.3.0.ebuild
+++ b/app-portage/repoman/repoman-2.3.0.ebuild
@@ -48,16 +48,6 @@ python_prepare_all() {
        distutils-r1_python_prepare_all
 
        if [[ -n ${EPREFIX} ]] ; then
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
                einfo "Prefixing shebangs ..."
                while read -r -d $'\0' ; do
                        local shebang=$(head -n1 "$REPLY")

diff --git a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
index fda70fdfc6ccc791da797f114f8737a948bd2c76..f14164af9a8df372a77b680e95aca088aa458e02 100644 (file)
--- a/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
+++ b/app-portage/repoman/repoman-2.3.0_rc1-r1.ebuild
@@ -48,16 +48,6 @@ python_prepare_all() {
        distutils-r1_python_prepare_all
 
        if [[ -n ${EPREFIX} ]] ; then
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
                einfo "Prefixing shebangs ..."
                while read -r -d $'\0' ; do
                        local shebang=$(head -n1 "$REPLY")

diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index af029670d387b6ed21d42f278c54b81e00bba9c3..b790c81e18e2d7f476f69eb7908e49258df73d26 100644 (file)
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -54,16 +54,6 @@ python_prepare_all() {
        distutils-r1_python_prepare_all
 
        if [[ -n ${EPREFIX} ]] ; then
-               einfo "Setting portage.const.EPREFIX ..."
-               sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-                       -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-                       -i pym/portage/const.py || \
-                       die "Failed to patch portage.const.EPREFIX"
-
                einfo "Prefixing shebangs ..."
                while read -r -d $'\0' ; do
                        local shebang=$(head -n1 "$REPLY")