diff --git a/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh b/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh
index c1090d0..334fbfb 100644
--- a/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh
+++ b/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh
@@ -10,7 +10,7 @@ NEW_BRANCH=$4
 echo -e "
 >> requirements for this branch:
    app-admin/eselect-python
-   sys-devel/base-gcc:4.6
+   sys-devel/base-gcc:<latest>
 >> Entropy post-upgrade migration script
 >> Repository: "${REPO_ID}"
 >> Root: "${ROOT}"
@@ -58,12 +58,6 @@ fix_lib64_symlinks() {
 	fi
 }
 
-latest_gcc_profile() {
-    local gcc_dir="/etc/env.d/gcc"
-    local latest=$(ls -1 ${gcc_dir}/$(uname -m)* | sort | tail -n 1 2> /dev/null)
-    [[ -n "${latest}" ]] && echo $(basename "${latest}")
-}
-
 three_four_to_five() {
 
     local rc=0
@@ -86,18 +80,6 @@ three_four_to_five() {
         rc=1
     fi
 
-    ## sys-devel/base-gcc:LATEST must be forced using
-    ## packages.db.system_mask inside repository db dir
-    c_profile=$(latest_gcc_profile)
-    if [ -n "${c_profile}" ]; then
-        gcc-config "${c_profile}"
-        # update env
-        env-update
-    else
-        echo "gcc-config unable to set new profile: not detected"
-        rc=1
-    fi
-
     # set proper eselect esd engine
     if [ -f "${ROOT}/usr/bin/esdcompat" ]; then
         eselect esd list | grep PulseAudio | cut -d"[" -f 2 | \
diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.post_upgrade.sh b/conf/intel/repo/sabayonlinux.org/packages.db.post_upgrade.sh
index c1090d0..334fbfb 100644
--- a/conf/intel/repo/sabayonlinux.org/packages.db.post_upgrade.sh
+++ b/conf/intel/repo/sabayonlinux.org/packages.db.post_upgrade.sh
@@ -10,7 +10,7 @@ NEW_BRANCH=$4
 echo -e "
 >> requirements for this branch:
    app-admin/eselect-python
-   sys-devel/base-gcc:4.6
+   sys-devel/base-gcc:<latest>
 >> Entropy post-upgrade migration script
 >> Repository: "${REPO_ID}"
 >> Root: "${ROOT}"
@@ -58,12 +58,6 @@ fix_lib64_symlinks() {
 	fi
 }
 
-latest_gcc_profile() {
-    local gcc_dir="/etc/env.d/gcc"
-    local latest=$(ls -1 ${gcc_dir}/$(uname -m)* | sort | tail -n 1 2> /dev/null)
-    [[ -n "${latest}" ]] && echo $(basename "${latest}")
-}
-
 three_four_to_five() {
 
     local rc=0
@@ -86,18 +80,6 @@ three_four_to_five() {
         rc=1
     fi
 
-    ## sys-devel/base-gcc:LATEST must be forced using
-    ## packages.db.system_mask inside repository db dir
-    c_profile=$(latest_gcc_profile)
-    if [ -n "${c_profile}" ]; then
-        gcc-config "${c_profile}"
-        # update env
-        env-update
-    else
-        echo "gcc-config unable to set new profile: not detected"
-        rc=1
-    fi
-
     # set proper eselect esd engine
     if [ -f "${ROOT}/usr/bin/esdcompat" ]; then
         eselect esd list | grep PulseAudio | cut -d"[" -f 2 | \