Обновление EIX-SYNC

странное произошло сегодня, после EIX-SYNC вот что выдало

calculate andrey # eix-sync
* Копирую старую базу данных в /var/cache/eix/previous.eix
* Синхронизация всех оверлеев
* Running… # ( cd /var/lib/layman/calculate && /usr/bin/git pull )
U profiles/calculate/desktop/CLDG/package.keywords/default
U profiles/calculate/desktop/CLDG/package.keywords/gnome3
U profiles/calculate/desktop/CLDX/package.keywords
U profiles/calculate/desktop/package.keywords/default
U profiles/calculate/package.mask
U profiles/package.mask
A profiles/patches/xfce-extra/xfce4-mixer-4.10-change_icon.sh
U profiles/templates/3.1/3_ac_desktop_desktop/2-desktop-root/60-qt-gui-4.7/Trolltech.conf
U profiles/templates/3.1/3_ac_desktop_desktop/2-desktop-user/.calculate_directory
A profiles/templates/3.1/3_ac_desktop_desktop/2-desktop-user/00-patch-3.0.3/.calculate_directory
A profiles/templates/3.1/3_ac_desktop_desktop/2-desktop-user/00-patch-3.0.3/ini.env
A profiles/templates/3.1/3_ac_desktop_desktop/2-desktop-user/00-patch-3.0.3/xfce4-panel.xml
U profiles/templates/3.1/3_ac_desktop_desktop/2-desktop-user/40-xfce-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
U profiles/templates/3.1/3_ac_desktop_install/.calculate_directory
U profiles/templates/3.1/3_ac_desktop_merge/.calculate_directory
A profiles/templates/3.1/4_ac_install_live/1-live/00-calculate-install/00-calculate.env
A profiles/templates/3.1/4_ac_install_live/1-live/00-calculate-install/10-calculate.env
A profiles/templates/3.1/4_ac_install_live/1-live/00-calculate-install/99-calculate2.env.del
A profiles/templates/3.1/4_ac_install_live/1-live/00-calculate-install/99-calculate3.env.del
A profiles/templates/3.1/4_ac_install_live/1-live/calculate-utilities/calculate.env
A profiles/templates/3.1/6_ac_install_system/2-system/calculate-client/calculate.env
A profiles/templates/3.1/6_ac_install_system/2-system/calculate-install/calculate.env
A profiles/templates/assemble/setup/etc/calculate/calculate.env
U profiles/templates/assemble/setup/etc/calculate/calculate2.env
U profiles/templates/assemble/setup/etc/calculate/calculate3.env
A profiles/templates/builder/squash/etc/calculate/calculate.env
U profiles/templates/builder/squash/etc/calculate/calculate2.env
A profiles/templates/builder/squash/etc/calculate/calculate2.env.del
U profiles/templates/builder/squash/etc/calculate/calculate3.env
A profiles/templates/builder/squash/etc/calculate/calculate3.env.del
A profiles/templates/desktop/desktop/00-patch-3.0.3/.calculate_directory
A profiles/templates/desktop/desktop/00-patch-3.0.3/ini.env
A profiles/templates/desktop/desktop/00-patch-3.0.3/xfce4-panel.xml
U profiles/templates/desktop/desktop/40-xfce-4.10/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
U sys-apps/calculate-assemble/Manifest
U sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild
U sys-apps/calculate-builder/Manifest
U sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild
U sys-apps/calculate-client/Manifest
U sys-apps/calculate-client/calculate-client-2.2.9999.ebuild
A sys-apps/calculate-client/calculate-client-3.1.0_alpha1.ebuild
A sys-apps/calculate-client/calculate-client-3.1.0_alpha2.ebuild
A sys-apps/calculate-client/calculate-client-3.1.0_alpha3.ebuild
A sys-apps/calculate-client/calculate-client-3.1.0_alpha4.ebuild
A sys-apps/calculate-client/calculate-client-3.1.9999.ebuild
U sys-apps/calculate-console-gui/Manifest
A sys-apps/calculate-console-gui/calculate-console-gui-3.1.0_alpha1.ebuild
A sys-apps/calculate-console-gui/calculate-console-gui-3.1.0_alpha2.ebuild
A sys-apps/calculate-console-gui/calculate-console-gui-3.1.0_alpha3.ebuild
A sys-apps/calculate-console-gui/calculate-console-gui-3.1.0_alpha4.ebuild
A sys-apps/calculate-console-gui/calculate-console-gui-3.1.9999.ebuild
U sys-apps/calculate-console/Manifest
A sys-apps/calculate-console/calculate-console-3.1.0_alpha1.ebuild
A sys-apps/calculate-console/calculate-console-3.1.0_alpha2.ebuild
A sys-apps/calculate-console/calculate-console-3.1.0_alpha3.ebuild
A sys-apps/calculate-console/calculate-console-3.1.0_alpha4.ebuild
A sys-apps/calculate-console/calculate-console-3.1.9999.ebuild
U sys-apps/calculate-core/Manifest
A sys-apps/calculate-core/calculate-core-3.1.0_alpha1.ebuild
A sys-apps/calculate-core/calculate-core-3.1.0_alpha2.ebuild
A sys-apps/calculate-core/calculate-core-3.1.0_alpha3.ebuild
A sys-apps/calculate-core/calculate-core-3.1.0_alpha4.ebuild
A sys-apps/calculate-core/calculate-core-3.1.9999.ebuild
U sys-apps/calculate-desktop/Manifest
U sys-apps/calculate-desktop/calculate-desktop-2.2.9999.ebuild
A sys-apps/calculate-desktop/calculate-desktop-3.1.0_alpha1.ebuild
A sys-apps/calculate-desktop/calculate-desktop-3.1.0_alpha2.ebuild
A sys-apps/calculate-desktop/calculate-desktop-3.1.0_alpha3.ebuild
A sys-apps/calculate-desktop/calculate-desktop-3.1.0_alpha4.ebuild
A sys-apps/calculate-desktop/calculate-desktop-3.1.9999.ebuild
U sys-apps/calculate-i18n/Manifest
U sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild
A sys-apps/calculate-i18n/calculate-i18n-3.1.0_alpha1.ebuild
A sys-apps/calculate-i18n/calculate-i18n-3.1.0_alpha2.ebuild
A sys-apps/calculate-i18n/calculate-i18n-3.1.0_alpha3.ebuild
A sys-apps/calculate-i18n/calculate-i18n-3.1.0_alpha4.ebuild
A sys-apps/calculate-i18n/calculate-i18n-3.1.9999.ebuild
U sys-apps/calculate-install/Manifest
U sys-apps/calculate-install/calculate-install-2.2.9999.ebuild
A sys-apps/calculate-install/calculate-install-3.1.0_alpha1.ebuild
A sys-apps/calculate-install/calculate-install-3.1.0_alpha2.ebuild
A sys-apps/calculate-install/calculate-install-3.1.0_alpha3.ebuild
A sys-apps/calculate-install/calculate-install-3.1.0_alpha4.ebuild
A sys-apps/calculate-install/calculate-install-3.1.9999.ebuild
U sys-apps/calculate-lib/Manifest
U sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
U sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild
A sys-apps/calculate-lib/calculate-lib-3.1.0_alpha1.ebuild
A sys-apps/calculate-lib/calculate-lib-3.1.0_alpha2.ebuild
A sys-apps/calculate-lib/calculate-lib-3.1.0_alpha3.ebuild
A sys-apps/calculate-lib/calculate-lib-3.1.0_alpha4.ebuild
A sys-apps/calculate-lib/calculate-lib-3.1.9999.ebuild
U sys-apps/calculate-server/Manifest
U sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
U sys-apps/calculate-templates/Manifest
U sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild
U sys-apps/calculate-utilities/Manifest
A sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha1.ebuild
A sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha2.ebuild
A sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha3.ebuild
A sys-apps/calculate-utilities/calculate-utilities-3.1.0_alpha4.ebuild
A sys-apps/calculate-utilities/calculate-utilities-3.1.9999.ebuild
U sys-apps/calculate/Manifest
U sys-apps/calculate/calculate-9999.ebuild
U sys-kernel/calculate-sources/Manifest
A sys-kernel/calculate-sources/calculate-sources-3.5.6.ebuild
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm ’
as appropriate to mark resolution, or use ‘git commit -a’.
*
* Errors:
* ------
*
* Failed to sync overlay “calculate”.
* Error was: Syncing overlay “calculate” returned status 1!
*
* ошибка layman -S
* Запуск emerge --sync
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: <<<<<<<
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: >>>>>>>
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: <<<<<<<
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: >>>>>>>
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4

