From 7e3c5ce8cffc7d430357b11680f85565b194f912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 19 Nov 2020 17:01:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20app-portage/eix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- merge/README.txt | 2 ++ merge/app-portage/.calculate_directory | 1 + merge/app-portage/eix/.calculate_directory | 1 + merge/app-portage/eix/50-calculate | 5 +++++ merge/app-portage/eix/eix-sync.conf | 4 ++++ 5 files changed, 13 insertions(+) create mode 100644 merge/app-portage/.calculate_directory create mode 100644 merge/app-portage/eix/.calculate_directory create mode 100644 merge/app-portage/eix/50-calculate create mode 100644 merge/app-portage/eix/eix-sync.conf 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'