diff --git a/merge/README.txt b/merge/README.txt index c46f0ff..13975fb 100644 --- a/merge/README.txt +++ b/merge/README.txt @@ -5,3 +5,5 @@ app-office/scribus app-emulation/lxd При переносе шаблонов app-office/libreoffice удалены шаблоны для x86 +При переносе шаблонов app-portage/eix удалены условия и шаблоны для версии +меньше 0.30 diff --git a/merge/app-portage/.calculate_directory b/merge/app-portage/.calculate_directory new file mode 100644 index 0000000..8e3df7f --- /dev/null +++ b/merge/app-portage/.calculate_directory @@ -0,0 +1 @@ +{% calculate append = 'skip' %} diff --git a/merge/app-portage/eix/.calculate_directory b/merge/app-portage/eix/.calculate_directory new file mode 100644 index 0000000..ec382b8 --- /dev/null +++ b/merge/app-portage/eix/.calculate_directory @@ -0,0 +1 @@ +{% calculate name='etc', package='app-portage/eix' %} diff --git a/merge/app-portage/eix/50-calculate b/merge/app-portage/eix/50-calculate new file mode 100644 index 0000000..7cbc9ff --- /dev/null +++ b/merge/app-portage/eix/50-calculate @@ -0,0 +1,5 @@ +{% calculate comment='#', append='replace', format='raw', path='/etc/eixrc', pkg() >= '0.29' %} +COLORSCHEME1="true" +NOSTATUSLINE=true +EIX_LIMIT=0 +EIX_LIMIT_COMPACT=0 diff --git a/merge/app-portage/eix/eix-sync.conf b/merge/app-portage/eix/eix-sync.conf new file mode 100644 index 0000000..dc80900 --- /dev/null +++ b/merge/app-portage/eix/eix-sync.conf @@ -0,0 +1,4 @@ +{% calculate comment='#', format='raw', append='replace' %} +# checkout and repair repositories before sync +!have_changed=: +!emergecmd='/usr/sbin/cl-core --method update --sync-only --skip-eix-update'