Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-04 18:40:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com:/pentoo/pentoo-overlay

Browse source
This commit is contained in:
blshkv 2018-03-20 15:50:44 +08:00
commit 8f3421bd82
No known key found for this signature in database
GPG key ID: 273E3E90D1A6294F
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pentoo/zero-system/zero-system-9999.ebuild
View file

@ -38,6 +38,7 @@ PDEPEND="
dev-util/jenkins-bin
)
!nu? ( !arm? ( net-print/samsung-unified-linux-driver )
dev-ruby/pry
app-doc/doxygen
mail-client/thunderbird
!arm? ( mail-client/thunderbird-bin )

26
scripts/pentoo-updater.sh
View file

@ -34,28 +34,28 @@ if [ -z "${PYTHON2}" ] || [ -z "${PYTHON3}" ]; then
printf "From PYTHON_TARGETS: $(emerge --info | grep '^PYTHON TARGETS')\n"
exit 1
fi
if eselect python list --python2 | grep -q ${PYTHON2}; then
eselect python set --python2 ${PYTHON2} || safe_exit
if eselect python list --python2 | grep -q "${PYTHON2}"; then
eselect python set --python2 "${PYTHON2}" || safe_exit
else
printf "System wants ${PYTHON2} as default python2 version but it isn't installed yet.\n"
RESET_PYTHON=1
fi
if eselect python list --python3 | grep -q ${PYTHON3}; then
eselect python set --python3 ${PYTHON3} || safe_exit
if eselect python list --python3 | grep -q "${PYTHON3}"; then
eselect python set --python3 "${PYTHON3}" || safe_exit
else
printf "System wants ${PYTHON3} as default python3 version but it isn't installed yet.\n"
RESET_PYTHON=1
fi
${PYTHON2} -c "from _multiprocessing import SemLock" || emerge -1 python:${PYTHON2#python}
${PYTHON3} -c "from _multiprocessing import SemLock" || emerge -1 python:${PYTHON3#python}
"${PYTHON2}" -c "from _multiprocessing import SemLock" || emerge -1 python:"${PYTHON2#python}"
"${PYTHON3}" -c "from _multiprocessing import SemLock" || emerge -1 python:"${PYTHON3#python}"
emerge --update --newuse --oneshot --changed-use --newrepo portage || safe_exit
#modified from news item "Python ABIFLAGS rebuild needed"
if [ -n "$(find /usr/lib*/python3* -name '*cpython-3[3-5].so')" ]; then
emerge -1v --usepkg=n --buildpkg=y $(find /usr/lib*/python3* -name '*cpython-3[3-5].so')
fi
if [ -n "$(find /usr/include/python3.{3,4,5} -type f 2> /dev/null)" ]; then
emerge -1v --usepkg=n --buildpkg=y /usr/include/python3.{3,4,5}
if [ -n "$(find /usr/include/python3.[3-5] -type f 2> /dev/null)" ]; then
emerge -1v --usepkg=n --buildpkg=y /usr/include/python3.[3-5]
fi
#modified from news item gcc-5-new-c++11-abi
@ -79,8 +79,8 @@ perl-cleaner --ph-clean --modules -- --buildpkg=y || safe_exit
emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit
if [ ${RESET_PYTHON} = 1 ]; then
eselect python set --python2 ${PYTHON2} || safe_exit
eselect python set --python3 ${PYTHON3} || safe_exit
eselect python set --python2 "${PYTHON2}" || safe_exit
eselect python set --python3 "${PYTHON3}" || safe_exit
fi
#if we are in catalyst, update the extra binpkgs
@ -92,8 +92,7 @@ if [ -n "${clst_target}" ]; then
etc-update --automode -5 || safe_exit
fi
portageq list_preserved_libs /
if [ $? = 0 ]; then
if portageq list_preserved_libs /; then
emerge @preserved-rebuild --buildpkg=y || safe_exit
fi
smart-live-rebuild 2>&1 || safe_exit
@ -101,8 +100,7 @@ revdep-rebuild -i -- --rebuild-exclude dev-java/swt --exclude dev-java/swt --bui
emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit
#we need to do the clean BEFORE we drop the extra flags otherwise all the packages we just built are removed
emerge --depclean || safe_exit
portageq list_preserved_libs /
if [ $? = 0 ]; then
if portageq list_preserved_libs /; then
emerge @preserved-rebuild --buildpkg=y || safe_exit
fi