diff options
Diffstat (limited to 'metadata/md5-cache/app-shells')
| -rw-r--r-- | metadata/md5-cache/app-shells/Manifest.gz | bin | 15597 -> 15635 bytes | |||
| -rw-r--r-- | metadata/md5-cache/app-shells/zsh-5.6.2 | 4 | ||||
| -rw-r--r-- | metadata/md5-cache/app-shells/zsh-5.7.1 | 4 | ||||
| -rw-r--r-- | metadata/md5-cache/app-shells/zsh-9999 | 4 |
4 files changed, 12 insertions, 0 deletions
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz Binary files differindex d87b08826bcc..b5fb51e1f3b1 100644 --- a/metadata/md5-cache/app-shells/Manifest.gz +++ b/metadata/md5-cache/app-shells/Manifest.gz diff --git a/metadata/md5-cache/app-shells/zsh-5.6.2 b/metadata/md5-cache/app-shells/zsh-5.6.2 index fed352d2eab2..202e1847846d 100644 --- a/metadata/md5-cache/app-shells/zsh-5.6.2 +++ b/metadata/md5-cache/app-shells/zsh-5.6.2 @@ -10,5 +10,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers ) RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1 SLOT=0 SRC_URI=https://www.zsh.org/pub/zsh-5.6.2.tar.xz https://www.zsh.org/pub/old/zsh-5.6.2.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.6.2-doc.tar.xz ) +<<<<<<< HEAD +_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5d0efcc61e57775f8ab86853ce678f57 diff --git a/metadata/md5-cache/app-shells/zsh-5.7.1 b/metadata/md5-cache/app-shells/zsh-5.7.1 index d6cfbeb5f158..8ff4482d2cc7 100644 --- a/metadata/md5-cache/app-shells/zsh-5.7.1 +++ b/metadata/md5-cache/app-shells/zsh-5.7.1 @@ -11,5 +11,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers ) RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1 SLOT=0 SRC_URI=https://www.zsh.org/pub/zsh-5.7.1.tar.xz https://www.zsh.org/pub/old/zsh-5.7.1.tar.xz mirror://sourceforge/zsh/zsh-5.7.1.tar.xz doc? ( https://www.zsh.org/pub/zsh-5.7.1-doc.tar.xz mirror://sourceforge/zsh/zsh-5.7.1-doc.tar.xz ) +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=431869bf963015d70f8a8479c194acec diff --git a/metadata/md5-cache/app-shells/zsh-9999 b/metadata/md5-cache/app-shells/zsh-9999 index 99646754daf1..07da7a176346 100644 --- a/metadata/md5-cache/app-shells/zsh-9999 +++ b/metadata/md5-cache/app-shells/zsh-9999 @@ -10,5 +10,9 @@ PDEPEND=examples? ( app-doc/zsh-lovers ) PROPERTIES=live RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1 SLOT=0 +<<<<<<< HEAD +_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +======= _eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 git-r3 562b380fc59ae6a8622171d0acb777d1 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e prefix c2993e4c430c1ee24f278983d6189501 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a +>>>>>>> next _md5_=5798c7b5c25728a3418de57a31fc3f69 |