Starting git pull in /usr/portage…
Already up-to-date.

Git pull in /usr/portage successful
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: <<<<<<<
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: >>>>>>>
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: <<<<<<<
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: >>>>>>>
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: <<<<<<<
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords: >>>>>>>
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: <<<<<<<
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: >>>>>>>
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: <<<<<<< HEAD
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: =
— Invalid atom in /var/lib/layman/calculate/profiles/calculate/package.mask: >>>>>>> 15dcab05616deea007a576b6c47ed36f196441c4
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate/calculate-9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 1690
* Expected: 1597
Error processing sys-apps/calculate-9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 665
* Expected: 572
Error processing sys-apps/calculate-assemble-2.2.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 738
* Expected: 645
Error processing sys-apps/calculate-builder-2.2.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-client/calculate-client-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 974
* Expected: 881
Error processing sys-apps/calculate-client-2.2.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-desktop/calculate-desktop-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 1071
* Expected: 978
Error processing sys-apps/calculate-desktop-2.2.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 863
* Expected: 770
Error processing sys-apps/calculate-i18n-2.2.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-install/calculate-install-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 778
* Expected: 685
Error processing sys-apps/calculate-install-2.2.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-lib/calculate-lib-2.1.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 648
* Expected: 555
Error processing sys-apps/calculate-lib-2.1.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 823
* Expected: 730
Error processing sys-apps/calculate-lib-2.2.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-server/calculate-server-2.1.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 1204
* Expected: 1111
Error processing sys-apps/calculate-server-2.1.9999, continuing…
* Digest verification failed:
* /var/lib/layman/calculate/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild
* Reason: Filesize does not match recorded size
* Got: 670
* Expected: 577
Error processing sys-apps/calculate-templates-2.2.9999, continuing…
* Что-то не так с egencache --repo=calculate --update --jobs=4
* Запуск eix-update
Чтенье настроек Portage …
– Неверная строка 19 в /var/lib/layman/calculate/profiles/package.mask: ‘<<<<<<< …’
Не могу прочесть категорию.

– Неверная строка 27 в /var/lib/layman/calculate/profiles/package.mask: ‘= …’
Не могу прочесть категорию.

– Неверная строка 35 в /var/lib/layman/calculate/profiles/package.mask: ‘>>>>>>> …’
Не могу прочесть категорию.

– Неверная строка 10 в /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: ‘<<<<<<< …’
Не могу прочесть категорию.

– Неверная строка 11 в /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: ‘= …’
Не могу прочесть категорию.

– Неверная строка 13 в /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: ‘>>>>>>> …’
Не могу прочесть категорию.

Построенье базы данных (/var/cache/eix/portage.eix) …
[0] “gentoo” /usr/portage/ (кэш: metadata-md5-or-flat)
Чтенье категории 157|157 (100%) Готово
[1] “calculate” /var/lib/layman/calculate (кэш: parse|ebuild*#metadata-md5#metadata-flat#assign)
Чтенье категории 125|157 ( 79%): sys-apps …/var/lib/layman/calculate/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild: line 19: syntax error near unexpected token `<<<’
/var/lib/layman/calculate/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild: line 19: `<<<<<<< HEAD’
* ERROR: sys-apps/calculate-assemble-2.2.9999 failed (depend phase):
* error sourcing ebuild
*
* Call stack:
* ebuild.sh, line 552: Called die
* The specific snippet of code:
* source “$EBUILD” || die “error sourcing ebuild”
*
* If you need support, post the output of `emerge --info ‘=sys-apps/calculate-assemble-2.2.9999’`,
* the complete build log and the output of `emerge -pqv ‘=sys-apps/calculate-assemble-2.2.9999’`.
* This ebuild is from an overlay: ‘/var/lib/layman/calculate/’
* Working directory: ‘/home/andrey’
* S: ‘/calculate-assemble-2.2.9999’

Ошибка ebuild со статусом 1
Чтенье категории 125|157 ( 79%): sys-apps …
Не получилось исполнить /var/lib/layman/calculate/sys-apps/calculate-assemble/calculate-assemble-2.2.9999.ebuild
Чтенье категории 125|157 ( 79%): sys-apps …/var/lib/layman/calculate/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild: line 19: syntax error near unexpected token `<<<’
/var/lib/layman/calculate/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild: line 19: `<<<<<<< HEAD’
* ERROR: sys-apps/calculate-builder-2.2.9999 failed (depend phase):
* error sourcing ebuild
*
* Call stack:
* ebuild.sh, line 552: Called die
* The specific snippet of code:
* source “$EBUILD” || die “error sourcing ebuild”
*
* If you need support, post the output of `emerge --info ‘=sys-apps/calculate-builder-2.2.9999’`,
* the complete build log and the output of `emerge -pqv ‘=sys-apps/calculate-builder-2.2.9999’`.
* This ebuild is from an overlay: ‘/var/lib/layman/calculate/’
* Working directory: ‘/home/andrey’
* S: ‘/calculate-builder-2.2.9999’

Ошибка ebuild со статусом 1
Чтенье категории 125|157 ( 79%): sys-apps …
Не получилось исполнить /var/lib/layman/calculate/sys-apps/calculate-builder/calculate-builder-2.2.9999.ebuild
Чтенье категории 125|157 ( 79%): sys-apps …/var/lib/layman/calculate/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild: line 19: syntax error near unexpected token `<<<’
/var/lib/layman/calculate/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild: line 19: `<<<<<<< HEAD’
* ERROR: sys-apps/calculate-i18n-2.2.9999 failed (depend phase):
* error sourcing ebuild
*
* Call stack:
* ebuild.sh, line 552: Called die
* The specific snippet of code:
* source “$EBUILD” || die “error sourcing ebuild”
*
* If you need support, post the output of `emerge --info ‘=sys-apps/calculate-i18n-2.2.9999’`,
* the complete build log and the output of `emerge -pqv ‘=sys-apps/calculate-i18n-2.2.9999’`.
* This ebuild is from an overlay: ‘/var/lib/layman/calculate/’
* Working directory: ‘/home/andrey’
* S: ‘/calculate-i18n-2.2.9999’

Ошибка ebuild со статусом 1
Чтенье категории 125|157 ( 79%): sys-apps …
Не получилось исполнить /var/lib/layman/calculate/sys-apps/calculate-i18n/calculate-i18n-2.2.9999.ebuild
Чтенье категории 125|157 ( 79%): sys-apps …/var/lib/layman/calculate/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild: line 18: syntax error near unexpected token `<<<’
/var/lib/layman/calculate/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild: line 18: `<<<<<<< HEAD’
* ERROR: sys-apps/calculate-lib-2.2.9999 failed (depend phase):
* error sourcing ebuild
*
* Call stack:
* ebuild.sh, line 552: Called die
* The specific snippet of code:
* source “$EBUILD” || die “error sourcing ebuild”
*
* If you need support, post the output of `emerge --info ‘=sys-apps/calculate-lib-2.2.9999’`,
* the complete build log and the output of `emerge -pqv ‘=sys-apps/calculate-lib-2.2.9999’`.
* This ebuild is from an overlay: ‘/var/lib/layman/calculate/’
* Working directory: ‘/home/andrey’
* S: ‘/calculate-lib-2.2.9999’

Ошибка ebuild со статусом 1
Чтенье категории 125|157 ( 79%): sys-apps …
Не получилось исполнить /var/lib/layman/calculate/sys-apps/calculate-lib/calculate-lib-2.2.9999.ebuild
Чтенье категории 125|157 ( 79%): sys-apps …/var/lib/layman/calculate/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild: line 15: syntax error near unexpected token `<<<’
/var/lib/layman/calculate/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild: line 15: `<<<<<<< HEAD’
* ERROR: sys-apps/calculate-templates-2.2.9999 failed (depend phase):
* error sourcing ebuild
*
* Call stack:
* ebuild.sh, line 552: Called die
* The specific snippet of code:
* source “$EBUILD” || die “error sourcing ebuild”
*
* If you need support, post the output of `emerge --info ‘=sys-apps/calculate-templates-2.2.9999’`,
* the complete build log and the output of `emerge -pqv ‘=sys-apps/calculate-templates-2.2.9999’`.
* This ebuild is from an overlay: ‘/var/lib/layman/calculate/’
* Working directory: ‘/home/andrey’
* S: ‘/calculate-templates-2.2.9999’

Ошибка ebuild со статусом 1
Чтенье категории 125|157 ( 79%): sys-apps …
Не получилось исполнить /var/lib/layman/calculate/sys-apps/calculate-templates/calculate-templates-2.2.9999.ebuild
Чтенье категории 157|157 (100%) Готово
Примененье масок …
Расчёт хэш-таблиц …
Запись файла базы данных /var/cache/eix/portage.eix …
База данных содержит 15893 пакетов в 157 категориях.
* Вызов eix-diff
– Неверная строка 19 в /var/lib/layman/calculate/profiles/package.mask: ‘<<<<<<< …’
Не могу прочесть категорию.

– Неверная строка 27 в /var/lib/layman/calculate/profiles/package.mask: ‘= …’
Не могу прочесть категорию.

– Неверная строка 35 в /var/lib/layman/calculate/profiles/package.mask: ‘>>>>>>> …’
Не могу прочесть категорию.

– Неверная строка 10 в /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: ‘<<<<<<< …’
Не могу прочесть категорию.

– Неверная строка 11 в /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: ‘=== …’
Не могу прочесть категорию.

– Неверная строка 13 в /var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords: ‘>>>>>>> …’
Не могу прочесть категорию.

Сравнение баз данных (15893 -> 15893 пакетов)
* Статистика времени:
2 секунд для синхронизация
7 секунд для eix-update
2 секунд для eix-diff
15 секунд всего


Pull is not possible because you have unmerged files.

Вообще - с переводом портежей в git, и удалением оных перед созданием iso пошла куча косяков с обновлением. И в багтрекере запись об этом есть

решить по быстрому можно так:

<code class="sh">
for p in /usr/portage /var/lib/layman; do
  cd $p
  git checkout -- '*'
  git pull origin master
  cd -
done
</code>

Далее можно уже запустить команду
eix-sync
СОбственно портежи у вас будут уже обновлены, но она заодно выполнит ряд доп. действий (таких как настройка портежей, создание кеша eix, сравнение старого и нового кеша)

Непомогло

все так и осталось

  • Errors:

    • Failed to sync overlay “calculate”.
  • Error was: Syncing overlay “calculate” returned status 1!
  • * ошибка layman -S

layman -d calculate && layman -a calculate && eix-sync

а в файлах /var/lib/layman/calculate/profiles/calculate/desktop/package.keywords/custom
/var/lib/layman/calculate/profiles/calculate/desktop/CLDX/package.keywords/custom

и т.п есть ошибки посмотри

Вот такое выдает

Git pull in /usr/portage successful
* ERROR: net-misc/italc-1.0.13 failed (depend phase):
* qt4.eclass could not be found by inherit()
*
* Call stack:
* ebuild.sh, line 552: Called source ‘/var/lib/layman/calculate/net-misc/italc/italc-1.0.13.ebuild’
* italc-1.0.13.ebuild, line 7: Called inherit ‘autotools’ ‘qt4’ ‘eutils’ ‘autotools’
* ebuild.sh, line 262: Called die
* The specific snippet of code:
* [ ! -e “$location” ] && die “${1}.eclass could not be found by inherit()”
*
* If you need support, post the output of `emerge --info ‘=net-misc/italc-1.0.13’`,
* the complete build log and the output of `emerge -pqv ‘=net-misc/italc-1.0.13’`.
* This ebuild is from an overlay named ‘calculate’: ‘/var/lib/layman/calculate/’
* ERROR: net-misc/italc-1.0.13-r1 failed (depend phase):
* qt4.eclass could not be found by inherit()
*
* Working directory: ‘/home/andrey’
* Call stack:
* S: ‘/var/calculate/tmp/portage/net-misc/italc-1.0.13/work/italc-1.0.13’
* ebuild.sh, line 552: Called source ‘/var/lib/layman/calculate/net-misc/italc/italc-1.0.13-r1.ebuild’
* italc-1.0.13-r1.ebuild, line 7: Called inherit ‘autotools’ ‘qt4’ ‘eutils’ ‘autotools’
* ebuild.sh, line 262: Called die
* The specific snippet of code:
* [ ! -e “$location” ] && die “${1}.eclass could not be found by inherit()”
*
* If you need support, post the output of `emerge --info ‘=net-misc/italc-1.0.13-r1’`,
* the complete build log and the output of `emerge -pqv ‘=net-misc/italc-1.0.13-r1’`.
* This ebuild is from an overlay named ‘calculate’: ‘/var/lib/layman/calculate/’
* Working directory: ‘/home/andrey’
* S: ‘/var/calculate/tmp/portage/net-misc/italc-1.0.13-r1/work/italc-1.0.13’
Error processing net-misc/italc-1.0.13-r1, continuing…
Error processing net-misc/italc-1.0.13, continuing…
* Что-то не так с egencache --repo=calculate --update --jobs=4